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

2024-09-13 10:31:48 +09:00 · 2024-09-13 10:31:48 +09:00 · fc9d27ff91
commit fc9d27ff91
parent 3277819b62 202077517c
392 changed files with 3757 additions and 3233 deletions
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@ -156,7 +156,7 @@ async function refreshHomeTimelineAndNotification(dispatch, getState) {
    // TODO: polling for merged notifications
    try {
      await dispatch(pollRecentGroupNotifications());
-    } catch (error) {
+    } catch {
      // TODO
    }
  } else {