From 90a1aa45a93f538341eaf74c4d2cfbd8846da5cf Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 22 Aug 2016 00:47:06 +0200 Subject: [PATCH] Fixed some broken command strings --- src/NadekoBot/Modules/Music/Classes/Song.cs | 2 +- .../Music/{MusicModule.cs => Music.cs} | 4 +- .../Resources/CommandStrings.Designer.cs | 134 +++++++++--------- src/NadekoBot/Resources/CommandStrings.resx | 28 ++-- 4 files changed, 84 insertions(+), 84 deletions(-) rename src/NadekoBot/Modules/Music/{MusicModule.cs => Music.cs} (99%) diff --git a/src/NadekoBot/Modules/Music/Classes/Song.cs b/src/NadekoBot/Modules/Music/Classes/Song.cs index 4e0d0184..db4b06ea 100644 --- a/src/NadekoBot/Modules/Music/Classes/Song.cs +++ b/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); diff --git a/src/NadekoBot/Modules/Music/MusicModule.cs b/src/NadekoBot/Modules/Music/Music.cs similarity index 99% rename from src/NadekoBot/Modules/Music/MusicModule.cs rename to src/NadekoBot/Modules/Music/Music.cs index 48ae23c2..4d773f5f 100644 --- a/src/NadekoBot/Modules/Music/MusicModule.cs +++ b/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 MusicPlayers = new ConcurrentDictionary(); 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 { } diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index bf1f80b2..e925fecc 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -3734,27 +3734,27 @@ namespace NadekoBot.Resources { /// /// Looks up a localized string similar to Queues all songs from a directory. **Bot Owner Only!**. /// - public static string localplaylst_desc { + public static string localpl_desc { get { - return ResourceManager.GetString("localplaylst_desc", resourceCulture); + return ResourceManager.GetString("localpl_desc", resourceCulture); } } /// /// Looks up a localized string similar to `!!lopl C:/music/classical`. /// - public static string localplaylst_summary { + public static string localpl_summary { get { - return ResourceManager.GetString("localplaylst_summary", resourceCulture); + return ResourceManager.GetString("localpl_summary", resourceCulture); } } /// /// Looks up a localized string similar to localplaylst. /// - 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 { } } - /// - /// Looks up a localized string similar to Shows information about an osu beatmap.. - /// - public static string osubeatmap_desc { - get { - return ResourceManager.GetString("osubeatmap_desc", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to `~osu b https://osu.ppy.sh/s/127712`. - /// - public static string osubeatmap_summary { - get { - return ResourceManager.GetString("osubeatmap_summary", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to osu b. - /// - public static string osubeatmap_text { - get { - return ResourceManager.GetString("osubeatmap_text", resourceCulture); - } - } - /// /// Looks up a localized string similar to Displays a user's top 5 plays.. /// - public static string osutop5_desc { + public static string osu5_desc { get { - return ResourceManager.GetString("osutop5_desc", resourceCulture); + return ResourceManager.GetString("osu5_desc", resourceCulture); } } /// /// Looks up a localized string similar to `~osu top5 Name`. /// - public static string osutop5_summary { + public static string osu5_summary { get { - return ResourceManager.GetString("osutop5_summary", resourceCulture); + return ResourceManager.GetString("osu5_summary", resourceCulture); } } /// - /// Looks up a localized string similar to osu top5. + /// Looks up a localized string similar to osu5. /// - public static string osutop5_text { + public static string osu5_text { get { - return ResourceManager.GetString("osutop5_text", resourceCulture); + return ResourceManager.GetString("osu5_text", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Shows information about an osu beatmap.. + /// + public static string osub_desc { + get { + return ResourceManager.GetString("osub_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `~osu b https://osu.ppy.sh/s/127712`. + /// + public static string osub_summary { + get { + return ResourceManager.GetString("osub_summary", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to osub. + /// + public static string osub_text { + get { + return ResourceManager.GetString("osub_text", resourceCulture); } } @@ -5189,6 +5189,33 @@ namespace NadekoBot.Resources { } } + /// + /// 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).. + /// + public static string repeatpl_desc { + get { + return ResourceManager.GetString("repeatpl_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `!!rpl`. + /// + public static string repeatpl_summary { + get { + return ResourceManager.GetString("repeatpl_summary", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to rpeatplaylst. + /// + public static string repeatpl_text { + get { + return ResourceManager.GetString("repeatpl_text", resourceCulture); + } + } + /// /// Looks up a localized string similar to Toggles repeat of current song.. /// @@ -5594,33 +5621,6 @@ namespace NadekoBot.Resources { } } - /// - /// 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).. - /// - public static string rpeatplaylst_desc { - get { - return ResourceManager.GetString("rpeatplaylst_desc", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to `!!rpl`. - /// - public static string rpeatplaylst_summary { - get { - return ResourceManager.GetString("rpeatplaylst_summary", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to rpeatplaylst. - /// - public static string rpeatplaylst_text { - get { - return ResourceManager.GetString("rpeatplaylst_text", resourceCulture); - } - } - /// /// Looks up a localized string similar to Play a game of rocket paperclip scissors with Nadeko.. /// diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index e33eeace..ef9e269b 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -1773,13 +1773,13 @@ `!!scpl soundcloudseturl` - + localplaylst - + Queues all songs from a directory. **Bot Owner Only!** - + `!!lopl C:/music/classical` @@ -1854,13 +1854,13 @@ `!!rcs` - + rpeatplaylst - + Toggles repeat of all songs in the queue (every song that finishes is added to the end of the queue). - + `!!rpl` @@ -2061,22 +2061,22 @@ `~osu Name` or `~osu Name taiko` - - osu b + + osub - + Shows information about an osu beatmap. - + `~osu b https://osu.ppy.sh/s/127712` - - osu top5 + + osu5 - + Displays a user's top 5 plays. - + `~osu top5 Name`