From a6b66667f1b9edbb299e496932690c2e364a7d3d Mon Sep 17 00:00:00 2001
From: Lachezar Lechev <lachezar@ambire.com>
Date: Thu, 16 May 2024 19:38:34 +0300
Subject: [PATCH 01/27] feat(player): add seek action and handle seeking player
 state w/ debug statements

Signed-off-by: Lachezar Lechev <lachezar@ambire.com>
---
 src/routes/Player/Player.js      | 28 ++++++++++++++++++++++++++--
 src/routes/Player/usePlayer.d.ts |  2 +-
 src/routes/Player/usePlayer.js   | 15 ++++++++++++++-
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index 0a2efef8a..3ad5dfea2 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -34,7 +34,7 @@ const Player = ({ urlParams, queryParams }) => {
         return queryParams.has('forceTranscoding');
     }, [queryParams]);
 
-    const [player, videoParamsChanged, timeChanged, pausedChanged, ended, nextVideo] = usePlayer(urlParams);
+    const [player, videoParamsChanged, timeChanged, seek, pausedChanged, ended, nextVideo] = usePlayer(urlParams);
     const [settings, updateSettings] = useSettings();
     const streamingServer = useStreamingServer();
     const statistics = useStatistics(player, streamingServer);
@@ -42,6 +42,8 @@ const Player = ({ urlParams, queryParams }) => {
     const routeFocused = useRouteFocused();
     const toast = useToast();
 
+    const [seeking, setSeeking] = React.useState(false);
+
     const [casting, setCasting] = React.useState(() => {
         return chromecast.active && chromecast.transport.getCastState() === cast.framework.CastState.CONNECTED;
     });
@@ -136,6 +138,8 @@ const Player = ({ urlParams, queryParams }) => {
 
     const onPlayRequested = React.useCallback(() => {
         video.setProp('paused', false);
+        setSeeking(false);
+        console.log(`setSeeking to (PlayRequested - Space): false`);
     }, []);
 
     const onPlayRequestedDebounced = React.useCallback(debounce(onPlayRequested, 200), []);
@@ -159,6 +163,9 @@ const Player = ({ urlParams, queryParams }) => {
 
     const onSeekRequested = React.useCallback((time) => {
         video.setProp('time', time);
+
+        setSeeking(true);
+        console.log(`setSeeking to (SeekRequested): true`);
     }, []);
 
     const onPlaybackSpeedChanged = React.useCallback((rate) => {
@@ -341,11 +348,24 @@ const Player = ({ urlParams, queryParams }) => {
         video.setProp('extraSubtitlesOutlineColor', settings.subtitlesOutlineColor);
     }, [settings.subtitlesOutlineColor]);
 
+    React.useEffect(() => {
+        if (seeking && video.state.buffered) {
+            console.log(`setSeeking to (on !video.state.buffering): false`);
+            setSeeking(false);
+        }
+    }, [video.state.buffering]);
+
     React.useEffect(() => {
         if (video.state.time !== null && !isNaN(video.state.time) &&
             video.state.duration !== null && !isNaN(video.state.duration) &&
             video.state.manifest !== null && typeof video.state.manifest.name === 'string') {
-            timeChanged(video.state.time, video.state.duration, video.state.manifest.name);
+
+                if (seeking) {
+                    seek(video.state.time, video.state.duration, video.state.manifest.name)
+                    // timeChanged(video.state.time, video.state.duration, video.state.manifest.name);
+                } else {
+                    timeChanged(video.state.time, video.state.duration, video.state.manifest.name);
+                }
         }
     }, [video.state.time, video.state.duration, video.state.manifest]);
 
@@ -468,8 +488,12 @@ const Player = ({ urlParams, queryParams }) => {
                     if (!menusOpen && !nextVideoPopupOpen && video.state.paused !== null) {
                         if (video.state.paused) {
                             onPlayRequested();
+                            setSeeking(false);
+                            console.log(`setSeeking to (play requested - Space): false`);
                         } else {
                             onPauseRequested();
+                            setSeeking(false);
+                            console.log(`setSeeking to (pause requested - Space): false`);
                         }
                     }
 
diff --git a/src/routes/Player/usePlayer.d.ts b/src/routes/Player/usePlayer.d.ts
index 8580583f3..0ee68cf56 100644
--- a/src/routes/Player/usePlayer.d.ts
+++ b/src/routes/Player/usePlayer.d.ts
@@ -1,2 +1,2 @@
-declare const usePlayer: (urlParams: UrlParams, videoParams: any) => [Player, (time: number, duration: number, device: string) => void, (paused: boolean) => void, () => void, () => void];
+declare const usePlayer: (urlParams: UrlParams, videoParams: { hash: string | null, size: number | null, filename: string | null } | null | undefined) => [Player, (videoParams: { hash: string | null, size: number | null, filename: string | null }) => void, (time: number, duration: number, device: string) => void, (time: number, duration: number, device: string) => void, (paused: boolean) => void, () => void, () => void,];
 export = usePlayer;
\ No newline at end of file
diff --git a/src/routes/Player/usePlayer.js b/src/routes/Player/usePlayer.js
index 9bbc1673d..9beb0ba06 100644
--- a/src/routes/Player/usePlayer.js
+++ b/src/routes/Player/usePlayer.js
@@ -81,6 +81,7 @@ const usePlayer = (urlParams) => {
                 }
             };
         } else {
+            console.warn("Player Unload triggered");
             return {
                 action: 'Unload'
             };
@@ -104,6 +105,17 @@ const usePlayer = (urlParams) => {
             }
         }, 'player');
     }, []);
+
+    const seek = React.useCallback((time, duration, device) => {
+        core.transport.dispatch({
+            action: 'Player',
+            args: {
+                action: 'Seek',
+                args: { time, duration, device }
+            }
+        }, 'player');
+    }, []);
+
     const ended = React.useCallback(() => {
         core.transport.dispatch({
             action: 'Player',
@@ -129,8 +141,9 @@ const usePlayer = (urlParams) => {
             }
         }, 'player');
     }, []);
+
     const player = useModelState({ model: 'player', action, map });
-    return [player, videoParamsChanged, timeChanged, pausedChanged, ended, nextVideo];
+    return [player, videoParamsChanged, timeChanged, pausedChanged, ended, nextVideo, seek];
 };
 
 module.exports = usePlayer;

From 5d5c28b1184ce0e02419703ae7203e3a0bf62ab2 Mon Sep 17 00:00:00 2001
From: Lachezar Lechev <lachezar@ambire.com>
Date: Fri, 17 May 2024 10:19:33 +0300
Subject: [PATCH 02/27] fix(player): buffering effects for seeking

Signed-off-by: Lachezar Lechev <lachezar@ambire.com>
---
 src/routes/Player/Player.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index 3ad5dfea2..44b75c724 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -349,8 +349,8 @@ const Player = ({ urlParams, queryParams }) => {
     }, [settings.subtitlesOutlineColor]);
 
     React.useEffect(() => {
-        if (seeking && video.state.buffered) {
-            console.log(`setSeeking to (on !video.state.buffering): false`);
+        if (seeking && video.state.buffering) {
+            console.log(`setSeeking to (on video.state.buffering): false`);
             setSeeking(false);
         }
     }, [video.state.buffering]);

From e66c383e23eb1840183ee0813f0d57ffdf143f14 Mon Sep 17 00:00:00 2001
From: Lachezar Lechev <lachezar@ambire.com>
Date: Fri, 17 May 2024 11:24:49 +0300
Subject: [PATCH 03/27] fix: usePlayer exports and TS definition

Signed-off-by: Lachezar Lechev <lachezar@ambire.com>
---
 src/routes/Player/usePlayer.d.ts | 2 +-
 src/routes/Player/usePlayer.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/Player/usePlayer.d.ts b/src/routes/Player/usePlayer.d.ts
index 0ee68cf56..256424dd4 100644
--- a/src/routes/Player/usePlayer.d.ts
+++ b/src/routes/Player/usePlayer.d.ts
@@ -1,2 +1,2 @@
-declare const usePlayer: (urlParams: UrlParams, videoParams: { hash: string | null, size: number | null, filename: string | null } | null | undefined) => [Player, (videoParams: { hash: string | null, size: number | null, filename: string | null }) => void, (time: number, duration: number, device: string) => void, (time: number, duration: number, device: string) => void, (paused: boolean) => void, () => void, () => void,];
+declare const usePlayer: (urlParams: UrlParams) => [Player, (videoParams: { hash: string | null, size: number | null, filename: string | null }) => void, (time: number, duration: number, device: string) => void, (time: number, duration: number, device: string) => void, (paused: boolean) => void, () => void, () => void,];
 export = usePlayer;
\ No newline at end of file
diff --git a/src/routes/Player/usePlayer.js b/src/routes/Player/usePlayer.js
index 9beb0ba06..c2a2ff165 100644
--- a/src/routes/Player/usePlayer.js
+++ b/src/routes/Player/usePlayer.js
@@ -143,7 +143,7 @@ const usePlayer = (urlParams) => {
     }, []);
 
     const player = useModelState({ model: 'player', action, map });
-    return [player, videoParamsChanged, timeChanged, pausedChanged, ended, nextVideo, seek];
+    return [player, videoParamsChanged, timeChanged, seek, pausedChanged, ended, nextVideo];
 };
 
 module.exports = usePlayer;

From 97451619990a0301155c558de73c6250ed6fe31c Mon Sep 17 00:00:00 2001
From: Lachezar Lechev <lachezar@ambire.com>
Date: Fri, 17 May 2024 11:25:26 +0300
Subject: [PATCH 04/27] fix(player): setSeeking false right after seek instead
 of using video.state.buffering

Signed-off-by: Lachezar Lechev <lachezar@ambire.com>
---
 src/routes/Player/Player.js | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index 44b75c724..521fc2387 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -348,24 +348,19 @@ const Player = ({ urlParams, queryParams }) => {
         video.setProp('extraSubtitlesOutlineColor', settings.subtitlesOutlineColor);
     }, [settings.subtitlesOutlineColor]);
 
-    React.useEffect(() => {
-        if (seeking && video.state.buffering) {
-            console.log(`setSeeking to (on video.state.buffering): false`);
-            setSeeking(false);
-        }
-    }, [video.state.buffering]);
-
     React.useEffect(() => {
         if (video.state.time !== null && !isNaN(video.state.time) &&
             video.state.duration !== null && !isNaN(video.state.duration) &&
             video.state.manifest !== null && typeof video.state.manifest.name === 'string') {
 
-                if (seeking) {
-                    seek(video.state.time, video.state.duration, video.state.manifest.name)
-                    // timeChanged(video.state.time, video.state.duration, video.state.manifest.name);
-                } else {
-                    timeChanged(video.state.time, video.state.duration, video.state.manifest.name);
-                }
+            if (seeking) {
+                seek(video.state.time, video.state.duration, video.state.manifest.name)
+                setSeeking(false);
+                console.log(`setSeeking to (on video.state.time change): false`);
+
+            } else {
+                timeChanged(video.state.time, video.state.duration, video.state.manifest.name);
+            }
         }
     }, [video.state.time, video.state.duration, video.state.manifest]);
 

From 84ad70fc43651275d531707e6f15d9b1eeb8d940 Mon Sep 17 00:00:00 2001
From: Lachezar Lechev <lachezar@ambire.com>
Date: Thu, 25 Jul 2024 15:54:01 +0300
Subject: [PATCH 05/27] fix: Player - onSeekRequest and setting the seeking
 flag to true before updating the video player

Signed-off-by: Lachezar Lechev <lachezar@ambire.com>
---
 src/routes/Player/Player.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index 521fc2387..670cd31e1 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -162,10 +162,11 @@ const Player = ({ urlParams, queryParams }) => {
     }, []);
 
     const onSeekRequested = React.useCallback((time) => {
-        video.setProp('time', time);
-
+        // first set seeking to true and then update time!
         setSeeking(true);
         console.log(`setSeeking to (SeekRequested): true`);
+
+        video.setProp('time', time);
     }, []);
 
     const onPlaybackSpeedChanged = React.useCallback((rate) => {
@@ -354,11 +355,12 @@ const Player = ({ urlParams, queryParams }) => {
             video.state.manifest !== null && typeof video.state.manifest.name === 'string') {
 
             if (seeking) {
-                seek(video.state.time, video.state.duration, video.state.manifest.name)
+                seek(video.state.time, video.state.duration, video.state.manifest.name);
                 setSeeking(false);
                 console.log(`setSeeking to (on video.state.time change): false`);
 
             } else {
+                console.log(`time changed!`);
                 timeChanged(video.state.time, video.state.duration, video.state.manifest.name);
             }
         }

From 9168df4b823ce22054e4bb0c5ed0d700e2b1562b Mon Sep 17 00:00:00 2001
From: "Timothy Z." <timothy@stremio.com>
Date: Wed, 31 Jul 2024 10:52:38 +0300
Subject: [PATCH 06/27] refactor: add onKeyUp to not setSeeking to false

---
 src/routes/Player/Player.js | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index 62c842d45..8bf74ee9a 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -139,7 +139,6 @@ const Player = ({ urlParams, queryParams }) => {
     const onPlayRequested = React.useCallback(() => {
         video.setProp('paused', false);
         setSeeking(false);
-        console.log(`setSeeking to (PlayRequested - Space): false`);
     }, []);
 
     const onPlayRequestedDebounced = React.useCallback(debounce(onPlayRequested, 200), []);
@@ -162,10 +161,8 @@ const Player = ({ urlParams, queryParams }) => {
     }, []);
 
     const onSeekRequested = React.useCallback((time) => {
-        // first set seeking to true and then update time!
         setSeeking(true);
         console.log(`setSeeking to (SeekRequested): true`);
-
         video.setProp('time', time);
     }, []);
 
@@ -353,16 +350,10 @@ const Player = ({ urlParams, queryParams }) => {
         if (video.state.time !== null && !isNaN(video.state.time) &&
             video.state.duration !== null && !isNaN(video.state.duration) &&
             video.state.manifest !== null && typeof video.state.manifest.name === 'string') {
-
-            if (seeking) {
-                seek(video.state.time, video.state.duration, video.state.manifest.name);
-                setSeeking(false);
-                console.log(`setSeeking to (on video.state.time change): false`);
-
-            } else {
-                console.log(`time changed!`);
+            seeking ?
+                seek(video.state.time, video.state.duration, video.state.manifest.name)
+                :
                 timeChanged(video.state.time, video.state.duration, video.state.manifest.name);
-            }
         }
     }, [video.state.time, video.state.duration, video.state.manifest]);
 
@@ -489,8 +480,6 @@ const Player = ({ urlParams, queryParams }) => {
                             console.log(`setSeeking to (play requested - Space): false`);
                         } else {
                             onPauseRequested();
-                            setSeeking(false);
-                            console.log(`setSeeking to (pause requested - Space): false`);
                         }
                     }
 
@@ -574,6 +563,12 @@ const Player = ({ urlParams, queryParams }) => {
                 }
             }
         };
+        const onKeyUp = (event) => {
+            if (event.code === 'ArrowRight' || event.code === 'ArrowLeft') {
+                setSeeking(false);
+                console.log(`setSeeking to (key up - ArrowRight/ArrowLeft): false`);
+            }
+        };
         const onWheel = ({ deltaY }) => {
             if (deltaY > 0) {
                 if (!menusOpen && video.state.volume !== null) {
@@ -587,10 +582,12 @@ const Player = ({ urlParams, queryParams }) => {
         };
         if (routeFocused) {
             window.addEventListener('keydown', onKeyDown);
+            window.addEventListener('keyup', onKeyUp);
             window.addEventListener('wheel', onWheel);
         }
         return () => {
             window.removeEventListener('keydown', onKeyDown);
+            window.removeEventListener('keyup', onKeyUp);
             window.removeEventListener('wheel', onWheel);
         };
     }, [player.metaItem, player.selected, streamingServer.statistics, settings.seekTimeDuration, settings.seekShortTimeDuration, routeFocused, menusOpen, nextVideoPopupOpen, video.state.paused, video.state.time, video.state.volume, video.state.audioTracks, video.state.subtitlesTracks, video.state.extraSubtitlesTracks, video.state.playbackSpeed, toggleSubtitlesMenu, toggleInfoMenu, toggleVideosMenu, toggleStatisticsMenu]);

From 42ca0550ae1b9c6d4013ffe96d2f7fed69968074 Mon Sep 17 00:00:00 2001
From: ArtificialSloth <ArtificialSloth+git@gmail.com>
Date: Sun, 22 Sep 2024 00:17:06 -0400
Subject: [PATCH 07/27] feat/subtitles-track-label

---
 src/routes/Player/SubtitlesMenu/SubtitlesMenu.js | 5 ++++-
 src/routes/Player/SubtitlesMenu/styles.less      | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js b/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js
index 0130c58e2..23b44eb35 100644
--- a/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js
+++ b/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js
@@ -204,7 +204,10 @@ const SubtitlesMenu = React.memo((props) => {
                         <div className={styles['variants-list']}>
                             {subtitlesTracksForLanguage.map((track, index) => (
                                 <Button key={index} title={track.label} className={classnames(styles['variant-option'], { 'selected': props.selectedSubtitlesTrackId === track.id || props.selectedExtraSubtitlesTrackId === track.id })} data-id={track.id} data-origin={track.origin} data-embedded={track.embedded} onClick={subtitlesTrackOnClick}>
-                                    <div className={styles['variant-label']}>{track.origin}</div>
+                                    <div className={styles['variant-origin']}>
+                                        {track.origin}
+                                        <div className={styles['variant-label']}>{track.label}</div>
+                                    </div>
                                     {
                                         props.selectedSubtitlesTrackId === track.id || props.selectedExtraSubtitlesTrackId === track.id ?
                                             <div className={styles['icon']} />
diff --git a/src/routes/Player/SubtitlesMenu/styles.less b/src/routes/Player/SubtitlesMenu/styles.less
index 3f397b068..c9034286c 100644
--- a/src/routes/Player/SubtitlesMenu/styles.less
+++ b/src/routes/Player/SubtitlesMenu/styles.less
@@ -40,13 +40,17 @@
                     background-color: var(--overlay-color);
                 }
 
-                .language-label, .variant-label {
+                .language-label, .variant-origin {
                     flex: 1;
                     max-height: 2.4em;
                     font-size: 1.1rem;
                     color: var(--primary-foreground-color);
                 }
 
+                .variant-origin .variant-label {
+                    color: var(--color-placeholder-text);
+                }
+
                 .icon {
                     flex: none;
                     width: 0.5rem;

From faca36592504f6cd0eef5180fc23e17ccc03c591 Mon Sep 17 00:00:00 2001
From: ArtificialSloth <ArtificialSloth+git@gmail.com>
Date: Sun, 22 Sep 2024 01:12:37 -0400
Subject: [PATCH 08/27] prevent-url-labels

---
 src/routes/Player/SubtitlesMenu/SubtitlesMenu.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js b/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js
index 23b44eb35..705c1c29b 100644
--- a/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js
+++ b/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js
@@ -206,7 +206,12 @@ const SubtitlesMenu = React.memo((props) => {
                                 <Button key={index} title={track.label} className={classnames(styles['variant-option'], { 'selected': props.selectedSubtitlesTrackId === track.id || props.selectedExtraSubtitlesTrackId === track.id })} data-id={track.id} data-origin={track.origin} data-embedded={track.embedded} onClick={subtitlesTrackOnClick}>
                                     <div className={styles['variant-origin']}>
                                         {track.origin}
-                                        <div className={styles['variant-label']}>{track.label}</div>
+                                        {
+                                            typeof track.label === 'string' && !track.label.startsWith('http') ?
+                                                <div className={styles['variant-label']}>{track.label}</div>
+                                                :
+                                                null
+                                        }
                                     </div>
                                     {
                                         props.selectedSubtitlesTrackId === track.id || props.selectedExtraSubtitlesTrackId === track.id ?

From e095ca1e5c700c32f8abbfc230eb0a3375f97f50 Mon Sep 17 00:00:00 2001
From: Gater73 <osfulanosgames@gmail.com>
Date: Mon, 11 Nov 2024 23:48:43 -0300
Subject: [PATCH 09/27] Update CONSTANTS.js

Add x.com as a white listed domain
---
 src/common/CONSTANTS.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/CONSTANTS.js b/src/common/CONSTANTS.js
index c08cf471d..af8426600 100644
--- a/src/common/CONSTANTS.js
+++ b/src/common/CONSTANTS.js
@@ -93,7 +93,7 @@ const EXTERNAL_PLAYERS = [
     },
 ];
 
-const WHITELISTED_HOSTS = ['stremio.com', 'strem.io', 'stremio.zendesk.com', 'google.com', 'youtube.com', 'twitch.tv', 'twitter.com', 'netflix.com', 'adex.network', 'amazon.com', 'forms.gle'];
+const WHITELISTED_HOSTS = ['stremio.com', 'strem.io', 'stremio.zendesk.com', 'google.com', 'youtube.com', 'twitch.tv', 'twitter.com', 'x.com', 'netflix.com', 'adex.network', 'amazon.com', 'forms.gle'];
 
 module.exports = {
     CHROMECAST_RECEIVER_APP_ID,

From feb6746c90910cd81d9f2959de4e04fab3a2c81e Mon Sep 17 00:00:00 2001
From: "Timothy Z." <timothy@stremio.com>
Date: Sat, 16 Nov 2024 22:27:42 +0200
Subject: [PATCH 10/27] fix: modal dialog styles issues

---
 src/common/ModalDialog/styles.less | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/common/ModalDialog/styles.less b/src/common/ModalDialog/styles.less
index 9aafca16a..32605d341 100644
--- a/src/common/ModalDialog/styles.less
+++ b/src/common/ModalDialog/styles.less
@@ -67,6 +67,7 @@
         .modal-dialog-content {
             z-index: 1;
             position: relative;
+            overflow-y: auto;
 
             .title-container {
                 flex: 1 0 auto;
@@ -157,9 +158,11 @@
             z-index: 0;
             padding: 0 1.5rem;
 
-            .buttons-container {
-                flex-direction: column;
-                gap: 1rem;
+            .modal-dialog-content {
+                .buttons-container {
+                    flex-direction: column;
+                    gap: 1rem;
+                }
             }
         }
 

From c27b94fa6c16212ec5c406c8c90804f523e0d40c Mon Sep 17 00:00:00 2001
From: Tim <tymmesyde@gmail.com>
Date: Sat, 16 Nov 2024 22:22:53 +0100
Subject: [PATCH 11/27] refactor(ModalDialog): rename duplicated class name

---
 src/common/ModalDialog/ModalDialog.js | 2 +-
 src/common/ModalDialog/styles.less    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/ModalDialog/ModalDialog.js b/src/common/ModalDialog/ModalDialog.js
index 52d0a2513..1efa6ea6e 100644
--- a/src/common/ModalDialog/ModalDialog.js
+++ b/src/common/ModalDialog/ModalDialog.js
@@ -70,7 +70,7 @@ const ModalDialog = ({ className, title, buttons, children, dataset, onCloseRequ
                             :
                             null
                     }
-                    <div className={styles['modal-dialog-content']}>
+                    <div className={styles['body-container']}>
                         {children}
                     </div>
                     {
diff --git a/src/common/ModalDialog/styles.less b/src/common/ModalDialog/styles.less
index 32605d341..bde17932d 100644
--- a/src/common/ModalDialog/styles.less
+++ b/src/common/ModalDialog/styles.less
@@ -79,7 +79,7 @@
                 color: var(--primary-foreground-color);
             }
 
-            .modal-dialog-content {
+            .body-container {
                 flex: 1;
                 align-self: stretch;
                 overflow-y: auto;

From 06e43968c9151834b3814ab4dcea61a92e493c54 Mon Sep 17 00:00:00 2001
From: "Timothy Z." <timothy@stremio.com>
Date: Mon, 18 Nov 2024 15:49:48 +0200
Subject: [PATCH 12/27] refactor: add checks to call setter when needed

---
 src/routes/Player/Player.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index 8bf74ee9a..e893a6c14 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -161,8 +161,7 @@ const Player = ({ urlParams, queryParams }) => {
     }, []);
 
     const onSeekRequested = React.useCallback((time) => {
-        setSeeking(true);
-        console.log(`setSeeking to (SeekRequested): true`);
+        !seeking && setSeeking(true);
         video.setProp('time', time);
     }, []);
 
@@ -477,7 +476,6 @@ const Player = ({ urlParams, queryParams }) => {
                         if (video.state.paused) {
                             onPlayRequested();
                             setSeeking(false);
-                            console.log(`setSeeking to (play requested - Space): false`);
                         } else {
                             onPauseRequested();
                         }
@@ -565,8 +563,7 @@ const Player = ({ urlParams, queryParams }) => {
         };
         const onKeyUp = (event) => {
             if (event.code === 'ArrowRight' || event.code === 'ArrowLeft') {
-                setSeeking(false);
-                console.log(`setSeeking to (key up - ArrowRight/ArrowLeft): false`);
+                seeking && setSeeking(false);
             }
         };
         const onWheel = ({ deltaY }) => {

From feb84ef4c43c1611367849db032064fc887dd887 Mon Sep 17 00:00:00 2001
From: "Timothy Z." <timothy@stremio.com>
Date: Mon, 18 Nov 2024 15:52:28 +0200
Subject: [PATCH 13/27] refactor: use single quote strings

---
 src/routes/Player/usePlayer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/Player/usePlayer.js b/src/routes/Player/usePlayer.js
index c2a2ff165..dfdc9efb5 100644
--- a/src/routes/Player/usePlayer.js
+++ b/src/routes/Player/usePlayer.js
@@ -81,7 +81,7 @@ const usePlayer = (urlParams) => {
                 }
             };
         } else {
-            console.warn("Player Unload triggered");
+            console.warn('Player Unload triggered');
             return {
                 action: 'Unload'
             };

From 2cb027d99c6b23e77c6a95f9c2aa0f0bfaffd731 Mon Sep 17 00:00:00 2001
From: Lachezar Lechev <lachezar@ambire.com>
Date: Mon, 18 Nov 2024 16:05:49 +0200
Subject: [PATCH 14/27] chore: add core-web dep. from gh-pages

Signed-off-by: Lachezar Lechev <lachezar@ambire.com>
---
 package-lock.json | 7 ++++---
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2966ee9c0..20751445f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
                 "@babel/runtime": "7.16.0",
                 "@sentry/browser": "6.13.3",
                 "@stremio/stremio-colors": "5.0.1",
-                "@stremio/stremio-core-web": "0.47.8",
+                "@stremio/stremio-core-web": "https://stremio.github.io/stremio-core/stremio-core-web/feat/separate-seek-user-action/dev/stremio-stremio-core-web-0.47.8.tgz",
                 "@stremio/stremio-icons": "5.2.0",
                 "@stremio/stremio-video": "0.0.46",
                 "a-color-picker": "1.2.1",
@@ -3132,8 +3132,9 @@
         },
         "node_modules/@stremio/stremio-core-web": {
             "version": "0.47.8",
-            "resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.47.8.tgz",
-            "integrity": "sha512-X5yKSCm5DXR7U6oIO+2kaI1q3TnaWP6df/HFa1RBi/uw+8IYk+FB8GWpryxXyisJTFiUfQgcJDIlHROauaBQkg==",
+            "resolved": "https://stremio.github.io/stremio-core/stremio-core-web/feat/separate-seek-user-action/dev/stremio-stremio-core-web-0.47.8.tgz",
+            "integrity": "sha512-5dcb2kzGJfnpWYAeZtbw+TRXkCfR55iX/4Qa3OzBdFnQI3/Rv6GXvF10CxxxgsgIzjRcMall84qf0F6sAac+ug==",
+            "license": "MIT",
             "dependencies": {
                 "@babel/runtime": "7.24.1"
             }
diff --git a/package.json b/package.json
index 10da2944a..933b2db57 100755
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
         "@babel/runtime": "7.16.0",
         "@sentry/browser": "6.13.3",
         "@stremio/stremio-colors": "5.0.1",
-        "@stremio/stremio-core-web": "0.47.8",
+        "@stremio/stremio-core-web": "https://stremio.github.io/stremio-core/stremio-core-web/feat/separate-seek-user-action/dev/stremio-stremio-core-web-0.47.8.tgz",
         "@stremio/stremio-icons": "5.2.0",
         "@stremio/stremio-video": "0.0.46",
         "a-color-picker": "1.2.1",

From ffdb2fd5d4e2fb7850f0db6525912dad8bd3ddf1 Mon Sep 17 00:00:00 2001
From: ArtificialSloth <ArtificialSloth+git@gmail.com>
Date: Wed, 20 Nov 2024 05:26:48 -0500
Subject: [PATCH 15/27] Swap origin and label, add fallback for url check,
 translate origin, and handle text overflow for long labels

---
 src/routes/Player/SubtitlesMenu/SubtitlesMenu.js | 13 ++++++-------
 src/routes/Player/SubtitlesMenu/styles.less      |  6 ++++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js b/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js
index 705c1c29b..d85c93758 100644
--- a/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js
+++ b/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js
@@ -204,14 +204,13 @@ const SubtitlesMenu = React.memo((props) => {
                         <div className={styles['variants-list']}>
                             {subtitlesTracksForLanguage.map((track, index) => (
                                 <Button key={index} title={track.label} className={classnames(styles['variant-option'], { 'selected': props.selectedSubtitlesTrackId === track.id || props.selectedExtraSubtitlesTrackId === track.id })} data-id={track.id} data-origin={track.origin} data-embedded={track.embedded} onClick={subtitlesTrackOnClick}>
-                                    <div className={styles['variant-origin']}>
-                                        {track.origin}
-                                        {
-                                            typeof track.label === 'string' && !track.label.startsWith('http') ?
-                                                <div className={styles['variant-label']}>{track.label}</div>
-                                                :
-                                                null
+                                    <div className={styles['variant-label']}>
+                                        {typeof track.label === 'string' && !track.label.startsWith('http') ?
+                                            track.label
+                                            :
+                                            track.lang
                                         }
+                                        <div className={styles['variant-origin']}>{t(track.origin)}</div>
                                     </div>
                                     {
                                         props.selectedSubtitlesTrackId === track.id || props.selectedExtraSubtitlesTrackId === track.id ?
diff --git a/src/routes/Player/SubtitlesMenu/styles.less b/src/routes/Player/SubtitlesMenu/styles.less
index c9034286c..68cbb5ce4 100644
--- a/src/routes/Player/SubtitlesMenu/styles.less
+++ b/src/routes/Player/SubtitlesMenu/styles.less
@@ -40,14 +40,16 @@
                     background-color: var(--overlay-color);
                 }
 
-                .language-label, .variant-origin {
+                .language-label, .variant-label {
                     flex: 1;
                     max-height: 2.4em;
                     font-size: 1.1rem;
+                    text-wrap: nowrap;
+                    text-overflow: ellipsis;
                     color: var(--primary-foreground-color);
                 }
 
-                .variant-origin .variant-label {
+                .variant-label .variant-origin {
                     color: var(--color-placeholder-text);
                 }
 

From 18359aa42d63fc4a057bf5ce04a1c19f5051026c Mon Sep 17 00:00:00 2001
From: ArtificialSloth <artificialsloth@gmail.com>
Date: Wed, 20 Nov 2024 05:40:02 -0500
Subject: [PATCH 16/27] Update src/routes/Player/SubtitlesMenu/SubtitlesMenu.js

Co-authored-by: Timothy Z. <timothy@stremio.com>
---
 src/routes/Player/SubtitlesMenu/SubtitlesMenu.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js b/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js
index d85c93758..c65cb9c9e 100644
--- a/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js
+++ b/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js
@@ -205,10 +205,11 @@ const SubtitlesMenu = React.memo((props) => {
                             {subtitlesTracksForLanguage.map((track, index) => (
                                 <Button key={index} title={track.label} className={classnames(styles['variant-option'], { 'selected': props.selectedSubtitlesTrackId === track.id || props.selectedExtraSubtitlesTrackId === track.id })} data-id={track.id} data-origin={track.origin} data-embedded={track.embedded} onClick={subtitlesTrackOnClick}>
                                     <div className={styles['variant-label']}>
-                                        {typeof track.label === 'string' && !track.label.startsWith('http') ?
-                                            track.label
-                                            :
-                                            track.lang
+                                        {
+                                            typeof track.label === 'string' && !track.label.startsWith('http') ?
+                                                track.label
+                                                :
+                                                track.lang
                                         }
                                         <div className={styles['variant-origin']}>{t(track.origin)}</div>
                                     </div>

From b07e10fe2b5d9f2baab6a838b873b9a8a46e8cd9 Mon Sep 17 00:00:00 2001
From: ArtificialSloth <ArtificialSloth+git@gmail.com>
Date: Wed, 20 Nov 2024 05:56:14 -0500
Subject: [PATCH 17/27] handle text overflow for track origin.

---
 src/routes/Player/SubtitlesMenu/styles.less | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/routes/Player/SubtitlesMenu/styles.less b/src/routes/Player/SubtitlesMenu/styles.less
index 68cbb5ce4..9798854cf 100644
--- a/src/routes/Player/SubtitlesMenu/styles.less
+++ b/src/routes/Player/SubtitlesMenu/styles.less
@@ -44,9 +44,12 @@
                     flex: 1;
                     max-height: 2.4em;
                     font-size: 1.1rem;
+                    color: var(--primary-foreground-color);
+                }
+
+                .language-label, .variant-label, .variant-origin {
                     text-wrap: nowrap;
                     text-overflow: ellipsis;
-                    color: var(--primary-foreground-color);
                 }
 
                 .variant-label .variant-origin {

From b6e141989c12482dce02054f09f3049c31450d5a Mon Sep 17 00:00:00 2001
From: Lachezar Lechev <lachezar@ambire.com>
Date: Wed, 20 Nov 2024 14:13:00 +0200
Subject: [PATCH 18/27] chore: Bump stremio-core-web to 0.48.0

Signed-off-by: Lachezar Lechev <lachezar@ambire.com>
---
 package-lock.json | 9 ++++-----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 20751445f..5ac7dc54e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
                 "@babel/runtime": "7.16.0",
                 "@sentry/browser": "6.13.3",
                 "@stremio/stremio-colors": "5.0.1",
-                "@stremio/stremio-core-web": "https://stremio.github.io/stremio-core/stremio-core-web/feat/separate-seek-user-action/dev/stremio-stremio-core-web-0.47.8.tgz",
+                "@stremio/stremio-core-web": "0.48.0",
                 "@stremio/stremio-icons": "5.2.0",
                 "@stremio/stremio-video": "0.0.46",
                 "a-color-picker": "1.2.1",
@@ -3131,10 +3131,9 @@
             "license": "MIT"
         },
         "node_modules/@stremio/stremio-core-web": {
-            "version": "0.47.8",
-            "resolved": "https://stremio.github.io/stremio-core/stremio-core-web/feat/separate-seek-user-action/dev/stremio-stremio-core-web-0.47.8.tgz",
-            "integrity": "sha512-5dcb2kzGJfnpWYAeZtbw+TRXkCfR55iX/4Qa3OzBdFnQI3/Rv6GXvF10CxxxgsgIzjRcMall84qf0F6sAac+ug==",
-            "license": "MIT",
+            "version": "0.48.0",
+            "resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.48.0.tgz",
+            "integrity": "sha512-UEVxb5weAIZ22Hz0iNKM8O1QkALcLShG9AyCe1P2WhZhyiridbwE7MtP5itBtLcLm9f/D6UeRrpUWMCS01n18Q==",
             "dependencies": {
                 "@babel/runtime": "7.24.1"
             }
diff --git a/package.json b/package.json
index 933b2db57..eb1172a44 100755
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
         "@babel/runtime": "7.16.0",
         "@sentry/browser": "6.13.3",
         "@stremio/stremio-colors": "5.0.1",
-        "@stremio/stremio-core-web": "https://stremio.github.io/stremio-core/stremio-core-web/feat/separate-seek-user-action/dev/stremio-stremio-core-web-0.47.8.tgz",
+        "@stremio/stremio-core-web": "0.48.0",
         "@stremio/stremio-icons": "5.2.0",
         "@stremio/stremio-video": "0.0.46",
         "a-color-picker": "1.2.1",

From 84903f456693bc58d6fa5979b3eec3d991e9471c Mon Sep 17 00:00:00 2001
From: "Timothy Z." <timothy@stremio.com>
Date: Fri, 22 Nov 2024 00:13:16 +0200
Subject: [PATCH 19/27] fix: bug when clicking on mark as watched button

---
 src/routes/MetaDetails/VideosList/Video/Video.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/routes/MetaDetails/VideosList/Video/Video.js b/src/routes/MetaDetails/VideosList/Video/Video.js
index a9ef3be86..25b67aae9 100644
--- a/src/routes/MetaDetails/VideosList/Video/Video.js
+++ b/src/routes/MetaDetails/VideosList/Video/Video.js
@@ -47,6 +47,7 @@ const Video = ({ className, id, title, thumbnail, episode, released, upcoming, w
     }, []);
     const toggleWatchedOnClick = React.useCallback((event) => {
         event.preventDefault();
+        event.stopPropagation();
         closeMenu();
         core.transport.dispatch({
             action: 'MetaDetails',

From 6ead60808693e68e2a2d9a80131dceca5bca8256 Mon Sep 17 00:00:00 2001
From: Lachezar Lechev <lachezar@ambire.com>
Date: Mon, 25 Nov 2024 15:41:23 +0200
Subject: [PATCH 20/27] fix(payer): Seekbar action and arrow keys for Seek
 action

Signed-off-by: Lachezar Lechev <lachezar@ambire.com>
---
 src/routes/Player/Player.js    | 54 ++++++++++++++++++++++++++++------
 src/routes/Player/usePlayer.js |  7 +++--
 2 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index e893a6c14..81111e8db 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -160,10 +160,28 @@ const Player = ({ urlParams, queryParams }) => {
         video.setProp('volume', volume);
     }, []);
 
+    // use only for SeekBar!
+    // Clicking on the SeekBar needs to send exactly 1 state change
+    // while sliding does nothing.
+    // In the other seek places, we need for the user to stop the seek (with arrow keys for example)
     const onSeekRequested = React.useCallback((time) => {
-        !seeking && setSeeking(true);
+        // make sure to update TimeChanged first
+        if (video.state.time !== null && !isNaN(video.state.time) &&
+            video.state.duration !== null && !isNaN(video.state.duration) &&
+            video.state.manifest !== null && typeof video.state.manifest.name === 'string') {
+            timeChanged(video.state.time, video.state.duration, video.state.manifest.name);
+        }
+
+        setSeeking(true);
         video.setProp('time', time);
-    }, []);
+        if (video.state.time !== null && !isNaN(video.state.time) &&
+            video.state.duration !== null && !isNaN(video.state.duration) &&
+            video.state.manifest !== null && typeof video.state.manifest.name === 'string') {
+            console.error('here!');
+            seek(time, video.state.duration, video.state.manifest.name);
+        }
+        setSeeking(false);
+    }, [video.state.time, video.state.duration, video.state.manifest]);
 
     const onPlaybackSpeedChanged = React.useCallback((rate) => {
         video.setProp('playbackSpeed', rate);
@@ -349,12 +367,15 @@ const Player = ({ urlParams, queryParams }) => {
         if (video.state.time !== null && !isNaN(video.state.time) &&
             video.state.duration !== null && !isNaN(video.state.duration) &&
             video.state.manifest !== null && typeof video.state.manifest.name === 'string') {
-            seeking ?
-                seek(video.state.time, video.state.duration, video.state.manifest.name)
-                :
+            if (seeking) {
+                seek(video.state.time, video.state.duration, video.state.manifest.name);
+                // console.warn('Send Seek action');
+            } else {
                 timeChanged(video.state.time, video.state.duration, video.state.manifest.name);
+                // console.warn('Send TimeChanged action');
+            }
         }
-    }, [video.state.time, video.state.duration, video.state.manifest]);
+    }, [video.state.time, video.state.duration, video.state.manifest, seeking]);
 
     React.useEffect(() => {
         if (video.state.paused !== null) {
@@ -483,18 +504,30 @@ const Player = ({ urlParams, queryParams }) => {
 
                     break;
                 }
+                // make sure to set Seeking (if not set already)
+                // and update the time property to send the Seek Action
+                // accordingly.
+                // Continuously holding the arrow key should not trigger TimeChanged
+                // until releasing.
                 case 'ArrowRight': {
                     if (!menusOpen && !nextVideoPopupOpen && video.state.time !== null) {
                         const seekDuration = event.shiftKey ? settings.seekShortTimeDuration : settings.seekTimeDuration;
-                        onSeekRequested(video.state.time + seekDuration);
+                        !seeking && setSeeking(true);
+                        video.setProp('time', video.state.time + seekDuration);
                     }
 
                     break;
                 }
+                // make sure to set Seeking (if not set already)
+                // and update the time property to send the Seek Action
+                // accordingly.
+                // Continuously holding the arrow key should not trigger TimeChanged
+                // until releasing.
                 case 'ArrowLeft': {
                     if (!menusOpen && !nextVideoPopupOpen && video.state.time !== null) {
                         const seekDuration = event.shiftKey ? settings.seekShortTimeDuration : settings.seekTimeDuration;
-                        onSeekRequested(video.state.time - seekDuration);
+                        !seeking && setSeeking(true);
+                        video.setProp('time', video.state.time - seekDuration);
                     }
 
                     break;
@@ -562,8 +595,11 @@ const Player = ({ urlParams, queryParams }) => {
             }
         };
         const onKeyUp = (event) => {
+            // stops the seeking propagation if user holds the arrow continually
+            // this ensures TimeCHanged is only send when you stop holding the button
             if (event.code === 'ArrowRight' || event.code === 'ArrowLeft') {
-                seeking && setSeeking(false);
+                console.warn('Key Up for Arrows! Stop seek!');
+                setSeeking(false);
             }
         };
         const onWheel = ({ deltaY }) => {
diff --git a/src/routes/Player/usePlayer.js b/src/routes/Player/usePlayer.js
index dfdc9efb5..8a4b69873 100644
--- a/src/routes/Player/usePlayer.js
+++ b/src/routes/Player/usePlayer.js
@@ -81,7 +81,6 @@ const usePlayer = (urlParams) => {
                 }
             };
         } else {
-            console.warn('Player Unload triggered');
             return {
                 action: 'Unload'
             };
@@ -97,21 +96,23 @@ const usePlayer = (urlParams) => {
         }, 'player');
     }, []);
     const timeChanged = React.useCallback((time, duration, device) => {
+        console.log('Time changed triggered: '+ time);
         core.transport.dispatch({
             action: 'Player',
             args: {
                 action: 'TimeChanged',
-                args: { time, duration, device }
+                args: { time: Math.round(time), duration, device }
             }
         }, 'player');
     }, []);
 
     const seek = React.useCallback((time, duration, device) => {
+        console.log('Seek triggered: ' + time);
         core.transport.dispatch({
             action: 'Player',
             args: {
                 action: 'Seek',
-                args: { time, duration, device }
+                args: { time: Math.round(time), duration, device }
             }
         }, 'player');
     }, []);

From bd6367ef50632be879e8738e801ffb8b0af914b2 Mon Sep 17 00:00:00 2001
From: Tim <tymmesyde@gmail.com>
Date: Tue, 26 Nov 2024 18:20:59 +0100
Subject: [PATCH 21/27] refactor(Player): core seek action

---
 src/routes/Player/Player.js    | 43 +++++-----------------------------
 src/routes/Player/usePlayer.js | 42 ++++++++++++++++++++-------------
 2 files changed, 32 insertions(+), 53 deletions(-)

diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index 81111e8db..f3147db82 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -160,27 +160,9 @@ const Player = ({ urlParams, queryParams }) => {
         video.setProp('volume', volume);
     }, []);
 
-    // use only for SeekBar!
-    // Clicking on the SeekBar needs to send exactly 1 state change
-    // while sliding does nothing.
-    // In the other seek places, we need for the user to stop the seek (with arrow keys for example)
     const onSeekRequested = React.useCallback((time) => {
-        // make sure to update TimeChanged first
-        if (video.state.time !== null && !isNaN(video.state.time) &&
-            video.state.duration !== null && !isNaN(video.state.duration) &&
-            video.state.manifest !== null && typeof video.state.manifest.name === 'string') {
-            timeChanged(video.state.time, video.state.duration, video.state.manifest.name);
-        }
-
-        setSeeking(true);
         video.setProp('time', time);
-        if (video.state.time !== null && !isNaN(video.state.time) &&
-            video.state.duration !== null && !isNaN(video.state.duration) &&
-            video.state.manifest !== null && typeof video.state.manifest.name === 'string') {
-            console.error('here!');
-            seek(time, video.state.duration, video.state.manifest.name);
-        }
-        setSeeking(false);
+        seek(time, video.state.duration, video.state.manifest?.name);
     }, [video.state.time, video.state.duration, video.state.manifest]);
 
     const onPlaybackSpeedChanged = React.useCallback((rate) => {
@@ -364,17 +346,7 @@ const Player = ({ urlParams, queryParams }) => {
     }, [settings.subtitlesOutlineColor]);
 
     React.useEffect(() => {
-        if (video.state.time !== null && !isNaN(video.state.time) &&
-            video.state.duration !== null && !isNaN(video.state.duration) &&
-            video.state.manifest !== null && typeof video.state.manifest.name === 'string') {
-            if (seeking) {
-                seek(video.state.time, video.state.duration, video.state.manifest.name);
-                // console.warn('Send Seek action');
-            } else {
-                timeChanged(video.state.time, video.state.duration, video.state.manifest.name);
-                // console.warn('Send TimeChanged action');
-            }
-        }
+        !seeking && timeChanged(video.state.time, video.state.duration, video.state.manifest?.name);
     }, [video.state.time, video.state.duration, video.state.manifest, seeking]);
 
     React.useEffect(() => {
@@ -512,8 +484,8 @@ const Player = ({ urlParams, queryParams }) => {
                 case 'ArrowRight': {
                     if (!menusOpen && !nextVideoPopupOpen && video.state.time !== null) {
                         const seekDuration = event.shiftKey ? settings.seekShortTimeDuration : settings.seekTimeDuration;
-                        !seeking && setSeeking(true);
-                        video.setProp('time', video.state.time + seekDuration);
+                        setSeeking(true);
+                        onSeekRequested(video.state.time + seekDuration);
                     }
 
                     break;
@@ -526,8 +498,8 @@ const Player = ({ urlParams, queryParams }) => {
                 case 'ArrowLeft': {
                     if (!menusOpen && !nextVideoPopupOpen && video.state.time !== null) {
                         const seekDuration = event.shiftKey ? settings.seekShortTimeDuration : settings.seekTimeDuration;
-                        !seeking && setSeeking(true);
-                        video.setProp('time', video.state.time - seekDuration);
+                        setSeeking(true);
+                        onSeekRequested(video.state.time - seekDuration);
                     }
 
                     break;
@@ -595,10 +567,7 @@ const Player = ({ urlParams, queryParams }) => {
             }
         };
         const onKeyUp = (event) => {
-            // stops the seeking propagation if user holds the arrow continually
-            // this ensures TimeCHanged is only send when you stop holding the button
             if (event.code === 'ArrowRight' || event.code === 'ArrowLeft') {
-                console.warn('Key Up for Arrows! Stop seek!');
                 setSeeking(false);
             }
         };
diff --git a/src/routes/Player/usePlayer.js b/src/routes/Player/usePlayer.js
index 8a4b69873..05036f220 100644
--- a/src/routes/Player/usePlayer.js
+++ b/src/routes/Player/usePlayer.js
@@ -96,25 +96,35 @@ const usePlayer = (urlParams) => {
         }, 'player');
     }, []);
     const timeChanged = React.useCallback((time, duration, device) => {
-        console.log('Time changed triggered: '+ time);
-        core.transport.dispatch({
-            action: 'Player',
-            args: {
-                action: 'TimeChanged',
-                args: { time: Math.round(time), duration, device }
-            }
-        }, 'player');
+        if (typeof time === 'number' && typeof duration === 'number' && typeof device === 'string') {
+            core.transport.dispatch({
+                action: 'Player',
+                args: {
+                    action: 'TimeChanged',
+                    args: {
+                        time: Math.round(time),
+                        duration,
+                        device,
+                    }
+                }
+            }, 'player');
+        }
     }, []);
 
     const seek = React.useCallback((time, duration, device) => {
-        console.log('Seek triggered: ' + time);
-        core.transport.dispatch({
-            action: 'Player',
-            args: {
-                action: 'Seek',
-                args: { time: Math.round(time), duration, device }
-            }
-        }, 'player');
+        if (typeof time === 'number' && typeof duration === 'number' && typeof device === 'string') {
+            core.transport.dispatch({
+                action: 'Player',
+                args: {
+                    action: 'Seek',
+                    args: {
+                        time: Math.round(time),
+                        duration,
+                        device,
+                    }
+                }
+            }, 'player');
+        }
     }, []);
 
     const ended = React.useCallback(() => {

From d3a98fbdd3f29ce33c3d2674832f0467bda37642 Mon Sep 17 00:00:00 2001
From: "Timothy Z." <timothy@stremio.com>
Date: Wed, 27 Nov 2024 14:57:41 +0200
Subject: [PATCH 22/27] fix(multiSelect): addon name overflow

---
 src/common/Multiselect/styles.less             | 3 +++
 src/routes/MetaDetails/StreamsList/styles.less | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/common/Multiselect/styles.less b/src/common/Multiselect/styles.less
index 31b44182a..b82fd06c5 100644
--- a/src/common/Multiselect/styles.less
+++ b/src/common/Multiselect/styles.less
@@ -27,6 +27,9 @@
         max-height: 2.4em;
         font-weight: 500;
         color: var(--primary-foreground-color);
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
     }
 
     .icon {
diff --git a/src/routes/MetaDetails/StreamsList/styles.less b/src/routes/MetaDetails/StreamsList/styles.less
index 3ddb27813..c22b14071 100644
--- a/src/routes/MetaDetails/StreamsList/styles.less
+++ b/src/routes/MetaDetails/StreamsList/styles.less
@@ -108,7 +108,6 @@
 
         .select-input-container {
             min-width: 40%;
-            flex: 0 0 auto;
             flex-grow: 1;
             background: none;
 

From 15026ccf8cdaef5dd4fc9d8ee4e6ec3479c0e3e1 Mon Sep 17 00:00:00 2001
From: "Timothy Z." <timothy@stremio.com>
Date: Wed, 27 Nov 2024 14:57:57 +0200
Subject: [PATCH 23/27] fix(stream): addon label overflow

---
 src/routes/MetaDetails/StreamsList/Stream/styles.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/MetaDetails/StreamsList/Stream/styles.less b/src/routes/MetaDetails/StreamsList/Stream/styles.less
index 4136c3a63..e4af802f4 100644
--- a/src/routes/MetaDetails/StreamsList/Stream/styles.less
+++ b/src/routes/MetaDetails/StreamsList/Stream/styles.less
@@ -58,7 +58,7 @@
 
         .addon-name {
             width: 7rem;
-            max-height: 3.6em;
+            max-height:4em;
             font-size: 1.1rem;
             text-align: left;
             color: var(--primary-foreground-color);

From 941d8d782289dcbc3e2ce37f1af4883ecc9fbc6e Mon Sep 17 00:00:00 2001
From: Tim <tymmesyde@gmail.com>
Date: Thu, 28 Nov 2024 09:18:47 +0100
Subject: [PATCH 24/27] refactor(Player): remove unecessary dep onSeekRequested
 callback

---
 src/routes/Player/Player.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index f3147db82..a342c5af5 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -163,7 +163,7 @@ const Player = ({ urlParams, queryParams }) => {
     const onSeekRequested = React.useCallback((time) => {
         video.setProp('time', time);
         seek(time, video.state.duration, video.state.manifest?.name);
-    }, [video.state.time, video.state.duration, video.state.manifest]);
+    }, [video.state.duration, video.state.manifest]);
 
     const onPlaybackSpeedChanged = React.useCallback((rate) => {
         video.setProp('playbackSpeed', rate);

From 9fc13d2c55011f97a7029de44a8a482f6c27a8e4 Mon Sep 17 00:00:00 2001
From: Tim <tymmesyde@gmail.com>
Date: Thu, 28 Nov 2024 09:20:11 +0100
Subject: [PATCH 25/27] refactor(Player): remove unecessary comments

---
 src/routes/Player/Player.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index a342c5af5..5ace96f77 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -476,11 +476,6 @@ const Player = ({ urlParams, queryParams }) => {
 
                     break;
                 }
-                // make sure to set Seeking (if not set already)
-                // and update the time property to send the Seek Action
-                // accordingly.
-                // Continuously holding the arrow key should not trigger TimeChanged
-                // until releasing.
                 case 'ArrowRight': {
                     if (!menusOpen && !nextVideoPopupOpen && video.state.time !== null) {
                         const seekDuration = event.shiftKey ? settings.seekShortTimeDuration : settings.seekTimeDuration;
@@ -490,11 +485,6 @@ const Player = ({ urlParams, queryParams }) => {
 
                     break;
                 }
-                // make sure to set Seeking (if not set already)
-                // and update the time property to send the Seek Action
-                // accordingly.
-                // Continuously holding the arrow key should not trigger TimeChanged
-                // until releasing.
                 case 'ArrowLeft': {
                     if (!menusOpen && !nextVideoPopupOpen && video.state.time !== null) {
                         const seekDuration = event.shiftKey ? settings.seekShortTimeDuration : settings.seekTimeDuration;

From 96a15dfbf6cdde89977dc9cf644698c69f9df218 Mon Sep 17 00:00:00 2001
From: Tim <tymmesyde@gmail.com>
Date: Thu, 28 Nov 2024 09:23:10 +0100
Subject: [PATCH 26/27] refactor(Player): format type declaration

---
 src/routes/Player/usePlayer.d.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/routes/Player/usePlayer.d.ts b/src/routes/Player/usePlayer.d.ts
index 6f9586099..12f0813e2 100644
--- a/src/routes/Player/usePlayer.d.ts
+++ b/src/routes/Player/usePlayer.d.ts
@@ -1,2 +1,11 @@
-declare const usePlayer: (urlParams: UrlParams) => [Player, (videoParams: { hash: string | null, size: number | null, filename: string | null }) => void, (time: number, duration: number, device: string) => void, (time: number, duration: number, device: string) => void, (paused: boolean) => void, () => void, () => void,];
+declare const usePlayer: (urlParams: UrlParams) => [
+    Player,
+    videoParamsChanged: (videoParams: { hash: string | null, size: number | null, filename: string | null }) => void,
+    timeChanged: (time: number, duration: number, device: string) => void,
+    seek: (time: number, duration: number, device: string) => void,
+    pausedChanged: (paused: boolean) => void, () => void, () => void,
+    ended: () => void,
+    nextVideo: () => void,
+];
+
 export = usePlayer;

From 192bd535373b354796e2949efcdcec4d6ad365f8 Mon Sep 17 00:00:00 2001
From: "Timothy Z." <timothy@stremio.com>
Date: Thu, 28 Nov 2024 12:35:30 +0200
Subject: [PATCH 27/27] remove(stream): max-height on addon-name

Co-authored-by: Tim <tymmesyde@gmail.com>
---
 src/routes/MetaDetails/StreamsList/Stream/styles.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/routes/MetaDetails/StreamsList/Stream/styles.less b/src/routes/MetaDetails/StreamsList/Stream/styles.less
index e4af802f4..22b2abc61 100644
--- a/src/routes/MetaDetails/StreamsList/Stream/styles.less
+++ b/src/routes/MetaDetails/StreamsList/Stream/styles.less
@@ -58,7 +58,6 @@
 
         .addon-name {
             width: 7rem;
-            max-height:4em;
             font-size: 1.1rem;
             text-align: left;
             color: var(--primary-foreground-color);