Add fix for thread entry in context menu

3 files changed, 34 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1adff6bf4de3..4b9453dbed7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = telegram-desktop9
 	pkgdesc = Official Telegram Desktop client (personal build)
 	pkgver = 2.5.8
-	pkgrel = 1
+	pkgrel = 2
 	url = https://desktop.telegram.org/
 	arch = x86_64
 	license = GPL3
@@ -34,6 +34,7 @@ pkgbase = telegram-desktop9
 	source = dont_pulse_mentions.patch
 	source = no_circles.patch
 	source = use_xdg-open.patch
+	source = fix_thread_context_menu.patch
 	sha512sums = 12258eb5119fcd9db6d1be38224678ed67c76a24de59909d2ef0268587df2432f6f076273581f016f8ba593b95bb7c0e02062b77bad194ff5a211b35fa743d7b
 	sha512sums = fdef3a430bdd60d88c9e9011ee878805e7803699204a2a7e22797d0f8729bf7dc0543851083ad700a4ece32bc768b6bfeb6f0135c8c039e035b22afb6df1171d
 	sha512sums = dc5ffda130496c44bfe52792e856dac811b1a8e48b463529dd54396ad1b45915f8b6d9fcb6cb254f9350b3440d7b94a67d1c19660962f0350015061b021af6f1
@@ -42,6 +43,7 @@ pkgbase = telegram-desktop9
 	sha512sums = 673e2a28781d0d604549c621592b1017ad306ddaf6d1beedfe73f3f1357fbb6afd994a324dfa15029789bdf8a4d6e85ad12a3877519618f6585bbc1927c06900
 	sha512sums = 8ec6b1739a1391b75a2653fff704a7d22e830c526acffe138936bbd20047bd24831e42558fa22069d7e914e762bbcfa2e1b14a8fd3911fd8bbbd0662d8baac14
 	sha512sums = 9c74c88eff1402d1334ec66b6233e85497666ee28eca1a804b8f5006c691bdd3718db2a238a736e30b1c8249d2c20ccc320650e97f67c4a9a67b689eb572cc2b
+	sha512sums = e6a10c1304e01676373c77d27629d93c085fa4e34e80ce1e4bd10af9cfb0a24c1fe2077cc0fdda83162e865cfab6811c9bc27aa13661c6d300c54749ffaef796
 
 pkgname = telegram-desktop9
 
diff --git a/PKGBUILD b/PKGBUILD
index f4253699924a..da894d242ed4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: hexchain <i@hexchain.org>
 pkgname=telegram-desktop9
 pkgver=2.5.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Official Telegram Desktop client (personal build)'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
@@ -21,7 +21,8 @@ source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver
         "clicky_sticker_panel.patch"
         "dont_pulse_mentions.patch"
         "no_circles.patch"
-        "use_xdg-open.patch")
+        "use_xdg-open.patch"
+        "fix_thread_context_menu.patch")
 sha512sums=('12258eb5119fcd9db6d1be38224678ed67c76a24de59909d2ef0268587df2432f6f076273581f016f8ba593b95bb7c0e02062b77bad194ff5a211b35fa743d7b'
             'fdef3a430bdd60d88c9e9011ee878805e7803699204a2a7e22797d0f8729bf7dc0543851083ad700a4ece32bc768b6bfeb6f0135c8c039e035b22afb6df1171d'
             'dc5ffda130496c44bfe52792e856dac811b1a8e48b463529dd54396ad1b45915f8b6d9fcb6cb254f9350b3440d7b94a67d1c19660962f0350015061b021af6f1'
@@ -29,7 +30,8 @@ sha512sums=('12258eb5119fcd9db6d1be38224678ed67c76a24de59909d2ef0268587df2432f6f
             '19a13dbe8d8af5400bb64c2004fbf31b162da7ecc46636b5e5d93dc860ab0a6b9d81331789d11171451ade679459e0338134b64a21cc69b01ab201d64ec7560e'
             '673e2a28781d0d604549c621592b1017ad306ddaf6d1beedfe73f3f1357fbb6afd994a324dfa15029789bdf8a4d6e85ad12a3877519618f6585bbc1927c06900'
             '8ec6b1739a1391b75a2653fff704a7d22e830c526acffe138936bbd20047bd24831e42558fa22069d7e914e762bbcfa2e1b14a8fd3911fd8bbbd0662d8baac14'
-            '9c74c88eff1402d1334ec66b6233e85497666ee28eca1a804b8f5006c691bdd3718db2a238a736e30b1c8249d2c20ccc320650e97f67c4a9a67b689eb572cc2b')
+            '9c74c88eff1402d1334ec66b6233e85497666ee28eca1a804b8f5006c691bdd3718db2a238a736e30b1c8249d2c20ccc320650e97f67c4a9a67b689eb572cc2b'
+            'e6a10c1304e01676373c77d27629d93c085fa4e34e80ce1e4bd10af9cfb0a24c1fe2077cc0fdda83162e865cfab6811c9bc27aa13661c6d300c54749ffaef796')
 
 prepare() {
     cd "$srcdir/tdesktop-$pkgver-full"
diff --git a/fix_thread_context_menu.patch b/fix_thread_context_menu.patch
new file mode 100644
index 000000000000..3ec9807aca87
--- /dev/null
+++ b/fix_thread_context_menu.patch
@@ -0,0 +1,26 @@
+diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
+index 495376acc..04a2470db 100644
+--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
++++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
+@@ -1541,7 +1541,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
+ 		}
+ 		const auto repliesCount = item->repliesCount();
+ 		const auto withReplies = IsServerMsgId(item->id)
+-			&& (repliesCount > 0);
++			&& (repliesCount > 0 || IsServerMsgId(item->replyToTop()));
+ 		if (withReplies && item->history()->peer->isMegagroup()) {
+ 			const auto rootId = repliesCount ? item->id : item->replyToTop();
+ 			const auto phrase = (repliesCount > 0)
+diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+index 73ca05504..50c8c896c 100644
+--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
++++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+@@ -570,7 +570,7 @@ bool AddViewRepliesAction(
+ 		return false;
+ 	}
+ 	const auto repliesCount = item->repliesCount();
+-	const auto withReplies = (repliesCount > 0);
++	const auto withReplies = (repliesCount > 0) || IsServerMsgId(item->replyToTop());
+ 	if (!withReplies || !item->history()->peer->isMegagroup()) {
+ 		return false;
+ 	}