From 4235e327fce5401eee8a4d28b6792fa22f951e1c Mon Sep 17 00:00:00 2001
From: chrisk325 <singaracemas@gmail.com>
Date: Thu, 1 Jan 2026 15:45:49 +0530
Subject: [PATCH] fixes trakt up next

---
 src/hooks/useWatchProgress.ts | 68 +++++++++++++++++++++++++----------
 1 file changed, 49 insertions(+), 19 deletions(-)

diff --git a/src/hooks/useWatchProgress.ts b/src/hooks/useWatchProgress.ts
index daa9e8fd..453e154e 100644
--- a/src/hooks/useWatchProgress.ts
+++ b/src/hooks/useWatchProgress.ts
@@ -108,30 +108,60 @@ export const useWatchProgress = (
               setWatchProgress(null);
             }
           } else {
-            // FIXED: Find the most recently watched episode instead of first unfinished
-            // Sort by lastUpdated timestamp (most recent first)
-            const sortedProgresses = seriesProgresses.sort((a, b) =>
-              b.progress.lastUpdated - a.progress.lastUpdated
-            );
-
-            if (sortedProgresses.length > 0) {
-              // Use the most recently watched episode
-              const mostRecentProgress = sortedProgresses[0];
-              const progress = mostRecentProgress.progress;
-
-              // Removed excessive logging for most recent progress
-
+            const COMPLETION_THRESHOLD = 85;
+            const incompleteProgresses = seriesProgresses.filter(({ progress }) => {
+              const progressPercent = (progress.currentTime / progress.duration) * 100;
+              return progressPercent < COMPLETION_THRESHOLD;
+            });
+            if (incompleteProgresses.length > 0) {
+              const sortedIncomplete = incompleteProgresses.sort((a, b) =>
+                b.progress.lastUpdated - a.progress.lastUpdated
+              );
+              const mostRecentIncomplete = sortedIncomplete[0];
               setWatchProgress({
-                ...progress,
-                episodeId: mostRecentProgress.episodeId,
-                traktSynced: progress.traktSynced,
-                traktProgress: progress.traktProgress
+                ...mostRecentIncomplete.progress,
+                episodeId: mostRecentIncomplete.episodeId,
+                traktSynced: mostRecentIncomplete.progress.traktSynced,
+                traktProgress: mostRecentIncomplete.progress.traktProgress
               });
+            } else if (seriesProgresses.length > 0) {
+              const watchedEpisodeNumbers = seriesProgresses
+              .map(({ episodeId }) => getEpisodeNumber(episodeId))
+              .filter(Boolean)
+              .sort((a, b) => {
+                if (a!.season !== b!.season) return a!.season - b!.season;
+                return a!.episode - b!.episode;
+              });
+            if (watchedEpisodeNumbers.length > 0) {
+              const lastWatched = watchedEpisodeNumbers[watchedEpisodeNumbers.length - 1]!;
+              const currentEpisodes = episodesRef.current;
+              
+              const nextEpisode = currentEpisodes.find(ep => {
+                if (ep.season_number > lastWatched.season) return true;
+                if (ep.season_number === lastWatched.season && ep.episode_number > lastWatched.episode) return true;
+                return false;
+              });
+
+              if (nextEpisode) {
+                setWatchProgress({
+                  currentTime: 0,
+                  duration: nextEpisode.runtime * 60 || 0,
+                  lastUpdated: Date.now(),
+                  episodeId: `${id}:${nextEpisode.season_number}:${nextEpisode.episode_number}`,
+                  traktSynced: false,
+                  traktProgress: 0
+                });
+              } else {
+                setWatchProgress(null);
+              }
             } else {
-              // No watched episodes found
               setWatchProgress(null);
             }
+          } else {
+            setWatchProgress(null);
           }
+        }
+        
         } else {
           // For movies
           const progress = await storageService.getWatchProgress(id, type, episodeId);
@@ -224,4 +254,4 @@ export const useWatchProgress = (
     getPlayButtonText,
     loadWatchProgress
   };
-};
\ No newline at end of file
+};