Various improvements

submodules/TelegramCore/Sources/TelegramEngine/Stickers/SavedStickers.swift

@@ -5,7 +5,7 @@ import SwiftSignalKit
 
 public enum SavedStickerResult {
     case generic
-    case limitExceeded
+    case limitExceeded(Int32, Int32)
 }
 
 func _internal_toggleStickerSaved(postbox: Postbox, network: Network, accountPeerId: PeerId, file: TelegramMediaFile, saved: Bool) -> Signal<SavedStickerResult, AddSavedStickerError> {
@@ -15,15 +15,13 @@ func _internal_toggleStickerSaved(postbox: Postbox, network: Network, accountPee
             let items = transaction.getOrderedListItems(collectionId: Namespaces.OrderedItemList.CloudSavedStickers)
             
             let appConfiguration = transaction.getPreferencesEntry(key: PreferencesKeys.appConfiguration)?.get(AppConfiguration.self) ?? .defaultValue
-            let userLimitsConfiguration = UserLimitsConfiguration(appConfiguration: appConfiguration, isPremium: isPremium)
+            let limitsConfiguration = UserLimitsConfiguration(appConfiguration: appConfiguration, isPremium: false)
+            let premiumLimitsConfiguration = UserLimitsConfiguration(appConfiguration: appConfiguration, isPremium: false)
             
             return addSavedSticker(postbox: postbox, network: network, file: file)
             |> map { _ -> SavedStickerResult in
-                return .generic
+                return items.count == limitsConfiguration.maxFavedStickerCount && !isPremium ? .limitExceeded(limitsConfiguration.maxFavedStickerCount, premiumLimitsConfiguration.maxFavedStickerCount) : .generic
             }
-            |> then(
-                .single(items.count == userLimitsConfiguration.maxFavedStickerCount ? .limitExceeded : .generic)
-            )
         }
         |> castError(AddSavedStickerError.self)
         |> switchToLatest

submodules/TelegramUI/Sources/ChatController.swift

@@ -7956,8 +7956,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             switch result {
                                 case .generic:
                                     strongSelf.presentInGlobalOverlay(UndoOverlayController(presentationData: strongSelf.presentationData, content: .sticker(context: strongSelf.context, file: stickerFile, title: nil, text: added ? strongSelf.presentationData.strings.Conversation_StickerAddedToFavorites : strongSelf.presentationData.strings.Conversation_StickerRemovedFromFavorites, undoText: nil), elevatedLayout: true, action: { _ in return false }), with: nil)
-                                case .limitExceeded:
+                                case let .limitExceeded(limit, premiumLimit):
-                                    strongSelf.presentInGlobalOverlay(UndoOverlayController(presentationData: strongSelf.presentationData, content: .sticker(context: strongSelf.context, file: stickerFile, title: strongSelf.presentationData.strings.Premium_MaxFavedStickersTitle("5").string, text: strongSelf.presentationData.strings.Premium_MaxFavedStickersText("10").string, undoText: nil), elevatedLayout: true, action: { [weak self] action in
+                                    strongSelf.presentInGlobalOverlay(UndoOverlayController(presentationData: strongSelf.presentationData, content: .sticker(context: strongSelf.context, file: stickerFile, title: strongSelf.presentationData.strings.Premium_MaxFavedStickersTitle("\(limit)").string, text: strongSelf.presentationData.strings.Premium_MaxFavedStickersText("\(premiumLimit)").string, undoText: nil), elevatedLayout: true, action: { [weak self] action in
                                         if let strongSelf = self {
                                             if case .info = action {
                                                 let controller = PremiumIntroScreen(context: strongSelf.context, source: .savedStickers)

submodules/TelegramUI/Sources/ChatMediaInputNode.swift

@@ -1581,12 +1581,26 @@ final class ChatMediaInputNode: ChatInputNode {
                                             f(.default)
                                             
                                             if let strongSelf = self {
-                                                if isStarred {
+                                                let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
-                                                    let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
+                                                let _ = (strongSelf.context.engine.stickers.toggleStickerSaved(file: item.file, saved: !isStarred)
-                                                } else {
+                                                |> deliverOnMainQueue).start(next: { result in
-                                                    let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
+                                                    switch result {
+                                                        case .generic:
+                                                            strongSelf.controllerInteraction.presentGlobalOverlayController(UndoOverlayController(presentationData: presentationData, content: .sticker(context: strongSelf.context, file: item.file, title: nil, text: !isStarred ? strongSelf.strings.Conversation_StickerAddedToFavorites : strongSelf.strings.Conversation_StickerRemovedFromFavorites, undoText: nil), elevatedLayout: false, action: { _ in return false }), nil)
+                                                        case let .limitExceeded(limit, premiumLimit):
+                                                            strongSelf.controllerInteraction.presentGlobalOverlayController(UndoOverlayController(presentationData: presentationData, content: .sticker(context: strongSelf.context, file: item.file, title: strongSelf.strings.Premium_MaxFavedStickersTitle("\(limit)").string, text: strongSelf.strings.Premium_MaxFavedStickersText("\(premiumLimit)").string, undoText: nil), elevatedLayout: false, action: { [weak self] action in
+                                                                if let strongSelf = self {
+                                                                    if case .info = action {
+                                                                        let controller = PremiumIntroScreen(context: strongSelf.context, source: .savedStickers)
+                                                                        strongSelf.controllerInteraction.navigationController()?.pushViewController(controller)
+                                                                        return true
                                                                     }
                                                                 }
+                                                                return false
+                                                            }), nil)
+                                                    }
+                                                })
+                                            }
                                         }))
                                     )
                                     menuItems.append(.action(ContextMenuActionItem(text: strongSelf.strings.StickerPack_ViewPack, icon: { theme in
@@ -1711,12 +1725,26 @@ final class ChatMediaInputNode: ChatInputNode {
                                                 f(.default)
                                                 
                                                 if let strongSelf = self {
-                                                    if isStarred {
+                                                    let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
-                                                        let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
+                                                    let _ = (strongSelf.context.engine.stickers.toggleStickerSaved(file: item.file, saved: !isStarred)
-                                                    } else {
+                                                    |> deliverOnMainQueue).start(next: { result in
-                                                        let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
+                                                        switch result {
+                                                            case .generic:
+                                                                strongSelf.controllerInteraction.presentGlobalOverlayController(UndoOverlayController(presentationData: presentationData, content: .sticker(context: strongSelf.context, file: item.file, title: nil, text: !isStarred ? strongSelf.strings.Conversation_StickerAddedToFavorites : strongSelf.strings.Conversation_StickerRemovedFromFavorites, undoText: nil), elevatedLayout: false, action: { _ in return false }), nil)
+                                                            case let .limitExceeded(limit, premiumLimit):
+                                                                strongSelf.controllerInteraction.presentGlobalOverlayController(UndoOverlayController(presentationData: presentationData, content: .sticker(context: strongSelf.context, file: item.file, title: strongSelf.strings.Premium_MaxFavedStickersTitle("\(limit)").string, text: strongSelf.strings.Premium_MaxFavedStickersText("\(premiumLimit)").string, undoText: nil), elevatedLayout: false, action: { [weak self] action in
+                                                                    if let strongSelf = self {
+                                                                        if case .info = action {
+                                                                            let controller = PremiumIntroScreen(context: strongSelf.context, source: .savedStickers)
+                                                                            strongSelf.controllerInteraction.navigationController()?.pushViewController(controller)
+                                                                            return true
                                                                         }
                                                                     }
+                                                                    return false
+                                                                }), nil)
+                                                        }
+                                                    })
+                                                }
                                             }))
                                         )
                                         menuItems.append(

submodules/TelegramUI/Sources/FeaturedStickersScreen.swift

@@ -498,12 +498,25 @@ private final class FeaturedStickersScreenNode: ViewControllerTracingNode {
                                         f(.default)
                                         
                                         if let strongSelf = self {
-                                            if isStarred {
+                                            let _ = (strongSelf.context.engine.stickers.toggleStickerSaved(file: item.file, saved: !isStarred)
-                                                let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
+                                            |> deliverOnMainQueue).start(next: { result in
-                                            } else {
+                                                switch result {
-                                                let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
+                                                    case .generic:
+                                                        strongSelf.controller?.presentInGlobalOverlay(UndoOverlayController(presentationData: strongSelf.presentationData, content: .sticker(context: strongSelf.context, file: item.file, title: nil, text: !isStarred ? strongSelf.presentationData.strings.Conversation_StickerAddedToFavorites : strongSelf.presentationData.strings.Conversation_StickerRemovedFromFavorites, undoText: nil), elevatedLayout: false, action: { _ in return false }), with: nil)
+                                                    case let .limitExceeded(limit, premiumLimit):
+                                                        strongSelf.controller?.presentInGlobalOverlay(UndoOverlayController(presentationData: strongSelf.presentationData, content: .sticker(context: strongSelf.context, file: item.file, title: strongSelf.presentationData.strings.Premium_MaxFavedStickersTitle("\(limit)").string, text: strongSelf.presentationData.strings.Premium_MaxFavedStickersText("\(premiumLimit)").string, undoText: nil), elevatedLayout: false, action: { [weak self] action in
+                                                            if let strongSelf = self {
+                                                                if case .info = action {
+                                                                    let controller = PremiumIntroScreen(context: strongSelf.context, source: .savedStickers)
+                                                                    strongSelf.controller?.push(controller)
+                                                                    return true
                                                                 }
                                                             }
+                                                            return false
+                                                        }), with: nil)
+                                                }
+                                            })
+                                        }
                                     })),
                                     .action(ContextMenuActionItem(text: strongSelf.presentationData.strings.StickerPack_ViewPack, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Sticker"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
                                         f(.default)
@@ -568,12 +581,25 @@ private final class FeaturedStickersScreenNode: ViewControllerTracingNode {
                                 f(.default)
                                 
                                 if let strongSelf = self {
-                                    if isStarred {
+                                    let _ = (strongSelf.context.engine.stickers.toggleStickerSaved(file: item.file, saved: !isStarred)
-                                        let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
+                                    |> deliverOnMainQueue).start(next: { result in
-                                    } else {
+                                        switch result {
-                                        let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
+                                            case .generic:
+                                            strongSelf.controller?.presentInGlobalOverlay(UndoOverlayController(presentationData: strongSelf.presentationData, content: .sticker(context: strongSelf.context, file: item.file, title: nil, text: !isStarred ? strongSelf.presentationData.strings.Conversation_StickerAddedToFavorites : strongSelf.presentationData.strings.Conversation_StickerRemovedFromFavorites, undoText: nil), elevatedLayout: false, action: { _ in return false }), with: nil)
+                                            case let .limitExceeded(limit, premiumLimit):
+                                                strongSelf.controller?.presentInGlobalOverlay(UndoOverlayController(presentationData: strongSelf.presentationData, content: .sticker(context: strongSelf.context, file: item.file, title: strongSelf.presentationData.strings.Premium_MaxFavedStickersTitle("\(limit)").string, text: strongSelf.presentationData.strings.Premium_MaxFavedStickersText("\(premiumLimit)").string, undoText: nil), elevatedLayout: false, action: { [weak self] action in
+                                                    if let strongSelf = self {
+                                                        if case .info = action {
+                                                            let controller = PremiumIntroScreen(context: strongSelf.context, source: .savedStickers)
+                                                            strongSelf.controller?.push(controller)
+                                                            return true
                                                         }
                                                     }
+                                                    return false
+                                                }), with: nil)
+                                        }
+                                    })
+                                }
                             })),
                             .action(ContextMenuActionItem(text: strongSelf.presentationData.strings.StickerPack_ViewPack, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Sticker"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
                                 f(.default)

submodules/TelegramUI/Sources/HorizontalStickersChatContextPanelNode.swift

@@ -13,6 +13,7 @@ import StickerPackPreviewUI
 import ContextUI
 import ChatPresentationInterfaceState
 import PremiumUI
+import UndoUI
 
 final class HorizontalStickersChatContextPanelInteraction {
     var previewedStickerItem: StickerPackItem?
@@ -187,12 +188,26 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode {
                                     f(.default)
                                     
                                     if let strongSelf = self {
-                                        if isStarred {
+                                        let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
-                                            let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
+                                        let _ = (strongSelf.context.engine.stickers.toggleStickerSaved(file: item.file, saved: !isStarred)
-                                        } else {
+                                        |> deliverOnMainQueue).start(next: { result in
-                                            let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
+                                            switch result {
+                                                case .generic:
+                                                    strongSelf.interfaceInteraction?.presentGlobalOverlayController(UndoOverlayController(presentationData: presentationData, content: .sticker(context: strongSelf.context, file: item.file, title: nil, text: !isStarred ? strongSelf.strings.Conversation_StickerAddedToFavorites : strongSelf.strings.Conversation_StickerRemovedFromFavorites, undoText: nil), elevatedLayout: false, action: { _ in return false }), nil)
+                                                case let .limitExceeded(limit, premiumLimit):
+                                                    strongSelf.interfaceInteraction?.presentGlobalOverlayController(UndoOverlayController(presentationData: presentationData, content: .sticker(context: strongSelf.context, file: item.file, title: strongSelf.strings.Premium_MaxFavedStickersTitle("\(limit)").string, text: strongSelf.strings.Premium_MaxFavedStickersText("\(premiumLimit)").string, undoText: nil), elevatedLayout: false, action: { [weak self] action in
+                                                        if let strongSelf = self {
+                                                            if case .info = action {
+                                                                let controller = PremiumIntroScreen(context: strongSelf.context, source: .savedStickers)
+                                                                strongSelf.controllerInteraction?.navigationController()?.pushViewController(controller)
+                                                                return true
                                                             }
                                                         }
+                                                        return false
+                                                    }), nil)
+                                            }
+                                        })
+                                    }
                                 })),
                                 .action(ContextMenuActionItem(text: strongSelf.strings.StickerPack_ViewPack, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Sticker"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
                                     f(.default)

submodules/TelegramUI/Sources/InlineReactionSearchPanel.swift

@@ -12,6 +12,7 @@ import StickerPackPreviewUI
 import ContextUI
 import ChatPresentationInterfaceState
 import PremiumUI
+import UndoUI
 
 private final class InlineReactionSearchStickersNode: ASDisplayNode, UIScrollViewDelegate {
     private final class DisplayItem {
@@ -139,12 +140,26 @@ private final class InlineReactionSearchStickersNode: ASDisplayNode, UIScrollVie
                                     f(.default)
                                     
                                     if let strongSelf = self {
-                                        if isStarred {
+                                        let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
-                                            let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
+                                        let _ = (strongSelf.context.engine.stickers.toggleStickerSaved(file: item.file, saved: !isStarred)
-                                        } else {
+                                        |> deliverOnMainQueue).start(next: { result in
-                                            let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
+                                            switch result {
+                                                case .generic:
+                                                    strongSelf.getControllerInteraction?()?.presentGlobalOverlayController(UndoOverlayController(presentationData: presentationData, content: .sticker(context: strongSelf.context, file: item.file, title: nil, text: !isStarred ? strongSelf.strings.Conversation_StickerAddedToFavorites : strongSelf.strings.Conversation_StickerRemovedFromFavorites, undoText: nil), elevatedLayout: false, action: { _ in return false }), nil)
+                                                case let .limitExceeded(limit, premiumLimit):
+                                                    strongSelf.getControllerInteraction?()?.presentGlobalOverlayController(UndoOverlayController(presentationData: presentationData, content: .sticker(context: strongSelf.context, file: item.file, title: strongSelf.strings.Premium_MaxFavedStickersTitle("\(limit)").string, text: strongSelf.strings.Premium_MaxFavedStickersText("\(premiumLimit)").string, undoText: nil), elevatedLayout: false, action: { [weak self] action in
+                                                        if let strongSelf = self {
+                                                            if case .info = action {
+                                                                let controller = PremiumIntroScreen(context: strongSelf.context, source: .savedStickers)
+                                                                strongSelf.getControllerInteraction?()?.navigationController()?.pushViewController(controller)
+                                                                return true
                                                             }
                                                         }
+                                                        return false
+                                                    }), nil)
+                                            }
+                                        })
+                                    }
                                 }))
                             )
                                 

submodules/TelegramUI/Sources/StickersChatInputContextPanelNode.swift

@@ -13,6 +13,7 @@ import StickerPackPreviewUI
 import ContextUI
 import ChatPresentationInterfaceState
 import PremiumUI
+import UndoUI
 
 private struct StickersChatInputContextPanelEntryStableId: Hashable {
     let ids: [MediaId]
@@ -143,12 +144,26 @@ final class StickersChatInputContextPanelNode: ChatInputContextPanelNode {
                                         f(.default)
                                         
                                         if let strongSelf = self {
-                                            if isStarred {
+                                            let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
-                                                let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
+                                            let _ = (strongSelf.context.engine.stickers.toggleStickerSaved(file: item.file, saved: !isStarred)
-                                            } else {
+                                            |> deliverOnMainQueue).start(next: { result in
-                                                let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
+                                                switch result {
+                                                    case .generic:
+                                                        strongSelf.interfaceInteraction?.presentGlobalOverlayController(UndoOverlayController(presentationData: presentationData, content: .sticker(context: strongSelf.context, file: item.file, title: nil, text: !isStarred ? strongSelf.strings.Conversation_StickerAddedToFavorites : strongSelf.strings.Conversation_StickerRemovedFromFavorites, undoText: nil), elevatedLayout: false, action: { _ in return false }), nil)
+                                                    case let .limitExceeded(limit, premiumLimit):
+                                                        strongSelf.interfaceInteraction?.presentGlobalOverlayController(UndoOverlayController(presentationData: presentationData, content: .sticker(context: strongSelf.context, file: item.file, title: strongSelf.strings.Premium_MaxFavedStickersTitle("\(limit)").string, text: strongSelf.strings.Premium_MaxFavedStickersText("\(premiumLimit)").string, undoText: nil), elevatedLayout: false, action: { [weak self] action in
+                                                            if let strongSelf = self {
+                                                                if case .info = action {
+                                                                    let controller = PremiumIntroScreen(context: strongSelf.context, source: .savedStickers)
+                                                                    strongSelf.controllerInteraction?.navigationController()?.pushViewController(controller)
+                                                                    return true
                                                                 }
                                                             }
+                                                            return false
+                                                        }), nil)
+                                                }
+                                            })
+                                        }
                                     })),
                                     .action(ContextMenuActionItem(text: strongSelf.strings.StickerPack_ViewPack, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Sticker"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
                                         f(.default)

submodules/UndoUI/Sources/UndoOverlayControllerNode.swift

@@ -708,7 +708,7 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
                 } else {
                     displayUndo = false
                 }
-                self.originalRemainingSeconds = 3
+                self.originalRemainingSeconds = isUserInteractionEnabled ? 5 : 3
             
                 if let updatedFetchSignal = updatedFetchSignal {
                     self.fetchResourceDisposable = updatedFetchSignal.start()