- bug fixes and improvments

Author: overtake

Telegram-Mac.xcworkspace/xcuserdata/keepcoder.xcuserdatad/UserInterfaceState.xcuserstate

@@ -352,10 +352,9 @@ final class AuthorizedApplicationContext: NSObject, SplitViewDelegate {
         }, with: self, for: .F, priority: .supreme, modifierFlags: [.command, .option])
 
         #if DEBUG
-        window.set(handler: { () -> KeyHandlerResult in
-            alert(for: window, info: evaluateApiHash())
-            return .invoked
-        }, with: self, for: .T, priority: .supreme, modifierFlags: .command)
+//        window.set(handler: { () -> KeyHandlerResult in
+//            return .invoked
+//        }, with: self, for: .T, priority: .supreme, modifierFlags: .command)
         #endif
 
 

Telegram-Mac/ApplicationContext.swift

@@ -14,6 +14,9 @@ import SyncCore
 import SwiftSignalKit
 
 
+
+
+
 private final class ChannelBlacklistControllerArguments {
     let context: AccountContext
 
@@ -188,11 +191,11 @@ private struct ChannelBlacklistControllerState: Equatable {
     }
 }
 
-private func channelBlacklistControllerEntries(view: PeerView, state: ChannelBlacklistControllerState, participants: [RenderedChannelParticipant]?) -> [ChannelBlacklistEntry] {
+private func channelBlacklistControllerEntries(view: PeerView, state: ChannelBlacklistControllerState, participants: [RenderedChannelParticipant]?, inSearch: Bool) -> [ChannelBlacklistEntry] {
 
     var entries: [ChannelBlacklistEntry] = []
 
-    var index:Int32 = 0
+    var index:Int32 = 10
     var sectionId:Int32 = 1
 
 
@@ -201,16 +204,12 @@ private func channelBlacklistControllerEntries(view: PeerView, state: ChannelBla
         entries.append(.section(sectionId))
         sectionId += 1
 
-        if peer.hasPermission(.banMembers) {
-             entries.append(.addMember(sectionId, index, .singleItem))
-            index += 1
-            
-            entries.append(.header(sectionId, index, peer.isGroup ? L10n.channelBlacklistDescGroup : L10n.channelBlacklistDescChannel, .textBottomItem))
-            index += 1
-
+        if peer.hasPermission(.banMembers), !inSearch {
+            entries.append(.addMember(sectionId, 0, .singleItem))
+            entries.append(.header(sectionId, 1, peer.isGroup ? L10n.channelBlacklistDescGroup : L10n.channelBlacklistDescChannel, .textBottomItem))
         }
         if let participants = participants {
-            if !participants.isEmpty {
+            if !participants.isEmpty, peer.hasPermission(.banMembers) || inSearch {
                 entries.append(.section(sectionId))
                 sectionId += 1
             }
@@ -245,13 +244,19 @@ private func channelBlacklistControllerEntries(view: PeerView, state: ChannelBla
     return entries
 }
 
-fileprivate func prepareTransition(left:[AppearanceWrapperEntry<ChannelBlacklistEntry>], right: [AppearanceWrapperEntry<ChannelBlacklistEntry>], initialSize:NSSize, arguments:ChannelBlacklistControllerArguments) -> TableUpdateTransition {
+fileprivate func prepareTransition(left:[AppearanceWrapperEntry<ChannelBlacklistEntry>], right: [AppearanceWrapperEntry<ChannelBlacklistEntry>], initialSize:NSSize, arguments:ChannelBlacklistControllerArguments, inSearch: Bool, searchData: TableSearchVisibleData) -> TableUpdateTransition {
 
     let (removed, inserted, updated) = proccessEntriesWithoutReverse(left, right: right) { entry -> TableRowItem in
         return entry.entry.item(arguments, initialSize: initialSize)
     }
+    let searchState: TableSearchViewState?
+    if inSearch {
+        searchState = .visible(searchData)
+    } else {
+        searchState = .none
+    }
 
-    return TableUpdateTransition(deleted: removed, inserted: inserted, updated: updated, animated: true)
+    return TableUpdateTransition(deleted: removed, inserted: inserted, updated: updated, animated: true, searchState: searchState)
 }
 
 
@@ -265,6 +270,12 @@ class ChannelBlacklistViewController: EditableViewController<TableView> {
     private let updatePeerDisposable = MetaDisposable()
     private let disposable:MetaDisposable = MetaDisposable()
 
+    private let _inSearch: ValuePromise<Bool> = ValuePromise(false)
+    private var inSearch: Bool = false {
+        didSet {
+            _inSearch.set(self.inSearch)
+        }
+    }
     init(_ context:AccountContext, peerId:PeerId) {
         self.peerId = peerId
         super.init(context)
@@ -275,6 +286,8 @@ class ChannelBlacklistViewController: EditableViewController<TableView> {
         let context = self.context
         let peerId = self.peerId
 
+        
+        
         genericView.getBackgroundColor = {
             theme.colors.listBackground
         }
@@ -288,6 +301,8 @@ class ChannelBlacklistViewController: EditableViewController<TableView> {
         }
 
         let blacklistPromise = Promise<[RenderedChannelParticipant]?>(nil)
+        let listDisposable = MetaDisposable()
+        
         let viewValue:Atomic<PeerView?> = Atomic(value: nil)
 
         let restrict:(PeerId, Bool) -> Void = { [weak self] memberId, unban in
@@ -360,38 +375,85 @@ class ChannelBlacklistViewController: EditableViewController<TableView> {
         let peerView = context.account.viewTracker.peerView(peerId)
 
 
-        let (listDisposable, loadMoreControl) = context.peerChannelMemberCategoriesContextsManager.banned(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, updated: { listState in
+        var (disposable, loadMoreControl) = context.peerChannelMemberCategoriesContextsManager.banned(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, updated: { listState in
             if case .loading(true) = listState.loadingState, listState.list.isEmpty {
                 blacklistPromise.set(.single(nil))
             } else {
                 blacklistPromise.set(.single(listState.list))
             }
         })
+        
+        listDisposable.set(disposable)
+        
         actionsDisposable.add(listDisposable)
-
+        
         let initialSize = atomicSize
         let previousEntries:Atomic<[AppearanceWrapperEntry<ChannelBlacklistEntry>]> = Atomic(value: [])
 
 
-        let signal = combineLatest(statePromise.get(), peerView, blacklistPromise.get(), appearanceSignal)
+        let searchData = TableSearchVisibleData(cancelImage: theme.icons.chatSearchCancel, cancel: { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.inSearch = !strongSelf.inSearch
+            
+            (disposable, loadMoreControl) = context.peerChannelMemberCategoriesContextsManager.banned(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, updated: { listState in
+                if case .loading(true) = listState.loadingState, listState.list.isEmpty {
+                    blacklistPromise.set(.single(nil))
+                } else {
+                    blacklistPromise.set(.single(listState.list))
+                }
+            })
+            listDisposable.set(disposable)
+            
+        }, updateState: { state in
+            if !state.request.isEmpty {
+                (disposable, loadMoreControl) = context.peerChannelMemberCategoriesContextsManager.restrictedAndBanned(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.peerId, peerId: peerId, searchQuery: state.request, updated: { listState in
+                    blacklistPromise.set(.single(listState.list))
+                })
+                listDisposable.set(disposable)
+            } else {
+                (disposable, loadMoreControl) = context.peerChannelMemberCategoriesContextsManager.banned(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, updated: { listState in
+                    if case .loading(true) = listState.loadingState, listState.list.isEmpty {
+                        blacklistPromise.set(.single(nil))
+                    } else {
+                        blacklistPromise.set(.single(listState.list))
+                    }
+                })
+                listDisposable.set(disposable)
+            }
+        })
+        
+      
+        let signal = combineLatest(statePromise.get(), peerView, blacklistPromise.get(), appearanceSignal, _inSearch.get())
             |> deliverOnMainQueue
-            |> map { state, view, blacklist, appearance -> (TableUpdateTransition, PeerView) in
+            |> map { state, view, blacklist, appearance, inSearch -> (TableUpdateTransition, PeerView) in
                 _ = viewValue.swap(view)
-                let entries = channelBlacklistControllerEntries(view: view, state: state, participants: blacklist).map {AppearanceWrapperEntry(entry: $0, appearance: appearance)}
-                return (prepareTransition(left: previousEntries.swap(entries), right: entries, initialSize: initialSize.modify{$0}, arguments: arguments), view)
+                let entries = channelBlacklistControllerEntries(view: view, state: state, participants: blacklist, inSearch: inSearch).map {AppearanceWrapperEntry(entry: $0, appearance: appearance)}
+                return (prepareTransition(left: previousEntries.swap(entries), right: entries, initialSize: initialSize.modify{$0}, arguments: arguments, inSearch: inSearch, searchData: searchData), view)
         } |> afterDisposed {
             actionsDisposable.dispose()
-        }
+        } |> deliverOnMainQueue
 
-        disposable.set((signal |> deliverOnMainQueue).start(next: { [weak self] transition, peerView in
-            if let strongSelf = self {
-                strongSelf.genericView.merge(with: transition)
-                strongSelf.readyOnce()
-                strongSelf.rightBarView.isHidden = strongSelf.genericView.item(at: 0) is SearchEmptyRowItem
-                if let peer = peerViewMainPeer(peerView) as? TelegramChannel {
-                    strongSelf.rightBarView.isHidden = strongSelf.rightBarView.isHidden || !peer.hasPermission(.banMembers)
-                }
+        self.disposable.set(signal.start(next: { [weak self] transition, peerView in
+            guard let `self` = self else {
+                return
+            }
+            self.genericView.merge(with: transition)
+            self.readyOnce()
+            self.rightBarView.isHidden = self.genericView.item(at: 0) is SearchEmptyRowItem
+            if let peer = peerViewMainPeer(peerView) as? TelegramChannel {
+                self.rightBarView.isHidden = self.rightBarView.isHidden || !peer.hasPermission(.banMembers)
             }
+            
+            var hasItems: Bool = false
+            self.genericView.enumerateItems(with: { item -> Bool in
+                if item is ShortPeerRowItem {
+                    hasItems = true
+                }
+                return !hasItems
+            })
+            (self.centerBarView as? SearchTitleBarView)?.updateSearchVisibility(hasItems || self.inSearch)
         }))
 
         genericView.setScrollHandler { position in
@@ -406,6 +468,32 @@ class ChannelBlacklistViewController: EditableViewController<TableView> {
         }
     }
 
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        
+        window?.set(handler: { [weak self] () -> KeyHandlerResult in
+            guard let `self` = self else {
+                return .rejected
+            }
+            self.inSearch = !self.inSearch
+            return .invoked
+        }, with: self, for: .F, modifierFlags: [.command])
+    }
+    
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        window?.removeAllHandlers(for: self)
+    }
+    
+    override func getCenterBarViewOnce() -> TitledBarView {
+        return SearchTitleBarView(controller: self, title:.initialize(string: defaultBarTitle, color: theme.colors.text, font: .medium(.title)), handler: { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.inSearch = !strongSelf.inSearch
+        })
+    }
+    
     deinit {
         disposable.dispose()
         removePeerDisposable.dispose()

Telegram-Mac/ChannelBlacklistViewController.swift

@@ -420,7 +420,7 @@ class ChannelMembersViewController: EditableViewController<TableView> {
     }
 
     override func getCenterBarViewOnce() -> TitledBarView {
-        return PeerInfoTitleBarView(controller: self, title:.initialize(string: defaultBarTitle, color: theme.colors.text, font: .medium(.title)), handler: { [weak self] in
+        return SearchTitleBarView(controller: self, title:.initialize(string: defaultBarTitle, color: theme.colors.text, font: .medium(.title)), handler: { [weak self] in
             self?.searchChannelUsers()
         })
     }

Telegram-Mac/ChannelMembersViewController.swift

@@ -1504,7 +1504,7 @@ class ChatController: EditableViewController<ChatControllerView>, Notifable, Tab
                             apply(strongSelf, atDate: atDate)
                         } else if presentation.state != .editing, let peer = chatInteraction.peer {
                             DispatchQueue.main.async {
-                                showModal(with: ScheduledMessageModalController(context: context, sendWhenOnline: peer.isUser, scheduleAt: { [weak strongSelf] date in
+                                showModal(with: ScheduledMessageModalController(context: context, sendWhenOnline: peer.isUser && peer.id != context.peerId, scheduleAt: { [weak strongSelf] date in
                                     if let strongSelf = strongSelf {
                                         apply(strongSelf, atDate: date)
                                     }
@@ -1831,7 +1831,7 @@ class ChatController: EditableViewController<ChatControllerView>, Notifable, Tab
                     apply(strongSelf, atDate: nil)
                 case .scheduled:
                     if let peer = strongSelf.chatInteraction.peer {
-                        showModal(with: ScheduledMessageModalController(context: context, sendWhenOnline: peer.isUser, scheduleAt: { [weak strongSelf] date in
+                        showModal(with: ScheduledMessageModalController(context: context, sendWhenOnline: peer.isUser && peer.id != context.peerId, scheduleAt: { [weak strongSelf] date in
                             if let strongSelf = strongSelf {
                                 apply(strongSelf, atDate: Int32(date.timeIntervalSince1970))
                             }
@@ -2061,7 +2061,7 @@ class ChatController: EditableViewController<ChatControllerView>, Notifable, Tab
 
                 switch strongSelf.mode {
                 case .scheduled:
-                    showModal(with: ScheduledMessageModalController(context: strongSelf.context, sendWhenOnline: peer.isUser, scheduleAt: { [weak strongSelf] date in
+                    showModal(with: ScheduledMessageModalController(context: strongSelf.context, sendWhenOnline: peer.isUser && peer.id != context.peerId, scheduleAt: { [weak strongSelf] date in
                         if let strongSelf = strongSelf {
                             let _ = (Sender.enqueue(media: media, context: context, peerId: strongSelf.chatInteraction.peerId, chatInteraction: strongSelf.chatInteraction, atDate: date) |> deliverOnMainQueue).start(completed: scrollAfterSend)
                             strongSelf.nextTransaction.set(handler: {})
@@ -2162,7 +2162,7 @@ class ChatController: EditableViewController<ChatControllerView>, Notifable, Tab
                 }
                 switch strongSelf.mode {
                 case .scheduled:
-                    showModal(with: ScheduledMessageModalController(context: context, sendWhenOnline: peer.isUser, scheduleAt: { [weak strongSelf] date in
+                    showModal(with: ScheduledMessageModalController(context: context, sendWhenOnline: peer.isUser && peer.id != context.peerId, scheduleAt: { [weak strongSelf] date in
                         if let controller = strongSelf {
                             apply(controller, atDate: date)
                         }
@@ -2191,7 +2191,7 @@ class ChatController: EditableViewController<ChatControllerView>, Notifable, Tab
                     if let atDate = atDate {
                         apply(strongSelf, atDate: atDate)
                     } else {
-                        showModal(with: ScheduledMessageModalController(context: context, sendWhenOnline: peer.isUser, scheduleAt: { [weak strongSelf] date in
+                        showModal(with: ScheduledMessageModalController(context: context, sendWhenOnline: peer.isUser && peer.id != context.peerId, scheduleAt: { [weak strongSelf] date in
                             if let strongSelf = strongSelf {
                                 apply(strongSelf, atDate: date)
                             }
@@ -2232,7 +2232,7 @@ class ChatController: EditableViewController<ChatControllerView>, Notifable, Tab
                 switch strongSelf.mode {
                 case .scheduled:
                     DispatchQueue.main.async {
-                        showModal(with: ScheduledMessageModalController(context: context, sendWhenOnline: peer.isUser, scheduleAt: { [weak strongSelf] date in
+                        showModal(with: ScheduledMessageModalController(context: context, sendWhenOnline: peer.isUser && peer.id != context.peerId, scheduleAt: { [weak strongSelf] date in
                             if let strongSelf = strongSelf {
                                 apply(strongSelf, atDate: date)
                             }
@@ -4228,7 +4228,21 @@ class ChatController: EditableViewController<ChatControllerView>, Notifable, Tab
                     return false
                 }
 
+                if list.count == 1, let editState = chatInteraction.presentation.interfaceState.editState, editState.canEditMedia {
+                    return [DragItem(title: L10n.chatDropEditTitle, desc: L10n.chatDropEditDesc, handler: { [weak self] in
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        _ = (Sender.generateMedia(for: MediaSenderContainer(path: list[0], isFile: false), account: strongSelf.chatInteraction.context.account) |> deliverOnMainQueue).start(next: { media, _ in
+                            self?.chatInteraction.update({$0.updatedInterfaceState({$0.updatedEditState({$0?.withUpdatedMedia(media)})})})
+                        })
+                    })]
+                }
+                
+                
                 if !list.isEmpty {
+                    
+                    
                     let asMediaItem = DragItem(title:tr(L10n.chatDropTitle), desc: tr(L10n.chatDropQuickDesc), handler:{ [weak self] in
                         let shift = NSApp.currentEvent?.modifierFlags.contains(.shift) ?? false
                         if shift {
@@ -4280,6 +4294,17 @@ class ChatController: EditableViewController<ChatControllerView>, Notifable, Tab
             let data = pasteboard.data(forType: .tiff)
             if let data = data, let image = NSImage(data: data) {
 
+                if let editState = chatInteraction.presentation.interfaceState.editState, editState.canEditMedia {
+                    return [DragItem(title: L10n.chatDropEditTitle, desc: L10n.chatDropEditDesc, handler: { [weak self] in
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        _ = (putToTemp(image: image) |> mapToSignal {Sender.generateMedia(for: MediaSenderContainer(path: $0, isFile: false), account: strongSelf.chatInteraction.context.account)} |> deliverOnMainQueue).start(next: { media, _ in
+                            self?.chatInteraction.update({$0.updatedInterfaceState({$0.updatedEditState({$0?.withUpdatedMedia(media)})})})
+                        })
+                    })]
+                }
+                
                 var items:[DragItem] = []
 
                 let asMediaItem = DragItem(title:tr(L10n.chatDropTitle), desc: tr(L10n.chatDropQuickDesc), handler:{ [weak self] in