From 2b9f7b9cd78fd3324ddafde8fc8b9b8201a49f2e Mon Sep 17 00:00:00 2001
From: Cenk Ergen <57065323+Cenngo@users.noreply.github.com>
Date: Thu, 10 Feb 2022 14:18:53 +0300
Subject: [PATCH] clean up component info argument parsing

---
 .../Info/Commands/ComponentCommandInfo.cs     | 54 ++++++-------------
 1 file changed, 17 insertions(+), 37 deletions(-)

diff --git a/src/Discord.Net.Interactions/Info/Commands/ComponentCommandInfo.cs b/src/Discord.Net.Interactions/Info/Commands/ComponentCommandInfo.cs
index f66690ca0..27c0c5438 100644
--- a/src/Discord.Net.Interactions/Info/Commands/ComponentCommandInfo.cs
+++ b/src/Discord.Net.Interactions/Info/Commands/ComponentCommandInfo.cs
@@ -61,49 +61,29 @@ namespace Discord.Interactions
                 for(var i = 0; i < paramCount; i++)
                 {
                     var parameter = Parameters.ElementAt(i);
+                    bool isCapture = i < captureCount;
 
-                    if (i < captureCount)
+                    if(isCapture ^ parameter.IsRouteSegmentParameter)
                     {
-                        if(parameter.IsRouteSegmentParameter)
-                        {
-                            var readResult = await parameter.TypeReader.ReadAsync(context, wildcardCaptures.ElementAt(i), services).ConfigureAwait(false);
-
-                            if(!readResult.IsSuccess)
-                            {
-                                await InvokeModuleEvent(context, readResult).ConfigureAwait(false);
-                                return readResult;
-                            }
-
-                            args[i] = readResult.Value;
-                        }
-                        else
-                        {
-                            var result = ExecuteResult.FromError(InteractionCommandError.BadArgs, $"Expected Wild Card Capture, got component value");
-                            await InvokeModuleEvent(context, result).ConfigureAwait(false);
-                            return result;
-                        }    
+                        var result = ExecuteResult.FromError(InteractionCommandError.BadArgs, $"Argument type and parameter type didn't match (Wild Card capture/Component value)");
+                        await InvokeModuleEvent(context, result).ConfigureAwait(false);
+                        return result;
                     }
+
+                    TypeConverterResult readResult;
+
+                    if (isCapture)
+                        readResult = await parameter.TypeReader.ReadAsync(context, wildcardCaptures.ElementAt(i), services).ConfigureAwait(false);
                     else
+                        readResult = await parameter.TypeConverter.ReadAsync(context, data, services).ConfigureAwait(false);   
+
+                    if (!readResult.IsSuccess)
                     {
-                        if(!parameter.IsRouteSegmentParameter)
-                        {
-                            var readResult = await parameter.TypeConverter.ReadAsync(context, data, services).ConfigureAwait(false);
-
-                            if (!readResult.IsSuccess)
-                            {
-                                await InvokeModuleEvent(context, readResult).ConfigureAwait(false);
-                                return readResult;
-                            }
-
-                            args[i] = readResult.Value;
-                        }
-                        else
-                        {
-                            var result = ExecuteResult.FromError(InteractionCommandError.BadArgs, $"Expected component value, got Wild Card capture.");
-                            await InvokeModuleEvent(context, result).ConfigureAwait(false);
-                            return result;
-                        }
+                        await InvokeModuleEvent(context, readResult).ConfigureAwait(false);
+                        return readResult;
                     }
+
+                    args[i] = readResult.Value;
                 }
 
                 return await RunAsync(context, args, services).ConfigureAwait(false);