Update to version 1.8.8

4 files changed, 21 insertions, 164 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 61a2cceb6dd2..dbdf33d8c958 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = telegram-desktop-udf-patched
 	pkgdesc = Telegram Desktop client with several personal patches
-	pkgver = 1.8.2
+	pkgver = 1.8.8
 	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = x86_64
@@ -22,7 +22,7 @@ pkgbase = telegram-desktop-udf-patched
 	optdepends = ttf-opensans: default Open Sans font family
 	provides = telegram-desktop
 	conflicts = telegram-desktop
-	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.8.2
+	source = tdesktop::git+https://github.com/telegramdesktop/tdesktop.git#tag=v1.8.8
 	source = libtgvoip::git+https://github.com/telegramdesktop/libtgvoip
 	source = variant::git+https://github.com/mapbox/variant
 	source = Catch2::git+https://github.com/catchorg/Catch2.git
@@ -43,7 +43,6 @@ pkgbase = telegram-desktop-udf-patched
 	source = always_clear_history_for_everyone.patch
 	source = always_pin_without_notify.patch
 	source = always_send_as_photo_or_album.patch
-	source = search_by_any_user.patch
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
@@ -55,17 +54,16 @@ pkgbase = telegram-desktop-udf-patched
 	sha512sums = b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d
 	sha512sums = 16874fabcb0d04d6bf8db1ee2fd77fbd09eeb6acc28bb5fd915d378f7a5ed7ebf4aae01c390e516695572cf9ef0e2cb59493e21a35643fd63ddf3fec446858a6
 	sha512sums = 3b6a0450f7981c2ce5f90c1ea46d9fb504194609f357b957b5c4a741681d3c531252394df116f8b77780a3a110783c047c9a081f9651e0792e7423573e390392
-	sha512sums = a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5
+	sha512sums = f5c7feb710fa12694c9f4ae9c818259c6ced5dc9d63079556a14c8bac14e3cc0ec4d3322df3650530b8afd8a512e573b4d3d8b3130b6374e842a92daacedd534
 	sha512sums = d60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39
 	sha512sums = 6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0
 	sha512sums = ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653
 	sha512sums = a83b80668b2dc2cc77c857069fdb45b487793fda01ad8a63bab66c6a1c71e5d032050e4ec7efb5b4c3216badc5377c856ef1f4a59c2e02b24ee53b1d83124bf3
 	sha512sums = e25dc1c54d6001a7a3740c6cee40a12a2313a3fd2e41986268f0ee5d9d8bf2d34812f539efb0eb5d26d3f263b2e4a7849016711532bf215aa9ff38da30175557
-	sha512sums = 31ed454cbfe5811dedfac516e1c55cd6a2ea69fedb5e09035c04ed1b9647270eafdee1501494ecd948b6baa7a38dbf0747ba686dc89f31804589a39470793ac2
+	sha512sums = e88fa96024efc6176c818d0a46684e0ee1fb3a7bdadb323ad3b29f736209c80b6c31b135cf84389e7e2bbd614e57b241e4437c94b6fd114e73cfc418bf130015
 	sha512sums = 4a7e9de924bbf32fb4cd24ffa2764bcf49e0540bba649829b180da20a62810d4a21ebf11529d4eca22c9ceaa93b434ca3fbfd0b636795f8109ea4e1eddbff8f3
 	sha512sums = b4eeeb4b2801f3edcc7423f28403b1dfabd3f3869425e4f102a2a4554bde93e63bd73d2d4dbf3e5748ce831b570e441d3917f532fc5cceac1ee5e8fd0832cb30
 	sha512sums = 650a2a2568cacd2775979614c06c90a4c505207246eb229bbf4fccd8e9fc2540093eaa5bd748e3801c1e1b43beb89b19674c27c5f400d451475b0ee068b04ca2
-	sha512sums = f2bee85f3e665b4fe2c1273d2dd8f1ce893e72f2280df6722b14acf5c78dc12b1b71b95c3f8d701f7495265df520cea0075f0299582b21ca0b2fd485d6cf66d6
 
 pkgname = telegram-desktop-udf-patched
 
diff --git a/PKGBUILD b/PKGBUILD
index 07a4f9a99201..a56682c2ea69 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 # https://github.com/mymedia2/tdesktop
 
 pkgname=telegram-desktop-udf-patched
-pkgver=1.8.2
+pkgver=1.8.8
 pkgrel=1
 pkgdesc='Telegram Desktop client with several personal patches'
 arch=('x86_64')
@@ -48,7 +48,6 @@ source=(
     "always_clear_history_for_everyone.patch"
     "always_pin_without_notify.patch"
     "always_send_as_photo_or_album.patch"
-    "search_by_any_user.patch"
 )
 sha512sums=(
     'SKIP'
@@ -63,18 +62,17 @@ sha512sums=(
     'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d'
     '16874fabcb0d04d6bf8db1ee2fd77fbd09eeb6acc28bb5fd915d378f7a5ed7ebf4aae01c390e516695572cf9ef0e2cb59493e21a35643fd63ddf3fec446858a6'
     '3b6a0450f7981c2ce5f90c1ea46d9fb504194609f357b957b5c4a741681d3c531252394df116f8b77780a3a110783c047c9a081f9651e0792e7423573e390392'
-    'a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5'
+    'f5c7feb710fa12694c9f4ae9c818259c6ced5dc9d63079556a14c8bac14e3cc0ec4d3322df3650530b8afd8a512e573b4d3d8b3130b6374e842a92daacedd534'
     'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39'
     '6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0'
     'ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653'
     'a83b80668b2dc2cc77c857069fdb45b487793fda01ad8a63bab66c6a1c71e5d032050e4ec7efb5b4c3216badc5377c856ef1f4a59c2e02b24ee53b1d83124bf3'
     'e25dc1c54d6001a7a3740c6cee40a12a2313a3fd2e41986268f0ee5d9d8bf2d34812f539efb0eb5d26d3f263b2e4a7849016711532bf215aa9ff38da30175557'
     # Custom patches
-    '31ed454cbfe5811dedfac516e1c55cd6a2ea69fedb5e09035c04ed1b9647270eafdee1501494ecd948b6baa7a38dbf0747ba686dc89f31804589a39470793ac2'
+    'e88fa96024efc6176c818d0a46684e0ee1fb3a7bdadb323ad3b29f736209c80b6c31b135cf84389e7e2bbd614e57b241e4437c94b6fd114e73cfc418bf130015'
     '4a7e9de924bbf32fb4cd24ffa2764bcf49e0540bba649829b180da20a62810d4a21ebf11529d4eca22c9ceaa93b434ca3fbfd0b636795f8109ea4e1eddbff8f3'
     'b4eeeb4b2801f3edcc7423f28403b1dfabd3f3869425e4f102a2a4554bde93e63bd73d2d4dbf3e5748ce831b570e441d3917f532fc5cceac1ee5e8fd0832cb30'
     '650a2a2568cacd2775979614c06c90a4c505207246eb229bbf4fccd8e9fc2540093eaa5bd748e3801c1e1b43beb89b19674c27c5f400d451475b0ee068b04ca2'
-    'f2bee85f3e665b4fe2c1273d2dd8f1ce893e72f2280df6722b14acf5c78dc12b1b71b95c3f8d701f7495265df520cea0075f0299582b21ca0b2fd485d6cf66d6'
 )
 
 prepare() {
@@ -101,11 +99,19 @@ prepare() {
     patch -Np1 -i "$srcdir/always_clear_history_for_everyone.patch"
     patch -Np1 -i "$srcdir/always_pin_without_notify.patch"
     patch -Np1 -i "$srcdir/always_send_as_photo_or_album.patch"
-    patch -Np1 -i "$srcdir/search_by_any_user.patch"
 
     # disable static-qt for rlottie
     sed "/RLOTTIE_WITH_STATIC_QT/d" -i "$srcdir/tdesktop/Telegram/gyp/lib_rlottie.gyp"
 
+    # fix C++ ranges::sized_iterator_range
+    sed "s/ranges::make_iterator_range/ranges::subrange/g" -i "$srcdir/tdesktop/Telegram/SourceFiles/data/data_channel.cpp"
+    sed "s/ranges::make_iterator_range/ranges::subrange/g" -i "$srcdir/tdesktop/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp"
+    sed "s/ranges::make_iterator_range/ranges::subrange/g" -i "$srcdir/tdesktop/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp"
+    sed "s/ranges::make_iterator_range/ranges::subrange/g" -i "$srcdir/tdesktop/Telegram/SourceFiles/ui/widgets/input_fields.cpp"
+    sed "s/ranges::make_iterator_range/ranges::subrange/g" -i "$srcdir/tdesktop/Telegram/SourceFiles/ui/text/text_entity.cpp"
+    sed "s/make_iterator_range/ranges::subrange/g" -i "$srcdir/tdesktop/Telegram/SourceFiles/history/history_inner_widget.cpp"
+    sed "/int remainder = 0;/a inline bool operator==(const PercentCounterItem &o) const { return !(*this < o) && !(o < *this);}" -i "$srcdir/tdesktop/Telegram/SourceFiles/history/view/media/history_view_poll.cpp"
+
     cd "$srcdir/tdesktop"
     cd "Telegram/ThirdParty/libtgvoip"
     patch -Np1 -i "$srcdir/libtgvoip.patch"
diff --git a/always_delete_for_everyone.patch b/always_delete_for_everyone.patch
index 254c2ac60911..768e9b8df27e 100644
--- a/always_delete_for_everyone.patch
+++ b/always_delete_for_everyone.patch
@@ -1,15 +1,15 @@
 Description: Selects the delete for {other party} checkbox by default
 
 diff --git a/Telegram/SourceFiles/boxes/confirm_box.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp
-index dda4aa691..b7e497da6 100644
+index 4f8699f37..369048168 100644
 --- a/Telegram/SourceFiles/boxes/confirm_box.cpp
 +++ b/Telegram/SourceFiles/boxes/confirm_box.cpp
-@@ -536,7 +536,7 @@ void DeleteMessagesBox::prepare() {
- 		if (const auto peer = checkFromSinglePeer()) {
+@@ -545,7 +545,7 @@ void DeleteMessagesBox::prepare() {
  			auto count = int(_ids.size());
- 			if (auto revoke = revokeText(peer)) {
+ 			if (hasScheduledMessages()) {
+ 			} else if (auto revoke = revokeText(peer)) {
 -				_revoke.create(this, revoke->checkbox, false, st::defaultBoxCheckbox);
 +				_revoke.create(this, revoke->checkbox, true, st::defaultBoxCheckbox);
  				appendDetails(std::move(revoke->description));
- 			} else if (peer && peer->isChannel()) {
+ 			} else if (peer->isChannel()) {
  				if (peer->isMegagroup()) {
diff --git a/search_by_any_user.patch b/search_by_any_user.patch
deleted file mode 100644
index e50f9524d4c3..000000000000
--- a/search_by_any_user.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-Author: TheWug (https://github.com/TheWug)
-Description: Allows searching by any user instead of only members of a chat
-
-diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
-index dfea07f62..e2e332577 100644
---- a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
-+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
-@@ -299,7 +299,7 @@ void AddSpecialBoxController::migrate(not_null<ChannelData*> channel) {
- 
- std::unique_ptr<PeerListRow> AddSpecialBoxController::createSearchRow(
- 		not_null<PeerData*> peer) {
--	if (peer->isSelf()) {
-+	if (_excludeSelf && peer->isSelf()) {
- 		return nullptr;
- 	}
- 	if (const auto user = peer->asUser()) {
-@@ -312,6 +312,8 @@ void AddSpecialBoxController::prepare() {
- 	delegate()->peerListSetSearchMode(PeerListSearchMode::Enabled);
- 	auto title = [&] {
- 		switch (_role) {
-+		case Role::Members:
-+			return tr::lng_profile_participants_section();
- 		case Role::Admins:
- 			return tr::lng_channel_add_admin();
- 		case Role::Restricted:
-@@ -799,7 +801,8 @@ void AddSpecialBoxController::kickUser(
- }
- 
- bool AddSpecialBoxController::appendRow(not_null<UserData*> user) {
--	if (delegate()->peerListFindRow(user->id) || user->isSelf()) {
-+	if (delegate()->peerListFindRow(user->id)
-+		|| (_excludeSelf && user->isSelf())) {
- 		return false;
- 	}
- 	delegate()->peerListAppendRow(createRow(user));
-diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.h b/Telegram/SourceFiles/boxes/peers/add_participants_box.h
-index deef59d01..b1fab5a43 100644
---- a/Telegram/SourceFiles/boxes/peers/add_participants_box.h
-+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.h
-@@ -131,6 +131,9 @@ private:
- 	AdminDoneCallback _adminDoneCallback;
- 	BannedDoneCallback _bannedDoneCallback;
- 
-+protected:
-+	bool _excludeSelf = true;
-+
- };
- 
- // Finds chat/channel members, then contacts, then global search results.
-diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
-index b5823b308..9e11fa53e 100644
---- a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
-+++ b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
-@@ -19,18 +19,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
- namespace Dialogs {
- 
- void ShowSearchFromBox(
--		not_null<Window::SessionNavigation*> navigation,
- 		not_null<PeerData*> peer,
- 		Fn<void(not_null<UserData*>)> callback,
- 		Fn<void()> closedCallback) {
- 	auto createController = [
--		navigation,
- 		peer,
- 		callback = std::move(callback)
- 	]() -> std::unique_ptr<PeerListController> {
- 		if (peer && (peer->isChat() || peer->isMegagroup())) {
- 			return std::make_unique<Dialogs::SearchFromController>(
--				navigation,
- 				peer,
- 				std::move(callback));
- 		}
-@@ -50,18 +47,20 @@ void ShowSearchFromBox(
- }
- 
- SearchFromController::SearchFromController(
--	not_null<Window::SessionNavigation*> navigation,
- 	not_null<PeerData*> peer,
- 	Fn<void(not_null<UserData*>)> callback)
--: ParticipantsBoxController(
--	navigation,
-+: AddSpecialBoxController(
- 	peer,
--	ParticipantsBoxController::Role::Members)
--, _callback(std::move(callback)) {
-+	ParticipantsBoxController::Role::Members,
-+	AdminDoneCallback(),
-+	BannedDoneCallback())
-+, _callback(std::move(callback))
-+{
-+	_excludeSelf = false;
- }
- 
- void SearchFromController::prepare() {
--	ParticipantsBoxController::prepare();
-+	AddSpecialBoxController::prepare();
- 	delegate()->peerListSetTitle(tr::lng_search_messages_from());
- }
- 
-diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h
-index 3a45b7b5c..709353bb5 100644
---- a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h
-+++ b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h
-@@ -8,20 +8,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
- #pragma once
- 
- #include "boxes/peer_list_box.h"
--#include "boxes/peers/edit_participants_box.h"
-+#include "boxes/peers/add_participants_box.h"
- 
- namespace Dialogs {
- 
- void ShowSearchFromBox(
--	not_null<Window::SessionNavigation*> navigation,
- 	not_null<PeerData*> peer,
- 	Fn<void(not_null<UserData*>)> callback,
- 	Fn<void()> closedCallback);
- 
--class SearchFromController : public ParticipantsBoxController {
-+class SearchFromController : public AddSpecialBoxController {
- public:
- 	SearchFromController(
--		not_null<Window::SessionNavigation*> navigation,
- 		not_null<PeerData*> peer,
- 		Fn<void(not_null<UserData*>)> callback);
- 
-@@ -29,7 +27,7 @@ public:
- 	void rowClicked(not_null<PeerListRow*> row) override;
- 
- protected:
--	std::unique_ptr<PeerListRow> createRow(not_null<UserData*> user) const override;
-+	std::unique_ptr<PeerListRow> createRow(not_null<UserData*> user) const;
- 
- private:
- 	Fn<void(not_null<UserData*>)> _callback;
-diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
-index 68797353e..888b2dc4d 100644
---- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
-+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
-@@ -1322,7 +1322,6 @@ void Widget::showSearchFrom() {
- 	if (const auto peer = _searchInChat.peer()) {
- 		const auto chat = _searchInChat;
- 		ShowSearchFromBox(
--			controller(),
- 			peer,
- 			crl::guard(this, [=](not_null<UserData*> user) {
- 				Ui::hideLayer();