From 788955bb1af1f0c7762d2e0b47813de7041c5878 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Nov 2017 04:33:54 +0100 Subject: [PATCH 1/6] Version upped --- NadekoBot.Core/Services/Impl/StatsService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NadekoBot.Core/Services/Impl/StatsService.cs b/NadekoBot.Core/Services/Impl/StatsService.cs index a79dddf2..bdf27db8 100644 --- a/NadekoBot.Core/Services/Impl/StatsService.cs +++ b/NadekoBot.Core/Services/Impl/StatsService.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Core.Services.Impl private readonly IBotCredentials _creds; private readonly DateTime _started; - public const string BotVersion = "2.3.6"; + public const string BotVersion = "2.4.0"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; From 5d30658b0f7d6cedc0d7bcab7212774464abd4c3 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Nov 2017 06:14:08 +0100 Subject: [PATCH 2/6] Gifs will now work again in .plant and .gc, fix #1807 --- NadekoBot.Core/Modules/Games/PlantAndPickCommands.cs | 2 +- NadekoBot.Core/Modules/Games/Services/GamesService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NadekoBot.Core/Modules/Games/PlantAndPickCommands.cs b/NadekoBot.Core/Modules/Games/PlantAndPickCommands.cs index e726cad3..0c04a2d3 100644 --- a/NadekoBot.Core/Modules/Games/PlantAndPickCommands.cs +++ b/NadekoBot.Core/Modules/Games/PlantAndPickCommands.cs @@ -91,7 +91,7 @@ namespace NadekoBot.Modules.Games using (var toSend = imgData.ToStream()) { - msg = await Context.Channel.SendFileAsync(toSend, "plant.png", msgToSend, options: new RequestOptions() + msg = await Context.Channel.SendFileAsync(toSend, "plant.gif", msgToSend, options: new RequestOptions() { RetryMode = RetryMode.AlwaysRetry }).ConfigureAwait(false); diff --git a/NadekoBot.Core/Modules/Games/Services/GamesService.cs b/NadekoBot.Core/Modules/Games/Services/GamesService.cs index c8a7dc85..365529c6 100644 --- a/NadekoBot.Core/Modules/Games/Services/GamesService.cs +++ b/NadekoBot.Core/Modules/Games/Services/GamesService.cs @@ -200,7 +200,7 @@ namespace NadekoBot.Modules.Games.Services { var sent = await channel.SendFileAsync( fileStream, - "drop.png", + "drop.gif", toSend).ConfigureAwait(false); msgs[0] = sent; From 1ef7880f4d3cb3036e1d85f4ba264e97a5cbc9ec Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Nov 2017 06:23:05 +0100 Subject: [PATCH 3/6] Fixed dnd roll, closes #1806 --- NadekoBot.Core/Modules/Gambling/DiceRollCommands.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/NadekoBot.Core/Modules/Gambling/DiceRollCommands.cs b/NadekoBot.Core/Modules/Gambling/DiceRollCommands.cs index c18d78bf..550a9cb9 100644 --- a/NadekoBot.Core/Modules/Gambling/DiceRollCommands.cs +++ b/NadekoBot.Core/Modules/Gambling/DiceRollCommands.cs @@ -164,11 +164,8 @@ namespace NadekoBot.Modules.Gambling int.TryParse(match.Groups["n2"].ToString(), out int n2) && n1 <= 50 && n2 <= 100000 && n1 > 0 && n2 > 0) { - if (!int.TryParse(match.Groups["add"].Value, out int add) || - !int.TryParse(match.Groups["sub"].Value, out int sub)) - { - return; - } + int.TryParse(match.Groups["add"].Value, out int add); + int.TryParse(match.Groups["sub"].Value, out int sub); var arr = new int[n1]; for (int i = 0; i < n1; i++) From d5840e6acde2313d97de92dd996975ca2c180aa2 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Nov 2017 06:30:33 +0100 Subject: [PATCH 4/6] Delete pack.ps1 --- pack.ps1 | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 pack.ps1 diff --git a/pack.ps1 b/pack.ps1 deleted file mode 100644 index ddb3b585..00000000 --- a/pack.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -dotnet pack "src\NadekoBot\NadekoBot.csproj" -c "Release" -o "../../artifacts" --no-build --version-suffix "$Env:BUILD" /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG" -if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } \ No newline at end of file From ed27d6b21370c6210499bb769f23db02be81c5b6 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Nov 2017 06:30:55 +0100 Subject: [PATCH 5/6] Delete build.ps1 --- build.ps1 | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 build.ps1 diff --git a/build.ps1 b/build.ps1 deleted file mode 100644 index ba45cce3..00000000 --- a/build.ps1 +++ /dev/null @@ -1,4 +0,0 @@ -appveyor-retry dotnet restore NadekoBot.sln -v Minimal /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG" -if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } -dotnet build NadekoBot.sln -c "Release" /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG" -if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } \ No newline at end of file From 759bb0982ecc2c6d93985043f8b49f1467c4dcd8 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Nov 2017 12:46:17 +0100 Subject: [PATCH 6/6] Version upped to 2.4.1 --- NadekoBot.Core/Services/Impl/StatsService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NadekoBot.Core/Services/Impl/StatsService.cs b/NadekoBot.Core/Services/Impl/StatsService.cs index bdf27db8..701bd256 100644 --- a/NadekoBot.Core/Services/Impl/StatsService.cs +++ b/NadekoBot.Core/Services/Impl/StatsService.cs @@ -21,7 +21,7 @@ namespace NadekoBot.Core.Services.Impl private readonly IBotCredentials _creds; private readonly DateTime _started; - public const string BotVersion = "2.4.0"; + public const string BotVersion = "2.4.1"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net";