ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Chat import fixes

Browse Source
This commit is contained in:
Ali 2021-01-27 21:08:20 +05:00
parent 19ed9642cf
commit e63330f754
4 changed files with 8 additions and 2 deletions

2
Telegram/Telegram-iOS/en.lproj/Localizable.strings

@ -5936,7 +5936,7 @@ Sorry for the inconvenience.";
"ChatImport.Title" = "Select Chat";
"ChatImport.SelectionErrorNotAdmin" = "You need to be an admin of the group to import messages into it.";
"ChatImport.SelectionErrorGroupGeneric" = "You can't import history into this group.";
"ChatImport.SelectionErrorGroupGeneric" = "You can't import history to this group.";
"ChatImport.SelectionConfirmationGroupWithTitle" = "Are you sure you want to import messages from **%1$@** into **%2$@**?";
"ChatImport.SelectionConfirmationGroupWithoutTitle" = "Are you sure you want to import messages into **%@**?";
"ChatImport.SelectionConfirmationAlertTitle" = "Import Messages";

4
submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift

@ -491,7 +491,9 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
var authorNameText: String?
if let author = message.effectiveAuthor {
if let forwardInfo = message.forwardInfo, forwardInfo.flags.contains(.isImported), let authorSignature = forwardInfo.authorSignature {
authorNameText = authorSignature
} else if let author = message.effectiveAuthor {
authorNameText = author.displayTitle(strings: self.strings, displayOrder: self.nameOrder)
} else if let peer = message.peers[message.id.peerId] {
authorNameText = peer.displayTitle(strings: self.strings, displayOrder: self.nameOrder)

2
submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift

@ -1251,6 +1251,8 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
if item.effectiveAuthorId?.namespace == Namespaces.Peer.Empty {
item.controllerInteraction.displayMessageTooltip(item.content.firstMessage.id, item.presentationData.strings.Conversation_ForwardAuthorHiddenTooltip, self, avatarNode.frame)
} else if let forwardInfo = item.content.firstMessage.forwardInfo, forwardInfo.flags.contains(.isImported), forwardInfo.author == nil {
item.controllerInteraction.displayImportedMessageTooltip(avatarNode)
} else {
if !item.message.id.peerId.isReplies, let channel = item.content.firstMessage.forwardInfo?.author as? TelegramChannel, channel.username == nil {
if case .member = channel.participationStatus {

2
submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift

@ -818,6 +818,8 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
if item.effectiveAuthorId?.namespace == Namespaces.Peer.Empty {
item.controllerInteraction.displayMessageTooltip(item.content.firstMessage.id, item.presentationData.strings.Conversation_ForwardAuthorHiddenTooltip, self, avatarNode.frame)
} else if let forwardInfo = item.content.firstMessage.forwardInfo, forwardInfo.flags.contains(.isImported), forwardInfo.author == nil {
item.controllerInteraction.displayImportedMessageTooltip(avatarNode)
} else {
if !item.message.id.peerId.isReplies, let channel = item.content.firstMessage.forwardInfo?.author as? TelegramChannel, channel.username == nil {
if case .member = channel.participationStatus {