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

Merge commit '809db5605297aaad60e93e0579fd0681b63abec0' into experimental-3

Browse Source 
# Conflicts:
#	Telegram/Telegram-iOS/en.lproj/Localizable.strings
This commit is contained in:
Ali
2022-01-25 21:16:22 +04:00
parent 85b5913b6a 809db56052
commit 8edb5f967c
46 changed files with 730 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -852,7 +852,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
}, openPeer: { [weak self] peerId in
if let strongSelf = self {
strongSelf.controllerInteraction?.openPeer(peerId, .default, nil)
strongSelf.controllerInteraction?.openPeer(peerId, .default, nil, nil)
}
}, openHashtag: { [weak self] peerName, hashtag in
if let strongSelf = self {
@@ -920,7 +920,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
})
})))
}, openPeer: { [weak self] id, navigation, fromMessage in
}, openPeer: { [weak self] id, navigation, fromMessage, _ in
self?.openPeer(peerId: id, navigation: navigation, fromMessage: fromMessage)
}, openPeerMention: { [weak self] name in
self?.openPeerMention(name)
@@ -1141,7 +1141,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
return
}
strongSelf.openPeer(peerId: id, navigation: .default, fromMessage: message)
strongSelf.openPeer(peerId: id, navigation: .default, fromMessage: MessageReference(message))
})
})))
@@ -10963,7 +10963,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
case let .mention(peerId, mention):
switch action {
case .tap:
strongSelf.controllerInteraction?.openPeer(peerId, .default, nil)
strongSelf.controllerInteraction?.openPeer(peerId, .default, nil, nil)
case .longTap:
strongSelf.controllerInteraction?.longTap(.peerMention(peerId, mention), nil)
}
@@ -11051,7 +11051,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
case let .mention(peerId, mention):
switch action {
case .tap:
strongSelf.controllerInteraction?.openPeer(peerId, .default, nil)
strongSelf.controllerInteraction?.openPeer(peerId, .default, nil, nil)
case .longTap:
strongSelf.controllerInteraction?.longTap(.peerMention(peerId, mention), nil)
}
@@ -11160,7 +11160,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
case let .mention(peerId, mention):
switch action {
case .tap:
strongSelf.controllerInteraction?.openPeer(peerId, .default, nil)
strongSelf.controllerInteraction?.openPeer(peerId, .default, nil, nil)
case .longTap:
strongSelf.controllerInteraction?.longTap(.peerMention(peerId, mention), nil)
}
@@ -12978,7 +12978,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
})
}
private func openPeer(peerId: PeerId?, navigation: ChatControllerInteractionNavigateToPeer, fromMessage: Message?, expandAvatar: Bool = false) {
private func openPeer(peerId: PeerId?, navigation: ChatControllerInteractionNavigateToPeer, fromMessage: MessageReference?, expandAvatar: Bool = false) {
let _ = self.presentVoiceMessageDiscardAlert(action: {
if case let .peer(currentPeerId) = self.chatLocation, peerId == currentPeerId {
switch navigation {
@@ -13008,8 +13008,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
switch navigation {
case .info, .default:
let peerSignal: Signal<Peer?, NoError>
if let fromMessage = fromMessage {
peerSignal = loadedPeerFromMessage(account: self.context.account, peerId: peerId, messageId: fromMessage.id)
if let messageId = fromMessage?.id {
peerSignal = loadedPeerFromMessage(account: self.context.account, peerId: peerId, messageId: messageId)
} else {
peerSignal = self.context.account.postbox.loadedPeerWithId(peerId) |> map(Optional.init)
}