fix(issue-form): bound the gh release fetch with a 30s timeout

fix(issue-form): pin checkout to develop, serialize runs, simplify release fetch
- `release` events check out the tagged commit, so the script regenerated the form from the tag's stale copy and the bot PR could revert form edits made on develop since that release - checkout develop explicitly. - Fixed concurrency group: a release event and the weekly cron no longer race on the same ci/update-issue-form branch (queue, no cancel). - Replace `gh api --paginate` (fetches every release page) with `gh release list --exclude-drafts --exclude-pre-releases --limit N`. - Document the GITHUB_TOKEN limitation on the auto-merge step: bot PRs don't trigger required checks; close/reopen kicks them, then auto-merge completes after reviews.
2026-06-11 00:10:24 +01:00 · 2026-06-10 20:24:35 +02:00 · 2026-06-10 20:20:56 +02:00 · 2026-06-10 20:11:27 +02:00 · 2026-06-05 13:38:52 +02:00 · 2026-06-05 13:30:47 +02:00
20 changed files with 301 additions and 754 deletions
--- a/.github/ISSUE_TEMPLATE/issue_report.yml
+++ b/.github/ISSUE_TEMPLATE/issue_report.yml
@@ -75,10 +75,13 @@ body:
    id: version
    attributes:
      label: Streamyfin Version
-      description: What version of Streamyfin are you using?
+      description: What version of Streamyfin are you running? On a TestFlight or development build, choose "TestFlight/Development build" and include the exact version string shown in the app's Settings.
      options:
        - 0.54.1
        - 0.51.0
+        - 0.47.1
+        - 0.30.2
+        - 0.28.0
        - Older
        - TestFlight/Development build
    validations:
--- a/.github/workflows/update-issue-form.yml
+++ b/.github/workflows/update-issue-form.yml
@@ -1,67 +1,102 @@
-name: 🐛 Update Bug Report Template
+name: 🐛 Update Issue Form Versions

 on:
  release:
-    types: [published]  # Run on every published release on any branch
+    # Only full releases populate the dropdown (no drafts/prereleases).
+    types: [released]
+  schedule:
+    - cron: "0 3 * * 1" # Weekly safety net (Mondays 03:00 UTC) in case a release event was missed
+  workflow_dispatch:

+# Fixed group so a release event and the weekly cron can't race on the same
+# ci/update-issue-form branch — runs queue instead of force-pushing over each other.
 concurrency:
-   group: update-issue-form-${{ github.event.release.tag_name || github.run_id }}
-   cancel-in-progress: true
+  group: update-issue-form
+  cancel-in-progress: false
+
+permissions:
+  contents: read

 jobs:
-  update-bug-report:
+  update-issue-form:
+    name: 🔢 Populate version dropdown
+    runs-on: ubuntu-24.04
    permissions:
      contents: write
      pull-requests: write
-      issues: write
-    runs-on: ubuntu-24.04
-
    steps:
      - name: 📥 Checkout repository
        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-
-      - name: "🟢 Setup Node.js"
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
-          node-version: '24.x'
-          cache: 'npm'
+          # On `release` events GITHUB_SHA is the tagged commit — without this the
+          # script would regenerate the form from the tag's (stale) copy and the bot
+          # PR would revert any form edits made on develop since that release.
+          ref: develop

-      - name: 🔍 Extract minor version from app.json
-        id: minor
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # main
+      - name: 🍞 Setup Bun
+        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
        with:
-          result-encoding: string
-          script: |
-            const fs = require('fs-extra');
-            const semver = require('semver');
-            const content = fs.readJsonSync('./app.json');
-            const version = content.expo.version;
-            const minorVersion = semver.minor(version);
-            return minorVersion.toString();
+          bun-version: latest

-      - name: 📝 Update bug report version
-        uses: ShaMan123/gha-populate-form-version@be012141ca560dbb92156e3fe098c46035f6260d #v2.0.5
-        with:
-          semver: '^0.${{ steps.minor.outputs.result }}.0'
-          dry_run: no-push
+      - name: 🔢 Populate version dropdown from GitHub releases
+        id: populate
+        run: bun scripts/update-issue-form.mjs
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GITHUB_REPOSITORY: ${{ github.repository }}

-      - name: ⚙️ Update bug report node version dropdown
-        uses: ShaMan123/gha-populate-form-version@be012141ca560dbb92156e3fe098c46035f6260d #v2.0.5
-        with:
-          dropdown: _node_version
-          package: node
-          semver: '>=24.0.0'
-          dry_run: no-push
-
-      - name: 📬 Commit and create pull request
+      - name: 📬 Create pull request
+        id: cpr
        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
        with:
-          add-paths: .github/ISSUE_TEMPLATE/bug_report.yml
-          branch: ci-update-bug-report
+          add-paths: .github/ISSUE_TEMPLATE/issue_report.yml
+          branch: ci/update-issue-form
          base: develop
          delete-branch: true
          labels: ⚙️ ci, 🤖 github-actions
-          title: 'chore(): Update bug report template to match release version'
+          commit-message: "chore: update issue form version dropdown"
+          title: "chore: update issue form version dropdown"
+          # Follows .github/pull_request_template.md so the bot PR isn't flagged by PR validation.
          body: |
-            Automated update to `.github/ISSUE_TEMPLATE/bug_report.yml`
-            Triggered by workflow run [${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
+            # 📦 Pull Request
+
+            ## 📝 Description
+
+            Automated update of the **Streamyfin Version** dropdown in `.github/ISSUE_TEMPLATE/issue_report.yml`, populated from the latest published GitHub releases by `scripts/update-issue-form.mjs`.
+
+            **Version dropdown now lists:** ${{ steps.populate.outputs.versions }}
+
+            Triggered by `${{ github.event_name }}`${{ github.event.release.tag_name && format(' — release {0}', github.event.release.tag_name) || '' }} · [run ${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}).
+
+            ## 🏷️ Ticket / Issue
+
+            N/A — automated maintenance.
+
+            ### 🖼️ Screenshots / GIFs (if UI)
+
+            N/A — issue-template metadata only, no app UI.
+
+            ## ✅ Checklist
+
+            - [x] I’ve read the [contribution guidelines](CONTRIBUTING.md)
+            - [x] Verified that changes behave as expected for all platforms
+            - [x] Code passes lint/formatting and type checks (`tsc`/`biome`)
+            - [x] No secrets, hardcoded credentials, or private config files are included
+            - [x] I've declared if AI was used to assist with this PR (by uncommenting the line at the bottom, or not)
+
+            ## 🔍 Testing Instructions
+
+            N/A — generated by CI from published releases; review the dropdown diff in `issue_report.yml`.
+
+      - name: 🔀 Enable auto-merge
+        if: steps.cpr.outputs.pull-request-operation == 'created'
+        env:
+          GH_TOKEN: ${{ github.token }}
+        # Known limitation: PRs created with GITHUB_TOKEN don't trigger CI workflows
+        # (GitHub anti-recursion), so the required checks stay "Expected" until a
+        # maintainer kicks them (close/reopen the PR, or push an empty commit).
+        # Auto-merge is still worth enabling: once checks run and reviews land,
+        # the PR merges itself.
+        run: |
+          gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}" \
+            || echo "::warning::Could not enable auto-merge — enable 'Allow auto-merge' in repo settings (and branch protection); merge the PR manually for now."
--- a/app/(auth)/(tabs)/(favorites)/index.tsx
+++ b/app/(auth)/(tabs)/(favorites)/index.tsx
@@ -1,24 +1,14 @@
 import { useCallback, useState } from "react";
-import { useTranslation } from "react-i18next";
 import { Platform, RefreshControl, ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { FavoritesTabButtons } from "@/components/favorites/FavoritesTabButtons";
 import { Favorites } from "@/components/home/Favorites";
 import { Favorites as TVFavorites } from "@/components/home/Favorites.tv";
 import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
-import { useSettings } from "@/utils/atoms/settings";

 export default function FavoritesPage() {
  const invalidateCache = useInvalidatePlaybackProgressCache();
-  const { t } = useTranslation();
-  const { settings } = useSettings();

  const [loading, setLoading] = useState(false);
-  // KefinTweaks watchlist (Likes-backed) view, toggled in-place like Discover.
-  const watchlistEnabled = settings?.useKefinTweaks ?? false;
-  const [viewType, setViewType] = useState<"Favorites" | "Watchlist">(
-    "Favorites",
-  );
  const refetch = useCallback(async () => {
    setLoading(true);
    await invalidateCache();
@@ -30,8 +20,6 @@ export default function FavoritesPage() {
    return <TVFavorites />;
  }

-  const isWatchlist = watchlistEnabled && viewType === "Watchlist";
-
  return (
    <ScrollView
      nestedScrollEnabled
@@ -46,26 +34,7 @@ export default function FavoritesPage() {
      }}
    >
      <View style={{ paddingTop: Platform.OS === "android" ? 10 : 0 }}>
-        {watchlistEnabled && (
-          <View className='pl-4 pr-4 flex flex-row mb-2'>
-            <FavoritesTabButtons
-              viewType={viewType}
-              setViewType={setViewType}
-              t={t}
-            />
-          </View>
-        )}
-        {isWatchlist ? (
-          <Favorites
-            filter='Likes'
-            queryKeyBase='watchlist'
-            seeAllNamespace='kefintweaksWatchlist'
-            emptyTitleKey='kefintweaksWatchlist.noDataTitle'
-            emptyTextKey='kefintweaksWatchlist.noData'
-          />
-        ) : (
-          <Favorites />
-        )}
+        <Favorites />
      </View>
    </ScrollView>
  );
--- a/app/(auth)/(tabs)/(favorites)/see-all.tsx
+++ b/app/(auth)/(tabs)/(favorites)/see-all.tsx
@@ -2,7 +2,6 @@ import type { Api } from "@jellyfin/sdk";
 import type {
  BaseItemDto,
  BaseItemKind,
-  ItemFilter,
 } from "@jellyfin/sdk/lib/generated-client";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
 import { FlashList } from "@shopify/flash-list";
@@ -11,7 +10,7 @@ import { Stack, useLocalSearchParams } from "expo-router";
 import { t } from "i18next";
 import { useAtom } from "jotai";
 import { useCallback, useMemo } from "react";
-import { Platform, useWindowDimensions, View } from "react-native";
+import { useWindowDimensions, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Text } from "@/components/common/Text";
 import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
@@ -53,13 +52,9 @@ export default function FavoritesSeeAllScreen() {
  const searchParams = useLocalSearchParams<{
    type?: string;
    title?: string;
-    filter?: string;
  }>();
  const typeParam = searchParams.type;
  const titleParam = searchParams.title;
-  // Watchlist (KefinTweaks) reuses this screen with the "Likes" filter.
-  const filter: ItemFilter =
-    searchParams.filter === "Likes" ? "Likes" : "IsFavorite";

  const itemType = useMemo(() => {
    if (!isFavoriteType(typeParam)) return null;
@@ -82,7 +77,7 @@ export default function FavoritesSeeAllScreen() {
        userId: user.Id,
        sortBy: ["SeriesSortName", "SortName"],
        sortOrder: ["Ascending"],
-        filters: [filter],
+        filters: ["IsFavorite"],
        recursive: true,
        fields: ["PrimaryImageAspectRatio"],
        collapseBoxSetItems: false,
@@ -95,12 +90,12 @@ export default function FavoritesSeeAllScreen() {

      return response.data.Items || [];
    },
-    [api, itemType, user?.Id, filter],
+    [api, itemType, user?.Id],
  );

  const { data, isFetching, fetchNextPage, hasNextPage, isLoading } =
    useInfiniteQuery({
-      queryKey: ["favorites", "see-all", itemType, filter],
+      queryKey: ["favorites", "see-all", itemType],
      queryFn: ({ pageParam = 0 }) => fetchItems({ pageParam }),
      getNextPageParam: (lastPage, pages) => {
        if (!lastPage || lastPage.length < pageSize) return undefined;
@@ -160,7 +155,7 @@ export default function FavoritesSeeAllScreen() {
        options={{
          headerTitle: headerTitle,
          headerBlurEffect: "none",
-          headerTransparent: Platform.OS === "ios",
+          headerTransparent: true,
          headerShadowVisible: false,
        }}
      />
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites,watchlists)/series/[id].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites,watchlists)/series/[id].tsx
@@ -9,7 +9,6 @@ import { useEffect, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, View } from "react-native";
 import { AddToFavorites } from "@/components/AddToFavorites";
-import { AddToKefinWatchlist } from "@/components/AddToKefinWatchlist";
 import { DownloadItems } from "@/components/DownloadItem";
 import { ParallaxScrollView } from "@/components/ParallaxPage";
 import { NextUp } from "@/components/series/NextUp";
@@ -19,7 +18,6 @@ import { TVSeriesPage } from "@/components/series/TVSeriesPage";
 import { useDownload } from "@/providers/DownloadProvider";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { OfflineModeProvider } from "@/providers/OfflineModeProvider";
-import { useSettings } from "@/utils/atoms/settings";
 import {
  buildOfflineSeriesFromEpisodes,
  getDownloadedEpisodesForSeries,
@@ -32,7 +30,6 @@ import { storage } from "@/utils/mmkv";
 const page: React.FC = () => {
  const navigation = useNavigation();
  const { t } = useTranslation();
-  const { settings } = useSettings();
  const params = useLocalSearchParams();
  const {
    id: seriesId,
@@ -140,7 +137,6 @@ const page: React.FC = () => {
        !isLoading && item && allEpisodes && allEpisodes.length > 0 ? (
          <View className='flex flex-row items-center space-x-2'>
            <AddToFavorites item={item} />
-            {settings?.useKefinTweaks && <AddToKefinWatchlist item={item} />}
            {!Platform.isTV && (
              <DownloadItems
                size='large'
@@ -161,7 +157,7 @@ const page: React.FC = () => {
          </View>
        ) : null,
    });
-  }, [allEpisodes, isLoading, item, isOffline, settings?.useKefinTweaks]);
+  }, [allEpisodes, isLoading, item, isOffline]);

  // For offline mode, we can show the page even without backdropUrl
  if (!item || (!isOffline && !backdropUrl)) return null;
--- a/components/AddToKefinWatchlist.tsx
+++ b/components/AddToKefinWatchlist.tsx
@@ -1,28 +0,0 @@
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import type { FC } from "react";
-import { View, type ViewProps } from "react-native";
-import { RoundButton } from "@/components/RoundButton";
-import { useWatchlist } from "@/hooks/useWatchlist";
-
-interface Props extends ViewProps {
-  item: BaseItemDto;
-}
-
-/**
- * KefinTweaks watchlist toggle, backed by Jellyfin's "Likes" rating.
- * Render only when settings.useKefinTweaks is enabled.
- */
-export const AddToKefinWatchlist: FC<Props> = ({ item, ...props }) => {
-  const { isWatchlisted, toggleWatchlist } = useWatchlist(item);
-
-  return (
-    <View {...props}>
-      <RoundButton
-        size='large'
-        icon={isWatchlisted ? "bookmark" : "bookmark-outline"}
-        color={isWatchlisted ? "purple" : "white"}
-        onPress={toggleWatchlist}
-      />
-    </View>
-  );
-};
--- a/components/ItemContent.tsx
+++ b/components/ItemContent.tsx
@@ -29,7 +29,6 @@ import { useOfflineMode } from "@/providers/OfflineModeProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
 import { AddToFavorites } from "./AddToFavorites";
-import { AddToKefinWatchlist } from "./AddToKefinWatchlist";
 import { AddToWatchlist } from "./AddToWatchlist";
 import { ItemHeader } from "./ItemHeader";
 import { ItemTechnicalDetails } from "./ItemTechnicalDetails";
@@ -139,9 +138,6 @@ const ItemContentMobile: React.FC<ItemContentProps> = ({

                  <PlayedStatus items={[item]} size='large' />
                  <AddToFavorites item={item} />
-                  {settings.useKefinTweaks && (
-                    <AddToKefinWatchlist item={item} />
-                  )}
                  {settings.streamyStatsServerUrl &&
                    !settings.hideWatchlistsTab && (
                      <AddToWatchlist item={item} />
@@ -164,9 +160,6 @@ const ItemContentMobile: React.FC<ItemContentProps> = ({

                  <PlayedStatus items={[item]} size='large' />
                  <AddToFavorites item={item} />
-                  {settings.useKefinTweaks && (
-                    <AddToKefinWatchlist item={item} />
-                  )}
                  {settings.streamyStatsServerUrl &&
                    !settings.hideWatchlistsTab && (
                      <AddToWatchlist item={item} />
@@ -185,7 +178,6 @@ const ItemContentMobile: React.FC<ItemContentProps> = ({
    settings.hideRemoteSessionButton,
    settings.streamyStatsServerUrl,
    settings.hideWatchlistsTab,
-    settings.useKefinTweaks,
  ]);

  useEffect(() => {
--- a/components/ItemContent.tv.tsx
+++ b/components/ItemContent.tv.tsx
@@ -39,7 +39,6 @@ import {
  TVRefreshButton,
  TVSeriesNavigation,
  TVTechnicalDetails,
-  TVWatchlistButton,
 } from "@/components/tv";
 import type { Track } from "@/components/video-player/controls/types";
 import { useScaledTVTypography } from "@/constants/TVTypography";
@@ -753,7 +752,6 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
                  </Text>
                </TVButton>
                <TVFavoriteButton item={item} />
-                {settings.useKefinTweaks && <TVWatchlistButton item={item} />}
                <TVPlayedButton item={item} />
                <TVRefreshButton itemId={item.Id} />
              </View>
--- a/components/common/TouchableItemRouter.tsx
+++ b/components/common/TouchableItemRouter.tsx
@@ -11,10 +11,8 @@ import {
 import useRouter from "@/hooks/useAppRouter";
 import { useFavorite } from "@/hooks/useFavorite";
 import { useMarkAsPlayed } from "@/hooks/useMarkAsPlayed";
-import { useWatchlist } from "@/hooks/useWatchlist";
 import { useDownload } from "@/providers/DownloadProvider";
 import { useOfflineMode } from "@/providers/OfflineModeProvider";
-import { useSettings } from "@/utils/atoms/settings";

 interface Props extends TouchableOpacityProps {
  item: BaseItemDto;
@@ -157,8 +155,6 @@ export const TouchableItemRouter: React.FC<PropsWithChildren<Props>> = ({
  const { showActionSheetWithOptions } = useActionSheet();
  const markAsPlayedStatus = useMarkAsPlayed([item]);
  const { isFavorite, toggleFavorite } = useFavorite(item);
-  const { isWatchlisted, toggleWatchlist } = useWatchlist(item);
-  const { settings } = useSettings();
  const router = useRouter();
  const isOffline = useOfflineMode();
  const { deleteFile } = useDownload();
@@ -187,66 +183,36 @@ export const TouchableItemRouter: React.FC<PropsWithChildren<Props>> = ({
    )
      return;

-    // Build options as { label, action } so dynamic entries (watchlist,
-    // offline delete) don't break index-based handling.
-    const actions: {
-      label: string;
-      action: () => void;
-      destructive?: boolean;
-    }[] = [
-      {
-        label: t("common.mark_as_played"),
-        action: () => {
-          markAsPlayedStatus(true);
-        },
-      },
-      {
-        label: t("common.mark_as_not_played"),
-        action: () => {
-          markAsPlayedStatus(false);
-        },
-      },
-      {
-        label: isFavorite
-          ? t("music.track_options.remove_from_favorites")
-          : t("music.track_options.add_to_favorites"),
-        action: toggleFavorite,
-      },
+    const options: string[] = [
+      t("common.mark_as_played"),
+      t("common.mark_as_not_played"),
+      isFavorite
+        ? t("music.track_options.remove_from_favorites")
+        : t("music.track_options.add_to_favorites"),
+      ...(isOffline ? [t("home.downloads.delete_download")] : []),
+      t("common.cancel"),
    ];
-
-    if (settings?.useKefinTweaks) {
-      actions.push({
-        label: isWatchlisted
-          ? t("watchlists.remove_from_watchlist")
-          : t("watchlists.add_to_watchlist"),
-        action: toggleWatchlist,
-      });
-    }
-
-    if (isOffline && item.Id) {
-      const id = item.Id;
-      actions.push({
-        label: t("home.downloads.delete_download"),
-        action: () => deleteFile(id),
-        destructive: true,
-      });
-    }
-
-    const options = [...actions.map((a) => a.label), t("common.cancel")];
    const cancelButtonIndex = options.length - 1;
-    const destructiveButtonIndex = actions.findIndex((a) => a.destructive);
+    const destructiveButtonIndex = isOffline
+      ? cancelButtonIndex - 1
+      : undefined;

    showActionSheetWithOptions(
      {
        options,
        cancelButtonIndex,
-        destructiveButtonIndex:
-          destructiveButtonIndex === -1 ? undefined : destructiveButtonIndex,
+        destructiveButtonIndex,
      },
-      (selectedIndex) => {
-        if (selectedIndex === undefined || selectedIndex >= actions.length)
-          return;
-        actions[selectedIndex].action();
+      async (selectedIndex) => {
+        if (selectedIndex === 0) {
+          await markAsPlayedStatus(true);
+        } else if (selectedIndex === 1) {
+          await markAsPlayedStatus(false);
+        } else if (selectedIndex === 2) {
+          toggleFavorite();
+        } else if (isOffline && selectedIndex === 3 && item.Id) {
+          deleteFile(item.Id);
+        }
      },
    );
  }, [
@@ -254,9 +220,6 @@ export const TouchableItemRouter: React.FC<PropsWithChildren<Props>> = ({
    isFavorite,
    markAsPlayedStatus,
    toggleFavorite,
-    isWatchlisted,
-    toggleWatchlist,
-    settings?.useKefinTweaks,
    isOffline,
    deleteFile,
    item.Id,
--- a/components/favorites/FavoritesTabButtons.tsx
+++ b/components/favorites/FavoritesTabButtons.tsx
@@ -1,74 +0,0 @@
-import { Platform, TouchableOpacity, View } from "react-native";
-import { Tag } from "@/components/GenreTags";
-
-// @expo/ui's SwiftUI native module (ExpoUI) does not exist in tvOS builds.
-// A static top-level import crashes the route tree on tvOS at module load.
-// Load it lazily and only off-TV; TV never renders this component.
-const { Button, Host, HStack, Spacer } = Platform.isTV
-  ? ({} as typeof import("@expo/ui/swift-ui"))
-  : require("@expo/ui/swift-ui");
-const { buttonStyle } = Platform.isTV
-  ? ({} as typeof import("@expo/ui/swift-ui/modifiers"))
-  : require("@expo/ui/swift-ui/modifiers");
-
-type ViewType = "Favorites" | "Watchlist";
-
-interface FavoritesTabButtonsProps {
-  viewType: ViewType;
-  setViewType: (type: ViewType) => void;
-  t: (key: string) => string;
-}
-
-export const FavoritesTabButtons: React.FC<FavoritesTabButtonsProps> = ({
-  viewType,
-  setViewType,
-  t,
-}) => {
-  if (Platform.OS === "ios" && !Platform.isTV) {
-    return (
-      <Host style={{ height: 40, flex: 1 }}>
-        <HStack spacing={8}>
-          <Button
-            modifiers={[
-              buttonStyle(
-                viewType === "Favorites" ? "glassProminent" : "glass",
-              ),
-            ]}
-            onPress={() => setViewType("Favorites")}
-            label={t("tabs.favorites")}
-          />
-          <Button
-            modifiers={[
-              buttonStyle(
-                viewType === "Watchlist" ? "glassProminent" : "glass",
-              ),
-            ]}
-            onPress={() => setViewType("Watchlist")}
-            label={t("favorites.watchlist")}
-          />
-          <Spacer />
-        </HStack>
-      </Host>
-    );
-  }
-
-  // Android UI
-  return (
-    <View className='flex flex-row gap-1 mr-1'>
-      <TouchableOpacity onPress={() => setViewType("Favorites")}>
-        <Tag
-          text={t("tabs.favorites")}
-          textClass='p-1'
-          className={viewType === "Favorites" ? "bg-purple-600" : undefined}
-        />
-      </TouchableOpacity>
-      <TouchableOpacity onPress={() => setViewType("Watchlist")}>
-        <Tag
-          text={t("favorites.watchlist")}
-          textClass='p-1'
-          className={viewType === "Watchlist" ? "bg-purple-600" : undefined}
-        />
-      </TouchableOpacity>
-    </View>
-  );
-};
--- a/components/favorites/TVFavoritesTabBadges.tsx
+++ b/components/favorites/TVFavoritesTabBadges.tsx
@@ -1,117 +0,0 @@
-import React from "react";
-import { useTranslation } from "react-i18next";
-import { Animated, Pressable, View } from "react-native";
-import { Text } from "@/components/common/Text";
-import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
-import { useScaledTVTypography } from "@/constants/TVTypography";
-
-type ViewType = "Favorites" | "Watchlist";
-
-interface TVFavoritesTabBadgeProps {
-  label: string;
-  isSelected: boolean;
-  onPress: () => void;
-  hasTVPreferredFocus?: boolean;
-}
-
-const TVFavoritesTabBadge: React.FC<TVFavoritesTabBadgeProps> = ({
-  label,
-  isSelected,
-  onPress,
-  hasTVPreferredFocus = false,
-}) => {
-  const typography = useScaledTVTypography();
-  const { focused, handleFocus, handleBlur, animatedStyle } =
-    useTVFocusAnimation({ duration: 150 });
-
-  // Design language: white for focused/selected, transparent white for unfocused
-  const getBackgroundColor = () => {
-    if (focused) return "#fff";
-    if (isSelected) return "rgba(255,255,255,0.25)";
-    return "rgba(255,255,255,0.1)";
-  };
-
-  const getTextColor = () => {
-    if (focused) return "#000";
-    return "#fff";
-  };
-
-  return (
-    <Pressable
-      onPress={onPress}
-      onFocus={handleFocus}
-      onBlur={handleBlur}
-      hasTVPreferredFocus={hasTVPreferredFocus}
-    >
-      <Animated.View
-        style={[
-          animatedStyle,
-          {
-            paddingHorizontal: 24,
-            paddingVertical: 14,
-            borderRadius: 24,
-            backgroundColor: getBackgroundColor(),
-            shadowColor: "#fff",
-            shadowOffset: { width: 0, height: 0 },
-            shadowOpacity: focused ? 0.4 : 0,
-            shadowRadius: focused ? 12 : 0,
-          },
-        ]}
-      >
-        <Text
-          style={{
-            fontSize: typography.callout,
-            color: getTextColor(),
-            fontWeight: isSelected || focused ? "600" : "400",
-          }}
-        >
-          {label}
-        </Text>
-      </Animated.View>
-    </Pressable>
-  );
-};
-
-export interface TVFavoritesTabBadgesProps {
-  viewType: ViewType;
-  setViewType: (type: ViewType) => void;
-  /** Only render the toggle when the KefinTweaks watchlist is enabled. */
-  enabled: boolean;
-  hasTVPreferredFocus?: boolean;
-}
-
-export const TVFavoritesTabBadges: React.FC<TVFavoritesTabBadgesProps> = ({
-  viewType,
-  setViewType,
-  enabled,
-  hasTVPreferredFocus = false,
-}) => {
-  const { t } = useTranslation();
-
-  if (!enabled) {
-    return null;
-  }
-
-  return (
-    <View
-      style={{
-        flexDirection: "row",
-        gap: 16,
-        marginBottom: 24,
-      }}
-    >
-      <TVFavoritesTabBadge
-        label={t("tabs.favorites")}
-        isSelected={viewType === "Favorites"}
-        onPress={() => setViewType("Favorites")}
-        hasTVPreferredFocus={hasTVPreferredFocus && viewType === "Favorites"}
-      />
-      <TVFavoritesTabBadge
-        label={t("favorites.watchlist")}
-        isSelected={viewType === "Watchlist"}
-        onPress={() => setViewType("Watchlist")}
-        hasTVPreferredFocus={hasTVPreferredFocus && viewType === "Watchlist"}
-      />
-    </View>
-  );
-};
--- a/components/home/Favorites.tsx
+++ b/components/home/Favorites.tsx
@@ -1,8 +1,5 @@
 import type { Api } from "@jellyfin/sdk";
-import type {
-  BaseItemKind,
-  ItemFilter,
-} from "@jellyfin/sdk/lib/generated-client";
+import type { BaseItemKind } from "@jellyfin/sdk/lib/generated-client";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
 import { Image } from "expo-image";
 import { t } from "i18next";
@@ -25,24 +22,7 @@ type FavoriteTypes =
  | "Playlist";
 type EmptyState = Record<FavoriteTypes, boolean>;

-interface FavoritesProps {
-  /** Jellyfin item filter. "IsFavorite" (default) or "Likes" for the watchlist view. */
-  filter?: ItemFilter;
-  /** Query key segment used to keep favorites/watchlist caches separate. */
-  queryKeyBase?: string;
-  emptyTitleKey?: string;
-  emptyTextKey?: string;
-  /** Namespace for the see-all page headers ("favorites" or "kefintweaksWatchlist"). */
-  seeAllNamespace?: string;
-}
-
-export const Favorites = ({
-  filter = "IsFavorite",
-  queryKeyBase = "favorites",
-  emptyTitleKey = "favorites.noDataTitle",
-  emptyTextKey = "favorites.noData",
-  seeAllNamespace = "favorites",
-}: FavoritesProps = {}) => {
+export const Favorites = () => {
  const router = useRouter();
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
@@ -66,7 +46,7 @@ export const Favorites = ({
        userId: user?.Id,
        sortBy: ["SeriesSortName", "SortName"],
        sortOrder: ["Ascending"],
-        filters: [filter],
+        filters: ["IsFavorite"],
        recursive: true,
        fields: ["PrimaryImageAspectRatio"],
        collapseBoxSetItems: false,
@@ -88,7 +68,7 @@ export const Favorites = ({

      return items;
    },
-    [api, user, filter],
+    [api, user],
  );

  // Reset empty state when component mounts or dependencies change
@@ -146,68 +126,44 @@ export const Favorites = ({
  const handleSeeAllSeries = useCallback(() => {
    router.push({
      pathname: "/(auth)/(tabs)/(favorites)/see-all",
-      params: {
-        type: "Series",
-        title: t(`${seeAllNamespace}.seeAllSeries`),
-        filter,
-      },
+      params: { type: "Series", title: t("favorites.series") },
    } as any);
-  }, [router, filter, seeAllNamespace]);
+  }, [router]);

  const handleSeeAllMovies = useCallback(() => {
    router.push({
      pathname: "/(auth)/(tabs)/(favorites)/see-all",
-      params: {
-        type: "Movie",
-        title: t(`${seeAllNamespace}.seeAllMovies`),
-        filter,
-      },
+      params: { type: "Movie", title: t("favorites.movies") },
    } as any);
-  }, [router, filter, seeAllNamespace]);
+  }, [router]);

  const handleSeeAllEpisodes = useCallback(() => {
    router.push({
      pathname: "/(auth)/(tabs)/(favorites)/see-all",
-      params: {
-        type: "Episode",
-        title: t(`${seeAllNamespace}.seeAllEpisodes`),
-        filter,
-      },
+      params: { type: "Episode", title: t("favorites.episodes") },
    } as any);
-  }, [router, filter, seeAllNamespace]);
+  }, [router]);

  const handleSeeAllVideos = useCallback(() => {
    router.push({
      pathname: "/(auth)/(tabs)/(favorites)/see-all",
-      params: {
-        type: "Video",
-        title: t(`${seeAllNamespace}.seeAllVideos`),
-        filter,
-      },
+      params: { type: "Video", title: t("favorites.videos") },
    } as any);
-  }, [router, filter, seeAllNamespace]);
+  }, [router]);

  const handleSeeAllBoxsets = useCallback(() => {
    router.push({
      pathname: "/(auth)/(tabs)/(favorites)/see-all",
-      params: {
-        type: "BoxSet",
-        title: t(`${seeAllNamespace}.seeAllBoxsets`),
-        filter,
-      },
+      params: { type: "BoxSet", title: t("favorites.boxsets") },
    } as any);
-  }, [router, filter, seeAllNamespace]);
+  }, [router]);

  const handleSeeAllPlaylists = useCallback(() => {
    router.push({
      pathname: "/(auth)/(tabs)/(favorites)/see-all",
-      params: {
-        type: "Playlist",
-        title: t(`${seeAllNamespace}.seeAllPlaylists`),
-        filter,
-      },
+      params: { type: "Playlist", title: t("favorites.playlists") },
    } as any);
-  }, [router, filter, seeAllNamespace]);
+  }, [router]);

  return (
    <View className='flex flex-co gap-y-4'>
@@ -220,16 +176,16 @@ export const Favorites = ({
            source={heart}
          />
          <Text className='text-xl font-semibold text-white mb-2'>
-            {t(emptyTitleKey)}
+            {t("favorites.noDataTitle")}
          </Text>
          <Text className='text-base text-white/70 text-center max-w-xs px-4'>
-            {t(emptyTextKey)}
+            {t("favorites.noData")}
          </Text>
        </View>
      )}
      <InfiniteScrollingCollectionList
        queryFn={fetchFavoriteSeries}
-        queryKey={["home", queryKeyBase, "series"]}
+        queryKey={["home", "favorites", "series"]}
        title={t("favorites.series")}
        hideIfEmpty
        pageSize={pageSize}
@@ -237,7 +193,7 @@ export const Favorites = ({
      />
      <InfiniteScrollingCollectionList
        queryFn={fetchFavoriteMovies}
-        queryKey={["home", queryKeyBase, "movies"]}
+        queryKey={["home", "favorites", "movies"]}
        title={t("favorites.movies")}
        hideIfEmpty
        orientation='vertical'
@@ -246,7 +202,7 @@ export const Favorites = ({
      />
      <InfiniteScrollingCollectionList
        queryFn={fetchFavoriteEpisodes}
-        queryKey={["home", queryKeyBase, "episodes"]}
+        queryKey={["home", "favorites", "episodes"]}
        title={t("favorites.episodes")}
        hideIfEmpty
        pageSize={pageSize}
@@ -254,7 +210,7 @@ export const Favorites = ({
      />
      <InfiniteScrollingCollectionList
        queryFn={fetchFavoriteVideos}
-        queryKey={["home", queryKeyBase, "videos"]}
+        queryKey={["home", "favorites", "videos"]}
        title={t("favorites.videos")}
        hideIfEmpty
        pageSize={pageSize}
@@ -262,7 +218,7 @@ export const Favorites = ({
      />
      <InfiniteScrollingCollectionList
        queryFn={fetchFavoriteBoxsets}
-        queryKey={["home", queryKeyBase, "boxsets"]}
+        queryKey={["home", "favorites", "boxsets"]}
        title={t("favorites.boxsets")}
        hideIfEmpty
        pageSize={pageSize}
@@ -270,7 +226,7 @@ export const Favorites = ({
      />
      <InfiniteScrollingCollectionList
        queryFn={fetchFavoritePlaylists}
-        queryKey={["home", queryKeyBase, "playlists"]}
+        queryKey={["home", "favorites", "playlists"]}
        title={t("favorites.playlists")}
        hideIfEmpty
        pageSize={pageSize}
--- a/components/home/Favorites.tv.tsx
+++ b/components/home/Favorites.tv.tsx
@@ -1,8 +1,5 @@
 import type { Api } from "@jellyfin/sdk";
-import type {
-  BaseItemKind,
-  ItemFilter,
-} from "@jellyfin/sdk/lib/generated-client";
+import type { BaseItemKind } from "@jellyfin/sdk/lib/generated-client";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
 import { Image } from "expo-image";
 import { useAtom } from "jotai";
@@ -12,12 +9,10 @@ import { ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import heart from "@/assets/icons/heart.fill.png";
 import { Text } from "@/components/common/Text";
-import { TVFavoritesTabBadges } from "@/components/favorites/TVFavoritesTabBadges";
 import { InfiniteScrollingCollectionList } from "@/components/home/InfiniteScrollingCollectionList.tv";
 import { Colors } from "@/constants/Colors";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";

 const HORIZONTAL_PADDING = 60;
 const TOP_PADDING = 100;
@@ -38,27 +33,7 @@ export const Favorites = () => {
  const insets = useSafeAreaInsets();
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
-  const { settings } = useSettings();
  const pageSize = 20;
-
-  // KefinTweaks watchlist (Likes-backed) view, toggled in-place like Discover.
-  const watchlistEnabled = settings?.useKefinTweaks ?? false;
-  const [viewType, setViewType] = useState<"Favorites" | "Watchlist">(
-    "Favorites",
-  );
-  const filter: ItemFilter =
-    watchlistEnabled && viewType === "Watchlist" ? "Likes" : "IsFavorite";
-  const queryKeyBase =
-    watchlistEnabled && viewType === "Watchlist" ? "watchlist" : "favorites";
-  // Translation namespace for the empty state, swapped for the KefinTweaks
-  // watchlist (Likes-backed) view. Section titles stay generic ("Series").
-  const emptyNamespace =
-    watchlistEnabled && viewType === "Watchlist"
-      ? "kefintweaksWatchlist"
-      : "favorites";
-  const emptyTitleKey = `${emptyNamespace}.noDataTitle`;
-  const emptyTextKey = `${emptyNamespace}.noData`;
-
  const [emptyState, setEmptyState] = useState<EmptyState>({
    Series: false,
    Movie: false,
@@ -78,7 +53,7 @@ export const Favorites = () => {
        userId: user?.Id,
        sortBy: ["SeriesSortName", "SortName"],
        sortOrder: ["Ascending"],
-        filters: [filter],
+        filters: ["IsFavorite"],
        recursive: true,
        fields: ["PrimaryImageAspectRatio"],
        collapseBoxSetItems: false,
@@ -99,7 +74,7 @@ export const Favorites = () => {

      return items;
    },
-    [api, user, filter],
+    [api, user],
  );

  useEffect(() => {
@@ -111,7 +86,7 @@ export const Favorites = () => {
      BoxSet: false,
      Playlist: false,
    });
-  }, [api, user, viewType]);
+  }, [api, user]);

  const areAllEmpty = () => {
    const loadedCategories = Object.values(emptyState);
@@ -152,63 +127,46 @@ export const Favorites = () => {
    [fetchFavoritesByType, pageSize],
  );

-  const tabBadges = (
-    <TVFavoritesTabBadges
-      viewType={viewType}
-      setViewType={setViewType}
-      enabled={watchlistEnabled}
-      hasTVPreferredFocus={watchlistEnabled}
-    />
-  );
-
  if (areAllEmpty()) {
    return (
      <View
        style={{
          flex: 1,
-          paddingTop: insets.top + TOP_PADDING,
+          alignItems: "center",
+          justifyContent: "center",
          paddingHorizontal: HORIZONTAL_PADDING,
        }}
      >
-        {tabBadges}
-        <View
+        <Image
          style={{
-            flex: 1,
-            alignItems: "center",
-            justifyContent: "center",
+            width: 64,
+            height: 64,
+            marginBottom: 16,
+            tintColor: Colors.primary,
+          }}
+          contentFit='contain'
+          source={heart}
+        />
+        <Text
+          style={{
+            fontSize: typography.heading,
+            fontWeight: "bold",
+            marginBottom: 8,
+            color: "#FFFFFF",
          }}
        >
-          <Image
-            style={{
-              width: 64,
-              height: 64,
-              marginBottom: 16,
-              tintColor: Colors.primary,
-            }}
-            contentFit='contain'
-            source={heart}
-          />
-          <Text
-            style={{
-              fontSize: typography.heading,
-              fontWeight: "bold",
-              marginBottom: 8,
-              color: "#FFFFFF",
-            }}
-          >
-            {t(emptyTitleKey)}
-          </Text>
-          <Text
-            style={{
-              textAlign: "center",
-              opacity: 0.7,
-              fontSize: typography.body,
-              color: "#FFFFFF",
-            }}
-          >
-            {t(emptyTextKey)}
-          </Text>
-        </View>
+          {t("favorites.noDataTitle")}
+        </Text>
+        <Text
+          style={{
+            textAlign: "center",
+            opacity: 0.7,
+            fontSize: typography.body,
+            color: "#FFFFFF",
+          }}
+        >
+          {t("favorites.noData")}
+        </Text>
      </View>
    );
  }
@@ -223,22 +181,17 @@ export const Favorites = () => {
      }}
    >
      <View style={{ gap: SECTION_GAP }}>
-        {watchlistEnabled && (
-          <View style={{ paddingHorizontal: HORIZONTAL_PADDING }}>
-            {tabBadges}
-          </View>
-        )}
        <InfiniteScrollingCollectionList
          queryFn={fetchFavoriteSeries}
-          queryKey={["home", queryKeyBase, "series"]}
+          queryKey={["home", "favorites", "series"]}
          title={t("favorites.series")}
          hideIfEmpty
          pageSize={pageSize}
-          isFirstSection={!watchlistEnabled}
+          isFirstSection
        />
        <InfiniteScrollingCollectionList
          queryFn={fetchFavoriteMovies}
-          queryKey={["home", queryKeyBase, "movies"]}
+          queryKey={["home", "favorites", "movies"]}
          title={t("favorites.movies")}
          hideIfEmpty
          orientation='vertical'
@@ -246,28 +199,28 @@ export const Favorites = () => {
        />
        <InfiniteScrollingCollectionList
          queryFn={fetchFavoriteEpisodes}
-          queryKey={["home", queryKeyBase, "episodes"]}
+          queryKey={["home", "favorites", "episodes"]}
          title={t("favorites.episodes")}
          hideIfEmpty
          pageSize={pageSize}
        />
        <InfiniteScrollingCollectionList
          queryFn={fetchFavoriteVideos}
-          queryKey={["home", queryKeyBase, "videos"]}
+          queryKey={["home", "favorites", "videos"]}
          title={t("favorites.videos")}
          hideIfEmpty
          pageSize={pageSize}
        />
        <InfiniteScrollingCollectionList
          queryFn={fetchFavoriteBoxsets}
-          queryKey={["home", queryKeyBase, "boxsets"]}
+          queryKey={["home", "favorites", "boxsets"]}
          title={t("favorites.boxsets")}
          hideIfEmpty
          pageSize={pageSize}
        />
        <InfiniteScrollingCollectionList
          queryFn={fetchFavoritePlaylists}
-          queryKey={["home", queryKeyBase, "playlists"]}
+          queryKey={["home", "favorites", "playlists"]}
          title={t("favorites.playlists")}
          hideIfEmpty
          pageSize={pageSize}
--- a/components/tv/TVWatchlistButton.tsx
+++ b/components/tv/TVWatchlistButton.tsx
@@ -1,36 +0,0 @@
-import { Ionicons } from "@expo/vector-icons";
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import React from "react";
-import { useWatchlist } from "@/hooks/useWatchlist";
-import { TVButton } from "./TVButton";
-
-export interface TVWatchlistButtonProps {
-  item: BaseItemDto;
-  disabled?: boolean;
-}
-
-/**
- * KefinTweaks watchlist toggle (Likes-backed) for TV detail pages.
- * Render only when settings.useKefinTweaks is enabled.
- */
-export const TVWatchlistButton: React.FC<TVWatchlistButtonProps> = ({
-  item,
-  disabled,
-}) => {
-  const { isWatchlisted, toggleWatchlist } = useWatchlist(item);
-
-  return (
-    <TVButton
-      onPress={toggleWatchlist}
-      variant='glass'
-      square
-      disabled={disabled}
-    >
-      <Ionicons
-        name={isWatchlisted ? "bookmark" : "bookmark-outline"}
-        size={28}
-        color='#FFFFFF'
-      />
-    </TVButton>
-  );
-};
--- a/components/tv/index.ts
+++ b/components/tv/index.ts
@@ -68,5 +68,3 @@ export { TVTrackCard } from "./TVTrackCard";
 // User switching
 export type { TVUserCardProps } from "./TVUserCard";
 export { TVUserCard } from "./TVUserCard";
-export type { TVWatchlistButtonProps } from "./TVWatchlistButton";
-export { TVWatchlistButton } from "./TVWatchlistButton";
--- a/hooks/useWatchlist.ts
+++ b/hooks/useWatchlist.ts
@@ -1,146 +0,0 @@
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { atom, useAtom } from "jotai";
-import { useCallback, useEffect, useMemo, useRef } from "react";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-
-// Shared atom to store watchlist (Likes) status across all components
-// Maps itemId -> isWatchlisted
-const watchlistAtom = atom<Record<string, boolean>>({});
-
-/**
- * KefinTweaks watchlist is backed by Jellyfin's native "Likes" rating.
- * Toggling watchlist membership toggles UserData.Likes on the item.
- */
-export const useWatchlist = (item: BaseItemDto) => {
-  const queryClient = useQueryClient();
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-  const [watchlist, setWatchlist] = useAtom(watchlistAtom);
-
-  const itemId = item.Id ?? "";
-
-  // Get current watchlist status from shared state, falling back to item data
-  const isWatchlisted = itemId
-    ? (watchlist[itemId] ?? item.UserData?.Likes)
-    : item.UserData?.Likes;
-
-  // Update shared state when item data changes
-  useEffect(() => {
-    if (itemId && item.UserData?.Likes !== undefined) {
-      setWatchlist((prev) => ({
-        ...prev,
-        [itemId]: item.UserData!.Likes!,
-      }));
-    }
-  }, [itemId, item.UserData?.Likes, setWatchlist]);
-
-  // Helper to update watchlist status in shared state
-  const setIsWatchlisted = useCallback(
-    (value: boolean | null | undefined) => {
-      if (itemId && typeof value === "boolean") {
-        setWatchlist((prev) => ({ ...prev, [itemId]: value }));
-      }
-    },
-    [itemId, setWatchlist],
-  );
-
-  // Use refs to avoid stale closure issues in mutationFn
-  const itemRef = useRef(item);
-  const apiRef = useRef(api);
-  const userRef = useRef(user);
-
-  // Keep refs updated
-  useEffect(() => {
-    itemRef.current = item;
-  }, [item]);
-
-  useEffect(() => {
-    apiRef.current = api;
-  }, [api]);
-
-  useEffect(() => {
-    userRef.current = user;
-  }, [user]);
-
-  const itemQueryKeyPrefix = useMemo(
-    () => ["item", item.Id] as const,
-    [item.Id],
-  );
-
-  const updateItemInQueries = useCallback(
-    (newData: Partial<BaseItemDto>) => {
-      queryClient.setQueriesData<BaseItemDto | null | undefined>(
-        { queryKey: itemQueryKeyPrefix },
-        (old) => {
-          if (!old) return old;
-          return {
-            ...old,
-            ...newData,
-            UserData: { ...old.UserData, ...newData.UserData },
-          };
-        },
-      );
-    },
-    [itemQueryKeyPrefix, queryClient],
-  );
-
-  const watchlistMutation = useMutation({
-    mutationFn: async (nextIsWatchlisted: boolean) => {
-      const currentApi = apiRef.current;
-      const currentUser = userRef.current;
-      const currentItem = itemRef.current;
-
-      if (!currentApi || !currentUser?.Id || !currentItem?.Id) {
-        return;
-      }
-
-      // Watchlist == Jellyfin "Likes" rating:
-      // POST /UserItems/{itemId}/Rating?userId={userId}&likes=true   - add to watchlist
-      // POST /UserItems/{itemId}/Rating?userId={userId}&likes=false  - remove from watchlist
-      const path = `/UserItems/${currentItem.Id}/Rating`;
-
-      const response = await currentApi.post(
-        path,
-        {},
-        { params: { userId: currentUser.Id, likes: nextIsWatchlisted } },
-      );
-      return response.data;
-    },
-    onMutate: async (nextIsWatchlisted: boolean) => {
-      await queryClient.cancelQueries({ queryKey: itemQueryKeyPrefix });
-
-      const previousIsWatchlisted = isWatchlisted;
-      const previousQueries = queryClient.getQueriesData<BaseItemDto | null>({
-        queryKey: itemQueryKeyPrefix,
-      });
-
-      setIsWatchlisted(nextIsWatchlisted);
-      updateItemInQueries({ UserData: { Likes: nextIsWatchlisted } });
-
-      return { previousIsWatchlisted, previousQueries };
-    },
-    onError: (_err, _nextIsWatchlisted, context) => {
-      if (context?.previousQueries) {
-        for (const [queryKey, data] of context.previousQueries) {
-          queryClient.setQueryData(queryKey, data);
-        }
-      }
-      setIsWatchlisted(context?.previousIsWatchlisted);
-    },
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: itemQueryKeyPrefix });
-      queryClient.invalidateQueries({ queryKey: ["home", "watchlist"] });
-    },
-  });
-
-  const toggleWatchlist = useCallback(() => {
-    watchlistMutation.mutate(!isWatchlisted);
-  }, [watchlistMutation, isWatchlisted]);
-
-  return {
-    isWatchlisted,
-    toggleWatchlist,
-    watchlistMutation,
-  };
-};
--- a/scripts/update-issue-form.mjs
+++ b/scripts/update-issue-form.mjs
@@ -0,0 +1,122 @@
+#!/usr/bin/env bun
+/**
+ * Populates the "Streamyfin Version" dropdown in the issue report form with the
+ * latest GitHub releases. Run by the "Update Issue Form Versions" workflow on
+ * release events + a weekly cron (and manually via workflow_dispatch).
+ *
+ * Source: published, non-draft, non-prerelease GitHub releases, newest first.
+ * Non-version sentinels (e.g. "older", "TestFlight/Development build") are
+ * preserved at the end of the list.
+ *
+ * Usage:
+ *   bun scripts/update-issue-form.mjs            # rewrite the form in place
+ *   ISSUE_FORM_LIMIT=8 bun scripts/update-issue-form.mjs
+ *   bun scripts/update-issue-form.mjs --dry-run  # print the new options, don't write
+ *
+ * Env: GITHUB_REPOSITORY (owner/repo), GH_TOKEN/GITHUB_TOKEN (for gh, provided in CI).
+ */
+
+import { execFileSync } from "node:child_process";
+import {
+  appendFileSync,
+  readFileSync as read,
+  writeFileSync as write,
+} from "node:fs";
+
+const FORM = ".github/ISSUE_TEMPLATE/issue_report.yml";
+const DROPDOWN_ID = "version"; // the `id:` of the dropdown to populate
+const parsedLimit = Number.parseInt(process.env.ISSUE_FORM_LIMIT ?? "", 10);
+const LIMIT =
+  Number.isInteger(parsedLimit) && parsedLimit > 0 ? parsedLimit : 5;
+const REPO = process.env.GITHUB_REPOSITORY || "streamyfin/streamyfin";
+const DRY = process.argv.includes("--dry-run");
+
+// Matches "0.54.1" and prerelease/beta tags like "0.54.0-beta.1".
+const isVersion = (s) => /^\d+\.\d+/.test(s.trim());
+
+// 1. Fetch the latest published releases (newest first) — drafts and prereleases
+//    aren't a full release users run, so they don't belong in the dropdown.
+const raw = execFileSync(
+  "gh",
+  [
+    "release",
+    "list",
+    "--repo",
+    REPO,
+    "--exclude-drafts",
+    "--exclude-pre-releases",
+    "--limit",
+    String(LIMIT),
+    "--json",
+    "tagName",
+    "--jq",
+    ".[].tagName",
+  ],
+  // Bounded timeout so a stuck gh process fails the job fast instead of
+  // holding the workflow open until the job-level timeout.
+  { encoding: "utf8", timeout: 30_000 },
+);
+const seen = new Set();
+const versions = [];
+for (const tag of raw.split("\n")) {
+  if (!tag) continue;
+  const ver = tag.trim().replace(/^v/, "");
+  if (!isVersion(ver) || seen.has(ver)) continue;
+  seen.add(ver);
+  versions.push(ver);
+}
+
+if (!versions.length) {
+  console.error("No release versions found — leaving the form untouched.");
+  process.exit(1);
+}
+
+// 2. rewrite the dropdown options, preserving non-version sentinels
+//    (e.g. "older", "TestFlight/Development build") at the end of the list.
+const lines = read(FORM, "utf8").split("\n");
+const idIdx = lines.findIndex((l) =>
+  l.match(new RegExp(`^\\s*id:\\s*${DROPDOWN_ID}\\s*$`)),
+);
+if (idIdx === -1)
+  throw new Error(`dropdown id: ${DROPDOWN_ID} not found in ${FORM}`);
+const optIdx = lines.findIndex(
+  (l, i) => i > idIdx && /^\s*options:\s*$/.test(l),
+);
+if (optIdx === -1)
+  throw new Error(`options: not found after id: ${DROPDOWN_ID}`);
+
+const itemIndent = lines[optIdx].match(/^\s*/)[0] + "  "; // options items are nested one level deeper
+let end = optIdx + 1;
+const sentinels = [];
+while (end < lines.length && /^\s*-\s+/.test(lines[end])) {
+  const val = lines[end].replace(/^\s*-\s+/, "");
+  if (!isVersion(val)) sentinels.push(val);
+  end++;
+}
+
+const newOptions = [...versions, ...sentinels].map(
+  (v) => `${itemIndent}- ${v}`,
+);
+const updated = [
+  ...lines.slice(0, optIdx + 1),
+  ...newOptions,
+  ...lines.slice(end),
+].join("\n");
+
+console.log(
+  `Versions: ${versions.join(", ")}${sentinels.length ? ` | kept: ${sentinels.join(", ")}` : ""}`,
+);
+if (DRY) {
+  console.log("--dry-run: not writing.");
+} else {
+  write(FORM, updated);
+  console.log(`Updated ${FORM}.`);
+}
+
+// Expose the resulting list for the workflow (PR description).
+if (process.env.GITHUB_OUTPUT) {
+  appendFileSync(
+    process.env.GITHUB_OUTPUT,
+    `versions=${versions.join(", ")}\n`,
+  );
+}
--- a/translations/en.json
+++ b/translations/en.json
@@ -593,25 +593,8 @@
    "videos": "Videos",
    "boxsets": "Box sets",
    "playlists": "Playlists",
-    "seeAllSeries": "Favorited Series",
-    "seeAllMovies": "Favorited Movies",
-    "seeAllEpisodes": "Favorited Episodes",
-    "seeAllVideos": "Favorited Videos",
-    "seeAllBoxsets": "Favorited Box sets",
-    "seeAllPlaylists": "Favorited Playlists",
    "noDataTitle": "No favorites yet",
-    "noData": "Mark items as favorites to see them appear here for quick access.",
-    "watchlist": "Watchlist"
-  },
-  "kefintweaksWatchlist": {
-    "seeAllSeries": "Watchlisted Series",
-    "seeAllMovies": "Watchlisted Movies",
-    "seeAllEpisodes": "Watchlisted Episodes",
-    "seeAllVideos": "Watchlisted Videos",
-    "seeAllBoxsets": "Watchlisted Box sets",
-    "seeAllPlaylists": "Watchlisted Playlists",
-    "noDataTitle": "No watchlisted items yet",
-    "noData": "Add items to your watchlist to see them appear here."
+    "noData": "Mark items as favorites to see them appear here for quick access."
  },
  "custom_links": {
    "no_links": "No links"
--- a/translations/sv.json
+++ b/translations/sv.json
@@ -675,25 +675,8 @@
    "videos": "Videor",
    "boxsets": "Box Set",
    "playlists": "Spellistor",
-    "seeAllSeries": "Favoritmarkerade serier",
-    "seeAllMovies": "Favoritmarkerade filmer",
-    "seeAllEpisodes": "Favoritmarkerade avsnitt",
-    "seeAllVideos": "Favoritmarkerade videor",
-    "seeAllBoxsets": "Favoritmarkerade box set",
-    "seeAllPlaylists": "Favoritmarkerade spellistor",
    "noDataTitle": "Inga favoriter än",
-    "noData": "Markera objekt som favoriter för att se dem visas här för snabb åtkomst.",
-    "watchlist": "Bevakningslista"
-  },
-  "kefintweaksWatchlist": {
-    "seeAllSeries": "Bevakade serier",
-    "seeAllMovies": "Bevakade filmer",
-    "seeAllEpisodes": "Bevakade avsnitt",
-    "seeAllVideos": "Bevakade videor",
-    "seeAllBoxsets": "Bevakade box set",
-    "seeAllPlaylists": "Bevakade spellistor",
-    "noDataTitle": "Inga bevakade objekt än",
-    "noData": "Lägg till objekt i din bevakningslista för att se dem visas här."
+    "noData": "Markera objekt som favoriter för att se dem visas här för snabb åtkomst."
  },
  "custom_links": {
    "no_links": "Inga Länkar"
--- a/utils/atoms/filters.ts
+++ b/utils/atoms/filters.ts
@@ -82,6 +82,8 @@ export const useFilterOptions = () => {
        { key: FilterByOption.IsFavorite, value: "Is Favorite" },
        { key: FilterByOption.IsResumable, value: "Is Resumable" },
      ];
+  console.log("filterOptions");
+  console.log(filterOptions);
  return filterOptions;
 };
Author	SHA1	Message	Date
Gauvain	7c1900a27d	fix(issue-form): bound the gh release fetch with a 30s timeout	2026-06-10 20:24:35 +02:00
Gauvain	888b8bb342	fix(issue-form): pin checkout to develop, serialize runs, simplify release fetch - `release` events check out the tagged commit, so the script regenerated the form from the tag's stale copy and the bot PR could revert form edits made on develop since that release - checkout develop explicitly. - Fixed concurrency group: a release event and the weekly cron no longer race on the same ci/update-issue-form branch (queue, no cancel). - Replace `gh api --paginate` (fetches every release page) with `gh release list --exclude-drafts --exclude-pre-releases --limit N`. - Document the GITHUB_TOKEN limitation on the auto-merge step: bot PRs don't trigger required checks; close/reopen kicks them, then auto-merge completes after reviews.	2026-06-10 20:20:56 +02:00
Gauvain	1c8a0ac35e	Merge remote-tracking branch 'origin/develop' into ci/auto-update-issue-form # Conflicts: # .github/ISSUE_TEMPLATE/issue_report.yml	2026-06-10 20:11:27 +02:00
Gauvino	e4def1f2a1	docs(issue-form): guide TestFlight/dev users to report the exact build The version dropdown lists published releases only, so a TestFlight or dev build will not appear in it. Point those reporters to the "TestFlight/Development build" option and the exact version shown in the app's Settings.	2026-06-05 13:38:52 +02:00
Gauvino	55376cd824	fix(issue-form): list published releases only, drop TestFlight draft entries Per maintainer feedback (fredrikburmester, lancechant): the version dropdown no longer surfaces draft releases as "X (TestFlight)" — drafts and prereleases are unreliable version identifiers. update-issue-form.mjs now fetches only published, non-prerelease releases and drops the per-version TestFlight label; the workflow triggers on `released` events only; and the generic "TestFlight/Development build" sentinel is restored at the end of the list.	2026-06-05 13:30:47 +02:00
Gauvino	3c8369ea4d	ci(issue-form): auto-populate version dropdown from GitHub releases Replaces the broken update workflow (it targeted a non-existent bug_report.yml via the npm-based populate action; Streamyfin isn't on npm) with scripts/update-issue-form.mjs (Bun, dep-free): reads release tags via gh and rewrites the 'version' dropdown in issue_report.yml, preserving sentinels (older, TestFlight/Development build), newest-first, capped at ISSUE_FORM_LIMIT (5) — so each new release rotates the oldest entry out. Drafts/prereleases are included on purpose: release.yml drafts v<app.json version> for every TestFlight (iOS) / beta (Android) build, and the app shows that nativeApplicationVersion to users (UserInfo.tsx), so those in-flight versions must be selectable. Runs on release events + a weekly cron safety net + workflow_dispatch, opens a PR and enables auto-merge. Seeds the current versions.	2026-06-01 16:53:53 +02:00