usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

This commit is contained in:
tamaina 2021-11-12 10:08:55 +09:00
parent af8c2d436b
commit 8fa55baf98
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/client/src/scripts/get-user-name.ts Normal file
View File

@ -0,0 +1,3 @@
export default function(user: { name?: string | null, username: string }): string {
return user.name || user.username;
}

2
packages/client/src/sw/sw.ts
View File

@ -8,7 +8,7 @@ import { swLang } from '@/sw/lang';
import { swNotificationRead } from '@/sw/notification-read';
import { pushNotificationDataMap } from '@/sw/types';
import * as swos from './operations';
import { getAcct } from '@/scripts/acct';
import { acct as getAcct } from '@/filters/user';
//#region Lifecycle: Install
self.addEventListener('install', ev => {