bugfixes

Author: overtake

Telegram-Mac/AccountContext.swift

@@ -212,9 +212,7 @@ final class AccountContext {
     #endif
     private(set) var timeDifference:TimeInterval  = 0
     #if !SHARE
-    
-    var audioPlayer:APController?
-    
+        
 
     let peerChannelMemberCategoriesContextsManager: PeerChannelMemberCategoriesContextsManager
     let blockedPeersContext: BlockedPeersContext
@@ -853,8 +851,6 @@ final class AccountContext {
         #if !SHARE
       //  self.walletPasscodeTimeoutContext.clear()
         self.networkStatusManager.cleanup()
-        self.audioPlayer?.cleanup()
-        self.audioPlayer = nil
         self.diceCache.cleanup()
         _chatThemes.set(.single([]))
         _cloudThemes.set(.single(.init(themes: [], list: [:], default: nil, custom: nil)))

Telegram-Mac/AppDelegate.swift

@@ -865,7 +865,7 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
                                 if let account = account {
 
                                     let context = AccountContext(sharedContext: sharedApplicationContext.sharedContext, window: window, account: account)
-                                    return AuthorizedApplicationContext(window: window, context: context, launchSettings: settings ?? LaunchSettings.defaultSettings, callSession: sharedContext.getCrossAccountCallSession(), groupCallContext: sharedContext.getCrossAccountGroupCall(), folders: folders)
+                                    return AuthorizedApplicationContext(window: window, context: context, launchSettings: settings ?? LaunchSettings.defaultSettings, callSession: sharedContext.getCrossAccountCallSession(), groupCallContext: sharedContext.getCrossAccountGroupCall(), inlinePlayerContext: sharedContext.getCrossInlinePlayer(), folders: folders)
 
                                 } else {
                                     return nil
@@ -1121,11 +1121,14 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
 
     func navigateProfile(_ peerId: PeerId, account: Account) {
         if let context = self.contextValue?.context, context.peerId == account.peerId {
-            context.bindings.rootNavigation().push(PeerInfoController(context: context, peerId: peerId))
+            PeerInfoController.push(navigation: context.bindings.rootNavigation(), context: context, peerId: peerId)
             context.window.makeKeyAndOrderFront(nil)
             context.window.orderFrontRegardless()
         } else {
-            sharedApplicationContextValue?.sharedContext.switchToAccount(id: account.id, action: .profile(peerId, necessary: true))
+            let signal = account.postbox.loadedPeerWithId(peerId) |> deliverOnMainQueue
+            _ = signal.start(next: { peer in
+                self.sharedApplicationContextValue?.sharedContext.switchToAccount(id: account.id, action: .profile(EnginePeer(peer), necessary: true))
+            })
         }
     }
     func navigateChat(_ peerId: PeerId, account: Account) {

Telegram-Mac/Appearance.swift

@@ -2800,7 +2800,9 @@ private func generateIcons(from palette: ColorPalette, bubbled: Bool) -> Telegra
                               message_quote_blue: { NSImage(named: "Icon_Quote")!.precomposed(NSColor(0x368AD1)) },
                               message_quote_pink: { NSImage(named: "Icon_Quote")!.precomposed(NSColor(0xC7508B)) },
                               message_quote_bubble_incoming: { NSImage(named: "Icon_Quote")!.precomposed(palette.chatReplyTitleBubble_incoming) },
-                              message_quote_bubble_outgoing: { NSImage(named: "Icon_Quote")!.precomposed(palette.chatReplyTitleBubble_outgoing) }
+                              message_quote_bubble_outgoing: { NSImage(named: "Icon_Quote")!.precomposed(palette.chatReplyTitleBubble_outgoing) },
+                              channel_stats_likes: { NSImage(named: "Icon_ChannelStats_Likes")!.precomposed(palette.grayIcon) },
+                              channel_stats_shares: { NSImage(named: "Icon_ChannelStats_Shares")!.precomposed(palette.grayIcon) }
 
     )
 }

Telegram-Mac/ApplicationContext.swift

@@ -189,7 +189,7 @@ final class AuthorizedApplicationContext: NSObject, SplitViewDelegate {
 
     private var launchAction: ApplicationContextLaunchAction?
 
-    init(window: Window, context: AccountContext, launchSettings: LaunchSettings, callSession: PCallSession?, groupCallContext: GroupCallContext?, folders: ChatListFolders?) {
+    init(window: Window, context: AccountContext, launchSettings: LaunchSettings, callSession: PCallSession?, groupCallContext: GroupCallContext?, inlinePlayerContext: InlineAudioPlayerView.ContextObject?, folders: ChatListFolders?) {
 
         self.context = context
         emptyController = EmptyChatViewController(context)
@@ -596,13 +596,13 @@ final class AuthorizedApplicationContext: NSObject, SplitViewDelegate {
                 self.launchAction = .preferences
                 _ready.set(leftController.settings.ready.get())
                 leftController.tabController.select(index: leftController.settingsIndex)
-            case let .profile(peerId, necessary):
+            case let .profile(peer, necessary):
 
                 _ready.set(leftController.chatList.ready.get())
                 self.leftController.tabController.select(index: self.leftController.chatIndex)
 
                 if (necessary || context.layout != .single) {
-                    let controller = PeerInfoController(context: context, peerId: peerId)
+                    let controller = PeerInfoController(context: context, peer: peer._asPeer())
                     controller.navigationController = self.rightController
                     controller.loadViewIfNeeded(self.rightController.bounds)
 
@@ -657,16 +657,13 @@ final class AuthorizedApplicationContext: NSObject, SplitViewDelegate {
         if let groupCallContext = groupCallContext {
             rightController.callHeader?.show(true, contextObject: groupCallContext)
         }
-        
+        if let inlinePlayerContext = inlinePlayerContext {
+            rightController.header?.show(true, contextObject: inlinePlayerContext)
+        }
         self.updateFoldersDisposable.set(combineLatest(queue: .mainQueue(), chatListFilterPreferences(engine: context.engine), context.layoutValue).start(next: { [weak self] value, layout in
             self?.updateLeftSidebar(with: value, layout: layout, animated: true)
         }))
 
-        
-        if let controller = context.audioPlayer, let _ = self.rightController.header {
-            self.rightController.header?.show(false, contextObject: InlineAudioPlayerView.ContextObject(controller: controller, context: context, tableView: nil, supportTableView: nil))
-        }
-        
        // _ready.set(.single(true))
     }
 

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

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "Like_14 (1).png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Like_14@2x (1).png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Telegram-Mac/Assets.xcassets/Icon_ChannelStats_Likes.imageset/Like_14 (1).png

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