From 5d30658b0f7d6cedc0d7bcab7212774464abd4c3 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Nov 2017 06:14:08 +0100 Subject: [PATCH 1/2] 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 2/2] 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++)