Merge remote-tracking branch 'parent/main' into upstream-20231214

2023-12-14 09:21:21 +09:00 · 2023-12-14 09:21:21 +09:00 · 08a2f557fe
commit 08a2f557fe
parent 04485adcfb 8a3d8c6c14
61 changed files with 980 additions and 838 deletions
--- a/app/javascript/mastodon/actions/notifications_typed.ts
+++ b/app/javascript/mastodon/actions/notifications_typed.ts
@ -18,6 +18,6 @@ export const notificationsUpdate = createAction(
    playSound: boolean;
  }) => ({
    payload: args,
-    meta: { playSound: playSound ? { sound: 'boop' } : undefined },
+    meta: { sound: playSound ? 'boop' : undefined },
  }),
 );