From d5139b63635772dedf082af08bb46429e16b0717 Mon Sep 17 00:00:00 2001
From: Ilya Laktyushin <ilya@laktyush.in>
Date: Thu, 24 Apr 2025 15:06:21 +0400
Subject: [PATCH] Various fixes

---
 .../Sources/MediaEditorScreen.swift           | 34 ++++++++++++++++---
 .../Sources/MediaScrubberComponent.swift      |  2 +-
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift
index 418b8257c4..0af513e356 100644
--- a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift
+++ b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift
@@ -2021,8 +2021,12 @@ final class MediaEditorScreenComponent: Component {
                         if case .avatarEditor = controller.mode {
                             maxDuration = 9.9
                         } else {
-                            maxDuration = storyMaxCombinedVideoDuration
-                            segmentDuration = storyMaxVideoDuration
+                            if controller.node.items.count > 0 {
+                                maxDuration = storyMaxVideoDuration
+                            } else {
+                                maxDuration = storyMaxCombinedVideoDuration
+                                segmentDuration = storyMaxVideoDuration
+                            }
                         }
                     }
                     
@@ -3506,7 +3510,10 @@ public final class MediaEditorScreenImpl: ViewController, MediaEditorScreen, UID
                 values: initialValues,
                 hasHistogram: true
             )
-            mediaEditor.maxDuration = storyMaxCombinedVideoDuration
+            if case .storyEditor = controller.mode, self.items.isEmpty {
+                mediaEditor.maxDuration = storyMaxCombinedVideoDuration
+            }
+            
             if case .avatarEditor = controller.mode {
                 mediaEditor.setVideoIsMuted(true)
             } else if case let .coverEditor(dimensions) = controller.mode {
@@ -6801,9 +6808,26 @@ public final class MediaEditorScreenImpl: ViewController, MediaEditorScreen, UID
             coverImage = nil
         }
         
+        var storyCount: Int32 = 0
+        if self.node.items.count > 0 {
+            storyCount = Int32(self.node.items.count(where: { $0.isEnabled }))
+        } else {
+            if case let .asset(asset) = self.node.subject {
+                let duration: Double
+                if let playerDuration = mediaEditor.duration {
+                    duration = playerDuration
+                } else {
+                    duration = asset.duration
+                }
+                if duration > storyMaxVideoDuration {
+                    storyCount = Int32(min(storyMaxCombinedVideoCount, Int(ceil(duration / storyMaxVideoDuration))))
+                }
+            }
+        }
+        
         let stateContext = ShareWithPeersScreen.StateContext(
             context: self.context,
-            subject: .stories(editing: false, count: Int32(self.node.items.count(where: { $0.isEnabled }))),
+            subject: .stories(editing: false, count: storyCount),
             editing: false,
             initialPeerIds: Set(privacy.privacy.additionallyIncludePeers),
             closeFriends: self.closeFriends.get(),
@@ -8151,7 +8175,7 @@ public final class MediaEditorScreenImpl: ViewController, MediaEditorScreen, UID
                 
                 let storyCount = min(storyMaxCombinedVideoCount, Int(ceil(duration / storyMaxVideoDuration)))
                 var start = values.videoTrimRange?.lowerBound ?? 0
-                for _ in 0 ..< storyCount {
+                for i in 0 ..< storyCount {
                     let trimmedValues = values.withUpdatedVideoTrimRange(start ..< min(start + storyMaxVideoDuration, originalDuration))
                     
                     var editingItem = EditingItem(asset: asset)
diff --git a/submodules/TelegramUI/Components/MediaScrubberComponent/Sources/MediaScrubberComponent.swift b/submodules/TelegramUI/Components/MediaScrubberComponent/Sources/MediaScrubberComponent.swift
index f7847fee37..7793a3f9ff 100644
--- a/submodules/TelegramUI/Components/MediaScrubberComponent/Sources/MediaScrubberComponent.swift
+++ b/submodules/TelegramUI/Components/MediaScrubberComponent/Sources/MediaScrubberComponent.swift
@@ -1510,7 +1510,7 @@ private class TrackView: UIView, UIScrollViewDelegate, UIGestureRecognizerDelega
         
         var validIds = Set<Int32>()
         var segmentFrame = CGRect(x: segmentOrigin + segmentWidth, y: 0.0, width: 1.0, height: containerFrame.size.height)
-        for i in 0 ..< segmentCount {
+        for i in 0 ..< min(segmentCount, 2) {
             let id = Int32(i)
             validIds.insert(id)