From b7815df1343a5858dfe7037acfabf5e962516e17 Mon Sep 17 00:00:00 2001 From: Marie Date: Sun, 15 Sep 2024 20:04:29 +0200 Subject: upd: fetch sponsors from OC --- .../backend/src/server/api/endpoints/sponsors.ts | 33 +++++++++++----------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'packages/backend/src/server/api') diff --git a/packages/backend/src/server/api/endpoints/sponsors.ts b/packages/backend/src/server/api/endpoints/sponsors.ts index b6ccb9b2f9..67712ca379 100644 --- a/packages/backend/src/server/api/endpoints/sponsors.ts +++ b/packages/backend/src/server/api/endpoints/sponsors.ts @@ -10,7 +10,7 @@ import { DI } from '@/di-symbols.js'; export const meta = { tags: ['meta'], - description: 'Get Sharkey GH Sponsors', + description: 'Get Sharkey Sponsors', requireCredential: false, requireCredentialPrivateMode: false, @@ -30,29 +30,28 @@ export default class extends Endpoint { // eslint- @Inject(DI.redis) private redisClient: Redis.Redis, ) { super(meta, paramDef, async (ps, me) => { - let sponsors; - const cachedSponsors = await this.redisClient.get('sponsors'); + let totalSponsors; + const cachedSponsors = await this.redisClient.get('sponsors'); + if (!ps.forceUpdate && cachedSponsors) { - sponsors = JSON.parse(cachedSponsors); + totalSponsors = JSON.parse(cachedSponsors); } else { - AbortSignal.timeout ??= function timeout(ms) { - const ctrl = new AbortController(); - setTimeout(() => ctrl.abort(), ms); - return ctrl.signal; - }; - try { - sponsors = await fetch('https://kaifa.ch/transfem-sponsors.json', { signal: AbortSignal.timeout(2000) }) - .then((response) => response.json()); + const backers = await fetch('https://opencollective.com/sharkey/tiers/backer/all.json').then((response) => response.json()); + const sponsorsOC = await fetch('https://opencollective.com/sharkey/tiers/sponsor/all.json').then((response) => response.json()); + + // Merge both together into one array and make sure it only has Active subscriptions + const allSponsors = [...backers, ...sponsorsOC].filter(sponsor => sponsor.isActive == true); + + // Remove possible duplicates + totalSponsors = [...new Map(allSponsors.map(v => [v.profile, v])).values()]; - await this.redisClient.set('sponsors', JSON.stringify(sponsors), 'EX', 3600); + await this.redisClient.set('sponsors', JSON.stringify(totalSponsors), 'EX', 3600); } catch (error) { - sponsors = { - sponsors: [], - }; + totalSponsors = []; } } - return { sponsor_data: sponsors['sponsors'] }; + return { sponsor_data: totalSponsors }; }); } } -- cgit v1.2.3-freya From 2e18359dadff0d6d26710b6275c7dffb1cbefbc0 Mon Sep 17 00:00:00 2001 From: Marie Date: Sun, 15 Sep 2024 18:17:35 +0000 Subject: chore: lint --- packages/backend/src/server/api/endpoints/sponsors.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/backend/src/server/api') diff --git a/packages/backend/src/server/api/endpoints/sponsors.ts b/packages/backend/src/server/api/endpoints/sponsors.ts index 67712ca379..06c3c0d620 100644 --- a/packages/backend/src/server/api/endpoints/sponsors.ts +++ b/packages/backend/src/server/api/endpoints/sponsors.ts @@ -41,7 +41,7 @@ export default class extends Endpoint { // eslint- const sponsorsOC = await fetch('https://opencollective.com/sharkey/tiers/sponsor/all.json').then((response) => response.json()); // Merge both together into one array and make sure it only has Active subscriptions - const allSponsors = [...backers, ...sponsorsOC].filter(sponsor => sponsor.isActive == true); + const allSponsors = [...backers, ...sponsorsOC].filter(sponsor => sponsor.isActive === true); // Remove possible duplicates totalSponsors = [...new Map(allSponsors.map(v => [v.profile, v])).values()]; -- cgit v1.2.3-freya From 62a81bed9b76dda5e30b0a2ae8aff98c48830712 Mon Sep 17 00:00:00 2001 From: Marie Date: Mon, 16 Sep 2024 19:02:06 +0200 Subject: upd: change sorting of supporters --- packages/backend/src/server/api/endpoints/sponsors.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/backend/src/server/api') diff --git a/packages/backend/src/server/api/endpoints/sponsors.ts b/packages/backend/src/server/api/endpoints/sponsors.ts index 06c3c0d620..99414e739a 100644 --- a/packages/backend/src/server/api/endpoints/sponsors.ts +++ b/packages/backend/src/server/api/endpoints/sponsors.ts @@ -41,7 +41,7 @@ export default class extends Endpoint { // eslint- const sponsorsOC = await fetch('https://opencollective.com/sharkey/tiers/sponsor/all.json').then((response) => response.json()); // Merge both together into one array and make sure it only has Active subscriptions - const allSponsors = [...backers, ...sponsorsOC].filter(sponsor => sponsor.isActive === true); + const allSponsors = [...sponsorsOC, ...backers].filter(sponsor => sponsor.isActive === true); // Remove possible duplicates totalSponsors = [...new Map(allSponsors.map(v => [v.profile, v])).values()]; -- cgit v1.2.3-freya From 3f6beb97d2923abea3146290242423347629528d Mon Sep 17 00:00:00 2001 From: dakkar Date: Fri, 20 Sep 2024 08:35:45 +0100 Subject: copy RateLimiterService from MisskeyIO This implementation allocates fewer Promises, might help with the memory leaks --- .../backend/src/server/api/RateLimiterService.ts | 32 ++++++++-------------- 1 file changed, 11 insertions(+), 21 deletions(-) (limited to 'packages/backend/src/server/api') diff --git a/packages/backend/src/server/api/RateLimiterService.ts b/packages/backend/src/server/api/RateLimiterService.ts index e94160a657..e9afb9d05a 100644 --- a/packages/backend/src/server/api/RateLimiterService.ts +++ b/packages/backend/src/server/api/RateLimiterService.ts @@ -32,18 +32,11 @@ export class RateLimiterService { @bindThis public limit(limitation: IEndpointMeta['limit'] & { key: NonNullable }, actor: string, factor = 1) { - { - if (this.disabled) { - 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 + return new Promise((ok, reject) => { + if (this.disabled) ok(); // Short-term limit - // eslint-disable-next-line brace-style - const minP = () => { return new Promise((ok, reject) => { + const minP = (): void => { const minIntervalLimiter = new Limiter({ id: `${actor}:${limitation.key}:min`, duration: limitation.minInterval! * factor, @@ -62,18 +55,16 @@ export class RateLimiterService { return reject({ code: 'BRIEF_REQUEST_INTERVAL', info }); } else { if (hasLongTermLimit) { - return maxP().then(ok, reject); + return maxP(); } else { return ok(); } } }); - // eslint-disable-next-line brace-style - }); }; + }; // Long term limit - // eslint-disable-next-line brace-style - const maxP = () => { return new Promise((ok, reject) => { + const maxP = (): void => { const limiter = new Limiter({ id: `${actor}:${limitation.key}`, duration: limitation.duration! * factor, @@ -94,8 +85,7 @@ export class RateLimiterService { return ok(); } }); - // eslint-disable-next-line brace-style - }); }; + }; const hasShortTermLimit = typeof limitation.minInterval === 'number'; @@ -104,12 +94,12 @@ export class RateLimiterService { typeof limitation.max === 'number'; if (hasShortTermLimit) { - return minP(); + minP(); } else if (hasLongTermLimit) { - return maxP(); + maxP(); } else { - return Promise.resolve(); + ok(); } - } + }); } } -- cgit v1.2.3-freya From 8a982c61c01909e7540ff1be9f019df07c3f0624 Mon Sep 17 00:00:00 2001 From: dakkar Date: Fri, 20 Sep 2024 09:16:44 +0100 Subject: move rate-limit-exceeded error reporting, earlier a rate-limit-exceeded error has `kind:'client'`, so the branch that adds the `Retry-After` would never get taken --- packages/backend/src/server/api/ApiCallService.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'packages/backend/src/server/api') diff --git a/packages/backend/src/server/api/ApiCallService.ts b/packages/backend/src/server/api/ApiCallService.ts index 47f64f6609..808795fdac 100644 --- a/packages/backend/src/server/api/ApiCallService.ts +++ b/packages/backend/src/server/api/ApiCallService.ts @@ -64,15 +64,6 @@ export class ApiCallService implements OnApplicationShutdown { let statusCode = err.httpStatusCode; if (err.httpStatusCode === 401) { reply.header('WWW-Authenticate', 'Bearer realm="Misskey"'); - } else if (err.kind === 'client') { - reply.header('WWW-Authenticate', `Bearer realm="Misskey", error="invalid_request", error_description="${err.message}"`); - statusCode = statusCode ?? 400; - } else if (err.kind === 'permission') { - // (ROLE_PERMISSION_DENIEDは関係ない) - if (err.code === 'PERMISSION_DENIED') { - reply.header('WWW-Authenticate', `Bearer realm="Misskey", error="insufficient_scope", error_description="${err.message}"`); - } - statusCode = statusCode ?? 403; } else if (err.code === 'RATE_LIMIT_EXCEEDED') { const info: unknown = err.info; const unixEpochInSeconds = Date.now(); @@ -83,6 +74,15 @@ export class ApiCallService implements OnApplicationShutdown { } else { this.logger.warn(`rate limit information has unexpected type ${typeof(err.info?.reset)}`); } + } else if (err.kind === 'client') { + reply.header('WWW-Authenticate', `Bearer realm="Misskey", error="invalid_request", error_description="${err.message}"`); + statusCode = statusCode ?? 400; + } else if (err.kind === 'permission') { + // (ROLE_PERMISSION_DENIEDは関係ない) + if (err.code === 'PERMISSION_DENIED') { + reply.header('WWW-Authenticate', `Bearer realm="Misskey", error="insufficient_scope", error_description="${err.message}"`); + } + statusCode = statusCode ?? 403; } else if (!statusCode) { statusCode = 500; } -- cgit v1.2.3-freya