github-mirror/Telegram-iOS
1
0
Fork 0
mirror of https://github.com/TelegramMessenger/Telegram-iOS.git synced 2026-07-06 03:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ilya Laktyushin 2022-07-04 15:49:22 +03:00
commit a8bf32fa45
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
submodules/TelegramCore/Sources/TelegramEngine/Messages/DeleteMessagesInteractively.swift
View file

@ -53,7 +53,7 @@ func deleteMessagesInteractively(transaction: Transaction, stateManager: Account
if peerId.namespace == Namespaces.Peer.CloudChannel || peerId.namespace == Namespaces.Peer.CloudGroup || peerId.namespace == Namespaces.Peer.CloudUser {
let remoteMessageIds = peerMessageIds.filter { id in
if id.namespace == Namespaces.Message.Local {
if id.namespace == Namespaces.Message.Local || id.namespace == Namespaces.Message.ScheduledLocal {
return false
}
return true

4
submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
View file

@ -474,10 +474,10 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
override func setupItem(_ item: ChatMessageItem, synchronousLoad: Bool) {
super.setupItem(item, synchronousLoad: synchronousLoad)
if item.message.id.namespace == Namespaces.Message.Local {
if item.message.id.namespace == Namespaces.Message.Local || item.message.id.namespace == Namespaces.Message.ScheduledLocal {
self.wasPending = true
}
if self.wasPending && item.message.id.namespace != Namespaces.Message.Local {
if self.wasPending && (item.message.id.namespace != Namespaces.Message.Local && item.message.id.namespace != Namespaces.Message.ScheduledLocal) {
self.didChangeFromPendingToSent = true
}

2
submodules/TelegramUI/Sources/ChatMessageInstantVideoItemNode.swift
View file

@ -81,7 +81,7 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView, UIGestureRecognizerD
self.interactiveVideoNode.shouldOpen = { [weak self] in
if let strongSelf = self {
if let item = strongSelf.item, item.message.id.namespace == Namespaces.Message.Local {
if let item = strongSelf.item, (item.message.id.namespace == Namespaces.Message.Local || item.message.id.namespace == Namespaces.Message.ScheduledLocal) {
return false
}
return !strongSelf.animatingHeight

2
submodules/TelegramUI/Sources/ChatMessageInteractiveInstantVideoNode.swift
View file

@ -231,7 +231,7 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode {
break
}
}
if item.message.id.namespace == Namespaces.Message.Local {
if item.message.id.namespace == Namespaces.Message.Local || item.message.id.namespace == Namespaces.Message.ScheduledLocal {
notConsumed = true
}