zio/elk
2
0
Fork 0
Code Releases 2 Packages 1 Activity

feat: upgrade to masto.js v6 (#2530)

Browse source
This commit is contained in:
patak 2024-01-09 09:56:15 +01:00 • committed by GitHub
parent d8ea685803
commit 6c5bb83ac3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 262 additions and 263 deletions
Download patch file Download diff file Expand all files Collapse all files

10
composables/push-notifications/createPushSubscription.ts
View file

@ -8,7 +8,7 @@ import { PushSubscriptionError } from '~/composables/push-notifications/types'
export async function createPushSubscription(user: RequiredUserLogin,
notificationData: CreatePushNotification,
policy: mastodon.v1.SubscriptionPolicy = 'all',
policy: mastodon.v1.WebPushSubscriptionPolicy = 'all',
force = false): Promise<mastodon.v1.WebPushSubscription | undefined> {
const { server: serverEndpoint, vapidKey } = user
@ -115,10 +115,10 @@ async function removePushNotificationDataOnError(e: Error) {
async function sendSubscriptionToBackend(
subscription: PushSubscription,
data: CreatePushNotification,
policy: mastodon.v1.SubscriptionPolicy,
policy: mastodon.v1.WebPushSubscriptionPolicy,
): Promise<mastodon.v1.WebPushSubscription> {
const { endpoint, keys } = subscription.toJSON()
const params: mastodon.v1.CreateWebPushSubscriptionParams = {
return await useMastoClient().v1.push.subscription.create({
policy,
subscription: {
endpoint: endpoint!,
@ -128,7 +128,5 @@ async function sendSubscriptionToBackend(
},
},
data,
}
return await useMastoClient().v1.webPushSubscriptions.create(params)
})
}

4
composables/push-notifications/types.ts
View file

@ -14,11 +14,11 @@ export interface RequiredUserLogin extends Required<Omit<UserLogin, 'account' |
export interface CreatePushNotification {
alerts?: Partial<mastodon.v1.WebPushSubscriptionAlerts> | null
policy?: mastodon.v1.SubscriptionPolicy
policy?: mastodon.v1.WebPushSubscriptionPolicy
}
export type PushNotificationRequest = Record<string, boolean>
export type PushNotificationPolicy = Record<string, mastodon.v1.SubscriptionPolicy>
export type PushNotificationPolicy = Record<string, mastodon.v1.WebPushSubscriptionPolicy>
export interface CustomEmojisInfo {
lastUpdate: number

8
composables/push-notifications/usePushManager.ts
View file

@ -61,7 +61,7 @@ export function usePushManager() {
const subscribe = async (
notificationData?: CreatePushNotification,
policy?: mastodon.v1.SubscriptionPolicy,
policy?: mastodon.v1.WebPushSubscriptionPolicy,
force?: boolean,
): Promise<SubscriptionResult> => {
if (!isSupported)
@ -116,7 +116,7 @@ export function usePushManager() {
await removePushNotificationData(currentUser.value)
}
const saveSettings = async (policy?: mastodon.v1.SubscriptionPolicy) => {
const saveSettings = async (policy?: mastodon.v1.WebPushSubscriptionPolicy) => {
if (policy)
pushNotificationData.value.policy = policy
@ -173,7 +173,7 @@ export function usePushManager() {
if (policyChanged)
await subscribe(data, policy, true)
else
currentUser.value.pushSubscription = await client.v1.webPushSubscriptions.update({ data })
currentUser.value.pushSubscription = await client.v1.push.subscription.update({ data })
policyChanged && await nextTick()
@ -198,7 +198,7 @@ export function usePushManager() {
function createRawSettings(
pushSubscription?: mastodon.v1.WebPushSubscription,
subscriptionPolicy?: mastodon.v1.SubscriptionPolicy,
subscriptionPolicy?: mastodon.v1.WebPushSubscriptionPolicy,
) {
return {
follow: pushSubscription?.alerts.follow ?? true,