chore(deps): Update actions/cache action to v5.0.3

.github/workflows/build-apps.yml

@@ -46,7 +46,7 @@ jobs:
           bun-version: latest
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: ~/.bun/install/cache
           key: ${{ runner.os }}-${{ runner.arch }}-bun-develop-${{ hashFiles('bun.lock') }}
@@ -60,7 +60,7 @@ jobs:
           bun run submodule-reload
 
       - name: 💾 Cache Gradle global
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ~/.gradle/caches
@@ -73,7 +73,7 @@ jobs:
         run: bun run prebuild
 
       - name: 💾 Cache project Gradle (.gradle)
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: android/.gradle
           key: ${{ runner.os }}-android-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
@@ -129,7 +129,7 @@ jobs:
           bun-version: latest
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: ~/.bun/install/cache
           key: ${{ runner.os }}-${{ runner.arch }}-bun-develop-${{ hashFiles('bun.lock') }}
@@ -143,7 +143,7 @@ jobs:
           bun run submodule-reload
 
       - name: 💾 Cache Gradle global
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ~/.gradle/caches
@@ -156,7 +156,7 @@ jobs:
         run: bun run prebuild:tv
 
       - name: 💾 Cache project Gradle (.gradle)
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: android/.gradle
           key: ${{ runner.os }}-android-gradle-develop-${{ hashFiles('android/**/build.gradle', 'android/gradle/wrapper/gradle-wrapper.properties') }}
@@ -200,7 +200,7 @@ jobs:
           bun-version: latest
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: ~/.bun/install/cache
           key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}
@@ -264,7 +264,7 @@ jobs:
           bun-version: latest
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: ~/.bun/install/cache
           key: ${{ runner.os }}-bun-cache-${{ hashFiles('bun.lock') }}

.github/workflows/check-lockfile.yml

@@ -32,7 +32,7 @@ jobs:
           bun-version: latest
 
       - name: 💾 Cache Bun dependencies
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ~/.bun/install/cache

app/(auth)/player/direct-player.tsx

@@ -28,7 +28,6 @@ import {
 } from "@/components/video-player/controls/utils/playback-speed-settings";
 import useRouter from "@/hooks/useAppRouter";
 import { useHaptic } from "@/hooks/useHaptic";
-import { useIntroPlayback } from "@/hooks/useIntroPlayback";
 import { useOrientation } from "@/hooks/useOrientation";
 import { usePlaybackManager } from "@/hooks/usePlaybackManager";
 import usePlaybackSpeed from "@/hooks/usePlaybackSpeed";
@@ -56,7 +55,7 @@ import {
 } from "@/utils/jellyfin/subtitleUtils";
 import { writeToLog } from "@/utils/log";
 import { generateDeviceProfile } from "@/utils/profiles/native";
-import { msToTicks, ticksToMs, ticksToSeconds } from "@/utils/time";
+import { msToTicks, ticksToSeconds } from "@/utils/time";
 
 export default function page() {
   const videoRef = useRef<MpvPlayerViewRef>(null);
@@ -88,8 +87,6 @@ export default function page() {
   const progress = useSharedValue(0);
   const isSeeking = useSharedValue(false);
   const cacheProgress = useSharedValue(0);
-  // Track whether we've already triggered completion for the current intro
-  const introCompletionTriggered = useSharedValue(false);
   const VolumeManager = Platform.isTV
     ? null
     : require("react-native-volume-manager");
@@ -152,14 +149,6 @@ export default function page() {
     isError: false,
   });
 
-  // Intro playback hook - manages intro video playback before main content
-  const { intros, currentIntro, isPlayingIntro, skipAllIntros } =
-    useIntroPlayback({
-      api,
-      itemId: item?.Id || null,
-      userId: user?.Id,
-    });
-
   // Resolve audio index: use URL param if provided, otherwise use stored index for offline playback
   const audioIndex = useMemo(() => {
     if (audioIndexFromUrl !== undefined) {
@@ -258,9 +247,6 @@ export default function page() {
     isError: false,
   });
 
-  // Intro stream state - separate from main content stream
-  const [introStream, setIntroStream] = useState<Stream | null>(null);
-
   useEffect(() => {
     const fetchStreamData = async () => {
       setStreamStatus({ isLoading: true, isError: false });
@@ -341,57 +327,6 @@ export default function page() {
     downloadedItem,
   ]);
 
-  // Fetch intro stream when current intro changes
-  useEffect(() => {
-    const fetchIntroStreamData = async () => {
-      // Don't fetch intro stream if offline or no current intro
-      if (offline || !currentIntro?.Id || !api || !user?.Id) {
-        setIntroStream(null);
-        return;
-      }
-
-      try {
-        const res = await getStreamUrl({
-          api,
-          item: currentIntro,
-          startTimeTicks: 0, // Always start from beginning for intros
-          userId: user.Id,
-          audioStreamIndex: audioIndex,
-          maxStreamingBitrate: bitrateValue,
-          mediaSourceId: undefined,
-          subtitleStreamIndex: subtitleIndex,
-          deviceProfile: generateDeviceProfile(),
-        });
-        if (!res) return;
-        const { mediaSource, sessionId, url } = res;
-
-        if (!sessionId || !mediaSource || !url) {
-          console.error("Failed to get intro stream URL");
-          return;
-        }
-        setIntroStream({ mediaSource, sessionId, url });
-      } catch (error) {
-        console.error("Failed to fetch intro stream:", error);
-      }
-    };
-    fetchIntroStreamData();
-  }, [
-    currentIntro,
-    api,
-    user?.Id,
-    audioIndex,
-    bitrateValue,
-    subtitleIndex,
-    offline,
-  ]);
-
-  // Reset intro completion flag when a new intro starts playing
-  useEffect(() => {
-    if (isPlayingIntro) {
-      introCompletionTriggered.value = false;
-    }
-  }, [isPlayingIntro, currentIntro]);
-
   useEffect(() => {
     if (!stream || !api || offline) return;
     const reportPlaybackStart = async () => {
@@ -545,21 +480,6 @@ export default function page() {
         lastUrlUpdateTime.value = now;
       }
 
-      // Handle intro completion - check if intro has reached its end
-      if (isPlayingIntro && currentIntro) {
-        const introDuration = ticksToMs(currentIntro.RunTimeTicks || 0);
-        // Check if we're near the end of the intro (within 1000ms buffer)
-        // Use a larger buffer to ensure reliable detection even with short intros
-        // or if MPV doesn't fire progress callbacks frequently
-        if (currentTime >= introDuration - 1000) {
-          // Only trigger once per intro to avoid multiple calls
-          if (!introCompletionTriggered.value) {
-            introCompletionTriggered.value = true;
-            skipAllIntros();
-          }
-        }
-      }
-
       if (!item?.Id) return;
 
       playbackManager.reportPlaybackProgress(
@@ -576,9 +496,6 @@ export default function page() {
       isSeeking,
       isPlaybackStopped,
       isBuffering,
-      isPlayingIntro,
-      currentIntro,
-      skipAllIntros,
     ],
   );
 
@@ -589,11 +506,9 @@ export default function page() {
 
   /** Build video source config for MPV */
   const videoSource = useMemo<MpvVideoSource | undefined>(() => {
-    // Use intro stream if playing intro, otherwise use main content stream
-    const activeStream = isPlayingIntro ? introStream : stream;
-    if (!activeStream?.url) return undefined;
+    if (!stream?.url) return undefined;
 
-    const mediaSource = activeStream.mediaSource;
+    const mediaSource = stream.mediaSource;
     const isTranscoding = Boolean(mediaSource?.TranscodingUrl);
 
     // Get external subtitle URLs
@@ -629,17 +544,14 @@ export default function page() {
     );
 
     // Calculate start position directly here to avoid timing issues
-    // For intros, always start from 0
-    const startTicks = isPlayingIntro
-      ? 0
-      : playbackPositionFromUrl
-        ? Number.parseInt(playbackPositionFromUrl, 10)
-        : (item?.UserData?.PlaybackPositionTicks ?? 0);
+    const startTicks = playbackPositionFromUrl
+      ? Number.parseInt(playbackPositionFromUrl, 10)
+      : (item?.UserData?.PlaybackPositionTicks ?? 0);
     const startPos = ticksToSeconds(startTicks);
 
     // Build source config - headers only needed for online streaming
     const source: MpvVideoSource = {
-      url: activeStream.url,
+      url: stream.url,
       startPosition: startPos,
       autoplay: true,
       initialSubtitleId,
@@ -662,8 +574,6 @@ export default function page() {
   }, [
     stream?.url,
     stream?.mediaSource,
-    introStream?.url,
-    introStream?.mediaSource,
     item?.UserData?.PlaybackPositionTicks,
     playbackPositionFromUrl,
     api?.basePath,
@@ -671,7 +581,6 @@ export default function page() {
     subtitleIndex,
     audioIndex,
     offline,
-    isPlayingIntro,
   ]);
 
   const volumeUpCb = useCallback(async () => {
@@ -1084,9 +993,6 @@ export default function page() {
                 getTechnicalInfo={getTechnicalInfo}
                 playMethod={playMethod}
                 transcodeReasons={transcodeReasons}
-                isPlayingIntro={isPlayingIntro}
-                skipAllIntros={skipAllIntros}
-                intros={intros}
               />
             )}
           </View>

bun.lock

@@ -1,5 +1,6 @@
 {
   "lockfileVersion": 1,
+  "configVersion": 0,
   "workspaces": {
     "": {
       "name": "streamyfin",

components/video-player/controls/BottomControls.tsx

@@ -57,11 +57,6 @@ interface BottomControlsProps {
     minutes: number;
     seconds: number;
   };
-
-  // Intro playback props
-  isPlayingIntro?: boolean;
-  skipAllIntros?: () => void;
-  intros?: BaseItemDto[];
 }
 
 export const BottomControls: FC<BottomControlsProps> = ({
@@ -92,9 +87,6 @@ export const BottomControls: FC<BottomControlsProps> = ({
   trickPlayUrl,
   trickplayInfo,
   time,
-  isPlayingIntro = false,
-  skipAllIntros,
-  intros = [],
 }) => {
   const { settings } = useSettings();
   const insets = useSafeAreaInsets();
@@ -141,14 +133,6 @@ export const BottomControls: FC<BottomControlsProps> = ({
           )}
         </View>
         <View className='flex flex-row space-x-2 shrink-0'>
-          {/* Skip Intro button - shows when playing intro videos */}
-          {isPlayingIntro && intros.length > 0 && skipAllIntros && (
-            <SkipButton
-              showButton={true}
-              onPress={skipAllIntros}
-              buttonText='Skip Intro'
-            />
-          )}
           <SkipButton
             showButton={showSkipButton}
             onPress={skipIntro}

components/video-player/controls/Controls.tsx

@@ -72,10 +72,6 @@ interface Props {
   getTechnicalInfo?: () => Promise<TechnicalInfo>;
   playMethod?: "DirectPlay" | "DirectStream" | "Transcode";
   transcodeReasons?: string[];
-  // Intro playback props
-  isPlayingIntro?: boolean;
-  skipAllIntros?: () => void;
-  intros?: BaseItemDto[];
 }
 
 export const Controls: FC<Props> = ({
@@ -105,9 +101,6 @@ export const Controls: FC<Props> = ({
   getTechnicalInfo,
   playMethod,
   transcodeReasons,
-  isPlayingIntro = false,
-  skipAllIntros,
-  intros = [],
 }) => {
   const offline = useOfflineMode();
   const { settings, updateSettings } = useSettings();
@@ -561,9 +554,6 @@ export const Controls: FC<Props> = ({
               trickPlayUrl={trickPlayUrl}
               trickplayInfo={trickplayInfo}
               time={isSliding || showRemoteBubble ? time : remoteTime}
-              isPlayingIntro={isPlayingIntro}
-              skipAllIntros={skipAllIntros}
-              intros={intros}
             />
           </Animated.View>
         </>

hooks/useIntroPlayback.ts

@@ -1,46 +0,0 @@
-import type { Api } from "@jellyfin/sdk";
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { useEffect, useState } from "react";
-import { getIntros } from "@/utils/intros";
-
-interface UseIntroPlaybackProps {
-  api: Api | null;
-  itemId: string | null;
-  userId?: string;
-}
-
-export function useIntroPlayback({
-  api,
-  itemId,
-  userId,
-}: UseIntroPlaybackProps) {
-  const [intros, setIntros] = useState<BaseItemDto[]>([]);
-  const [isPlayingIntro, setIsPlayingIntro] = useState(false);
-
-  useEffect(() => {
-    async function fetchIntros() {
-      if (!api || !itemId) return;
-
-      const introItems = await getIntros(api, itemId, userId);
-      setIntros(introItems);
-      // Set isPlayingIntro to true when intros are available
-      setIsPlayingIntro(introItems.length > 0);
-    }
-
-    fetchIntros();
-  }, [api, itemId, userId]);
-
-  // Only play the first intro if intros are available.. might be nice to configure this at some point with tags or something 🤷‍♂️
-  const currentIntro = intros.length > 0 ? intros[0] : null;
-
-  const skipAllIntros = () => {
-    setIsPlayingIntro(false);
-  };
-
-  return {
-    intros,
-    currentIntro,
-    isPlayingIntro,
-    skipAllIntros,
-  };
-}

utils/intros.ts

@@ -1,28 +0,0 @@
-import type { Api } from "@jellyfin/sdk";
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
-import { getUserLibraryApi } from "@jellyfin/sdk/lib/utils/api";
-
-/**
- * Fetches intro items for a given media item using the Jellyfin SDK
- * @param api - The Jellyfin API instance
- * @param itemId - The ID of the media item
- * @param userId - Optional user ID
- * @returns Promise<BaseItemDto[]> - Array of intro items
- */
-export async function getIntros(
-  api: Api,
-  itemId: string,
-  userId?: string,
-): Promise<BaseItemDto[]> {
-  try {
-    const response = await getUserLibraryApi(api).getIntros({
-      itemId,
-      userId,
-    });
-
-    return response.data.Items || [];
-  } catch (error) {
-    console.error("Error fetching intros:", error);
-    return [];
-  }
-}