From 28566023c2661995dea6f83d0c68b52a601a177a Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 31 Jan 2017 20:11:42 +0100 Subject: [PATCH 1/2] Fixed music errors? --- NuGet.Config | 1 + src/NadekoBot/Modules/Gambling/Commands/CurrencyEvents.cs | 3 +-- src/NadekoBot/Modules/Music/Classes/SongHandler.cs | 2 +- src/NadekoBot/project.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index d40268d3..e482807c 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -2,5 +2,6 @@ + diff --git a/src/NadekoBot/Modules/Gambling/Commands/CurrencyEvents.cs b/src/NadekoBot/Modules/Gambling/Commands/CurrencyEvents.cs index ad6e7023..927f8a72 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/CurrencyEvents.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/CurrencyEvents.cs @@ -26,6 +26,7 @@ namespace NadekoBot.Modules.Gambling } //flower reaction event public static readonly ConcurrentHashSet _flowerReactionAwardedUsers = new ConcurrentHashSet(); + public static readonly ConcurrentHashSet _sneakyGameAwardedUsers = new ConcurrentHashSet(); private static readonly char[] _sneakyGameStatusChars = Enumerable.Range(48, 10) @@ -34,8 +35,6 @@ namespace NadekoBot.Modules.Gambling .Select(x => (char)x) .ToArray(); - public static readonly ConcurrentHashSet _sneakyGameAwardedUsers = new ConcurrentHashSet(); - private static string _secretCode = String.Empty; [NadekoCommand, Usage, Description, Aliases] diff --git a/src/NadekoBot/Modules/Music/Classes/SongHandler.cs b/src/NadekoBot/Modules/Music/Classes/SongHandler.cs index 7892e278..f296d2cb 100644 --- a/src/NadekoBot/Modules/Music/Classes/SongHandler.cs +++ b/src/NadekoBot/Modules/Music/Classes/SongHandler.cs @@ -97,7 +97,7 @@ namespace NadekoBot.Modules.Music.Classes { Title = video.Title.Substring(0, video.Title.Length - 10), // removing trailing "- You Tube" Provider = "YouTube", - Uri = video.Uri, + Uri = await video.GetUriAsync().ConfigureAwait(false), Query = link, ProviderType = musicType, }); diff --git a/src/NadekoBot/project.json b/src/NadekoBot/project.json index 17dc48f1..a88058ea 100644 --- a/src/NadekoBot/project.json +++ b/src/NadekoBot/project.json @@ -18,7 +18,7 @@ }, "dependencies": { "AngleSharp": "0.9.9", - "VideoLibrary": "1.3.4", + "libvideo": "1.0.0", "CoreCLR-NCalc": "2.1.2", "Google.Apis.Urlshortener.v1": "1.19.0.138", "Google.Apis.YouTube.v3": "1.20.0.701", From 3c4cdb3e60ad99f23bb6dc7f30657bb48c14e7fa Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 31 Jan 2017 20:22:12 +0100 Subject: [PATCH 2/2] 1.1.5a --- src/NadekoBot/Services/Impl/StatsService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Services/Impl/StatsService.cs b/src/NadekoBot/Services/Impl/StatsService.cs index 380ca2bb..ab72769d 100644 --- a/src/NadekoBot/Services/Impl/StatsService.cs +++ b/src/NadekoBot/Services/Impl/StatsService.cs @@ -15,7 +15,7 @@ namespace NadekoBot.Services.Impl private DiscordShardedClient client; private DateTime started; - public const string BotVersion = "1.1.5"; + public const string BotVersion = "1.1.5a"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net";