- bugfixes

Author: overtake

Telegram-Mac/AccountContext.swift

@@ -25,6 +25,11 @@ let clown: String = "🤡"
 let focusIntentEmoji = "⛔️"
 
 
+
+func bestWindow(_ accountContext: AccountContext, _ controller: ViewController?) -> Window {
+    return controller?.window ?? accountContext.window
+}
+
 public struct PremiumConfiguration {
     public static var defaultValue: PremiumConfiguration {
         return PremiumConfiguration(

Telegram-Mac/ApplicationContext.swift

@@ -547,16 +547,6 @@ final class AuthorizedApplicationContext: NSObject, SplitViewDelegate {
             return .invoked
         }, with: self, for: .T, priority: .supreme, modifierFlags: [.command])
 
-        self.context.window.set(handler: { _ -> KeyHandlerResult in
-            showModal(with: Star_ListScreen(context: context, source: .buy), for: context.window)
-            return .invoked
-        }, with: self, for: .Y, priority: .supreme, modifierFlags: [.command])
-        
-        self.context.window.set(handler: { _ -> KeyHandlerResult in
-            showModal(with: Star_ListScreen(context: context, source: .account), for: context.window)
-            return .invoked
-        }, with: self, for: .R, priority: .supreme, modifierFlags: [.command])
-
         #endif
 
 

Telegram-Mac/ChannelInfoEntries.swift

@@ -586,11 +586,11 @@ class ChannelInfoArguments : PeerInfoArguments {
 
     }
 
-    func stats(_ datacenterId: Int32, monetization: Bool) {
+    func stats(_ datacenterId: Int32, monetization: Bool, stars: Bool) {
         if datacenterId == 0 {
             self.pushViewController(ChannelBoostStatsController(context: context, peerId: peerId))
         } else {
-            self.pushViewController(ChannelStatsSegmentController(context, peerId: peerId, isChannel: true, monetization: monetization))
+            self.pushViewController(ChannelStatsSegmentController(context, peerId: peerId, isChannel: true, monetization: monetization, stars: stars))
         }
     }
     func share() {
@@ -691,7 +691,7 @@ enum ChannelInfoEntry: PeerInfoEntry {
     case requests(section: ChannelInfoSection, count: Int32, viewType: GeneralViewType)
     case reactions(section: ChannelInfoSection, text: String, allowedReactions: PeerAllowedReactions?, availableReactions: AvailableReactions?, reactionsCount: Int32?, viewType: GeneralViewType)
     case color(section: ChannelInfoSection, peer: PeerEquatable, viewType: GeneralViewType)
-    case stats(section: ChannelInfoSection, datacenterId: Int32, monetization: Bool, viewType: GeneralViewType)
+    case stats(section: ChannelInfoSection, datacenterId: Int32, monetization: Bool, stars: Bool, viewType: GeneralViewType)
     case discussion(sectionId: ChannelInfoSection, group: Peer?, participantsCount: Int32?, viewType: GeneralViewType)
     case discussionDesc(sectionId: ChannelInfoSection, viewType: GeneralViewType)
     case aboutInput(sectionId: ChannelInfoSection, description:String, viewType: GeneralViewType)
@@ -722,7 +722,7 @@ enum ChannelInfoEntry: PeerInfoEntry {
         case let .discussion(sectionId, group, participantsCount, _): return .discussion(sectionId: sectionId, group: group, participantsCount: participantsCount, viewType: viewType)
         case let .reactions(section, text, allowedReactions, availableReactions, reactionsCount, _): return .reactions(section: section, text: text, allowedReactions: allowedReactions, availableReactions: availableReactions, reactionsCount: reactionsCount, viewType: viewType)
         case let .color(section, peer, _): return .color(section: section, peer: peer, viewType: viewType)
-        case let .stats(section, datacenterId, monetization, _): return .stats(section: section, datacenterId: datacenterId, monetization: monetization, viewType: viewType)
+        case let .stats(section, datacenterId, monetization, stars, _): return .stats(section: section, datacenterId: datacenterId, monetization: monetization, stars: stars, viewType: viewType)
         case let .discussionDesc(sectionId, _): return .discussionDesc(sectionId: sectionId, viewType: viewType)
         case let .aboutInput(sectionId, description, _): return .aboutInput(sectionId: sectionId, description: description, viewType: viewType)
         case let .aboutDesc(sectionId, _): return .aboutDesc(sectionId: sectionId, viewType: viewType)
@@ -888,8 +888,8 @@ enum ChannelInfoEntry: PeerInfoEntry {
             } else {
                 return false
             }
-        case let .stats(sectionId, datacenterId, monetization, viewType):
-            if case .stats(sectionId, datacenterId, monetization, viewType) = entry {
+        case let .stats(sectionId, datacenterId, monetization, stars, viewType):
+            if case .stats(sectionId, datacenterId, monetization, stars, viewType) = entry {
                 return true
             } else {
                 return false
@@ -1039,7 +1039,7 @@ enum ChannelInfoEntry: PeerInfoEntry {
             return sectionId.rawValue
         case let .color(sectionId, _, _):
             return sectionId.rawValue
-        case let .stats(sectionId, _, _, _):
+        case let .stats(sectionId, _, _, _, _):
             return sectionId.rawValue
         case let .discussionDesc(sectionId, _):
             return sectionId.rawValue
@@ -1096,7 +1096,7 @@ enum ChannelInfoEntry: PeerInfoEntry {
             return (sectionId.rawValue * 1000) + stableIndex
         case let .color(sectionId, _, _):
             return (sectionId.rawValue * 1000) + stableIndex
-        case let .stats(sectionId, _, _, _):
+        case let .stats(sectionId, _, _, _, _):
             return (sectionId.rawValue * 1000) + stableIndex
         case let .discussionDesc(sectionId, _):
             return (sectionId.rawValue * 1000) + stableIndex
@@ -1214,9 +1214,9 @@ enum ChannelInfoEntry: PeerInfoEntry {
             return GeneralInteractedRowItem(initialSize, stableId: stableId.hashValue, name: strings().peerInfoChannelAppearance, icon: theme.icons.profile_channel_color, type: .imageContext(generateSettingsMenuPeerColorsLabelIcon(peer: peer.peer, context: arguments.context), ""), viewType: viewType, action: {
                 arguments.openNameColor(peer: peer.peer)
             }, afterNameImage: level == 0 ? generateDisclosureActionBoostLevelBadgeImage(text: strings().boostBadgeLevelPLus(1)) : nil)
-        case let .stats(_, datacenterId, monetization, viewType):
+        case let .stats(_, datacenterId, monetization, stars, viewType):
             return GeneralInteractedRowItem(initialSize, stableId: stableId.hashValue, name: strings().peerInfoStatAndBoosts, icon: theme.icons.profile_channel_stats, type: .next, viewType: viewType, action: {
-                arguments.stats(datacenterId, monetization: monetization)
+                arguments.stats(datacenterId, monetization: monetization, stars: stars)
             })
         case let .setTitle(_, text, viewType):
             return InputDataRowItem(initialSize, stableId: stableId.hashValue, mode: .plain, error: nil, viewType: viewType, currentText: text, placeholder: nil, inputPlaceholder: strings().peerInfoChannelTitlePleceholder, filter: { $0 }, updated: arguments.updateEditingName, limit: 255)
@@ -1405,7 +1405,7 @@ func channelInfoEntries(view: PeerView, arguments:PeerInfoArguments, mediaTabsDa
             entries.append(.members(sectionId: .manage, count: membersCount, viewType: .innerItem))
 
             if let cachedData = view.cachedData as? CachedChannelData, cachedData.flags.contains(.canViewStats) {
-                entries.append(.stats(section: .manage, datacenterId: cachedData.statsDatacenterId, monetization: cachedData.flags.contains(.canViewRevenue), viewType: .innerItem))
+                entries.append(.stats(section: .manage, datacenterId: cachedData.statsDatacenterId, monetization: cachedData.flags.contains(.canViewRevenue), stars: cachedData.flags.contains(.canViewStarsRevenue), viewType: .innerItem))
             }
 
             entries.append(.blocked(sectionId: .manage, count: blockedCount, viewType: .innerItem))

Telegram-Mac/ChannelStatsSegmentController.swift

@@ -15,7 +15,7 @@ import TGUIKit
 private final class CenterView : TitledBarView {
     let segment: CatalinaStyledSegmentController
     var select:((Int)->Void)? = nil
-    init(controller: ViewController, monetization: Bool) {
+    init(controller: ViewController, monetization: Bool, stars: Bool) {
         self.segment = CatalinaStyledSegmentController(frame: NSMakeRect(0, 0, 240, 30))
         super.init(controller: controller)
 
@@ -30,13 +30,14 @@ private final class CenterView : TitledBarView {
             segment.add(segment: .init(title: strings().statsMonetization, handler: { [weak self] in
                 self?.select?(2)
             }))
-//            
+        }
+        
+        if stars {
             segment.add(segment: .init(title: strings().statsStars, handler: { [weak self] in
                 self?.select?(3)
             }))
         }
 
-        
         self.addSubview(segment.view)
 
         updateLocalizationAndTheme(theme: theme)
@@ -70,16 +71,19 @@ final class ChannelStatsSegmentController : SectionViewController {
     private let stars: ViewController?
     private let context: AccountContext
     private let peerId: PeerId
-    init(_ context: AccountContext, peerId: PeerId, isChannel: Bool, monetization: Bool = false) {
+    init(_ context: AccountContext, peerId: PeerId, isChannel: Bool, monetization: Bool = false, stars: Bool = false) {
         self.context = context
         self.peerId = peerId
         if isChannel {
             self.stats = ChannelStatsViewController(context, peerId: peerId)
             if monetization {
                 self.monetization = FragmentMonetizationController(context: context, peerId: peerId)
-                self.stars = FragmentStarMonetizationController(context: context, peerId: peerId, revenueContext: nil)
             } else {
                 self.monetization = nil
+            }
+            if stars {
+                self.stars = FragmentStarMonetizationController(context: context, peerId: peerId, revenueContext: nil)
+            } else {
                 self.stars = nil
             }
         } else {
@@ -104,7 +108,7 @@ final class ChannelStatsSegmentController : SectionViewController {
     }
 
     override func getCenterBarViewOnce() -> TitledBarView {
-        return CenterView(controller: self, monetization: self.monetization != nil)
+        return CenterView(controller: self, monetization: self.monetization != nil, stars: self.stars != nil)
     }
 
     override func getRightBarViewOnce() -> BarView {

Telegram-Mac/ContextMediaRowItem.swift

@@ -255,6 +255,8 @@ class ContextMediaRowView: TableRowView, ModalPreviewRowViewProtocol {
                             effectiveFile = FileMediaReference.savedSticker(media: media)
                         case .recentSticker(media: let media):
                             effectiveFile = FileMediaReference.recentSticker(media: media)
+                        case let .starsTransaction(transaction, media):
+                            effectiveFile = FileMediaReference.starsTransaction(transaction: transaction, media: media)
                         }
 
                     }

Telegram-Mac/ImageCompression.swift

@@ -51,7 +51,7 @@ public func extractImageExtraScans(_ data: Data) -> [Int] {
 }
 
 public func compressImageToJPEG(_ cgImage: CGImage, quality: Float) -> Data? {
-    if let result = compressJPEGData(cgImage) {
+    if let result = compressJPEGData(cgImage, Int32(quality * 100.0)) {
         return result
     }
 

Telegram-Mac/Info.plist

@@ -35,7 +35,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>265332</string>
+	<string>265350</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

Telegram-Mac/PasscodeLockController.swift

@@ -410,15 +410,15 @@ class PasscodeLockController: ModalViewController {
     override func windowDidBecomeKey() {
         super.windowDidBecomeKey()
 
-        if NSApp.isActive {
+        if NSApp.isActive, useTouchId {
             callTouchId()
         }
     }
 
     override func windowDidResignKey() {
         super.windowDidResignKey()
-        if !NSApp.isActive {
-           // invalidateTouchId()
+        if !NSApp.isActive, useTouchId {
+            invalidateTouchId()
         }
     }
 

Telegram-Mac/PaymentsCheckoutController.swift

@@ -440,6 +440,13 @@ func PaymentsCheckoutController(context: AccountContext, source: BotPaymentInvoi
         completion = nil
     }
 
+    var getController:(()->ViewController?)? = nil
+    
+    
+    let window:()->Window = {
+        return bestWindow(context, getController?())
+    }
+    
     var close:(()->Void)? = nil
     let actionsDisposable = DisposableSet()
 
@@ -456,7 +463,7 @@ func PaymentsCheckoutController(context: AccountContext, source: BotPaymentInvoi
 
             let canSave = paymentForm.canSaveCredentials && !paymentForm.passwordMissing
             if canSave {
-                verifyAlert_button(for: context.window, information: strings().checkoutInfoSaveInfoHelp, ok: strings().modalYes, cancel: strings().modalNotNow, successHandler: { _ in
+                verifyAlert_button(for: window(), information: strings().checkoutInfoSaveInfoHelp, ok: strings().modalYes, cancel: strings().modalNotNow, successHandler: { _ in
                     updateState { current in
                         var current = current
                         current.paymentMethod = .webToken(.init(title: token.title, data: token.data, saveOnServer: true))
@@ -477,7 +484,7 @@ func PaymentsCheckoutController(context: AccountContext, source: BotPaymentInvoi
                 }
             }
 
-        })), for: context.window)
+        })), for: window())
     }
 
     let arguments = Arguments(context: context, openForm: { focus in
@@ -490,7 +497,7 @@ func PaymentsCheckoutController(context: AccountContext, source: BotPaymentInvoi
                     current.validatedInfo = validatedInfo
                     return current
                 }
-            }), for: context.window)
+            }), for: window())
         }
     }, openShippingMethod: {
         let state = stateValue.with({ $0 })
@@ -501,7 +508,7 @@ func PaymentsCheckoutController(context: AccountContext, source: BotPaymentInvoi
                     current.shippingOptionId = id
                     return current
                 }
-            }), for: context.window)
+            }), for: window())
         }
     }, openPaymentMethod: {
         if let form = stateValue.with({ $0.form }), let value = parseRequestedPaymentMethod(paymentForm: form) {
@@ -513,7 +520,7 @@ func PaymentsCheckoutController(context: AccountContext, source: BotPaymentInvoi
                         current.paymentMethod = method
                         return current
                     }
-                }), for: context.window)
+                }), for: window())
             }
 
             let methods = availablePaymentMethods(form: form, current: nil)
@@ -523,7 +530,7 @@ func PaymentsCheckoutController(context: AccountContext, source: BotPaymentInvoi
                     current.paymentMethod = .savedCredentials(selected)
                     return current
                 }
-            }, addNew: openNewCard, addPaymentMethod: addPaymentMethod), for: context.window)
+            }, addNew: openNewCard, addPaymentMethod: addPaymentMethod), for: window())
 
         } else if let paymentForm = stateValue.with({ $0.form }) {
             if let url = paymentForm.url {
@@ -546,7 +553,7 @@ func PaymentsCheckoutController(context: AccountContext, source: BotPaymentInvoi
 
                 let paySignal = context.engine.payments.sendBotPaymentForm(source: source, formId: form.id, validatedInfoId: state.validatedInfo?.id, shippingOptionId: state.shippingOptionId?.id, tipAmount: state.form?.invoice.tip != nil ? (state.currentTip ?? 0) : nil, credentials: credentials)
 
-                _ = showModalProgress(signal: paySignal, for: context.window).start(next: { result in
+                _ = showModalProgress(signal: paySignal, for: window()).start(next: { result in
 
                     let success:(Bool)->Void = { value in
                         if value {
@@ -557,14 +564,14 @@ func PaymentsCheckoutController(context: AccountContext, source: BotPaymentInvoi
 
                             let total = formatCurrencyAmount(totalValue, currency: form.invoice.currency)
 
-                            showModalText(for: context.window, text: strings().paymentsPaid(total, invoice.title))
+                            showModalText(for: window(), text: strings().paymentsPaid(total, invoice.title))
                         }
                     }
                     switch result {
                     case .done:
                         success(true)
                     case let .externalVerificationRequired(url: url):
-                        showModal(with: PaymentWebInteractionController(context: context, url: url, intent: .externalVerification(success)), for: context.window)
+                        showModal(with: PaymentWebInteractionController(context: context, url: url, intent: .externalVerification(success)), for: window())
                     }
                 }, error: { error in
                     let text: String
@@ -578,7 +585,7 @@ func PaymentsCheckoutController(context: AccountContext, source: BotPaymentInvoi
                     case .precheckoutFailed:
                         text = strings().checkoutErrorPrecheckoutFailed
                     }
-                    alert(for: context.window, info: text)
+                    alert(for: window(), info: text)
                     invokeCompletion(.failed)
                     close?()
                 })
@@ -596,7 +603,7 @@ func PaymentsCheckoutController(context: AccountContext, source: BotPaymentInvoi
                         if value {
                             pay()
                         } else {
-                            verifyAlert_button(for: context.window, header: strings().paymentsWarninTitle, information: strings().paymentsWarningText(botPeer.compactDisplayTitle, providerPeer.compactDisplayTitle, botPeer.compactDisplayTitle, botPeer.compactDisplayTitle), successHandler: { _ in
+                            verifyAlert_button(for: window(), header: strings().paymentsWarninTitle, information: strings().paymentsWarningText(botPeer.compactDisplayTitle, providerPeer.compactDisplayTitle, botPeer.compactDisplayTitle, botPeer.compactDisplayTitle), successHandler: { _ in
                                 pay()
                                 _ = ApplicationSpecificNotice.setBotPaymentLiability(accountManager: context.sharedContext.accountManager, peerId: botPeer.id).start()
                             })
@@ -634,15 +641,15 @@ func PaymentsCheckoutController(context: AccountContext, source: BotPaymentInvoi
                                         }
                                     })
                                 }
-                            }), for: context.window)
+                            }), for: window())
                         }
                     })
                 }
             }
         case let .webToken(token):
             pay(.generic(data: token.data, saveOnServer: token.saveOnServer))
         default:
-            alert(for: context.window, info: "Unsupported")
+            alert(for: window(), info: "Unsupported")
             return
         }
     }, selectTip: { value in
@@ -733,10 +740,14 @@ func PaymentsCheckoutController(context: AccountContext, source: BotPaymentInvoi
         close?()
         switch error {
         case .generic:
-            alert(for: context.window, info: strings().unknownError)
+            alert(for: window(), info: strings().unknownError)
         }
     }))
 
+    getController = { [weak controller] in
+        return controller
+    }
+    
 
     controller.onDeinit = {
         actionsDisposable.dispose()