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

This commit is contained in:
Ilya Laktyushin
2018-12-14 23:14:50 +04:00
32 changed files with 4710 additions and 2632 deletions

View File

@@ -8,6 +8,7 @@ private func contentNodeMessagesAndClassesForItem(_ item: ChatMessageItem) -> [(
var result: [(Message, AnyClass)] = []
var skipText = false
var addFinalText = false
var isUnsupportedMedia = false
outer: for message in item.content {
inner: for media in message.media {
@@ -41,10 +42,14 @@ private func contentNodeMessagesAndClassesForItem(_ item: ChatMessageItem) -> [(
result.removeAll()
result.append((message, ChatMessageActionBubbleContentNode.self))
return result
} else if let _ = media as? TelegramMediaPoll {
result.append((message, ChatMessagePollBubbleContentNode.self))
} else if let _ = media as? TelegramMediaUnsupported {
isUnsupportedMedia = true
}
}
if !message.text.isEmpty {
if !message.text.isEmpty || isUnsupportedMedia {
if !skipText {
if case .group = item.content {
addFinalText = true