ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-07-19 09:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix monoforum search

Browse Source
This commit is contained in:
Isaac 2025-05-16 12:44:16 +08:00
parent 1a56afcb48
commit 245ad761be
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
submodules/TelegramCore/Sources/TelegramEngine/Messages/SearchMessages.swift
View File

@ -240,9 +240,10 @@ func _internal_getSearchMessageCount(account: Account, location: SearchMessagesL
guard case let .peer(peerId, fromId, _, _, threadId, _, _) = location else { guard case let .peer(peerId, fromId, _, _, threadId, _, _) = location else {
return .single(nil) return .single(nil)
} }
return account.postbox.transaction { transaction -> (Api.InputPeer?, Api.InputPeer?) in return account.postbox.transaction { transaction -> (Api.InputPeer?, Api.InputPeer?, Api.InputPeer?) in
var chatPeer = transaction.getPeer(peerId).flatMap(apiInputPeer) var chatPeer = transaction.getPeer(peerId)
var fromPeer: Api.InputPeer? var fromPeer: Api.InputPeer?
var savedPeer: Api.InputPeer?
if let fromId { if let fromId {
if let value = transaction.getPeer(fromId).flatMap(apiInputPeer) { if let value = transaction.getPeer(fromId).flatMap(apiInputPeer) {
fromPeer = value fromPeer = value
@ -251,9 +252,13 @@ func _internal_getSearchMessageCount(account: Account, location: SearchMessagesL
} }
} }
return (chatPeer, fromPeer) if let threadId, let channel = chatPeer as? TelegramChannel, channel.isMonoForum {
savedPeer = transaction.getPeer(PeerId(threadId)).flatMap(apiInputPeer)
}
return (chatPeer.flatMap(apiInputPeer), fromPeer, savedPeer)
} }
|> mapToSignal { inputPeer, fromPeer -> Signal<Int?, NoError> in |> mapToSignal { inputPeer, fromPeer, savedPeer -> Signal<Int?, NoError> in
guard let inputPeer else { guard let inputPeer else {
return .single(nil) return .single(nil)
} }
@ -265,12 +270,16 @@ func _internal_getSearchMessageCount(account: Account, location: SearchMessagesL
} }
var topMsgId: Int32? var topMsgId: Int32?
if let threadId = threadId { var savedPeerId: Api.InputPeer?
if let savedPeer {
flags |= (1 << 2)
savedPeerId = savedPeer
} else if let threadId {
flags |= (1 << 1) flags |= (1 << 1)
topMsgId = Int32(clamping: threadId) topMsgId = Int32(clamping: threadId)
} }
return account.network.request(Api.functions.messages.search(flags: flags, peer: inputPeer, q: query, fromId: fromPeer, savedPeerId: nil, savedReaction: nil, topMsgId: topMsgId, filter: .inputMessagesFilterEmpty, minDate: 0, maxDate: 0, offsetId: 0, addOffset: 0, limit: 1, maxId: 0, minId: 0, hash: 0)) return account.network.request(Api.functions.messages.search(flags: flags, peer: inputPeer, q: query, fromId: fromPeer, savedPeerId: savedPeerId, savedReaction: nil, topMsgId: topMsgId, filter: .inputMessagesFilterEmpty, minDate: 0, maxDate: 0, offsetId: 0, addOffset: 0, limit: 1, maxId: 0, minId: 0, hash: 0))
|> map { result -> Int? in |> map { result -> Int? in
switch result { switch result {
case let .channelMessages(_, _, count, _, _, _, _, _): case let .channelMessages(_, _, count, _, _, _, _, _):
@ -357,7 +366,7 @@ func _internal_searchMessages(account: Account, location: SearchMessagesLocation
additionalPeer = transaction.getPeer(migrationReference.maxMessageId.peerId) additionalPeer = transaction.getPeer(migrationReference.maxMessageId.peerId)
} }
var subPeer: Peer? var subPeer: Peer?
if peerId == account.peerId, let threadId = threadId { if peerId == account.peerId || peer.isMonoForum, let threadId {
subPeer = transaction.getPeer(PeerId(threadId)) subPeer = transaction.getPeer(PeerId(threadId))
} }
@ -387,7 +396,7 @@ func _internal_searchMessages(account: Account, location: SearchMessagesLocation
} }
} }
var topMsgId: Int32? var topMsgId: Int32?
if peerId == account.peerId { if peerId == account.peerId || inputSavedPeer != nil {
} else if let threadId = threadId { } else if let threadId = threadId {
flags |= (1 << 1) flags |= (1 << 1)
topMsgId = Int32(clamping: threadId) topMsgId = Int32(clamping: threadId)

11
submodules/TelegramCore/Sources/TelegramEngine/Messages/TelegramEngineMessages.swift
View File

@ -468,13 +468,16 @@ public extension TelegramEngine {
public func refreshMessageTagStats(peerId: EnginePeer.Id, threadId: Int64?, tags: [EngineMessage.Tags]) -> Signal<Never, NoError> { public func refreshMessageTagStats(peerId: EnginePeer.Id, threadId: Int64?, tags: [EngineMessage.Tags]) -> Signal<Never, NoError> {
let account = self.account let account = self.account
return self.account.postbox.transaction { transaction -> (Api.InputPeer?, Api.InputPeer?) in return self.account.postbox.transaction { transaction -> (Api.InputPeer?, Api.InputPeer?) in
let chatPeer = transaction.getPeer(peerId)
var inputSavedPeer: Api.InputPeer? var inputSavedPeer: Api.InputPeer?
if let threadId = threadId { if let threadId {
if peerId == account.peerId { if peerId == account.peerId {
inputSavedPeer = transaction.getPeer(PeerId(threadId)).flatMap(apiInputPeer) inputSavedPeer = transaction.getPeer(PeerId(threadId)).flatMap(apiInputPeer)
} else if let channel = chatPeer as? TelegramChannel, channel.isMonoForum {
inputSavedPeer = transaction.getPeer(PeerId(threadId)).flatMap(apiInputPeer)
} }
} }
return (transaction.getPeer(peerId).flatMap(apiInputPeer), inputSavedPeer) return (chatPeer.flatMap(apiInputPeer), inputSavedPeer)
} }
|> mapToSignal { inputPeer, inputSavedPeer -> Signal<Never, NoError> in |> mapToSignal { inputPeer, inputSavedPeer -> Signal<Never, NoError> in
guard let inputPeer = inputPeer else { guard let inputPeer = inputPeer else {
@ -489,8 +492,8 @@ public extension TelegramEngine {
var flags: Int32 = 0 var flags: Int32 = 0
var topMsgId: Int32? var topMsgId: Int32?
if let threadId = threadId { if let threadId {
if peerId == account.peerId { if peerId == account.peerId || inputSavedPeer != nil {
if inputSavedPeer != nil { if inputSavedPeer != nil {
flags |= (1 << 2) flags |= (1 << 2)
} }