ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 22:25:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:peter-iakovlev/TelegramUI

Browse Source 
# Conflicts:
#	TelegramUI/PresentationStrings.swift
This commit is contained in:
Ilya Laktyushin
2018-11-02 20:32:05 +04:00
parent ca6c287be4 f110dd2b66
commit 3cb29347d1
125 changed files with 4525 additions and 2617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
TelegramUI/ChatMessageBubbleItemNode.swift
View File

@@ -342,7 +342,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView {
}
if !isBroadcastChannel {
hasAvatar = true
hasAvatar = item.content.firstMessage.effectivelyIncoming(item.account.peerId)
}
}
} else if incoming {
@@ -1574,7 +1574,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView {
case .openMessage:
foundTapAction = true
if let item = self.item {
let _ = item.controllerInteraction.openMessage(item.message)
let _ = item.controllerInteraction.openMessage(item.message, .default)
}
break loop
}