From 3b018284382bde5a3026d61d46bcc5a3550d0635 Mon Sep 17 00:00:00 2001 From: spla Date: Sat, 12 Mar 2022 13:45:28 +0100 Subject: [PATCH] Revert "Updated according to 0b52e009" This reverts commit e80a59a4ec97c8d3f82694a2096755a943841eff. --- README.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 88f3fba..56a74cd 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,55 @@ Within Python Virtual Environment: 5. Run `python fetchservers.py` to add servers to alive servers database. -6. Run `python fediverse.py` to query world alive servers API. It gets data from server's nodeinfo information. +6. Run `python fediverse.py` to query world alive servers API. It gets data from server's API according this table: + +| Software | API peers | API users (nodeinfo/2.0.json) | API users (nodeinfo/2.0) | API users (api/v1/instance) | API users (main/nodeinfo/2.0) | API users (api/nodeinfo/2.0.json) | API users (api/nodeinfo) | Software | +|:--------------:|:---------------------:|:------------------------------------------:|:----------------------------------------------------------------------------------------------:|:---------------------------:|:-----------------------------:|:---------------------------------:|:---------------------------:|:--------------:| +| Diaspora | | ['usage']['users']['total'] | | | | | | Diaspora | +| Friendica | api/v1/instance/peers | | ['usage']['users']['total'] | | | | | Friendica | +| Ganggo | | | ['usage']['users']['total'] | | | | | Ganggo | +| GNU Social | | | | | ['usage']['users']['total'] | | | GNU Social | +| GNU Social 2.x | | | | | | ['usage']['users']['total'] | | GNU Social 2.x | +| Groundpolis | | | ['usage']['users']['total'] | | | | | Groundpolis | +| Hubzilla | | | ['usage']['users']['total'] | | | | | Hubzilla | +| Lemmy | api/v2/site ['federated_instances']['linked'] | ['usage']['users']['total']| | | | | | Lemmy | +| Mastodon | api/v1/instance/peers | ['usage']['users']['total'] (since v3.0.0) | | ['stats']['user_count'] | | | | Mastodon | +| Misskey | | | **NO** (['usage']['users'] returns {}) so using ['usage']['users']['activeHalfyear'] instead | | | | | Misskey | +| Osada | | | ['usage']['users']['total'] | | | | | Osada | +| Peertube | | ['usage']['users']['total'] | | | | | | Peertube | +| Pixelfed | | | | | | ['usage']['users']['total'] | | Pixelfed | +| Pleroma | api/v1/instance/peers | ['usage']['users']['total'] | | | | | | Pleroma | +| Plume | | | ['usage']['users']['total'] | | | | | Plume | +| Prismo | | | ['usage']['users']['total'] | | | | | Prismo | +| Ravenvale | | ['usage']['users']['total'] | | | | | | Ravenvale | +| Squus | | | ['usage']['users']['total'] | | | | | Squus | +| Writefreely | | | | | | | ['usage']['users']['total'] | Writefreely | +| Zap | | | ['usage']['users']['total'] | | | | | Zap | + +| software | API | software name | +|-------------|:---------------------:|:--------------------:| +| diaspora | nodeinfo/2.0.json | ['software']['name'] | +| dolphin | nodeinfo/2.0 | ['software']['name'] | +| ganggo | nodeinfo/2.0 | ['software']['name'] | +| friendica | nodeinfo/2.0 | ['software']['name'] | +| gnusocial | main/nodeinfo/2.0 | ['software']['name'] | +| gnusocialv2 | api/nodeinfo/2.0.json | ['software']['name'] | +| groundpolis | nodeinfo/2.0 | ['software']['name'] | +| hubzilla | nodeinfo/2.0 | ['software']['name'] | +| lemmy | nodeinfo/2.0.json | ['software']['name'] | +| mastodon | nodeinfo/2.0.json | ['software']['name'] | +| misskey | nodeinfo/2.0 | ['software']['name'] | +| osada | nodeinfo/2.0.json | ['software']['name'] | +| peertube | nodeinfo/2.0.json | ['software']['name'] | +| pixelfed | api/nodeinfo/2.0.json | ['software']['name'] | +| pleroma | nodeinfo/2.0.json | ['software']['name'] | +| plume | nodeinfo/2.0 | ['software']['name'] | +| prismo | nodeinfo/2.0.json | ['software']['name'] | +| ravenvale | nodeinfo/2.0.json | ['software']['name'] | +| squs | nodeinfo/2.0 | ['software']['name'] | +| wordpress | wp-json/nodeinfo/2.0 | ['software']['name'] | +| writefreely | api/nodeinfo | ['software']['name'] | +| zap | nodeinfo/2.0.json | ['software']['name'] | 7. Run `python uptime_setup.py` to get your Uptime bot's access token of your Mastodon or Pleroma server existing account. It will be saved to 'secrets/uptime_secrets.txt' for further use. @@ -35,4 +83,3 @@ Within Python Virtual Environment: 21.8.2021 - New feature! Added Best Fediverse's servers Uptime publishing bot. 22.10.2021 - New feature! Added [Funkwhale](https://funkwhale.audio) support. 26.10.2021 - New feature! Added [Socialhome](https://socialhome.network) support. -2.3.2022 - Improved servers nodeinfo detection