Fix min peers

This commit is contained in:
Ali
2020-09-18 21:51:11 +04:00
parent f3fabd8bcd
commit ae9de371be

View File

@@ -108,15 +108,16 @@ private func fetchWebpage(account: Account, messageId: MessageId) -> Signal<Void
var peers: [Peer] = [] var peers: [Peer] = []
var peerPresences: [PeerId: PeerPresence] = [:] var peerPresences: [PeerId: PeerPresence] = [:]
for chat in chats { for chat in chats {
if let groupOrChannel = parseTelegramGroupOrChannel(chat: chat) { if let groupOrChannel = mergeGroupOrChannel(lhs: transaction.getPeer(chat.peerId), rhs: chat) {
peers.append(groupOrChannel) peers.append(groupOrChannel)
} }
} }
for user in users { for apiUser in users {
let telegramUser = TelegramUser(user: user) if let user = TelegramUser.merge(transaction.getPeer(apiUser.peerId) as? TelegramUser, rhs: apiUser) {
peers.append(telegramUser) peers.append(user)
if let presence = TelegramUserPresence(apiUser: user) { if let presence = TelegramUserPresence(apiUser: apiUser) {
peerPresences[telegramUser.id] = presence peerPresences[user.id] = presence
}
} }
} }
@@ -624,15 +625,16 @@ public final class AccountViewTracker {
var peers: [Peer] = [] var peers: [Peer] = []
var peerPresences: [PeerId: PeerPresence] = [:] var peerPresences: [PeerId: PeerPresence] = [:]
for user in users { for apiUser in users {
let telegramUser = TelegramUser(user: user) if let user = TelegramUser.merge(transaction.getPeer(apiUser.peerId) as? TelegramUser, rhs: apiUser) {
peers.append(telegramUser) peers.append(user)
if let presence = TelegramUserPresence(apiUser: user) { if let presence = TelegramUserPresence(apiUser: apiUser) {
peerPresences[telegramUser.id] = presence peerPresences[user.id] = presence
}
} }
} }
for chat in chats { for chat in chats {
if let groupOrChannel = parseTelegramGroupOrChannel(chat: chat) { if let groupOrChannel = mergeGroupOrChannel(lhs: transaction.getPeer(chat.peerId), rhs: chat) {
peers.append(groupOrChannel) peers.append(groupOrChannel)
} }
} }
@@ -917,15 +919,16 @@ public final class AccountViewTracker {
var peerPresences: [PeerId: PeerPresence] = [:] var peerPresences: [PeerId: PeerPresence] = [:]
for chat in chats { for chat in chats {
if let groupOrChannel = parseTelegramGroupOrChannel(chat: chat) { if let groupOrChannel = mergeGroupOrChannel(lhs: transaction.getPeer(chat.peerId), rhs: chat) {
peers.append(groupOrChannel) peers.append(groupOrChannel)
} }
} }
for user in users { for apiUser in users {
let telegramUser = TelegramUser(user: user) if let user = TelegramUser.merge(transaction.getPeer(apiUser.peerId) as? TelegramUser, rhs: apiUser) {
peers.append(telegramUser) peers.append(user)
if let presence = TelegramUserPresence(apiUser: user) { if let presence = TelegramUserPresence(apiUser: apiUser) {
peerPresences[telegramUser.id] = presence peerPresences[user.id] = presence
}
} }
} }