{/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
e.stopPropagation()}
>
diff --git a/src/components/Discover/CreateSlider/index.tsx b/src/components/Discover/CreateSlider/index.tsx
index 24b9d3fd..40d26fff 100644
--- a/src/components/Discover/CreateSlider/index.tsx
+++ b/src/components/Discover/CreateSlider/index.tsx
@@ -2,6 +2,7 @@ import Button from '@app/components/Common/Button';
import Tooltip from '@app/components/Common/Tooltip';
import { sliderTitles } from '@app/components/Discover/constants';
import MediaSlider from '@app/components/MediaSlider';
+import { WatchProviderSelector } from '@app/components/Selector';
import { encodeURIExtraParams } from '@app/hooks/useDiscover';
import type {
TmdbCompanySearchResponse,
@@ -55,7 +56,7 @@ type CreateOption = {
dataUrl: string;
params?: string;
titlePlaceholderText: string;
- dataPlaceholderText: string;
+ dataPlaceholderText?: string;
};
const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
@@ -276,6 +277,20 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
titlePlaceholderText: intl.formatMessage(messages.slidernameplaceholder),
dataPlaceholderText: intl.formatMessage(messages.providetmdbsearch),
},
+ {
+ type: DiscoverSliderType.TMDB_MOVIE_STREAMING_SERVICES,
+ title: intl.formatMessage(sliderTitles.tmdbmoviestreamingservices),
+ dataUrl: '/api/v1/discover/movies',
+ params: 'watchRegion=$regionValue&watchProviders=$providersValue',
+ titlePlaceholderText: intl.formatMessage(messages.slidernameplaceholder),
+ },
+ {
+ type: DiscoverSliderType.TMDB_TV_STREAMING_SERVICES,
+ title: intl.formatMessage(sliderTitles.tmdbtvstreamingservices),
+ dataUrl: '/api/v1/discover/tv',
+ params: 'watchRegion=$regionValue&watchProviders=$providersValue',
+ titlePlaceholderText: intl.formatMessage(messages.slidernameplaceholder),
+ },
];
return (
@@ -417,6 +432,40 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
/>
);
break;
+ case DiscoverSliderType.TMDB_MOVIE_STREAMING_SERVICES:
+ dataInput = (
+ Number(v)) ?? []
+ }
+ onChange={(region, providers) => {
+ setFieldValue('data', `${region},${providers.join('|')}`);
+ }}
+ />
+ );
+ break;
+ case DiscoverSliderType.TMDB_TV_STREAMING_SERVICES:
+ dataInput = (
+ Number(v)) ?? []
+ }
+ onChange={(region, providers) => {
+ setFieldValue('data', `${region},${providers.join('|')}`);
+ }}
+ />
+ );
+ break;
default:
dataInput = (
{
'$value',
encodeURIExtraParams(values.data)
)}
- extraParams={activeOption.params?.replace(
- '$value',
- encodeURIExtraParams(values.data)
- )}
+ extraParams={
+ activeOption.type ===
+ DiscoverSliderType.TMDB_MOVIE_STREAMING_SERVICES ||
+ activeOption.type ===
+ DiscoverSliderType.TMDB_TV_STREAMING_SERVICES
+ ? activeOption.params
+ ?.replace(
+ '$regionValue',
+ encodeURIExtraParams(values?.data.split(',')[0])
+ )
+ .replace(
+ '$providersValue',
+ encodeURIExtraParams(values?.data.split(',')[1])
+ )
+ : activeOption.params?.replace(
+ '$value',
+ encodeURIExtraParams(values.data)
+ )
+ }
onNewTitles={updateResultCount}
/>
diff --git a/src/components/Discover/DiscoverSliderEdit/index.tsx b/src/components/Discover/DiscoverSliderEdit/index.tsx
index 970a9887..9a0f3aa7 100644
--- a/src/components/Discover/DiscoverSliderEdit/index.tsx
+++ b/src/components/Discover/DiscoverSliderEdit/index.tsx
@@ -164,6 +164,10 @@ const DiscoverSliderEdit = ({
return intl.formatMessage(sliderTitles.tmdbnetwork);
case DiscoverSliderType.TMDB_SEARCH:
return intl.formatMessage(sliderTitles.tmdbsearch);
+ case DiscoverSliderType.TMDB_MOVIE_STREAMING_SERVICES:
+ return intl.formatMessage(sliderTitles.tmdbmoviestreamingservices);
+ case DiscoverSliderType.TMDB_TV_STREAMING_SERVICES:
+ return intl.formatMessage(sliderTitles.tmdbtvstreamingservices);
default:
return 'Unknown Slider';
}
@@ -195,7 +199,9 @@ const DiscoverSliderEdit = ({
className={`${slider.data ? 'mb-4' : 'mb-0'} flex space-x-2 md:mb-0`}
>
- {getSliderTitle(slider)}
+
+ {getSliderTitle(slider)}
+
+
+ {intl.formatMessage(messages.tmdbuservotecount)}
+
+
+ {
+ updateQueryParams(
+ 'voteCountGte',
+ min !== 0 && Number(currentFilters.voteCountLte) !== 1000
+ ? min.toString()
+ : undefined
+ );
+ }}
+ onUpdateMax={(max) => {
+ updateQueryParams(
+ 'voteCountLte',
+ max !== 1000 && Number(currentFilters.voteCountGte) !== 0
+ ? max.toString()
+ : undefined
+ );
+ }}
+ subText={intl.formatMessage(messages.voteCount, {
+ minValue: currentFilters.voteCountGte ?? 0,
+ maxValue: currentFilters.voteCountLte ?? 1000,
+ })}
+ />
+
{intl.formatMessage(messages.streamingservices)}
diff --git a/src/components/Discover/constants.ts b/src/components/Discover/constants.ts
index 6fcbe43c..0571f1fc 100644
--- a/src/components/Discover/constants.ts
+++ b/src/components/Discover/constants.ts
@@ -86,6 +86,8 @@ export const sliderTitles = defineMessages({
tmdbnetwork: 'TMDB Network',
tmdbstudio: 'TMDB Studio',
tmdbsearch: 'TMDB Search',
+ tmdbmoviestreamingservices: 'TMDB Movie Streaming Services',
+ tmdbtvstreamingservices: 'TMDB TV Streaming Services',
});
export const QueryFilterOptions = z.object({
@@ -102,6 +104,8 @@ export const QueryFilterOptions = z.object({
withRuntimeLte: z.string().optional(),
voteAverageGte: z.string().optional(),
voteAverageLte: z.string().optional(),
+ voteCountLte: z.string().optional(),
+ voteCountGte: z.string().optional(),
watchRegion: z.string().optional(),
watchProviders: z.string().optional(),
});
@@ -167,6 +171,14 @@ export const prepareFilterValues = (
filterValues.voteAverageLte = values.voteAverageLte;
}
+ if (values.voteCountGte) {
+ filterValues.voteCountGte = values.voteCountGte;
+ }
+
+ if (values.voteCountLte) {
+ filterValues.voteCountLte = values.voteCountLte;
+ }
+
if (values.watchProviders) {
filterValues.watchProviders = values.watchProviders;
}
@@ -188,6 +200,12 @@ export const countActiveFilters = (filterValues: FilterOptions): number => {
delete clonedFilters.voteAverageLte;
}
+ if (clonedFilters.voteCountGte || filterValues.voteCountLte) {
+ totalCount += 1;
+ delete clonedFilters.voteCountGte;
+ delete clonedFilters.voteCountLte;
+ }
+
if (clonedFilters.withRuntimeGte || filterValues.withRuntimeLte) {
totalCount += 1;
delete clonedFilters.withRuntimeGte;
diff --git a/src/components/Discover/index.tsx b/src/components/Discover/index.tsx
index b9071b42..38875dbe 100644
--- a/src/components/Discover/index.tsx
+++ b/src/components/Discover/index.tsx
@@ -165,10 +165,10 @@ const Discover = () => {
![\"All](\"https://img.shields.io/badge/all_contributors-<%=){kind=icon}
-orange.svg\"/>
-
+
@@ -182,6 +182,21 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
