New usage format for command strings.

src/NadekoBot/Common/Attributes/Usage.cs

@@ -1,14 +1,24 @@
 using System.Runtime.CompilerServices;
 using Discord.Commands;
 using NadekoBot.Services.Impl;
+using System.Linq;
+using Discord;
 
 namespace NadekoBot.Common.Attributes
 {
     public class Usage : RemarksAttribute
     {
-        public Usage([CallerMemberName] string memberName="") : base(Localization.LoadCommand(memberName.ToLowerInvariant()).Usage)
+        public Usage([CallerMemberName] string memberName="") : base(Usage.GetUsage(memberName))
         {
 
         }
+
+        public static string GetUsage(string memberName)
+        {
+            var usage = Localization.LoadCommand(memberName.ToLowerInvariant()).Usage;
+            return string.Join(" or ", usage
+                .Select(x => Format.Code(x)));
+
+        }
     }
 }

src/NadekoBot/Common/CommandData.cs

@@ -3,7 +3,7 @@
     public class CommandData
     {
         public string Cmd { get; set; }
-        public string Usage { get; set; }
         public string Desc { get; set; }
+        public string[] Usage { get; set; }
     }
 }

src/NadekoBot/Modules/Gambling/CurrencyEventsCommands.cs

@@ -56,7 +56,7 @@ namespace NadekoBot.Modules.Gambling
                 switch (e)
                 {
                     case CurrencyEvent.Reaction:
-                        await reactionEvent(Context, arg).ConfigureAwait(false);
+                        await ReactionEvent(Context, arg).ConfigureAwait(false);
                         break;
                     case CurrencyEvent.SneakyGameStatus:
                         await SneakyGameStatusEvent(Context, arg).ConfigureAwait(false);
@@ -128,7 +128,7 @@ namespace NadekoBot.Modules.Gambling
                 return Task.CompletedTask;
             }
 
-            public async Task reactionEvent(ICommandContext context, int amount)
+            public async Task ReactionEvent(ICommandContext context, int amount)
             {
                 if (amount <= 0)
                     amount = 100;

src/NadekoBot/NadekoBot.cs

@@ -61,6 +61,17 @@ namespace NadekoBot
             if (shardId < 0)
                 throw new ArgumentOutOfRangeException(nameof(shardId));
 
+            //var obj = JsonConvert.DeserializeObject<Dictionary<string, CommandData2>>(File.ReadAllText("./data/command_strings.json"))
+            //    .ToDictionary(x => x.Key, x => new CommandData2
+            //    {
+            //        Cmd = x.Value.Cmd,
+            //        Desc = x.Value.Desc,
+            //        Usage = x.Value.Usage.Select(y => y.Substring(1, y.Length - 2)).ToArray(),
+            //    });
+
+            //File.WriteAllText("./data/command_strings.json", JsonConvert.SerializeObject(obj, Formatting.Indented));
+            
+
             LogSetup.SetupLogger();
             _log = LogManager.GetCurrentClassLogger();
             TerribleElevatedPermissionCheck();

src/NadekoBot/Services/Impl/Localization.cs

@@ -137,7 +137,7 @@ namespace NadekoBot.Services.Impl
                 {
                     Cmd = key,
                     Desc = key,
-                    Usage = key,
+                    Usage = new[] { key },
                 };
 
             return toReturn;