Custom Command system fully implemented.

Author: GreemDev

SIVA/Core/Discord/EventHandler.cs

@@ -79,18 +79,19 @@ public async Task HandleMessageOrCommand(SocketMessage s)
 
             var argPos = 0;
 
-            var msgStrip = ctx.Message.Content.Replace(prefix, string.Empty);
+            var msgStrip = msg.Content.Replace(prefix, string.Empty);
+            
 
-            foreach (var command in config.CustomCommands)
+            if (msg.HasStringPrefix(prefix, ref argPos) || msg.HasMentionPrefix(_client.CurrentUser, ref argPos))
             {
-                if (msg.HasStringPrefix(prefix + command.Key, ref argPos))
+                if (config.CustomCommands.ContainsKey(msgStrip))
                 {
-                    await ctx.Channel.SendMessageAsync(command.Value);
+                    await ctx.Channel.SendMessageAsync(
+                        config.CustomCommands.FirstOrDefault(c => c.Key.ToLower() == msgStrip.ToLower()).Value
+                    );
+                
                 }
-            }
-
-            if (msg.HasStringPrefix(prefix, ref argPos) || msg.HasMentionPrefix(_client.CurrentUser, ref argPos))
-            {
+                
                 var result = await _service.ExecuteAsync(ctx, argPos);
 
                 if (result.IsSuccess == false && result.ErrorReason != "Unknown command.")