From 86774ad75304620b59dc3b5af01d4388d8a43369 Mon Sep 17 00:00:00 2001 From: anatawa12 Date: Wed, 16 Apr 2025 07:51:21 +0900 Subject: [PATCH 1/2] fix: improve flaky federation test (#15845) --- packages/backend/test-federation/test/user.test.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 From c5f1ce60fa4800d51d3f09b911b85ceff0a69e83 Mon Sep 17 00:00:00 2001 From: anatawa12 Date: Wed, 16 Apr 2025 07:51:41 +0900 Subject: [PATCH 2/2] fix(sw): type error in sw (#15844) --- packages/sw/src/scripts/create-notification.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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,