From 0d9ca380c6137b2651be3a14bfcde180f296d1c3 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sun, 6 Aug 2023 12:46:51 -0700 Subject: [PATCH] fix: calckey -> firefish --- ADDING-SERVER.md | 2 +- source/_data/common.json | 2 +- source/_data/miscellaneous.json | 2 +- source/_data/misskey.json | 6 +++--- source/_data/numbers.json | 10 +++++----- source/en/portal/servers/index.md | 12 ++++++------ update-numbers.py | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ADDING-SERVER.md b/ADDING-SERVER.md index f76a590..39b8c5d 100644 --- a/ADDING-SERVER.md +++ b/ADDING-SERVER.md @@ -2,7 +2,7 @@ Our [servers list](https://fediverse.party/en/portal/servers) promotes new small Fediverse instances, and we have the following criteria for inclusion: -1. At the moment we accept servers running following software: Mastodon (Glitch-Soc, Hometown), Pleroma (Akkoma), Friendica, Misskey (Calckey), Hubzilla (the list may be expanded in the future). +1. At the moment we accept servers running following software: Mastodon (Glitch-Soc, Hometown), Pleroma (Akkoma), Friendica, Misskey (Firefish), Hubzilla (the list may be expanded in the future). 2. Only servers with open or pre-moderated registration are accepted. Servers with pre-moderated signup (a question like "Why do you want to join?" on signup) must be added to the category "Various (registration by application)". diff --git a/source/_data/common.json b/source/_data/common.json index 729d8de..32fa209 100644 --- a/source/_data/common.json +++ b/source/_data/common.json @@ -117,7 +117,7 @@ }, { "name": "TypeScript", - "networks": "Calckey, Misskey, PeerTube" + "networks": "Firefish, Misskey, PeerTube" } ] } diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json index 00b0ddd..d1d4842 100644 --- a/source/_data/miscellaneous.json +++ b/source/_data/miscellaneous.json @@ -1340,7 +1340,7 @@ "site": "https://joinfirefish.org", "logo": "/img/misc/firefish.svg", "servers": "https://firefish.fediverse.observer/list", - "description": "A fun, new, open way to experience social media. Foremerly known as Calckey, originally a Misskey fork", + "description": "A fun, new, open way to experience social media. A fork of Misskey, formerly known as Calckey.", "codeLanguage": "TypeScript", "techStack": "Node.js, Vue", "license": "AGPL-3.0", diff --git a/source/_data/misskey.json b/source/_data/misskey.json index 9d2b8c6..a111c90 100644 --- a/source/_data/misskey.json +++ b/source/_data/misskey.json @@ -27,9 +27,9 @@ "devTutorial": "https://misskey-hub.net/en/docs/install.html", "forks": [ - {"id": "0", "url": "https://firefish.social/", "descr": "formerly known as Calckey, Firefish was originally a Misskey fork"}, - {"id": "1", "url": "https://akkoma.dev/FoundKeyGang/FoundKey", "descr": "Foundkey - fork that removes bloat from Misskey"}, - {"id": "2", "url": "https://github.com/mei23/misskey", "descr": "Meiskey - actively developed fork v11"} + {"id": "0", "url": "https://firefish.social/", "descr": "Firefish - hard fork with a community oriented direction"}, + {"id": "1", "url": "https://github.com/mei23/misskey", "descr": "Meiskey - actively developed fork v11"}, + {"id": "2", "url": "https://akkoma.dev/FoundKeyGang/FoundKey", "descr": "FoundKey - hard fork that removes bloat from Misskey"} ], "mascot": [{"item": "藍 (Ai)", "imgNum": "1"}], "dwellers": "Miskist", diff --git a/source/_data/numbers.json b/source/_data/numbers.json index 4434a4c..1565759 100644 --- a/source/_data/numbers.json +++ b/source/_data/numbers.json @@ -96,10 +96,10 @@ "activeUsers": "13\u00a0789", "podsNum": "498" }, - "calckey": { - "population": "8\u00a0015", - "activeUsers": "6\u00a0217", - "podsNum": "339" + "firefish": { + "population": "20\u00a0699", + "activeUsers": "12\u00a0227", + "podsNum": "588" }, "hometown": { "population": "14\u00a0458", @@ -112,4 +112,4 @@ "podsNum": "19\u00a0440" } } -} \ No newline at end of file +} diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index 7773304..13fe39f 100644 --- a/source/en/portal/servers/index.md +++ b/source/en/portal/servers/index.md @@ -3,7 +3,7 @@ layout: "post" title: "Themed servers" --- -**Unsure where to register to join Fediverse?** Choose a website from this curated list. It includes [Mastodon](/en/mastodon), Glitch-soc and Hometown (Mastodon forks), [Pleroma](/en/pleroma) and Akkoma (Pleroma fork), [Friendica](/en/friendica), [Misskey](/en/misskey) and Calckey (Misskey fork), and [Hubzilla](/en/hubzilla) servers. Websites are not restricted to their theme. They help people with common interests find their community. +**Unsure where to register to join Fediverse?** Choose a website from this curated list. It includes [Mastodon](/en/mastodon), Glitch-soc and Hometown (Mastodon forks), [Pleroma](/en/pleroma) and Akkoma (Pleroma fork), [Friendica](/en/friendica), [Misskey](/en/misskey) and Firefish (Misskey fork), and [Hubzilla](/en/hubzilla) servers. Websites are not restricted to their theme. They help people with common interests find their community. Information about adding a server can be found [here](https://codeberg.org/fediverse/fediparty/src/branch/main/ADDING-SERVER.md). @@ -48,7 +48,7 @@ Information about adding a server can be found [here](https://codeberg.org/fediv * [bikesare.cool](https://bikesare.cool) - space for competitive and casual cyclists *(Mastodon)* * [social.vtopia.live](https://social.vtopia.live) - for Vtubers, their fans, and the creators that make them possible *(Misskey)* * [gametoots.de](https://gametoots.de) - for gamers and streamers *(Mastodon)* -* [hub.adrelien.com](https://hub.adrelien.com) - for all sports, e-sports, and gaming enthusiasts *(Calckey)* *(Google reCAPTCHA)* +* [hub.adrelien.com](https://hub.adrelien.com) - for all sports, e-sports, and gaming enthusiasts *(Firefish)* *(Google reCAPTCHA)* * [mastodon.triggerphra.se](https://mastodon.triggerphra.se) - for the hypnosis community; 18+, queer, and getting very sleepy *(Mastodon)* * [moth.orchids.social](https://moth.orchids.social) - for orchid lovers *(Mastodon)* @@ -79,7 +79,7 @@ Information about adding a server can be found [here](https://codeberg.org/fediv * [fairy.id](https://fairy.id) - Chinese language *(Mastodon)* * [e.fo](https://e.fo) - Faroese language *(Mastodon)* * [kanoa.de](https://kanoa.de) - German language *(Mastodon)* -* [electricrequiem.com](https://electricrequiem.com) - Greek language *(Calckey)* *(Google reCAPTCHA)* +* [electricrequiem.com](https://electricrequiem.com) - Greek language *(Firefish)* *(Google reCAPTCHA)* ### 🛡 [Safer spaces](#safer-spaces) @@ -106,7 +106,7 @@ Instances run by and for people belonging to minorities and moderated more stric * [mastodon-belgium.be](https://mastodon-belgium.be) - Belgium *(Mastodon)* #### Canada -* [vancity.social](https://vancity.social) - Vancouver *(Calckey)* +* [vancity.social](https://vancity.social) - Vancouver *(Firefish)* #### Czech Republic * [witter.cz](https://witter.cz) - Czech Republic *(Mastodon)* @@ -145,7 +145,7 @@ Instances run by and for people belonging to minorities and moderated more stric * [mastodonindonesia.com](https://mastodonindonesia.com) - Indonesia *(Mastodon)* #### Italy -* [www.foxyhole.io](https://www.foxyhole.io) - Italy *(Calckey)* *(hCaptcha)* +* [foxyhole.io](https://foxyhole.io) - Italy *(Firefish)* *(hCaptcha)* #### Nigeria * [mastodon.holeyfox.co](https://mastodon.holeyfox.co) - Nigeria *(Mastodon)* @@ -217,7 +217,7 @@ Instances run by and for people belonging to minorities and moderated more stric ### 🐾 [Subcultures](#subcultures) * [birds.garden](https://birds.garden) - a quiet, peaceful place where any bird can find refuge *(Pleroma)* -* [stop.voring.me](https://stop.voring.me) - fun hangout for furries and normies alike *(Calckey)* *(hCaptcha)* +* [stop.voring.me](https://stop.voring.me) - fun hangout for furries and normies alike *(Firefish)* *(hCaptcha)* ### 🙏 [Religion](#religion) * [elizur.me](https://elizur.me) - for German-speaking Christians *(Mastodon)* diff --git a/update-numbers.py b/update-numbers.py index 7e712f1..5871ead 100755 --- a/update-numbers.py +++ b/update-numbers.py @@ -7,7 +7,7 @@ import requests SOFTWARES = ['diaspora', 'friendica', 'hubzilla', 'mastodon', 'gnusocial', 'pleroma', 'misskey', 'peertube', 'pixelfed', 'funkwhale', 'writefreely', 'plume', 'mobilizon', 'lemmy', 'gotosocial', - 'owncast', 'bookwyrm', 'microblogpub', 'akkoma', 'calckey', + 'owncast', 'bookwyrm', 'microblogpub', 'akkoma', 'firefish', 'hometown'] def number_to_string(number):