Merge branch 'develop' into feature/reports-groups-and-multiple-state-update

diff --combined CHANGELOG.md
index 3c306980b65a4caeffdaeae9564bc30f4a341474,bd06ec866f9bd6a73306601f17a94ea1fb2e07f4..c51807c8069662b548b1453ba6201956e6c1e196
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -16,12 -16,11 +16,13 @@@ The format is based on [Keep a Changelo
  - OAuth: support for hierarchical permissions / [Mastodon 2.4.3 OAuth permissions](https://docs.joinmastodon.org/api/permissions/)
  - Authentication: Added rate limit for password-authorized actions / login existence checks
  - Metadata Link: Atom syndication Feed
+ - Mix task to re-count statuses for all users (`mix pleroma.count_statuses`)
 +- Admin API: Add ability to fetch reports, grouped by status `GET /api/pleroma/admin/grouped_reports`
  
  ### Changed
  - **Breaking:** Elixir >=1.8 is now required (was >= 1.7)
  - **Breaking:** Admin API: Return link alongside with token on password reset
 +- **Breaking:** Admin API: Changing report state now uses `PATCH` (it was `PUT` before) and allows updating multiple reports at once (API changed)
  - Replaced [pleroma_job_queue](https://git.pleroma.social/pleroma/pleroma_job_queue) and `Pleroma.Web.Federator.RetryQueue` with [Oban](https://github.com/sorentwo/oban) (see [`docs/config.md`](docs/config.md) on migrating customized worker / retry settings)
  - Introduced [quantum](https://github.com/quantum-elixir/quantum-core) job scheduler
  - Admin API: Return `total` when querying for reports
@@@ -29,6 -28,7 +30,7 @@@
  - Admin API: Return link alongside with token on password reset
  - MRF (Simple Policy): Also use `:accept`/`:reject` on the actors rather than only their activities
  - OStatus: Extract RSS functionality
+ - Mastodon API: Add `pleroma.direct_conversation_id` to the status endpoint (`GET /api/v1/statuses/:id`)
  
  ### Fixed
  - Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
@@@ -87,6 -87,7 +89,7 @@@
  - ActivityPub: Fix `/users/:nickname/inbox` crashing without an authenticated user
  - MRF: fix ability to follow a relay when AntiFollowbotPolicy was enabled
  - Mastodon API: Blocks are now treated consistently between the Streaming API and the Timeline APIs
+ - Mastodon API: `exclude_replies` is correctly handled again.
  
  ### Added
  - Expiring/ephemeral activites. All activities can have expires_at value set, which controls when they should be deleted automatically.