mirrors/jellyseerr
1
0
Fork 0
mirror of https://github.com/fallenbagel/jellyseerr.git synced 2025-12-23 18:29:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(webpush): ensure the local storage reflects the correct notification status

Browse Source 
Signed-off-by: 0xsysr3ll <0xsysr3ll@pm.me>
This commit is contained in:
0xsysr3ll
2025-12-08 21:55:43 +01:00
parent d60b75adf4
commit 6d3db3d596
1 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush/index.tsx
View File

@@ -114,33 +114,27 @@ const UserWebPushSettings = () => {
endpoint
);
// Delete from backend if endpoint is available
localStorage.setItem('pushNotificationsEnabled', 'false');
setWebPushEnabled(false);
const endpointToDelete = unsubscribedEndpoint || subEndpoint || endpoint;
const endpointsToDelete: string[] = endpointToDelete
? [endpointToDelete]
: dataDevices?.map((device: { endpoint: string }) => device.endpoint) ??
[];
if (endpointToDelete) {
await deletePushSubscriptionFromBackend(endpointToDelete);
} else if (dataDevices && dataDevices.length > 0) {
let hasFailures = false;
for (const device of dataDevices) {
try {
await deletePushSubscriptionFromBackend(device.endpoint);
} catch (error) {
hasFailures = true;
}
}
if (hasFailures) {
addToast(intl.formatMessage(messages.disablingwebpusherror), {
autoDismiss: true,
appearance: 'error',
});
return;
for (const ep of endpointsToDelete) {
try {
await axios.delete(
`/api/v1/user/${user?.id}/pushSubscription/${encodeURIComponent(
ep
)}`
);
} catch {
// Ignore individual deletion failures - backend cleanup is best effort
}
}
localStorage.setItem('pushNotificationsEnabled', 'false');
setWebPushEnabled(false);
addToast(intl.formatMessage(messages.webpushhasbeendisabled), {
autoDismiss: true,
appearance: 'success',
@@ -181,17 +175,19 @@ const UserWebPushSettings = () => {
useEffect(() => {
const verifyWebPush = async () => {
const enabled = await verifyPushSubscription(user?.id, currentSettings);
setWebPushEnabled(enabled);
const hasBackendSubscriptions = dataDevices && dataDevices.length > 0;
const isEnabled = enabled || hasBackendSubscriptions;
setWebPushEnabled(isEnabled);
localStorage.setItem(
'pushNotificationsEnabled',
enabled ? 'true' : 'false'
isEnabled ? 'true' : 'false'
);
};
if (user?.id) {
verifyWebPush();
}
}, [user?.id, currentSettings]);
}, [user?.id, currentSettings, dataDevices]);
useEffect(() => {
const getSubscriptionEndpoint = async () => {