From 78bf2502cbf1e26980abf6c0ffb7f0c74b917a3b Mon Sep 17 00:00:00 2001 From: Fuwn Date: Sat, 28 Mar 2026 06:20:36 +0000 Subject: fix(notifications): support per-device push subscriptions --- src/lib/Database/SB/User/notifications.ts | 41 ++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) (limited to 'src/lib/Database/SB/User') diff --git a/src/lib/Database/SB/User/notifications.ts b/src/lib/Database/SB/User/notifications.ts index 058171a9..21ad827b 100644 --- a/src/lib/Database/SB/User/notifications.ts +++ b/src/lib/Database/SB/User/notifications.ts @@ -8,6 +8,16 @@ export interface UserNotifications { fingerprint: string; } +const subscriptionEndpoint = (subscription: JSON) => { + if (typeof subscription !== "object" || subscription === null) return null; + + return "endpoint" in subscription && + typeof subscription.endpoint === "string" && + subscription.endpoint.length + ? subscription.endpoint + : null; +}; + export const getUserSubscription = async (userId: number) => await sb.from("user_notifications").select("*").eq("user_id", userId); @@ -33,13 +43,38 @@ export const setUserSubscription = async ( userId: number, subscription: JSON, fingerprint: string, -) => - await sb.from("user_notifications").upsert( +) => { + const endpoint = subscriptionEndpoint(subscription); + + if (endpoint) { + const { data } = await sb + .from("user_notifications") + .select("fingerprint, subscription") + .eq("user_id", userId); + + const staleFingerprints = + data + ?.filter( + (existing) => + existing.fingerprint !== fingerprint && + subscriptionEndpoint(existing.subscription as JSON) === endpoint, + ) + .map((existing) => existing.fingerprint) ?? []; + + await Promise.all( + staleFingerprints.map(async (staleFingerprint) => { + await deleteUserSubscription(userId, staleFingerprint); + }), + ); + } + + return await sb.from("user_notifications").upsert( { user_id: userId, updated_at: new Date().toISOString(), subscription: subscription, fingerprint, }, - { onConflict: "user_id" }, + { onConflict: "user_id,fingerprint" }, ); +}; -- cgit v1.2.3