Update API

submodules/TelegramCore/Sources/TelegramEngine/Messages/MediaArea.swift

@@ -124,6 +124,7 @@ public enum MediaArea: Codable, Equatable {
     
     case venue(coordinates: Coordinates, venue: Venue)
     case reaction(coordinates: Coordinates, reaction: MessageReaction.Reaction, flags: ReactionFlags)
+    case channelMessage(coordinates: Coordinates, messageId: EngineMessage.Id)
     
     public struct ReactionFlags: OptionSet {
         public var rawValue: Int32
@@ -144,6 +145,7 @@ public enum MediaArea: Codable, Equatable {
     private enum MediaAreaType: Int32 {
         case venue
         case reaction
+        case channelMessage
     }
     
     public enum DecodingError: Error {
@@ -166,6 +168,10 @@ public enum MediaArea: Codable, Equatable {
             let reaction = try container.decode(MessageReaction.Reaction.self, forKey: .value)
             let flags = ReactionFlags(rawValue: try container.decodeIfPresent(Int32.self, forKey: .flags) ?? 0)
             self = .reaction(coordinates: coordinates, reaction: reaction, flags: flags)
+        case .channelMessage:
+            let coordinates = try container.decode(MediaArea.Coordinates.self, forKey: .coordinates)
+            let messageId = try container.decode(MessageId.self, forKey: .value)
+            self = .channelMessage(coordinates: coordinates, messageId: messageId)
         }
     }
     
@@ -182,6 +188,10 @@ public enum MediaArea: Codable, Equatable {
             try container.encode(coordinates, forKey: .coordinates)
             try container.encode(reaction, forKey: .value)
             try container.encode(flags.rawValue, forKey: .flags)
+        case let .channelMessage(coordinates, messageId):
+            try container.encode(MediaAreaType.channelMessage.rawValue, forKey: .type)
+            try container.encode(coordinates, forKey: .coordinates)
+            try container.encode(messageId, forKey: .value)
         }
     }
 }
@@ -193,6 +203,8 @@ public extension MediaArea {
             return coordinates
         case let .reaction(coordinates, _, _):
             return coordinates
+        case let .channelMessage(coordinates, _):
+            return coordinates
         }
     }
 }

submodules/TelegramCore/Sources/TelegramEngine/Messages/SearchMessages.swift

@@ -9,7 +9,6 @@ public enum SearchMessagesLocation: Equatable {
     case general(tags: MessageTags?, minDate: Int32?, maxDate: Int32?)
     case group(groupId: PeerGroupId, tags: MessageTags?, minDate: Int32?, maxDate: Int32?)
     case peer(peerId: PeerId, fromId: PeerId?, tags: MessageTags?, topMsgId: MessageId?, minDate: Int32?, maxDate: Int32?)
-    case publicForwards(messageId: MessageId)
     case sentMedia(tags: MessageTags?)
 }
 
@@ -354,46 +353,6 @@ func _internal_searchMessages(account: Account, location: SearchMessagesLocation
                     return .single((nil, nil))
                 }
             }
-        case let .publicForwards(messageId):
-            remoteSearchResult = account.postbox.transaction { transaction -> (Api.InputChannel?, Int32, MessageIndex?, Api.InputPeer, Int32?) in
-                let sourcePeer = transaction.getPeer(messageId.peerId)
-                let inputChannel = sourcePeer.flatMap { apiInputChannel($0) }
-                let statsDatacenterId = (transaction.getPeerCachedData(peerId: messageId.peerId) as? CachedChannelData)?.statsDatacenterId
-                
-                var lowerBound: MessageIndex?
-                if let state = state, let message = state.main.messages.last {
-                    lowerBound = message.index
-                }
-                if let lowerBound = lowerBound, let peer = transaction.getPeer(lowerBound.id.peerId), let inputPeer = apiInputPeer(peer) {
-                    return (inputChannel, state?.main.nextRate ?? 0, lowerBound, inputPeer, statsDatacenterId)
-                } else {
-                    return (inputChannel, 0, lowerBound, .inputPeerEmpty, statsDatacenterId)
-                }
-            }
-            |> mapToSignal { (inputChannel, nextRate, lowerBound, inputPeer, statsDatacenterId) in
-                guard let inputChannel = inputChannel else {
-                    return .complete()
-                }
-                
-                let request = Api.functions.stats.getMessagePublicForwards(channel: inputChannel, msgId: messageId.id, offsetRate: nextRate, offsetPeer: inputPeer, offsetId: lowerBound?.id.id ?? 0, limit: limit)
-                let signal: Signal<Api.messages.Messages, MTRpcError>
-                if let statsDatacenterId = statsDatacenterId, account.network.datacenterId != statsDatacenterId {
-                    signal = account.network.download(datacenterId: Int(statsDatacenterId), isMedia: false, tag: nil)
-                    |> castError(MTRpcError.self)
-                    |> mapToSignal { worker in
-                        return worker.request(request)
-                    }
-                } else {
-                    signal = account.network.request(request, automaticFloodWait: false)
-                }
-                return signal
-                |> map { result -> (Api.messages.Messages?, Api.messages.Messages?) in
-                    return (result, nil)
-                }
-                |> `catch` { _ -> Signal<(Api.messages.Messages?, Api.messages.Messages?), NoError> in
-                    return .single((nil, nil))
-                }
-            }
         case let .sentMedia(tags):
             let filter: Api.MessagesFilter = tags.flatMap { messageFilterForTagMask($0) } ?? .inputMessagesFilterEmpty
         

submodules/TelegramCore/Sources/TelegramEngine/Messages/Stories.swift

@@ -1092,7 +1092,7 @@ func _internal_uploadStoryImpl(
                             flags |= 1 << 4
                         }
                         
-                        let inputMediaAreas: [Api.MediaArea] = apiMediaAreasFromMediaAreas(mediaAreas)
+                        let inputMediaAreas: [Api.MediaArea] = apiMediaAreasFromMediaAreas(mediaAreas, transaction: transaction)
                         if !inputMediaAreas.isEmpty {
                             flags |= 1 << 5
                         }
@@ -1281,7 +1281,7 @@ func _internal_editStory(account: Account, peerId: PeerId, id: Int32, media: Eng
                 flags |= 1 << 2
             }
             
-            let inputMediaAreas: [Api.MediaArea]? = mediaAreas.flatMap(apiMediaAreasFromMediaAreas)
+            let inputMediaAreas: [Api.MediaArea]? = mediaAreas.flatMap { apiMediaAreasFromMediaAreas($0, transaction: transaction) }
             if let inputMediaAreas = inputMediaAreas, !inputMediaAreas.isEmpty {
                 flags |= 1 << 3
             }

submodules/TelegramCore/Sources/TelegramEngine/Payments/GiftCodes.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Postbox
 import MtProtoKit
 import SwiftSignalKit
 import TelegramApi
@@ -138,13 +139,19 @@ func _internal_getPremiumGiveawayInfo(account: Account, peerId: EnginePeer.Id, m
     }
 }
 
-func _internal_premiumGiftCodeOptions(account: Account, peerId: EnginePeer.Id) -> Signal<[PremiumGiftCodeOption], NoError> {
-    let flags: Int32 = 1 << 0
-    return account.postbox.loadedPeerWithId(peerId)
-    |> mapToSignal { peer in
-        guard let inputPeer = apiInputPeer(peer) else {
-            return .complete()
+func _internal_premiumGiftCodeOptions(account: Account, peerId: EnginePeer.Id?) -> Signal<[PremiumGiftCodeOption], NoError> {
+    var flags: Int32 = 0
+    if let _ = peerId {
+        flags |= 1 << 0
+    }
+    return account.postbox.transaction { transaction -> Peer? in
+        if let peerId = peerId {
+            return transaction.getPeer(peerId)
         }
+        return nil
+    }
+    |> mapToSignal { peer in
+        let inputPeer = peer.flatMap(apiInputPeer)
         return account.network.request(Api.functions.payments.getPremiumGiftCodeOptions(flags: flags, boostPeer: inputPeer))
         |> map(Optional.init)
         |> `catch` { _ -> Signal<[Api.PremiumGiftCodeOption]?, NoError> in

submodules/TelegramCore/Sources/TelegramEngine/Payments/TelegramEnginePayments.swift

@@ -54,7 +54,7 @@ public extension TelegramEngine {
             return _internal_applyPremiumGiftCode(account: self.account, slug: slug)
         }
         
-        public func premiumGiftCodeOptions(peerId: EnginePeer.Id) -> Signal<[PremiumGiftCodeOption], NoError> {
+        public func premiumGiftCodeOptions(peerId: EnginePeer.Id?) -> Signal<[PremiumGiftCodeOption], NoError> {
             return _internal_premiumGiftCodeOptions(account: self.account, peerId: peerId)
         }