Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

This commit is contained in:
Ilya Laktyushin 2023-12-03 14:36:18 +04:00
commit 351f98fc4d

View File

@ -894,7 +894,7 @@ public final class ChatHistoryListNodeImpl: ListView, ChatHistoryNode, ChatHisto
strongSelf.maybeUpdateOverscrollAction(offset: offsetFromBottom) strongSelf.maybeUpdateOverscrollAction(offset: offsetFromBottom)
} }
var maxMessage: Message? var maxMessage: MessageIndex?
strongSelf.forEachVisibleMessageItemNode { itemNode in strongSelf.forEachVisibleMessageItemNode { itemNode in
if let item = itemNode.item { if let item = itemNode.item {
var matches = false var matches = false
@ -908,19 +908,32 @@ public final class ChatHistoryListNodeImpl: ListView, ChatHistoryNode, ChatHisto
} }
if matches { if matches {
if let maxMessageValue = maxMessage { var maxItemIndex: MessageIndex?
if maxMessageValue.index < item.message.index { for (message, _) in item.content {
maxMessage = item.message if let maxItemIndexValue = maxItemIndex {
if maxItemIndexValue < message.index {
maxItemIndex = message.index
}
} else {
maxItemIndex = message.index
}
}
if let maxItemIndex {
if let maxMessageValue = maxMessage {
if maxMessageValue < maxItemIndex {
maxMessage = maxItemIndex
}
} else {
maxMessage = maxItemIndex
} }
} else {
maxMessage = item.message
} }
} }
} }
} }
if let maxMessage { if let maxMessage {
//print("read \(maxMessage.text)") //print("read \(maxMessage.text)")
strongSelf.updateMaxVisibleReadIncomingMessageIndex(maxMessage.index) strongSelf.updateMaxVisibleReadIncomingMessageIndex(maxMessage)
} }
} }
} }