diff --git a/locales/en-US.yml b/locales/en-US.yml index 8e1d0ba3c..76bc5c24a 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1228,6 +1228,7 @@ _aboutMisskey: donateHost: "Donate to {host}" morePatrons: "We also appreciate the support of many other helpers not listed here. Thank you! 🥰" + sponsors: "Calckey sponsors" patrons: "Calckey patrons" patronsList: "Listed chronologically, not by donation size. Donate with the link above to get your name on here!" _nsfw: diff --git a/packages/backend/src/server/api/endpoints/patrons.ts b/packages/backend/src/server/api/endpoints/patrons.ts index 696d0e338..8ca1f8902 100644 --- a/packages/backend/src/server/api/endpoints/patrons.ts +++ b/packages/backend/src/server/api/endpoints/patrons.ts @@ -9,7 +9,7 @@ const _dirname = dirname(_filename); export const meta = { tags: ["meta"], - description: "Get list of Calckey patrons from Codeberg", + description: "Get Calckey patrons", requireCredential: false, requireCredentialPrivateMode: false, @@ -51,6 +51,8 @@ export default define(meta, paramDef, async (ps) => { }); await redisClient.set("patrons", JSON.stringify(patrons), "EX", 3600); } - - return patrons["patrons"]; + return { + patrons: patrons["patrons"], + sponsors: patrons["sponsors"], + }; }); diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue index fb508239b..eb06a6104 100644 --- a/packages/client/src/pages/about-calckey.vue +++ b/packages/client/src/pages/about-calckey.vue @@ -127,6 +127,25 @@ > + + + + + + + + + @@ -147,9 +166,7 @@ - {{ - i18n.ts._aboutMisskey.morePatrons - }} + {{ i18n.ts._aboutMisskey.morePatrons }} @@ -172,11 +189,13 @@ import * as os from "@/os"; import { definePageMetadata } from "@/scripts/page-metadata"; let patrons = []; -try { - patrons = await os.api("patrons", { forceUpdate: true }); -} catch { - console.error("Codeberg's down."); -} +let sponsors = []; +const patronsResp = await os.api("patrons", { forceUpdate: true }); +patrons = patronsResp.patrons; +sponsors = patronsResp.sponsors; + + +patrons = patrons.filter((patron) => !sponsors.includes(patron)); let easterEggReady = false; let easterEggEmojis = $ref([]); diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue index e87052ea2..9d643c0b6 100644 --- a/packages/client/src/pages/user/home.vue +++ b/packages/client/src/pages/user/home.vue @@ -461,11 +461,8 @@ const timeForThem = $computed(() => { }); let patrons = []; -try { - patrons = await os.api("patrons"); -} catch { - console.error("Codeberg's down."); -} +const patronsResp = await os.api("patrons"); +patrons = patronsResp.patrons; function parallaxLoop() { parallaxAnimationId = window.requestAnimationFrame(parallaxLoop); diff --git a/patrons.json b/patrons.json index 28a3b5870..f2339e3b8 100644 --- a/patrons.json +++ b/patrons.json @@ -94,7 +94,14 @@ "@Space6host@calckey.social", "@zakalwe@plasmatrap.com", "@seasicksailor@calckey.social", - "@Hunkabilly@calckey.world", + "@geerue@calckey.social", + "@WXFanatic@m.ai6yr.org", + "@Hunkabilly@calckey.world" + ], + "sponsors": [ + "@atomicpoet@calckey.social", + "@unattributed@calckey.social", + "@jtbennett@noc.social", "\nInterkosmos Link" ] }
{{ i18n.ts._aboutMisskey.morePatrons }}