Fixed some broken command strings

src/NadekoBot/Modules/Music/Classes/Song.cs

@@ -75,7 +75,7 @@ namespace NadekoBot.Modules.Music.Classes
 
         internal async Task Play(IAudioClient voiceClient, CancellationToken cancelToken)
         {
-            var filename = Path.Combine(MusicModule.MusicDataPath, DateTime.Now.UnixTimestamp().ToString());
+            var filename = Path.Combine(Music.MusicDataPath, DateTime.Now.UnixTimestamp().ToString());
 
             SongBuffer sb = new SongBuffer(filename, SongInfo, skipTo);
             var bufferTask = sb.BufferSong(cancelToken).ConfigureAwait(false);

src/NadekoBot/Modules/Music/Music.cs

@@ -17,14 +17,14 @@ using System.Collections.Generic;
 namespace NadekoBot.Modules.Music
 {
     [Module("!!", AppendSpace = false)]
-    public partial class MusicModule : DiscordModule
+    public partial class Music : DiscordModule
     {
         public static ConcurrentDictionary<ulong, MusicPlayer> MusicPlayers = new ConcurrentDictionary<ulong, MusicPlayer>();
 
         public const string MusicDataPath = "data/musicdata";
         private IGoogleApiService _google;
 
-        public MusicModule(ILocalization loc, CommandService cmds, IBotConfiguration config, DiscordSocketClient client, IGoogleApiService google) : base(loc, cmds, config, client)
+        public Music(ILocalization loc, CommandService cmds, IBotConfiguration config, DiscordSocketClient client, IGoogleApiService google) : base(loc, cmds, config, client)
         {
             //it can fail if its currenctly opened or doesn't exist. Either way i don't care
             try { Directory.Delete(MusicDataPath, true); } catch { }

src/NadekoBot/Resources/CommandStrings.Designer.cs

@@ -3734,27 +3734,27 @@ namespace NadekoBot.Resources {
         /// <summary>
         ///    Looks up a localized string similar to Queues all songs from a directory. **Bot Owner Only!**.
         /// </summary>
-        public static string localplaylst_desc {
+        public static string localpl_desc {
             get {
-                return ResourceManager.GetString("localplaylst_desc", resourceCulture);
+                return ResourceManager.GetString("localpl_desc", resourceCulture);
             }
         }
         
         /// <summary>
         ///    Looks up a localized string similar to `!!lopl C:/music/classical`.
         /// </summary>
-        public static string localplaylst_summary {
+        public static string localpl_summary {
             get {
-                return ResourceManager.GetString("localplaylst_summary", resourceCulture);
+                return ResourceManager.GetString("localpl_summary", resourceCulture);
             }
         }
         
         /// <summary>
         ///    Looks up a localized string similar to localplaylst.
         /// </summary>
-        public static string localplaylst_text {
+        public static string localpl_text {
             get {
-                return ResourceManager.GetString("localplaylst_text", resourceCulture);
+                return ResourceManager.GetString("localpl_text", resourceCulture);
             }
         }
         
@@ -4352,57 +4352,57 @@ namespace NadekoBot.Resources {
             }
         }
         
-        /// <summary>
-        ///    Looks up a localized string similar to Shows information about an osu beatmap..
-        /// </summary>
-        public static string osubeatmap_desc {
-            get {
-                return ResourceManager.GetString("osubeatmap_desc", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///    Looks up a localized string similar to `~osu b https://osu.ppy.sh/s/127712`.
-        /// </summary>
-        public static string osubeatmap_summary {
-            get {
-                return ResourceManager.GetString("osubeatmap_summary", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///    Looks up a localized string similar to osu b.
-        /// </summary>
-        public static string osubeatmap_text {
-            get {
-                return ResourceManager.GetString("osubeatmap_text", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///    Looks up a localized string similar to Displays a user&apos;s top 5 plays..
         /// </summary>
-        public static string osutop5_desc {
+        public static string osu5_desc {
             get {
-                return ResourceManager.GetString("osutop5_desc", resourceCulture);
+                return ResourceManager.GetString("osu5_desc", resourceCulture);
             }
         }
         
         /// <summary>
         ///    Looks up a localized string similar to `~osu top5 Name`.
         /// </summary>
-        public static string osutop5_summary {
+        public static string osu5_summary {
             get {
-                return ResourceManager.GetString("osutop5_summary", resourceCulture);
+                return ResourceManager.GetString("osu5_summary", resourceCulture);
             }
         }
         
         /// <summary>
-        ///    Looks up a localized string similar to osu top5.
+        ///    Looks up a localized string similar to osu5.
         /// </summary>
-        public static string osutop5_text {
+        public static string osu5_text {
             get {
-                return ResourceManager.GetString("osutop5_text", resourceCulture);
+                return ResourceManager.GetString("osu5_text", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///    Looks up a localized string similar to Shows information about an osu beatmap..
+        /// </summary>
+        public static string osub_desc {
+            get {
+                return ResourceManager.GetString("osub_desc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///    Looks up a localized string similar to `~osu b https://osu.ppy.sh/s/127712`.
+        /// </summary>
+        public static string osub_summary {
+            get {
+                return ResourceManager.GetString("osub_summary", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///    Looks up a localized string similar to osub.
+        /// </summary>
+        public static string osub_text {
+            get {
+                return ResourceManager.GetString("osub_text", resourceCulture);
             }
         }
         
@@ -5189,6 +5189,33 @@ namespace NadekoBot.Resources {
             }
         }
         
+        /// <summary>
+        ///    Looks up a localized string similar to Toggles repeat of all songs in the queue (every song that finishes is added to the end of the queue)..
+        /// </summary>
+        public static string repeatpl_desc {
+            get {
+                return ResourceManager.GetString("repeatpl_desc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///    Looks up a localized string similar to `!!rpl`.
+        /// </summary>
+        public static string repeatpl_summary {
+            get {
+                return ResourceManager.GetString("repeatpl_summary", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///    Looks up a localized string similar to rpeatplaylst.
+        /// </summary>
+        public static string repeatpl_text {
+            get {
+                return ResourceManager.GetString("repeatpl_text", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///    Looks up a localized string similar to Toggles repeat of current song..
         /// </summary>
@@ -5594,33 +5621,6 @@ namespace NadekoBot.Resources {
             }
         }
         
-        /// <summary>
-        ///    Looks up a localized string similar to Toggles repeat of all songs in the queue (every song that finishes is added to the end of the queue)..
-        /// </summary>
-        public static string rpeatplaylst_desc {
-            get {
-                return ResourceManager.GetString("rpeatplaylst_desc", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///    Looks up a localized string similar to `!!rpl`.
-        /// </summary>
-        public static string rpeatplaylst_summary {
-            get {
-                return ResourceManager.GetString("rpeatplaylst_summary", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///    Looks up a localized string similar to rpeatplaylst.
-        /// </summary>
-        public static string rpeatplaylst_text {
-            get {
-                return ResourceManager.GetString("rpeatplaylst_text", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///    Looks up a localized string similar to Play a game of rocket paperclip scissors with Nadeko..
         /// </summary>

src/NadekoBot/Resources/CommandStrings.resx

@@ -1773,13 +1773,13 @@
   <data name="soundcloudpl_summary" xml:space="preserve">
     <value>`!!scpl soundcloudseturl`</value>
   </data>
-  <data name="localplaylst_text" xml:space="preserve">
+  <data name="localpl_text" xml:space="preserve">
     <value>localplaylst</value>
   </data>
-  <data name="localplaylst_desc" xml:space="preserve">
+  <data name="localpl_desc" xml:space="preserve">
     <value>Queues all songs from a directory. **Bot Owner Only!**</value>
   </data>
-  <data name="localplaylst_summary" xml:space="preserve">
+  <data name="localpl_summary" xml:space="preserve">
     <value>`!!lopl C:/music/classical`</value>
   </data>
   <data name="radio_text" xml:space="preserve">
@@ -1854,13 +1854,13 @@
   <data name="reptcursong_summary" xml:space="preserve">
     <value>`!!rcs`</value>
   </data>
-  <data name="rpeatplaylst_text" xml:space="preserve">
+  <data name="repeatpl_text" xml:space="preserve">
     <value>rpeatplaylst</value>
   </data>
-  <data name="rpeatplaylst_desc" xml:space="preserve">
+  <data name="repeatpl_desc" xml:space="preserve">
     <value>Toggles repeat of all songs in the queue (every song that finishes is added to the end of the queue).</value>
   </data>
-  <data name="rpeatplaylst_summary" xml:space="preserve">
+  <data name="repeatpl_summary" xml:space="preserve">
     <value>`!!rpl`</value>
   </data>
   <data name="save_text" xml:space="preserve">
@@ -2061,22 +2061,22 @@
   <data name="osu_summary" xml:space="preserve">
     <value>`~osu Name` or `~osu Name taiko`</value>
   </data>
-  <data name="osubeatmap_text" xml:space="preserve">
+  <data name="osub_text" xml:space="preserve">
-    <value>osu b</value>
+    <value>osub</value>
   </data>
-  <data name="osubeatmap_desc" xml:space="preserve">
+  <data name="osub_desc" xml:space="preserve">
     <value>Shows information about an osu beatmap.</value>
   </data>
-  <data name="osubeatmap_summary" xml:space="preserve">
+  <data name="osub_summary" xml:space="preserve">
     <value>`~osu b https://osu.ppy.sh/s/127712`</value>
   </data>
-  <data name="osutop5_text" xml:space="preserve">
+  <data name="osu5_text" xml:space="preserve">
-    <value>osu top5</value>
+    <value>osu5</value>
   </data>
-  <data name="osutop5_desc" xml:space="preserve">
+  <data name="osu5_desc" xml:space="preserve">
     <value>Displays a user's top 5 plays.</value>
   </data>
-  <data name="osutop5_summary" xml:space="preserve">
+  <data name="osu5_summary" xml:space="preserve">
     <value>`~osu top5 Name`</value>
   </data>
   <data name="pokemon_text" xml:space="preserve">