From 37be617523b6a355af3383329817a866fd89ec1e Mon Sep 17 00:00:00 2001
From: viown <48097677+viown@users.noreply.github.com>
Date: Mon, 28 Oct 2024 17:12:07 +0300
Subject: [PATCH 1/2] Make 'ask to skip' the default for intro and outro
 segments

---
 .../features/playback/utils/mediaSegmentSettings.ts       | 8 ++++++--
 src/components/playbackSettings/playbackSettings.js       | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/apps/stable/features/playback/utils/mediaSegmentSettings.ts b/src/apps/stable/features/playback/utils/mediaSegmentSettings.ts
index e190a60f95..d2106ac21e 100644
--- a/src/apps/stable/features/playback/utils/mediaSegmentSettings.ts
+++ b/src/apps/stable/features/playback/utils/mediaSegmentSettings.ts
@@ -8,7 +8,11 @@ const PREFIX = 'segmentTypeAction';
 
 export const getId = (type: MediaSegmentType) => `${PREFIX}__${type}`;
 
-export function getMediaSegmentAction(userSettings: UserSettings, type: MediaSegmentType): MediaSegmentAction | undefined {
+export function getMediaSegmentAction(userSettings: UserSettings, type: MediaSegmentType): MediaSegmentAction {
     const action = userSettings.get(getId(type), false);
-    return action ? action as MediaSegmentAction : undefined;
+    let defaultAction = MediaSegmentAction.None;
+    if (type === MediaSegmentType.Intro || type === MediaSegmentType.Outro) {
+        defaultAction = MediaSegmentAction.AskToSkip;
+    }
+    return action ? action as MediaSegmentAction : defaultAction;
 }
diff --git a/src/components/playbackSettings/playbackSettings.js b/src/components/playbackSettings/playbackSettings.js
index 05374a78d5..81e82d0415 100644
--- a/src/components/playbackSettings/playbackSettings.js
+++ b/src/components/playbackSettings/playbackSettings.js
@@ -65,7 +65,7 @@ function populateMediaSegments(container, userSettings) {
     ].map(segmentType => {
         const segmentTypeLabel = globalize.translate('LabelMediaSegmentsType', globalize.translate(`MediaSegmentType.${segmentType}`));
         const id = getId(segmentType);
-        selectedValues[id] = getMediaSegmentAction(userSettings, segmentType) || MediaSegmentAction.None;
+        selectedValues[id] = getMediaSegmentAction(userSettings, segmentType);
         return `<div class="selectContainer">
 <select is="emby-select" id="${id}" class="segmentTypeAction" label="${segmentTypeLabel}">
     ${actionOptions}

From acde0685b5510d1f8f358c74fa9e0e57d28fd4be Mon Sep 17 00:00:00 2001
From: viown <48097677+viown@users.noreply.github.com>
Date: Mon, 28 Oct 2024 17:36:10 +0300
Subject: [PATCH 2/2] Use a constant for defaults

---
 .../features/playback/utils/mediaSegmentSettings.ts    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/apps/stable/features/playback/utils/mediaSegmentSettings.ts b/src/apps/stable/features/playback/utils/mediaSegmentSettings.ts
index d2106ac21e..45a3b83581 100644
--- a/src/apps/stable/features/playback/utils/mediaSegmentSettings.ts
+++ b/src/apps/stable/features/playback/utils/mediaSegmentSettings.ts
@@ -5,14 +5,16 @@ import { UserSettings } from 'scripts/settings/userSettings';
 import { MediaSegmentAction } from '../constants/mediaSegmentAction';
 
 const PREFIX = 'segmentTypeAction';
+const DEFAULT_ACTIONS: Partial<Record<MediaSegmentType, MediaSegmentAction>> = {
+    [MediaSegmentType.Intro]: MediaSegmentAction.AskToSkip,
+    [MediaSegmentType.Outro]: MediaSegmentAction.AskToSkip
+};
 
 export const getId = (type: MediaSegmentType) => `${PREFIX}__${type}`;
 
 export function getMediaSegmentAction(userSettings: UserSettings, type: MediaSegmentType): MediaSegmentAction {
     const action = userSettings.get(getId(type), false);
-    let defaultAction = MediaSegmentAction.None;
-    if (type === MediaSegmentType.Intro || type === MediaSegmentType.Outro) {
-        defaultAction = MediaSegmentAction.AskToSkip;
-    }
+    const defaultAction = DEFAULT_ACTIONS[type] || MediaSegmentAction.None;
+
     return action ? action as MediaSegmentAction : defaultAction;
 }