diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-04-16 09:25:17 +0900 |
|---|---|---|
| committer | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-04-16 09:25:17 +0900 |
| commit | 46a5aa9edebcdb9fb4104e8ef73143cdf5498372 (patch) | |
| tree | 2cb983674ac519d24ed347351e5179ebab741eb8 /packages | |
| parent | refactor(frontend): アカウント情報はstore管理に (diff) | |
| parent | fix(sw): type error in sw (#15844) (diff) | |
| download | sharkey-46a5aa9edebcdb9fb4104e8ef73143cdf5498372.tar.gz sharkey-46a5aa9edebcdb9fb4104e8ef73143cdf5498372.tar.bz2 sharkey-46a5aa9edebcdb9fb4104e8ef73143cdf5498372.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/backend/test-federation/test/user.test.ts | 6 | ||||
| -rw-r--r-- | packages/sw/src/scripts/create-notification.ts | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/packages/backend/test-federation/test/user.test.ts b/packages/backend/test-federation/test/user.test.ts index 83dcb8df44..ee69e857bc 100644 --- a/packages/backend/test-federation/test/user.test.ts +++ b/packages/backend/test-federation/test/user.test.ts @@ -381,7 +381,8 @@ describe('User', () => { await alice.client.request('i/delete-account', { password: alice.password }); // NOTE: user deletion query is slow - await sleep(4000); + // FIXME: ensure user is removed successfully + await sleep(10000); const following = await bob.client.request('users/following', { userId: bob.id }); strictEqual(following.length, 0); // no following relation @@ -480,7 +481,8 @@ describe('User', () => { await aAdmin.client.request('admin/suspend-user', { userId: alice.id }); // NOTE: user deletion query is slow - await sleep(4000); + // FIXME: ensure user is removed successfully + await sleep(10000); const following = await bob.client.request('users/following', { userId: bob.id }); strictEqual(following.length, 0); // no following relation diff --git a/packages/sw/src/scripts/create-notification.ts b/packages/sw/src/scripts/create-notification.ts index 77b3f88791..783c78f7dc 100644 --- a/packages/sw/src/scripts/create-notification.ts +++ b/packages/sw/src/scripts/create-notification.ts @@ -271,7 +271,7 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif case 'newChatMessage': if (data.body.toRoom != null) { return [`${data.body.toRoom.name}: ${getUserName(data.body.fromUser)}: ${data.body.text}`, { - icon: data.body.fromUser.avatarUrl, + icon: data.body.fromUser.avatarUrl ?? undefined, badge: iconUrl('messages'), tag: `chat:room:${data.body.toRoomId}`, data, @@ -279,7 +279,7 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif }]; } else { return [`${getUserName(data.body.fromUser)}: ${data.body.text}`, { - icon: data.body.fromUser.avatarUrl, + icon: data.body.fromUser.avatarUrl ?? undefined, badge: iconUrl('messages'), tag: `chat:user:${data.body.fromUserId}`, data, |