Various fixes

Author: laktyushin

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

@@ -14290,3 +14290,6 @@ Sorry for the inconvenience.";
 "MediaPicker.CreateStory_1" = "Create %@ Story";
 "MediaPicker.CreateStory_any" = "Create %@ Stories";
 "MediaPicker.CombineIntoCollage" = "Combine into Collage";
+
+"Gift.Resale.Unavailable.Title" = "Resell Gift";
+"Gift.Resale.Unavailable.Text" = "Sorry, you can't list this gift yet.\n\Reselling will be available on %@.";

submodules/MediaPickerUI/Sources/MediaPickerScreen.swift

@@ -2004,7 +2004,7 @@ public final class MediaPickerScreenImpl: ViewController, MediaPickerScreen, Att
                 var hasSelect = false
                 if forCollage {
                     hasSelect = true
-                } else if case .story = mode {
+                } else if case .story = mode, selectionContext.selectionLimit > 1 {
                     hasSelect = true
                 }
 
@@ -3402,7 +3402,7 @@ public func stickerMediaPickerController(
                         destinationCornerRadius: 0.0
                     )
                 },
-                completion: { result, _, commit in
+                completion: { result, _, _, commit in
                     completion(result, nil, .zero, nil, true, { _ in return nil }, {
                         returnToCameraImpl?()
                     })
@@ -3520,7 +3520,7 @@ public func avatarMediaPickerController(
                         destinationCornerRadius: 0.0
                     )
                 },
-                completion: { result, _, commit in
+                completion: { result, _, _, commit in
                     completion(result, nil, .zero, nil, true, { _ in return nil }, {
                         returnToCameraImpl?()
                     })

submodules/TelegramUI/Components/CameraScreen/Sources/CameraScreen.swift

@@ -1959,6 +1959,7 @@ public class CameraScreenImpl: ViewController, CameraScreen {
                                         }
                                     },
                                     nil,
+                                    1,
                                     {}
                                 )
                             } else {
@@ -1995,6 +1996,7 @@ public class CameraScreenImpl: ViewController, CameraScreen {
                                 }
                             },
                             nil,
+                            self.controller?.remainingStoryCount,
                             {}
                         )
                     }
@@ -3374,14 +3376,15 @@ public class CameraScreenImpl: ViewController, CameraScreen {
             self.transitionOut = transitionOut
         }
     }
-    fileprivate let completion: (Signal<CameraScreenImpl.Result, NoError>, ResultTransition?, @escaping () -> Void) -> Void
+    fileprivate let completion: (Signal<CameraScreenImpl.Result, NoError>, ResultTransition?, Int32?, @escaping () -> Void) -> Void
     public var transitionedIn: () -> Void = {}
     public var transitionedOut: () -> Void = {}
 
     private var audioSessionDisposable: Disposable?
 
     private let postingAvailabilityPromise = Promise<StoriesUploadAvailability>()
     private var postingAvailabilityDisposable: Disposable?
+    private var remainingStoryCount: Int32?
 
     private var codeDisposable: Disposable?
     private var resolveCodeDisposable: Disposable?
@@ -3419,7 +3422,7 @@ public class CameraScreenImpl: ViewController, CameraScreen {
         holder: CameraHolder? = nil,
         transitionIn: TransitionIn?,
         transitionOut: @escaping (Bool) -> TransitionOut?,
-        completion: @escaping (Signal<CameraScreenImpl.Result, NoError>, ResultTransition?, @escaping () -> Void) -> Void
+        completion: @escaping (Signal<CameraScreenImpl.Result, NoError>, ResultTransition?, Int32?, @escaping () -> Void) -> Void
     ) {
         self.context = context
         self.mode = mode
@@ -3473,7 +3476,7 @@ public class CameraScreenImpl: ViewController, CameraScreen {
                     return
                 }
                 if case let .available(remainingCount) = availability {
-                    let _ = remainingCount
+                    self.remainingStoryCount = remainingCount
                     return
                 }
                 self.node.postingAvailable = false
@@ -3639,7 +3642,11 @@ public class CameraScreenImpl: ViewController, CameraScreen {
                 if self.cameraState.isCollageEnabled {
                     selectionLimit = 6
                 } else {
-                    selectionLimit = 10
+                    if let remainingStoryCount = self.remainingStoryCount {
+                        selectionLimit = min(Int(remainingStoryCount), 10)
+                    } else {
+                        selectionLimit = 10
+                    }
                 }
             }
             controller = self.context.sharedContext.makeStoryMediaPickerScreen(
@@ -3704,10 +3711,10 @@ public class CameraScreenImpl: ViewController, CameraScreen {
                                     )
                                     self.present(alertController, in: .window(.root))
                                 } else {
-                                    self.completion(.single(.asset(asset)), resultTransition, dismissed)
+                                    self.completion(.single(.asset(asset)), resultTransition, self.remainingStoryCount, dismissed)
                                 }
                             } else if let draft = result as? MediaEditorDraft {
-                                self.completion(.single(.draft(draft)), resultTransition, dismissed)
+                                self.completion(.single(.draft(draft)), resultTransition, self.remainingStoryCount, dismissed)
                             }
                         }
                     }
@@ -3753,7 +3760,7 @@ public class CameraScreenImpl: ViewController, CameraScreen {
                         }
                     } else {
                         if let assets = results as? [PHAsset] {
-                            self.completion(.single(.assets(assets)), nil, {
+                            self.completion(.single(.assets(assets)), nil, self.remainingStoryCount, {
 
                             })
                         }

submodules/TelegramUI/Components/Gifts/GiftStoreScreen/Sources/GiftStoreScreen.swift

@@ -338,8 +338,6 @@ final class GiftStoreScreenComponent: Component {
             )
 
             if let effectiveGifts = self.effectiveGifts, effectiveGifts.isEmpty && self.state?.starGiftsState?.dataState != .loading {
-                showClearFilters = true
-                
                 let emptyAnimationHeight = 148.0
                 let visibleHeight = availableHeight
                 let emptyAnimationSpacing: CGFloat = 20.0

submodules/TelegramUI/Components/Gifts/GiftViewScreen/Sources/GiftViewScreen.swift

@@ -2820,7 +2820,7 @@ public class GiftViewScreen: ViewControllerComponentContainer {
         case upgradePreview([StarGift.UniqueGift.Attribute], String)
         case wearPreview(StarGift.UniqueGift)
 
-        var arguments: (peerId: EnginePeer.Id?, fromPeerId: EnginePeer.Id?, fromPeerName: String?, messageId: EngineMessage.Id?, reference: StarGiftReference?, incoming: Bool, gift: StarGift, date: Int32, convertStars: Int64?, text: String?, entities: [MessageTextEntity]?, nameHidden: Bool, savedToProfile: Bool, pinnedToTop: Bool?, converted: Bool, upgraded: Bool, refunded: Bool, canUpgrade: Bool, upgradeStars: Int64?, transferStars: Int64?, resellStars: Int64?, canExportDate: Int32?, upgradeMessageId: Int32?)? {
+        var arguments: (peerId: EnginePeer.Id?, fromPeerId: EnginePeer.Id?, fromPeerName: String?, messageId: EngineMessage.Id?, reference: StarGiftReference?, incoming: Bool, gift: StarGift, date: Int32, convertStars: Int64?, text: String?, entities: [MessageTextEntity]?, nameHidden: Bool, savedToProfile: Bool, pinnedToTop: Bool?, converted: Bool, upgraded: Bool, refunded: Bool, canUpgrade: Bool, upgradeStars: Int64?, transferStars: Int64?, resellStars: Int64?, canExportDate: Int32?, upgradeMessageId: Int32?, canTransferDate: Int32?, canResaleDate: Int32?)? {
             switch self {
             case let .message(message):
                 if let action = message.media.first(where: { $0 is TelegramMediaAction }) as? TelegramMediaAction {
@@ -2832,8 +2832,8 @@ public class GiftViewScreen: ViewControllerComponentContainer {
                         } else {
                             reference = .message(messageId: message.id)
                         }
-                        return (message.id.peerId, senderId ?? message.author?.id, message.author?.compactDisplayTitle, message.id, reference, message.flags.contains(.Incoming), gift, message.timestamp, convertStars, text, entities, nameHidden, savedToProfile, nil, converted, upgraded, isRefunded, canUpgrade, upgradeStars, nil, nil, nil, upgradeMessageId)
-                    case let .starGiftUnique(gift, isUpgrade, isTransferred, savedToProfile, canExportDate, transferStars, _, peerId, senderId, savedId, _, _, _):
+                        return (message.id.peerId, senderId ?? message.author?.id, message.author?.compactDisplayTitle, message.id, reference, message.flags.contains(.Incoming), gift, message.timestamp, convertStars, text, entities, nameHidden, savedToProfile, nil, converted, upgraded, isRefunded, canUpgrade, upgradeStars, nil, nil, nil, upgradeMessageId, nil, nil)
+                    case let .starGiftUnique(gift, isUpgrade, isTransferred, savedToProfile, canExportDate, transferStars, _, peerId, senderId, savedId, _, canTransferDate, canResaleDate):
                         var reference: StarGiftReference
                         if let peerId, let savedId {
                             reference = .peer(peerId: peerId, id: savedId)
@@ -2857,13 +2857,13 @@ public class GiftViewScreen: ViewControllerComponentContainer {
                         if case let .unique(uniqueGift) = gift {
                             resellStars = uniqueGift.resellStars
                         }
-                        return (message.id.peerId, senderId ?? message.author?.id, message.author?.compactDisplayTitle, message.id, reference, incoming, gift, message.timestamp, nil, nil, nil, false, savedToProfile, nil, false, false, false, false, nil, transferStars, resellStars, canExportDate, nil)
+                        return (message.id.peerId, senderId ?? message.author?.id, message.author?.compactDisplayTitle, message.id, reference, incoming, gift, message.timestamp, nil, nil, nil, false, savedToProfile, nil, false, false, false, false, nil, transferStars, resellStars, canExportDate, nil, canTransferDate, canResaleDate)
                     default:
                         return nil
                     }
                 }
             case let .uniqueGift(gift, _), let .wearPreview(gift):
-                return (nil, nil, nil, nil, nil, false, .unique(gift), 0, nil, nil, nil, false, false, nil, false, false, false, false, nil, nil, gift.resellStars, nil, nil)
+                return (nil, nil, nil, nil, nil, false, .unique(gift), 0, nil, nil, nil, false, false, nil, false, false, false, false, nil, nil, gift.resellStars, nil, nil, nil, nil)
             case let .profileGift(peerId, gift):
                 var messageId: EngineMessage.Id?
                 if case let .message(messageIdValue) = gift.reference {
@@ -2873,7 +2873,7 @@ public class GiftViewScreen: ViewControllerComponentContainer {
                 if case let .unique(uniqueGift) = gift.gift {
                     resellStars = uniqueGift.resellStars
                 }
-                return (peerId, gift.fromPeer?.id, gift.fromPeer?.compactDisplayTitle, messageId, gift.reference, false, gift.gift, gift.date, gift.convertStars, gift.text, gift.entities, gift.nameHidden, gift.savedToProfile, gift.pinnedToTop, false, false, false, gift.canUpgrade, gift.upgradeStars, gift.transferStars, resellStars, gift.canExportDate, nil)
+                return (peerId, gift.fromPeer?.id, gift.fromPeer?.compactDisplayTitle, messageId, gift.reference, false, gift.gift, gift.date, gift.convertStars, gift.text, gift.entities, gift.nameHidden, gift.savedToProfile, gift.pinnedToTop, false, false, false, gift.canUpgrade, gift.upgradeStars, gift.transferStars, resellStars, gift.canExportDate, nil, gift.canTransferDate, gift.canResaleDate)
             case .soldOutGift:
                 return nil
             case .upgradePreview:
@@ -3400,6 +3400,22 @@ public class GiftViewScreen: ViewControllerComponentContainer {
 
             self.dismissAllTooltips()
 
+            let currentTime = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970)
+            if let canResaleDate = arguments.canResaleDate, currentTime < canResaleDate {
+                let dateString = stringForFullDate(timestamp: canResaleDate, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat)
+                let controller = textAlertController(
+                    context: self.context,
+                    title: presentationData.strings.Gift_Resale_Unavailable_Title,
+                    text: presentationData.strings.Gift_Resale_Unavailable_Text(dateString).string,
+                    actions: [
+                        TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})
+                    ],
+                    parseMarkdown: true
+                )
+                self.present(controller, in: .window(.root))
+                return
+            }
+            
             let presentationData = context.sharedContext.currentPresentationData.with { $0 }
             let giftTitle = "\(gift.title) #\(presentationStringsFormattedNumber(gift.number, presentationData.dateTimeFormat.groupingSeparator))"
             let reference = arguments.reference ?? .slug(slug: gift.slug)
@@ -3582,7 +3598,7 @@ public class GiftViewScreen: ViewControllerComponentContainer {
 
                 if case let .unique(gift) = arguments.gift, let resellStars = gift.resellStars, resellStars > 0 {
                     items.append(.action(ContextMenuActionItem(text: presentationData.strings.Gift_View_Context_ChangePrice, icon: { theme in
-                        return generateTintedImage(image: UIImage(bundleImageName: "Media Grid/Paid"), color: theme.contextMenu.primaryColor)
+                        return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/PriceTag"), color: theme.contextMenu.primaryColor)
                     }, action: { c, _ in
                         c?.dismiss(completion: nil)
 

submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditor.swift

@@ -988,6 +988,8 @@ public final class MediaEditor {
                     if let trimRange = self.values.videoTrimRange {
                         player.currentItem?.forwardPlaybackEndTime = CMTime(seconds: trimRange.upperBound, preferredTimescale: CMTimeScale(1000))
 //                        additionalPlayer?.currentItem?.forwardPlaybackEndTime = CMTime(seconds: trimRange.upperBound, preferredTimescale: CMTimeScale(1000))
+                    } else if let duration = player.currentItem?.duration.seconds, duration > self.maxDuration {
+                        player.currentItem?.forwardPlaybackEndTime = CMTime(seconds: self.maxDuration, preferredTimescale: CMTimeScale(1000))
                     }
 
                     if let initialSeekPosition = self.initialSeekPosition {

submodules/TelegramUI/Components/MediaEditorScreen/Sources/EditStories.swift

@@ -97,7 +97,7 @@ public extension MediaEditorScreenImpl {
         var updateProgressImpl: ((Float) -> Void)?
         let controller = MediaEditorScreenImpl(
             context: context,
-            mode: .storyEditor,
+            mode: .storyEditor(remainingCount: 1),
             subject: subject,
             isEditing: !repost,
             isEditingCover: cover,