Various Fixes

This commit is contained in:
Ilya Laktyushin
2021-08-29 11:59:50 +03:00
parent e43b4b1b02
commit 98b27c9483
9 changed files with 202 additions and 57 deletions

View File

@@ -90,7 +90,12 @@ class ChatMessageTextBubbleContentNode: ChatMessageBubbleContentNode {
return (contentProperties, nil, CGFloat.greatestFiniteMagnitude, { constrainedSize, position in
let message = item.message
let incoming = item.message.effectivelyIncoming(item.context.account.peerId)
let incoming: Bool
if let subject = item.associatedData.subject, case .forwardedMessages = subject {
incoming = false
} else {
incoming = item.message.effectivelyIncoming(item.context.account.peerId)
}
var maxTextWidth = CGFloat.greatestFiniteMagnitude
for media in item.message.media {
@@ -134,7 +139,13 @@ class ChatMessageTextBubbleContentNode: ChatMessageBubbleContentNode {
}
}
let dateText = stringForMessageTimestampStatus(accountPeerId: item.context.account.peerId, message: item.message, dateTimeFormat: item.presentationData.dateTimeFormat, nameDisplayOrder: item.presentationData.nameDisplayOrder, strings: item.presentationData.strings, reactionCount: dateReactionCount)
let dateFormat: MessageTimestampStatusFormat
if let subject = item.associatedData.subject, case .forwardedMessages = subject {
dateFormat = .minimal
} else {
dateFormat = .regular
}
let dateText = stringForMessageTimestampStatus(accountPeerId: item.context.account.peerId, message: item.message, dateTimeFormat: item.presentationData.dateTimeFormat, nameDisplayOrder: item.presentationData.nameDisplayOrder, strings: item.presentationData.strings, format: dateFormat, reactionCount: dateReactionCount)
let statusType: ChatMessageDateAndStatusType?
var displayStatus = false