tastytea
/
mastodonpp
2
1
Fork 0
Code Issues Pull Requests Releases 12 Wiki Activity

Merge branch 'develop' into main
continuous-integration/drone/push Build is passing Details

This commit is contained in:
tastytea 2020-04-18 15:44:12 +02:00
parent 576c84aa36 d20818221d
commit 2ada3b406b
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/api.hpp
View File

@ -31,7 +31,7 @@ using std::variant;
/*!
* @brief Holds %API endpoints.
*
* Supported %API endpoints: Mastodon 3.0.1, Pleroma 2.0.0.
* Supported %API endpoints: Mastodon 3.0.1, Pleroma 2.0.2.
*
* @since 0.1.0
*
@ -271,6 +271,7 @@ public:
admin_users_revoke_invite,
admin_users_email_invite,
admin_users_nickname_password_reset,
admin_users_nickname_update_credentials,
admin_users_force_password_reset,
admin_reports,
admin_grouped_reports,

1
include/instance.hpp
View File

@ -32,7 +32,6 @@ namespace mastodonpp
using std::uint64_t;
using std::string;
using std::string_view;
using std::move;
using std::vector;
/*!

2
src/api.cpp
View File

@ -234,6 +234,8 @@ const map<API::endpoint_type,string_view> API::_endpoint_map
"/api/pleroma/admin/users/email_invite"},
{pleroma::admin_users_nickname_password_reset,
"/api/pleroma/admin/users/<NICKNAME>/password_reset"},
{pleroma::admin_users_nickname_update_credentials,
"/api/pleroma/admin/users/<NICKNAME>/update_credentials"},
{pleroma::admin_users_force_password_reset,
"/api/pleroma/admin/users/force_password_reset"},
{pleroma::admin_reports, "/api/pleroma/admin/reports"},