From b232bebd735913ac9508c453278181b12a970c7f Mon Sep 17 00:00:00 2001
From: herrrta <73949927+herrrta@users.noreply.github.com>
Date: Mon, 6 Jan 2025 12:06:58 -0500
Subject: [PATCH] [Jellyseerr] Show genre/studio/network discover sliders
implements #326
---
.../jellyseerr/[personId].tsx | 247 ------------------
.../jellyseerr/company/[companyId].tsx | 136 ++++++++++
.../jellyseerr/genre/[genreId].tsx | 128 +++++++++
.../jellyseerr/person/[personId].tsx | 151 +++++++++++
app/(auth)/(tabs)/(search)/_layout.tsx | 4 +-
bun.lockb | Bin 594152 -> 592269 bytes
components/ParallaxPage.tsx | 13 +-
components/jellyseerr/JellyseerrIndexPage.tsx | 12 +-
components/jellyseerr/ParallaxSlideShow.tsx | 155 +++++++++++
components/jellyseerr/PersonPoster.tsx | 2 +-
.../jellyseerr/discover/CompanySlide.tsx | 41 +++
components/jellyseerr/discover/Discover.tsx | 47 ++++
.../jellyseerr/discover/GenericSlideCard.tsx | 59 +++++
components/jellyseerr/discover/GenreSlide.tsx | 56 ++++
.../MovieTvSlide.tsx} | 59 ++---
components/jellyseerr/discover/Slide.tsx | 55 ++++
hooks/useJellyseerr.ts | 22 +-
utils/jellyseerr | 2 +-
18 files changed, 887 insertions(+), 302 deletions(-)
delete mode 100644 app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/[personId].tsx
create mode 100644 app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/company/[companyId].tsx
create mode 100644 app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/genre/[genreId].tsx
create mode 100644 app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/person/[personId].tsx
create mode 100644 components/jellyseerr/ParallaxSlideShow.tsx
create mode 100644 components/jellyseerr/discover/CompanySlide.tsx
create mode 100644 components/jellyseerr/discover/Discover.tsx
create mode 100644 components/jellyseerr/discover/GenericSlideCard.tsx
create mode 100644 components/jellyseerr/discover/GenreSlide.tsx
rename components/jellyseerr/{DiscoverSlide.tsx => discover/MovieTvSlide.tsx} (58%)
create mode 100644 components/jellyseerr/discover/Slide.tsx
diff --git a/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/[personId].tsx b/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/[personId].tsx
deleted file mode 100644
index 5a930982..00000000
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/[personId].tsx
+++ /dev/null
@@ -1,247 +0,0 @@
-import {
- router,
- useLocalSearchParams,
- useNavigation,
- useSegments,
-} from "expo-router";
-import React, {
- useCallback,
- useEffect,
- useMemo,
- useRef,
- useState,
-} from "react";
-import { TouchableOpacity, View } from "react-native";
-import { useQuery } from "@tanstack/react-query";
-import { useJellyseerr } from "@/hooks/useJellyseerr";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { ParallaxScrollView } from "@/components/ParallaxPage";
-import { Text } from "@/components/common/Text";
-import { Animated } from "react-native";
-import { Image } from "expo-image";
-import { OverviewText } from "@/components/OverviewText";
-import { orderBy } from "lodash";
-import { FlashList } from "@shopify/flash-list";
-import { PersonCreditCast } from "@/utils/jellyseerr/server/models/Person";
-import Poster from "@/components/posters/Poster";
-import JellyseerrMediaIcon from "@/components/jellyseerr/JellyseerrMediaIcon";
-
-const ANIMATION_ENTER = 250;
-const ANIMATION_EXIT = 250;
-const BACKDROP_DURATION = 5000;
-
-export default function page() {
- const insets = useSafeAreaInsets();
- const local = useLocalSearchParams();
- const segments = useSegments();
- const { jellyseerrApi, jellyseerrUser } = useJellyseerr();
-
- const { personId } = local as { personId: string };
- const from = segments[2];
-
- const [currentIndex, setCurrentIndex] = useState(0);
- const fadeAnim = useRef(new Animated.Value(0)).current;
-
- const { data, isLoading, isFetching } = useQuery({
- queryKey: ["jellyseerr", "person", personId],
- queryFn: async () => ({
- details: await jellyseerrApi?.personDetails(personId),
- combinedCredits: await jellyseerrApi?.personCombinedCredits(personId),
- }),
- enabled: !!jellyseerrApi && !!personId,
- });
-
- const locale = useMemo(() => {
- return jellyseerrUser?.settings?.locale || "en";
- }, [jellyseerrUser]);
-
- const region = useMemo(
- () => jellyseerrUser?.settings?.region || "US",
- [jellyseerrUser]
- );
-
- const castedRoles: PersonCreditCast[] = useMemo(
- () =>
- orderBy(
- data?.combinedCredits?.cast,
- ["voteCount", "voteAverage"],
- "desc"
- ),
- [data?.combinedCredits]
- );
-
- const backdrops = useMemo(
- () => castedRoles.map((c) => c.backdropPath),
- [data?.combinedCredits]
- );
-
- const enterAnimation = useCallback(
- () =>
- Animated.timing(fadeAnim, {
- toValue: 1,
- duration: ANIMATION_ENTER,
- useNativeDriver: true,
- }),
- [fadeAnim]
- );
-
- const exitAnimation = useCallback(
- () =>
- Animated.timing(fadeAnim, {
- toValue: 0,
- duration: ANIMATION_EXIT,
- useNativeDriver: true,
- }),
- [fadeAnim]
- );
-
- useEffect(() => {
- if (backdrops?.length) {
- enterAnimation().start();
- const intervalId = setInterval(() => {
- exitAnimation().start((end) => {
- if (end.finished)
- setCurrentIndex((prevIndex) => (prevIndex + 1) % backdrops?.length);
- });
- }, BACKDROP_DURATION);
-
- return () => clearInterval(intervalId);
- }
- }, [backdrops, enterAnimation, exitAnimation, setCurrentIndex, currentIndex]);
-
- const viewDetails = (credit: PersonCreditCast) => {
- router.push({
- //@ts-ignore
- pathname: `/(auth)/(tabs)/${from}/jellyseerr/page`,
- //@ts-ignore
- params: {
- ...credit,
- mediaTitle: credit.title,
- releaseYear: new Date(credit.releaseDate).getFullYear(),
- canRequest: "false",
- posterSrc: jellyseerrApi?.imageProxy(
- credit.posterPath,
- "w300_and_h450_face"
- ),
- },
- });
- };
-
- return (
-
-
- }
- logo={
-
- }
- >
-
-
-
-
- {data?.details?.name}
-
-
- Born{" "}
- {new Date(data?.details?.birthday!!).toLocaleDateString(
- `${locale}-${region}`,
- {
- year: "numeric",
- month: "long",
- day: "numeric",
- }
- )}{" "}
- | {data?.details?.placeOfBirth}
-
-
-
-
-
-
-
-
- No results
-
-
- }
- contentInsetAdjustmentBehavior="automatic"
- ListHeaderComponent={
- Appearances
- }
- renderItem={({ item }) => (
- viewDetails(item)}
- >
-
-
- {/*{item.title}*/}
- {item.character && (
-
- as {item.character}
-
- )}
-
- )}
- keyExtractor={(item) => item.id.toString()}
- estimatedItemSize={255}
- numColumns={3}
- contentContainerStyle={{ paddingBottom: 24 }}
- ItemSeparatorComponent={() => }
- />
-
-
-
-
- );
-}
diff --git a/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/company/[companyId].tsx b/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/company/[companyId].tsx
new file mode 100644
index 00000000..02762a51
--- /dev/null
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/company/[companyId].tsx
@@ -0,0 +1,136 @@
+import {router, useLocalSearchParams, useSegments,} from "expo-router";
+import React, {useMemo,} from "react";
+import {TouchableOpacity} from "react-native";
+import {useInfiniteQuery} from "@tanstack/react-query";
+import {Endpoints, useJellyseerr} from "@/hooks/useJellyseerr";
+import {Text} from "@/components/common/Text";
+import {Image} from "expo-image";
+import Poster from "@/components/posters/Poster";
+import JellyseerrMediaIcon from "@/components/jellyseerr/JellyseerrMediaIcon";
+import {DiscoverSliderType} from "@/utils/jellyseerr/server/constants/discover";
+import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
+import {MovieResult, Results, TvResult} from "@/utils/jellyseerr/server/models/Search";
+import {COMPANY_LOGO_IMAGE_FILTER} from "@/utils/jellyseerr/src/components/Discover/NetworkSlider";
+import {uniqBy} from "lodash";
+
+export default function page() {
+ const local = useLocalSearchParams();
+ const segments = useSegments();
+ const {jellyseerrApi} = useJellyseerr();
+
+ const from = segments[2];
+ const {companyId, name, image, type} = local as unknown as {
+ companyId: string,
+ name: string,
+ image: string,
+ type: DiscoverSliderType
+ };
+
+ const {data, fetchNextPage, hasNextPage} = useInfiniteQuery({
+ queryKey: ["jellyseerr", "company", type, companyId],
+ queryFn: async ({pageParam}) => {
+ let params: any = {
+ page: Number(pageParam),
+ };
+
+ return jellyseerrApi?.discover(
+ (
+ type == DiscoverSliderType.NETWORKS
+ ? Endpoints.DISCOVER_TV_NETWORK
+ : Endpoints.DISCOVER_MOVIES_STUDIO
+ ) + `/${companyId}`,
+ params
+ )
+ },
+ enabled: !!jellyseerrApi && !!companyId,
+ initialPageParam: 1,
+ getNextPageParam: (lastPage, pages) =>
+ (lastPage?.page || pages?.findLast((p) => p?.results.length)?.page || 1) +
+ 1,
+ staleTime: 0,
+ });
+
+ const flatData = useMemo(
+ () => uniqBy(data?.pages?.filter((p) => p?.results.length).flatMap((p) => p?.results ?? []), "id")?? [],
+ [data]
+ );
+
+ const backdrops = useMemo(
+ () => jellyseerrApi
+ ? flatData.map((r) => jellyseerrApi.imageProxy((r as TvResult | MovieResult).backdropPath, "w1920_and_h800_multi_faces"))
+ : [],
+ [jellyseerrApi, flatData]
+ );
+
+ const viewDetails = (result: Results) => {
+ router.push({
+ //@ts-ignore
+ pathname: `/(auth)/(tabs)/${from}/jellyseerr/page`,
+ //@ts-ignore
+ params: {
+ ...result,
+ mediaTitle: getName(result),
+ releaseYear: getYear(result),
+ canRequest: "false",
+ posterSrc: jellyseerrApi?.imageProxy(
+ (result as MovieResult | TvResult).posterPath,
+ "w300_and_h450_face"
+ ),
+ },
+ });
+ };
+
+ const getName = (result: Results) => {
+ return (result as TvResult).name || (result as MovieResult).title
+ }
+
+ const getYear = (result: Results) => {
+ return new Date((result as TvResult).firstAirDate || (result as MovieResult).releaseDate).getFullYear()
+ }
+
+ return (
+ item.id.toString()}
+ onEndReached={() => {
+ if (hasNextPage) {
+ fetchNextPage()
+ }
+ }}
+ logo={
+
+ }
+ renderItem={(item, index) => (
+ viewDetails(item)}
+ >
+
+
+ {getName(item)}
+ {getYear(item)}
+
+ )}
+ />
+ );
+}
diff --git a/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/genre/[genreId].tsx b/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/genre/[genreId].tsx
new file mode 100644
index 00000000..34a4fc7b
--- /dev/null
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/genre/[genreId].tsx
@@ -0,0 +1,128 @@
+import {router, useLocalSearchParams, useSegments,} from "expo-router";
+import React, {useMemo,} from "react";
+import {TouchableOpacity} from "react-native";
+import {useInfiniteQuery} from "@tanstack/react-query";
+import {Endpoints, useJellyseerr} from "@/hooks/useJellyseerr";
+import {Text} from "@/components/common/Text";
+import Poster from "@/components/posters/Poster";
+import JellyseerrMediaIcon from "@/components/jellyseerr/JellyseerrMediaIcon";
+import {DiscoverSliderType} from "@/utils/jellyseerr/server/constants/discover";
+import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
+import {MovieResult, Results, TvResult} from "@/utils/jellyseerr/server/models/Search";
+import {uniqBy} from "lodash";
+import {textShadowStyle} from "@/components/jellyseerr/discover/GenericSlideCard";
+
+export default function page() {
+ const local = useLocalSearchParams();
+ const segments = useSegments();
+ const {jellyseerrApi} = useJellyseerr();
+
+ const from = segments[2];
+ const {genreId, name, type} = local as unknown as {
+ genreId: string,
+ name: string,
+ type: DiscoverSliderType
+ };
+
+ const {data, fetchNextPage, hasNextPage} = useInfiniteQuery({
+ queryKey: ["jellyseerr", "company", type, genreId],
+ queryFn: async ({pageParam}) => {
+ let params: any = {
+ page: Number(pageParam),
+ genre: genreId
+ };
+
+ return jellyseerrApi?.discover(
+ type == DiscoverSliderType.MOVIE_GENRES
+ ? Endpoints.DISCOVER_MOVIES
+ : Endpoints.DISCOVER_TV,
+ params
+ )
+ },
+ enabled: !!jellyseerrApi && !!genreId,
+ initialPageParam: 1,
+ getNextPageParam: (lastPage, pages) =>
+ (lastPage?.page || pages?.findLast((p) => p?.results.length)?.page || 1) +
+ 1,
+ staleTime: 0,
+ });
+
+ const flatData = useMemo(
+ () => uniqBy(data?.pages?.filter((p) => p?.results.length).flatMap((p) => p?.results ?? []), "id")?? [],
+ [data]
+ );
+
+ const backdrops = useMemo(
+ () => jellyseerrApi
+ ? flatData.map((r) => jellyseerrApi.imageProxy((r as TvResult | MovieResult).backdropPath, "w1920_and_h800_multi_faces"))
+ : [],
+ [jellyseerrApi, flatData]
+ );
+
+ const viewDetails = (result: Results) => {
+ router.push({
+ //@ts-ignore
+ pathname: `/(auth)/(tabs)/${from}/jellyseerr/page`,
+ //@ts-ignore
+ params: {
+ ...result,
+ mediaTitle: getName(result),
+ releaseYear: getYear(result),
+ canRequest: "false",
+ posterSrc: jellyseerrApi?.imageProxy(
+ (result as MovieResult | TvResult).posterPath,
+ "w300_and_h450_face"
+ ),
+ },
+ });
+ };
+
+ const getName = (result: Results) => {
+ return (result as TvResult).name || (result as MovieResult).title
+ }
+
+ const getYear = (result: Results) => {
+ return new Date((result as TvResult).firstAirDate || (result as MovieResult).releaseDate).getFullYear()
+ }
+
+ return (
+ item.id.toString()}
+ onEndReached={() => {
+ if (hasNextPage) {
+ fetchNextPage()
+ }
+ }}
+ logo={
+
+ {name}
+
+ }
+ renderItem={(item, index) => (
+ viewDetails(item)}
+ >
+
+
+ {getName(item)}
+ {getYear(item)}
+
+ )}
+ />
+ );
+}
diff --git a/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/person/[personId].tsx b/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/person/[personId].tsx
new file mode 100644
index 00000000..84f59f4b
--- /dev/null
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites)/jellyseerr/person/[personId].tsx
@@ -0,0 +1,151 @@
+import {
+ router,
+ useLocalSearchParams,
+ useSegments,
+} from "expo-router";
+import React, { useMemo } from "react";
+import { TouchableOpacity } from "react-native";
+import { useQuery } from "@tanstack/react-query";
+import { useJellyseerr } from "@/hooks/useJellyseerr";
+import { Text } from "@/components/common/Text";
+import { Image } from "expo-image";
+import { OverviewText } from "@/components/OverviewText";
+import { orderBy } from "lodash";
+import { PersonCreditCast } from "@/utils/jellyseerr/server/models/Person";
+import Poster from "@/components/posters/Poster";
+import JellyseerrMediaIcon from "@/components/jellyseerr/JellyseerrMediaIcon";
+import ParallaxSlideShow from "@/components/jellyseerr/ParallaxSlideShow";
+
+export default function page() {
+ const local = useLocalSearchParams();
+ const segments = useSegments();
+ const { jellyseerrApi, jellyseerrUser } = useJellyseerr();
+
+ const { personId } = local as { personId: string };
+ const from = segments[2];
+
+ const { data, isLoading, isFetching } = useQuery({
+ queryKey: ["jellyseerr", "person", personId],
+ queryFn: async () => ({
+ details: await jellyseerrApi?.personDetails(personId),
+ combinedCredits: await jellyseerrApi?.personCombinedCredits(personId),
+ }),
+ enabled: !!jellyseerrApi && !!personId,
+ });
+
+ const locale = useMemo(() => {
+ return jellyseerrUser?.settings?.locale || "en";
+ }, [jellyseerrUser]);
+
+ const region = useMemo(
+ () => jellyseerrUser?.settings?.region || "US",
+ [jellyseerrUser]
+ );
+
+ const castedRoles: PersonCreditCast[] = useMemo(
+ () =>
+ orderBy(
+ data?.combinedCredits?.cast,
+ ["voteCount", "voteAverage"],
+ "desc"
+ ),
+ [data?.combinedCredits]
+ );
+ const backdrops = useMemo(
+ () => jellyseerrApi
+ ? castedRoles.map((c) => jellyseerrApi.imageProxy(c.backdropPath, "w1920_and_h800_multi_faces"))
+ : [],
+ [jellyseerrApi, data?.combinedCredits]
+ );
+
+ const viewDetails = (credit: PersonCreditCast) => {
+ router.push({
+ //@ts-ignore
+ pathname: `/(auth)/(tabs)/${from}/jellyseerr/page`,
+ //@ts-ignore
+ params: {
+ ...credit,
+ mediaTitle: credit.title,
+ releaseYear: new Date(credit.releaseDate).getFullYear(),
+ canRequest: "false",
+ posterSrc: jellyseerrApi?.imageProxy(
+ credit.posterPath,
+ "w300_and_h450_face"
+ ),
+ },
+ });
+ };
+
+ return (
+ item.id.toString()}
+ logo={
+
+ }
+ HeaderContent={() => (
+ <>
+
+ {data?.details?.name}
+
+
+ Born{" "}
+ {new Date(data?.details?.birthday!!).toLocaleDateString(
+ `${locale}-${region}`,
+ {
+ year: "numeric",
+ month: "long",
+ day: "numeric",
+ }
+ )}{" "}
+ | {data?.details?.placeOfBirth}
+
+
+ )}
+ MainContent={() => (
+
+ )}
+ renderItem={(item, index) => (
+ viewDetails(item)}
+ >
+
+
+ {item.character && (
+
+ as {item.character}
+
+ )}
+
+ )}
+ />
+ );
+}
diff --git a/app/(auth)/(tabs)/(search)/_layout.tsx b/app/(auth)/(tabs)/(search)/_layout.tsx
index 1119e2a4..1f6a3c8b 100644
--- a/app/(auth)/(tabs)/(search)/_layout.tsx
+++ b/app/(auth)/(tabs)/(search)/_layout.tsx
@@ -36,7 +36,9 @@ export default function SearchLayout() {
}}
/>
-
+
+
+
);
}
diff --git a/bun.lockb b/bun.lockb
index 3a1947ce30c440a8d00177577d1bbabe3f3ebd0e..ce47c71ee7edf7cbb7368deee0e1c1e12a8774a9 100755
GIT binary patch
delta 118774
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