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

Author: overtake

submodules/AccountContext/Sources/AccountContext.swift

@@ -896,14 +896,12 @@ public enum JoinAffiliateProgramScreenMode {
 
     public final class Active {
         public let targetPeer: EnginePeer
-        public let link: String
-        public let userCount: Int
-        public let copyLink: () -> Void
+        public let bot: TelegramConnectedStarRefBotList.Item
+        public let copyLink: (TelegramConnectedStarRefBotList.Item) -> Void
 
-        public init(targetPeer: EnginePeer, link: String, userCount: Int, copyLink: @escaping () -> Void) {
+        public init(targetPeer: EnginePeer, bot: TelegramConnectedStarRefBotList.Item, copyLink: @escaping (TelegramConnectedStarRefBotList.Item) -> Void) {
             self.targetPeer = targetPeer
-            self.link = link
-            self.userCount = userCount
+            self.bot = bot
             self.copyLink = copyLink
         }
     }

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

@@ -632,7 +632,6 @@ func _internal_updateStarRefProgram(account: Account, id: EnginePeer.Id, program
 }
 
 public final class TelegramConnectedStarRefBotList : Equatable {
-    
     public final class Item: Equatable {
         public let peer: EnginePeer
         public let url: String

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

@@ -306,6 +306,10 @@ public struct StarsAmount: Equatable, Comparable, Hashable, Codable, CustomStrin
     }
 
     public static func +(lhs: StarsAmount, rhs: StarsAmount) -> StarsAmount {
+        if rhs.value < 0 || rhs.nanos < 0 {
+            return lhs - StarsAmount(value: abs(rhs.value), nanos: abs(rhs.nanos))
+        }
+        
         let totalNanos = Int64(lhs.nanos) + Int64(rhs.nanos)
         let overflow = totalNanos / 1_000_000_000
         let remainingNanos = totalNanos % 1_000_000_000
@@ -533,7 +537,7 @@ private final class StarsContextImpl {
         }
         var transactions = state.transactions
         if addTransaction {
-            transactions.insert(.init(flags: [.isLocal], id: "\(arc4random())", count: balance, date: Int32(Date().timeIntervalSince1970), peer: .appStore, title: nil, description: nil, photo: nil, transactionDate: nil, transactionUrl: nil, paidMessageId: nil, giveawayMessageId: nil, media: [], subscriptionPeriod: nil, starGift: nil, floodskipNumber: nil), at: 0)
+            transactions.insert(.init(flags: [.isLocal], id: "\(arc4random())", count: balance, date: Int32(Date().timeIntervalSince1970), peer: .appStore, title: nil, description: nil, photo: nil, transactionDate: nil, transactionUrl: nil, paidMessageId: nil, giveawayMessageId: nil, media: [], subscriptionPeriod: nil, starGift: nil, floodskipNumber: nil, starrefCommissionPermille: nil, starrefPeerId: nil, starrefAmount: nil), at: 0)
         }
 
         self.updateState(StarsContext.State(flags: [.isPendingBalance], balance: max(StarsAmount(value: 0, nanos: 0), state.balance + balance), subscriptions: state.subscriptions, canLoadMoreSubscriptions: state.canLoadMoreSubscriptions, transactions: transactions, canLoadMoreTransactions: state.canLoadMoreTransactions, isLoading: state.isLoading))
@@ -556,10 +560,6 @@ private extension StarsContext.State.Transaction {
     init?(apiTransaction: Api.StarsTransaction, peerId: EnginePeer.Id?, transaction: Transaction) {
         switch apiTransaction {
         case let .starsTransaction(apiFlags, id, stars, date, transactionPeer, title, description, photo, transactionDate, transactionUrl, _, messageId, extendedMedia, subscriptionPeriod, giveawayPostId, starGift, floodskipNumber, starrefCommissionPermille, starrefPeer, starrefAmount):
-            let _ = starrefCommissionPermille
-            let _ = starrefPeer
-            let _ = starrefAmount
-            
             let parsedPeer: StarsContext.State.Transaction.Peer
             var paidMessageId: MessageId?
             var giveawayMessageId: MessageId?
@@ -615,7 +615,7 @@ private extension StarsContext.State.Transaction {
 
             let media = extendedMedia.flatMap({ $0.compactMap { textMediaAndExpirationTimerFromApiMedia($0, PeerId(0)).media } }) ?? []
             let _ = subscriptionPeriod
-            self.init(flags: flags, id: id, count: StarsAmount(apiAmount: stars), date: date, peer: parsedPeer, title: title, description: description, photo: photo.flatMap(TelegramMediaWebFile.init), transactionDate: transactionDate, transactionUrl: transactionUrl, paidMessageId: paidMessageId, giveawayMessageId: giveawayMessageId, media: media, subscriptionPeriod: subscriptionPeriod, starGift: starGift.flatMap { StarGift(apiStarGift: $0) }, floodskipNumber: floodskipNumber)
+            self.init(flags: flags, id: id, count: StarsAmount(apiAmount: stars), date: date, peer: parsedPeer, title: title, description: description, photo: photo.flatMap(TelegramMediaWebFile.init), transactionDate: transactionDate, transactionUrl: transactionUrl, paidMessageId: paidMessageId, giveawayMessageId: giveawayMessageId, media: media, subscriptionPeriod: subscriptionPeriod, starGift: starGift.flatMap { StarGift(apiStarGift: $0) }, floodskipNumber: floodskipNumber, starrefCommissionPermille: starrefCommissionPermille, starrefPeerId: starrefPeer.flatMap(\.peerId), starrefAmount: starrefAmount.flatMap(StarsAmount.init(apiAmount:)))
         }
     }
 }
@@ -690,6 +690,9 @@ public final class StarsContext {
             public let subscriptionPeriod: Int32?
             public let starGift: StarGift?
             public let floodskipNumber: Int32?
+            public let starrefCommissionPermille: Int32?
+            public let starrefPeerId: PeerId?
+            public let starrefAmount: StarsAmount?
 
             public init(
                 flags: Flags,
@@ -707,7 +710,10 @@ public final class StarsContext {
                 media: [Media],
                 subscriptionPeriod: Int32?,
                 starGift: StarGift?,
-                floodskipNumber: Int32?
+                floodskipNumber: Int32?,
+                starrefCommissionPermille: Int32?,
+                starrefPeerId: PeerId?,
+                starrefAmount: StarsAmount?
             ) {
                 self.flags = flags
                 self.id = id
@@ -725,6 +731,9 @@ public final class StarsContext {
                 self.subscriptionPeriod = subscriptionPeriod
                 self.starGift = starGift
                 self.floodskipNumber = floodskipNumber
+                self.starrefCommissionPermille = starrefCommissionPermille
+                self.starrefPeerId = starrefPeerId
+                self.starrefAmount = starrefAmount
             }
 
             public static func == (lhs: Transaction, rhs: Transaction) -> Bool {
@@ -776,6 +785,15 @@ public final class StarsContext {
                 if lhs.floodskipNumber != rhs.floodskipNumber {
                     return false
                 }
+                if lhs.starrefCommissionPermille != rhs.starrefCommissionPermille {
+                    return false
+                }
+                if lhs.starrefPeerId != rhs.starrefPeerId {
+                    return false
+                }
+                if lhs.starrefAmount != rhs.starrefAmount {
+                    return false
+                }
                 return true
             }
         }

submodules/TelegramUI/Components/PeerInfo/AffiliateProgramSetupScreen/Sources/AffiliateProgramSetupScreen.swift

@@ -364,9 +364,8 @@ If you end your affiliate program:
                     programDuration: bot.durationMonths,
                     mode: .active(JoinAffiliateProgramScreenMode.Active(
                         targetPeer: targetPeer,
-                        link: bot.url,
-                        userCount: Int(bot.participants),
-                        copyLink: { [weak self] in
+                        bot: bot,
+                        copyLink: { [weak self] bot in
                             guard let self, let component = self.component else {
                                 return
                             }