diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/connection.cpp | 6 | ||||
| -rw-r--r-- | src/curl_wrapper.cpp | 20 | ||||
| -rw-r--r-- | src/instance.cpp | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/connection.cpp b/src/connection.cpp index 794247b..f471c4e 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -29,16 +29,16 @@ Connection::Connection(Instance &instance) answer_type Connection::get(const endpoint_variant &endpoint, const parametermap ¶meters) { - string uri{[&] + const string uri{[&] { if (holds_alternative<API::endpoint_type>(endpoint)) { return string(_baseuri).append( API{std::get<API::endpoint_type>(endpoint)}.to_string_view()); } - - return std::get<string>(endpoint); + return string(std::get<string_view>(endpoint)); }()}; + return make_request(http_method::GET, uri, parameters); } diff --git a/src/curl_wrapper.cpp b/src/curl_wrapper.cpp index 1e1040b..7b0eb79 100644 --- a/src/curl_wrapper.cpp +++ b/src/curl_wrapper.cpp @@ -88,32 +88,32 @@ answer_type CURLWrapper::make_request(const http_method &method, string uri, if (pos != string::npos) { uri.replace(pos, param.first.size() + 2, - get<string>(param.second)); + get<string_view>(param.second)); } continue; } static bool first{true}; if (first) { - uri.append("?"); + uri += "?"; first = false; } else { - uri.append("&"); + uri += "&"; } - if (holds_alternative<string>(param.second)) + if (holds_alternative<string_view>(param.second)) { - uri.append(param.first + '=' + get<string>(param.second)); + ((uri += param.first) += "=") += get<string_view>(param.second); } else { - for (const auto &arg : get<vector<string>>(param.second)) + for (const auto &arg : get<vector<string_view>>(param.second)) { - uri.append(param.first + "[]=" + arg); - if (arg != *get<vector<string>>(param.second).rbegin()) + ((uri += param.first) += "[]=") += arg; + if (arg != *get<vector<string_view>>(param.second).rbegin()) { - uri.append("&"); + uri += "&"; } } } @@ -238,7 +238,7 @@ void CURLWrapper::setup_curl() // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg) code = curl_easy_setopt(_connection, CURLOPT_USERAGENT, - string("mastorss/").append(version).c_str()); + (string("mastorss/") += version).c_str()); if (code != CURLE_OK) { throw CURLException{code, "Failed to set User-Agent", diff --git a/src/instance.cpp b/src/instance.cpp index e10675f..72369e5 100644 --- a/src/instance.cpp +++ b/src/instance.cpp @@ -23,7 +23,7 @@ namespace mastodonpp 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} , _baseuri{"https://" + _hostname} , _access_token{access_token} |