RSCord/ServerSpacebarOld
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix push changes 2

Browse Source
This commit is contained in:
murdle 2025-12-21 16:21:14 +02:00
parent 6ab94bb3cd
commit a7b349241c
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
assets/public/custom/pushMessages.js
View File

@ -6,7 +6,17 @@ function checkServiceWorkerSupport() {
async function isPushRegistered() { async function isPushRegistered() {
checkServiceWorkerSupport(); checkServiceWorkerSupport();
try { try {
const reg = await navigator.serviceWorker.ready; const regs = await navigator.serviceWorker.getRegistrations();
for (const reg of regs) {
if (!reg.pushManager) continue;
const sub = await reg.pushManager.getSubscription();
if (sub) return true;
}
const reg = await navigator.serviceWorker.getRegistration();
if (!reg || !reg.pushManager) return false;
const sub = await reg.pushManager.getSubscription(); const sub = await reg.pushManager.getSubscription();
return !!sub; return !!sub;
} catch { } catch {
@ -42,17 +52,14 @@ async function registerPush(publicKey) {
} }
const registration = await navigator.serviceWorker.register("/assets/custom/serviceWorker.js"); const registration = await navigator.serviceWorker.register("/assets/custom/serviceWorker.js");
console.log("Service Worker registered");
let subscription = await registration.pushManager.getSubscription(); let subscription = await registration.pushManager.getSubscription();
if (!subscription) { if (!subscription) {
const applicationServerKey = urlBase64ToUint8Array(publicKey); const applicationServerKey = urlBase64ToUint8Array(publicKey);
subscription = await registration.pushManager.subscribe({ subscription = await registration.pushManager.subscribe({
userVisibleOnly: true, userVisibleOnly: true,
applicationServerKey applicationServerKey
}); });
console.log("Push subscription obtained");
} }
const response = await fetch(`${window.GLOBAL_ENV.API_ENDPOINT}/v9/users/@me/devices`, { const response = await fetch(`${window.GLOBAL_ENV.API_ENDPOINT}/v9/users/@me/devices`, {
@ -67,9 +74,7 @@ async function registerPush(publicKey) {
}) })
}); });
if (response.ok) { if (!response.ok) {
console.log("Device registered successfully");
} else {
const text = await response.text(); const text = await response.text();
throw new Error("Failed to register: ", text) throw new Error("Failed to register: ", text)
} }