ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

- export invitations bug fixes

Browse Source
This commit is contained in:
overtake 2021-01-15 16:38:57 +03:00
parent e788dbedcd
commit a616805a51
1 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
submodules/TelegramCore/Sources/InvitationLinks.swift
View File

@ -90,17 +90,26 @@ public func createPeerExportedInvitation(account: Account, peerId: PeerId, expir
} |> switchToLatest } |> switchToLatest
} }
public func peerExportedInvitations(account: Account, peerId: PeerId) -> Signal<[ExportedInvitation]?, NoError> { public struct ExportedInvitations : Equatable {
return account.postbox.transaction { transaction -> Signal<[ExportedInvitation]?, NoError> in public let list: [ExportedInvitation]?
public let totalCount: Int32
}
public func peerExportedInvitations(account: Account, peerId: PeerId, offsetLink: String? = nil) -> Signal<ExportedInvitations?, NoError> {
return account.postbox.transaction { transaction -> Signal<ExportedInvitations?, NoError> in
if let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer) { if let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer) {
return account.network.request(Api.functions.messages.getExportedChatInvites(flags: 0, peer: inputPeer, adminId: nil, offsetLink: nil, limit: 100)) var flags: Int32 = 0
if let _ = offsetLink {
flags |= (1 << 2)
}
return account.network.request(Api.functions.messages.getExportedChatInvites(flags: 0, peer: inputPeer, adminId: nil, offsetLink: offsetLink, limit: 100))
|> map(Optional.init) |> map(Optional.init)
|> `catch` { _ -> Signal<Api.messages.ExportedChatInvites?, NoError> in |> `catch` { _ -> Signal<Api.messages.ExportedChatInvites?, NoError> in
return .single(nil) return .single(nil)
} }
|> mapToSignal { result -> Signal<[ExportedInvitation]?, NoError> in |> mapToSignal { result -> Signal<ExportedInvitations?, NoError> in
return account.postbox.transaction { transaction -> [ExportedInvitation]? in return account.postbox.transaction { transaction -> ExportedInvitations? in
if let result = result, case let .exportedChatInvites(_, apiInvites, users) = result { if let result = result, case let .exportedChatInvites(count, apiInvites, users) = result {
var peers: [Peer] = [] var peers: [Peer] = []
var peersMap: [PeerId: Peer] = [:] var peersMap: [PeerId: Peer] = [:]
for user in users { for user in users {
@ -118,7 +127,7 @@ public func peerExportedInvitations(account: Account, peerId: PeerId) -> Signal<
invites.append(invite) invites.append(invite)
} }
} }
return invites return ExportedInvitations(list: invites, totalCount: count)
} else { } else {
return nil return nil
} }
@ -146,7 +155,8 @@ public func editPeerExportedInvitation(account: Account, peerId: PeerId, link: S
} }
return account.network.request(Api.functions.messages.editExportedChatInvite(flags: flags, peer: inputPeer, link: link, expireDate: expireDate, usageLimit: usageLimit)) return account.network.request(Api.functions.messages.editExportedChatInvite(flags: flags, peer: inputPeer, link: link, expireDate: expireDate, usageLimit: usageLimit))
|> mapError { _ in return EditPeerExportedInvitationError.generic } |> mapError { _ in return EditPeerExportedInvitationError.generic }
|> map { result -> ExportedInvitation? in |> mapToSignal { result -> Signal<ExportedInvitation?, EditPeerExportedInvitationError> in
return account.postbox.transaction { transaction in
if case let .exportedChatInvite(invite, users) = result { if case let .exportedChatInvite(invite, users) = result {
var peers: [Peer] = [] var peers: [Peer] = []
for user in users { for user in users {
@ -160,6 +170,7 @@ public func editPeerExportedInvitation(account: Account, peerId: PeerId, link: S
} else { } else {
return nil return nil
} }
} |> mapError { _ in .generic }
} }
} else { } else {
return .complete() return .complete()
@ -173,13 +184,29 @@ public enum RevokePeerExportedInvitationError {
case generic case generic
} }
public func revokePeerExportedInvitation(account: Account, peerId: PeerId, link: String) -> Signal<Never, RevokePeerExportedInvitationError> { public func revokePeerExportedInvitation(account: Account, peerId: PeerId, link: String) -> Signal<ExportedInvitation?, RevokePeerExportedInvitationError> {
return account.postbox.transaction { transaction -> Signal<Never, RevokePeerExportedInvitationError> in return account.postbox.transaction { transaction -> Signal<ExportedInvitation?, RevokePeerExportedInvitationError> in
if let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer) { if let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer) {
let flags: Int32 = (1 << 2) let flags: Int32 = (1 << 2)
return account.network.request(Api.functions.messages.editExportedChatInvite(flags: flags, peer: inputPeer, link: link, expireDate: nil, usageLimit: nil)) return account.network.request(Api.functions.messages.editExportedChatInvite(flags: flags, peer: inputPeer, link: link, expireDate: nil, usageLimit: nil))
|> mapError { _ in return RevokePeerExportedInvitationError.generic } |> mapError { _ in return RevokePeerExportedInvitationError.generic }
|> ignoreValues |> mapToSignal { result -> Signal<ExportedInvitation?, RevokePeerExportedInvitationError> in
return account.postbox.transaction { transaction in
if case let .exportedChatInvite(invite, users) = result {
var peers: [Peer] = []
for user in users {
let telegramUser = TelegramUser(user: user)
peers.append(telegramUser)
}
updatePeers(transaction: transaction, peers: peers, update: { _, updated -> Peer in
return updated
})
return ExportedInvitation(apiExportedInvite: invite)
} else {
return nil
}
} |> mapError { _ in .generic }
}
} else { } else {
return .complete() return .complete()
} }