Various Fixes

Telegram/Telegram-iOS/en.lproj/Localizable.strings

@@ -5978,3 +5978,9 @@ Sorry for the inconvenience.";
 "VoiceOver.Chat.Profile" = "Profile";
 "VoiceOver.Chat.GroupInfo" = "Group Info";
 "VoiceOver.Chat.ChannelInfo" = "Channel Info";
+
+"Conversation.ForwardTooltip.Chat.One" = "Message forwarded to **%@**";
+"Conversation.ForwardTooltip.Chat.Many" = "Messages forwarded to **%@**";
+
+"Conversation.ForwardTooltip.SavedMessages.One" = "Message forwarded to **Saved Messages**";
+"Conversation.ForwardTooltip.SavedMessages.Many" = "Messages forwarded to **Saved Messages**";

submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift

@@ -29,6 +29,7 @@ import GalleryData
 import InstantPageUI
 import ChatInterfaceState
 import ShareController
+import UndoUI
 
 private enum ChatListTokenId: Int32 {
     case filter
@@ -899,6 +900,9 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo
                 let peerId = peer.id
                 if let strongSelf = self, let _ = peerSelectionController {
                     if peerId == strongSelf.context.account.peerId {
+                        let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                        (strongSelf.navigationController?.topViewController as? ViewController)?.present(UndoOverlayController(presentationData: presentationData, content: .forward(savedMessages: true, text: messages.count == 1 ? presentationData.strings.Conversation_ForwardTooltip_SavedMessages_One : presentationData.strings.Conversation_ForwardTooltip_SavedMessages_Many), elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false }), in: .window(.root))
+                        
                         let _ = (enqueueMessages(account: strongSelf.context.account, peerId: peerId, messages: messageIds.map { id -> EnqueueMessage in
                             return .forward(source: id, grouping: .auto, attributes: [])
                         })

submodules/Display/Source/KeyboardManager.swift

@@ -7,6 +7,22 @@ struct KeyboardSurface {
     let host: UIView
 }
 
+public extension UIResponder {
+    private struct Static {
+        static weak var responder: UIResponder?
+    }
+
+    static func currentFirst() -> UIResponder? {
+        Static.responder = nil
+        UIApplication.shared.sendAction(#selector(UIResponder._trap), to: nil, from: nil, for: nil)
+        return Static.responder
+    }
+
+    @objc private func _trap() {
+        Static.responder = self
+    }
+}
+
 private func getFirstResponder(_ view: UIView) -> UIView? {
     if view.isFirstResponder {
         return view

submodules/TelegramUI/Sources/ChatController.swift

@@ -10041,6 +10041,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     strongSelf.searchResultsController = nil
                     strongController.dismiss()
                 } else if peerId == strongSelf.context.account.peerId {
+                    let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                    strongSelf.present(UndoOverlayController(presentationData: presentationData, content: .forward(savedMessages: true, text: messages.count == 1 ? presentationData.strings.Conversation_ForwardTooltip_SavedMessages_One : presentationData.strings.Conversation_ForwardTooltip_SavedMessages_Many), elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false }), in: .window(.root))
+                    
                     let _ = (enqueueMessages(account: strongSelf.context.account, peerId: peerId, messages: messages.map { message -> EnqueueMessage in
                         return .forward(source: message.id, grouping: .auto, attributes: [])
                     })
@@ -11262,7 +11265,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     }
                 })
             ]
-        } else {
+        } else if UIResponder.currentFirst() == nil {
             inputShortcuts = [
                 KeyShortcut(title: strings.KeyCommand_FocusOnInputField, input: "\r", action: { [weak self] in
                     if let strongSelf = self {
@@ -11316,6 +11319,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     }
                 })
             ]
+        } else {
+            inputShortcuts = []
         }
         
         var canEdit = false

submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift

@@ -54,6 +54,7 @@ import GalleryData
 import ChatInterfaceState
 import TelegramVoip
 import InviteLinksUI
+import UndoUI
 
 protocol PeerInfoScreenItem: class {
     var id: AnyHashable { get }
@@ -4689,6 +4690,9 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                 
                 if let strongSelf = self, let _ = peerSelectionController {
                     if peerId == strongSelf.context.account.peerId {
+                        let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                        strongSelf.controller?.present(UndoOverlayController(presentationData: presentationData, content: .forward(savedMessages: true, text: messageIds.count == 1 ? presentationData.strings.Conversation_ForwardTooltip_SavedMessages_One : presentationData.strings.Conversation_ForwardTooltip_SavedMessages_Many), elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false }), in: .window(.root))
+                        
                         strongSelf.headerNode.navigationButtonContainer.performAction?(.selectionDone)
                         
                         let _ = (enqueueMessages(account: strongSelf.context.account, peerId: peerId, messages: messageIds.map { id -> EnqueueMessage in

submodules/TelegramUniversalVideoContent/Sources/YoutubeEmbedImplementation.swift

@@ -174,7 +174,7 @@ final class YoutubeEmbedImplementation: WebEmbedImplementation {
         updateStatus(self.status)
         
         let html = String(format: htmlTemplate, paramsJson)
-        webView.loadHTMLString(html, baseURL: URL(string: "https://messenger.telegram.org"))
+        webView.loadHTMLString(html, baseURL: URL(string: "https://telegram.youtube.com"))
 //        webView.isUserInteractionEnabled = false
         
         userContentController.addUserScript(WKUserScript(source: userScript, injectionTime: .atDocumentEnd, forMainFrameOnly: false))

submodules/UndoUI/Sources/UndoOverlayController.swift

@@ -28,6 +28,7 @@ public enum UndoOverlayContent {
     case banned(text: String)
     case importedMessage(text: String)
     case audioRate(slowdown: Bool, text: String)
+    case forward(savedMessages: Bool, text: String)
 }
 
 public enum UndoOverlayAction {

submodules/UndoUI/Sources/UndoOverlayControllerNode.swift

@@ -492,6 +492,21 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
                 self.textNode.attributedText = attributedText
                 self.textNode.maximumNumberOfLines = 2
                 
+                displayUndo = false
+                self.originalRemainingSeconds = 3
+            case let .forward(savedMessages, text):
+                self.avatarNode = nil
+                self.iconNode = nil
+                self.iconCheckNode = nil
+                self.animationNode = AnimationNode(animation: savedMessages ? "anim_savedmessages" : "anim_forward", colors: [:], scale: 0.066)
+                self.animatedStickerNode = nil
+                
+                let body = MarkdownAttributeSet(font: Font.regular(14.0), textColor: .white)
+                let bold = MarkdownAttributeSet(font: Font.semibold(14.0), textColor: .white)
+                let attributedText = parseMarkdownIntoAttributedString(text, attributes: MarkdownAttributes(body: body, bold: bold, link: body, linkAttribute: { _ in return nil }), textAlignment: .natural)
+                self.textNode.attributedText = attributedText
+                self.textNode.maximumNumberOfLines = 2
+                
                 displayUndo = false
                 self.originalRemainingSeconds = 3
         }
@@ -522,7 +537,7 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
         switch content {
         case .removedChat:
             self.panelWrapperNode.addSubnode(self.timerTextNode)
-            case .archivedChat, .hidArchive, .revealedArchive, .succeed, .emoji, .swipeToReply, .actionSucceeded, .stickersModified, .chatAddedToFolder, .chatRemovedFromFolder, .messagesUnpinned, .setProximityAlert, .invitedToVoiceChat, .linkCopied, .banned, .importedMessage, .audioRate:
+            case .archivedChat, .hidArchive, .revealedArchive, .succeed, .emoji, .swipeToReply, .actionSucceeded, .stickersModified, .chatAddedToFolder, .chatRemovedFromFolder, .messagesUnpinned, .setProximityAlert, .invitedToVoiceChat, .linkCopied, .banned, .importedMessage, .audioRate, .forward:
             break
         case .dice:
             self.panelWrapperNode.clipsToBounds = true