Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/dev' into constructors
Browse files Browse the repository at this point in the history
  • Loading branch information
Mishura4 committed Oct 6, 2023
2 parents 85a1817 + 545e7ff commit ef91d85
Show file tree
Hide file tree
Showing 65 changed files with 1,563 additions and 1,514 deletions.
11 changes: 3 additions & 8 deletions include/dpp/event.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,13 @@
#include <dpp/json_fwd.h>

#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;
class x : public event { public: virtual void handle(class dpp::discord_client* client, nlohmann::json &j, const std::string &raw); };

/**
* @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.
Expand Down Expand Up @@ -152,5 +148,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
Loading

0 comments on commit ef91d85

Please sign in to comment.