ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-08-18 11:30:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix holes

Browse Source
This commit is contained in:
Peter 2019-04-16 19:36:30 +01:00
parent 1b3b5aad52
commit 20b755baf3
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
TelegramCore/FetchChatList.swift
View File

@ -228,13 +228,14 @@ func fetchChatList(postbox: Postbox, network: Network, location: FetchChatListLo
additionalPinnedChats = .single(nil) additionalPinnedChats = .single(nil)
} }
let flags: Int32 = 1 << 1 var flags: Int32 = 1 << 1
let requestFolderId: Int32 let requestFolderId: Int32
switch location { switch location {
case .general: case .general:
requestFolderId = 0 requestFolderId = 0
case let .group(groupId): case let .group(groupId):
flags |= 1 << 0
requestFolderId = groupId.rawValue requestFolderId = groupId.rawValue
} }
let requestChats = network.request(Api.functions.messages.getDialogs(flags: flags, folderId: requestFolderId, offsetDate: timestamp, offsetId: id, offsetPeer: peer, limit: limit, hash: hash)) let requestChats = network.request(Api.functions.messages.getDialogs(flags: flags, folderId: requestFolderId, offsetDate: timestamp, offsetId: id, offsetPeer: peer, limit: limit, hash: hash))
@ -336,6 +337,22 @@ func fetchChatList(postbox: Postbox, network: Network, location: FetchChatListLo
storeMessages.append(contentsOf: folderChats.storeMessages) storeMessages.append(contentsOf: folderChats.storeMessages)
} }
var pinnedItemIds: [PinnedItemId]?
if let parsedPinnedChats = parsedPinnedChats {
var array: [PinnedItemId] = []
for itemId in parsedPinnedChats.itemIds {
switch itemId {
case let .peer(peerId):
if peerGroupIds[peerId] == nil {
array.append(itemId)
}
case .group:
break
}
}
pinnedItemIds = array
}
return FetchedChatList( return FetchedChatList(
peers: peers, peers: peers,
peerPresences: peerPresences, peerPresences: peerPresences,
@ -348,7 +365,7 @@ func fetchChatList(postbox: Postbox, network: Network, location: FetchChatListLo
lowerNonPinnedIndex: parsedRemoteChats.lowerNonPinnedIndex, lowerNonPinnedIndex: parsedRemoteChats.lowerNonPinnedIndex,
pinnedItemIds: parsedPinnedChats.flatMap { $0.itemIds }, pinnedItemIds: pinnedItemIds,
folders: folders.map { ($0.0, $0.1.lowerNonPinnedIndex) }, folders: folders.map { ($0.0, $0.1.lowerNonPinnedIndex) },
peerGroupIds: peerGroupIds peerGroupIds: peerGroupIds
) )

6
TelegramCore/Holes.swift
View File

@ -385,12 +385,6 @@ func fetchChatListHole(postbox: Postbox, network: Network, accountPeerId: PeerId
transaction.updatePeerGroupId(peerId, groupId: groupId) transaction.updatePeerGroupId(peerId, groupId: groupId)
} }
/*for (groupId, lowerIndex) in fetchedChats.folders {
if let hole = postbox.seedConfiguration.initializeChatListWithHole.groups {
transaction.replaceChatListHole(groupId: groupId, index: hole.index, hole: lowerIndex.flatMap(ChatListHole.init))
}
}*/
for (peerId, chatState) in fetchedChats.chatStates { for (peerId, chatState) in fetchedChats.chatStates {
if let chatState = chatState as? ChannelState { if let chatState = chatState as? ChannelState {
if let current = transaction.getPeerChatState(peerId) as? ChannelState { if let current = transaction.getPeerChatState(peerId) as? ChannelState {

3
TelegramCore/MultipartFetch.swift
View File

@ -690,6 +690,9 @@ func multipartFetch(postbox: Postbox, network: Network, mediaReferenceRevalidati
switch info.reference { switch info.reference {
case let .avatar(peer, _): case let .avatar(peer, _):
return resource.apiInputLocation(peerReference: peer) return resource.apiInputLocation(peerReference: peer)
case let .messageAuthorAvatar(message, resource):
return nil
default: default:
return nil return nil
} }