shpaq/sct-overseerr
1
0
Fork 0
mirror of https://github.com/sct/overseerr.git synced 2025-09-17 17:24:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(webpush): only prompt user to allow notifications if enabled in user settings (#1552)

Browse Source
This commit is contained in:
TheCatLady
2021-05-03 23:40:32 -04:00
committed by GitHub
parent 6c9991d474
commit b05b177776
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/routes/index.ts
View File

@@ -81,10 +81,16 @@ router.get('/status/appdata', (_req, res) => {
}); });
router.use('/user', isAuthenticated(), user); router.use('/user', isAuthenticated(), user);
router.get('/settings/public', async (_req, res) => { router.get('/settings/public', async (req, res) => {
const settings = getSettings(); const settings = getSettings();
return res.status(200).json(settings.fullPublicSettings); if (!req.user?.settings?.notificationTypes.webpush) {
return res
.status(200)
.json({ ...settings.fullPublicSettings, enablePushRegistration: false });
} else {
return res.status(200).json(settings.fullPublicSettings);
}
}); });
router.use( router.use(
'/settings', '/settings',

3
src/components/Settings/Notifications/NotificationsWebPush/index.tsx
View File

@@ -3,7 +3,7 @@ import { Field, Form, Formik } from 'formik';
import React, { useState } from 'react'; import React, { useState } from 'react';
import { defineMessages, useIntl } from 'react-intl'; import { defineMessages, useIntl } from 'react-intl';
import { useToasts } from 'react-toast-notifications'; import { useToasts } from 'react-toast-notifications';
import useSWR from 'swr'; import useSWR, { mutate } from 'swr';
import globalMessages from '../../../../i18n/globalMessages'; import globalMessages from '../../../../i18n/globalMessages';
import Button from '../../../Common/Button'; import Button from '../../../Common/Button';
import LoadingSpinner from '../../../Common/LoadingSpinner'; import LoadingSpinner from '../../../Common/LoadingSpinner';
@@ -44,6 +44,7 @@ const NotificationsWebPush: React.FC = () => {
types: values.types, types: values.types,
options: {}, options: {},
}); });
mutate('/api/v1/settings/public');
addToast(intl.formatMessage(messages.webpushsettingssaved), { addToast(intl.formatMessage(messages.webpushsettingssaved), {
appearance: 'success', appearance: 'success',
autoDismiss: true, autoDismiss: true,

3
src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush.tsx
View File

@@ -4,7 +4,7 @@ import { useRouter } from 'next/router';
import React from 'react'; import React from 'react';
import { defineMessages, useIntl } from 'react-intl'; import { defineMessages, useIntl } from 'react-intl';
import { useToasts } from 'react-toast-notifications'; import { useToasts } from 'react-toast-notifications';
import useSWR from 'swr'; import useSWR, { mutate } from 'swr';
import { UserSettingsNotificationsResponse } from '../../../../../server/interfaces/api/userSettingsInterfaces'; import { UserSettingsNotificationsResponse } from '../../../../../server/interfaces/api/userSettingsInterfaces';
import { useUser } from '../../../../hooks/useUser'; import { useUser } from '../../../../hooks/useUser';
import globalMessages from '../../../../i18n/globalMessages'; import globalMessages from '../../../../i18n/globalMessages';
@@ -48,6 +48,7 @@ const UserWebPushSettings: React.FC = () => {
webpush: values.enableWebPush ? ALL_NOTIFICATIONS : 0, webpush: values.enableWebPush ? ALL_NOTIFICATIONS : 0,
}, },
}); });
mutate('/api/v1/settings/public');
addToast(intl.formatMessage(messages.webpushsettingssaved), { addToast(intl.formatMessage(messages.webpushsettingssaved), {
appearance: 'success', appearance: 'success',
autoDismiss: true, autoDismiss: true,