Fixed core not creating users and members on message create

Author: zeroxs

include/aegis/gateway/objects/impl/message.cpp

@@ -150,7 +150,7 @@ AEGIS_DECL void message::populate_self()
 #if !defined(AEGIS_DISABLE_ALL_CACHE)
     if (!is_webhook())
     {
-        if ((_user == nullptr) && (_author_id > 0))
+        if (_user == nullptr)
             _user = _core->find_user(_author_id);
         if (_user == nullptr)
         {

include/aegis/gateway/objects/member.hpp

@@ -12,6 +12,7 @@
 #include "aegis/config.hpp"
 #include "aegis/snowflake.hpp"
 #include "aegis/gateway/objects/role.hpp"
+#include "aegis/gateway/objects/user.hpp"
 #include <nlohmann/json.hpp>
 
 namespace aegis
@@ -51,6 +52,7 @@ struct member
     std::vector<objects::role> roles;
     std::string nick; /**< nick of user */
     std::string joined_at;
+    std::optional<user> _user;
     bool mute = false;
     bool deaf = false;
 };
@@ -69,6 +71,8 @@ inline void from_json(const nlohmann::json& j, member& m)
         m.mute = j["mute"];
     if (j.count("deaf") && !j["deaf"].is_null())
         m.deaf = j["deaf"];
+    if (j.count("user") && !j["user"].is_null())
+        m._user = j["user"];
 }
 
 inline void to_json(nlohmann::json& j, const member& m)
@@ -79,6 +83,8 @@ inline void to_json(nlohmann::json& j, const member& m)
     j["joined_at"] = m.joined_at;
     j["mute"] = m.mute;
     j["deaf"] = m.deaf;
+    if (m._user.has_value())
+        j["user"] = m._user.value();
 }
 /// \endcond
 

include/aegis/impl/core.cpp

@@ -1276,19 +1276,41 @@ AEGIS_DECL void core::ws_message_create(const json & result, shards::shard * _sh
     }
     else
     {
-        //todo: nullptr should result in nullopt so optional can return has_value correctly
-        auto m = find_user(result["d"]["author"]["id"]);
-        auto g = &c->get_guild();
-        gateway::events::message_create obj{ *_shard, std::ref(*m), std::ref(*c)/*, std::make_optional(std::ref(*g))*/ };
+        if (!result["d"].count("webhook_id"))
+        {
+            auto g = &c->get_guild();
+            auto m = find_user(result["d"]["author"]["id"]);
+            if (m == nullptr)
+            {
+                if (result["d"].count("member") && !result["d"]["member"].is_null())
+                {
+                    gateway::objects::member u = result["d"]["member"];
+                    u._user = result["d"]["author"];
+                    int64_t author_id = u._user->id;
+                    m = user_create(author_id);
+                    m->_load_nolock(g, u, _shard);
+                }
+            }
 
-        obj.msg = result["d"];
-        obj.msg._core = this;
+            //user was previously created via presence update, but presence update only contains id
+            if (m->get_username().empty())
+            {
+                gateway::objects::member u = result["d"]["member"];
+                u._user = result["d"]["author"];
+                m->_load_nolock(g, u, _shard);
+            }
 
-        if (i_message_create_raw)
-            i_message_create_raw(result, _shard);
+            gateway::events::message_create obj{ *_shard, std::ref(*m), std::ref(*c) };
 
-        if (i_message_create)
-            i_message_create(obj);
+            obj.msg = result["d"];
+            obj.msg._core = this;
+
+            if (i_message_create_raw)
+                i_message_create_raw(result, _shard);
+
+            if (i_message_create)
+                i_message_create(obj);
+        }
     }
 }
 

include/aegis/impl/user.cpp

@@ -80,7 +80,12 @@ AEGIS_DECL void user::_load_nolock(guild * _guild, const json & obj, shards::sha
 
                 json roles = obj["roles"];
                 for (auto & r : roles)
-                    g_info->roles.emplace_back(std::stoull(r.get<std::string>()));
+                {
+                    if (r.is_object())
+                        g_info->roles.emplace_back(std::stoull(r["id"].get<std::string>()));
+                    else if (r.is_string())
+                        g_info->roles.emplace_back(std::stoull(r.get<std::string>()));
+                }
             }
 
             if (obj.count("nick") && !obj["nick"].is_null())