Merge commit '9e099d66124628ed33ed7ded87cd771e7e31adc2' into beta

Author: laktyushin

.claude/settings.local.json

@@ -0,0 +1,12 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(swift build)",
+      "Bash(.build/debug/makeproject:*)",
+      "Bash(mkdir:*)",
+      "Bash(find:*)",
+      "Bash(grep:*)"
+    ],
+    "deny": []
+  }
+}

MODULE.bazel.lock

@@ -14882,11 +14882,117 @@ Sorry for the inconvenience.";
 "Stories.ToastAddedToFolder_any" = "%@ stories added to folder.";
 "Stories.ToastAlbumNotAvailable" = "The album is no longer available.";
 
-
 "Gift.Options.Gift.Premium" = "premium";
 
 "Stars.Transaction.FragmentTopUpTon.Title" = "TON Top-Up";
 "Stars.Transaction.FragmentWithdrawalTon.Title" = "TON Withdrawal";
 
 "Stars.Transaction.SearchFee.Title" = "Extra Search Fee";
 "Stars.Intro.Transaction.SearchFee" = "Extra Search Fee";
+
+"PeerInfo.Gifts.Upgradable" = "Upgradable";
+
+"Gift.Upgrade.GiftTitle" = "Make Unique";
+"Gift.Upgrade.GiftDescription" = "Let %@ turn this gift into a unique collectible.";
+"Gift.Upgrade.Unique.GiftDescription" = "%@ will get a unique number, model, backdrop, and symbol for the gift.";
+"Gift.Upgrade.Transferable.GiftDescription" = "%@ will be able to send the gift to anyone Telegram.";
+"Gift.Upgrade.Tradable.GiftDescription" = "%@ will be able to auction the gift on third-party NFT marketplaces.";
+
+"Notification.StarGift.Subtitle.Upgrade.Prepaid" = "%@ can now turn this gift to a unique collectible";
+
+"Notification.StarsGift.SentUpgradeYou" = "You sent an upgrade worth %1$@ for your gift to %2$@";
+"Notification.StarsGift.SentUpgradeYouOther" = "You sent an upgrade worth %1$@ for the gift %2$@ received from %3$@";
+"Notification.StarsGift.SentUpgradeYouUnknown" = "You sent an upgrade worth %1$@ for the gift to %2$@";
+
+"Notification.StarsGift.SentUpgrade" = "%1$@ sent an upgrade worth %2$@ for your gift";
+"Notification.StarsGift.SentUpgradeOther" = "%1$@ sent an upgrade worth %2$@ for the gift you received from %3$@";
+
+"Notification.StarsGift.UpgradePrepaidYou" = "You unpacked the gift that %@ helped upgrade";
+"Notification.StarsGift.UpgradePrepaid" = "%@ unpacked the gift that you helped upgrade";
+
+"Gift.View.Unknown.Title" = "Gift";
+
+"Conversation.StopVoiceMessageTitle" = "Audio Recording";
+"Conversation.StopVoiceMessageDescription" = "Are you sure you want to pause recording?";
+"Conversation.StopVoiceMessageDiscardAction" = "Discard";
+"Conversation.StopVoiceMessagePauseAction" = "Pause";
+
+"Gift.Options.GiftLocked.Title" = "Gift Locked";
+
+"Gift.Unique.Value" = "Value";
+"Gift.Unique.LearnMore" = "learn more";
+
+"Gift.Upgrade.GiftUpgrade" = "Pay %@ for Upgrade";
+"Gift.View.GiftUpgrade" = "Gift an Upgrade";
+
+"Gift.View.OpenChatTheme" = "This gift is the chat's theme. [Change Theme >]()";
+
+"Notification.ChatTheme.Text" = "%1$@ set **%2$@** as a new theme for this chat.";
+"Notification.ChatTheme.TextYou" = "You set **%@** as a new theme for this chat.";
+
+"Notification.ChangedThemeGift" = "%1$@ changed chat theme to %2$@";
+"Notification.YouChangedThemeGift" = "You changed chat theme to %@";
+
+"Conversation.Theme.GiftTransfer.Text" = "This gift is already your theme in the chat with **%@**. Remove it there and use it here instead?";
+"Conversation.Theme.GiftTransfer.Proceed" = "Yes";
+
+"PeerInfo.Tabs.SetMainTab" = "Set as Main Tab";
+"PeerInfo.Tabs.SetMainTab.Succeed" = "Tab order changed.";
+
+"MediaPlayer.SavedMusic.AddToProfile" = "Add to Profile";
+"MediaPlayer.SavedMusic.RemoveFromProfile" = "This audio is visible on your profile. [Remove >]()";
+
+"MediaPlayer.SavedMusic.AddedToProfile.View" = "View";
+"MediaPlayer.SavedMusic.AddedToProfile" = "Audio added to your profile.";
+"MediaPlayer.SavedMusic.RemovedFromProfile" = "Audio removed from your profile.";
+
+"MediaPlayer.ContextMenu.SaveToFiles" = "Save to Files";
+"MediaPlayer.ContextMenu.SaveTo" = "Save to...";
+"MediaPlayer.ContextMenu.SaveTo.Profile" = "Profile";
+"MediaPlayer.ContextMenu.SaveTo.SavedMessages" = "Saved Messages";
+"MediaPlayer.ContextMenu.SaveTo.Files" = "Files";
+"MediaPlayer.ContextMenu.SaveTo.Info" = "Choose where you want this audio to be saved.";
+"MediaPlayer.ContextMenu.ShowInChat" = "Show in Chat";
+"MediaPlayer.ContextMenu.Forward" = "Forward";
+"MediaPlayer.ContextMenu.Delete" = "Delete";
+"MediaPlayer.ContextMenu.Remove" = "Remove";
+
+"MediaPlayer.Playlist.ThisChat" = "AUDIO IN THIS CHAT";
+"MediaPlayer.Playlist.SavedMusic" = "%@'S PLAYLIST";
+"MediaPlayer.Playlist.SavedMusicYou" = "YOUR PLAYLIST";
+
+"Notification.PremiumGift.Stars_1" = "%@ Star";
+"Notification.PremiumGift.Stars_any" = "%@ Stars";
+
+"Ton.ProceedsOverview" = "PROCEEDS OVERVIEW";
+"Ton.AvailableBalance" = "Balance Available to Withdraw";
+"Ton.LifetimeProceeds" = "Total Lifetime Proceeds";
+
+"Ton.WithdrawViaFragment" = "Withdraw via Fragment";
+"Ton.WithdrawViaFragment.Info" = "Collect your TON using Fragment. [Learn More >]()";
+"Ton.WithdrawViaFragment.Info_URL" = "https://telegram.org/tos/bot-developers#6-2-2-tpa-balance";
+
+"MESSAGE_GIFT_THEME" = "%1$@ changed theme to %2$@";
+
+"Gift.Upgrade.Skip" = "Skip";
+"Gift.Upgrade.UpgradeNext" = "Upgrade Next Gift";
+
+"Gift.Value.DescriptionAveragePrice" = "This is the average sale price of **%@** on Telegram and Fragment over the past month.";
+"Gift.Value.DescriptionLastPriceFragment" = "This is the last price at which **%@** was last sold on Fragment.";
+"Gift.Value.DescriptionLastPriceTelegram" = "This is the last price at which **%@** was last sold on Telegram.";
+
+"Gift.Value.LastPriceInfo" = "**%1$@** is the last price for %2$@ gifts listed on Telegram and Fragment.";
+"Gift.Value.MinimumPriceInfo" = "**%1$@** is the floor price for %2$@ gifts listed on Telegram and Fragment.";
+"Gift.Value.AveragePriceInfo" = "**%1$@** is the average sale price for %2$@ gifts listed on Telegram and Fragment over the past month.";
+
+"Gift.Value.AveragePrice" = "Last Sale";
+"Gift.Value.InitialSale" = "Initial Sale";
+"Gift.Value.InitialPrice" = "Initial Price";
+"Gift.Value.LastSale" = "Last Sale";
+"Gift.Value.LastPrice" = "Last Price";
+"Gift.Value.MinimumPrice" = "Minimum Price";
+"Gift.Value.AveragePrice" = "Average Price";
+"Gift.Value.ForSaleOnTelegram" = "for sale on Telegram";
+"Gift.Value.ForSaleOnFragment" = "for sale on Fragment";
+
+"Gift.View.Context.SetAsTheme" = "Set as Theme in...";

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

@@ -333,6 +333,7 @@ public enum ResolvedUrl {
     case shareStory(Int64)
     case storyFolder(peerId: PeerId, id: Int64)
     case giftCollection(peerId: PeerId, id: Int64)
+    case sendGift(peerId: PeerId?)
 }
 
 public enum ResolveUrlResult {
@@ -552,7 +553,42 @@ public final class NavigateToChatControllerParams {
     public let customChatNavigationStack: [EnginePeer.Id]?
     public let skipAgeVerification: Bool
 
-    public init(navigationController: NavigationController, chatController: ChatController? = nil, context: AccountContext, chatLocation: Location, chatLocationContextHolder: Atomic<ChatLocationContextHolder?> = Atomic<ChatLocationContextHolder?>(value: nil), subject: ChatControllerSubject? = nil, botStart: ChatControllerInitialBotStart? = nil, attachBotStart: ChatControllerInitialAttachBotStart? = nil, botAppStart: ChatControllerInitialBotAppStart? = nil, updateTextInputState: ChatTextInputState? = nil, activateInput: ChatControllerActivateInput? = nil, keepStack: NavigateToChatKeepStack = .default, useExisting: Bool = true, useBackAnimation: Bool = false, purposefulAction: (() -> Void)? = nil, scrollToEndIfExists: Bool = false, activateMessageSearch: (ChatSearchDomain, String)? = nil, peekData: ChatPeekTimeout? = nil, peerNearbyData: ChatPeerNearbyData? = nil, reportReason: NavigateToChatControllerParams.ReportReason? = nil, animated: Bool = true, forceAnimatedScroll: Bool = false, options: NavigationAnimationOptions = [], parentGroupId: PeerGroupId? = nil, chatListFilter: Int32? = nil, chatNavigationStack: [ChatNavigationStackItem] = [], changeColors: Bool = false, setupController: @escaping (ChatController) -> Void = { _ in }, pushController: ((ChatController, Bool, @escaping () -> Void) -> Void)? = nil, completion: @escaping (ChatController) -> Void = { _ in }, chatListCompletion: @escaping (ChatListController) -> Void = { _ in }, forceOpenChat: Bool = false, customChatNavigationStack: [EnginePeer.Id]? = nil, skipAgeVerification: Bool = false) {
+    public init(
+        navigationController: NavigationController,
+        chatController: ChatController? = nil,
+        context: AccountContext,
+        chatLocation: Location,
+        chatLocationContextHolder: Atomic<ChatLocationContextHolder?> = Atomic<ChatLocationContextHolder?>(value: nil),
+        subject: ChatControllerSubject? = nil,
+        botStart: ChatControllerInitialBotStart? = nil,
+        attachBotStart: ChatControllerInitialAttachBotStart? = nil,
+        botAppStart: ChatControllerInitialBotAppStart? = nil,
+        updateTextInputState: ChatTextInputState? = nil,
+        activateInput: ChatControllerActivateInput? = nil,
+        keepStack: NavigateToChatKeepStack = .default,
+        useExisting: Bool = true,
+        useBackAnimation: Bool = false,
+        purposefulAction: (() -> Void)? = nil,
+        scrollToEndIfExists: Bool = false,
+        activateMessageSearch: (ChatSearchDomain, String)? = nil,
+        peekData: ChatPeekTimeout? = nil,
+        peerNearbyData: ChatPeerNearbyData? = nil,
+        reportReason: NavigateToChatControllerParams.ReportReason? = nil,
+        animated: Bool = true,
+        forceAnimatedScroll: Bool = false,
+        options: NavigationAnimationOptions = [],
+        parentGroupId: PeerGroupId? = nil,
+        chatListFilter: Int32? = nil,
+        chatNavigationStack: [ChatNavigationStackItem] = [],
+        changeColors: Bool = false,
+        setupController: @escaping (ChatController) -> Void = { _ in },
+        pushController: ((ChatController, Bool, @escaping () -> Void) -> Void)? = nil,
+        completion: @escaping (ChatController) -> Void = { _ in },
+        chatListCompletion: @escaping (ChatListController) -> Void = { _ in },
+        forceOpenChat: Bool = false,
+        customChatNavigationStack: [EnginePeer.Id]? = nil,
+        skipAgeVerification: Bool = false
+    ) {
         self.navigationController = navigationController
         self.chatController = chatController
         self.chatLocationContextHolder = chatLocationContextHolder
@@ -1290,7 +1326,7 @@ public protocol SharedAccountContext: AnyObject {
     func makeStarsGiveawayBoostScreen(context: AccountContext, peerId: EnginePeer.Id, boost: ChannelBoostersContext.State.Boost) -> ViewController
     func makeStarsIntroScreen(context: AccountContext) -> ViewController
     func makeGiftViewScreen(context: AccountContext, message: EngineMessage, shareStory: ((StarGift.UniqueGift) -> Void)?) -> ViewController
-    func makeGiftViewScreen(context: AccountContext, gift: StarGift.UniqueGift, shareStory: ((StarGift.UniqueGift) -> Void)?, dismissed: (() -> Void)?) -> ViewController
+    func makeGiftViewScreen(context: AccountContext, gift: StarGift.UniqueGift, shareStory: ((StarGift.UniqueGift) -> Void)?, openChatTheme: (() -> Void)?, dismissed: (() -> Void)?) -> ViewController
     func makeGiftWearPreviewScreen(context: AccountContext, gift: StarGift.UniqueGift) -> ViewController
 
     func makeStorySharingScreen(context: AccountContext, subject: StorySharingSubject, parentController: ViewController) -> ViewController

submodules/AccountContext/Sources/AccountContext.swift

@@ -800,6 +800,7 @@ public enum ChatControllerSubject: Equatable {
     case pinnedMessages(id: EngineMessage.Id?)
     case messageOptions(peerIds: [EnginePeer.Id], ids: [EngineMessage.Id], info: MessageOptionsInfo)
     case customChatContents(contents: ChatCustomContentsProtocol)
+    case botForumThread(forumId: EnginePeer.Id, threadId: Int64)
 
     public static func ==(lhs: ChatControllerSubject, rhs: ChatControllerSubject) -> Bool {
         switch lhs {
@@ -833,6 +834,12 @@ public enum ChatControllerSubject: Equatable {
             } else {
                 return false
             }
+        case let .botForumThread(forumId, threadId):
+            if case .botForumThread(forumId, threadId) = rhs {
+                return true
+            } else {
+                return false
+            }
         }
     }
 
@@ -1172,7 +1179,7 @@ public enum ChatHistoryListSource {
     }
 
     case `default`
-    case custom(messages: Signal<([Message], Int32, Bool), NoError>, messageId: MessageId?, quote: Quote?, loadMore: (() -> Void)?)
+    case custom(messages: Signal<([Message], Int32, Bool), NoError>, messageId: MessageId?, quote: Quote?, isSavedMusic: Bool, canReorder: Bool, loadMore: (() -> Void)?)
     case customView(historyView: Signal<(MessageHistoryView, ViewUpdateType), NoError>)
 }
 

submodules/AccountContext/Sources/ChatController.swift

@@ -12,6 +12,7 @@ public enum PeerMessagesMediaPlaylistId: Equatable, SharedMediaPlaylistId {
     case peer(PeerId)
     case recentActions(PeerId)
     case feed(Int32)
+    case savedMusic(PeerId)
     case custom
 
     public func isEqual(to: SharedMediaPlaylistId) -> Bool {
@@ -26,7 +27,8 @@ public enum PeerMessagesPlaylistLocation: Equatable, SharedMediaPlaylistLocation
     case messages(chatLocation: ChatLocation, tagMask: MessageTags, at: MessageId)
     case singleMessage(MessageId)
     case recentActions(Message)
-    case custom(messages: Signal<([Message], Int32, Bool), NoError>, at: MessageId, loadMore: (() -> Void)?)
+    case savedMusic(context: ProfileSavedMusicContext, at: Int32, canReorder: Bool)
+    case custom(messages: Signal<([Message], Int32, Bool), NoError>, canReorder: Bool, at: MessageId, loadMore: (() -> Void)?)
 
     public var playlistId: PeerMessagesMediaPlaylistId {
         switch self {
@@ -43,14 +45,55 @@ public enum PeerMessagesPlaylistLocation: Equatable, SharedMediaPlaylistLocation
                 return .peer(id.peerId)
             case let .recentActions(message):
                 return .recentActions(message.id.peerId)
+            case let .savedMusic(context, _, _):
+                return .savedMusic(context.peerId)
             case .custom:
                 return .custom
         }
     }
 
+    public func effectiveLocation(context: AccountContext) -> PeerMessagesPlaylistLocation {
+        switch self {
+        case let .savedMusic(savedMusicContext, at, canReorder):
+            let peerId = savedMusicContext.peerId
+            return .custom(
+                messages: combineLatest(
+                    savedMusicContext.state,
+                    context.engine.data.get(TelegramEngine.EngineData.Item.Peer.Peer(id: savedMusicContext.peerId))
+                )
+                |> map { state, peer in
+                    var messages: [Message] = []
+                    var peers = SimpleDictionary<PeerId, Peer>()
+                    if let peer {
+                        peers[peerId] = peer._asPeer()
+                    }
+                    for file in state.files {
+                        let stableId = UInt32(clamping: file.fileId.id % Int64(Int32.max))
+                        messages.append(Message(stableId: stableId, stableVersion: 0, id: MessageId(peerId: peerId, namespace: Namespaces.Message.Local, id: Int32(stableId)), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 0, flags: [], tags: [.music], globalTags: [], localTags: [], customTags: [], forwardInfo: nil, author: nil, text: "", attributes: [], media: [file], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: [], associatedMedia: [:], associatedThreadInfo: nil, associatedStories: [:]))
+                    }
+                    var canLoadMore = false
+                    if case let .ready(canLoadMoreValue) = state.dataState {
+                        canLoadMore = canLoadMoreValue
+                    }
+                    return (messages, Int32(messages.count), canLoadMore)
+                },
+                canReorder: canReorder,
+                at: MessageId(peerId: peerId, namespace: Namespaces.Message.Local, id: at),
+                loadMore: { [weak savedMusicContext] in
+                    guard let savedMusicContext else {
+                        return
+                    }
+                    savedMusicContext.loadMore()
+                }
+            )
+        default:
+            return self
+        }
+    }
+    
     public var messageId: MessageId? {
         switch self {
-            case let .messages(_, _, messageId), let .singleMessage(messageId), let .custom(_, messageId, _):
+            case let .messages(_, _, messageId), let .singleMessage(messageId), let .custom(_, _, messageId, _):
                 return messageId
             default:
                 return nil
@@ -85,8 +128,14 @@ public enum PeerMessagesPlaylistLocation: Equatable, SharedMediaPlaylistLocation
                 } else {
                     return false
                 }
-            case let .custom(_, lhsAt, _):
-                if case let .custom(_, rhsAt, _) = rhs, lhsAt == rhsAt {
+            case let .savedMusic(lhsContext, lhsAt, _):
+                if case let .savedMusic(rhsContext, rhsAt, _) = rhs {
+                    return lhsContext.peerId == rhsContext.peerId && lhsAt == rhsAt
+                } else {
+                    return false
+                }
+            case let .custom(_, _, lhsAt, _):
+                if case let .custom(_, _, rhsAt, _) = rhs, lhsAt == rhsAt {
                     return true
                 } else {
                     return false
@@ -120,8 +169,10 @@ public func peerMessageMediaPlayerType(_ message: EngineMessage) -> MediaManager
     return nil
 }
 
-public func peerMessagesMediaPlaylistAndItemId(_ message: EngineMessage, isRecentActions: Bool, isGlobalSearch: Bool, isDownloadList: Bool) -> (SharedMediaPlaylistId, SharedMediaPlaylistItemId)? {
-    if isGlobalSearch && !isDownloadList {
+public func peerMessagesMediaPlaylistAndItemId(_ message: EngineMessage, isRecentActions: Bool, isGlobalSearch: Bool, isDownloadList: Bool, isSavedMusic: Bool) -> (SharedMediaPlaylistId, SharedMediaPlaylistItemId)? {
+    if isSavedMusic {
+        return (PeerMessagesMediaPlaylistId.savedMusic(message.id.peerId), PeerMessagesMediaPlaylistItemId(messageId: message.id, messageIndex: message.index))
+    } else if isGlobalSearch && !isDownloadList {
         return (PeerMessagesMediaPlaylistId.custom, PeerMessagesMediaPlaylistItemId(messageId: message.id, messageIndex: message.index))
     } else if isRecentActions && !isDownloadList {
         return (PeerMessagesMediaPlaylistId.recentActions(message.id.peerId), PeerMessagesMediaPlaylistItemId(messageId: message.id, messageIndex: message.index))

submodules/AccountContext/Sources/MediaManager.swift

@@ -911,7 +911,7 @@ - (void)_assertSubnodeState
   NSArray<ASLayout *> *sublayouts = _calculatedDisplayNodeLayout.layout.sublayouts;
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 180400
 #pragma clang diagnostic push
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 260000
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 180500
 #pragma clang diagnostic ignored "-Wvla-cxx-extension"
 #endif
 #endif
@@ -938,7 +938,7 @@ - (void)_assertSubnodeState
 
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 180400
 #pragma clang diagnostic push
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 260000
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 180500
 #pragma clang diagnostic ignored "-Wvla-cxx-extension"
 #endif
 #endif

submodules/AsyncDisplayKit/Source/ASDisplayNode+Layout.mm

@@ -34,7 +34,7 @@
 
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 180400
 #pragma clang diagnostic push
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 260000
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 180500
 #pragma clang diagnostic ignored "-Wvla-cxx-extension"
 #endif
 #endif