change: .race will now have 82-94% payout rate based on the number of players playign (1-12, x0.01 per player). Any player over 12 won't increase payout

fix: Fixed timely on different shards

CHANGELOG.md

@@ -2,6 +2,30 @@
 
 Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
+## [5.1.19] - 04.11.2024
+
+### Added
+
+- Added `.betstats`
+    - See your own stats with .betstats
+    - Target someone else:  .betstats @seraphe
+    - You can also specify a game .betstats lula
+    - Or both! .betstats seraphe 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
+
+### Changed
+
+- `.plant/pick` password font size will be slightly bigger
+- `.race` will now have 82-94% payout rate based on the number of players playing (1-12, x0.01 per player).
+  - Any player over 12 won't increase payout
+
+### Fixed
+
+- `.xplb` and `.xpglb` now have proper ranks after page 1
+- Fixed boost bonus on shards different than the specified servers' shard
+
 ## [5.1.18] - 02.11.2024
 
 ### Added
@@ -12,14 +36,16 @@ Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except da
       language of that country
     - 5 second cooldown per user
     - The message can only be translated once per language (counter resets every 24h)
-- `.timely` now has a button. Togglable via `.conf gambling` it's called pass because previously it was a captcha, but captchas are too annoying
+- `.timely` now has a button. Togglable via `.conf gambling` it's called pass because previously it was a captcha, but
+  captchas are too annoying
 
 ## Changed
 
 - [public bot] Patreon reward bonus for flowers reduced. Timely bonuses stay the same
 - discriminators removed from the databases. All users who had ???? as discriminator have been renamed to ??username.
     - all new unknown users will have ??Unknown as their name
-- Flower currency generation will now have a strikeout to try combat the pickbots. This is the weakest but easiest protection to implement. There may be more options in the future
+- Flower currency generation will now have a strikeout to try combat the pickbots. This is the weakest but easiest
+  protection to implement. There may be more options in the future
 
 ## Fixed
 

remove-migration.ps1

@@ -1,3 +0,0 @@
-dotnet ef migrations remove -c SqliteContext -f -p src/NadekoBot/NadekoBot.csproj
-dotnet ef migrations remove -c PostgreSqlContext -f -p src/NadekoBot/NadekoBot.csproj
-

src/NadekoBot.GrpcApiBase/protos/xp.proto

@@ -7,14 +7,25 @@ package xp;
 service GrpcXp {
   rpc GetXpLb(GetXpLbRequest) returns (GetXpLbReply);
   rpc ResetUserXp(ResetUserXpRequest) returns (ResetUserXpReply);
-  
+
   rpc GetXpSettings(GetXpSettingsRequest) returns (GetXpSettingsReply);
-  
+
   rpc AddExclusion(AddExclusionRequest) returns (AddExclusionReply);
   rpc DeleteExclusion(DeleteExclusionRequest) returns (DeleteExclusionReply);
-  
+
   rpc AddReward(AddRewardRequest) returns (AddRewardReply);
   rpc DeleteReward(DeleteRewardRequest) returns (DeleteRewardReply);
+
+  rpc SetServerExclusion(SetServerExclusionRequest) returns (SetServerExclusionReply);
+}
+
+message SetServerExclusionRequest {
+  uint64 guildId = 1;
+  bool serverExcluded = 2;
+}
+
+message SetServerExclusionReply {
+  bool success = 1;
 }
 
 message GetXpLbRequest {
@@ -32,7 +43,8 @@ message XpLbUserReply {
   string username = 2;
   int64 xp = 3;
   int64 level = 4;
-  string avatar = 5;
+  int64 levelPercent = 5;
+  string avatar = 6;
 }
 
 message ResetUserXpRequest {

src/NadekoBot/Db/Models/support/PatronQuota.cs

@@ -1,8 +1,12 @@
 #nullable disable
+using System.ComponentModel.DataAnnotations;
+
 namespace NadekoBot.Db.Models;
 
 public class PatronUser
 {
+    // [Key]
+    // public int Id { get; set; }
     public string UniquePlatformUserId { get; set; }
     public ulong UserId { get; set; }
     public int AmountCents { get; set; }

src/NadekoBot/Db/NadekoContext.cs

@@ -61,6 +61,7 @@ public abstract class NadekoContext : DbContext
     public DbSet<TodoModel> Todos { get; set; }
     public DbSet<ArchivedTodoListModel> TodosArchive { get; set; }
     public DbSet<HoneypotChannel> HoneyPotChannels { get; set; }
+    
 
     // public DbSet<GuildColors> GuildColors { get; set; }
 
@@ -73,6 +74,15 @@ public abstract class NadekoContext : DbContext
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
+        #region UserBetStats
+        
+        modelBuilder.Entity<UserBetStats>()
+                    .HasIndex(x => new { x.UserId, x.Game })
+                    .IsUnique();
+        
+        
+        #endregion
+        
         #region Flag Translate 
 
         modelBuilder.Entity<FlagTranslateChannel>()

src/NadekoBot/Migrations/PostgreSql/20241104094232_betstats.cs

@@ -0,0 +1,48 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.PostgreSql
+{
+    /// <inheritdoc />
+    public partial class betstats : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "userbetstats",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    userid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
+                    game = table.Column<int>(type: "integer", nullable: false),
+                    wincount = table.Column<long>(type: "bigint", nullable: false),
+                    losecount = table.Column<long>(type: "bigint", nullable: false),
+                    totalbet = table.Column<decimal>(type: "numeric", nullable: false),
+                    paidout = table.Column<decimal>(type: "numeric", nullable: false),
+                    maxwin = table.Column<long>(type: "bigint", nullable: false),
+                    maxbet = table.Column<long>(type: "bigint", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_userbetstats", x => x.id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_userbetstats_userid_game",
+                table: "userbetstats",
+                columns: new[] { "userid", "game" },
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "userbetstats");
+        }
+    }
+}

src/NadekoBot/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs

@@ -3227,6 +3227,57 @@ namespace NadekoBot.Migrations.PostgreSql
                     b.ToTable("greetsettings", (string)null);
                 });
 
+            modelBuilder.Entity("NadekoBot.Services.UserBetStats", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Game")
+                        .HasColumnType("integer")
+                        .HasColumnName("game");
+
+                    b.Property<long>("LoseCount")
+                        .HasColumnType("bigint")
+                        .HasColumnName("losecount");
+
+                    b.Property<long>("MaxBet")
+                        .HasColumnType("bigint")
+                        .HasColumnName("maxbet");
+
+                    b.Property<long>("MaxWin")
+                        .HasColumnType("bigint")
+                        .HasColumnName("maxwin");
+
+                    b.Property<decimal>("PaidOut")
+                        .HasColumnType("numeric")
+                        .HasColumnName("paidout");
+
+                    b.Property<decimal>("TotalBet")
+                        .HasColumnType("numeric")
+                        .HasColumnName("totalbet");
+
+                    b.Property<decimal>("UserId")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("userid");
+
+                    b.Property<long>("WinCount")
+                        .HasColumnType("bigint")
+                        .HasColumnName("wincount");
+
+                    b.HasKey("Id")
+                        .HasName("pk_userbetstats");
+
+                    b.HasIndex("UserId", "Game")
+                        .IsUnique()
+                        .HasDatabaseName("ix_userbetstats_userid_game");
+
+                    b.ToTable("userbetstats", (string)null);
+                });
+
             modelBuilder.Entity("NadekoBot.Db.Models.AntiAltSetting", b =>
                 {
                     b.HasOne("NadekoBot.Db.Models.GuildConfig", null)

src/NadekoBot/Migrations/Sqlite/20241104094222_betstats.cs

@@ -0,0 +1,47 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations
+{
+    /// <inheritdoc />
+    public partial class betstats : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "UserBetStats",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    UserId = table.Column<ulong>(type: "INTEGER", nullable: false),
+                    Game = table.Column<int>(type: "INTEGER", nullable: false),
+                    WinCount = table.Column<long>(type: "INTEGER", nullable: false),
+                    LoseCount = table.Column<long>(type: "INTEGER", nullable: false),
+                    TotalBet = table.Column<decimal>(type: "TEXT", nullable: false),
+                    PaidOut = table.Column<decimal>(type: "TEXT", nullable: false),
+                    MaxWin = table.Column<long>(type: "INTEGER", nullable: false),
+                    MaxBet = table.Column<long>(type: "INTEGER", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_UserBetStats", x => x.Id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_UserBetStats_UserId_Game",
+                table: "UserBetStats",
+                columns: new[] { "UserId", "Game" },
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "UserBetStats");
+        }
+    }
+}

src/NadekoBot/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs

@@ -2399,6 +2399,44 @@ namespace NadekoBot.Migrations
                     b.ToTable("GreetSettings");
                 });
 
+            modelBuilder.Entity("NadekoBot.Services.UserBetStats", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Game")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("LoseCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("MaxBet")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("MaxWin")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("PaidOut")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("TotalBet")
+                        .HasColumnType("TEXT");
+
+                    b.Property<ulong>("UserId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("WinCount")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "Game")
+                        .IsUnique();
+
+                    b.ToTable("UserBetStats");
+                });
+
             modelBuilder.Entity("NadekoBot.Db.Models.AntiAltSetting", b =>
                 {
                     b.HasOne("NadekoBot.Db.Models.GuildConfig", null)

src/NadekoBot/Modules/Gambling/AnimalRacing/AnimalRace.cs

@@ -6,6 +6,10 @@ namespace NadekoBot.Modules.Gambling.Common.AnimalRacing;
 
 public sealed class AnimalRace : IDisposable
 {
+    public const double BASE_MULTIPLIER = 0.82;
+    public const double MAX_MULTIPLIER = 0.94;
+    public const double MULTI_PER_USER = 0.01;
+
     public enum Phase
     {
         WaitingForPlayers,
@@ -100,7 +104,7 @@ public sealed class AnimalRace : IDisposable
             foreach (var user in _users)
             {
                 if (user.Bet > 0)
-                    await _currency.AddAsync(user.UserId, user.Bet, new("animalrace", "refund"));
+                    await _currency.AddAsync(user.UserId, (long)(user.Bet * BASE_MULTIPLIER), new("animalrace", "refund"));
             }
 
             _ = OnStartingFailed?.Invoke(this);
@@ -131,8 +135,10 @@ public sealed class AnimalRace : IDisposable
 
             if (FinishedUsers[0].Bet > 0)
             {
+                Multi = FinishedUsers.Count
+                        * Math.Min(MAX_MULTIPLIER, BASE_MULTIPLIER + (MULTI_PER_USER * FinishedUsers.Count));
                 await _currency.AddAsync(FinishedUsers[0].UserId,
-                    FinishedUsers[0].Bet * (_users.Count - 1),
+                    (long)(FinishedUsers[0].Bet * Multi),
                     new("animalrace", "win"));
             }
 
@@ -140,6 +146,8 @@ public sealed class AnimalRace : IDisposable
         });
     }
 
+    public double Multi { get; set; } = BASE_MULTIPLIER;
+
     public void Dispose()
     {
         CurrentPhase = Phase.Ended;

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

@@ -74,10 +74,14 @@ public partial class Gambling
                 if (race.FinishedUsers[0].Bet > 0)
                 {
                     return Response()
-                           .Confirm(GetText(strs.animal_race),
-                               GetText(strs.animal_race_won_money(Format.Bold(winner.Username),
-                                   winner.Animal.Icon,
-                                   (race.FinishedUsers[0].Bet * (race.Users.Count - 1)) + CurrencySign)))
+                           .Embed(_sender.CreateEmbed()
+                                         .WithOkColor()
+                                         .WithTitle(GetText(strs.animal_race))
+                                         .WithDescription(GetText(strs.animal_race_won_money(
+                                             Format.Bold(winner.Username),
+                                             winner.Animal.Icon,
+                                             N(race.FinishedUsers[0].Bet * race.Multi))))
+                                         .WithFooter($"x{race.Multi:F2}"))
                            .SendAsync();
                 }
 
@@ -113,14 +117,14 @@ public partial class Gambling
 
         private async Task Ar_OnStateUpdate(AnimalRace race)
         {
-            var text = $@"|🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🔚|
+            var text = $@"|🏁 🏁 🏁 🏁 🏁 🏁 🏁 🏁 🏁 🏁 🏁 🏁 🏁 🏁 🏁🔚|
 {string.Join("\n", race.Users.Select(p =>
 {
     var index = race.FinishedUsers.IndexOf(p);
     var extra = index == -1 ? "" : $"#{index + 1} {(index == 0 ? "🏆" : "")}";
     return $"{(int)(p.Progress / 60f * 100),-2}%|{new string('‣', p.Progress) + p.Animal.Icon + extra}";
 }))}
-|🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🔚|";
+|🏁 🏁 🏁 🏁 🏁 🏁 🏁 🏁 🏁 🏁 🏁 🏁 🏁 🏁 🏁 🔚|";
 
             var msg = raceMessage;
 
@@ -129,10 +133,10 @@ public partial class Gambling
             else
             {
                 await msg.ModifyAsync(x => x.Embed = _sender.CreateEmbed()
-                                                        .WithTitle(GetText(strs.animal_race))
-                                                        .WithDescription(text)
-                                                        .WithOkColor()
-                                                        .Build());
+                                                            .WithTitle(GetText(strs.animal_race))
+                                                            .WithDescription(text)
+                                                            .WithOkColor()
+                                                            .Build());
             }
         }
 

src/NadekoBot/Modules/Gambling/Gambling.cs

@@ -14,6 +14,13 @@ using System.Text;
 using NadekoBot.Modules.Gambling.Rps;
 using NadekoBot.Common.TypeReaders;
 using NadekoBot.Modules.Patronage;
+using SixLabors.Fonts;
+using SixLabors.Fonts.Unicode;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Drawing.Processing;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
+using Color = SixLabors.ImageSharp.Color;
 
 namespace NadekoBot.Modules.Gambling;
 
@@ -71,7 +78,65 @@ public partial class Gambling : GamblingModule<GamblingService>
     }
 
     [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();
 
@@ -153,10 +218,12 @@ public partial class Gambling : GamblingModule<GamblingService>
                     customId: "timely:" + _rng.Next(123456, 999999)),
                 async (smc) =>
                 {
+                    await smc.DeferAsync();
                     await ClaimTimely();
                 });
 
     [Cmd]
+    [RequireContext(ContextType.Guild)]
     public async Task Timely()
     {
         var val = Config.Timely.Amount;
@@ -167,62 +234,64 @@ public partial class Gambling : GamblingModule<GamblingService>
             return;
         }
 
-        if (Config.Timely.RequirePassword)
+        if (Config.Timely.ProtType == TimelyProt.Button)
         {
-            // var password = _service.GeneratePassword();
-            //
-            // var img = new Image<Rgba32>(100, 40);
-            //
-            // var font = _fonts.NotoSans.CreateFont(30);
-            // var outlinePen = new SolidPen(Color.Black, 1f);
-            // var strikeoutRun = new RichTextRun
-            // {
-            //     Start = 0,
-            //     End = password.GetGraphemeCount(),
-            //     Font = font,
-            //     StrikeoutPen = new SolidPen(Color.White, 3),
-            //     TextDecorations = TextDecorations.Strikeout
-            // };
-            // // draw password on the image
-            // img.Mutate(x =>
-            // {
-            //     x.DrawText(new RichTextOptions(font)
-            //         {
-            //             HorizontalAlignment = HorizontalAlignment.Center,
-            //             VerticalAlignment = VerticalAlignment.Center,
-            //             FallbackFontFamilies = _fonts.FallBackFonts,
-            //             Origin = new(50, 20),
-            //             TextRuns = [strikeoutRun]
-            //         },
-            //         password,
-            //         Brushes.Solid(Color.White),
-            //         outlinePen);
-            // });
-            // using var stream = await img.ToStreamAsync();
-            // var captcha = await Response()
-            //                     .Embed(_sender.CreateEmbed()
-            //                                   .WithOkColor()
-            //                                   .WithImageUrl("attachment://timely.png"))
-            //                     .File(stream, "timely.png")
-            //                     .SendAsync();
-            // try
-            // {
-            //     var userInput = await GetUserInputAsync(ctx.User.Id, ctx.Channel.Id);
-            //     if (userInput?.ToLowerInvariant() != password?.ToLowerInvariant())
-            //     {
-            //         return;
-            //     }
-            // }
-            // finally
-            // {
-            //     _ = captcha.DeleteAsync();
-            // }
-
             var interaction = CreateTimelyInteraction();
             var msg = await Response().Pending(strs.timely_button).Interaction(interaction).SendAsync();
             await msg.DeleteAsync();
             return;
         }
+        else if (Config.Timely.ProtType == TimelyProt.Captcha)
+        {
+            var password = _service.GeneratePassword();
+
+            var img = new Image<Rgba32>(70, 35);
+
+            var font = _fonts.NotoSans.CreateFont(30);
+            var outlinePen = new SolidPen(Color.Black, 1f);
+            var strikeoutRun = new RichTextRun
+            {
+                Start = 0,
+                End = password.GetGraphemeCount(),
+                Font = font,
+                StrikeoutPen = new SolidPen(Color.White, 3),
+                TextDecorations = TextDecorations.Strikeout
+            };
+            // draw password on the image
+            img.Mutate(x =>
+            {
+                x.DrawText(new RichTextOptions(font)
+                    {
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center,
+                        FallbackFontFamilies = _fonts.FallBackFonts,
+                        Origin = new(35, 17),
+                        TextRuns = [strikeoutRun]
+                    },
+                    password,
+                    Brushes.Solid(Color.White),
+                    outlinePen);
+            });
+            using var stream = await img.ToStreamAsync();
+            var captcha = await Response()
+                                // .Embed(_sender.CreateEmbed()
+                                //               .WithOkColor()
+                                //               .WithImageUrl("attachment://timely.png"))
+                                .File(stream, "timely.png")
+                                .SendAsync();
+            try
+            {
+                var userInput = await GetUserInputAsync(ctx.User.Id, ctx.Channel.Id);
+                if (userInput?.ToLowerInvariant() != password?.ToLowerInvariant())
+                {
+                    return;
+                }
+            }
+            finally
+            {
+                _ = captcha.DeleteAsync();
+            }
+        }
 
         await ClaimTimely();
     }
@@ -249,6 +318,29 @@ public partial class Gambling : GamblingModule<GamblingService>
 
 
         var val = Config.Timely.Amount;
+        var boostGuilds = Config.BoostBonus.GuildIds ?? new();
+        var guildUsers = await boostGuilds
+                               .Select(async gid =>
+                               {
+                                   try
+                                   {
+                                       var guild = await _client.Rest.GetGuildAsync(gid, false);
+                                       var user = await _client.Rest.GetGuildUserAsync(gid, ctx.User.Id);
+                                       return (guild, user);
+                                   }
+                                   catch
+                                   {
+                                       return default;
+                                   }
+                               })
+                               .WhenAll();
+
+        var userInfo = guildUsers.FirstOrDefault(x => x.user?.PremiumSince is not null);
+        var booster = userInfo != default;
+
+        if (booster)
+            val += Config.BoostBonus.BaseTimelyBonus;
+
         var patron = await _ps.GetPatronAsync(ctx.User.Id);
 
         var percentBonus = (_ps.PercentBonus(patron) / 100f);
@@ -259,7 +351,16 @@ public partial class Gambling : GamblingModule<GamblingService>
 
         await _cs.AddAsync(ctx.User.Id, val, new("timely", "claim"));
 
-        await Response().Confirm(strs.timely(N(val), period)).Interaction(inter).SendAsync();
+        if (booster)
+        {
+            var msg = GetText(strs.timely(N(val), period))
+                      + "\n\n"
+                      + $"*+{N(Config.BoostBonus.BaseTimelyBonus)} bonus for boosting {userInfo.guild}!*";
+
+            await Response().Confirm(msg).Interaction(inter).SendAsync();
+        }
+        else
+            await Response().Confirm(strs.timely(N(val), period)).Interaction(inter).SendAsync();
     }
 
     [Cmd]
@@ -370,8 +471,9 @@ public partial class Gambling : GamblingModule<GamblingService>
         }
 
         var embed = _sender.CreateEmbed()
-                           .WithTitle(GetText(strs.transactions(((SocketGuild)ctx.Guild)?.GetUser(userId)?.ToString()
-                                                                ?? $"{userId}")))
+                           .WithTitle(GetText(strs.transactions(
+                               ((SocketGuild)ctx.Guild)?.GetUser(userId)?.ToString()
+                               ?? $"{userId}")))
                            .WithOkColor();
 
         var sb = new StringBuilder();
@@ -627,7 +729,9 @@ public partial class Gambling : GamblingModule<GamblingService>
         }
         else
         {
-            await Response().Error(strs.take_fail(N(amount), Format.Bold(user.ToString()), CurrencySign)).SendAsync();
+            await Response()
+                  .Error(strs.take_fail(N(amount), Format.Bold(user.ToString()), CurrencySign))
+                  .SendAsync();
         }
     }
 
@@ -648,7 +752,9 @@ public partial class Gambling : GamblingModule<GamblingService>
         }
         else
         {
-            await Response().Error(strs.take_fail(N(amount), Format.Code(usrId.ToString()), CurrencySign)).SendAsync();
+            await Response()
+                  .Error(strs.take_fail(N(amount), Format.Code(usrId.ToString()), CurrencySign))
+                  .SendAsync();
         }
     }
 

src/NadekoBot/Modules/Gambling/GamblingConfig.cs

@@ -11,7 +11,7 @@ namespace NadekoBot.Modules.Gambling.Common;
 public sealed partial class GamblingConfig : ICloneable<GamblingConfig>
 {
     [Comment("""DO NOT CHANGE""")]
-    public int Version { get; set; } = 9;
+    public int Version { get; set; } = 11;
 
     [Comment("""Currency settings""")]
     public CurrencyConfig Currency { get; set; }
@@ -67,6 +67,11 @@ public sealed partial class GamblingConfig : ICloneable<GamblingConfig>
     [Comment("""Slot config""")]
     public SlotsConfig Slots { get; set; }
 
+    [Comment("""
+             Bonus config for server boosts
+             """)]
+    public BoostBonusConfig BoostBonus { get; set; }
+
     public GamblingConfig()
     {
         BetRoll = new();
@@ -79,6 +84,7 @@ public sealed partial class GamblingConfig : ICloneable<GamblingConfig>
         Slots = new();
         LuckyLadder = new();
         BotCuts = new();
+        BoostBonus = new();
     }
 }
 
@@ -104,7 +110,7 @@ public partial class TimelyConfig
              How much currency will the users get every time they run .timely command
              setting to 0 or less will disable this feature
              """)]
-    public int Amount { get; set; } = 0;
+    public long Amount { get; set; } = 0;
 
     [Comment("""
              How often (in hours) can users claim currency with .timely command
@@ -113,9 +119,17 @@ public partial class TimelyConfig
     public int Cooldown { get; set; } = 24;
 
     [Comment("""
-             Whether the users are required to type a password when they do timely.
+             How will timely be protected?
+             None, Button (users have to click the button) or Captcha (users have to type the captcha from an image)
              """)]
-    public bool RequirePassword { get; set; } = true;
+    public TimelyProt ProtType { get; set; } = TimelyProt.Button;
+}
+
+public enum TimelyProt
+{
+    None,
+    Button,
+    Captcha
 }
 
 [Cloneable]
@@ -413,4 +427,15 @@ public sealed partial class BotCutConfig
              Default 0.1 (10%).
              """)]
     public decimal ShopSaleCut { get; set; } = 0.1m;
+}
+
+[Cloneable]
+public sealed partial class BoostBonusConfig
+{
+    [Comment("Users will receive a bonus if they boost any of these servers")]
+    public List<ulong> GuildIds { get; set; } = new();
+
+    [Comment("This bonus will be added before any other multiplier is applied to the .timely command")]
+
+    public long BaseTimelyBonus { get; set; } = 50;
 }

src/NadekoBot/Modules/Gambling/GamblingConfigService.cs

@@ -144,9 +144,9 @@ public sealed class GamblingConfigService : ConfigServiceBase<GamblingConfig>
             ConfigPrinters.ToString,
             val => val >= 0);
 
-        AddParsedProp("timely.pass",
-            gs => gs.Timely.RequirePassword,
-            bool.TryParse,
+        AddParsedProp("timely.prot",
+            gs => gs.Timely.ProtType,
+            ConfigParsers.InsensitiveEnum,
            ConfigPrinters.ToString);
 
         Migrate();
@@ -189,11 +189,11 @@ public sealed class GamblingConfigService : ConfigServiceBase<GamblingConfig>
             });
         }
         
-        if (data.Version < 9)
+        if (data.Version < 11)
         {
             ModifyConfig(c =>
             {
-                c.Version = 9;
+                c.Version = 11;
             });
         }
     }

src/NadekoBot/Modules/Gambling/PlantPick/PlantPickService.cs

@@ -147,7 +147,7 @@ public class PlantPickService : INService, IExecNoCommand
         pass = pass.TrimTo(10, true).ToLowerInvariant();
         using var img = Image.Load<Rgba32>(curImg);
         // choose font size based on the image height, so that it's visible
-        var font = _fonts.NotoSans.CreateFont(img.Height / 12.0f, FontStyle.Bold);
+        var font = _fonts.NotoSans.CreateFont(img.Height / 11.0f, FontStyle.Bold);
         img.Mutate(x =>
         {
             // measure the size of the text to be drawing
@@ -159,7 +159,7 @@ public class PlantPickService : INService, IExecNoCommand
 
             // fill the background with black, add 5 pixels on each side to make it look better
             x.FillPolygon(Color.ParseHex("00000080"),
-                new PointF(0, 0),
+                new PointF(1, 1),
                 new PointF(size.Width + 5, 0),
                 new PointF(size.Width + 5, size.Height + 10),
                 new PointF(0, size.Height + 10));
@@ -169,7 +169,7 @@ public class PlantPickService : INService, IExecNoCommand
                 Start = 0,
                 End = pass.GetGraphemeCount(),
                 Font = font,
-                StrikeoutPen = new SolidPen(Color.White, 5),
+                StrikeoutPen = new SolidPen(Color.White, 2),
                 TextDecorations = TextDecorations.Strikeout
             };
 

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

@@ -37,7 +37,7 @@ public sealed class NewGamblingService : IGamblingService, INService
         var won = (long)result.Won;
         if (won > 0)
         {
-            await _cs.AddAsync(userId, won, new("lula", "win"));
+            await _cs.AddAsync(userId, won, new("lula",  result.Multiplier >= 1 ? "win" : "lose"));
         }
 
         return result;
@@ -155,7 +155,7 @@ public sealed class NewGamblingService : IGamblingService, INService
         var won = (long)result.Won;
         if (won > 0)
         {
-            await _cs.AddAsync(userId, won, new("slot", "won"));
+            await _cs.AddAsync(userId, won, new("slot", "win"));
         }
 
         return result;

src/NadekoBot/Modules/Searches/Translate/FlagTranslateService_SupportedFlags.cs

@@ -69,5 +69,13 @@ public partial class FlagTranslateService
                                      YE ar
                                      AL sq
                                      AE ar
+                                     AU en
+                                     NZ en
+                                     KZ kz
+                                     NO no
+                                     SE sv
+                                     DK da
+                                     FI fi
+                                     HU hu
                                      """;
 }

src/NadekoBot/Modules/Xp/Xp.cs

@@ -225,7 +225,7 @@ public partial class Xp : NadekoModule<XpService>
                       else if (userXpData.AwardedXp < 0)
                           awardStr = $"({userXpData.AwardedXp})";
 
-                      embed.AddField($"#{i + 1 + (curPage * 9)} {user?.ToString() ?? users[i].UserId.ToString()}",
+                      embed.AddField($"#{i + 1 + (curPage * 10)} {user?.ToString() ?? users[i].UserId.ToString()}",
                           $"{GetText(strs.level_x(levelStats.Level))} - {levelStats.TotalXp}xp {awardStr}");
                   }
 
@@ -278,7 +278,7 @@ public partial class Xp : NadekoModule<XpService>
                   for (var i = 0; i < users.Count; i++)
                   {
                       var user = users[i];
-                      embed.AddField($"#{i + 1 + (curPage * 9)} {user}",
+                      embed.AddField($"#{i + 1 + (curPage * 10)} {user}",
                           $"{GetText(strs.level_x(new LevelStats(users[i].TotalXp).Level))} - {users[i].TotalXp}xp");
                   }
 

src/NadekoBot/NadekoBot.csproj

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

src/NadekoBot/Services/GrpcApi/GreetByeSvc.cs

@@ -17,10 +17,13 @@ public sealed class GreetByeSvc : GrpcGreet.GrpcGreetBase, IGrpcSvc, INService
     public ServerServiceDefinition Bind()
         => GrpcGreet.BindService(this);
 
-    private static GrpcGreetSettings ToConf(GreetSettings? conf)
+    private static GrpcGreetSettings ToConf(GreetSettings? conf, GreetType type)
     {
         if (conf is null)
-            return new GrpcGreetSettings();
+            return new GrpcGreetSettings()
+            {
+                Type = (GrpcGreetType)type
+            };
 
         return new GrpcGreetSettings()
         {
@@ -35,9 +38,10 @@ public sealed class GreetByeSvc : GrpcGreet.GrpcGreetBase, IGrpcSvc, INService
     {
         var guildId = request.GuildId;
 
-        var conf = await _gs.GetGreetSettingsAsync(guildId, (GreetType)request.Type);
+        var type = (GreetType)request.Type;
+        var conf = await _gs.GetGreetSettingsAsync(guildId, type);
 
-        return ToConf(conf);
+        return ToConf(conf, type);
     }
 
     public override async Task<UpdateGreetReply> UpdateGreet(UpdateGreetRequest request, ServerCallContext context)

src/NadekoBot/Services/GrpcApi/XpSvc.cs

@@ -29,7 +29,7 @@ public class XpSvc : GrpcXp.GrpcXpBase, IGrpcSvc, INService
         ServerCallContext context)
     {
         await Task.Yield();
-        
+
         var guild = _client.GetGuild(request.GuildId);
 
         if (guild is null)
@@ -65,14 +65,14 @@ public class XpSvc : GrpcXp.GrpcXpBase, IGrpcSvc, INService
             Type = "Currency",
             Value = x.Amount.ToString()
         });
-        
+
         rews = rews.Concat(roleRews.Select(x => new RewItemReply()
-        {
-            Level = x.Level,
-            Type = "Role",
-            Value = guild.GetRole(x.RoleId)?.ToString() ?? x.RoleId.ToString()
-        }))
-        .OrderBy(x => x.Level);
+                   {
+                       Level = x.Level,
+                       Type = x.Remove ? "RemoveRole" : "AddRole",
+                       Value = guild.GetRole(x.RoleId)?.ToString() ?? x.RoleId.ToString()
+                   }))
+                   .OrderBy(x => x.Level);
 
         reply.Rewards.AddRange(rews);
 
@@ -207,15 +207,15 @@ public class XpSvc : GrpcXp.GrpcXpBase, IGrpcSvc, INService
 
     public override async Task<GetXpLbReply> GetXpLb(GetXpLbRequest request, ServerCallContext context)
     {
-        if (request.Page < 0)
-            throw new RpcException(new Status(StatusCode.InvalidArgument, "Page must be greater than or equal to 0"));
+        if (request.Page < 1)
+            throw new RpcException(new Status(StatusCode.InvalidArgument, "Page must be greater than or equal to 1"));
 
         var guild = _client.GetGuild(request.GuildId);
 
         if (guild is null)
             throw new RpcException(new Status(StatusCode.NotFound, "Guild not found"));
 
-        var data = await _xp.GetGuildUserXps(request.GuildId, request.Page);
+        var data = await _xp.GetGuildUserXps(request.GuildId, request.Page - 1);
         var total = await _xp.GetTotalGuildUsers(request.GuildId);
 
         var reply = new GetXpLbReply
@@ -223,45 +223,60 @@ public class XpSvc : GrpcXp.GrpcXpBase, IGrpcSvc, INService
             Total = total
         };
 
-        reply.Users.AddRange(await data
-                                   .Select(async x =>
-                                   {
-                                       var user = guild.GetUser(x.UserId);
+        var users = await data
+                          .Select(async x =>
+                          {
+                              var user = guild.GetUser(x.UserId);
 
-                                       if (user is null)
-                                       {
-                                           var du = await _duSvc.GetUserAsync(x.UserId);
-                                           if (du is null)
-                                               return new XpLbUserReply
-                                               {
-                                                   UserId = x.UserId,
-                                                   Avatar = string.Empty,
-                                                   Username = string.Empty,
-                                                   Xp = x.Xp,
-                                                   Level = new LevelStats(x.Xp).Level
-                                               };
+                              if (user is null)
+                              {
+                                  var du = await _duSvc.GetUserAsync(x.UserId);
+                                  if (du is null)
+                                      return new XpLbUserReply
+                                      {
+                                          UserId = x.UserId,
+                                          Avatar = string.Empty,
+                                          Username = string.Empty,
+                                          Xp = x.Xp,
+                                          Level = new LevelStats(x.Xp).Level
+                                      };
 
-                                           return new XpLbUserReply()
-                                           {
-                                               UserId = x.UserId,
-                                               Avatar = du.RealAvatarUrl()?.ToString() ?? string.Empty,
-                                               Username = du.ToString() ?? string.Empty,
-                                               Xp = x.Xp,
-                                               Level = new LevelStats(x.Xp).Level
-                                           };
-                                       }
+                                  return new XpLbUserReply()
+                                  {
+                                      UserId = x.UserId,
+                                      Avatar = du.RealAvatarUrl()?.ToString() ?? string.Empty,
+                                      Username = du.ToString() ?? string.Empty,
+                                      Xp = x.Xp,
+                                      Level = new LevelStats(x.Xp).Level
+                                  };
+                              }
 
-                                       return new XpLbUserReply
-                                       {
-                                           UserId = x.UserId,
-                                           Avatar = user?.GetAvatarUrl() ?? string.Empty,
-                                           Username = user?.ToString() ?? string.Empty,
-                                           Xp = x.Xp,
-                                           Level = new LevelStats(x.Xp).Level
-                                       };
-                                   })
-                                   .WhenAll());
+                              return new XpLbUserReply
+                              {
+                                  UserId = x.UserId,
+                                  Avatar = user?.GetAvatarUrl() ?? string.Empty,
+                                  Username = user?.ToString() ?? string.Empty,
+                                  Xp = x.Xp,
+                                  Level = new LevelStats(x.Xp).Level
+                              };
+                          })
+                          .WhenAll();
+
+        reply.Users.AddRange(users);
 
         return reply;
     }
+
+    public override async Task<SetServerExclusionReply> SetServerExclusion(
+        SetServerExclusionRequest request,
+        ServerCallContext context)
+    {
+        await Task.Yield();
+        
+        var newValue = _xp.ToggleExcludeServer(request.GuildId);
+        return new()
+        {
+            Success = newValue
+        };
+    }
 }

src/NadekoBot/_common/Currency/ITxTracker.cs

@@ -4,6 +4,6 @@ namespace NadekoBot.Services;
 
 public interface ITxTracker
 {
-    Task TrackAdd(long amount, TxData? txData);
-    Task TrackRemove(long amount, TxData? txData);
+    Task TrackAdd(ulong userId, long amount, TxData? txData);
+    Task TrackRemove(ulong userId, long amount, TxData? txData);
 }

src/NadekoBot/_common/Services/Currency/CurrencyService.cs

@@ -77,7 +77,7 @@ public sealed class CurrencyService : ICurrencyService, INService
     {
         var wallet = await GetWalletAsync(userId);
         await wallet.Add(amount, txData);
-        await _txTracker.TrackAdd(amount, txData);
+        await _txTracker.TrackAdd(userId, amount, txData);
     }
 
     public async Task AddAsync(
@@ -97,7 +97,7 @@ public sealed class CurrencyService : ICurrencyService, INService
         var wallet = await GetWalletAsync(userId);
         var result = await wallet.Take(amount, txData);
         if (result)
-            await _txTracker.TrackRemove(amount, txData);
+            await _txTracker.TrackRemove(userId, amount, txData);
         return result;
     }
 

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

@@ -1,8 +1,10 @@
 using LinqToDB;
+using LinqToDB.Data;
 using LinqToDB.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Services.Currency;
 using NadekoBot.Db.Models;
+using System.Collections.Concurrent;
 
 namespace NadekoBot.Services;
 
@@ -10,15 +12,11 @@ public sealed class GamblingTxTracker : ITxTracker, INService, IReadyExecutor
 {
     private static readonly IReadOnlySet<string> _gamblingTypes = new HashSet<string>(new[]
     {
-        "lula",
-        "betroll",
-        "betflip",
-        "blackjack",
-        "betdraw",
-        "slot",
+        "lula", "betroll", "betflip", "blackjack", "betdraw", "slot",
     });
 
-    private ConcurrentDictionary<string, (decimal Bet, decimal PaidOut)> _stats = new();
+    private NonBlocking.ConcurrentDictionary<string, (decimal Bet, decimal PaidOut)> globalStats = new();
+    private ConcurrentBag<UserBetStats> userStats = new();
 
     private readonly DbService _db;
 
@@ -28,83 +26,283 @@ public sealed class GamblingTxTracker : ITxTracker, INService, IReadyExecutor
     }
 
     public async Task OnReadyAsync()
+        => await Task.WhenAll(RunUserStatsCollector(), RunBetStatsCollector());
+
+    public async Task RunBetStatsCollector()
     {
         using var timer = new PeriodicTimer(TimeSpan.FromHours(1));
         while (await timer.WaitForNextTickAsync())
         {
             await using var ctx = _db.GetDbContext();
-            await using var trans = await ctx.Database.BeginTransactionAsync();
 
             try
             {
-                var keys = _stats.Keys;
+                // update betstats
+                var keys = globalStats.Keys;
                 foreach (var key in keys)
                 {
-                    if (_stats.TryRemove(key, out var stat))
+                    if (globalStats.TryRemove(key, out var stat))
                     {
                         await ctx.GetTable<GamblingStats>()
-                            .InsertOrUpdateAsync(() => new()
-                            {
-                                Feature = key,
-                                Bet = stat.Bet,
-                                PaidOut = stat.PaidOut,
-                                DateAdded = DateTime.UtcNow
-                            }, old => new()
-                            {
-                                Bet = old.Bet + stat.Bet,
-                                PaidOut = old.PaidOut + stat.PaidOut,
-                            }, () => new()
-                            {
-                                Feature = key
-                            });
+                                 .InsertOrUpdateAsync(() => new()
+                                     {
+                                         Feature = key,
+                                         Bet = stat.Bet,
+                                         PaidOut = stat.PaidOut,
+                                         DateAdded = DateTime.UtcNow
+                                     },
+                                     old => new()
+                                     {
+                                         Bet = old.Bet + stat.Bet,
+                                         PaidOut = old.PaidOut + stat.PaidOut,
+                                     },
+                                     () => new()
+                                     {
+                                         Feature = key
+                                     });
                     }
                 }
             }
             catch (Exception ex)
             {
-                Log.Error(ex, "An error occurred in gambling tx tracker");
-            }
-            finally
-            {
-                await trans.CommitAsync();
+                Log.Error(ex, "An error occurred in betstats gambling tx tracker");
             }
         }
     }
 
-    public Task TrackAdd(long amount, TxData? txData)
+    private async Task RunUserStatsCollector()
+    {
+        var timer = new PeriodicTimer(TimeSpan.FromSeconds(5));
+        while (await timer.WaitForNextTickAsync())
+        {
+            try
+            {
+                if (userStats.Count == 0)
+                    continue;
+
+                var users = new List<UserBetStats>(userStats.Count + 5);
+
+                while (userStats.TryTake(out var s))
+                    users.Add(s);
+
+                if (users.Count == 0)
+                    continue;
+
+                foreach (var (k, x) in users.GroupBy(x => (x.UserId, x.Game))
+                                            .ToDictionary(x => x.Key,
+                                                x => x.Aggregate((a, b) => new()
+                                                {
+                                                    WinCount = a.WinCount + b.WinCount,
+                                                    LoseCount = a.LoseCount + b.LoseCount,
+                                                    TotalBet = a.TotalBet + b.TotalBet,
+                                                    PaidOut = a.PaidOut + b.PaidOut,
+                                                    MaxBet = Math.Max(a.MaxBet, b.MaxBet),
+                                                    MaxWin = Math.Max(a.MaxWin, b.MaxWin),
+                                                })))
+                {
+                    // bulk upsert in the future
+                    await using var uow = _db.GetDbContext();
+                    await uow.GetTable<UserBetStats>()
+                             .InsertOrUpdateAsync(() => new()
+                                 {
+                                     UserId = k.UserId,
+                                     Game = k.Game,
+                                     WinCount = x.WinCount,
+                                     LoseCount = Math.Max(0, x.LoseCount),
+                                     TotalBet = x.TotalBet,
+                                     PaidOut = x.PaidOut,
+                                     MaxBet = x.MaxBet,
+                                     MaxWin = x.MaxWin
+                                 },
+                                 o => new()
+                                 {
+                                     WinCount = o.WinCount + x.WinCount,
+                                     LoseCount = Math.Max(0, o.LoseCount + x.LoseCount),
+                                     TotalBet = o.TotalBet + x.TotalBet,
+                                     PaidOut = o.PaidOut + x.PaidOut,
+                                     MaxBet = Math.Max(o.MaxBet, x.MaxBet),
+                                     MaxWin = Math.Max(o.MaxWin, x.MaxWin),
+                                 },
+                                 () => new()
+                                 {
+                                     UserId = k.UserId,
+                                     Game = k.Game
+                                 });
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "An error occurred in UserBetStats gambling tx tracker");
+            }
+        }
+    }
+
+    public Task TrackAdd(ulong userId, long amount, TxData? txData)
     {
         if (txData is null)
             return Task.CompletedTask;
-        
+
         if (_gamblingTypes.Contains(txData.Type))
         {
-            _stats.AddOrUpdate(txData.Type,
+            globalStats.AddOrUpdate(txData.Type,
                 _ => (0, amount),
                 (_, old) => (old.Bet, old.PaidOut + amount));
         }
 
+        var mType = GetGameType(txData.Type);
+
+        if (mType is not { } type)
+            return Task.CompletedTask;
+
+        if (txData.Type == "lula")
+        {
+            if (txData.Extra == "lose")
+            {
+                userStats.Add(new()
+                {
+                    UserId = userId,
+                    Game = type,
+                    WinCount = 0,
+                    LoseCount = 0,
+                    TotalBet = 0,
+                    PaidOut = amount,
+                    MaxBet = 0,
+                    MaxWin = amount,
+                });
+                return Task.CompletedTask;
+            }
+        }
+        else if (txData.Type == "animalrace")
+        {
+            if (txData.Extra == "refund")
+            {
+                userStats.Add(new()
+                {
+                    UserId = userId,
+                    Game = type,
+                    WinCount = 0,
+                    LoseCount = -1,
+                    TotalBet = -amount,
+                    PaidOut = 0,
+                    MaxBet = 0,
+                    MaxWin = 0,
+                });
+
+                return Task.CompletedTask;
+            }
+        }
+
+        userStats.Add(new UserBetStats()
+        {
+            UserId = userId,
+            Game = type,
+            WinCount = 1,
+            LoseCount = -1,
+            TotalBet = 0,
+            PaidOut = amount,
+            MaxBet = 0,
+            MaxWin = amount,
+        });
+
         return Task.CompletedTask;
     }
 
-    public Task TrackRemove(long amount, TxData? txData)
+    public Task TrackRemove(ulong userId, long amount, TxData? txData)
     {
         if (txData is null)
             return Task.CompletedTask;
-        
+
         if (_gamblingTypes.Contains(txData.Type))
         {
-            _stats.AddOrUpdate(txData.Type,
+            globalStats.AddOrUpdate(txData.Type,
                 _ => (amount, 0),
                 (_, old) => (old.Bet + amount, old.PaidOut));
         }
 
+        var mType = GetGameType(txData.Type);
+
+        if (mType is not { } type)
+            return Task.CompletedTask;
+
+        userStats.Add(new UserBetStats()
+        {
+            UserId = userId,
+            Game = type,
+            WinCount = 0,
+            LoseCount = 1,
+            TotalBet = amount,
+            PaidOut = 0,
+            MaxBet = amount,
+            MaxWin = 0
+        });
+
         return Task.CompletedTask;
     }
 
+    private static GamblingGame? GetGameType(string game)
+        => game switch
+        {
+            "lula" => GamblingGame.Lula,
+            "betroll" => GamblingGame.Betroll,
+            "betflip" => GamblingGame.Betflip,
+            "blackjack" => GamblingGame.Blackjack,
+            "betdraw" => GamblingGame.Betdraw,
+            "slot" => GamblingGame.Slots,
+            "animalrace" => GamblingGame.Race,
+            _ => null
+        };
+
     public async Task<IReadOnlyCollection<GamblingStats>> GetAllAsync()
     {
         await using var ctx = _db.GetDbContext();
         return await ctx.Set<GamblingStats>()
-            .ToListAsyncEF();
+                        .ToListAsyncEF();
     }
+
+    public async Task<List<UserBetStats>> GetUserStatsAsync(ulong userId, GamblingGame? game = null)
+    {
+        await using var ctx = _db.GetDbContext();
+
+
+        if (game is null)
+            return await ctx
+                         .GetTable<UserBetStats>()
+                         .Where(x => x.UserId == userId)
+                         .ToListAsync();
+
+        return await ctx
+                     .GetTable<UserBetStats>()
+                     .Where(x => x.UserId == userId && x.Game == game)
+                     .ToListAsync();
+    }
+}
+
+public sealed class UserBetStats
+{
+    public int Id { get; set; }
+    public ulong UserId { get; set; }
+    public GamblingGame Game { get; set; }
+    public long WinCount { get; set; }
+    public long LoseCount { get; set; }
+    public decimal TotalBet { get; set; }
+    public decimal PaidOut { get; set; }
+    public long MaxWin { get; set; }
+    public long MaxBet { get; set; }
+}
+
+public enum GamblingGame
+{
+    Betflip = 0,
+    Bf = 0,
+    Betroll = 1,
+    Br = 1,
+    Betdraw = 2,
+    Bd = 2,
+    Slots = 3,
+    Slot = 3,
+    Blackjack = 4,
+    Bj = 4,
+    Lula = 5,
+    Race = 6,
+    AnimalRace = 6
 }

src/NadekoBot/data/aliases.yml

@@ -848,6 +848,10 @@ eventstart:
   - eventstart
 betstats:
   - betstats
+  - bs
+gamblestats:
+  - gamblestats
+  - gs
 bettest:
   - bettest
 slot:

src/NadekoBot/data/commandlist.json

@@ -2758,11 +2758,29 @@
   "Gambling": [
     {
       "Aliases": [
-        ".betstats"
+        ".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": [
-        ".betstats"
+        ".gamblestats"
       ],
       "Submodule": "Gambling",
       "Module": "Gambling",
@@ -6160,6 +6178,24 @@
       "Options": null,
       "Requirements": []
     },
+    {
+      "Aliases": [
+        ".translateflags",
+        ".trfl",
+        ".fltr",
+        ".transflags"
+      ],
+      "Description": "Toggles translate flags on the current channel.\nReacting with a country flag will translate the message to that country's language.",
+      "Usage": [
+        ".translateflags"
+      ],
+      "Submodule": "TranslateCommands",
+      "Module": "Searches",
+      "Options": null,
+      "Requirements": [
+        "ManageChannels Channel Permission"
+      ]
+    },
     {
       "Aliases": [
         ".xkcd"

src/NadekoBot/data/gambling.yml

@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 9
+version: 11
 # Currency settings
 currency:
   # What is the emoji/character which represents the currency
@@ -56,8 +56,9 @@ timely:
   # How often (in hours) can users claim currency with .timely command
   # setting to 0 or less will disable this feature
   cooldown: 12
-  # Whether the users are required to type a password when they do timely.
-  requirePassword: true
+  # How will timely be protected?
+  # None, Button (users have to click the button) or Captcha (users have to type the captcha from an image)
+  protType: Captcha
 # How much will each user's owned currency decay over time.
 decay:
   # Percentage of user's current currency which will be deducted every 24h.
@@ -273,3 +274,10 @@ voteReward: 100
 slots:
   # Hex value of the color which the numbers on the slot image will have.
   currencyFontColor: ff0000
+# Bonus config for server boosts
+boostBonus:
+  # Users will receive a bonus if they boost any of these servers
+  guildIds:
+    - 117523346618318850
+  # This bonus will be added before any other multiplier is applied to the .timely command
+  baseTimelyBonus: 50

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

@@ -2703,7 +2703,7 @@ eventstart:
         desc: "The type of event being started."
       options:
         desc: "The optional option flags for the event."
-betstats:
+gamblestats:
   desc: |-
     Shows the total stats of several gambling features.
     Updates once an hour.
@@ -4641,4 +4641,24 @@ translateflags:
   ex:
     - ''
   params:
-    - { }
+    - { }
+betstats:
+  desc: |-
+    Shows the current bet stats for yourself, or the targetted user.
+    You may optionally specify the game to show stats for.
+    Supported games right now are: bf, br, bd, lula, slot, race
+  ex:
+    - ''
+    - '@someone'
+    - '@someone lula'
+    - 'bd'
+  params:
+    - {}
+    - user:
+        desc: 'The user for who to show the betstats for.'
+    - user:
+        desc: 'The user for who to show the betstats for.'
+      game:
+        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'

src/NadekoBot/migrate.ps1

@@ -3,7 +3,7 @@ if ($args.Length -eq 0) {
 }
 else {
     $migrationName = $args[0]
-    dotnet ef migrations add $migrationName -c SqliteContext -p src/NadekoBot/NadekoBot.csproj
-    dotnet ef migrations add $migrationName -c PostgreSqlContext -p src/NadekoBot/NadekoBot.csproj
+    dotnet ef migrations add $migrationName -c SqliteContext -p NadekoBot.csproj
+    dotnet ef migrations add $migrationName -c PostgreSqlContext -p NadekoBot.csproj
 }
 

src/NadekoBot/remove-migration.ps1

@@ -0,0 +1,3 @@
+dotnet ef migrations remove -c SqliteContext -f -p NadekoBot.csproj
+dotnet ef migrations remove -c PostgreSqlContext -f -p NadekoBot.csproj
+