diff options
| author | feld <feld@feld.me> | 2020-03-04 18:22:37 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-03-04 18:22:37 +0000 |
| commit | 9b740cfb23e3bc507207e1971a2a168cdf1d23d3 (patch) | |
| tree | 33453eb7a18f71a5321cc199bdb6f31fb8326350 | |
| parent | 6f7a8c43a200d2d0166e4e544aee1e6104bcb671 (diff) | |
| parent | 7af431c150cf4dc2c283b6a90fdaa7eafd860170 (diff) | |
Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
Closes #1596
See merge request pleroma/pleroma!2267
| -rw-r--r-- | docs/API/admin_api.md | 13 | ||||
| -rw-r--r-- | lib/pleroma/web/admin_api/admin_api_controller.ex | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/docs/API/admin_api.md b/docs/API/admin_api.md index 91c76ce00..47afdfba5 100644 --- a/docs/API/admin_api.md +++ b/docs/API/admin_api.md @@ -278,6 +278,19 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret - On failure: `Not found` - On success: JSON array of instance's latest statuses +## `GET /api/pleroma/admin/statuses` + +### Retrives all latest statuses + +- Params: + - *optional* `page_size`: number of statuses to return (default is `20`) + - *optional* `local_only`: excludes remote statuses + - *optional* `godmode`: `true`/`false` – allows to see private statuses + - *optional* `with_reblogs`: `true`/`false` – allows to see reblogs (default is false) +- Response: + - On failure: `Not found` + - On success: JSON array of user's latest statuses + ## `POST /api/pleroma/admin/relay` ### Follow a Relay diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 558832703..de0755ee5 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -748,6 +748,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do def list_statuses(%{assigns: %{user: admin}} = conn, params) do godmode = params["godmode"] == "true" || params["godmode"] == true local_only = params["local_only"] == "true" || params["local_only"] == true + with_reblogs = params["with_reblogs"] == "true" || params["with_reblogs"] == true {page, page_size} = page_params(params) activities = @@ -755,7 +756,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do "godmode" => godmode, "local_only" => local_only, "limit" => page_size, - "offset" => (page - 1) * page_size + "offset" => (page - 1) * page_size, + "exclude_reblogs" => !with_reblogs && "true" }) conn |