Added raw event handlers

Author: zeroxs

include/aegis/core.hpp

@@ -568,107 +568,143 @@ class core
     using voice_server_update_t = std::function<void(gateway::events::voice_server_update obj)>;
     using webhooks_update_t = std::function<void(gateway::events::webhooks_update obj)>;
 
+    using raw_event_t = std::function<void(json obj, shards::shard * _shard)>;
+
     /// TYPING_START callback
     void set_on_typing_start(typing_start_t cb) { i_typing_start = cb; }
+    void set_on_typing_start_raw(raw_event_t cb) { i_typing_start_raw = cb; }
 
     /// MESSAGE_CREATE callback
     void set_on_message_create(message_create_t cb) { i_message_create = cb; }
+    void set_on_message_create_raw(raw_event_t cb) { i_message_create_raw = cb; }
 
     /// MESSAGE_CREATE callback for direct messages
     void set_on_message_create_dm(message_create_t cb) { i_message_create_dm = cb; }
+    void set_on_message_create_dm_raw(raw_event_t cb) { i_message_create_dm_raw = cb; }
 
     /// MESSAGE_UPDATE callback
     void set_on_message_update(message_update_t cb) { i_message_update = cb; }
+    void set_on_message_update_raw(raw_event_t cb) { i_message_update_raw = cb; }
 
     /// MESSAGE_DELETE callback
     void set_on_message_delete(message_delete_t cb) { i_message_delete = cb; }
+    void set_on_message_delete_raw(raw_event_t cb) { i_message_delete_raw = cb; }
 
     /// MESSAGE_DELETE_BULK callback
     void set_on_message_delete_bulk(message_delete_bulk_t cb) { i_message_delete_bulk = cb; }
+    void set_on_message_delete_bulk_raw(raw_event_t cb) { i_message_delete_bulk_raw = cb; }
 
     /// GUILD_CREATE callback
     void set_on_guild_create(guild_create_t cb) { i_guild_create = cb; }
+    void set_on_guild_create_raw(raw_event_t cb) { i_guild_create_raw = cb; }
 
     /// GUILD_UPDATE callback
     void set_on_guild_update(guild_update_t cb) { i_guild_update = cb; }
+    void set_on_guild_update_raw(raw_event_t cb) { i_guild_update_raw = cb; }
 
     /// GUILD_DELETE callback
     void set_on_guild_delete(guild_delete_t cb) { i_guild_delete = cb; }
+    void set_on_guild_delete_raw(raw_event_t cb) { i_guild_delete_raw = cb; }
 
     /// MESSAGE_REACTION_ADD callback
     void set_on_message_reaction_add(message_reaction_add_t cb) { i_message_reaction_add = cb; }
+    void set_on_message_reaction_add_raw(raw_event_t cb) { i_message_reaction_add_raw = cb; }
 
     /// MESSAGE_REACTION_REMOVE callback
     void set_on_message_reaction_remove(message_reaction_remove_t cb) { i_message_reaction_remove = cb; }
+    void set_on_message_reaction_remove_raw(raw_event_t cb) { i_message_reaction_remove_raw = cb; }
 
     /// MESSAGE_REACTION_REMOVE_ALL callback
     void set_on_message_reaction_remove_all(message_reaction_remove_all_t cb) { i_message_reaction_remove_all = cb; }
+    void set_on_message_reaction_remove_all_raw(raw_event_t cb) { i_message_reaction_remove_all_raw = cb; }
 
     /// USER_UPDATE callback
     void set_on_user_update(user_update_t cb) { i_user_update = cb; }
+    void set_on_user_update_raw(raw_event_t cb) { i_user_update_raw = cb; }
 
     /// READY callback
     void set_on_ready(ready_t cb) { i_ready = cb; }
+    void set_on_ready_raw(raw_event_t cb) { i_ready_raw = cb; }
 
     /// RESUME callback
     void set_on_resumed(resumed_t cb) { i_resumed = cb; }
+    void set_on_resumed_raw(raw_event_t cb) { i_resumed_raw = cb; }
 
     /// CHANNEL_CREATE callback
     void set_on_channel_create(channel_create_t cb) { i_channel_create = cb; }
+    void set_on_channel_create_raw(raw_event_t cb) { i_channel_create_raw = cb; }
 
     /// CHANNEL_UPDATE callback
     void set_on_channel_update(channel_update_t cb) { i_channel_update = cb; }
+    void set_on_channel_update_raw(raw_event_t cb) { i_channel_update_raw = cb; }
 
     /// CHANNEL_DELETE callback
     void set_on_channel_delete(channel_delete_t cb) { i_channel_delete = cb; }
+    void set_on_channel_delete_raw(raw_event_t cb) { i_channel_delete_raw = cb; }
 
     /// CHANNEL_PINS_UPDATE callback
     void set_on_channel_pins_update(channel_pins_update_t cb) { i_channel_pins_update = cb; }
+    void set_on_channel_pins_update_raw(raw_event_t cb) { i_channel_pins_update_raw = cb; }
 
     /// GUILD_BAN_ADD callback
     void set_on_guild_ban_add(guild_ban_add_t cb) { i_guild_ban_add = cb; }
+    void set_on_guild_ban_add_raw(raw_event_t cb) { i_guild_ban_add_raw = cb; }
 
     /// GUILD_BAN_REMOVE callback
     void set_on_guild_ban_remove(guild_ban_remove_t cb) { i_guild_ban_remove = cb; }
+    void set_on_guild_ban_remove_raw(raw_event_t cb) { i_guild_ban_remove_raw = cb; }
 
     /// GUILD_EMOJIS_UPDATE callback
     void set_on_guild_emojis_update(guild_emojis_update_t cb) { i_guild_emojis_update = cb; }
+    void set_on_guild_emojis_update_raw(raw_event_t cb) { i_guild_emojis_update_raw = cb; }
 
     /// GUILD_INTEGRATIONS_UPDATE callback
     void set_on_guild_integrations_update(guild_integrations_update_t cb) { i_guild_integrations_update = cb; }
+    void set_on_guild_integrations_update_raw(raw_event_t cb) { i_guild_integrations_update_raw = cb; }
 
     /// GUILD_MEMBER_ADD callback
     void set_on_guild_member_add(guild_member_add_t cb) { i_guild_member_add = cb; }
+    void set_on_guild_member_add_raw(raw_event_t cb) { i_guild_member_add_raw = cb; }
 
     /// GUILD_MEMBER_REMOVE callback
     void set_on_guild_member_remove(guild_member_remove_t cb) { i_guild_member_remove = cb; }
+    void set_on_guild_member_remove_raw(raw_event_t cb) { i_guild_member_remove_raw = cb; }
 
     /// GUILD_MEMBER_UPDATE callback
     void set_on_guild_member_update(guild_member_update_t cb) { i_guild_member_update = cb; }
+    void set_on_guild_member_update_raw(raw_event_t cb) { i_guild_member_update_raw = cb; }
 
     /// GUILD_MEMBERS_CHUNK callback
     void set_on_guild_member_chunk(guild_members_chunk_t cb) { i_guild_members_chunk = cb; }
+    void set_on_guild_member_chunk_raw(raw_event_t cb) { i_guild_members_chunk_raw = cb; }
 
     /// GUILD_ROLE_CREATE callback
     void set_on_guild_role_create(guild_role_create_t cb) { i_guild_role_create = cb; }
+    void set_on_guild_role_create_raw(raw_event_t cb) { i_guild_role_create_raw = cb; }
 
     /// GUILD_ROLE_UPDATE callback
     void set_on_guild_role_update(guild_role_update_t cb) { i_guild_role_update = cb; }
+    void set_on_guild_role_update_raw(raw_event_t cb) { i_guild_role_update_raw = cb; }
 
     /// GUILD_ROLE_DELETE callback
     void set_on_guild_role_delete(guild_role_delete_t cb) { i_guild_role_delete = cb; }
+    void set_on_guild_role_delete_raw(raw_event_t cb) { i_guild_role_delete_raw = cb; }
 
     /// PRESENCE_UPDATE callback
     void set_on_presence_update(presence_update_t cb) { i_presence_update = cb; }
+    void set_on_presence_update_raw(raw_event_t cb) { i_presence_update_raw = cb; }
 
     /// VOICE_STATE_UPDATE callback
     void set_on_voice_state_update(voice_state_update_t cb) { i_voice_state_update = cb; }
+    void set_on_voice_state_update_raw(raw_event_t cb) { i_voice_state_update_raw = cb; }
 
     /// VOICE_SERVER_UPDATE callback
     void set_on_voice_server_update(voice_server_update_t cb) { i_voice_server_update = cb; }
+    void set_on_voice_server_update_raw(raw_event_t cb) { i_voice_server_update_raw = cb; }
 
     /// WEBHOOKS_UPDATE callback
     void set_on_webhooks_update(webhooks_update_t cb) { i_webhooks_update = cb; }
+    void set_on_webhooks_update_raw(raw_event_t cb) { i_webhooks_update_raw = cb; }
 
     /// Shard disconnect callback
     void set_on_shard_disconnect(std::function<void(aegis::shards::shard*)> cb)
@@ -882,6 +918,8 @@ class core
 
     AEGIS_DECL void _thread_track(thread_state * t_state);
 
+#pragma region event handlers
+    //preprocessed object events
     typing_start_t i_typing_start;
     message_create_t i_message_create;
     message_create_t i_message_create_dm;
@@ -917,6 +955,78 @@ class core
     voice_server_update_t i_voice_server_update;
     webhooks_update_t i_webhooks_update;
 
+    //raw json events
+    raw_event_t i_typing_start_raw;
+    raw_event_t i_message_create_raw;
+    raw_event_t i_message_create_dm_raw;
+    raw_event_t i_message_update_raw;
+    raw_event_t i_message_delete_raw;
+    raw_event_t i_message_delete_bulk_raw;
+    raw_event_t i_guild_create_raw;
+    raw_event_t i_guild_update_raw;
+    raw_event_t i_guild_delete_raw;
+    raw_event_t i_message_reaction_add_raw;
+    raw_event_t i_message_reaction_remove_raw;
+    raw_event_t i_message_reaction_remove_all_raw;
+    raw_event_t i_user_update_raw;
+    raw_event_t i_ready_raw;
+    raw_event_t i_resumed_raw;
+    raw_event_t i_channel_create_raw;
+    raw_event_t i_channel_update_raw;
+    raw_event_t i_channel_delete_raw;
+    raw_event_t i_channel_pins_update_raw;
+    raw_event_t i_guild_ban_add_raw;
+    raw_event_t i_guild_ban_remove_raw;
+    raw_event_t i_guild_emojis_update_raw;
+    raw_event_t i_guild_integrations_update_raw;
+    raw_event_t i_guild_member_add_raw;
+    raw_event_t i_guild_member_remove_raw;
+    raw_event_t i_guild_member_update_raw;
+    raw_event_t i_guild_members_chunk_raw;
+    raw_event_t i_guild_role_create_raw;
+    raw_event_t i_guild_role_update_raw;
+    raw_event_t i_guild_role_delete_raw;
+    raw_event_t i_presence_update_raw;
+    raw_event_t i_voice_state_update_raw;
+    raw_event_t i_voice_server_update_raw;
+    raw_event_t i_webhooks_update_raw;
+
+
+    AEGIS_DECL void ws_presence_update(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_typing_start(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_message_create(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_message_update(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_guild_create(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_guild_update(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_guild_delete(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_message_reaction_add(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_message_reaction_remove(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_message_reaction_remove_all(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_message_delete(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_message_delete_bulk(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_user_update(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_resumed(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_ready(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_channel_create(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_channel_update(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_channel_delete(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_channel_pins_update(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_guild_ban_add(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_guild_ban_remove(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_guild_emojis_update(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_guild_integrations_update(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_guild_member_add(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_guild_member_remove(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_guild_member_update(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_guild_members_chunk(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_guild_role_create(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_guild_role_update(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_guild_role_delete(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_voice_server_update(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_voice_state_update(const json& result, shards::shard* _shard);
+    AEGIS_DECL void ws_webhooks_update(const json& result, shards::shard* _shard);
+#pragma endregion
+
     AEGIS_DECL void setup_gateway();
     AEGIS_DECL void keep_alive(const asio::error_code & error, const std::chrono::milliseconds ms, shards::shard * _shard);
 
@@ -929,39 +1039,6 @@ class core
     friend class channel;
     //friend class shard;
 
-    AEGIS_DECL void ws_presence_update(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_typing_start(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_message_create(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_message_update(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_guild_create(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_guild_update(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_guild_delete(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_message_reaction_add(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_message_reaction_remove(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_message_reaction_remove_all(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_message_delete(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_message_delete_bulk(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_user_update(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_resumed(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_ready(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_channel_create(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_channel_update(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_channel_delete(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_channel_pins_update(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_guild_ban_add(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_guild_ban_remove(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_guild_emojis_update(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_guild_integrations_update(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_guild_member_add(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_guild_member_remove(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_guild_member_update(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_guild_members_chunk(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_guild_role_create(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_guild_role_update(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_guild_role_delete(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_voice_server_update(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_voice_state_update(const json & result, shards::shard * _shard);
-    AEGIS_DECL void ws_webhooks_update(const json & result, shards::shard * _shard);
 
     AEGIS_DECL void on_message(websocketpp::connection_hdl hdl, std::string msg, shards::shard * _shard);
     AEGIS_DECL void on_connect(websocketpp::connection_hdl hdl, shards::shard * _shard);