= ({
}, [onChange, selectedRegion, name, regions]);
return (
-
-
-
- {({ open }) => (
-
-
-
- {((selectedRegion && hasFlag(selectedRegion?.iso_3166_1)) ||
- (isUserSetting &&
- !selectedRegion &&
- currentSettings.region &&
- hasFlag(currentSettings.region))) && (
-
-
-
- )}
-
- {selectedRegion && selectedRegion.iso_3166_1 !== 'all'
- ? intl.formatDisplayName(selectedRegion.iso_3166_1, {
- type: 'region',
- fallback: 'none',
- }) ?? selectedRegion.english_name
- : isUserSetting && selectedRegion?.iso_3166_1 !== 'all'
- ? intl.formatMessage(messages.regionServerDefault, {
- region: currentSettings.region
- ? intl.formatDisplayName(currentSettings.region, {
- type: 'region',
- fallback: 'none',
- }) ?? defaultRegionNameFallback
- : intl.formatMessage(messages.regionDefault),
- })
- : intl.formatMessage(messages.regionDefault)}
+
+
+ {({ open }) => (
+
+
+
+ {((selectedRegion && hasFlag(selectedRegion?.iso_3166_1)) ||
+ (isUserSetting &&
+ !selectedRegion &&
+ currentSettings.region &&
+ hasFlag(currentSettings.region))) && (
+
+
-
-
-
-
-
+ )}
+
+ {selectedRegion && selectedRegion.iso_3166_1 !== 'all'
+ ? regionName(selectedRegion.iso_3166_1)
+ : isUserSetting && selectedRegion?.iso_3166_1 !== 'all'
+ ? intl.formatMessage(messages.regionServerDefault, {
+ region: currentSettings.region
+ ? regionName(currentSettings.region)
+ : intl.formatMessage(messages.regionDefault),
+ })
+ : intl.formatMessage(messages.regionDefault)}
+
+
+
+
+
+
-
+
-
- {isUserSetting && (
-
- {({ selected, active }) => (
-
+ {({ selected, active }) => (
+
+
+
+
+
-
-
-
+ {intl.formatMessage(messages.regionServerDefault, {
+ region: currentSettings.region
+ ? regionName(currentSettings.region)
+ : intl.formatMessage(messages.regionDefault),
+ })}
+
+ {selected && (
- {intl.formatMessage(messages.regionServerDefault, {
- region: currentSettings.region
- ? intl.formatDisplayName(
- currentSettings.region,
- {
- type: 'region',
- fallback: 'none',
- }
- ) ?? defaultRegionNameFallback
- : intl.formatMessage(messages.regionDefault),
- })}
+
- {selected && (
-
-
-
- )}
-
+ )}
+
+
+ {intl.formatMessage(messages.regionDefault)}
+
+ {selected && (
+
+
+
)}
-
+
)}
-
+
+ {sortedRegions?.map((region) => (
+
{({ selected, active }) => (
+
+
+
- {intl.formatMessage(messages.regionDefault)}
+ {regionName(region.iso_3166_1)}
{selected && (
= ({
)}
- {sortedRegions?.map((region) => (
-
- {({ selected, active }) => (
-
-
-
-
-
- {intl.formatDisplayName(region.iso_3166_1, {
- type: 'region',
- fallback: 'none',
- }) ?? region.english_name}
-
- {selected && (
-
-
-
- )}
-
- )}
-
- ))}
-
-
-
-
);
};
diff --git a/src/components/RequestBlock/index.tsx b/src/components/RequestBlock/index.tsx
index d003bcf72..cd07e1ebf 100644
--- a/src/components/RequestBlock/index.tsx
+++ b/src/components/RequestBlock/index.tsx
@@ -8,6 +8,7 @@ import {
XIcon,
} from '@heroicons/react/solid';
import axios from 'axios';
+import Link from 'next/link';
import React, { useState } from 'react';
import { defineMessages, useIntl } from 'react-intl';
import { MediaRequestStatus } from '../../../server/constants/media';
@@ -80,14 +81,22 @@ const RequestBlock: React.FC
= ({ request, onUpdate }) => {
{request.modifiedBy && (
)}
@@ -95,33 +104,29 @@ const RequestBlock: React.FC = ({ request, onUpdate }) => {
{request.status === MediaRequestStatus.PENDING && (
<>
-
-
-
-
-
-
-
-
-
+
+
+
)}
{request.status !== MediaRequestStatus.PENDING && (
@@ -130,7 +135,7 @@ const RequestBlock: React.FC
= ({ request, onUpdate }) => {
onClick={() => deleteRequest()}
disabled={isUpdating}
>
-
+
)}
{intl.formatMessage(messages.requestoverrides)}
diff --git a/src/components/RequestButton/index.tsx b/src/components/RequestButton/index.tsx
index a528bba43..5ba5bf5d5 100644
--- a/src/components/RequestButton/index.tsx
+++ b/src/components/RequestButton/index.tsx
@@ -123,7 +123,15 @@ const RequestButton: React.FC = ({
const buttons: ButtonOption[] = [];
if (
(!media || media.status === MediaStatus.UNKNOWN) &&
- hasPermission(Permission.REQUEST)
+ hasPermission(
+ [
+ Permission.REQUEST,
+ mediaType === 'movie'
+ ? Permission.REQUEST_MOVIE
+ : Permission.REQUEST_TV,
+ ],
+ { type: 'or' }
+ )
) {
buttons.push({
id: 'request',
@@ -132,15 +140,21 @@ const RequestButton: React.FC = ({
setEditRequest(false);
setShowRequestModal(true);
},
- svg: ,
+ svg: ,
});
}
if (
(!media || media.status4k === MediaStatus.UNKNOWN) &&
- (hasPermission(Permission.REQUEST_4K) ||
- (mediaType === 'movie' && hasPermission(Permission.REQUEST_4K_MOVIE)) ||
- (mediaType === 'tv' && hasPermission(Permission.REQUEST_4K_TV))) &&
+ hasPermission(
+ [
+ Permission.REQUEST_4K,
+ mediaType === 'movie'
+ ? Permission.REQUEST_4K_MOVIE
+ : Permission.REQUEST_4K_TV,
+ ],
+ { type: 'or' }
+ ) &&
((settings.currentSettings.movie4kEnabled && mediaType === 'movie') ||
(settings.currentSettings.series4kEnabled && mediaType === 'tv'))
) {
@@ -151,7 +165,7 @@ const RequestButton: React.FC = ({
setEditRequest(false);
setShowRequest4kModal(true);
},
- svg: ,
+ svg: ,
});
}
@@ -168,7 +182,7 @@ const RequestButton: React.FC = ({
setEditRequest(true);
setShowRequestModal(true);
},
- svg: ,
+ svg: ,
});
}
@@ -185,7 +199,7 @@ const RequestButton: React.FC = ({
setEditRequest(true);
setShowRequest4kModal(true);
},
- svg: ,
+ svg: ,
});
}
@@ -201,7 +215,7 @@ const RequestButton: React.FC = ({
action: () => {
modifyRequest(activeRequest, 'approve');
},
- svg: ,
+ svg: ,
},
{
id: 'decline-request',
@@ -209,7 +223,7 @@ const RequestButton: React.FC = ({
action: () => {
modifyRequest(activeRequest, 'decline');
},
- svg: ,
+ svg: ,
}
);
}
@@ -229,7 +243,7 @@ const RequestButton: React.FC = ({
action: () => {
modifyRequests(activeRequests, 'approve');
},
- svg: ,
+ svg: ,
},
{
id: 'decline-request-batch',
@@ -239,7 +253,7 @@ const RequestButton: React.FC = ({
action: () => {
modifyRequests(activeRequests, 'decline');
},
- svg: ,
+ svg: ,
}
);
}
@@ -256,7 +270,7 @@ const RequestButton: React.FC = ({
action: () => {
modifyRequest(active4kRequest, 'approve');
},
- svg: ,
+ svg: ,
},
{
id: 'decline-4k-request',
@@ -264,7 +278,7 @@ const RequestButton: React.FC = ({
action: () => {
modifyRequest(active4kRequest, 'decline');
},
- svg: ,
+ svg: ,
}
);
}
@@ -284,7 +298,7 @@ const RequestButton: React.FC = ({
action: () => {
modifyRequests(active4kRequests, 'approve');
},
- svg: ,
+ svg: ,
},
{
id: 'decline-4k-request-batch',
@@ -294,7 +308,7 @@ const RequestButton: React.FC = ({
action: () => {
modifyRequests(active4kRequests, 'decline');
},
- svg: ,
+ svg: ,
}
);
}
@@ -302,7 +316,9 @@ const RequestButton: React.FC = ({
if (
mediaType === 'tv' &&
(!activeRequest || activeRequest.requestedBy.id !== user?.id) &&
- hasPermission(Permission.REQUEST) &&
+ hasPermission([Permission.REQUEST, Permission.REQUEST_TV], {
+ type: 'or',
+ }) &&
media &&
media.status !== MediaStatus.AVAILABLE &&
media.status !== MediaStatus.UNKNOWN &&
@@ -315,7 +331,7 @@ const RequestButton: React.FC = ({
setEditRequest(false);
setShowRequestModal(true);
},
- svg: ,
+ svg: ,
});
}
@@ -338,7 +354,7 @@ const RequestButton: React.FC = ({
setEditRequest(false);
setShowRequest4kModal(true);
},
- svg: ,
+ svg: ,
});
}
@@ -376,8 +392,8 @@ const RequestButton: React.FC = ({
- {buttonOne.svg ?? null}
- {buttonOne.text}
+ {buttonOne.svg}
+ {buttonOne.text}
}
onClick={buttonOne.action}
@@ -390,7 +406,7 @@ const RequestButton: React.FC = ({
key={`request-option-${button.id}`}
>
{button.svg}
- {button.text}
+ {button.text}
))
: null}
diff --git a/src/components/RequestCard/index.tsx b/src/components/RequestCard/index.tsx
index 7e71813e3..afa6216e6 100644
--- a/src/components/RequestCard/index.tsx
+++ b/src/components/RequestCard/index.tsx
@@ -1,7 +1,7 @@
import { CheckIcon, TrashIcon, XIcon } from '@heroicons/react/solid';
import axios from 'axios';
import Link from 'next/link';
-import React, { useContext, useEffect } from 'react';
+import React, { useEffect } from 'react';
import { useInView } from 'react-intersection-observer';
import { defineMessages, useIntl } from 'react-intl';
import useSWR, { mutate } from 'swr';
@@ -12,7 +12,6 @@ import {
import type { MediaRequest } from '../../../server/entity/MediaRequest';
import type { MovieDetails } from '../../../server/models/Movie';
import type { TvDetails } from '../../../server/models/Tv';
-import { LanguageContext } from '../../context/LanguageContext';
import { Permission, useUser } from '../../hooks/useUser';
import globalMessages from '../../i18n/globalMessages';
import { withProperties } from '../../utils/typeHelpers';
@@ -63,16 +62,15 @@ const RequestCardError: React.FC = ({ mediaId }) => {
{intl.formatMessage(messages.mediaerror)}
{hasPermission(Permission.MANAGE_REQUESTS) && mediaId && (
-
-
-
+
)}
@@ -92,13 +90,12 @@ const RequestCard: React.FC = ({ request, onTitleData }) => {
});
const intl = useIntl();
const { hasPermission } = useUser();
- const { locale } = useContext(LanguageContext);
const url =
request.type === 'movie'
? `/api/v1/movie/${request.media.tmdbId}`
: `/api/v1/tv/${request.media.tmdbId}`;
const { data: title, error } = useSWR(
- inView ? `${url}?language=${locale}` : null
+ inView ? `${url}` : null
);
const {
data: requestData,
@@ -242,31 +239,27 @@ const RequestCard: React.FC = ({ request, onTitleData }) => {
{requestData.status === MediaRequestStatus.PENDING &&
hasPermission(Permission.MANAGE_REQUESTS) && (
-
-
-
-
-
-
-
+
+
+
)}
-
+
{intl.formatMessage(messages.advancedoptions)}
@@ -522,8 +519,8 @@ const AdvancedRequester: React.FC
= ({
({selectedUser.email})
-
-
+
+
diff --git a/src/components/RequestModal/MovieRequestModal.tsx b/src/components/RequestModal/MovieRequestModal.tsx
index bd2512aee..11d4e9e0f 100644
--- a/src/components/RequestModal/MovieRequestModal.tsx
+++ b/src/components/RequestModal/MovieRequestModal.tsx
@@ -236,7 +236,7 @@ const MovieRequestModal: React.FC = ({
}
secondaryButtonType="danger"
cancelText={intl.formatMessage(globalMessages.close)}
- iconSvg={}
+ iconSvg={}
>
{isOwner
? intl.formatMessage(messages.pendingapproval)
@@ -294,7 +294,7 @@ const MovieRequestModal: React.FC = ({
)
}
okButtonType={'primary'}
- iconSvg={}
+ iconSvg={}
>
{hasAutoApprove && !quota?.movie.restricted && (
diff --git a/src/components/RequestModal/SearchByNameModal/index.tsx b/src/components/RequestModal/SearchByNameModal/index.tsx
index 111d6137f..fad62198e 100644
--- a/src/components/RequestModal/SearchByNameModal/index.tsx
+++ b/src/components/RequestModal/SearchByNameModal/index.tsx
@@ -52,7 +52,7 @@ const SearchByNameModal: React.FC
= ({
okText={intl.formatMessage(globalMessages.next)}
okDisabled={!tvdbId}
okButtonType="primary"
- iconSvg={}
+ iconSvg={}
>
= ({
? intl.formatMessage(globalMessages.back)
: intl.formatMessage(globalMessages.cancel)
}
- iconSvg={}
+ iconSvg={}
>
{editRequest
? isOwner
diff --git a/src/components/ResetPassword/RequestResetLink.tsx b/src/components/ResetPassword/RequestResetLink.tsx
index 74c342fa2..0cf20abb7 100644
--- a/src/components/ResetPassword/RequestResetLink.tsx
+++ b/src/components/ResetPassword/RequestResetLink.tsx
@@ -107,7 +107,7 @@ const ResetPassword: React.FC = () => {
id="email"
name="email"
type="text"
- placeholder="name@example.com"
+ inputMode="email"
className="flex-1 block w-full min-w-0 text-white transition duration-150 ease-in-out bg-gray-700 border border-gray-500 rounded-md form-input sm:text-sm sm:leading-5"
/>
-
{
-
{
+ const { currentSettings } = useSettings();
+ const { user } = useUser();
+ useEffect(() => {
+ if ('serviceWorker' in navigator && user?.id) {
+ navigator.serviceWorker
+ .register('/sw.js')
+ .then(async (registration) => {
+ console.log(
+ '[SW] Registration successful, scope is:',
+ registration.scope
+ );
+
+ if (currentSettings.enablePushRegistration) {
+ const sub = await registration.pushManager.subscribe({
+ userVisibleOnly: true,
+ applicationServerKey: currentSettings.vapidPublic,
+ });
+
+ const parsedSub = JSON.parse(JSON.stringify(sub));
+
+ if (parsedSub.keys.p256dh && parsedSub.keys.auth) {
+ await axios.post('/api/v1/user/registerPushSubscription', {
+ endpoint: parsedSub.endpoint,
+ p256dh: parsedSub.keys.p256dh,
+ auth: parsedSub.keys.auth,
+ });
+ }
+ }
+ })
+ .catch(function (error) {
+ console.log('[SW] Service worker registration failed, error:', error);
+ });
+ }
+ }, [
+ user,
+ currentSettings.vapidPublic,
+ currentSettings.enablePushRegistration,
+ ]);
+ return null;
+};
+
+export default ServiceWorkerSetup;
diff --git a/src/components/Settings/CopyButton.tsx b/src/components/Settings/CopyButton.tsx
index 4ae21190a..bd9738a29 100644
--- a/src/components/Settings/CopyButton.tsx
+++ b/src/components/Settings/CopyButton.tsx
@@ -30,9 +30,9 @@ const CopyButton: React.FC<{ textToCopy: string }> = ({ textToCopy }) => {
e.preventDefault();
setCopied();
}}
- className="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium leading-5 text-white transition duration-150 ease-in-out bg-indigo-600 border border-gray-500 hover:bg-indigo-500 focus:outline-none focus:ring-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700"
+ className="input-action"
>
-
+
);
};
diff --git a/src/components/Settings/Notifications/NotificationsDiscord.tsx b/src/components/Settings/Notifications/NotificationsDiscord.tsx
index b70baf286..70427f699 100644
--- a/src/components/Settings/Notifications/NotificationsDiscord.tsx
+++ b/src/components/Settings/Notifications/NotificationsDiscord.tsx
@@ -1,6 +1,6 @@
import axios from 'axios';
import { Field, Form, Formik } from 'formik';
-import React from 'react';
+import React, { useState } from 'react';
import { defineMessages, useIntl } from 'react-intl';
import { useToasts } from 'react-toast-notifications';
import useSWR from 'swr';
@@ -15,16 +15,20 @@ const messages = defineMessages({
botUsername: 'Bot Username',
botAvatarUrl: 'Bot Avatar URL',
webhookUrl: 'Webhook URL',
- webhookUrlPlaceholder: 'Server Settings → Integrations → Webhooks',
+ webhookUrlTip:
+ 'Create a webhook integration in your server',
discordsettingssaved: 'Discord notification settings saved successfully!',
discordsettingsfailed: 'Discord notification settings failed to save.',
- discordtestsent: 'Discord test notification sent!',
+ toastDiscordTestSending: 'Sending Discord test notification…',
+ toastDiscordTestSuccess: 'Discord test notification sent!',
+ toastDiscordTestFailed: 'Discord test notification failed to send.',
validationUrl: 'You must provide a valid URL',
});
const NotificationsDiscord: React.FC = () => {
const intl = useIntl();
- const { addToast } = useToasts();
+ const { addToast, removeToast } = useToasts();
+ const [isTesting, setIsTesting] = useState(false);
const { data, error, revalidate } = useSWR(
'/api/v1/settings/notifications/discord'
);
@@ -86,20 +90,47 @@ const NotificationsDiscord: React.FC = () => {
>
{({ errors, touched, isSubmitting, values, isValid, setFieldValue }) => {
const testSettings = async () => {
- await axios.post('/api/v1/settings/notifications/discord/test', {
- enabled: true,
- types: values.types,
- options: {
- botUsername: values.botUsername,
- botAvatarUrl: values.botAvatarUrl,
- webhookUrl: values.webhookUrl,
- },
- });
+ setIsTesting(true);
+ let toastId: string | undefined;
+ try {
+ addToast(
+ intl.formatMessage(messages.toastDiscordTestSending),
+ {
+ autoDismiss: false,
+ appearance: 'info',
+ },
+ (id) => {
+ toastId = id;
+ }
+ );
+ await axios.post('/api/v1/settings/notifications/discord/test', {
+ enabled: true,
+ types: values.types,
+ options: {
+ botUsername: values.botUsername,
+ botAvatarUrl: values.botAvatarUrl,
+ webhookUrl: values.webhookUrl,
+ },
+ });
- addToast(intl.formatMessage(messages.discordtestsent), {
- appearance: 'info',
- autoDismiss: true,
- });
+ if (toastId) {
+ removeToast(toastId);
+ }
+ addToast(intl.formatMessage(messages.toastDiscordTestSuccess), {
+ autoDismiss: true,
+ appearance: 'success',
+ });
+ } catch (e) {
+ if (toastId) {
+ removeToast(toastId);
+ }
+ addToast(intl.formatMessage(messages.toastDiscordTestFailed), {
+ autoDismiss: true,
+ appearance: 'error',
+ });
+ } finally {
+ setIsTesting(false);
+ }
};
return (
@@ -107,65 +138,75 @@ const NotificationsDiscord: React.FC = () => {
-
-
-
-
-
-
-
{errors.smtpHost && touched.smtpHost && (
@@ -303,7 +344,7 @@ const NotificationsEmail: React.FC = () => {
id="smtpPort"
name="smtpPort"
type="text"
- placeholder="465"
+ inputMode="numeric"
className="short"
/>
{errors.smtpPort && touched.smtpPort && (
@@ -312,14 +353,29 @@ const NotificationsEmail: React.FC = () => {
-
@@ -350,11 +406,11 @@ const NotificationsEmail: React.FC = () => {
@@ -375,10 +431,11 @@ const NotificationsEmail: React.FC = () => {
-
@@ -404,11 +461,11 @@ const NotificationsEmail: React.FC = () => {
-
{errors.pgpPassword && touched.pgpPassword && (
@@ -425,21 +482,22 @@ const NotificationsEmail: React.FC = () => {