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/TelegramUI

Browse Source
This commit is contained in:
Ilya Laktyushin 2018-11-27 22:58:38 +04:00
commit 145dd4a39c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TelegramUI/ChatMessageInteractiveMediaNode.swift
View File

@ -260,7 +260,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode {
var mediaUpdated = false
if let currentMedia = currentMedia {
mediaUpdated = !media.isEqual(to: currentMedia)
mediaUpdated = !media.isSemanticallyEqual(to: currentMedia)
} else {
mediaUpdated = true
}
@ -318,7 +318,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode {
if file.isSticker {
updateImageSignal = chatMessageSticker(account: account, file: file, small: false)
} else {
updateImageSignal = mediaGridMessageVideo(postbox: account.postbox, videoReference: .message(message: MessageReference(message), media: file), onlyFullSize: currentMedia != nil)
updateImageSignal = mediaGridMessageVideo(postbox: account.postbox, videoReference: .message(message: MessageReference(message), media: file), onlyFullSize: currentMedia?.id?.namespace == Namespaces.Media.LocalFile)
}
}

6
TelegramUI/UrlHandling.swift
View File

@ -168,10 +168,10 @@ private func resolveInternalUrl(account: Account, url: ParsedInternalUrl) -> Sig
return .channelMessage(peerId: peer.id, messageId: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: id))
}
} else {
if let peer = peer as? TelegramUser, peer.botInfo != nil {
return .peer(peer.id, .chat(textInputState: nil, messageId: nil))
} else {
if let peer = peer as? TelegramUser, peer.botInfo == nil {
return .peer(peer.id, .info)
} else {
return .peer(peer.id, .chat(textInputState: nil, messageId: nil))
}
}
} else {