Merge pull request #688 from telegramdesktop/dev

Create a new pull request by comparing changes across two branches

.github/workflows/linux.yml

@@ -94,6 +94,7 @@ jobs:
           -D CMAKE_CXX_FLAGS="-Werror" \
           -D CMAKE_EXE_LINKER_FLAGS="-s" \
           -D TDESKTOP_API_TEST=ON \
+          -D DESKTOP_APP_DISABLE_AUTOUPDATE=OFF \
           -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF \
           $DEFINE
 
@@ -115,7 +116,7 @@ jobs:
         run: |
           cd $REPO_NAME/out/Debug
           mkdir artifact
-          mv Telegram artifact/
+          mv {Telegram,Updater} artifact/
       - uses: actions/upload-artifact@master
         if: env.UPLOAD_ARTIFACT == 'true'
         name: Upload artifact.

.github/workflows/mac.yml

@@ -115,6 +115,7 @@ jobs:
           -D CMAKE_CXX_FLAGS="-Werror" \
           -D CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO \
           -D TDESKTOP_API_TEST=ON \
+          -D DESKTOP_APP_DISABLE_AUTOUPDATE=OFF \
           -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF \
           $DEFINE
 

.github/workflows/win.yml

@@ -169,6 +169,7 @@ jobs:
           %TDESKTOP_BUILD_GENERATOR% ^
           %TDESKTOP_BUILD_ARCH% ^
           %TDESKTOP_BUILD_API% ^
+          -D DESKTOP_APP_DISABLE_AUTOUPDATE=OFF ^
           -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF ^
           -D DESKTOP_APP_NO_PDB=ON ^
           %TDESKTOP_BUILD_DEFINE%
@@ -178,8 +179,10 @@ jobs:
       - name: Move artifact.
         if: (env.UPLOAD_ARTIFACT == 'true') || (github.ref == 'refs/heads/nightly')
         run: |
+          set OUT=%TBUILD%\%REPO_NAME%\out\Debug
           mkdir artifact
-          move %TBUILD%\%REPO_NAME%\out\Debug\Telegram.exe artifact/
+          move %OUT%\Telegram.exe artifact/
+          move %OUT%\Updater.exe artifact/
       - uses: actions/upload-artifact@master
         name: Upload artifact.
         if: (env.UPLOAD_ARTIFACT == 'true') || (github.ref == 'refs/heads/nightly')

Telegram/CMakeLists.txt

@@ -550,6 +550,10 @@ PRIVATE
     data/data_replies_list.h
     data/data_reply_preview.cpp
     data/data_reply_preview.h
+    data/data_saved_messages.cpp
+    data/data_saved_messages.h
+    data/data_saved_sublist.cpp
+    data/data_saved_sublist.h
     data/data_search_controller.cpp
     data/data_search_controller.h
     data/data_send_action.cpp
@@ -796,6 +800,8 @@ PRIVATE
     history/view/history_view_sponsored_click_handler.h
     history/view/history_view_sticker_toast.cpp
     history/view/history_view_sticker_toast.h
+    history/view/history_view_sublist_section.cpp
+    history/view/history_view_sublist_section.h
     history/view/history_view_transcribe_button.cpp
     history/view/history_view_transcribe_button.h
     history/view/history_view_translate_bar.cpp
@@ -897,6 +903,8 @@ PRIVATE
     info/profile/info_profile_values.h
     info/profile/info_profile_widget.cpp
     info/profile/info_profile_widget.h
+    info/saved/info_saved_sublists_widget.cpp
+    info/saved/info_saved_sublists_widget.h
     info/settings/info_settings_widget.cpp
     info/settings/info_settings_widget.h
     info/similar_channels/info_similar_channels_widget.cpp

Telegram/Resources/qrc/telegram/animations.qrc

@@ -11,5 +11,7 @@
     <file alias="ttl.tgs">../../animations/ttl.tgs</file>
     <file alias="discussion.tgs">../../animations/discussion.tgs</file>
     <file alias="stats.tgs">../../animations/stats.tgs</file>
+    <file alias="voice_ttl_idle.tgs">../../animations/voice_ttl_idle.tgs</file>
+    <file alias="voice_ttl_start.tgs">../../animations/voice_ttl_start.tgs</file>
   </qresource>
 </RCC>

Telegram/Resources/qrc/telegram/telegram.qrc

@@ -15,6 +15,7 @@
     <file alias="art/slot_2_idle.tgs">../../art/slot_2_idle.tgs</file>
     <file alias="art/slot_back.tgs">../../art/slot_back.tgs</file>
     <file alias="art/slot_pull.tgs">../../art/slot_pull.tgs</file>
+    <file alias="art/winners.tgs">../../art/winners.tgs</file>
     <file alias="day-blue.tdesktop-theme">../../day-blue.tdesktop-theme</file>
     <file alias="night.tdesktop-theme">../../night.tdesktop-theme</file>
     <file alias="night-green.tdesktop-theme">../../night-green.tdesktop-theme</file>

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.12.2.0" />
+    Version="4.14.0.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

Telegram/Resources/winrc/Telegram.rc

@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,12,2,0
- PRODUCTVERSION 4,12,2,0
+ FILEVERSION 4,14,0,0
+ PRODUCTVERSION 4,14,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.12.2.0"
+            VALUE "FileVersion", "4.14.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.12.2.0"
+            VALUE "ProductVersion", "4.14.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,12,2,0
- PRODUCTVERSION 4,12,2,0
+ FILEVERSION 4,14,0,0
+ PRODUCTVERSION 4,14,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.12.2.0"
+            VALUE "FileVersion", "4.14.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2023"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.12.2.0"
+            VALUE "ProductVersion", "4.14.0.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/SourceFiles/_other/startup_task_win.cpp

@@ -6,6 +6,7 @@ For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include <windows.h>
+#include <shellapi.h>
 
 #include <array>
 #include <string>

Telegram/SourceFiles/_other/updater_win.cpp

@@ -537,11 +537,12 @@ HANDLE _generateDumpFileAtPath(const WCHAR *path) {
 
 	GetLocalTime(&stLocalTime);
 
-	wsprintf(szFileName, L"%s%s-%s-%04d%02d%02d-%02d%02d%02d-%ld-%ld.dmp",
-	         szPath, szExeName, updaterVersionStr,
-	         stLocalTime.wYear, stLocalTime.wMonth, stLocalTime.wDay,
-	         stLocalTime.wHour, stLocalTime.wMinute, stLocalTime.wSecond,
-	         GetCurrentProcessId(), GetCurrentThreadId());
+	wsprintf(
+		szFileName, L"%s%s-%s-%04d%02d%02d-%02d%02d%02d-%ld-%ld.dmp",
+		szPath, szExeName, updaterVersionStr,
+		stLocalTime.wYear, stLocalTime.wMonth, stLocalTime.wDay,
+		stLocalTime.wHour, stLocalTime.wMinute, stLocalTime.wSecond,
+		GetCurrentProcessId(), GetCurrentThreadId());
 	return CreateFile(szFileName, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, 0, CREATE_ALWAYS, 0, 0);
 }
 
@@ -562,7 +563,7 @@ void _generateDump(EXCEPTION_POINTERS* pExceptionPointers) {
 	DWORD len = GetModuleFileName(GetModuleHandle(0), szPath, maxFileLen);
 	if (!len) return;
 
-	WCHAR *pathEnd = szPath  + len;
+	WCHAR *pathEnd = szPath + len;
 
 	if (!_wcsicmp(pathEnd - wcslen(_exeName), _exeName)) {
 		wsprintf(pathEnd - wcslen(_exeName), L"");

Telegram/SourceFiles/api/api_bot.cpp

@@ -415,12 +415,16 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 		const auto peer = item->history()->peer;
 		const auto itemId = item->id;
 		const auto id = int32(button->buttonId);
-		const auto chosen = [=](not_null<PeerData*> result) {
+		const auto chosen = [=](std::vector<not_null<PeerData*>> result) {
 			peer->session().api().request(MTPmessages_SendBotRequestedPeer(
 				peer->input,
 				MTP_int(itemId),
 				MTP_int(id),
-				result->input
+				MTP_vector_from_range(
+					result
+					| ranges::views::transform([](
+						not_null<PeerData*> peer) {
+				return MTPInputPeer(peer->input); }))
 			)).done([=](const MTPUpdates &result) {
 				peer->session().api().applyUpdates(result);
 			}).send();

Telegram/SourceFiles/api/api_messages_search.cpp

@@ -90,6 +90,7 @@ void MessagesSearch::searchRequest() {
 			(_from
 				? _from->input
 				: MTP_inputPeerEmpty()),
+			MTPInputPeer(), // saved_peer_id
 			MTPint(), // top_msg_id
 			MTP_inputMessagesFilterEmpty(),
 			MTP_int(0), // min_date

Telegram/SourceFiles/api/api_peer_colors.cpp

@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #include "api/api_peer_colors.h"
 
 #include "apiwrap.h"
+#include "data/data_peer.h"
 #include "ui/chat/chat_style.h"
 
 namespace Api {
@@ -62,6 +63,16 @@ auto PeerColors::indicesValue() const
 	}));
 }
 
+int PeerColors::requiredLevelFor(PeerId channel, uint8 index) const {
+	if (Data::DecideColorIndex(channel) == index) {
+		return 0;
+	} else if (const auto i = _requiredLevels.find(index)
+		; i != end(_requiredLevels)) {
+		return i->second;
+	}
+	return 1;
+}
+
 void PeerColors::apply(const MTPDhelp_peerColors &data) {
 	auto suggested = std::vector<uint8>();
 	auto colors = std::make_shared<
@@ -89,6 +100,7 @@ void PeerColors::apply(const MTPDhelp_peerColors &data) {
 	};
 
 	const auto &list = data.vcolors().v;
+	_requiredLevels.clear();
 	suggested.reserve(list.size());
 	for (const auto &color : list) {
 		const auto &data = color.data();
@@ -98,6 +110,9 @@ void PeerColors::apply(const MTPDhelp_peerColors &data) {
 			continue;
 		}
 		const auto colorIndex = uint8(colorIndexBare);
+		if (const auto min = data.vchannel_min_level()) {
+			_requiredLevels[colorIndex] = min->v;
+		}
 		if (!data.is_hidden()) {
 			suggested.push_back(colorIndex);
 		}

Telegram/SourceFiles/api/api_peer_colors.h

@@ -28,6 +28,10 @@ class PeerColors final {
 	[[nodiscard]] auto indicesValue() const
 		-> rpl::producer<Ui::ColorIndicesCompressed>;
 
+	[[nodiscard]] int requiredLevelFor(
+		PeerId channel,
+		uint8 index) const;
+
 private:
 	void request();
 	void apply(const MTPDhelp_peerColors &data);
@@ -38,6 +42,7 @@ class PeerColors final {
 	mtpRequestId _requestId = 0;
 	base::Timer _timer;
 	rpl::variable<std::vector<uint8>> _suggested;
+	base::flat_map<uint8, int> _requiredLevels;
 	rpl::event_stream<> _colorIndicesChanged;
 	std::unique_ptr<Ui::ColorIndicesCompressed> _colorIndicesCurrent;
 

Telegram/SourceFiles/api/api_peer_photo.cpp

@@ -515,6 +515,7 @@ auto PeerPhoto::emojiList(EmojiListType type) -> EmojiListData & {
 	case EmojiListType::Profile: return _profileEmojiList;
 	case EmojiListType::Group: return _groupEmojiList;
 	case EmojiListType::Background: return _backgroundEmojiList;
+	case EmojiListType::NoChannelStatus: return _noChannelStatusEmojiList;
 	}
 	Unexpected("Type in PeerPhoto::emojiList.");
 }
@@ -551,6 +552,8 @@ void PeerPhoto::requestEmojiList(EmojiListType type) {
 		? send(MTPaccount_GetDefaultProfilePhotoEmojis())
 		: (type == EmojiListType::Group)
 		? send(MTPaccount_GetDefaultGroupPhotoEmojis())
+		: (type == EmojiListType::NoChannelStatus)
+		? send(MTPaccount_GetChannelRestrictedStatusEmojis())
 		: send(MTPaccount_GetDefaultBackgroundEmojis());
 }
 

Telegram/SourceFiles/api/api_peer_photo.h

@@ -32,6 +32,7 @@ class PeerPhoto final {
 		Profile,
 		Group,
 		Background,
+		NoChannelStatus,
 	};
 
 	struct UserPhoto {
@@ -112,6 +113,7 @@ class PeerPhoto final {
 	EmojiListData _profileEmojiList;
 	EmojiListData _groupEmojiList;
 	EmojiListData _backgroundEmojiList;
+	EmojiListData _noChannelStatusEmojiList;
 
 };
 

Telegram/SourceFiles/api/api_premium.cpp

@@ -26,7 +26,7 @@ namespace {
 
 [[nodiscard]] GiftCode Parse(const MTPDpayments_checkedGiftCode &data) {
 	return {
-		.from = peerFromMTP(data.vfrom_id()),
+		.from = data.vfrom_id() ? peerFromMTP(*data.vfrom_id()) : PeerId(),
 		.to = data.vto_id() ? peerFromUser(*data.vto_id()) : PeerId(),
 		.giveawayId = data.vgiveaway_msg_id().value_or_empty(),
 		.date = data.vdate().v,
@@ -342,15 +342,12 @@ PremiumGiftCodeOptions::PremiumGiftCodeOptions(not_null<PeerData*> peer)
 rpl::producer<rpl::no_value, QString> PremiumGiftCodeOptions::request() {
 	return [=](auto consumer) {
 		auto lifetime = rpl::lifetime();
-		const auto channel = _peer->asChannel();
-		if (!channel) {
-			return lifetime;
-		}
 
 		using TLOption = MTPPremiumGiftCodeOption;
 		_api.request(MTPpayments_GetPremiumGiftCodeOptions(
-			MTP_flags(
-				MTPpayments_GetPremiumGiftCodeOptions::Flag::f_boost_peer),
+			MTP_flags(_peer->isChannel()
+				? MTPpayments_GetPremiumGiftCodeOptions::Flag::f_boost_peer
+				: MTPpayments_GetPremiumGiftCodeOptions::Flag(0)),
 			_peer->input
 		)).done([=](const MTPVector<TLOption> &result) {
 			auto tlMapOptions = base::flat_map<Amount, QVector<TLOption>>();
@@ -420,6 +417,8 @@ const std::vector<int> &PremiumGiftCodeOptions::availablePresets() const {
 }
 
 [[nodiscard]] int PremiumGiftCodeOptions::monthsFromPreset(int monthsIndex) {
+	Expects(monthsIndex >= 0 && monthsIndex < _availablePresets.size());
+
 	return _optionsForOnePerson.months[monthsIndex];
 }