diff --git a/src/easy/entities/account.cpp b/src/easy/entities/account.cpp index 8ec9cf8..1e5f0a2 100644 --- a/src/easy/entities/account.cpp +++ b/src/easy/entities/account.cpp @@ -24,27 +24,25 @@ using Account = Easy::Account; bool Account::valid() const { - const std::vector attributes = - {{ - "id", - "username", - "acct", - "display_name", - "locked", - "created_at", - "followers_count", - "following_count", - "statuses_count", - "note", - "url", - "avatar", - "avatar_static", - "header", - "header_static", - "emojis" - }}; - - return Entity::check_valid(attributes); + return Entity::check_valid( + { + "id", + "username", + "acct", + "display_name", + "locked", + "created_at", + "followers_count", + "following_count", + "statuses_count", + "note", + "url", + "avatar", + "avatar_static", + "header", + "header_static", + "emojis" + }); } const string Account::acct() const diff --git a/src/easy/entities/attachment.cpp b/src/easy/entities/attachment.cpp index 7cad1dc..9bb138f 100644 --- a/src/easy/entities/attachment.cpp +++ b/src/easy/entities/attachment.cpp @@ -23,15 +23,13 @@ using Attachment = Easy::Attachment; bool Attachment::valid() const { - const std::vector attributes = - {{ - "id", - "type", - "url", - "preview_url" - }}; - - return Entity::check_valid(attributes); + return Entity::check_valid( + { + "id", + "type", + "url", + "preview_url" + }); } double Attachment::aspect() const diff --git a/src/easy/entities/card.cpp b/src/easy/entities/card.cpp index ad38a4a..fdddb9b 100644 --- a/src/easy/entities/card.cpp +++ b/src/easy/entities/card.cpp @@ -22,15 +22,13 @@ using Card = Easy::Card; bool Card::valid() const { - const std::vector attributes = - {{ - "url", - "title", - "description", - "type" - }}; - - return Entity::check_valid(attributes); + return Entity::check_valid( + { + "url", + "title", + "description", + "type" + }); } const string Card::author_name() const diff --git a/src/easy/entities/context.cpp b/src/easy/entities/context.cpp index e09c0e3..4898792 100644 --- a/src/easy/entities/context.cpp +++ b/src/easy/entities/context.cpp @@ -23,13 +23,11 @@ using Context = Easy::Context; bool Context::valid() const { - const std::vector attributes = - {{ - "ancestors", - "descendants" - }}; - - return Entity::check_valid(attributes); + return Entity::check_valid( + { + "ancestors", + "descendants" + }); } const std::vector Context::ancestors() const diff --git a/src/easy/entities/emoji.cpp b/src/easy/entities/emoji.cpp index 486666f..dcc2a7f 100644 --- a/src/easy/entities/emoji.cpp +++ b/src/easy/entities/emoji.cpp @@ -22,15 +22,13 @@ using Emoji = Easy::Emoji; bool Emoji::valid() const { - const std::vector attributes = - {{ - "shortcode", - "static_url", - "url", - "visible_in_picker" - }}; - - return Entity::check_valid(attributes); + return Entity::check_valid( + { + "shortcode", + "static_url", + "url", + "visible_in_picker" + }); } const string Emoji::shortcode() const diff --git a/src/easy/entities/filter.cpp b/src/easy/entities/filter.cpp index 882255e..f046597 100644 --- a/src/easy/entities/filter.cpp +++ b/src/easy/entities/filter.cpp @@ -24,11 +24,14 @@ using Filter = Easy::Filter; bool Filter::valid() const { - return Entity::check_valid({ "id", - "phrase", - "context", - "irreversible", - "whole_word" }); + return Entity::check_valid( + { + "id", + "phrase", + "context", + "irreversible", + "whole_word" + }); } const string Filter::id() const diff --git a/src/easy/entities/instance.cpp b/src/easy/entities/instance.cpp index 8223283..b485305 100644 --- a/src/easy/entities/instance.cpp +++ b/src/easy/entities/instance.cpp @@ -24,18 +24,16 @@ using Instance = Easy::Instance; bool Instance::valid() const { - const std::vector attributes = - {{ - "uri", - "title", - "description", - "email", - "version", - "urls", - "languages" - }}; - - return Entity::check_valid(attributes); + return Entity::check_valid( + { + "uri", + "title", + "description", + "email", + "version", + "urls", + "languages" + }); } const Easy::Account Instance::contact_account() const diff --git a/src/easy/entities/list.cpp b/src/easy/entities/list.cpp index 19fc8a6..b1de4d5 100644 --- a/src/easy/entities/list.cpp +++ b/src/easy/entities/list.cpp @@ -23,13 +23,11 @@ using std::uint64_t; bool List::valid() const { - const std::vector attributes = - { - "id", - "title" - }; - - return Entity::check_valid(attributes); + return Entity::check_valid( + { + "id", + "title" + }); } const string List::id() const diff --git a/src/easy/entities/mention.cpp b/src/easy/entities/mention.cpp index 3e3ed39..d911eef 100644 --- a/src/easy/entities/mention.cpp +++ b/src/easy/entities/mention.cpp @@ -21,15 +21,13 @@ using Mention = Easy::Mention; bool Mention::valid() const { - const std::vector attributes = - {{ - "url", - "username", - "acct", - "id" - }}; - - return Entity::check_valid(attributes); + return Entity::check_valid( + { + "url", + "username", + "acct", + "id" + }); } const string Mention::acct() const diff --git a/src/easy/entities/notification.cpp b/src/easy/entities/notification.cpp index 35f5368..b0b3eeb 100644 --- a/src/easy/entities/notification.cpp +++ b/src/easy/entities/notification.cpp @@ -22,15 +22,13 @@ using Notification = Easy::Notification; bool Notification::valid() const { - const std::vector attributes = - {{ - "id", - "type", - "created_at", - "account" - }}; - - return Entity::check_valid(attributes); + return Entity::check_valid( + { + "id", + "type", + "created_at", + "account" + }); } const Easy::Account Notification::account() const diff --git a/src/easy/entities/pushsubscription.cpp b/src/easy/entities/pushsubscription.cpp index c8e2964..280df43 100644 --- a/src/easy/entities/pushsubscription.cpp +++ b/src/easy/entities/pushsubscription.cpp @@ -26,14 +26,12 @@ const string PushSubscription::id() const bool PushSubscription::valid() const { - const std::vector attributes = - {{ - "id", - "endpoint", - "server_key" - }}; - - return Entity::check_valid(attributes); + return Entity::check_valid( + { + "id", + "endpoint", + "server_key" + }); } const string PushSubscription::endpoint() const diff --git a/src/easy/entities/relationship.cpp b/src/easy/entities/relationship.cpp index 7394d3a..7a6ce08 100644 --- a/src/easy/entities/relationship.cpp +++ b/src/easy/entities/relationship.cpp @@ -21,19 +21,17 @@ using Relationship = Easy::Relationship; bool Relationship::valid() const { - const std::vector attributes = - {{ - "id", - "following", - "followed_by", - "blocking", - "muting", - "muting_notifications", - "requested", - "domain_blocking" - }}; - - return Entity::check_valid(attributes); + return Entity::check_valid( + { + "id", + "following", + "followed_by", + "blocking", + "muting", + "muting_notifications", + "requested", + "domain_blocking" + }); } bool Relationship::blocking() const diff --git a/src/easy/entities/report.cpp b/src/easy/entities/report.cpp index 31e1f4e..30ca0cd 100644 --- a/src/easy/entities/report.cpp +++ b/src/easy/entities/report.cpp @@ -21,13 +21,11 @@ using Report = Easy::Report; bool Report::valid() const { - const std::vector attributes = - {{ - "id", - "action_taken" - }}; - - return Entity::check_valid(attributes); + return Entity::check_valid( + { + "id", + "action_taken" + }); } bool Report::action_taken() const diff --git a/src/easy/entities/results.cpp b/src/easy/entities/results.cpp index 4c49d84..814d18f 100644 --- a/src/easy/entities/results.cpp +++ b/src/easy/entities/results.cpp @@ -23,14 +23,12 @@ using Results = Easy::Results; bool Results::valid() const { - const std::vector attributes = - {{ - "accounts", - "statuses", - "hashtags" - }}; - - return Entity::check_valid(attributes); + return Entity::check_valid( + { + "accounts", + "statuses", + "hashtags" + }); } const std::vector Results::accounts() const diff --git a/src/easy/entities/status.cpp b/src/easy/entities/status.cpp index 378383e..b69b152 100644 --- a/src/easy/entities/status.cpp +++ b/src/easy/entities/status.cpp @@ -24,27 +24,25 @@ using Status = Easy::Status; bool Status::valid() const { - const std::vector attributes = - {{ - "id", - "uri", - "account", - "content", - "created_at", - "emojis", - "replies_count", - "reblogs_count", - "favourites_count", - "sensitive", - "spoiler_text", - "visibility", - "media_attachments", - "mentions", - "tags", - "application" - }}; - - return Entity::check_valid(attributes); + return Entity::check_valid( + { + "id", + "uri", + "account", + "content", + "created_at", + "emojis", + "replies_count", + "reblogs_count", + "favourites_count", + "sensitive", + "spoiler_text", + "visibility", + "media_attachments", + "mentions", + "tags", + "application" + }); } const Easy::Account Status::account() const diff --git a/src/easy/entities/tag.cpp b/src/easy/entities/tag.cpp index df8987e..6f17a77 100644 --- a/src/easy/entities/tag.cpp +++ b/src/easy/entities/tag.cpp @@ -25,13 +25,11 @@ using Tag = Easy::Tag; bool Tag::valid() const { - const std::vector attributes = - {{ - "name", - "url" - }}; - - return Entity::check_valid(attributes); + return Entity::check_valid( + { + "name", + "url" + }); } const string Tag::name() const diff --git a/src/easy/entities/token.cpp b/src/easy/entities/token.cpp index 9f3a38f..f6a5254 100644 --- a/src/easy/entities/token.cpp +++ b/src/easy/entities/token.cpp @@ -21,10 +21,13 @@ using Token = Easy::Token; bool Token::valid() const { - return Entity::check_valid({"access_token", - "token_type", - "scope", - "created_at"}); + return Entity::check_valid( + { + "access_token", + "token_type", + "scope", + "created_at" + }); } const string Token::access_token() const