- bugfixes

Telegram-Mac/ApplicationContext.swift

@@ -534,11 +534,11 @@ final class AuthorizedApplicationContext: NSObject, SplitViewDelegate {
 
         #if DEBUG
         self.context.window.set(handler: { _ -> KeyHandlerResult in
-
+           // showModal(with: Star_Transaction(context: context, peer: .init(context.myPeer!), transaction: StarsContext.State.Transaction.init(id: "kqwjeflklqwkejflqwkejflqkwejflqkwejf", count: 1000, date: Int32(Date().timeIntervalSince1970), peer: StarsContext.State.Transaction.Peer.appStore)), for: context.window)
 //            showModal(with: FactCheckController(context: context), for: context.window)
           //  showModal(with: Star_PurschaseInApp(context: context, peerId: context.peerId), for: context.window)
 
-//            context.bindings.rootNavigation().push(HashtagSearchController(context, hashtag: "#test", peerId: context.peerId))
+            context.bindings.rootNavigation().push(HashtagSearchController(context, hashtag: "#test", peerId: context.peerId))
 
             return .invoked
         }, with: self, for: .T, priority: .supreme, modifierFlags: [.command])

Telegram-Mac/Assets.xcassets/Icon_StarTransaction_Preview_Android.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "android_top-up.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Telegram-Mac/Assets.xcassets/Icon_StarTransaction_Preview_AppStore.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "apple_top-up.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Telegram-Mac/Assets.xcassets/Icon_StarTransaction_Preview_Fragment.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "fragment_top-up.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Telegram-Mac/Assets.xcassets/Icon_StarTransaction_Preview_PremiumBot.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "premiumbot_top-up.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Telegram-Mac/Assets.xcassets/Icon_StarTransaction_Preview_Unknown.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "stars_top-up.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Telegram-Mac/AutomaticBusinessMessageSetupChatContents.swift

@@ -13,6 +13,8 @@ import SwiftSignalKit
 
 
 final class AutomaticBusinessMessageSetupChatContents: ChatCustomContentsProtocol {
+
+
     private final class PendingMessageContext {
         let disposable = MetaDisposable()
         var message: Message?
@@ -178,6 +180,22 @@ final class AutomaticBusinessMessageSetupChatContents: ChatCustomContentsProtoco
                 self.context.engine.accountData.editMessageShortcut(id: shortcutId, shortcut: value)
             }
         }
+        func messagesAtIds(_ ids: [MessageId], album: Bool) -> Signal<[Message], NoError> {
+            let messages = self.mergedHistoryView?.entries.map { $0.message } ?? []
+
+            var filtered = messages.filter({ ids.contains($0.id) })
+
+            if album {
+                let grouping = filtered.filter{ $0.groupingKey != nil }
+                for groupMessage in grouping {
+                    let additional = messages.filter { $0.groupingKey == groupMessage.groupingKey && $0.id != groupMessage.id }
+                    filtered.append(contentsOf: additional)
+                }
+            }
+
+            return .single(filtered)
+        }
+
     }
 
     var kind: ChatCustomContentsKind
@@ -209,6 +227,8 @@ final class AutomaticBusinessMessageSetupChatContents: ChatCustomContentsProtoco
             initialShortcut = "hello"
         case let .quickReplyMessageInput(shortcut):
             initialShortcut = shortcut
+        case .searchHashtag:
+            fatalError()
         }
 
         let queue = Queue()
@@ -245,5 +265,22 @@ final class AutomaticBusinessMessageSetupChatContents: ChatCustomContentsProtoco
             impl.quickReplyUpdateShortcut(value: value)
         }
     }
+
+    func messagesAtIds(_ ids: [MessageId], album: Bool) -> Signal<[Message], NoError> {
+        return self.impl.signalWith({ impl, subscriber in
+            return impl.messagesAtIds(ids, album: album).startStandalone(next: { messages in
+                subscriber.putNext(messages)
+                subscriber.putCompletion()
+            })
+        })
+    }
+
+    func hashtagSearchUpdate(query: String) {
+
+    }
+    func loadMore() {
+
+    }
+    var hashtagSearchResultsUpdate: ((SearchMessagesResult, SearchMessagesState)) -> Void = { _ in }
 }
 

Telegram-Mac/ChatAudioContentView.swift

@@ -239,19 +239,22 @@ class ChatAudioContentView: ChatMediaContentView, APDelegate {
 
     func checkState(animated: Bool) {
 
-        let presentation: ChatMediaPresentation = parameters?.presentation ?? .Empty
-        if let parent = parent, let controller = context?.sharedContext.getAudioPlayer(), let song = controller.currentSong {
-            if song.entry.isEqual(to: parent), case .playing = song.state {
-                progressView.theme = RadialProgressTheme(backgroundColor: presentation.activityBackground, foregroundColor: presentation.activityForeground, icon: presentation.pauseThumb, iconInset:NSEdgeInsets(left:0), blendMode: presentation.blendingMode)
-                progressView.state = .Icon(image: presentation.pauseThumb)
+        if fetchStatus == nil || fetchStatus == .Local {
+            let presentation: ChatMediaPresentation = parameters?.presentation ?? .Empty
+            if let parent = parent, let controller = context?.sharedContext.getAudioPlayer(), let song = controller.currentSong {
+                if song.entry.isEqual(to: parent), case .playing = song.state {
+                    progressView.theme = RadialProgressTheme(backgroundColor: presentation.activityBackground, foregroundColor: presentation.activityForeground, icon: presentation.pauseThumb, iconInset:NSEdgeInsets(left:0), blendMode: presentation.blendingMode)
+                    progressView.state = .Icon(image: presentation.pauseThumb)
+                } else {
+                    progressView.theme = RadialProgressTheme(backgroundColor: presentation.activityBackground, foregroundColor: presentation.activityForeground, icon: presentation.playThumb, iconInset:NSEdgeInsets(left:1), blendMode: presentation.blendingMode)
+                    progressView.state = .Icon(image: presentation.playThumb)
+                }
             } else {
                 progressView.theme = RadialProgressTheme(backgroundColor: presentation.activityBackground, foregroundColor: presentation.activityForeground, icon: presentation.playThumb, iconInset:NSEdgeInsets(left:1), blendMode: presentation.blendingMode)
                 progressView.state = .Icon(image: presentation.playThumb)
             }
-        } else {
-            progressView.theme = RadialProgressTheme(backgroundColor: presentation.activityBackground, foregroundColor: presentation.activityForeground, icon: presentation.playThumb, iconInset:NSEdgeInsets(left:1), blendMode: presentation.blendingMode)
-            progressView.state = .Icon(image: presentation.playThumb)
         }
+
     }
 
     override func update(with media: Media, size:NSSize, context: AccountContext, parent:Message?, table:TableView?, parameters:ChatMediaLayoutParameters? = nil, animated: Bool = false, positionFlags: LayoutPositionFlags? = nil, approximateSynchronousValue: Bool = false) {