Merge branch 'release'

Author: overtake

.gitignore

@@ -10,4 +10,9 @@ core-xprojects/libopus/build
 core-xprojects/ffmpeg/build
 core-xprojects/webrtc/build
 core-xprojects/libvpx/build
-
+core-xprojects/OpenH264/build
+submodules/libwebp/SharedHeaders
+submodules/Mozjpeg/SharedHeaders
+submodules/OpenSSLEncryptionProvider/SharedHeaders
+core-xprojects/dav1d/build
+core-xprojects/tde2e/build

Telegram-Mac.xcworkspace/contents.xcworkspacedata

@@ -57,7 +57,7 @@ class AccountInfoItem: GeneralRowItem {
         self.titleActiveLayout = .init(activeTitle, maximumNumberOfLines: 1)
 
         if let phone = peer.phone {
-            _ = attr.append(string: formatPhoneNumber(phone), color: theme.colors.grayText, font: .normal(.text))
+            _ = attr.append(string: formatPhoneNumber(context: context, number: phone), color: theme.colors.grayText, font: .normal(.text))
         }
         if let username = peer.username, !username.isEmpty {
             if !attr.string.isEmpty {
@@ -104,7 +104,7 @@ class AccountInfoItem: GeneralRowItem {
         textLayout.measure(width: width - 140)
         activeTextlayout.measure(width: width - 140)
 
-        let hasControl = PremiumStatusControl.hasControl(peer)
+        let hasControl = PremiumStatusControl.hasControl(peer, left: false)
 
         self.titleLayout.measure(width: width - 140 - (hasControl ? 45 : 0))
         self.titleActiveLayout.measure(width: width - 140 - (hasControl ? 45 : 0))
@@ -333,7 +333,7 @@ private class AccountInfoView : GeneralContainableRowView {
                 self.statusControl = nil
             }
 
-            let control = PremiumStatusControl.control(item.peer, account: item.context.account, inlinePacksContext: item.context.inlinePacksContext, isSelected: item.isSelected, isBig: true, cached: self.statusControl, animated: animated)
+            let control = PremiumStatusControl.control(item.peer, account: item.context.account, inlinePacksContext: item.context.inlinePacksContext, left: false, isSelected: item.isSelected, isBig: true, cached: self.statusControl, animated: animated)
 
             if let control = control {
                 self.statusControl = control
@@ -380,7 +380,7 @@ private class AccountInfoView : GeneralContainableRowView {
                         self.photoVideoView!.isEventLess = true
                         self.photoVideoView!.frame = self.avatarView.frame
 
-                        let file = TelegramMediaFile(fileId: MediaId(namespace: 0, id: 0), partialReference: nil, resource: video.resource, previewRepresentations: first.image.representations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: video.resource.size, attributes: [])
+                        let file = TelegramMediaFile(fileId: MediaId(namespace: 0, id: 0), partialReference: nil, resource: video.resource, previewRepresentations: first.image.representations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: video.resource.size, attributes: [], alternativeRepresentations: [])
 
                         let mediaPlayer = MediaPlayer(postbox: item.context.account.postbox, userLocation: .peer(item.context.peerId), userContentType: .avatar, reference: MediaResourceReference.standalone(resource: file.resource), streamable: true, video: true, preferSoftwareDecoding: false, enableSound: false, fetchAutomatically: true)
 

Telegram-Mac/AccountContext.swift

@@ -418,7 +418,7 @@ private enum AccountInfoEntry : TableItemListNodeEntry {
                 arguments.openPremium(true)
             }, border:[BorderType.Right], inset:NSEdgeInsets(left: 12, right: 12))
         case let .giftPremium(_, viewType):
-            return GeneralInteractedRowItem(initialSize, stableId: stableId, name: strings().accountSettingsGiftPremium, icon: theme.icons.settingsGiftPremium, activeIcon: theme.icons.settingsGiftPremium, type: .next, viewType: viewType, action: arguments.giftPremium, border:[BorderType.Right], inset:NSEdgeInsets(left: 12, right: 12))
+            return GeneralInteractedRowItem(initialSize, stableId: stableId, name: strings().accountSettingsSendGift, icon: theme.icons.settingsGiftPremium, activeIcon: theme.icons.settingsGiftPremium, type: .next, viewType: viewType, action: arguments.giftPremium, border:[BorderType.Right], inset:NSEdgeInsets(left: 12, right: 12))
         case let .stars(_, stars, viewType):
             return GeneralInteractedRowItem(initialSize, stableId: stableId, name: strings().accountSettingsStars, icon: theme.icons.settingsStars, activeIcon: theme.icons.settingsStars, type: .nextContext(stars > 0 ? "\(stars)" : ""), viewType: viewType, action: arguments.stars, border:[BorderType.Right], inset:NSEdgeInsets(left: 12, right: 12))
         case let .faq(_, viewType):
@@ -635,8 +635,8 @@ private func accountInfoEntries(peerView:PeerView, context: AccountContext, acco
 
         let stars_purchase_blocked = context.appConfiguration.getBoolValue("stars_purchase_blocked", orElse: true)
 
-        if !stars_purchase_blocked, let stars, stars.balance > 0 || !stars.transactions.isEmpty  {
-            entries.append(.stars(index: index, count: stars.balance, viewType: .singleItem))
+        if !stars_purchase_blocked, let stars, stars.balance.value > 0 || !stars.transactions.isEmpty  {
+            entries.append(.stars(index: index, count: stars.balance.value, viewType: .singleItem))
             index += 1
         }
 
@@ -813,6 +813,17 @@ class AccountViewController : TelegramGenericViewController<AccountControllerVie
 
     private let settings: Promise<(AccountPrivacySettings?, WebSessionsContextState, (ProxySettings, ConnectionStatus), (Bool, Bool))> = Promise()
 
+    func updateMessagesPrivacy(noPaidMessages: SelectivePrivacySettings, globalSettings: GlobalPrivacySettings) {
+        let privacy = self.settings.get() |> deliverOnMainQueue |> take(1)
+        _ = privacy.startStandalone(next: { [weak self] privacy, web, proxy, value in
+            var privacy = privacy
+            privacy?.noPaidMessages = noPaidMessages
+            privacy?.globalSettings = globalSettings
+            DispatchQueue.main.async {
+                self?.settings.set(.single((privacy, web, proxy, value)))
+            }
+        })
+    }
 
     func updatePrivacy(_ updated: SelectivePrivacySettings, kind: SelectivePrivacySettingsKind) {
         let privacy = self.settings.get() |> deliverOnMainQueue |> take(1)
@@ -838,6 +849,8 @@ class AccountViewController : TelegramGenericViewController<AccountControllerVie
                 privacy?.bio = updated
             case .birthday:
                 privacy?.birthday = updated
+            case .gifts:
+                privacy?.giftsAutoSave = updated
             }
             DispatchQueue.main.async {
                 self?.settings.set(.single((privacy, web, proxy, value)))
@@ -909,8 +922,8 @@ class AccountViewController : TelegramGenericViewController<AccountControllerVie
 
 
         let setStatus:(Control, TelegramUser)->Void = { control, peer in
-            let callback:(TelegramMediaFile, Int32?, CGRect?)->Void = { file, timeout, fromRect in
-                context.reactions.setStatus(file, peer: peer, timestamp: context.timestamp, timeout: timeout, fromRect: fromRect)
+            let callback:(TelegramMediaFile, StarGift.UniqueGift?, Int32?, CGRect?)->Void = { file, starGift, timeout, fromRect in
+                context.reactions.setStatus(file, peer: peer, timestamp: context.timestamp, timeout: timeout, fromRect: fromRect, starGift: starGift)
             }
             if control.popover == nil {
                 showPopover(for: control, with: PremiumStatusController(context, callback: callback, peer: peer), edge: .maxY, inset: NSMakePoint(-80, -35), static: true, animationMode: .reveal)
@@ -941,7 +954,7 @@ class AccountViewController : TelegramGenericViewController<AccountControllerVie
                     navigation.push(PremiumBoardingController(context: context, source: .business_standalone), false)
                 }
             } else {
-                showModal(with: PremiumBoardingController(context: context, source: business ? .business : .settings), for: context.window)
+                prem(with: PremiumBoardingController(context: context, source: business ? .business : .settings), for: context.window)
             }
         }, giftPremium: {
             multigift(context: context)

Telegram-Mac/AccountInfoItem.swift

@@ -146,7 +146,7 @@ func AddContactModalController(_ context: AccountContext) -> InputDataModalContr
             return state
                 .withUpdatedFirstName(data[_id_input_first_name]?.stringValue ?? "")
                 .withUpdatedLastName(data[_id_input_last_name]?.stringValue ?? "")
-                .withUpdatedPhoneNumber(formatPhoneNumber(data[_id_input_phone_number]?.stringValue ?? ""))
+                .withUpdatedPhoneNumber(formatPhoneNumber(context: context, number: data[_id_input_phone_number]?.stringValue ?? ""))
                 .withUpdatedError(nil, for: _id_input_first_name)
                 .withUpdatedError(nil, for: _id_input_last_name)
                 .withUpdatedError(nil, for: _id_input_phone_number)

Telegram-Mac/AccountViewController.swift

@@ -95,6 +95,7 @@ private func generateParabollicMotionKeyframes(from sourcePoint: CGPoint, to tar
 
 
 enum ContextReaction : Equatable {
+    case stars(file: TelegramMediaFile, isSelected: Bool)
     case builtin(value: MessageReaction.Reaction, staticFile: TelegramMediaFile, selectFile: TelegramMediaFile, appearFile: TelegramMediaFile, isSelected: Bool)
     case custom(value: MessageReaction.Reaction, fileId: Int64, TelegramMediaFile?, isSelected: Bool)
 
@@ -104,6 +105,8 @@ enum ContextReaction : Equatable {
             return staticFile
         case let .custom(_, _, file, _ ):
             return file
+        case let .stars(file, _):
+            return file
         }
     }
     var fileId: Int64 {
@@ -112,6 +115,8 @@ enum ContextReaction : Equatable {
             return staticFile.fileId.id
         case let .custom(_, fileId, _, _):
             return fileId
+        case let .stars(file, _):
+            return file.fileId.id
         }
     }
     var isSelected: Bool {
@@ -120,6 +125,8 @@ enum ContextReaction : Equatable {
             return isSelected
         case let .custom(_, _, _, isSelected):
             return isSelected
+        case let .stars(_, isSelected):
+            return isSelected
         }
     }
     func selectAnimation(_ context: AccountContext) -> Signal<TelegramMediaFile, NoError> {
@@ -128,6 +135,8 @@ enum ContextReaction : Equatable {
             return .single(selectAnimation)
         case .custom:
             return .complete()
+        case let .stars(file, _):
+            return .single(file)
         }
     }
     var selectedAnimation: TelegramMediaFile? {
@@ -136,6 +145,8 @@ enum ContextReaction : Equatable {
             return selectAnimation
         case let .custom(_, _, file, _ ):
             return file
+        case let .stars(file, _):
+            return file
         }
     }
     var appearAnimation: TelegramMediaFile? {
@@ -144,6 +155,8 @@ enum ContextReaction : Equatable {
             return appearAnimation
         case .custom:
             return nil
+        case .stars:
+            return nil
         }
     }
     var value: MessageReaction.Reaction {
@@ -152,6 +165,8 @@ enum ContextReaction : Equatable {
             return value
         case let .custom(value, _, _, _):
             return value
+        case .stars:
+            return .stars
         }
     }
 
@@ -178,7 +193,11 @@ final class ContextAddReactionsListView : View, StickerFramesCollector  {
         private var selectionView : View?
         private let presentation: TelegramPresentationTheme
 
-        required init(frame frameRect: NSRect, context: AccountContext, reaction: ContextReaction, add: @escaping(MessageReaction.Reaction, Bool, NSRect?)->Void, theme: TelegramPresentationTheme) {
+        private var starEffect: StarsButtonEffectLayer?
+        
+        private var starBackground: SimpleGradientLayer?
+        
+        required init(frame frameRect: NSRect, context: AccountContext, reaction: ContextReaction, add: @escaping(MessageReaction.Reaction, Bool, NSRect?)->Void, theme: TelegramPresentationTheme, message: Message?) {
 
             let size: NSSize = reaction.isSelected ? NSMakeSize(25, 24) : NSMakeSize(frameRect.width, 30)
             let rect = CGRect(origin: .zero, size: size)
@@ -192,6 +211,32 @@ final class ContextAddReactionsListView : View, StickerFramesCollector  {
 
             super.init(frame: frameRect)
 
+            self.layer?.masksToBounds = false
+            
+            if case .stars = reaction.value {
+                
+                if !reaction.isSelected {
+                    starBackground = .init(frame: frameRect.size.bounds.insetBy(dx: -2, dy: -2))
+                    self.layer?.addSublayer(starBackground!)
+                    
+                    starBackground?.colors =  [NSColor(0xFFAC04).withAlphaComponent(0.15),
+                                               NSColor(0xFFCA35).withAlphaComponent(0.1),
+                                               NSColor(0xffffff).withAlphaComponent(0.0)].map { $0.cgColor }
+                    
+                    starBackground?.startPoint = NSMakePoint(0, 0.5)
+                    starBackground?.endPoint = NSMakePoint(1, 0.5)
+                }
+                
+                
+
+                
+                starEffect = .init()
+                starEffect?.frame = rect
+                starEffect?.update(size: rect.size)
+                self.layer?.addSublayer(starEffect!)
+            }
+
+            
             let imageView: InlineStickerView
             if let file = reaction.selectedAnimation {
                 imageView = InlineStickerView(account: context.account, file: file, size: size, isPlayable: false)
@@ -203,13 +248,16 @@ final class ContextAddReactionsListView : View, StickerFramesCollector  {
 
             addSubview(player)
             self.player.isHidden = false
-
+            
+          
 
             switch reaction {
             case .builtin:
                 self.layer?.cornerRadius = 0
             case .custom:
                 self.layer?.cornerRadius = 4
+            case .stars:
+                self.layer?.cornerRadius = 0
             }
 
             stateDisposable.set(player.state.start(next: { [weak self] state in
@@ -228,8 +276,12 @@ final class ContextAddReactionsListView : View, StickerFramesCollector  {
             }))
 
 
-            let signal = reaction.selectAnimation(context) |> mapToSignal {
-                context.account.postbox.mediaBox.resourceData($0.resource, attemptSynchronously: true)
+            let signal = reaction.selectAnimation(context) |> mapToSignal { file in
+                if let resource = file.resource as? LocalBundleResource, let path = resource.path {
+                    return .single(MediaResourceData(path: path, offset: 0, size: 0, complete: true))
+                } else {
+                    return context.account.postbox.mediaBox.resourceData(file.resource, attemptSynchronously: true)
+                }
             }
             |> filter {
                 $0.complete
@@ -239,14 +291,15 @@ final class ContextAddReactionsListView : View, StickerFramesCollector  {
             disposable.set(signal.start(next: { [weak self] resourceData in
                 if let data = try? Data(contentsOf: URL.init(fileURLWithPath: resourceData.path)) {
                     self?.selectAnimationData = data
-                    if isLite {
+                    if !isLite {
                         let apply:()->Void = {
                             self?.apply(data, key: "select", policy: .framesCount(1))
                         }
                         apply()
                     }
                 }
             }))
+            
             set(handler: { control in
                 if let window = control.window {
                     let wrect = control.convert(control.frame.size.bounds, to: nil)
@@ -255,14 +308,30 @@ final class ContextAddReactionsListView : View, StickerFramesCollector  {
                 }
             }, for: .Click)
 
-            contextMenu = {
-                let menu = ContextMenu()
-                menu.addItem(ContextMenuItem(strings().chatContextReactionQuick, handler: {
-                    context.reactions.updateQuick(reaction.value)
-                }, itemImage: MenuAnimation.menu_add_to_favorites.value))
-                return menu
+            if case .stars = reaction.value, let message {
+                self.set(handler: { _ in
+                    showModal(with: Star_ReactionsController(context: context, message: message), for: context.window)
+                    AppMenu.closeAll()
+                }, for: .RightDown)
+                
+                self.set(handler: { _ in
+                    showModal(with: Star_ReactionsController(context: context, message: message), for: context.window)
+                    AppMenu.closeAll()
+                }, for: .LongMouseDown)
+            } else {
+                
+                contextMenu = {
+                    let menu = ContextMenu()
+                    menu.addItem(ContextMenuItem(strings().chatContextReactionQuick, handler: {
+                        context.reactions.updateQuick(reaction.value)
+                    }, itemImage: MenuAnimation.menu_add_to_favorites.value))
+                    return menu
+                }
             }
 
+            
+            
+            
             if reaction.isSelected {
                 let view = View()
                 self.selectionView = view
@@ -435,7 +504,7 @@ final class ContextAddReactionsListView : View, StickerFramesCollector  {
     private let presentation: TelegramPresentationTheme
     private let hasBubble: Bool
     private let aboveText: TextViewLayout?
-    required init(frame frameRect: NSRect, context: AccountContext, list: [ContextReaction], add:@escaping(MessageReaction.Reaction, Bool, NSRect?)->Void, radiusLayer: CGFloat? = 15, revealReactions:((ContextAddReactionsListView & StickerFramesCollector)->Void)? = nil, presentation: TelegramPresentationTheme = theme, hasBubble: Bool = true, aboveText: TextViewLayout? = nil) {
+    required init(frame frameRect: NSRect, context: AccountContext, list: [ContextReaction], add:@escaping(MessageReaction.Reaction, Bool, NSRect?)->Void, radiusLayer: CGFloat? = 15, revealReactions:((ContextAddReactionsListView & StickerFramesCollector)->Void)? = nil, presentation: TelegramPresentationTheme = theme, hasBubble: Bool = true, aboveText: TextViewLayout? = nil, message: Message? = nil) {
         self.list = list
         self.showMore = ShowMore(frame: NSMakeRect(0, 0, 34, 34), theme: presentation)
         self.revealReactions = revealReactions
@@ -541,7 +610,7 @@ final class ContextAddReactionsListView : View, StickerFramesCollector  {
         for reaction in list {
             let add:(ContextReaction)->Void = { reaction in
                 let itemSize = size.bounds
-                let reaction = ReactionView(frame: NSMakeRect(x, y, itemSize.width, itemSize.height), context: context, reaction: reaction, add: add, theme: presentation)
+                let reaction = ReactionView(frame: NSMakeRect(x, y, itemSize.width, itemSize.height), context: context, reaction: reaction, add: add, theme: presentation, message: message)
 
                 self.documentView.addSubview(reaction)
                 x += size.width + 4