ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-07 09:20:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix position

Browse Source
This commit is contained in:
Isaac 2024-01-26 17:55:07 +01:00
parent 676f413a60
commit f28303a1bf
4 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
submodules/TelegramCore/Sources/TelegramEngine/Messages/AdMessages.swift
View File

@ -42,16 +42,19 @@ private class AdMessagesHistoryContextImpl {
case title case title
case joinHash case joinHash
case nameColor case nameColor
case image
} }
var title: String var title: String
var joinHash: String var joinHash: String
var nameColor: PeerNameColor? var nameColor: PeerNameColor?
var image: TelegramMediaImage?
init(title: String, joinHash: String, nameColor: PeerNameColor? = nil) { init(title: String, joinHash: String, nameColor: PeerNameColor?, image: TelegramMediaImage?) {
self.title = title self.title = title
self.joinHash = joinHash self.joinHash = joinHash
self.nameColor = nameColor self.nameColor = nameColor
self.image = image
} }
init(from decoder: Decoder) throws { init(from decoder: Decoder) throws {
@ -60,6 +63,9 @@ private class AdMessagesHistoryContextImpl {
self.title = try container.decode(String.self, forKey: .title) self.title = try container.decode(String.self, forKey: .title)
self.joinHash = try container.decode(String.self, forKey: .joinHash) self.joinHash = try container.decode(String.self, forKey: .joinHash)
self.nameColor = try container.decodeIfPresent(Int32.self, forKey: .nameColor).flatMap { PeerNameColor(rawValue: $0) } self.nameColor = try container.decodeIfPresent(Int32.self, forKey: .nameColor).flatMap { PeerNameColor(rawValue: $0) }
self.image = (try container.decodeIfPresent(Data.self, forKey: .image)).flatMap { data in
return TelegramMediaImage(decoder: PostboxDecoder(buffer: MemoryBuffer(data: data)))
}
} }
func encode(to encoder: Encoder) throws { func encode(to encoder: Encoder) throws {
@ -68,6 +74,11 @@ private class AdMessagesHistoryContextImpl {
try container.encode(self.title, forKey: .title) try container.encode(self.title, forKey: .title)
try container.encode(self.joinHash, forKey: .joinHash) try container.encode(self.joinHash, forKey: .joinHash)
try container.encodeIfPresent(self.nameColor?.rawValue, forKey: .nameColor) try container.encodeIfPresent(self.nameColor?.rawValue, forKey: .nameColor)
try container.encodeIfPresent(self.image.flatMap { image in
let encoder = PostboxEncoder()
image.encode(encoder)
return encoder.makeData()
}, forKey: .image)
} }
} }
@ -350,6 +361,11 @@ private class AdMessagesHistoryContextImpl {
let messageHash = (self.text.hashValue &+ 31 &* peerId.hashValue) &* 31 &+ author.id.hashValue let messageHash = (self.text.hashValue &+ 31 &* peerId.hashValue) &* 31 &+ author.id.hashValue
let messageStableVersion = UInt32(bitPattern: Int32(truncatingIfNeeded: messageHash)) let messageStableVersion = UInt32(bitPattern: Int32(truncatingIfNeeded: messageHash))
var media: [Media] = self.media
if media.isEmpty, case let .invite(invite) = self.target, let image = invite.image {
media.append(image)
}
return Message( return Message(
stableId: 0, stableId: 0,
@ -369,7 +385,7 @@ private class AdMessagesHistoryContextImpl {
author: author, author: author,
text: self.text, text: self.text,
attributes: attributes, attributes: attributes,
media: self.media, media: media,
peers: messagePeers, peers: messagePeers,
associatedMessages: SimpleDictionary<MessageId, Message>(), associatedMessages: SimpleDictionary<MessageId, Message>(),
associatedMessageIds: [], associatedMessageIds: [],
@ -567,8 +583,6 @@ private class AdMessagesHistoryContextImpl {
target = .peer(fromId.peerId) target = .peer(fromId.peerId)
} }
} else if let webPage = webPage { } else if let webPage = webPage {
displayAvatar = false
switch webPage { switch webPage {
case let .sponsoredWebPage(_, url, siteName, photo): case let .sponsoredWebPage(_, url, siteName, photo):
let photo = photo.flatMap { telegramMediaImageFromApiPhoto($0) } let photo = photo.flatMap { telegramMediaImageFromApiPhoto($0) }
@ -577,10 +591,11 @@ private class AdMessagesHistoryContextImpl {
} else if let chatInvite = chatInvite, let chatInviteHash = chatInviteHash { } else if let chatInvite = chatInvite, let chatInviteHash = chatInviteHash {
switch chatInvite { switch chatInvite {
case let .chatInvite(flags, title, _, photo, participantsCount, participants, nameColor): case let .chatInvite(flags, title, _, photo, participantsCount, participants, nameColor):
let photo = telegramMediaImageFromApiPhoto(photo).flatMap({ smallestImageRepresentation($0.representations) }) let image = telegramMediaImageFromApiPhoto(photo)
let flags: ExternalJoiningChatState.Invite.Flags = .init(isChannel: (flags & (1 << 0)) != 0, isBroadcast: (flags & (1 << 1)) != 0, isPublic: (flags & (1 << 2)) != 0, isMegagroup: (flags & (1 << 3)) != 0, requestNeeded: (flags & (1 << 6)) != 0, isVerified: (flags & (1 << 7)) != 0, isScam: (flags & (1 << 8)) != 0, isFake: (flags & (1 << 9)) != 0) let flags: ExternalJoiningChatState.Invite.Flags = .init(isChannel: (flags & (1 << 0)) != 0, isBroadcast: (flags & (1 << 1)) != 0, isPublic: (flags & (1 << 2)) != 0, isMegagroup: (flags & (1 << 3)) != 0, requestNeeded: (flags & (1 << 6)) != 0, isVerified: (flags & (1 << 7)) != 0, isScam: (flags & (1 << 8)) != 0, isFake: (flags & (1 << 9)) != 0)
let _ = photo displayAvatar = false
let _ = flags let _ = flags
let _ = participantsCount let _ = participantsCount
let _ = participants let _ = participants
@ -588,14 +603,16 @@ private class AdMessagesHistoryContextImpl {
target = .invite(CachedMessage.Target.Invite( target = .invite(CachedMessage.Target.Invite(
title: title, title: title,
joinHash: chatInviteHash, joinHash: chatInviteHash,
nameColor: PeerNameColor(rawValue: nameColor) nameColor: PeerNameColor(rawValue: nameColor),
image: image
)) ))
case let .chatInvitePeek(chat, _): case let .chatInvitePeek(chat, _):
if let peer = parseTelegramGroupOrChannel(chat: chat) { if let peer = parseTelegramGroupOrChannel(chat: chat) {
target = .invite(CachedMessage.Target.Invite( target = .invite(CachedMessage.Target.Invite(
title: peer.debugDisplayTitle, title: peer.debugDisplayTitle,
joinHash: chatInviteHash, joinHash: chatInviteHash,
nameColor: peer.nameColor nameColor: peer.nameColor,
image: nil
)) ))
} }
case let .chatInviteAlready(chat): case let .chatInviteAlready(chat):
@ -603,7 +620,8 @@ private class AdMessagesHistoryContextImpl {
target = .invite(CachedMessage.Target.Invite( target = .invite(CachedMessage.Target.Invite(
title: peer.debugDisplayTitle, title: peer.debugDisplayTitle,
joinHash: chatInviteHash, joinHash: chatInviteHash,
nameColor: peer.nameColor nameColor: peer.nameColor,
image: nil
)) ))
} }
} }

8
submodules/TelegramUI/Components/Chat/ChatMessageReactionsFooterContentNode/Sources/ChatMessageReactionsFooterContentNode.swift
View File

@ -125,15 +125,11 @@ public final class MessageReactionButtonsNode: ASDisplayNode {
let reactionButtonsResult = self.container.update( let reactionButtonsResult = self.container.update(
context: context, context: context,
action: { [weak self] itemView, value in action: { [weak self] _, value in
guard let self else { guard let self else {
return return
} }
if reactions.isTags { self.reactionSelected?(value)
self.openReactionPreview?(nil, itemView.containerView, value)
} else {
self.reactionSelected?(value)
}
}, },
reactions: reactions.reactions.map { reaction in reactions: reactions.reactions.map { reaction in
var centerAnimation: TelegramMediaFile? var centerAnimation: TelegramMediaFile?

1
submodules/TelegramUI/Sources/ChatController.swift
View File

@ -1305,6 +1305,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
return nil return nil
} }
} else { } else {
strongSelf.chatDisplayNode.historyNode.frozenMessageForScrollingReset = message.id
strongSelf.interfaceInteraction?.updateHistoryFilter { _ in strongSelf.interfaceInteraction?.updateHistoryFilter { _ in
return ChatPresentationInterfaceState.HistoryFilter(customTags: tags, isActive: true) return ChatPresentationInterfaceState.HistoryFilter(customTags: tags, isActive: true)
} }

1
submodules/TelegramUI/Sources/ChatControllerOpenMessageReactionContextMenu.swift
View File

@ -110,7 +110,6 @@ extension ChatControllerImpl {
return return
} }
self.chatDisplayNode.historyNode.frozenMessageForScrollingReset = message.id self.chatDisplayNode.historyNode.frozenMessageForScrollingReset = message.id
self.interfaceInteraction?.updateHistoryFilter { _ in self.interfaceInteraction?.updateHistoryFilter { _ in
return ChatPresentationInterfaceState.HistoryFilter(customTags: tags, isActive: true) return ChatPresentationInterfaceState.HistoryFilter(customTags: tags, isActive: true)
} }