Tag improvements

submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoHeaderNode.swift

@@ -489,7 +489,9 @@ final class PeerInfoHeaderNode: ASDisplayNode {
         let credibilityIcon: CredibilityIcon
         var verifiedIcon: CredibilityIcon = .none
         if let peer = peer {
-            if peer.isFake {
+            if peer.id == self.context.account.peerId && !self.isSettings {
+                credibilityIcon = .none
+            } else if peer.isFake {
                 credibilityIcon = .fake
             } else if peer.isScam {
                 credibilityIcon = .scam
@@ -969,7 +971,11 @@ final class PeerInfoHeaderNode: ASDisplayNode {
         if let peer = peer {
             var title: String
             if peer.id == self.context.account.peerId && !self.isSettings {
-                title = presentationData.strings.Conversation_SavedMessages
+                if case .replyThread = self.chatLocation {
+                    title = presentationData.strings.Conversation_MyNotes
+                } else {
+                    title = presentationData.strings.Conversation_SavedMessages
+                }
             } else if peer.id.isAnonymousSavedMessages {
                 title = presentationData.strings.ChatList_AuthorHidden
             } else if let threadData = threadData {

submodules/TelegramUI/Sources/ChatController.swift

@@ -1266,6 +1266,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             }
             
             if !force && message.areReactionsTags(accountPeerId: strongSelf.context.account.peerId) {
+                if case .pinnedMessages = strongSelf.subject {
+                    return
+                }
+                
                 if !strongSelf.presentationInterfaceState.isPremium {
                     //TODO:localize
                     let context = strongSelf.context
@@ -2807,7 +2811,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     return .none
                 }
                 if case let .replyThread(replyThreadMessage) = strongSelf.chatLocation, replyThreadMessage.peerId == strongSelf.context.account.peerId {
-                    return .none
+                    if replyThreadMessage.threadId != strongSelf.context.account.peerId.toInt64() {
+                        return .none
+                    }
                 }
                 if case .peer = strongSelf.chatLocation, let channel = strongSelf.presentationInterfaceState.renderedPeer?.peer as? TelegramChannel, channel.flags.contains(.isForum) {
                     if message.threadId == nil {

submodules/TelegramUI/Sources/ChatControllerOpenMessageReactionContextMenu.swift

@@ -118,21 +118,24 @@ extension ChatControllerImpl {
                     })
                 })))
                 
-                if self.presentationInterfaceState.historyFilter?.customTags != tags {
+                if case .pinnedMessages = self.subject {
-                    items.append(.action(ContextMenuActionItem(text: self.presentationData.strings.Chat_ReactionContextMenu_FilterByTag, icon: { theme in
+                } else {
-                        return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/TagFilter"), color: theme.contextMenu.primaryColor)
+                    if self.presentationInterfaceState.historyFilter?.customTags != tags {
-                    }, action: { [weak self] _, a in
+                        items.append(.action(ContextMenuActionItem(text: self.presentationData.strings.Chat_ReactionContextMenu_FilterByTag, icon: { theme in
-                        guard let self else {
+                            return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/TagFilter"), color: theme.contextMenu.primaryColor)
-                            a(.default)
+                        }, action: { [weak self] _, a in
-                            return
+                            guard let self else {
-                        }
+                                a(.default)
-                        self.chatDisplayNode.historyNode.frozenMessageForScrollingReset = message.id
+                                return
-                        self.interfaceInteraction?.updateHistoryFilter { _ in
+                            }
-                            return ChatPresentationInterfaceState.HistoryFilter(customTags: tags, isActive: true)
+                            self.chatDisplayNode.historyNode.frozenMessageForScrollingReset = message.id
-                        }
+                            self.interfaceInteraction?.updateHistoryFilter { _ in
+                                return ChatPresentationInterfaceState.HistoryFilter(customTags: tags, isActive: true)
+                            }
                             
-                        a(.default)
+                            a(.default)
-                    })))
+                        })))
+                    }
                 }
                 
                 items.append(.action(ContextMenuActionItem(text: self.presentationData.strings.Chat_ReactionContextMenu_RemoveTag, textColor: .destructive, icon: { theme in

submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift

@@ -287,7 +287,9 @@ func canReplyInChat(_ chatPresentationInterfaceState: ChatPresentationInterfaceS
         break
     }
     if case let .replyThread(replyThreadMessage) = chatPresentationInterfaceState.chatLocation, replyThreadMessage.peerId == accountPeerId {
-        return false
+        if replyThreadMessage.threadId != accountPeerId.toInt64() {
+            return false
+        }
     }
     
     if let channel = peer as? TelegramChannel, channel.flags.contains(.isForum) {