Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop int…

…o telegramdesktop-dev

Telegram/CMakeLists.txt

@@ -198,6 +198,8 @@ PRIVATE
     boxes/peers/edit_participant_box.h
     boxes/peers/edit_participants_box.cpp
     boxes/peers/edit_participants_box.h
+    boxes/peers/edit_peer_color_box.cpp
+    boxes/peers/edit_peer_color_box.h
     boxes/peers/edit_peer_common.h
     boxes/peers/edit_peer_info_box.cpp
     boxes/peers/edit_peer_info_box.h
@@ -651,6 +653,8 @@ PRIVATE
     history/view/controls/history_view_compose_controls.h
     history/view/controls/history_view_compose_search.cpp
     history/view/controls/history_view_compose_search.h
+    history/view/controls/history_view_draft_options.cpp
+    history/view/controls/history_view_draft_options.h
     history/view/controls/history_view_forward_panel.cpp
     history/view/controls/history_view_forward_panel.h
     history/view/controls/history_view_ttl_button.cpp
@@ -659,6 +663,8 @@ PRIVATE
     history/view/controls/history_view_voice_record_bar.h
     history/view/controls/history_view_voice_record_button.cpp
     history/view/controls/history_view_voice_record_button.h
+    history/view/controls/history_view_webpage_processor.cpp
+    history/view/controls/history_view_webpage_processor.h
     history/view/media/history_view_call.cpp
     history/view/media/history_view_call.h
     history/view/media/history_view_contact.cpp
@@ -677,6 +683,8 @@ PRIVATE
     history/view/media/history_view_game.h
     history/view/media/history_view_gif.cpp
     history/view/media/history_view_gif.h
+    history/view/media/history_view_giveaway.cpp
+    history/view/media/history_view_giveaway.h
     history/view/media/history_view_invoice.cpp
     history/view/media/history_view_invoice.h
     history/view/media/history_view_large_emoji.cpp
@@ -816,20 +824,6 @@ PRIVATE
     history/history_view_highlight_manager.h
     history/history_widget.cpp
     history/history_widget.h
-    info/info_content_widget.cpp
-    info/info_content_widget.h
-    info/info_controller.cpp
-    info/info_controller.h
-    info/info_layer_widget.cpp
-    info/info_layer_widget.h
-    info/info_memento.cpp
-    info/info_memento.h
-    info/info_section_widget.cpp
-    info/info_section_widget.h
-    info/info_top_bar.cpp
-    info/info_top_bar.h
-    info/info_wrap_widget.cpp
-    info/info_wrap_widget.h
     info/boosts/info_boosts_inner_widget.cpp
     info/boosts/info_boosts_inner_widget.h
     info/boosts/info_boosts_widget.cpp
@@ -916,6 +910,20 @@ PRIVATE
     info/userpic/info_userpic_emoji_builder_preview.h
     info/userpic/info_userpic_emoji_builder_widget.cpp
     info/userpic/info_userpic_emoji_builder_widget.h
+    info/info_content_widget.cpp
+    info/info_content_widget.h
+    info/info_controller.cpp
+    info/info_controller.h
+    info/info_layer_widget.cpp
+    info/info_layer_widget.h
+    info/info_memento.cpp
+    info/info_memento.h
+    info/info_section_widget.cpp
+    info/info_section_widget.h
+    info/info_top_bar.cpp
+    info/info_top_bar.h
+    info/info_wrap_widget.cpp
+    info/info_wrap_widget.h
     inline_bots/bot_attach_web_view.cpp
     inline_bots/bot_attach_web_view.h
     inline_bots/inline_bot_layout_internal.cpp

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.10.5.0" />
+    Version="4.11.0.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,10,5,0
- PRODUCTVERSION 4,10,5,0
+ FILEVERSION 4,11,0,0
+ PRODUCTVERSION 4,11,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "xmdnx"
             VALUE "FileDescription", "rabbitGram Desktop"
-            VALUE "FileVersion", "4.10.5.0"
+            VALUE "FileVersion", "4.11.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2023"
             VALUE "ProductName", "rabbitGram Desktop"
-            VALUE "ProductVersion", "4.10.5.0"
+            VALUE "ProductVersion", "4.11.0.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,10,5,0
- PRODUCTVERSION 4,10,5,0
+ FILEVERSION 4,11,0,0
+ PRODUCTVERSION 4,11,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "xmdnx"
             VALUE "FileDescription", "rabbitGram Desktop Updater"
-            VALUE "FileVersion", "4.10.5.0"
-            VALUE "LegalCopyright", "Copyright (C) 2021-2023"
+            VALUE "FileVersion", "4.11.0.0"
+            VALUE "LegalCopyright", "Copyright (C) 2023"
             VALUE "ProductName", "rabbitGram Desktop"
-            VALUE "ProductVersion", "4.10.5.0"
+            VALUE "ProductVersion", "4.11.0.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/SourceFiles/api/api_bot.cpp

@@ -169,9 +169,7 @@ void SendBotCallbackData(
 void HideSingleUseKeyboard(
 		not_null<Window::SessionController*> controller,
 		not_null<HistoryItem*> item) {
-	controller->content()->hideSingleUseKeyboard(
-		item->history()->peer,
-		item->id);
+	controller->content()->hideSingleUseKeyboard(item->fullId());
 }
 
 } // namespace
@@ -312,12 +310,14 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 	case ButtonType::Default: {
 		// Copy string before passing it to the sending method
 		// because the original button can be destroyed inside.
-		const auto replyTo = item->isRegular() ? item->id : 0;
+		const auto replyTo = item->isRegular()
+			? item->fullId()
+			: FullMsgId();
 		controller->content()->sendBotCommand({
 			.peer = item->history()->peer,
 			.command = QString(button->text),
 			.context = item->fullId(),
-			.replyTo = replyTo,
+			.replyTo = { replyTo },
 		});
 	} break;
 
@@ -363,7 +363,7 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 
 	case ButtonType::RequestPhone: {
 		HideSingleUseKeyboard(controller, item);
-		const auto itemId = item->id;
+		const auto itemId = item->fullId();
 		const auto topicRootId = item->topicRootId();
 		const auto history = item->history();
 		controller->show(Ui::MakeConfirmBox({
@@ -376,7 +376,7 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 				auto action = Api::SendAction(history);
 				action.clearDraft = false;
 				action.replyTo = {
-					.msgId = itemId,
+					.messageId = itemId,
 					.topicRootId = topicRootId,
 				};
 				history->session().api().shareContact(
@@ -397,13 +397,11 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 				chosen |= PollData::Flag::Quiz;
 			}
 		}
-		const auto replyToId = MsgId(0);
-		const auto topicRootId = MsgId(0);
+		const auto replyTo = FullReplyTo();
 		Window::PeerMenuCreatePoll(
 			controller,
 			item->history()->peer,
-			replyToId,
-			topicRootId,
+			replyTo,
 			chosen,
 			disabled);
 	} break;

Telegram/SourceFiles/api/api_common.cpp

@@ -19,8 +19,8 @@ SendAction::SendAction(
 	SendOptions options)
 : history(thread->owningHistory())
 , options(options)
-, replyTo({ .msgId = thread->topicRootId() }) {
-	replyTo.topicRootId = replyTo.msgId;
+, replyTo({ .messageId = { history->peer->id, thread->topicRootId() } }) {
+	replyTo.topicRootId = replyTo.messageId.msg;
 }
 
 SendOptions DefaultSendWhenOnlineOptions() {
@@ -31,7 +31,7 @@ SendOptions DefaultSendWhenOnlineOptions() {
 }
 
 MTPInputReplyTo SendAction::mtpReplyTo() const {
-	return Data::ReplyToForMTP(&history->owner(), replyTo);
+	return Data::ReplyToForMTP(history, replyTo);
 }
 
 } // namespace Api

Telegram/SourceFiles/api/api_common.h

@@ -7,6 +7,8 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
+#include "data/data_drafts.h"
+
 class History;
 
 namespace Data {
@@ -22,7 +24,6 @@ struct SendOptions {
 	TimeId scheduled = 0;
 	bool silent = false;
 	bool handleSupportSwitch = false;
-	bool removeWebPageId = false;
 	bool hideViaBot = false;
 };
 [[nodiscard]] SendOptions DefaultSendWhenOnlineOptions();
@@ -54,7 +55,7 @@ struct MessageToSend {
 
 	SendAction action;
 	TextWithTags textWithTags;
-	WebPageId webPageId = 0;
+	Data::WebPageDraft webPage;
 };
 
 struct RemoteFileInfo {

Telegram/SourceFiles/api/api_editing.cpp

@@ -11,8 +11,10 @@ For license and copyright information please follow this link:
 #include "api/api_media.h"
 #include "api/api_text_entities.h"
 #include "ui/boxes/confirm_box.h"
+#include "data/data_histories.h"
 #include "data/data_scheduled_messages.h"
 #include "data/data_session.h"
+#include "data/data_web_page.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "lang/lang_keys.h"
@@ -45,6 +47,7 @@ template <typename DoneCallback, typename FailCallback>
 mtpRequestId EditMessage(
 		not_null<HistoryItem*> item,
 		const TextWithEntities &textWithEntities,
+		Data::WebPageDraft webpage,
 		SendOptions options,
 		DoneCallback &&done,
 		FailCallback &&fail,
@@ -65,15 +68,21 @@ mtpRequestId EditMessage(
 
 	const auto emptyFlag = MTPmessages_EditMessage::Flag(0);
 	const auto flags = emptyFlag
-	| (!text.isEmpty() || media
+	| ((!text.isEmpty() || media)
 		? MTPmessages_EditMessage::Flag::f_message
 		: emptyFlag)
 	| ((media && inputMedia.has_value())
 		? MTPmessages_EditMessage::Flag::f_media
 		: emptyFlag)
-	| (options.removeWebPageId
+	| (webpage.removed
 		? MTPmessages_EditMessage::Flag::f_no_webpage
 		: emptyFlag)
+	| ((!webpage.removed && !webpage.url.isEmpty())
+		? MTPmessages_EditMessage::Flag::f_media
+		: emptyFlag)
+	| ((!webpage.removed && !webpage.url.isEmpty() && webpage.invert)
+		? MTPmessages_EditMessage::Flag::f_invert_media
+		: emptyFlag)
 	| (!sentEntities.v.isEmpty()
 		? MTPmessages_EditMessage::Flag::f_entities
 		: emptyFlag)
@@ -89,7 +98,7 @@ mtpRequestId EditMessage(
 		item->history()->peer->input,
 		MTP_int(id),
 		MTP_string(text),
-		inputMedia.value_or(MTPInputMedia()),
+		inputMedia.value_or(Data::WebPageForMTP(webpage, text.isEmpty())),
 		MTPReplyMarkup(),
 		sentEntities,
 		MTP_int(options.scheduled)
@@ -133,9 +142,15 @@ mtpRequestId EditMessage(
 		FailCallback &&fail,
 		std::optional<MTPInputMedia> inputMedia = std::nullopt) {
 	const auto &text = item->originalText();
+	const auto webpage = (!item->media() || !item->media()->webpage())
+		? Data::WebPageDraft{ .removed = true }
+		: Data::WebPageDraft{
+			.id = item->media()->webpage()->id,
+		};
 	return EditMessage(
 		item,
 		text,
+		webpage,
 		options,
 		std::forward<DoneCallback>(done),
 		std::forward<FailCallback>(fail),
@@ -216,20 +231,27 @@ mtpRequestId EditCaption(
 		SendOptions options,
 		Fn<void()> done,
 		Fn<void(const QString &)> fail) {
-	return EditMessage(item, caption, options, done, fail);
+	return EditMessage(
+		item,
+		caption,
+		Data::WebPageDraft(),
+		options,
+		done,
+		fail);
 }
 
 mtpRequestId EditTextMessage(
 		not_null<HistoryItem*> item,
 		const TextWithEntities &caption,
+		Data::WebPageDraft webpage,
 		SendOptions options,
 		Fn<void(mtpRequestId requestId)> done,
 		Fn<void(const QString &, mtpRequestId requestId)> fail) {
 	const auto callback = [=](Fn<void()> applyUpdates, mtpRequestId id) {
 		applyUpdates();
 		done(id);
 	};
-	return EditMessage(item, caption, options, callback, fail);
+	return EditMessage(item, caption, webpage, options, callback, fail);
 }
 
 } // namespace Api

Telegram/SourceFiles/api/api_editing.h

@@ -9,6 +9,10 @@ For license and copyright information please follow this link:
 
 class HistoryItem;
 
+namespace Data {
+struct WebPageDraft;
+} // namespace Data
+
 namespace MTP {
 class Error;
 } // namespace MTP
@@ -48,6 +52,7 @@ mtpRequestId EditCaption(
 mtpRequestId EditTextMessage(
 	not_null<HistoryItem*> item,
 	const TextWithEntities &caption,
+	Data::WebPageDraft webpage,
 	SendOptions options,
 	Fn<void(mtpRequestId requestId)> done,
 	Fn<void(const QString &error, mtpRequestId requestId)> fail);