NadekoBot Patronage system, Search commands improvements + fixes

src/NadekoBot/Modules/Gambling/Bank/BankCommands.cs

@@ -65,7 +65,7 @@ public partial class Gambling
             }
             catch
             {
-                await ReplyErrorLocalizedAsync(strs.unable_to_dm_user);
+                await ReplyErrorLocalizedAsync(strs.cant_dm);
             }
         }
     }

src/NadekoBot/Modules/Gambling/Bank/BankService.cs

@@ -1,5 +1,6 @@
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
+using NadekoBot.Db.Models;
 
 namespace NadekoBot.Modules.Gambling.Bank;
 
@@ -74,4 +75,19 @@ public sealed class BankService : IBankService, INService
                ?.Balance
                ?? 0;
     }
+
+    public async Task<long> BurnAllAsync(ulong userId)
+    {
+        await using var ctx = _db.GetDbContext();
+        var output = await ctx.GetTable<BankUser>()
+                              .Where(x => x.UserId == userId)
+                              .UpdateWithOutputAsync(old => new()
+                              {
+                                  Balance = 0
+                              });
+        if (output.Length == 0)
+            return 0;
+        
+        return output[0].Deleted.Balance;
+    }
 }

src/NadekoBot/Modules/Gambling/Bank/IBankService.cs

@@ -5,4 +5,5 @@ public interface IBankService
     Task<bool> DepositAsync(ulong userId, long amount);
     Task<bool> WithdrawAsync(ulong userId, long amount);
     Task<long> GetBalanceAsync(ulong userId);
+    Task<long> BurnAllAsync(ulong userId);
 }

src/NadekoBot/Modules/Gambling/CashInteraction.cs

@@ -1,17 +1,13 @@
 #nullable disable
 namespace NadekoBot.Modules.Gambling;
 
-public class CashInteraction
+public class CashInteraction : NInteraction
 {
-    public static NadekoInteractionData Data =
-        new NadekoInteractionData(new Emoji("🏦"), "cash:bank_show_balance");
+    protected override NadekoInteractionData Data
+        => new NadekoInteractionData(new Emoji("🏦"), "cash:bank_show_balance");
 
-    public static NadekoInteraction CreateInstance(
-        DiscordSocketClient client,
-        ulong userId,
-        Func<SocketMessageComponent, Task> action)
-        => new NadekoInteractionBuilder()
-           .WithData(Data)
-           .WithAction(action)
-           .Build(client, userId);
+    public CashInteraction(DiscordSocketClient client, ulong userId, Func<SocketMessageComponent, Task> action)
+        : base(client, userId, action)
+    {
+    }
 }

src/NadekoBot/Modules/Gambling/Gambling.cs

@@ -3,11 +3,13 @@ using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using NadekoBot.Db;
 using NadekoBot.Db.Models;
+using NadekoBot.Modules.Utility.Patronage;
 using NadekoBot.Modules.Gambling.Bank;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Services;
 using NadekoBot.Services.Currency;
 using NadekoBot.Services.Database.Models;
+using System.Collections.Immutable;
 using System.Globalization;
 using System.Text;
 
@@ -42,6 +44,7 @@ public partial class Gambling : GamblingModule<GamblingService>
     private readonly DownloadTracker _tracker;
     private readonly GamblingConfigService _configService;
     private readonly IBankService _bank;
+    private readonly IPatronageService _ps;
 
     private IUserMessage rdMsg;
 
@@ -52,7 +55,8 @@ public partial class Gambling : GamblingModule<GamblingService>
         DiscordSocketClient client,
         DownloadTracker tracker,
         GamblingConfigService configService,
-        IBankService bank)
+        IBankService bank,
+        IPatronageService ps)
         : base(configService)
     {
         _db = db;
@@ -60,6 +64,7 @@ public partial class Gambling : GamblingModule<GamblingService>
         _cache = cache;
         _client = client;
         _bank = bank;
+        _ps = ps;
 
         _enUsCulture = new CultureInfo("en-US", false).NumberFormat;
         _enUsCulture.NumberDecimalDigits = 0;
@@ -102,6 +107,12 @@ public partial class Gambling : GamblingModule<GamblingService>
         await ctx.Channel.EmbedAsync(embed);
     }
 
+    private static readonly FeatureLimitKey _timelyKey = new FeatureLimitKey()
+    {
+        Key = "timely:extra_percent",
+        PrettyName = "Timely"
+    };
+    
     [Cmd]
     public async partial Task Timely()
     {
@@ -119,6 +130,10 @@ public partial class Gambling : GamblingModule<GamblingService>
             return;
         }
 
+        var result = await _ps.TryGetFeatureLimitAsync(_timelyKey, ctx.User.Id, 0);
+
+        val = (int)(val * (1 + (result.Quota * 0.01f)));
+
         await _cs.AddAsync(ctx.User.Id, val, new("timely", "claim"));
 
         await ReplyConfirmLocalizedAsync(strs.timely(N(val), period));
@@ -331,8 +346,8 @@ public partial class Gambling : GamblingModule<GamblingService>
               .Pipe(text => smc.RespondConfirmAsync(_eb, text, ephemeral: true));
     }
 
-    private NadekoInteraction CreateCashInteraction()
-        => CashInteraction.CreateInstance(_client, ctx.User.Id, BankAction);
+    private NadekoButtonInteraction CreateCashInteraction()
+        => new CashInteraction(_client, ctx.User.Id, BankAction).GetInteraction();
 
     [Cmd]
     [Priority(1)]
@@ -780,4 +795,31 @@ public partial class Gambling : GamblingModule<GamblingService>
 
         await ctx.Channel.EmbedAsync(embed);
     }
+    
+    private static readonly ImmutableArray<string> _emojis =
+        new[] { "⬆", "↖", "⬅", "↙", "⬇", "↘", "➡", "↗" }.ToImmutableArray();
+
+    [Cmd]
+    public async partial Task WheelOfFortune(ShmartNumber amount)
+    {
+        if (!await CheckBetMandatory(amount))
+            return;
+
+        if (!await _cs.RemoveAsync(ctx.User.Id, amount, new("wheel", "bet")))
+        {
+            await ReplyErrorLocalizedAsync(strs.not_enough(CurrencySign));
+            return;
+        }
+
+        var result = await _service.WheelOfFortuneSpinAsync(ctx.User.Id, amount);
+
+        var wofMultipliers = Config.WheelOfFortune.Multipliers;
+        await SendConfirmAsync(Format.Bold($@"{ctx.User} won: {N(result.Amount)}
+
+   『{wofMultipliers[1]}』   『{wofMultipliers[0]}』   『{wofMultipliers[7]}』
+
+『{wofMultipliers[2]}』      {_emojis[result.Index]}      『{wofMultipliers[6]}』
+
+     『{wofMultipliers[3]}』   『{wofMultipliers[4]}』   『{wofMultipliers[5]}』"));
+    }
 }

src/NadekoBot/Modules/Gambling/Wheel/WheelOfFortuneCommands.cs

@@ -1,49 +0,0 @@
-#nullable disable
-using NadekoBot.Modules.Gambling.Common;
-using NadekoBot.Modules.Gambling.Services;
-using System.Collections.Immutable;
-
-namespace NadekoBot.Modules.Gambling;
-
-public partial class Gambling
-{
-    public partial class WheelOfFortuneCommands : GamblingSubmodule<GamblingService>
-    {
-        private static readonly ImmutableArray<string> _emojis =
-            new[] { "⬆", "↖", "⬅", "↙", "⬇", "↘", "➡", "↗" }.ToImmutableArray();
-
-        private readonly ICurrencyService _cs;
-        private readonly DbService _db;
-
-        public WheelOfFortuneCommands(ICurrencyService cs, DbService db, GamblingConfigService gamblingConfService)
-            : base(gamblingConfService)
-        {
-            _cs = cs;
-            _db = db;
-        }
-
-        [Cmd]
-        public async partial Task WheelOfFortune(ShmartNumber amount)
-        {
-            if (!await CheckBetMandatory(amount))
-                return;
-
-            if (!await _cs.RemoveAsync(ctx.User.Id, amount, new("wheel", "bet")))
-            {
-                await ReplyErrorLocalizedAsync(strs.not_enough(CurrencySign));
-                return;
-            }
-
-            var result = await _service.WheelOfFortuneSpinAsync(ctx.User.Id, amount);
-
-            var wofMultipliers = Config.WheelOfFortune.Multipliers;
-            await SendConfirmAsync(Format.Bold($@"{ctx.User} won: {N(result.Amount)}
-
-   『{wofMultipliers[1]}』   『{wofMultipliers[0]}』   『{wofMultipliers[7]}』
-
-『{wofMultipliers[2]}』      {_emojis[result.Index]}      『{wofMultipliers[6]}』
-
-     『{wofMultipliers[3]}』   『{wofMultipliers[4]}』   『{wofMultipliers[5]}』"));
-        }
-    }
-}