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

Reformat source files.

Browse Source
This commit is contained in:
tastytea 2020-11-13 14:00:03 +01:00
parent 8c7493e68e
commit 9efc8d2dfd
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
7 changed files with 213 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/api.cpp
View File

@ -25,8 +25,7 @@ API::API(const endpoint_type &endpoint)
// TODO: look for a better way. // TODO: look for a better way.
// NOLINTNEXTLINE(cert-err58-cpp) // NOLINTNEXTLINE(cert-err58-cpp)
const map<API::endpoint_type,string_view> API::_endpoint_map const map<API::endpoint_type, string_view> API::_endpoint_map{
{
{v1::apps, "/api/v1/apps"}, {v1::apps, "/api/v1/apps"},
{v1::apps_verify_credentials, "/api/v1/apps/verify_credentials"}, {v1::apps_verify_credentials, "/api/v1/apps/verify_credentials"},
@ -67,7 +66,7 @@ const map<API::endpoint_type,string_view> API::_endpoint_map
{v1::follow_requests, "/api/v1/follow_requests"}, {v1::follow_requests, "/api/v1/follow_requests"},
{v1::follow_requests_id_authorize, {v1::follow_requests_id_authorize,
"/api/v1/follow_requests/<ID>/authorize"}, "/api/v1/follow_requests/<ID>/authorize"},
{v1::follow_requests_id_reject, "/api/v1/follow_requests/<ID>/reject"}, {v1::follow_requests_id_reject, "/api/v1/follow_requests/<ID>/reject"},
{v1::endorsements, "/api/v1/endorsements"}, {v1::endorsements, "/api/v1/endorsements"},
@ -150,7 +149,7 @@ const map<API::endpoint_type,string_view> API::_endpoint_map
{v1::admin_accounts, "/api/v1/admin/accounts"}, {v1::admin_accounts, "/api/v1/admin/accounts"},
{v1::admin_accounts_id, "/api/v1/admin/accounts/<ID>"}, {v1::admin_accounts_id, "/api/v1/admin/accounts/<ID>"},
{v1::admin_accounts_account_id_action, {v1::admin_accounts_account_id_action,
"/api/v1/admin/accounts/<ACCOUNT_ID>/action"}, "/api/v1/admin/accounts/<ACCOUNT_ID>/action"},
{v1::admin_accounts_id_approve, "/api/v1/admin/accounts/<ID>/approve"}, {v1::admin_accounts_id_approve, "/api/v1/admin/accounts/<ID>/approve"},
{v1::admin_accounts_id_reject, "/api/v1/admin/accounts/<ID>/reject"}, {v1::admin_accounts_id_reject, "/api/v1/admin/accounts/<ID>/reject"},
{v1::admin_accounts_id_enable, "/api/v1/admin/accounts/<ID>/enable"}, {v1::admin_accounts_id_enable, "/api/v1/admin/accounts/<ID>/enable"},
@ -159,39 +158,39 @@ const map<API::endpoint_type,string_view> API::_endpoint_map
{v1::admin_reports, "/api/v1/admin/reports"}, {v1::admin_reports, "/api/v1/admin/reports"},
{v1::admin_reports_id, "/api/v1/admin/reports/<ID>"}, {v1::admin_reports_id, "/api/v1/admin/reports/<ID>"},
{v1::admin_reports_id_assign_to_self, {v1::admin_reports_id_assign_to_self,
"/api/v1/admin/reports/<ID>/assign_to_self"}, "/api/v1/admin/reports/<ID>/assign_to_self"},
{v1::admin_reports_id_unassign, "/api/v1/admin/reports/<ID>/unassign"}, {v1::admin_reports_id_unassign, "/api/v1/admin/reports/<ID>/unassign"},
{v1::admin_reports_id_resolve, "/api/v1/admin/reports/<ID>/resolve"}, {v1::admin_reports_id_resolve, "/api/v1/admin/reports/<ID>/resolve"},
{v1::admin_reports_id_reopen, "/api/v1/admin/reports/<ID>/reopen"}, {v1::admin_reports_id_reopen, "/api/v1/admin/reports/<ID>/reopen"},
{v1::pleroma_notifications_read, " /api/v1/pleroma/notifications/read"}, {v1::pleroma_notifications_read, " /api/v1/pleroma/notifications/read"},
{v1::pleroma_accounts_id_subscribe, {v1::pleroma_accounts_id_subscribe,
"/api/v1/pleroma/accounts/<ID>/subscribe"}, "/api/v1/pleroma/accounts/<ID>/subscribe"},
{v1::pleroma_accounts_id_unsubscribe, {v1::pleroma_accounts_id_unsubscribe,
"/api/v1/pleroma/accounts/<ID>/unsubscribe"}, "/api/v1/pleroma/accounts/<ID>/unsubscribe"},
{v1::pleroma_accounts_id_favourites, {v1::pleroma_accounts_id_favourites,
"/api/v1/pleroma/accounts/<ID>/favourites"}, "/api/v1/pleroma/accounts/<ID>/favourites"},
{v1::pleroma_accounts_update_avatar, {v1::pleroma_accounts_update_avatar,
"/api/v1/pleroma/accounts/update_avatar"}, "/api/v1/pleroma/accounts/update_avatar"},
{v1::pleroma_accounts_update_banner, {v1::pleroma_accounts_update_banner,
"/api/v1/pleroma/accounts/update_banner"}, "/api/v1/pleroma/accounts/update_banner"},
{v1::pleroma_accounts_update_background, {v1::pleroma_accounts_update_background,
"/api/v1/pleroma/accounts/update_background"}, "/api/v1/pleroma/accounts/update_background"},
{v1::pleroma_accounts_confirmation_resend, {v1::pleroma_accounts_confirmation_resend,
"/api/v1/pleroma/accounts/confirmation_resend"}, "/api/v1/pleroma/accounts/confirmation_resend"},
{v1::pleroma_mascot, "/api/v1/pleroma/mascot"}, {v1::pleroma_mascot, "/api/v1/pleroma/mascot"},
{v1::pleroma_conversations_id_statuses, {v1::pleroma_conversations_id_statuses,
"/api/v1/pleroma/conversations/<ID>/statuses"}, "/api/v1/pleroma/conversations/<ID>/statuses"},
{v1::pleroma_conversations_id, "/api/v1/pleroma/conversations/<ID>"}, {v1::pleroma_conversations_id, "/api/v1/pleroma/conversations/<ID>"},
{v1::pleroma_conversations_id_read, {v1::pleroma_conversations_id_read,
"/api/v1/pleroma/conversations/<ID>/read"}, "/api/v1/pleroma/conversations/<ID>/read"},
{v1::pleroma_accounts_id_scrobbles, {v1::pleroma_accounts_id_scrobbles,
"/api/v1/pleroma/accounts/<ID>/scrobbles"}, "/api/v1/pleroma/accounts/<ID>/scrobbles"},
{v1::pleroma_scrobble, "/api/v1/pleroma/scrobble"}, {v1::pleroma_scrobble, "/api/v1/pleroma/scrobble"},
{v1::pleroma_statuses_id_reactions_emoji, {v1::pleroma_statuses_id_reactions_emoji,
"/api/v1/pleroma/statuses/<ID>/reactions/<EMOJI>"}, "/api/v1/pleroma/statuses/<ID>/reactions/<EMOJI>"},
{v1::pleroma_statuses_id_reactions, {v1::pleroma_statuses_id_reactions,
"/api/v1/pleroma/statuses/<ID>/reactions"}, "/api/v1/pleroma/statuses/<ID>/reactions"},
{v2::search, "/api/v2/search"}, {v2::search, "/api/v2/search"},
@ -206,66 +205,66 @@ const map<API::endpoint_type,string_view> API::_endpoint_map
{pleroma::admin_users_follow, "/api/pleroma/admin/users/follow"}, {pleroma::admin_users_follow, "/api/pleroma/admin/users/follow"},
{pleroma::admin_users_unfollow, "/api/pleroma/admin/users/unfollow"}, {pleroma::admin_users_unfollow, "/api/pleroma/admin/users/unfollow"},
{pleroma::admin_users_nickname_toggle_activation, {pleroma::admin_users_nickname_toggle_activation,
"/api/pleroma/admin/users/<NICKNAME>/toggle_activation"}, "/api/pleroma/admin/users/<NICKNAME>/toggle_activation"},
{pleroma::admin_users_tag, "/api/pleroma/admin/users/tag"}, {pleroma::admin_users_tag, "/api/pleroma/admin/users/tag"},
{pleroma::admin_users_nickname_permission_group, {pleroma::admin_users_nickname_permission_group,
"/api/pleroma/admin/users/<NICKNAME>/permission_group"}, "/api/pleroma/admin/users/<NICKNAME>/permission_group"},
{pleroma::admin_users_nickname_permission_group_permission_group, {pleroma::admin_users_nickname_permission_group_permission_group,
"/api/pleroma/admin/users/<NICKNAME>" "/api/pleroma/admin/users/<NICKNAME>"
"/permission_group/<PERMISSION_GROUP>"}, "/permission_group/<PERMISSION_GROUP>"},
{pleroma::admin_users_permission_group_permission_group, {pleroma::admin_users_permission_group_permission_group,
"/api/pleroma/admin/users/permission_group/<PERMISSION_GROUP>"}, "/api/pleroma/admin/users/permission_group/<PERMISSION_GROUP>"},
{pleroma::admin_users_activate, "/api/pleroma/admin/users/activate"}, {pleroma::admin_users_activate, "/api/pleroma/admin/users/activate"},
{pleroma::admin_users_deactivate, "/api/pleroma/admin/users/deactivate"}, {pleroma::admin_users_deactivate, "/api/pleroma/admin/users/deactivate"},
{pleroma::admin_users_nickname_or_id, {pleroma::admin_users_nickname_or_id,
"/api/pleroma/admin/users/<NICKNAME_OR_ID>"}, "/api/pleroma/admin/users/<NICKNAME_OR_ID>"},
{pleroma::admin_users_nickname_or_id_statuses, {pleroma::admin_users_nickname_or_id_statuses,
"/api/pleroma/admin/users/<NICKNAME_OR_ID>/statuses"}, "/api/pleroma/admin/users/<NICKNAME_OR_ID>/statuses"},
{pleroma::admin_instances_instance_statuses, {pleroma::admin_instances_instance_statuses,
"/api/pleroma/admin/instances/<INSTANCE>/statuses"}, "/api/pleroma/admin/instances/<INSTANCE>/statuses"},
{pleroma::admin_statuses, "/api/pleroma/admin/statuses"}, {pleroma::admin_statuses, "/api/pleroma/admin/statuses"},
{pleroma::admin_relay, "/api/pleroma/admin/relay"}, {pleroma::admin_relay, "/api/pleroma/admin/relay"},
{pleroma::admin_users_invite_token, {pleroma::admin_users_invite_token,
"/api/pleroma/admin/users/invite_token"}, "/api/pleroma/admin/users/invite_token"},
{pleroma::admin_users_invites, "/api/pleroma/admin/users/invites"}, {pleroma::admin_users_invites, "/api/pleroma/admin/users/invites"},
{pleroma::admin_users_revoke_invite, {pleroma::admin_users_revoke_invite,
"/api/pleroma/admin/users/revoke_invite"}, "/api/pleroma/admin/users/revoke_invite"},
{pleroma::admin_users_email_invite, {pleroma::admin_users_email_invite,
"/api/pleroma/admin/users/email_invite"}, "/api/pleroma/admin/users/email_invite"},
{pleroma::admin_users_nickname_password_reset, {pleroma::admin_users_nickname_password_reset,
"/api/pleroma/admin/users/<NICKNAME>/password_reset"}, "/api/pleroma/admin/users/<NICKNAME>/password_reset"},
{pleroma::admin_users_nickname_update_credentials, {pleroma::admin_users_nickname_update_credentials,
"/api/pleroma/admin/users/<NICKNAME>/update_credentials"}, "/api/pleroma/admin/users/<NICKNAME>/update_credentials"},
{pleroma::admin_users_force_password_reset, {pleroma::admin_users_force_password_reset,
"/api/pleroma/admin/users/force_password_reset"}, "/api/pleroma/admin/users/force_password_reset"},
{pleroma::admin_reports, "/api/pleroma/admin/reports"}, {pleroma::admin_reports, "/api/pleroma/admin/reports"},
{pleroma::admin_grouped_reports, "/api/pleroma/admin/grouped_reports"}, {pleroma::admin_grouped_reports, "/api/pleroma/admin/grouped_reports"},
{pleroma::admin_reports_id, "/api/pleroma/admin/reports/<ID>"}, {pleroma::admin_reports_id, "/api/pleroma/admin/reports/<ID>"},
{pleroma::admin_reports_id_notes, "/api/pleroma/admin/reports/<ID>/notes"}, {pleroma::admin_reports_id_notes, "/api/pleroma/admin/reports/<ID>/notes"},
{pleroma::admin_reports_report_id_notes_id, {pleroma::admin_reports_report_id_notes_id,
"/api/pleroma/admin/reports/<REPORT_ID>/notes/<ID>"}, "/api/pleroma/admin/reports/<REPORT_ID>/notes/<ID>"},
{pleroma::admin_statuses_id, "/api/pleroma/admin/statuses/<ID>"}, {pleroma::admin_statuses_id, "/api/pleroma/admin/statuses/<ID>"},
{pleroma::admin_restart, "/api/pleroma/admin/restart"}, {pleroma::admin_restart, "/api/pleroma/admin/restart"},
{pleroma::admin_config, "/api/pleroma/admin/config"}, {pleroma::admin_config, "/api/pleroma/admin/config"},
{pleroma::admin_config_descriptions, {pleroma::admin_config_descriptions,
"/api/pleroma/admin/config/descriptions"}, "/api/pleroma/admin/config/descriptions"},
{pleroma::admin_moderation_log, "/api/pleroma/admin/moderation_log"}, {pleroma::admin_moderation_log, "/api/pleroma/admin/moderation_log"},
{pleroma::admin_reload_emoji, "/api/pleroma/admin/reload_emoji"}, {pleroma::admin_reload_emoji, "/api/pleroma/admin/reload_emoji"},
{pleroma::admin_users_confirm_email, {pleroma::admin_users_confirm_email,
"/api/pleroma/admin/users/confirm_email"}, "/api/pleroma/admin/users/confirm_email"},
{pleroma::admin_users_resend_confirm_email, {pleroma::admin_users_resend_confirm_email,
"/api/pleroma/admin/users/resend_confirm_email"}, "/api/pleroma/admin/users/resend_confirm_email"},
{pleroma::admin_stats, "/api/pleroma/admin/stats"}, {pleroma::admin_stats, "/api/pleroma/admin/stats"},
{pleroma::admin_users_nickname, "/api/pleroma/admin/users/<NICKNAME>"}, {pleroma::admin_users_nickname, "/api/pleroma/admin/users/<NICKNAME>"},
{pleroma::admin_users_nickname_activation_status, {pleroma::admin_users_nickname_activation_status,
"/api/pleroma/admin/users/<NICKNAME>/activation_status"}, "/api/pleroma/admin/users/<NICKNAME>/activation_status"},
{pleroma::admin_reports_id_respond, {pleroma::admin_reports_id_respond,
"/api/pleroma/admin/reports/<ID>/respond"}, "/api/pleroma/admin/reports/<ID>/respond"},
{pleroma::admin_config_migrate_to_db, {pleroma::admin_config_migrate_to_db,
"/api/pleroma/admin/config/migrate_to_db"}, "/api/pleroma/admin/config/migrate_to_db"},
{pleroma::admin_config_migrate_from_db, {pleroma::admin_config_migrate_from_db,
"/api/pleroma/admin/config/migrate_from_db"}, "/api/pleroma/admin/config/migrate_from_db"},
{pleroma::emoji, "/api/pleroma/emoji"}, {pleroma::emoji, "/api/pleroma/emoji"},
{pleroma::follow_import, "/api/pleroma/follow_import"}, {pleroma::follow_import, "/api/pleroma/follow_import"},
@ -278,18 +277,16 @@ const map<API::endpoint_type,string_view> API::_endpoint_map
{pleroma::emoji_packs, "/api/pleroma/emoji/packs"}, {pleroma::emoji_packs, "/api/pleroma/emoji/packs"},
{pleroma::emoji_packs_name, "/api/pleroma/emoji/packs/<NAME>"}, {pleroma::emoji_packs_name, "/api/pleroma/emoji/packs/<NAME>"},
{pleroma::emoji_packs_name_update_file, {pleroma::emoji_packs_name_update_file,
"/api/pleroma/emoji/packs/<NAME>/update_file"}, "/api/pleroma/emoji/packs/<NAME>/update_file"},
{pleroma::emoji_packs_name_update_metadata, {pleroma::emoji_packs_name_update_metadata,
"/api/pleroma/emoji/packs/<NAME>/update_metadata"}, "/api/pleroma/emoji/packs/<NAME>/update_metadata"},
{pleroma::emoji_packs_download_from, {pleroma::emoji_packs_download_from,
"/api/pleroma/emoji/packs/download_from"}, "/api/pleroma/emoji/packs/download_from"},
{pleroma::emoji_packs_list_from, {pleroma::emoji_packs_list_from, "/api/pleroma/emoji/packs/list_from"},
"/api/pleroma/emoji/packs/list_from"},
{pleroma::emoji_packs_name_download_shared, {pleroma::emoji_packs_name_download_shared,
"/api/pleroma/emoji/packs/<NAME>/download_shared"}, "/api/pleroma/emoji/packs/<NAME>/download_shared"},
{pleroma::account_register, "/api/pleroma/account/register"}, {pleroma::account_register, "/api/pleroma/account/register"},
}; };
} // namespace mastodonpp } // namespace mastodonpp

24
src/connection.cpp
View File

@ -25,8 +25,8 @@ string Connection::endpoint_to_uri(const endpoint_variant &endpoint) const
{ {
if (holds_alternative<API::endpoint_type>(endpoint)) if (holds_alternative<API::endpoint_type>(endpoint))
{ {
return string(_baseuri) return string(_baseuri) += API{std::get<API::endpoint_type>(endpoint)}
+= API{std::get<API::endpoint_type>(endpoint)}.to_string_view(); .to_string_view();
} }
return string(_baseuri) += std::get<string_view>(endpoint); return string(_baseuri) += std::get<string_view>(endpoint);
} }
@ -34,36 +34,36 @@ string Connection::endpoint_to_uri(const endpoint_variant &endpoint) const
answer_type Connection::get(const endpoint_variant &endpoint, answer_type Connection::get(const endpoint_variant &endpoint,
const parametermap &parameters) const parametermap &parameters)
{ {
return make_request(http_method::GET, return make_request(http_method::GET, endpoint_to_uri(endpoint),
endpoint_to_uri(endpoint), parameters); parameters);
} }
answer_type Connection::post(const endpoint_variant &endpoint, answer_type Connection::post(const endpoint_variant &endpoint,
const parametermap &parameters) const parametermap &parameters)
{ {
return make_request(http_method::POST, return make_request(http_method::POST, endpoint_to_uri(endpoint),
endpoint_to_uri(endpoint), parameters); parameters);
} }
answer_type Connection::patch(const endpoint_variant &endpoint, answer_type Connection::patch(const endpoint_variant &endpoint,
const parametermap &parameters) const parametermap &parameters)
{ {
return make_request(http_method::PATCH, return make_request(http_method::PATCH, endpoint_to_uri(endpoint),
endpoint_to_uri(endpoint), parameters); parameters);
} }
answer_type Connection::put(const endpoint_variant &endpoint, answer_type Connection::put(const endpoint_variant &endpoint,
const parametermap &parameters) const parametermap &parameters)
{ {
return make_request(http_method::PUT, return make_request(http_method::PUT, endpoint_to_uri(endpoint),
endpoint_to_uri(endpoint), parameters); parameters);
} }
answer_type Connection::del(const endpoint_variant &endpoint, answer_type Connection::del(const endpoint_variant &endpoint,
const parametermap &parameters) const parametermap &parameters)
{ {
return make_request(http_method::DELETE, return make_request(http_method::DELETE, endpoint_to_uri(endpoint),
endpoint_to_uri(endpoint), parameters); parameters);
} }
string Connection::get_new_stream_contents() string Connection::get_new_stream_contents()

59
src/curl_wrapper.cpp
View File

@ -15,6 +15,7 @@
*/ */
#include "curl_wrapper.hpp" #include "curl_wrapper.hpp"
#include "exceptions.hpp" #include "exceptions.hpp"
#include "log.hpp" #include "log.hpp"
#include "version.hpp" #include "version.hpp"
@ -28,15 +29,15 @@
namespace mastodonpp namespace mastodonpp
{ {
using std::any_of;
using std::array; // NOLINT(misc-unused-using-decls)
using std::atomic;
using std::get; using std::get;
using std::holds_alternative; using std::holds_alternative;
using std::any_of;
using std::transform;
using std::array; // NOLINT(misc-unused-using-decls)
using std::atomic;
using std::toupper; using std::toupper;
using std::uint8_t; using std::transform;
using std::uint16_t; using std::uint16_t;
using std::uint8_t;
// No one will ever need more than 65535 connections. 😉 // No one will ever need more than 65535 connections. 😉
static atomic<uint16_t> curlwrapper_instances{0}; static atomic<uint16_t> curlwrapper_instances{0};
@ -185,7 +186,7 @@ answer_type CURLWrapper::make_request(const http_method &method, string uri,
if (code == CURLE_OK if (code == CURLE_OK
|| (code == CURLE_ABORTED_BY_CALLBACK && _stream_cancelled)) || (code == CURLE_ABORTED_BY_CALLBACK && _stream_cancelled))
{ {
long http_status; // NOLINT(google-runtime-int) long http_status; // NOLINT(google-runtime-int)
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg) // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
curl_easy_getinfo(_connection, CURLINFO_RESPONSE_CODE, &http_status); curl_easy_getinfo(_connection, CURLINFO_RESPONSE_CODE, &http_status);
answer.http_status = static_cast<uint16_t>(http_status); answer.http_status = static_cast<uint16_t>(http_status);
@ -250,11 +251,11 @@ void CURLWrapper::set_access_token(const string_view access_token)
if (code != CURLE_OK) if (code != CURLE_OK)
{ {
throw CURLException{code, "Could not set authorization token.", throw CURLException{code, "Could not set authorization token.",
_curl_buffer_error}; _curl_buffer_error};
} }
#if (LIBCURL_VERSION_NUM < 0x073d00) // libcurl < 7.61.0. #if (LIBCURL_VERSION_NUM < 0x073d00) // libcurl < 7.61.0.
#define CURLAUTH_BEARER CURLAUTH_ANY # define CURLAUTH_BEARER CURLAUTH_ANY
#endif #endif
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg, hicpp-signed-bitwise) // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg, hicpp-signed-bitwise)
@ -262,7 +263,7 @@ void CURLWrapper::set_access_token(const string_view access_token)
if (code != CURLE_OK) if (code != CURLE_OK)
{ {
throw CURLException{code, "Could not set authorization token.", throw CURLException{code, "Could not set authorization token.",
_curl_buffer_error}; _curl_buffer_error};
} }
debuglog << "Set authorization token.\n"; debuglog << "Set authorization token.\n";
@ -281,19 +282,19 @@ void CURLWrapper::set_cainfo(const string_view path)
void CURLWrapper::set_useragent(const string_view useragent) void CURLWrapper::set_useragent(const string_view useragent)
{ {
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg) // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg)
CURLcode code{curl_easy_setopt(_connection, CURLOPT_USERAGENT, CURLcode code{
useragent.data())}; curl_easy_setopt(_connection, CURLOPT_USERAGENT, useragent.data())};
if (code != CURLE_OK) if (code != CURLE_OK)
{ {
throw CURLException{code, "Failed to set User-Agent", throw CURLException{code, "Failed to set User-Agent",
_curl_buffer_error}; _curl_buffer_error};
} }
debuglog << "Set User-Agent to: " << useragent << '\n'; debuglog << "Set User-Agent to: " << useragent << '\n';
} }
size_t CURLWrapper::writer_body(char *data, size_t size, size_t nmemb) size_t CURLWrapper::writer_body(char *data, size_t size, size_t nmemb)
{ {
if(data == nullptr) if (data == nullptr)
{ {
return 0; return 0;
} }
@ -307,7 +308,7 @@ size_t CURLWrapper::writer_body(char *data, size_t size, size_t nmemb)
size_t CURLWrapper::writer_header(char *data, size_t size, size_t nmemb) size_t CURLWrapper::writer_header(char *data, size_t size, size_t nmemb)
{ {
if(data == nullptr) if (data == nullptr)
{ {
return 0; return 0;
} }
@ -317,8 +318,8 @@ size_t CURLWrapper::writer_header(char *data, size_t size, size_t nmemb)
return size * nmemb; return size * nmemb;
} }
int CURLWrapper::progress(void *, curl_off_t , curl_off_t , int CURLWrapper::progress(void *, curl_off_t, curl_off_t, curl_off_t,
curl_off_t , curl_off_t ) curl_off_t)
{ {
if (_stream_cancelled) if (_stream_cancelled)
{ {
@ -371,21 +372,25 @@ void CURLWrapper::setup_curl()
bool CURLWrapper::replace_parameter_in_uri(string &uri, bool CURLWrapper::replace_parameter_in_uri(string &uri,
const parameterpair &parameter) const parameterpair &parameter)
{ {
static constexpr array replace static constexpr array replace{"id",
{ "nickname",
"id", "nickname", "nickname_or_id", "account_id", "list_id", "nickname_or_id",
"hashtag", "permission_group", "instance", "report_id", "name", "account_id",
"emoji" "list_id",
}; "hashtag",
"permission_group",
"instance",
"report_id",
"name",
"emoji"};
if (any_of(replace.begin(), replace.end(), if (any_of(replace.begin(), replace.end(),
[&parameter](const auto &s) { return s == parameter.first; })) [&parameter](const auto &s) { return s == parameter.first; }))
{ {
const string searchstring{[&parameter] const string searchstring{[&parameter] {
{
string s{"<"}; string s{"<"};
s += parameter.first; s += parameter.first;
transform(s.begin(), s.end(), s.begin(), transform(s.begin(), s.end(), s.begin(),
[](const unsigned char c){ return toupper(c); }); [](const unsigned char c) { return toupper(c); });
return s; return s;
}()}; }()};
const auto pos{uri.find(searchstring)}; const auto pos{uri.find(searchstring)};
@ -441,8 +446,8 @@ void CURLWrapper::add_parameters_to_uri(string &uri,
} }
} }
void CURLWrapper::add_mime_part(curl_mime *mime, void CURLWrapper::add_mime_part(curl_mime *mime, string_view name,
string_view name, string_view data) string_view data)
{ {
curl_mimepart *part{curl_mime_addpart(mime)}; curl_mimepart *part{curl_mime_addpart(mime)};
if (part == nullptr) if (part == nullptr)

2
src/exceptions.cpp
View File

@ -21,8 +21,8 @@
namespace mastodonpp namespace mastodonpp
{ {
using std::to_string;
using std::move; using std::move;
using std::to_string;
CURLException::CURLException(const CURLcode &error, string message) CURLException::CURLException(const CURLcode &error, string message)
: error_code{error} : error_code{error}

237
src/helpers.cpp
View File

@ -26,15 +26,15 @@
namespace mastodonpp namespace mastodonpp
{ {
using std::stoul;
using std::codecvt_utf8; using std::codecvt_utf8;
using std::wstring_convert;
using std::map; using std::map;
using std::move;
using std::regex; using std::regex;
using std::regex_search; using std::regex_search;
using std::smatch; using std::smatch;
using std::stoul;
using std::string_view; using std::string_view;
using std::move; using std::wstring_convert;
string unescape_html(string html) string unescape_html(string html)
{ {
@ -43,145 +43,100 @@ string unescape_html(string html)
// Source: https://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_ // Source: https://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_
// entity_references#Character_entity_references_in_HTML // entity_references#Character_entity_references_in_HTML
const map<string_view, char32_t> names const map<string_view, char32_t>
{ names{{"exclamation", 0x0021}, {"quot", 0x0022}, {"percent", 0x0025},
{ "exclamation", 0x0021 }, { "quot", 0x0022 }, {"amp", 0x0026}, {"apos", 0x0027}, {"add", 0x002B},
{ "percent", 0x0025 }, { "amp", 0x0026 }, {"lt", 0x003C}, {"equal", 0x003D}, {"gt", 0x003E},
{ "apos", 0x0027 }, { "add", 0x002B }, {"nbsp", 0x00A0}, {"iexcl", 0x00A1}, {"cent", 0x00A2},
{ "lt", 0x003C }, { "equal", 0x003D }, {"pound", 0x00A3}, {"curren", 0x00A4}, {"yen", 0x00A5},
{ "gt", 0x003E }, { "nbsp", 0x00A0 }, {"brvbar", 0x00A6}, {"sect", 0x00A7}, {"uml", 0x00A8},
{ "iexcl", 0x00A1 }, { "cent", 0x00A2 }, {"copy", 0x00A9}, {"ordf", 0x00AA}, {"laquo", 0x00AB},
{ "pound", 0x00A3 }, { "curren", 0x00A4 }, {"not", 0x00AC}, {"shy", 0x00AD}, {"reg", 0x00AE},
{ "yen", 0x00A5 }, { "brvbar", 0x00A6 }, {"macr", 0x00AF}, {"deg", 0x00B0}, {"plusmn", 0x00B1},
{ "sect", 0x00A7 }, { "uml", 0x00A8 }, {"sup2", 0x00B2}, {"sup3", 0x00B3}, {"acute", 0x00B4},
{ "copy", 0x00A9 }, { "ordf", 0x00AA }, {"micro", 0x00B5}, {"para", 0x00B6}, {"middot", 0x00B7},
{ "laquo", 0x00AB }, { "not", 0x00AC }, {"cedil", 0x00B8}, {"sup1", 0x00B9}, {"ordm", 0x00BA},
{ "shy", 0x00AD }, { "reg", 0x00AE }, {"raquo", 0x00BB}, {"frac14", 0x00BC}, {"frac12", 0x00BD},
{ "macr", 0x00AF }, { "deg", 0x00B0 }, {"frac34", 0x00BE}, {"iquest", 0x00BF}, {"Agrave", 0x00C0},
{ "plusmn", 0x00B1 }, { "sup2", 0x00B2 }, {"Aacute", 0x00C1}, {"Acirc", 0x00C2}, {"Atilde", 0x00C3},
{ "sup3", 0x00B3 }, { "acute", 0x00B4 }, {"Auml", 0x00C4}, {"Aring", 0x00C5}, {"AElig", 0x00C6},
{ "micro", 0x00B5 }, { "para", 0x00B6 }, {"Ccedil", 0x00C7}, {"Egrave", 0x00C8}, {"Eacute", 0x00C9},
{ "middot", 0x00B7 }, { "cedil", 0x00B8 }, {"Ecirc", 0x00CA}, {"Euml", 0x00CB}, {"Igrave", 0x00CC},
{ "sup1", 0x00B9 }, { "ordm", 0x00BA }, {"Iacute", 0x00CD}, {"Icirc", 0x00CE}, {"Iuml", 0x00CF},
{ "raquo", 0x00BB }, { "frac14", 0x00BC }, {"ETH", 0x00D0}, {"Ntilde", 0x00D1}, {"Ograve", 0x00D2},
{ "frac12", 0x00BD }, { "frac34", 0x00BE }, {"Oacute", 0x00D3}, {"Ocirc", 0x00D4}, {"Otilde", 0x00D5},
{ "iquest", 0x00BF }, { "Agrave", 0x00C0 }, {"Ouml", 0x00D6}, {"times", 0x00D7}, {"Oslash", 0x00D8},
{ "Aacute", 0x00C1 }, { "Acirc", 0x00C2 }, {"Ugrave", 0x00D9}, {"Uacute", 0x00DA}, {"Ucirc", 0x00DB},
{ "Atilde", 0x00C3 }, { "Auml", 0x00C4 }, {"Uuml", 0x00DC}, {"Yacute", 0x00DD}, {"THORN", 0x00DE},
{ "Aring", 0x00C5 }, { "AElig", 0x00C6 }, {"szlig", 0x00DF}, {"agrave", 0x00E0}, {"aacute", 0x00E1},
{ "Ccedil", 0x00C7 }, { "Egrave", 0x00C8 }, {"acirc", 0x00E2}, {"atilde", 0x00E3}, {"auml", 0x00E4},
{ "Eacute", 0x00C9 }, { "Ecirc", 0x00CA }, {"aring", 0x00E5}, {"aelig", 0x00E6}, {"ccedil", 0x00E7},
{ "Euml", 0x00CB }, { "Igrave", 0x00CC }, {"egrave", 0x00E8}, {"eacute", 0x00E9}, {"ecirc", 0x00EA},
{ "Iacute", 0x00CD }, { "Icirc", 0x00CE }, {"euml", 0x00EB}, {"igrave", 0x00EC}, {"iacute", 0x00ED},
{ "Iuml", 0x00CF }, { "ETH", 0x00D0 }, {"icirc", 0x00EE}, {"iuml", 0x00EF}, {"eth", 0x00F0},
{ "Ntilde", 0x00D1 }, { "Ograve", 0x00D2 }, {"ntilde", 0x00F1}, {"ograve", 0x00F2}, {"oacute", 0x00F3},
{ "Oacute", 0x00D3 }, { "Ocirc", 0x00D4 }, {"ocirc", 0x00F4}, {"otilde", 0x00F5}, {"ouml", 0x00F6},
{ "Otilde", 0x00D5 }, { "Ouml", 0x00D6 }, {"divide", 0x00F7}, {"oslash", 0x00F8}, {"ugrave", 0x00F9},
{ "times", 0x00D7 }, { "Oslash", 0x00D8 }, {"uacute", 0x00FA}, {"ucirc", 0x00FB}, {"uuml", 0x00FC},
{ "Ugrave", 0x00D9 }, { "Uacute", 0x00DA }, {"yacute", 0x00FD}, {"thorn", 0x00FE}, {"yuml", 0x00FF},
{ "Ucirc", 0x00DB }, { "Uuml", 0x00DC }, {"OElig", 0x0152}, {"oelig", 0x0153}, {"Scaron", 0x0160},
{ "Yacute", 0x00DD }, { "THORN", 0x00DE }, {"scaron", 0x0161}, {"Yuml", 0x0178}, {"fnof", 0x0192},
{ "szlig", 0x00DF }, { "agrave", 0x00E0 }, {"circ", 0x02C6}, {"tilde", 0x02DC}, {"Alpha", 0x0391},
{ "aacute", 0x00E1 }, { "acirc", 0x00E2 }, {"Beta", 0x0392}, {"Gamma", 0x0393}, {"Delta", 0x0394},
{ "atilde", 0x00E3 }, { "auml", 0x00E4 }, {"Epsilon", 0x0395}, {"Zeta", 0x0396}, {"Eta", 0x0397},
{ "aring", 0x00E5 }, { "aelig", 0x00E6 }, {"Theta", 0x0398}, {"Iota", 0x0399}, {"Kappa", 0x039A},
{ "ccedil", 0x00E7 }, { "egrave", 0x00E8 }, {"Lambda", 0x039B}, {"Mu", 0x039C}, {"Nu", 0x039D},
{ "eacute", 0x00E9 }, { "ecirc", 0x00EA }, {"Xi", 0x039E}, {"Omicron", 0x039F}, {"Pi", 0x03A0},
{ "euml", 0x00EB }, { "igrave", 0x00EC }, {"Rho", 0x03A1}, {"Sigma", 0x03A3}, {"Tau", 0x03A4},
{ "iacute", 0x00ED }, { "icirc", 0x00EE }, {"Upsilon", 0x03A5}, {"Phi", 0x03A6}, {"Chi", 0x03A7},
{ "iuml", 0x00EF }, { "eth", 0x00F0 }, {"Psi", 0x03A8}, {"Omega", 0x03A9}, {"alpha", 0x03B1},
{ "ntilde", 0x00F1 }, { "ograve", 0x00F2 }, {"beta", 0x03B2}, {"gamma", 0x03B3}, {"delta", 0x03B4},
{ "oacute", 0x00F3 }, { "ocirc", 0x00F4 }, {"epsilon", 0x03B5}, {"zeta", 0x03B6}, {"eta", 0x03B7},
{ "otilde", 0x00F5 }, { "ouml", 0x00F6 }, {"theta", 0x03B8}, {"iota", 0x03B9}, {"kappa", 0x03BA},
{ "divide", 0x00F7 }, { "oslash", 0x00F8 }, {"lambda", 0x03BB}, {"mu", 0x03BC}, {"nu", 0x03BD},
{ "ugrave", 0x00F9 }, { "uacute", 0x00FA }, {"xi", 0x03BE}, {"omicron", 0x03BF}, {"pi", 0x03C0},
{ "ucirc", 0x00FB }, { "uuml", 0x00FC }, {"rho", 0x03C1}, {"sigmaf", 0x03C2}, {"sigma", 0x03C3},
{ "yacute", 0x00FD }, { "thorn", 0x00FE }, {"tau", 0x03C4}, {"upsilon", 0x03C5}, {"phi", 0x03C6},
{ "yuml", 0x00FF }, { "OElig", 0x0152 }, {"chi", 0x03C7}, {"psi", 0x03C8}, {"omega", 0x03C9},
{ "oelig", 0x0153 }, { "Scaron", 0x0160 }, {"thetasym", 0x03D1}, {"upsih", 0x03D2}, {"piv", 0x03D6},
{ "scaron", 0x0161 }, { "Yuml", 0x0178 }, {"ensp", 0x2002}, {"emsp", 0x2003}, {"thinsp", 0x2009},
{ "fnof", 0x0192 }, { "circ", 0x02C6 }, {"zwnj", 0x200C}, {"zwj", 0x200D}, {"lrm", 0x200E},
{ "tilde", 0x02DC }, { "Alpha", 0x0391 }, {"rlm", 0x200F}, {"ndash", 0x2013}, {"mdash", 0x2014},
{ "Beta", 0x0392 }, { "Gamma", 0x0393 }, {"horbar", 0x2015}, {"lsquo", 0x2018}, {"rsquo", 0x2019},
{ "Delta", 0x0394 }, { "Epsilon", 0x0395 }, {"sbquo", 0x201A}, {"ldquo", 0x201C}, {"rdquo", 0x201D},
{ "Zeta", 0x0396 }, { "Eta", 0x0397 }, {"bdquo", 0x201E}, {"dagger", 0x2020}, {"Dagger", 0x2021},
{ "Theta", 0x0398 }, { "Iota", 0x0399 }, {"bull", 0x2022}, {"hellip", 0x2026}, {"permil", 0x2030},
{ "Kappa", 0x039A }, { "Lambda", 0x039B }, {"prime", 0x2032}, {"Prime", 0x2033}, {"lsaquo", 0x2039},
{ "Mu", 0x039C }, { "Nu", 0x039D }, {"rsaquo", 0x203A}, {"oline", 0x203E}, {"frasl", 0x2044},
{ "Xi", 0x039E }, { "Omicron", 0x039F }, {"euro", 0x20AC}, {"image", 0x2111}, {"weierp", 0x2118},
{ "Pi", 0x03A0 }, { "Rho", 0x03A1 }, {"real", 0x211C}, {"trade", 0x2122}, {"alefsym", 0x2135},
{ "Sigma", 0x03A3 }, { "Tau", 0x03A4 }, {"larr", 0x2190}, {"uarr", 0x2191}, {"rarr", 0x2192},
{ "Upsilon", 0x03A5 }, { "Phi", 0x03A6 }, {"darr", 0x2193}, {"harr", 0x2194}, {"crarr", 0x21B5},
{ "Chi", 0x03A7 }, { "Psi", 0x03A8 }, {"lArr", 0x21D0}, {"uArr", 0x21D1}, {"rArr", 0x21D2},
{ "Omega", 0x03A9 }, { "alpha", 0x03B1 }, {"dArr", 0x21D3}, {"hArr", 0x21D4}, {"forall", 0x2200},
{ "beta", 0x03B2 }, { "gamma", 0x03B3 }, {"part", 0x2202}, {"exist", 0x2203}, {"empty", 0x2205},
{ "delta", 0x03B4 }, { "epsilon", 0x03B5 }, {"nabla", 0x2207}, {"isin", 0x2208}, {"notin", 0x2209},
{ "zeta", 0x03B6 }, { "eta", 0x03B7 }, {"ni", 0x220B}, {"prod", 0x220F}, {"sum", 0x2211},
{ "theta", 0x03B8 }, { "iota", 0x03B9 }, {"minus", 0x2212}, {"lowast", 0x2217}, {"radic", 0x221A},
{ "kappa", 0x03BA }, { "lambda", 0x03BB }, {"prop", 0x221D}, {"infin", 0x221E}, {"ang", 0x2220},
{ "mu", 0x03BC }, { "nu", 0x03BD }, {"and", 0x2227}, {"or", 0x2228}, {"cap", 0x2229},
{ "xi", 0x03BE }, { "omicron", 0x03BF }, {"cup", 0x222A}, {"int", 0x222B}, {"there4", 0x2234},
{ "pi", 0x03C0 }, { "rho", 0x03C1 }, {"sim", 0x223C}, {"cong", 0x2245}, {"asymp", 0x2248},
{ "sigmaf", 0x03C2 }, { "sigma", 0x03C3 }, {"ne", 0x2260}, {"equiv", 0x2261}, {"le", 0x2264},
{ "tau", 0x03C4 }, { "upsilon", 0x03C5 }, {"ge", 0x2265}, {"sub", 0x2282}, {"sup", 0x2283},
{ "phi", 0x03C6 }, { "chi", 0x03C7 }, {"nsub", 0x2284}, {"sube", 0x2286}, {"supe", 0x2287},
{ "psi", 0x03C8 }, { "omega", 0x03C9 }, {"oplus", 0x2295}, {"otimes", 0x2297}, {"perp", 0x22A5},
{ "thetasym", 0x03D1 }, { "upsih", 0x03D2 }, {"sdot", 0x22C5}, {"lceil", 0x2308}, {"rceil", 0x2309},
{ "piv", 0x03D6 }, { "ensp", 0x2002 }, {"lfloor", 0x230A}, {"rfloor", 0x230B}, {"lang", 0x2329},
{ "emsp", 0x2003 }, { "thinsp", 0x2009 }, {"rang", 0x232A}, {"loz", 0x25CA}, {"spades", 0x2660},
{ "zwnj", 0x200C }, { "zwj", 0x200D }, {"clubs", 0x2663}, {"hearts", 0x2665}, {"diams", 0x2666}};
{ "lrm", 0x200E }, { "rlm", 0x200F },
{ "ndash", 0x2013 }, { "mdash", 0x2014 },
{ "horbar", 0x2015 }, { "lsquo", 0x2018 },
{ "rsquo", 0x2019 }, { "sbquo", 0x201A },
{ "ldquo", 0x201C }, { "rdquo", 0x201D },
{ "bdquo", 0x201E }, { "dagger", 0x2020 },
{ "Dagger", 0x2021 }, { "bull", 0x2022 },
{ "hellip", 0x2026 }, { "permil", 0x2030 },
{ "prime", 0x2032 }, { "Prime", 0x2033 },
{ "lsaquo", 0x2039 }, { "rsaquo", 0x203A },
{ "oline", 0x203E }, { "frasl", 0x2044 },
{ "euro", 0x20AC }, { "image", 0x2111 },
{ "weierp", 0x2118 }, { "real", 0x211C },
{ "trade", 0x2122 }, { "alefsym", 0x2135 },
{ "larr", 0x2190 }, { "uarr", 0x2191 },
{ "rarr", 0x2192 }, { "darr", 0x2193 },
{ "harr", 0x2194 }, { "crarr", 0x21B5 },
{ "lArr", 0x21D0 }, { "uArr", 0x21D1 },
{ "rArr", 0x21D2 }, { "dArr", 0x21D3 },
{ "hArr", 0x21D4 }, { "forall", 0x2200 },
{ "part", 0x2202 }, { "exist", 0x2203 },
{ "empty", 0x2205 }, { "nabla", 0x2207 },
{ "isin", 0x2208 }, { "notin", 0x2209 },
{ "ni", 0x220B }, { "prod", 0x220F },
{ "sum", 0x2211 }, { "minus", 0x2212 },
{ "lowast", 0x2217 }, { "radic", 0x221A },
{ "prop", 0x221D }, { "infin", 0x221E },
{ "ang", 0x2220 }, { "and", 0x2227 },
{ "or", 0x2228 }, { "cap", 0x2229 },
{ "cup", 0x222A }, { "int", 0x222B },
{ "there4", 0x2234 }, { "sim", 0x223C },
{ "cong", 0x2245 }, { "asymp", 0x2248 },
{ "ne", 0x2260 }, { "equiv", 0x2261 },
{ "le", 0x2264 }, { "ge", 0x2265 },
{ "sub", 0x2282 }, { "sup", 0x2283 },
{ "nsub", 0x2284 }, { "sube", 0x2286 },
{ "supe", 0x2287 }, { "oplus", 0x2295 },
{ "otimes", 0x2297 }, { "perp", 0x22A5 },
{ "sdot", 0x22C5 }, { "lceil", 0x2308 },
{ "rceil", 0x2309 }, { "lfloor", 0x230A },
{ "rfloor", 0x230B }, { "lang", 0x2329 },
{ "rang", 0x232A }, { "loz", 0x25CA },
{ "spades", 0x2660 }, { "clubs", 0x2663 },
{ "hearts", 0x2665 }, { "diams", 0x2666 }
};
// Used to convert number to utf-8 char. // Used to convert number to utf-8 char.
wstring_convert<codecvt_utf8<char32_t>, char32_t> u8c; wstring_convert<codecvt_utf8<char32_t>, char32_t> u8c;
// Matches numbered entities between 1 and 8 digits, decimal or hexadecimal, // Matches numbered entities between 1 and 8 digits, decimal or hexadecimal,
// or named entities. // or named entities.
const regex re_entity{"&(#(x)?([[:alnum:]]{1,8})" const regex re_entity{"&(#(x)?([[:alnum:]]{1,8})"
"|[^;[:space:][:punct:]]+);"}; "|[^;[:space:][:punct:]]+);"};
smatch match; smatch match;
while (regex_search(buffer, match, re_entity)) while (regex_search(buffer, match, re_entity))
@ -189,8 +144,10 @@ string unescape_html(string html)
output += match.prefix().str(); output += match.prefix().str();
try try
{ {
// clang-format off
const char32_t codepoint{[&match, &names] const char32_t codepoint{[&match, &names]
{ {
// clang-format on
// If it doesn't start with a '#' it is a named entity. // If it doesn't start with a '#' it is a named entity.
if (match[1].str()[0] != '#') if (match[1].str()[0] != '#')
{ {
@ -199,12 +156,12 @@ string unescape_html(string html)
// 'x' after '#' means the number is hexadecimal. // 'x' after '#' means the number is hexadecimal.
if (match[2].length() == 1) if (match[2].length() == 1)
{ {
return static_cast<char32_t>(stoul(match[3].str(), return static_cast<char32_t>(
nullptr, 16)); stoul(match[3].str(), nullptr, 16));
} }
// '#' without 'x' means the number is decimal. // '#' without 'x' means the number is decimal.
return static_cast<char32_t>(stoul(match[3].str(), return static_cast<char32_t>(
nullptr, 10)); stoul(match[3].str(), nullptr, 10));
}()}; }()};
output += u8c.to_bytes(codepoint); output += u8c.to_bytes(codepoint);
} }

41
src/instance.cpp
View File

@ -15,6 +15,7 @@
*/ */
#include "instance.hpp" #include "instance.hpp"
#include "log.hpp" #include "log.hpp"
#include <algorithm> #include <algorithm>
@ -24,12 +25,12 @@
namespace mastodonpp namespace mastodonpp
{ {
using std::sort;
using std::stoull;
using std::exception; using std::exception;
using std::regex; using std::regex;
using std::regex_search; using std::regex_search;
using std::smatch; using std::smatch;
using std::sort;
using std::stoull;
Instance::Instance(const string_view hostname, const string_view access_token) Instance::Instance(const string_view hostname, const string_view access_token)
: _hostname{hostname} : _hostname{hostname}
@ -50,8 +51,8 @@ Instance::Instance(const Instance &other)
, _cainfo{other._cainfo} , _cainfo{other._cainfo}
, _useragent{other._useragent} , _useragent{other._useragent}
{ {
CURLWrapper::setup_connection_properties(_proxy, _access_token, CURLWrapper::setup_connection_properties(_proxy, _access_token, _cainfo,
_cainfo, _useragent); _useragent);
} }
uint64_t Instance::get_max_chars() noexcept uint64_t Instance::get_max_chars() noexcept
@ -66,16 +67,18 @@ uint64_t Instance::get_max_chars() noexcept
try try
{ {
debuglog << "Querying " << _hostname << " for max_toot_chars…\n"; debuglog << "Querying " << _hostname << " for max_toot_chars…\n";
const auto answer{make_request(http_method::GET, const auto answer{
_baseuri + "/api/v1/instance", {})}; make_request(http_method::GET, _baseuri + "/api/v1/instance", {})};
if (!answer) if (!answer)
{ {
debuglog << "Could not get instance info.\n"; debuglog << "Could not get instance info.\n";
return default_max_chars; return default_max_chars;
} }
// clang-format off
_max_chars = [&answer] _max_chars = [&answer]
{ {
// clang-format on
const regex re_chars{R"("max_toot_chars"\s*:\s*([^"]+))"}; const regex re_chars{R"("max_toot_chars"\s*:\s*([^"]+))"};
smatch match; smatch match;
@ -100,8 +103,8 @@ uint64_t Instance::get_max_chars() noexcept
answer_type Instance::get_nodeinfo() answer_type Instance::get_nodeinfo()
{ {
auto answer{make_request(http_method::GET, auto answer{
_baseuri + "/.well-known/nodeinfo", {})}; make_request(http_method::GET, _baseuri + "/.well-known/nodeinfo", {})};
if (!answer) if (!answer)
{ {
debuglog << "NodeInfo not found.\n"; debuglog << "NodeInfo not found.\n";
@ -177,11 +180,8 @@ answer_type Instance::ObtainToken::step_1(const string_view client_name,
const string_view scopes, const string_view scopes,
const string_view website) const string_view website)
{ {
parametermap parameters parametermap parameters{{"client_name", client_name},
{ {"redirect_uris", "urn:ietf:wg:oauth:2.0:oob"}};
{"client_name", client_name},
{"redirect_uris", "urn:ietf:wg:oauth:2.0:oob"}
};
if (!scopes.empty()) if (!scopes.empty())
{ {
_scopes = scopes; _scopes = scopes;
@ -192,8 +192,8 @@ answer_type Instance::ObtainToken::step_1(const string_view client_name,
parameters.insert({"website", website}); parameters.insert({"website", website});
} }
auto answer{make_request(http_method::POST, _baseuri + "/api/v1/apps", auto answer{
parameters)}; make_request(http_method::POST, _baseuri + "/api/v1/apps", parameters)};
if (answer) if (answer)
{ {
const regex re_id{R"("client_id"\s*:\s*"([^"]+)\")"}; const regex re_id{R"("client_id"\s*:\s*"([^"]+)\")"};
@ -210,9 +210,10 @@ answer_type Instance::ObtainToken::step_1(const string_view client_name,
} }
string uri{_baseuri + "/oauth/authorize?scope=" + escape_url(scopes) string uri{_baseuri + "/oauth/authorize?scope=" + escape_url(scopes)
+ "&response_type=code" + "&response_type=code"
"&redirect_uri=" + escape_url("urn:ietf:wg:oauth:2.0:oob") "&redirect_uri="
+ "&client_id=" + _client_id}; + escape_url("urn:ietf:wg:oauth:2.0:oob")
+ "&client_id=" + _client_id};
if (!website.empty()) if (!website.empty())
{ {
uri += "&website=" + escape_url(website); uri += "&website=" + escape_url(website);
@ -236,8 +237,8 @@ answer_type Instance::ObtainToken::step_2(const string_view code)
parameters.insert({"scope", _scopes}); parameters.insert({"scope", _scopes});
} }
auto answer{make_request(http_method::POST, _baseuri + "/oauth/token", auto answer{
parameters)}; make_request(http_method::POST, _baseuri + "/oauth/token", parameters)};
if (answer) if (answer)
{ {
const regex re_token{R"("access_token"\s*:\s*"([^"]+)\")"}; const regex re_token{R"("access_token"\s*:\s*"([^"]+)\")"};

12
src/types.cpp
View File

@ -14,9 +14,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "log.hpp"
#include "types.hpp" #include "types.hpp"
#include "log.hpp"
#include <algorithm> #include <algorithm>
#include <cctype> #include <cctype>
@ -36,7 +37,7 @@ answer_type::operator string_view() const
return body; return body;
} }
std::ostream &operator <<(std::ostream &out, const answer_type &answer) std::ostream &operator<<(std::ostream &out, const answer_type &answer)
{ {
out << answer.body; out << answer.body;
return out; return out;
@ -45,10 +46,11 @@ std::ostream &operator <<(std::ostream &out, const answer_type &answer)
string_view answer_type::get_header(const string_view field) const string_view answer_type::get_header(const string_view field) const
{ {
const string_view searchstring{string(field) += ':'}; const string_view searchstring{string(field) += ':'};
auto it{search(headers.begin(), headers.end(), // clang-format off
searchstring.begin(), searchstring.end(), auto it{search(headers.begin(), headers.end(), searchstring.begin(),
[](unsigned char a, unsigned char b) searchstring.end(), [](unsigned char a, unsigned char b)
{ return tolower(a) == tolower(b); })}; { return tolower(a) == tolower(b); })};
// clang-format on
if (it != headers.end()) if (it != headers.end())
{ {