Resorted apps, clarify what's FOSS and proprietary, and ToC (#583)

* Resorted apps, clarify what's FOSS and proprietary, and ToC Cause CLI apps and Bots overlapped, I mostly combined them under Command line clients. * That's not needed anymore * Not needed, is already clear from the name 'web tools'
2018-03-29 19:03:03 +02:00 · 2018-03-29 19:03:03 +02:00 · 022d02351b
parent a411158c33
commit 022d02351b
1 changed files with 89 additions and 53 deletions
--- a/Using-Mastodon/Apps.md
+++ b/Using-Mastodon/Apps.md
@ -1,12 +1,30 @@
 List of apps
 ============

-Some people have started working on apps for the Mastodon API. Here is a list of them:
-<!---Only list apps and tools that work with every (up-to-date) instance. Mobile apps should provide at least an installable package. Please keep this order: Stable FOSS (title **bold**) > unstable FOSS *(alpha/beta/experimental)* > proprietary/non-FOSS (if your app is FOSS, please provide the source and move it to the FOSS section). Further everything alphabetically (but mobile clients on top, cause that is what most people are looking for). --->
+<!---Only list apps and tools that work with every (up-to-date) instance. Mobile apps should provide at least an installable package. Please list apps with stable versions before apps with only unstable versions *(alpha/beta/experimental)* (alphabetically). Mobile, desktop and web clients first (for the end-users) --->
+
+**Table of contents**
+
+* [Mobile clients](#mobile-clients)
+   * [Android - open source](#android---open-source)
+   * [Android - proprietary](#android---proprietary)
+   * [iOS - open source](#ios---open-source)
+   * [iOS - proprietary](#ios---proprietary)
+   * [Sailfish OS](#sailfish-os)
+* [Desktop clients](#desktop-clients)
+   * [Linux](#linux)
+   * [Mac](#mac)
+   * [Windows](#windows)
+* [Alternative web clients](#alternative-web-clients)
+* [Browser add-ons/extensions](#browser-add-onsextensions)
+* [Bridges from/to other platforms](#bridges-fromto-other-platforms)
+* [Command line tools](#command-line-tools)
+* [Web tools](#web-tools)
+* [Other tools](#other-tools)

 ## Mobile clients

-### Android
+### Android - open source

 |App|Source code|Developer(s)|
 |---|-----------|------------|
@ -19,17 +37,22 @@ Some people have started working on apps for the Mastodon API. Here is a list of
 |[Mastobone](https://github.com/deguchi/mastobone/blob/master/README.md)<br />([Play Store](https://play.google.com/store/apps/details?id=com.mastobone)) *(alpha)*|<https://github.com/deguchi/mastobone>|[@deguchi@bookn.me](https://bookn.me/@deguchi)|
 |[MouseApp](https://github.com/cerisara/mousetodon/blob/master/README.md)<br />([F‑Droid](https://f-droid.org/packages/fr.xtof54.mousetodon/)) *(beta)*|<https://github.com/cerisara/mousetodon>|[@cerisara@mastodon.etalab.gouv.fr](https://mastodon.etalab.gouv.fr/@cerisara)
 |[TootyFruity](https://github.com/eggplantPrince/tootyFruity/blob/master/README.md)<br />([Play Store](https://play.google.com/store/apps/details?id=ch.kevinegli.tootyfruity221258)) *(beta)*|<https://github.com/eggplantPrince/tootyFruity>|[@eggplant@mastodon.social](https://mastodon.social/users/eggplant)|
-|dndkodon<br />([Play Store](https://play.google.com/store/apps/details?id=jp.coe.dndkodon))|N/A|Tsuyoshi Hyuga|
-|Cosian<br />([Play Store](https://play.google.com/store/apps/details?id=com.yatsuhashi.crims0n))|N/A|083|
-|MastoPane<br />([Play Store](https://play.google.com/store/apps/details?id=com.mastopane))|N/A|Panecraft|
-|mastty<br />([Play Store](https://play.google.com/store/apps/details?id=com.sasaneko.mastodon))|N/A|White Cat Factory|
-|[Pawoo](https://pawoo.net/about)<br />([Play Store](https://play.google.com/store/apps/details?id=jp.pxv.pawoo))|N/A|[@pixiv@pawoo.net](https://pawoo.net/users/pixiv)|
-|Stegodon<br />([Play Store](https://play.google.com/store/apps/details?id=com.gilawhost.stegolophodon))|N/A|[@GilaW@mastodon.cloud](https://mastodon.cloud/@Gilaw)|
-|Tootaloo<br />([Play Store](https://play.google.com/store/apps/details?id=net.liverworks.tootalooa))|N/A|[liverworks.net](http://liverworks.net/)|
-|Tootdon<br />([Play Store](https://play.google.com/store/apps/details?id=club.tootdon.app))|N/A/|[@tootdon@mstdn.jp](https://mstdn.jp/@tootdon)|
-|Troutoss<br />([Play Store](https://play.google.com/store/apps/details?id=jp.gr.java_conf.miwax.troutoss))|N/A|[@tomoya0x00@mstdn.jp](https://mstdn.jp/@tomoya0x00)|

-### iOS
+### Android - proprietary
+
+|App|Developer(s)|
+|---|------------|
+|dndkodon<br />([Play Store](https://play.google.com/store/apps/details?id=jp.coe.dndkodon))|Tsuyoshi Hyuga|
+|Cosian<br />([Play Store](https://play.google.com/store/apps/details?id=com.yatsuhashi.crims0n))|083|
+|MastoPane<br />([Play Store](https://play.google.com/store/apps/details?id=com.mastopane))|Panecraft|
+|mastty<br />([Play Store](https://play.google.com/store/apps/details?id=com.sasaneko.mastodon))|White Cat Factory|
+|[Pawoo](https://pawoo.net/about)<br />([Play Store](https://play.google.com/store/apps/details?id=jp.pxv.pawoo))|[@pixiv@pawoo.net](https://pawoo.net/users/pixiv)|
+|Stegodon<br />([Play Store](https://play.google.com/store/apps/details?id=com.gilawhost.stegolophodon))|[@GilaW@mastodon.cloud](https://mastodon.cloud/@Gilaw)|
+|Tootaloo<br />([Play Store](https://play.google.com/store/apps/details?id=net.liverworks.tootalooa))|[liverworks.net](http://liverworks.net/)|
+|Tootdon<br />([Play Store](https://play.google.com/store/apps/details?id=club.tootdon.app))|[@tootdon@mstdn.jp](https://mstdn.jp/@tootdon)|
+|Troutoss<br />([Play Store](https://play.google.com/store/apps/details?id=jp.gr.java_conf.miwax.troutoss))|[@tomoya0x00@mstdn.jp](https://mstdn.jp/@tomoya0x00)|
+
+### iOS - open source

 |App|Source code|Developer(s)|
 |---|-----------|------------|
@ -37,17 +60,22 @@ Some people have started working on apps for the Mastodon API. Here is a list of
 |**[Amaroq](https://github.com/ReticentJohn/Amaroq/blob/master/README.md)**<br />([iTunes](https://itunes.apple.com/us/app/amarok-for-mastodon/id1214116200?ls=1&mt=8))|<https://github.com/ReticentJohn/Amaroq>|[@eurasierboy@mastodon.social](https://mastodon.social/users/eurasierboy)|
 |**[iMast](https://cinderella-project.github.io/iMast/)**<br />([iTunes](https://itunes.apple.com/jp/app/imast/id1229461703))|<https://github.com/cinderella-project/iMast>|[@imast_ios@imastodon.net](https://imastodon.net/@imast_ios)|
 |[TootyFruity](https://github.com/eggplantPrince/tootyFruity/blob/master/README.md)<br />([iTunes](https://docs.google.com/forms/d/e/1FAIpQLScW2lvZaKrOm4AKJH5HLI_Ul0Yr3CsXulf5bcTJQ1xaN5jiPg/viewform?c=0&w=1)) *(beta)*|<https://github.com/eggplantPrince/tootyFruity>|[@eggplant@mastodon.social](https://mastodon.social/users/eggplant)|
-|Mustor<br />([iTunes](https://itunes.apple.com/us/app/mustor/id1229531204?l=zh&ls=1&mt=8))|N/A|[@darkcl@mastodon.cloud](https://mastodon.cloud/@darkcl)|
-|[Pawoo](https://pawoo.net/about)<br />([iTunes](https://itunes.apple.com/us/app/pawoo/id1229070679))|N/A|[@pixiv@pawoo.net](https://pawoo.net/users/pixiv)|
-|friends.nico<br />([iTunes](https://itunes.apple.com/us/app/friends-nico/id1230158182))|N/A|[@friends_nico@friends.nico](https://friends.nico/@friends_nico)|
-|Tootdon<br />([iTunes](https://itunes.apple.com/us/app/tootdon-for-mastodon/id1282283934))|N/A/|[@tootdon@mstdn.jp](https://mstdn.jp/@tootdon)|
-|Tootter<br />([iTunes](https://itunes.apple.com/us/app/id1229555793))|N/A|[@Tootter_for_Mastodon@mstdn.jp](https://mstdn.jp/@Tootter_for_Mastodon)|

-## Alternative web apps
+### iOS - proprietary
+
+|App|Developer(s)|
+|---|------------|
+|Mustor<br />([iTunes](https://itunes.apple.com/us/app/mustor/id1229531204?l=zh&ls=1&mt=8))|[@darkcl@mastodon.cloud](https://mastodon.cloud/@darkcl)|
+|[Pawoo](https://pawoo.net/about)<br />([iTunes](https://itunes.apple.com/us/app/pawoo/id1229070679))|[@pixiv@pawoo.net](https://pawoo.net/users/pixiv)|
+|friends.nico<br />([iTunes](https://itunes.apple.com/us/app/friends-nico/id1230158182))|[@friends_nico@friends.nico](https://friends.nico/@friends_nico)|
+|Tootdon<br />([iTunes](https://itunes.apple.com/us/app/tootdon-for-mastodon/id1282283934))|[@tootdon@mstdn.jp](https://mstdn.jp/@tootdon)|
+|Tootter<br />([iTunes](https://itunes.apple.com/us/app/id1229555793))|[@Tootter_for_Mastodon@mstdn.jp](https://mstdn.jp/@Tootter_for_Mastodon)|
+
+### Sailfish OS
+
 |App|Source code|Developer(s)|
 |---|-----------|------------|
-|**[Halcyon](https://halcyon.social)**|<https://github.com/halcyon-suite/halcyon>|[@halcyon@mastodon.social](https://mastodon.social/@halcyon)|
-|[Naumanni](https://naumanni.com/) *(alpha)*|<https://github.com/naumanni/naumanni>|[@shi3z@mstdn.onosendai.jp](https://mstdn.onosendai.jp/@shi3z)/[@shn@oppai.tokyo](https://oppai.tokyo/@shn)|
+|**[Tooter](https://openrepos.net/content/dysko/tooter)**|<https://github.com/dysk0/harbour-tooter>|[@disko@mastodon.social](https://mastodon.social/@dysko)|

 ## Desktop clients
 ### Linux
@ -74,20 +102,13 @@ Some people have started working on apps for the Mastodon API. Here is a list of
 |**[WinMasto](https://github.com/drasticactions/WinMasto/blob/master/README.md)**|10|<https://github.com/drasticactions/WinMasto>|[@drasticactions@mastodon.network](https://mastodon.network/users/drasticactions)|
 |[Mastodon UWP](https://rink.hockeyapp.net/apps/5199eba8bc914c4ab416aa8513d62826) *(beta)*|10|<https://github.com/woachk/mastodon>|[@my123@mastodon.social](https://mastodon.social/users/my123)|
 |[TheDesk](https://github.com/cutls/TheDesk/blob/master/README.md) |7~ |<https://github.com/cutls/TheDesk>|[@Cutls@kirishima.cloud](https://kirishima.cloud/@Cutls) |
-## Other clients

-|App|Platform|Source code|Developer(s)|
-|---|--------|-----------|------------|
-|**[bitlbee-mastodon](https://github.com/kensanata/bitlbee-mastodon#mastodon-plugin-for-bitlbee)**|IRC|<https://github.com/kensanata/bitlbee-mastodon>|[Alex Schroeder](https://alexschroeder.ch/wiki/Contact)|
-|**[madonctl](https://github.com/McKael/madonctl/blob/master/README.md)**|CLI|<https://github.com/McKael/madonctl>|[@McKael@mamot.fr](https://mamot.fr/@McKael)|
-|**[mastodon.el](https://github.com/jdenen/mastodon.el/blob/master/README.org)**|Emacs|<https://github.com/jdenen/mastodon.el>|[@johnson@mastodon.social](https://mastodon.social/users/johnson)|
-|**[Mstdn (Mastodon CLI)](https://github.com/mattn/go-mastodon/blob/master/README.md)**|CLI|<https://github.com/mattn/go-mastodon>|[@mattn@mstdn.jp](https://mstdn.jp/@mattn)|
-|**[toot](https://github.com/ihabunek/toot/blob/master/README.rst)**|CLI|<https://github.com/ihabunek/toot>|[@ihabunek@mastodon.social](https://mastodon.social/users/ihabunek)|
-|**[tootstream](https://github.com/magicalraccoon/tootstream/blob/develop/README.md)**|CLI|<https://github.com/magicalraccoon/tootstream>|[@Raccoon@mastodon.social](https://mastodon.social/users/Raccoon)|
-|**[soCLIal](https://gitlab.com/IvanSanchez/soclial/blob/master/README.md)**|CLI|<https://gitlab.com/IvanSanchez/soclial>|[@IvanSanchez@mastodon.social](https://mastodon.social/@IvanSanchez)|
-|**[Tooter](https://openrepos.net/content/dysko/tooter)**|SailfishOS|<https://github.com/dysk0/harbour-tooter>|[@disko@mastodon.social](https://mastodon.social/@dysko)|
-|**[pynitel/ulla](https://github.com/cquest/pynitel)**|Minitel|<https://github.com/cquest/pynitel>|[@cquest@amicale.net](https://amicale.net/@cquest)|
-|**[vim-mastodon](https://github.com/mattn/vim-mastodon/blob/master/README.md)**|Vim|<https://github.com/mattn/vim-mastodon>|[@mattn@mstdn.jp](https://mstdn.jp/@mattn)|
+## Alternative web clients
+
+|App|Source code|Developer(s)|
+|---|-----------|------------|
+|**[Halcyon](https://halcyon.social)**|<https://github.com/halcyon-suite/halcyon>|[@halcyon@mastodon.social](https://mastodon.social/@halcyon)|
+|[Naumanni](https://naumanni.com/) *(alpha)*|<https://github.com/naumanni/naumanni>|[@shi3z@mstdn.onosendai.jp](https://mstdn.onosendai.jp/@shi3z)/[@shn@oppai.tokyo](https://oppai.tokyo/@shn)|

 ## Browser add-ons/extensions

@ -105,9 +126,10 @@ Some people have started working on apps for the Mastodon API. Here is a list of
 |App|Platform|Source code|Developer(s)|
 |---|--------|-----------|------------|
 |**[Autopost to Mastodon](https://wordpress.org/plugins/autopost-to-mastodon/)**|Wordpress plugin|<https://github.com/L1am0/mastodon_wordpress_autopost>|[L1am0](http://l1am0.eu/)|
+|**[bitlbee-mastodon](https://github.com/kensanata/bitlbee-mastodon#mastodon-plugin-for-bitlbee)**|IRC|<https://github.com/kensanata/bitlbee-mastodon>|[Alex Schroeder](https://alexschroeder.ch/wiki/Contact)|
 |**[MastodonToTwitter](https://github.com/halcy/MastodonToTwitter/blob/master/README.md)**|CLI|<https://github.com/halcy/MastodonToTwitter>|[@halcy@mastodon.social](https://mastodon.social/@halcy)|
-|**[Retoot](https://gitlab.com/mojo42/retoot/blob/master/README.md)**|CLI|<https://gitlab.com/mojo42/retoot>|[@Mojo@apoil.org](https://apoil.org/users/mojo)|
 |**[Mastodon Twitter Poster](https://crossposter.masto.donte.com.br)**|Service|<https://github.com/renatolond/mastodon-twitter-poster>|[@renatolond@masto.donte.com.br](https://masto.donte.com.br/@renatolond)|
+|**[Retoot](https://gitlab.com/mojo42/retoot/blob/master/README.md)**|CLI|<https://gitlab.com/mojo42/retoot>|[@Mojo@apoil.org](https://apoil.org/users/mojo)|
 |**[RSSTootalizer](https://github.com/blind-coder/rsstootalizer/blob/master/README.md)**|Web browser|<https://github.com/blind-coder/rsstootalizer>|[@blindcoder@toot.berlin](https://toot.berlin/users/blindcoder)|
 |**[t2m – Twitter 2 Mastodon](https://github.com/Psycojoker/t2m/blob/master/README.md)**|CLI|<https://github.com/Psycojoker/t2m>|Psycojoker|
 |**[umrc](https://github.com/Ulrar/umrc/blob/master/README.md)**|IRC|<https://github.com/Ulrar/umrc>|[@lemonnierk@ulrar.net](https://mastodon.ulrar.net/users/lemonnierk)|
@ -115,26 +137,40 @@ Some people have started working on apps for the Mastodon API. Here is a list of
 |**[SPIP](https://contrib.spip.net/Mastodon)**|SPIP plugin|<https://github.com/Cerdic/mastodon>|[@cerdic@mamot.fr](https://mamot.fr/@cerdic)|
 |[ogp-share](http://mastodon.tools/ogp-share/) *(beta)*|Web browser|<https://github.com/DavidLibeau/mastodon-tools/tree/master/ogp-share>|[@David@mastodon.xyz](https://mastodon.xyz/@David)|

-## Bots
+## Command line tools

+|App|Source code|Developer(s)|
+|---|-----------|------------|
+|**[Fluffy Broccoli](https://github.com/algernon/fluffy-broccoli/blob/master/README.md)**|<https://github.com/algernon/fluffy-broccoli>|[@algernon@trunk.mad-scientist.club](https://trunk.mad-scientist.club/@algernon)
+|**[HackerNewsBot](https://github.com/raymestalez/mastodon-hnbot/blob/master/README.md)**|<https://github.com/raymestalez/mastodon-hnbot>|[@rayalez@hackertribe.io](https://hackertribe.io/users/rayalez)|
+|**[madonctl](https://github.com/McKael/madonctl/blob/master/README.md)**|<https://github.com/McKael/madonctl>|[@McKael@mamot.fr](https://mamot.fr/@McKael)|
+|**[Mastodon Image Bot](https://github.com/ZerataX/mastodon-img-bot/blob/master/README.MD)**|<https://github.com/ZerataX/mastodon-img-bot>|[@peterspark@pawoo.net](https://pawoo.net/@peterspark)|
+|**[Mstdn (Mastodon CLI)](https://github.com/mattn/go-mastodon/blob/master/README.md)**|<https://github.com/mattn/go-mastodon>|[@mattn@mstdn.jp](https://mstdn.jp/@mattn)|
+|**[toot](https://github.com/ihabunek/toot/blob/master/README.rst)**|<https://github.com/ihabunek/toot>|[@ihabunek@mastodon.social](https://mastodon.social/users/ihabunek)|
+|**[tootstream](https://github.com/magicalraccoon/tootstream/blob/develop/README.md)**|<https://github.com/magicalraccoon/tootstream>|[@Raccoon@mastodon.social](https://mastodon.social/users/Raccoon)|
+|**[simpleMastodonBot](https://github.com/M-D-M/simpleMastodonBot/blob/master/README.md)**|<https://github.com/M-D-M/simpleMastodonBot>|[M-D-M](https://github.com/M-D-M)
+|**[soCLIal](https://gitlab.com/IvanSanchez/soclial/blob/master/README.md)**|<https://gitlab.com/IvanSanchez/soclial>|[@IvanSanchez@mastodon.social](https://mastodon.social/@IvanSanchez)|
+|**[SupportBot](https://github.com/polymerwitch/SupportBot/blob/master/README.md)**|<https://github.com/polymerwitch/SupportBot>|[@polymerwitch@toot.cat](https://toot.cat/@polymerwitch)|
+|[mastodon-archive](https://github.com/kensanata/mastodon-backup#mastodon-archive)|<https://github.com/kensanata/mastodon-backup#mastodon-archive>|[Alex Schroeder](https://alexschroeder.ch/wiki/Contact)|
+|[mastodon-glossary-bot](https://github.com/michelbl/mastodon-glossary-bot/blob/master/README.md) *(experimental)* (also for Heroku)|<https://github.com/michelbl/mastodon-glossary-bot>|[@Michel@mastodon.etalab.gouv.fr](https://mastodon.etalab.gouv.fr/@Michel)|
+
+## Web tools
+
+|App|Source code|Developer(s)|
+|---|-----------|------------|
+|**[Contest-draw](http://mastodon.tools/contest-draw/)**|<https://github.com/DavidLibeau/mastodon-tools/tree/master/contest-draw>|[@David@mastodon.xyz](https://mastodon.xyz/@David)|
+|**[Mastoshare](https://github.com/koyuawsmbrtn/mastoshare/blob/master/README.md)**|<https://github.com/koyuawsmbrtn/mastoshare>|[@koyuawsmbrtn@mastodon.social](https://mastodon.social/@koyuawsmbrtn)|
+|**[wall](http://mastodon.tools/wall/)**|<https://github.com/DavidLibeau/mastodon-tools/tree/master/wall>|[@David@mastodon.xyz](https://mastodon.xyz/@David)|
+|[Scheduler](http://mastodon.tools/scheduler/) *(beta)*|<https://github.com/DavidLibeau/mastodon-scheduler>|[@David@mastodon.xyz](https://mastodon.xyz/@David)|
+|**[Tootmap](https://tootmap.net/)**|<https://github.com/wakin-/Tootmap>|[@wakin@biwakodon.com](https://biwakodon.com/@wakin)|
+|**[Mastodon User Matching](http://vinayaka.distsn.org/)**|<https://github.com/distsn/vinayaka>|[@hakabahitoyo@2.distsn.org](https://2.distsn.org/@hakabahitoyo)|
+
+## Other tools 
+<!--- Tools that don't fit elsewhere --->
 |App|Platform|Source code|Developer(s)|
 |---|--------|-----------|------------|
-|**[Fluffy Broccoli](https://github.com/algernon/fluffy-broccoli/blob/master/README.md)**|CLI|<https://github.com/algernon/fluffy-broccoli>|[@algernon@trunk.mad-scientist.club](https://trunk.mad-scientist.club/@algernon)
-|**[HackerNewsBot](https://github.com/raymestalez/mastodon-hnbot/blob/master/README.md)**|CLI|<https://github.com/raymestalez/mastodon-hnbot>|[@rayalez@hackertribe.io](https://hackertribe.io/users/rayalez)|
-|**[Mastodon Image Bot](https://github.com/ZerataX/mastodon-img-bot/blob/master/README.MD)**|CLI|<https://github.com/ZerataX/mastodon-img-bot>|[@peterspark@pawoo.net](https://pawoo.net/@peterspark)|
-|**[simpleMastodonBot](https://github.com/M-D-M/simpleMastodonBot/blob/master/README.md)**|CLI|<https://github.com/M-D-M/simpleMastodonBot>|[M-D-M](https://github.com/M-D-M)
-|**[SupportBot](https://github.com/polymerwitch/SupportBot/blob/master/README.md)**|CLI|<https://github.com/polymerwitch/SupportBot>|[@polymerwitch@toot.cat](https://toot.cat/@polymerwitch)|
-|[mastodon-glossary-bot](https://github.com/michelbl/mastodon-glossary-bot/blob/master/README.md) *(experimental)*|CLI or Heroku|<https://github.com/michelbl/mastodon-glossary-bot>|[@Michel@mastodon.etalab.gouv.fr](https://mastodon.etalab.gouv.fr/@Michel)|
-
-## Other tools
-|App|Platform|Source code|Developer(s)|
-|---|--------|-----------|------------|
-|**[Contest-draw](http://mastodon.tools/contest-draw/)**|Web browser|<https://github.com/DavidLibeau/mastodon-tools/tree/master/contest-draw>|[@David@mastodon.xyz](https://mastodon.xyz/@David)|
-|**[Mastoshare](https://github.com/koyuawsmbrtn/mastoshare/blob/master/README.md)**|Web browser|<https://github.com/koyuawsmbrtn/mastoshare>|[@koyuawsmbrtn@mastodon.social](https://mastodon.social/@koyuawsmbrtn)|
-|**[wall](http://mastodon.tools/wall/)**|Web browser|<https://github.com/DavidLibeau/mastodon-tools/tree/master/wall>|[@David@mastodon.xyz](https://mastodon.xyz/@David)|
-|[Scheduler](http://mastodon.tools/scheduler/) *(beta)*|Web browser|<https://github.com/DavidLibeau/mastodon-scheduler>|[@David@mastodon.xyz](https://mastodon.xyz/@David)|
-|**[Tootmap](https://tootmap.net/)**|Web browser|<https://github.com/wakin-/Tootmap>|[@wakin@biwakodon.com](https://biwakodon.com/@wakin)|
-|**[Mastodon User Matching](http://vinayaka.distsn.org/)**|Web browser|<https://github.com/distsn/vinayaka>|[@hakabahitoyo@2.distsn.org](https://2.distsn.org/@hakabahitoyo)|
-|[mastodon-archive](https://github.com/kensanata/mastodon-backup#mastodon-archive)|CLI|<https://github.com/kensanata/mastodon-backup#mastodon-archive>|[Alex Schroeder](https://alexschroeder.ch/wiki/Contact)|
+|**[mastodon.el](https://github.com/jdenen/mastodon.el/blob/master/README.org)**|Emacs|<https://github.com/jdenen/mastodon.el>|[@johnson@mastodon.social](https://mastodon.social/users/johnson)|
+|**[pynitel/ulla](https://github.com/cquest/pynitel)**|Minitel|<https://github.com/cquest/pynitel>|[@cquest@amicale.net](https://amicale.net/@cquest)|
+|**[vim-mastodon](https://github.com/mattn/vim-mastodon/blob/master/README.md)**|Vim|<https://github.com/mattn/vim-mastodon>|[@mattn@mstdn.jp](https://mstdn.jp/@mattn)|

 If you have a project like this, make a PR to add it to the list!