Stories

submodules/ChatListUI/Sources/ChatListController.swift

@@ -1083,26 +1083,19 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                 
                 self.chatListDisplayNode.mainContainerNode.currentItemNode.clearHighlightAnimated(true)
                 
+                if let navigationController = self.navigationController as? NavigationController {
+                    let chatListController = ChatListControllerImpl(context: self.context, location: .chatList(groupId: groupId), controlsHistoryPreload: false, enableDebugActions: false)
+                    chatListController.navigationPresentation = .master
+                    navigationController.pushViewController(chatListController)
+                }
+                
                 if !didDisplayTip {
+                    #if DEBUG
+                    #else
                     let _ = ApplicationSpecificNotice.setDisplayChatListArchiveTooltip(accountManager: self.context.sharedContext.accountManager).start()
+                    #endif
                     
-                    self.push(ArchiveInfoScreen(context: self.context, settings: settings, buttonAction: { [weak self] in
+                    self.push(ArchiveInfoScreen(context: self.context, settings: settings))
-                        guard let self else {
-                            return
-                        }
-                        
-                        if let navigationController = self.navigationController as? NavigationController {
-                            let chatListController = ChatListControllerImpl(context: self.context, location: .chatList(groupId: groupId), controlsHistoryPreload: false, enableDebugActions: false)
-                            chatListController.navigationPresentation = .master
-                            navigationController.pushViewController(chatListController)
-                        }
-                    }))
-                } else {
-                    if let navigationController = self.navigationController as? NavigationController {
-                        let chatListController = ChatListControllerImpl(context: self.context, location: .chatList(groupId: groupId), controlsHistoryPreload: false, enableDebugActions: false)
-                        chatListController.navigationPresentation = .master
-                        navigationController.pushViewController(chatListController)
-                    }
                 }
             })
         }
@@ -2693,6 +2686,10 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                         return
                     }
                     
+                    if peer.isService {
+                        return
+                    }
+                    
                     var items: [ContextMenuItem] = []
                                     
                     //TODO:localize
@@ -2769,7 +2766,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                         })))
                         
                         let isMuted = resolvedAreStoriesMuted(globalSettings: globalSettings._asGlobalNotificationSettings(), peer: peer._asPeer(), peerSettings: notificationSettings._asNotificationSettings(), topSearchPeers: topSearchPeers)
-                        items.append(.action(ContextMenuActionItem(text: isMuted ? "Notify" : "Don't Notify", icon: { theme in
+                        items.append(.action(ContextMenuActionItem(text: isMuted ? "Notify About Stories" : "Do Not Notify About Stories", icon: { theme in
                             return generateTintedImage(image: UIImage(bundleImageName: isMuted ? "Chat/Context Menu/Unmute" : "Chat/Context Menu/Muted"), color: theme.contextMenu.primaryColor)
                         }, action: { [weak self] _, f in
                             f(.default)
@@ -2814,11 +2811,11 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                         
                         let hideText: String
                         if self.location == .chatList(groupId: .archive) {
-                            hideText = "Unarchive"
+                            hideText = "Unhide Stories"
                         } else {
-                            hideText = "Archive"
+                            hideText = "Hide Stories"
                         }
-                        let iconName = self.location == .chatList(groupId: .archive) ? "Chat/Context Menu/MoveToChats" : "Chat/Context Menu/MoveToContacts"
+                        let iconName = self.location == .chatList(groupId: .archive) ? "Chat/Context Menu/Unarchive" : "Chat/Context Menu/Archive"
                         items.append(.action(ContextMenuActionItem(text: hideText, icon: { theme in
                             return generateTintedImage(image: UIImage(bundleImageName: iconName), color: theme.contextMenu.primaryColor)
                         }, action: { [weak self] _, f in

submodules/SettingsUI/Sources/ArchiveSettingsController.swift

@@ -194,6 +194,7 @@ public func archiveSettingsController(context: AccountContext) -> ViewController
     }
     
     let controller = ItemListController(context: context, state: signal)
+    controller.navigationPresentation = .modal
     
     presentUndoImpl = { [weak controller] content in
         guard let controller else {

submodules/TelegramApi/Sources/Api31.swift

@@ -8973,6 +8973,25 @@ public extension Api.functions.users {
                     })
                 }
 }
+public extension Api.functions.users {
+                static func getStoriesMaxIDs(id: [Api.InputUser]) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<[Int32]>) {
+                    let buffer = Buffer()
+                    buffer.appendInt32(-904087125)
+                    buffer.appendInt32(481674261)
+                    buffer.appendInt32(Int32(id.count))
+                    for item in id {
+                        item.serialize(buffer, true)
+                    }
+                    return (FunctionDescription(name: "users.getStoriesMaxIDs", parameters: [("id", String(describing: id))]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> [Int32]? in
+                        let reader = BufferReader(buffer)
+                        var result: [Int32]?
+                        if let _ = reader.readInt32() {
+                            result = Api.parseVector(reader, elementSignature: -1471112230, elementType: Int32.self)
+                        }
+                        return result
+                    })
+                }
+}
 public extension Api.functions.users {
                 static func getUsers(id: [Api.InputUser]) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<[Api.User]>) {
                     let buffer = Buffer()

submodules/TelegramCore/Sources/State/AccountViewTracker.swift

@@ -1289,7 +1289,7 @@ public final class AccountViewTracker {
                 let messageTimestamp = self.refreshStoriesForPeerIdsAndTimestamps[peerId]
                 var refresh = false
                 if let messageTimestamp = messageTimestamp {
-                    refresh = messageTimestamp < timestamp - 60
+                    refresh = messageTimestamp < timestamp - 60 * 60
                 } else {
                     refresh = true
                 }
@@ -1304,8 +1304,14 @@ public final class AccountViewTracker {
                 self.nextUpdatedUnsupportedMediaDisposableId += 1
                 
                 if let account = self.account {
-                    let signal = account.postbox.transaction { transaction -> [Api.InputUser] in
+                    let signal = account.postbox.transaction { transaction -> [(PeerId, Api.InputUser)] in
-                        return addedPeerIds.compactMap { transaction.getPeer($0).flatMap(apiInputUser) }
+                        return addedPeerIds.compactMap { id -> (PeerId, Api.InputUser)? in
+                            if let user = transaction.getPeer(id).flatMap(apiInputUser) {
+                                return (id, user)
+                            } else {
+                                return nil
+                            }
+                        }
                     }
                     |> mapToSignal { inputUsers -> Signal<Never, NoError> in
                         guard !inputUsers.isEmpty else {
@@ -1314,21 +1320,30 @@ public final class AccountViewTracker {
                         
                         var requests: [Signal<Never, NoError>] = []
                         
-                        let batchCount = 50
+                        let batchCount = 100
                         var startIndex = 0
                         while startIndex < inputUsers.count {
-                            var slice: [Api.InputUser] = []
+                            var slice: [(PeerId, Api.InputUser)] = []
                             for i in startIndex ..< min(startIndex + batchCount, inputUsers.count) {
                                 slice.append(inputUsers[i])
                             }
                             startIndex += batchCount
-                            requests.append(account.network.request(Api.functions.users.getUsers(id: slice))
+                            requests.append(account.network.request(Api.functions.users.getStoriesMaxIDs(id: slice.map(\.1)))
-                            |> `catch` { _ -> Signal<[Api.User], NoError> in
+                            |> `catch` { _ -> Signal<[Int32], NoError> in
                                 return .single([])
                             }
                             |> mapToSignal { result -> Signal<Never, NoError> in
                                 return account.postbox.transaction { transaction in
-                                    updatePeers(transaction: transaction, accountPeerId: account.peerId, peers: AccumulatedPeers(users: result))
+                                    for i in 0 ..< result.count {
+                                        if i < slice.count {
+                                            let value = result[i]
+                                            if value <= 0 {
+                                                transaction.clearStoryItemsInexactMaxId(peerId: slice[i].0)
+                                            } else {
+                                                transaction.setStoryItemsInexactMaxId(peerId: slice[i].0, id: value)
+                                            }
+                                        }
+                                    }
                                 }
                                 |> ignoreValues
                             })

submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerComponent.swift

@@ -3850,49 +3850,10 @@ public final class StoryItemSetContainerComponent: Component {
                 let presentationData = component.context.sharedContext.currentPresentationData.with({ $0 }).withUpdated(theme: component.theme)
                 var items: [ContextMenuItem] = []
                 
-                if component.slice.item.storyItem.isPublic && (component.slice.peer.addressName != nil || !component.slice.peer._asPeer().usernames.isEmpty) {
-                    items.append(.action(ContextMenuActionItem(text: "Copy Link", icon: { theme in
-                        return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Link"), color: theme.contextMenu.primaryColor)
-                    }, action: { [weak self] _, a in
-                        a(.default)
-                        
-                        guard let self, let component = self.component else {
-                            return
-                        }
-                        
-                        let _ = (component.context.engine.messages.exportStoryLink(peerId: component.slice.peer.id, id: component.slice.item.storyItem.id)
-                        |> deliverOnMainQueue).start(next: { [weak self] link in
-                            guard let self, let component = self.component else {
-                                return
-                            }
-                            if let link {
-                                UIPasteboard.general.string = link
-                                
-                                component.presentController(UndoOverlayController(
-                                    presentationData: presentationData,
-                                    content: .linkCopied(text: "Link copied."),
-                                    elevatedLayout: false,
-                                    animateInAsReplacement: false,
-                                    action: { _ in return false }
-                                ), nil)
-                            }
-                        })
-                    })))
-                    items.append(.action(ContextMenuActionItem(text: "Share", icon: { theme in
-                        return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Forward"), color: theme.contextMenu.primaryColor)
-                    }, action: {  [weak self] _, a in
-                        a(.default)
-                        
-                        guard let self else {
-                            return
-                        }
-                        self.sendMessageContext.performShareAction(view: self)
-                    })))
-                }
-                                
                 let isMuted = resolvedAreStoriesMuted(globalSettings: globalSettings._asGlobalNotificationSettings(), peer: component.slice.peer._asPeer(), peerSettings: settings._asNotificationSettings(), topSearchPeers: topSearchPeers)
                 
-                items.append(.action(ContextMenuActionItem(text: isMuted ? "Notify" : "Don't Notify", icon: { theme in
+                if !component.slice.peer.isService {
+                    items.append(.action(ContextMenuActionItem(text: isMuted ? "Notify About Stories" : "Do Not Notify About Stories", icon: { theme in
                         return generateTintedImage(image: UIImage(bundleImageName: component.slice.additionalPeerData.isMuted ? "Chat/Context Menu/Unmute" : "Chat/Context Menu/Muted"), color: theme.contextMenu.primaryColor)
                     }, action: { [weak self] _, a in
                         a(.default)
@@ -3941,8 +3902,8 @@ public final class StoryItemSetContainerComponent: Component {
                         isHidden = storiesHidden
                     }
                     
-                items.append(.action(ContextMenuActionItem(text: isHidden ? "Unarchive" : "Archive", icon: { theme in
+                    items.append(.action(ContextMenuActionItem(text: isHidden ? "Unhide Stories" : "Hide Stories", icon: { theme in
-                    return generateTintedImage(image: UIImage(bundleImageName: isHidden ? "Chat/Context Menu/MoveToChats" : "Chat/Context Menu/MoveToContacts"), color: theme.contextMenu.primaryColor)
+                        return generateTintedImage(image: UIImage(bundleImageName: isHidden ? "Chat/Context Menu/Unarchive" : "Chat/Context Menu/Archive"), color: theme.contextMenu.primaryColor)
                     }, action: { [weak self] _, a in
                         a(.default)
                         
@@ -3952,7 +3913,7 @@ public final class StoryItemSetContainerComponent: Component {
                         
                         let _ = component.context.engine.peers.updatePeerStoriesHidden(id: component.slice.peer.id, isHidden: !isHidden)
                         
-                    let text = isHidden ? "Stories from **\(component.slice.peer.compactDisplayTitle)** will now be shown in Chats, not Contacts." : "Stories from **\(component.slice.peer.compactDisplayTitle)** will now be shown in Contacts, not Chats."
+                        let text = isHidden ? "Stories from **\(component.slice.peer.compactDisplayTitle)** will now be shown in Archived Chats." : "Stories from **\(component.slice.peer.compactDisplayTitle)** will now be shown in Chats."
                         let tooltipScreen = TooltipScreen(
                             context: component.context,
                             account: component.context.account,
@@ -3980,14 +3941,10 @@ public final class StoryItemSetContainerComponent: Component {
                         self.updateIsProgressPaused()
                         component.controller()?.present(tooltipScreen, in: .current)
                     })))
-                
-                #if DEBUG
-                let saveText: String
-                if case .file = component.slice.item.storyItem.media {
-                    saveText = "Save Video"
-                } else {
-                    saveText = "Save Image"
                 }
+                
+                if !component.slice.item.storyItem.isForwardingDisabled {
+                    let saveText: String = "Save to Gallery"
                     items.append(.action(ContextMenuActionItem(text: saveText, icon: { theme in
                         return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Save"), color: theme.contextMenu.primaryColor)
                     }, action: { [weak self] _, a in
@@ -3998,8 +3955,49 @@ public final class StoryItemSetContainerComponent: Component {
                         }
                         self.requestSave()
                     })))
-                #endif
+                }
                 
+                if !component.slice.peer.isService && component.slice.item.storyItem.isPublic && (component.slice.peer.addressName != nil || !component.slice.peer._asPeer().usernames.isEmpty) {
+                    items.append(.action(ContextMenuActionItem(text: "Copy Link", icon: { theme in
+                        return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Link"), color: theme.contextMenu.primaryColor)
+                    }, action: { [weak self] _, a in
+                        a(.default)
+                        
+                        guard let self, let component = self.component else {
+                            return
+                        }
+                        
+                        let _ = (component.context.engine.messages.exportStoryLink(peerId: component.slice.peer.id, id: component.slice.item.storyItem.id)
+                        |> deliverOnMainQueue).start(next: { [weak self] link in
+                            guard let self, let component = self.component else {
+                                return
+                            }
+                            if let link {
+                                UIPasteboard.general.string = link
+                                
+                                component.presentController(UndoOverlayController(
+                                    presentationData: presentationData,
+                                    content: .linkCopied(text: "Link copied."),
+                                    elevatedLayout: false,
+                                    animateInAsReplacement: false,
+                                    action: { _ in return false }
+                                ), nil)
+                            }
+                        })
+                    })))
+                    /*items.append(.action(ContextMenuActionItem(text: "Share", icon: { theme in
+                        return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Forward"), color: theme.contextMenu.primaryColor)
+                    }, action: {  [weak self] _, a in
+                        a(.default)
+                        
+                        guard let self else {
+                            return
+                        }
+                        self.sendMessageContext.performShareAction(view: self)
+                    })))*/
+                }
+                
+                if !component.slice.peer.isService {
                     items.append(.action(ContextMenuActionItem(text: "Report", icon: { theme in
                         return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Report"), color: theme.contextMenu.primaryColor)
                     }, action: { [weak self] c, a in
@@ -4033,6 +4031,7 @@ public final class StoryItemSetContainerComponent: Component {
                             }
                         )
                     })))
+                }
                 
                 var hasLinkedStickers = false
                 let media = component.slice.item.storyItem.media._asMedia()

submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift

@@ -910,7 +910,7 @@ final class StoryItemSetContainerSendMessage {
             component.presentController(actionSheet, nil)
         } else {
             var preferredAction: ShareControllerPreferredAction?
-            if focusedItem.storyItem.isPublic {
+            if focusedItem.storyItem.isPublic && !component.slice.peer.isService {
                 preferredAction = .custom(action: ShareControllerAction(title: "Copy Link", action: {
                     let _ = ((component.context.engine.messages.exportStoryLink(peerId: peerId, id: focusedItem.storyItem.id))
                              |> deliverOnMainQueue).start(next: { link in