fix: Jellyseerr discovery crash (#1032)

components/DownloadItem.tsx

@@ -61,7 +61,7 @@ export const DownloadItems: React.FC<DownloadProps> = ({
   const [api] = useAtom(apiAtom);
   const [user] = useAtom(userAtom);
   const [queue, _setQueue] = useAtom(queueAtom);
-  const [settings] = useSettings(null);
+  const { settings } = useSettings();
   const [downloadUnwatchedOnly, setDownloadUnwatchedOnly] = useState(false);
 
   const { processes, startBackgroundDownload, getDownloadedItems } =

components/ItemContent.tsx

@@ -54,7 +54,7 @@ interface ItemContentProps {
 export const ItemContent: React.FC<ItemContentProps> = React.memo(
   ({ item, isOffline }) => {
     const [api] = useAtom(apiAtom);
-    const [settings] = useSettings(null);
+    const { settings } = useSettings();
     const { orientation } = useOrientation();
     const navigation = useNavigation();
     const insets = useSafeAreaInsets();

components/PlayButton.tsx

@@ -67,7 +67,7 @@ export const PlayButton: React.FC<Props> = ({
   const startColor = useSharedValue(colorAtom);
   const widthProgress = useSharedValue(0);
   const colorChangeProgress = useSharedValue(0);
-  const [settings, updateSettings] = useSettings(null);
+  const { settings, updateSettings } = useSettings();
   const lightHapticFeedback = useHaptic("light");
 
   const goToPlayer = useCallback(

components/PlayButton.tv.tsx

@@ -44,7 +44,7 @@ export const PlayButton: React.FC<Props> = ({
   const startColor = useSharedValue(colorAtom);
   const widthProgress = useSharedValue(0);
   const colorChangeProgress = useSharedValue(0);
-  const [settings] = useSettings(null);
+  const { settings } = useSettings();
   const lightHapticFeedback = useHaptic("light");
 
   const goToPlayer = useCallback(

components/common/JellyseerrItemRouter.tsx

@@ -10,6 +10,7 @@ import {
   Permission,
 } from "@/utils/jellyseerr/server/lib/permissions";
 import type { MovieDetails } from "@/utils/jellyseerr/server/models/Movie";
+import { PersonCreditCast } from "@/utils/jellyseerr/server/models/Person";
 import type {
   MovieResult,
   TvResult,
@@ -17,7 +18,7 @@ import type {
 import type { TvDetails } from "@/utils/jellyseerr/server/models/Tv";
 
 interface Props extends TouchableOpacityProps {
-  result?: MovieResult | TvResult | MovieDetails | TvDetails;
+  result?: MovieResult | TvResult | MovieDetails | TvDetails | PersonCreditCast;
   mediaTitle: string;
   releaseYear: number;
   canRequest: boolean;

components/home/LargeMovieCarousel.tsx

@@ -26,7 +26,7 @@ import { itemRouter } from "../common/TouchableItemRouter";
 interface Props extends ViewProps {}
 
 export const LargeMovieCarousel: React.FC<Props> = ({ ...props }) => {
-  const [settings] = useSettings(null);
+  const { settings } = useSettings();
 
   const ref = React.useRef<ICarouselInstance>(null);
   const progress = useSharedValue<number>(0);

components/jellyseerr/discover/MovieTvSlide.tsx

@@ -11,16 +11,12 @@ import {
   useJellyseerr,
 } from "@/hooks/useJellyseerr";
 import { DiscoverSliderType } from "@/utils/jellyseerr/server/constants/discover";
-import type {
-  MovieResult,
-  TvResult,
-} from "@/utils/jellyseerr/server/models/Search";
 
 const MovieTvSlide: React.FC<SlideProps & ViewProps> = ({
   slide,
   ...props
 }) => {
-  const { jellyseerrApi } = useJellyseerr();
+  const { jellyseerrApi, isJellyseerrMovieOrTvResult } = useJellyseerr();
 
   const { data, fetchNextPage, hasNextPage } = useInfiniteQuery({
     queryKey: ["jellyseerr", "discover", slide.id],
@@ -69,7 +65,9 @@ const MovieTvSlide: React.FC<SlideProps & ViewProps> = ({
       uniqBy(
         data?.pages
           ?.filter((p) => p?.results.length)
-          .flatMap((p) => p?.results),
+          .flatMap((p) =>
+            p?.results.filter((r) => isJellyseerrMovieOrTvResult(r)),
+          ),
         "id",
       ),
     [data],
@@ -86,12 +84,7 @@ const MovieTvSlide: React.FC<SlideProps & ViewProps> = ({
         onEndReached={() => {
           if (hasNextPage) fetchNextPage();
         }}
-        renderItem={(item) => (
-          <JellyseerrPoster
-            item={item as MovieResult | TvResult}
-            key={item?.id}
-          />
-        )}
+        renderItem={(item) => <JellyseerrPoster item={item} key={item?.id} />}
       />
     )
   );

components/library/LibraryItemCard.tsx

@@ -41,7 +41,7 @@ const icons: Record<CollectionType, IconName> = {
 export const LibraryItemCard: React.FC<Props> = ({ library, ...props }) => {
   const [api] = useAtom(apiAtom);
   const [user] = useAtom(userAtom);
-  const [settings] = useSettings(null);
+  const { settings } = useSettings();
 
   const { t } = useTranslation();
 

components/posters/JellyseerrPoster.tsx

@@ -20,6 +20,7 @@ import { MediaStatus } from "@/utils/jellyseerr/server/constants/media";
 import type MediaRequest from "@/utils/jellyseerr/server/entity/MediaRequest";
 import type { DownloadingItem } from "@/utils/jellyseerr/server/lib/downloadtracker";
 import type { MovieDetails } from "@/utils/jellyseerr/server/models/Movie";
+import { PersonCreditCast } from "@/utils/jellyseerr/server/models/Person";
 import type {
   MovieResult,
   TvResult,
@@ -27,7 +28,7 @@ import type {
 import type { TvDetails } from "@/utils/jellyseerr/server/models/Tv";
 
 interface Props extends ViewProps {
-  item?: MovieResult | TvResult | MovieDetails | TvDetails;
+  item?: MovieResult | TvResult | MovieDetails | TvDetails | PersonCreditCast;
   horizontal?: boolean;
   showDownloadInfo?: boolean;
   mediaRequest?: MediaRequest;

components/settings/AppLanguageSelector.tsx

@@ -12,7 +12,7 @@ interface Props extends ViewProps {}
 
 export const AppLanguageSelector: React.FC<Props> = () => {
   const isTv = Platform.isTV;
-  const [settings, updateSettings] = useSettings(null);
+  const { settings, updateSettings } = useSettings();
   const { t } = useTranslation();
 
   if (isTv) return null;

components/settings/AudioToggles.tsx

@@ -17,7 +17,7 @@ export const AudioToggles: React.FC<Props> = ({ ...props }) => {
   const isTv = Platform.isTV;
 
   const media = useMedia();
-  const [_, __, pluginSettings] = useSettings(null);
+  const { pluginSettings } = useSettings();
   const { settings, updateSettings } = media;
   const cultures = media.cultures;
   const { t } = useTranslation();

components/settings/ChromecastSettings.tsx

@@ -4,7 +4,7 @@ import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
 
 export const ChromecastSettings: React.FC = ({ ...props }) => {
-  const [settings, updateSettings] = useSettings(null);
+  const { settings, updateSettings } = useSettings();
   return (
     <View {...props}>
       <ListGroup title={"Chromecast"}>

components/settings/Dashboard.tsx

@@ -7,7 +7,7 @@ import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
 
 export const Dashboard = () => {
-  const [settings, _updateSettings] = useSettings(null);
+  const { settings } = useSettings();
   const { sessions = [] } = useSessions({} as useSessionsProps);
   const router = useRouter();
 

components/settings/DownloadSettings.tsx

@@ -7,7 +7,7 @@ import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
 
 export default function DownloadSettings({ ...props }) {
-  const [settings, updateSettings, pluginSettings] = useSettings(null);
+  const { settings, updateSettings, pluginSettings } = useSettings();
   const { t } = useTranslation();
 
   const allDisabled = useMemo(

components/settings/GestureControls.tsx

@@ -13,7 +13,7 @@ interface Props extends ViewProps {}
 export const GestureControls: React.FC<Props> = ({ ...props }) => {
   const { t } = useTranslation();
 
-  const [settings, updateSettings, pluginSettings] = useSettings(null);
+  const { settings, updateSettings, pluginSettings } = useSettings();
 
   const disabled = useMemo(
     () =>

components/settings/HomeIndex.tsx

@@ -64,13 +64,7 @@ export const HomeIndex = () => {
   const user = useAtomValue(userAtom);
 
   const [loading, setLoading] = useState(false);
-  const [
-    settings,
-    _updateSettings,
-    _pluginSettings,
-    _setPluginSettings,
-    refreshStreamyfinPluginSettings,
-  ] = useSettings(null);
+  const { settings, refreshStreamyfinPluginSettings } = useSettings();
 
   const navigation = useNavigation();
 

components/settings/Jellyseerr.tsx

@@ -20,7 +20,7 @@ export const JellyseerrSettings = () => {
   const { t } = useTranslation();
 
   const [user] = useAtom(userAtom);
-  const [settings, updateSettings, _pluginSettings] = useSettings(null);
+  const { settings, updateSettings } = useSettings();
 
   const [jellyseerrPassword, setJellyseerrPassword] = useState<
     string | undefined

components/settings/MediaContext.tsx

@@ -28,7 +28,7 @@ export const useMedia = () => {
 };
 
 export const MediaProvider = ({ children }: { children: ReactNode }) => {
-  const [settings, updateSettings] = useSettings(null);
+  const { settings, updateSettings } = useSettings();
   const api = useAtomValue(apiAtom);
   const queryClient = useQueryClient();
 

components/settings/MediaToggles.tsx

@@ -13,7 +13,7 @@ interface Props extends ViewProps {}
 export const MediaToggles: React.FC<Props> = ({ ...props }) => {
   const { t } = useTranslation();
 
-  const [settings, updateSettings, pluginSettings] = useSettings(null);
+  const { settings, updateSettings, pluginSettings } = useSettings();
 
   const disabled = useMemo(
     () =>

components/settings/OtherSettings.tsx

@@ -23,7 +23,7 @@ import { ListItem } from "../list/ListItem";
 
 export const OtherSettings: React.FC = () => {
   const router = useRouter();
-  const [settings, updateSettings, pluginSettings] = useSettings(null);
+  const { settings, updateSettings, pluginSettings } = useSettings();
 
   const { t } = useTranslation();
 

components/settings/PluginSettings.tsx

@@ -6,7 +6,7 @@ import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
 
 export const PluginSettings = () => {
-  const [settings, _updateSettings] = useSettings(null);
+  const { settings } = useSettings();
 
   const router = useRouter();
 

components/settings/SubtitleToggles.tsx

@@ -20,7 +20,7 @@ export const SubtitleToggles: React.FC<Props> = ({ ...props }) => {
   const isTv = Platform.isTV;
 
   const media = useMedia();
-  const [_, __, pluginSettings] = useSettings(null);
+  const { pluginSettings } = useSettings();
   const { settings, updateSettings } = media;
   const cultures = media.cultures;
   const { t } = useTranslation();

components/video-player/controls/BottomControls.tsx

@@ -88,7 +88,7 @@ export const BottomControls: FC<BottomControlsProps> = ({
   trickplayInfo,
   time,
 }) => {
-  const [settings] = useSettings(null);
+  const { settings } = useSettings();
   const insets = useSafeAreaInsets();
 
   return (

components/video-player/controls/CenterControls.tsx

@@ -30,7 +30,7 @@ export const CenterControls: FC<CenterControlsProps> = ({
   handleSkipBackward,
   handleSkipForward,
 }) => {
-  const [settings] = useSettings(null);
+  const { settings } = useSettings();
   const insets = useSafeAreaInsets();
 
   return (

components/video-player/controls/ContinueWatchingOverlay.tsx

@@ -16,7 +16,7 @@ export interface ContinueWatchingOverlayProps {
 const ContinueWatchingOverlay: React.FC<ContinueWatchingOverlayProps> = ({
   goToNextItem,
 }) => {
-  const [settings] = useSettings(null);
+  const { settings } = useSettings();
   const router = useRouter();
 
   return settings.autoPlayEpisodeCount >=

components/video-player/controls/Controls.tsx

@@ -116,7 +116,7 @@ export const Controls: FC<Props> = ({
   api = null,
   downloadedFiles = undefined,
 }) => {
-  const [settings, updateSettings] = useSettings(api);
+  const { settings, updateSettings } = useSettings();
   const router = useRouter();
   const lightHapticFeedback = useHaptic("light");
 

components/video-player/controls/GestureOverlay.tsx

@@ -31,7 +31,7 @@ export const GestureOverlay = ({
   onSkipForward,
   onSkipBackward,
 }: Props) => {
-  const [settings] = useSettings(null);
+  const { settings } = useSettings();
   const lightHaptic = useHaptic("light");
 
   const [feedback, setFeedback] = useState<FeedbackState>({

components/video-player/controls/HeaderControls.tsx

@@ -70,7 +70,7 @@ export const HeaderControls: FC<HeaderControlsProps> = ({
   setVideoAspectRatio,
   setVideoScaleFactor,
 }) => {
-  const [settings] = useSettings(null);
+  const { settings } = useSettings();
   const router = useRouter();
   const insets = useSafeAreaInsets();
   const { width: screenWidth } = useWindowDimensions();

components/video-player/controls/hooks/useVideoNavigation.ts

@@ -20,7 +20,7 @@ export function useVideoNavigation({
   seek,
   play,
 }: UseVideoNavigationProps) {
-  const [settings] = useSettings(null);
+  const { settings } = useSettings();
   const lightHapticFeedback = useHaptic("light");
   const wasPlayingRef = useRef(false);