From 809219acc35177e9d4c2273d4bac2286870aac9d Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Thu, 15 Jun 2017 19:16:50 +0200 Subject: [PATCH] global nadeko compilation issue --- src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs | 4 ++-- src/NadekoBot/Modules/Music/Music.cs | 2 +- src/NadekoBot/NadekoBot.cs | 5 +++-- src/NadekoBot/_Extensions/Extensions.cs | 5 ++++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs b/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs index 376fe584..7cecf927 100644 --- a/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs +++ b/src/NadekoBot/Modules/Games/Commands/Hangman/HangmanGame.cs @@ -23,9 +23,9 @@ namespace NadekoBot.Modules.Games.Hangman { data = JsonConvert.DeserializeObject>(File.ReadAllText(termsPath)); } - catch (Exception ex) + catch (Exception) { - + //ignored } } diff --git a/src/NadekoBot/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs index 86d7b4a6..afd60bb2 100644 --- a/src/NadekoBot/Modules/Music/Music.cs +++ b/src/NadekoBot/Modules/Music/Music.cs @@ -431,7 +431,7 @@ namespace NadekoBot.Modules.Music using (var http = new HttpClient()) { - var scvids = JObject.Parse(await http.GetStringAsync($"http://scapi.nadekobot.me/resolve?url={pl}").ConfigureAwait(false))["tracks"].ToObject(); + var scvids = JObject.Parse(await http.GetStringAsync($"https://scapi.nadekobot.me/resolve?url={pl}").ConfigureAwait(false))["tracks"].ToObject(); await _music.QueueSong(((IGuildUser)Context.User), (ITextChannel)Context.Channel, ((IGuildUser)Context.User).VoiceChannel, scvids[0].TrackLink).ConfigureAwait(false); MusicPlayer musicPlayer; diff --git a/src/NadekoBot/NadekoBot.cs b/src/NadekoBot/NadekoBot.cs index 6bc2a657..59c6196d 100644 --- a/src/NadekoBot/NadekoBot.cs +++ b/src/NadekoBot/NadekoBot.cs @@ -27,6 +27,7 @@ using NadekoBot.Services.Utility; using NadekoBot.Services.Help; using System.IO; using NadekoBot.Services.Pokemon; +using NadekoBot.DataStructures; namespace NadekoBot { @@ -279,7 +280,7 @@ namespace NadekoBot var _ = await CommandService.AddModulesAsync(this.GetType().GetTypeInfo().Assembly); - + //Console.WriteLine(string.Join(", ", CommandService.Commands // .Distinct(x => x.Name + x.Module.Name) // .SelectMany(x => x.Aliases) @@ -287,8 +288,8 @@ namespace NadekoBot // .Where(x => x.Count() > 1) // .Select(x => x.Key + $"({x.Count()})"))); +//unload modules which are not available on the public bot #if GLOBAL_NADEKO - //unload modules which are not available on the public bot CommandService .Modules .ToArray() diff --git a/src/NadekoBot/_Extensions/Extensions.cs b/src/NadekoBot/_Extensions/Extensions.cs index 050903a2..4520ebd4 100644 --- a/src/NadekoBot/_Extensions/Extensions.cs +++ b/src/NadekoBot/_Extensions/Extensions.cs @@ -94,7 +94,10 @@ namespace NadekoBot.Extensions } } } - catch (Exception ex) { } + catch (Exception) + { + //ignored + } }; using (msg.OnReaction(client, changePage, changePage))