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

Fix send as peer in discussion groups

Browse Source
This commit is contained in:
Ilya Laktyushin 2021-11-06 14:40:24 +04:00
parent 8ce334e180
commit ab59881d2d
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7049,3 +7049,5 @@ Sorry for the inconvenience.";
"Channel.AdminLog.MessageToggleNoForwardsOn" = "%@ enabled no-forwards"; "Channel.AdminLog.MessageToggleNoForwardsOn" = "%@ enabled no-forwards";
"Channel.AdminLog.MessageToggleNoForwardsOff" = "%@ disabled no-forwards"; "Channel.AdminLog.MessageToggleNoForwardsOff" = "%@ disabled no-forwards";
"VoiceChat.DiscussionGroup" = "discussion group";

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

@ -4565,14 +4565,18 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
return [FoundPeer(peer: peer, subscribers: nil)] return [FoundPeer(peer: peer, subscribers: nil)]
} }
let _ = (combineLatest(queue: Queue.mainQueue(), currentAccountPeer, self.context.engine.peers.sendAsAvailablePeers(peerId: self.chatLocation.peerId))) let _ = (combineLatest(queue: Queue.mainQueue(), currentAccountPeer, self.context.account.postbox.peerView(id: self.chatLocation.peerId), self.context.engine.peers.sendAsAvailablePeers(peerId: self.chatLocation.peerId)))
.start(next: { [weak self] currentAccountPeer, peers in .start(next: { [weak self] currentAccountPeer, peerView, peers in
guard let strongSelf = self else { guard let strongSelf = self else {
return return
} }
var allPeers: [FoundPeer]? var allPeers: [FoundPeer]?
if !peers.isEmpty { if !peers.isEmpty {
if let channel = peerViewMainPeer(peerView) as? TelegramChannel, case .group = channel.info, channel.hasPermission(.canBeAnonymous) {
allPeers = []
} else {
allPeers = currentAccountPeer allPeers = currentAccountPeer
}
allPeers?.append(contentsOf: peers) allPeers?.append(contentsOf: peers)
} }
strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: false, { strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: false, {
@ -7398,7 +7402,13 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
return return
} }
let myPeerId = strongSelf.presentationInterfaceState.currentSendAsPeerId ?? strongSelf.context.account.peerId let defaultMyPeerId: PeerId
if let channel = strongSelf.presentationInterfaceState.renderedPeer?.chatMainPeer as? TelegramChannel, case .group = channel.info, channel.hasPermission(.canBeAnonymous) {
defaultMyPeerId = channel.id
} else {
defaultMyPeerId = strongSelf.context.account.peerId
}
let myPeerId = strongSelf.presentationInterfaceState.currentSendAsPeerId ?? defaultMyPeerId
let avatarSize = CGSize(width: 28.0, height: 28.0) let avatarSize = CGSize(width: 28.0, height: 28.0)
var items: [ContextMenuItem] = [] var items: [ContextMenuItem] = []
@ -7410,8 +7420,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
if peer.peer.id.namespace == Namespaces.Peer.CloudUser { if peer.peer.id.namespace == Namespaces.Peer.CloudUser {
subtitle = strongSelf.presentationData.strings.VoiceChat_PersonalAccount subtitle = strongSelf.presentationData.strings.VoiceChat_PersonalAccount
} else if let subscribers = peer.subscribers { } else if let subscribers = peer.subscribers {
if let peer = peer.peer as? TelegramChannel, case .broadcast = peer.info { if let peer = peer.peer as? TelegramChannel {
if case .broadcast = peer.info {
subtitle = strongSelf.presentationData.strings.Conversation_StatusSubscribers(subscribers) subtitle = strongSelf.presentationData.strings.Conversation_StatusSubscribers(subscribers)
} else {
subtitle = strongSelf.presentationData.strings.VoiceChat_DiscussionGroup
}
} else { } else {
subtitle = strongSelf.presentationData.strings.Conversation_StatusMembers(subscribers) subtitle = strongSelf.presentationData.strings.Conversation_StatusMembers(subscribers)
} }