+
diff --git a/src/components/RequestModal/TvRequestModal.tsx b/src/components/RequestModal/TvRequestModal.tsx
index 71750678..18579d64 100644
--- a/src/components/RequestModal/TvRequestModal.tsx
+++ b/src/components/RequestModal/TvRequestModal.tsx
@@ -42,7 +42,6 @@ const messages = defineMessages('components.RequestModal', {
season: 'Season',
numberofepisodes: '# of Episodes',
seasonnumber: 'Season {number}',
- extras: 'Extras',
errorediting: 'Something went wrong while editing the request.',
requestedited: 'Request for
{title} edited successfully!',
requestApproved: 'Request for
{title} approved!',
@@ -254,11 +253,13 @@ const TvRequestModal = ({
};
const getAllSeasons = (): number[] => {
- return (data?.seasons ?? [])
- .filter(
- (season) => season.seasonNumber !== 0 && season.episodeCount !== 0
- )
- .map((season) => season.seasonNumber);
+ let allSeasons = (data?.seasons ?? []).filter(
+ (season) => season.episodeCount !== 0
+ );
+ if (!settings.currentSettings.partialRequestsEnabled) {
+ allSeasons = allSeasons.filter((season) => season.seasonNumber !== 0);
+ }
+ return allSeasons.map((season) => season.seasonNumber);
};
const getAllRequestedSeasons = (): number[] => {
@@ -582,7 +583,9 @@ const TvRequestModal = ({
{data?.seasons
.filter(
(season) =>
- season.seasonNumber !== 0 && season.episodeCount !== 0
+ (!settings.currentSettings.enableSpecialEpisodes
+ ? season.seasonNumber !== 0
+ : true) && season.episodeCount !== 0
)
.map((season) => {
const seasonRequest = getSeasonRequest(
@@ -660,7 +663,7 @@ const TvRequestModal = ({
{season.seasonNumber === 0
- ? intl.formatMessage(messages.extras)
+ ? intl.formatMessage(globalMessages.specials)
: intl.formatMessage(messages.seasonnumber, {
number: season.seasonNumber,
})}
diff --git a/src/components/Selector/index.tsx b/src/components/Selector/index.tsx
index db959170..6c831909 100644
--- a/src/components/Selector/index.tsx
+++ b/src/components/Selector/index.tsx
@@ -13,6 +13,7 @@ import type {
TmdbKeywordSearchResponse,
} from '@server/api/themoviedb/interfaces';
import type { GenreSliderItem } from '@server/interfaces/api/discoverInterfaces';
+import type { UserResultsResponse } from '@server/interfaces/api/userInterfaces';
import type {
Keyword,
ProductionCompany,
@@ -29,6 +30,7 @@ const messages = defineMessages('components.Selector', {
searchKeywords: 'Search keywords…',
searchGenres: 'Select genres…',
searchStudios: 'Search studios…',
+ searchUsers: 'Select users…',
starttyping: 'Starting typing to search.',
nooptions: 'No results.',
showmore: 'Show More',
@@ -374,7 +376,11 @@ export const WatchProviderSelector = ({
const { currentSettings } = useSettings();
const [showMore, setShowMore] = useState(false);
const [watchRegion, setWatchRegion] = useState(
- region ? region : currentSettings.region ? currentSettings.region : 'US'
+ region
+ ? region
+ : currentSettings.discoverRegion
+ ? currentSettings.discoverRegion
+ : 'US'
);
const [activeProvider, setActiveProvider] = useState(
activeProviders ?? []
@@ -437,7 +443,7 @@ export const WatchProviderSelector = ({
key={`prodiver-${provider.id}`}
>
-
+
+
+
{isActive && (
@@ -483,7 +486,7 @@ export const WatchProviderSelector = ({
key={`prodiver-${provider.id}`}
>
-
+
+
+
{isActive && (
@@ -548,3 +548,77 @@ export const WatchProviderSelector = ({
);
};
+
+export const UserSelector = ({
+ isMulti,
+ defaultValue,
+ onChange,
+}: BaseSelectorMultiProps | BaseSelectorSingleProps) => {
+ const intl = useIntl();
+ const [defaultDataValue, setDefaultDataValue] = useState<
+ { label: string; value: number }[] | null
+ >(null);
+
+ useEffect(() => {
+ const loadUsers = async (): Promise => {
+ if (!defaultValue) {
+ return;
+ }
+
+ const users = defaultValue.split(',');
+
+ const res = await fetch(`/api/v1/user`);
+ if (!res.ok) {
+ throw new Error('Network response was not ok');
+ }
+ const response: UserResultsResponse = await res.json();
+
+ const genreData = users
+ .filter((u) => response.results.find((user) => user.id === Number(u)))
+ .map((u) => response.results.find((user) => user.id === Number(u)))
+ .map((u) => ({
+ label: u?.displayName ?? '',
+ value: u?.id ?? 0,
+ }));
+
+ setDefaultDataValue(genreData);
+ };
+
+ loadUsers();
+ }, [defaultValue]);
+
+ const loadUserOptions = async (inputValue: string) => {
+ const res = await fetch(
+ `/api/v1/user${inputValue ? `?q=${encodeURIComponent(inputValue)}` : ''}`
+ );
+ if (!res.ok) throw new Error();
+ const results: UserResultsResponse = await res.json();
+
+ return results.results
+ .map((result) => ({
+ label: result.displayName,
+ value: result.id,
+ }))
+ .filter(({ label }) =>
+ label.toLowerCase().includes(inputValue.toLowerCase())
+ );
+ };
+
+ return (
+ {
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ onChange(value as any);
+ }}
+ />
+ );
+};
diff --git a/src/components/Settings/Notifications/NotificationsDiscord.tsx b/src/components/Settings/Notifications/NotificationsDiscord.tsx
index b62263fb..82ac6840 100644
--- a/src/components/Settings/Notifications/NotificationsDiscord.tsx
+++ b/src/components/Settings/Notifications/NotificationsDiscord.tsx
@@ -19,12 +19,16 @@ const messages = defineMessages('components.Settings.Notifications', {
webhookUrl: 'Webhook URL',
webhookUrlTip:
'Create a webhook integration in your server',
+ webhookRoleId: 'Notification Role ID',
+ webhookRoleIdTip:
+ 'The role ID to mention in the webhook message. Leave empty to disable mentions',
discordsettingssaved: 'Discord notification settings saved successfully!',
discordsettingsfailed: 'Discord notification settings failed to save.',
toastDiscordTestSending: 'Sending Discord test notification…',
toastDiscordTestSuccess: 'Discord test notification sent!',
toastDiscordTestFailed: 'Discord test notification failed to send.',
validationUrl: 'You must provide a valid URL',
+ validationWebhookRoleId: 'You must provide a valid Discord Role ID',
validationTypes: 'You must select at least one notification type',
enableMentions: 'Enable Mentions',
});
@@ -53,6 +57,12 @@ const NotificationsDiscord = () => {
otherwise: Yup.string().nullable(),
})
.url(intl.formatMessage(messages.validationUrl)),
+ webhookRoleId: Yup.string()
+ .nullable()
+ .matches(
+ /^\d{17,19}$/,
+ intl.formatMessage(messages.validationWebhookRoleId)
+ ),
});
if (!data && !error) {
@@ -67,6 +77,7 @@ const NotificationsDiscord = () => {
botUsername: data?.options.botUsername,
botAvatarUrl: data?.options.botAvatarUrl,
webhookUrl: data.options.webhookUrl,
+ webhookRoleId: data?.options.webhookRoleId,
enableMentions: data?.options.enableMentions,
}}
validationSchema={NotificationsDiscordSchema}
@@ -84,6 +95,7 @@ const NotificationsDiscord = () => {
botUsername: values.botUsername,
botAvatarUrl: values.botAvatarUrl,
webhookUrl: values.webhookUrl,
+ webhookRoleId: values.webhookRoleId,
enableMentions: values.enableMentions,
},
}),
@@ -141,6 +153,7 @@ const NotificationsDiscord = () => {
botUsername: values.botUsername,
botAvatarUrl: values.botAvatarUrl,
webhookUrl: values.webhookUrl,
+ webhookRoleId: values.webhookRoleId,
enableMentions: values.enableMentions,
},
}),
@@ -254,6 +267,21 @@ const NotificationsDiscord = () => {
)}
+
+
+
+
+
+
+ {errors.webhookRoleId &&
+ touched.webhookRoleId &&
+ typeof errors.webhookRoleId === 'string' && (
+ {errors.webhookRoleId}
+ )}
+
+
+
+
+
+
+
+
+ {errors.messageThreadId &&
+ touched.messageThreadId &&
+ typeof errors.messageThreadId === 'string' && (
+ {errors.messageThreadId}
+ )}
+
+
+
+ {intl.formatMessage(messages.overrideRules)}
+
+
+ {rules && (
+
+ )}
+ -
+
+
+
+
);
}}
diff --git a/src/components/Settings/SettingsJellyfin.tsx b/src/components/Settings/SettingsJellyfin.tsx
index 316dc48e..7c6d02d8 100644
--- a/src/components/Settings/SettingsJellyfin.tsx
+++ b/src/components/Settings/SettingsJellyfin.tsx
@@ -139,7 +139,10 @@ const SettingsJellyfin: React.FC = ({
),
jellyfinExternalUrl: Yup.string()
.nullable()
- .url(intl.formatMessage(messages.validationUrl))
+ .matches(
+ /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}(\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&/=]*))?$/i,
+ intl.formatMessage(messages.validationUrl)
+ )
.test(
'no-trailing-slash',
intl.formatMessage(messages.validationUrlTrailingSlash),
@@ -147,7 +150,10 @@ const SettingsJellyfin: React.FC = ({
),
jellyfinForgotPasswordUrl: Yup.string()
.nullable()
- .url(intl.formatMessage(messages.validationUrl))
+ .matches(
+ /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}(\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&/=]*))?$/i,
+ intl.formatMessage(messages.validationUrl)
+ )
.test(
'no-trailing-slash',
intl.formatMessage(messages.validationUrlTrailingSlash),
diff --git a/src/components/Settings/SettingsJobsCache/index.tsx b/src/components/Settings/SettingsJobsCache/index.tsx
index 975de36c..aeba1531 100644
--- a/src/components/Settings/SettingsJobsCache/index.tsx
+++ b/src/components/Settings/SettingsJobsCache/index.tsx
@@ -58,6 +58,7 @@ const messages: { [messageName: string]: MessageDescriptor } = defineMessages(
'plex-recently-added-scan': 'Plex Recently Added Scan',
'plex-full-scan': 'Plex Full Library Scan',
'plex-watchlist-sync': 'Plex Watchlist Sync',
+ 'plex-refresh-token': 'Plex Refresh Token',
'jellyfin-full-scan': 'Jellyfin Full Library Scan',
'jellyfin-recently-added-scan': 'Jellyfin Recently Added Scan',
'availability-sync': 'Media Availability Sync',
diff --git a/src/components/Settings/SettingsMain/index.tsx b/src/components/Settings/SettingsMain/index.tsx
index 2d1e0219..8020b9fe 100644
--- a/src/components/Settings/SettingsMain/index.tsx
+++ b/src/components/Settings/SettingsMain/index.tsx
@@ -31,10 +31,12 @@ const messages = defineMessages('components.Settings.SettingsMain', {
apikey: 'API Key',
applicationTitle: 'Application Title',
applicationurl: 'Application URL',
- region: 'Discover Region',
- regionTip: 'Filter content by regional availability',
+ discoverRegion: 'Discover Region',
+ discoverRegionTip: 'Filter content by regional availability',
originallanguage: 'Discover Language',
originallanguageTip: 'Filter content by original language',
+ streamingRegion: 'Streaming Region',
+ streamingRegionTip: 'Show streaming sites by regional availability',
toastApiKeySuccess: 'New API key generated successfully!',
toastApiKeyFailure: 'Something went wrong while generating a new API key.',
toastSettingsSuccess: 'Settings saved successfully!',
@@ -54,6 +56,7 @@ const messages = defineMessages('components.Settings.SettingsMain', {
validationApplicationUrl: 'You must provide a valid URL',
validationApplicationUrlTrailingSlash: 'URL must not end in a trailing slash',
partialRequestsEnabled: 'Allow Partial Series Requests',
+ enableSpecialEpisodes: 'Allow Special Episodes Requests',
locale: 'Display Language',
proxyEnabled: 'HTTP(S) Proxy',
proxyHostname: 'Proxy Hostname',
@@ -87,7 +90,10 @@ const SettingsMain = () => {
intl.formatMessage(messages.validationApplicationTitle)
),
applicationUrl: Yup.string()
- .url(intl.formatMessage(messages.validationApplicationUrl))
+ .matches(
+ /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}(\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&/=]*))?$/i,
+ intl.formatMessage(messages.validationApplicationUrl)
+ )
.test(
'no-trailing-slash',
intl.formatMessage(messages.validationApplicationUrlTrailingSlash),
@@ -149,9 +155,11 @@ const SettingsMain = () => {
csrfProtection: data?.csrfProtection,
hideAvailable: data?.hideAvailable,
locale: data?.locale ?? 'en',
- region: data?.region,
+ discoverRegion: data?.discoverRegion,
originalLanguage: data?.originalLanguage,
+ streamingRegion: data?.streamingRegion,
partialRequestsEnabled: data?.partialRequestsEnabled,
+ enableSpecialEpisodes: data?.enableSpecialEpisodes,
trustProxy: data?.trustProxy,
cacheImages: data?.cacheImages,
proxyEnabled: data?.proxy?.enabled,
@@ -178,9 +186,11 @@ const SettingsMain = () => {
csrfProtection: values.csrfProtection,
hideAvailable: values.hideAvailable,
locale: values.locale,
- region: values.region,
+ discoverRegion: values.discoverRegion,
+ streamingRegion: values.streamingRegion,
originalLanguage: values.originalLanguage,
partialRequestsEnabled: values.partialRequestsEnabled,
+ enableSpecialEpisodes: values.enableSpecialEpisodes,
trustProxy: values.trustProxy,
cacheImages: values.cacheImages,
proxy: {
@@ -399,17 +409,17 @@ const SettingsMain = () => {
-
+
+
+
+
+
+
+ {
+ setFieldValue(
+ 'enableSpecialEpisodes',
+ !values.enableSpecialEpisodes
+ );
+ }}
+ />
+
+
+
+
+
+
+
+
{values.proxyEnabled && (
<>
-
- | 
-
+
**Jellyseerr** is a free and open source software application for managing requests for your media library.
@@ -147,6 +147,22 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
