bugfixes

Author: Mike Renoir

Telegram-Mac/AccountInfoItem.swift

@@ -82,8 +82,8 @@ class AccountInfoItem: GeneralRowItem {
 
         let hasControl = PremiumStatusControl.hasControl(peer)
 
-        self.titleLayout.measure(width: width - 140 - (hasControl ? 35 : 0))
-        self.titleActiveLayout.measure(width: width - 140 - (hasControl ? 35 : 0))
+        self.titleLayout.measure(width: width - 140 - (hasControl ? 45 : 0))
+        self.titleActiveLayout.measure(width: width - 140 - (hasControl ? 45 : 0))
         return success
     }
 
@@ -345,7 +345,7 @@ private class AccountInfoView : GeneralContainableRowView {
 
         let h: CGFloat = statusControl != nil ? 6 : 0
 
-        container.setFrameSize(NSMakeSize(max(titleView.frame.width, textView.frame.width + (statusControl != nil ? 35 : 0)), titleView.frame.height + textView.frame.height + 2 + h))
+        container.setFrameSize(NSMakeSize(max(titleView.frame.width, textView.frame.width + (statusControl != nil ? 40 : 0)), titleView.frame.height + textView.frame.height + 2 + h))
 
         titleView.setFrameOrigin(0, h)
         textView.setFrameOrigin(0, titleView.frame.maxY + 2)

Telegram-Mac/AddReactionManager.swift

@@ -94,7 +94,7 @@ final class ContextAddReactionsListView : View, StickerFramesCollector  {
             let rect = CGRect(origin: .zero, size: size)
 
             self.player = LottiePlayerView(frame: rect)
-            self.imageView = InlineStickerView(account: context.account, inlinePacksContext: context.inlinePacksContext, emoji: .init(fileId: reaction.fileId, file: reaction.file, emoji: ""), size: size)
+            self.imageView = InlineStickerView(account: context.account, inlinePacksContext: context.inlinePacksContext, emoji: .init(fileId: reaction.fileId, file: reaction.file, emoji: ""), size: size, shimmerColor: .init(circle: true))
             self.reaction = reaction
             self.context = context
 

Telegram-Mac/ChatReactionsView.swift

@@ -34,6 +34,33 @@ extension MessageReaction.Reaction {
     }
 }
 
+extension MessageReaction {
+    static func <(lhs: MessageReaction, rhs: MessageReaction) -> Bool {
+        var lhsCount = lhs.count
+        if lhs.chosenOrder != nil {
+            lhsCount -= 1
+        }
+        var rhsCount = rhs.count
+        if rhs.chosenOrder != nil {
+            rhsCount -= 1
+        }
+        if lhsCount != rhsCount {
+            return lhsCount > rhsCount
+        }
+        
+        if (lhs.chosenOrder != nil) != (rhs.chosenOrder != nil) {
+            if lhs.chosenOrder != nil {
+                return true
+            } else {
+                return false
+            }
+        } else if let lhsIndex = lhs.chosenOrder, let rhsIndex = rhs.chosenOrder {
+            return lhsIndex < rhsIndex
+        }
+        return false
+    }
+}
+
 final class ChatReactionsLayout {
 
     struct Theme : Equatable {
@@ -160,14 +187,14 @@ final class ChatReactionsLayout {
         func getInlineLayer(_ mode: ChatReactionsLayout.Mode) -> InlineStickerItemLayer {
             switch source {
             case let .builtin(reaction):
-                return .init(account: context.account, file: reaction.staticIcon, size: presentation.reactionSize)
+                return .init(account: context.account, file: reaction.staticIcon, size: presentation.reactionSize, shimmerColor: .init(color: presentation.bgColor.darker(), circle: true))
             case let .custom(fileId, file, _):
                 var reactionSize: NSSize = presentation.reactionSize
                 if mode == .full {
                     reactionSize.width += 3
                     reactionSize.height += 3
                 }
-                return .init(account: context.account, inlinePacksContext: context.inlinePacksContext, emoji: .init(fileId: fileId, file: file, emoji: ""), size: reactionSize)
+                return .init(account: context.account, inlinePacksContext: context.inlinePacksContext, emoji: .init(fileId: fileId, file: file, emoji: ""), size: reactionSize, shimmerColor: .init(color: presentation.bgColor.darker(), circle: true))
             }
         }
 
@@ -431,21 +458,7 @@ final class ChatReactionsLayout {
             }
         }
 
-        let sorted = reactions.reactions.sorted(by: { lhs, rhs in
-            if lhs.isSelected != rhs.isSelected {
-                if lhs.isSelected {
-                    return true
-                } else {
-                    return false
-                }
-            } else {
-                if let lhsIndex = lhs.chosenOrder, let rhsIndex = rhs.chosenOrder {
-                    return lhsIndex < rhsIndex
-                } else {
-                    return lhs.count > rhs.count
-                }
-            }
-        })
+        let sorted = reactions.reactions.sorted(by: <)
 
 
         self.reactions = sorted.compactMap { reaction in
@@ -474,6 +487,9 @@ final class ChatReactionsLayout {
                 if let peer = message.peers[message.id.peerId], peer.isChannel {
                     recentPeers = []
                 }
+                if reactions.reactions.reduce(0, { $0 + $1.count }) > 3 {
+                    recentPeers = []
+                }
 
                 if message.id.peerId.namespace == Namespaces.Peer.CloudUser {
                     if mode == .full {
@@ -627,7 +643,7 @@ class AnimationLayerContainer : View {
     override func layout() {
         super.layout()
         if let imageLayer = self.imageLayer {
-            imageLayer.frame = focus(imageLayer.frame.size)
+            imageLayer.frame = self.bounds
         }
     }
 

Telegram-Mac/ChatRowItem.swift

@@ -2733,7 +2733,7 @@ class ChatRowItem: TableRowItem {
                 var accessToAll: Bool
 
                 let isSelected:(MessageReaction.Reaction)->Bool = { reaction in
-                    return message.effectiveReactions?.contains(where: { $0.value == reaction }) ?? false
+                    return message.effectiveReactions?.contains(where: { $0.value == reaction && $0.isSelected }) ?? false
                 }
 
 

Telegram-Mac/CoreExtension.swift

@@ -614,21 +614,7 @@ public extension Message {
         var updated:[UpdateMessageReaction] = []
         if let reactions = self.effectiveReactions {
 
-            let sorted = reactions.sorted(by: { lhs, rhs in
-                if lhs.isSelected != rhs.isSelected {
-                    if lhs.isSelected {
-                        return true
-                    } else {
-                        return false
-                    }
-                } else {
-                    if let lhsIndex = lhs.chosenOrder, let rhsIndex = rhs.chosenOrder {
-                        return lhsIndex < rhsIndex
-                    } else {
-                        return lhs.count > rhs.count
-                    }
-                }
-            })
+            let sorted = reactions.sorted(by: <)
 
             updated = sorted.compactMap { value in
                 if value.isSelected {

Telegram-Mac/EmojiesController.swift

@@ -557,19 +557,41 @@ private func entries(_ state: State, arguments: Arguments) -> [InputDataEntry] {
                 }
                 popular = Array(top.prefix(perline * 2))
                 recent = state.recentReactionsItems
+                
+                
                 for item in state.topReactionsItems {
                     let recentContains = recent.contains(where: { $0.id.id == item.id.id })
                     let popularContains = popular.contains(where: { $0.id.id == item.id.id })
 
                     if !recentContains && !popularContains {
-                        switch item.content {
-                        case .builtin:
+                        if state.recentReactionsItems.isEmpty {
+                            switch item.content {
+                            case .builtin:
+                                recent.append(item)
+                            default:
+                                break
+                            }
+                        } else {
                             recent.append(item)
-                        default:
-                            break
                         }
                     }
                 }
+                
+                if let reactions = state.reactions?.reactions {
+                    for reaction in reactions {
+                        let recentContains = recent.contains(where: { $0.content.reaction == reaction.value })
+                        let popularContains = popular.contains(where: { $0.content.reaction == reaction.value })
+                        if !recentContains && !popularContains {
+                            switch reaction.value {
+                            case let .builtin(emoji):
+                                recent.append(.init(.builtin(emoji)))
+                            default:
+                                break
+                            }
+                        }
+                    }
+                }
+                
                 recent = Array(recent.prefix(perline * 10))
 //                } else {
 //                    popular = Array(state.topReactionsItems.prefix(perline * 2))

Telegram-Mac/Info.plist

@@ -35,7 +35,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>236327</string>
+	<string>236378</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.social-networking</string>
 	<key>LSFileQuarantineEnabled</key>

Telegram-Mac/InlineStickerItemLayer.swift

@@ -12,6 +12,7 @@ import TelegramCore
 import Postbox
 import TGUIKit
 import Accelerate
+import AppKit
 
 class InlineStickerLockLayer : SimpleLayer {
     private let lockedView: SimpleLayer = SimpleLayer()
@@ -250,14 +251,14 @@ private final class MultiTargetContextCache {
 }
 
 final class InlineStickerView: View {
-    init(account: Account, inlinePacksContext: InlineStickersContext?, emoji: ChatTextCustomEmojiAttribute, size: NSSize, getColors:((TelegramMediaFile)->[LottieColor])? = nil) {
-        let layer = InlineStickerItemLayer(account: account, inlinePacksContext: inlinePacksContext, emoji: emoji, size: size, getColors: getColors)
+    init(account: Account, inlinePacksContext: InlineStickersContext?, emoji: ChatTextCustomEmojiAttribute, size: NSSize, getColors:((TelegramMediaFile)->[LottieColor])? = nil, shimmerColor: InlineStickerItemLayer.Shimmer = .init(circle: false)) {
+        let layer = InlineStickerItemLayer(account: account, inlinePacksContext: inlinePacksContext, emoji: emoji, size: size, getColors: getColors, shimmerColor: shimmerColor)
         super.init(frame: size.bounds)
         self.layer = layer
         layer.superview = self
     }
-    init(account: Account, file: TelegramMediaFile, size: NSSize, getColors:((TelegramMediaFile)->[LottieColor])? = nil) {
-        let layer = InlineStickerItemLayer(account: account, file: file, size: size, getColors: getColors)
+    init(account: Account, file: TelegramMediaFile, size: NSSize, getColors:((TelegramMediaFile)->[LottieColor])? = nil, shimmerColor: InlineStickerItemLayer.Shimmer = .init(circle: false)) {
+        let layer = InlineStickerItemLayer(account: account, file: file, size: size, getColors: getColors, shimmerColor: shimmerColor)
         super.init(frame: size.bounds)
         self.layer = layer
         layer.superview = self
@@ -359,11 +360,23 @@ final class InlineStickerItemLayer : SimpleLayer {
 
     private let getColors:((TelegramMediaFile)->[LottieColor])?
 
-    init(account: Account, inlinePacksContext: InlineStickersContext?, emoji: ChatTextCustomEmojiAttribute, size: NSSize, playPolicy: LottiePlayPolicy = .loop, checkStatus: Bool = false, aspectFilled: Bool = false, getColors:((TelegramMediaFile)->[LottieColor])? = nil) {
+    struct Shimmer {
+        let color: NSColor
+        let circle: Bool
+        init(color:NSColor = NSColor(0x748391), circle: Bool) {
+            self.color = color
+            self.circle = circle
+        }
+    }
+    private let shimmerColor: Shimmer
+    
+    
+    init(account: Account, inlinePacksContext: InlineStickersContext?, emoji: ChatTextCustomEmojiAttribute, size: NSSize, playPolicy: LottiePlayPolicy = .loop, checkStatus: Bool = false, aspectFilled: Bool = false, getColors:((TelegramMediaFile)->[LottieColor])? = nil, shimmerColor: Shimmer = Shimmer(circle: false)) {
         self.aspectFilled = aspectFilled
         self.account = account
         self.playPolicy = playPolicy
         self.getColors = getColors
+        self.shimmerColor = shimmerColor
         super.init()
         self.frame = size.bounds
         self.initialize()
@@ -386,11 +399,12 @@ final class InlineStickerItemLayer : SimpleLayer {
         })
     }
 
-    init(account: Account, file: TelegramMediaFile, size: NSSize, playPolicy: LottiePlayPolicy = .loop, aspectFilled: Bool = false, getColors:((TelegramMediaFile)->[LottieColor])? = nil) {
+    init(account: Account, file: TelegramMediaFile, size: NSSize, playPolicy: LottiePlayPolicy = .loop, aspectFilled: Bool = false, getColors:((TelegramMediaFile)->[LottieColor])? = nil, shimmerColor: Shimmer = Shimmer(circle: false)) {
         self.aspectFilled = aspectFilled
         self.account = account
         self.playPolicy = playPolicy
         self.getColors = getColors
+        self.shimmerColor = shimmerColor
         super.init()
         self.initialize()
         self.file = file
@@ -449,20 +463,26 @@ final class InlineStickerItemLayer : SimpleLayer {
             }
         }
     }
+    private var isPreviousPreview: Bool = false
+    
     private var contextToken: (Int, MultiTargetContextCache.Key)?
     private func set(_ animation: LottieAnimation?, force: Bool = false) {
         self.animation = animation
         if let animation = animation, let isPlayable = self.isPlayable, isPlayable, !stopped {
-            weak var layer: CALayer? = self
+            weak var layer: InlineStickerItemLayer? = self
             let key: MultiTargetContextCache.Key = .init(key: animation.key, unique: unique)
             delayDisposable.set(delaySignal(MultiTargetContextCache.exists(key) || force ? 0 : 0.1).start(completed: { [weak self] in
-                                
+
                 self?.contextToken = (MultiTargetContextCache.create(animation, key: key, displayFrame: { image in
                     DispatchQueue.main.async {
                         layer?.contents = image
+                        if layer?.isPreviousPreview == true {
+                            layer?.animateContents()
+                            layer?.isPreviousPreview = false
+                        }
                     }
                 }, release: {
-                    
+
                 }, updateState: { [weak self] state in
                     self?.updateState(state)
                 }), key)
@@ -590,7 +610,7 @@ final class InlineStickerItemLayer : SimpleLayer {
             }
 
             fetchDisposable.set(fetchedMediaResource(mediaBox: account.postbox.mediaBox, reference: mediaResource).start())
-            
+            let shimmerColor = self.shimmerColor
             let fillColor: NSColor? = getColors?(file).first?.color
             let emptyColor: TransformImageEmptyColor?
             if let fillColor = fillColor {
@@ -612,28 +632,29 @@ final class InlineStickerItemLayer : SimpleLayer {
 
 
                 let signal: Signal<ImageDataTransformation, NoError>
-                    
+
                 switch file.mimeType {
                 case "image/webp":
                     signal = chatMessageSticker(postbox: account.postbox, file: reference, small: aspectSize.width <= 5, scale: System.backingScale, fetched: true)
                 default:
                     signal = chatMessageAnimatedSticker(postbox: account.postbox, file: reference, small: aspectSize.width <= 5, scale: System.backingScale, size: aspectSize, fetched: true, thumbAtFrame: 0, isVideo: file.fileName == "webm-preview" || file.isVideoSticker)
                 }
-                
+
                 var result: TransformImageResult?
                 _ = cachedMedia(media: file, arguments: arguments, scale: System.backingScale).start(next: { value in
                     result = value
                 })
                 if self.playerState != .playing {
                     self.contents = result?.image
-                    
+
                     if let image = result?.image {
                         self.preview = image
+                        self.isPreviousPreview = true
                     }
                 }
 
 
-                if self.preview == nil, let data = file.immediateThumbnailData, self.playerState != .playing {
+                if self.preview == nil, self.playerState != .playing {
 
                     let dataSignal = account.postbox.mediaBox.resourceData(mediaResource.resource)
                     |> map { $0.complete }
@@ -649,10 +670,19 @@ final class InlineStickerItemLayer : SimpleLayer {
                                 current = ShimmerLayer()
                                 self?.addSublayer(current)
                                 self?.shimmer = current
-                                current.frame = size.bounds.focus(aspectSize)
                             }
-                            current.update(backgroundColor: nil, foregroundColor: NSColor(rgb: 0x748391, alpha: 0.2), shimmeringColor: NSColor(rgb: 0x748391, alpha: 0.35), data: data, size: aspectSize)
-                            current.updateAbsoluteRect(size.bounds, within: aspectSize)
+                                                        
+                            let data = shimmerColor.circle ? nil : file.immediateThumbnailData
+                            
+                            let shimmerSize = aspectSize
+                            
+                            current.update(backgroundColor: nil, foregroundColor: shimmerColor.color.withAlphaComponent(0.2), shimmeringColor: shimmerColor.color.withAlphaComponent(0.35), data: data, size: shimmerSize)
+                            current.updateAbsoluteRect(size.bounds, within: shimmerSize)
+                            
+                            current.frame = size.bounds.focus(aspectSize)
+                            
+                            self?.isPreviousPreview = true
+
                         } else {
                             if let shimmer = self?.shimmer {
                                 shimmer.animateAlpha(from: 1, to: 0, duration: 0.2, removeOnCompletion: false, completion: { [weak shimmer] _ in
@@ -683,11 +713,15 @@ final class InlineStickerItemLayer : SimpleLayer {
                         let fontImage = fontContext?.generateImage()
                         return (TransformImageResult(image, context?.isHighQuality ?? false), TransformImageResult(fontImage, fontContext?.isHighQuality ?? false))
                     } |> deliverOnMainQueue
-                    
+
                     previewDisposable = result.start(next: { [weak self] result, fontResult in
                         if self?.playerState != .playing {
                             self?.contents = result.image
                         }
+                        if self?.isPreviousPreview == true {
+                            self?.animateContents()
+                            self?.isPreviousPreview = false
+                        }
                         if let image = result.image {
                             self?.preview = image
                             if let shimmer = self?.shimmer {
@@ -697,7 +731,7 @@ final class InlineStickerItemLayer : SimpleLayer {
                                 self?.shimmer = nil
                             }
                         }
-                        
+
                         cacheMedia(fontResult, media: file, arguments: fontArguments, scale: System.backingScale)
                         cacheMedia(result, media: file, arguments: arguments, scale: System.backingScale)
                     })