diff --git a/source/_data/hubzilla.json b/source/_data/hubzilla.json index 7507ee4..e7cfa7b 100644 --- a/source/_data/hubzilla.json +++ b/source/_data/hubzilla.json @@ -64,7 +64,6 @@ "By default Hubzilla account federates only within Hubzilla network. You need to turn on ActivityPub and diaspora plugins in profile settings in order to connect with your friends from other networks", "Sharing files is possible only between Hubzilla users, friends from other networks will not have access to shared files" ], - "donate": "https://salt.bountysource.com/teams/hubzilla", "tracker": "https://framagit.org/hubzilla/core/issues", "bounty": "https://salt.bountysource.com/teams/hubzilla", "translating": "https://www.transifex.com/Friendica/hubzilla", diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json index e755cb2..4b51881 100644 --- a/source/_data/mastodon.json +++ b/source/_data/mastodon.json @@ -29,9 +29,8 @@ [ {"id": "0", "url": "https://pinafore.social"}, {"id": "1", "url": "https://notabug.org/halcyon-suite/halcyon"}, - {"id": "2", "url": "https://twitodon.com"}, - {"id": "3", "url": "https://communitywiki.org/trunk"}, - {"id": "4", "url": "https://fedi.directory"} + {"id": "2", "url": "https://communitywiki.org/trunk"}, + {"id": "3", "url": "https://fedi.directory"} ], "tutorials": [ @@ -60,7 +59,7 @@ [ {"id": "0", "url": "https://www.mastofeed.com"}, {"id": "1", "url": "https://gitlab.com/chaica/feed2toot"}, - {"id": "2", "url": "https://pleromabot.robertoszek.xyz/pleroma-bot"} + {"id": "2", "url": "https://pleromabot.robertoszek.xyz"} ], "mascot": [{"item": "mastodon", "imgNum": "1"}], "dwellers": "mastonauts", diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json index abf467a..58bb5ec 100644 --- a/source/_data/miscellaneous.json +++ b/source/_data/miscellaneous.json @@ -1789,7 +1789,7 @@ "protocols": "ActivityPub", "site": "", "logo": "", - "servers": "https://vidzy.codeberg.pag/", + "servers": "https://vidzy.codeberg.page", "description": "Federated alternative to TikTok.", "codeLanguage": "Python", "techStack": "", diff --git a/source/_data/tools.json b/source/_data/tools.json index c4fbecb..e2fc64c 100644 --- a/source/_data/tools.json +++ b/source/_data/tools.json @@ -21,9 +21,9 @@ }, { "title": "rtoot", - "source": "https://github.com/schochastics/rtoot", + "source": "https://github.com/gesistsa/rtoot", "protocols": "ActivityPub", - "site": "https://schochastics.github.io/rtoot", + "site": "https://gesistsa.github.io/rtoot", "logo": "/img/misc/rtoot.png", "servers": "", "description": "Interact with the mastodon API from R", diff --git a/source/_posts/diaspora-features-bounties.md b/source/_posts/diaspora-features-bounties.md deleted file mode 100644 index d6f20c9..0000000 --- a/source/_posts/diaspora-features-bounties.md +++ /dev/null @@ -1,17 +0,0 @@ - ---- -layout: "post" -title: "diaspora* features and bounties" -date: 2018-04-04 -updated: 2018-04-04 -tags: - - diaspora -preview: "New feature — client-side picture resize — merged in diaspora* develop brunch, will soon be available. Author got a $200 bounty. Take a bounty too" -url: "/en/post/diaspora-features-bounties" -lang: en -authors: [{"name": "@lostinlight", "url": "https://mastodon.xyz/@lightone", "network": "mastodon"}] ---- - -New feature — client-side picture resize — was recently merged in develop branch. Previously trying to upload a large (20MB) image to diaspora* would have resulted in error message “Max image size is 4MB”. Now, it is resized before being sent. Thank you @Fred, and congrats for the $200 bounty! -More diapsora* bounties [here](https://www.bountysource.com/teams/diaspora). -Read Fla's [post](https://diaspora-fr.org/posts/3444111) on the matter. diff --git a/source/_posts/fediquiz-answers.md b/source/_posts/fediquiz-answers.md index 0866460..7075dce 100644 --- a/source/_posts/fediquiz-answers.md +++ b/source/_posts/fediquiz-answers.md @@ -64,7 +64,7 @@ There were three sets of questions, each having different number of answers. Fur **Which one is not a fork of Mastodon?** Pleroma. This may seem an idiotic question, but over the years we've seen many newcomers whose acquaintance with Fediverse starts and ends with Mastodon. They come across popular Mastodon forks and assume that all Fedi microblogging platforms are some variant of modified Mastodon. This question was a reminder that Pleroma, like many other microblogging projects, has a different, independent codebase and history. -**Which one started as a fork of Pleroma?** In our quiz, the correct answer is Mobilizon, but it was pointed out to us ([twice](https://pl.fediverse.pl/objects/afc2836b-ce54-4f09-96c2-25a5edf10037)) that it wasn't a full-blown fork — Mobilizon just borrowed some of the code. We couldn't come up with a better phrasing for the question though, so it is what it is. +**Which one started as a fork of Pleroma?** In our quiz, the correct answer is Mobilizon, but it was pointed out to us that it wasn't a full-blown fork — Mobilizon just borrowed some of the code. We couldn't come up with a better phrasing for the question though, so it is what it is. **What is the unofficial Fediverse mascot suggested by community members?** Phoenix - the symbol of rebirth, renewal, progress and eternity. A legendary bird that rises from the ashes, just like federated networks fall in popularity and rise again, better and stronger. Hopefully you noticed that the birds at the end of the quiz are phoenixes too! diff --git a/source/_posts/fediverse-in-2021.md b/source/_posts/fediverse-in-2021.md index 257aa64..6eb5a25 100644 --- a/source/_posts/fediverse-in-2021.md +++ b/source/_posts/fediverse-in-2021.md @@ -166,7 +166,7 @@ There have also been ideas to set up an official Fediverse foundation, a legal e `✔ September 25:` Friendica ["Siberian Iris"](https://github.com/friendica/friendica/releases/tag/2021.09) is out, with scheduled postings, better notification system and admin panel improvements -`✔ September 28:` [Gitea](https://gitea.io), a community-maintained Git project, adds [NodeInfo support](https://social.gitea.io/@gitea/107006650861897944), getting one step closer to ActivityPub federation between code forges +`✔ September 28:` [Gitea](https://gitea.io), a community-maintained Git project, adds NodeInfo support, getting one step closer to ActivityPub federation between code forges `✔ September 28:` [Funkwhale's](https://funkwhale.audio) official Android app [becomes available](https://f-droid.org/packages/audio.funkwhale.ffa/) on FDroid. diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index 20d014d..6920c29 100644 --- a/source/en/portal/servers/index.md +++ b/source/en/portal/servers/index.md @@ -11,8 +11,6 @@ Information about adding a server can be found [here](https://codeberg.org/fediv ### 💡 [Sciences](#sciences) * [lugnasad.eu](https://lugnasad.eu) - for French speaking science lovers *(Friendica)* -* [humangenetics.social](https://humangenetics.social) - for people interested in the science of human genetics *(Mastodon)* -* [science.social](https://science.social) - for scientists *(Mastodon)* ### 🎨 [Humanities](#humanities) * [oulipo.social](https://oulipo.social) - a lipogrammatic server *(Mastodon)* @@ -46,11 +44,8 @@ Information about adding a server can be found [here](https://codeberg.org/fediv * [makerspace.social](https://makerspace.social) - space for makers (CNC, woodworking, microcontrollers, etc) *(Mastodon)* * [3dp.chat](https://3dp.chat) - 3D printing *(Mastodon)* * [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 *(Firefish)* *(Google reCAPTCHA)* * [mastodon.triggerphra.se](https://mastodon.triggerphra.se) - for the hypnosis community; 18+, queer, and getting very sleepy *(Mastodon)* -* [moth.orchids.social](https://moth.orchids.social) - for orchid lovers *(Mastodon)* ### 🚄 [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)* @@ -113,9 +108,6 @@ Instances run by and for people belonging to minorities and moderated more stric #### Denmark * [norrebro.space](https://norrebro.space) - Denmark *(Mastodon)* -#### Egypt -* [twitteregypt.online](https://twitteregypt.online) - Egypt *(Mastodon)* - #### Finland * [mastodo.fi](https://mastodo.fi) - Finland *(Mastodon)* @@ -141,7 +133,6 @@ Instances run by and for people belonging to minorities and moderated more stric #### Indonesia * [mstdn.id](https://mstdn.id) - Indonesia *(Mastodon)* -* [mastodonindonesia.com](https://mastodonindonesia.com) - Indonesia *(Mastodon)* #### Italy * [foxyhole.io](https://foxyhole.io) - Italy *(Firefish)* *(hCaptcha)* @@ -229,7 +220,6 @@ Instances run by and for people belonging to minorities and moderated more stric // *small-to-medium sized instances that will be happy to have new users* * [venera.social](https://venera.social) - friendly humans are welcome *(Friendica)* * [misskey.de](https://misskey.de) - hosted in Helsinki *(Misskey)* -* [wienermobile.rentals](https://wienermobile.rentals) - for all reasonable people *(Pleroma)* * [howlr.me](https://howlr.me) - for members of niche and alternative lifestyle communities; originally alterhuman focused *(Akkoma)* * [social.sp-codes.de](https://social.sp-codes.de) - main language is German *(Mastodon)* * [social.yesterweb.org](https://social.yesterweb.org) - hosted in the USA, mainly in English *(Mastodon)* @@ -237,7 +227,6 @@ Instances run by and for people belonging to minorities and moderated more stric * [masto.bike](https://masto.bike) - riding a bike is a plus, French speaking *(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)* -* [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) *Instances which declare to be affiliated with an incorporate non-profit (usually an [association](https://en.wikipedia.org/wiki/Voluntary_association) or [cooperative](https://www.ica.coop/en/cooperatives/what-is-a-cooperative)) and to follow its policies* @@ -267,7 +256,6 @@ Instances run by and for people belonging to minorities and moderated more stric * [lediver.se](https://lediver.se) - für Leipzig, Diversität - diversity-friendly German-language instance *(Mastodon)* * [lgbtqia.space](https://lgbtqia.space) - for all LGBTQIA people who want a caring and safe environment *(Mastodon)* * [meemu.org](https://meemu.org) - a queer-friendly instance *(Mastodon)* -* [outdoors.lgbt](https://outdoors.lgbt) - a safe space for LGBTQIA+ individuals and staunch allies that love the outdoors *(Mastodon)* * [pipou.academy](https://pipou.academy) - a French-language queer instance - une instance queer, qui vise à être aussi confortable et safe que possible *(Mastodon)* * [poweredbygay.social](https://poweredbygay.social) - for those LGBTQIA+ (and Allies) that are into fun adventurous things, like playing/watching sports, hiking, camping *(Mastodon)* * [retro.pizza](https://retro.pizza) - a queer-run poly-fandom nerd culture instance *(Mastodon)* @@ -327,7 +315,6 @@ Instances run by and for people belonging to minorities and moderated more stric * [PCGamer.social](https://pcgamer.social) - by the PC gamer, for the PC gamer *(Mastodon)* * [poliverso.org](https://poliverso.org) - dedicated to politics and digital rights (Italian speaking) *(Friendica)* * [ruby.social](https://ruby.social) - for people interested in Ruby, Rails and related topics *(Mastodon)* -* [activism.openworlds.info](https://activism.openworlds.info) - for activists *(Mastodon)* * [mastodontti.fi](https://mastodontti.fi) - for Finnish speakers *(Mastodon)* * [snabelen.no](https://snabelen.no) - for Norwegian speakers *(Mastodon)* * [mastodon.ml](https://mastodon.ml) - Russia *(Mastodon)* @@ -359,7 +346,6 @@ Instances run by and for people belonging to minorities and moderated more stric * [xarxa.cloud](https://xarxa.cloud) - for Catalan and Spanish speakers *(Mastodon)* * [myhobby.zone](https://myhobby.zone) - for all kinds of hobbies *(Mastodon)* * [neurodifferent.me](https://neurodifferent.me) - a friendly space for neurodifferent folks *(Mastodon)* -* [aviators.network](https://aviators.network) - for aviation enthusiasts *(Mastodon)* * [machteburch.social](https://machteburch.social) - Magdeburg *(Mastodon)* * [frankfurt.social](https://frankfurt.social) - Frankfurt *(Mastodon)* * [nahe.social](https://nahe.social) - Nahe region *(Mastodon)* diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml index 0f773a8..5c3de32 100644 --- a/themes/starter/languages/en.yml +++ b/themes/starter/languages/en.yml @@ -103,7 +103,6 @@ backup: Mastodon backup graphs: graphs webmentions: Webmentions - site + Fediverse bridge mastofeed: Mastofeed -twitodon: Find and follow Twitter friends on Mastodon fediDir: Curated list of interesting accounts feed2toot: RSS to Mastodon bot trunk: Trunk - follow users with common interests diff --git a/themes/starter/layout/mastodon.ejs b/themes/starter/layout/mastodon.ejs index 99d146b..947416e 100644 --- a/themes/starter/layout/mastodon.ejs +++ b/themes/starter/layout/mastodon.ejs @@ -7,7 +7,7 @@ network: true <% const data = site.data.mastodon.data; const tuts = [__('howto'), __('guide')]; - const uxList = [__('pinafore'), __('halcyon'), __('twitodon'), __('trunk'), __('fediDir')]; + const uxList = [__('pinafore'), __('halcyon'), __('trunk'), __('fediDir')]; const tech = [__('awesome'), __('backup')]; const tools = [__('preinstalled'), __('mediaHosting')]; const utils = [__('mastofeed'), __('feed2toot'), __('pleromaBot')];