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

Replace arguments in URI.
continuous-integration/drone/push Build is passing Details 

id, nickname, nickname_or_id, hashtag, permission_group.
This commit is contained in:
tastytea 2020-01-08 14:04:53 +01:00
parent c07fb1db71
commit 2ab0018df9
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api.cpp
View File

@ -31,7 +31,7 @@ const map<API::endpoint_type,string_view> API::_endpoint_map
{v1::accounts, "/api/v1/accounts"},
{v1::accounts_verify_credentials, "/api/v1/accounts/verify/credentials"},
{v1::accounts_update_credentials, "/api/v1/accounts/update/credentials"},
{v1::accounts_id, "/api/v1/accounts/id"},
{v1::accounts_id, "/api/v1/accounts/<ID>"},
{v1::accounts_id_statuses, "/api/v1/accounts/<ID>/statuses"},
{v1::accounts_id_followers, "/api/v1/accounts/<ID>/followers"},
{v1::accounts_id_following, "/api/v1/accounts/<ID>/following"},

20
src/curl_wrapper.cpp
View File

@ -19,6 +19,8 @@
#include "log.hpp"
#include "version.hpp"
#include <algorithm>
#include <array>
#include <atomic>
#include <cstdint>
#include <cstring>
@ -28,6 +30,8 @@ namespace mastodonpp
using std::get;
using std::holds_alternative;
using std::any_of;
using std::array;
using std::atomic;
using std::uint8_t;
using std::uint16_t;
@ -72,6 +76,22 @@ answer_type CURLWrapper::make_request(const http_method &method, string uri,
for (const auto &param : parameters)
{
static constexpr array replace_in_uri
{
"id", "nickname", "nickname_or_id",
"hashtag", "permission_group"
};
if (any_of(replace_in_uri.begin(), replace_in_uri.end(),
[&param](const auto &s) { return s == param.first; }))
{
const auto pos{uri.find('<')};
if (pos != string::npos)
{
uri.replace(pos, param.first.size() + 2,
get<string>(param.second));
}
continue;
}
static bool first{true};
if (first)
{