mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-11-07 01:10:09 +00:00
Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios
This commit is contained in:
commit
3e31d12db6
@ -137,9 +137,7 @@ public final class ChatMessageSuggestedPostInfoNode: ASDisplayNode {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
var channelName = ""
|
var channelName = ""
|
||||||
if item.message.author is TelegramChannel {
|
channelName = item.message.author.flatMap(EnginePeer.init)?.compactDisplayTitle ?? " "
|
||||||
channelName = item.message.author.flatMap(EnginePeer.init)?.compactDisplayTitle ?? " "
|
|
||||||
}
|
|
||||||
if changedText && changedMedia && changedPrice && changedTime {
|
if changedText && changedMedia && changedPrice && changedTime {
|
||||||
titleText = item.presentationData.strings.Chat_PostSuggestion_ChannelChangePTC(channelName).string
|
titleText = item.presentationData.strings.Chat_PostSuggestion_ChannelChangePTC(channelName).string
|
||||||
} else if changedText && changedPrice && changedTime {
|
} else if changedText && changedPrice && changedTime {
|
||||||
|
|||||||
@ -289,7 +289,7 @@ public final class PeerSelectionControllerImpl: ViewController, PeerSelectionCon
|
|||||||
TelegramEngine.EngineData.Item.Peer.Peer(id: linkedMonoforumId)
|
TelegramEngine.EngineData.Item.Peer.Peer(id: linkedMonoforumId)
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
mainPeer = .single(nil)
|
mainPeer = .single(EnginePeer.channel(peer))
|
||||||
}
|
}
|
||||||
|
|
||||||
let _ = (mainPeer |> deliverOnMainQueue).startStandalone(next: { [weak self] mainPeer in
|
let _ = (mainPeer |> deliverOnMainQueue).startStandalone(next: { [weak self] mainPeer in
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user