forked from trent_larson/crowd-funder-for-time-pwa
adjust the notification-subscription objects to try and send correct info
This commit is contained in:
17
src/App.vue
17
src/App.vue
@@ -345,6 +345,10 @@ interface VapidResponse {
|
||||
};
|
||||
}
|
||||
|
||||
interface PushSubscriptionWithTime extends PushSubscriptionJSON {
|
||||
notifyTime: { utcHour: number };
|
||||
}
|
||||
|
||||
import { DEFAULT_PUSH_SERVER, NotificationIface } from "@/constants/app";
|
||||
import { db } from "@/db/index";
|
||||
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
||||
@@ -561,15 +565,12 @@ export default class App extends Vue {
|
||||
hourNum + Math.round(new Date().getTimezoneOffset() / 60);
|
||||
const finalUtcHour = (utcHour + (utcHour < 0 ? 24 : 0)) % 24;
|
||||
|
||||
// This ignore commentary is because I'm adding non-standard stuff to the subscription object.
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-ignore
|
||||
const subscriptionWithTime = {
|
||||
const subscriptionWithTime: PushSubscriptionWithTime = {
|
||||
notifyTime: { utcHour: finalUtcHour },
|
||||
...subscription,
|
||||
...subscription.toJSON(),
|
||||
};
|
||||
this.sendSubscriptionToServer(subscriptionWithTime);
|
||||
return subscription;
|
||||
await this.sendSubscriptionToServer(subscriptionWithTime);
|
||||
return subscriptionWithTime;
|
||||
} else {
|
||||
throw new Error("Subscription object is not available.");
|
||||
}
|
||||
@@ -665,7 +666,7 @@ export default class App extends Vue {
|
||||
}
|
||||
|
||||
private sendSubscriptionToServer(
|
||||
subscription: PushSubscription,
|
||||
subscription: PushSubscriptionWithTime,
|
||||
): Promise<void> {
|
||||
console.log("About to send subscription...", subscription);
|
||||
return fetch("/web-push/subscribe", {
|
||||
|
||||
Reference in New Issue
Block a user