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

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

This commit is contained in:
syuilo 2025-04-16 09:25:17 +09:00
parent 75267f87d5 c5f1ce60fa
commit 46a5aa9ede
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/backend/test-federation/test/user.test.ts
View File

@ -381,7 +381,8 @@ describe('User', () => {
await alice.client.request('i/delete-account', { password: alice.password }); await alice.client.request('i/delete-account', { password: alice.password });
// NOTE: user deletion query is slow // 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 }); const following = await bob.client.request('users/following', { userId: bob.id });
strictEqual(following.length, 0); // no following relation strictEqual(following.length, 0); // no following relation
@ -480,7 +481,8 @@ describe('User', () => {
await aAdmin.client.request('admin/suspend-user', { userId: alice.id }); await aAdmin.client.request('admin/suspend-user', { userId: alice.id });
// NOTE: user deletion query is slow // 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 }); const following = await bob.client.request('users/following', { userId: bob.id });
strictEqual(following.length, 0); // no following relation strictEqual(following.length, 0); // no following relation

4
packages/sw/src/scripts/create-notification.ts
View File

@ -271,7 +271,7 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
case 'newChatMessage': case 'newChatMessage':
if (data.body.toRoom != null) { if (data.body.toRoom != null) {
return [`${data.body.toRoom.name}: ${getUserName(data.body.fromUser)}: ${data.body.text}`, { 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'), badge: iconUrl('messages'),
tag: `chat:room:${data.body.toRoomId}`, tag: `chat:room:${data.body.toRoomId}`,
data, data,
@ -279,7 +279,7 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
}]; }];
} else { } else {
return [`${getUserName(data.body.fromUser)}: ${data.body.text}`, { return [`${getUserName(data.body.fromUser)}: ${data.body.text}`, {
icon: data.body.fromUser.avatarUrl, icon: data.body.fromUser.avatarUrl ?? undefined,
badge: iconUrl('messages'), badge: iconUrl('messages'),
tag: `chat:user:${data.body.fromUserId}`, tag: `chat:user:${data.body.fromUserId}`,
data, data,