diff --git a/packages/backend/src/server/api/RateLimiterService.ts b/packages/backend/src/server/api/RateLimiterService.ts index 52d73baa0a..e94160a657 100644 --- a/packages/backend/src/server/api/RateLimiterService.ts +++ b/packages/backend/src/server/api/RateLimiterService.ts @@ -37,8 +37,13 @@ export class RateLimiterService { return Promise.resolve(); } + // those lines with the "wrong" brace style / indentation are + // done that way so that the *other* lines stay identical to + // Misskey, simplifying merges + // Short-term limit - const min = new Promise((ok, reject) => { + // eslint-disable-next-line brace-style + const minP = () => { return new Promise((ok, reject) => { const minIntervalLimiter = new Limiter({ id: `${actor}:${limitation.key}:min`, duration: limitation.minInterval! * factor, @@ -57,16 +62,18 @@ export class RateLimiterService { return reject({ code: 'BRIEF_REQUEST_INTERVAL', info }); } else { if (hasLongTermLimit) { - return max.then(ok, reject); + return maxP().then(ok, reject); } else { return ok(); } } }); - }); + // eslint-disable-next-line brace-style + }); }; // Long term limit - const max = new Promise((ok, reject) => { + // eslint-disable-next-line brace-style + const maxP = () => { return new Promise((ok, reject) => { const limiter = new Limiter({ id: `${actor}:${limitation.key}`, duration: limitation.duration! * factor, @@ -87,7 +94,8 @@ export class RateLimiterService { return ok(); } }); - }); + // eslint-disable-next-line brace-style + }); }; const hasShortTermLimit = typeof limitation.minInterval === 'number'; @@ -96,9 +104,9 @@ export class RateLimiterService { typeof limitation.max === 'number'; if (hasShortTermLimit) { - return min; + return minP(); } else if (hasLongTermLimit) { - return max; + return maxP(); } else { return Promise.resolve(); }