mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-12-22 22:25:57 +00:00
Merge branch 'master' into postbox-refactoring-1
This commit is contained in:
@@ -156,7 +156,7 @@ final class ForwardAccessoryPanelNode: AccessoryPanelNode {
|
||||
var text = ""
|
||||
var sourcePeer: (Bool, String)?
|
||||
for message in messages {
|
||||
if let author = message.effectiveAuthor, !uniquePeerIds.contains(author.id) {
|
||||
if let author = message.forwardInfo?.author ?? message.effectiveAuthor, !uniquePeerIds.contains(author.id) {
|
||||
uniquePeerIds.insert(author.id)
|
||||
if !authors.isEmpty {
|
||||
authors.append(", ")
|
||||
@@ -268,15 +268,20 @@ final class ForwardAccessoryPanelNode: AccessoryPanelNode {
|
||||
|
||||
let filteredMessages = self.messages
|
||||
|
||||
var authors = self.authors ?? ""
|
||||
if forwardOptionsState?.hideNames == true {
|
||||
authors = self.strings.DialogList_You
|
||||
}
|
||||
|
||||
var title = ""
|
||||
var text = ""
|
||||
if filteredMessages.count == 1, let message = filteredMessages.first {
|
||||
title = self.strings.Conversation_ForwardOptions_ForwardTitleSingle
|
||||
let (string, _) = textStringForForwardedMessage(message, strings: strings)
|
||||
text = "\(self.authors ?? ""): \(string)"
|
||||
text = "\(authors): \(string)"
|
||||
} else {
|
||||
title = self.strings.Conversation_ForwardOptions_ForwardTitle(Int32(filteredMessages.count))
|
||||
text = self.strings.Conversation_ForwardFrom(self.authors ?? "").string
|
||||
text = self.strings.Conversation_ForwardFrom(authors).string
|
||||
}
|
||||
|
||||
self.titleNode.attributedText = NSAttributedString(string: title, font: Font.medium(15.0), textColor: self.theme.chat.inputPanel.panelControlAccentColor)
|
||||
|
||||
Reference in New Issue
Block a user