From b631d11d00667d554feb7ebe5f5df1e90a301b28 Mon Sep 17 00:00:00 2001 From: Eugen Date: Tue, 28 Feb 2017 14:58:11 +0100 Subject: [PATCH 1/7] Updated sponsors --- Contributing-to-Mastodon/Sponsors.md | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/Contributing-to-Mastodon/Sponsors.md b/Contributing-to-Mastodon/Sponsors.md index 3fee6e1e..9cdd5b03 100644 --- a/Contributing-to-Mastodon/Sponsors.md +++ b/Contributing-to-Mastodon/Sponsors.md @@ -6,23 +6,16 @@ These people make the development of Mastodon possible through [Patreon](https:/ **Extra special Patrons** - [World'sTallestLadder](https://mastodon.social/users/carcinoGeneticist) -- [glocal](https://mastodon.social/users/glocal) - [Jimmy Tidey](https://mastodon.social/users/jimmytidey) - [Kurtis Rainbolt-Greene](https://mastodon.social/users/krainboltgreene) - [Kit Redgrave](https://socially.constructed.space/users/KitRedgrave) -- [Zeiphner](https://mastodon.social/users/Zeipher) +- [Zeipher](https://mastodon.social/users/Zeipher) - [Effy Elden](https://toot.zone/users/effy) - [Zoë Quinn](https://mastodon.social/users/zoequinn) **Thank you to the following people** -- [Sophia Park](https://mastodon.social/users/sophia) -- [WelshPixie](https://mastodon.social/users/WelshPixie) -- [John Parker](https://mastodon.social/users/Middaparka) -- [Christina Hendricks](https://mastodon.social/users/clhendricksbc) -- [Jelle](http://jelv.nl) - [Harris Bomberguy](https://mastodon.social/users/Hbomberguy) -- [Martin Tithonium](https://mastodon.social/users/tithonium) - [Edward Saperia](https://nwspk.com) - [Yoz Grahame](http://yoz.com/) - [Jenn Kaplan](https://gay.crime.team/users/jkap) @@ -33,5 +26,21 @@ These people make the development of Mastodon possible through [Patreon](https:/ - [Niels Roesen Abildgaard](http://hypesystem.dk/) - [Zatnosk](https://github.com/Zatnosk) - [Spex Bluefox](https://mastodon.social/users/Spex) -- [Sam Waldie](https://mastodon.social/users/denjin) - [J. C. Holder](http://jcholder.com/) +- [glocal](https://mastodon.social/users/glocal) +- [jk](https://mastodon.social/users/jk) +- [C418](https://mastodon.social/users/C418) +- [halcy](https://icosahedron.website/users/halcy) +- [Extropic](https://gnusocial.no/extropic) +- TBD +- TBD +- TBD +- TBD +- TBD +- TBD +- TBD +- TBD +- TBD +- TBD +- TBD +- TBD From d7f35050adf5eb3c949788d723de9d3c73c064c5 Mon Sep 17 00:00:00 2001 From: shel Date: Tue, 28 Feb 2017 13:02:39 -0500 Subject: [PATCH 2/7] Add social.dickseven.com New instance --- Using-Mastodon/List-of-Mastodon-instances.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Using-Mastodon/List-of-Mastodon-instances.md b/Using-Mastodon/List-of-Mastodon-instances.md index ed3c7429..ed549d5b 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -14,5 +14,6 @@ List of Known Mastodon instances | [gnusocial.me](https://gnusocial.me) |Yes, it's a mastodon instance now|Yes| | [icosahedron.website](https://icosahedron.website/) |Icosahedron-themed (well, visually), open registration.|Yes| | [memetastic.space](https://memetastic.space) |Memes|Yes| +| [social.diskseven.com](https://social.diskseven.com) |Single user|No| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From 22e12b4037fbf88e48e301e3a733a5b03f95ec04 Mon Sep 17 00:00:00 2001 From: undrskr Date: Fri, 3 Mar 2017 22:38:10 +0200 Subject: [PATCH 3/7] gnusocial.me doesn't use Mastodon anymore The host uses postActiv now. --- Using-Mastodon/List-of-Mastodon-instances.md | 1 - 1 file changed, 1 deletion(-) diff --git a/Using-Mastodon/List-of-Mastodon-instances.md b/Using-Mastodon/List-of-Mastodon-instances.md index ed549d5b..3dc9cf03 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -11,7 +11,6 @@ List of Known Mastodon instances | [epiktistes.com](https://epiktistes.com) |N/A|Yes| | [on.vu](https://on.vu) | Appears defunct|No| | [gay.crime.team](https://gay.crime.team) |N/A|Yes(?)| -| [gnusocial.me](https://gnusocial.me) |Yes, it's a mastodon instance now|Yes| | [icosahedron.website](https://icosahedron.website/) |Icosahedron-themed (well, visually), open registration.|Yes| | [memetastic.space](https://memetastic.space) |Memes|Yes| | [social.diskseven.com](https://social.diskseven.com) |Single user|No| From 5ac99b44122b977a44118a8277788ca617079d8a Mon Sep 17 00:00:00 2001 From: Alexander Acevedo Date: Fri, 3 Mar 2017 19:17:58 -0500 Subject: [PATCH 4/7] add social.gestaltzerfall.net instance information Hello fediverse! --- Using-Mastodon/List-of-Mastodon-instances.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Using-Mastodon/List-of-Mastodon-instances.md b/Using-Mastodon/List-of-Mastodon-instances.md index 3dc9cf03..ef3c835d 100644 --- a/Using-Mastodon/List-of-Mastodon-instances.md +++ b/Using-Mastodon/List-of-Mastodon-instances.md @@ -14,5 +14,6 @@ List of Known Mastodon instances | [icosahedron.website](https://icosahedron.website/) |Icosahedron-themed (well, visually), open registration.|Yes| | [memetastic.space](https://memetastic.space) |Memes|Yes| | [social.diskseven.com](https://social.diskseven.com) |Single user|No| +| [social.gestaltzerfall.net](https://social.gestaltzerfall.net) |Single user|No| Let me know if you start running one so I can add it to the list! (Alternatively, add it yourself as a pull request). From 6389273247e2bbc58301e8296f5adfba52c5c26e Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 5 Mar 2017 17:27:17 +0100 Subject: [PATCH 5/7] Improved /api/v1/accounts/:id/statuses with new params: only_media, exclude_replies Redirect /:username to /users/:username Redirect /:username/:id to /users/:username/updates/:id Updated API documentation and sponsors --- Contributing-to-Mastodon/Sponsors.md | 2 +- Using-the-API/API.md | 30 ++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/Contributing-to-Mastodon/Sponsors.md b/Contributing-to-Mastodon/Sponsors.md index 9cdd5b03..47579168 100644 --- a/Contributing-to-Mastodon/Sponsors.md +++ b/Contributing-to-Mastodon/Sponsors.md @@ -32,7 +32,7 @@ These people make the development of Mastodon possible through [Patreon](https:/ - [C418](https://mastodon.social/users/C418) - [halcy](https://icosahedron.website/users/halcy) - [Extropic](https://gnusocial.no/extropic) -- TBD +- [Pat Monaghan](http://iwrite.software/) - TBD - TBD - TBD diff --git a/Using-the-API/API.md b/Using-the-API/API.md index 07c1b25a..af785828 100644 --- a/Using-the-API/API.md +++ b/Using-the-API/API.md @@ -75,6 +75,10 @@ Query parameters: - `max_id` (optional): Skip statuses younger than ID (e.g. navigate backwards in time) - `since_id` (optional): Skip statuses older than ID (e.g. check for updates) +Query parameters for public and tag timelines only: + +- `local` (optional): Only return statuses originating from this instance + ### Notifications **GET /api/v1/notifications** @@ -115,7 +119,14 @@ Returns authenticated user's account. **GET /api/v1/accounts/:id/statuses** -Returns statuses by user. Same options as timeline are permitted. +Returns statuses by user. + +Query parameters: + +- `max_id` (optional): Skip statuses younger than ID (e.g. navigate backwards in time) +- `since_id` (optional): Skip statuses older than ID (e.g. check for updates) +- `only_media` (optional): Only return statuses that have media attachments +- `exclude_replies` (optional): Skip statuses that reply to other statuses **GET /api/v1/accounts/:id/following** @@ -127,7 +138,7 @@ Returns users the given user is followed by. **GET /api/v1/accounts/relationships** -Returns relationships (`following`, `followed_by`, `blocking`) of the current user to a list of given accounts. +Returns relationships (`following`, `followed_by`, `blocking`, `muting`, `requested`) of the current user to a list of given accounts. Query parameters: @@ -146,6 +157,14 @@ Query parameters: Returns accounts blocked by authenticated user. +**GET /api/v1/mutes** + +Returns accounts muted by authenticated user. + +**GET /api/v1/follow_requests** + +Returns accounts that want to follow the authenticated user but are waiting for approval. + **GET /api/v1/favourites** Returns statuses favourited by authenticated user. @@ -207,6 +226,13 @@ Returns the updated relationship to the user. Returns the updated relationship to the user. +# Muting and unmuting users + +**POST /api/v1/accounts/:id/mute** +**POST /api/v1/accounts/:id/unmute** + +Returns the updated relationship to the user. + ### OAuth apps **POST /api/v1/apps** From 0a76382b7f8363ce236fd8834eac5631c4fab450 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 14 Mar 2017 15:59:21 +0100 Subject: [PATCH 6/7] Obfuscate filenames better, double rate limits --- Using-the-API/Push-notifications.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Using-the-API/Push-notifications.md b/Using-the-API/Push-notifications.md index d98c8833..fc373e72 100644 --- a/Using-the-API/Push-notifications.md +++ b/Using-the-API/Push-notifications.md @@ -1,4 +1,4 @@ Push notifications ================== -**Note: This push notification design turned out to not be fully operational on the side of Firebase. A different approach is in consideration** +See for an example of how to create push notifications for a mobile app. It involves using the Mastodon streaming API on behalf of the app's users, as a sort of proxy. From b35944a5c40d02a09cc0ea3f4121ff39578daf94 Mon Sep 17 00:00:00 2001 From: Eugen Date: Wed, 15 Mar 2017 18:44:37 +0100 Subject: [PATCH 7/7] Update list of apps --- Using-Mastodon/Apps.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Using-Mastodon/Apps.md b/Using-Mastodon/Apps.md index e350e5f9..62d48c5e 100644 --- a/Using-Mastodon/Apps.md +++ b/Using-Mastodon/Apps.md @@ -5,11 +5,13 @@ Some people have started working on apps for the Mastodon API. Here is a list of |App|Platform|Link|Developer(s)| |---|--------|----|------------| -|Matodor|iOS/Android||[@jeroensmeets@mastodon.social](https://mastodon.social/users/jeroensmeets)| |Tusky|Android||[@Vavassor@mastodon.social](https://mastodon.social/users/Vavassor)| -|Albatross|iOS||[@goldie_ice@mastodon.social](https://mastodon.social/users/goldie_ice)| -|tootstream|command-line||[@Raccoon@mastodon.social](https://mastodon.social/users/Raccoon)| -|mastodroid|Android||| -|Tooter|Chrome extension||[@effy@mastodon.social](https://mastodon.social/users/effy)| +|mastodroid|Android||[@charlag@mastodon.social](https://mastodon.social/users/charlag)| |TootyFruity|Android||[@eggplant@mastodon.social](https://mastodon.social/users/eggplant)| +|Matodor|iOS/Android||[@jeroensmeets@mastodon.social](https://mastodon.social/users/jeroensmeets)| +|Amarok|iOS||[@eurasierboy@mastodon.social](https://mastodon.social/users/eurasierboy)| +|Albatross|iOS||[@goldie_ice@mastodon.social](https://mastodon.social/users/goldie_ice)| +|Tooter|Chrome||[@effy@mastodon.social](https://mastodon.social/users/effy)| +|tootstream|CLI||[@Raccoon@mastodon.social](https://mastodon.social/users/Raccoon)| + If you have a project like this, let me know so I can add it to the list!