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

Replaced return types for get_stream, patch, post, put, del
the build failed Details

This commit is contained in:
tastytea 2019-02-22 12:33:03 +01:00
parent ade55f8f19
commit cbb1e18b0c
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
10 changed files with 126 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/api/delete.cpp
View File

@ -1,6 +1,6 @@
/* This file is part of mastodon-cpp.
* Copyright © 2018 tastytea <tastytea@tastytea.de>
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, version 3.
@ -20,8 +20,8 @@
using namespace Mastodon;
uint16_t API::del(const Mastodon::API::v1 &call,
const parametermap &parameters)
return_call API::del(const Mastodon::API::v1 &call,
const parametermap &parameters)
{
string strcall = "";
string strid = "";
@ -51,19 +51,16 @@ uint16_t API::del(const Mastodon::API::v1 &call,
strcall = "/api/v1/push/subscription";
break;
default:
ttdebug << "ERROR: Invalid call.\n";
return 11;
ttdebug << "ERROR: Invalid argument.\n";
return { 22, "Invalid argument", 0, "" };
break;
}
string answer;
return del(strcall, parameters, answer);
return del(strcall, parameters);
}
uint16_t API::del(const std::string &call,
const parametermap &parameters, string &answer)
return_call API::del(const std::string &call, const parametermap &parameters)
{
return _http.request(http::method::DELETE, call,
maptoformdata(parameters), answer);
return _http.request(http::method::DELETE, call, maptoformdata(parameters));
}

2
src/api/get.cpp
View File

@ -1,5 +1,5 @@
/* This file is part of mastodon-cpp.
* Copyright © 2018 tastytea <tastytea@tastytea.de>
* Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

27
src/api/get_stream.cpp
View File

@ -1,6 +1,6 @@
/* This file is part of mastodon-cpp.
* Copyright © 2018 tastytea <tastytea@tastytea.de>
*
* Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, version 3.
@ -21,10 +21,9 @@
using namespace Mastodon;
using std::cerr;
uint16_t API::get_stream(const Mastodon::API::v1 &call,
const parametermap &parameters,
string &answer,
std::unique_ptr<Mastodon::API::http> &ptr)
return_call API::get_stream(const Mastodon::API::v1 &call,
const parametermap &parameters,
std::unique_ptr<Mastodon::API::http> &ptr)
{
string strcall = "";
@ -47,7 +46,7 @@ uint16_t API::get_stream(const Mastodon::API::v1 &call,
break;
default:
ttdebug << "ERROR: Invalid call.\n";
return 11;
return { 22, "Invalid argument", 0, "" };
break;
}
@ -56,20 +55,18 @@ uint16_t API::get_stream(const Mastodon::API::v1 &call,
strcall += maptostr(parameters);
}
return get_stream(strcall, answer, ptr);
return get_stream(strcall, ptr);
}
uint16_t API::get_stream(const Mastodon::API::v1 &call,
string &answer,
std::unique_ptr<Mastodon::API::http> &ptr)
return_call API::get_stream(const Mastodon::API::v1 &call,
std::unique_ptr<Mastodon::API::http> &ptr)
{
parametermap p = {};
return get_stream(call, p, answer, ptr);
return get_stream(call, p, ptr);
}
uint16_t API::get_stream(const std::string &call, string &answer,
std::unique_ptr<http> &ptr)
return_call API::get_stream(const std::string &call, std::unique_ptr<http> &ptr)
{
ptr = std::make_unique<http>(*this, _instance, _access_token);
return ptr->request(http::method::GET_STREAM, call, answer);
return ptr->request(http::method::GET_STREAM, call);
}

13
src/api/patch.cpp
View File

@ -1,5 +1,5 @@
/* This file is part of mastodon-cpp.
* Copyright © 2018 tastytea <tastytea@tastytea.de>
* Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -21,9 +21,8 @@
using namespace Mastodon;
using std::cerr;
uint16_t API::patch(const Mastodon::API::v1 &call,
const parametermap &parameters,
string &answer)
return_call API::patch(const Mastodon::API::v1 &call,
const parametermap &parameters)
{
string strcall = "";
switch (call)
@ -32,11 +31,11 @@ uint16_t API::patch(const Mastodon::API::v1 &call,
strcall = "/api/v1/accounts/update_credentials";
break;
default:
ttdebug << "ERROR: Invalid call.\n";
return 11;
ttdebug << "ERROR: Invalid argument.\n";
return { 22, "Invalid argument", 0, "" };
break;
}
return _http.request(API::http::method::PATCH,
strcall, maptoformdata(parameters), answer);
strcall, maptoformdata(parameters));
}

24
src/api/post.cpp
View File

@ -1,6 +1,6 @@
/* This file is part of mastodon-cpp.
* Copyright © 2018 tastytea <tastytea@tastytea.de>
*
* Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, version 3.
@ -20,8 +20,8 @@
using namespace Mastodon;
uint16_t API::post(const Mastodon::API::v1 &call,
const parametermap &parameters, string &answer)
return_call API::post(const Mastodon::API::v1 &call,
const parametermap &parameters)
{
string strcall = "";
string strid = "";
@ -129,24 +129,22 @@ uint16_t API::post(const Mastodon::API::v1 &call,
strcall = "/api/v1/statuses/" + strid + "/unbookmark";
break;
default:
ttdebug << "ERROR: Invalid call.\n";
return 11;
ttdebug << "ERROR: Invalid argument.\n";
return { 22, "Invalid argument", 0, ""};
break;
}
return post(strcall, parameters, answer);
return post(strcall, parameters);
}
uint16_t API::post(const Mastodon::API::v1 &call, string &answer)
return_call API::post(const Mastodon::API::v1 &call)
{
const parametermap p;
return post(call, p, answer);
return post(call, p);
}
uint16_t API::post(const string &call,
const parametermap &parameters, string &answer)
return_call API::post(const string &call, const parametermap &parameters)
{
return _http.request(http::method::POST, call,
maptoformdata(parameters), answer);
return _http.request(http::method::POST, call, maptoformdata(parameters));
}

20
src/api/put.cpp
View File

@ -1,6 +1,6 @@
/* This file is part of mastodon-cpp.
* Copyright © 2018 tastytea <tastytea@tastytea.de>
*
* Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, version 3.
@ -20,8 +20,8 @@
using namespace Mastodon;
uint16_t API::put(const Mastodon::API::v1 &call,
const parametermap &parameters, string &answer)
return_call API::put(const Mastodon::API::v1 &call,
const parametermap &parameters)
{
string strcall = "";
string strid = "";
@ -45,18 +45,16 @@ uint16_t API::put(const Mastodon::API::v1 &call,
strcall = "/api/v1/push/subscription";
break;
default:
ttdebug << "ERROR: Invalid call.\n";
return 11;
ttdebug << "ERROR: Invalid argument.\n";
return { 22, "Invalid argument", 0, "" };
break;
}
return put(strcall, parameters, answer);
return put(strcall, parameters);
}
uint16_t API::put(const string &call,
const parametermap &parameters, string &answer)
return_call API::put(const string &call, const parametermap &parameters)
{
return _http.request(http::method::PUT, call,
maptoformdata(parameters), answer);
return _http.request(http::method::PUT, call, maptoformdata(parameters));
}

4
src/easy/easy.hpp
View File

@ -1,6 +1,6 @@
/* This file is part of mastodon-cpp.
* Copyright © 2018 tastytea <tastytea@tastytea.de>
*
* Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, version 3.

2
src/http.cpp
View File

@ -1,5 +1,5 @@
/* This file is part of mastodon-cpp.
* Copyright © 2018 tastytea <tastytea@tastytea.de>
* Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

4
src/mastodon-cpp.cpp
View File

@ -1,6 +1,6 @@
/* This file is part of mastodon-cpp.
* Copyright © 2018 tastytea <tastytea@tastytea.de>
*
* Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, version 3.

192
src/mastodon-cpp.hpp
View File

@ -1,6 +1,6 @@
/* This file is part of mastodon-cpp.
* Copyright © 2018 tastytea <tastytea@tastytea.de>
*
* Copyright © 2018, 2019 tastytea <tastytea@tastytea.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, version 3.
@ -476,12 +476,10 @@ public:
* @brief Make a GET request which doesn't require parameters.
*
* @param call A call defined in Mastodon::API::v1
* @param answer The answer from the server. Usually JSON. On error an
* empty string.
*
* @return @ref error "Error code".
*
* @since before 0.11.0
*
* @since 0.100.0
*/
const return_call get(const Mastodon::API::v1 &call);
@ -490,11 +488,8 @@ public:
*
* @param call A call defined in Mastodon::API::v1
* @param parameters A Mastodon::API::parametermap containing parameters
* @param answer The answer from the server. Usually JSON. On error
* an empty string.
*
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
* @return @ref error "Error code".
*/
const return_call get(const Mastodon::API::v1 &call,
const parametermap &parameters);
@ -502,7 +497,12 @@ public:
/*!
* @brief Make a GET request which requires parameters.
*
* @since 0.16.0
* @since 0.100.0
*
* @param call A call defined in Mastodon::API::v2
* @param parameters A Mastodon::API::parametermap containing parameters
*
* @return @ref error "Error code".
*/
const return_call get(const Mastodon::API::v2 &call,
const parametermap &parameters);
@ -511,13 +511,10 @@ public:
* @brief Make a custom GET request.
*
* @param call String in the form `/api/v1/example`
* @param answer The answer from the server. Usually JSON. On error an
* empty string.
*
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*
* @since before 0.11.0
* @return @ref error "Error code".
*
* @since 0.100.0
*/
const return_call get(const string &call);
@ -526,54 +523,44 @@ public:
*
* @param call A call defined in Mastodon::API::v1
* @param parameters A Mastodon::API::parametermap containing parameters
* @param answer The answer from the server. Events with JSON-payload.
* @param ptr Pointer to the http object. Can be used to call
* ptr->cancel_stream()
*
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*
* @since before 0.11.0
* @return @ref error "Error code".
*
* @since 0.100.0
*/
uint16_t get_stream(const Mastodon::API::v1 &call,
const parametermap &parameters,
string &answer,
std::unique_ptr<Mastodon::API::http> &ptr);
return_call get_stream(const Mastodon::API::v1 &call,
const parametermap &parameters,
std::unique_ptr<Mastodon::API::http> &ptr);
/*!
* @brief Make a streaming GET request.
*
* @param call A call defined in Mastodon::API::v1
* @param answer The answer from the server. Events with JSON-payload.
* @param ptr Pointer to the http object. Can be used to call
* ptr->cancel_stream()
* @param call A call defined in Mastodon::API::v1
* @param ptr Pointer to the http object. Can be used to call
* ptr->cancel_stream()
*
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*
* @since before 0.11.0
* @return @ref error "Error code".
*
* @since 0.100.0
*/
uint16_t get_stream(const Mastodon::API::v1 &call,
string &answer,
std::unique_ptr<Mastodon::API::http> &ptr);
return_call get_stream(const Mastodon::API::v1 &call,
std::unique_ptr<Mastodon::API::http> &ptr);
/*!
* @brief Make a streaming GET request.
*
* @param call String in the form `/api/v1/example`
* @param answer The answer from the server. Usually JSON. On error an
* empty string.
* @param ptr Pointer to the http object. Can be used to call
* ptr->cancel_stream()
* @param call String in the form `/api/v1/example`
* @param ptr Pointer to the http object. Can be used to call
* ptr->cancel_stream()
*
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*
* @since before 0.11.0
* @return @ref error "Error code".
*
* @since 0.100.0
*/
uint16_t get_stream(const string &call,
string &answer,
std::unique_ptr<Mastodon::API::http> &ptr);
return_call get_stream(const string &call,
std::unique_ptr<Mastodon::API::http> &ptr);
/*!
* @brief Make a PATCH request.
@ -582,31 +569,24 @@ public:
*
* @param call A call defined in Mastodon::API::v1
* @param parameters A Mastodon::API::parametermap containing parameters
* @param answer The answer from the server. Usually JSON. On error
* an empty string.
*
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*
* @since before 0.11.0
* @return @ref error "Error code".
*
* @since 0.100.0
*/
uint16_t patch(const Mastodon::API::v1 &call,
const parametermap &parameters,
string &answer);
return_call patch(const Mastodon::API::v1 &call,
const parametermap &parameters);
/*!
* @brief Make a POST request which doesn't require parameters.
*
* @param call A call defined in Mastodon::API::v1
* @param answer The answer from the server. Usually JSON. On error an
* empty string.
*
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*
* @since before 0.11.0
* @return @ref error "Error code".
*
* @since 0.100.0
*/
uint16_t post(const Mastodon::API::v1 &call, string &answer);
return_call post(const Mastodon::API::v1 &call);
/*!
* @brief Make a POST request which requires parameters.
@ -615,17 +595,13 @@ public:
*
* @param call A call defined in Mastodon::API::v1
* @param parameters A Mastodon::API::parametermap containing parameters
* @param answer The answer from the server. Usually JSON. On error
* an empty string.
*
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*
* @since before 0.11.0
* @return @ref error "Error code".
*
* @since 0.100.0
*/
uint16_t post(const Mastodon::API::v1 &call,
const parametermap &parameters,
string &answer);
return_call post(const Mastodon::API::v1 &call,
const parametermap &parameters);
/*!
* @brief Make a custom POST request.
@ -634,53 +610,38 @@ public:
*
* @param call String in the form `/api/v1/example`
* @param parameters A Mastodon::API::parametermap containing parameters
* @param answer The answer from the server. Usually JSON. On error
* an empty string.
*
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*
* @since before 0.11.0
* @return @ref error "Error code".
*
* @since 0.100.0
*/
uint16_t post(const string &call,
const parametermap &parameters,
string &answer);
return_call post(const string &call,
const parametermap &parameters);
/*!
* @brief Make a PUT request which requires a parameters.
*
* @param call A call defined in Mastodon::API::v1
* @param parameters A Mastodon::API::parametermap containing
* parameters
* @param answer The answer from the server. Usually JSON. On error
* an empty string.
* @param parameters A Mastodon::API::parametermap containing parameters
*
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*
* @since before 0.11.0
* @return @ref error "Error code".
*
* @since 0.100.0
*/
uint16_t put(const Mastodon::API::v1 &call,
const parametermap &parameters,
string &answer);
return_call put(const Mastodon::API::v1 &call,
const parametermap &parameters);
/*!
* @brief Make a custom PUT request.
*
* @param call String in the form `/api/v1/example`
* @param parameters A Mastodon::API::parametermap containing
* parameters
* @param answer The answer from the server. Usually JSON. On error
* an empty string.
* @param parameters A Mastodon::API::parametermap containing parameters
*
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*
* @since before 0.11.0
* @return @ref error "Error code".
*
* @since 0.100.0
*/
uint16_t put(const string &call,
const parametermap &parameters,
string &answer);
return_call put(const string &call, const parametermap &parameters);
/*!
* @brief Make a DELETE request which requires parameters.
@ -689,28 +650,23 @@ public:
* @param parameters A Mastodon::API::parametermap containing parameters
*
* @return @ref error "Error code".
*
* @since before 0.11.0
*
* @since 0.100.0
*/
uint16_t del(const Mastodon::API::v1 &call,
const parametermap &parameters);
return_call del(const Mastodon::API::v1 &call,
const parametermap &parameters);
/*!
* @brief Make a custom DELETE request.
*
* @param call String in the form `/api/v1/example`
* @param parameters A Mastodon::API::parametermap containing parameters
* @param answer The answer from the server. Usually JSON. On error
* an empty string.
*
* @return @ref error "Error code". If the URL has permanently changed, 13
* is returned and answer is set to the new URL.
*
* @since before 0.11.0
* @return @ref error "Error code".
*
* @since 0.100.0
*/
uint16_t del(const string &call,
const parametermap &parameters,
string &answer);
return_call del(const string &call, const parametermap &parameters);
private:
const string _instance;