Invite Links Fixes

submodules/InviteLinksUI/Sources/InviteLinkInviteController.swift

@@ -55,7 +55,7 @@ private enum InviteLinkInviteEntry: Comparable, Identifiable {
     case header(PresentationTheme, String, String)
     case mainLink(PresentationTheme, ExportedInvitation)
     case links(Int32, PresentationTheme, [ExportedInvitation])
-    case manage(PresentationTheme, String)
+    case manage(PresentationTheme, String, Bool)
     
     var stableId: InviteLinkInviteEntryId {
         switch self {
@@ -90,8 +90,8 @@ private enum InviteLinkInviteEntry: Comparable, Identifiable {
                 } else {
                     return false
                 }
-            case let .manage(lhsTheme, lhsText):
+            case let .manage(lhsTheme, lhsText, lhsStandalone):
-                if case let .manage(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
+                if case let .manage(rhsTheme, rhsText, rhsStandalone) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsStandalone == rhsStandalone {
                     return true
                 } else {
                     return false
@@ -148,13 +148,13 @@ private enum InviteLinkInviteEntry: Comparable, Identifiable {
                 }, viewAction: {
                 })
             case let .links(_, _, invites):
-                return ItemListInviteLinkGridItem(presentationData: ItemListPresentationData(presentationData), invites: invites, share: true, sectionId: 0, style: .plain, tapAction: { invite in
+                return ItemListInviteLinkGridItem(presentationData: ItemListPresentationData(presentationData), invites: invites, share: true, sectionId: 1, style: .plain, tapAction: { invite in
                     interaction.copyLink(invite)
                 }, contextAction: { invite, _ in
                     interaction.shareLink(invite)
                 })
-            case let .manage(theme, text):
+            case let .manage(theme, text, standalone):
-                return InviteLinkInviteManageItem(theme: theme, text: text, action: {
+                return InviteLinkInviteManageItem(theme: theme, text: text, standalone: standalone, action: {
                     interaction.manageLinks()
                 })
         }
@@ -257,6 +257,7 @@ public final class InviteLinkInviteController: ViewController {
         
         private let context: AccountContext
         private let peerId: PeerId
+        private let invitesContext: PeerExportedInvitationsContext
         
         private var interaction: InviteLinkInviteInteraction?
         
@@ -290,6 +291,8 @@ public final class InviteLinkInviteController: ViewController {
             self.presentationDataPromise = Promise(self.presentationData)
             self.controller = controller
             
+            self.invitesContext = PeerExportedInvitationsContext(account: context.account, peerId: peerId, revoked: false, forceUpdate: false)
+                        
             self.dimNode = ASDisplayNode()
             self.dimNode.backgroundColor = UIColor(white: 0.0, alpha: 0.5)
             
@@ -386,8 +389,9 @@ public final class InviteLinkInviteController: ViewController {
                 let contextController = ContextController(account: context.account, presentationData: presentationData, source: .extracted(InviteLinkContextExtractedContentSource(controller: controller, sourceNode: node)), items: .single(items), reactionItems: [], gesture: gesture)
                 self?.controller?.presentInGlobalOverlay(contextController)
             }, copyLink: { [weak self] invite in
-                let shareController = ShareController(context: context, subject: .url(invite.link))
+                UIPasteboard.general.string = invite.link
-                self?.controller?.present(shareController, in: .window(.root))
+                let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+                self?.controller?.present(OverlayStatusController(theme: presentationData.theme, type: .genericSuccess(presentationData.strings.Username_LinkCopied, false)), in: .window(.root))
             }, shareLink: { [weak self] invite in
                 let shareController = ShareController(context: context, subject: .url(invite.link))
                 self?.controller?.present(shareController, in: .window(.root))
@@ -400,20 +404,38 @@ public final class InviteLinkInviteController: ViewController {
             let previousEntries = Atomic<[InviteLinkInviteEntry]?>(value: nil)
             
             let peerView = context.account.postbox.peerView(id: peerId)
-            self.disposable = (combineLatest(self.presentationDataPromise.get(), peerView)
+            self.disposable = (combineLatest(self.presentationDataPromise.get(), peerView, self.invitesContext.state)
-            |> deliverOnMainQueue).start(next: { [weak self] presentationData, view in
+            |> deliverOnMainQueue).start(next: { [weak self] presentationData, view, invites in
                 if let strongSelf = self {
                     var entries: [InviteLinkInviteEntry] = []
                     
                     entries.append(.header(presentationData.theme, presentationData.strings.InviteLink_InviteLink, presentationData.strings.InviteLink_CreatePrivateLinkHelp))
                     
+                    let mainInvite: ExportedInvitation?
                     if let cachedData = view.cachedData as? CachedGroupData, let invite = cachedData.exportedInvitation {
-                        entries.append(.mainLink(presentationData.theme, invite))
+                        mainInvite = invite
                     } else if let cachedData = view.cachedData as? CachedChannelData, let invite = cachedData.exportedInvitation {
-                        entries.append(.mainLink(presentationData.theme, invite))
+                        mainInvite = invite
+                    } else {
+                        mainInvite = nil
+                    }
+                    if let mainInvite = mainInvite {
+                        entries.append(.mainLink(presentationData.theme, mainInvite))
                     }
                     
-                    entries.append(.manage(presentationData.theme, presentationData.strings.InviteLink_Manage))
+                    let additionalInvites = invites.invitations.filter { $0.link != mainInvite?.link }
+                    var index: Int32 = 0
+                    for i in stride(from: 0, to: additionalInvites.endIndex, by: 2) {
+                        var invitesPair: [ExportedInvitation] = []
+                        invitesPair.append(additionalInvites[i])
+                        if i + 1 < additionalInvites.count {
+                            invitesPair.append(additionalInvites[i + 1])
+                        }
+                        entries.append(.links(index, presentationData.theme, invitesPair))
+                        index += 1
+                    }
+                    
+                    entries.append(.manage(presentationData.theme, presentationData.strings.InviteLink_Manage, additionalInvites.isEmpty))
                        
                     let previousEntries = previousEntries.swap(entries)
                     

submodules/InviteLinksUI/Sources/InviteLinkInviteManageItem.swift

@@ -14,12 +14,13 @@ class InviteLinkInviteManageItem: ListViewItem, ItemListItem {
     
     let theme: PresentationTheme
     let text: String
-    
+    let standalone: Bool
     let action: () -> Void
     
-    init(theme: PresentationTheme, text: String, action: @escaping () -> Void) {
+    init(theme: PresentationTheme, text: String, standalone: Bool, action: @escaping () -> Void) {
         self.theme = theme
         self.text = text
+        self.standalone = standalone
         self.action = action
     }
     
@@ -94,8 +95,12 @@ class InviteLinkInviteManageItemNode: ListViewItemNode {
                 if let strongSelf = self {
                     strongSelf.item = item
                     
+                    strongSelf.backgroundNode.backgroundColor = item.standalone ? .clear : item.theme.list.blocksBackgroundColor
+                    
                     strongSelf.buttonNode.setTitle(item.text, with: Font.regular(17.0), with: item.theme.actionSheet.controlAccentColor, for: .normal)
                     
+                    strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: params.width, height: 1000.0))
+
                     let size = strongSelf.buttonNode.measure(layout.contentSize)
                     strongSelf.buttonNode.frame = CGRect(origin: CGPoint(x: floorToScreenPixels((layout.contentSize.width - size.width) / 2.0), y: floorToScreenPixels((layout.contentSize.height - size.height) / 2.0)), size: size)
                 }

submodules/InviteLinksUI/Sources/InviteLinkListController.swift

@@ -449,7 +449,7 @@ public func inviteLinkListController(context: AccountContext, peerId: PeerId) ->
                     if let invite = invite {
                         if invite.isRevoked {
                             invitesContext.remove(invite)
-                            revokedInvitesContext.add(invite)
+                            revokedInvitesContext.add(invite.withUpdated(isRevoked: true))
                         } else {
                             invitesContext.update(invite)
                         }
@@ -508,7 +508,7 @@ public func inviteLinkListController(context: AccountContext, peerId: PeerId) ->
                             }))
                             
                             invitesContext.remove(invite)
-                            revokedInvitesContext.add(invite)
+                            revokedInvitesContext.add(invite.withUpdated(isRevoked: true))
                         })
                     ]),
                     ActionSheetItemGroup(items: [ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, action: { dismissAction() })])

submodules/InviteLinksUI/Sources/InviteLinksGridNode.swift

@@ -63,11 +63,36 @@ private enum ItemBackgroundColor: Equatable {
             case .red:
                 return (UIColor(rgb: 0xf2656a), UIColor(rgb: 0xf25f65), UIColor(rgb: 0xffd3de))
             case .gray:
-                return (UIColor(rgb: 0xd4d8db), UIColor(rgb: 0xced2d5), UIColor(rgb: 0xf8f9f9))
+                return (UIColor(rgb: 0xa8b2bb), UIColor(rgb: 0xa2abb4), UIColor(rgb: 0xe3e6e8))
         }
     }
 }
 
+private let moreIcon = generateImage(CGSize(width: 26.0, height: 26.0), contextGenerator: { size, context in
+    context.clear(CGRect(origin: CGPoint(), size: size))
+    
+    context.setFillColor(UIColor.white.cgColor)
+    context.fillEllipse(in: CGRect(origin: CGPoint(), size: size))
+    
+    context.setBlendMode(.clear)
+    context.fillEllipse(in: CGRect(origin: CGPoint(x: 4.0, y: 11.0), size: CGSize(width: 4.0, height: 4.0)))
+    context.fillEllipse(in: CGRect(origin: CGPoint(x: 11.0, y: 11.0), size: CGSize(width: 4.0, height: 4.0)))
+    context.fillEllipse(in: CGRect(origin: CGPoint(x: 18.0, y: 11.0), size: CGSize(width: 4.0, height: 4.0)))
+})
+
+private let shareIcon = generateImage(CGSize(width: 26.0, height: 26.0), contextGenerator: { size, context in
+    context.clear(CGRect(origin: CGPoint(), size: size))
+    
+    context.setFillColor(UIColor.white.cgColor)
+    context.fillEllipse(in: CGRect(origin: CGPoint(), size: size))
+    
+    if let maskImage = UIImage(bundleImageName: "Chat/Links/Share") {
+        context.clip(to: CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - maskImage.size.width) / 2.0), y: floorToScreenPixels((size.height - maskImage.size.height) / 2.0)), size: maskImage.size), mask: maskImage.cgImage!)
+        context.setBlendMode(.clear)
+        context.fillEllipse(in: CGRect(origin: CGPoint(), size: size))
+    }
+})
+
 private class ItemNode: ASDisplayNode {
     private let selectionNode: HighlightTrackingButtonNode
     private let wrapperNode: ASDisplayNode
@@ -114,17 +139,6 @@ private class ItemNode: ASDisplayNode {
         self.buttonIconNode = ASImageNode()
         self.buttonIconNode.displaysAsynchronously = false
         self.buttonIconNode.displayWithoutProcessing = true
-        self.buttonIconNode.image = generateImage(CGSize(width: 26.0, height: 26.0), contextGenerator: { size, context in
-            context.clear(CGRect(origin: CGPoint(), size: size))
-            
-            context.setFillColor(UIColor.white.cgColor)
-            context.fillEllipse(in: CGRect(origin: CGPoint(), size: size))
-            
-            context.setBlendMode(.clear)
-            context.fillEllipse(in: CGRect(origin: CGPoint(x: 4.0, y: 11.0), size: CGSize(width: 4.0, height: 4.0)))
-            context.fillEllipse(in: CGRect(origin: CGPoint(x: 11.0, y: 11.0), size: CGSize(width: 4.0, height: 4.0)))
-            context.fillEllipse(in: CGRect(origin: CGPoint(x: 18.0, y: 11.0), size: CGSize(width: 4.0, height: 4.0)))
-        })
         
         self.titleNode = ImmediateTextNode()
         self.titleNode.maximumNumberOfLines = 2
@@ -264,6 +278,8 @@ private class ItemNode: ASDisplayNode {
         }
         self.titleNode.attributedText = title
         
+        self.buttonIconNode.image = share ? shareIcon : moreIcon
+        
         var subtitleText: String = ""
         if let count = invite.count {
             subtitleText = presentationData.strings.InviteLink_PeopleJoinedShort(count)
@@ -282,7 +298,11 @@ private class ItemNode: ASDisplayNode {
             if !subtitleText.isEmpty {
                 subtitleText += " • "
             }
+            if share {
+                subtitleText = presentationData.strings.InviteLink_Expired
+            } else {
                 subtitleText += presentationData.strings.InviteLink_Expired
+            }
             self.iconNode.image = generateTintedImage(image: UIImage(bundleImageName: "Chat/Links/Expired"), color: .white)
             self.timerNode?.removeFromSupernode()
             self.timerNode = nil
@@ -290,7 +310,11 @@ private class ItemNode: ASDisplayNode {
             if !subtitleText.isEmpty {
                 subtitleText += " • "
             }
+            if share {
+                subtitleText = presentationData.strings.InviteLink_UsageLimitReached
+            } else {
                 subtitleText += presentationData.strings.InviteLink_UsageLimitReached
+            }
             self.iconNode.image = generateTintedImage(image: UIImage(bundleImageName: "Chat/Links/Expired"), color: .white)
             self.timerNode?.removeFromSupernode()
             self.timerNode = nil
@@ -306,10 +330,16 @@ private class ItemNode: ASDisplayNode {
                 self.addSubnode(timerNode)
             }
             timerNode.update(color: UIColor.white, creationTimestamp: invite.date, deadlineTimestamp: expireDate)
+            if share {
+                subtitleText = presentationData.strings.InviteLink_TapToCopy
+            }
         } else {
             self.iconNode.image = generateTintedImage(image: UIImage(bundleImageName: "Chat/Links/Link"), color: .white)
             self.timerNode?.removeFromSupernode()
             self.timerNode = nil
+            if share {
+                subtitleText = presentationData.strings.InviteLink_TapToCopy
+            }
         }
         
         self.iconNode.frame = CGRect(x: 10.0, y: 10.0, width: 30.0, height: 30.0)

submodules/InviteLinksUI/Sources/ItemListInviteLinkGridItem.swift

@@ -130,14 +130,21 @@ public class ItemListInviteLinkGridItemNode: ListViewItemNode, ItemListItemNode
             let itemSeparatorColor: UIColor
             
             let leftInset = 16.0 + params.leftInset
+            let topInset: CGFloat
+            if case .plain = item.style, case .otherSection = neighbors.top {
+                topInset = 16.0
+            } else {
+                topInset = 4.0
+            }
+            
             
             var height: CGFloat
             let count = item.invites?.count ?? 0
             if count > 0 {
                 if count % 2 == 0 {
-                    height = 4.0 + 122.0 + 6.0
+                    height = topInset + 122.0 + 6.0
                 } else {
-                    height = 4.0 + 102.0 + 6.0
+                    height = topInset + 102.0 + 6.0
                 }
             } else {
                 height = 0.001
@@ -145,9 +152,9 @@ public class ItemListInviteLinkGridItemNode: ListViewItemNode, ItemListItemNode
             
             switch item.style {
             case .plain:
-                itemBackgroundColor = item.presentationData.theme.list.plainBackgroundColor
+                itemBackgroundColor = item.presentationData.theme.list.blocksBackgroundColor
-                itemSeparatorColor = item.presentationData.theme.list.itemPlainSeparatorColor
+                itemSeparatorColor = item.presentationData.theme.list.blocksBackgroundColor
-                insets = itemListNeighborsPlainInsets(neighbors)
+                insets = UIEdgeInsets()
             case .blocks:
                 itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor
                 itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor
@@ -155,7 +162,7 @@ public class ItemListInviteLinkGridItemNode: ListViewItemNode, ItemListItemNode
             }
             if case .sameSection(false) = neighbors.bottom {
             } else {
-                height += 6.0
+                height += 10.0
             }
             contentSize = CGSize(width: params.width, height: height)
             
@@ -170,7 +177,7 @@ public class ItemListInviteLinkGridItemNode: ListViewItemNode, ItemListItemNode
                     }
                     
                     let gridSize = strongSelf.gridNode.update(size: contentSize, safeInset: params.leftInset, items: item.invites ?? [], share: item.share, presentationData: item.presentationData, transition: .immediate)
-                    strongSelf.gridNode.frame = CGRect(origin: CGPoint(), size: gridSize)
+                    strongSelf.gridNode.frame = CGRect(origin: CGPoint(x: 0.0, y: topInset - 4.0), size: gridSize)
                     strongSelf.gridNode.action = { invite in
                         item.tapAction?(invite)
                     }
@@ -180,18 +187,19 @@ public class ItemListInviteLinkGridItemNode: ListViewItemNode, ItemListItemNode
                     
                     switch item.style {
                     case .plain:
-                        if strongSelf.backgroundNode.supernode != nil {
+                        if strongSelf.backgroundNode.supernode == nil {
-                            strongSelf.backgroundNode.removeFromSupernode()
+                            strongSelf.insertSubnode(strongSelf.backgroundNode, at: 0)
                         }
                         if strongSelf.topStripeNode.supernode != nil {
                             strongSelf.topStripeNode.removeFromSupernode()
                         }
-                        if strongSelf.bottomStripeNode.supernode == nil {
+                        if strongSelf.bottomStripeNode.supernode != nil {
-                            strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 0)
+                            strongSelf.bottomStripeNode.removeFromSupernode()
                         }
                         if strongSelf.maskNode.supernode != nil {
                             strongSelf.maskNode.removeFromSupernode()
                         }
+                        strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: params.width, height: contentSize.height))
                         strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: leftInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - leftInset, height: separatorHeight))
                     case .blocks:
                         if strongSelf.backgroundNode.supernode == nil {

submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift

@@ -595,15 +595,6 @@ private func channelVisibilityControllerEntries(presentationData: PresentationDa
                         } else {
                             entries.append(.publicLinkInfo(presentationData.theme, presentationData.strings.Group_Username_CreatePublicLinkHelp))
                         }                        
-                        
-                        switch mode {
-                            case .initialSetup:
-                                break
-                            case .generic, .privateLink:
-                                entries.append(.privateLinkManage(presentationData.theme, presentationData.strings.InviteLink_Manage))
-                                entries.append(.privateLinkManageInfo(presentationData.theme, presentationData.strings.InviteLink_CreateInfo))
-                        }
-                        
                     } else {
                         entries.append(.publicLinkInfo(presentationData.theme, presentationData.strings.Channel_Username_CreatePublicLinkHelp))
                     }

submodules/SyncCore/Sources/ExportedInvitation.swift

@@ -66,4 +66,8 @@ public struct ExportedInvitation: PostboxCoding, Equatable {
     public static func ==(lhs: ExportedInvitation, rhs: ExportedInvitation) -> Bool {
         return lhs.link == rhs.link && lhs.isPermanent == rhs.isPermanent && lhs.isRevoked == rhs.isRevoked && lhs.adminId == rhs.adminId && lhs.date == rhs.date && lhs.startDate == rhs.startDate && lhs.expireDate == rhs.expireDate && lhs.usageLimit == rhs.usageLimit && lhs.count == rhs.count
     }
+    
+    public func withUpdated(isRevoked: Bool) -> ExportedInvitation {
+        return ExportedInvitation(link: self.link, isPermanent: self.isPermanent, isRevoked: isRevoked, adminId: self.adminId, date: self.date, startDate: self.startDate, expireDate: self.expireDate, usageLimit: self.usageLimit, count: self.count)
+    }
 }

submodules/TelegramUI/Images.xcassets/Chat/Links/Share.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_sharelink.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift

@@ -4570,16 +4570,8 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                     return
                 }
                 strongSelf.view.endEditing(true)
-                let mode: ChannelVisibilityControllerMode
-                if groupPeer.addressName != nil {
-                    let visibilityController = channelVisibilityController(context: strongSelf.context, peerId: groupPeer.id, mode: .generic, upgradedToSupergroup: { _, f in f() }, onDismissRemoveController: contactsController)
-                    //visibilityController.navigationPresentation = .modal
-    
-                    contactsController?.push(visibilityController)
-                } else {
                 contactsController?.present(InviteLinkInviteController(context: context, peerId: groupPeer.id, parentNavigationController: contactsController?.navigationController as? NavigationController), in: .window(.root))
             }
-            }
 
             strongSelf.controller?.push(contactsController)
             let selectAddMemberDisposable = strongSelf.selectAddMemberDisposable