From 42f3c7a9befc689673cb3a47819825702ba2a976 Mon Sep 17 00:00:00 2001
From: Craig Edwards <craigedwards@brainbox.cc>
Date: Thu, 5 Oct 2023 22:36:11 +0000
Subject: [PATCH] style: change two namespace on one line to dpp::event

---
 include/dpp/event.h                                  | 11 +++++------
 src/dpp/events/automod_rule_create.cpp               |  4 ++--
 src/dpp/events/automod_rule_delete.cpp               |  4 ++--
 src/dpp/events/automod_rule_execute.cpp              |  4 ++--
 src/dpp/events/automod_rule_update.cpp               |  4 ++--
 src/dpp/events/channel_create.cpp                    |  4 ++--
 src/dpp/events/channel_delete.cpp                    |  4 ++--
 src/dpp/events/channel_pins_update.cpp               |  4 ++--
 src/dpp/events/channel_update.cpp                    |  4 ++--
 src/dpp/events/guild_audit_log_entry_create.cpp      |  4 ++--
 src/dpp/events/guild_ban_add.cpp                     |  4 ++--
 src/dpp/events/guild_ban_remove.cpp                  |  4 ++--
 src/dpp/events/guild_create.cpp                      |  4 ++--
 src/dpp/events/guild_delete.cpp                      |  4 ++--
 src/dpp/events/guild_emojis_update.cpp               |  4 ++--
 src/dpp/events/guild_integrations_update.cpp         |  4 ++--
 src/dpp/events/guild_join_request_delete.cpp         |  4 ++--
 src/dpp/events/guild_member_add.cpp                  |  4 ++--
 src/dpp/events/guild_member_remove.cpp               |  4 ++--
 src/dpp/events/guild_member_update.cpp               |  4 ++--
 src/dpp/events/guild_members_chunk.cpp               |  4 ++--
 src/dpp/events/guild_role_create.cpp                 |  4 ++--
 src/dpp/events/guild_role_delete.cpp                 |  4 ++--
 src/dpp/events/guild_role_update.cpp                 |  4 ++--
 src/dpp/events/guild_scheduled_event_create.cpp      |  4 ++--
 src/dpp/events/guild_scheduled_event_delete.cpp      |  4 ++--
 src/dpp/events/guild_scheduled_event_update.cpp      |  4 ++--
 src/dpp/events/guild_scheduled_event_user_add.cpp    |  4 ++--
 src/dpp/events/guild_scheduled_event_user_remove.cpp |  4 ++--
 src/dpp/events/guild_stickers_update.cpp             |  4 ++--
 src/dpp/events/guild_update.cpp                      |  4 ++--
 src/dpp/events/integration_create.cpp                |  4 ++--
 src/dpp/events/integration_delete.cpp                |  4 ++--
 src/dpp/events/integration_update.cpp                |  4 ++--
 src/dpp/events/interaction_create.cpp                |  4 ++--
 src/dpp/events/invite_create.cpp                     |  4 ++--
 src/dpp/events/invite_delete.cpp                     |  4 ++--
 src/dpp/events/logger.cpp                            |  4 ++--
 src/dpp/events/message_create.cpp                    |  4 ++--
 src/dpp/events/message_delete.cpp                    |  4 ++--
 src/dpp/events/message_delete_bulk.cpp               |  4 ++--
 src/dpp/events/message_reaction_add.cpp              |  4 ++--
 src/dpp/events/message_reaction_remove.cpp           |  4 ++--
 src/dpp/events/message_reaction_remove_all.cpp       |  4 ++--
 src/dpp/events/message_reaction_remove_emoji.cpp     |  4 ++--
 src/dpp/events/message_update.cpp                    |  4 ++--
 src/dpp/events/presence_update.cpp                   |  4 ++--
 src/dpp/events/ready.cpp                             |  4 ++--
 src/dpp/events/resumed.cpp                           |  4 ++--
 src/dpp/events/stage_instance_create.cpp             |  4 ++--
 src/dpp/events/stage_instance_delete.cpp             |  4 ++--
 src/dpp/events/stage_instance_update.cpp             |  4 ++--
 src/dpp/events/thread_create.cpp                     |  4 ++--
 src/dpp/events/thread_delete.cpp                     |  4 ++--
 src/dpp/events/thread_list_sync.cpp                  |  4 ++--
 src/dpp/events/thread_member_update.cpp              |  4 ++--
 src/dpp/events/thread_members_update.cpp             |  4 ++--
 src/dpp/events/thread_update.cpp                     |  4 ++--
 src/dpp/events/typing_start.cpp                      |  4 ++--
 src/dpp/events/user_update.cpp                       |  4 ++--
 src/dpp/events/voice_server_update.cpp               |  4 ++--
 src/dpp/events/voice_state_update.cpp                |  4 ++--
 src/dpp/events/webhooks_update.cpp                   |  4 ++--
 63 files changed, 129 insertions(+), 130 deletions(-)

diff --git a/include/dpp/event.h b/include/dpp/event.h
index e229d51f31..9542298baa 100644
--- a/include/dpp/event.h
+++ b/include/dpp/event.h
@@ -27,15 +27,15 @@
 #define event_decl(x,wstype) /** @brief Internal event handler for wstype websocket events. Called for each websocket message of this type. @internal */ \
 	class x : public event { public: virtual void handle(dpp::discord_client* client, nlohmann::json &j, const std::string &raw); };
 
-namespace dpp { 
-
-class discord_client;
+namespace dpp {
+	class discord_client;
+};
 
 /**
  * @brief The events namespace holds the internal event handlers for each websocket event.
  * These are handled internally and also dispatched to the user code if the event is hooked.
  */
-namespace events {
+namespace dpp::events { 
 
 /**
  * @brief An event object represents an event handled internally, passed from the websocket e.g. MESSAGE_CREATE.
@@ -152,5 +152,4 @@ event_decl(automod_rule_execute, AUTO_MODERATION_ACTION_EXECUTION);
 /* Audit log */
 event_decl(guild_audit_log_entry_create, GUILD_AUDIT_LOG_ENTRY_CREATE);
 
-} // namespace events
-} // namespace dpp
+} // namespace dpp::events
diff --git a/src/dpp/events/automod_rule_create.cpp b/src/dpp/events/automod_rule_create.cpp
index 739119503e..31ec851a54 100644
--- a/src/dpp/events/automod_rule_create.cpp
+++ b/src/dpp/events/automod_rule_create.cpp
@@ -26,7 +26,7 @@
 
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -47,4 +47,4 @@ void automod_rule_create::handle(discord_client* client, json &j, const std::str
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/automod_rule_delete.cpp b/src/dpp/events/automod_rule_delete.cpp
index 590fd8c569..d1fa9d68c5 100644
--- a/src/dpp/events/automod_rule_delete.cpp
+++ b/src/dpp/events/automod_rule_delete.cpp
@@ -26,7 +26,7 @@
 
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 	
 using json = nlohmann::json;
 using namespace dpp;
@@ -47,4 +47,4 @@ void automod_rule_delete::handle(discord_client* client, json &j, const std::str
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/automod_rule_execute.cpp b/src/dpp/events/automod_rule_execute.cpp
index 0f2918e7c6..5fa2fc3bc8 100644
--- a/src/dpp/events/automod_rule_execute.cpp
+++ b/src/dpp/events/automod_rule_execute.cpp
@@ -24,7 +24,7 @@
 #include <dpp/stringops.h>
 #include <dpp/json.h>
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -55,4 +55,4 @@ void automod_rule_execute::handle(discord_client* client, json &j, const std::st
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/automod_rule_update.cpp b/src/dpp/events/automod_rule_update.cpp
index 5fb78c6df3..ccdcfa6829 100644
--- a/src/dpp/events/automod_rule_update.cpp
+++ b/src/dpp/events/automod_rule_update.cpp
@@ -24,7 +24,7 @@
 #include <dpp/stringops.h>
 #include <dpp/json.h>
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -45,4 +45,4 @@ void automod_rule_update::handle(discord_client* client, json &j, const std::str
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/channel_create.cpp b/src/dpp/events/channel_create.cpp
index 76875105d4..46ea4794d6 100644
--- a/src/dpp/events/channel_create.cpp
+++ b/src/dpp/events/channel_create.cpp
@@ -24,7 +24,7 @@
 #include <dpp/stringops.h>
 #include <dpp/json.h>
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -76,4 +76,4 @@ void channel_create::handle(discord_client* client, json &j, const std::string &
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/channel_delete.cpp b/src/dpp/events/channel_delete.cpp
index 786b3fcc68..1c55ecf543 100644
--- a/src/dpp/events/channel_delete.cpp
+++ b/src/dpp/events/channel_delete.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -60,4 +60,4 @@ void channel_delete::handle(discord_client* client, json &j, const std::string &
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/channel_pins_update.cpp b/src/dpp/events/channel_pins_update.cpp
index 9ae70e9c36..1d701b74c2 100644
--- a/src/dpp/events/channel_pins_update.cpp
+++ b/src/dpp/events/channel_pins_update.cpp
@@ -27,7 +27,7 @@
 
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 	
 using json = nlohmann::json;
 using namespace dpp;
@@ -53,4 +53,4 @@ void channel_pins_update::handle(discord_client* client, json &j, const std::str
 
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/channel_update.cpp b/src/dpp/events/channel_update.cpp
index 66f7541b33..634671fff8 100644
--- a/src/dpp/events/channel_update.cpp
+++ b/src/dpp/events/channel_update.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -59,4 +59,4 @@ void channel_update::handle(discord_client* client, json &j, const std::string &
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_audit_log_entry_create.cpp b/src/dpp/events/guild_audit_log_entry_create.cpp
index ed1e8ff9a7..69a8d423ea 100644
--- a/src/dpp/events/guild_audit_log_entry_create.cpp
+++ b/src/dpp/events/guild_audit_log_entry_create.cpp
@@ -21,7 +21,7 @@
 #include <dpp/discordevents.h>
 #include <dpp/cluster.h>
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -43,4 +43,4 @@ void guild_audit_log_entry_create::handle(discord_client* client, json &j, const
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_ban_add.cpp b/src/dpp/events/guild_ban_add.cpp
index 353b182395..0e9aa32445 100644
--- a/src/dpp/events/guild_ban_add.cpp
+++ b/src/dpp/events/guild_ban_add.cpp
@@ -27,7 +27,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -50,4 +50,4 @@ void guild_ban_add::handle(discord_client* client, json &j, const std::string &r
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_ban_remove.cpp b/src/dpp/events/guild_ban_remove.cpp
index 02a99c9d7f..1265d592de 100644
--- a/src/dpp/events/guild_ban_remove.cpp
+++ b/src/dpp/events/guild_ban_remove.cpp
@@ -27,7 +27,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -50,4 +50,4 @@ void guild_ban_remove::handle(discord_client* client, json &j, const std::string
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_create.cpp b/src/dpp/events/guild_create.cpp
index 8fea1392aa..f6d75da142 100644
--- a/src/dpp/events/guild_create.cpp
+++ b/src/dpp/events/guild_create.cpp
@@ -28,7 +28,7 @@
 
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 	
 using json = nlohmann::json;
 using namespace dpp;
@@ -211,4 +211,4 @@ void guild_create::handle(discord_client* client, json &j, const std::string &ra
 	}
 }
 
-}};
+};
diff --git a/src/dpp/events/guild_delete.cpp b/src/dpp/events/guild_delete.cpp
index a68f9f15e9..3e013d6bfc 100644
--- a/src/dpp/events/guild_delete.cpp
+++ b/src/dpp/events/guild_delete.cpp
@@ -28,7 +28,7 @@
 
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 	
 using json = nlohmann::json;
 using namespace dpp;
@@ -93,4 +93,4 @@ void guild_delete::handle(discord_client* client, json &j, const std::string &ra
 	}
 }
 
-}};
+};
diff --git a/src/dpp/events/guild_emojis_update.cpp b/src/dpp/events/guild_emojis_update.cpp
index 8dbf12c9e8..df99001134 100644
--- a/src/dpp/events/guild_emojis_update.cpp
+++ b/src/dpp/events/guild_emojis_update.cpp
@@ -28,7 +28,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -80,4 +80,4 @@ void guild_emojis_update::handle(discord_client* client, json &j, const std::str
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_integrations_update.cpp b/src/dpp/events/guild_integrations_update.cpp
index c04c683b0c..fe5f3f1cde 100644
--- a/src/dpp/events/guild_integrations_update.cpp
+++ b/src/dpp/events/guild_integrations_update.cpp
@@ -28,7 +28,7 @@
 
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 	
 using json = nlohmann::json;
 using namespace dpp;
@@ -49,4 +49,4 @@ void guild_integrations_update::handle(class discord_client* client, json &j, co
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_join_request_delete.cpp b/src/dpp/events/guild_join_request_delete.cpp
index 66a596a374..7951670cd6 100644
--- a/src/dpp/events/guild_join_request_delete.cpp
+++ b/src/dpp/events/guild_join_request_delete.cpp
@@ -25,7 +25,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -47,4 +47,4 @@ void guild_join_request_delete::handle(class discord_client* client, json &j, co
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_member_add.cpp b/src/dpp/events/guild_member_add.cpp
index 3c1f50f9a5..a064352007 100644
--- a/src/dpp/events/guild_member_add.cpp
+++ b/src/dpp/events/guild_member_add.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -76,4 +76,4 @@ void guild_member_add::handle(discord_client* client, json &j, const std::string
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_member_remove.cpp b/src/dpp/events/guild_member_remove.cpp
index 6171897050..7e6b383988 100644
--- a/src/dpp/events/guild_member_remove.cpp
+++ b/src/dpp/events/guild_member_remove.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -77,4 +77,4 @@ void guild_member_remove::handle(discord_client* client, json &j, const std::str
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_member_update.cpp b/src/dpp/events/guild_member_update.cpp
index c265d08d69..291fb51ea8 100644
--- a/src/dpp/events/guild_member_update.cpp
+++ b/src/dpp/events/guild_member_update.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -74,4 +74,4 @@ void guild_member_update::handle(discord_client* client, json &j, const std::str
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_members_chunk.cpp b/src/dpp/events/guild_members_chunk.cpp
index 3533f769e4..b9c34d7eee 100644
--- a/src/dpp/events/guild_members_chunk.cpp
+++ b/src/dpp/events/guild_members_chunk.cpp
@@ -27,7 +27,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -73,4 +73,4 @@ void guild_members_chunk::handle(discord_client* client, json &j, const std::str
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_role_create.cpp b/src/dpp/events/guild_role_create.cpp
index d3bc02b2c2..1196c05915 100644
--- a/src/dpp/events/guild_role_create.cpp
+++ b/src/dpp/events/guild_role_create.cpp
@@ -27,7 +27,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -73,4 +73,4 @@ void guild_role_create::handle(discord_client* client, json &j, const std::strin
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_role_delete.cpp b/src/dpp/events/guild_role_delete.cpp
index abdb694e7f..c39b12e7dd 100644
--- a/src/dpp/events/guild_role_delete.cpp
+++ b/src/dpp/events/guild_role_delete.cpp
@@ -27,7 +27,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 /**
@@ -73,4 +73,4 @@ void guild_role_delete::handle(discord_client* client, json &j, const std::strin
 	}
 }
 
-}};
+};
diff --git a/src/dpp/events/guild_role_update.cpp b/src/dpp/events/guild_role_update.cpp
index 5a85bff455..80bd66344b 100644
--- a/src/dpp/events/guild_role_update.cpp
+++ b/src/dpp/events/guild_role_update.cpp
@@ -28,7 +28,7 @@
 
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 	
 using json = nlohmann::json;
 using namespace dpp;
@@ -68,4 +68,4 @@ void guild_role_update::handle(discord_client* client, json &j, const std::strin
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_scheduled_event_create.cpp b/src/dpp/events/guild_scheduled_event_create.cpp
index 81c8054764..e6f542102c 100644
--- a/src/dpp/events/guild_scheduled_event_create.cpp
+++ b/src/dpp/events/guild_scheduled_event_create.cpp
@@ -25,7 +25,7 @@
 #include <dpp/stringops.h>
 #include <dpp/json.h>
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -47,4 +47,4 @@ void guild_scheduled_event_create::handle(discord_client* client, json &j, const
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_scheduled_event_delete.cpp b/src/dpp/events/guild_scheduled_event_delete.cpp
index b2cef3fc26..b6f79c56d8 100644
--- a/src/dpp/events/guild_scheduled_event_delete.cpp
+++ b/src/dpp/events/guild_scheduled_event_delete.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -48,4 +48,4 @@ void guild_scheduled_event_delete::handle(discord_client* client, json &j, const
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_scheduled_event_update.cpp b/src/dpp/events/guild_scheduled_event_update.cpp
index ee81d6552a..8f6c9557ed 100644
--- a/src/dpp/events/guild_scheduled_event_update.cpp
+++ b/src/dpp/events/guild_scheduled_event_update.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -48,4 +48,4 @@ void guild_scheduled_event_update::handle(discord_client* client, json &j, const
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_scheduled_event_user_add.cpp b/src/dpp/events/guild_scheduled_event_user_add.cpp
index db8a3253e4..882cdea650 100644
--- a/src/dpp/events/guild_scheduled_event_user_add.cpp
+++ b/src/dpp/events/guild_scheduled_event_user_add.cpp
@@ -25,7 +25,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -49,4 +49,4 @@ void guild_scheduled_event_user_add::handle(discord_client* client, json &j, con
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_scheduled_event_user_remove.cpp b/src/dpp/events/guild_scheduled_event_user_remove.cpp
index f41b8fa1be..f6a38d2e75 100644
--- a/src/dpp/events/guild_scheduled_event_user_remove.cpp
+++ b/src/dpp/events/guild_scheduled_event_user_remove.cpp
@@ -25,7 +25,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -49,4 +49,4 @@ void guild_scheduled_event_user_remove::handle(discord_client* client, json &j,
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_stickers_update.cpp b/src/dpp/events/guild_stickers_update.cpp
index f483e63e29..359d5f4e93 100644
--- a/src/dpp/events/guild_stickers_update.cpp
+++ b/src/dpp/events/guild_stickers_update.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -55,4 +55,4 @@ void guild_stickers_update::handle(discord_client* client, json &j, const std::s
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/guild_update.cpp b/src/dpp/events/guild_update.cpp
index 802f15832d..dc96a9e2c8 100644
--- a/src/dpp/events/guild_update.cpp
+++ b/src/dpp/events/guild_update.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -73,4 +73,4 @@ void guild_update::handle(discord_client* client, json &j, const std::string &ra
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/integration_create.cpp b/src/dpp/events/integration_create.cpp
index af39d76484..38efb60ab4 100644
--- a/src/dpp/events/integration_create.cpp
+++ b/src/dpp/events/integration_create.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -48,4 +48,4 @@ void integration_create::handle(discord_client* client, json &j, const std::stri
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/integration_delete.cpp b/src/dpp/events/integration_delete.cpp
index f5f5c992e8..63c1b737eb 100644
--- a/src/dpp/events/integration_delete.cpp
+++ b/src/dpp/events/integration_delete.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -47,4 +47,4 @@ void integration_delete::handle(discord_client* client, json &j, const std::stri
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/integration_update.cpp b/src/dpp/events/integration_update.cpp
index 7d4dc2e4d3..3318e31e2b 100644
--- a/src/dpp/events/integration_update.cpp
+++ b/src/dpp/events/integration_update.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -47,4 +47,4 @@ void integration_update::handle(discord_client* client, json &j, const std::stri
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/interaction_create.cpp b/src/dpp/events/interaction_create.cpp
index 2c1f7b9a12..bace354b35 100644
--- a/src/dpp/events/interaction_create.cpp
+++ b/src/dpp/events/interaction_create.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -160,4 +160,4 @@ void interaction_create::handle(discord_client* client, json &j, const std::stri
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/invite_create.cpp b/src/dpp/events/invite_create.cpp
index f3bfef2d3c..119d978d50 100644
--- a/src/dpp/events/invite_create.cpp
+++ b/src/dpp/events/invite_create.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -47,4 +47,4 @@ void invite_create::handle(discord_client* client, json &j, const std::string &r
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/invite_delete.cpp b/src/dpp/events/invite_delete.cpp
index 554f28c9ff..a72d257a3a 100644
--- a/src/dpp/events/invite_delete.cpp
+++ b/src/dpp/events/invite_delete.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -47,4 +47,4 @@ void invite_delete::handle(discord_client* client, json &j, const std::string &r
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/logger.cpp b/src/dpp/events/logger.cpp
index f38240642a..e04827b726 100644
--- a/src/dpp/events/logger.cpp
+++ b/src/dpp/events/logger.cpp
@@ -25,7 +25,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -46,4 +46,4 @@ void logger::handle(discord_client* client, json &j, const std::string &raw) {
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/message_create.cpp b/src/dpp/events/message_create.cpp
index 94bf9418c9..317c302b3b 100644
--- a/src/dpp/events/message_create.cpp
+++ b/src/dpp/events/message_create.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -49,4 +49,4 @@ void message_create::handle(discord_client* client, json &j, const std::string &
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/message_delete.cpp b/src/dpp/events/message_delete.cpp
index 21568c2829..0ba9b754cb 100644
--- a/src/dpp/events/message_delete.cpp
+++ b/src/dpp/events/message_delete.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -50,4 +50,4 @@ void message_delete::handle(discord_client* client, json &j, const std::string &
 
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/message_delete_bulk.cpp b/src/dpp/events/message_delete_bulk.cpp
index a7428a14ea..ce428695fa 100644
--- a/src/dpp/events/message_delete_bulk.cpp
+++ b/src/dpp/events/message_delete_bulk.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 	
 using json = nlohmann::json;
 using namespace dpp;
@@ -53,4 +53,4 @@ void message_delete_bulk::handle(discord_client* client, json &j, const std::str
 
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/message_reaction_add.cpp b/src/dpp/events/message_reaction_add.cpp
index 62f3b36577..9a1781c4c1 100644
--- a/src/dpp/events/message_reaction_add.cpp
+++ b/src/dpp/events/message_reaction_add.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -57,4 +57,4 @@ void message_reaction_add::handle(discord_client* client, json &j, const std::st
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/message_reaction_remove.cpp b/src/dpp/events/message_reaction_remove.cpp
index 2bb1cc76b9..a6045d052f 100644
--- a/src/dpp/events/message_reaction_remove.cpp
+++ b/src/dpp/events/message_reaction_remove.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -55,4 +55,4 @@ void message_reaction_remove::handle(discord_client* client, json &j, const std:
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/message_reaction_remove_all.cpp b/src/dpp/events/message_reaction_remove_all.cpp
index 381062105a..dc2ca20654 100644
--- a/src/dpp/events/message_reaction_remove_all.cpp
+++ b/src/dpp/events/message_reaction_remove_all.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -52,4 +52,4 @@ void message_reaction_remove_all::handle(discord_client* client, json &j, const
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/message_reaction_remove_emoji.cpp b/src/dpp/events/message_reaction_remove_emoji.cpp
index bbd31f2687..935b294a68 100644
--- a/src/dpp/events/message_reaction_remove_emoji.cpp
+++ b/src/dpp/events/message_reaction_remove_emoji.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -54,4 +54,4 @@ void message_reaction_remove_emoji::handle(discord_client* client, json &j, cons
 
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/message_update.cpp b/src/dpp/events/message_update.cpp
index 4b35bc1bae..d4d42b6506 100644
--- a/src/dpp/events/message_update.cpp
+++ b/src/dpp/events/message_update.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -50,4 +50,4 @@ void message_update::handle(discord_client* client, json &j, const std::string &
 
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/presence_update.cpp b/src/dpp/events/presence_update.cpp
index b959de43c8..ddf1601cf4 100644
--- a/src/dpp/events/presence_update.cpp
+++ b/src/dpp/events/presence_update.cpp
@@ -25,7 +25,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -46,4 +46,4 @@ void presence_update::handle(discord_client* client, json &j, const std::string
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/ready.cpp b/src/dpp/events/ready.cpp
index 992ee24f9e..38966fd4ce 100644
--- a/src/dpp/events/ready.cpp
+++ b/src/dpp/events/ready.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -78,4 +78,4 @@ void ready::handle(discord_client* client, json &j, const std::string &raw) {
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/resumed.cpp b/src/dpp/events/resumed.cpp
index a5a1533a5a..7654e7bdd6 100644
--- a/src/dpp/events/resumed.cpp
+++ b/src/dpp/events/resumed.cpp
@@ -25,7 +25,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -50,4 +50,4 @@ void resumed::handle(discord_client* client, json &j, const std::string &raw) {
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/stage_instance_create.cpp b/src/dpp/events/stage_instance_create.cpp
index ff2590fc77..8c6fe00722 100644
--- a/src/dpp/events/stage_instance_create.cpp
+++ b/src/dpp/events/stage_instance_create.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -47,4 +47,4 @@ void stage_instance_create::handle(discord_client* client, json &j, const std::s
 	}
 }
 
-}};
+};
diff --git a/src/dpp/events/stage_instance_delete.cpp b/src/dpp/events/stage_instance_delete.cpp
index 777fc7716a..6a646108a3 100644
--- a/src/dpp/events/stage_instance_delete.cpp
+++ b/src/dpp/events/stage_instance_delete.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 	
 using json = nlohmann::json;
 using namespace dpp;
@@ -47,4 +47,4 @@ void stage_instance_delete::handle(discord_client* client, json &j, const std::s
 	}
 }
 
-}};
+};
diff --git a/src/dpp/events/stage_instance_update.cpp b/src/dpp/events/stage_instance_update.cpp
index b1df2c9245..272a86acb0 100644
--- a/src/dpp/events/stage_instance_update.cpp
+++ b/src/dpp/events/stage_instance_update.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -47,4 +47,4 @@ void stage_instance_update::handle(discord_client* client, json &j, const std::s
 	}
 }
 
-}};
+};
diff --git a/src/dpp/events/thread_create.cpp b/src/dpp/events/thread_create.cpp
index cf94707e13..f2af207c1a 100644
--- a/src/dpp/events/thread_create.cpp
+++ b/src/dpp/events/thread_create.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -47,4 +47,4 @@ void thread_create::handle(discord_client* client, json& j, const std::string& r
 		client->creator->on_thread_create.call(tc);
 	}
 }
-}};
+};
diff --git a/src/dpp/events/thread_delete.cpp b/src/dpp/events/thread_delete.cpp
index 0d86dbdc21..0af8999a6f 100644
--- a/src/dpp/events/thread_delete.cpp
+++ b/src/dpp/events/thread_delete.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -50,4 +50,4 @@ void thread_delete::handle(discord_client* client, json& j, const std::string& r
 		client->creator->on_thread_delete.call(td);
 	}
 }
-}};
+};
diff --git a/src/dpp/events/thread_list_sync.cpp b/src/dpp/events/thread_list_sync.cpp
index f91feb1eb8..42777db458 100644
--- a/src/dpp/events/thread_list_sync.cpp
+++ b/src/dpp/events/thread_list_sync.cpp
@@ -27,7 +27,7 @@
 
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 	
 using json = nlohmann::json;
 using namespace dpp;
@@ -59,4 +59,4 @@ void thread_list_sync::handle(discord_client* client, json& j, const std::string
 		client->creator->on_thread_list_sync.call(tls);
 	}
 }
-}};
+};
diff --git a/src/dpp/events/thread_member_update.cpp b/src/dpp/events/thread_member_update.cpp
index d8d0a95070..726c118b07 100644
--- a/src/dpp/events/thread_member_update.cpp
+++ b/src/dpp/events/thread_member_update.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -39,4 +39,4 @@ void thread_member_update::handle(discord_client* client, json& j, const std::st
 		client->creator->on_thread_member_update.call(tm);
 	}
 }
-}};
+};
diff --git a/src/dpp/events/thread_members_update.cpp b/src/dpp/events/thread_members_update.cpp
index 5e78c7f43e..0b34737eaf 100644
--- a/src/dpp/events/thread_members_update.cpp
+++ b/src/dpp/events/thread_members_update.cpp
@@ -26,7 +26,7 @@
 #include <dpp/json.h>
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 
 using json = nlohmann::json;
 using namespace dpp;
@@ -57,4 +57,4 @@ void thread_members_update::handle(discord_client* client, json& j, const std::s
 		client->creator->on_thread_members_update.call(tms);
 	}
 }
-}};
+};
diff --git a/src/dpp/events/thread_update.cpp b/src/dpp/events/thread_update.cpp
index 6e86f29cb3..83348d33c9 100644
--- a/src/dpp/events/thread_update.cpp
+++ b/src/dpp/events/thread_update.cpp
@@ -27,7 +27,7 @@
 
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 	
 using json = nlohmann::json;
 using namespace dpp;
@@ -45,4 +45,4 @@ void thread_update::handle(discord_client* client, json& j, const std::string& r
 		client->creator->on_thread_update.call(tu);
 	}
 }
-}};
+};
diff --git a/src/dpp/events/typing_start.cpp b/src/dpp/events/typing_start.cpp
index 3a158e3b2e..1677bf110b 100644
--- a/src/dpp/events/typing_start.cpp
+++ b/src/dpp/events/typing_start.cpp
@@ -26,7 +26,7 @@
 
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 	
 using json = nlohmann::json;
 using namespace dpp;
@@ -51,4 +51,4 @@ void typing_start::handle(discord_client* client, json &j, const std::string &ra
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/user_update.cpp b/src/dpp/events/user_update.cpp
index 7918f76f14..36051d3d69 100644
--- a/src/dpp/events/user_update.cpp
+++ b/src/dpp/events/user_update.cpp
@@ -28,7 +28,7 @@
 
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 	
 using json = nlohmann::json;
 using namespace dpp;
@@ -67,4 +67,4 @@ void user_update::handle(discord_client* client, json &j, const std::string &raw
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/voice_server_update.cpp b/src/dpp/events/voice_server_update.cpp
index 5f130797b0..c85a347d4a 100644
--- a/src/dpp/events/voice_server_update.cpp
+++ b/src/dpp/events/voice_server_update.cpp
@@ -28,7 +28,7 @@
 
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 	
 using json = nlohmann::json;
 using namespace dpp;
@@ -68,4 +68,4 @@ void voice_server_update::handle(discord_client* client, json &j, const std::str
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/voice_state_update.cpp b/src/dpp/events/voice_state_update.cpp
index a6545e19b2..6cf73b4b79 100644
--- a/src/dpp/events/voice_state_update.cpp
+++ b/src/dpp/events/voice_state_update.cpp
@@ -29,7 +29,7 @@
 
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 	
 using json = nlohmann::json;
 using namespace dpp;
@@ -92,4 +92,4 @@ void voice_state_update::handle(discord_client* client, json &j, const std::stri
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/dpp/events/webhooks_update.cpp b/src/dpp/events/webhooks_update.cpp
index 326e2ba5ad..4642a99fd3 100644
--- a/src/dpp/events/webhooks_update.cpp
+++ b/src/dpp/events/webhooks_update.cpp
@@ -27,7 +27,7 @@
 
 
 
-namespace dpp { namespace events {
+namespace dpp::events {
 	
 using json = nlohmann::json;
 using namespace dpp;
@@ -49,4 +49,4 @@ void webhooks_update::handle(discord_client* client, json &j, const std::string
 	}
 }
 
-}};
\ No newline at end of file
+};
\ No newline at end of file