From 48425b18a87f690dc4cacf7e70e2371736f550a2 Mon Sep 17 00:00:00 2001 From: Federico Leva Date: Wed, 12 Jul 2023 22:17:50 +0300 Subject: [PATCH 01/15] Add blackqueer.life --- source/en/portal/servers/index.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index dfa118a..6dc91e7 100644 --- a/source/en/portal/servers/index.md +++ b/source/en/portal/servers/index.md @@ -85,6 +85,8 @@ Information about adding a server can be found [here](https://codeberg.org/fediv Instances run by and for people belonging to minorities and moderated more strictly than usual. A curated list of well-moderated, reliable instances is at [Fedi.Garden](https://fedi.garden). +See also the section "[Minorities (registration by application)](πŸŽ‰-Various-registration-by-application)" below for stricter instances. + * [neovibe.app](https://neovibe.app) - for fans of music, movies, gaming and all forms of entertainment, LGBTQ+ friendly and Black-run *(Mastodon)* * [qdon.space](https://qdon.space) - a queer-friendly Korean-language instance - 퀴어 μΉœν™”μ μΈ λ§ˆμŠ€ν† λˆ μΈμŠ€ν„΄μŠ€μž…λ‹ˆλ‹€ *(Mastodon)* * [bark.lgbt](https://bark.lgbt) - for critters that like to bark, LGBTQ+ run and friendly, active moderation *(Mastodon)* @@ -282,6 +284,7 @@ Instances run by and for people belonging to minorities and moderated more stric * [poweredbygay.social](https://poweredbygay.social) - for those LGBTQIA+ (and Allies) that are into fun adventurous things, like playing/watching sports, hiking, camping *(Mastodon)* * [retro.pizza](https://retro.pizza) - a queer-run poly-fandom nerd culture instance *(Mastodon)* * [connectop.us](https://connectop.us) - a respectful, diverse, inclusive community standing up for all marginalized gropus *(Mastodon)* +* [blackqueer.life](https://blackqueer.life) - for Black queer folks *(Mastodon glitch)* #### Furry (registration by application) *Instances which are focused on providing a safe space for furry interests and require approval for registration.* @@ -391,5 +394,4 @@ Instances run by and for people belonging to minorities and moderated more stric ## 🌟 Other research links - [Pirate Parties in Fediverse](https://codeberg.org/lostinlight/distributopia/src/branch/main/caramba) -- [Mastodon server distribution](https://chaos.social/@leah/99837391793032137) research by @Leah - +- [Mastodon server distribution](https://chaos.social/@leah/99837391793032137) - research by @Leah From 9a2845d60b08408937a841ff40185b1e7f8f6ede Mon Sep 17 00:00:00 2001 From: Federico Leva Date: Thu, 13 Jul 2023 00:45:20 +0300 Subject: [PATCH 02/15] Add some academic instances --- source/en/portal/servers/index.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index 6dc91e7..8bc93a1 100644 --- a/source/en/portal/servers/index.md +++ b/source/en/portal/servers/index.md @@ -268,6 +268,10 @@ See also the section "[Minorities (registration by application)](πŸŽ‰-Various-re * [mastodon.acc.sunet.se](https://mastodon.acc.sunet.se) - by Academic Computer Club at UmeΓ₯ University, Sweden *(Mastodon)* * [akademienl.social](https://akademienl.social) - for anyone working in, affiliated with, or with a general interest in Dutch academia *(Mastodon)* * [social.sunet.se](https://social.sunet.se) - by the Swedish Research Council for anyone belonging to a Swedish university *(Mastodon)* +* [social.edu.nl](https://social.edu.nl) - by [SURF](https://www.wikidata.org/wiki/Q2422744), a cooperative of Dutch universities *(Mastodon)* +* [social.mpdl.mpg.de](https://social.mpdl.mpg.de) - by the [Max Planck Digital Library](https://www.mpdl.mpg.de/) at MPG *(Mastodon)* +* [wisskomm.social](https://wisskomm.social) - by [idw](https://de.wikipedia.org/wiki/Informationsdienst_Wissenschaft), for entities and groups in German academia *(Mastodon)* +* [social.up.edu.ph](https://social.up.edu.ph) - by the University of the Philippines *(Hometown)* ### πŸŽ‰ [Various (registration by application)](#registration-by-application) From c182f12f20cf604ce93343f037726f28193e6342 Mon Sep 17 00:00:00 2001 From: lostinlight Date: Thu, 20 Jul 2023 22:44:38 +0300 Subject: [PATCH 03/15] Add 1 instance, small edits --- source/en/portal/servers/index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index 8bc93a1..75ee216 100644 --- a/source/en/portal/servers/index.md +++ b/source/en/portal/servers/index.md @@ -58,6 +58,7 @@ Information about adding a server can be found [here](https://codeberg.org/fediv * [bahn.social](https://bahn.social) - for rail enthusiasts, in German *(Mastodon)* * [toot.pizza](https://toot.pizza) - NYC-leaning urbanism and transit instance *(Mastodon)* * [towns.gay](https://towns.gay) - for radical queers, who believe that cities are for us too *(Mastodon)* +* [geobla.net](https://geobla.net) - for vanlife and camping *(Mastodon)* ### 🎏 [Language specific](#languages) * [toki.social](https://toki.social) - for those interested in toki pona *(Mastodon)* @@ -83,9 +84,8 @@ Information about adding a server can be found [here](https://codeberg.org/fediv ### πŸ›‘ [Safer spaces](#safer-spaces) -Instances run by and for people belonging to minorities and moderated more strictly than usual. A curated list of well-moderated, reliable instances is at [Fedi.Garden](https://fedi.garden). - -See also the section "[Minorities (registration by application)](πŸŽ‰-Various-registration-by-application)" below for stricter instances. +Instances run by and for people belonging to minorities and moderated more strictly than usual +(also check out [Fedi.Garden](https://fedi.garden) for curated list of well-moderated instances) * [neovibe.app](https://neovibe.app) - for fans of music, movies, gaming and all forms of entertainment, LGBTQ+ friendly and Black-run *(Mastodon)* * [qdon.space](https://qdon.space) - a queer-friendly Korean-language instance - 퀴어 μΉœν™”μ μΈ λ§ˆμŠ€ν† λˆ μΈμŠ€ν„΄μŠ€μž…λ‹ˆλ‹€ *(Mastodon)* From 081abfdeef7c66d64eb0e4987bf3a032de635dae Mon Sep 17 00:00:00 2001 From: hauschke Date: Mon, 24 Jul 2023 09:38:01 +0000 Subject: [PATCH 04/15] Added baudigital.social Added baudigital.social, a mastodon server for everyone working or thinking in the fields of architecture, civil engineering, or urban studies. Signed-off-by: hauschke --- source/en/portal/servers/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index 8bc93a1..9a87ac1 100644 --- a/source/en/portal/servers/index.md +++ b/source/en/portal/servers/index.md @@ -58,6 +58,7 @@ Information about adding a server can be found [here](https://codeberg.org/fediv * [bahn.social](https://bahn.social) - for rail enthusiasts, in German *(Mastodon)* * [toot.pizza](https://toot.pizza) - NYC-leaning urbanism and transit instance *(Mastodon)* * [towns.gay](https://towns.gay) - for radical queers, who believe that cities are for us too *(Mastodon)* +* [baudigital.social](https://baudigital.social) - for people in architecture, civil engineering, or urban studies *(Mastodon) ### 🎏 [Language specific](#languages) * [toki.social](https://toki.social) - for those interested in toki pona *(Mastodon)* From 49bf88d806bb5e964164283d52bb561c30b2acd5 Mon Sep 17 00:00:00 2001 From: hauschke Date: Mon, 24 Jul 2023 09:40:03 +0000 Subject: [PATCH 05/15] =?UTF-8?q?=E2=80=9Esource/en/portal/servers/index.m?= =?UTF-8?q?d=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/en/portal/servers/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index 9a87ac1..7105c6d 100644 --- a/source/en/portal/servers/index.md +++ b/source/en/portal/servers/index.md @@ -58,7 +58,7 @@ Information about adding a server can be found [here](https://codeberg.org/fediv * [bahn.social](https://bahn.social) - for rail enthusiasts, in German *(Mastodon)* * [toot.pizza](https://toot.pizza) - NYC-leaning urbanism and transit instance *(Mastodon)* * [towns.gay](https://towns.gay) - for radical queers, who believe that cities are for us too *(Mastodon)* -* [baudigital.social](https://baudigital.social) - for people in architecture, civil engineering, or urban studies *(Mastodon) +* [baudigital.social](https://baudigital.social) - for people in architecture, civil engineering, or urban studies *(Mastodon)* ### 🎏 [Language specific](#languages) * [toki.social](https://toki.social) - for those interested in toki pona *(Mastodon)* From 647f48c2acad6ac9bb5afd7b7347509e7ff2da07 Mon Sep 17 00:00:00 2001 From: aRubes Date: Thu, 20 Jul 2023 03:48:09 +0300 Subject: [PATCH 06/15] various changes to misc --- source/_data/miscellaneous.json | 74 +++++++----------- source/_data/misskey.json | 2 +- source/img/misc/akkoma.svg | 34 +++++++++ source/img/misc/ecko.svg | 8 ++ source/img/misc/firefish.svg | 33 ++++++++ source/img/misc/hubzilla.png | Bin 0 -> 11342 bytes source/img/misc/immers.png | Bin 0 -> 26616 bytes source/img/misc/olki.svg | 16 ++++ source/img/misc/skohub.svg | 61 +++++++++++++++ source/img/misc/takahe.svg | 128 ++++++++++++++++++++++++++++++++ 10 files changed, 309 insertions(+), 47 deletions(-) create mode 100644 source/img/misc/akkoma.svg create mode 100644 source/img/misc/ecko.svg create mode 100644 source/img/misc/firefish.svg create mode 100644 source/img/misc/hubzilla.png create mode 100644 source/img/misc/immers.png create mode 100644 source/img/misc/olki.svg create mode 100644 source/img/misc/skohub.svg create mode 100644 source/img/misc/takahe.svg diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json index f1d466a..06ef88e 100644 --- a/source/_data/miscellaneous.json +++ b/source/_data/miscellaneous.json @@ -203,7 +203,7 @@ "title": "brutalinks", "source": "https://github.com/mariusor/go-littr", "protocols": "ActivityPub", - "site": "", + "site": "https://brutalinks.tech/~admin/", "logo": "", "servers": "https://the-federation.info/brutalinks", "description": "Link aggregator inspired by Reddit.", @@ -259,7 +259,7 @@ "protocols": "ActivityPub", "site": "", "logo": "", - "servers": "", + "servers": "https://hometown.fediverse.observer/list", "description": "A fork of Mastodon that provides local posting and a wider range of content types.", "codeLanguage": "Ruby", "techStack": "React, SASS, Node.js", @@ -275,9 +275,9 @@ "title": "Ecko", "source": "https://github.com/magicstone-dev/ecko", "protocols": "ActivityPub", - "site": "", - "logo": "", - "servers": "", + "site": "https://magicstone.dev/", + "logo": "/img/misc/ecko.svg", + "servers": "https://ecko.fediverse.observer/list", "description": "A fork of Mastodon to optimize toward community, that is making it as easy as possible to contribute.", "codeLanguage": "Ruby", "techStack": "React, SASS, Node.js", @@ -293,7 +293,7 @@ "title": "Acropolis", "source": "https://github.com/magicstone-dev/acropolis", "protocols": "diaspora", - "site": "", + "site": "https://magicstone.dev/", "logo": "", "servers": "https://the-federation.info/acropolis", "description": "A fork of diaspora to optimize toward community, that is making it as easy as possible to contribute.", @@ -335,7 +335,7 @@ "description": "An ActivityPub server with minimal dependencies, optimized for single-user application.", "codeLanguage": "Crystal", "techStack": "", - "license": "-", + "license": "GNU Affero General Public License", "FediAccount": "@toddsundsted@mastodon.social", "apClass": true, "zotClass": false, @@ -345,16 +345,16 @@ }, { "title": "OLKi", - "source": "", + "source": "https://framagit.org/synalp/olki/olki", "protocols": "ActivityPub", "site": "https://olki.loria.fr/platform", - "logo": "", + "logo": "/img/misc/olki.svg", "servers": "", "description": "A self-hosted linguistic corpora exchange platform that aims to be a simple gateway to the Fediverse for scientific interaction.", "codeLanguage": "Python", "techStack": "Django, Vue, Nuxt, Spectre.css, Zutre", "license": "AGPL-3.0", - "FediAccount": "", + "FediAccount": "@cerisara@mastodon.etalab.gouv.fr", "apClass": true, "zotClass": false, "diasporaClass": false, @@ -545,7 +545,7 @@ "title": "OCamlot", "source": "https://github.com/gopiandcode/ocamlot", "protocols": "ActivityPub", - "site": "", + "site": "ocamlot.xyz", "logo": "", "servers": "ocamlot.xyz", "description": "An ActivityPub-speaking server in OCaml (Pleroma and Mastodon compatible).", @@ -631,24 +631,6 @@ "OStatusClass": false, "categories": ["SN-mi"] }, - { - "title": "Kroeg", - "source": "https://puck.moe/git/kroeg/server", - "protocols": "ActivityPub", - "site": "https://puckipedia.com/kroeg", - "logo": "", - "servers": "", - "description": "Generic ActivityPub server, with a focus on microblogging style activities.", - "codeLanguage": "Rust", - "techStack": "", - "license": "-", - "FediAccount": "", - "apClass": true, - "zotClass": false, - "diasporaClass": false, - "OStatusClass": false, - "categories": ["SN-mi"] - }, { "title": "Aardwolf", "source": "https://github.com/Aardwolf-Social/aardwolf", @@ -707,7 +689,7 @@ "title": "microstatus", "source": "https://github.com/Arkanosis/microstatus", "protocols": "ActivityPub, OStatus", - "site": "", + "site": "https://microstatus.org/", "logo": "", "servers": "", "description": "Lightweight Mastodon and GNU social-compatible server implementation.", @@ -744,7 +726,7 @@ "source": "https://github.com/hbz/skohub-pubsub", "protocols": "ActivityPub", "site": "https://skohub.io", - "logo": "", + "logo": "/img/misc/skohub.svg", "servers": "", "description": "SkoHub creates a publication / subscription infrastructure for Open Educational Resources. It allows to follow specific subjects and to be notified when new content about that subject is published.", "codeLanguage": "JavaScript", @@ -759,7 +741,7 @@ }, { "title": "CPub", - "source": "https://gitlab.com/openengiadina/cpub", + "source": "https://codeberg.org/openEngiadina/cpub", "protocols": "ActivityPub", "site": "", "logo": "", @@ -851,8 +833,8 @@ "title": "Immers Space", "source": "https://github.com/immers-space/immers", "protocols": "ActivityPub", - "site": "", - "logo": "", + "site": "https://immers.space/", + "logo": "/img/misc/immers.png", "servers": "", "description": "A decentralized virtual reality metaverse platform powered by Mozilla Hubs and ActivityPub-Express.", "codeLanguage": "JavaScript", @@ -1388,17 +1370,17 @@ "categories": ["SN-mi"] }, { - "title": "Calckey", - "source": "https://codeberg.org/thatonecalculator/calckey", + "title": "Firefish", + "source": "https://gitlab.prometheus.systems/firefish/firefish", "protocols": "ActivityPub", - "site": "", - "logo": "", - "servers": "https://the-federation.info/calckey", - "description": "An actively developed, community-driven fork of Misskey with many quality of life improvements for users and admins alike.", + "site": "https://firefish.social/", + "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", "codeLanguage": "TypeScript", "techStack": "Node.js, Vue", "license": "AGPL-3.0", - "FediAccount": "", + "FediAccount": "@firefish@fedi.software", "apClass": true, "zotClass": false, "diasporaClass": false, @@ -1445,14 +1427,14 @@ "title": "Takahe", "source": "https://github.com/andrewgodwin/takahe", "protocols": "ActivityPub", - "site": "", - "logo": "", + "site": "https://jointakahe.org/takahesocial/", + "logo": "/img/misc/takahe.svg", "servers": "", "description": "A very experimental Fediverse server for microblogging.", "codeLanguage": "Python", "techStack": "Django", "license": "BSD-3-clause", - "FediAccount": "@andrew@fedi.aeracode.org", + "FediAccount": "@takahe@jointakahe.org", "apClass": true, "zotClass": false, "diasporaClass": false, @@ -1518,8 +1500,8 @@ "source": "https://akkoma.dev/AkkomaGang/akkoma", "protocols": "ActivityPub", "site": "https://akkoma.social", - "logo": "", - "servers": "", + "logo": "/img/misc/akkoma.svg", + "servers": "https://akkoma.fediverse.observer/list", "description": "A community-driven fork of Pleroma with new features such as support for Misskey-flavored Markdown.", "codeLanguage": "Elixir", "techStack": "", diff --git a/source/_data/misskey.json b/source/_data/misskey.json index b799244..61e0010 100644 --- a/source/_data/misskey.json +++ b/source/_data/misskey.json @@ -27,7 +27,7 @@ "devTutorial": "https://misskey-hub.net/en/docs/install.html", "forks": [ - {"id": "0", "url": "https://calckey.org", "descr": "Calckey - fork with requested community features"}, + {"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"} ], diff --git a/source/img/misc/akkoma.svg b/source/img/misc/akkoma.svg new file mode 100644 index 0000000..01ddbad --- /dev/null +++ b/source/img/misc/akkoma.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/img/misc/ecko.svg b/source/img/misc/ecko.svg new file mode 100644 index 0000000..4a4704c --- /dev/null +++ b/source/img/misc/ecko.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/source/img/misc/firefish.svg b/source/img/misc/firefish.svg new file mode 100644 index 0000000..981fe2f --- /dev/null +++ b/source/img/misc/firefish.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/img/misc/hubzilla.png b/source/img/misc/hubzilla.png new file mode 100644 index 0000000000000000000000000000000000000000..5720b430658296ba1bc8e8b43df8a20c3775bf7b GIT binary patch literal 11342 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

iN{0P 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 z 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 + + + + + + + + + + + + + + + diff --git a/source/img/misc/skohub.svg b/source/img/misc/skohub.svg new file mode 100644 index 0000000..8ca7375 --- /dev/null +++ b/source/img/misc/skohub.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/img/misc/takahe.svg b/source/img/misc/takahe.svg new file mode 100644 index 0000000..a2e6b36 --- /dev/null +++ b/source/img/misc/takahe.svg @@ -0,0 +1,128 @@ + + + + From 4a019b0a7112d0590e26e74bcd146c218c27940f Mon Sep 17 00:00:00 2001 From: lostinlight Date: Wed, 26 Jul 2023 19:53:10 +0300 Subject: [PATCH 07/15] Update Misc page, remove PNG logo --- source/_data/miscellaneous.json | 30 ++++++------------------------ source/img/misc/hubzilla.png | Bin 11342 -> 0 bytes 2 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 source/img/misc/hubzilla.png diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json index 06ef88e..ed7da22 100644 --- a/source/_data/miscellaneous.json +++ b/source/_data/miscellaneous.json @@ -203,7 +203,7 @@ "title": "brutalinks", "source": "https://github.com/mariusor/go-littr", "protocols": "ActivityPub", - "site": "https://brutalinks.tech/~admin/", + "site": "", "logo": "", "servers": "https://the-federation.info/brutalinks", "description": "Link aggregator inspired by Reddit.", @@ -335,7 +335,7 @@ "description": "An ActivityPub server with minimal dependencies, optimized for single-user application.", "codeLanguage": "Crystal", "techStack": "", - "license": "GNU Affero General Public License", + "license": "AGPL-3.0", "FediAccount": "@toddsundsted@mastodon.social", "apClass": true, "zotClass": false, @@ -343,24 +343,6 @@ "OStatusClass": false, "categories": ["SN-mi"] }, - { - "title": "OLKi", - "source": "https://framagit.org/synalp/olki/olki", - "protocols": "ActivityPub", - "site": "https://olki.loria.fr/platform", - "logo": "/img/misc/olki.svg", - "servers": "", - "description": "A self-hosted linguistic corpora exchange platform that aims to be a simple gateway to the Fediverse for scientific interaction.", - "codeLanguage": "Python", - "techStack": "Django, Vue, Nuxt, Spectre.css, Zutre", - "license": "AGPL-3.0", - "FediAccount": "@cerisara@mastodon.etalab.gouv.fr", - "apClass": true, - "zotClass": false, - "diasporaClass": false, - "OStatusClass": false, - "categories": ["OpenData", "SN-mi"] - }, { "title": "pubgate", "source": "https://github.com/autogestion/pubgate", @@ -545,7 +527,7 @@ "title": "OCamlot", "source": "https://github.com/gopiandcode/ocamlot", "protocols": "ActivityPub", - "site": "ocamlot.xyz", + "site": "", "logo": "", "servers": "ocamlot.xyz", "description": "An ActivityPub-speaking server in OCaml (Pleroma and Mastodon compatible).", @@ -1371,9 +1353,9 @@ }, { "title": "Firefish", - "source": "https://gitlab.prometheus.systems/firefish/firefish", + "source": "https://git.joinfirefish.org/firefish/firefish", "protocols": "ActivityPub", - "site": "https://firefish.social/", + "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", @@ -1427,7 +1409,7 @@ "title": "Takahe", "source": "https://github.com/andrewgodwin/takahe", "protocols": "ActivityPub", - "site": "https://jointakahe.org/takahesocial/", + "site": "https://jointakahe.org", "logo": "/img/misc/takahe.svg", "servers": "", "description": "A very experimental Fediverse server for microblogging.", diff --git a/source/img/misc/hubzilla.png b/source/img/misc/hubzilla.png deleted file mode 100644 index 5720b430658296ba1bc8e8b43df8a20c3775bf7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11342 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 Date: Wed, 26 Jul 2023 22:04:16 +0300 Subject: [PATCH 08/15] Minify Misc SVGs --- source/img/misc/akkoma.svg | 35 +--------- source/img/misc/firefish.svg | 34 +-------- source/img/misc/immers.png | Bin 26616 -> 1202 bytes source/img/misc/olki.svg | 16 ----- source/img/misc/skohub.svg | 62 +---------------- source/img/misc/takahe.svg | 129 +---------------------------------- 6 files changed, 4 insertions(+), 272 deletions(-) delete mode 100644 source/img/misc/olki.svg diff --git a/source/img/misc/akkoma.svg b/source/img/misc/akkoma.svg index 01ddbad..df32cfa 100644 --- a/source/img/misc/akkoma.svg +++ b/source/img/misc/akkoma.svg @@ -1,34 +1 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/source/img/misc/firefish.svg b/source/img/misc/firefish.svg index 981fe2f..e1305de 100644 --- a/source/img/misc/firefish.svg +++ b/source/img/misc/firefish.svg @@ -1,33 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/source/img/misc/immers.png b/source/img/misc/immers.png index c151692300cd6c7e1cccfc95044f3a2159deb422..5f7a322c83a15a2ab630047438335967d1d2da9c 100644 GIT binary patch literal 1202 zcmeAS@N?(olHy`uVBq!ia0vp^x**KK3=%maw1RPa^p9_utZWFNo3P z7>pU^t^;pRp8E)7ZrS~&wDC@6<*hx3->upF5@HTA8z>SGe|g8gw?KxO=Q)Ui ztje3kjdycxyjPbbcO;v9P6 z-G^UyAACP~?i0{cdk(!@vhGE7$GvN}zFxWU<>={;)g5<}i*A^EpS^nXi@wY0?Q?Ew z0R!5+B*-tA;j@e4M$;dUdu>_XAKNPP`@*|d&+qPBy=3Opn&Pa?AV(b$o=@*CUpTX6 z)5iIeCwI3rmnO$VM{!vQ2lX&8Fdg-DaSZV|zBKfE`7Hy1X_-u!C;Y-MOrFp!T_Wrki&3Yy0*UVdfC_eoYJn>Xu zSEW;z{KR=H?)X2uRdrKhb9KX$Ca{a@+9x&R5e;tGSx7@&E8k zE)aZphcmt6ZrJ|qy-}_=b-5<3Husv8rl!0u>|uXYl4bVnc*Y-FIT9DHUzAb$Rp`hG z_08*!YL-r6^4qe0Ps95YQ#Zc$>2Q!T)$Zrrma4z~z?8kK-p!kxb7*njC)1oi_qI-# zPiP7_9=T`xMX}kO;j*e%GA-LB7G$Eo2qTM7v;3qZa*(65GyS1cz4f(C23Oa*U#>GuxE1bwvcCAjoZ1BO>Zqp z@2OPZc}XFkr{Z3ViInr#Wydd9F;3Hp`>J~G%u2cM6?$=vOQ*DVPjNBj{w%}A#rsaT zqWy|V(xy!DG_hY-3v*y~my5p-ez2>fe z7yH-3@cMx-*^{j$1#;zrZWvEKeE8%o=@9Gc+-`jf&Q}pKYwt}^Jy|Ha)i1wL_Im2F z&Y)p951@&$=%*CHYT^=Ns-wiOepWRr4RnT=X|;yS%*5 zdAMqSc&>I$qJ+Z2`wOb4?&mLK%~gM>67uHP?*;phUt@i3G3!!vNH5#5 z@9&+jh4AjGkGGb-H1Fnz_~Pen#<_p??0KlO?D?P5PYs0mbkEd%JNvUfXJz4>hD}9F Qfq8<#)78&qol`;+0F3&$DgXcg literal 26616 zcmeFYbx@qm)-Q@%Ah^5h;O_1^cmly@aF^g39D=(;kPuu$a0nh;gL@#jyPP50-hIz^ zzjME;d;Z%~HC6L;uk~BqtCw~6GZE^la%d<-C{R#PXbSSuKqx3^nwKvU0;DDMR`~!5 zibT*$OV1T(;!fe{>|kzX3#M@ObOcj?J*>>3pgb0qGxZa;n&V}jzeT=-A>m5-Fj4M4 z{^QuCYoJ`BN_jK&%R6u(RS*r7d&dV@udC&T}FUv|~h`j;gE6r=6fG-Tj9Yzh;f>T=c#w^7

iN{0P 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 z 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 - - - - - - - - - - - - - - - diff --git a/source/img/misc/skohub.svg b/source/img/misc/skohub.svg index 8ca7375..61f2c00 100644 --- a/source/img/misc/skohub.svg +++ b/source/img/misc/skohub.svg @@ -1,61 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/source/img/misc/takahe.svg b/source/img/misc/takahe.svg index a2e6b36..6e16593 100644 --- a/source/img/misc/takahe.svg +++ b/source/img/misc/takahe.svg @@ -1,128 +1 @@ - - - - + \ No newline at end of file From 0daae32b68ada01b48994248e3ead7de41083a30 Mon Sep 17 00:00:00 2001 From: lostinlight Date: Wed, 26 Jul 2023 22:32:28 +0300 Subject: [PATCH 09/15] Update Contributing --- CONTRIBUTING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f143c47..4862fde 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,6 +18,7 @@ If your project targets mainly *developers*, tech-savvy users or is a helper (re Software submitted to **ALL APPS** website page **must be**: * Fully open source (please, consider showcasing your closed source apps on https://the-federation.info) * Supporting or planning to support one of the following protocols: OStatus, diaspora, Zot, ActivityPub (please, consider showcasing your apps federating via other protocols on https://the-federation.info) +* Being maintained (latest commit no older than 1.5 years ago) Fork this repository. Add your project data to `./source/_data/miscellaneous.json` file. @@ -42,7 +43,7 @@ Please, choose no more than **3 categories** (array of strings) for the software * `Forums` (forums and forum-like software, boards, etc) * `Other` (everything that doesn't quite fit into the above categories) -A project may have a logo / image (45x45px), placed in `./source/img/misc` folder. +A project may have a logo / image (PNG - 45x45px; SVG height and width - 24x24 if possible), placed in `./source/img/misc` folder. ### [Submitting tools](#submitting-tools) Fork this repository. Add your project data to `./source/_data/tools.json` file. From 5d294fac7176596c1a22834608d91cfe58d3cb9d Mon Sep 17 00:00:00 2001 From: lostinlight Date: Tue, 1 Aug 2023 22:04:36 +0300 Subject: [PATCH 10/15] Fix Fedidb links (htmlproofer) --- source/_data/friendica.json | 2 +- source/_data/funkwhale.json | 2 +- source/_data/gnusocial.json | 2 +- source/_data/hubzilla.json | 2 +- source/_data/mastodon.json | 4 ++-- source/_data/misskey.json | 2 +- source/_data/peertube.json | 2 +- source/_data/pixelfed.json | 2 +- source/_data/pleroma.json | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/_data/friendica.json b/source/_data/friendica.json index b2d5acf..eaf09ed 100644 --- a/source/_data/friendica.json +++ b/source/_data/friendica.json @@ -22,7 +22,7 @@ [ {"num": "1", "url": "https://the-federation.info/friendica"}, {"num": "2", "url": "https://dir.friendica.social/servers"}, - {"num": "3", "url": "https://fedidb.org/network/?s=friendica"}, + {"num": "3", "url": "https://fedidb.org/software/friendica"}, {"num": "4", "url": "https://friendica.fediverse.observer/list"} ], "serverWizard": "https://fediverse.observer/list?wizard", diff --git a/source/_data/funkwhale.json b/source/_data/funkwhale.json index 7bf97e2..6a33794 100644 --- a/source/_data/funkwhale.json +++ b/source/_data/funkwhale.json @@ -19,7 +19,7 @@ [ {"num": "1", "url": "https://network.funkwhale.audio/dashboards/d/overview/network-overview"}, {"num": "2", "url": "https://the-federation.info/funkwhale"}, - {"num": "3", "url": "https://fedidb.org/network/?s=funkwhale"}, + {"num": "3", "url": "https://fedidb.org/software/funkwhale"}, {"num": "4", "url": "https://funkwhale.fediverse.observer/list"} ], "mobile": "https://funkwhale.audio/en_US/apps", diff --git a/source/_data/gnusocial.json b/source/_data/gnusocial.json index 5ba7532..a993171 100644 --- a/source/_data/gnusocial.json +++ b/source/_data/gnusocial.json @@ -20,7 +20,7 @@ "servers": [ {"num": "1", "url": "https://the-federation.info/gnusocial"}, - {"num": "2", "url": "https://fedidb.org/network/?s=gnusocial"}, + {"num": "2", "url": "https://fedidb.org/software/gnusocial"}, {"num": "3", "url": "https://gnusocial.fediverse.observer/list"} ], "mobile": "", diff --git a/source/_data/hubzilla.json b/source/_data/hubzilla.json index 8ac29e3..7507ee4 100644 --- a/source/_data/hubzilla.json +++ b/source/_data/hubzilla.json @@ -22,7 +22,7 @@ "servers": [ {"num": "1", "url": "https://the-federation.info/hubzilla"}, - {"num": "2", "url": "https://fedidb.org/network/?s=hubzilla"}, + {"num": "2", "url": "https://fedidb.org/software/hubzilla"}, {"num": "3", "url": "https://hubzilla.fediverse.observer/list"} ], "mobile": "https://f-droid.org/en/packages/com.dfa.hubzilla_android", diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json index 2b63147..2c59a7b 100644 --- a/source/_data/mastodon.json +++ b/source/_data/mastodon.json @@ -18,8 +18,8 @@ "wiki": "", "servers": [ - {"num": "1", "url": "https://the-federation.info/mastodon"}, - {"num": "2", "url": "/en/portal/servers"}, + {"num": "1", "url": "/en/portal/servers"}, + {"num": "2", "url": "https://the-federation.info/mastodon"}, {"num": "3", "url": "https://instances.social"}, {"num": "4", "url": "https://mastodon.fediverse.observer/list"} diff --git a/source/_data/misskey.json b/source/_data/misskey.json index 61e0010..9d2b8c6 100644 --- a/source/_data/misskey.json +++ b/source/_data/misskey.json @@ -20,7 +20,7 @@ {"num": "1", "url": "https://misskey-hub.net/en/instances.html"}, {"num": "2", "url": "https://join.misskey.page/en/wiki/instances"}, {"num": "3", "url": "https://the-federation.info/misskey"}, - {"num": "4", "url": "https://fedidb.org/network/?s=misskey"}, + {"num": "4", "url": "https://fedidb.org/software/misskey"}, {"num": "5", "url": "https://misskey.fediverse.observer/list"} ], "mobile": "https://misskey-hub.net/en/docs/faq.html", diff --git a/source/_data/peertube.json b/source/_data/peertube.json index 064eb4a..7408ecf 100644 --- a/source/_data/peertube.json +++ b/source/_data/peertube.json @@ -19,7 +19,7 @@ [ {"num": "1", "url": "https://joinpeertube.org/instances"}, {"num": "2", "url": "https://the-federation.info/peertube"}, - {"num": "3", "url": "https://fedidb.org/network/?s=peertube"}, + {"num": "3", "url": "https://fedidb.org/software/peertube"}, {"num": "4", "url": "https://peertube.fediverse.observer/list"} ], "mobile": "https://docs.joinpeertube.org/#/use-third-party-application", diff --git a/source/_data/pixelfed.json b/source/_data/pixelfed.json index 99bfe50..34552bc 100644 --- a/source/_data/pixelfed.json +++ b/source/_data/pixelfed.json @@ -19,7 +19,7 @@ "servers": [ {"num": "1", "url": "https://the-federation.info/pixelfed"}, - {"num": "2", "url": "https://fedidb.org/network/?s=pixelfed"}, + {"num": "2", "url": "https://fedidb.org/software/pixelfed"}, {"num": "3", "url": "https://pixelfed.fediverse.observer/list"} ], "mobile": "https://github.com/glitchpizza/morii", diff --git a/source/_data/pleroma.json b/source/_data/pleroma.json index 7e8fd0f..2712367 100644 --- a/source/_data/pleroma.json +++ b/source/_data/pleroma.json @@ -18,7 +18,7 @@ "servers": [ {"num": "1", "url": "https://the-federation.info/pleroma"}, - {"num": "2", "url": "https://fedidb.org/network/?s=pleroma"}, + {"num": "2", "url": "https://fedidb.org/software/pleroma"}, {"num": "3", "url": "https://pleroma.fediverse.observer/list"} ], "mobile": "https://docs-develop.pleroma.social/backend/clients", From 94c64e9d295108276144d320c5ea63a4931c4a2f Mon Sep 17 00:00:00 2001 From: lostinlight Date: Tue, 1 Aug 2023 22:12:22 +0300 Subject: [PATCH 11/15] Remove wizard links --- source/_data/diaspora.json | 1 - source/_data/friendica.json | 1 - source/_data/mastodon.json | 1 - themes/starter/layout/_partial/join.ejs | 4 ---- 4 files changed, 7 deletions(-) diff --git a/source/_data/diaspora.json b/source/_data/diaspora.json index 560e4b1..2844ea7 100644 --- a/source/_data/diaspora.json +++ b/source/_data/diaspora.json @@ -19,7 +19,6 @@ {"num": "1", "url": "https://the-federation.info/diaspora"}, {"num": "2", "url": "https://diaspora.fediverse.observer/list"} ], - "serverWizard": "https://fediverse.observer/list?wizard", "mobile": "https://f-droid.org/en/packages/com.github.dfa.diaspora_android", "proxy": "https://wiki.diasporafoundation.org/Installation/Camo", "tutorials": diff --git a/source/_data/friendica.json b/source/_data/friendica.json index eaf09ed..49d8f31 100644 --- a/source/_data/friendica.json +++ b/source/_data/friendica.json @@ -25,7 +25,6 @@ {"num": "3", "url": "https://fedidb.org/software/friendica"}, {"num": "4", "url": "https://friendica.fediverse.observer/list"} ], - "serverWizard": "https://fediverse.observer/list?wizard", "mobile": "https://github.com/friendica/friendica/wiki/Clients", "tutorials": [ diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json index 2c59a7b..f08829a 100644 --- a/source/_data/mastodon.json +++ b/source/_data/mastodon.json @@ -24,7 +24,6 @@ {"num": "4", "url": "https://mastodon.fediverse.observer/list"} ], - "serverWizard": "https://fediverse.observer/list?wizard", "mobile": "https://joinmastodon.org/apps", "forUsers": [ diff --git a/themes/starter/layout/_partial/join.ejs b/themes/starter/layout/_partial/join.ejs index a4802f4..c07049b 100644 --- a/themes/starter/layout/_partial/join.ejs +++ b/themes/starter/layout/_partial/join.ejs @@ -22,10 +22,6 @@ <% } %> - <% if (data.serverWizard) { %> -

network logo colour icon Or use a wizard to help you pick a server from the list:

- <%- __('wizard') %> - <% } %> <% if (data.mobile) { %>

network logo colour icon Choose a mobile application from the available ones:

From 9ed3b28a225741df32302b5d887db2b649ce1798 Mon Sep 17 00:00:00 2001 From: lostinlight Date: Tue, 1 Aug 2023 23:29:27 +0300 Subject: [PATCH 12/15] Remove, fix broken links --- source/_data/funkwhale.json | 2 +- source/_data/mastodon.json | 12 ++----- source/_data/miscellaneous.json | 20 +---------- source/_data/tools.json | 36 ------------------- source/_posts/fediverse-13-2021-party-time.md | 2 +- source/_posts/fediverse-in-2019.md | 4 +-- source/_posts/fediverse-in-2020.md | 7 +--- source/_posts/fediverse-in-2021.md | 2 +- source/en/portal/servers/index.md | 23 ++---------- themes/starter/languages/en.yml | 4 --- themes/starter/layout/mastodon.ejs | 14 +------- 11 files changed, 13 insertions(+), 113 deletions(-) diff --git a/source/_data/funkwhale.json b/source/_data/funkwhale.json index 6a33794..e3b0496 100644 --- a/source/_data/funkwhale.json +++ b/source/_data/funkwhale.json @@ -25,7 +25,7 @@ "mobile": "https://funkwhale.audio/en_US/apps", "forUsers": [ - {"id": "0", "url": "https://docs.funkwhale.audio/stable/users/index.html"} + {"id": "0", "url": "https://docs.funkwhale.audio/user/index.html"} ], "devTutorial": "https://docs.funkwhale.audio/stable/installation/index.html", "services": diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json index f08829a..e755cb2 100644 --- a/source/_data/mastodon.json +++ b/source/_data/mastodon.json @@ -39,10 +39,6 @@ {"id": "1", "url": "https://gist.github.com/joyeusenoelle/74f6e6c0f349651349a0df9ae4582969"} ], "devTutorial": "https://github.com/mastodon/documentation", - "metrics": - [ - {"id": "0", "url": "http://sp3r4z.fr/mastodon"} - ], "forTechies": [ {"id": "0", "url": "https://github.com/tleb/awesome-mastodon"}, @@ -63,12 +59,8 @@ "utilities": [ {"id": "0", "url": "https://www.mastofeed.com"}, - {"id": "1", "url": "https://crossposter.masto.donte.com.br"}, - {"id": "2", "url": "http://www.unmung.com/mastoview"}, - {"id": "3", "url": "https://fed.brid.gy"}, - {"id": "4", "url": "https://gitlab.com/chaica/feed2toot"}, - {"id": "5", "url": "https://moa.party"}, - {"id": "6", "url": "https://pleromabot.robertoszek.xyz"} + {"id": "1", "url": "https://gitlab.com/chaica/feed2toot"}, + {"id": "2", "url": "https://pleromabot.robertoszek.xyz/pleroma-bot"} ], "mascot": [{"item": "mastodon", "imgNum": "1"}], "dwellers": "mastonauts", diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json index ed7da22..00b0ddd 100644 --- a/source/_data/miscellaneous.json +++ b/source/_data/miscellaneous.json @@ -901,24 +901,6 @@ "OStatusClass": false, "categories": ["Develop"] }, - { - "title": "Flocking Bird", - "source": "https://github.com/flockingbird/roost", - "protocols": "ActivityPub", - "site": "https://search.flockingbird.social", - "logo": "", - "servers": "", - "description": "Network for professionals. A LinkedIn alternative.", - "codeLanguage": "", - "techStack": "", - "license": "-", - "FediAccount": "@flockingbird@fosstodon.org", - "apClass": true, - "zotClass": false, - "diasporaClass": false, - "OStatusClass": false, - "categories": ["SN-ma"] - }, { "title": "Kitsune", "source": "https://github.com/kitsune-soc/kitsune", @@ -1416,7 +1398,7 @@ "codeLanguage": "Python", "techStack": "Django", "license": "BSD-3-clause", - "FediAccount": "@takahe@jointakahe.org", + "FediAccount": "@takahe@jointakahe.takahe.social", "apClass": true, "zotClass": false, "diasporaClass": false, diff --git a/source/_data/tools.json b/source/_data/tools.json index fdacbc7..44fbda5 100644 --- a/source/_data/tools.json +++ b/source/_data/tools.json @@ -1153,24 +1153,6 @@ "OStatusClass": false, "categories": ["Bridges"] }, - { - "title": "Mastodon Twitter poster", - "source": "https://crossposter.masto.donte.com.br", - "protocols": "ActivityPub", - "site": "", - "logo": "", - "servers": "", - "description": "Crossposter to post statuses between Mastodon and Twitter.", - "codeLanguage": "Ruby", - "techStack": "", - "license": "AGPL-3.0", - "FediAccount": "@crossposter@masto.donte.com.br", - "apClass": true, - "zotClass": false, - "diasporaClass": false, - "OStatusClass": false, - "categories": ["Bridges"] - }, { "title": "Twitter Hamachpil", "source": "https://gitlab.com/hamachpil/twitter_hamachpil", @@ -1891,24 +1873,6 @@ "OStatusClass": false, "categories": ["Utils"] }, - { - "title": "Twitodon", - "source": "https://github.com/diddledani/twitodon", - "protocols": "ActivityPub", - "site": "https://twitodon.com", - "logo": "", - "servers": "", - "description": "Twitter to Mastodon account mapping service to aid migration away from Twitter without losing all your followed friends.", - "codeLanguage": "Javascript", - "techStack": "", - "license": "-", - "FediAccount": "", - "apClass": true, - "zotClass": false, - "diasporaClass": false, - "OStatusClass": false, - "categories": ["Utils"] - }, { "title": "ActivityPub Models", "source": "https://github.com/activitypub-js/activitypub-models", diff --git a/source/_posts/fediverse-13-2021-party-time.md b/source/_posts/fediverse-13-2021-party-time.md index eb1cddb..8de6ba8 100644 --- a/source/_posts/fediverse-13-2021-party-time.md +++ b/source/_posts/fediverse-13-2021-party-time.md @@ -24,7 +24,7 @@ Newcomers are usually advised to create an "introductions" post, telling a few w **Note**: If you speak Catalan or Spanish, join the [online meeting](https://bbb.exo.cat/b/rit-vd9-fhv) of fedizens [dedicated](https://agora.fedi.cat/t/18-de-maig-fedianiversari/313) to this special day (from 19h30 to 21h30 UTC+2). ![Festive illustration with a cake and candles](/en/post/fediverse-13-2021-party-time/cat-es-meeting.png) -Credits: promo image - by @titi, CC BY-SA, source +Credits: promo image - by @titi, CC BY-SA ### Planting the seeds diff --git a/source/_posts/fediverse-in-2019.md b/source/_posts/fediverse-in-2019.md index 4074ae6..7017a20 100644 --- a/source/_posts/fediverse-in-2019.md +++ b/source/_posts/fediverse-in-2019.md @@ -98,7 +98,7 @@ At least 10 new networks expressed a wish to be βœ” `May:` Fediverse has a 🐣 Birthday, technically - [11 years](https://social.diekershoff.de/display/f3ad7b1c-145c-e10f-1e74-b7b177306491) and counting. Happy Birthday, Fedi! -βœ” `July:` Hubzilla community announces a [call for participation](https://www.w3.org/community/zot) to standardize the Zot protocol used in [Hubzilla](/en/hubzilla) and [Zap](https://codeberg.org/zot/zap) software +βœ” `July:` Hubzilla community announces a [call for participation](https://www.w3.org/community/zot) to standardize the Zot protocol used in [Hubzilla](/en/hubzilla) software βœ” `July:` [Pixelfed](/en/pixelfed) starts federating with other Fedi networks. A long awaited update @@ -140,7 +140,7 @@ Most used providers 2019: ![list of most used hosting providers](/en/post/fediverse-in-2019/providers.jpg) -You can see Mastodon statistics on [servers](http://sp3r4z.fr/mastodon/general) and [providers](http://sp3r4z.fr/mastodon/providers). The situation hasn't changed much since 2018 Leah's [research](https://chaos.social/@leah/99837391793032137) on server distribution. Will something change in 2020? +The situation hasn't changed much since 2018 Leah's [research](https://chaos.social/@leah/99837391793032137) on server distribution. Will something change in 2020? ### Fediverse.party news: diff --git a/source/_posts/fediverse-in-2020.md b/source/_posts/fediverse-in-2020.md index 9b12d03..3eb32b1 100644 --- a/source/_posts/fediverse-in-2020.md +++ b/source/_posts/fediverse-in-2020.md @@ -47,9 +47,7 @@ Seven networks growing most rapidly in *online* server numbers in 2020 were: ### Fediverse in projects -At least 17 new projects joined Fediverse in 2020! - -🌟 [Hash2Pub](https://git.orlives.de/schmittlauch/Hash2Pub) – a fully-decentralised DHT-based relay for global hashtag federation +At least 16 new projects joined Fediverse in 2020! 🌟 [Bonfire](https://gitlab.com/bonfire-ecosystem/activitypub) – a plug & play federated social network based on CommonsPub @@ -85,9 +83,6 @@ At least 17 new projects joined Fediverse in 20 β†’ For a full list of Fediverse projects in development see [Miscellaneous](https://fediverse.party/en/miscellaneous) page. -#### Project forks: -β€’ [Mistpark 2020](https://codeberg.org/zot/misty) – also known as "misty", a webserver app that supports ActivityPub and Zot protocols, fork of Zap - #### Related new projects: β€’ [SepiaSearch](https://sepiasearch.org) – search engine for PeerTube diff --git a/source/_posts/fediverse-in-2021.md b/source/_posts/fediverse-in-2021.md index 694cb7b..257aa64 100644 --- a/source/_posts/fediverse-in-2021.md +++ b/source/_posts/fediverse-in-2021.md @@ -99,7 +99,7 @@ At least 13 new projects joined Fediverse in 20 ### Fediverse ecosystem -In July [Inexcode](https://social.inex.rocks/@inexcode) relaunched [fediverse.space](https://fediverse.space) - a beautiful project that has previously been developed by Tao BojlΓ©n and that got a second life thanks to its codebase being open source! In August Paula [launched](https://climatejustice.social/@PaulaToThePeople/106681444006722123) a new forum for any discussions related to Fediverse - [fediverse.town](https://fediverse.town). In November [Minoru](https://functional.cafe/@minoru) open sourced Fediverse [nodes list](https://nodes.fediverse.party) to help public statistics hubs and to empower new ecosystem developments! And by the end of the year, [Fediverse Wiki](https://joinfediverse.wiki) project was launched. +In July [Inexcode](https://social.inex.rocks/@inexcode) relaunched [fediverse.space](https://fediverse.space) - a beautiful project that has previously been developed by Tao BojlΓ©n and that got a second life thanks to its codebase being open source! In November [Minoru](https://functional.cafe/@minoru) open sourced Fediverse [nodes list](https://nodes.fediverse.party) to help public statistics hubs and to empower new ecosystem developments! And by the end of the year, [Fediverse Wiki](https://joinfediverse.wiki) project was launched. ![Space photo background with major Fedi ecosystem URLs listed](/en/post/fediverse-in-2021/ecosystem.jpg) Credits: background image by Alex Antropov, Pixabay license diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index 5210fbc..ae07a69 100644 --- a/source/en/portal/servers/index.md +++ b/source/en/portal/servers/index.md @@ -50,7 +50,7 @@ Information about adding a server can be found [here](https://codeberg.org/fediv * [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)* * [mastodon.triggerphra.se](https://mastodon.triggerphra.se) - for the hypnosis community; 18+, queer, and getting very sleepy *(Mastodon)* -* [redd.live](https://redd.live) - community for ReddCoin and cryptocurrency users *(Mastodon)* *(Cloudflared)* +* [moth.orchids.social](https://moth.orchids.social) - for orchid lovers *(Mastodon)* ### πŸš„ [Travel, Transport and Infrastructure](#travel) * [rail.chat](https://rail.chat) - discussions about long-distance, passenger and freight rail networks for economic, environmental and equity benefits *(Mastodon)* @@ -74,7 +74,6 @@ Information about adding a server can be found [here](https://codeberg.org/fediv * [occitania.social](https://occitania.social) - community of Occitan culture and language *(Mastodon)* * [samenet.social](https://samenet.social) - SΓ‘mi language *(Mastodon)* * [mastodo.fi](https://mastodo.fi) - Finnish language *(Mastodon)* -* [twitteregypt.online](https://twitteregypt.online) - Arabic language *(Mastodon)* * [vkl.world](https://vkl.world) - Belarusian language *(Mastodon)* * [9kb.me](https://9kb.me) - Chinese language *(Mastodon)* * [fairy.id](https://fairy.id) - Chinese language *(Mastodon)* @@ -107,8 +106,6 @@ Instances run by and for people belonging to minorities and moderated more stric * [mastodon-belgium.be](https://mastodon-belgium.be) - Belgium *(Mastodon)* #### Canada - -* [halifaxsocial.ca](https://halifaxsocial.ca) - Halifax *(Mastodon)* * [vancity.social](https://vancity.social) - Vancouver *(Calckey)* #### Czech Republic @@ -116,11 +113,9 @@ Instances run by and for people belonging to minorities and moderated more stric #### Denmark * [norrebro.space](https://norrebro.space) - Denmark *(Mastodon)* -* [fynbo.social](https://fynbo.social) - Denmark *(Mastodon)* #### Egypt * [twitteregypt.online](https://twitteregypt.online) - Egypt *(Mastodon)* -* [masr.social](https://masr.social) - Egypt *(Mastodon)* #### Finland * [mastodo.fi](https://mastodo.fi) - Finland *(Mastodon)* @@ -143,7 +138,6 @@ Instances run by and for people belonging to minorities and moderated more stric * [cas.social](https://cas.social) - Castrop-Rauxel *(Mastodon)* * [im.allmendenetz.de](https://im.allmendenetz.de) - Cologne, Germany *(Hubzilla)* * [toot.berlin](https://toot.berlin) - Berlin *(Mastodon)* -* [bz.pawdev.me](https://bz.pawdev.me) - Bautzen *(Calckey)* *(Cloudflared)* *(hCaptcha)* * [kowelenz.social](https://kowelenz.social) - Koblenz *(Akkoma)* #### Indonesia @@ -171,7 +165,6 @@ Instances run by and for people belonging to minorities and moderated more stric #### Switzerland * [swiss.social](https://swiss.social) - Switzerland *(Mastodon)* -* [basel.social](https://basel.social) - Basel and Basel region *(Mastodon)* * [mastodon.free-solutions.org](https://mastodon.free-solutions.org) - Switzerland *(Mastodon)* * [swiss-talk.net](https://swiss-talk.net) - Switzerland *(Mastodon)* @@ -181,7 +174,6 @@ Instances run by and for people belonging to minorities and moderated more stric #### UK * [bath.social](https://bath.social) - Bath *(Mastodon)* -* [gib.social](https://gib.social) - Gibraltar *(Mastodon)* #### USA * [socialclub.nyc](https://socialclub.nyc) - New York *(Mastodon)* @@ -195,19 +187,15 @@ Instances run by and for people belonging to minorities and moderated more stric * [devschile.social](https://devschile.social) - for Spanish-language techies of Chile *(Mastodon)* * [k8s.social](https://k8s.social) - for kubernetes, container and cloud native enthusiasts *(Mastodon)* * [gnulinux.social](https://gnulinux.social) - community dedicated to Free Software enthusiasts and supporters -* [h4x0r.army](https://h4x0r.army) - community for hackers, pentesters, programmers, and more *(Mastodon)* *(Cloudflared)* -* [dataanalytics.social](https://dataanalytics.social) - for data and analytics topics *(Mastodon)* * [technodon.org](https://technodon.org) - general technology discussion *(Mastodon)* *(Cloudflared)* * [toot.works](https://toot.works) - for folks who make things with bits, wires, wood, and more *(Mastodon)* ### πŸ’» [Programming](#instances-for-programmers) * [pythondevs.social](https://pythondevs.social) - for Python developers of all experience levels *(Pleroma)* -* [pythonist.as](https://pythonist.as) - for Pythonistas *(Mastodon)* * [dotnet.social](https://dotnet.social) - .NET *(Mastodon)* * [jvm.social](https://jvm.social) - JVM technologies related server *(Mastodon)* ### 🎬 [Book / Game / Show theme](#entertainment) -* [osrs.club](https://osrs.club) - themed around Old School Runescape *(Pleroma)* * [greenhill.zone](https://greenhill.zone) - multilingual instance for fans of Sonic the Hedgehog *(Mastodon)* ### 🐰 [Environmentalism](#environmentalism) @@ -221,7 +209,6 @@ Instances run by and for people belonging to minorities and moderated more stric ### βš• [Healthcare](#health) * [fedisabled.social](https://fedisabled.social) - for all disabled people *(Mastodon)* -* [diabetes.masto.host](https://diabetes.masto.host) - safe harbor for people affected by diabetes *(Mastodon)* * [medibubble.org](https://medibubble.org) - for medical professionals and everyone else, in German *(Mastodon)* ### πŸ‘½ [Fandoms](#fandoms) @@ -249,10 +236,8 @@ Instances run by and for people belonging to minorities and moderated more stric * [social.yesterweb.org](https://social.yesterweb.org) - hosted in the USA, mainly in English *(Mastodon)* * [wetdry.world](https://wetdry.world) - talk about tech, gaming, bad jokes *(Mastodon)* * [masto.bike](https://masto.bike) - riding a bike is a plus, French speaking *(Mastodon)* -* [astronomique.de](https://astronomique.de) - main language is German *(Mastodon)* * [blueplanet.social](https://blueplanet.social) - for people interested in making this planet a better place, primarily German language * [convo.casa](https://convo.casa) - general for everyone *(Mastodon)* -* [mstodon.eu](https://mstodon.eu) - EU based English language server *(Mastodon)* * [publicsquare.global](https://publicsquare.global) - safe place in Fediverse dedicated to providing online communication as a basic human right *(Mastodon)* *(Cloudflared)* ### 🐚 [Run by tech-savvy organizations](#run-by-tech-savvy-organizations) @@ -308,7 +293,6 @@ Instances run by and for people belonging to minorities and moderated more stric * [krefeld.life](https://krefeld.life) - Krefeld, Germany *(Mastodon)* * [darmstadt.social](https://darmstadt.social) - Darmstadt, Germany *(Mastodon)* * [snabelen.no](https://snabelen.no) - Norway *(Mastodon)* -* [mastodon.se](https://mastodon.se) - Sweden *(Mastodon)* * [tukkers.online](https://tukkers.online) - Twente region, Netherlands *(Mastodon)* * [mastodon.opencloud.lu](https://mastodon.opencloud.lu) - Luxembourg (private and public organisations) *(Mastodon)* * [mastodon.uy](https://mastodon.uy) - Uruguay *(Mastodon)* @@ -329,7 +313,6 @@ Instances run by and for people belonging to minorities and moderated more stric * [dads.cool](https://dads.cool) - anyone with a kid can be a dad *(Mastodon)* * [colorid.es](https://colorid.es)- Spanish LGBTQIA+ / queer instance primarily for Portuguese speakers *(Mastodon)* * [fandom.ink](https://fandom.ink) - for fans and fandoms of all types *(Mastodon)* -* [aspiechattr.me](https://aspiechattr.me) - for aspies and other NDs where you can chat to other peeps with ASD, ADHD, and related conditions *(Mastodon)* * [tooting.ch](https://tooting.ch) - generic instance hosted by the FairSocialNet association *(Mastodon)* * [digitalcourage.social](https://digitalcourage.social) - by DigitalCourage *(Mastodon)* * [libretooth.gr](https://libretooth.gr) - by LibreOps, who contribute to (re-)decentralizing the net *(Mastodon)* @@ -367,7 +350,6 @@ Instances run by and for people belonging to minorities and moderated more stric * [musicians.today](https://musicians.today) - for musicians of all levels, instruments, regions, languages, and genres *(Mastodon)* * [kalmar.social](https://kalmar.social) - Kalmar region, Sweden *(Mastodon)* * [blasmusik.social](https://blasmusik.social) - specially, but not only for brass musicians, Germany *(Mastodon)* -* [poketopia.city](https://poketopia.city) - For PokΓ©mon furries, PokΓ©furs. Also transformation and inanimate TF. *(Mastodon)* * [social.seattle.wa.us](https://social.seattle.wa.us) - Seattle *(Mastodon)* * [social.bau-ha.us](https://social.bau-ha.us) - part of CCC family, hosted in Weimar *(Mastodon)* * [poliversity.it](https://poliversity.it) - Italian instance dedicated to the world of science and journalism *(Mastodon)* @@ -392,8 +374,9 @@ Instances run by and for people belonging to minorities and moderated more stric * [hoosier.social](https://hoosier.social) - for residents of Indiana *(Mastodon)* * [dz.social](https://dz.social) - Algeria *(Mastodon)* * [astronomy.city](https://astronomy.city) - for astronomy and astronomy-adjacent users *(Mastodon)* -* [paktodon.asia](https://paktodon.asia) - a Pakistani instance for the Global South +* [paktodon.asia](https://paktodon.asia) - a Pakistani instance for the Global South *(Mastodon)* * [baudigital.social](https://baudigital.social) - for people in architecture, civil engineering, or urban studies *(Mastodon)* +* [yasu.mu](https://yasu.mu) - a space free of bigotry and stress for people to come home to after offline struggle *(Hometown)* diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml index 1e99204..3435f1b 100644 --- a/themes/starter/languages/en.yml +++ b/themes/starter/languages/en.yml @@ -99,15 +99,11 @@ howto: How to Mastodon guide: Guide awesome: Awesome Mastodon list backup: Mastodon backup -metrics: metrics -stats: statistics graphs: graphs webmentions: Webmentions - site + Fediverse bridge mastofeed: Mastofeed -crossposting: Mastodon-Twitter crossposting twitodon: Find and follow Twitter friends on Mastodon fediDir: Curated list of interesting accounts -feedPreview: Instance timeline preview feed2toot: RSS to Mastodon bot trunk: Trunk - follow users with common interests moa: Twitter cross-poster diff --git a/themes/starter/layout/mastodon.ejs b/themes/starter/layout/mastodon.ejs index e56d8aa..99d146b 100644 --- a/themes/starter/layout/mastodon.ejs +++ b/themes/starter/layout/mastodon.ejs @@ -8,10 +8,9 @@ network: true const data = site.data.mastodon.data; const tuts = [__('howto'), __('guide')]; const uxList = [__('pinafore'), __('halcyon'), __('twitodon'), __('trunk'), __('fediDir')]; - const stats = [__('stats')]; const tech = [__('awesome'), __('backup')]; const tools = [__('preinstalled'), __('mediaHosting')]; - const utils = [__('mastofeed'), __('crossposting'), __('feedPreview'), __('webmentions'), __('feed2toot'), __('moa'), __('pleromaBot')]; + const utils = [__('mastofeed'), __('feed2toot'), __('pleromaBot')]; %> <%- partial('_partial/heroheader') %> @@ -92,17 +91,6 @@ network: true <% } %> -
-

<%- __('metrics') %>

-
    - <% for (item in data.metrics) { %> - <% let s = data.metrics[item].id %> -
  • - <%= stats[s] %> /  -
  • - <% } %> -
-
From 9109503ccc4dc9d3cdf7cf5c6969a9969e91e7af Mon Sep 17 00:00:00 2001 From: lostinlight Date: Fri, 4 Aug 2023 23:52:25 +0300 Subject: [PATCH 13/15] Remove broken link --- source/en/portal/servers/index.md | 1 - 1 file changed, 1 deletion(-) diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index ae07a69..7773304 100644 --- a/source/en/portal/servers/index.md +++ b/source/en/portal/servers/index.md @@ -376,7 +376,6 @@ Instances run by and for people belonging to minorities and moderated more stric * [astronomy.city](https://astronomy.city) - for astronomy and astronomy-adjacent users *(Mastodon)* * [paktodon.asia](https://paktodon.asia) - a Pakistani instance for the Global South *(Mastodon)* * [baudigital.social](https://baudigital.social) - for people in architecture, civil engineering, or urban studies *(Mastodon)* -* [yasu.mu](https://yasu.mu) - a space free of bigotry and stress for people to come home to after offline struggle *(Hometown)* From 0d9ca380c6137b2651be3a14bfcde180f296d1c3 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sun, 6 Aug 2023 12:46:51 -0700 Subject: [PATCH 14/15] 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): From 304c8fb66279ea678e36caff4bd089e5b189e078 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sun, 6 Aug 2023 12:50:03 -0700 Subject: [PATCH 15/15] firefish landing page instead of flagship instance --- source/_data/misskey.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/_data/misskey.json b/source/_data/misskey.json index a111c90..eda6687 100644 --- a/source/_data/misskey.json +++ b/source/_data/misskey.json @@ -27,7 +27,7 @@ "devTutorial": "https://misskey-hub.net/en/docs/install.html", "forks": [ - {"id": "0", "url": "https://firefish.social/", "descr": "Firefish - hard fork with a community oriented direction"}, + {"id": "0", "url": "https://joinfirefish.org/", "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"} ],