From 9cd3a16a026018a571e8d45f010afeaf6866b9f5 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 3 Jan 2017 16:02:02 +0100 Subject: [PATCH] Updated to discord.net rc --- Discord.Net | 2 +- scripts/Latest.bat | 13 +++++-------- .../Modules/Games/Commands/Trivia/TriviaGame.cs | 2 +- src/NadekoBot/Modules/Music/Music.cs | 3 +-- .../Modules/Searches/Commands/XkcdCommands.cs | 2 +- src/NadekoBot/Services/Impl/StatsService.cs | 2 +- src/NadekoBot/ShardedDiscordClient.cs | 4 ++-- 7 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Discord.Net b/Discord.Net index 40fa35c8..fa2568bc 160000 --- a/Discord.Net +++ b/Discord.Net @@ -1 +1 @@ -Subproject commit 40fa35c851076fb035fab06deb06f2b013281c15 +Subproject commit fa2568bc312ba35f1518e47601c62fccdb949731 diff --git a/scripts/Latest.bat b/scripts/Latest.bat index 359cd366..f551c732 100644 --- a/scripts/Latest.bat +++ b/scripts/Latest.bat @@ -4,12 +4,11 @@ TITLE Downloading NadekoBot, please wait SET root=%~dp0 CD /D %root% SET rootdir=%cd% -SET build1=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.API\ -SET build2=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Core\ -SET build3=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Rest\ -SET build4=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.WebSocket\ -SET build5=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Commands\ -SET build6=%root%NadekoInstall_Temp\NadekoBot\src\NadekoBot\ +SET build1=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Core\ +SET build2=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Rest\ +SET build3=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.WebSocket\ +SET build4=%root%NadekoInstall_Temp\NadekoBot\Discord.Net\src\Discord.Net.Commands\ +SET build5=%root%NadekoInstall_Temp\NadekoBot\src\NadekoBot\ SET installtemp=%root%NadekoInstall_Temp\ ::Deleting traces of last setup for the sake of clean folders, if by some miracle it still exists IF EXIST %installtemp% ( RMDIR %installtemp% /S /Q >nul 2>&1) @@ -39,8 +38,6 @@ CD /D %build4% dotnet restore >nul 2>&1 CD /D %build5% dotnet restore >nul 2>&1 -CD /D %build6% -dotnet restore >nul 2>&1 dotnet build --configuration Release >nul 2>&1 ::Attempts to backup old files if they currently exist in the same folder as the batch file IF EXIST "%root%NadekoBot\" (GOTO :backupinstall) diff --git a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs index 83b71e1d..2c989738 100644 --- a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs +++ b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs @@ -98,7 +98,7 @@ namespace NadekoBot.Modules.Games.Trivia if (ShowHints) try { - await questionMessage.ModifyAsync(m => m.Embed = questionEmbed.WithFooter(efb => efb.WithText(CurrentQuestion.GetHint()))) + await questionMessage.ModifyAsync(m => m.Embed = questionEmbed.WithFooter(efb => efb.WithText(CurrentQuestion.GetHint())).Build()) .ConfigureAwait(false); } catch (HttpException ex) when (ex.StatusCode == System.Net.HttpStatusCode.NotFound || ex.StatusCode == System.Net.HttpStatusCode.Forbidden) diff --git a/src/NadekoBot/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs index f3114943..7ecef7c5 100644 --- a/src/NadekoBot/Modules/Music/Music.cs +++ b/src/NadekoBot/Modules/Music/Music.cs @@ -460,17 +460,16 @@ $"{("tracks".SnPl(musicPlayer.Playlist.Count))} | {(int)total.TotalHours}h {tota [Priority(0)] public async Task Remove(int num) { - MusicPlayer musicPlayer; if (!MusicPlayers.TryGetValue(Context.Guild.Id, out musicPlayer)) return; if (((IGuildUser)Context.User).VoiceChannel != musicPlayer.PlaybackVoiceChannel) return; + musicPlayer.SongRemoved += async (song) => { try { - var embed = new EmbedBuilder() .WithAuthor(eab => eab.WithName("Removed song #" + num).WithMusicIcon()) .WithDescription(song.PrettyName) diff --git a/src/NadekoBot/Modules/Searches/Commands/XkcdCommands.cs b/src/NadekoBot/Modules/Searches/Commands/XkcdCommands.cs index f6b0ad98..a8de4c7e 100644 --- a/src/NadekoBot/Modules/Searches/Commands/XkcdCommands.cs +++ b/src/NadekoBot/Modules/Searches/Commands/XkcdCommands.cs @@ -60,7 +60,7 @@ namespace NadekoBot.Modules.Searches await Task.Delay(10000).ConfigureAwait(false); - await sent.ModifyAsync(m => m.Embed = embed.AddField(efb => efb.WithName("Alt").WithValue(comic.Alt.ToString()).WithIsInline(false))); + await sent.ModifyAsync(m => m.Embed = embed.AddField(efb => efb.WithName("Alt").WithValue(comic.Alt.ToString()).WithIsInline(false)).Build()); } } } diff --git a/src/NadekoBot/Services/Impl/StatsService.cs b/src/NadekoBot/Services/Impl/StatsService.cs index 9a0d160c..a4c91a59 100644 --- a/src/NadekoBot/Services/Impl/StatsService.cs +++ b/src/NadekoBot/Services/Impl/StatsService.cs @@ -14,7 +14,7 @@ namespace NadekoBot.Services.Impl private ShardedDiscordClient client; private DateTime started; - public const string BotVersion = "1.1.0-alpha"; + public const string BotVersion = "1.1.0-beta"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; diff --git a/src/NadekoBot/ShardedDiscordClient.cs b/src/NadekoBot/ShardedDiscordClient.cs index fcee8863..8a341197 100644 --- a/src/NadekoBot/ShardedDiscordClient.cs +++ b/src/NadekoBot/ShardedDiscordClient.cs @@ -122,9 +122,9 @@ namespace NadekoBot _log.Info($"Shard #{c.ShardId} downloaded {c.Guilds.Sum(g => g.Users.Count)} users after {sw.Elapsed.TotalSeconds:F2}s ({++_downloadedCount}/{Clients.Count})."); })); - public Task SetGame(string game) => Task.WhenAll(Clients.Select(ms => ms.SetGame(game))); + public Task SetGame(string game) => Task.WhenAll(Clients.Select(ms => ms.SetGameAsync(game))); - public Task SetStream(string name, string url) => Task.WhenAll(Clients.Select(ms => ms.SetGame(name, url, StreamType.NotStreaming))); + public Task SetStream(string name, string url) => Task.WhenAll(Clients.Select(ms => ms.SetGameAsync(name, url, StreamType.NotStreaming))); } } \ No newline at end of file