Merge commit 'c8181eb0a4' into kb_migration

2023-05-09 15:39:21 +09:00 · 2023-05-09 15:39:21 +09:00 · ba3f60ba63
commit ba3f60ba63
parent 32f0e619f0 c8181eb0a4
153 changed files with 426 additions and 366 deletions
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@ -52,8 +52,10 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
    /**
     * @param {function(Function, Function): void} fallback
     */
+
    const useFallback = fallback => {
      fallback(dispatch, () => {
+        // eslint-disable-next-line react-hooks/rules-of-hooks -- this is not a react hook
        pollingId = setTimeout(() => useFallback(fallback), 20000 + randomUpTo(20000));
      });
    };