Merge commit '84a17115fa6082750c991bde783485fd4d92daf0'

# Conflicts:
#	submodules/TelegramUI/Components/MessageInputPanelComponent/Sources/MessageInputPanelComponent.swift

Author: Isaac

.gitignore

@@ -68,4 +68,5 @@ build-input/*
 submodules/OpusBinding/SharedHeaders/*
 submodules/FFMpegBinding/SharedHeaders/*
 submodules/OpenSSLEncryptionProvider/SharedHeaders/*
-buildServer.json
+submodules/TelegramCore/FlatSerialization/Sources/*
+buildServer.json

Telegram/Telegram-iOS/en.lproj/Localizable.strings

@@ -13819,12 +13819,12 @@ Sorry for the inconvenience.";
 "GroupInfo.Permissions.ChargeForMessages" = "Charge for Messages";
 "GroupInfo.Permissions.ChargeForMessagesInfo" = "If you turn this on, regular members of the group will have to pay Stars to send messages.";
 "GroupInfo.Permissions.MessagePrice" = "SET YOUR PRICE PER MESSAGE";
-"GroupInfo.Permissions.MessagePriceInfo" = "Your group will receive 85% of the selected fee (%1$@) for each incoming message.";
+"GroupInfo.Permissions.MessagePriceInfo" = "Your group will receive %1$@% of the selected fee (%2$@) for each incoming message.";
 
 "Privacy.Messages.ChargeForMessages" = "Charge for Messages";
 "Privacy.Messages.ChargeForMessagesInfo" = "Charge a fee for messages from people outide your contacts or those you haven't messaged first.";
 "Privacy.Messages.MessagePrice" = "SET YOUR PRICE PER MESSAGE";
-"Privacy.Messages.MessagePriceInfo" = "Your will receive 85% of the selected fee (%1$@) for each incoming message.";
+"Privacy.Messages.MessagePriceInfo" = "Your will receive %1$@% of the selected fee (%2$@) for each incoming message.";
 
 "Privacy.Messages.RemoveFeeHeader" = "EXCEPTIONS";
 "Privacy.Messages.RemoveFee" = "Remove Fee";
@@ -13839,9 +13839,15 @@ Sorry for the inconvenience.";
 "Notification.PaidMessage.Stars_1" = "%@ Star";
 "Notification.PaidMessage.Stars_any" = "%@ Stars";
 
+"Notification.PaidMessage.Messages_1" = "%@ message";
+"Notification.PaidMessage.Messages_any" = "%@ messages";
+
 "Notification.PaidMessage" = "%1$@ paid %2$@ to send a message";
 "Notification.PaidMessageYou" = "You paid %1$@ to send a message";
 
+"Notification.PaidMessageMany" = "%1$@ paid %2$@ to send %3$@";
+"Notification.PaidMessageYouMany" = "You paid %1$@ to send %2$@";
+
 "Stars.Transfer.Terms" = "By purchasing you agree to the [Terms of Service]().";
 "Stars.Transfer.Terms_URL" = "https://telegram.org/tos/stars";
 
@@ -13850,10 +13856,31 @@ Sorry for the inconvenience.";
 "Settings.Privacy.Messages.ValuePaid" = "Paid";
 
 "Stars.Transaction.PaidMessage_1" = "Fee for %@ Message";
-"Stars.Transaction.PaidMessage_anu" = "Fee for %@ Messages";
+"Stars.Transaction.PaidMessage_any" = "Fee for %@ Messages";
 "Stars.Transaction.PaidMessage.Text" = "You receive **%@%** of the price that you charge for each incoming message. [Change Fee >]()";
+"Stars.Transaction.Paid" = "Paid";
+
 "Stars.Intro.Transaction.PaidMessage_1" = "Fee for %@ Message";
 "Stars.Intro.Transaction.PaidMessage_any" = "Fee for %@ Messages";
 
 "Stars.Purchase.SendMessageInfo" = "Buy Stars to send a message to **%@**.";
 "Stars.Purchase.SendGroupMessageInfo" = "Buy Stars to send a message in **%@**.";
+
+"Gift.Options.Gift.Transfer" = "Transfer";
+"Gift.Options.Gift.Filter.MyGifts" = "My Gifts";
+"Gift.Options.Premium.OrStars" = "or %@";
+
+"Gift.Send.PayWithStars" = "Pay with %@";
+"Gift.Send.PayWithStars.Info" = "Your balance is **%@**. [Get More Stars >]()";
+
+"Chat.PanelCustomStatusShortInfo" = "%@ is a mark for [Premium subscribers >]()";
+
+"Chat.InputTextPaidMessagePlaceholder" = "Message for %@";
+
+"Privacy.Messages.Stars_1" = "%@ Star";
+"Privacy.Messages.Stars_any" = "%@ Stars";
+"Privacy.Messages.Unlock" = "Unlock with Telegram Premium";
+
+"Premium.PaidMessages" = "Paid Messages";
+"Premium.PaidMessagesInfo" = "Charge a fee for messages from non-contacts or new senders.";
+"Premium.PaidMessages.Proceed" = "About Telegram Premium";

submodules/AccountContext/Sources/AccountContext.swift

@@ -1116,6 +1116,8 @@ public protocol SharedAccountContext: AnyObject {
     func makeMiniAppListScreenInitialData(context: AccountContext) -> Signal<MiniAppListScreenInitialData, NoError>
     func makeMiniAppListScreen(context: AccountContext, initialData: MiniAppListScreenInitialData) -> ViewController
 
+    func makeIncomingMessagePrivacyScreen(context: AccountContext, value: GlobalPrivacySettings.NonContactChatsPrivacy, exceptions: SelectivePrivacySettings, update: @escaping (GlobalPrivacySettings.NonContactChatsPrivacy) -> Void) -> ViewController
+    
     func openWebApp(context: AccountContext, parentController: ViewController, updatedPresentationData: (initial: PresentationData, signal: Signal<PresentationData, NoError>)?, botPeer: EnginePeer, chatPeer: EnginePeer?, threadId: Int64?, buttonText: String, url: String, simple: Bool, source: ChatOpenWebViewSource, skipTermsOfService: Bool, payload: String?)
 
     func makeAffiliateProgramSetupScreenInitialData(context: AccountContext, peerId: EnginePeer.Id, mode: AffiliateProgramSetupScreenMode) -> Signal<AffiliateProgramSetupScreenInitialData, NoError>
@@ -1351,20 +1353,50 @@ public struct StickersSearchConfiguration {
 
 public struct StarsSubscriptionConfiguration {
     static var defaultValue: StarsSubscriptionConfiguration {
-        return StarsSubscriptionConfiguration(maxFee: 2500, usdWithdrawRate: 1200)
+        return StarsSubscriptionConfiguration(
+            maxFee: 2500,
+            usdWithdrawRate: 1200,
+            paidMessageMaxAmount: 10000,
+            paidMessageCommissionPermille: 850,
+            paidMessagesAvailable: false
+        )
     }
-    
-    public let maxFee: Int64?
-    public let usdWithdrawRate: Int64?
-    
-    fileprivate init(maxFee: Int64?, usdWithdrawRate: Int64?) {
+        
+    public let maxFee: Int64
+    public let usdWithdrawRate: Int64
+    public let paidMessageMaxAmount: Int64
+    public let paidMessageCommissionPermille: Int32
+    public let paidMessagesAvailable: Bool
+    
+    fileprivate init(
+        maxFee: Int64,
+        usdWithdrawRate: Int64,
+        paidMessageMaxAmount: Int64,
+        paidMessageCommissionPermille: Int32,
+        paidMessagesAvailable: Bool
+    ) {
         self.maxFee = maxFee
         self.usdWithdrawRate = usdWithdrawRate
+        self.paidMessageMaxAmount = paidMessageMaxAmount
+        self.paidMessageCommissionPermille = paidMessageCommissionPermille
+        self.paidMessagesAvailable = paidMessagesAvailable
     }
 
     public static func with(appConfiguration: AppConfiguration) -> StarsSubscriptionConfiguration {
-        if let data = appConfiguration.data, let value = data["stars_subscription_amount_max"] as? Double, let usdRate = data["stars_usd_withdraw_rate_x1000"] as? Double {
-            return StarsSubscriptionConfiguration(maxFee: Int64(value), usdWithdrawRate: Int64(usdRate))
+        if let data = appConfiguration.data {
+            let maxFee = (data["stars_subscription_amount_max"] as? Double).flatMap(Int64.init) ?? StarsSubscriptionConfiguration.defaultValue.maxFee
+            let usdWithdrawRate = (data["stars_usd_withdraw_rate_x1000"] as? Double).flatMap(Int64.init) ?? StarsSubscriptionConfiguration.defaultValue.usdWithdrawRate
+            let paidMessageMaxAmount = (data["stars_paid_message_amount_max"] as? Double).flatMap(Int64.init) ?? StarsSubscriptionConfiguration.defaultValue.paidMessageMaxAmount
+            let paidMessageCommissionPermille = (data["stars_paid_message_commission_permille"] as? Double).flatMap(Int32.init) ?? StarsSubscriptionConfiguration.defaultValue.paidMessageCommissionPermille
+            let paidMessagesAvailable = (data["stars_paid_messages_available"] as? Bool) ?? StarsSubscriptionConfiguration.defaultValue.paidMessagesAvailable
+            
+            return StarsSubscriptionConfiguration(
+                maxFee: maxFee,
+                usdWithdrawRate: usdWithdrawRate,
+                paidMessageMaxAmount: paidMessageMaxAmount,
+                paidMessageCommissionPermille: paidMessageCommissionPermille,
+                paidMessagesAvailable: paidMessagesAvailable
+            )
         } else {
             return .defaultValue
         }

submodules/AccountContext/Sources/Premium.swift

@@ -42,6 +42,7 @@ public enum PremiumIntroSource {
     case folderTags
     case animatedEmoji
     case messageEffects
+    case paidMessages
 }
 
 public enum PremiumGiftSource: Equatable {
@@ -79,6 +80,7 @@ public enum PremiumDemoSubject {
     case folderTags
     case business
     case messageEffects
+    case paidMessages
 
     case businessLocation
     case businessHours
@@ -134,6 +136,7 @@ public enum StarsPurchasePurpose: Equatable {
     case unlockMedia(requiredStars: Int64)
     case starGift(peerId: EnginePeer.Id, requiredStars: Int64)
     case upgradeStarGift(requiredStars: Int64)
+    case sendMessage(peerId: EnginePeer.Id, requiredStars: Int64)
 }
 
 public struct PremiumConfiguration {

submodules/AccountContext/Sources/ShareController.swift

@@ -76,5 +76,5 @@ public enum ShareControllerSubject {
     case image([ImageRepresentationWithReference])
     case media(AnyMediaReference, MediaParameters?)
     case mapMedia(TelegramMediaMap)
-    case fromExternal(([PeerId], [PeerId: Int64], String, ShareControllerAccountContext, Bool) -> Signal<ShareControllerExternalStatus, ShareControllerError>)
+    case fromExternal(Int, ([PeerId], [PeerId: Int64], [PeerId: StarsAmount], String, ShareControllerAccountContext, Bool) -> Signal<ShareControllerExternalStatus, ShareControllerError>)
 }

submodules/AttachmentTextInputPanelNode/BUILD

@@ -35,6 +35,7 @@ swift_library(
         "//submodules/TelegramUI/Components/MultiAnimationRenderer:MultiAnimationRenderer",
         "//submodules/TelegramUI/Components/TextNodeWithEntities:TextNodeWithEntities",
         "//submodules/TelegramUI/Components/Chat/ChatInputTextNode",
+        "//submodules/AnimatedCountLabelNode",
     ],
     visibility = [
         "//visibility:public",

submodules/AttachmentTextInputPanelNode/Sources/AttachmentTextInputActionButtonsNode.swift

@@ -8,6 +8,7 @@ import ContextUI
 import ChatPresentationInterfaceState
 import ComponentFlow
 import AccountContext
+import AnimatedCountLabelNode
 
 final class AttachmentTextInputActionButtonsNode: ASDisplayNode, ChatSendMessageActionSheetControllerSourceSendButtonNode {
     private let strings: PresentationStrings
@@ -17,7 +18,7 @@ final class AttachmentTextInputActionButtonsNode: ASDisplayNode, ChatSendMessage
     let sendButton: HighlightTrackingButtonNode
     var sendButtonHasApplyIcon = false
     var animatingSendButton = false
-    let textNode: ImmediateTextNode
+    let textNode: ImmediateAnimatedCountLabelNode
 
     private var theme: PresentationTheme
 
@@ -46,8 +47,7 @@ final class AttachmentTextInputActionButtonsNode: ASDisplayNode, ChatSendMessage
         self.backgroundNode.clipsToBounds = true
         self.sendButton = HighlightTrackingButtonNode(pointerStyle: nil)
 
-        self.textNode = ImmediateTextNode()
-        self.textNode.attributedText = NSAttributedString(string: self.strings.MediaPicker_Send, font: Font.semibold(17.0), textColor: theme.chat.inputPanel.actionControlForegroundColor)
+        self.textNode = ImmediateAnimatedCountLabelNode()
         self.textNode.isUserInteractionEnabled = false
 
         super.init()
@@ -104,29 +104,51 @@ final class AttachmentTextInputActionButtonsNode: ASDisplayNode, ChatSendMessage
 
     func updateTheme(theme: PresentationTheme, wallpaper: TelegramWallpaper) {
         self.backgroundNode.backgroundColor = theme.chat.inputPanel.actionControlFillColor
-        
-        self.textNode.attributedText = NSAttributedString(string: self.strings.MediaPicker_Send, font: Font.semibold(17.0), textColor: theme.chat.inputPanel.actionControlForegroundColor)
     }
 
     private var absoluteRect: (CGRect, CGSize)?
     func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize, transition: ContainedViewLayoutTransition) {
         self.absoluteRect = (rect, containerSize)
     }
 
-    func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition, minimized: Bool, interfaceState: ChatPresentationInterfaceState) -> CGSize {
+    func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition, minimized: Bool, text: String, interfaceState: ChatPresentationInterfaceState) -> CGSize {
         self.validLayout = size
 
         let width: CGFloat
-        let textSize = self.textNode.updateLayout(CGSize(width: 100.0, height: 100.0))
+        
+        var titleOffset: CGFloat = 0.0
+        var segments: [AnimatedCountLabelNode.Segment] = []
+        var buttonInset: CGFloat = 18.0
+        if text.hasPrefix("⭐️") {
+            let font = Font.with(size: 17.0, design: .round, weight: .semibold, traits: .monospacedNumbers)
+            let badgeString = NSMutableAttributedString(string: "⭐️ ", font: font, textColor: interfaceState.theme.chat.inputPanel.actionControlForegroundColor)
+            if let range = badgeString.string.range(of: "⭐️") {
+                badgeString.addAttribute(.attachment, value: PresentationResourcesChat.chatPlaceholderStarIcon(interfaceState.theme)!, range: NSRange(range, in: badgeString.string))
+                badgeString.addAttribute(.baselineOffset, value: 1.0, range: NSRange(range, in: badgeString.string))
+            }
+            segments.append(.text(0, badgeString))
+            for char in text {
+                if let intValue = Int(String(char)) {
+                    segments.append(.number(intValue, NSAttributedString(string: String(char), font: font, textColor: interfaceState.theme.chat.inputPanel.actionControlForegroundColor)))
+                }
+            }
+            titleOffset -= 2.0
+            buttonInset = 14.0
+        } else {
+            segments.append(.text(0, NSAttributedString(string: text, font: Font.semibold(17.0), textColor: interfaceState.theme.chat.inputPanel.actionControlForegroundColor)))
+        }
+        self.textNode.segments = segments
+        
+        let textSize = self.textNode.updateLayout(size: CGSize(width: 100.0, height: 100.0), animated: transition.isAnimated)
         if minimized {
             width = 44.0
         } else {
-            width = textSize.width + 36.0
+            width = textSize.width + buttonInset * 2.0
         }
 
         let buttonSize = CGSize(width: width, height: size.height)
 
-        transition.updateFrame(node: self.textNode, frame: CGRect(origin: CGPoint(x: floorToScreenPixels((width - textSize.width) / 2.0), y: floorToScreenPixels((buttonSize.height - textSize.height) / 2.0)), size: textSize))
+        transition.updateFrame(node: self.textNode, frame: CGRect(origin: CGPoint(x: floorToScreenPixels((width - textSize.width) / 2.0) + titleOffset, y: floorToScreenPixels((buttonSize.height - textSize.height) / 2.0)), size: textSize))
         transition.updateAlpha(node: self.textNode, alpha: minimized ? 0.0 : 1.0)
         transition.updateAlpha(node: self.sendButton.imageNode, alpha: minimized ? 1.0 : 0.0)
 

submodules/AttachmentTextInputPanelNode/Sources/AttachmentTextInputPanelNode.swift

@@ -750,7 +750,7 @@ public class AttachmentTextInputPanelNode: ASDisplayNode, TGCaptionPanelView, AS
                 }
 
                 self.theme = interfaceState.theme
-
+                
                 self.actionButtons.updateTheme(theme: interfaceState.theme, wallpaper: interfaceState.chatWallpaper)
 
                 let textFieldMinHeight = calclulateTextFieldMinHeight(interfaceState, metrics: metrics)
@@ -957,7 +957,17 @@ public class AttachmentTextInputPanelNode: ASDisplayNode, TGCaptionPanelView, AS
         var textBackgroundInset: CGFloat = 0.0
         let actionButtonsSize: CGSize
         if let presentationInterfaceState = self.presentationInterfaceState {
-            actionButtonsSize = self.actionButtons.updateLayout(size: CGSize(width: 44.0, height: minimalHeight), transition: transition, minimized: !self.isAttachment || inputHasText, interfaceState: presentationInterfaceState)
+            let isMinimized: Bool
+            let text: String
+            if let sendPaidMessageStars = presentationInterfaceState.sendPaidMessageStars {
+                isMinimized = false
+                let count = max(1, presentationInterfaceState.interfaceState.forwardMessageIds?.count ?? 1)
+                text = "⭐️\(sendPaidMessageStars.value * Int64(count))"
+            } else {
+                isMinimized = !self.isAttachment || inputHasText
+                text = presentationInterfaceState.strings.MediaPicker_Send
+            }
+            actionButtonsSize = self.actionButtons.updateLayout(size: CGSize(width: 44.0, height: minimalHeight), transition: transition, minimized: isMinimized, text: text, interfaceState: presentationInterfaceState)
             textBackgroundInset = 44.0 - actionButtonsSize.width
         } else {
             actionButtonsSize = CGSize(width: 44.0, height: minimalHeight)

submodules/AttachmentUI/Sources/AttachmentController.swift

@@ -1141,7 +1141,7 @@ public class AttachmentController: ViewController, MinimizableController {
             }
 
             let isEffecitvelyCollapsedUpdated = (self.selectionCount > 0) != (self.panel.isSelecting)
-            let panelHeight = self.panel.update(layout: containerLayout, buttons: self.controller?.buttons ?? [], isSelecting: self.selectionCount > 0, elevateProgress: !hasPanel && !hasButton, transition: transition)
+            let panelHeight = self.panel.update(layout: containerLayout, buttons: self.controller?.buttons ?? [], isSelecting: self.selectionCount > 0, selectionCount: self.selectionCount, elevateProgress: !hasPanel && !hasButton, transition: transition)
             if hasPanel || hasButton {
                 containerInsets.bottom = panelHeight
             }