Merge branch 'telegramdesktop-dev' into dev

Telegram/Resources/langs/lang.strings

@@ -1166,6 +1166,7 @@ https://github.com/rabbitGramDesktop/rabbitGramDesktop/blob/dev/LEGAL
 "lng_mute_box_title" = "Mute notifications for...";
 
 "lng_preview_loading" = "Getting Link Info...";
+"lng_preview_cant" = "Could not generate preview for this link.";
 
 "lng_profile_settings_section" = "Settings";
 "lng_profile_bot_settings" = "Bot Settings";
@@ -2361,6 +2362,7 @@ https://github.com/rabbitGramDesktop/rabbitGramDesktop/blob/dev/LEGAL
 "lng_saved_messages" = "Saved Messages";
 "lng_saved_short" = "Save";
 "lng_saved_forward_here" = "Forward messages here for quick access";
+"lng_saved_quote_here" = "Quote here to save";
 
 "lng_scheduled_messages" = "Scheduled Messages";
 "lng_scheduled_messages_empty" = "No scheduled messages here yet...";

Telegram/Resources/uwp/AppX/AppxManifest.xml

@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.11.0.0" />
+    Version="4.11.1.0" />
   <Properties>
     <DisplayName>rabbitGram Desktop</DisplayName>
     <PublisherDisplayName>xmdnx</PublisherDisplayName>

Telegram/Resources/winrc/Telegram.rc

@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,11,0,0
- PRODUCTVERSION 4,11,0,0
+ FILEVERSION 4,11,1,0
+ PRODUCTVERSION 4,11,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "xmdnx"
             VALUE "FileDescription", "rabbitGram Desktop"
-            VALUE "FileVersion", "4.11.0.0"
+            VALUE "FileVersion", "4.11.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2023"
             VALUE "ProductName", "rabbitGram Desktop"
-            VALUE "ProductVersion", "4.11.0.0"
+            VALUE "ProductVersion", "4.11.1.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/Resources/winrc/Updater.rc

@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,11,0,0
- PRODUCTVERSION 4,11,0,0
+ FILEVERSION 4,11,1,0
+ PRODUCTVERSION 4,11,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "xmdnx"
             VALUE "FileDescription", "rabbitGram Desktop Updater"
-            VALUE "FileVersion", "4.11.0.0"
+            VALUE "FileVersion", "4.11.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2023"
             VALUE "ProductName", "rabbitGram Desktop"
-            VALUE "ProductVersion", "4.11.0.0"
+            VALUE "ProductVersion", "4.11.1.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/SourceFiles/apiwrap.cpp

@@ -3682,6 +3682,7 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 			Api::ConvertOption::SkipLocal);
 		if (!sentEntities.v.isEmpty()) {
 			sendFlags |= MTPmessages_SendMessage::Flag::f_entities;
+			mediaFlags |= MTPmessages_SendMedia::Flag::f_entities;
 		}
 		const auto clearCloudDraft = action.clearDraft;
 		const auto topicRootId = action.replyTo.topicRootId;

Telegram/SourceFiles/boxes/peer_list_box.cpp

@@ -457,7 +457,7 @@ int PeerListController::descriptionTopSkipMin() const {
 void PeerListBox::addSelectItem(
 		not_null<PeerData*> peer,
 		anim::type animated) {
-	const auto respect = _controller->respectSavedMessagesChat();
+	const auto respect = !_controller->savedMessagesChatStatus().isEmpty();
 	const auto text = (respect && peer->isSelf())
 		? tr::lng_saved_short(tr::now)
 		: (respect && peer->isRepliesChat())
@@ -580,8 +580,8 @@ void PeerListRow::refreshStatus() {
 	_statusType = StatusType::LastSeen;
 	_statusValidTill = 0;
 	if (auto user = peer()->asUser()) {
-		if (_isSavedMessagesChat) {
-			setStatusText(tr::lng_saved_forward_here(tr::now));
+		if (!_savedMessagesStatus.isEmpty()) {
+			setStatusText(_savedMessagesStatus);
 		} else {
 			auto time = base::unixtime::now();
 			setStatusText(Data::OnlineText(user, time));
@@ -614,7 +614,7 @@ void PeerListRow::refreshName(const style::PeerListItem &st) {
 	if (!_initialized) {
 		return;
 	}
-	const auto text = _isSavedMessagesChat
+	const auto text = !_savedMessagesStatus.isEmpty()
 		? tr::lng_saved_messages(tr::now)
 		: _isRepliesMessagesChat
 		? tr::lng_replies_messages(tr::now)
@@ -684,7 +684,7 @@ QString PeerListRow::generateName() {
 }
 
 QString PeerListRow::generateShortName() {
-	return _isSavedMessagesChat
+	return !_savedMessagesStatus.isEmpty()
 		? tr::lng_saved_short(tr::now)
 		: _isRepliesMessagesChat
 		? tr::lng_replies_messages(tr::now)
@@ -700,7 +700,7 @@ Ui::PeerUserpicView &PeerListRow::ensureUserpicView() {
 
 PaintRoundImageCallback PeerListRow::generatePaintUserpicCallback(
 		bool forceRound) {
-	const auto saved = _isSavedMessagesChat;
+	const auto saved = !_savedMessagesStatus.isEmpty();
 	const auto replies = _isRepliesMessagesChat;
 	const auto peer = this->peer();
 	auto userpic = saved ? Ui::PeerUserpicView() : ensureUserpicView();
@@ -746,7 +746,9 @@ int PeerListRow::paintNameIconGetWidth(
 		int availableWidth,
 		int outerWidth,
 		bool selected) {
-	if (special() || _isSavedMessagesChat || _isRepliesMessagesChat) {
+	if (special()
+		|| !_savedMessagesStatus.isEmpty()
+		|| _isRepliesMessagesChat) {
 		return 0;
 	}
 	return _bagde.drawGetWidth(
@@ -856,7 +858,7 @@ void PeerListRow::paintDisabledCheckUserpic(
 	auto iconBorderPen = st.checkbox.check.border->p;
 	iconBorderPen.setWidth(st.checkbox.selectWidth);
 
-	if (_isSavedMessagesChat) {
+	if (!_savedMessagesStatus.isEmpty()) {
 		Ui::EmptyUserpic::PaintSavedMessages(p, userpicLeft, userpicTop, outerWidth, userpicRadius * 2);
 	} else if (_isRepliesMessagesChat) {
 		Ui::EmptyUserpic::PaintRepliesMessages(p, userpicLeft, userpicTop, outerWidth, userpicRadius * 2);
@@ -1048,9 +1050,10 @@ void PeerListContent::setRowHidden(not_null<PeerListRow*> row, bool hidden) {
 }
 
 void PeerListContent::addRowEntry(not_null<PeerListRow*> row) {
-	if (_controller->respectSavedMessagesChat() && !row->special()) {
+	const auto savedMessagesStatus = _controller->savedMessagesChatStatus();
+	if (!savedMessagesStatus.isEmpty() && !row->special()) {
 		if (row->peer()->isSelf()) {
-			row->setIsSavedMessagesChat(true);
+			row->setSavedMessagesChatStatus(savedMessagesStatus);
 		} else if (row->peer()->isRepliesChat()) {
 			row->setIsRepliesMessagesChat(true);
 		}

Telegram/SourceFiles/boxes/peer_list_box.h

@@ -185,8 +185,8 @@ class PeerListRow {
 	void setIsSearchResult(bool isSearchResult) {
 		_isSearchResult = isSearchResult;
 	}
-	void setIsSavedMessagesChat(bool isSavedMessagesChat) {
-		_isSavedMessagesChat = isSavedMessagesChat;
+	void setSavedMessagesChatStatus(QString savedMessagesStatus) {
+		_savedMessagesStatus = savedMessagesStatus;
 	}
 	void setIsRepliesMessagesChat(bool isRepliesMessagesChat) {
 		_isRepliesMessagesChat = isRepliesMessagesChat;
@@ -278,12 +278,12 @@ class PeerListRow {
 	StatusType _statusType = StatusType::Online;
 	crl::time _statusValidTill = 0;
 	base::flat_set<QChar> _nameFirstLetters;
+	QString _savedMessagesStatus;
 	int _absoluteIndex = -1;
 	State _disabledState = State::Active;
 	bool _hidden : 1 = false;
 	bool _initialized : 1 = false;
 	bool _isSearchResult : 1 = false;
-	bool _isSavedMessagesChat : 1 = false;
 	bool _isRepliesMessagesChat : 1 = false;
 
 };
@@ -517,8 +517,8 @@ class PeerListController : public PeerListSearchDelegate {
 	void peerListSearchAddRow(PeerListRowId id) override;
 	void peerListSearchRefreshRows() override;
 
-	[[nodiscard]] virtual bool respectSavedMessagesChat() const {
-		return false;
+	[[nodiscard]] virtual QString savedMessagesChatStatus() const {
+		return QString();
 	}
 	[[nodiscard]] virtual int customRowHeight() {
 		Unexpected("PeerListController::customRowHeight.");

Telegram/SourceFiles/boxes/peer_list_controllers.cpp

@@ -313,7 +313,7 @@ void ChatsListBoxController::rebuildRows() {
 		return count;
 	};
 	auto added = 0;
-	if (respectSavedMessagesChat()) {
+	if (!savedMessagesChatStatus().isEmpty()) {
 		if (appendRow(session().data().history(session().user()))) {
 			++added;
 		}
@@ -330,7 +330,7 @@ void ChatsListBoxController::rebuildRows() {
 			const auto history = static_cast<const Row&>(a).history();
 			return history->inChatList();
 		});
-		if (respectSavedMessagesChat()) {
+		if (!savedMessagesChatStatus().isEmpty()) {
 			delegate()->peerListPartitionRows([](const PeerListRow &a) {
 				return a.peer()->isSelf();
 			});
@@ -696,6 +696,10 @@ void ChooseRecipientBoxController::rowClicked(not_null<PeerListRow*> row) {
 	}
 }
 
+QString ChooseRecipientBoxController::savedMessagesChatStatus() const {
+	return tr::lng_saved_forward_here(tr::now);
+}
+
 auto ChooseRecipientBoxController::createRow(
 		not_null<History*> history) -> std::unique_ptr<Row> {
 	const auto peer = history->peer;

Telegram/SourceFiles/boxes/peer_list_controllers.h

@@ -218,9 +218,7 @@ class ChooseRecipientBoxController
 	Main::Session &session() const override;
 	void rowClicked(not_null<PeerListRow*> row) override;
 
-	bool respectSavedMessagesChat() const override {
-		return true;
-	}
+	QString savedMessagesChatStatus() const override;
 
 protected:
 	void prepareViewHook() override;

Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp

@@ -45,8 +45,8 @@ class ChoosePeerBoxController final
 	Main::Session &session() const override;
 	void rowClicked(not_null<PeerListRow*> row) override;
 
-	bool respectSavedMessagesChat() const override {
-		return true;
+	QString savedMessagesChatStatus() const override {
+		return tr::lng_saved_forward_here(tr::now);
 	}
 
 private:

Telegram/SourceFiles/core/local_url_handlers.cpp

@@ -644,6 +644,17 @@ bool OpenExternalLink(
 		context);
 }
 
+bool CopyPeerId(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	TextUtilities::SetClipboardText(TextForMimeData{ match->captured(1) });
+	if (controller) {
+		controller->showToast(tr::lng_text_copied(tr::now));
+	}
+	return true;
+}
+
 void ExportTestChatTheme(
 		not_null<Window::SessionController*> controller,
 		not_null<const Data::CloudTheme*> theme) {
@@ -985,6 +996,10 @@ const std::vector<LocalUrlHandler> &InternalUrlHandlers() {
 			u"^url:(.+)$"_q,
 			OpenExternalLink
 		},
+		{
+			u"^copy:(.+)$"_q,
+			CopyPeerId
+		}
 	};
 	return Result;
 }

Telegram/SourceFiles/core/version.h

@@ -22,7 +22,7 @@ constexpr auto AppId = "{4356CE01-4137-4C55-9F8B-FB4EEBB6EC0C}"_cs;
 constexpr auto AppNameOld = "rabbitGram Win (Unofficial)"_cs;
 constexpr auto AppName = "rabbitGram Desktop"_cs;
 constexpr auto AppFile = "rabbitGram"_cs;
-constexpr auto AppVersion = 4011000;
-constexpr auto AppVersionStr = "4.11";
+constexpr auto AppVersion = 4011001;
+constexpr auto AppVersionStr = "4.11.1";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;

Telegram/SourceFiles/data/data_web_page.cpp

@@ -254,6 +254,15 @@ bool WebPageData::applyChanges(
 		}
 		return QString();
 	}();
+	const auto hasSiteName = !resultSiteName.isEmpty() ? 1 : 0;
+	const auto hasTitle = !resultTitle.isEmpty() ? 1 : 0;
+	const auto hasDescription = !newDescription.text.isEmpty() ? 1 : 0;
+	if (newDocument
+		|| !newCollage.items.empty()
+		|| !newPhoto
+		|| (hasSiteName + hasTitle + hasDescription < 2)) {
+		newHasLargeMedia = false;
+	}
 
 	if (type == newType
 		&& url == resultUrl

Telegram/SourceFiles/history/history_inner_widget.cpp

@@ -2380,7 +2380,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 	};
 
 	const auto addReplyAction = [&](HistoryItem *item) {
-		if (!item) {
+		if (!item || !item->isRegular()) {
 			return;
 		}
 		const auto canSendReply = [&] {