Merge branch 'v5' of https://gitlab.com/kwoth/nadekobot into v5

change: timely will no longer require guild context, as dmcmd .timely will do the same thing

CHANGELOG.md

@@ -2,7 +2,29 @@
 
 Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
-## [5.3.0] - 07.12.2024
+## [5.3.2] - 14.12.2024
+
+## Fixed
+
+- `.banner` should be working properly now with both server and global user banners
+
+## [5.3.1] - 13.12.2024
+
+## Changed
+
+- `.translate` will now use 2 embeds, to allow for longer messages
+- Added role icon to `.inrole`, if it exists
+- `.honeypot` will now add a 'Honeypot' as a ban reason.
+
+## Fixed
+
+- `.winlb` looks better, has a title, shows 9 entries now
+- `.sar ex` help updated
+- `.banner` partially fixed, it still can't show global banners, but it will show guild ones correctly, in a good enough size
+- `.sclr` will now show correct color hexes without alpha
+- `.dmcmd` will now correctly block commands in dms, not globally
+
+## [5.3.0] - 10.12.2024
 
 ## Added
 
@@ -35,10 +57,12 @@ Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except da
 - `.sclr show` will now show hex code of the current color
 - Queueing a song will now restart the playback if the queue is on the last track and stopped (there were no more tracks
   to play)
+- `.translate` will now use 2 embeds instead of 1
 
 ## Fixed
 
 - .setstream and .setactivity will now pause .ropl (rotating statuses)
+- Fixed `.sar ex` help description
 
 ## Removed
 

src/NadekoBot/Modules/Administration/Honeypot/HoneyPotService.cs

@@ -71,7 +71,7 @@ public sealed class HoneyPotService : IHoneyPotService, IReadyExecutor, IExecNoC
                 try
                 {
                     Log.Information("Honeypot caught user {User} [{UserId}]", user, user.Id);
-                    await user.BanAsync(pruneDays: 1);
+                    await user.BanAsync(pruneDays: 1, reason: "Honeypot");
                     await user.Guild.RemoveBanAsync(user.Id);
                 }
                 catch (Exception e)

src/NadekoBot/Modules/Gambling/BetStatsCommands.cs

@@ -149,7 +149,10 @@ public partial class Gambling
                                    ?? (await _userService.GetUserAsync(x.UserId))?.Username
                                    ?? x.UserId.ToString();
 
-                        outputItems.Add(new WinLbStat(i + 1 + (page * 10), user, x.Game, x.MaxWin));
+                        if (user.StartsWith("??"))
+                            user = x.UserId.ToString();
+
+                        outputItems.Add(new WinLbStat(i + 1 + (page * 9), user, x.Game, x.MaxWin));
                     }
 
                     return outputItems;
@@ -166,10 +169,11 @@ public partial class Gambling
             await Response()
                   .Paginated()
                   .PageItems(p => GetCachedWinLbAsync(p))
-                  .PageSize(10)
+                  .PageSize(9)
                   .Page((items, curPage) =>
                   {
                       var eb = CreateEmbed()
+                               .WithTitle(GetText(strs.winlb))
                                .WithOkColor();
 
                       if (items.Count == 0)
@@ -182,7 +186,8 @@ public partial class Gambling
                       {
                           var item = items[i];
                           eb.AddField($"#{item.Rank} {item.User}",
-                              $"{N(item.MaxWin)}\n`{item.Game.ToString().ToLower()}`");
+                              $"{N(item.MaxWin)}\n`{item.Game.ToString().ToLower()}`",
+                              true);
                       }
 
                       return eb;

src/NadekoBot/Modules/Gambling/Gambling.cs

@@ -135,7 +135,6 @@ public partial class Gambling : GamblingModule<GamblingService>
                 });
 
     [Cmd]
-    [RequireContext(ContextType.Guild)]
     public async Task Timely()
     {
         var val = Config.Timely.Amount;

src/NadekoBot/Modules/Gambling/UserBetStatsService.cs

@@ -60,8 +60,8 @@ public sealed class UserBetStatsService : INService
         await using var ctx = _db.GetDbContext();
         return await ctx.GetTable<UserBetStats>()
                         .OrderByDescending(x => x.MaxWin)
-                        .Skip(page * 10)
+                        .Skip(page * 9)
-                        .Take(10)
+                        .Take(9)
                         .ToArrayAsyncLinqToDB();
     }
 }

src/NadekoBot/Modules/Permissions/GlobalPermissions/GlobalPermissionService.cs

@@ -92,13 +92,13 @@ public class GlobalPermissionService : IExecPreCommand, INService
         {
             if (priv)
             {
-                if (bs.Blocked.Commands.Add(commandName))
+                if (bs.DmBlocked.Commands.Add(commandName))
                 {
                     added = true;
                 }
                 else
                 {
-                    bs.Blocked.Commands.Remove(commandName);
+                    bs.DmBlocked.Commands.Remove(commandName);
                     added = false;
                 }
 

src/NadekoBot/Modules/Searches/Searches.cs

@@ -417,15 +417,25 @@ public partial class Searches : NadekoModule<SearchesService>
     {
         usr ??= (IGuildUser)ctx.User;
 
-        var bannerUrl = usr.GetGuildBannerUrl();
+        var bannerUrl = usr.GetGuildBannerUrl(size: 2048)
+                        ?? (await ((DiscordSocketClient)ctx.Client).Rest.GetUserAsync(usr.Id))?.GetBannerUrl();
+
+        if (bannerUrl is null)
+        {
+            await Response()
+                  .Error(strs.no_banner)
+                  .SendAsync();
+
+            return;
+        }
 
         await Response()
               .Embed(
                   CreateEmbed()
                       .WithOkColor()
-                      .AddField("Username", usr.ToString())
+                      .AddField("Username", usr.ToString(), true)
-                      .AddField("Banner Url", bannerUrl)
+                      .AddField("Banner Url", bannerUrl, true)
-                      .WithThumbnailUrl(bannerUrl))
+                      .WithImageUrl(bannerUrl))
               .SendAsync();
     }
 

src/NadekoBot/Modules/Utility/GuildColorsCommands.cs

@@ -13,9 +13,9 @@ public partial class Utility
         public async Task ServerColorsShow()
         {
             var colors = _service.GetColors(ctx.Guild.Id);
-            var okHex = colors?.Ok?.RawValue.ToString("X8");
+            var okHex = colors?.Ok?.RawValue.ToString("x6");
-            var warnHex = colors?.Warn?.RawValue.ToString("X8");
+            var warnHex = colors?.Warn?.RawValue.ToString("x6");
-            var errHex = colors?.Error?.RawValue.ToString("X8");
+            var errHex = colors?.Error?.RawValue.ToString("x6");
             EmbedBuilder[] ebs =
             [
                 CreateEmbed()

src/NadekoBot/Modules/Utility/Utility.cs

@@ -186,7 +186,7 @@ public partial class Utility : NadekoModule
 
                   return CreateEmbed()
                                 .WithOkColor()
-                                .WithTitle(GetText(strs.inrole_list(roleName, roleUsers.Count)))
+                                .WithTitle(GetText(strs.inrole_list(role?.GetIconUrl() + roleName, roleUsers.Count)))
                                 .WithDescription(string.Join("\n", pageUsers));
               })
               .SendAsync();

src/NadekoBot/NadekoBot.csproj

@@ -4,7 +4,7 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>true</ImplicitUsings>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-        <Version>5.3.0</Version>
+        <Version>5.3.2</Version>
 
         <!-- Output/build -->
         <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>

src/NadekoBot/data/strings/responses/responses.en-US.json

@@ -1157,5 +1157,7 @@
   "notify_desc_protection": "Triggers when antialt, antispam or antiraid is triggered.",
   "notify_desc_addrolerew": "Triggers when a user gets a role as a reward for reaching a level (xprew).",
   "notify_desc_removerolerew": "Triggers when a user loses a role as a reward for reaching a level (xprew).",
-  "notify_desc_not_found": "No description found for this notify event. Please report this."
+  "notify_desc_not_found": "No description found for this notify event. Please report this.",
+  "winlb": "Biggest Wins Leaderboard",
+  "no_banner": "No banner set."
 }