From c9b892cffb6920be1090ac5f5d833b9fa815bd34 Mon Sep 17 00:00:00 2001
From: FiniteReality <FiniteReality@users.noreply.github.com>
Date: Wed, 7 Dec 2016 20:39:59 +0000
Subject: [PATCH] Make overload builders actually useful

*facepalm* I can't believe I missed this.
This commit also improves command attribute building
---
 .../Builders/ModuleClassBuilder.cs            | 21 +++++++++++--------
 .../Builders/OverloadBuilder.cs               | 10 ++++++++-
 src/Discord.Net.Commands/CommandService.cs    |  2 +-
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs b/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs
index 2f89edbb0..547c11fd6 100644
--- a/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs
+++ b/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs
@@ -110,32 +110,35 @@ namespace Discord.Commands
             {
                 builder.AddCommand((command) =>
                 {
+                    string firstName = null;
+
                     foreach (var method in overloads)
                     {
+                        if (firstName == null)
+                            firstName =  method.Name;
+
                         command.AddOverload((overload) =>
                         {
                             BuildOverload(overload, typeInfo, method, service);
                         });
                     }
 
-                    var defaultOverload = overloads.OrderByDescending(x => x.GetCustomAttribute<PriorityAttribute>()?.Priority ?? 0).First();
-
-                    BuildCommand(command, defaultOverload, service);
+                    var allAttributes = overloads.SelectMany(x => x.GetCustomAttributes());
+                    BuildCommand(command, firstName, allAttributes, service);
                 });
             }
         }
 
-        private static void BuildCommand(CommandBuilder builder, MethodInfo method, CommandService service)
-        {
-            var attributes = method.GetCustomAttributes();
-            
+        private static void BuildCommand(CommandBuilder builder, string defaultName, IEnumerable<Attribute> attributes, CommandService service)
+        {   
             foreach (var attribute in attributes)
             {
                 // TODO: C#7 type switch
                 if (attribute is CommandAttribute)
                 {
                     var cmdAttr = attribute as CommandAttribute;
-                    builder.AddAliases(cmdAttr.Text);
+                    if (!builder.Aliases.Contains(cmdAttr.Text))
+                        builder.AddAliases(cmdAttr.Text);
                     builder.Name = builder.Name ?? cmdAttr.Text;
                 }
                 else if (attribute is NameAttribute)
@@ -149,7 +152,7 @@ namespace Discord.Commands
             }
 
             if (builder.Name == null)
-                builder.Name = method.Name;
+                builder.Name = defaultName;
         }
 
         private static void BuildOverload(OverloadBuilder builder, TypeInfo typeInfo, MethodInfo method, CommandService service)
diff --git a/src/Discord.Net.Commands/Builders/OverloadBuilder.cs b/src/Discord.Net.Commands/Builders/OverloadBuilder.cs
index ef53c3a7d..8551b28d0 100644
--- a/src/Discord.Net.Commands/Builders/OverloadBuilder.cs
+++ b/src/Discord.Net.Commands/Builders/OverloadBuilder.cs
@@ -4,6 +4,8 @@ using System.Threading.Tasks;
 using System.Collections.Generic;
 using System.Diagnostics;
 
+using CommandCallback = System.Func<Discord.Commands.CommandContext, object[], Discord.Commands.IDependencyMap, System.Threading.Tasks.Task>;
+
 namespace Discord.Commands.Builders
 {
     public class OverloadBuilder
@@ -12,7 +14,7 @@ namespace Discord.Commands.Builders
         private readonly List<ParameterBuilder> _parameters;
 
         public CommandBuilder Command { get; }
-        internal Func<CommandContext, object[], IDependencyMap, Task> Callback { get; set; }
+        public CommandCallback Callback { get; set; }
 
         public RunMode RunMode { get; set; }
         public int Priority { get; set; }
@@ -40,6 +42,12 @@ namespace Discord.Commands.Builders
             return this;
         }
 
+        public OverloadBuilder WithCallback(CommandCallback callback)
+        {
+            Callback = callback;
+            return this;
+        }
+
         public OverloadBuilder AddPrecondition(PreconditionAttribute precondition)
         {
             _preconditions.Add(precondition);
diff --git a/src/Discord.Net.Commands/CommandService.cs b/src/Discord.Net.Commands/CommandService.cs
index 966f7104b..f75540d64 100644
--- a/src/Discord.Net.Commands/CommandService.cs
+++ b/src/Discord.Net.Commands/CommandService.cs
@@ -228,7 +228,7 @@ namespace Discord.Commands
         public SearchResult Search(CommandContext context, string input)
         {
             string searchInput = _caseSensitive ? input : input.ToLowerInvariant();
-            var matches = _map.GetCommands(input).OrderBy(x => x.Overloads.Average(y => y.Priority)).ToImmutableArray();
+            var matches = _map.GetCommands(searchInput).OrderBy(x => x.Overloads.Average(y => y.Priority)).ToImmutableArray();
 
             if (matches.Length > 0)
                 return SearchResult.FromSuccess(input, matches);