ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ilya Laktyushin 2023-10-31 00:41:21 +04:00
commit 6c27ff5e2f
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/Postbox/Sources/Postbox.swift
View File

@ -1899,7 +1899,7 @@ final class PostboxImpl {
}
//#endif
if !isTemporary && self.messageHistoryMetadataTable.shouldReindexUnreadCounts() {
if !isTemporary && useCaches && self.messageHistoryMetadataTable.shouldReindexUnreadCounts() {
self.groupMessageStatsTable.removeAll()
let startTime = CFAbsoluteTimeGetCurrent()
let (totalStates, summaries) = self.chatListIndexTable.debugReindexUnreadCounts(postbox: self, currentTransaction: transaction)

12
submodules/TelegramCore/Sources/ApiUtils/StoreMessage_Telegram.swift
View File

@ -606,9 +606,15 @@ extension StoreMessage {
threadId = makeMessageThreadId(threadIdValue)
}
} else {
let threadIdValue = MessageId(peerId: peerId, namespace: Namespaces.Message.Cloud, id: replyToTopId)
threadMessageId = threadIdValue
threadId = makeMessageThreadId(threadIdValue)
if peerId.namespace == Namespaces.Peer.CloudChannel {
let threadIdValue = MessageId(peerId: peerId, namespace: Namespaces.Message.Cloud, id: replyToTopId)
threadMessageId = threadIdValue
threadId = makeMessageThreadId(threadIdValue)
} else {
let threadIdValue = MessageId(peerId: replyToPeerId?.peerId ?? peerId, namespace: Namespaces.Message.Cloud, id: replyToTopId)
threadMessageId = threadIdValue
threadId = makeMessageThreadId(threadIdValue)
}
}
} else if peerId.namespace == Namespaces.Peer.CloudChannel {
let threadIdValue = MessageId(peerId: peerId, namespace: Namespaces.Message.Cloud, id: replyToMsgId)

6
submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift
View File

@ -250,11 +250,7 @@ public final class PrincipalThemeEssentialGraphics {
let outgoingKnockout = self.outgoingBubbleGradientImage != nil
let highlightKnockout: Bool
if case .color = wallpaper {
highlightKnockout = true
} else {
highlightKnockout = false
}
highlightKnockout = false
let serviceColor = serviceMessageColorComponents(chatTheme: theme, wallpaper: wallpaper)

2
submodules/TelegramUI/Components/Chat/ChatMessageBubbleItemNode/Sources/ChatMessageBubbleItemNode.swift
View File

@ -4728,7 +4728,7 @@ public class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewI
}
backgroundHighlightNode.customHighlightColor = highlightColor
backgroundHighlightNode.setType(type: backgroundType, highlighted: true, graphics: graphics, maskMode: true, hasWallpaper: false, transition: .immediate, backgroundNode: nil)
backgroundHighlightNode.setType(type: backgroundType, highlighted: true, graphics: graphics, maskMode: true, hasWallpaper: true, transition: .immediate, backgroundNode: nil)
backgroundHighlightNode.frame = self.backgroundNode.frame
backgroundHighlightNode.updateLayout(size: backgroundHighlightNode.frame.size, transition: .immediate)

2
versions.json
View File

@ -1,5 +1,5 @@
{
"app": "10.2.1",
"app": "10.2.2",
"bazel": "6.4.0",
"xcode": "15.0"
}