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/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 b2d5acf..49d8f31 100644 --- a/source/_data/friendica.json +++ b/source/_data/friendica.json @@ -22,10 +22,9 @@ [ {"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", "mobile": "https://github.com/friendica/friendica/wiki/Clients", "tutorials": [ diff --git a/source/_data/funkwhale.json b/source/_data/funkwhale.json index 7bf97e2..e3b0496 100644 --- a/source/_data/funkwhale.json +++ b/source/_data/funkwhale.json @@ -19,13 +19,13 @@ [ {"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", "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/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..e755cb2 100644 --- a/source/_data/mastodon.json +++ b/source/_data/mastodon.json @@ -18,13 +18,12 @@ "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"} ], - "serverWizard": "https://fediverse.observer/list?wizard", "mobile": "https://joinmastodon.org/apps", "forUsers": [ @@ -40,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"}, @@ -64,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 9aea299..902172d 100644 --- a/source/_data/miscellaneous.json +++ b/source/_data/miscellaneous.json @@ -335,11 +335,15 @@ "description": "An ActivityPub server with minimal dependencies, optimized for single-user application.", "codeLanguage": "Crystal", "techStack": "", +<<<<<<< HEAD <<<<<<< HEAD "license": "GNU Affero General Public License", ======= "license": "AGPL-3.0", >>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 +======= + "license": "AGPL-3.0", +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 "FediAccount": "@toddsundsted@mastodon.social", "apClass": true, "zotClass": false, @@ -348,6 +352,7 @@ "categories": ["SN-mi"] }, { +<<<<<<< HEAD <<<<<<< HEAD "title": "OLKi", "source": "https://framagit.org/synalp/olki/olki", @@ -360,14 +365,32 @@ "techStack": "Django, Vue, Nuxt, Spectre.css, Zutre", "license": "AGPL-3.0", "FediAccount": "@cerisara@mastodon.etalab.gouv.fr", +======= + "title": "pubgate", + "source": "https://github.com/autogestion/pubgate", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "https://the-federation.info/pubgate", + "description": "Lightweight ActivityPub CMS. Implements both client-to-server (C2S) and server-to-server(S2S) APIs. Compatible with Mastodon, Pixelfed, Pleroma and microblog.pub.", + "codeLanguage": "Python", + "techStack": "", + "license": "BSD-3-clause", + "FediAccount": "", +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 "apClass": true, "zotClass": false, "diasporaClass": false, "OStatusClass": false, +<<<<<<< HEAD "categories": ["OpenData", "SN-mi"] }, ======= >>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 +======= + "categories": ["SN-mi"] + }, +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 { "title": "castling.club", "source": "https://github.com/stephank/castling.club", @@ -549,6 +572,27 @@ "categories": ["Ev-Meet"] }, { +<<<<<<< HEAD +======= + "title": "Rustodon", + "source": "https://github.com/rustodon/rustodon", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "Mastodon-compatible social microblogging server.", + "codeLanguage": "Rust", + "techStack": "Diesel, SASS", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 "title": "Aardwolf", "source": "https://github.com/Aardwolf-Social/aardwolf", "protocols": "ActivityPub", @@ -1216,6 +1260,7 @@ }, { "title": "Firefish", +<<<<<<< HEAD <<<<<<< HEAD "source": "https://gitlab.prometheus.systems/firefish/firefish", "protocols": "ActivityPub", @@ -1228,6 +1273,14 @@ "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", +======= + "source": "https://git.joinfirefish.org/firefish/firefish", + "protocols": "ActivityPub", + "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. A fork of Misskey, formerly known as Calckey.", +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 "codeLanguage": "TypeScript", "techStack": "Node.js, Vue", "license": "AGPL-3.0", @@ -1278,18 +1331,26 @@ "title": "Takahe", "source": "https://github.com/andrewgodwin/takahe", "protocols": "ActivityPub", +<<<<<<< HEAD <<<<<<< HEAD "site": "https://jointakahe.org/takahesocial/", ======= "site": "https://jointakahe.org", >>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 +======= + "site": "https://jointakahe.org", +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 "logo": "/img/misc/takahe.svg", "servers": "", "description": "A very experimental Fediverse server for microblogging.", "codeLanguage": "Python", "techStack": "Django", "license": "BSD-3-clause", +<<<<<<< HEAD "FediAccount": "@takahe@jointakahe.org", +======= + "FediAccount": "@takahe@jointakahe.takahe.social", +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 "apClass": true, "zotClass": false, "diasporaClass": false, diff --git a/source/_data/miscellaneous.json.orig b/source/_data/miscellaneous.json.orig new file mode 100644 index 0000000..902172d --- /dev/null +++ b/source/_data/miscellaneous.json.orig @@ -0,0 +1,1757 @@ +{ + "apps": + [ + { + "title": "WriteFreely", + "source": "https://github.com/writefreely/writefreely", + "protocols": "ActivityPub", + "site": "https://writefreely.org", + "logo": "/img/misc/writefreely.svg", + "servers": "https://the-federation.info/writefreely", + "description": "Minimalist blog software providing focused writing and publishing experience. Easy on resources.", + "codeLanguage": "Go", + "techStack": "Node.js, LESS", + "license": "AGPL-3.0", + "FediAccount": "@writefreely@writing.exchange", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Blog-Pub"] + }, + { + "title": "Mobilizon", + "source": "https://framagit.org/framasoft/mobilizon", + "protocols": "ActivityPub", + "site": "https://joinmobilizon.org/en", + "logo": "/img/misc/mobilizon.svg", + "servers": "https://the-federation.info/mobilizon", + "description": "A network to gather, organize, and mobilize.", + "codeLanguage": "Elixir", + "techStack": "Vue, TypeScript", + "license": "AGPL-3.0", + "FediAccount": "@mobilizon@framapiaf.org", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Ev-Meet"] + }, + { + "title": "Plume", + "source": "https://git.joinplu.me/Plume/Plume", + "protocols": "ActivityPub", + "site": "https://joinplu.me", + "logo": "/img/misc/plume.svg", + "servers": "https://the-federation.info/plume", + "description": "Blogging application suitable for collaborative writing.", + "codeLanguage": "Rust", + "techStack": "Rocket, Diesel, Ructe templates, WASM, SCSS", + "license": "AGPL-3.0", + "FediAccount": "@PlumeDev@fediverse.blog", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Blog-Pub"] + }, + { + "title": "Lemmy", + "source": "https://codeberg.org/LemmyNet/lemmy", + "protocols": "ActivityPub", + "site": "https://join-lemmy.org", + "logo": "/img/misc/lemmy.svg", + "servers": "https://the-federation.info/lemmy", + "description": "Link aggregator, a federated alternative to Reddit / Lobste.rs / Raddle / Hacker News.", + "codeLanguage": "Rust", + "techStack": "Actix, Diesel, Inferno, TypeScript", + "license": "AGPL-3.0", + "FediAccount": "@LemmyDev@mastodon.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Forums", "Links"] + }, + { + "title": "microblog.pub", + "source": "https://git.sr.ht/~tsileo/microblog.pub", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "https://the-federation.info/microblogpub", + "description": "Self-hosted, single-user, ActivityPub powered microblog.", + "codeLanguage": "Python", + "techStack": "Flask, Tornado, SASS", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "Epicyon", + "source": "https://codeberg.org/bashrc/epicyon", + "protocols": "ActivityPub", + "site": "https://libreserver.org/epicyon", + "logo": "/img/misc/epicyon.png", + "servers": "https://epicyon.fediverse.observer/list", + "description": "ActivityPub server implementing S2S and C2S protocols, suitable for single board computers. Provides moderation tools, post expiry, content warnings, Calendar, Scheduled Posts, text search, federated blogging and image descriptions.", + "codeLanguage": "Python", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@bob@epicyon.libreserver.org", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi","Blog-Pub"] + }, + { + "title": "Lotide", + "source": "https://sr.ht/~vpzom/lotide", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "https://the-federation.info/lotide", + "description": "A federated forum / link aggregator.", + "codeLanguage": "Rust", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Links"] + }, + { + "title": "Socialhome", + "source": "https://gitlab.com/jaywink/socialhome", + "protocols": "diaspora, ActivityPub", + "site": "https://socialhome.network", + "logo": "/img/misc/socialhome.svg", + "servers": "https://the-federation.info/socialhome", + "description": "Personal webpage with social networking functionality. Column grid layout makes it a perfect network for sharing image content or creating personal portfolio.", + "codeLanguage": "Python", + "techStack": "Django, Vue", + "license": "AGPL-3.0", + "FediAccount": "@jaywink@jasonrobinson.me", + "apClass": true, + "zotClass": false, + "diasporaClass": true, + "OStatusClass": false, + "categories": ["SN-ma"] + }, + { + "title": "Bookwyrm", + "source": "https://github.com/mouse-reeve/bookwyrm", + "protocols": "ActivityPub", + "site": "https://joinbookwyrm.com", + "logo": "/img/misc/bookwyrm.png", + "servers": "https://the-federation.info/bookwyrm", + "description": "Social reading and reviewing, a federated alternative to GoodReads.", + "codeLanguage": "Python", + "techStack": "Django", + "license": "Anti-capitalist-1.4", + "FediAccount": "@bookwyrm@tech.lgbt", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Reviews"] + }, + { + "title": "Gancio", + "source": "https://framagit.org/les/gancio", + "protocols": "ActivityPub", + "site": "https://gancio.org", + "logo": "/img/misc/gancio.png", + "servers": "https://the-federation.info/gancio", + "description": "A shared agenda for local communities. Decentralized events.", + "codeLanguage": "JavaScript", + "techStack": "Vue, Node.js", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Ev-Meet"] + }, + { + "title": "Honk", + "source": "https://humungus.tedunangst.com/r/honk/f", + "protocols": "ActivityPub", + "site": "https://humungus.tedunangst.com/r/honk/f", + "logo": "", + "servers": "https://honk.fediverse.observer/list", + "description": "ActivityPub server with minimal setup and support costs.", + "codeLanguage": "Go", + "techStack": "", + "license": "ISC", + "FediAccount": "@tedu@honk.tedunangst.com", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "brutalinks", + "source": "https://github.com/mariusor/go-littr", + "protocols": "ActivityPub", + "site": "https://brutalinks.tech/~admin/", + "logo": "", + "servers": "https://the-federation.info/brutalinks", + "description": "Link aggregator inspired by Reddit.", + "codeLanguage": "Go", + "techStack": "", + "license": "MIT", + "FediAccount": "@mariusor@metalhead.club", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Links"] + }, + { + "title": "Smithereen", + "source": "https://github.com/grishka/Smithereen", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "https://the-federation.info/smithereen", + "description": "Federated, ActivityPub-compatible social network with friends, walls, and groups.", + "codeLanguage": "Java", + "techStack": "", + "license": "Unlicense (public domain)", + "FediAccount": "@grishka@mastodon.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-ma", "Ev-Meet"] + }, + { + "title": "Glitch-soc", + "source": "https://github.com/glitch-soc/mastodon", + "protocols": "ActivityPub", + "site": "https://glitch-soc.github.io/docs", + "logo": "", + "servers": "", + "description": "A friendly fork of Mastodon, with the aim of providing additional features at the risk of potentially less stable software.", + "codeLanguage": "Ruby", + "techStack": "React, SASS, Node.js", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "Hometown", + "source": "https://github.com/hometown-fork/hometown", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "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", + "license": "AGPL-3.0", + "FediAccount": "@darius@friend.camp", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "Ecko", + "source": "https://github.com/magicstone-dev/ecko", + "protocols": "ActivityPub", + "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", + "license": "AGPL-3.0", + "FediAccount": "@weex@c4.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "Acropolis", + "source": "https://github.com/magicstone-dev/acropolis", + "protocols": "diaspora", + "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.", + "codeLanguage": "Ruby", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@weex@c4.social", + "apClass": false, + "zotClass": false, + "diasporaClass": true, + "OStatusClass": false, + "categories": ["SN-ma"] + }, + { + "title": "Owncast", + "source": "https://github.com/owncast/owncast", + "protocols": "ActivityPub", + "site": "https://owncast.online", + "logo": "/img/misc/owncast.svg", + "servers": "https://the-federation.info/owncast", + "description": "Owncast is a self-hosted live video and web chat server for use with existing popular broadcasting software.", + "codeLanguage": "Go", + "techStack": "", + "license": "MIT", + "FediAccount": "@gabek@mastodon.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Media"] + }, + { + "title": "Ktistec", + "source": "https://github.com/toddsundsted/ktistec", + "protocols": "ActivityPub", + "site": "https://epiktistes.com/", + "logo": "/img/misc/ktistec.png", + "servers": "https://the-federation.info/ktistec", + "description": "An ActivityPub server with minimal dependencies, optimized for single-user application.", + "codeLanguage": "Crystal", + "techStack": "", +<<<<<<< HEAD +<<<<<<< HEAD + "license": "GNU Affero General Public License", +======= + "license": "AGPL-3.0", +>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 +======= + "license": "AGPL-3.0", +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 + "FediAccount": "@toddsundsted@mastodon.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { +<<<<<<< HEAD +<<<<<<< HEAD + "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", +======= + "title": "pubgate", + "source": "https://github.com/autogestion/pubgate", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "https://the-federation.info/pubgate", + "description": "Lightweight ActivityPub CMS. Implements both client-to-server (C2S) and server-to-server(S2S) APIs. Compatible with Mastodon, Pixelfed, Pleroma and microblog.pub.", + "codeLanguage": "Python", + "techStack": "", + "license": "BSD-3-clause", + "FediAccount": "", +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, +<<<<<<< HEAD + "categories": ["OpenData", "SN-mi"] + }, +======= +>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 +======= + "categories": ["SN-mi"] + }, +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 + { + "title": "castling.club", + "source": "https://github.com/stephank/castling.club", + "protocols": "ActivityPub", + "site": "https://castling.club", + "logo": "", + "servers": "https://fedidb.org/software/castling.club", + "description": "Challenge someone to a game of chess using toots! An ActivityPub server with a single hardcoded King service actor that acts as a chess arbiter.", + "codeLanguage": "TypeScript", + "techStack": "Node.js", + "license": "MIT", + "FediAccount": "@kosinus@mastodon.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Games"] + }, + { + "title": "Guppe", + "source": "https://github.com/wmurphyrd/guppe", + "protocols": "ActivityPub", + "site": "https://a.gup.pe", + "logo": "/img/misc/guppe.png", + "servers": "", + "description": "Social groups for Mastodon and other ActivityPub networks.", + "codeLanguage": "JavaScript", + "techStack": "Node.js, Express, Vue", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Extension"] + }, + { + "title": "Group Actor", + "source": "https://git.ondrovo.com/MightyPork/group-actor", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "https://piggo.space/hob", + "description": "Groups work with any software that implements Mastodon client API. Has moderation, admin announcements.", + "codeLanguage": "Rust", + "techStack": "", + "license": "MIT", + "FediAccount": "@piggo@piggo.space", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Extension"] + }, + { + "title": "Nextcloud-Social", + "source": "https://github.com/nextcloud/social", + "protocols": "ActivityPub", + "site": "https://apps.nextcloud.com/apps/social", + "logo": "/img/misc/nextcloud.png", + "servers": "", + "description": "Social networking app for NextCloud users.", + "codeLanguage": "PHP", + "techStack": "Node.js, Vue, SCSS", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Files", "SN-mi"] + }, + { + "title": "Read.as", + "source": "https://github.com/writeas/Read.as", + "protocols": "ActivityPub", + "site": "https://read.as", + "logo": "/img/misc/readas.svg", + "servers": "https://the-federation.info/read.as", + "description": "Long-form reader. It helps you gather and curate things to read in a peaceful space.", + "codeLanguage": "Go", + "techStack": "Node.js", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Blog-Pub"] + }, + { + "title": "dokieli", + "source": "https://github.com/linkeddata/dokieli", + "protocols": "ActivityPub", + "site": "https://dokie.li", + "logo": "/img/misc/dokieli.png", + "servers": "", + "description": "In-browser article authoring and formatting, RDFa annotations, and social interactions tool.", + "codeLanguage": "JavaScript", + "techStack": "Node.js", + "license": "Apache-2.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Blog-Pub"] + }, + { + "title": "GoBlog", + "source": "https://git.jlel.se/jlelse/GoBlog", + "protocols": "ActivityPub", + "site": "https://goblog.app", + "logo": "", + "servers": "", + "description": "Simple blogging system written in Go.", + "codeLanguage": "Go", + "techStack": "", + "license": "MIT", + "FediAccount": "@jle@fosstodon.org", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Blog-Pub"] + }, + { + "title": "OCamlot", + "source": "https://github.com/gopiandcode/ocamlot", + "protocols": "ActivityPub", + "site": "ocamlot.xyz", + "logo": "", + "servers": "ocamlot.xyz", + "description": "An ActivityPub-speaking server in OCaml (Pleroma and Mastodon compatible).", + "codeLanguage": "OCaml", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@gopiandcode@ocamlot.xyz", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "Gath.io", + "source": "https://github.com/lowercasename/gathio", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "Self-destructing, shareable, no-registration event pages.", + "codeLanguage": "JavaScript", + "techStack": "", + "license": "GPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Ev-Meet"] + }, + { + "title": "The Occasion Octopus", + "source": "https://github.com/theoccasionoctopus/theoccasionoctopus-server", + "protocols": "ActivityPub", + "site": "https://www.theoccasionoctopus.net", + "logo": "", + "servers": "", + "description": "A federated network of Open Data for discovering interesting events.", + "codeLanguage": "PHP", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@theoccasionoctopus@fosstodon.org", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Ev-Meet"] + }, + { +<<<<<<< HEAD +======= + "title": "Rustodon", + "source": "https://github.com/rustodon/rustodon", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "Mastodon-compatible social microblogging server.", + "codeLanguage": "Rust", + "techStack": "Diesel, SASS", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 + "title": "Aardwolf", + "source": "https://github.com/Aardwolf-Social/aardwolf", + "protocols": "ActivityPub", + "site": "", + "logo": "/img/misc/aardwolf.png", + "servers": "", + "description": "Facebook-like social network connecting communities across the web.", + "codeLanguage": "Rust", + "techStack": "Rocket, Bulma CSS", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-ma"] + }, + { + "title": "Smilodon", + "source": "https://source.puri.sm/liberty/smilodon", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "A complementary fork of Mastodon, focusing on opt-in public spaces.", + "codeLanguage": "Ruby", + "techStack": "React, SASS, Node.js", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "microstatus", + "source": "https://github.com/Arkanosis/microstatus", + "protocols": "ActivityPub, OStatus", + "site": "https://microstatus.org/", + "logo": "", + "servers": "", + "description": "Lightweight Mastodon and GNU social-compatible server implementation.", + "codeLanguage": "Rust", + "techStack": "", + "license": "ISC", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": true, + "categories": ["SN-mi"] + }, + { + "title": "Tavern", + "source": "https://gitlab.com/ngerakines/tavern", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "https://the-federation.info/tavern", + "description": "A minimalistic Activity Pub server. Think Mastodon, but smaller and with fewer features.", + "codeLanguage": "Go", + "techStack": "", + "license": "MIT", + "FediAccount": "@ngerakines@mastodon.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "SkoHub", + "source": "https://github.com/hbz/skohub-pubsub", + "protocols": "ActivityPub", + "site": "https://skohub.io", + "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", + "techStack": "", + "license": "Apache-2.0", + "FediAccount": "@skohub@openbiblio.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["OpenData"] + }, + { + "title": "CPub", + "source": "https://codeberg.org/openEngiadina/cpub", + "protocols": "ActivityPub", + "site": "https://openengiadina.codeberg.page/cpub/cpub.html", + "logo": "", + "servers": "", + "description": "General ActivityPub server built upon Semantic Web ideas. Implements a Linked Data Platform (LDP), uses RDF Turtle as serialization format.", + "codeLanguage": "Elixir", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["OpenData"] + }, + { + "title": "SemApps", + "source": "https://github.com/assemblee-virtuelle/semapps", + "protocols": "ActivityPub", + "site": "http://semapps.org", + "logo": "", + "servers": "", + "description": "A collaborative, generic knowledge management system. Aims to ease data storage and filtering.", + "codeLanguage": "JavaScript", + "techStack": "", + "license": "Apache-2.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["OpenData"] + }, + { + "title": "LubarGW2", + "source": "https://git.lubar.me/ben/guild-website", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "https://the-federation.info/lubargw2", + "description": "Federating guild website using GuildWars2 API.", + "codeLanguage": "Go", + "techStack": "", + "license": "-", + "FediAccount": "@ben@mastodon.lubar.me", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Games"] + }, + { + "title": "Learn Awesome", + "source": "https://github.com/learn-awesome/learn", + "protocols": "ActivityPub", + "site": "https://learnawesome.org", + "logo": "", + "servers": "", + "description": "Open-source equivalent review aggregation site. Think GoodReads, but generalized to all learning resources organized by topics, formats and difficulty. Optimal learning paths for any topic.", + "codeLanguage": "Ruby", + "techStack": "Rails, PostgreSQL, Bootstrap, Stream Dashboard UI Kit", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Reviews"] + }, + { + "title": "Bonfire", + "source": "https://github.com/bonfire-networks", + "protocols": "ActivityPub", + "site": "https://bonfirenetworks.org", + "logo": "/img/misc/bonfire.png", + "servers": "", + "description": "Your plug & play federated social network. Based on CommonsPub, runs on RaspberryPi devices. Still in beta.", + "codeLanguage": "Elixir", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@bonfire@indieweb.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi", "SN-ma"] + }, + { + "title": "Immers Space", + "source": "https://github.com/immers-space/immers", + "protocols": "ActivityPub", + "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", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "immersspace@gup.pe", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Other"] + }, + { + "title": "Lumen-AP-server", + "source": "https://notabug.org/tinyrabbit/lumen-ap-server", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "ActivityPub server using Lumen framework.", + "codeLanguage": "PHP", + "techStack": "Lumen", + "license": "MIT", + "FediAccount": "@tinyrabbit@floss.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "Spritely", + "source": "https://gitlab.com/spritely", + "protocols": "ActivityPub", + "site": "https://spritely.institute", + "logo": "", + "servers": "", + "description": "A distributed social network by ActivityPub specification co-author Christopher Lemmer Webber.", + "codeLanguage": "Racket", + "techStack": "", + "license": "Apache-2", + "FediAccount": "@spritelyproject@octodon.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-ma"] + }, + { + "title": "ForgeFriends", + "source": "https://lab.forgefriends.org/forgefriends/forgefriends", + "protocols": "ActivityPub", + "site": "https://forgefriends.org", + "logo": "/img/misc/forgefriends.svg", + "servers": "", + "description": "An online service to federate forges.", + "codeLanguage": "Go", + "techStack": "", + "license": "MIT", + "FediAccount": "forgefriends@mastodon.online", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Develop"] + }, + { + "title": "Kitsune", + "source": "https://github.com/kitsune-soc/kitsune", + "protocols": "ActivityPub", + "site": "https://joinkitsune.org", + "logo": "", + "servers": "", + "description": "Microblogging server using ActivityPub protocol to connect to a global interconnected network. Federates with Mastodon, Misskey, Akkoma, etc.", + "codeLanguage": "Rust", + "techStack": "", + "license": "MIT", + "FediAccount": "@0x0@corteximplant.com", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "Mastotool", + "source": "https://github.com/muesli/mastotool", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "A collection of tools to work with your Mastodon account; displays account statistics and lets you search your toots.", + "codeLanguage": "Go", + "techStack": "", + "license": "MIT", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Extension"] + }, + { + "title": "GoToSocial", + "source": "https://github.com/superseriousbusiness/gotosocial", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "A headless Mastodon-compatible Fediverse server project, written in Golang.", + "codeLanguage": "Go", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@gotosocial@gts.superseriousbusiness.org", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "CastoPod Host", + "source": "https://code.podlibre.org/podlibre/castopod", + "protocols": "ActivityPub", + "site": "https://podlibre.org/tag/castopod-host", + "logo": "/img/misc/castopod.svg", + "servers": "", + "description": "An open-source hosting platform made for podcasters who want to engage and interact with their audience.", + "codeLanguage": "PHP", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@castopod@podlibre.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Media"] + }, + { + "title": "Corteza", + "source": "https://github.com/cortezaproject/corteza-server", + "protocols": "ActivityPub", + "site": "https://cortezaproject.org", + "logo": "", + "servers": "", + "description": "Digital Work Platform for Humanity. An open-source, low-code federated platform for building cloud-based business apps with CRM capabilities.", + "codeLanguage": "Go", + "techStack": "", + "license": "Apache-2.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Other"] + }, + { + "title": "FChannel", + "source": "https://github.com/FChannel0/FChannel-Server", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "https://fchannel.fediverse.observer/list", + "description": "A libre, self-hostable, federated, imageboard platform that utilizes ActivityPub.", + "codeLanguage": "Go", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Forums", "Media"] + }, + { + "title": "Catcast D", + "source": "https://github.com/mrcatman/catcast-d", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "A federated video live streaming platform.", + "codeLanguage": "TypeScript", + "techStack": "", + "license": "-", + "FediAccount": "@mrcatmann@mastodon.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Media"] + }, + { + "title": "Lectrn", + "source": "https://github.com/lectrn/lectrn", + "protocols": "ActivityPub", + "site": "https://lectrn.com", + "logo": "", + "servers": "", + "description": "A social network for humans that is free, decentralized, open, and easy to use.", + "codeLanguage": "JavaScript", + "techStack": "Node.js, PostgreSQL", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "FitTrackee", + "source": "https://github.com/SamR1/FitTrackee", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "A simple self-hosted workout / activity tracker.", + "codeLanguage": "Python", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@SamR1@mastodon.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Other"] + }, + { + "title": "hvxahv", + "source": "https://github.com/disism/hvxahv", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "A multifunctional decentralized social network implementation based on ActivityPub, ipfs and Matrix protocols.", + "codeLanguage": "Go", + "techStack": "", + "license": "MIT", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-ma"] + }, + { + "title": "Ocelot Social", + "source": "https://github.com/Ocelot-Social-Community/Ocelot-Social", + "protocols": "ActivityPub", + "site": "https://ocelot.social/", + "logo": "/img/misc/ocelot.svg", + "servers": "", + "description": "Social, action and knowledge network for active citizenship.", + "codeLanguage": "JavaScript", + "techStack": "Node.js, Vue, Nuxt", + "license": "MIT", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-ma"] + }, + { + "title": "Mastodon Group Bot", + "source": "https://github.com/drequivalent/mastodon-bot-autoresponder", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "A bot that implements group functionality in Mastodon.", + "codeLanguage": "Python", + "techStack": "", + "license": "MIT", + "FediAccount": "@drq@mastodon.ml", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Extension"] + }, + { + "title": "bopwiki", + "source": "https://codeberg.org/Valenoern/bopwiki", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "A simple 'microwiki' implementation, fairly similar to a Zettelkasten system.", + "codeLanguage": "Lisp", + "techStack": "", + "license": "GPL-3.0", + "FediAccount": "@Valenoern@floss.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Other"] + }, + { + "title": "Inventaire", + "source": "https://github.com/inventaire/inventaire", + "protocols": "ActivityPub", + "site": "https://inventaire.io/welcome", + "logo": "", + "servers": "", + "description": "A free open platform for cataloguing and sharing physical books from personal collections and independent libraries.", + "codeLanguage": "JavaScript", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@inventaire@mamot.fr", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Reviews","Other"] + }, + { + "title": "Wolfgame", + "source": "https://gitlab.com/stemid/wolfgame", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "Wolfgame is a lot like Mafia. Once started the game simulates day/night cycle and allows players to vote for who might be a werewolf during the day.", + "codeLanguage": "Python", + "techStack": "", + "license": "MIT", + "FediAccount": "@stemid@mastodon.se", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Games"] + }, + { + "title": "Librecast LIVE", + "source": "https://github.com/librestack/librecast-live", + "protocols": "ActivityPub", + "site": "https://librecast.net/live.html", + "logo": "", + "servers": "", + "description": "Live streaming video platform with multicast.", + "codeLanguage": "JavaScript", + "techStack": "", + "license": "GPL-2.0 / GPL-3.0", + "FediAccount": "@onepict@chaos.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Media"] + }, + { + "title": "Minipub", + "source": "https://github.com/skymethod/minipub", + "protocols": "ActivityPub", + "site": "https://minipub.dev", + "logo": "/img/misc/minipub.svg", + "servers": "", + "description": "Minimal ActivityPub server for posting federated podcast comments.", + "codeLanguage": "TypeScript", + "techStack": "", + "license": "MIT", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Media"] + }, + { + "title": "Swanye", + "source": "https://codeberg.org/WammKD/Swanye", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "A tumblelog in the style of Tumblr.", + "codeLanguage": "Elixir", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@Swanye@fosstodon.org", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "Yuforium", + "source": "https://github.com/yuforium", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "A community platform that focuses on federated communities so they are no longer constrained to a single entity.", + "codeLanguage": "TypeScript", + "techStack": "", + "license": "GPL-3.0", + "FediAccount": "@cpmoser@mastodon.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Forums"] + }, + { + "title": "FediPlan", + "source": "https://framagit.org/tom79/fediplan", + "protocols": "ActivityPub", + "site": "https://fedilab.app/page/fediplan/", + "logo": "", + "servers": "", + "description": "A way to safely schedule messages with Mastodon and Pleroma.", + "codeLanguage": "PHP", + "techStack": "", + "license": "GPL-3.0", + "FediAccount": "@apps@toot.fedilab.app", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Extension"] + }, + { + "title": "ForgeFlux", + "source": "https://github.com/forgeflux-org/interface", + "protocols": "ActivityPub", + "site": "https://forgeflux.org/", + "logo": "", + "servers": "", + "description": "Forge federation will implement ForgeFed external, using the forge's HTTP APIs. Federation for Gitea, SourceHut, GitLab and GitHub will be implemented", + "codeLanguage": "Python", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@forgeflux@gts.batsense.net", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Develop"] + }, + { + "title": "Vervis", + "source": "https://vervis.peers.community/repos/WvWbo/source", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "Decentralized project hosting and management platform. Reference implementation for ForgeFed protocol extension.", + "codeLanguage": "Haskell", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@fr33domlover@todon.nl", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Develop"] + }, + { + "title": "FoundKey", + "source": "https://akkoma.dev/FoundKeyGang/FoundKey", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "https://the-federation.info/foundkey", + "description": "A fork of Misskey with various bug fixes and improvements.", + "codeLanguage": "TypeScript", + "techStack": "Node.js, Vue", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "Firefish", +<<<<<<< HEAD +<<<<<<< HEAD + "source": "https://gitlab.prometheus.systems/firefish/firefish", + "protocols": "ActivityPub", + "site": "https://firefish.social/", +======= + "source": "https://git.joinfirefish.org/firefish/firefish", + "protocols": "ActivityPub", + "site": "https://joinfirefish.org", +>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 + "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", +======= + "source": "https://git.joinfirefish.org/firefish/firefish", + "protocols": "ActivityPub", + "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. A fork of Misskey, formerly known as Calckey.", +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 + "codeLanguage": "TypeScript", + "techStack": "Node.js, Vue", + "license": "AGPL-3.0", + "FediAccount": "@firefish@fedi.software", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "Meiskey", + "source": "https://github.com/mei23/misskey", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "An actively developed fork of Misskey v11.", + "codeLanguage": "TypeScript", + "techStack": "Node.js, Vue", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "Kbin", + "source": "https://codeberg.org/Kbin/kbin-core", + "protocols": "ActivityPub", + "site": "https://kbin.pub", + "logo": "/img/misc/kbin.png", + "servers": "https://the-federation.info/kbin", + "description": "Link aggregator and microblogging platform for the fediverse.", + "codeLanguage": "PHP", + "techStack": "Symfony, Stimulus", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Forums", "Links", "SN-mi"] + }, + { + "title": "Takahe", + "source": "https://github.com/andrewgodwin/takahe", + "protocols": "ActivityPub", +<<<<<<< HEAD +<<<<<<< HEAD + "site": "https://jointakahe.org/takahesocial/", +======= + "site": "https://jointakahe.org", +>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 +======= + "site": "https://jointakahe.org", +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 + "logo": "/img/misc/takahe.svg", + "servers": "", + "description": "A very experimental Fediverse server for microblogging.", + "codeLanguage": "Python", + "techStack": "Django", + "license": "BSD-3-clause", +<<<<<<< HEAD + "FediAccount": "@takahe@jointakahe.org", +======= + "FediAccount": "@takahe@jointakahe.takahe.social", +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "apevents", + "source": "https://github.com/ngerakines/apevents", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "Event management system that allows event creation and coordination across Fediverse.", + "codeLanguage": "Rust", + "techStack": "", + "license": "MIT", + "FediAccount": "@nick@thegem.city", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Extension", "Ev-Meet"] + }, + { + "title": "AP-Groups", + "source": "https://github.com/michaelcpuckett/ap-groups", + "protocols": "ActivityPub", + "site": "https://chirp.social", + "logo": "", + "servers": "", + "description": "Group actors as bot / relay.", + "codeLanguage": "TypeScript", + "techStack": "", + "license": "MIT", + "FediAccount": "@mpuckett@a11y.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Extension"] + }, + { + "title": "snac", + "source": "https://codeberg.org/grunfink/snac2", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "Simple, minimalistic ActivityPub instance with minimal dependencies, multiuser, no database nor cookies needed, totally JavaScript-free.", + "codeLanguage": "C", + "techStack": "", + "license": "MIT", + "FediAccount": "comam.es/snac/grunfink", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "Akkoma", + "source": "https://akkoma.dev/AkkomaGang/akkoma", + "protocols": "ActivityPub", + "site": "https://akkoma.social", + "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": "", + "license": "AGPL-3.0", + "FediAccount": "ihatebeinga.live/users/akkoma", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "Streams", + "source": "https://codeberg.org/streams/streams", + "protocols": "Zot, ActivityPub", + "site": "", + "logo": "", + "servers": "-", + "description": "Public domain federated communications server. Provides a feature rich ActivityPub and Nomad communication node.", + "codeLanguage": "PHP", + "techStack": "", + "license": "Public domain and others", + "FediAccount": "@mike@macgirvin.com", + "apClass": true, + "zotClass": true, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-ma", "Files"] + }, + { + "title": "Fedigroup", + "source": "https://github.com/guysoft/fedigroup", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "Federated Group server with the ability to search back in messages, early Alpha stage", + "codeLanguage": "Python", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@fedigroup@fedigroup.party", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Extension"] + }, + { + "title": "diaspora*", + "source": "https://github.com/diaspora/diaspora", + "protocols": "diaspora", + "site": "https://diasporafoundation.org", + "logo": "/img/misc/diaspora.svg", + "servers": "https://the-federation.info/diaspora", + "description": "Online world where you are in control. Has 'aspects' similar to Google+ 'circles', and all the basic features of a macroblogging network.", + "codeLanguage": "Ruby", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": false, + "zotClass": false, + "diasporaClass": true, + "OStatusClass": false, + "categories": ["SN-ma"] + }, + { + "title": "Friendica", + "source": "https://github.com/friendica/friendica", + "protocols": "diaspora, ActivityPub, OStatus", + "site": "https://friendi.ca", + "logo": "/img/misc/friendica.svg", + "servers": "https://the-federation.info/friendica", + "description": "Personal network that helps to keep in contact with friends. Interface and functionality include common features of a mainstream social network.", + "codeLanguage": "PHP", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": true, + "OStatusClass": true, + "categories": ["SN-ma", "Ev-Meet"] + }, + { + "title": "Funkwhale", + "source": "https://dev.funkwhale.audio/funkwhale/funkwhale", + "protocols": "ActivityPub", + "site": "https://funkwhale.audio", + "logo": "/img/misc/funkwhale.svg", + "servers": "https://the-federation.info/funkwhale", + "description": "Community-driven audio server and player that lets you listen and share music within a decentralized, open network. A place for socializing around music and discovering new content.", + "codeLanguage": "Python", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@agateblue@mastodon.technology", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Media"] + }, + { + "title": "GNU Social", + "source": "https://notabug.org/diogo/gnu-social", + "protocols": "ActivityPub, OStatus", + "site": "https://gnusocial.network", + "logo": "/img/misc/gnusocial.svg", + "servers": "https://the-federation.info/gnusocial", + "description": "Microblogging server with multiple plugins.", + "codeLanguage": "PHP", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@diogo@social.hackersatporto.com", + "apClass": false, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": true, + "categories": ["SN-mi"] + }, + { + "title": "Hubzilla", + "source": "https://framagit.org/hubzilla/core", + "protocols": "Zot, diaspora, ActivityPub", + "site": "https://hubzilla.org", + "logo": "/img/misc/hubzilla.svg", + "servers": "https://the-federation.info/hubzilla", + "description": "Multi-purpose network for power users. Includes a significant number of features and granular settings.", + "codeLanguage": "PHP", + "techStack": "", + "license": "MIT", + "FediAccount": "", + "apClass": true, + "zotClass": true, + "diasporaClass": true, + "OStatusClass": true, + "categories": ["SN-ma", "Files", "Ev-Meet"] + }, + { + "title": "Misskey", + "source": "https://github.com/misskey-dev/misskey", + "protocols": "ActivityPub", + "site": "https://join.misskey.page/en", + "logo": "/img/misc/misskey.png", + "servers": "https://the-federation.info/misskey", + "description": "Sophisticated microblogging with personality. Provides many additional features like calendar, emoji reactions, polls, games, and many other widgets.", + "codeLanguage": "TypeScript", + "techStack": "Node.js, Vue", + "license": "AGPL-3.0", + "FediAccount": "@syuilo@misskey.io", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "PeerTube", + "source": "https://github.com/Chocobozzz/PeerTube", + "protocols": "ActivityPub", + "site": "https://joinpeertube.org/en", + "logo": "/img/misc/peertube.svg", + "servers": "https://the-federation.info/peertube", + "description": "Decentralized video platform, a network of interconnected video hosting providers. Video broadcasting may be peer-to-peer.", + "codeLanguage": "TypeScript", + "techStack": "Node.js", + "license": "AGPL-3.0", + "FediAccount": "@peertube@framapiaf.org", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Media"] + }, + { + "title": "Pixelfed", + "source": "https://github.com/dansup/pixelfed", + "protocols": "ActivityPub", + "site": "https://pixelfed.org", + "logo": "/img/misc/pixelfed.svg", + "servers": "https://the-federation.info/pixelfed", + "description": "An image sharing platform with modern user interface.", + "codeLanguage": "PHP", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@pixelfed@mastodon.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Media"] + }, + { + "title": "Pleroma", + "source": "https://git.pleroma.social/pleroma", + "protocols": "ActivityPub", + "site": "https://pleroma.social", + "logo": "/img/misc/pleroma.svg", + "servers": "https://the-federation.info/pleroma", + "description": "Microblogging platform with excellent performance and low resource consumption. Has many features: polls, custom themes, markdown support.", + "codeLanguage": "Elixir", + "techStack": "Vue", + "license": "AGPL-3.0", + "FediAccount": "@lain@pleroma.soykaf.com", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "Mastodon", + "source": "https://github.com/mastodon/mastodon", + "protocols": "ActivityPub", + "site": "https://joinmastodon.org", + "logo": "/img/misc/mastodon.svg", + "servers": "https://the-federation.info/mastodon", + "description": "Epic microblogging network with many features and multiple interface layouts to choose from.", + "codeLanguage": "Ruby", + "techStack": "React, SASS, Node.js", + "license": "AGPL-3.0", + "FediAccount": "@gargron@mastodon.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "Decodon", + "source": "https://github.com/jesseplusplus/decodon", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "A fork of Mastodon focusing on followers-only posting of media. Configurable circles to post to.", + "codeLanguage": "Ruby", + "techStack": "React, SASS, Node.js", + "license": "AGPL-3.0", + "FediAccount": "@jesseplusplus@mastodon.social", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "Emissary", + "source": "https://github.com/EmissarySocial/emissary", + "protocols": "ActivityPub", + "site": "https://emissary.social/", + "logo": "", + "servers": "", + "description": "A customizable, private space in the Fediverse where people can create, share, and collaborate.", + "codeLanguage": "Go", + "techStack": "MongoDB, HTMX, Hyperscript", + "license": "AGPL-3.0", + "FediAccount": "https://mastodon.social/@benpate", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-mi"] + }, + { + "title": "Pinnetta", + "source": "https://codeberg.org/pinetta/proto-pinetta", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "description": "A FOSS, federated, ActivityPub-enabled pinboard thingy, in the style of Pinterest", + "codeLanguage": "Python", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@Pinetta@Fedi.Software", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Forums","Other"] + }, + { + "title": "Yarn", + "source": "https://git.mills.io/yarnsocial/yarn", + "protocols": "ActivityPub", + "site": "https://yarn.social/", + "logo": "", + "servers": "", + "description": "Yarn.social is a decentralised self-hosted social media based on the Twtxt format (with Extensions) that has a privacy-first focus", + "codeLanguage": "Go", + "techStack": "", + "license": "AGPL-3.0", + "FediAccount": "@prologic@twtxt.net", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Forums","Other"] + }, + { + "title": "Transit FediAlerts", + "source": "https://github.com/kona314/transit-fedilerts", + "protocols": "ActivityPub", + "site": "https://transit.alerts.social/", + "logo": "", + "servers": "", + "description": "ActivityPub-compliant (Mastodon-compatible) transit alerts generated from GTFS-realtime Service Alerts", + "codeLanguage": "Typescript", + "techStack": "", + "license": "", + "FediAccount": "@prologic@twtxt.net", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Other"] + }, + { + "title": "Vocata", + "source": "https://codeberg.org/Vocata/vocata", + "protocols": "ActivityPub", + "site": "https://docs.vocata.one/", + "logo": "/img/misc/vocata.png", + "servers": "", + "description": "Vocabulary-Agnostic Transport Agent", + "codeLanguage": "Python", + "techStack": "", + "license": "LGPL-3.0", + "FediAccount": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["Other","Extension"] + } + ] +} diff --git a/source/_data/misskey.json b/source/_data/misskey.json index 61e0010..38ae7ae 100644 --- a/source/_data/misskey.json +++ b/source/_data/misskey.json @@ -20,16 +20,22 @@ {"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", "devTutorial": "https://misskey-hub.net/en/docs/install.html", "forks": [ +<<<<<<< HEAD {"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://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"} +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 ], "mascot": [{"item": "藍 (Ai)", "imgNum": "1"}], "dwellers": "Miskist", diff --git a/source/_data/misskey.json.orig b/source/_data/misskey.json.orig new file mode 100644 index 0000000..38ae7ae --- /dev/null +++ b/source/_data/misskey.json.orig @@ -0,0 +1,70 @@ +{ + "data": + { + "title": "misskey", + "category": "social network", + "type": "microblogging", + "logoClr": "9fd608", + "created": "2014", + "official": "https://misskey-hub.net/en", + "license": "AGPL-3.0", + "repo": "https://github.com/misskey-dev/misskey", + "language": "TypeScript", + "protocols": + [ + {"title": "ActivityPub", "url": "https://activitypub.rocks"} + ], + "wiki": "https://misskey-hub.net/en/docs/misskey.html", + "servers": + [ + {"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/software/misskey"}, + {"num": "5", "url": "https://misskey.fediverse.observer/list"} + ], + "mobile": "https://misskey-hub.net/en/docs/faq.html", + "devTutorial": "https://misskey-hub.net/en/docs/install.html", + "forks": + [ +<<<<<<< HEAD + {"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://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"} +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 + ], + "mascot": [{"item": "藍 (Ai)", "imgNum": "1"}], + "dwellers": "Miskist", + "communities": "", + "descr": "Apart from the mainstream microblogging experience, this network provides many additional features like a calendar, emoji reactions, rich chatting, antennas, animated text posts, and more. The web client can be customized by choosing from various available widgets. Original interface language is Japanese, but translations for many other languages such as English, German, Korean and more are available.", + "connections": ["Friendica", "Hubzilla", "microblog.pub", "Mastodon", "PeerTube", "Pixelfed", "Pleroma", "Plume", "WriteFreely"], + "screenshots": + [ + {"descr": "Misskey interface", "img": "misskey-1.jpg"}, + {"descr": "Dark theme", "img": "misskey-2.jpg"} + ], + "features": + [ + "polls", + "emoji reactions", + "lists", + "calendar", + "trends", + "recommended users", + "tips for newcomers", + "server information", + "animated markdown", + "rich chatting" + ], + "donate": "https://www.patreon.com/syuilo", + "tracker": "https://github.com/syuilo/misskey/issues", + "bounty": "", + "translating": "https://crowdin.com/project/misskey", + "reading": "", + "notable": "" + } +} 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/_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", diff --git a/source/_data/tools.json b/source/_data/tools.json index 2f23ec7..2011f9a 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 75ee216..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,9 +48,9 @@ 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)* -* [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,13 +74,12 @@ 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)* * [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) @@ -107,20 +106,16 @@ 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)* +* [vancity.social](https://vancity.social) - Vancouver *(Firefish)* #### Czech Republic * [witter.cz](https://witter.cz) - Czech Republic *(Mastodon)* #### 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 @@ -151,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)* @@ -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) @@ -230,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)* @@ -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,7 +374,8 @@ 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)* diff --git a/source/img/misc/akkoma.svg b/source/img/misc/akkoma.svg index 886ec90..3240e7d 100644 --- a/source/img/misc/akkoma.svg +++ b/source/img/misc/akkoma.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD @@ -36,3 +37,6 @@ ======= >>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 +======= + +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 diff --git a/source/img/misc/akkoma.svg.orig b/source/img/misc/akkoma.svg.orig new file mode 100644 index 0000000..3240e7d --- /dev/null +++ b/source/img/misc/akkoma.svg.orig @@ -0,0 +1,42 @@ +<<<<<<< HEAD +<<<<<<< HEAD + + + + + + + + + + + + + + + + + + +======= + +>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 +======= + +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 diff --git a/source/img/misc/firefish.svg b/source/img/misc/firefish.svg index 69d5837..2db0e05 100644 --- a/source/img/misc/firefish.svg +++ b/source/img/misc/firefish.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD @@ -35,3 +36,6 @@ ======= >>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 +======= + +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 diff --git a/source/img/misc/firefish.svg.orig b/source/img/misc/firefish.svg.orig new file mode 100644 index 0000000..2db0e05 --- /dev/null +++ b/source/img/misc/firefish.svg.orig @@ -0,0 +1,41 @@ +<<<<<<< HEAD +<<<<<<< HEAD + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +======= + +>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 +======= + +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 diff --git a/source/img/misc/immers_BACKUP_282.png b/source/img/misc/immers_BACKUP_282.png new file mode 100644 index 0000000..c151692 Binary files /dev/null and b/source/img/misc/immers_BACKUP_282.png differ diff --git a/source/img/misc/immers_BASE_282.png b/source/img/misc/immers_BASE_282.png new file mode 100644 index 0000000..e69de29 diff --git a/source/img/misc/immers_LOCAL_282.png b/source/img/misc/immers_LOCAL_282.png new file mode 100644 index 0000000..c151692 Binary files /dev/null and b/source/img/misc/immers_LOCAL_282.png differ diff --git a/source/img/misc/immers_REMOTE_282.png b/source/img/misc/immers_REMOTE_282.png new file mode 100644 index 0000000..5f7a322 Binary files /dev/null and b/source/img/misc/immers_REMOTE_282.png differ diff --git a/source/img/misc/skohub.svg b/source/img/misc/skohub.svg index 2e20518..45b1911 100644 --- a/source/img/misc/skohub.svg +++ b/source/img/misc/skohub.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 +======= + +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 diff --git a/source/img/misc/takahe.svg b/source/img/misc/takahe.svg index c3728d4..a021bc2 100644 --- a/source/img/misc/takahe.svg +++ b/source/img/misc/takahe.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD @@ -130,3 +131,6 @@ ======= >>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30 +======= + +>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078 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/_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:

<%- __('mobapps') %>
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') %>

- -
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):