Updated to 4.16.10.

forkgram · Apr 26, 2024 · 104166b · 104166b
2 parents cfcd108 + c0db5ee
commit 104166b
Show file tree

Hide file tree

Showing 100 changed files with 1,809 additions and 509 deletions.
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
@@ -277,6 +277,8 @@ PRIVATE
     boxes/local_storage_box.h
     boxes/max_invite_box.cpp
     boxes/max_invite_box.h
+    boxes/moderate_messages_box.cpp
+    boxes/moderate_messages_box.h
     boxes/peer_list_box.cpp
     boxes/peer_list_box.h
     boxes/peer_list_controllers.cpp

diff --git a/Telegram/Resources/iv_html/page.css b/Telegram/Resources/iv_html/page.css
@@ -134,9 +134,32 @@ html.custom_scroll ::-webkit-scrollbar-thumb:hover {
 .page-slide {
 	position: relative;
 	width: 100%;
+	min-height: 100%;
 	margin-left: 0%;
 	transition: margin 240ms ease-in-out;
 }
+.page-footer {
+	height: 32px;
+	margin-top: -32px;
+	background: var(--td-window-bg-over);
+}
+.page-footer .content {
+	padding: 3px 18px;
+	font-size: 15px;
+	color: var(--td-window-sub-text-fg);
+	text-align: center;
+}
+.page-footer .wrong {
+	position: relative;
+	padding: 5px;
+	margin: -5px;
+	color: var(--td-window-sub-text-fg);
+	text-decoration: none;
+	cursor: pointer;
+}
+.page-footer .wrong:hover {
+	text-decoration: underline;
+}
 .hidden-left,
 .hidden-right {
 	pointer-events: none;
@@ -148,7 +171,7 @@ html.custom_scroll ::-webkit-scrollbar-thumb:hover {
 	margin-left: 100%;
 }
 article {
-	padding-bottom: 12px;
+	padding-bottom: 40px;
 	overflow-y: hidden;
 	overflow-x: auto;
 	white-space: pre-wrap;
@@ -893,6 +916,9 @@ section.related a.related-link:after {
 	right: 0;
 	bottom: 0;
 }
+section.related a.related-link:last-child:after {
+	border-bottom: 0px;
+}
 section.related .related-link-url {
 	display: block;
 	font-size: 15px;
@@ -1027,6 +1053,9 @@ section.channel > a > h4 {
 	display: block;
 	margin: 0 auto;
 }
+.media-outer {
+	margin-bottom: 16px;
+}
 .photo-wrap,
 .video-wrap {
 	width: 100%;

diff --git a/Telegram/Resources/iv_html/page.js b/Telegram/Resources/iv_html/page.js
@@ -26,7 +26,7 @@ var IV = {
 			}
 			target = target.parentNode;
 		}
-		if (!target || !target.hasAttribute('href')) {
+		if (!target || (context === '' && !target.hasAttribute('href'))) {
 			return;
 		}
 		var base = document.createElement('A');
@@ -413,9 +413,12 @@ var IV = {
 		var article = function (el) {
 			return el.getElementsByTagName('article')[0];
 		};
-		var from = article(IV.findPageScroll());
-		var to = article(IV.makeScrolledContent(data.html));
-		morphdom(from, to, {
+		var footer = function (el) {
+			return el.getElementsByClassName('page-footer')[0];
+		};
+		var from = IV.findPageScroll();
+		var to = IV.makeScrolledContent(data.html);
+		morphdom(article(from), article(to), {
 			onBeforeElUpdated: function (fromEl, toEl) {
 				if (fromEl.classList.contains('video')
 					&& toEl.classList.contains('video')
@@ -439,6 +442,7 @@ var IV = {
 				return !fromEl.isEqualNode(toEl);
 			}
 		});
+		morphdom(footer(from), footer(to));
 		IV.initMedia();
 		eval(data.js);
 	},
@@ -477,9 +481,7 @@ var IV = {
 		var result = document.createElement('div');
 		result.className = 'page-scroll';
 		result.tabIndex = '-1';
-		result.innerHTML = '<div class="page-slide"><article>'
-			+ html
-			+ '</article></div>';
+		result.innerHTML = html.trim();
 		result.onscroll = IV.frameScrolled;
 		return result;
 	},

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
@@ -2889,7 +2889,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_in_dlg_audio_count#other" = "{count} audio";
 
 "lng_ban_user" = "Ban User";
+"lng_ban_users" = "Ban users";
+"lng_restrict_users" = "Restrict users";
 "lng_delete_all_from_user" = "Delete all from {user}";
+"lng_delete_all_from_users" = "Delete all from users";
+"lng_restrict_user_part" = "Partially restrict this user {emoji}";
+"lng_restrict_users_part" = "Partially restrict users {emoji}";
+"lng_restrict_user_full" = "Fully ban this user {emoji}";
+"lng_restrict_users_full" = "Fully ban users {emoji}";
+"lng_restrict_users_part_single_header" = "What can this user do?";
+"lng_restrict_users_part_header#one" = "What can {count} selected user do?";
+"lng_restrict_users_part_header#other" = "What can {count} selected users do?";
 "lng_report_spam" = "Report Spam";
 "lng_report_spam_and_leave" = "Report spam and leave";
 "lng_report_spam_done" = "Thank you for your report.";
@@ -5141,6 +5151,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_iv_share" = "Share";
 "lng_iv_join_channel" = "Join";
 "lng_iv_window_title" = "Instant View";
+"lng_iv_wrong_layout" = "Wrong layout?";
 
 "lng_limit_download_title" = "Download speed limited";
 "lng_limit_download_subscribe" = "Subscribe to {link} and increase download speed {increase}.";

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/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.16.9.0" />
+    Version="4.16.10.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,16,9,0
- PRODUCTVERSION 4,16,9,0
+ FILEVERSION 4,16,10,0
+ PRODUCTVERSION 4,16,10,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", ""
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "4.16.9.0"
+            VALUE "FileVersion", "4.16.10.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.9.0"
+            VALUE "ProductVersion", "4.16.10.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,16,9,0
- PRODUCTVERSION 4,16,9,0
+ FILEVERSION 4,16,10,0
+ PRODUCTVERSION 4,16,10,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", ""
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "4.16.9.0"
+            VALUE "FileVersion", "4.16.10.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2024"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "4.16.9.0"
+            VALUE "ProductVersion", "4.16.10.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Telegram/SourceFiles/api/api_chat_participants.cpp b/Telegram/SourceFiles/api/api_chat_participants.cpp
@@ -592,6 +592,33 @@ ChatParticipants::Parsed ChatParticipants::ParseRecent(
 	return result;
 }
 
+void ChatParticipants::Restrict(
+		not_null<ChannelData*> channel,
+		not_null<PeerData*> participant,
+		ChatRestrictionsInfo oldRights,
+		ChatRestrictionsInfo newRights,
+		Fn<void()> onDone,
+		Fn<void()> onFail) {
+	channel->session().api().request(MTPchannels_EditBanned(
+		channel->inputChannel,
+		participant->input,
+		MTP_chatBannedRights(
+			MTP_flags(MTPDchatBannedRights::Flags::from_raw(
+				uint32(newRights.flags))),
+			MTP_int(newRights.until))
+	)).done([=](const MTPUpdates &result) {
+		channel->session().api().applyUpdates(result);
+		channel->applyEditBanned(participant, oldRights, newRights);
+		if (onDone) {
+			onDone();
+		}
+	}).fail([=] {
+		if (onFail) {
+			onFail();
+		}
+	}).send();
+}
+
 void ChatParticipants::requestSelf(not_null<ChannelData*> channel) {
 	if (_selfParticipantRequests.contains(channel)) {
 		return;

diff --git a/Telegram/SourceFiles/api/api_chat_participants.h b/Telegram/SourceFiles/api/api_chat_participants.h
@@ -100,6 +100,13 @@ class ChatParticipants final {
 	static Parsed ParseRecent(
 		not_null<ChannelData*> channel,
 		const TLMembers &data);
+	static void Restrict(
+		not_null<ChannelData*> channel,
+		not_null<PeerData*> participant,
+		ChatRestrictionsInfo oldRights,
+		ChatRestrictionsInfo newRights,
+		Fn<void()> onDone,
+		Fn<void()> onFail);
 	void add(
 		std::shared_ptr<Ui::Show> show,
 		not_null<PeerData*> peer,

diff --git a/Telegram/SourceFiles/api/api_confirm_phone.cpp b/Telegram/SourceFiles/api/api_confirm_phone.cpp
@@ -62,6 +62,10 @@ void ConfirmPhone::resolve(
 				return bad("FirebaseSms");
 			}, [&](const MTPDauth_sentCodeTypeEmailCode &) {
 				return bad("EmailCode");
+			}, [&](const MTPDauth_sentCodeTypeSmsWord &) {
+				return bad("SmsWord");
+			}, [&](const MTPDauth_sentCodeTypeSmsPhrase &) {
+				return bad("SmsPhrase");
 			}, [&](const MTPDauth_sentCodeTypeSetUpEmailRequired &) {
 				return bad("SetUpEmailRequired");
 			});

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
@@ -546,7 +546,7 @@ rightsToggle: Toggle(defaultToggle) {
 	vsize: 5px;
 	vshift: 1px;
 	stroke: 2px;
-	duration: 120;
+	duration: universalDuration;
 }
 
 rightsButton: SettingsButton(defaultSettingsButton) {
@@ -691,6 +691,10 @@ createPollOptionField: InputField(createPollField) {
 	placeholderMargins: margins(2px, 0px, 2px, 0px);
 	heightMax: 68px;
 }
+createPollOptionFieldPremium: InputField(createPollOptionField) {
+	textMargins: margins(22px, 11px, 68px, 11px);
+}
+createPollOptionFieldPremiumEmojiPosition: point(15px, -1px);
 createPollSolutionField: InputField(createPollField) {
 	textMargins: margins(0px, 4px, 0px, 4px);
 	border: 1px;
@@ -704,7 +708,7 @@ createPollOptionRemove: CrossButton {
 	cross: CrossAnimation {
 		size: 22px;
 		skip: 6px;
-		stroke: 1.;
+		stroke: 1.5;
 		minScale: 0.3;
 	}
 	crossFg: boxTitleCloseFg;
@@ -718,6 +722,7 @@ createPollOptionRemove: CrossButton {
 	}
 }
 createPollOptionRemovePosition: point(11px, 9px);
+createPollOptionEmojiPositionSkip: 4px;
 createPollWarning: FlatLabel(defaultFlatLabel) {
 	textFg: windowSubTextFg;
 	palette: TextPalette(defaultTextPalette) {
@@ -1074,3 +1079,23 @@ collectibleBox: Box(defaultBox) {
 	buttonHeight: 36px;
 	button: collectibleCopy;
 }
+
+moderateBoxUserpic: UserpicButton(defaultUserpicButton) {
+	size: size(34px, 42px);
+	photoSize: 34px;
+	photoPosition: point(0px, 4px);
+}
+moderateBoxExpand: icon {{ "chat/reply_type_group", boxTextFg }};
+moderateBoxExpandHeight: 20px;
+moderateBoxExpandRight: 10px;
+moderateBoxExpandInnerSkip: 2px;
+moderateBoxExpandFont: font(11px);
+moderateBoxExpandToggleSize: 4px;
+moderateBoxExpandToggleFourStrokes: 3px;
+moderateBoxExpandIcon: icon{{ "info/edit/expand_arrow_small-flip_vertical", windowActiveTextFg }};
+moderateBoxExpandIconDown: icon{{ "info/edit/expand_arrow_small", windowActiveTextFg }};
+moderateBoxDividerLabel: FlatLabel(boxDividerLabel) {
+	palette: TextPalette(defaultTextPalette) {
+		selectLinkFg: windowActiveTextFg;
+	}
+}