diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-09-23 17:57:39 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-09-23 17:57:39 +0000 |
| commit | 69efba9366ca9bc271f676a72ba6d41b558ebeb3 (patch) | |
| tree | c1562ef4d5fb5e968bd83fd0ba401319ec2c7574 /packages/backend/src | |
| parent | merge: Only accept HTML `<link rel="alternate">` on successful HTTP statuses ... (diff) | |
| parent | upd: change sorting of supporters (diff) | |
| download | sharkey-69efba9366ca9bc271f676a72ba6d41b558ebeb3.tar.gz sharkey-69efba9366ca9bc271f676a72ba6d41b558ebeb3.tar.bz2 sharkey-69efba9366ca9bc271f676a72ba6d41b558ebeb3.zip | |
merge: Fetch sponsors from OC (!624)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/624
Closes #653
Approved-by: Julia <julia@insertdomain.name>
Approved-by: Tess K <me@thvxl.se>
Diffstat (limited to 'packages/backend/src')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/sponsors.ts | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/packages/backend/src/server/api/endpoints/sponsors.ts b/packages/backend/src/server/api/endpoints/sponsors.ts index b6ccb9b2f9..99414e739a 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<typeof meta, typeof paramDef> { // 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 = [...sponsorsOC, ...backers].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 }; }); } } |