diff --git a/src/client/sw/operations.ts b/src/client/sw/operations.ts index 33f366d1fc..3dc71bd551 100644 --- a/src/client/sw/operations.ts +++ b/src/client/sw/operations.ts @@ -5,7 +5,7 @@ declare var self: ServiceWorkerGlobalScope; import { SwMessage, swMessageOrderType } from './types'; -import renderAcct from '@/misc/acct/render'; +import { getAcct } from '@/misc/acct'; import { getAccountFromId } from '@client/scripts/get-account-from-id'; import { appendLoginId } from '@client/scripts/login-id'; @@ -41,7 +41,7 @@ export function openNote(noteId: string, loginId: string) { export async function openChat(body: any, loginId: string) { if (body.groupId === null) { - return openClient('push', `/my/messaging/${renderAcct(body.user)}`, loginId, { body }); + return openClient('push', `/my/messaging/${getAcct(body.user)}`, loginId, { body }); } else { return openClient('push', `/my/messaging/group/${body.groupId}`, loginId, { body }); } diff --git a/src/client/sw/sw.ts b/src/client/sw/sw.ts index 4c651117c7..fac8750975 100644 --- a/src/client/sw/sw.ts +++ b/src/client/sw/sw.ts @@ -8,7 +8,7 @@ import { swLang } from '@client/sw/lang'; import { swNotificationRead } from '@client/sw/notification-read'; import { pushNotificationData } from '@/types'; import * as ope from './operations'; -import renderAcct from '@/misc/acct/render'; +import { getAcct } from '@/misc/acct'; //#region Lifecycle: Install self.addEventListener('install', ev => { @@ -121,7 +121,7 @@ self.addEventListener('notificationclick', ev => { client = await ope.api('following/create', id, { userId: body.userId }); break; case 'showUser': - client = await ope.openUser(renderAcct(body.user), id); + client = await ope.openUser(getAcct(body.user), id); if (body.type !== 'renote') close = false; break; case 'reply': @@ -169,7 +169,7 @@ self.addEventListener('notificationclick', ev => { break; } if ('user' in body) { - client = await ope.openUser(renderAcct(body.data.user), id); + client = await ope.openUser(getAcct(body.data.user), id); break; } }