fixed time conversion

Changelog updated

CHANGELOG.md

@@ -2,15 +2,36 @@
 
 Mostly based on [keepachangelog](https://keepachangelog.com/en/1.1.0/) except date format. a-c-f-r-o
 
+## [5.1.20] - 13.11.2024
+
+### Added
+
+- Added `.rakeback` command, get a % of house edge back as claimable currency
+- Added `.snipe` command to quickly get a copy of  a posted message as an embed
+  - You can reply to a message to snipe that message
+  - Or just type .snipe and the bot will snipe the last message in the channel with content or image
+- Added `.betstatsreset` / `.bsreset` command to reset your stats for a fee
+- Added `.gamblestatsreset` / `.gsreset` owner-only command to reset bot stats for all games
+- Added `.waifuclaims` command which lists all of your claimed waifus
+- Added and changed `%bot.time%` and `%bot.date%` placeholders. They use timestamp tags now
+
+### Changed
+
+- `.divorce` no longer has a cooldown
+- `.betroll` has a 2% better payout
+- `.slot` payout balanced out (less volatile), reduced jackpot win but increased other wins, 
+  - now has a new symbol, wheat 
+  - worse around 1% in total (now shares the top spot with .bf)
+
 ## [5.1.19] - 05.11.2024
 
 ### Added
 
 - Added `.betstats`
     - See your own stats with .betstats
-    - Target someone else:  .betstats @seraphe
+    - Target someone else:  .betstats @mai_lanfiel
     - You can also specify a game .betstats lula
-    - Or both! .betstats seraphe br
+    - Or both! .betstats mai_lanfiel br
 - `.timely` can now have a server boost bonus
     - Configure server ids and reward amount in data/gambling.yml
     - anyone who boosts one of the sepcified servers gets the amount as base timely bonus

src/EllieBot/Db/EllieContext.cs

@@ -74,6 +74,13 @@ public abstract class EllieContext : DbContext
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
+        #region Rakeback
+
+        modelBuilder.Entity<Rakeback>()
+                    .HasKey(x => x.UserId);
+
+        #endregion
+
         #region UserBetStats
 
         modelBuilder.Entity<UserBetStats>()

src/EllieBot/EllieBot.csproj

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

src/EllieBot/Migrations/MigrationQueries.cs

@@ -7,7 +7,7 @@ public static class MigrationQueries
 {
     public static void UpdateUsernames(MigrationBuilder migrationBuilder)
     {
-        migrationBuilder.Sql("UPDATE DiscordUser SET Username = '??' + Username WHERE Discriminator = '????';");
+        migrationBuilder.Sql("UPDATE DiscordUser SET Username = '??' || Username WHERE Discriminator = '????';");
     }
 
     public static void MigrateRero(MigrationBuilder migrationBuilder)

src/EllieBot/Migrations/PostgreSql/20241107051622_rakeback.cs

@@ -0,0 +1,33 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace EllieBot.Migrations.PostgreSql
+{
+    /// <inheritdoc />
+    public partial class rakeback : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "rakeback",
+                columns: table => new
+                {
+                    userid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
+                    amount = table.Column<decimal>(type: "numeric", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_rakeback", x => x.userid);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "rakeback");
+        }
+    }
+}

src/EllieBot/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs

@@ -3227,6 +3227,23 @@ namespace EllieBot.Migrations.PostgreSql
                     b.ToTable("greetsettings", (string)null);
                 });
 
+            modelBuilder.Entity("EllieBot.Services.Rakeback", b =>
+                {
+                    b.Property<decimal>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("userid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric")
+                        .HasColumnName("amount");
+
+                    b.HasKey("UserId")
+                        .HasName("pk_rakeback");
+
+                    b.ToTable("rakeback", (string)null);
+                });
+
             modelBuilder.Entity("EllieBot.Services.UserBetStats", b =>
                 {
                     b.Property<int>("Id")

src/EllieBot/Migrations/Sqlite/20241107051525_rakeback.cs

@@ -0,0 +1,34 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace EllieBot.Migrations
+{
+    /// <inheritdoc />
+    public partial class rakeback : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Rakeback",
+                columns: table => new
+                {
+                    UserId = table.Column<ulong>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    Amount = table.Column<decimal>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Rakeback", x => x.UserId);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Rakeback");
+        }
+    }
+}

src/EllieBot/Migrations/Sqlite/EllieSqliteContextModelSnapshot.cs

@@ -2399,6 +2399,20 @@ namespace EllieBot.Migrations
                     b.ToTable("GreetSettings");
                 });
 
+            modelBuilder.Entity("EllieBot.Services.Rakeback", b =>
+                {
+                    b.Property<ulong>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("UserId");
+
+                    b.ToTable("Rakeback");
+                });
+
             modelBuilder.Entity("EllieBot.Services.UserBetStats", b =>
                 {
                     b.Property<int>("Id")

src/EllieBot/Modules/Administration/Self/SelfService.cs

@@ -71,7 +71,6 @@ public sealed class SelfService : IExecNoCommand, IReadyExecutor, IEService
                 if (server.OwnerId != _client.CurrentUser.Id)
                 {
                     await server.LeaveAsync();
-                    Log.Information("Left server {Name} [{Id}]", server.Name, server.Id);
                 }
                 else
                 {

src/EllieBot/Modules/Gambling/AnimalRacing/AnimalRacingCommands.cs

@@ -12,7 +12,7 @@ namespace EllieBot.Modules.Gambling;
 public partial class Gambling
 {
     [Group]
-    public partial class AnimalRacingCommands : GamblingSubmodule<AnimalRaceService>
+    public partial class AnimalRacingCommands : GamblingModule<AnimalRaceService>
     {
         private readonly ICurrencyService _cs;
         private readonly DiscordSocketClient _client;

src/EllieBot/Modules/Gambling/BetStatsCommands.cs

@@ -0,0 +1,175 @@
+#nullable disable
+using EllieBot.Modules.Gambling.Common;
+using EllieBot.Modules.Gambling.Services;
+
+namespace EllieBot.Modules.Gambling;
+
+public partial class Gambling
+{
+    [Group]
+    public sealed class BetStatsCommands : GamblingModule<UserBetStatsService>
+    {
+        private readonly GamblingTxTracker _gamblingTxTracker;
+
+        public BetStatsCommands(
+            GamblingTxTracker gamblingTxTracker,
+            GamblingConfigService gcs)
+            : base(gcs)
+        {
+            _gamblingTxTracker = gamblingTxTracker;
+        }
+
+        [Cmd]
+        public async Task BetStatsReset(GamblingGame? game = null)
+        {
+            var price = await _service.GetResetStatsPriceAsync(ctx.User.Id, game);
+
+            var result = await PromptUserConfirmAsync(_sender.CreateEmbed()
+                                                             .WithDescription(
+                                                                 $"""
+                                                                  Are you sure you want to reset your bet stats for **{GetGameName(game)}**?
+
+                                                                  It will cost you {N(price)}
+                                                                  """));
+
+            if (!result)
+                return;
+
+            var success = await _service.ResetStatsAsync(ctx.User.Id, game);
+
+            if (success)
+            {
+                await ctx.OkAsync();
+            }
+            else
+            {
+                await Response()
+                      .Error(strs.not_enough(CurrencySign))
+                      .SendAsync();
+            }
+        }
+
+        private string GetGameName(GamblingGame? game)
+        {
+            if (game is null)
+                return "all games";
+
+            return game.ToString();
+        }
+
+        [Cmd]
+        [Priority(3)]
+        public async Task BetStats()
+            => await BetStats(ctx.User, null);
+
+        [Cmd]
+        [Priority(2)]
+        public async Task BetStats(GamblingGame game)
+            => await BetStats(ctx.User, game);
+
+        [Cmd]
+        [Priority(1)]
+        public async Task BetStats([Leftover] IUser user)
+            => await BetStats(user, null);
+
+        [Cmd]
+        [Priority(0)]
+        public async Task BetStats(IUser user, GamblingGame? game)
+        {
+            var stats = await _gamblingTxTracker.GetUserStatsAsync(user.Id, game);
+
+            if (stats.Count == 0)
+                stats = new()
+                {
+                    new()
+                    {
+                        TotalBet = 1
+                    }
+                };
+
+            var eb = _sender.CreateEmbed()
+                            .WithOkColor()
+                            .WithAuthor(user)
+                            .AddField("Total Won", N(stats.Sum(x => x.PaidOut)), true)
+                            .AddField("Biggest Win", N(stats.Max(x => x.MaxWin)), true)
+                            .AddField("Biggest Bet", N(stats.Max(x => x.MaxBet)), true)
+                            .AddField("# Bets", stats.Sum(x => x.WinCount + x.LoseCount), true)
+                            .AddField("Payout",
+                                (stats.Sum(x => x.PaidOut) / stats.Sum(x => x.TotalBet)).ToString("P2", Culture),
+                                true);
+            if (game == null)
+            {
+                var favGame = stats.MaxBy(x => x.WinCount + x.LoseCount);
+                eb.AddField("Favorite Game",
+                    favGame.Game + "\n" + Format.Italics((favGame.WinCount + favGame.LoseCount) + " plays"),
+                    true);
+            }
+            else
+            {
+                eb.WithDescription(game.ToString())
+                  .AddField("# Wins", stats.Sum(x => x.WinCount), true);
+            }
+
+            await Response()
+                  .Embed(eb)
+                  .SendAsync();
+        }
+
+        [Cmd]
+        public async Task GambleStats()
+        {
+            var stats = await _gamblingTxTracker.GetAllAsync();
+
+            var eb = _sender.CreateEmbed()
+                            .WithOkColor();
+
+            var str = "` Feature `｜`   Bet  `｜`Paid Out`｜`  RoI  `\n";
+            str += "――――――――――――――――――――\n";
+            foreach (var stat in stats)
+            {
+                var perc = (stat.PaidOut / stat.Bet).ToString("P2", Culture);
+                str += $"`{stat.Feature.PadBoth(9)}`"
+                       + $"｜`{stat.Bet.ToString("N0").PadLeft(8, ' ')}`"
+                       + $"｜`{stat.PaidOut.ToString("N0").PadLeft(8, ' ')}`"
+                       + $"｜`{perc.PadLeft(6, ' ')}`\n";
+            }
+
+            var bet = stats.Sum(x => x.Bet);
+            var paidOut = stats.Sum(x => x.PaidOut);
+
+            if (bet == 0)
+                bet = 1;
+
+            var tPerc = (paidOut / bet).ToString("P2", Culture);
+            str += "――――――――――――――――――――\n";
+            str += $"` {("TOTAL").PadBoth(7)}` "
+                   + $"｜**{N(bet).PadLeft(8, ' ')}**"
+                   + $"｜**{N(paidOut).PadLeft(8, ' ')}**"
+                   + $"｜`{tPerc.PadLeft(6, ' ')}`";
+
+            eb.WithDescription(str);
+
+            await Response().Embed(eb).SendAsync();
+        }
+
+        [Cmd]
+        [OwnerOnly]
+        public async Task GambleStatsReset()
+        {
+            if (!await PromptUserConfirmAsync(_sender.CreateEmbed()
+                                                     .WithDescription(
+                                                         """
+                                                         Are you sure?
+                                                         This will completely reset Gambling Stats.
+
+                                                         This action is irreversible.
+                                                         """)))
+                return;
+
+            await GambleStats();
+            await _service.ResetGamblingStatsAsync();
+
+            await ctx.OkAsync();
+        }
+    }
+}

src/EllieBot/Modules/Gambling/BlackJack/BlackJackCommands.cs

@@ -8,7 +8,7 @@ namespace EllieBot.Modules.Gambling;
 
 public partial class Gambling
 {
-    public partial class BlackJackCommands : GamblingSubmodule<BlackJackService>
+    public partial class BlackJackCommands : GamblingModule<BlackJackService>
     {
         public enum BjAction
         {

src/EllieBot/Modules/Gambling/Connect4/Connect4Commands.cs

@@ -9,7 +9,7 @@ namespace EllieBot.Modules.Gambling;
 public partial class Gambling
 {
     [Group]
-    public partial class Connect4Commands : GamblingSubmodule<GamblingService>
+    public partial class Connect4Commands : GamblingModule<GamblingService>
     {
         private static readonly string[] _numbers =
         [

src/EllieBot/Modules/Gambling/Draw/DrawCommands.cs

@@ -12,7 +12,7 @@ namespace EllieBot.Modules.Gambling;
 public partial class Gambling
 {
     [Group]
-    public partial class DrawCommands : GamblingSubmodule<IGamblingService>
+    public partial class DrawCommands : GamblingModule<IGamblingService>
     {
         private static readonly ConcurrentDictionary<IGuild, Deck> _allDecks = new();
         private readonly IImageCache _images;

src/EllieBot/Modules/Gambling/Events/CurrencyEventsCommands.cs

@@ -9,7 +9,7 @@ namespace EllieBot.Modules.Gambling;
 public partial class Gambling
 {
     [Group]
-    public partial class CurrencyEventsCommands : GamblingSubmodule<CurrencyEventsService>
+    public partial class CurrencyEventsCommands : GamblingModule<CurrencyEventsService>
     {
         public CurrencyEventsCommands(GamblingConfigService gamblingConf)
             : base(gamblingConf)

src/EllieBot/Modules/Gambling/FlipCoin/FlipCoinCommands.cs

@@ -11,7 +11,7 @@ namespace EllieBot.Modules.Gambling;
 public partial class Gambling
 {
     [Group]
-    public partial class FlipCoinCommands : GamblingSubmodule<IGamblingService>
+    public partial class FlipCoinCommands : GamblingModule<IGamblingService>
     {
         public enum BetFlipGuess : byte
         {

src/EllieBot/Modules/Gambling/Gambling.cs

@@ -38,6 +38,7 @@ public partial class Gambling : GamblingModule<GamblingService>
     private readonly IRemindService _remind;
     private readonly GamblingTxTracker _gamblingTxTracker;
     private readonly IPatronageService _ps;
+    private readonly RakebackService _rb;
 
     public Gambling(
         IGamblingService gs,
@@ -50,7 +51,8 @@ public partial class Gambling : GamblingModule<GamblingService>
         IBankService bank,
         IRemindService remind,
         IPatronageService patronage,
-        GamblingTxTracker gamblingTxTracker)
+        GamblingTxTracker gamblingTxTracker,
+        RakebackService rb)
         : base(configService)
     {
         _gs = gs;
@@ -60,6 +62,7 @@ public partial class Gambling : GamblingModule<GamblingService>
         _bank = bank;
         _remind = remind;
         _gamblingTxTracker = gamblingTxTracker;
+        _rb = rb;
         _ps = patronage;
         _rng = new EllieRandom();
 
@@ -77,100 +80,6 @@ public partial class Gambling : GamblingModule<GamblingService>
         return N(bal);
     }
 
-    [Cmd]
-    [Priority(3)]
-    public async Task BetStats()
-        => await BetStats(ctx.User, null);
-
-    [Cmd]
-    [Priority(2)]
-    public async Task BetStats(GamblingGame game)
-        => await BetStats(ctx.User, game);
-
-    [Cmd]
-    [Priority(1)]
-    public async Task BetStats([Leftover] IUser user)
-        => await BetStats(user, null);
-
-    [Cmd]
-    [Priority(0)]
-    public async Task BetStats(IUser user, GamblingGame? game)
-    {
-        var stats = await _gamblingTxTracker.GetUserStatsAsync(user.Id, game);
-
-        if (stats.Count == 0)
-            stats = new()
-            {
-                new()
-                {
-                    TotalBet = 1
-                }
-            };
-
-        var eb = _sender.CreateEmbed()
-                        .WithOkColor()
-                        .WithAuthor(user)
-                        .AddField("Total Won", N(stats.Sum(x => x.PaidOut)), true)
-                        .AddField("Biggest Win", N(stats.Max(x => x.MaxWin)), true)
-                        .AddField("Biggest Bet", N(stats.Max(x => x.MaxBet)), true)
-                        .AddField("# Bets", stats.Sum(x => x.WinCount + x.LoseCount), true)
-                        .AddField("Payout",
-                            (stats.Sum(x => x.PaidOut) / stats.Sum(x => x.TotalBet)).ToString("P2", Culture),
-                            true);
-        if (game == null)
-        {
-            var favGame = stats.MaxBy(x => x.WinCount + x.LoseCount);
-            eb.AddField("Favorite Game",
-                favGame.Game + "\n" + Format.Italics((favGame.WinCount + favGame.LoseCount) + " plays"),
-                true);
-        }
-        else
-        {
-            eb.WithDescription(game.ToString())
-              .AddField("# Wins", stats.Sum(x => x.WinCount), true);
-        }
-
-        await Response()
-              .Embed(eb)
-              .SendAsync();
-    }
-
-    [Cmd]
-    public async Task GambleStats()
-    {
-        var stats = await _gamblingTxTracker.GetAllAsync();
-
-        var eb = _sender.CreateEmbed()
-                        .WithOkColor();
-
-        var str = "` Feature `｜`   Bet  `｜`Paid Out`｜`  RoI  `\n";
-        str += "――――――――――――――――――――\n";
-        foreach (var stat in stats)
-        {
-            var perc = (stat.PaidOut / stat.Bet).ToString("P2", Culture);
-            str += $"`{stat.Feature.PadBoth(9)}`"
-                   + $"｜`{stat.Bet.ToString("N0").PadLeft(8, ' ')}`"
-                   + $"｜`{stat.PaidOut.ToString("N0").PadLeft(8, ' ')}`"
-                   + $"｜`{perc.PadLeft(6, ' ')}`\n";
-        }
-
-        var bet = stats.Sum(x => x.Bet);
-        var paidOut = stats.Sum(x => x.PaidOut);
-
-        if (bet == 0)
-            bet = 1;
-
-        var tPerc = (paidOut / bet).ToString("P2", Culture);
-        str += "――――――――――――――――――――\n";
-        str += $"` {("TOTAL").PadBoth(7)}` "
-               + $"｜**{N(bet).PadLeft(8, ' ')}**"
-               + $"｜**{N(paidOut).PadLeft(8, ' ')}**"
-               + $"｜`{tPerc.PadLeft(6, ' ')}`";
-
-        eb.WithDescription(str);
-
-        await Response().Embed(eb).SendAsync();
-    }
 
     private async Task RemindTimelyAction(SocketMessageComponent smc, DateTime when)
     {
@@ -318,7 +227,6 @@ public partial class Gambling : GamblingModule<GamblingService>
 
 
         var val = Config.Timely.Amount;
-
         var boostGuilds = Config.BoostBonus.GuildIds ?? new();
         var guildUsers = await boostGuilds
                                .Select(async gid =>
@@ -352,11 +260,16 @@ public partial class Gambling : GamblingModule<GamblingService>
 
         await _cs.AddAsync(ctx.User.Id, val, new("timely", "claim"));
 
-        if (booster)
+        var msg = GetText(strs.timely(N(val), period));
+        if (booster || percentBonus > float.Epsilon)
         {
-            var msg = GetText(strs.timely(N(val), period))
-                      + "\n\n"
-                      + $"*+{N(Config.BoostBonus.BaseTimelyBonus)} bonus for boosting {userInfo.guild}!*";
+            msg += "\n\n";
+            if (booster)
+                msg += $"*+{N(Config.BoostBonus.BaseTimelyBonus)} bonus for boosting {userInfo.guild}!*\n";
+
+            if (percentBonus > float.Epsilon)
+                msg +=
+                    $"*+{percentBonus:P0} bonus for the [Patreon](https://patreon.com/elliebot) pledge! <:hart:746995901758832712>*";
 
             await Response().Confirm(msg).Interaction(inter).SendAsync();
         }
@@ -1089,4 +1002,45 @@ public partial class Gambling : GamblingModule<GamblingService>
                   footer: $"Total Bet: {tests} | Payout: {payout:F0} | {payout * 1.0M / tests * 100}%")
               .SendAsync();
     }
+
+    private EllieInteractionBase CreateRakebackInteraction()
+        => _inter.Create(ctx.User.Id,
+            new ButtonBuilder(
+                customId: "cash:rakeback",
+                emote: new Emoji("💸")),
+            RakebackAction);
+
+    private async Task RakebackAction(SocketMessageComponent arg)
+    {
+        var rb = await _rb.ClaimRakebackAsync(ctx.User.Id);
+
+        if (rb == 0)
+        {
+            await arg.DeferAsync();
+            return;
+        }
+
+        await arg.RespondAsync(_sender, GetText(strs.rakeback_claimed(N(rb))), MsgType.Ok);
+    }
+
+    [Cmd]
+    public async Task Rakeback()
+    {
+        var rb = await _rb.GetRakebackAsync(ctx.User.Id);
+
+        if (rb < 1)
+        {
+            await Response()
+                  .Error(strs.rakeback_none)
+                  .SendAsync();
+
+            return;
+        }
+
+        var inter = CreateRakebackInteraction();
+        await Response()
+              .Pending(strs.rakeback_available(N(rb)))
+              .Interaction(inter)
+              .SendAsync();
+    }
 }

src/EllieBot/Modules/Gambling/GamblingConfig.cs

@@ -11,7 +11,7 @@ namespace EllieBot.Modules.Gambling.Common;
 public sealed partial class GamblingConfig : ICloneable<GamblingConfig>
 {
     [Comment("""DO NOT CHANGE""")]
-    public int Version { get; set; } = 11;
+    public int Version { get; set; } = 12;
 
     [Comment("""Currency settings""")]
     public CurrencyConfig Currency { get; set; }
@@ -164,7 +164,7 @@ public partial class BetRollConfig
             },
             new()
             {
-                WhenAbove = 66,
+                WhenAbove = 65,
                 MultiplyBy = 2
             }
         ];
@@ -226,7 +226,7 @@ public partial class LuckyLadderSettings
     public decimal[] Multipliers { get; set; }
 
     public LuckyLadderSettings()
-        => Multipliers = [2.4M, 1.7M, 1.5M, 1.2M, 0.5M, 0.3M, 0.2M, 0.1M];
+        => Multipliers = [2.4M, 1.7M, 1.5M, 1.1M, 0.5M, 0.3M, 0.2M, 0.1M];
 }
 
 [Cloneable]

src/EllieBot/Modules/Gambling/GamblingConfigService.cs

@@ -189,11 +189,16 @@ public sealed class GamblingConfigService : ConfigServiceBase<GamblingConfig>
             });
         }
 
-        if (data.Version < 11)
+        if (data.Version < 12)
         {
             ModifyConfig(c =>
             {
-                c.Version = 11;
+                c.Version = 12;
+
+                if (c.BetRoll.Pairs.Length == 3 && c.BetRoll.Pairs[2].WhenAbove == 66)
+                {
+                    c.BetRoll.Pairs[2].WhenAbove = 65;
+                }
             });
         }
     }

src/EllieBot/Modules/Gambling/GamblingTopLevelModule.cs

@@ -58,11 +58,3 @@ public abstract class GamblingModule<TService> : EllieModule<TService>
         return InternalCheckBet(amount);
     }
 }
-
-public abstract class GamblingSubmodule<TService> : GamblingModule<TService>
-{
-    protected GamblingSubmodule(GamblingConfigService gamblingConfService)
-        : base(gamblingConfService)
-    {
-    }
-}

src/EllieBot/Modules/Gambling/PlantPick/PlantAndPickCommands.cs

@@ -8,7 +8,7 @@ namespace EllieBot.Modules.Gambling;
 public partial class Gambling
 {
     [Group]
-    public partial class PlantPickCommands : GamblingSubmodule<PlantPickService>
+    public partial class PlantPickCommands : GamblingModule<PlantPickService>
     {
         private readonly ILogCommandService _logService;
 

src/EllieBot/Modules/Gambling/Shop/ShopCommands.cs

@@ -10,7 +10,7 @@ namespace EllieBot.Modules.Gambling;
 public partial class Gambling
 {
     [Group]
-    public partial class ShopCommands : GamblingSubmodule<IShopService>
+    public partial class ShopCommands : GamblingModule<IShopService>
     {
         public enum List
         {

src/EllieBot/Modules/Gambling/Slot/SlotCommands.cs

@@ -21,7 +21,7 @@ public enum GamblingError
 public partial class Gambling
 {
     [Group]
-    public partial class SlotCommands : GamblingSubmodule<IGamblingService>
+    public partial class SlotCommands : GamblingModule<IGamblingService>
     {
         private readonly IImageCache _images;
         private readonly FontProvider _fonts;

src/EllieBot/Modules/Gambling/UserBetStatsService.cs

@@ -0,0 +1,55 @@
+#nullable disable
+using LinqToDB;
+using LinqToDB.EntityFrameworkCore;
+using EllieBot.Db.Models;
+
+namespace EllieBot.Modules.Gambling.Services;
+
+public sealed class UserBetStatsService : IEService
+{
+    private const long RESET_MIN_PRICE = 1000;
+    private const decimal RESET_TOTAL_MULTIPLIER = 0.002m;
+
+    private readonly DbService _db;
+    private readonly ICurrencyService _cs;
+
+    public UserBetStatsService(DbService db, ICurrencyService cs)
+    {
+        _db = db;
+        _cs = cs;
+    }
+
+    public async Task<long> GetResetStatsPriceAsync(ulong userId, GamblingGame? game)
+    {
+        await using var ctx = _db.GetDbContext();
+
+        var totalBet = await ctx.GetTable<UserBetStats>()
+                                .Where(x => x.UserId == userId && (game == null || x.Game == game))
+                                .SumAsyncLinqToDB(x => x.TotalBet);
+
+        return Math.Max(RESET_MIN_PRICE, (long)Math.Ceiling(totalBet * RESET_TOTAL_MULTIPLIER));
+    }
+
+    public async Task<bool> ResetStatsAsync(ulong userId, GamblingGame? game)
+    {
+        var price = await GetResetStatsPriceAsync(userId, game);
+
+        if (!await _cs.RemoveAsync(userId, price, new("betstats", "reset")))
+        {
+            return false;
+        }
+
+        await using var ctx = _db.GetDbContext();
+        await ctx.GetTable<UserBetStats>()
+                 .DeleteAsync(x => x.UserId == userId && (game == null || x.Game == game));
+
+        return true;
+    }
+
+    public async Task ResetGamblingStatsAsync()
+    {
+        await using var ctx = _db.GetDbContext();
+        await ctx.GetTable<GamblingStats>()
+                 .DeleteAsync();
+    }
+}

src/EllieBot/Modules/Gambling/Waifus/WaifuClaimCommands.cs

@@ -10,7 +10,7 @@ namespace EllieBot.Modules.Gambling;
 public partial class Gambling
 {
     [Group]
-    public partial class WaifuClaimCommands : GamblingSubmodule<WaifuService>
+    public partial class WaifuClaimCommands : GamblingModule<WaifuService>
     {
         public WaifuClaimCommands(GamblingConfigService gamblingConfService)
             : base(gamblingConfService)
@@ -37,6 +37,45 @@ public partial class Gambling
             await Response().Error(strs.waifu_reset_fail).SendAsync();
         }
 
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        public async Task WaifuClaims()
+        {
+            await Response()
+                  .Paginated()
+                  .PageItems(async (page) => await _service.GetClaimsAsync(ctx.User.Id, page))
+                  .Page((items, page) =>
+                  {
+                      var eb = _sender.CreateEmbed()
+                                      .WithOkColor()
+                                      .WithTitle("Waifus");
+
+                      if (items.Count == 0)
+                      {
+                          eb
+                              .WithPendingColor()
+                              .WithDescription(GetText(strs.empty_page));
+
+                          return eb;
+                      }
+
+                      for (var i = 0; i < items.Count; i++)
+                      {
+                          var item = items[i];
+                          eb.AddField($"`#{(page * 9) + 1 + i}`  {N(item.Price)}",
+                              $"""
+                               {item.Username}
+                               ||{item.UserId}||
+                               """,
+                              true
+                          );
+                      }
+
+                      return eb;
+                  })
+                  .SendAsync();
+        }
+
         [Cmd]
         [RequireContext(ContextType.Guild)]
         public async Task WaifuClaim(long amount, [Leftover] IUser target)
@@ -144,7 +183,7 @@ public partial class Gambling
             if (targetId == ctx.User.Id)
                 return;
 
-            var (w, result, amount, remaining) = await _service.DivorceWaifuAsync(ctx.User, targetId);
+            var (w, result, amount) = await _service.DivorceWaifuAsync(ctx.User, targetId);
 
             if (result == DivorceResult.SucessWithPenalty)
             {
@@ -157,14 +196,6 @@ public partial class Gambling
                 await Response().Confirm(strs.waifu_divorced_notlike(N(amount))).SendAsync();
             else if (result == DivorceResult.NotYourWife)
                 await Response().Error(strs.waifu_not_yours).SendAsync();
-            else if (remaining is { } rem)
-            {
-                await Response()
-                      .Error(strs.waifu_recent_divorce(
-                          Format.Bold(((int)rem.TotalHours).ToString()),
-                          Format.Bold(rem.Minutes.ToString())))
-                      .SendAsync();
-            }
         }
 
         [Cmd]

src/EllieBot/Modules/Gambling/Waifus/WaifuService.cs

@@ -318,25 +318,20 @@ public class WaifuService : IEService, IReadyExecutor
     private static TypedKey<long> GetAffinityKey(ulong userId)
         => new($"waifu:affinity:{userId}");
 
-    public async Task<(WaifuInfo, DivorceResult, long, TimeSpan?)> DivorceWaifuAsync(IUser user, ulong targetId)
+    public async Task<(WaifuInfo, DivorceResult, long)> DivorceWaifuAsync(IUser user, ulong targetId)
     {
         DivorceResult result;
-        TimeSpan? remaining = null;
         long amount = 0;
         WaifuInfo w;
         await using (var uow = _db.GetDbContext())
         {
             w = uow.Set<WaifuInfo>().ByWaifuUserId(targetId);
             if (w?.Claimer is null || w.Claimer.UserId != user.Id)
+            {
                 result = DivorceResult.NotYourWife;
+            }
             else
             {
-                remaining = await _cache.GetRatelimitAsync(GetDivorceKey(user.Id), 6.Hours());
-                if (remaining is TimeSpan rem)
-                {
-                    result = DivorceResult.Cooldown;
-                    return (w, result, amount, rem);
-                }
 
                 amount = w.Price / 2;
 
@@ -369,7 +364,7 @@ public class WaifuService : IEService, IReadyExecutor
             await uow.SaveChangesAsync();
         }
 
-        return (w, result, amount, remaining);
+        return (w, result, amount);
     }
 
     public async Task<bool> GiftWaifuAsync(
@@ -630,4 +625,38 @@ public class WaifuService : IEService, IReadyExecutor
                                           .FirstOrDefault())
                         .ToListAsyncEF();
     }
+
+    public async Task<IReadOnlyCollection<WaifuClaimsResult>> GetClaimsAsync(ulong userId, int page)
+    {
+        await using var ctx = _db.GetDbContext();
+
+        var wid = ctx.GetTable<DiscordUser>()
+                     .Where(x => x.UserId == userId)
+                     .Select(x => x.Id)
+                     .FirstOrDefault();
+
+        if (wid == 0)
+            return [];
+
+        return await ctx.GetTable<WaifuInfo>()
+                        .Where(x => x.ClaimerId == wid)
+                        .LeftJoin(ctx.GetTable<DiscordUser>(),
+                            (wi, du) => wi.WaifuId == du.Id,
+                            (wi, du) => new WaifuClaimsResult(
+                                du.Username,
+                                du.UserId,
+                                wi.Price
+                            ))
+                        .OrderByDescending(x => x.Price)
+                        .Skip(page * 9)
+                        .Take(9)
+                        .ToListAsyncLinqToDB();
+    }
+}
+
+public sealed class WaifuClaimsResult(string username, ulong userId, long price)
+{
+    public string Username { get; } = username;
+    public ulong UserId { get; } = userId;
+    public long Price { get; } = price;
 }

src/EllieBot/Modules/Gambling/_common/IGamblingService.cs

@@ -13,5 +13,10 @@ public interface IGamblingService
     Task<OneOf<SlotResult, GamblingError>> SlotAsync(ulong userId, long amount);
     Task<FlipResult[]> FlipAsync(int count);
     Task<OneOf<RpsResult, GamblingError>> RpsAsync(ulong userId, long amount, byte pick);
-    Task<OneOf<BetdrawResult, GamblingError>> BetDrawAsync(ulong userId, long amount, byte? maybeGuessValue, byte? maybeGuessColor);
+
+    Task<OneOf<BetdrawResult, GamblingError>> BetDrawAsync(
+        ulong userId,
+        long amount,
+        byte? maybeGuessValue,
+        byte? maybeGuessColor);
 }

src/EllieBot/Modules/Gambling/_common/NewGamblingService.cs

@@ -1,4 +1,6 @@
 #nullable disable
+using LinqToDB;
+using LinqToDB.EntityFrameworkCore;
 using EllieBot.Modules.Gambling.Betdraw;
 using EllieBot.Modules.Gambling.Rps;
 using EllieBot.Modules.Gambling.Services;
@@ -8,12 +10,12 @@ namespace EllieBot.Modules.Gambling;
 
 public sealed class NewGamblingService : IGamblingService, IEService
 {
-    private readonly GamblingConfigService _bcs;
+    private readonly GamblingConfigService _gcs;
     private readonly ICurrencyService _cs;
 
-    public NewGamblingService(GamblingConfigService bcs, ICurrencyService cs)
+    public NewGamblingService(GamblingConfigService gcs, ICurrencyService cs)
     {
-        _bcs = bcs;
+        _gcs = gcs;
         _cs = cs;
     }
 
@@ -31,7 +33,7 @@ public sealed class NewGamblingService : IGamblingService, IEService
             }
         }
 
-        var game = new LulaGame(_bcs.Data.LuckyLadder.Multipliers);
+        var game = new LulaGame(_gcs.Data.LuckyLadder.Multipliers);
         var result = game.Spin(amount);
 
         var won = (long)result.Won;
@@ -57,7 +59,7 @@ public sealed class NewGamblingService : IGamblingService, IEService
             }
         }
 
-        var game = new BetrollGame(_bcs.Data.BetRoll.Pairs
+        var game = new BetrollGame(_gcs.Data.BetRoll.Pairs
                                        .Select(x => (x.WhenAbove, (decimal)x.MultiplyBy))
                                        .ToList());
 
@@ -88,7 +90,7 @@ public sealed class NewGamblingService : IGamblingService, IEService
             }
         }
 
-        var game = new BetflipGame(_bcs.Data.BetFlip.Multiplier);
+        var game = new BetflipGame(_gcs.Data.BetFlip.Multiplier);
         var result = game.Flip(guess, amount);
 
         var won = (long)result.Won;
@@ -100,7 +102,11 @@ public sealed class NewGamblingService : IGamblingService, IEService
         return result;
     }
 
-    public async Task<OneOf<BetdrawResult, GamblingError>> BetDrawAsync(ulong userId, long amount, byte? maybeGuessValue, byte? maybeGuessColor)
+    public async Task<OneOf<BetdrawResult, GamblingError>> BetDrawAsync(
+        ulong userId,
+        long amount,
+        byte? maybeGuessValue,
+        byte? maybeGuessColor)
     {
         ArgumentOutOfRangeException.ThrowIfNegative(amount);
 
@@ -266,3 +272,45 @@ public sealed class NewGamblingService : IGamblingService, IEService
         return result;
     }
 }
+
+public sealed class RakebackService : IEService
+{
+    private readonly DbService _db;
+    private readonly ICurrencyService _cs;
+
+    public RakebackService(DbService db, ICurrencyService cs)
+    {
+        _db = db;
+        _cs = cs;
+    }
+
+    public async Task<long> GetRakebackAsync(ulong userId)
+    {
+        await using var uow = _db.GetDbContext();
+
+        var rb = uow.GetTable<Rakeback>()
+            .Where(x => x.UserId == userId)
+            .Select(x => x.Amount)
+            .FirstOrDefault();
+
+        return (long)rb;
+    }
+
+    public async Task<long> ClaimRakebackAsync(ulong userId)
+    {
+        await using var uow = _db.GetDbContext();
+
+        var rbs = await uow.GetTable<Rakeback>()
+                          .Where(x => x.UserId == userId)
+                          .DeleteWithOutputAsync((x) => x.Amount);
+
+        if (rbs.Length == 0)
+            return 0;
+
+        var rb = (long)rbs[0];
+
+        await _cs.AddAsync(userId, rb, new("rakeback", "claim"));
+
+        return rb;
+    }
+}

src/EllieBot/Modules/Patronage/CurrencyRewardService.cs

@@ -122,11 +122,11 @@ public sealed class CurrencyRewardService : IEService, IReadyExecutor
         var dollarValue = pledgeCents / 100;
         percentBonus = dollarValue switch
         {
-            >= 100 => 20,
-            >= 50 => 10,
-            >= 20 => 5,
-            >= 10 => 3,
-            >= 5 => 1,
+            >= 100 => 25,
+            >= 50 => 20,
+            >= 20 => 15,
+            >= 10 => 10,
+            >= 5 => 5,
             _ => 0
         };
         return (long)(modifiedAmount * (1 + (percentBonus / 100.0f)));

src/EllieBot/Modules/Patronage/PatronageService.cs

@@ -404,9 +404,9 @@ public sealed class PatronageService
         {
             >= 10_000 => 100,
             >= 5000 => 50,
-            >= 2000 => 20,
-            >= 1000 => 10,
-            >= 500 => 5,
+            >= 2000 => 30,
+            >= 1000 => 20,
+            >= 500 => 10,
             _ => 0
         };
 

src/EllieBot/Modules/Permissions/Blacklist/BlacklistCommands.cs

@@ -18,13 +18,13 @@ public partial class Permissions
         {
             ArgumentOutOfRangeException.ThrowIfNegative(page);
 
-            var list = _service.GetBlacklist();
-            var allItems = await list.Where(x => x.Type == type)
+            var list = await _service.GetBlacklist(type);
+            var allItems = await list
                                  .Select(i =>
                                  {
                                      try
                                      {
-                                          return Task.FromResult(i.Type switch
+                                         return Task.FromResult(type switch
                                          {
                                              BlacklistType.Channel => Format.Code(i.ItemId.ToString())
                                                                       + " "

src/EllieBot/Modules/Utility/Utility.cs

@@ -783,4 +783,28 @@ public partial class Utility : EllieModule
             await Response().Error(ex.Message).SendAsync();
         }
     }
+
+    [Cmd]
+    public async Task Snipe()
+    {
+        if (ctx.Message.ReferencedMessage is not { } msg)
+        {
+            var msgs = await ctx.Channel.GetMessagesAsync(ctx.Message, Direction.Before, 3).FlattenAsync();
+            msg = msgs.FirstOrDefault(x => !string.IsNullOrWhiteSpace(x.Content) || (x.Attachments.FirstOrDefault()?.Width is not null)) as IUserMessage;
+
+            if (msg is null)
+                return;
+        }
+
+        var eb = _sender.CreateEmbed()
+                        .WithOkColor()
+                        .WithDescription(msg.Content)
+                        .WithAuthor(msg.Author)
+                        .WithTimestamp(msg.Timestamp)
+                        .WithImageUrl(msg.Attachments.FirstOrDefault()?.Url)
+                        .WithFooter(GetText(strs.sniped_by(ctx.User.ToString())), ctx.User.GetDisplayAvatarUrl());
+
+        ctx.Message.DeleteAfter(1);
+        await Response().Embed(eb).SendAsync();
+    }
 }

src/EllieBot/Services/GrpcApi/XpSvc.cs

@@ -159,14 +159,14 @@ public class XpSvc : GrpcXp.GrpcXpBase, IGrpcSvc, IEService
             _xp.SetRoleReward(request.GuildId, request.Level, rid, request.Type == "RemoveRole");
             success = true;
         }
-        else if (request.Type == "Currency")
-        {
-            if (!int.TryParse(request.Value, out var amount))
-                throw new RpcException(new Status(StatusCode.InvalidArgument, "Invalid amount"));
-
-            _xp.SetCurrencyReward(request.GuildId, request.Level, amount);
-            success = true;
-        }
+        // else if (request.Type == "Currency")
+        // {
+        //     if (!int.TryParse(request.Value, out var amount))
+        //         throw new RpcException(new Status(StatusCode.InvalidArgument, "Invalid amount"));
+        //
+        //     _xp.SetCurrencyReward(request.GuildId, request.Level, amount);
+        //     success = true;
+        // }
 
         return new()
         {

src/EllieBot/_common/Abstractions/Extensions/SelfAssignableRolesExtensions.cs

@@ -1,5 +1,4 @@
-#nullable disable
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using EllieBot.Db.Models;
 
 namespace EllieBot.Db;
@@ -17,6 +16,8 @@ public static class SelfAssignableRolesExtensions
         return true;
     }
 
-    public static IReadOnlyCollection<SelfAssignedRole> GetFromGuild(this DbSet<SelfAssignedRole> roles, ulong guildId)
+    public static IReadOnlyCollection<SelfAssignedRole> GetFromGuild(
+        this DbSet<SelfAssignedRole> roles,
+        ulong guildId)
         => roles.AsQueryable().Where(s => s.GuildId == guildId).ToArray();
 }

src/EllieBot/_common/Gambling/Slot/SlotGame.cs

@@ -11,9 +11,9 @@ public class SlotGame
     {
         var rolls = new[]
         {
-            (byte)_rng.Next(0, 6),
-            (byte)_rng.Next(0, 6),
-            (byte)_rng.Next(0, 6)
+            (byte)_rng.Next(0, 7),
+            (byte)_rng.Next(0, 7),
+            (byte)_rng.Next(0, 7)
         };
 
         ref var a = ref rolls[0];
@@ -24,24 +24,24 @@ public class SlotGame
         var winType = SlotWinType.None;
         if (a == b && b == c)
         {
-            if (a == 5)
+            if (a == 6)
             {
                 winType = SlotWinType.TrippleJoker;
-                multi = 30;
+                multi = 25;
             }
             else
             {
                 winType = SlotWinType.TrippleNormal;
-                multi = 10;
+                multi = 15;
             }
         }
-        else if (a == 5 && (b == 5 || c == 5)
-                 || (b == 5 && c == 5))
+        else if (a == 6 && (b == 6 || c == 6)
+                 || (b == 6 && c == 6))
         {
             winType = SlotWinType.DoubleJoker;
-            multi = 4;
+            multi = 6;
         }
-        else if (a == 5 || b == 5 || c == 5)
+        else if (a == 6 || b == 6 || c == 6)
         {
             winType = SlotWinType.SingleJoker;
             multi = 1;

src/EllieBot/_common/ImageUrls.cs

@@ -8,7 +8,7 @@ namespace EllieBot.Common;
 public partial class ImageUrls : ICloneable<ImageUrls> 
 {
     [Comment("DO NOT CHANGE")]
-    public int Version { get; set; } = 5;
+    public int Version { get; set; } = 6;
 
     public CoinData Coins { get; set; }
     public Uri[] Currency { get; set; }

src/EllieBot/_common/Replacements/Impl/ReplacementRegistrator.default.cs

@@ -12,7 +12,11 @@ public sealed partial class ReplacementPatternStore
     {
         Register("%bot.time%",
             static ()
-                => DateTime.Now.ToString("HH:mm " + TimeZoneInfo.Local.StandardName.GetInitials()));
+                => TimestampTag.FromDateTime(DateTime.UtcNow, TimestampTagStyles.ShortTime).ToString());
+
+        Register("%bot.date%",
+            static ()
+            => TimestampTag.FromDateTime(DateTime.UtcNow, TimestampTagStyles.ShortTime).ToString());
     }
 
     private void WithClient()

src/EllieBot/_common/Services/CommandHandler.cs

@@ -165,7 +165,7 @@ public class CommandHandler : IEService, IReadyExecutor, ICommandHandler
             Log.Information("Succ | g:{GuildId} | c: {ChannelId} | u: {UserId} | msg: {Message}",
                 channel?.Guild.Id.ToString() ?? "-",
                 channel?.Id.ToString() ?? "-",
-                usrMsg.Author.Id,
+                usrMsg.Author.Id.ToString(),
                 usrMsg.Content.TrimTo(10));
         }
 

src/EllieBot/_common/Services/Currency/GamblingTxTracker.cs

@@ -4,6 +4,7 @@ using LinqToDB.EntityFrameworkCore;
 using EllieBot.Common.ModuleBehaviors;
 using EllieBot.Services.Currency;
 using EllieBot.Db.Models;
+using EllieBot.Modules.Gambling;
 using System.Collections.Concurrent;
 
 namespace EllieBot.Services;
@@ -88,6 +89,10 @@ public sealed class GamblingTxTracker : ITxTracker, IEService, IReadyExecutor
                 if (users.Count == 0)
                     continue;
 
+                // rakeback
+                var rakebacks = new Dictionary<ulong, decimal>();
+
+                // update userstats
                 foreach (var (k, x) in users.GroupBy(x => (x.UserId, x.Game))
                                             .ToDictionary(x => x.Key,
                                                 x => x.Aggregate((a, b) => new()
@@ -100,6 +105,10 @@ public sealed class GamblingTxTracker : ITxTracker, IEService, IReadyExecutor
                                                     MaxWin = Math.Max(a.MaxWin, b.MaxWin),
                                                 })))
                 {
+                    rakebacks.TryAdd(k.UserId, 0m);
+                    rakebacks[k.UserId] += x.TotalBet * GetHouseEdge(k.Game) * BASE_RAKEBACK;
+
+
                     // bulk upsert in the future
                     await using var uow = _db.GetDbContext();
                     await uow.GetTable<UserBetStats>()
@@ -129,6 +138,25 @@ public sealed class GamblingTxTracker : ITxTracker, IEService, IReadyExecutor
                                      Game = k.Game
                                  });
                 }
+
+                foreach (var (k, v) in rakebacks)
+                {
+                    await _db.GetDbContext()
+                             .GetTable<Rakeback>()
+                             .InsertOrUpdateAsync(() => new()
+                             {
+                                 UserId = k,
+                                 Amount = v
+                             },
+                                 (old) => new()
+                                 {
+                                     Amount = old.Amount + v
+                                 },
+                                 () => new()
+                                 {
+                                     UserId = k
+                                 });
+                }
             }
             catch (Exception ex)
             {
@@ -137,6 +165,8 @@ public sealed class GamblingTxTracker : ITxTracker, IEService, IReadyExecutor
         }
     }
 
+    private const decimal BASE_RAKEBACK = 0.05m;
+
     public Task TrackAdd(ulong userId, long amount, TxData? txData)
     {
         if (txData is null)
@@ -275,6 +305,21 @@ public sealed class GamblingTxTracker : ITxTracker, IEService, IReadyExecutor
                      .Where(x => x.UserId == userId && x.Game == game)
                      .ToListAsync();
     }
+
+    public decimal GetHouseEdge(GamblingGame game)
+        => game switch
+        {
+            GamblingGame.Betflip => 0.025m,
+            GamblingGame.Betroll => 0.04m,
+            GamblingGame.Betdraw => 0.04m,
+            GamblingGame.Slots => 0.034m,
+            GamblingGame.Blackjack => 0.02m,
+            GamblingGame.Lula => 0.025m,
+            GamblingGame.Race => 0.06m,
+            _ => 0
+        };
+
+
 }
 
 public sealed class UserBetStats
@@ -306,3 +351,9 @@ public enum GamblingGame
     Race = 6,
     AnimalRace = 6
 }
+
+public sealed class Rakeback
+{
+    public ulong UserId { get; set; }
+    public decimal Amount { get; set; }
+}

src/EllieBot/_common/Services/Impl/BlacklistService.cs

@@ -1,13 +1,13 @@
-#nullable disable
 using LinqToDB;
 using LinqToDB.Data;
 using LinqToDB.EntityFrameworkCore;
 using EllieBot.Common.ModuleBehaviors;
 using EllieBot.Db.Models;
+using System.Collections.Frozen;
 
 namespace EllieBot.Modules.Permissions.Services;
 
-public sealed class BlacklistService : IExecOnMessage
+public sealed class BlacklistService : IExecOnMessage, IReadyExecutor
 {
     public int Priority
         => int.MaxValue;
@@ -15,69 +15,114 @@ public sealed class BlacklistService : IExecOnMessage
     private readonly DbService _db;
     private readonly IPubSub _pubSub;
     private readonly IBotCreds _creds;
-    private IReadOnlyList<BlacklistEntry> blacklist;
+    private readonly DiscordSocketClient _client;
 
-    private readonly TypedKey<BlacklistEntry[]> _blPubKey = new("blacklist.reload");
+    private FrozenSet<ulong> blacklistedGuilds = new HashSet<ulong>().ToFrozenSet();
+    private FrozenSet<ulong> blacklistedUsers = new HashSet<ulong>().ToFrozenSet();
+    private FrozenSet<ulong> blacklistedChannels = new HashSet<ulong>().ToFrozenSet();
 
-    public BlacklistService(DbService db, IPubSub pubSub, IBotCreds creds)
+    private readonly TypedKey<bool> _blPubKey = new("blacklist.reload");
+
+    public BlacklistService(
+        DbService db,
+        IPubSub pubSub,
+        IBotCreds creds,
+        DiscordSocketClient client)
     {
         _db = db;
         _pubSub = pubSub;
         _creds = creds;
+        _client = client;
 
-        Reload(false);
-        _pubSub.Sub(_blPubKey, OnReload);
+        _pubSub.Sub(_blPubKey, async _ => await Reload(false));
+    }
+
+    public async Task OnReadyAsync()
+    {
+        _client.JoinedGuild += async (g) =>
+        {
+            if (blacklistedGuilds.Contains(g.Id))
+            {
+                await g.LeaveAsync();
+            }
+        };
+
+        await Reload(false);
     }
 
     private ValueTask OnReload(BlacklistEntry[] newBlacklist)
     {
-        blacklist = newBlacklist;
+        newBlacklist ??= [];
+
+        blacklistedGuilds =
+            new HashSet<ulong>(newBlacklist.Where(x => x.Type == BlacklistType.Server).Select(x => x.ItemId))
+                .ToFrozenSet();
+        blacklistedChannels =
+            new HashSet<ulong>(newBlacklist.Where(x => x.Type == BlacklistType.Channel).Select(x => x.ItemId))
+                .ToFrozenSet();
+        blacklistedUsers =
+            new HashSet<ulong>(newBlacklist.Where(x => x.Type == BlacklistType.User).Select(x => x.ItemId))
+                .ToFrozenSet();
+
         return default;
     }
 
-    public Task<bool> ExecOnMessageAsync(IGuild guild, IUserMessage usrMsg)
+    public Task<bool> ExecOnMessageAsync(IGuild? guild, IUserMessage usrMsg)
     {
-        foreach (var bl in blacklist)
+        if (guild is not null && blacklistedGuilds.Contains(guild.Id))
         {
-            if (guild is not null && bl.Type == BlacklistType.Server && bl.ItemId == guild.Id)
-            {
-                Log.Information("Blocked input from blacklisted guild: {GuildName} [{GuildId}]", guild.Name, guild.Id);
-
+            Log.Information("Blocked input from blacklisted guild: {GuildName} [{GuildId}]",
+                guild.Name,
+                guild.Id.ToString());
             return Task.FromResult(true);
         }
 
-            if (bl.Type == BlacklistType.Channel && bl.ItemId == usrMsg.Channel.Id)
+        if (blacklistedChannels.Contains(usrMsg.Channel.Id))
         {
             Log.Information("Blocked input from blacklisted channel: {ChannelName} [{ChannelId}]",
                 usrMsg.Channel.Name,
-                    usrMsg.Channel.Id);
-
-                return Task.FromResult(true);
+                usrMsg.Channel.Id.ToString());
         }
 
-            if (bl.Type == BlacklistType.User && bl.ItemId == usrMsg.Author.Id)
+
+        if (blacklistedUsers.Contains(usrMsg.Author.Id))
         {
             Log.Information("Blocked input from blacklisted user: {UserName} [{UserId}]",
                 usrMsg.Author.ToString(),
-                    usrMsg.Author.Id);
-
+                usrMsg.Author.Id.ToString());
             return Task.FromResult(true);
         }
-        }
 
         return Task.FromResult(false);
     }
 
-    public IReadOnlyList<BlacklistEntry> GetBlacklist()
-        => blacklist;
-
-    public void Reload(bool publish = true)
+    public async Task<IReadOnlyList<BlacklistEntry>> GetBlacklist(BlacklistType type)
     {
-        using var uow = _db.GetDbContext();
-        var toPublish = uow.GetTable<BlacklistEntry>().ToArray();
-        blacklist = toPublish;
+        await using var uow = _db.GetDbContext();
+
+        return await uow
+                     .GetTable<BlacklistEntry>()
+                     .Where(x => x.Type == type)
+                     .ToListAsync();
+    }
+
+    public async Task Reload(bool publish = true)
+    {
+        var totalShards = _creds.TotalShards;
+        await using var uow = _db.GetDbContext();
+        var items = uow.GetTable<BlacklistEntry>()
+                       .Where(x => x.Type != BlacklistType.Server
+                                   || (x.Type == BlacklistType.Server
+                                       && Linq2DbExpressions.GuildOnShard(x.ItemId, totalShards, _client.ShardId)))
+                       .ToArray();
+
+
         if (publish)
-            _pubSub.Pub(_blPubKey, toPublish);
+        {
+            await _pubSub.Pub(_blPubKey, true);
+        }
+
+        await OnReload(items);
     }
 
     public async Task Blacklist(BlacklistType type, ulong id)
@@ -105,7 +150,7 @@ public sealed class BlacklistService : IExecOnMessage
                      });
         }
 
-        Reload();
+        await Reload();
     }
 
     public async Task UnBlacklist(BlacklistType type, ulong id)
@@ -115,7 +160,7 @@ public sealed class BlacklistService : IExecOnMessage
                  .Where(bi => bi.ItemId == id && bi.Type == type)
                  .DeleteAsync();
 
-        Reload();
+        await Reload();
     }
 
     public async Task BlacklistUsers(IReadOnlyCollection<ulong> toBlacklist)
@@ -136,6 +181,6 @@ public sealed class BlacklistService : IExecOnMessage
                      CurrencyAmount = 0
                  });
 
-        Reload();
+        await Reload();
     }
 }

src/EllieBot/_common/Services/Impl/ImagesConfig.cs

@@ -27,5 +27,22 @@ public sealed class ImagesConfig : ConfigServiceBase<ImageUrls>
                 c.Version = 5;
             });
         }
+
+        if (data.Version < 6)
+        {
+            ModifyConfig(c =>
+            {
+                if (c.Slots.Emojis?.Length == 6)
+                {
+                    c.Slots.Emojis =
+                    [
+                        new("https://cdn.nadeko.bot/slots/15.png"),
+                        ..c.Slots.Emojis
+                    ];
+                }
+
+                c.Version = 6;
+            });
+        }
     }
 }

src/EllieBot/_common/TypeReaders/Models/StoopidTime.cs

@@ -1,5 +1,4 @@
-#nullable disable
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 
 namespace EllieBot.Common.TypeReaders.Models;
 
@@ -9,8 +8,8 @@ public class StoopidTime
         @"^(?:(?<months>\d)mo)?(?:(?<weeks>\d{1,2})w)?(?:(?<days>\d{1,2})d)?(?:(?<hours>\d{1,4})h)?(?:(?<minutes>\d{1,5})m)?(?:(?<seconds>\d{1,6})s)?$",
         RegexOptions.Compiled | RegexOptions.Multiline);
 
-    public string Input { get; set; }
-    public TimeSpan Time { get; set; }
+    public string Input { get; set; } = string.Empty;
+    public TimeSpan Time { get; set; } = default;
 
     private StoopidTime() { }
 
@@ -53,8 +52,8 @@ public class StoopidTime
         };
     }
 
-    public static implicit operator TimeSpan(StoopidTime st)
-        => st.Time;
+    public static implicit operator TimeSpan?(StoopidTime? st)
+        => st?.Time;
 
     public static implicit operator StoopidTime(TimeSpan ts)
         => new()

src/EllieBot/clean-migrations.ps1

@@ -0,0 +1,49 @@
+# WORK IN PROGRESS
+
+# Define the folders to search for designer.cs files
+$folders = @("Migrations/PostgreSql", "Migrations/Sqlite")
+
+# Loop through each folder
+foreach ($folder in $folders) {
+  # Get all designer.cs files in the folder and subfolders
+  $files = Get-ChildItem -Path $folder -Filter *.designer.cs -Recurse
+
+  $excludedPattern = "cleanup|mysql-init|squash|rero-cascade"
+
+$filteredFiles = $files | Where-Object { $_.Name -notmatch $excludedPattern }
+  # Loop through each file
+  foreach ($file in ($files | Where-Object { $_.Name -notmatch $excludedPattern })) {
+    # Read the contents of the file
+    $content = Get-Content -Path $file.FullName | Select-Object -First 30
+
+    # Find the attribute lines
+    $attributes = $content | Where-Object { $_ -match '\[.*\]' } | ForEach-Object { '    ' + $_.Trim() }
+
+    # Find the namespace
+    $namespace = $content | Where-Object { $_ -match 'namespace' } | ForEach-Object { $_.Split(' ')[1] }
+
+    # Find the class name
+    $class_name = $content | Where-Object { $_ -match 'partial class' } | ForEach-Object { $_.Trim().Split(' ')[2] }
+
+    # Replace the contents with the new template
+    $new_content = @"
+// <auto-generated />
+using EllieBot.Db;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace $namespace
+{
+$($attributes -join "`n")
+    partial class $class_name 
+    {
+    }
+}
+"@
+
+    # Write the new contents to the file
+    Set-Content -Path $file.FullName -Value $new_content
+  }
+}

src/EllieBot/data/aliases.yml

@@ -863,6 +863,11 @@ affinity:
 waifuclaim:
   - waifuclaim
   - claim
+    - wc
+waifuclaims:
+  - waifuclaims
+  - claims
+  - wcs
 waifureset:
   - waifureset
 waifutransfer:
@@ -1454,3 +1459,17 @@ translateflags:
   - trfl
   - fltr
   - transflags
+rakeback:
+  - rakeback
+  - rb
+betstatsreset:
+  - betstatsreset
+  - bsr
+  - bsreset
+gamblestatsreset:
+  - gamblestatsreset
+  - gsr
+  - gsreset
+snipe:
+  - snipe
+  - sn

src/EllieBot/data/commandlist.json

@@ -2756,37 +2756,6 @@
     }
   ],
   "Gambling": [
-    {
-      "Aliases": [
-        ".betstats",
-        ".bs"
-      ],
-      "Description": "Shows the current bet stats for yourself, or the targetted user.\nYou may optionally specify the game to show stats for.\nSupported games right now are: bf, br, bd, lula, slot, race",
-      "Usage": [
-        ".betstats",
-        ".betstats @someone",
-        ".betstats @someone lula",
-        ".betstats bd"
-      ],
-      "Submodule": "Gambling",
-      "Module": "Gambling",
-      "Options": null,
-      "Requirements": []
-    },
-    {
-      "Aliases": [
-        ".gamblestats",
-        ".gs"
-      ],
-      "Description": "Shows the total stats of several gambling features.\nUpdates once an hour.",
-      "Usage": [
-        ".gamblestats"
-      ],
-      "Submodule": "Gambling",
-      "Module": "Gambling",
-      "Options": null,
-      "Requirements": []
-    },
     {
       "Aliases": [
         ".timely"
@@ -3030,6 +2999,20 @@
         "Bot Owner Only"
       ]
     },
+    {
+      "Aliases": [
+        ".rakeback",
+        ".rb"
+      ],
+      "Description": "Try to claim any rakeback that you have available.\nRakeback is accumulated by betting (not by winning or losing).\nDefault rakeback is 0.05 * house edge\nHouse edge is defined per game",
+      "Usage": [
+        ".rakeback"
+      ],
+      "Submodule": "Gambling",
+      "Module": "Gambling",
+      "Options": null,
+      "Requirements": []
+    },
     {
       "Aliases": [
         ".race"
@@ -3137,6 +3120,70 @@
         "Bot Owner Only"
       ]
     },
+    {
+      "Aliases": [
+        ".betstatsreset",
+        ".bsr",
+        ".bsreset"
+      ],
+      "Description": "Reset all of your Bet Stats for a fee.\nYou can alternatively reset Bet Stats for the specified game.",
+      "Usage": [
+        ".betstatsreset",
+        ".betstatsreset game"
+      ],
+      "Submodule": "BetStatsCommands",
+      "Module": "Gambling",
+      "Options": null,
+      "Requirements": []
+    },
+    {
+      "Aliases": [
+        ".betstats",
+        ".bs"
+      ],
+      "Description": "Shows the current bet stats for yourself, or the targetted user.\nYou may optionally specify the game to show stats for.\nSupported games right now are: bf, br, bd, lula, slot, race",
+      "Usage": [
+        ".betstats",
+        ".betstats @someone",
+        ".betstats @someone lula",
+        ".betstats bd"
+      ],
+      "Submodule": "BetStatsCommands",
+      "Module": "Gambling",
+      "Options": null,
+      "Requirements": []
+    },
+    {
+      "Aliases": [
+        ".gamblestats",
+        ".gs"
+      ],
+      "Description": "Shows the total stats of several gambling features.\nUpdates once an hour.",
+      "Usage": [
+        ".gamblestats"
+      ],
+      "Submodule": "BetStatsCommands",
+      "Module": "Gambling",
+      "Options": null,
+      "Requirements": []
+    },
+    {
+      "Aliases": [
+        ".gamblestatsreset",
+        ".gsr",
+        ".gsreset"
+      ],
+      "Description": "Resets the gamble stats.",
+      "Usage": [
+        ".gamblestatsreset"
+      ],
+      "Submodule": "BetStatsCommands",
+      "Module": "Gambling",
+      "Options": null,
+      "Requirements": [
+        "Bot Owner Only"
+      ]
+    },
     {
       "Aliases": [
         ".blackjack",
@@ -3601,10 +3648,25 @@
       "Options": null,
       "Requirements": []
     },
+    {
+      "Aliases": [
+        ".waifuclaims",
+        ".claims",
+        ".wcs"
+      ],
+      "Description": "Shows all of your currently claimed waifus.",
+      "Usage": [
+        ".waifuclaims"
+      ],
+      "Submodule": "WaifuClaimCommands",
+      "Module": "Gambling",
+      "Options": null,
+      "Requirements": []
+    },
     {
       "Aliases": [
         ".waifuclaim",
-        ".claim"
+        ".claim - wc"
       ],
       "Description": "Claim a waifu for yourself by spending currency.  You must spend at least 10% more than her current value unless she set `.affinity` towards you.",
       "Usage": [
@@ -6544,6 +6606,20 @@
         "No Public Bot"
       ]
     },
+    {
+      "Aliases": [
+        ".snipe",
+        ".sn"
+      ],
+      "Description": "Snipe the message you replied to with this command.\nOtherwise, if you don't reply to a message, it will snipe the last message sent in the channel (out of the last few messages) which has text or an image.",
+      "Usage": [
+        ".snipe"
+      ],
+      "Submodule": "Utility",
+      "Module": "Utility",
+      "Options": null,
+      "Requirements": []
+    },
     {
       "Aliases": [
         ".prompt"

src/EllieBot/data/gambling.yml

@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 11
+version: 12
 # Currency settings
 currency:
   # What is the emoji/character which represents the currency
@@ -28,7 +28,7 @@ betRoll:
       multiplyBy: 10
     - whenAbove: 90
       multiplyBy: 4
-    - whenAbove: 66
+    - whenAbove: 65
       multiplyBy: 2
 # Automatic currency generation settings.
 generation:
@@ -85,7 +85,7 @@ luckyLadder:
     - 2.4
     - 1.7
     - 1.5
-    - 1.2
+    - 1.1
     - 0.5
     - 0.3
     - 0.2

src/EllieBot/data/images.yml

@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 5
+version: 6
 coins:
   heads:
     - https://cdn.nadeko.bot/coins/heads3.png
@@ -22,15 +22,13 @@ dice:
   - https://cdn.nadeko.bot/other/dice/9.png
 xp:
   bg: https://cdn.nadeko.bot/other/xp/bg_k.png
-rip:
-  bg: https://cdn.nadeko.bot/other/rip/rip.png
-  overlay: https://cdn.nadeko.bot/other/rip/overlay.png
 slots:
   emojis:
-    - https://cdn.nadeko.bot/slots/0.png
-    - https://cdn.nadeko.bot/slots/1.png
-    - https://cdn.nadeko.bot/slots/2.png
-    - https://cdn.nadeko.bot/slots/3.png
-    - https://cdn.nadeko.bot/slots/4.png
-    - https://cdn.nadeko.bot/slots/5.png
+    - https://cdn.nadeko.bot/slots/10.png
+    - https://cdn.nadeko.bot/slots/11.png
+    - https://cdn.nadeko.bot/slots/12.png
+    - https://cdn.nadeko.bot/slots/13.png
+    - https://cdn.nadeko.bot/slots/14.png
+    - https://cdn.nadeko.bot/slots/15.png
+    - https://cdn.nadeko.bot/slots/16.png
   bg: https://cdn.nadeko.bot/slots/slots_bg.png

src/EllieBot/data/strings/commands/commands.en-US.yml

@@ -1517,7 +1517,7 @@ take:
 betroll:
   desc: |-
     Bets the specified amount of currency and rolls a dice.
-    Rolling over 66 yields x2 of your currency, over 90 - x4 and 100 x10.
+    Rolling over 65 yields x2 of your currency, over 90 - x4 and 100 x10.
     You can specify 'all', 'half' or 'X%' instead of the amount to bet that part of your current balance.
   ex:
     - 5
@@ -2711,6 +2711,13 @@ gamblestats:
     - ''
   params:
     - { }
+gamblestatsreset:
+  desc: |-
+    Resets the gamble stats.
+  ex:
+    - ''
+  params:
+    - { }
 slot:
   desc: |-
     Play Ellie slots by placing your bet.
@@ -2738,6 +2745,12 @@ waifuclaim:
         desc: "The cost of claiming the waifu."
       target:
         desc: "The user to whom the claim is being made, allowing the waifu to be claimed from their collection."
+waifuclaims:
+  desc: Shows all of your currently claimed waifus.
+  ex:
+    - ''
+  params:
+    - { }
 waifureset:
   desc: Resets your waifu stats, except current waifus.
   ex:
@@ -4642,6 +4655,16 @@ translateflags:
     - ''
   params:
     - { }
+betstatsreset:
+  desc: |-
+    Reset all of your Bet Stats for a fee.
+    You can alternatively reset Bet Stats for the specified game.
+  ex:
+    - ''
+    - 'game'
+  params:
+    - game:
+        desc: 'The game to reset betstats for. Omit to reset all games'
 betstats:
   desc: |-
     Shows the current bet stats for yourself, or the targetted user.
@@ -4662,3 +4685,21 @@ betstats:
         desc: 'The game to show betstats for. Omit to show betstats for all games combined'
     - game:
         desc: 'The game to show betstats for. Omit to show betstats for all games combined'
+rakeback:
+  desc: |-
+    Try to claim any rakeback that you have available.
+    Rakeback is accumulated by betting (not by winning or losing).
+    Default rakeback is 0.05 * house edge
+    House edge is defined per game
+  ex: 
+    - ''
+  params:
+    - {}
+snipe:
+  desc: |-
+    Snipe the message you replied to with this command.
+    Otherwise, if you don't reply to a message, it will snipe the last message sent in the channel (out of the last few messages) which has text or an image.
+  ex:
+    - ''
+  params:
+    - { }

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

@@ -1114,5 +1114,9 @@
   "invalid_img_size": "Image must to be {0}x{1} pixels.",
   "no_attach_found": "No attachment found. Please send the image along with this command.",
   "trfl_enabled": "Flag translation enabled on this channel. Reacting to a message with a flag will translate it to that language.",
-  "trfl_disabled": "Flag translation disabled."
+  "trfl_disabled": "Flag translation disabled.",
+  "rakeback_claimed": "You've claimed {0} as rakeback!",
+  "rakeback_none": "You don't have any rakeback to claim yet.",
+  "rakeback_available": "You have {0} rakeback available. Click the button to claim.",
+  "sniped_by": "Sniped by {0}"
 }