From: Maxim Filippov Date: Thu, 14 Nov 2019 14:45:29 +0000 (+0900) Subject: Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=114930b5fd816657c21c5fbe33845fd3742c9c23;p=akkoma Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance --- 114930b5fd816657c21c5fbe33845fd3742c9c23 diff --cc CHANGELOG.md index 66644efc9,b4ad91b0d..b4e013cdd --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -60,7 -66,7 +66,8 @@@ The format is based on [Keep a Changelo - Mastodon API: Add `/api/v1/markers` for managing timeline read markers - Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations` - Configuration: `feed` option for user atom feed. + - Pleroma API: Add Emoji reactions +- Admin API: Add `/api/pleroma/admin/instances/:instance/statuses` - lists all statuses from a given instance ### Fixed diff --cc lib/pleroma/web/router.ex index 1e2982b67,9b8b373b8..9eadb4591 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@@ -177,11 -177,10 +177,12 @@@ defmodule Pleroma.Web.Router d get("/users/:nickname", AdminAPIController, :user_show) get("/users/:nickname/statuses", AdminAPIController, :list_user_statuses) + get("/instances/:instance/statuses", AdminAPIController, :list_instance_statuses) + get("/reports", AdminAPIController, :list_reports) + get("/grouped_reports", AdminAPIController, :list_grouped_reports) get("/reports/:id", AdminAPIController, :report_show) - put("/reports/:id", AdminAPIController, :report_update_state) + patch("/reports", AdminAPIController, :reports_update) post("/reports/:id/respond", AdminAPIController, :report_respond) put("/statuses/:id", AdminAPIController, :status_update)