[WIP] Chat Import

Telegram/Telegram-iOS/en.lproj/Localizable.strings

@@ -3997,6 +3997,7 @@ Unused sets are archived when you add more.";
 "ChatList.DeleteChatConfirmation" = "Are you sure you want to delete chat\nwith %@?";
 "ChatList.DeleteSecretChatConfirmation" = "Are you sure you want to delete secret chat\nwith %@?";
 "ChatList.LeaveGroupConfirmation" = "Are you sure you want to leave %@?";
+"ChatList.DeleteAndLeaveGroupConfirmation" = "Are you sure you want to leave and delete %@?";
 "ChatList.DeleteSavedMessagesConfirmation" = "Are you sure you want to delete\nSaved Messages?";
 
 "Undo.Undo" = "Undo";
@@ -5914,3 +5915,6 @@ Sorry for the inconvenience.";
 
 "ChatList.HeaderImportIntoAnExistingGroup" = "OR IMPORT INTO AN EXISTING GROUP";
 "Conversation.ImportedMessageHint" = "The messages was imported from another app. We can't guarantee it's real.";
+
+"CallList.DeleteAllForMe" = "Delete for me";
+"CallList.DeleteAllForEveryone" = "Delete for me and Others";

submodules/CallListUI/BUILD

@@ -25,6 +25,7 @@ swift_library(
         "//submodules/MergeLists:MergeLists",
         "//submodules/ChatListSearchItemHeader:ChatListSearchItemHeader",
         "//submodules/PeerOnlineMarkerNode:PeerOnlineMarkerNode",
+        "//submodules/ContextUI:ContextUI",
     ],
     visibility = [
         "//visibility:public",

submodules/CallListUI/Sources/CallListController.swift

@@ -13,12 +13,58 @@ import AccountContext
 import AlertUI
 import AppBundle
 import LocalizedPeerData
+import ContextUI
 
 public enum CallListControllerMode {
     case tab
     case navigation
 }
 
+private final class DeleteAllButtonNode: ASDisplayNode {
+    private let pressed: () -> Void
+    
+    let contentNode: ContextExtractedContentContainingNode
+    private let buttonNode: HighlightableButtonNode
+    private let titleNode: ImmediateTextNode
+    
+    init(presentationData: PresentationData, pressed: @escaping () -> Void) {
+        self.pressed = pressed
+        
+        self.contentNode = ContextExtractedContentContainingNode()
+        self.buttonNode = HighlightableButtonNode()
+        self.titleNode = ImmediateTextNode()
+        
+        super.init()
+        
+        self.addSubnode(self.contentNode)
+        self.buttonNode.addSubnode(self.titleNode)
+        self.contentNode.contentNode.addSubnode(self.buttonNode)
+        
+        self.titleNode.attributedText = NSAttributedString(string: presentationData.strings.Notification_Exceptions_DeleteAll, font: Font.regular(17.0), textColor: presentationData.theme.rootController.navigationBar.accentTextColor)
+        
+        //self.buttonNode.addTarget(self, action: #selector(self.buttonPressed), forControlEvents: .touchUpInside)
+    }
+    
+    @objc private func buttonPressed() {
+        self.pressed()
+    }
+    
+    override public func calculateSizeThatFits(_ constrainedSize: CGSize) -> CGSize {
+        let titleSize = self.titleNode.updateLayout(constrainedSize)
+        self.titleNode.frame = CGRect(origin: CGPoint(), size: titleSize)
+        self.buttonNode.frame = CGRect(origin: CGPoint(), size: titleSize)
+        return titleSize
+    }
+    
+    override public func layout() {
+        super.layout()
+        
+        let size = self.bounds.size
+        self.contentNode.frame = CGRect(origin: CGPoint(), size: size)
+        self.contentNode.contentRect = CGRect(origin: CGPoint(), size: size)
+    }
+}
+
 public final class CallListController: ViewController {
     private var controllerNode: CallListControllerNode {
         return self.displayNode as! CallListControllerNode
@@ -43,6 +89,7 @@ public final class CallListController: ViewController {
     private var editingMode: Bool = false
     
     private let createActionDisposable = MetaDisposable()
+    private let clearDisposable = MetaDisposable()
     
     public init(context: AccountContext, mode: CallListControllerMode) {
         self.context = context
@@ -104,6 +151,7 @@ public final class CallListController: ViewController {
         self.createActionDisposable.dispose()
         self.presentationDataDisposable?.dispose()
         self.peerViewDisposable.dispose()
+        self.clearDisposable.dispose()
     }
     
     private func updateThemeAndStrings() {
@@ -167,6 +215,7 @@ public final class CallListController: ViewController {
                         switch strongSelf.mode {
                             case .tab:
                                 strongSelf.navigationItem.setLeftBarButton(nil, animated: true)
+                                strongSelf.navigationItem.setRightBarButton(nil, animated: true)
                             case .navigation:
                                 strongSelf.navigationItem.setRightBarButton(nil, animated: true)
                         }
@@ -175,8 +224,25 @@ public final class CallListController: ViewController {
                             case .tab:
                                 if strongSelf.editingMode {
                                     strongSelf.navigationItem.leftBarButtonItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Done, style: .done, target: strongSelf, action: #selector(strongSelf.donePressed))
+                                    var pressedImpl: (() -> Void)?
+                                    let buttonNode = DeleteAllButtonNode(presentationData: strongSelf.presentationData, pressed: {
+                                        pressedImpl?()
+                                    })
+                                    strongSelf.navigationItem.rightBarButtonItem = UIBarButtonItem(customDisplayNode: buttonNode)
+                                    strongSelf.navigationItem.rightBarButtonItem?.setCustomAction({
+                                        pressedImpl?()
+                                    })
+                                    pressedImpl = { [weak self, weak buttonNode] in
+                                        guard let strongSelf = self, let buttonNode = buttonNode else {
+                                            return
+                                        }
+                                        strongSelf.deleteAllPressed(buttonNode: buttonNode)
+                                    }
+                                    
+                                    //strongSelf.navigationItem.rightBarButtonItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Notification_Exceptions_DeleteAll, style: .plain, target: strongSelf, action: #selector(strongSelf.deleteAllPressed))
                                 } else {
                                     strongSelf.navigationItem.leftBarButtonItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Edit, style: .plain, target: strongSelf, action: #selector(strongSelf.editPressed))
+                                    strongSelf.navigationItem.rightBarButtonItem = UIBarButtonItem(image: PresentationResourcesRootController.navigationCallIcon(strongSelf.presentationData.theme), style: .plain, target: self, action: #selector(strongSelf.callPressed))
                                 }
                             case .navigation:
                                 if strongSelf.editingMode {
@@ -203,6 +269,89 @@ public final class CallListController: ViewController {
         self.beginCallImpl()
     }
     
+    @objc private func deleteAllPressed(buttonNode: DeleteAllButtonNode) {
+        var items: [ContextMenuItem] = []
+        
+        let beginClear: (Bool) -> Void = { [weak self] forEveryone in
+            guard let strongSelf = self else {
+                return
+            }
+            
+            var signal = clearCallHistory(account: strongSelf.context.account, forEveryone: forEveryone)
+            
+            var cancelImpl: (() -> Void)?
+            let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+            let progressSignal = Signal<Never, NoError> { subscriber in
+                let controller = OverlayStatusController(theme: presentationData.theme,  type: .loading(cancelled: {
+                    cancelImpl?()
+                }))
+                strongSelf.present(controller, in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+                return ActionDisposable { [weak controller] in
+                    Queue.mainQueue().async() {
+                        controller?.dismiss()
+                    }
+                }
+            }
+            |> runOn(Queue.mainQueue())
+            |> delay(0.15, queue: Queue.mainQueue())
+            let progressDisposable = progressSignal.start()
+            
+            signal = signal
+            |> afterDisposed {
+                Queue.mainQueue().async {
+                    progressDisposable.dispose()
+                }
+            }
+            cancelImpl = {
+                self?.clearDisposable.set(nil)
+            }
+            strongSelf.clearDisposable.set((signal
+            |> deliverOnMainQueue).start(completed: {
+            }))
+        }
+        
+        items.append(.action(ContextMenuActionItem(text: self.presentationData.strings.CallList_DeleteAllForMe, textColor: .destructive, icon: { _ in
+            return nil
+        }, action: { _, f in
+            f(.default)
+            beginClear(false)
+        })))
+        
+        items.append(.action(ContextMenuActionItem(text: self.presentationData.strings.CallList_DeleteAllForEveryone, textColor: .destructive, icon: { _ in
+            return nil
+        }, action: { _, f in
+            f(.default)
+            beginClear(true)
+        })))
+        
+        final class ExtractedContentSourceImpl: ContextExtractedContentSource {
+            var keepInPlace: Bool
+            let ignoreContentTouches: Bool = true
+            let blurBackground: Bool
+            
+            private let controller: ViewController
+            private let sourceNode: ContextExtractedContentContainingNode
+            
+            init(controller: ViewController, sourceNode: ContextExtractedContentContainingNode, keepInPlace: Bool, blurBackground: Bool) {
+                self.controller = controller
+                self.sourceNode = sourceNode
+                self.keepInPlace = keepInPlace
+                self.blurBackground = blurBackground
+            }
+            
+            func takeView() -> ContextControllerTakeViewInfo? {
+                return ContextControllerTakeViewInfo(contentContainingNode: self.sourceNode, contentAreaInScreenSpace: UIScreen.main.bounds)
+            }
+            
+            func putBack() -> ContextControllerPutBackViewInfo? {
+                return ContextControllerPutBackViewInfo(contentAreaInScreenSpace: UIScreen.main.bounds)
+            }
+        }
+    
+        let contextController = ContextController(account: self.context.account, presentationData: self.presentationData, source: .extracted(ExtractedContentSourceImpl(controller: self, sourceNode: buttonNode.contentNode, keepInPlace: false, blurBackground: false)), items: .single(items), reactionItems: [], gesture: nil)
+        self.presentInGlobalOverlay(contextController)
+    }
+    
     private func beginCallImpl() {
         let controller = self.context.sharedContext.makeContactSelectionController(ContactSelectionControllerParams(context: self.context, title: { $0.Calls_NewCall }, displayCallIcons: true))
         controller.navigationPresentation = .modal
@@ -234,9 +383,25 @@ public final class CallListController: ViewController {
     
     @objc func editPressed() {
         self.editingMode = true
+        
         switch self.mode {
             case .tab:
                 self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Done, style: .done, target: self, action: #selector(self.donePressed))
+                var pressedImpl: (() -> Void)?
+                let buttonNode = DeleteAllButtonNode(presentationData: self.presentationData, pressed: {
+                    pressedImpl?()
+                })
+                self.navigationItem.rightBarButtonItem = UIBarButtonItem(customDisplayNode: buttonNode)
+                self.navigationItem.rightBarButtonItem?.setCustomAction({
+                    pressedImpl?()
+                })
+                pressedImpl = { [weak self, weak buttonNode] in
+                    guard let strongSelf = self, let buttonNode = buttonNode else {
+                        return
+                    }
+                    strongSelf.deleteAllPressed(buttonNode: buttonNode)
+                }
+                //self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Notification_Exceptions_DeleteAll, style: .plain, target: self, action: #selector(self.deleteAllPressed))
             case .navigation:
                 self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Done, style: .done, target: self, action: #selector(self.donePressed))
         }
@@ -251,6 +416,7 @@ public final class CallListController: ViewController {
         switch self.mode {
             case .tab:
                 self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(self.editPressed))
+                self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: PresentationResourcesRootController.navigationCallIcon(self.presentationData.theme), style: .plain, target: self, action: #selector(self.callPressed))
             case .navigation:
                 self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(self.editPressed))
         }

submodules/CallListUI/Sources/CallListNodeEntries.swift

@@ -226,7 +226,10 @@ func callListNodeEntriesForView(view: CallListView, groupCalls: [Peer], state: C
 func countMeaningfulCallListEntries(_ entries: [CallListNodeEntry]) -> Int {
     var count: Int = 0
     for entry in entries {
-        if case .setting = entry.stableId {} else {
+        switch entry.stableId {
+        case .setting, .groupCall:
+            break
+        default:
             count += 1
         }
     }

submodules/ChatImportUI/Sources/ChatImportActivityScreen.swift

@@ -195,6 +195,18 @@ public final class ChatImportActivityScreen: ViewController {
                 if isDone {
                     self.radialCheck.transitionToState(.progress(color: .clear, lineWidth: 6.0, value: self.totalProgress, cancelEnabled: false), animated: false, synchronous: true, completion: {})
                     self.radialCheck.transitionToState(.check(self.presentationData.theme.list.itemAccentColor), animated: animated, synchronous: true, completion: {})
+                    self.radialStatus.layer.animateScale(from: 1.0, to: 1.05, duration: 0.07, delay: 0.0, timingFunction: CAMediaTimingFunctionName.linear.rawValue, removeOnCompletion: false, additive: false, completion: { [weak self] _ in
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        strongSelf.radialStatus.layer.animateScale(from: 1.05, to: 1.0, duration: 0.07, delay: 0.0, timingFunction: CAMediaTimingFunctionName.easeOut.rawValue, removeOnCompletion: false, additive: false)
+                    })
+                    self.radialCheck.layer.animateScale(from: 1.0, to: 1.05, duration: 0.07, delay: 0.0, timingFunction: CAMediaTimingFunctionName.linear.rawValue, removeOnCompletion: false, additive: false, completion: { [weak self] _ in
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        strongSelf.radialCheck.layer.animateScale(from: 1.05, to: 1.0, duration: 0.07, delay: 0.0, timingFunction: CAMediaTimingFunctionName.easeOut.rawValue, removeOnCompletion: false, additive: false)
+                    })
                     
                     let transition: ContainedViewLayoutTransition
                     if animated {

submodules/ChatListUI/Sources/ChatListController.swift

@@ -2132,8 +2132,6 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
             
             if let user = chatPeer as? TelegramUser, user.botInfo == nil, canRemoveGlobally {
                 strongSelf.maybeAskForPeerChatRemoval(peer: peer, joined: joined, completion: { _ in }, removed: {})
-            } else if let _ = chatPeer as? TelegramSecretChat, canRemoveGlobally {
-                strongSelf.maybeAskForPeerChatRemoval(peer: peer, joined: joined, completion: { _ in }, removed: {})
             } else {
                 let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData)
                 var items: [ActionSheetItem] = []
@@ -2164,6 +2162,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                     canClear = user.botInfo == nil
                     deleteTitle = strongSelf.presentationData.strings.ChatList_DeleteChat
                 } else if let _ = chatPeer as? TelegramSecretChat {
+                    canClear = true
                     deleteTitle = strongSelf.presentationData.strings.ChatList_DeleteChat
                 }
                 
@@ -2176,146 +2175,185 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                     canRemoveGlobally = true
                 }
                 
-                items.append(DeleteChatPeerActionSheetItem(context: strongSelf.context, peer: mainPeer, chatPeer: chatPeer, action: .delete, strings: strongSelf.presentationData.strings, nameDisplayOrder: strongSelf.presentationData.nameDisplayOrder))
+                if canRemoveGlobally, (mainPeer is TelegramGroup || mainPeer is TelegramChannel) {
-                if canClear {
+                    items.append(DeleteChatPeerActionSheetItem(context: strongSelf.context, peer: mainPeer, chatPeer: chatPeer, action: .deleteAndLeave, strings: strongSelf.presentationData.strings, nameDisplayOrder: strongSelf.presentationData.nameDisplayOrder))
-                    items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.DialogList_ClearHistoryConfirmation, color: .accent, action: { [weak actionSheet] in
+                    
+                    items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.ChatList_DeleteForCurrentUser, color: .destructive, action: { [weak actionSheet] in
+                        actionSheet?.dismissAnimated()
+                        self?.schedulePeerChatRemoval(peer: peer, type: .forLocalPeer, deleteGloballyIfPossible: false, completion: {
+                        })
+                    }))
+                    
+                    items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.ChatList_DeleteForAllMembers, color: .destructive, action: { [weak actionSheet] in
                         actionSheet?.dismissAnimated()
-                        
                         guard let strongSelf = self else {
                             return
                         }
-                        
+                        strongSelf.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: strongSelf.presentationData), title: strongSelf.presentationData.strings.ChatList_DeleteForEveryoneConfirmationTitle, text: strongSelf.presentationData.strings.ChannelInfo_DeleteGroupConfirmation, actions: [
-                        let beginClear: (InteractiveHistoryClearingType) -> Void = { type in
+                            TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {
+                            }),
+                            TextAlertAction(type: .destructiveAction, title: strongSelf.presentationData.strings.ChatList_DeleteForEveryoneConfirmationAction, action: {
+                                self?.schedulePeerChatRemoval(peer: peer, type: .forEveryone, deleteGloballyIfPossible: true, completion: {
+                                })
+                            })
+                        ], parseMarkdown: true), in: .window(.root))
+                    }))
+                } else {
+                    items.append(DeleteChatPeerActionSheetItem(context: strongSelf.context, peer: mainPeer, chatPeer: chatPeer, action: .delete, strings: strongSelf.presentationData.strings, nameDisplayOrder: strongSelf.presentationData.nameDisplayOrder))
+                    
+                    if canClear {
+                        items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.DialogList_ClearHistoryConfirmation, color: .accent, action: { [weak actionSheet] in
+                            actionSheet?.dismissAnimated()
+                            
                             guard let strongSelf = self else {
                                 return
                             }
-                            strongSelf.chatListDisplayNode.containerNode.updateState({ state in
-                                var state = state
-                                state.pendingClearHistoryPeerIds.insert(peer.peerId)
-                                return state
-                            })
-                            strongSelf.forEachController({ controller in
-                                if let controller = controller as? UndoOverlayController {
-                                    controller.dismissWithCommitActionAndReplacementAnimation()
-                                }
-                                return true
-                            })
                             
-                            strongSelf.present(UndoOverlayController(presentationData: strongSelf.context.sharedContext.currentPresentationData.with { $0 }, content: .removedChat(text: strongSelf.presentationData.strings.Undo_ChatCleared), elevatedLayout: false, animateInAsReplacement: true, action: { value in
+                            let beginClear: (InteractiveHistoryClearingType) -> Void = { type in
                                 guard let strongSelf = self else {
-                                    return false
+                                    return
                                 }
-                                if value == .commit {
+                                strongSelf.chatListDisplayNode.containerNode.updateState({ state in
-                                    let _ = clearHistoryInteractively(postbox: strongSelf.context.account.postbox, peerId: peerId, type: type).start(completed: {
+                                    var state = state
-                                        guard let strongSelf = self else {
+                                    state.pendingClearHistoryPeerIds.insert(peer.peerId)
-                                            return
+                                    return state
-                                        }
+                                })
+                                strongSelf.forEachController({ controller in
+                                    if let controller = controller as? UndoOverlayController {
+                                        controller.dismissWithCommitActionAndReplacementAnimation()
+                                    }
+                                    return true
+                                })
+                                
+                                strongSelf.present(UndoOverlayController(presentationData: strongSelf.context.sharedContext.currentPresentationData.with { $0 }, content: .removedChat(text: strongSelf.presentationData.strings.Undo_ChatCleared), elevatedLayout: false, animateInAsReplacement: true, action: { value in
+                                    guard let strongSelf = self else {
+                                        return false
+                                    }
+                                    if value == .commit {
+                                        let _ = clearHistoryInteractively(postbox: strongSelf.context.account.postbox, peerId: peerId, type: type).start(completed: {
+                                            guard let strongSelf = self else {
+                                                return
+                                            }
+                                            strongSelf.chatListDisplayNode.containerNode.updateState({ state in
+                                                var state = state
+                                                state.pendingClearHistoryPeerIds.remove(peer.peerId)
+                                                return state
+                                            })
+                                        })
+                                        return true
+                                    } else if value == .undo {
                                         strongSelf.chatListDisplayNode.containerNode.updateState({ state in
                                             var state = state
                                             state.pendingClearHistoryPeerIds.remove(peer.peerId)
                                             return state
                                         })
-                                    })
+                                        return true
-                                    return true
+                                    }
-                                } else if value == .undo {
+                                    return false
-                                    strongSelf.chatListDisplayNode.containerNode.updateState({ state in
+                                }), in: .current)
-                                        var state = state
-                                        state.pendingClearHistoryPeerIds.remove(peer.peerId)
-                                        return state
-                                    })
-                                    return true
-                                }
-                                return false
-                            }), in: .current)
-                        }
-                        
-                        if canRemoveGlobally {
-                            let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData)
-                            var items: [ActionSheetItem] = []
-                                                        
-                            items.append(DeleteChatPeerActionSheetItem(context: strongSelf.context, peer: mainPeer, chatPeer: chatPeer, action: .clearHistory, strings: strongSelf.presentationData.strings, nameDisplayOrder: strongSelf.presentationData.nameDisplayOrder))
-                            
-                            if joined || mainPeer.isDeleted {
-                                items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.Common_Delete, color: .destructive, action: { [weak actionSheet] in
-                                    beginClear(.forEveryone)
-                                    actionSheet?.dismissAnimated()
-                                }))
-                            } else {
-                                items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.ChatList_DeleteForEveryone(mainPeer.compactDisplayTitle).0, color: .destructive, action: { [weak actionSheet] in
-                                    beginClear(.forEveryone)
-                                    actionSheet?.dismissAnimated()
-                                }))
-                                items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.ChatList_DeleteForCurrentUser, color: .destructive, action: { [weak actionSheet] in
-                                    beginClear(.forLocalPeer)
-                                    actionSheet?.dismissAnimated()
-                                }))
                             }
                             
-                            actionSheet.setItemGroups([
+                            if canRemoveGlobally {
-                                ActionSheetItemGroup(items: items),
+                                let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData)
-                                ActionSheetItemGroup(items: [
+                                var items: [ActionSheetItem] = []
-                                    ActionSheetButtonItem(title: strongSelf.presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in
+                                                            
+                                items.append(DeleteChatPeerActionSheetItem(context: strongSelf.context, peer: mainPeer, chatPeer: chatPeer, action: .clearHistory, strings: strongSelf.presentationData.strings, nameDisplayOrder: strongSelf.presentationData.nameDisplayOrder))
+                                
+                                if joined || mainPeer.isDeleted {
+                                    items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.Common_Delete, color: .destructive, action: { [weak actionSheet] in
+                                        beginClear(.forEveryone)
                                         actionSheet?.dismissAnimated()
-                                    })
+                                    }))
+                                } else {
+                                    items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.ChatList_DeleteForEveryone(mainPeer.compactDisplayTitle).0, color: .destructive, action: { [weak actionSheet] in
+                                        beginClear(.forEveryone)
+                                        actionSheet?.dismissAnimated()
+                                    }))
+                                    items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.ChatList_DeleteForCurrentUser, color: .destructive, action: { [weak actionSheet] in
+                                        beginClear(.forLocalPeer)
+                                        actionSheet?.dismissAnimated()
+                                    }))
+                                }
+                                
+                                actionSheet.setItemGroups([
+                                    ActionSheetItemGroup(items: items),
+                                    ActionSheetItemGroup(items: [
+                                        ActionSheetButtonItem(title: strongSelf.presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in
+                                            actionSheet?.dismissAnimated()
+                                        })
+                                    ])
                                 ])
-                            ])
+                                strongSelf.present(actionSheet, in: .window(.root))
-                            strongSelf.present(actionSheet, in: .window(.root))
+                            } else {
-                        } else {
+                                strongSelf.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: strongSelf.presentationData), title: strongSelf.presentationData.strings.ChatList_DeleteSavedMessagesConfirmationTitle, text: strongSelf.presentationData.strings.ChatList_DeleteSavedMessagesConfirmationText, actions: [
-                            strongSelf.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: strongSelf.presentationData), title: strongSelf.presentationData.strings.ChatList_DeleteSavedMessagesConfirmationTitle, text: strongSelf.presentationData.strings.ChatList_DeleteSavedMessagesConfirmationText, actions: [
+                                    TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {
-                                TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {
+                                    }),
-                                }),
+                                    TextAlertAction(type: .destructiveAction, title: strongSelf.presentationData.strings.ChatList_DeleteSavedMessagesConfirmationAction, action: {
-                                TextAlertAction(type: .destructiveAction, title: strongSelf.presentationData.strings.ChatList_DeleteSavedMessagesConfirmationAction, action: {
+                                        beginClear(.forLocalPeer)
-                                    beginClear(.forLocalPeer)
+                                    })
-                                })
+                                ], parseMarkdown: true), in: .window(.root))
-                            ], parseMarkdown: true), in: .window(.root))
+                            }
-                        }
+                        }))
-                    }))
-                }
-                
-                items.append(ActionSheetButtonItem(title: deleteTitle, color: .destructive, action: { [weak actionSheet] in
-                    actionSheet?.dismissAnimated()
-                    guard let strongSelf = self else {
-                        return
                     }
                     
-                    if canRemoveGlobally, (mainPeer is TelegramGroup || mainPeer is TelegramChannel) {
+                    if chatPeer is TelegramSecretChat {
-                        let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData)
+                        items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.ChatList_DeleteForEveryone(mainPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0, color: .destructive, action: { [weak actionSheet] in
-                        var items: [ActionSheetItem] = []
-                        
-                        items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.ChatList_DeleteForCurrentUser, color: .destructive, action: { [weak actionSheet] in
-                            actionSheet?.dismissAnimated()
-                            self?.schedulePeerChatRemoval(peer: peer, type: .forLocalPeer, deleteGloballyIfPossible: false, completion: {
-                            })
-                        }))
-                        
-                        items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.ChatList_DeleteForAllMembers, color: .destructive, action: { [weak actionSheet] in
                             actionSheet?.dismissAnimated()
                             guard let strongSelf = self else {
                                 return
                             }
-                            strongSelf.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: strongSelf.presentationData), title: strongSelf.presentationData.strings.ChatList_DeleteForEveryoneConfirmationTitle, text: strongSelf.presentationData.strings.ChatList_DeleteForAllMembersConfirmationText, actions: [
+                            strongSelf.schedulePeerChatRemoval(peer: peer, type: .forEveryone, deleteGloballyIfPossible: true, completion: {
-                                TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {
+                            })
-                                }),
-                                TextAlertAction(type: .destructiveAction, title: strongSelf.presentationData.strings.ChatList_DeleteForEveryoneConfirmationAction, action: {
-                                    self?.schedulePeerChatRemoval(peer: peer, type: .forEveryone, deleteGloballyIfPossible: true, completion: {
-                                    })
-                                })
-                            ], parseMarkdown: true), in: .window(.root))
                         }))
-                            
-                        actionSheet.setItemGroups([
-                            ActionSheetItemGroup(items: items),
-                            ActionSheetItemGroup(items: [
-                                ActionSheetButtonItem(title: strongSelf.presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in
-                                    actionSheet?.dismissAnimated()
-                                })
-                            ])
-                        ])
-                        strongSelf.present(actionSheet, in: .window(.root))
                     } else {
-                        strongSelf.maybeAskForPeerChatRemoval(peer: peer, completion: { _ in }, removed: {})
+                        items.append(ActionSheetButtonItem(title: deleteTitle, color: .destructive, action: { [weak actionSheet] in
+                            actionSheet?.dismissAnimated()
+                            guard let strongSelf = self else {
+                                return
+                            }
+                            
+                            if canRemoveGlobally, (mainPeer is TelegramGroup || mainPeer is TelegramChannel) {
+                                let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData)
+                                var items: [ActionSheetItem] = []
+                                
+                                items.append(DeleteChatPeerActionSheetItem(context: strongSelf.context, peer: mainPeer, chatPeer: chatPeer, action: .deleteAndLeave, strings: strongSelf.presentationData.strings, nameDisplayOrder: strongSelf.presentationData.nameDisplayOrder))
+                                
+                                items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.ChatList_DeleteForCurrentUser, color: .destructive, action: { [weak actionSheet] in
+                                    actionSheet?.dismissAnimated()
+                                    self?.schedulePeerChatRemoval(peer: peer, type: .forLocalPeer, deleteGloballyIfPossible: false, completion: {
+                                    })
+                                }))
+                                
+                                items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.ChatList_DeleteForAllMembers, color: .destructive, action: { [weak actionSheet] in
+                                    actionSheet?.dismissAnimated()
+                                    guard let strongSelf = self else {
+                                        return
+                                    }
+                                    strongSelf.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: strongSelf.presentationData), title: strongSelf.presentationData.strings.ChatList_DeleteForEveryoneConfirmationTitle, text: strongSelf.presentationData.strings.ChatList_DeleteForAllMembersConfirmationText, actions: [
+                                        TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {
+                                        }),
+                                        TextAlertAction(type: .destructiveAction, title: strongSelf.presentationData.strings.ChatList_DeleteForEveryoneConfirmationAction, action: {
+                                            self?.schedulePeerChatRemoval(peer: peer, type: .forEveryone, deleteGloballyIfPossible: true, completion: {
+                                            })
+                                        })
+                                    ], parseMarkdown: true), in: .window(.root))
+                                }))
+                                    
+                                actionSheet.setItemGroups([
+                                    ActionSheetItemGroup(items: items),
+                                    ActionSheetItemGroup(items: [
+                                        ActionSheetButtonItem(title: strongSelf.presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in
+                                            actionSheet?.dismissAnimated()
+                                        })
+                                    ])
+                                ])
+                                strongSelf.present(actionSheet, in: .window(.root))
+                            } else {
+                                strongSelf.maybeAskForPeerChatRemoval(peer: peer, completion: { _ in }, removed: {})
+                            }
+                        }))
                     }
-                }))
+                }
                 
                 if canStop {
                     items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.DialogList_DeleteBotConversationConfirmation, color: .destructive, action: { [weak actionSheet] in

submodules/DeleteChatPeerActionSheetItem/Sources/DeleteChatPeerActionSheetItem.swift

@@ -11,6 +11,7 @@ import AccountContext
 
 public enum DeleteChatPeerAction {
     case delete
+    case deleteAndLeave
     case clearHistory
     case clearCache
     case clearCacheSuggestion
@@ -57,7 +58,8 @@ private final class DeleteChatPeerActionSheetItemNode: ActionSheetItemNode {
         self.theme = theme
         self.strings = strings
         
-        let peerFont = Font.regular(floor(theme.baseFontSize * 14.0 / 17.0))
+        let textFont = Font.regular(floor(theme.baseFontSize * 14.0 / 17.0))
+        let boldFont = Font.semibold(floor(theme.baseFontSize * 14.0 / 17.0))
         
         self.avatarNode = AvatarNode(font: avatarFont)
         self.avatarNode.isAccessibilityElement = false
@@ -93,9 +95,9 @@ private final class DeleteChatPeerActionSheetItemNode: ActionSheetItemNode {
         case .clearCache, .clearCacheSuggestion:
             switch action {
             case .clearCache:
-                attributedText = NSAttributedString(string: strings.ClearCache_Description, font: peerFont, textColor: theme.primaryTextColor)
+                attributedText = NSAttributedString(string: strings.ClearCache_Description, font: textFont, textColor: theme.primaryTextColor)
             case .clearCacheSuggestion:
-                attributedText = NSAttributedString(string: strings.ClearCache_FreeSpaceDescription, font: peerFont, textColor: theme.primaryTextColor)
+                attributedText = NSAttributedString(string: strings.ClearCache_FreeSpaceDescription, font: textFont, textColor: theme.primaryTextColor)
             default:
                 break
             }
@@ -114,6 +116,18 @@ private final class DeleteChatPeerActionSheetItemNode: ActionSheetItemNode {
                 } else {
                     text = strings.ChatList_DeleteChatConfirmation(peer.displayTitle(strings: strings, displayOrder: nameOrder))
                 }
+            case .deleteAndLeave:
+                if chatPeer.id == context.account.peerId {
+                    text = (strings.ChatList_DeleteSavedMessagesConfirmation, [])
+                } else if let chatPeer = chatPeer as? TelegramGroup {
+                    text = strings.ChatList_DeleteAndLeaveGroupConfirmation(chatPeer.title)
+                } else if let chatPeer = chatPeer as? TelegramChannel {
+                    text = strings.ChatList_DeleteAndLeaveGroupConfirmation(chatPeer.title)
+                } else if chatPeer is TelegramSecretChat {
+                    text = strings.ChatList_DeleteSecretChatConfirmation(peer.displayTitle(strings: strings, displayOrder: nameOrder))
+                } else {
+                    text = strings.ChatList_DeleteChatConfirmation(peer.displayTitle(strings: strings, displayOrder: nameOrder))
+                }
             case .clearHistory:
                 text = strings.ChatList_ClearChatConfirmation(peer.displayTitle(strings: strings, displayOrder: nameOrder))
             case .removeFromGroup:
@@ -122,9 +136,9 @@ private final class DeleteChatPeerActionSheetItemNode: ActionSheetItemNode {
                 break
             }
             if let text = text {
-                var formattedAttributedText = NSMutableAttributedString(attributedString: NSAttributedString(string: text.0, font: peerFont, textColor: theme.primaryTextColor))
+                var formattedAttributedText = NSMutableAttributedString(attributedString: NSAttributedString(string: text.0, font: textFont, textColor: theme.primaryTextColor))
                 for (_, range) in text.1 {
-                    formattedAttributedText.addAttribute(.font, value: peerFont, range: range)
+                    formattedAttributedText.addAttribute(.font, value: boldFont, range: range)
                 }
                 attributedText = formattedAttributedText
             }

submodules/Postbox/Sources/GlobalMessageHistoryTagsTable.swift

@@ -208,4 +208,13 @@ class GlobalMessageHistoryTagsTable: Table {
         }, limit: count)
         return indices
     }
+    
+    func getAll() -> [GlobalMessageHistoryTagsTableEntry] {
+        var indices: [GlobalMessageHistoryTagsTableEntry] = []
+        self.valueBox.scan(self.table, values: { key, value in
+            indices.append(parseEntry(key: key, value: value))
+            return true
+        })
+        return indices
+    }
 }

submodules/Postbox/Sources/MessageHistoryTable.swift

@@ -473,6 +473,19 @@ final class MessageHistoryTable: Table {
         self.removeMessages(indices.map { $0.id }, operationsByPeerId: &operationsByPeerId, updatedMedia: &updatedMedia, unsentMessageOperations: &unsentMessageOperations, updatedPeerReadStateOperations: &updatedPeerReadStateOperations, globalTagsOperations: &globalTagsOperations, pendingActionsOperations: &pendingActionsOperations, updatedMessageActionsSummaries: &updatedMessageActionsSummaries, updatedMessageTagSummaries: &updatedMessageTagSummaries, invalidateMessageTagSummaries: &invalidateMessageTagSummaries, localTagsOperations: &localTagsOperations, forEachMedia: forEachMedia)
     }
     
+    func removeAllMessagesWithGlobalTag(tag: GlobalMessageTags, operationsByPeerId: inout [PeerId: [MessageHistoryOperation]], updatedMedia: inout [MediaId: Media?], unsentMessageOperations: inout [IntermediateMessageHistoryUnsentOperation], updatedPeerReadStateOperations: inout [PeerId: PeerReadStateSynchronizationOperation?], globalTagsOperations: inout [GlobalMessageHistoryTagsOperation], pendingActionsOperations: inout [PendingMessageActionsOperation], updatedMessageActionsSummaries: inout [PendingMessageActionsSummaryKey: Int32], updatedMessageTagSummaries: inout [MessageHistoryTagsSummaryKey: MessageHistoryTagNamespaceSummary], invalidateMessageTagSummaries: inout [InvalidatedMessageHistoryTagsSummaryEntryOperation], localTagsOperations: inout [IntermediateMessageHistoryLocalTagsOperation], forEachMedia: (Media) -> Void) {
+        var indices: [MessageIndex] = []
+        for entry in self.allIndicesWithGlobalTag(tag: tag) {
+            switch entry {
+            case let .message(index):
+                indices.append(index)
+            case .hole:
+                break
+            }
+        }
+        self.removeMessages(indices.map { $0.id }, operationsByPeerId: &operationsByPeerId, updatedMedia: &updatedMedia, unsentMessageOperations: &unsentMessageOperations, updatedPeerReadStateOperations: &updatedPeerReadStateOperations, globalTagsOperations: &globalTagsOperations, pendingActionsOperations: &pendingActionsOperations, updatedMessageActionsSummaries: &updatedMessageActionsSummaries, updatedMessageTagSummaries: &updatedMessageTagSummaries, invalidateMessageTagSummaries: &invalidateMessageTagSummaries, localTagsOperations: &localTagsOperations, forEachMedia: forEachMedia)
+    }
+    
     func removeAllMessagesWithForwardAuthor(peerId: PeerId, forwardAuthorId: PeerId, namespace: MessageId.Namespace, operationsByPeerId: inout [PeerId: [MessageHistoryOperation]], updatedMedia: inout [MediaId: Media?], unsentMessageOperations: inout [IntermediateMessageHistoryUnsentOperation], updatedPeerReadStateOperations: inout [PeerId: PeerReadStateSynchronizationOperation?], globalTagsOperations: inout [GlobalMessageHistoryTagsOperation], pendingActionsOperations: inout [PendingMessageActionsOperation], updatedMessageActionsSummaries: inout [PendingMessageActionsSummaryKey: Int32], updatedMessageTagSummaries: inout [MessageHistoryTagsSummaryKey: MessageHistoryTagNamespaceSummary], invalidateMessageTagSummaries: inout [InvalidatedMessageHistoryTagsSummaryEntryOperation], localTagsOperations: inout [IntermediateMessageHistoryLocalTagsOperation], forEachMedia: (Media) -> Void) {
         let indices = self.allIndicesWithForwardAuthor(peerId: peerId, forwardAuthorId: forwardAuthorId, namespace: namespace)
         self.removeMessages(indices.map { $0.id }, operationsByPeerId: &operationsByPeerId, updatedMedia: &updatedMedia, unsentMessageOperations: &unsentMessageOperations, updatedPeerReadStateOperations: &updatedPeerReadStateOperations, globalTagsOperations: &globalTagsOperations, pendingActionsOperations: &pendingActionsOperations, updatedMessageActionsSummaries: &updatedMessageActionsSummaries, updatedMessageTagSummaries: &updatedMessageTagSummaries, invalidateMessageTagSummaries: &invalidateMessageTagSummaries, localTagsOperations: &localTagsOperations, forEachMedia: forEachMedia)
@@ -2717,6 +2730,10 @@ final class MessageHistoryTable: Table {
         return indices
     }
     
+    func allIndicesWithGlobalTag(tag: GlobalMessageTags) -> [GlobalMessageHistoryTagsTableEntry] {
+        return self.globalTagsTable.getAll()
+    }
+    
     func allIndicesWithForwardAuthor(peerId: PeerId, forwardAuthorId: PeerId, namespace: MessageId.Namespace) -> [MessageIndex] {
         var indices: [MessageIndex] = []
         self.valueBox.range(self.table, start: self.lowerBound(peerId: peerId, namespace: namespace), end: self.upperBound(peerId: peerId, namespace: namespace), values: { key, value in

submodules/Postbox/Sources/Postbox.swift

@@ -127,6 +127,11 @@ public final class Transaction {
         self.postbox?.removeAllMessagesWithAuthor(peerId, authorId: authorId, namespace: namespace, forEachMedia: forEachMedia)
     }
     
+    public func removeAllMessagesWithGlobalTag(tag: GlobalMessageTags) {
+        assert(!self.disposed)
+        self.postbox?.removeAllMessagesWithGlobalTag(tag: tag)
+    }
+    
     public func removeAllMessagesWithForwardAuthor(_ peerId: PeerId, forwardAuthorId: PeerId, namespace: MessageId.Namespace, forEachMedia: (Media) -> Void) {
         assert(!self.disposed)
         self.postbox?.removeAllMessagesWithForwardAuthor(peerId, forwardAuthorId: forwardAuthorId, namespace: namespace, forEachMedia: forEachMedia)
@@ -1738,6 +1743,10 @@ public final class Postbox {
         self.messageHistoryTable.removeAllMessagesWithAuthor(peerId: peerId, authorId: authorId, namespace: namespace, operationsByPeerId: &self.currentOperationsByPeerId, updatedMedia: &self.currentUpdatedMedia, unsentMessageOperations: &currentUnsentOperations, updatedPeerReadStateOperations: &self.currentUpdatedSynchronizeReadStateOperations, globalTagsOperations: &self.currentGlobalTagsOperations, pendingActionsOperations: &self.currentPendingMessageActionsOperations, updatedMessageActionsSummaries: &self.currentUpdatedMessageActionsSummaries, updatedMessageTagSummaries: &self.currentUpdatedMessageTagSummaries, invalidateMessageTagSummaries: &self.currentInvalidateMessageTagSummaries, localTagsOperations: &self.currentLocalTagsOperations, forEachMedia: forEachMedia)
     }
     
+    fileprivate func removeAllMessagesWithGlobalTag(tag: GlobalMessageTags) {
+        self.messageHistoryTable.removeAllMessagesWithGlobalTag(tag: tag, operationsByPeerId: &self.currentOperationsByPeerId, updatedMedia: &self.currentUpdatedMedia, unsentMessageOperations: &currentUnsentOperations, updatedPeerReadStateOperations: &self.currentUpdatedSynchronizeReadStateOperations, globalTagsOperations: &self.currentGlobalTagsOperations, pendingActionsOperations: &self.currentPendingMessageActionsOperations, updatedMessageActionsSummaries: &self.currentUpdatedMessageActionsSummaries, updatedMessageTagSummaries: &self.currentUpdatedMessageTagSummaries, invalidateMessageTagSummaries: &self.currentInvalidateMessageTagSummaries, localTagsOperations: &self.currentLocalTagsOperations, forEachMedia: { _ in })
+    }
+    
     fileprivate func removeAllMessagesWithForwardAuthor(_ peerId: PeerId, forwardAuthorId: PeerId, namespace: MessageId.Namespace, forEachMedia: (Media) -> Void) {
         self.messageHistoryTable.removeAllMessagesWithForwardAuthor(peerId: peerId, forwardAuthorId: forwardAuthorId, namespace: namespace, operationsByPeerId: &self.currentOperationsByPeerId, updatedMedia: &self.currentUpdatedMedia, unsentMessageOperations: &currentUnsentOperations, updatedPeerReadStateOperations: &self.currentUpdatedSynchronizeReadStateOperations, globalTagsOperations: &self.currentGlobalTagsOperations, pendingActionsOperations: &self.currentPendingMessageActionsOperations, updatedMessageActionsSummaries: &self.currentUpdatedMessageActionsSummaries, updatedMessageTagSummaries: &self.currentUpdatedMessageTagSummaries, invalidateMessageTagSummaries: &self.currentInvalidateMessageTagSummaries, localTagsOperations: &self.currentLocalTagsOperations, forEachMedia: forEachMedia)
     }

submodules/SyncCore/Sources/PeerStatusSettings.swift

@@ -15,6 +15,7 @@ public struct PeerStatusSettings: PostboxCoding, Equatable {
         public static let addExceptionWhenAddingContact = Flags(rawValue: 1 << 5)
         public static let canReportIrrelevantGeoLocation = Flags(rawValue: 1 << 6)
         public static let autoArchived = Flags(rawValue: 1 << 7)
+        public static let inviteMembers = Flags(rawValue: 1 << 8)
 
     }
     

submodules/TelegramCore/Sources/DeleteMessages.swift

@@ -1,7 +1,7 @@
 import Foundation
 import Postbox
 import SwiftSignalKit
-
+import TelegramApi
 import SyncCore
 
 func addMessageMediaResourceIdsToRemove(media: Media, resourceIds: inout [WrappedMediaResourceId]) {
@@ -91,3 +91,53 @@ public func clearHistory(transaction: Transaction, mediaBox: MediaBox, peerId: P
     transaction.clearHistory(peerId, namespaces: namespaces, forEachMedia: { _ in
     })
 }
+
+public enum ClearCallHistoryError {
+    case generic
+}
+
+public func clearCallHistory(account: Account, forEveryone: Bool) -> Signal<Never, ClearCallHistoryError> {
+    return account.postbox.transaction { transaction -> Signal<Void, NoError> in
+        var flags: Int32 = 0
+        if forEveryone {
+            flags |= 1 << 0
+        }
+        
+        let signal = account.network.request(Api.functions.messages.deletePhoneCallHistory(flags: flags))
+        |> map { result -> Api.messages.AffectedHistory? in
+            return result
+        }
+        |> `catch` { _ -> Signal<Api.messages.AffectedHistory?, Bool> in
+            return .fail(false)
+        }
+        |> mapToSignal { result -> Signal<Void, Bool> in
+            if let result = result {
+                switch result {
+                case let .affectedHistory(pts, ptsCount, offset):
+                    account.stateManager.addUpdateGroups([.updatePts(pts: pts, ptsCount: ptsCount)])
+                    if offset == 0 {
+                        return .fail(true)
+                    } else {
+                        return .complete()
+                    }
+                }
+            } else {
+                return .fail(true)
+            }
+        }
+        return (signal
+        |> restart)
+        |> `catch` { success -> Signal<Void, NoError> in
+            if success {
+                return account.postbox.transaction { transaction -> Void in
+                    transaction.removeAllMessagesWithGlobalTag(tag: GlobalMessageTags.Calls)
+                }
+            } else {
+                return .complete()
+            }
+        }
+    }
+    |> switchToLatest
+    |> ignoreValues
+    |> castError(ClearCallHistoryError.self)
+}

submodules/TelegramCore/Sources/PeerContactSettings.swift

@@ -30,6 +30,9 @@ extension PeerStatusSettings {
                 if (flags & (1 << 7)) != 0 {
                     result.insert(.autoArchived)
                 }
+                if (flags & (1 << 8)) != 0 {
+                    result.insert(.inviteMembers)
+                }
                 self = PeerStatusSettings(flags: result, geoDistance: geoDistance)
         }
     }

submodules/TelegramUI/Sources/ChatController.swift

@@ -365,6 +365,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
     
     private let createVoiceChatDisposable = MetaDisposable()
     
+    private let selectAddMemberDisposable = MetaDisposable()
+    private let addMemberDisposable = MetaDisposable()
+    
     private var shouldDisplayDownButton = false
 
     private var hasEmbeddedTitleContent = false
@@ -2854,6 +2857,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                     didDisplayActionsPanel = true
                                 } else if contactStatus.canReportIrrelevantLocation && peerStatusSettings.contains(.canReportIrrelevantGeoLocation) {
                                     didDisplayActionsPanel = true
+                                } else if peerStatusSettings.contains(.inviteMembers) {
+                                    didDisplayActionsPanel = true
                                 }
                             }
                         }
@@ -2869,6 +2874,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                     displayActionsPanel = true
                                 } else if contactStatus.canReportIrrelevantLocation && peerStatusSettings.contains(.canReportIrrelevantGeoLocation) {
                                     displayActionsPanel = true
+                                } else if peerStatusSettings.contains(.inviteMembers) {
+                                    displayActionsPanel = true
                                 }
                             }
                         }
@@ -3058,6 +3065,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                     didDisplayActionsPanel = true
                                 } else if contactStatus.canReportIrrelevantLocation && peerStatusSettings.contains(.canReportIrrelevantGeoLocation) {
                                     didDisplayActionsPanel = true
+                                } else if peerStatusSettings.contains(.inviteMembers) {
+                                    didDisplayActionsPanel = true
                                 }
                             }
                         }
@@ -3073,6 +3082,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                     displayActionsPanel = true
                                 } else if contactStatus.canReportIrrelevantLocation && peerStatusSettings.contains(.canReportIrrelevantGeoLocation) {
                                     displayActionsPanel = true
+                                } else if peerStatusSettings.contains(.inviteMembers) {
+                                    displayActionsPanel = true
                                 }
                             }
                         }
@@ -3440,6 +3451,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         self.hasActiveGroupCallDisposable?.dispose()
         self.createVoiceChatDisposable.dispose()
         self.checksTooltipDisposable.dispose()
+        self.selectAddMemberDisposable.dispose()
+        self.addMemberDisposable.dispose()
     }
     
     public func updatePresentationMode(_ mode: ChatControllerPresentationMode) {
@@ -6134,6 +6147,14 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 return
             }
             strongSelf.context.joinGroupCall(peerId: peer.id, activeCall: activeCall)
+        }, presentInviteMembers: { [weak self] in
+            guard let strongSelf = self, let peer = strongSelf.presentationInterfaceState.renderedPeer?.peer else {
+                return
+            }
+            if !(peer is TelegramGroup || peer is TelegramChannel) {
+                return
+            }
+            presentAddMembers(context: strongSelf.context, parentController: strongSelf, groupPeer: peer, selectAddMemberDisposable: strongSelf.selectAddMemberDisposable, addMemberDisposable: strongSelf.addMemberDisposable)
         }, editMessageMedia: { [weak self] messageId, draw in
             if let strongSelf = self {
                 strongSelf.controllerInteraction?.editMessageMedia(messageId, draw)

submodules/TelegramUI/Sources/ChatInterfaceTitlePanelNodes.swift

@@ -50,6 +50,8 @@ func titlePanelForChatPresentationInterfaceState(_ chatPresentationInterfaceStat
                 displayActionsPanel = true
             } else if contactStatus.canReportIrrelevantLocation && peerStatusSettings.contains(.canReportIrrelevantGeoLocation) {
                 displayActionsPanel = true
+            } else if peerStatusSettings.contains(.inviteMembers) {
+                displayActionsPanel = true
             }
         }
     }

submodules/TelegramUI/Sources/ChatPanelInterfaceInteraction.swift

@@ -128,6 +128,7 @@ final class ChatPanelInterfaceInteraction {
     let activatePinnedListPreview: (ASDisplayNode, ContextGesture) -> Void
     let editMessageMedia: (MessageId, Bool) -> Void
     let joinGroupCall: (CachedChannelData.ActiveCall) -> Void
+    let presentInviteMembers: () -> Void
     let statuses: ChatPanelInterfaceInteractionStatuses?
     
     init(
@@ -208,6 +209,7 @@ final class ChatPanelInterfaceInteraction {
         viewReplies: @escaping (MessageId?, ChatReplyThreadMessage) -> Void,
         activatePinnedListPreview: @escaping (ASDisplayNode, ContextGesture) -> Void,
         joinGroupCall: @escaping (CachedChannelData.ActiveCall) -> Void,
+        presentInviteMembers: @escaping () -> Void,
         editMessageMedia: @escaping (MessageId, Bool) -> Void,
         statuses: ChatPanelInterfaceInteractionStatuses?
     ) {
@@ -289,6 +291,7 @@ final class ChatPanelInterfaceInteraction {
         self.activatePinnedListPreview = activatePinnedListPreview
         self.editMessageMedia = editMessageMedia
         self.joinGroupCall = joinGroupCall
+        self.presentInviteMembers = presentInviteMembers
         self.statuses = statuses
     }
 }

submodules/TelegramUI/Sources/ChatRecentActionsController.swift

@@ -133,6 +133,7 @@ final class ChatRecentActionsController: TelegramBaseController {
         }, viewReplies: { _, _ in
         }, activatePinnedListPreview: { _, _ in
         }, joinGroupCall: { _ in
+        }, presentInviteMembers: {
         }, editMessageMedia: { _, _ in
         }, statuses: nil)
         

submodules/TelegramUI/Sources/ChatReportPeerTitlePanelNode.swift

@@ -17,6 +17,7 @@ private enum ChatReportPeerTitleButton: Equatable {
     case reportUserSpam
     case reportIrrelevantGeoLocation
     case unarchive
+    case inviteMembers
     
     func title(strings: PresentationStrings) -> String {
         switch self {
@@ -38,6 +39,8 @@ private enum ChatReportPeerTitleButton: Equatable {
                 return strings.Conversation_ReportGroupLocation
             case .unarchive:
                 return strings.Conversation_Unarchive
+            case .inviteMembers:
+                return strings.PeerInfo_ButtonAddMember
         }
     }
 }
@@ -90,6 +93,8 @@ private func peerButtons(_ state: ChatPresentationInterfaceState) -> [ChatReport
         } else if let contactStatus = state.contactStatus, let peerStatusSettings = contactStatus.peerStatusSettings, peerStatusSettings.contains(.autoArchived) {
             buttons.append(.reportUserSpam)
             buttons.append(.unarchive)
+        } else if let peerStatusSettings = state.contactStatus?.peerStatusSettings, peerStatusSettings.contains(.inviteMembers) {
+            buttons.append(.inviteMembers)
         } else {
             buttons.append(.reportSpam)
         }
@@ -510,6 +515,8 @@ final class ChatReportPeerTitlePanelNode: ChatTitleAccessoryPanelNode {
                         self.interfaceInteraction?.reportPeer()
                     case .unarchive:
                         self.interfaceInteraction?.unarchivePeer()
+                    case .inviteMembers:
+                        self.interfaceInteraction?.presentInviteMembers()
                     case .addContact:
                         self.interfaceInteraction?.presentPeerContact()
                     case .reportIrrelevantGeoLocation:

submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift

@@ -444,6 +444,7 @@ final class PeerInfoSelectionPanelNode: ASDisplayNode {
         }, viewReplies: { _, _ in
         }, activatePinnedListPreview: { _, _ in
         }, joinGroupCall: { _ in
+        }, presentInviteMembers: {
         }, editMessageMedia: { _, _ in
         }, statuses: nil)
         
@@ -4410,260 +4411,11 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
     }
     
     private func openAddMember() {
-        guard let data = self.data, let groupPeer = data.peer else {
+        guard let data = self.data, let groupPeer = data.peer, let controller = self.controller else {
             return
         }
         
-        let members: Promise<[PeerId]> = Promise()
+        presentAddMembers(context: self.context, parentController: controller, groupPeer: groupPeer, selectAddMemberDisposable: self.selectAddMemberDisposable, addMemberDisposable: self.addMemberDisposable)
-        if groupPeer.id.namespace == Namespaces.Peer.CloudChannel {
-            /*var membersDisposable: Disposable?
-            let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.recent(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerView.peerId, updated: { listState in
-                members.set(.single(listState.list.map {$0.peer.id}))
-                membersDisposable?.dispose()
-            })
-            membersDisposable = disposable*/
-            members.set(.single([]))
-        } else {
-            members.set(.single([]))
-        }
-        
-        let _ = (members.get()
-        |> take(1)
-        |> deliverOnMainQueue).start(next: { [weak self] recentIds in
-            guard let strongSelf = self else {
-                return
-            }
-            var createInviteLinkImpl: (() -> Void)?
-            var confirmationImpl: ((PeerId) -> Signal<Bool, NoError>)?
-            var options: [ContactListAdditionalOption] = []
-            let presentationData = strongSelf.presentationData
-            
-            var canCreateInviteLink = false
-            if let group = groupPeer as? TelegramGroup {
-                switch group.role {
-                case .creator, .admin:
-                    canCreateInviteLink = true
-                default:
-                    break
-                }
-            } else if let channel = groupPeer as? TelegramChannel {
-                if channel.hasPermission(.inviteMembers) {
-                    if channel.flags.contains(.isCreator) || (channel.adminRights != nil && channel.username == nil) {
-                        canCreateInviteLink = true
-                    }
-                }
-            }
-            
-            if canCreateInviteLink {
-                options.append(ContactListAdditionalOption(title: presentationData.strings.GroupInfo_InviteByLink, icon: .generic(UIImage(bundleImageName: "Contact List/LinkActionIcon")!), action: {
-                    createInviteLinkImpl?()
-                }, clearHighlightAutomatically: true))
-            }
-            
-            let contactsController: ViewController
-            if groupPeer.id.namespace == Namespaces.Peer.CloudGroup {
-                contactsController = strongSelf.context.sharedContext.makeContactSelectionController(ContactSelectionControllerParams(context: strongSelf.context, autoDismiss: false, title: { $0.GroupInfo_AddParticipantTitle }, options: options, confirmation: { peer in
-                    if let confirmationImpl = confirmationImpl, case let .peer(peer, _, _) = peer {
-                        return confirmationImpl(peer.id)
-                    } else {
-                        return .single(false)
-                    }
-                }))
-                contactsController.navigationPresentation = .modal
-            } else {
-                contactsController = strongSelf.context.sharedContext.makeContactMultiselectionController(ContactMultiselectionControllerParams(context: strongSelf.context, mode: .peerSelection(searchChatList: false, searchGroups: false, searchChannels: false), options: options, filters: [.excludeSelf, .disable(recentIds)]))
-                contactsController.navigationPresentation = .modal
-            }
-            
-            let context = strongSelf.context
-            confirmationImpl = { [weak contactsController] peerId in
-                return context.account.postbox.loadedPeerWithId(peerId)
-                |> deliverOnMainQueue
-                |> mapToSignal { peer in
-                    let result = ValuePromise<Bool>()
-                    let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                    if let contactsController = contactsController {
-                        let alertController = textAlertController(context: context, title: nil, text: presentationData.strings.GroupInfo_AddParticipantConfirmation(peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).0, actions: [
-                            TextAlertAction(type: .genericAction, title: presentationData.strings.Common_No, action: {
-                                result.set(false)
-                            }),
-                            TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_Yes, action: {
-                                result.set(true)
-                            })
-                        ])
-                        contactsController.present(alertController, in: .window(.root))
-                    }
-                    
-                    return result.get()
-                }
-            }
-            
-            let addMember: (ContactListPeer) -> Signal<Void, NoError> = { memberPeer -> Signal<Void, NoError> in
-                if case let .peer(selectedPeer, _, _) = memberPeer {
-                    let memberId = selectedPeer.id
-                    if groupPeer.id.namespace == Namespaces.Peer.CloudChannel {
-                        return context.peerChannelMemberCategoriesContextsManager.addMember(account: context.account, peerId: groupPeer.id, memberId: memberId)
-                        |> map { _ -> Void in
-                        }
-                        |> `catch` { _ -> Signal<Void, NoError> in
-                            return .complete()
-                        }
-                    } else {
-                        return addGroupMember(account: context.account, peerId: groupPeer.id, memberId: memberId)
-                        |> deliverOnMainQueue
-                        |> `catch` { error -> Signal<Void, NoError> in
-                            switch error {
-                            case .generic:
-                                return .complete()
-                            case .privacy:
-                                let _ = (context.account.postbox.loadedPeerWithId(memberId)
-                                |> deliverOnMainQueue).start(next: { peer in
-                                    self?.controller?.present(textAlertController(context: context, title: nil, text: presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(peer.compactDisplayTitle, peer.compactDisplayTitle).0, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                                })
-                                return .complete()
-                            case .notMutualContact:
-                                let _ = (context.account.postbox.loadedPeerWithId(memberId)
-                                |> deliverOnMainQueue).start(next: { peer in
-                                    self?.controller?.present(textAlertController(context: context, title: nil, text: presentationData.strings.GroupInfo_AddUserLeftError, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                                })
-                                return .complete()
-                            case .tooManyChannels:
-                                let _ = (context.account.postbox.loadedPeerWithId(memberId)
-                                |> deliverOnMainQueue).start(next: { peer in
-                                    self?.controller?.present(textAlertController(context: context, title: nil, text: presentationData.strings.Invite_ChannelsTooMuch, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                                })
-                                return .complete()
-                            case .groupFull:
-                                let signal = convertGroupToSupergroup(account: context.account, peerId: groupPeer.id)
-                                |> map(Optional.init)
-                                |> `catch` { error -> Signal<PeerId?, NoError> in
-                                    switch error {
-                                    case .tooManyChannels:
-                                        Queue.mainQueue().async {
-                                            self?.controller?.push(oldChannelsController(context: context, intent: .upgrade))
-                                        }
-                                    default:
-                                        break
-                                    }
-                                    return .single(nil)
-                                }
-                                |> mapToSignal { upgradedPeerId -> Signal<PeerId?, NoError> in
-                                    guard let upgradedPeerId = upgradedPeerId else {
-                                        return .single(nil)
-                                    }
-                                    return context.peerChannelMemberCategoriesContextsManager.addMember(account: context.account, peerId: upgradedPeerId, memberId: memberId)
-                                    |> `catch` { _ -> Signal<Never, NoError> in
-                                        return .complete()
-                                    }
-                                    |> mapToSignal { _ -> Signal<PeerId?, NoError> in
-                                    }
-                                    |> then(.single(upgradedPeerId))
-                                }
-                                |> deliverOnMainQueue
-                                |> mapToSignal { _ -> Signal<Void, NoError> in
-                                    return .complete()
-                                }
-                                return signal
-                            }
-                        }
-                    }
-                } else {
-                    return .complete()
-                }
-            }
-            
-            let addMembers: ([ContactListPeerId]) -> Signal<Void, AddChannelMemberError> = { members -> Signal<Void, AddChannelMemberError> in
-                let memberIds = members.compactMap { contact -> PeerId? in
-                    switch contact {
-                    case let .peer(peerId):
-                        return peerId
-                    default:
-                        return nil
-                    }
-                }
-                return context.account.postbox.multiplePeersView(memberIds)
-                |> take(1)
-                |> deliverOnMainQueue
-                |> castError(AddChannelMemberError.self)
-                |> mapToSignal { view -> Signal<Void, AddChannelMemberError> in
-                    if memberIds.count == 1 {
-                        return context.peerChannelMemberCategoriesContextsManager.addMember(account: context.account, peerId: groupPeer.id, memberId: memberIds[0])
-                        |> map { _ -> Void in
-                        }
-                    } else {
-                        return context.peerChannelMemberCategoriesContextsManager.addMembers(account: context.account, peerId: groupPeer.id, memberIds: memberIds) |> map { _ in
-                        }
-                    }
-                }
-            }
-            
-            createInviteLinkImpl = { [weak contactsController] in
-                guard let strongSelf = self else {
-                    return
-                }
-                strongSelf.view.endEditing(true)
-                contactsController?.present(InviteLinkInviteController(context: context, peerId: groupPeer.id, parentNavigationController: contactsController?.navigationController as? NavigationController), in: .window(.root))
-            }
-
-            strongSelf.controller?.push(contactsController)
-            let selectAddMemberDisposable = strongSelf.selectAddMemberDisposable
-            let addMemberDisposable = strongSelf.addMemberDisposable
-            if let contactsController = contactsController as? ContactSelectionController {
-                selectAddMemberDisposable.set((contactsController.result
-                |> deliverOnMainQueue).start(next: { [weak contactsController] memberPeer in
-                    guard let (memberPeer, _) = memberPeer else {
-                        return
-                    }
-                    
-                    contactsController?.displayProgress = true
-                    addMemberDisposable.set((addMember(memberPeer)
-                    |> deliverOnMainQueue).start(completed: {
-                        contactsController?.dismiss()
-                    }))
-                }))
-                contactsController.dismissed = {
-                    selectAddMemberDisposable.set(nil)
-                    addMemberDisposable.set(nil)
-                }
-            }
-            if let contactsController = contactsController as? ContactMultiselectionController {
-                selectAddMemberDisposable.set((contactsController.result
-                |> deliverOnMainQueue).start(next: { [weak contactsController] result in
-                    var peers: [ContactListPeerId] = []
-                    if case let .result(peerIdsValue, _) = result {
-                        peers = peerIdsValue
-                    }
-                    
-                    contactsController?.displayProgress = true
-                    addMemberDisposable.set((addMembers(peers)
-                    |> deliverOnMainQueue).start(error: { error in
-                        if peers.count == 1, case .restricted = error {
-                            switch peers[0] {
-                                case let .peer(peerId):
-                                    let _ = (context.account.postbox.loadedPeerWithId(peerId)
-                                    |> deliverOnMainQueue).start(next: { peer in
-                                        self?.controller?.present(textAlertController(context: context, title: nil, text: presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(peer.compactDisplayTitle, peer.compactDisplayTitle).0, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                                    })
-                                default:
-                                    break
-                            }
-                        } else if peers.count == 1, case .notMutualContact = error {
-                            self?.controller?.present(textAlertController(context: context, title: nil, text: presentationData.strings.GroupInfo_AddUserLeftError, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                        } else if case .tooMuchJoined = error  {
-                            self?.controller?.present(textAlertController(context: context, title: nil, text: presentationData.strings.Invite_ChannelsTooMuch, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                        }
-                        
-                        contactsController?.dismiss()
-                    },completed: {
-                        contactsController?.dismiss()
-                    }))
-                }))
-                contactsController.dismissed = {
-                    selectAddMemberDisposable.set(nil)
-                    addMemberDisposable.set(nil)
-                }
-            }
-        })
     }
     
     fileprivate func openSettings(section: PeerInfoSettingsSection) {
@@ -6300,3 +6052,247 @@ private final class MessageContextExtractedContentSource: ContextExtractedConten
         return ContextControllerPutBackViewInfo(contentAreaInScreenSpace: UIScreen.main.bounds)
     }
 }
+
+func presentAddMembers(context: AccountContext, parentController: ViewController, groupPeer: Peer, selectAddMemberDisposable: MetaDisposable, addMemberDisposable: MetaDisposable) {
+    let members: Promise<[PeerId]> = Promise()
+    if groupPeer.id.namespace == Namespaces.Peer.CloudChannel {
+        /*var membersDisposable: Disposable?
+        let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.recent(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerView.peerId, updated: { listState in
+            members.set(.single(listState.list.map {$0.peer.id}))
+            membersDisposable?.dispose()
+        })
+        membersDisposable = disposable*/
+        members.set(.single([]))
+    } else {
+        members.set(.single([]))
+    }
+    
+    let _ = (members.get()
+    |> take(1)
+    |> deliverOnMainQueue).start(next: { [weak parentController] recentIds in
+        var createInviteLinkImpl: (() -> Void)?
+        var confirmationImpl: ((PeerId) -> Signal<Bool, NoError>)?
+        var options: [ContactListAdditionalOption] = []
+        let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+        
+        var canCreateInviteLink = false
+        if let group = groupPeer as? TelegramGroup {
+            switch group.role {
+            case .creator, .admin:
+                canCreateInviteLink = true
+            default:
+                break
+            }
+        } else if let channel = groupPeer as? TelegramChannel {
+            if channel.hasPermission(.inviteMembers) {
+                if channel.flags.contains(.isCreator) || (channel.adminRights != nil && channel.username == nil) {
+                    canCreateInviteLink = true
+                }
+            }
+        }
+        
+        if canCreateInviteLink {
+            options.append(ContactListAdditionalOption(title: presentationData.strings.GroupInfo_InviteByLink, icon: .generic(UIImage(bundleImageName: "Contact List/LinkActionIcon")!), action: {
+                createInviteLinkImpl?()
+            }, clearHighlightAutomatically: true))
+        }
+        
+        let contactsController: ViewController
+        if groupPeer.id.namespace == Namespaces.Peer.CloudGroup {
+            contactsController = context.sharedContext.makeContactSelectionController(ContactSelectionControllerParams(context: context, autoDismiss: false, title: { $0.GroupInfo_AddParticipantTitle }, options: options, confirmation: { peer in
+                if let confirmationImpl = confirmationImpl, case let .peer(peer, _, _) = peer {
+                    return confirmationImpl(peer.id)
+                } else {
+                    return .single(false)
+                }
+            }))
+            contactsController.navigationPresentation = .modal
+        } else {
+            contactsController = context.sharedContext.makeContactMultiselectionController(ContactMultiselectionControllerParams(context: context, mode: .peerSelection(searchChatList: false, searchGroups: false, searchChannels: false), options: options, filters: [.excludeSelf, .disable(recentIds)]))
+            contactsController.navigationPresentation = .modal
+        }
+        
+        confirmationImpl = { [weak contactsController] peerId in
+            return context.account.postbox.loadedPeerWithId(peerId)
+            |> deliverOnMainQueue
+            |> mapToSignal { peer in
+                let result = ValuePromise<Bool>()
+                let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+                if let contactsController = contactsController {
+                    let alertController = textAlertController(context: context, title: nil, text: presentationData.strings.GroupInfo_AddParticipantConfirmation(peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).0, actions: [
+                        TextAlertAction(type: .genericAction, title: presentationData.strings.Common_No, action: {
+                            result.set(false)
+                        }),
+                        TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_Yes, action: {
+                            result.set(true)
+                        })
+                    ])
+                    contactsController.present(alertController, in: .window(.root))
+                }
+                
+                return result.get()
+            }
+        }
+        
+        let addMember: (ContactListPeer) -> Signal<Void, NoError> = { memberPeer -> Signal<Void, NoError> in
+            if case let .peer(selectedPeer, _, _) = memberPeer {
+                let memberId = selectedPeer.id
+                if groupPeer.id.namespace == Namespaces.Peer.CloudChannel {
+                    return context.peerChannelMemberCategoriesContextsManager.addMember(account: context.account, peerId: groupPeer.id, memberId: memberId)
+                    |> map { _ -> Void in
+                    }
+                    |> `catch` { _ -> Signal<Void, NoError> in
+                        return .complete()
+                    }
+                } else {
+                    return addGroupMember(account: context.account, peerId: groupPeer.id, memberId: memberId)
+                    |> deliverOnMainQueue
+                    |> `catch` { error -> Signal<Void, NoError> in
+                        switch error {
+                        case .generic:
+                            return .complete()
+                        case .privacy:
+                            let _ = (context.account.postbox.loadedPeerWithId(memberId)
+                            |> deliverOnMainQueue).start(next: { peer in
+                                parentController?.present(textAlertController(context: context, title: nil, text: presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(peer.compactDisplayTitle, peer.compactDisplayTitle).0, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                            })
+                            return .complete()
+                        case .notMutualContact:
+                            let _ = (context.account.postbox.loadedPeerWithId(memberId)
+                            |> deliverOnMainQueue).start(next: { peer in
+                                parentController?.present(textAlertController(context: context, title: nil, text: presentationData.strings.GroupInfo_AddUserLeftError, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                            })
+                            return .complete()
+                        case .tooManyChannels:
+                            let _ = (context.account.postbox.loadedPeerWithId(memberId)
+                            |> deliverOnMainQueue).start(next: { peer in
+                                parentController?.present(textAlertController(context: context, title: nil, text: presentationData.strings.Invite_ChannelsTooMuch, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                            })
+                            return .complete()
+                        case .groupFull:
+                            let signal = convertGroupToSupergroup(account: context.account, peerId: groupPeer.id)
+                            |> map(Optional.init)
+                            |> `catch` { error -> Signal<PeerId?, NoError> in
+                                switch error {
+                                case .tooManyChannels:
+                                    Queue.mainQueue().async {
+                                        parentController?.push(oldChannelsController(context: context, intent: .upgrade))
+                                    }
+                                default:
+                                    break
+                                }
+                                return .single(nil)
+                            }
+                            |> mapToSignal { upgradedPeerId -> Signal<PeerId?, NoError> in
+                                guard let upgradedPeerId = upgradedPeerId else {
+                                    return .single(nil)
+                                }
+                                return context.peerChannelMemberCategoriesContextsManager.addMember(account: context.account, peerId: upgradedPeerId, memberId: memberId)
+                                |> `catch` { _ -> Signal<Never, NoError> in
+                                    return .complete()
+                                }
+                                |> mapToSignal { _ -> Signal<PeerId?, NoError> in
+                                }
+                                |> then(.single(upgradedPeerId))
+                            }
+                            |> deliverOnMainQueue
+                            |> mapToSignal { _ -> Signal<Void, NoError> in
+                                return .complete()
+                            }
+                            return signal
+                        }
+                    }
+                }
+            } else {
+                return .complete()
+            }
+        }
+        
+        let addMembers: ([ContactListPeerId]) -> Signal<Void, AddChannelMemberError> = { members -> Signal<Void, AddChannelMemberError> in
+            let memberIds = members.compactMap { contact -> PeerId? in
+                switch contact {
+                case let .peer(peerId):
+                    return peerId
+                default:
+                    return nil
+                }
+            }
+            return context.account.postbox.multiplePeersView(memberIds)
+            |> take(1)
+            |> deliverOnMainQueue
+            |> castError(AddChannelMemberError.self)
+            |> mapToSignal { view -> Signal<Void, AddChannelMemberError> in
+                if memberIds.count == 1 {
+                    return context.peerChannelMemberCategoriesContextsManager.addMember(account: context.account, peerId: groupPeer.id, memberId: memberIds[0])
+                    |> map { _ -> Void in
+                    }
+                } else {
+                    return context.peerChannelMemberCategoriesContextsManager.addMembers(account: context.account, peerId: groupPeer.id, memberIds: memberIds) |> map { _ in
+                    }
+                }
+            }
+        }
+        
+        createInviteLinkImpl = { [weak contactsController] in
+            parentController?.view.endEditing(true)
+            contactsController?.present(InviteLinkInviteController(context: context, peerId: groupPeer.id, parentNavigationController: contactsController?.navigationController as? NavigationController), in: .window(.root))
+        }
+
+        parentController?.push(contactsController)
+        if let contactsController = contactsController as? ContactSelectionController {
+            selectAddMemberDisposable.set((contactsController.result
+            |> deliverOnMainQueue).start(next: { [weak contactsController] memberPeer in
+                guard let (memberPeer, _) = memberPeer else {
+                    return
+                }
+                
+                contactsController?.displayProgress = true
+                addMemberDisposable.set((addMember(memberPeer)
+                |> deliverOnMainQueue).start(completed: {
+                    contactsController?.dismiss()
+                }))
+            }))
+            contactsController.dismissed = {
+                selectAddMemberDisposable.set(nil)
+                addMemberDisposable.set(nil)
+            }
+        }
+        if let contactsController = contactsController as? ContactMultiselectionController {
+            selectAddMemberDisposable.set((contactsController.result
+            |> deliverOnMainQueue).start(next: { [weak contactsController] result in
+                var peers: [ContactListPeerId] = []
+                if case let .result(peerIdsValue, _) = result {
+                    peers = peerIdsValue
+                }
+                
+                contactsController?.displayProgress = true
+                addMemberDisposable.set((addMembers(peers)
+                |> deliverOnMainQueue).start(error: { error in
+                    if peers.count == 1, case .restricted = error {
+                        switch peers[0] {
+                            case let .peer(peerId):
+                                let _ = (context.account.postbox.loadedPeerWithId(peerId)
+                                |> deliverOnMainQueue).start(next: { peer in
+                                    parentController?.present(textAlertController(context: context, title: nil, text: presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(peer.compactDisplayTitle, peer.compactDisplayTitle).0, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                                })
+                            default:
+                                break
+                        }
+                    } else if peers.count == 1, case .notMutualContact = error {
+                        parentController?.present(textAlertController(context: context, title: nil, text: presentationData.strings.GroupInfo_AddUserLeftError, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                    } else if case .tooMuchJoined = error  {
+                        parentController?.present(textAlertController(context: context, title: nil, text: presentationData.strings.Invite_ChannelsTooMuch, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                    }
+                    
+                    contactsController?.dismiss()
+                },completed: {
+                    contactsController?.dismiss()
+                }))
+            }))
+            contactsController.dismissed = {
+                selectAddMemberDisposable.set(nil)
+                addMemberDisposable.set(nil)
+            }
+        }
+    })
+}

submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIBarButtonItem+Proxy.h

@@ -19,4 +19,6 @@ typedef void (^UIBarButtonItemSetEnabledListener)(BOOL);
 - (NSInteger)addSetEnabledListener:(UIBarButtonItemSetEnabledListener)listener;
 - (void)removeSetEnabledListener:(NSInteger)key;
 
+- (void)setCustomAction:(void (^)())customAction;
+
 @end

submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIBarButtonItem+Proxy.m

@@ -7,6 +7,7 @@ static const void *setEnabledListenerBagKey = &setEnabledListenerBagKey;
 static const void *setTitleListenerBagKey = &setTitleListenerBagKey;
 static const void *customDisplayNodeKey = &customDisplayNodeKey;
 static const void *backButtonAppearanceKey = &backButtonAppearanceKey;
+static const void *customActionKey = &customActionKey;
 
 @implementation UIBarButtonItem (Proxy)
 
@@ -44,6 +45,10 @@ static const void *backButtonAppearanceKey = &backButtonAppearanceKey;
     return [[self associatedObjectForKey:backButtonAppearanceKey] boolValue];
 }
 
+- (void)setCustomAction:(void (^)())customAction {
+    [self setAssociatedObject:[customAction copy] forKey:customActionKey];
+}
+
 - (void)_c1e56039_setEnabled:(BOOL)enabled
 {
     [self _c1e56039_setEnabled:enabled];
@@ -66,6 +71,12 @@ static const void *backButtonAppearanceKey = &backButtonAppearanceKey;
 
 - (void)performActionOnTarget
 {
+    void (^customAction)() = [self associatedObjectForKey:customActionKey];
+    if (customAction) {
+        customAction();
+        return;
+    }
+    
     if (self.target == nil) {
         return;
     }