Fixed some docs and json accessors to reduce chance of ambiguous calls

Author: zeroxs

include/aegis/gateway/objects/attachment.hpp

@@ -42,13 +42,13 @@ inline void from_json(const nlohmann::json& j, attachment& m)
     if (j.count("id"))
         m.id = j["id"];
     if (j.count("filename"))
-        m.filename = j["filename"];
+        m.filename = j["filename"].get<std::string>();
     if (j.count("size"))
         m.size = j["size"];
     if (j.count("url"))
-        m.url = j["url"];
+        m.url = j["url"].get<std::string>();
     if (j.count("proxy_url"))
-        m.proxy_url = j["proxy_url"];
+        m.proxy_url = j["proxy_url"].get<std::string>();
     if (j.count("height") && !j["height"].is_null())
         m.height = j["height"];
     if (j.count("width") && !j["width"].is_null())

include/aegis/gateway/objects/channel.hpp

@@ -88,9 +88,9 @@ inline void from_json(const nlohmann::json& j, channel& m)
         for (const auto & i : j["permission_overwrites"])
             m.permission_overwrites.push_back(i);
     if (j.count("name") && !j["name"].is_null())
-        m.name = j["name"];
+        m.name = j["name"].get<std::string>();
     if (j.count("topic") && !j["topic"].is_null())
-        m.topic = j["topic"];
+        m.topic = j["topic"].get<std::string>();
     if (j.count("nsfw") && !j["nsfw"].is_null())
         m.nsfw = j["nsfw"];
     if (j.count("last_message_id") && !j["last_message_id"].is_null())
@@ -100,7 +100,7 @@ inline void from_json(const nlohmann::json& j, channel& m)
     if (j.count("userlimit") && !j["userlimit"].is_null())
         m.userlimit = j["userlimit"];
     if (j.count("icon") && !j["icon"].is_null())
-        m.icon = j["icon"];
+        m.icon = j["icon"].get<std::string>();
     if (j.count("owner_id") && !j["owner_id"].is_null())
         m.owner_id = j["owner_id"];
     if (j.count("application_id") && !j["application_id"].is_null())

include/aegis/gateway/objects/footer.hpp

@@ -36,11 +36,11 @@ struct footer
 inline void from_json(const nlohmann::json& j, footer& m)
 {
     if (j.count("text") && !j["text"].is_null())
-        m.text = j["text"];
+        m.text = j["text"].get<std::string>();
     if (j.count("icon_url") && !j["icon_url"].is_null())
-        m.icon_url = j["icon_url"];
+        m.icon_url = j["icon_url"].get<std::string>();
     if (j.count("proxy_icon_url") && !j["proxy_icon_url"].is_null())
-        m.proxy_icon_url = j["proxy_icon_url"];
+        m.proxy_icon_url = j["proxy_icon_url"].get<std::string>();
 }
 
 inline void to_json(nlohmann::json& j, const footer& m)

include/aegis/gateway/objects/guild.hpp

@@ -93,15 +93,15 @@ inline void from_json(const nlohmann::json& j, guild& m)
     if (j.count("id") && !j["id"].is_null())
         m.id = m.guild_id = j["id"];
     if (j.count("name") && !j["name"].is_null())
-        m.name = j["name"];
+        m.name = j["name"].get<std::string>();
     if (j.count("icon") && !j["icon"].is_null())
-        m.icon = j["icon"];
+        m.icon = j["icon"].get<std::string>();
     if (j.count("splash") && !j["splash"].is_null())
-        m.splash = j["splash"];
+        m.splash = j["splash"].get<std::string>();
     if (j.count("owner_id") && !j["owner_id"].is_null())
         m.owner_id = j["owner_id"];
     if (j.count("region") && !j["region"].is_null())
-        m.region = j["region"];
+        m.region = j["region"].get<std::string>();
     if (j.count("afk_channel_id") && !j["afk_channel_id"].is_null())
         m.afk_channel_id = j["afk_channel_id"];
     if (j.count("afk_timeout") && !j["afk_timeout"].is_null())
@@ -117,7 +117,7 @@ inline void from_json(const nlohmann::json& j, guild& m)
     if (j.count("mfa_level") && !j["mfa_level"].is_null())
         m.mfa_level = j["mfa_level"];
     if (j.count("joined_at") && !j["joined_at"].is_null())
-        m.joined_at = j["joined_at"];
+        m.joined_at = j["joined_at"].get<std::string>();
     if (j.count("large") && !j["large"].is_null())
         m.large = j["large"];
     if (j.count("unavailable") && !j["unavailable"].is_null())

include/aegis/gateway/objects/guild_member.hpp

@@ -41,14 +41,14 @@ inline void from_json(const nlohmann::json& j, guild_member& m)
 {
     m._user = j["user"];
     if (j.count("nick") && !j["nick"].is_null())
-        m.nick = j["nick"];
+        m.nick = j["nick"].get<std::string>();
     if (j.count("guild_id") && !j["guild_id"].is_null())
         m.guild_id = j["guild_id"];
     if (j.count("roles") && !j["roles"].is_null())
         for (const auto & _role : j["roles"])
             m.roles.push_back(_role);
     if (j.count("joined_at"))
-        m.joined_at = j["joined_at"];
+        m.joined_at = j["joined_at"].get<std::string>();
     if (j.count("deaf"))
         m.deaf = j["deaf"];
     if (j.count("mute"))

include/aegis/gateway/objects/image.hpp

@@ -35,9 +35,9 @@ struct image
 inline void from_json(const nlohmann::json& j, image& m)
 {
     if (j.count("url") && !j["url"].is_null())
-        m.url = j["url"];
+        m.url = j["url"].get<std::string>();
     if (j.count("proxy_url") && !j["proxy_url"].is_null())
-        m.proxy_url = j["proxy_url"];
+        m.proxy_url = j["proxy_url"].get<std::string>();
     if (j.count("height") && !j["height"].is_null())
         m.height = j["height"];
     if (j.count("width") && !j["width"].is_null())

include/aegis/gateway/objects/member.hpp

@@ -62,9 +62,9 @@ inline void from_json(const nlohmann::json& j, member& m)
         for (const auto & _role : j["roles"])
             m.roles.push_back(_role);
     if (j.count("nick") && !j["nick"].is_null())
-        m.nick = j["nick"];
+        m.nick = j["nick"].get<std::string>();
     if (j.count("joined_at") && !j["joined_at"].is_null())
-        m.joined_at = j["joined_at"];
+        m.joined_at = j["joined_at"].get<std::string>();
     if (j.count("mute") && !j["mute"].is_null())
         m.mute = j["mute"];
     if (j.count("deaf") && !j["deaf"].is_null())

include/aegis/gateway/objects/provider.hpp

@@ -33,9 +33,9 @@ struct provider
 inline void from_json(const nlohmann::json& j, provider& m)
 {
     if (j.count("name") && !j["name"].is_null())
-        m.name = j["name"];
+        m.name = j["name"].get<std::string>();
     if (j.count("url") && !j["url"].is_null())
-        m.url = j["url"];
+        m.url = j["url"].get<std::string>();
 }
 /// \endcond
 

include/aegis/gateway/objects/role.hpp

@@ -49,7 +49,7 @@ struct role
 
     uint32_t color = 0;
     snowflake id;
-    snowflake role_id;
+    snowflake role_id; //<deprecated use role::id instead
     std::string name;
     aegis::permission _permission;
     uint16_t position = 0;
@@ -66,7 +66,7 @@ inline void from_json(const nlohmann::json& j, role& m)
     if (j.count("id") && !j["id"].is_null())
         m.id = m.role_id = j["id"];
     if (j.count("name") && !j["name"].is_null())
-        m.name = j["name"];
+        m.name = j["name"].get<std::string>();
     if (j.count("permissions") && !j["permissions"].is_null())
         m._permission = j["permissions"];
     if (j.count("position") && !j["position"].is_null())

include/aegis/gateway/objects/thumbnail.hpp

@@ -37,9 +37,9 @@ struct thumbnail
 inline void from_json(const nlohmann::json& j, thumbnail& m)
 {
     if (j.count("url"))
-        m.url = j["url"];
+        m.url = j["url"].get<std::string>();
     if (j.count("proxy_url"))
-        m.proxy_url = j["proxy_url"];
+        m.proxy_url = j["proxy_url"].get<std::string>();
     if (j.count("height") && !j["height"].is_null())
         m.height = j["height"];
     if (j.count("width") && !j["width"].is_null())