From 53fe1718e9048e4652cf1a16b8999e3de31f3b12 Mon Sep 17 00:00:00 2001
From: Isaac <>
Date: Fri, 7 Jun 2024 16:07:36 +0400
Subject: [PATCH] Various improvements

---
 .../Sources/ChatMessageAnimatedStickerItemNode.swift   | 10 ++++++----
 .../Sources/ChatMessageBubbleItemNode.swift            |  2 +-
 .../Sources/ChatMessageTextBubbleContentNode.swift     |  3 +++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/submodules/TelegramUI/Components/Chat/ChatMessageAnimatedStickerItemNode/Sources/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/Components/Chat/ChatMessageAnimatedStickerItemNode/Sources/ChatMessageAnimatedStickerItemNode.swift
index a2b9496859..4288683308 100644
--- a/submodules/TelegramUI/Components/Chat/ChatMessageAnimatedStickerItemNode/Sources/ChatMessageAnimatedStickerItemNode.swift
+++ b/submodules/TelegramUI/Components/Chat/ChatMessageAnimatedStickerItemNode/Sources/ChatMessageAnimatedStickerItemNode.swift
@@ -592,12 +592,14 @@ public class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
             }
         }
         
-        var isPlaying = self.visibilityStatus == true && !self.forceStopAnimations
+        let isPlaying = self.visibilityStatus == true && !self.forceStopAnimations
+        
+        var canPlayEffects = isPlaying
         if !item.controllerInteraction.canReadHistory {
-            isPlaying = false
+            canPlayEffects = false
         }
         
-        if !isPlaying {
+        if !canPlayEffects {
             self.removeAdditionalAnimations()
             self.removeEffectAnimations()
         }
@@ -630,7 +632,7 @@ public class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
             }
         }
         
-        if isPlaying, let animationNode = self.animationNode as? AnimatedStickerNode {
+        if canPlayEffects, let animationNode = self.animationNode as? AnimatedStickerNode {
             var effectAlreadySeen = true
             if item.message.flags.contains(.Incoming) {
                 if let unreadRange = item.controllerInteraction.unreadMessageRange[UnreadMessageRangeKey(peerId: item.message.id.peerId, namespace: item.message.id.namespace)] {
diff --git a/submodules/TelegramUI/Components/Chat/ChatMessageBubbleItemNode/Sources/ChatMessageBubbleItemNode.swift b/submodules/TelegramUI/Components/Chat/ChatMessageBubbleItemNode/Sources/ChatMessageBubbleItemNode.swift
index 0a99147972..59c90746ed 100644
--- a/submodules/TelegramUI/Components/Chat/ChatMessageBubbleItemNode/Sources/ChatMessageBubbleItemNode.swift
+++ b/submodules/TelegramUI/Components/Chat/ChatMessageBubbleItemNode/Sources/ChatMessageBubbleItemNode.swift
@@ -261,8 +261,8 @@ private func contentNodeMessagesAndClassesForItem(_ item: ChatMessageItem) -> ([
                         result.insert((message, ChatMessageTextBubbleContentNode.self, itemAttributes, BubbleItemAttributes(isAttachment: false, neighborType: .text, neighborSpacing: isFile ? .condensed : .default)), at: 0)
                     } else {
                         result.append((message, ChatMessageTextBubbleContentNode.self, itemAttributes, BubbleItemAttributes(isAttachment: false, neighborType: .text, neighborSpacing: isFile ? .condensed : .default)))
+                        needReactions = false
                     }
-                    needReactions = false
                 }
             } else {
                 if case .group = item.content {
diff --git a/submodules/TelegramUI/Components/Chat/ChatMessageTextBubbleContentNode/Sources/ChatMessageTextBubbleContentNode.swift b/submodules/TelegramUI/Components/Chat/ChatMessageTextBubbleContentNode/Sources/ChatMessageTextBubbleContentNode.swift
index 416aac8899..040982097b 100644
--- a/submodules/TelegramUI/Components/Chat/ChatMessageTextBubbleContentNode/Sources/ChatMessageTextBubbleContentNode.swift
+++ b/submodules/TelegramUI/Components/Chat/ChatMessageTextBubbleContentNode/Sources/ChatMessageTextBubbleContentNode.swift
@@ -166,6 +166,9 @@ public class ChatMessageTextBubbleContentNode: ChatMessageBubbleContentNode {
             guard let self else {
                 return
             }
+            
+            cancelParentGestures(view: self.view)
+            
             var mappedLocation: CGPoint?
             if let location {
                 mappedLocation = self.textNode.textNode.layer.convert(location, to: self.layer)