mild refactoring

This commit is contained in:
tastytea 2018-05-12 04:17:34 +02:00
parent 5ebaf7678c
commit dbebbd934f
Signed by: tastytea
GPG Key ID: 59346E0EA35C67E5
3 changed files with 11 additions and 11 deletions

View File

@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 3.7) cmake_minimum_required (VERSION 3.7)
project (expandurl-mastodon project (expandurl-mastodon
VERSION 0.1.2 VERSION 0.1.3
LANGUAGES CXX LANGUAGES CXX
) )

View File

@ -75,7 +75,7 @@ public:
std::vector<Easy::Notification> get_new_messages(); std::vector<Easy::Notification> get_new_messages();
Easy::Status get_status(const std::uint_fast64_t &id); Easy::Status get_status(const std::uint_fast64_t &id);
const bool send_reply(const Easy::Status &status, const string &message); const bool send_reply(const Easy::Status &to_status, const string &message);
const std::uint_fast64_t get_parent_id(Easy::Notification &notif); const std::uint_fast64_t get_parent_id(Easy::Notification &notif);
private: private:

View File

@ -96,7 +96,7 @@ Mastodon::Easy::Status Listener::get_status(const std::uint_fast64_t &id)
std::uint_fast16_t ret; std::uint_fast16_t ret;
string answer; string answer;
ret = _masto->get(Easy::v1::statuses_id, {{ "id", { std::to_string(id) }}}, ret = _masto->get(API::v1::statuses_id, {{ "id", { std::to_string(id) }}},
answer); answer);
if (ret == 0) if (ret == 0)
{ {
@ -109,15 +109,15 @@ Mastodon::Easy::Status Listener::get_status(const std::uint_fast64_t &id)
} }
} }
const bool Listener::send_reply(const Easy::Status &status, const bool Listener::send_reply(const Easy::Status &to_status,
const string &message) const string &message)
{ {
std::uint_fast16_t ret; std::uint_fast16_t ret;
string answer; string answer;
const string id = std::to_string(status.id()); const string id = std::to_string(to_status.id());
string strvisibility; string strvisibility;
switch (status.visibility()) switch (to_status.visibility())
{ {
case Easy::visibility_type::Private: case Easy::visibility_type::Private:
strvisibility = "private"; strvisibility = "private";
@ -134,20 +134,20 @@ const bool Listener::send_reply(const Easy::Status &status,
{ {
{ "in_reply_to_id", { id } }, { "in_reply_to_id", { id } },
{ "visibility", { strvisibility } }, { "visibility", { strvisibility } },
{ "status", { '@' + status.account().acct() + ' ' + message } } { "status", { '@' + to_status.account().acct() + ' ' + message } }
}; };
if (status.sensitive()) if (to_status.sensitive())
{ {
parameters.insert({ "sensitive", { "true" } }); parameters.insert({ "sensitive", { "true" } });
} }
if (!status.spoiler_text().empty()) if (!to_status.spoiler_text().empty())
{ {
parameters.insert({ "spoiler_text", { status.spoiler_text() } }); parameters.insert({ "spoiler_text", { to_status.spoiler_text() } });
} }
ret = _masto->post(Easy::v1::statuses, parameters, answer); ret = _masto->post(API::v1::statuses, parameters, answer);
if (ret == 0) if (ret == 0)
{ {