mirror of
https://github.com/TelegramMessenger/Telegram-iOS.git
synced 2026-07-05 19:28:46 +02:00
d1aa0db537
Squash of 63 commits spanning waves 46-93 (plus interspersed docs commits) of the gradual Postbox->TelegramEngine consumer-side migration. Scope: 139 files changed, 2123 insertions(+), 452 deletions(-). ## Themes by wave-block **Waves 46-58 — Peer field migrations + facade additions** Foundational EnginePeer convenience init additions (PeerReference, RenderedPeer, SelectivePrivacyPeer). Multiple `peer: Peer` field migrations across PeerInfo, ChatList, and SettingsUI components. **Waves 59-73 — peer field cascade + EnginePeer wrap drops** Series of single- to two-file peer-field migrations; consumer-side wrap removal (`EnginePeer(peer)` -> direct EnginePeer use); `as? TelegramUser` cast conversion to `case let .user(...)` enum match. Wave 64: RenderedPeer convenience init. Wave 68: SelectivePrivacyPeer convenience init. **Waves 74-83 — controller-Node bridge cleanup + small migrations** Wave-71 shadow-pattern cleanup at controller->Node bridges. Migrations of ChatRecentActionsController.peer (74), PeerInfoMember (75), MentionChatInputPanelItem (76), PassportUI SecureIdAuthController (77), AccountWithInfo + ShareController (78), peerInputActivitiesPromise (79), InactiveChannel (80), BlockedPeers (81), openHashtag resolveSignal (82), NotificationExceptionsList (83). **Waves 84-90 — TelegramEngine.Resources facade migrations** Per-method Shape-A/B sweeps converting `<ctx>.account.postbox.mediaBox.X(...)` to `<ctx>.engine.resources.X(...)`. Wave 90 was a single-commit big sweep: 40 fetchedMediaResource sites in 25 files migrated to engine.resources.fetch facade in one atomic pass with first-pass-clean build. Methods covered: storeResourceData, completedResourcePath, cancelInteractiveResourceFetch, resourceRangesStatus, resourceStatus, fetch (fetchedMediaResource). **Waves 91-92 — additional type migrations** Wave 91: ItemListWebsiteItem.peer + RecentSessionsController enum-case payload + openWebSession callback Peer? -> EnginePeer?. Wave 92: ChatListController StateHolder.EntryContext status type MediaResourceStatus -> EngineMediaResource.FetchStatus. **Wave 93 — speculative `import Postbox` drop sweep** Drop import from 7 wave-touched files where it became unused; restore in 5 files where bare PeerId/Message/MediaId/StoryId references escaped the pre-flight regex. Includes one MediaId(...) -> EngineMedia.Id(...) swap in InAppPurchaseManager to unlock its import drop. ## Build state Final state at squash: clean Telegram/Telegram build at debug_sim_arm64. ## Persistent-state notes - Pre-existing WIP unchanged across the squashed range: - build-system/bazel-rules/sourcekit-bazel-bsp submodule marker - Untracked: build-system/tulsi/, submodules/TgVoip/, third-party/libx264/ Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
211 lines
9.2 KiB
Swift
211 lines
9.2 KiB
Swift
import Foundation
|
|
import Postbox
|
|
import TelegramApi
|
|
|
|
|
|
public extension PeerReference {
|
|
var id: PeerId {
|
|
switch self {
|
|
case let .user(id, _):
|
|
return PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt64Value(id))
|
|
case let .group(id):
|
|
return PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt64Value(id))
|
|
case let .channel(id, _):
|
|
return PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt64Value(id))
|
|
}
|
|
}
|
|
|
|
init?(_ peer: EnginePeer) {
|
|
self.init(peer._asPeer())
|
|
}
|
|
}
|
|
|
|
extension PeerReference {
|
|
var inputPeer: Api.InputPeer {
|
|
switch self {
|
|
case let .user(id, accessHash):
|
|
return .inputPeerUser(.init(userId: id, accessHash: accessHash))
|
|
case let .group(id):
|
|
return .inputPeerChat(.init(chatId: id))
|
|
case let .channel(id, accessHash):
|
|
return .inputPeerChannel(.init(channelId: id, accessHash: accessHash))
|
|
}
|
|
}
|
|
|
|
var inputUser: Api.InputUser? {
|
|
if case let .user(id, accessHash) = self {
|
|
return .inputUser(.init(userId: id, accessHash: accessHash))
|
|
} else {
|
|
return nil
|
|
}
|
|
}
|
|
|
|
var inputChannel: Api.InputChannel? {
|
|
if case let .channel(id, accessHash) = self {
|
|
return .inputChannel(.init(channelId: id, accessHash: accessHash))
|
|
} else {
|
|
return nil
|
|
}
|
|
}
|
|
}
|
|
|
|
func forceApiInputPeer(_ peer: Peer) -> Api.InputPeer? {
|
|
switch peer {
|
|
case let user as TelegramUser:
|
|
return Api.InputPeer.inputPeerUser(.init(userId: user.id.id._internalGetInt64Value(), accessHash: user.accessHash?.value ?? 0))
|
|
case let group as TelegramGroup:
|
|
return Api.InputPeer.inputPeerChat(.init(chatId: group.id.id._internalGetInt64Value()))
|
|
case let channel as TelegramChannel:
|
|
if let accessHash = channel.accessHash {
|
|
return Api.InputPeer.inputPeerChannel(.init(channelId: channel.id.id._internalGetInt64Value(), accessHash: accessHash.value))
|
|
} else {
|
|
return nil
|
|
}
|
|
default:
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func apiInputPeer(_ peer: Peer) -> Api.InputPeer? {
|
|
switch peer {
|
|
case let user as TelegramUser where user.accessHash != nil:
|
|
return Api.InputPeer.inputPeerUser(.init(userId: user.id.id._internalGetInt64Value(), accessHash: user.accessHash!.value))
|
|
case let group as TelegramGroup:
|
|
return Api.InputPeer.inputPeerChat(.init(chatId: group.id.id._internalGetInt64Value()))
|
|
case let channel as TelegramChannel:
|
|
if let accessHash = channel.accessHash {
|
|
return Api.InputPeer.inputPeerChannel(.init(channelId: channel.id.id._internalGetInt64Value(), accessHash: accessHash.value))
|
|
} else {
|
|
return nil
|
|
}
|
|
default:
|
|
return nil
|
|
}
|
|
}
|
|
|
|
private func apiInputPeerFromSourceMessage(_ sourceMessageId: MessageId?, transaction: Transaction) -> (MessageId, Api.InputPeer)? {
|
|
guard let sourceMessageId else {
|
|
return nil
|
|
}
|
|
guard let sourcePeer = transaction.getPeer(sourceMessageId.peerId) else {
|
|
return nil
|
|
}
|
|
guard let inputPeer = apiInputPeer(sourcePeer) else {
|
|
return nil
|
|
}
|
|
return (sourceMessageId, inputPeer)
|
|
}
|
|
|
|
func apiInputPeer(_ peer: Peer, sourceMessageId: MessageId?, transaction: Transaction) -> Api.InputPeer? {
|
|
switch peer {
|
|
case let user as TelegramUser:
|
|
if let accessHash = user.accessHash {
|
|
switch accessHash {
|
|
case let .personal(value):
|
|
return Api.InputPeer.inputPeerUser(.init(userId: user.id.id._internalGetInt64Value(), accessHash: value))
|
|
case let .genericPublic(value):
|
|
if let (sourceMessageId, sourcePeer) = apiInputPeerFromSourceMessage(sourceMessageId, transaction: transaction) {
|
|
return Api.InputPeer.inputPeerUserFromMessage(.init(peer: sourcePeer, msgId: sourceMessageId.id, userId: user.id.id._internalGetInt64Value()))
|
|
}
|
|
return Api.InputPeer.inputPeerUser(.init(userId: user.id.id._internalGetInt64Value(), accessHash: value))
|
|
}
|
|
} else if let (sourceMessageId, sourcePeer) = apiInputPeerFromSourceMessage(sourceMessageId, transaction: transaction) {
|
|
return Api.InputPeer.inputPeerUserFromMessage(.init(peer: sourcePeer, msgId: sourceMessageId.id, userId: user.id.id._internalGetInt64Value()))
|
|
} else {
|
|
return nil
|
|
}
|
|
case let group as TelegramGroup:
|
|
return Api.InputPeer.inputPeerChat(.init(chatId: group.id.id._internalGetInt64Value()))
|
|
case let channel as TelegramChannel:
|
|
if let accessHash = channel.accessHash {
|
|
switch accessHash {
|
|
case let .personal(value):
|
|
return Api.InputPeer.inputPeerChannel(.init(channelId: channel.id.id._internalGetInt64Value(), accessHash: value))
|
|
case let .genericPublic(value):
|
|
if let (sourceMessageId, sourcePeer) = apiInputPeerFromSourceMessage(sourceMessageId, transaction: transaction) {
|
|
return Api.InputPeer.inputPeerChannelFromMessage(.init(peer: sourcePeer, msgId: sourceMessageId.id, channelId: channel.id.id._internalGetInt64Value()))
|
|
}
|
|
return Api.InputPeer.inputPeerChannel(.init(channelId: channel.id.id._internalGetInt64Value(), accessHash: value))
|
|
}
|
|
} else if let (sourceMessageId, sourcePeer) = apiInputPeerFromSourceMessage(sourceMessageId, transaction: transaction) {
|
|
return Api.InputPeer.inputPeerChannelFromMessage(.init(peer: sourcePeer, msgId: sourceMessageId.id, channelId: channel.id.id._internalGetInt64Value()))
|
|
} else {
|
|
return nil
|
|
}
|
|
default:
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func apiInputPeerOrSelf(_ peer: Peer, accountPeerId: PeerId) -> Api.InputPeer? {
|
|
if peer.id == accountPeerId {
|
|
return .inputPeerSelf
|
|
}
|
|
return apiInputPeer(peer)
|
|
}
|
|
|
|
func apiInputChannel(_ peer: Peer) -> Api.InputChannel? {
|
|
if let channel = peer as? TelegramChannel, let accessHash = channel.accessHash {
|
|
return Api.InputChannel.inputChannel(.init(channelId: channel.id.id._internalGetInt64Value(), accessHash: accessHash.value))
|
|
} else {
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func apiInputChannel(_ peer: Peer, sourceMessageId: MessageId?, transaction: Transaction) -> Api.InputChannel? {
|
|
guard let channel = peer as? TelegramChannel else {
|
|
return nil
|
|
}
|
|
if let accessHash = channel.accessHash {
|
|
switch accessHash {
|
|
case let .personal(value):
|
|
return Api.InputChannel.inputChannel(.init(channelId: channel.id.id._internalGetInt64Value(), accessHash: value))
|
|
case let .genericPublic(value):
|
|
if let (sourceMessageId, sourcePeer) = apiInputPeerFromSourceMessage(sourceMessageId, transaction: transaction) {
|
|
return Api.InputChannel.inputChannelFromMessage(.init(peer: sourcePeer, msgId: sourceMessageId.id, channelId: channel.id.id._internalGetInt64Value()))
|
|
}
|
|
return Api.InputChannel.inputChannel(.init(channelId: channel.id.id._internalGetInt64Value(), accessHash: value))
|
|
}
|
|
} else if let (sourceMessageId, sourcePeer) = apiInputPeerFromSourceMessage(sourceMessageId, transaction: transaction) {
|
|
return Api.InputChannel.inputChannelFromMessage(.init(peer: sourcePeer, msgId: sourceMessageId.id, channelId: channel.id.id._internalGetInt64Value()))
|
|
} else {
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func apiInputUser(_ peer: Peer) -> Api.InputUser? {
|
|
if let user = peer as? TelegramUser, let accessHash = user.accessHash {
|
|
return Api.InputUser.inputUser(.init(userId: user.id.id._internalGetInt64Value(), accessHash: accessHash.value))
|
|
} else {
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func apiInputUser(_ peer: Peer, sourceMessageId: MessageId?, transaction: Transaction) -> Api.InputUser? {
|
|
guard let user = peer as? TelegramUser else {
|
|
return nil
|
|
}
|
|
if let accessHash = user.accessHash {
|
|
switch accessHash {
|
|
case let .personal(value):
|
|
return Api.InputUser.inputUser(.init(userId: user.id.id._internalGetInt64Value(), accessHash: value))
|
|
case let .genericPublic(value):
|
|
if let (sourceMessageId, sourcePeer) = apiInputPeerFromSourceMessage(sourceMessageId, transaction: transaction) {
|
|
return Api.InputUser.inputUserFromMessage(.init(peer: sourcePeer, msgId: sourceMessageId.id, userId: user.id.id._internalGetInt64Value()))
|
|
}
|
|
return Api.InputUser.inputUser(.init(userId: user.id.id._internalGetInt64Value(), accessHash: value))
|
|
}
|
|
} else if let (sourceMessageId, sourcePeer) = apiInputPeerFromSourceMessage(sourceMessageId, transaction: transaction) {
|
|
return Api.InputUser.inputUserFromMessage(.init(peer: sourcePeer, msgId: sourceMessageId.id, userId: user.id.id._internalGetInt64Value()))
|
|
} else {
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func apiInputSecretChat(_ peer: Peer) -> Api.InputEncryptedChat? {
|
|
if let chat = peer as? TelegramSecretChat {
|
|
return Api.InputEncryptedChat.inputEncryptedChat(.init(chatId: Int32(peer.id.id._internalGetInt64Value()), accessHash: chat.accessHash))
|
|
} else {
|
|
return nil
|
|
}
|
|
}
|