mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-12-22 22:25:57 +00:00
Merge commit 'cc5de9372fcb52d80dcb1190e9a61c8336880be7' into experimental-3
# Conflicts: # submodules/TelegramCore/Sources/State/AccountStateManagementUtils.swift # submodules/TelegramCore/Sources/State/MessageReactions.swift
This commit is contained in:
@@ -256,7 +256,9 @@ public extension EngineMessageReactionListContext.State {
|
||||
}
|
||||
for recentPeer in reactionsAttribute.recentPeers {
|
||||
if let peer = message.peers[recentPeer.peerId] {
|
||||
items.append(EngineMessageReactionListContext.Item(peer: EnginePeer(peer), reaction: recentPeer.value))
|
||||
if reaction == nil || recentPeer.value == reaction {
|
||||
items.append(EngineMessageReactionListContext.Item(peer: EnginePeer(peer), reaction: recentPeer.value))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -348,6 +350,8 @@ public final class EngineMessageReactionListContext {
|
||||
|
||||
if initialState.canLoadMore {
|
||||
self.loadMore()
|
||||
} else {
|
||||
self.statePromise.set(.single(self.state))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user