refactor handlers to use event dispatcher pattern

Author: 01Dri

src/Disc.NET/Handlers/EventHandlers/PrefixCommandHandler.cs

@@ -14,39 +14,19 @@ public PrefixCommandHandler(AppConfiguration appConfiguration) : base(appConfigu
         {
         }
 
-        public override async Task HandleAsync(GatewayEvent @event, JsonDocument contextJson, AppConfiguration configuration)
-        {
-            if (@event != GatewayEvent.MessageCreate)
-            {
-                await base.HandleAsync(@event, contextJson, configuration).ConfigureAwait(false);
-                return;
-            }
+        public GatewayEvent GetEventType()
+            => GatewayEvent.MessageCreate;
 
+        public async Task HandleAsync(JsonDocument contextJson, AppConfiguration configuration)
+        {
             var content = contextJson.GetStringProperty("content");
-            if (string.IsNullOrEmpty(content))
-            {
-                await base.HandleAsync(@event, contextJson, configuration).ConfigureAwait(false);
-                return;
-            }
+            if (string.IsNullOrEmpty(content)) return;
             var commandModel = BuildCommandModelByEventContent(content);
-            if (commandModel.Prefix != configuration.BotPrefix)
-            {
-                await base.HandleAsync(@event, contextJson, configuration).ConfigureAwait(false);
-                return;
-            }
-
             var command = (IPrefixCommand)
                 GetCommandByAttribute<PrefixCommandAttribute, CommandContext>(commandModel.Name);
-
-            if (command == null)
-            {
-                await base.HandleAsync(@event, contextJson, configuration).ConfigureAwait(false);
-                return;
-            }
-
+            if (command == null) return;
             var context = BuildCommandContext(contextJson, configuration);
             await command.RunAsync(context, commandModel.Params).ConfigureAwait(false);
         }
-
     }
 }

src/Disc.NET/Handlers/EventHandlers/SlashCommandHandler.cs

@@ -14,32 +14,20 @@ public SlashCommandHandler(AppConfiguration appConfiguration) : base(appConfigur
         {
         }
 
-        public override async Task HandleAsync(GatewayEvent @event, JsonDocument contextJson,
-            AppConfiguration configuration)
-        {
-            if (@event != GatewayEvent.InteractionCreate)
-            {
-                await base.HandleAsync(@event, contextJson, configuration).ConfigureAwait(false);
-                return;
-            }
 
+        public GatewayEvent GetEventType()
+            => GatewayEvent.InteractionCreate;
+
+        public async Task HandleAsync(JsonDocument contextJson,AppConfiguration configuration)
+        {
             var data = contextJson.GetJsonStringProperty("data");
+            if (string.IsNullOrEmpty(data)) return;
             var slashCommandResult = Serializer.Deserialize<SlashCommandParamsResult>(data);
-            if (slashCommandResult == null)
-            {
-                await base.HandleAsync(@event, contextJson, configuration).ConfigureAwait(false);
-                return;
-            }
+            if (slashCommandResult == null) return;
             var command = (ISlashCommand)
                 GetCommandByAttribute<SlashCommandAttribute, InteractionContext>(slashCommandResult.Name);
-            if (command == null)
-            {
-                await base.HandleAsync(@event, contextJson, configuration).ConfigureAwait(false);
-                return;
-            }
-
+            if (command == null) return;
             var context = BuildInteractionContext(contextJson, configuration);
-
             await SendInteractionResponseAsync(contextJson);
             await command.RunAsync(context, slashCommandResult).ConfigureAwait(false);
 

src/Disc.NET/Handlers/EventHandlers/SlashCommandRegisterHandler.cs

@@ -13,15 +13,11 @@ public SlashCommandRegisterHandler(AppConfiguration appConfiguration) : base(app
         {
         }
 
-        public override async Task HandleAsync(GatewayEvent @event, JsonDocument contextJson,
-            AppConfiguration configuration)
-        {
-            if (@event != GatewayEvent.Ready)
-            {
-                await base.HandleAsync(@event, contextJson, configuration).ConfigureAwait(false);
-                return;
-            }
+        public GatewayEvent GetEventType()
+            => GatewayEvent.Ready;
 
+        public async Task HandleAsync(JsonDocument contextJson,AppConfiguration configuration)
+        {
             List<SlashCommandAttribute> attributes = GetCommandAttributes<SlashCommandAttribute>();
             foreach (var attribute in attributes)
             {