Merge branches 'master' and 'master' of gitlab.com:peter-iakovlev/telegram-ios

This commit is contained in:
Ilya Laktyushin
2024-03-19 14:47:12 +04:00
2 changed files with 59 additions and 2 deletions

View File

@@ -1677,6 +1677,34 @@ public extension TelegramEngine.EngineData.Item {
}
}
public struct BusinessIntro: TelegramEngineDataItem, TelegramEngineMapKeyDataItem, PostboxViewDataItem {
public typealias Result = CachedTelegramBusinessIntro?
fileprivate var id: EnginePeer.Id
public var mapKey: EnginePeer.Id {
return self.id
}
public init(id: EnginePeer.Id) {
self.id = id
}
var key: PostboxViewKey {
return .cachedPeerData(peerId: self.id)
}
func extract(view: PostboxView) -> Result {
guard let view = view as? CachedPeerDataView else {
preconditionFailure()
}
if let cachedData = view.cachedPeerData as? CachedUserData {
return cachedData.businessIntro
} else {
return nil
}
}
}
public struct ChatManagingBot: TelegramEngineDataItem, TelegramEngineMapKeyDataItem, PostboxViewDataItem {
public typealias Result = PeerStatusSettings.ManagingBot?
@@ -1732,5 +1760,34 @@ public extension TelegramEngine.EngineData.Item {
}
}
}
public struct Birthday: TelegramEngineDataItem, TelegramEngineMapKeyDataItem, PostboxViewDataItem {
public typealias Result = TelegramBirthday?
fileprivate var id: EnginePeer.Id
public var mapKey: EnginePeer.Id {
return self.id
}
public init(id: EnginePeer.Id) {
self.id = id
}
var key: PostboxViewKey {
return .cachedPeerData(peerId: self.id)
}
func extract(view: PostboxView) -> Result {
guard let view = view as? CachedPeerDataView else {
preconditionFailure()
}
if let cachedData = view.cachedPeerData as? CachedUserData {
return cachedData.birthday
} else {
return nil
}
}
}
}
}

View File

@@ -784,7 +784,7 @@ extension TelegramBusinessRecipients {
self.init(
categories: categories,
additionalPeers: Set((users ?? []).map(PeerId.init)),
additionalPeers: Set((users ?? []).map( { PeerId(namespace: Namespaces.Peer.CloudUser, id: ._internalFromInt64Value($0)) })),
excludePeers: Set(),
exclude: (flags & (1 << 5)) != 0
)
@@ -810,7 +810,7 @@ extension TelegramBusinessRecipients {
self.init(
categories: categories,
additionalPeers: Set((users ?? []).map(PeerId.init)),
additionalPeers: Set((users ?? []).map( { PeerId(namespace: Namespaces.Peer.CloudUser, id: ._internalFromInt64Value($0)) })),
excludePeers: Set((excludeUsers ?? []).map(PeerId.init)),
exclude: (flags & (1 << 5)) != 0
)