logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 1e8b79956e0c706650358e8b98c8e04e4fcf05b9
parent 58f646bcda97d6a9f21aa41b55f77dd4e2a9c695
Author: marcin mikołajczak <me@mkljczk.pl>
Date:   Wed, 28 Aug 2024 22:04:18 +0000

Merge branch 'docs-fix' into 'develop'

Correct response in AdminAPI docs

See merge request pleroma/pleroma!4240

Diffstat:

Achangelog.d/docs-fix.skip0
Mdocs/development/API/admin_api.md31+++++++++++++++++--------------
2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/changelog.d/docs-fix.skip b/changelog.d/docs-fix.skip diff --git a/docs/development/API/admin_api.md b/docs/development/API/admin_api.md @@ -433,7 +433,7 @@ Response: * On success: URL of the unfollowed relay ```json -{"https://example.com/relay"} +"https://example.com/relay" ``` ## `POST /api/v1/pleroma/admin/users/invite_token` @@ -1193,20 +1193,23 @@ Loads json generated from `config/descriptions.exs`. - Response: ```json -[ - { - "id": 1234, - "data": { - "actor": { - "id": 1, - "nickname": "lain" +{ + "items": [ + { + "id": 1234, + "data": { + "actor": { + "id": 1, + "nickname": "lain" + }, + "action": "relay_follow" }, - "action": "relay_follow" - }, - "time": 1502812026, // timestamp - "message": "[2017-08-15 15:47:06] @nick0 followed relay: https://example.org/relay" // log message - } -] + "time": 1502812026, // timestamp + "message": "[2017-08-15 15:47:06] @nick0 followed relay: https://example.org/relay" // log message + } + ], + "total": 1 +} ``` ## `POST /api/v1/pleroma/admin/reload_emoji`