Merge branch 'chore/changelog-update' into 'develop'

Update changelog and admin API docs with tags, display_name, avatar additions

See merge request pleroma/pleroma!1367

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 663d99ffd32848b9bc091d3a0d48c5d10d389855..ae7e4c0ed3e9e3a1e27dc137759da719590372b5 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Admin API: Endpoints for managing reports
 - Admin API: Endpoints for deleting and changing the scope of individual reported statuses
 - Admin API: Endpoints to view and change config settings.
+- Admin API: Return users' tags when querying reports
+- Admin API: Return avatar and display name when querying users
 - AdminFE: initial release with basic user management accessible at /pleroma/admin/
 - Mastodon API: Add chat token to `verify_credentials` response
 - Mastodon API: Add background image setting to `update_credentials`

diff --git a/docs/api/admin_api.md b/docs/api/admin_api.md
index 4be0ab0f8db8df0f5bdb91b32916a19a322419b9..74bde3ecedf7351dad8221ada16c6db0d4c5179a 100644 (file)
--- a/docs/api/admin_api.md
+++ b/docs/api/admin_api.md
@@ -38,7 +38,9 @@ Authentication is required and the user must be an admin.
         "moderator": bool
       },
       "local": bool,
-      "tags": array
+      "tags": array,
+      "avatar": string,
+      "display_name": string
     },
     ...
   ]
@@ -331,6 +333,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
           "pleroma": {},
           "sensitive": false
         },
+        "tags": ["force_unlisted"],
         "statuses_count": 3,
         "url": "https://pleroma.example.org/users/user",
         "username": "user"
@@ -366,6 +369,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
           "pleroma": {},
           "sensitive": false
         },
+        "tags": ["force_unlisted"],
         "statuses_count": 1,
         "url": "https://pleroma.example.org/users/lain",
         "username": "lain"