tastytea
/
mastodon-cpp
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Releases 26 Wiki Activity

Replaced uint16_t with uint_fast16_t, refactoring

This commit is contained in:
tastytea 2018-04-02 01:47:44 +02:00
parent 016f79b4d2
commit 844fb2c577
Signed by: tastytea
GPG Key ID: 59346E0EA35C67E5
11 changed files with 145 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 3.7)
project (mastodon-cpp
VERSION 0.7.22
VERSION 0.7.23
LANGUAGES CXX
)

2
README.md
View File

@ -32,7 +32,7 @@ int main()
## Another simple example
Using the `Easy-class`.
Using the `Easy`-class.
```C++
#include <iostream>

20
src/api/delete.cpp
View File

@ -15,16 +15,12 @@
*/
#include <iostream>
#include <string>
#include <vector>
#include <curlpp/cURLpp.hpp>
#include "macros.hpp"
#include "mastodon-cpp.hpp"
using namespace Mastodon;
using std::string;
const std::uint16_t API::del(const Mastodon::API::v1 &call,
const uint_fast16_t API::del(const Mastodon::API::v1 &call,
const parametermap &parameters)
{
string strcall = "";
@ -45,18 +41,18 @@ const std::uint16_t API::del(const Mastodon::API::v1 &call,
maptoformdata(parameters), answer);
}
const std::uint16_t API::del(const Mastodon::API::v1 &call,
const string &argument)
const uint_fast16_t API::del(const Mastodon::API::v1 &call,
const string &argument)
{
const parametermap p = {};
return del(call, argument, p);
}
const std::uint16_t API::del(const Mastodon::API::v1 &call,
const string &argument,
const parametermap &parameters)
const uint_fast16_t API::del(const Mastodon::API::v1 &call,
const string &argument,
const parametermap &parameters)
{
string strcall = "";
const string argument_encoded = curlpp::escape(argument);
const string argument_encoded = urlencode(argument);
switch (call)
{
@ -80,7 +76,7 @@ const std::uint16_t API::del(const Mastodon::API::v1 &call,
maptoformdata(parameters), answer);
}
const std::uint16_t API::del(const std::string &call,
const uint_fast16_t API::del(const std::string &call,
const parametermap &parameters, string &answer)
{

25
src/api/get.cpp
View File

@ -15,25 +15,20 @@
*/
#include <iostream>
#include <string>
#include <vector>
#include <memory>
#include <curlpp/cURLpp.hpp>
#include "macros.hpp"
#include "mastodon-cpp.hpp"
using namespace Mastodon;
using std::string;
using std::cerr;
const std::uint16_t API::get(const Mastodon::API::v1 &call, string &answer)
const uint_fast16_t API::get(const Mastodon::API::v1 &call, string &answer)
{
const parametermap p;
return get(call, p, answer);
}
const std::uint16_t API::get(const Mastodon::API::v1 &call,
const parametermap &parameters, string &answer)
const uint_fast16_t API::get(const Mastodon::API::v1 &call,
const parametermap &parameters, string &answer)
{
string strcall = "";
switch (call)
@ -99,19 +94,19 @@ const std::uint16_t API::get(const Mastodon::API::v1 &call,
return _http.request(http::method::GET, strcall, answer);
}
const std::uint16_t API::get(const Mastodon::API::v1 &call,
const string &argument, string &answer)
const uint_fast16_t API::get(const Mastodon::API::v1 &call,
const string &argument, string &answer)
{
const parametermap p;
return get(call, argument, p, answer);
}
const std::uint16_t API::get(const Mastodon::API::v1 &call,
const string &argument,
const parametermap &parameters, string &answer)
const uint_fast16_t API::get(const Mastodon::API::v1 &call,
const string &argument,
const parametermap &parameters, string &answer)
{
string strcall = "";
bool firstparam = true;
const string argument_encoded = curlpp::escape(argument);
const string argument_encoded = urlencode(argument);
switch (call)
{
@ -186,7 +181,7 @@ const std::uint16_t API::get(const Mastodon::API::v1 &call,
return _http.request(http::method::GET, strcall, answer);
}
const std::uint16_t API::get(const std::string &call, string &answer)
const uint_fast16_t API::get(const std::string &call, string &answer)
{
return _http.request(http::method::GET, call, answer);
}

11
src/api/get_stream.cpp
View File

@ -15,22 +15,19 @@
*/
#include <iostream>
#include <string>
#include <memory>
#include "macros.hpp"
#include "mastodon-cpp.hpp"
using namespace Mastodon;
using std::string;
using std::cerr;
const std::uint16_t API::get_stream(const Mastodon::API::v1 &call,
const uint_fast16_t API::get_stream(const Mastodon::API::v1 &call,
const string &argument,
string &answer,
std::unique_ptr<Mastodon::API::http> &ptr)
{
string strcall = "";
const string argument_encoded = curlpp::escape(argument);
const string argument_encoded = urlencode(argument);
switch (call)
{
@ -50,7 +47,7 @@ const std::uint16_t API::get_stream(const Mastodon::API::v1 &call,
return ptr->request(http::method::GET_STREAM, strcall, answer);
}
const std::uint16_t API::get_stream(const Mastodon::API::v1 &call,
const uint_fast16_t API::get_stream(const Mastodon::API::v1 &call,
string &answer,
std::unique_ptr<Mastodon::API::http> &ptr)
{
@ -77,7 +74,7 @@ const std::uint16_t API::get_stream(const Mastodon::API::v1 &call,
return ptr->request(http::method::GET_STREAM, strcall, answer);
}
const std::uint16_t API::get_stream(const std::string &call, string &answer,
const uint_fast16_t API::get_stream(const std::string &call, string &answer,
std::unique_ptr<http> &ptr)
{
ptr = std::make_unique<http>(*this, _instance, _access_token);

6
src/api/patch.cpp
View File

@ -15,15 +15,13 @@
*/
#include <iostream>
#include <string>
#include <vector>
#include "macros.hpp"
#include "mastodon-cpp.hpp"
using namespace Mastodon;
using std::string;
using std::cerr;
const std::uint16_t API::patch(const Mastodon::API::v1 &call,
const uint_fast16_t API::patch(const Mastodon::API::v1 &call,
const parametermap &parameters,
string &answer)
{

14
src/api/post.cpp
View File

@ -15,22 +15,18 @@
*/
#include <iostream>
#include <string>
#include <vector>
#include <curlpp/cURLpp.hpp>
#include "macros.hpp"
#include "mastodon-cpp.hpp"
using namespace Mastodon;
using std::string;
const std::uint16_t API::post(const Mastodon::API::v1 &call, string &answer)
const uint_fast16_t API::post(const Mastodon::API::v1 &call, string &answer)
{
const parametermap p;
return post(call, p, answer);
}
const std::uint16_t API::post(const Mastodon::API::v1 &call,
const uint_fast16_t API::post(const Mastodon::API::v1 &call,
const parametermap &parameters, string &answer)
{
string strcall = "";
@ -74,13 +70,13 @@ const std::uint16_t API::post(const Mastodon::API::v1 &call,
maptoformdata(parameters), answer);
}
const std::uint16_t API::post(const Mastodon::API::v1 &call,
const uint_fast16_t API::post(const Mastodon::API::v1 &call,
const string &argument, string &answer)
{
const parametermap p;
return post(call, argument, p, answer);
}
const std::uint16_t API::post(const Mastodon::API::v1 &call,
const uint_fast16_t API::post(const Mastodon::API::v1 &call,
const string &argument,
const parametermap &parameters, string &answer)
{
@ -150,7 +146,7 @@ const std::uint16_t API::post(const Mastodon::API::v1 &call,
maptoformdata(parameters), answer);
}
const std::uint16_t API::post(const std::string &call,
const uint_fast16_t API::post(const string &call,
const parametermap &parameters, string &answer)
{

10
src/api/put.cpp
View File

@ -15,21 +15,17 @@
*/
#include <iostream>
#include <string>
#include <vector>
#include <curlpp/cURLpp.hpp>
#include "macros.hpp"
#include "mastodon-cpp.hpp"
using namespace Mastodon;
using std::string;
const std::uint16_t API::put(const Mastodon::API::v1 &call,
const uint_fast16_t API::put(const Mastodon::API::v1 &call,
const string &argument,
const parametermap &parameters, string &answer)
{
string strcall = "";
const string argument_encoded = curlpp::escape(argument);
const string argument_encoded = urlencode(argument);
switch (call)
{
@ -46,7 +42,7 @@ const std::uint16_t API::put(const Mastodon::API::v1 &call,
maptoformdata(parameters), answer);
}
const std::uint16_t API::put(const std::string &call,
const uint_fast16_t API::put(const string &call,
const parametermap &parameters, string &answer)
{

11
src/http.cpp
View File

@ -14,14 +14,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <string>
#include <cstdint>
#include <iostream>
#include <functional> // std::bind
#include <list>
#include <cstring> // std::strncmp
#include <curlpp/cURLpp.hpp>
#include <curlpp/Easy.hpp>
#include <curlpp/Options.hpp>
#include <curlpp/Exception.hpp>
#include <curlpp/Infos.hpp>
@ -30,7 +26,6 @@
using namespace Mastodon;
namespace curlopts = curlpp::options;
using std::string;
using std::cerr;
API::http::http(const API &api, const string &instance,
@ -48,21 +43,21 @@ API::http::~http()
curlpp::terminate();
}
const std::uint16_t API::http::request(const method &meth,
const uint_fast16_t API::http::request(const method &meth,
const string &path,
string &answer)
{
return request(meth, path, curlpp::Forms(), answer);
}
const std::uint16_t API::http::request(const method &meth,
const uint_fast16_t API::http::request(const method &meth,
const string &path,
const curlpp::Forms &formdata,
string &answer)
{
using namespace std::placeholders; // _1, _2, _3
std::uint16_t ret = 0;
uint_fast16_t ret = 0;
ttdebug << "Path is: " << path << '\n';
try

28
src/mastodon-cpp.cpp
View File

@ -14,13 +14,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <string>
#include <map>
#include <vector>
#include <sstream>
#include <regex>
#include <curlpp/cURLpp.hpp>
#include <curlpp/Easy.hpp>
#include "version.hpp"
#include "macros.hpp"
#include "mastodon-cpp.hpp"
@ -28,7 +23,6 @@
#include <iostream>
using namespace Mastodon;
using std::string;
API::API(const string &instance, const string &access_token)
: _instance(instance)
@ -67,7 +61,7 @@ const string API::maptostr(const parametermap &map, const bool &firstparam)
{
if (it.second.size() == 1)
{
result += (delim + it.first + "=" + curlpp::escape(it.second.front()));
result += (delim + it.first + "=" + urlencode(it.second.front()));
if (delim == '?')
{
delim = '&';
@ -77,7 +71,7 @@ const string API::maptostr(const parametermap &map, const bool &firstparam)
{
for (const string &str : it.second)
{
result += (delim + it.first + "[]=" + curlpp::escape(str));
result += (delim + it.first + "[]=" + urlencode(str));
if (delim == '?')
{
delim = '&';
@ -136,7 +130,7 @@ const std::string API::urlencode(const std::string &str) const
return curlpp::escape(str);
}
const std::uint16_t API::register_app1(const string &instance,
const uint_fast16_t API::register_app1(const string &instance,
const string &client_name,
const string &redirect_uri,
const string &scopes,
@ -148,7 +142,7 @@ const std::uint16_t API::register_app1(const string &instance,
return register_app1(client_name, redirect_uri, scopes, website,
client_id, client_secret, url);
}
const std::uint16_t API::register_app1(const string &client_name,
const uint_fast16_t API::register_app1(const string &client_name,
const string &redirect_uri,
const string &scopes,
const string &website,
@ -165,7 +159,7 @@ const std::uint16_t API::register_app1(const string &client_name,
};
string answer;
std::uint16_t ret = post(API::v1::apps, parameters, answer);
uint_fast16_t ret = post(API::v1::apps, parameters, answer);
if (ret == 0)
{
@ -179,12 +173,12 @@ const std::uint16_t API::register_app1(const string &client_name,
client_secret = match[1].str();
url = "https://" + _instance + "/oauth/authorize" +
"?scope=" + curlpp::escape(scopes) + "&response_type=code" +
"&redirect_uri=" + curlpp::escape(redirect_uri) +
"?scope=" + urlencode(scopes) + "&response_type=code" +
"&redirect_uri=" + urlencode(redirect_uri) +
"&client_id=" + client_id;
if (!website.empty())
{
url += "&website=" + curlpp::escape(website);
url += "&website=" + urlencode(website);
}
return 0;
@ -202,7 +196,7 @@ const std::uint16_t API::register_app1(const string &client_name,
}
const std::uint16_t API::register_app2(const string &instance,
const uint_fast16_t API::register_app2(const string &instance,
const string &client_id,
const string &client_secret,
const string &redirect_uri,
@ -212,7 +206,7 @@ const std::uint16_t API::register_app2(const string &instance,
return register_app2(client_id, client_secret, redirect_uri, code, access_token);
}
const std::uint16_t API::register_app2(const string &client_id,
const uint_fast16_t API::register_app2(const string &client_id,
const string &client_secret,
const string &redirect_uri,
const string &code,
@ -228,7 +222,7 @@ const std::uint16_t API::register_app2(const string &client_id,
};
std::string answer;
std::uint16_t ret = post("/oauth/token", parameters, answer);
uint_fast16_t ret = post("/oauth/token", parameters, answer);
if (ret == 0)
{
std::smatch match;

194
src/mastodon-cpp.hpp
View File

@ -25,6 +25,9 @@
#include <curlpp/cURLpp.hpp>
#include <curlpp/Easy.hpp>
using std::uint_fast16_t;
using std::string;
/*!
* @example example01_dump_json.cpp
* @example example02_parse_account.cpp
@ -84,12 +87,12 @@ public:
GET_STREAM
};
explicit http(const API &api, const std::string &instance,
const std::string &access_token);
explicit http(const API &api, const string &instance,
const string &access_token);
~http();
const std::uint16_t request(const method &meth,
const std::string &path,
std::string &answer);
const uint_fast16_t request(const method &meth,
const string &path,
string &answer);
/*!
* @brief HTTP Request.
@ -102,15 +105,15 @@ public:
* @return @ref error "Error code". If the URL has permanently changed,
* 13 is returned and answer is set to the new URL.
*/
const std::uint16_t request(const method &meth,
const std::string &path,
const uint_fast16_t request(const method &meth,
const string &path,
const curlpp::Forms &formdata,
std::string &answer);
string &answer);
const void get_headers(std::string &headers) const;
const void get_headers(string &headers) const;
const size_t callback(char* data, size_t size, size_t nmemb,
std::string *oss);
string *oss);
/*!
* @brief Aborts the stream. Use only with streams.
@ -124,9 +127,9 @@ public:
private:
const API &parent;
const std::string _instance;
const std::string _access_token;
std::string _headers;
const string _instance;
const string _access_token;
string _headers;
bool _abort_stream;
};
@ -142,7 +145,7 @@ public:
* }
* @endcode
*/
typedef std::map<std::string, std::vector<std::string>> parametermap;
typedef std::map<string, std::vector<string>> parametermap;
/*!
* @brief A list of all API calls.
*
@ -223,29 +226,28 @@ public:
* @param instance The hostname of your instance
* @param access_token Your access token.
*/
explicit API(const std::string &instance,
const std::string &access_token);
explicit API(const string &instance, const string &access_token);
/*!
* @brief Sets the useragent. Default is mastodon-cpp/version.
*
* @param useragent The useragent
*/
const void set_useragent(const std::string &useragent);
const void set_useragent(const string &useragent);
/*!
* @brief Gets the useragent.
*
* @return The useragent.
*/
const std::string get_useragent() const;
const string get_useragent() const;
/*!
* @brief Returns the instance.
*
* @return The instance.
*/
const std::string get_instance() const;
const string get_instance() const;
/*!
* @brief Percent-encodes a string. This is done automatically, unless you
@ -254,7 +256,7 @@ public:
* Calls curlpp::escape(str)
*
* The only time you should use this, is if you use
* get(const std::string &call, std::string &answer).
* get(const string &call, string &answer).
*
* See RFC 3986 section 2.1 for more info.
*
@ -262,7 +264,7 @@ public:
*
* @return The percent-encoded string
*/
const std::string urlencode(const std::string &str) const;
const string urlencode(const string &str) const;
/*!
* @brief Register application, step 1/2
@ -278,26 +280,26 @@ public:
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and url is set to the new URL.
*/
const std::uint16_t register_app1(const std::string &client_name,
const std::string &redirect_uri,
const std::string &scopes,
const std::string &website,
std::string &client_id,
std::string &client_secret,
std::string &url);
const uint_fast16_t register_app1(const string &client_name,
const string &redirect_uri,
const string &scopes,
const string &website,
string &client_id,
string &client_secret,
string &url);
/*!
* @deprecated Will vanish in 1.0.0
*/
[[deprecated("Will vanish in 1.0.0")]]
const std::uint16_t register_app1(const std::string &instance,
const std::string &client_name,
const std::string &redirect_uri,
const std::string &scopes,
const std::string &website,
std::string &client_id,
std::string &client_secret,
std::string &url);
const uint_fast16_t register_app1(const string &instance,
const string &client_name,
const string &redirect_uri,
const string &scopes,
const string &website,
string &client_id,
string &client_secret,
string &url);
/*!
* @brief Register application, step 2/2
@ -312,22 +314,22 @@ public:
*
* @return @ref error "Error code".
*/
const std::uint16_t register_app2(const std::string &client_id,
const std::string &client_secret,
const std::string &redirect_uri,
const std::string &code,
std::string &access_token);
const uint_fast16_t register_app2(const string &client_id,
const string &client_secret,
const string &redirect_uri,
const string &code,
string &access_token);
/*!
* @deprecated Will vanish in 1.0.0
*/
[[deprecated("Will vanish in 1.0.0")]]
const std::uint16_t register_app2(const std::string &instance,
const std::string &client_id,
const std::string &client_secret,
const std::string &redirect_uri,
const std::string &code,
std::string &access_token);
const uint_fast16_t register_app2(const string &instance,
const string &client_id,
const string &client_secret,
const string &redirect_uri,
const string &code,
string &access_token);
/*!
* @brief Make a GET request which doesn't require parameters.
@ -338,7 +340,7 @@ public:
*
* @return @ref error "Error code".
*/
const std::uint16_t get(const Mastodon::API::v1 &call, std::string &answer);
const uint_fast16_t get(const Mastodon::API::v1 &call, string &answer);
/*!
* @brief Make a GET request which requires a parameter as part of the
@ -352,9 +354,9 @@ public:
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*/
const std::uint16_t get(const Mastodon::API::v1 &call,
const std::string &argument,
std::string &answer);
const uint_fast16_t get(const Mastodon::API::v1 &call,
const string &argument,
string &answer);
/*!
* @brief Make a GET request which requires parameters.
@ -367,9 +369,9 @@ public:
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*/
const std::uint16_t get(const Mastodon::API::v1 &call,
const uint_fast16_t get(const Mastodon::API::v1 &call,
const parametermap &parameters,
std::string &answer);
string &answer);
/*!
* @brief Make a GET request which requires a parameter as part of the
@ -384,10 +386,10 @@ public:
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*/
const std::uint16_t get(const Mastodon::API::v1 &call,
const std::string &argument,
const uint_fast16_t get(const Mastodon::API::v1 &call,
const string &argument,
const parametermap &parameters,
std::string &answer);
string &answer);
/*!
* @brief Make a custom GET request.
@ -399,8 +401,7 @@ public:
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*/
const std::uint16_t get(const std::string &call,
std::string &answer);
const uint_fast16_t get(const string &call, string &answer);
/*!
* @brief Make a streaming GET request.
@ -414,9 +415,9 @@ public:
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*/
const std::uint16_t get_stream(const Mastodon::API::v1 &call,
const std::string &argument,
std::string &answer,
const uint_fast16_t get_stream(const Mastodon::API::v1 &call,
const string &argument,
string &answer,
std::unique_ptr<Mastodon::API::http> &ptr);
/*!
@ -430,8 +431,8 @@ public:
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*/
const std::uint16_t get_stream(const Mastodon::API::v1 &call,
std::string &answer,
const uint_fast16_t get_stream(const Mastodon::API::v1 &call,
string &answer,
std::unique_ptr<Mastodon::API::http> &ptr);
/*!
@ -446,8 +447,8 @@ public:
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*/
const std::uint16_t get_stream(const std::string &call,
std::string &answer,
const uint_fast16_t get_stream(const string &call,
string &answer,
std::unique_ptr<Mastodon::API::http> &ptr);
/*!
@ -463,9 +464,9 @@ public:
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*/
const std::uint16_t patch(const Mastodon::API::v1 &call,
const uint_fast16_t patch(const Mastodon::API::v1 &call,
const parametermap &parameters,
std::string &answer);
string &answer);
/*!
* @brief Make a POST request which doesn't require parameters.
@ -477,8 +478,7 @@ public:
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*/
const std::uint16_t post(const Mastodon::API::v1 &call,
std::string &answer);
const uint_fast16_t post(const Mastodon::API::v1 &call, string &answer);
/*!
* @brief Make a POST request which requires a parameter as part of the
@ -492,9 +492,9 @@ public:
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*/
const std::uint16_t post(const Mastodon::API::v1 &call,
const std::string &argument,
std::string &answer);
const uint_fast16_t post(const Mastodon::API::v1 &call,
const string &argument,
string &answer);
/*!
* @brief Make a POST request which requires parameters.
@ -509,9 +509,9 @@ public:
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*/
const std::uint16_t post(const Mastodon::API::v1 &call,
const uint_fast16_t post(const Mastodon::API::v1 &call,
const parametermap &parameters,
std::string &answer);
string &answer);
/*!
* @brief Make a POST request which requires a parameter as part of the
@ -528,10 +528,10 @@ public:
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*/
const std::uint16_t post(const Mastodon::API::v1 &call,
const std::string &argument,
const uint_fast16_t post(const Mastodon::API::v1 &call,
const string &argument,
const parametermap &parameters,
std::string &answer);
string &answer);
/*!
* @brief Make a custom POST request.
@ -546,9 +546,9 @@ public:
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*/
const std::uint16_t post(const std::string &call,
const uint_fast16_t post(const string &call,
const parametermap &parameters,
std::string &answer);
string &answer);
/*!
* @brief Make a PUT request which requires a parameter as part of the
@ -564,10 +564,10 @@ public:
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*/
const std::uint16_t put(const Mastodon::API::v1 &call,
const std::string &argument,
const uint_fast16_t put(const Mastodon::API::v1 &call,
const string &argument,
const parametermap &parameters,
std::string &answer);
string &answer);
/*!
* @brief Make a custom PUT request.
@ -581,9 +581,9 @@ public:
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*/
const std::uint16_t put(const std::string &call,
const uint_fast16_t put(const string &call,
const parametermap &parameters,
std::string &answer);
string &answer);
/*!
* @brief Make a DELETE request which requires a parameter as part of the
@ -594,8 +594,8 @@ public:
*
* @return @ref error "Error code".
*/
const std::uint16_t del(const Mastodon::API::v1 &call,
const std::string &argument);
const uint_fast16_t del(const Mastodon::API::v1 &call,
const string &argument);
/*!
* @brief Make a DELETE request which requires parameters.
@ -605,7 +605,7 @@ public:
*
* @return @ref error "Error code".
*/
const std::uint16_t del(const Mastodon::API::v1 &call,
const uint_fast16_t del(const Mastodon::API::v1 &call,
const parametermap &parameters);
/*!
@ -618,8 +618,8 @@ public:
*
* @return @ref error "Error code".
*/
const std::uint16_t del(const Mastodon::API::v1 &call,
const std::string &argument,
const uint_fast16_t del(const Mastodon::API::v1 &call,
const string &argument,
const parametermap &parameters);
/*!
@ -633,9 +633,9 @@ public:
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*/
const std::uint16_t del(const std::string &call,
const uint_fast16_t del(const string &call,
const parametermap &parameters,
std::string &answer);
string &answer);
/*!
* @brief Gets the header from the last answer.
@ -644,12 +644,12 @@ public:
*
* @return The header, or "" on error.
*/
const std::string get_header(const std::string &header) const;
const string get_header(const string &header) const;
private:
const std::string _instance;
std::string _access_token;
std::string _useragent;
const string _instance;
string _access_token;
string _useragent;
http _http;
/*!
@ -660,8 +660,8 @@ private:
*
* @return String of parameters
*/
const std::string maptostr(const parametermap &map,
const bool &firstparam = true);
const string maptostr(const parametermap &map,
const bool &firstparam = true);
/*!
* @brief Converts map of parameters into form data