diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings index f87ee06cf0..b995a98026 100644 --- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings @@ -6783,13 +6783,7 @@ Sorry for the inconvenience."; "SponsoredMessageMenu.Info" = "What are sponsored\nmessages?"; "SponsoredMessageInfoScreen.Title" = "What are sponsored messages?"; -"SponsoredMessageInfoScreen.Text" = "Unlike other apps, Telegram never uses your private data to target ads. You are seeing this message only because someone chose this public one-to many channel as a space to promote their messages. This means that no user data is mined or analyzed to display ads, and every user viewing a channel on Telegram sees the same sponsored message. - -Unline other apps, Telegram doesn't track whether you tapped on a sponsored message and doesn't profile you based on your activity. We also prevent external links in sponsored messages to ensure that third parties can't spy on our users. We believe that everyone has the right to privacy, and technological platforms should respect that. - -Telegram offers free and unlimited service to hundreds of millions of users, which involves significant server and traffic costs. In order to remain independent and stay true to its values, Telegram developed a paid tool to promote messages with user privacy in mind. We welcome responsible adverticers at: -[url] -Ads should no longer be synonymous with abuse of user privacy. Let us redefine how a tech compony should operate — together."; +"SponsoredMessageInfoScreen.Text" = "Unlike other apps, Telegram never uses your private data to target ads. You are seeing this message only because someone chose this public one-to many channel as a space to promote their messages. This means that no user data is mined or analyzed to display ads, and every user viewing a channel on Telegram sees the same sponsored message.\n\nUnline other apps, Telegram doesn't track whether you tapped on a sponsored message and doesn't profile you based on your activity. We also prevent external links in sponsored messages to ensure that third parties can't spy on our users. We believe that everyone has the right to privacy, and technological platforms should respect that.\n\nTelegram offers free and unlimited service to hundreds of millions of users, which involves significant server and traffic costs. In order to remain independent and stay true to its values, Telegram developed a paid tool to promote messages with user privacy in mind. We welcome responsible adverticers at:\n[url]\nAds should no longer be synonymous with abuse of user privacy. Let us redefine how a tech compony should operate — together."; "SponsoredMessageInfo.Action" = "Learn More"; "SponsoredMessageInfo.Url" = "https://telegram.org/ads"; diff --git a/submodules/InviteLinksUI/Sources/InviteLinkListController.swift b/submodules/InviteLinksUI/Sources/InviteLinkListController.swift index 34261c1890..322c7b7ffa 100644 --- a/submodules/InviteLinksUI/Sources/InviteLinkListController.swift +++ b/submodules/InviteLinksUI/Sources/InviteLinkListController.swift @@ -756,7 +756,7 @@ public func inviteLinkListController(context: AccountContext, updatedPresentatio |> distinctUntilChanged |> deliverOnMainQueue |> map { invite -> PeerInvitationImportersContext? in - return invite.flatMap { context.engine.peers.peerInvitationImporters(peerId: peerId, invite: $0) } + return invite.flatMap { context.engine.peers.peerInvitationImporters(peerId: peerId, subject: .invite(invite: $0, requested: false)) } } |> afterNext { context in if let context = context { importersState.set(context.state |> map(Optional.init)) diff --git a/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift b/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift index fd3bac1755..0c21890f25 100644 --- a/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift +++ b/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift @@ -376,7 +376,7 @@ public final class InviteLinkViewController: ViewController { self.presentationDataPromise = Promise(self.presentationData) self.controller = controller - self.importersContext = importersContext ?? context.engine.peers.peerInvitationImporters(peerId: peerId, invite: invite) + self.importersContext = importersContext ?? context.engine.peers.peerInvitationImporters(peerId: peerId, subject: .invite(invite: invite, requested: false)) self.dimNode = ASDisplayNode() self.dimNode.backgroundColor = UIColor(white: 0.0, alpha: 0.5) diff --git a/submodules/InviteLinksUI/Sources/InviteRequestsController.swift b/submodules/InviteLinksUI/Sources/InviteRequestsController.swift index d156597672..39cb5b24fd 100644 --- a/submodules/InviteLinksUI/Sources/InviteRequestsController.swift +++ b/submodules/InviteLinksUI/Sources/InviteRequestsController.swift @@ -166,7 +166,7 @@ public func inviteRequestsController(context: AccountContext, updatedPresentatio var getControllerImpl: (() -> ViewController?)? - let importersContext = existingContext ?? context.engine.peers.peerInvitationImporters(peerId: peerId, invite: nil) + let importersContext = existingContext ?? context.engine.peers.peerInvitationImporters(peerId: peerId, subject: .requests) let arguments = InviteRequestsControllerArguments(context: context, openLinks: { let controller = inviteLinkListController(context: context, updatedPresentationData: updatedPresentationData, peerId: peerId, admin: nil) diff --git a/submodules/InviteLinksUI/Sources/ItemListInviteLinkItem.swift b/submodules/InviteLinksUI/Sources/ItemListInviteLinkItem.swift index dbcd124664..f73bd7646f 100644 --- a/submodules/InviteLinksUI/Sources/ItemListInviteLinkItem.swift +++ b/submodules/InviteLinksUI/Sources/ItemListInviteLinkItem.swift @@ -338,25 +338,34 @@ public class ItemListInviteLinkItemNode: ListViewItemNode, ItemListItemNode { let inviteLink = item.invite?.link.replacingOccurrences(of: "https://", with: "") ?? "" var titleText = inviteLink - + var subtitleText: String = "" var timerValue: TimerNode.Value? if let invite = item.invite { let count = invite.count ?? 0 + let requestedCount = invite.requestedCount ?? 0 + if count > 0 { - if invite.requestApproval { - subtitleText = item.presentationData.strings.MemberRequests_PeopleRequestedShort(count) - } else { - subtitleText = item.presentationData.strings.InviteLink_PeopleJoinedShort(count) - } + subtitleText = item.presentationData.strings.InviteLink_PeopleJoinedShort(count) } else { if let usageLimit = invite.usageLimit, count == 0 && !availability.isZero { subtitleText = item.presentationData.strings.InviteLink_PeopleCanJoin(usageLimit) } else { - subtitleText = availability.isZero ? item.presentationData.strings.InviteLink_PeopleJoinedShortNoneExpired : item.presentationData.strings.InviteLink_PeopleJoinedShortNone + if availability.isZero { + subtitleText = item.presentationData.strings.InviteLink_PeopleJoinedShortNoneExpired + } else if requestedCount == 0 { + subtitleText = item.presentationData.strings.InviteLink_PeopleJoinedShortNone + } } } + if requestedCount > 0 { + if !subtitleText.isEmpty { + subtitleText += ", " + } + subtitleText += item.presentationData.strings.MemberRequests_PeopleRequestedShort(requestedCount) + } + if invite.isRevoked { if !subtitleText.isEmpty { subtitleText += " • " diff --git a/submodules/TelegramApi/Sources/Api0.swift b/submodules/TelegramApi/Sources/Api0.swift index 12f4dc76c0..aea40542c7 100644 --- a/submodules/TelegramApi/Sources/Api0.swift +++ b/submodules/TelegramApi/Sources/Api0.swift @@ -745,7 +745,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[-1625153079] = { return Api.InputWebFileLocation.parse_inputWebFileGeoPointLocation($0) } dict[-1275374751] = { return Api.EmojiLanguage.parse_emojiLanguage($0) } dict[1601666510] = { return Api.MessageFwdHeader.parse_messageFwdHeader($0) } - dict[708589599] = { return Api.SponsoredMessage.parse_sponsoredMessage($0) } + dict[-783162982] = { return Api.SponsoredMessage.parse_sponsoredMessage($0) } dict[-1012849566] = { return Api.BaseTheme.parse_baseThemeClassic($0) } dict[-69724536] = { return Api.BaseTheme.parse_baseThemeDay($0) } dict[-1212997976] = { return Api.BaseTheme.parse_baseThemeNight($0) } @@ -838,6 +838,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[-1781355374] = { return Api.MessageAction.parse_messageActionChannelCreate($0) } dict[-519864430] = { return Api.MessageAction.parse_messageActionChatMigrateTo($0) } dict[-365344535] = { return Api.MessageAction.parse_messageActionChannelMigrateFrom($0) } + dict[-339958837] = { return Api.MessageAction.parse_messageActionChatJoinedByRequest($0) } dict[-1799538451] = { return Api.MessageAction.parse_messageActionPinMessage($0) } dict[-1615153660] = { return Api.MessageAction.parse_messageActionHistoryClear($0) } dict[-1834538890] = { return Api.MessageAction.parse_messageActionGameScore($0) } @@ -856,7 +857,6 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[-1441072131] = { return Api.MessageAction.parse_messageActionSetMessagesTTL($0) } dict[-1281329567] = { return Api.MessageAction.parse_messageActionGroupCallScheduled($0) } dict[-1434950843] = { return Api.MessageAction.parse_messageActionSetChatTheme($0) } - dict[-339958837] = { return Api.MessageAction.parse_messageActionChatJoinedByRequest($0) } dict[1399245077] = { return Api.PhoneCall.parse_phoneCallEmpty($0) } dict[-987599081] = { return Api.PhoneCall.parse_phoneCallWaiting($0) } dict[347139340] = { return Api.PhoneCall.parse_phoneCallRequested($0) } diff --git a/submodules/TelegramApi/Sources/Api2.swift b/submodules/TelegramApi/Sources/Api2.swift index 321b603aee..6e0f5b914c 100644 --- a/submodules/TelegramApi/Sources/Api2.swift +++ b/submodules/TelegramApi/Sources/Api2.swift @@ -19396,17 +19396,18 @@ public extension Api { } public enum SponsoredMessage: TypeConstructorDescription { - case sponsoredMessage(flags: Int32, randomId: Buffer, fromId: Api.Peer, startParam: String?, message: String, entities: [Api.MessageEntity]?) + case sponsoredMessage(flags: Int32, randomId: Buffer, fromId: Api.Peer, channelPost: Int32?, startParam: String?, message: String, entities: [Api.MessageEntity]?) public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { switch self { - case .sponsoredMessage(let flags, let randomId, let fromId, let startParam, let message, let entities): + case .sponsoredMessage(let flags, let randomId, let fromId, let channelPost, let startParam, let message, let entities): if boxed { - buffer.appendInt32(708589599) + buffer.appendInt32(-783162982) } serializeInt32(flags, buffer: buffer, boxed: false) serializeBytes(randomId, buffer: buffer, boxed: false) fromId.serialize(buffer, true) + if Int(flags) & Int(1 << 2) != 0 {serializeInt32(channelPost!, buffer: buffer, boxed: false)} if Int(flags) & Int(1 << 0) != 0 {serializeString(startParam!, buffer: buffer, boxed: false)} serializeString(message, buffer: buffer, boxed: false) if Int(flags) & Int(1 << 1) != 0 {buffer.appendInt32(481674261) @@ -19420,8 +19421,8 @@ public extension Api { public func descriptionFields() -> (String, [(String, Any)]) { switch self { - case .sponsoredMessage(let flags, let randomId, let fromId, let startParam, let message, let entities): - return ("sponsoredMessage", [("flags", flags), ("randomId", randomId), ("fromId", fromId), ("startParam", startParam), ("message", message), ("entities", entities)]) + case .sponsoredMessage(let flags, let randomId, let fromId, let channelPost, let startParam, let message, let entities): + return ("sponsoredMessage", [("flags", flags), ("randomId", randomId), ("fromId", fromId), ("channelPost", channelPost), ("startParam", startParam), ("message", message), ("entities", entities)]) } } @@ -19434,22 +19435,25 @@ public extension Api { if let signature = reader.readInt32() { _3 = Api.parse(reader, signature: signature) as? Api.Peer } - var _4: String? - if Int(_1!) & Int(1 << 0) != 0 {_4 = parseString(reader) } + var _4: Int32? + if Int(_1!) & Int(1 << 2) != 0 {_4 = reader.readInt32() } var _5: String? - _5 = parseString(reader) - var _6: [Api.MessageEntity]? + if Int(_1!) & Int(1 << 0) != 0 {_5 = parseString(reader) } + var _6: String? + _6 = parseString(reader) + var _7: [Api.MessageEntity]? if Int(_1!) & Int(1 << 1) != 0 {if let _ = reader.readInt32() { - _6 = Api.parseVector(reader, elementSignature: 0, elementType: Api.MessageEntity.self) + _7 = Api.parseVector(reader, elementSignature: 0, elementType: Api.MessageEntity.self) } } let _c1 = _1 != nil let _c2 = _2 != nil let _c3 = _3 != nil - let _c4 = (Int(_1!) & Int(1 << 0) == 0) || _4 != nil - let _c5 = _5 != nil - let _c6 = (Int(_1!) & Int(1 << 1) == 0) || _6 != nil - if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 { - return Api.SponsoredMessage.sponsoredMessage(flags: _1!, randomId: _2!, fromId: _3!, startParam: _4, message: _5!, entities: _6) + let _c4 = (Int(_1!) & Int(1 << 2) == 0) || _4 != nil + let _c5 = (Int(_1!) & Int(1 << 0) == 0) || _5 != nil + let _c6 = _6 != nil + let _c7 = (Int(_1!) & Int(1 << 1) == 0) || _7 != nil + if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 { + return Api.SponsoredMessage.sponsoredMessage(flags: _1!, randomId: _2!, fromId: _3!, channelPost: _4, startParam: _5, message: _6!, entities: _7) } else { return nil @@ -21079,6 +21083,7 @@ public extension Api { case messageActionChannelCreate(title: String) case messageActionChatMigrateTo(channelId: Int64) case messageActionChannelMigrateFrom(title: String, chatId: Int64) + case messageActionChatJoinedByRequest case messageActionPinMessage case messageActionHistoryClear case messageActionGameScore(gameId: Int64, score: Int32) @@ -21097,7 +21102,6 @@ public extension Api { case messageActionSetMessagesTTL(period: Int32) case messageActionGroupCallScheduled(call: Api.InputGroupCall, scheduleDate: Int32) case messageActionSetChatTheme(emoticon: String) - case messageActionChatJoinedByRequest public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { switch self { @@ -21176,6 +21180,12 @@ public extension Api { } serializeString(title, buffer: buffer, boxed: false) serializeInt64(chatId, buffer: buffer, boxed: false) + break + case .messageActionChatJoinedByRequest: + if boxed { + buffer.appendInt32(-339958837) + } + break case .messageActionPinMessage: if boxed { @@ -21314,12 +21324,6 @@ public extension Api { buffer.appendInt32(-1434950843) } serializeString(emoticon, buffer: buffer, boxed: false) - break - case .messageActionChatJoinedByRequest: - if boxed { - buffer.appendInt32(-339958837) - } - break } } @@ -21348,6 +21352,8 @@ public extension Api { return ("messageActionChatMigrateTo", [("channelId", channelId)]) case .messageActionChannelMigrateFrom(let title, let chatId): return ("messageActionChannelMigrateFrom", [("title", title), ("chatId", chatId)]) + case .messageActionChatJoinedByRequest: + return ("messageActionChatJoinedByRequest", []) case .messageActionPinMessage: return ("messageActionPinMessage", []) case .messageActionHistoryClear: @@ -21384,8 +21390,6 @@ public extension Api { return ("messageActionGroupCallScheduled", [("call", call), ("scheduleDate", scheduleDate)]) case .messageActionSetChatTheme(let emoticon): return ("messageActionSetChatTheme", [("emoticon", emoticon)]) - case .messageActionChatJoinedByRequest: - return ("messageActionChatJoinedByRequest", []) } } @@ -21506,6 +21510,9 @@ public extension Api { return nil } } + public static func parse_messageActionChatJoinedByRequest(_ reader: BufferReader) -> MessageAction? { + return Api.MessageAction.messageActionChatJoinedByRequest + } public static func parse_messageActionPinMessage(_ reader: BufferReader) -> MessageAction? { return Api.MessageAction.messageActionPinMessage } @@ -21750,9 +21757,6 @@ public extension Api { return nil } } - public static func parse_messageActionChatJoinedByRequest(_ reader: BufferReader) -> MessageAction? { - return Api.MessageAction.messageActionChatJoinedByRequest - } } public enum PhoneCall: TypeConstructorDescription { diff --git a/submodules/TelegramApi/Sources/Api4.swift b/submodules/TelegramApi/Sources/Api4.swift index 4df54958c7..102ea4fd28 100644 --- a/submodules/TelegramApi/Sources/Api4.swift +++ b/submodules/TelegramApi/Sources/Api4.swift @@ -4484,6 +4484,22 @@ public extension Api { }) } + public static func hideChatJoinRequest(flags: Int32, peer: Api.InputPeer, userId: Api.InputUser) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { + let buffer = Buffer() + buffer.appendInt32(2145904661) + serializeInt32(flags, buffer: buffer, boxed: false) + peer.serialize(buffer, true) + userId.serialize(buffer, true) + return (FunctionDescription(name: "messages.hideChatJoinRequest", parameters: [("flags", flags), ("peer", peer), ("userId", userId)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in + let reader = BufferReader(buffer) + var result: Api.Updates? + if let signature = reader.readInt32() { + result = Api.parse(reader, signature: signature) as? Api.Updates + } + return result + }) + } + public static func getSearchResultsPositions(peer: Api.InputPeer, filter: Api.MessagesFilter, offsetId: Int32, limit: Int32) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { let buffer = Buffer() buffer.appendInt32(1855292323) @@ -4500,22 +4516,6 @@ public extension Api { return result }) } - - public static func hideChatJoinRequest(flags: Int32, peer: Api.InputPeer, userId: Api.InputUser) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { - let buffer = Buffer() - buffer.appendInt32(2145904661) - serializeInt32(flags, buffer: buffer, boxed: false) - peer.serialize(buffer, true) - userId.serialize(buffer, true) - return (FunctionDescription(name: "messages.hideChatJoinRequest", parameters: [("flags", flags), ("peer", peer), ("userId", userId)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in - let reader = BufferReader(buffer) - var result: Api.Updates? - if let signature = reader.readInt32() { - result = Api.parse(reader, signature: signature) as? Api.Updates - } - return result - }) - } } public struct channels { public static func readHistory(channel: Api.InputChannel, maxId: Int32) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Messages/AdMessages.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/AdMessages.swift index 6c87d81cb6..1671d33c1d 100644 --- a/submodules/TelegramCore/Sources/TelegramEngine/Messages/AdMessages.swift +++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/AdMessages.swift @@ -11,6 +11,7 @@ private class AdMessagesHistoryContextImpl { case textEntities case media case authorId + case messageId case startParam } @@ -19,6 +20,7 @@ private class AdMessagesHistoryContextImpl { public let textEntities: [MessageTextEntity] public let media: [Media] public let authorId: PeerId + public let messageId: MessageId? public let startParam: String? public init( @@ -27,6 +29,7 @@ private class AdMessagesHistoryContextImpl { textEntities: [MessageTextEntity], media: [Media], authorId: PeerId, + messageId: MessageId?, startParam: String? ) { self.opaqueId = opaqueId @@ -34,6 +37,7 @@ private class AdMessagesHistoryContextImpl { self.textEntities = textEntities self.media = media self.authorId = authorId + self.messageId = messageId self.startParam = startParam } @@ -51,7 +55,7 @@ private class AdMessagesHistoryContextImpl { } self.authorId = try container.decode(PeerId.self, forKey: .authorId) - + self.messageId = try container.decodeIfPresent(MessageId.self, forKey: .messageId) self.startParam = try container.decodeIfPresent(String.self, forKey: .startParam) } @@ -70,6 +74,7 @@ private class AdMessagesHistoryContextImpl { try container.encode(mediaData, forKey: .media) try container.encode(self.authorId, forKey: .authorId) + try container.encodeIfPresent(self.messageId, forKey: .messageId) try container.encodeIfPresent(self.startParam, forKey: .startParam) } @@ -94,6 +99,9 @@ private class AdMessagesHistoryContextImpl { if lhs.authorId != rhs.authorId { return false } + if lhs.messageId != rhs.messageId { + return false + } if lhs.startParam != rhs.startParam { return false } @@ -317,7 +325,7 @@ private class AdMessagesHistoryContextImpl { for message in messages { switch message { - case let .sponsoredMessage(_, randomId, fromId, startParam, message, entities): + case let .sponsoredMessage(_, randomId, fromId, channelPost, startParam, message, entities): var parsedEntities: [MessageTextEntity] = [] if let entities = entities { parsedEntities = messageTextEntitiesFromApiEntities(entities) @@ -337,6 +345,7 @@ private class AdMessagesHistoryContextImpl { textEntities: parsedEntities, media: parsedMedia, authorId: fromId.peerId, + messageId: channelPost.flatMap { MessageId(peerId: fromId.peerId, namespace: Namespaces.Message.Cloud, id: $0) }, startParam: startParam )) } diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Peers/InvitationLinks.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/InvitationLinks.swift index 85b8fa9c9d..f824d4fbb2 100644 --- a/submodules/TelegramCore/Sources/TelegramEngine/Peers/InvitationLinks.swift +++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/InvitationLinks.swift @@ -662,10 +662,10 @@ final class CachedPeerInvitationImporters: Codable { let dates: [PeerId: Int32] let count: Int32 - static func key(peerId: PeerId, link: String) -> ValueBoxKey { + static func key(peerId: PeerId, link: String, requested: Bool) -> ValueBoxKey { let key = ValueBoxKey(length: 8 + 4) key.setInt64(0, value: peerId.toInt64()) - key.setInt32(8, value: Int32(HashFunctions.murMurHash32(link))) + key.setInt32(8, value: Int32(HashFunctions.murMurHash32(link + (requested ? "_requested" : "")))) return key } @@ -722,6 +722,7 @@ private final class PeerInvitationImportersContextImpl { private let account: Account private let peerId: PeerId private let link: String? + private let requested: Bool private let disposable = MetaDisposable() private let updateDisposable = MetaDisposable() private let actionDisposables = DisposableSet() @@ -735,18 +736,26 @@ private final class PeerInvitationImportersContextImpl { let state = Promise() - init(queue: Queue, account: Account, peerId: PeerId, invite: ExportedInvitation?) { + init(queue: Queue, account: Account, peerId: PeerId, subject: PeerInvitationImportersContext.Subject) { self.queue = queue self.account = account self.peerId = peerId + + var invite: ExportedInvitation? + var requested = false + if case let .invite(subjectInvite, subjectRequested) = subject { + invite = subjectInvite + requested = subjectRequested + } self.link = invite?.link + self.requested = requested let count = invite?.count ?? 0 self.count = count self.isLoadingMore = true self.disposable.set((account.postbox.transaction { transaction -> (peers: [PeerInvitationImportersState.Importer], count: Int32, canLoadMore: Bool)? in - let cachedResult = transaction.retrieveItemCacheEntry(id: ItemCacheEntryId(collectionId: Namespaces.CachedItemCollection.cachedPeerInvitationImporters, key: CachedPeerInvitationImporters.key(peerId: peerId, link: invite?.link ?? "requests")))?.get(CachedPeerInvitationImporters.self) + let cachedResult = transaction.retrieveItemCacheEntry(id: ItemCacheEntryId(collectionId: Namespaces.CachedItemCollection.cachedPeerInvitationImporters, key: CachedPeerInvitationImporters.key(peerId: peerId, link: invite?.link ?? "requests", requested: self.requested)))?.get(CachedPeerInvitationImporters.self) if let cachedResult = cachedResult, (Int(cachedResult.count) == count || invite == nil) { var result: [PeerInvitationImportersState.Importer] = [] for peerId in cachedResult.peerIds { @@ -811,6 +820,9 @@ private final class PeerInvitationImportersContextImpl { var flags: Int32 = 0 if let _ = link { + if self.requested { + flags |= (1 << 0) + } flags |= (1 << 1) } else { flags |= (1 << 0) @@ -854,7 +866,7 @@ private final class PeerInvitationImportersContextImpl { } if populateCache { if let entry = CodableEntry(CachedPeerInvitationImporters(importers: resultImporters, count: count)) { - transaction.putItemCacheEntry(id: ItemCacheEntryId(collectionId: Namespaces.CachedItemCollection.cachedPeerInvitationImporters, key: CachedPeerInvitationImporters.key(peerId: peerId, link: link ?? "requests")), entry: entry, collectionSpec: cachedPeerInvitationImportersCollectionSpec) + transaction.putItemCacheEntry(id: ItemCacheEntryId(collectionId: Namespaces.CachedItemCollection.cachedPeerInvitationImporters, key: CachedPeerInvitationImporters.key(peerId: peerId, link: link ?? "requests", requested: self.requested)), entry: entry, collectionSpec: cachedPeerInvitationImportersCollectionSpec) } } return (resultImporters, count) @@ -916,7 +928,7 @@ private final class PeerInvitationImportersContextImpl { let link = self.link self.updateDisposable.set(self.account.postbox.transaction({ transaction in if let entry = CodableEntry(CachedPeerInvitationImporters(importers: resultImporters, count: count)) { - transaction.putItemCacheEntry(id: ItemCacheEntryId(collectionId: Namespaces.CachedItemCollection.cachedPeerInvitationImporters, key: CachedPeerInvitationImporters.key(peerId: peerId, link: link ?? "requests")), entry: entry, collectionSpec: cachedPeerInvitationImportersCollectionSpec) + transaction.putItemCacheEntry(id: ItemCacheEntryId(collectionId: Namespaces.CachedItemCollection.cachedPeerInvitationImporters, key: CachedPeerInvitationImporters.key(peerId: peerId, link: link ?? "requests", requested: self.requested)), entry: entry, collectionSpec: cachedPeerInvitationImportersCollectionSpec) } }).start()) } @@ -927,6 +939,11 @@ private final class PeerInvitationImportersContextImpl { } public final class PeerInvitationImportersContext { + public enum Subject { + case invite(invite: ExportedInvitation, requested: Bool) + case requests + } + public enum UpdateAction { case approve case deny @@ -947,10 +964,10 @@ public final class PeerInvitationImportersContext { } } - init(account: Account, peerId: PeerId, invite: ExportedInvitation?) { + init(account: Account, peerId: PeerId, subject: Subject) { let queue = self.queue self.impl = QueueLocalObject(queue: queue, generate: { - return PeerInvitationImportersContextImpl(queue: queue, account: account, peerId: peerId, invite: invite) + return PeerInvitationImportersContextImpl(queue: queue, account: account, peerId: peerId, subject: subject) }) } diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Peers/TelegramEnginePeers.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/TelegramEnginePeers.swift index a9bc529b64..ecccb96e0f 100644 --- a/submodules/TelegramCore/Sources/TelegramEngine/Peers/TelegramEnginePeers.swift +++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/TelegramEnginePeers.swift @@ -454,8 +454,8 @@ public extension TelegramEngine { return _internal_revokePersistentPeerExportedInvitation(account: self.account, peerId: peerId) } - public func peerInvitationImporters(peerId: PeerId, invite: ExportedInvitation?) -> PeerInvitationImportersContext { - return PeerInvitationImportersContext(account: self.account, peerId: peerId, invite: invite) + public func peerInvitationImporters(peerId: PeerId, subject: PeerInvitationImportersContext.Subject) -> PeerInvitationImportersContext { + return PeerInvitationImportersContext(account: self.account, peerId: peerId, subject: subject) } public func notificationExceptionsList() -> Signal { diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Info/GroupRequestsIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Info/GroupRequestsIcon.imageset/Contents.json new file mode 100644 index 0000000000..6fe332016d --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chat/Info/GroupRequestsIcon.imageset/Contents.json @@ -0,0 +1,11 @@ +{ + "images" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/submodules/TelegramUI/Sources/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift index 944a29b9fd..85c82d176d 100644 --- a/submodules/TelegramUI/Sources/ChatController.swift +++ b/submodules/TelegramUI/Sources/ChatController.swift @@ -4802,7 +4802,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } if canManageInvitations, let inviteRequestsPending = inviteRequestsPending, inviteRequestsPending >= 0, strongSelf.inviteRequestsContext == nil { - let inviteRequestsContext = strongSelf.context.engine.peers.peerInvitationImporters(peerId: peerId, invite: nil) + let inviteRequestsContext = strongSelf.context.engine.peers.peerInvitationImporters(peerId: peerId, subject: .requests) strongSelf.inviteRequestsContext = inviteRequestsContext strongSelf.inviteRequestsDisposable.set((inviteRequestsContext.state diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift index ef19c33b1b..6b475c8785 100644 --- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift +++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift @@ -666,7 +666,7 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen if currentRequestsContext == nil { if canManageInvitations { - let requestsContext = context.engine.peers.peerInvitationImporters(peerId: peerId, invite: nil) + let requestsContext = context.engine.peers.peerInvitationImporters(peerId: peerId, subject: .requests) requestsContextPromise.set(.single(requestsContext)) requestsStatePromise.set(requestsContext.state |> map(Optional.init)) } @@ -843,7 +843,7 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen if currentRequestsContext == nil { if canManageInvitations { - let requestsContext = context.engine.peers.peerInvitationImporters(peerId: peerId, invite: nil) + let requestsContext = context.engine.peers.peerInvitationImporters(peerId: peerId, subject: .requests) requestsContextPromise.set(.single(requestsContext)) requestsStatePromise.set(requestsContext.state |> map(Optional.init)) }