Improve pic display for ads improvement

This commit is contained in:
Ilya Laktyushin 2024-03-29 18:45:59 +04:00
parent 7214c767c8
commit 2f4d7e305d
3 changed files with 10 additions and 5 deletions

View File

@ -326,7 +326,7 @@ private class AdMessagesHistoryContextImpl {
case .recommended: case .recommended:
mappedMessageType = .recommended mappedMessageType = .recommended
} }
attributes.append(AdMessageAttribute(opaqueId: self.opaqueId, messageType: mappedMessageType, displayAvatar: self.displayAvatar, target: target, buttonText: self.buttonText, sponsorInfo: self.sponsorInfo, additionalInfo: self.additionalInfo, canReport: self.canReport)) attributes.append(AdMessageAttribute(opaqueId: self.opaqueId, messageType: mappedMessageType, displayAvatar: self.displayAvatar && !self.canReport, target: target, buttonText: self.buttonText, sponsorInfo: self.sponsorInfo, additionalInfo: self.additionalInfo, canReport: self.canReport))
if !self.textEntities.isEmpty { if !self.textEntities.isEmpty {
let attribute = TextEntitiesMessageAttribute(entities: self.textEntities) let attribute = TextEntitiesMessageAttribute(entities: self.textEntities)
attributes.append(attribute) attributes.append(attribute)
@ -404,9 +404,14 @@ private class AdMessagesHistoryContextImpl {
let messageStableVersion = UInt32(bitPattern: Int32(truncatingIfNeeded: messageHash)) let messageStableVersion = UInt32(bitPattern: Int32(truncatingIfNeeded: messageHash))
var media: [Media] = self.media var media: [Media] = self.media
if media.isEmpty, case let .invite(invite) = self.target, let image = invite.image { if media.isEmpty {
media.append(image) if case let .invite(invite) = self.target, let image = invite.image {
media.append(image)
} else if self.displayAvatar && self.canReport, let profileImage = author.smallProfileImage {
media.append(TelegramMediaImage(imageId: MediaId(namespace: 0, id: 0), representations: [profileImage], immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: []))
}
} }
return Message( return Message(
stableId: 0, stableId: 0,

View File

@ -1415,7 +1415,7 @@ public class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewI
ignoreForward = true ignoreForward = true
effectiveAuthor = author effectiveAuthor = author
displayAuthorInfo = !mergedTop.merged && incoming displayAuthorInfo = !mergedTop.merged && incoming
hasAvatar = adAttribute.displayAvatar && !adAttribute.canReport hasAvatar = adAttribute.displayAvatar
} else { } else {
effectiveAuthor = firstMessage.author effectiveAuthor = firstMessage.author

View File

@ -341,7 +341,7 @@ public final class ChatMessageItemImpl: ChatMessageItem, CustomStringConvertible
} }
if let adAttribute = message.adAttribute { if let adAttribute = message.adAttribute {
if adAttribute.displayAvatar && !adAttribute.canReport { if adAttribute.displayAvatar {
hasAvatar = adAttribute.displayAvatar hasAvatar = adAttribute.displayAvatar
} }
} }