Merge pull request #1142 from Kwoth/dev

1.25a

docs/guides/Windows Guide.md

@@ -45,7 +45,7 @@ ________________________________________________________________________________
 - Again, copy the same `Client ID` and replace the `null` part of the `BotId` line with it.
 - Go to a server on discord and attempt to mention yourself, but put a backslash at the start like shown below
 - So the message `\@fearnlj01#3535` will appears as `<@145521851676884992>` after you send the message (to make it slightly easier, add the backslash after you type the mention out)
-- The message will appear as a mention if done correctly, copy the numbers from the message you sent (`145521851676884992`) and replace the `0` on the `OwnerIds` section with your user ID shown earlier.
+- The message will appear as a mention if done correctly, copy the numbers from the message you sent (`145521851676884992`) and replace the ID (By default, the ID is `105635576866156544`) on the `OwnerIds` section with your user ID shown earlier.
 - Save `credentials.json` (make sure you aren't saving it as `credentials.json.txt`)
 - If done correctly, you are now the bot owner. You can add multiple owners by seperating each owner ID with a comma within the square brackets.
 

src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs

@@ -1,6 +1,5 @@
 using Discord;
 using Discord.Commands;
-using ImageSharp;
 using NadekoBot.Attributes;
 using NadekoBot.Extensions;
 using NadekoBot.Services;
@@ -10,7 +9,6 @@ using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using ImageSharp.Formats;
 using Image = ImageSharp.Image;
 
 namespace NadekoBot.Modules.Gambling
@@ -62,7 +60,7 @@ namespace NadekoBot.Modules.Gambling
 
             [NadekoCommand, Usage, Description, Aliases]
             [Priority(0)]
-            public async Task Rolluo(int num)
+            public async Task Rolluo(int num = 1)
             {
                 await InternalRoll(num, false).ConfigureAwait(false);
             }

src/NadekoBot/Modules/Gambling/Commands/Slots.cs

@@ -145,7 +145,7 @@ namespace NadekoBot.Modules.Gambling
                         return;
                     }
 
-                    if (amount > 999)
+                    if (amount > 9999)
                     {
                         GetText("slot_maxbet", 999 + CurrencySign);
                         await ReplyErrorLocalized("max_bet_limit", 999 + CurrencySign).ConfigureAwait(false);

src/NadekoBot/Modules/Permissions/PermissionExtensions.cs

@@ -106,19 +106,13 @@ namespace NadekoBot.Modules.Permissions
             switch (perm.PrimaryTarget)
             {
                 case PrimaryPermissionType.User:
-                    if (guild == null)
+                    com += guild?.GetUser(perm.PrimaryTargetId).ToString() ?? $"<@{perm.PrimaryTargetId}>";
-                        com += $"<@{perm.PrimaryTargetId}>";
-                    else
-                        com += guild.GetUser(perm.PrimaryTargetId).ToString() ?? $"<@{perm.PrimaryTargetId}>";
                     break;
                 case PrimaryPermissionType.Channel:
                     com += $"<#{perm.PrimaryTargetId}>";
                     break;
                 case PrimaryPermissionType.Role:
-                    if(guild == null)
+                    com += guild?.GetRole(perm.PrimaryTargetId)?.ToString() ?? $"<@&{perm.PrimaryTargetId}>";
-                        com += $"<@&{perm.PrimaryTargetId}>";
-                    else
-                        com += guild.GetRole(perm.PrimaryTargetId).ToString() ?? $"<@{perm.PrimaryTargetId}>";
                     break;
                 case PrimaryPermissionType.Server:
                     break;

src/NadekoBot/Services/Impl/ImagesService.cs

@@ -21,7 +21,7 @@ namespace NadekoBot.Services.Impl
         private const string _currencyImagesPath = _basePath + "currency";
         private const string _diceImagesPath = _basePath + "dice";
 
-        private const string _slotBackgroundPath = _basePath + "slots/background.png";
+        private const string _slotBackgroundPath = _basePath + "slots/background2.png";
         private const string _slotNumbersPath = _basePath + "slots/numbers/";
         private const string _slotEmojisPath = _basePath + "slots/emojis/";
 

src/NadekoBot/Services/Impl/StatsService.cs

@@ -16,7 +16,7 @@ namespace NadekoBot.Services.Impl
         private readonly DiscordShardedClient _client;
         private readonly DateTime _started;
 
-        public const string BotVersion = "1.25";
+        public const string BotVersion = "1.25a";
 
         public string Author => "Kwoth#2560";
         public string Library => "Discord.Net";