From: feld <feld@feld.me>
Date: Tue, 2 Feb 2021 17:57:58 +0000 (+0000)
Subject: Merge branch 'develop' into 'fix/2411-mutes-api'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d289ad8579dacdf1459bbbdaf404bfcd042255ae;p=akkoma

Merge branch 'develop' into 'fix/2411-mutes-api'

# Conflicts:
#   CHANGELOG.md
#   docs/development/API/differences_in_mastoapi_responses.md
---

d289ad8579dacdf1459bbbdaf404bfcd042255ae
diff --cc CHANGELOG.md
index b2b7e5671,f4f3bddb7..504ba2fb8
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -49,7 -49,8 +49,9 @@@ The format is based on [Keep a Changelo
  - Admin API: An endpoint to manage frontends.
  - Streaming API: Add follow relationships updates.
  - WebPush: Introduce `pleroma:chat_mention` and `pleroma:emoji_reaction` notification types.
+ - Mastodon API: Add monthly active users to `/api/v1/instance` (`pleroma.stats.mau`).
+ - Mastodon API: Home, public, hashtag & list timelines accept `only_media`, `remote` & `local` parameters for filtration.
 +- Mastodon API: `/api/v1/accounts/:id` & `/api/v1/mutes` endpoints accept `with_relationships` parameter and return filled `pleroma.relationship` field.
  </details>
  
  ### Fixed
diff --cc docs/development/API/differences_in_mastoapi_responses.md
index b532d14ed,c83be2faa..38d70fa78
--- a/docs/development/API/differences_in_mastoapi_responses.md
+++ b/docs/development/API/differences_in_mastoapi_responses.md
@@@ -54,13 -60,16 +60,23 @@@ The `id` parameter can also be the `nic
  - `/api/v1/accounts/:id`
  - `/api/v1/accounts/:id/statuses`
  
+ `/api/v1/accounts/:id/statuses` endpoint accepts these parameters:
+ 
+ - `pinned`: include only pinned statuses
+ - `tagged`: with tag
+ - `only_media`: include only statuses with media attached
+ - `with_muted`: include statuses/reactions from muted accounts
+ - `exclude_reblogs`: exclude reblogs
+ - `exclude_replies`: exclude replies
+ - `exclude_visibilities`: exclude visibilities
+ 
 +Endpoints which accept `with_relationships` parameter:
 +
 +- `/api/v1/accounts/:id`
 +- `/api/v1/accounts/:id/followers`
 +- `/api/v1/accounts/:id/following`
 +- `/api/v1/mutes`
 +
  Has these additional fields under the `pleroma` object:
  
  - `ap_id`: nullable URL string, ActivityPub id of the user