From 0b47e0ec8dea12a76b1755ebd2279d293bd8dee6 Mon Sep 17 00:00:00 2001 From: tastytea Date: Sun, 27 Jan 2019 03:44:08 +0100 Subject: [PATCH] Changed ids from uint_fast64_t to const string in all Entities. --- src/easy/entities/account.cpp | 4 ++-- src/easy/entities/account.hpp | 2 +- src/easy/entities/attachment.cpp | 4 ++-- src/easy/entities/attachment.hpp | 2 +- src/easy/entities/list.cpp | 4 ++-- src/easy/entities/list.hpp | 2 +- src/easy/entities/mention.cpp | 4 ++-- src/easy/entities/mention.hpp | 2 +- src/easy/entities/notification.cpp | 2 +- src/easy/entities/notification.hpp | 2 +- src/easy/entities/pushsubscription.cpp | 4 ++-- src/easy/entities/pushsubscription.hpp | 3 +-- src/easy/entities/relationship.cpp | 4 ++-- src/easy/entities/relationship.hpp | 2 +- src/easy/entities/report.cpp | 4 ++-- src/easy/entities/report.hpp | 3 +-- src/easy/entities/status.cpp | 16 ++++++++-------- src/easy/entities/status.hpp | 8 ++++---- 18 files changed, 35 insertions(+), 37 deletions(-) diff --git a/src/easy/entities/account.cpp b/src/easy/entities/account.cpp index 9f8dae7..6c60078 100644 --- a/src/easy/entities/account.cpp +++ b/src/easy/entities/account.cpp @@ -154,9 +154,9 @@ const string Account::header_static() const return get_string("header_static"); } -std::uint_fast64_t Account::id() const +const string Account::id() const { - return stouint64(get_string("id")); + return get_string("id"); } bool Account::locked() const diff --git a/src/easy/entities/account.hpp b/src/easy/entities/account.hpp index 9b946de..d9537d5 100644 --- a/src/easy/entities/account.hpp +++ b/src/easy/entities/account.hpp @@ -188,7 +188,7 @@ namespace Mastodon * * @since before 0.11.0 */ - uint_fast64_t id() const; + const string id() const; /*! * @brief Returns true if the account is locked diff --git a/src/easy/entities/attachment.cpp b/src/easy/entities/attachment.cpp index dcd2d4e..cb407dc 100644 --- a/src/easy/entities/attachment.cpp +++ b/src/easy/entities/attachment.cpp @@ -139,9 +139,9 @@ uint_fast64_t Attachment::height_small() const return get_uint64("meta.small.height"); } -std::uint_fast64_t Attachment::id() const +const string Attachment::id() const { - return stouint64(get_string("id")); + return get_string("id"); } const string Attachment::preview_url() const diff --git a/src/easy/entities/attachment.hpp b/src/easy/entities/attachment.hpp index a320f68..49606fa 100644 --- a/src/easy/entities/attachment.hpp +++ b/src/easy/entities/attachment.hpp @@ -164,7 +164,7 @@ namespace Mastodon * * @since before 0.11.0 */ - uint_fast64_t id() const; + const string id() const; /*! * @brief Returns the URL of the preview image diff --git a/src/easy/entities/list.cpp b/src/easy/entities/list.cpp index 101d86f..1ad4a8b 100644 --- a/src/easy/entities/list.cpp +++ b/src/easy/entities/list.cpp @@ -40,9 +40,9 @@ bool List::valid() const return Entity::check_valid(attributes); } -uint_fast64_t List::id() const +const string List::id() const { - return stouint64(get_string("id")); + return get_string("id"); } const string List::title() const diff --git a/src/easy/entities/list.hpp b/src/easy/entities/list.hpp index 87b73e5..aeb97bb 100644 --- a/src/easy/entities/list.hpp +++ b/src/easy/entities/list.hpp @@ -66,7 +66,7 @@ namespace Mastodon * * @since before 0.11.0 */ - uint_fast64_t id() const; + const string id() const; /*! * @brief Returns title diff --git a/src/easy/entities/mention.cpp b/src/easy/entities/mention.cpp index 052dd0e..21cb9ac 100644 --- a/src/easy/entities/mention.cpp +++ b/src/easy/entities/mention.cpp @@ -45,9 +45,9 @@ const string Mention::acct() const return get_string("acct"); } -uint_fast64_t Mention::id() const +const string Mention::id() const { - return stouint64(get_string("id")); + return get_string("id"); } const string Mention::url() const diff --git a/src/easy/entities/mention.hpp b/src/easy/entities/mention.hpp index 36d7851..6a840a8 100644 --- a/src/easy/entities/mention.hpp +++ b/src/easy/entities/mention.hpp @@ -73,7 +73,7 @@ namespace Mastodon * * @since before 0.11.0 */ - uint_fast64_t id() const; + const string id() const; /*! * @brief Returns the URL of user's profile diff --git a/src/easy/entities/notification.cpp b/src/easy/entities/notification.cpp index 60e5704..e845dcb 100644 --- a/src/easy/entities/notification.cpp +++ b/src/easy/entities/notification.cpp @@ -58,7 +58,7 @@ const system_clock::time_point Notification::created_at() const return get_time_point("created_at"); } -uint_fast64_t Notification::id() const +const string Notification::id() const { return stouint64(get_string("id")); } diff --git a/src/easy/entities/notification.hpp b/src/easy/entities/notification.hpp index acaba32..fbe6c60 100644 --- a/src/easy/entities/notification.hpp +++ b/src/easy/entities/notification.hpp @@ -85,7 +85,7 @@ namespace Mastodon * * @since before 0.11.0 */ - uint_fast64_t id() const; + const string id() const; /*! * @brief Returns the Status associated with the notification, if diff --git a/src/easy/entities/pushsubscription.cpp b/src/easy/entities/pushsubscription.cpp index 093666b..8ea535d 100644 --- a/src/easy/entities/pushsubscription.cpp +++ b/src/easy/entities/pushsubscription.cpp @@ -23,9 +23,9 @@ PushSubscription::PushSubscription(const string &json) : Entity(json) {} -uint_fast64_t PushSubscription::id() const +const string PushSubscription::id() const { - return stouint64(get_string("id")); + return get_string("id"); } PushSubscription::PushSubscription() diff --git a/src/easy/entities/pushsubscription.hpp b/src/easy/entities/pushsubscription.hpp index 68fac5f..20f62fd 100644 --- a/src/easy/entities/pushsubscription.hpp +++ b/src/easy/entities/pushsubscription.hpp @@ -31,7 +31,6 @@ #endif using std::string; -using std::uint_fast64_t; namespace Mastodon { @@ -66,7 +65,7 @@ namespace Mastodon * * @since 0.14.0 */ - uint_fast64_t id() const; + const string id() const; /*! * @brief Returns the endpoint URL diff --git a/src/easy/entities/relationship.cpp b/src/easy/entities/relationship.cpp index 41c4da7..8a3f472 100644 --- a/src/easy/entities/relationship.cpp +++ b/src/easy/entities/relationship.cpp @@ -69,9 +69,9 @@ bool Relationship::following() const return get_bool("following"); } -uint_fast64_t Relationship::id() const +const string Relationship::id() const { - return stouint64(get_string("id")); + return get_string("id"); } bool Relationship::muting() const diff --git a/src/easy/entities/relationship.hpp b/src/easy/entities/relationship.hpp index 25343de..fe4f729 100644 --- a/src/easy/entities/relationship.hpp +++ b/src/easy/entities/relationship.hpp @@ -100,7 +100,7 @@ namespace Mastodon * * @since before 0.11.0 */ - uint_fast64_t id() const; + const string id() const; /*! * @brief Returns true if the user is muting the account diff --git a/src/easy/entities/report.cpp b/src/easy/entities/report.cpp index 53f6608..296e901 100644 --- a/src/easy/entities/report.cpp +++ b/src/easy/entities/report.cpp @@ -43,8 +43,8 @@ bool Report::action_taken() const return get_bool("action_taken"); } -uint_fast64_t Report::id() const +const string Report::id() const { - return stouint64(get_string("id")); + return get_string("id"); } diff --git a/src/easy/entities/report.hpp b/src/easy/entities/report.hpp index 5b54d03..195ae22 100644 --- a/src/easy/entities/report.hpp +++ b/src/easy/entities/report.hpp @@ -30,7 +30,6 @@ #endif using std::string; -using std::uint_fast64_t; namespace Mastodon { @@ -73,7 +72,7 @@ namespace Mastodon * * @since before 0.11.0 */ - uint_fast64_t id() const; + const string id() const; }; } diff --git a/src/easy/entities/status.cpp b/src/easy/entities/status.cpp index 41e4e9a..88f183d 100644 --- a/src/easy/entities/status.cpp +++ b/src/easy/entities/status.cpp @@ -127,25 +127,25 @@ uint_fast64_t Status::favourites_count() const return get_uint64("favourites_count"); } -uint_fast64_t Status::id() const +const string Status::id() const { - return stouint64(get_string("id")); + return get_string("id"); } -uint_fast64_t Status::in_reply_to_id() const +const string Status::in_reply_to_id() const { - return stouint64(get_string("in_reply_to_id")); + return get_string("in_reply_to_id"); } -Status Status::in_reply_to_id(const uint_fast64_t &in_reply_to_id) +Status Status::in_reply_to_id(const string &in_reply_to_id) { - set("in_reply_to_id", Json::Value(std::to_string(in_reply_to_id))); + set("in_reply_to_id", Json::Value(in_reply_to_id)); return *this; } -uint_fast64_t Status::in_reply_to_account_id() const +const string Status::in_reply_to_account_id() const { - return stouint64(get_string("in_reply_to_account_id")); + return get_string("in_reply_to_account_id"); } const string Status::language() const diff --git a/src/easy/entities/status.hpp b/src/easy/entities/status.hpp index 6222a37..494c546 100644 --- a/src/easy/entities/status.hpp +++ b/src/easy/entities/status.hpp @@ -145,28 +145,28 @@ namespace Mastodon * * @since before 0.11.0 */ - uint_fast64_t id() const; + const string id() const; /*! * @brief Returns the ID of the status it replies to * * @since before 0.11.0 */ - uint_fast64_t in_reply_to_id() const; + const string in_reply_to_id() const; /*! * @brief Sets the ID of the status it replies to * * @since 0.17.0 */ - Status in_reply_to_id(const uint_fast64_t &in_reply_to_id); + Status in_reply_to_id(const string &in_reply_to_id); /*! * @brief Returns the ID of the account it replies to * * @since before 0.11.0 */ - uint_fast64_t in_reply_to_account_id() const; + const string in_reply_to_account_id() const; /*! * @brief Returns the language of the status