Updated version to 4.3.9

Cmdcd and cleanup

See merge request Kwoth/nadekobot!269

.gitlab-ci.yml

@@ -104,7 +104,7 @@ publish-medusa-package:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_TAG
   script:
     - LAST_TAG=$(git describe --tags --abbrev=0)
-    - if [ $CI_COMMIT_TAG ];then MEDUSA_VERSION="$CI_COMMIT_TAG"; else MEDUSA_VERSION="$LAST_TAG-$CI_COMMIT_SHA"; fi
+    - if [ $CI_COMMIT_TAG ];then MEDUSA_VERSION="$CI_COMMIT_TAG"; else MEDUSA_VERSION="$LAST_TAG-$CI_COMMIT_SHORT_SHA"; fi
     - cd src/Nadeko.Medusa/
     - dotnet pack -c Release /p:Version=$MEDUSA_VERSION -o bin/Release/packed
     - dotnet nuget push bin/Release/packed/ --source https://www.myget.org/F/nadeko/api/v2/package --api-key "$MYGET_API_KEY"

CHANGELOG.md

@@ -2,7 +2,83 @@
 
 Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
-## Unreleased
+## [4.3.9] - 12.10.2022
+
+### Added 
+
+- `.betstats` shows sum of all bets, payouts and the payout rate in %. Updates once an hour
+
+### Changed
+
+- `.betstats` looks way better (except on Mac)
+- `.feedadd` errors clarified and separated in individual error messages for each issue.
+- `.clubban` and `.clubunban` errors clarified and separated in individual error messages for each issue.
+- `.clubapply` better error messages
+
+### Fixed
+
+- `.timely` 'Remind' button fixed in DMs
+- `.cmdcd` database bugs fixed
+- Fixed bugged mysql and postgresql migrations
+- Fixed issues with lodaing medusae due to strict versioning
+
+### Removed
+
+- `.slotstats` Superseded by `.betstats`
+
+## [4.3.8] - 02.10.2022
+
+### Added
+
+- Added `.autopublish` command which will automatically publish messages posted in the channel.
+- Added `--after <messageid>` option to prune which will make prune only delete messages after the specified message id.
+
+### Changed
+
+- `.prune` options `--after` and `--safe` are now proper command options, and will show in .h help
+- `.cmdcd` code mostly rewritten, slight QoL improvements.
+- Clarified `.remind` permission requirements in help text
+- `.cmdcds` looks a little better, and is paginated
+
+### Fixed
+
+- Fixed trivia bugs
+- Fixed `.yun` not working with channels with underscore in the name
+
+## [4.3.7] - 14.09.2022
+
+### Added
+
+- Added `.exprdelserv` (.exds) to completement .exas. Deletes an expression on the current server and is susceptible to .dpo, unlike .exd
+- Added `.shopreq` which lets you set role requirement for specific shop items
+- Added `.shopbuy` alias to `.buy`
+
+### Fixed
+
+- Fixed `.convertlist` showing currencies twice (this may not apply to existing users and it may require you to manually remove all currencies from units.json)
+
+### Removed
+
+- Removed `Viewer` field from stream online notification as it is (almost?) always 0.
+
+## [4.3.6] - 08.09.2022
+
+### Added
+
+- Added `.expraddserver` (.exas) which will server as a server-only alternative to '.exa' in case users want to override default Admin permissions with .dpo
+- Added .banprune command which sets how many days worth of messages will be pruned when bot (soft)bans a person either through a command or another punishment feature.
+- Added .qdelauth - Delete all quotes by the specified author on this server. If you target yourself - no permission required
+- Added `.timeout` command
+- Added an option to award currency based on received xp
+
+### Changed
+
+- Reminders now have embed support, but plaintext field is not supported.
+- User friendlier errors when parsing a number in a command fails
+
+### Fixed
+
+- Awarded xp is now correctly used in level up calculations
 
 ## [4.3.5] - 17.08.2022
 

docs/creds-guide.md

@@ -33,17 +33,17 @@ These are required for a number of features to function properly, and all should
 For a single owner, it should look like this:
 
 ```yml
-    OwnerIds:
-        - 105635576866156544
+OwnerIds:
+  - 105635576866156544
 ```
 
 For multiple owners, it should look like this:
 
 ```yml
-    OwnerIds:
-        - 105635123466156544
-        - 145521851676884992
-        - 341420590009417729
+OwnerIds:
+  - 105635123466156544
+  - 145521851676884992
+  - 341420590009417729
 ```
 
 

docs/guides/linux-guide.md

@@ -1,4 +1,4 @@
-# Setting up NadekoBot on Linux
+w# Setting up NadekoBot on Linux
 
 | Table of Contents                                   |
 | :-------------------------------------------------- |
@@ -17,7 +17,7 @@ It is recommended that you use **Ubuntu 20.04**, as there have been nearly no pr
 
 ##### Compatible operating systems:
 
-- Ubuntu: 16.04, 18.04, 20.04, 21.04, 21.10 22.04
+- Ubuntu: 16.04, 18.04, 20.04, 21.04, 21.10, 22.04
 - Mint: 19, 20
 - Debian: 9, 10
 - CentOS: 7
@@ -160,15 +160,30 @@ If you are presented with the installer main menu, exit it by choosing Option `8
 
 The above command will create a new session named **nadeko** *(you can replace “nadeko” with anything you prefer, it's your session name)*.
 
-2. Navigate to the project's root directory
-    - Project root directory location example: `cd /home/user/nadekobot/`
-3. Enter the `output` directory:
-    - `cd output`
-4. Run the bot using:
-    - `dotnet NadekoBot.dll`
-5. Detatch the tmux session:
+2. Run the installer: `bash linuxAIO.sh`
+
+3. There are a few options when it comes to running Nadeko.
+
+    - Run `3` to *Run the bot normally*
+    - Run `4` to *Run the bot with Auto Restart* (This is may or may not work)
+
+4. If option `4` was selected, you have the following options
+```
+1. Run Auto Restart normally without updating NadekoBot.
+2. Run Auto Restart and update NadekoBot.
+3. Exit
+
+Choose:
+[1] to Run NadekoBot with Auto Restart on "die" command without updating.
+[2] to Run with Auto Updating on restart after using "die" command.
+```
+- Run `1` to update the bot upon restart. (This is done using the `.die` command)
+- Run `2` to restart the bot without updating. (This is also done using the `.die` command)
+
+5. That's it! to detatch the tmux session:
     - Press `Ctrl` + `B`
     - Then press `D`
+
 Now check your Discord server, the bot should be online. Nadeko should now be running in the background of your system. 
 
 To re-open the tmux session to either update, restart, or whatever, execute `tmux a -t nadeko`. *(Make sure to replace "nadeko" with your session name. If you didn't change it, leave it as it.)*
@@ -301,6 +316,26 @@ This method is similar to the one above, but requires one extra step, with the a
 
 If you want Nadeko to play music for you 24/7 without having to hosting it on your PC and want to keep it cheap, reliable and convenient as possible, you can try Nadeko on Linux Digital Ocean Droplet using the link [DigitalOcean](http://m.do.co/c/46b4d3d44795/) (by using this link, you will get **$10 credit** and also support Nadeko)
 
+To set up the VPS, please select the options below
+```
+These are the min requirements you must follow:
+
+OS: Any between Ubuntu, Fedora, and Debian
+
+Plan: Basic
+
+CPU options: regular with SSD
+1 GB / 1 CPU
+25 GB SSD Disk
+1000 GB transfer
+
+Note: You can select the cheapest option with 512 MB /1 CPU but this has been a hit or miss.
+
+Datacenter region: Choose one depending on where you are located.
+
+Authentication: Password or SSH 
+(Select SSH if you know what you are doing, otherwise choose password)
+```
 **Setting up NadekoBot**
 Assuming you have followed the link above to setup an account and a Droplet with a 64-bit operational system on Digital Ocean and got the `IP address and root password (in your e-mail)` to login, it's time to get started.
 

src/Nadeko.Medusa/Nadeko.Medusa.csproj

@@ -12,9 +12,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Discord.Net.Core" Version="3.103.0" />
+      <PackageReference Include="Discord.Net.Core" Version="3.104.0" />
       <PackageReference Include="Serilog" Version="2.11.0" />
       <PackageReference Include="YamlDotNet" Version="11.2.1" />
     </ItemGroup>
 
+    <PropertyGroup Condition=" '$(Version)' == '' ">
+        <Version>5.0.0</Version>
+    </PropertyGroup>
 </Project>

src/NadekoBot/Bot.cs

@@ -3,14 +3,12 @@ using Microsoft.Extensions.DependencyInjection;
 using NadekoBot.Common.Configs;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Db;
-using NadekoBot.Modules.Administration;
 using NadekoBot.Modules.Utility;
 using NadekoBot.Services.Database.Models;
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Net;
 using System.Reflection;
-using Nadeko.Common;
 using RunMode = Discord.Commands.RunMode;
 
 namespace NadekoBot;
@@ -118,10 +116,6 @@ public sealed class Bot
                                           // cache
                                           .AddCache(_creds);
         
-        // admin
-#if GLOBAL_NADEKO
-        svcs.AddSingleton<ILogCommandService, DummyLogCommandService>();
-#endif
 
         svcs.AddHttpClient();
         svcs.AddHttpClient("memelist")

src/NadekoBot/Common/Interaction/NadekoInteraction.cs

@@ -38,19 +38,19 @@ public sealed class NadekoInteraction
         await msg.ModifyAsync(m => m.Components = new ComponentBuilder().Build());
     }
     
-    private async Task OnInteraction(SocketInteraction arg)
+    private Task OnInteraction(SocketInteraction arg)
     {
         if (arg is not SocketMessageComponent smc)
-            return;
+            return Task.CompletedTask;
 
         if (smc.Message.Id != message.Id)
-            return;
+            return Task.CompletedTask;
 
         if (_onlyAuthor && smc.User.Id != _authorId)
-            return;
+            return Task.CompletedTask;
 
         if (smc.Data.CustomId != _button.CustomId)
-            return;
+            return Task.CompletedTask;
 
         _ = Task.Run(async () =>
         {
@@ -64,6 +64,8 @@ public sealed class NadekoInteraction
                 await smc.DeferAsync();
             }
         });
+        
+        return Task.CompletedTask;
     }
 
 

src/NadekoBot/Common/TypeReaders/GuildUserTypeReader.cs

@@ -0,0 +1,33 @@
+namespace NadekoBot.Common.TypeReaders;
+
+public sealed class GuildUserTypeReader : NadekoTypeReader<IGuildUser>
+{
+    public override async ValueTask<TypeReaderResult<IGuildUser>> ReadAsync(ICommandContext ctx, string input)
+    {
+        if (ctx.Guild is null)
+            return TypeReaderResult.FromError<IGuildUser>(CommandError.Unsuccessful, "Must be in a guild.");
+
+        input = input.Trim();
+        IGuildUser? user = null;
+        if (MentionUtils.TryParseUser(input, out var id))
+            user = await ctx.Guild.GetUserAsync(id, CacheMode.AllowDownload);
+        
+        if (ulong.TryParse(input, out id))
+            user = await ctx.Guild.GetUserAsync(id, CacheMode.AllowDownload);
+
+        if (user is null)
+        {
+            var users = await ctx.Guild.GetUsersAsync(CacheMode.CacheOnly);
+            user = users.FirstOrDefault(x => x.Username == input)
+                   ?? users.FirstOrDefault(x =>
+                       string.Equals(x.ToString(), input, StringComparison.InvariantCultureIgnoreCase))
+                   ?? users.FirstOrDefault(x =>
+                       string.Equals(x.Username, input, StringComparison.InvariantCultureIgnoreCase));
+        }
+
+        if (user is null)
+            return TypeReaderResult.FromError<IGuildUser>(CommandError.ObjectNotFound, "User not found.");
+        
+        return TypeReaderResult.FromSuccess(user);
+    }
+}

src/NadekoBot/Db/Extensions/CurrencyTransactionExtensions.cs

@@ -1,4 +1,5 @@
 #nullable disable
+using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Services.Database.Models;
 
@@ -6,12 +7,14 @@ namespace NadekoBot.Db;
 
 public static class CurrencyTransactionExtensions
 {
-    public static List<CurrencyTransaction> GetPageFor(this DbSet<CurrencyTransaction> set, ulong userId, int page)
-        => set.AsQueryable()
-              .AsNoTracking()
-              .Where(x => x.UserId == userId)
-              .OrderByDescending(x => x.DateAdded)
-              .Skip(15 * page)
-              .Take(15)
-              .ToList();
+    public static Task<List<CurrencyTransaction>> GetPageFor(
+        this DbSet<CurrencyTransaction> set,
+        ulong userId,
+        int page)
+        => set.ToLinqToDBTable()
+            .Where(x => x.UserId == userId)
+            .OrderByDescending(x => x.DateAdded)
+            .Skip(15 * page)
+            .Take(15)
+            .ToListAsyncLinqToDB();
 }

src/NadekoBot/Db/Models/AutoPublishChannel.cs

@@ -0,0 +1,9 @@
+using NadekoBot.Services.Database.Models;
+
+namespace NadekoBot.Db.Models;
+
+public class AutoPublishChannel : DbEntity
+{
+    public ulong GuildId { get; set; }
+    public ulong ChannelId { get; set; }
+}

src/NadekoBot/Db/Models/BanTemplate.cs

@@ -5,4 +5,5 @@ public class BanTemplate : DbEntity
 {
     public ulong GuildId { get; set; }
     public string Text { get; set; }
+    public int? PruneDays { get; set; }
 }

src/NadekoBot/Db/Models/GamblingStats.cs

@@ -0,0 +1,9 @@
+#nullable disable
+namespace NadekoBot.Services.Database.Models;
+
+public class GamblingStats : DbEntity
+{
+    public string Feature { get; set; }
+    public decimal Bet { get; set; }
+    public decimal PaidOut { get; set; }
+}

src/NadekoBot/Db/Models/ShopEntry.cs

@@ -24,6 +24,7 @@ public class ShopEntry : DbEntity, IIndexed
 
     //list
     public HashSet<ShopEntryItem> Items { get; set; } = new();
+    public ulong? RoleRequirement { get; set; }
 }
 
 public class ShopEntryItem : DbEntity

src/NadekoBot/Db/NadekoContext.cs

@@ -330,6 +330,10 @@ public abstract class NadekoContext : DbContext
         #region BanTemplate
 
         modelBuilder.Entity<BanTemplate>().HasIndex(x => x.GuildId).IsUnique();
+        modelBuilder.Entity<BanTemplate>()
+            .Property(x => x.PruneDays)
+            .HasDefaultValue(null)
+            .IsRequired(false);
 
         #endregion
 
@@ -460,6 +464,22 @@ public abstract class NadekoContext : DbContext
             });
 
         #endregion
+        
+        #region AutoPublish
+
+        modelBuilder.Entity<AutoPublishChannel>(apc => apc
+            .HasIndex(x => x.GuildId)
+            .IsUnique());
+
+        #endregion
+        
+        #region GamblingStats
+
+        modelBuilder.Entity<GamblingStats>(gs => gs
+            .HasIndex(x => x.Feature)
+            .IsUnique());
+
+        #endregion
     }
 
 #if DEBUG

src/NadekoBot/Migrations/Mysql/20220831142722_banprune.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.Mysql
+{
+    public partial class banprune : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "prunedays",
+                table: "bantemplates",
+                type: "int",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "prunedays",
+                table: "bantemplates");
+        }
+    }
+}

src/NadekoBot/Migrations/Mysql/20220913192520_shop-role-req.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.Mysql
+{
+    public partial class shoprolereq : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<ulong>(
+                name: "rolerequirement",
+                table: "shopentry",
+                type: "bigint unsigned",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "rolerequirement",
+                table: "shopentry");
+        }
+    }
+}

src/NadekoBot/Migrations/Mysql/20220916194514_autopub.cs

@@ -0,0 +1,42 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.Mysql
+{
+    public partial class autopub : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "autopublishchannel",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    guildid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
+                    channelid = table.Column<ulong>(type: "bigint unsigned", nullable: false),
+                    dateadded = table.Column<DateTime>(type: "datetime(6)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_autopublishchannel", x => x.id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "ix_autopublishchannel_guildid",
+                table: "autopublishchannel",
+                column: "guildid",
+                unique: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "autopublishchannel");
+        }
+    }
+}

src/NadekoBot/Migrations/Mysql/20221003175743_gambling-stats.cs

@@ -0,0 +1,44 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.Mysql
+{
+    public partial class gamblingstats : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "gamblingstats",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    feature = table.Column<string>(type: "varchar(255)", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    bet = table.Column<decimal>(type: "decimal(65,30)", nullable: false),
+                    paidout = table.Column<decimal>(type: "decimal(65,30)", nullable: false),
+                    dateadded = table.Column<DateTime>(type: "datetime(6)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_gamblingstats", x => x.id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "ix_gamblingstats_feature",
+                table: "gamblingstats",
+                column: "feature",
+                unique: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "gamblingstats");
+        }
+    }
+}

src/NadekoBot/Migrations/Mysql/MysqlContextModelSnapshot.cs

@@ -19,6 +19,35 @@ namespace NadekoBot.Migrations.Mysql
                 .HasAnnotation("ProductVersion", "6.0.7")
                 .HasAnnotation("Relational:MaxIdentifierLength", 64);
 
+            modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int")
+                        .HasColumnName("id");
+
+                    b.Property<ulong>("ChannelId")
+                        .HasColumnType("bigint unsigned")
+                        .HasColumnName("channelid");
+
+                    b.Property<DateTime?>("DateAdded")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("dateadded");
+
+                    b.Property<ulong>("GuildId")
+                        .HasColumnType("bigint unsigned")
+                        .HasColumnName("guildid");
+
+                    b.HasKey("Id")
+                        .HasName("pk_autopublishchannel");
+
+                    b.HasIndex("GuildId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_autopublishchannel_guildid");
+
+                    b.ToTable("autopublishchannel", (string)null);
+                });
+
             modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b =>
                 {
                     b.Property<int>("Id")
@@ -675,6 +704,10 @@ namespace NadekoBot.Migrations.Mysql
                         .HasColumnType("bigint unsigned")
                         .HasColumnName("guildid");
 
+                    b.Property<int?>("PruneDays")
+                        .HasColumnType("int")
+                        .HasColumnName("prunedays");
+
                     b.Property<string>("Text")
                         .HasColumnType("longtext")
                         .HasColumnName("text");
@@ -1068,6 +1101,39 @@ namespace NadekoBot.Migrations.Mysql
                     b.ToTable("filterwordschannelid", (string)null);
                 });
 
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.GamblingStats", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int")
+                        .HasColumnName("id");
+
+                    b.Property<decimal>("Bet")
+                        .HasColumnType("decimal(65,30)")
+                        .HasColumnName("bet");
+
+                    b.Property<DateTime?>("DateAdded")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("dateadded");
+
+                    b.Property<string>("Feature")
+                        .HasColumnType("varchar(255)")
+                        .HasColumnName("feature");
+
+                    b.Property<decimal>("PaidOut")
+                        .HasColumnType("decimal(65,30)")
+                        .HasColumnName("paidout");
+
+                    b.HasKey("Id")
+                        .HasName("pk_gamblingstats");
+
+                    b.HasIndex("Feature")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gamblingstats_feature");
+
+                    b.ToTable("gamblingstats", (string)null);
+                });
+
             modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
@@ -2232,6 +2298,10 @@ namespace NadekoBot.Migrations.Mysql
                         .HasColumnType("longtext")
                         .HasColumnName("rolename");
 
+                    b.Property<ulong?>("RoleRequirement")
+                        .HasColumnType("bigint unsigned")
+                        .HasColumnName("rolerequirement");
+
                     b.Property<int>("Type")
                         .HasColumnType("int")
                         .HasColumnName("type");

src/NadekoBot/Migrations/PostgreSql/20220831142735_banprune.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.PostgreSql
+{
+    public partial class banprune : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "prunedays",
+                table: "bantemplates",
+                type: "integer",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "prunedays",
+                table: "bantemplates");
+        }
+    }
+}

src/NadekoBot/Migrations/PostgreSql/20220913192529_shop-role-req.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.PostgreSql
+{
+    public partial class shoprolereq : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<decimal>(
+                name: "rolerequirement",
+                table: "shopentry",
+                type: "numeric(20,0)",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "rolerequirement",
+                table: "shopentry");
+        }
+    }
+}

src/NadekoBot/Migrations/PostgreSql/20220916194523_autopub.cs

@@ -0,0 +1,51 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.PostgreSql
+{
+    public partial class autopub : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<decimal>(
+                name: "rolerequirement",
+                table: "shopentry",
+                type: "numeric(20,0)",
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "autopublishchannel",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    guildid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
+                    channelid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
+                    dateadded = table.Column<DateTime>(type: "timestamp without time zone", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_autopublishchannel", x => x.id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_autopublishchannel_guildid",
+                table: "autopublishchannel",
+                column: "guildid",
+                unique: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "autopublishchannel");
+
+            migrationBuilder.DropColumn(
+                name: "rolerequirement",
+                table: "shopentry");
+        }
+    }
+}

src/NadekoBot/Migrations/PostgreSql/20221003175752_gambling-stats.cs

@@ -0,0 +1,42 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.PostgreSql
+{
+    public partial class gamblingstats : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "gamblingstats",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    feature = table.Column<string>(type: "text", nullable: true),
+                    bet = table.Column<decimal>(type: "numeric", nullable: false),
+                    paidout = table.Column<decimal>(type: "numeric", nullable: false),
+                    dateadded = table.Column<DateTime>(type: "timestamp without time zone", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_gamblingstats", x => x.id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_gamblingstats_feature",
+                table: "gamblingstats",
+                column: "feature",
+                unique: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "gamblingstats");
+        }
+    }
+}

src/NadekoBot/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs

@@ -22,6 +22,37 @@ namespace NadekoBot.Migrations.PostgreSql
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
+            modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<decimal>("ChannelId")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("channelid");
+
+                    b.Property<DateTime?>("DateAdded")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("dateadded");
+
+                    b.Property<decimal>("GuildId")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("guildid");
+
+                    b.HasKey("Id")
+                        .HasName("pk_autopublishchannel");
+
+                    b.HasIndex("GuildId")
+                        .IsUnique()
+                        .HasDatabaseName("ix_autopublishchannel_guildid");
+
+                    b.ToTable("autopublishchannel", (string)null);
+                });
+
             modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b =>
                 {
                     b.Property<int>("Id")
@@ -705,6 +736,10 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnType("numeric(20,0)")
                         .HasColumnName("guildid");
 
+                    b.Property<int?>("PruneDays")
+                        .HasColumnType("integer")
+                        .HasColumnName("prunedays");
+
                     b.Property<string>("Text")
                         .HasColumnType("text")
                         .HasColumnName("text");
@@ -1122,6 +1157,41 @@ namespace NadekoBot.Migrations.PostgreSql
                     b.ToTable("filterwordschannelid", (string)null);
                 });
 
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.GamblingStats", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<decimal>("Bet")
+                        .HasColumnType("numeric")
+                        .HasColumnName("bet");
+
+                    b.Property<DateTime?>("DateAdded")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("dateadded");
+
+                    b.Property<string>("Feature")
+                        .HasColumnType("text")
+                        .HasColumnName("feature");
+
+                    b.Property<decimal>("PaidOut")
+                        .HasColumnType("numeric")
+                        .HasColumnName("paidout");
+
+                    b.HasKey("Id")
+                        .HasName("pk_gamblingstats");
+
+                    b.HasIndex("Feature")
+                        .IsUnique()
+                        .HasDatabaseName("ix_gamblingstats_feature");
+
+                    b.ToTable("gamblingstats", (string)null);
+                });
+
             modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
@@ -2338,6 +2408,10 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnType("text")
                         .HasColumnName("rolename");
 
+                    b.Property<decimal?>("RoleRequirement")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("rolerequirement");
+
                     b.Property<int>("Type")
                         .HasColumnType("integer")
                         .HasColumnName("type");

src/NadekoBot/Migrations/Sqlite/20220831142504_banprune.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations
+{
+    public partial class banprune : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "PruneDays",
+                table: "BanTemplates",
+                type: "INTEGER",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "PruneDays",
+                table: "BanTemplates");
+        }
+    }
+}

src/NadekoBot/Migrations/Sqlite/20220913190532_shop-role-req.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations
+{
+    public partial class shoprolereq : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<ulong>(
+                name: "RoleRequirement",
+                table: "ShopEntry",
+                type: "INTEGER",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "RoleRequirement",
+                table: "ShopEntry");
+        }
+    }
+}

src/NadekoBot/Migrations/Sqlite/20220916191702_autopub.cs

@@ -0,0 +1,40 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations
+{
+    public partial class autopub : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "AutoPublishChannel",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    GuildId = table.Column<ulong>(type: "INTEGER", nullable: false),
+                    ChannelId = table.Column<ulong>(type: "INTEGER", nullable: false),
+                    DateAdded = table.Column<DateTime>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AutoPublishChannel", x => x.Id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AutoPublishChannel_GuildId",
+                table: "AutoPublishChannel",
+                column: "GuildId",
+                unique: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "AutoPublishChannel");
+        }
+    }
+}

src/NadekoBot/Migrations/Sqlite/20221003111019_gambling-stats.cs

@@ -0,0 +1,41 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations
+{
+    public partial class gamblingstats : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "GamblingStats",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    Feature = table.Column<string>(type: "TEXT", nullable: true),
+                    Bet = table.Column<decimal>(type: "TEXT", nullable: false),
+                    PaidOut = table.Column<decimal>(type: "TEXT", nullable: false),
+                    DateAdded = table.Column<DateTime>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_GamblingStats", x => x.Id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_GamblingStats_Feature",
+                table: "GamblingStats",
+                column: "Feature",
+                unique: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "GamblingStats");
+        }
+    }
+}

src/NadekoBot/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs

@@ -17,6 +17,29 @@ namespace NadekoBot.Migrations
 #pragma warning disable 612, 618
             modelBuilder.HasAnnotation("ProductVersion", "6.0.7");
 
+            modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<ulong>("ChannelId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<ulong>("GuildId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GuildId")
+                        .IsUnique();
+
+                    b.ToTable("AutoPublishChannel");
+                });
+
             modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b =>
                 {
                     b.Property<int>("Id")
@@ -529,6 +552,9 @@ namespace NadekoBot.Migrations
                     b.Property<ulong>("GuildId")
                         .HasColumnType("INTEGER");
 
+                    b.Property<int?>("PruneDays")
+                        .HasColumnType("INTEGER");
+
                     b.Property<string>("Text")
                         .HasColumnType("TEXT");
 
@@ -838,6 +864,32 @@ namespace NadekoBot.Migrations
                     b.ToTable("FilterWordsChannelId");
                 });
 
+            modelBuilder.Entity("NadekoBot.Services.Database.Models.GamblingStats", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("Bet")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Feature")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("PaidOut")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Feature")
+                        .IsUnique();
+
+                    b.ToTable("GamblingStats");
+                });
+
             modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
                 {
                     b.Property<int>("Id")
@@ -1742,6 +1794,9 @@ namespace NadekoBot.Migrations
                     b.Property<string>("RoleName")
                         .HasColumnType("TEXT");
 
+                    b.Property<ulong?>("RoleRequirement")
+                        .HasColumnType("INTEGER");
+
                     b.Property<int>("Type")
                         .HasColumnType("INTEGER");
 

src/NadekoBot/Modules/Administration/Administration.cs

@@ -33,9 +33,13 @@ public partial class Administration : NadekoModule<AdministrationService>
     }
 
     private readonly SomethingOnlyChannelService _somethingOnly;
+    private readonly AutoPublishService _autoPubService;
 
-    public Administration(SomethingOnlyChannelService somethingOnly)
-        => _somethingOnly = somethingOnly;
+    public Administration(SomethingOnlyChannelService somethingOnly, AutoPublishService autoPubService)
+    {
+        _somethingOnly = somethingOnly;
+        _autoPubService = autoPubService;
+    }
 
     [Cmd]
     [RequireContext(ContextType.Guild)]
@@ -376,4 +380,26 @@ public partial class Administration : NadekoModule<AdministrationService>
         await t.DeleteAsync();
         await ctx.OkAsync();
     }
+
+    [Cmd]
+    [UserPerm(ChannelPerm.ManageMessages)]
+    public async Task AutoPublish()
+    {
+        if (ctx.Channel.GetChannelType() != ChannelType.News)
+        {
+            await ReplyErrorLocalizedAsync(strs.req_announcement_channel);
+            return;
+        }
+
+        var newState = await _autoPubService.ToggleAutoPublish(ctx.Guild.Id, ctx.Channel.Id);
+
+        if (newState)
+        {
+            await ReplyConfirmLocalizedAsync(strs.autopublish_enable);
+        }
+        else
+        {
+            await ReplyConfirmLocalizedAsync(strs.autopublish_disable);
+        }
+    }
 }

src/NadekoBot/Modules/Administration/AdministrationService.cs

@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using Nadeko.Common;
 using NadekoBot.Db;
 using NadekoBot.Services.Database.Models;
 

src/NadekoBot/Modules/Administration/AutoPublishService.cs

@@ -0,0 +1,87 @@
+#nullable disable
+using LinqToDB;
+using LinqToDB.EntityFrameworkCore;
+using NadekoBot.Common.ModuleBehaviors;
+using NadekoBot.Db.Models;
+
+namespace NadekoBot.Modules.Administration.Services;
+
+public class AutoPublishService : IExecNoCommand, IReadyExecutor, INService
+{
+    private readonly DbService _db;
+    private readonly DiscordSocketClient _client;
+    private readonly IBotCredsProvider _creds;
+    private ConcurrentDictionary<ulong, ulong> _enabled;
+
+    public AutoPublishService(DbService db, DiscordSocketClient client, IBotCredsProvider creds)
+    {
+        _db = db;
+        _client = client;
+        _creds = creds;
+    } 
+    
+    public async Task ExecOnNoCommandAsync(IGuild guild, IUserMessage msg)
+    {
+        if (guild is null)
+            return;
+        
+        if (msg.Channel.GetChannelType() != ChannelType.News)
+            return;
+
+        if (!_enabled.TryGetValue(guild.Id, out var cid) || cid != msg.Channel.Id)
+            return;
+        
+        await msg.CrosspostAsync(new RequestOptions()
+        {
+            RetryMode = RetryMode.AlwaysFail
+        });
+    }
+
+    public async Task OnReadyAsync()
+    {
+        var creds = _creds.GetCreds();
+        
+        await using var ctx = _db.GetDbContext();
+        var items = await ctx.GetTable<AutoPublishChannel>()
+            .Where(x => Linq2DbExpressions.GuildOnShard(x.GuildId, creds.TotalShards, _client.ShardId))
+            .ToListAsyncLinqToDB();
+
+        _enabled = items
+            .ToDictionary(x => x.GuildId, x => x.ChannelId)
+            .ToConcurrent();
+    }
+    
+    public async Task<bool> ToggleAutoPublish(ulong guildId, ulong channelId)
+    {
+        await using var ctx = _db.GetDbContext();
+        var deleted = await ctx.GetTable<AutoPublishChannel>()
+            .DeleteAsync(x => x.GuildId == guildId && x.ChannelId == channelId);
+
+        if (deleted != 0)
+        {
+            _enabled.TryRemove(guildId, out _);
+            return false;
+        }
+
+        await ctx.GetTable<AutoPublishChannel>()
+            .InsertOrUpdateAsync(() => new()
+                {
+                    GuildId = guildId,
+                    ChannelId = channelId,
+                    DateAdded = DateTime.UtcNow,
+                },
+                old => new()
+                {
+                    ChannelId = channelId,
+                    DateAdded = DateTime.UtcNow,
+                },
+                () => new()
+                {
+                    GuildId = guildId
+                });
+        
+        _enabled[guildId] = channelId;
+
+        return true;
+    }
+}

src/NadekoBot/Modules/Administration/Mute/MuteService.cs

@@ -358,9 +358,10 @@ public class MuteService : INService
         IGuild guild,
         IUser user,
         TimeSpan after,
-        string reason)
+        string reason,
+        int pruneDays)
     {
-        await guild.AddBanAsync(user.Id, 0, reason);
+        await guild.AddBanAsync(user.Id, pruneDays, reason);
         await using (var uow = _db.GetDbContext())
         {
             var config = uow.GuildConfigsForId(guild.Id, set => set.Include(x => x.UnbanTimer));

src/NadekoBot/Modules/Administration/Prune/PruneCommands.cs

@@ -1,4 +1,5 @@
 #nullable disable
+using CommandLine;
 using NadekoBot.Modules.Administration.Services;
 
 namespace NadekoBot.Modules.Administration;
@@ -10,17 +11,34 @@ public partial class Administration
     {
         private static readonly TimeSpan _twoWeeks = TimeSpan.FromDays(14);
 
-        //delets her own messages, no perm required
+        public sealed class PruneOptions : INadekoCommandOptions
+        {
+            [Option(shortName: 's', longName: "safe", Default = false, HelpText = "Whether pinned messages should be deleted.", Required = false)]
+            public bool Safe { get; set; }
+            
+            [Option(shortName: 'a', longName: "after", Default = null, HelpText = "Prune only messages after the specified message ID.", Required = false)]
+            public ulong? After { get; set; }
+
+            public void NormalizeOptions()
+            {
+            }
+        }
+        
+        //deletes her own messages, no perm required
         [Cmd]
         [RequireContext(ContextType.Guild)]
-        public async Task Prune(string parameter = null)
+        [NadekoOptions(typeof(PruneOptions))]
+        public async Task Prune(params string[] args)
         {
+            var (opts, _) = OptionsParser.ParseFrom<PruneOptions>(new PruneOptions(), args);
+            
             var user = await ctx.Guild.GetCurrentUserAsync();
 
-            if (parameter is "-s" or "--safe")
-                await _service.PruneWhere((ITextChannel)ctx.Channel, 100, x => x.Author.Id == user.Id && !x.IsPinned);
+            if (opts.Safe)
+                await _service.PruneWhere((ITextChannel)ctx.Channel, 100, x => x.Author.Id == user.Id && !x.IsPinned, opts.After);
             else
-                await _service.PruneWhere((ITextChannel)ctx.Channel, 100, x => x.Author.Id == user.Id);
+                await _service.PruneWhere((ITextChannel)ctx.Channel, 100, x => x.Author.Id == user.Id, opts.After);
+            
             ctx.Message.DeleteAfter(3);
         }
 
@@ -29,8 +47,9 @@ public partial class Administration
         [RequireContext(ContextType.Guild)]
         [UserPerm(ChannelPerm.ManageMessages)]
         [BotPerm(ChannelPerm.ManageMessages)]
+        [NadekoOptions(typeof(PruneOptions))]
         [Priority(1)]
-        public async Task Prune(int count, string parameter = null)
+        public async Task Prune(int count, params string[] args)
         {
             count++;
             if (count < 1)
@@ -38,10 +57,12 @@ public partial class Administration
             if (count > 1000)
                 count = 1000;
             
-            if (parameter is "-s" or "--safe")
-                await _service.PruneWhere((ITextChannel)ctx.Channel, count, x => !x.IsPinned);
+            var (opts, _) = OptionsParser.ParseFrom<PruneOptions>(new PruneOptions(), args);
+
+            if (opts.Safe)
+                await _service.PruneWhere((ITextChannel)ctx.Channel, count, x => !x.IsPinned, opts.After);
             else
-                await _service.PruneWhere((ITextChannel)ctx.Channel, count, _ => true);
+                await _service.PruneWhere((ITextChannel)ctx.Channel, count, _ => true, opts.After);
         }
 
         //prune @user [x]
@@ -49,17 +70,19 @@ public partial class Administration
         [RequireContext(ContextType.Guild)]
         [UserPerm(ChannelPerm.ManageMessages)]
         [BotPerm(ChannelPerm.ManageMessages)]
+        [NadekoOptions(typeof(PruneOptions))]
         [Priority(0)]
-        public Task Prune(IGuildUser user, int count = 100, string parameter = null)
-            => Prune(user.Id, count, parameter);
+        public Task Prune(IGuildUser user, int count = 100, string args = null)
+            => Prune(user.Id, count, args);
 
         //prune userid [x]
         [Cmd]
         [RequireContext(ContextType.Guild)]
         [UserPerm(ChannelPerm.ManageMessages)]
         [BotPerm(ChannelPerm.ManageMessages)]
+        [NadekoOptions(typeof(PruneOptions))]
         [Priority(0)]
-        public async Task Prune(ulong userId, int count = 100, string parameter = null)
+        public async Task Prune(ulong userId, int count = 100, params string[] args)
         {
             if (userId == ctx.User.Id)
                 count++;
@@ -70,17 +93,21 @@ public partial class Administration
             if (count > 1000)
                 count = 1000;
 
-            if (parameter is "-s" or "--safe")
+            var (opts, _) = OptionsParser.ParseFrom<PruneOptions>(new PruneOptions(), args);
+            
+            if (opts.Safe)
             {
                 await _service.PruneWhere((ITextChannel)ctx.Channel,
                     count,
-                    m => m.Author.Id == userId && DateTime.UtcNow - m.CreatedAt < _twoWeeks && !m.IsPinned);
+                    m => m.Author.Id == userId && DateTime.UtcNow - m.CreatedAt < _twoWeeks && !m.IsPinned,
+                    opts.After);
             }
             else
             {
                 await _service.PruneWhere((ITextChannel)ctx.Channel,
                     count,
-                    m => m.Author.Id == userId && DateTime.UtcNow - m.CreatedAt < _twoWeeks);
+                    m => m.Author.Id == userId && DateTime.UtcNow - m.CreatedAt < _twoWeeks,
+                    opts.After);
             }
         }
     }

src/NadekoBot/Modules/Administration/Prune/PruneService.cs

@@ -1,6 +1,4 @@
 #nullable disable
-using Nadeko.Common;
-
 namespace NadekoBot.Modules.Administration.Services;
 
 public class PruneService : INService
@@ -13,7 +11,7 @@ public class PruneService : INService
     public PruneService(ILogCommandService logService)
         => _logService = logService;
 
-    public async Task PruneWhere(ITextChannel channel, int amount, Func<IMessage, bool> predicate)
+    public async Task PruneWhere(ITextChannel channel, int amount, Func<IMessage, bool> predicate, ulong? after = null)
     {
         ArgumentNullException.ThrowIfNull(channel, nameof(channel));
 
@@ -28,7 +26,14 @@ public class PruneService : INService
             var now = DateTime.UtcNow;
             IMessage[] msgs;
             IMessage lastMessage = null;
-            msgs = (await channel.GetMessagesAsync(50).FlattenAsync()).Where(predicate).Take(amount).ToArray();
+            var dled = await channel.GetMessagesAsync(50).FlattenAsync();
+            
+            msgs = dled
+                .Where(predicate)
+                .Where(x => after is ulong a ? x.Id > a : true)
+                .Take(amount)
+                .ToArray();
+            
             while (amount > 0 && msgs.Any())
             {
                 lastMessage = msgs[^1];
@@ -62,10 +67,13 @@ public class PruneService : INService
                 amount -= 50;
                 if (amount > 0)
                 {
-                    msgs = (await channel.GetMessagesAsync(lastMessage, Direction.Before, 50).FlattenAsync())
-                           .Where(predicate)
-                           .Take(amount)
-                           .ToArray();
+                    dled = await channel.GetMessagesAsync(lastMessage, Direction.Before, 50).FlattenAsync();
+
+                    msgs = dled
+                        .Where(predicate)
+                        .Where(x => after is ulong a ? x.Id > a : true)
+                        .Take(amount)
+                        .ToArray();
                 }
             }
         }

src/NadekoBot/Modules/Administration/Role/ReactionRoleCommands.cs

@@ -67,42 +67,52 @@ public partial class Administration
         [RequireContext(ContextType.Guild)]
         [UserPerm(GuildPerm.ManageRoles)]
         [BotPerm(GuildPerm.ManageRoles)]
-        public async Task ReactionRolesList()
+        public async Task ReactionRolesList(int page = 1)
         {
+            if (--page < 0)
+                return;
+            
             var reros = await _rero.GetReactionRolesAsync(ctx.Guild.Id);
 
-            var embed = _eb.Create(ctx)
-                           .WithOkColor();
-
-            var content = string.Empty;
-            foreach (var g in reros.GroupBy(x => x.MessageId).OrderBy(x => x.Key))
+            await ctx.SendPaginatedConfirmAsync(page, curPage =>
             {
-                var messageId = g.Key;
-                content +=
-                    $"[{messageId}](https://discord.com/channels/{ctx.Guild.Id}/{g.First().ChannelId}/{g.Key})\n";
+                var embed = _eb.Create(ctx)
+                               .WithOkColor();
 
-                var groupGroups = g.GroupBy(x => x.Group);
-
-                foreach (var ggs in groupGroups)
+                var content = string.Empty;
+                foreach (var g in reros.OrderBy(x => x.Group)
+                                       .Skip(curPage * 10)
+                                       .GroupBy(x => x.MessageId)
+                                       .OrderBy(x => x.Key))
                 {
-                    content += $"`< {(g.Key == 0 ? ("Not Exclusive (Group 0)") : ($"Group {ggs.Key}"))} >`\n";
+                    var messageId = g.Key;
+                    content +=
+                        $"[{messageId}](https://discord.com/channels/{ctx.Guild.Id}/{g.First().ChannelId}/{g.Key})\n";
 
-                    foreach (var rero in ggs)
+                    var groupGroups = g.GroupBy(x => x.Group);
+
+                    foreach (var ggs in groupGroups)
                     {
-                        content += $"\t{rero.Emote} -> {(ctx.Guild.GetRole(rero.RoleId)?.Mention ?? "<missing role>")}";
-                        if (rero.LevelReq > 0)
-                            content += $" (lvl {rero.LevelReq}+)";
-                        content += '\n';
+                        content += $"`< {(g.Key == 0 ? ("Not Exclusive (Group 0)") : ($"Group {ggs.Key}"))} >`\n";
+
+                        foreach (var rero in ggs)
+                        {
+                            content +=
+                                $"\t{rero.Emote} -> {(ctx.Guild.GetRole(rero.RoleId)?.Mention ?? "<missing role>")}";
+                            if (rero.LevelReq > 0)
+                                content += $" (lvl {rero.LevelReq}+)";
+                            content += '\n';
+                        }
                     }
+
                 }
 
-            }
+                embed.WithDescription(string.IsNullOrWhiteSpace(content)
+                    ? "There are no reaction roles on this server"
+                    : content);
 
-            embed.WithDescription(string.IsNullOrWhiteSpace(content)
-                ? "There are no reaction roles on this server"
-                : content);
-
-            await ctx.Channel.EmbedAsync(embed);
+                return embed;
+            }, reros.Count, 10);
         }
 
         [Cmd]

src/NadekoBot/Modules/Administration/ServerLog/DummyLogCommandService.cs

@@ -3,6 +3,9 @@
 namespace NadekoBot.Modules.Administration;
 
 public sealed class DummyLogCommandService : ILogCommandService
+#if GLOBAL_NADEKO
+, INService
+#endif
 {
     public void AddDeleteIgnore(ulong xId)
     {

src/NadekoBot/Modules/Administration/UserPunish/UserPunishCommands.cs

@@ -429,7 +429,8 @@ public partial class Administration
                 }
             }
 
-            await _mute.TimedBan(ctx.Guild, user, time.Time, (ctx.User + " | " + msg).TrimTo(512));
+            var banPrune = await _service.GetBanPruneAsync(ctx.Guild.Id) ?? 7;
+            await _mute.TimedBan(ctx.Guild, user, time.Time, (ctx.User + " | " + msg).TrimTo(512), banPrune);
             var toSend = _eb.Create()
                             .WithOkColor()
                             .WithTitle("⛔️ " + GetText(strs.banned_user))
@@ -455,7 +456,8 @@ public partial class Administration
             var user = await ((DiscordSocketClient)Context.Client).Rest.GetGuildUserAsync(ctx.Guild.Id, userId);
             if (user is null)
             {
-                await ctx.Guild.AddBanAsync(userId, 7, (ctx.User + " | " + msg).TrimTo(512));
+                var banPrune = await _service.GetBanPruneAsync(ctx.Guild.Id) ?? 7;
+                await ctx.Guild.AddBanAsync(userId, banPrune, (ctx.User + " | " + msg).TrimTo(512));
 
                 await ctx.Channel.EmbedAsync(_eb.Create()
                                                 .WithOkColor()
@@ -490,7 +492,8 @@ public partial class Administration
                 dmFailed = true;
             }
 
-            await ctx.Guild.AddBanAsync(user, 7, (ctx.User + " | " + msg).TrimTo(512));
+            var banPrune = await _service.GetBanPruneAsync(ctx.Guild.Id) ?? 7;
+            await ctx.Guild.AddBanAsync(user, banPrune, (ctx.User + " | " + msg).TrimTo(512));
 
             var toSend = _eb.Create()
                             .WithOkColor()
@@ -504,6 +507,26 @@ public partial class Administration
             await ctx.Channel.EmbedAsync(toSend);
         }
 
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.BanMembers)]
+        [BotPerm(GuildPerm.BanMembers)]
+        public async Task BanPrune(int days)
+        {
+            if (days < 0 || days > 7)
+            {
+                await ReplyErrorLocalizedAsync(strs.invalid_input);
+                return;
+            }
+            
+            await _service.SetBanPruneAsync(ctx.Guild.Id, days);
+            
+            if (days == 0)
+                await ReplyConfirmLocalizedAsync(strs.ban_prune_disabled);
+            else
+                await ReplyConfirmLocalizedAsync(strs.ban_prune(days));
+        }
+
         [Cmd]
         [RequireContext(ContextType.Guild)]
         [UserPerm(GuildPerm.BanMembers)]
@@ -655,7 +678,8 @@ public partial class Administration
                 dmFailed = true;
             }
 
-            await ctx.Guild.AddBanAsync(user, 7, ("Softban | " + ctx.User + " | " + msg).TrimTo(512));
+            var banPrune = await _service.GetBanPruneAsync(ctx.Guild.Id) ?? 7;
+            await ctx.Guild.AddBanAsync(user, banPrune, ("Softban | " + ctx.User + " | " + msg).TrimTo(512));
             try { await ctx.Guild.RemoveBanAsync(user); }
             catch { await ctx.Guild.RemoveBanAsync(user); }
 
@@ -723,6 +747,49 @@ public partial class Administration
             await ctx.Channel.EmbedAsync(toSend);
         }
         
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.ModerateMembers)]
+        [BotPerm(GuildPerm.ModerateMembers)]
+        [Priority(2)]
+        public async Task Timeout(IUser globalUser, StoopidTime time,  [Leftover] string msg = null)
+        {
+            var user = await ctx.Guild.GetUserAsync(globalUser.Id);
+
+            if (user is null)
+                return;
+            
+            if (!await CheckRoleHierarchy(user))
+                return;
+
+            var dmFailed = false;
+
+            try
+            {
+                var dmMessage = GetText(strs.timeoutdm(Format.Bold(ctx.Guild.Name), msg));
+                await user.EmbedAsync(_eb.Create(ctx)
+                        .WithPendingColor()
+                        .WithDescription(dmMessage));
+            }
+            catch
+            {
+                dmFailed = true;
+            }
+            
+            await user.SetTimeOutAsync(time.Time);
+
+            var toSend = _eb.Create()
+                .WithOkColor()
+                .WithTitle("⏳ " + GetText(strs.timedout_user))
+                .AddField(GetText(strs.username), user.ToString(), true)
+                .AddField("ID", user.Id.ToString(), true);
+
+            if (dmFailed)
+                toSend.WithFooter("⚠️ " + GetText(strs.unable_to_dm_user));
+
+            await ctx.Channel.EmbedAsync(toSend);
+        }
+
         [Cmd]
         [RequireContext(ContextType.Guild)]
         [UserPerm(GuildPerm.BanMembers)]
@@ -779,11 +846,12 @@ public partial class Administration
 
             var banningMessage = await ctx.Channel.EmbedAsync(toSend);
 
+            var banPrune = await _service.GetBanPruneAsync(ctx.Guild.Id) ?? 7;
             foreach (var toBan in banning)
             {
                 try
                 {
-                    await ctx.Guild.AddBanAsync(toBan.Id, 7, $"{ctx.User} | Massban");
+                    await ctx.Guild.AddBanAsync(toBan.Id, banPrune, $"{ctx.User} | Massban");
                 }
                 catch (Exception ex)
                 {
@@ -822,10 +890,11 @@ public partial class Administration
                                                                .AddField(GetText(strs.invalid(missing)), missStr)
                                                                .WithPendingColor());
 
+            var banPrune = await _service.GetBanPruneAsync(ctx.Guild.Id) ?? 7;
             //do the banning
             await Task.WhenAll(bans.Where(x => x.Id.HasValue)
                                    .Select(x => ctx.Guild.AddBanAsync(x.Id.Value,
-                                       7,
+                                       banPrune,
                                        x.Reason,
                                        new()
                                        {

src/NadekoBot/Modules/Administration/UserPunish/UserPunishService.cs

@@ -1,5 +1,6 @@
 #nullable disable
 using LinqToDB;
+using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Common.TypeReaders.Models;
@@ -127,6 +128,7 @@ public class UserPunishService : INService, IReadyExecutor
         if (!await CheckPermission(guild, p))
             return;
 
+        int banPrune;
         switch (p)
         {
             case PunishmentAction.Mute:
@@ -151,13 +153,15 @@ public class UserPunishService : INService, IReadyExecutor
                 await user.KickAsync(reason);
                 break;
             case PunishmentAction.Ban:
+                banPrune = await GetBanPruneAsync(user.GuildId) ?? 7;
                 if (minutes == 0)
-                    await guild.AddBanAsync(user, reason: reason, pruneDays: 7);
+                    await guild.AddBanAsync(user, reason: reason, pruneDays: banPrune);
                 else
-                    await _mute.TimedBan(user.Guild, user, TimeSpan.FromMinutes(minutes), reason);
+                    await _mute.TimedBan(user.Guild, user, TimeSpan.FromMinutes(minutes), reason, banPrune);
                 break;
             case PunishmentAction.Softban:
-                await guild.AddBanAsync(user, 7, $"Softban | {reason}");
+                banPrune = await GetBanPruneAsync(user.GuildId) ?? 7;
+                await guild.AddBanAsync(user, banPrune, $"Softban | {reason}");
                 try
                 {
                     await guild.RemoveBanAsync(user);
@@ -489,6 +493,37 @@ public class UserPunishService : INService, IReadyExecutor
         uow.SaveChanges();
     }
 
+    public async Task SetBanPruneAsync(ulong guildId, int? pruneDays)
+    {
+        await using var ctx = _db.GetDbContext();
+        await ctx.BanTemplates
+            .ToLinqToDBTable()
+            .InsertOrUpdateAsync(() => new()
+                {
+                    GuildId = guildId,
+                    Text = null,
+                    DateAdded = DateTime.UtcNow,
+                    PruneDays = pruneDays
+                },
+                old => new()
+                {
+                    PruneDays = pruneDays
+                },
+                () => new()
+                {
+                    GuildId = guildId
+                });
+    }
+
+    public async Task<int?> GetBanPruneAsync(ulong guildId)
+    {
+        await using var ctx = _db.GetDbContext();
+        return await ctx.BanTemplates
+            .Where(x => x.GuildId == guildId)
+            .Select(x => x.PruneDays)
+            .FirstOrDefaultAsyncLinqToDB();
+    }
+
     public SmartText GetBanUserDmEmbed(
         ICommandContext context,
         IGuildUser target,

src/NadekoBot/Modules/CustomReactions/NadekoExpressions.cs

@@ -1,7 +1,5 @@
 #nullable disable
 
-using Nadeko.Common;
-
 namespace NadekoBot.Modules.NadekoExpressions;
 
 [Name("Expressions")]
@@ -25,15 +23,10 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
         => (ctx.Guild is null && _creds.IsOwner(ctx.User))
            || (ctx.Guild is not null && ((IGuildUser)ctx.User).GuildPermissions.Administrator);
 
-    [Cmd]
-    public async Task ExprAdd(string key, [Leftover] string message)
+    private async Task ExprAddInternalAsync(string key, string message)
     {
         if (string.IsNullOrWhiteSpace(message) || string.IsNullOrWhiteSpace(key))
-            return;
-
-        if (!AdminInGuildOrOwnerInDm())
         {
-            await ReplyErrorLocalizedAsync(strs.expr_insuff_perms);
             return;
         }
 
@@ -48,12 +41,43 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
                                             message.Length > 1024 ? GetText(strs.redacted_too_long) : message));
     }
 
+    [Cmd]
+    [UserPerm(GuildPerm.Administrator)]
+    public async Task ExprAddServer(string key, [Leftover] string message)
+    {
+        if (string.IsNullOrWhiteSpace(message) || string.IsNullOrWhiteSpace(key))
+        {
+            return;
+        }
+
+        await ExprAddInternalAsync(key, message);
+    }
+
+    [Cmd]
+    public async Task ExprAdd(string key, [Leftover] string message)
+    {
+        if (string.IsNullOrWhiteSpace(message) || string.IsNullOrWhiteSpace(key))
+        {
+            return;
+        }
+
+        if (!AdminInGuildOrOwnerInDm())
+        {
+            await ReplyErrorLocalizedAsync(strs.expr_insuff_perms);
+            return;
+        }
+
+        await ExprAddInternalAsync(key, message);
+    }
+
     [Cmd]
     public async Task ExprEdit(kwum id, [Leftover] string message)
     {
         var channel = ctx.Channel as ITextChannel;
         if (string.IsNullOrWhiteSpace(message) || id < 0)
+        {
             return;
+        }
 
         if ((channel is null && !_creds.IsOwner(ctx.User))
             || (channel is not null && !((IGuildUser)ctx.User).GuildPermissions.Administrator))
@@ -74,7 +98,9 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
                                                 message.Length > 1024 ? GetText(strs.redacted_too_long) : message));
         }
         else
+        {
             await ReplyErrorLocalizedAsync(strs.expr_no_found_id);
+        }
     }
 
     [Cmd]
@@ -82,7 +108,9 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
     public async Task ExprList(int page = 1)
     {
         if (--page < 0 || page > 999)
+        {
             return;
+        }
 
         var expressions = _service.GetExpressionsFor(ctx.Guild?.Id);
 
@@ -132,15 +160,8 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
                                             found.Response.TrimTo(1000).Replace("](", "]\\(")));
     }
 
-    [Cmd]
-    public async Task ExprDelete(kwum id)
+    public async Task ExprDeleteInternalAsync(kwum id)
     {
-        if (!AdminInGuildOrOwnerInDm())
-        {
-            await ReplyErrorLocalizedAsync(strs.expr_insuff_perms);
-            return;
-        }
-
         var ex = await _service.DeleteAsync(ctx.Guild?.Id, id);
 
         if (ex is not null)
@@ -153,7 +174,27 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
                                             .AddField(GetText(strs.response), ex.Response.TrimTo(1024)));
         }
         else
+        {
             await ReplyErrorLocalizedAsync(strs.expr_no_found_id);
+        }
+    }
+
+    [Cmd]
+    [UserPerm(GuildPerm.Administrator)]
+    [RequireContext(ContextType.Guild)]
+    public async Task ExprDeleteServer(kwum id)
+        => await ExprDeleteInternalAsync(id);
+
+    [Cmd]
+    public async Task ExprDelete(kwum id)
+    {
+        if (!AdminInGuildOrOwnerInDm())
+        {
+            await ReplyErrorLocalizedAsync(strs.expr_insuff_perms);
+            return;
+        }
+
+        await ExprDeleteInternalAsync(id);
     }
 
     [Cmd]
@@ -192,7 +233,9 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
                 succ.Add(emojiStr);
 
                 if (succ.Count >= 3)
+                {
                     break;
+                }
             }
             catch { }
         }

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

@@ -145,6 +145,9 @@ public partial class Gambling
         
         public async Task BetDrawInternal(long amount, InputValueGuess? val, InputColorGuess? col)
         {
+            if (amount <= 0)
+                return;
+            
             var res = await _service.BetDrawAsync(ctx.User.Id,
                 amount,
                 (byte?)val,

src/NadekoBot/Modules/Gambling/Gambling.cs

@@ -29,6 +29,7 @@ public partial class Gambling : GamblingModule<GamblingService>
     private readonly IBankService _bank;
     private readonly IPatronageService _ps;
     private readonly RemindService _remind;
+    private readonly GamblingTxTracker _gamblingTxTracker;
 
     private IUserMessage rdMsg;
 
@@ -41,7 +42,8 @@ public partial class Gambling : GamblingModule<GamblingService>
         GamblingConfigService configService,
         IBankService bank,
         IPatronageService ps,
-        RemindService remind)
+        RemindService remind,
+        GamblingTxTracker gamblingTxTracker)
         : base(configService)
     {
         _gs = gs;
@@ -51,6 +53,7 @@ public partial class Gambling : GamblingModule<GamblingService>
         _bank = bank;
         _ps = ps;
         _remind = remind;
+        _gamblingTxTracker = gamblingTxTracker;
 
         _enUsCulture = new CultureInfo("en-US", false).NumberFormat;
         _enUsCulture.NumberDecimalDigits = 0;
@@ -65,6 +68,43 @@ public partial class Gambling : GamblingModule<GamblingService>
         return N(bal);
     }
 
+    [Cmd]
+    public async Task BetStats()
+    {
+        var stats = await _gamblingTxTracker.GetAllAsync();
+
+        var eb = _eb.Create(ctx)
+            .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 ctx.Channel.EmbedAsync(eb);
+    }
+
     [Cmd]
     public async Task Economy()
     {
@@ -79,15 +119,15 @@ public partial class Gambling : GamblingModule<GamblingService>
 
         // [21:03] Bob Page: Kinda remids me of US economy
         var embed = _eb.Create()
-                       .WithTitle(GetText(strs.economy_state))
-                       .AddField(GetText(strs.currency_owned), N(ec.Cash - ec.Bot))
-                       .AddField(GetText(strs.currency_one_percent), (onePercent * 100).ToString("F2") + "%")
-                       .AddField(GetText(strs.currency_planted), N(ec.Planted))
-                       .AddField(GetText(strs.owned_waifus_total), N(ec.Waifus))
-                       .AddField(GetText(strs.bot_currency), N(ec.Bot))
-                       .AddField(GetText(strs.bank_accounts), N(ec.Bank))
-                       .AddField(GetText(strs.total), N(ec.Cash + ec.Planted + ec.Waifus + ec.Bank))
-                       .WithOkColor();
+            .WithTitle(GetText(strs.economy_state))
+            .AddField(GetText(strs.currency_owned), N(ec.Cash - ec.Bot))
+            .AddField(GetText(strs.currency_one_percent), (onePercent * 100).ToString("F2") + "%")
+            .AddField(GetText(strs.currency_planted), N(ec.Planted))
+            .AddField(GetText(strs.owned_waifus_total), N(ec.Waifus))
+            .AddField(GetText(strs.bot_currency), N(ec.Bot))
+            .AddField(GetText(strs.bank_accounts), N(ec.Bank))
+            .AddField(GetText(strs.total), N(ec.Cash + ec.Planted + ec.Waifus + ec.Bank))
+            .WithOkColor();
 
         // ec.Cash already contains ec.Bot as it's the total of all values in the CurrencyAmount column of the DiscordUser table
         await ctx.Channel.EmbedAsync(embed);
@@ -105,7 +145,7 @@ public partial class Gambling : GamblingModule<GamblingService>
 
         await _remind.AddReminderAsync(ctx.User.Id,
             ctx.User.Id,
-            ctx.Guild.Id,
+            ctx.Guild?.Id,
             true,
             when,
             GetText(strs.timely_time));
@@ -249,13 +289,13 @@ public partial class Gambling : GamblingModule<GamblingService>
         List<CurrencyTransaction> trs;
         await using (var uow = _db.GetDbContext())
         {
-            trs = uow.CurrencyTransactions.GetPageFor(userId, page);
+            trs = await uow.CurrencyTransactions.GetPageFor(userId, page);
         }
 
         var embed = _eb.Create()
-                       .WithTitle(GetText(strs.transactions(((SocketGuild)ctx.Guild)?.GetUser(userId)?.ToString()
-                                                            ?? $"{userId}")))
-                       .WithOkColor();
+            .WithTitle(GetText(strs.transactions(((SocketGuild)ctx.Guild)?.GetUser(userId)?.ToString()
+                                                 ?? $"{userId}")))
+            .WithOkColor();
 
         var sb = new StringBuilder();
         foreach (var tr in trs)
@@ -292,8 +332,8 @@ public partial class Gambling : GamblingModule<GamblingService>
         await using var uow = _db.GetDbContext();
 
         var tr = await uow.CurrencyTransactions.ToLinqToDBTable()
-                          .Where(x => x.Id == intId && x.UserId == ctx.User.Id)
-                          .FirstOrDefaultAsync();
+            .Where(x => x.Id == intId && x.UserId == ctx.User.Id)
+            .FirstOrDefaultAsync();
 
         if (tr is null)
         {
@@ -354,9 +394,9 @@ public partial class Gambling : GamblingModule<GamblingService>
         var balance = await _bank.GetBalanceAsync(ctx.User.Id);
 
         await N(balance)
-              .Pipe(strs.bank_balance)
-              .Pipe(GetText)
-              .Pipe(text => smc.RespondConfirmAsync(_eb, text, ephemeral: true));
+            .Pipe(strs.bank_balance)
+            .Pipe(GetText)
+            .Pipe(text => smc.RespondConfirmAsync(_eb, text, ephemeral: true));
     }
 
     private NadekoInteraction CreateCashInteraction()
@@ -799,8 +839,8 @@ public partial class Gambling : GamblingModule<GamblingService>
         }
         else if (result.Result == RpsResultType.Win)
         {
-            if((long)result.Won > 0)
-                 embed.AddField(GetText(strs.won), N(amount.Value));
+            if ((long)result.Won > 0)
+                embed.AddField(GetText(strs.won), N(amount.Value));
 
             msg = GetText(strs.rps_win(ctx.User.Mention,
                 GetRpsPick(pick),
@@ -863,99 +903,98 @@ public partial class Gambling : GamblingModule<GamblingService>
     }
 
 
-        public enum GambleTestTarget
+    public enum GambleTestTarget
+    {
+        Slot,
+        Betroll,
+        Betflip,
+        BetflipT,
+        BetDraw,
+        BetDrawHL,
+        BetDrawRB,
+        Lula,
+        Rps,
+    }
+
+    [Cmd]
+    [OwnerOnly]
+    public async Task BetTest()
+    {
+        await SendConfirmAsync(GetText(strs.available_tests),
+            Enum.GetValues<GambleTestTarget>()
+                .Select(x => $"`{x}`")
+                .Join(", "));
+    }
+
+    [Cmd]
+    [OwnerOnly]
+    public async Task BetTest(GambleTestTarget target, int tests = 1000)
+    {
+        if (tests <= 0)
+            return;
+
+        await ctx.Channel.TriggerTypingAsync();
+
+        var streak = 0;
+        var maxW = 0;
+        var maxL = 0;
+
+        var dict = new Dictionary<decimal, int>();
+        for (var i = 0; i < tests; i++)
         {
-            Slot,
-            Betroll,
-            Betflip,
-            BetflipT,
-            BetDraw,
-            BetDrawHL,
-            BetDrawRB,
-            Lula,
-            Rps,
-        }
-
-        [Cmd]
-        [OwnerOnly]
-        public async Task BetTest()
-        {
-            await SendConfirmAsync(GetText(strs.available_tests),
-                Enum.GetValues<GambleTestTarget>()
-                    .Select(x => $"`{x}`")
-                    .Join(", "));
-        }
-
-        [Cmd]
-        [OwnerOnly]
-        public async Task BetTest(GambleTestTarget target, int tests = 1000)
-        {
-            if (tests <= 0)
-                return;
-            
-            await ctx.Channel.TriggerTypingAsync();
-            
-            var streak = 0;
-            var maxW = 0;
-            var maxL = 0;
-            
-            var dict = new Dictionary<decimal, int>();
-            for (var i = 0; i < tests; i++)
+            var multi = target switch
             {
-                var multi = target switch
-                {
-                    GambleTestTarget.BetDraw => (await _gs.BetDrawAsync(ctx.User.Id, 0, 1, 0)).AsT0.Multiplier,
-                    GambleTestTarget.BetDrawRB => (await _gs.BetDrawAsync(ctx.User.Id, 0, null, 1)).AsT0.Multiplier,
-                    GambleTestTarget.BetDrawHL => (await _gs.BetDrawAsync(ctx.User.Id, 0, 0, null)).AsT0.Multiplier,
-                    GambleTestTarget.Slot => (await _gs.SlotAsync(ctx.User.Id, 0)).AsT0.Multiplier,
-                    GambleTestTarget.Betflip => (await _gs.BetFlipAsync(ctx.User.Id, 0, 0)).AsT0.Multiplier,
-                    GambleTestTarget.BetflipT => (await _gs.BetFlipAsync(ctx.User.Id, 0, 1)).AsT0.Multiplier,
-                    GambleTestTarget.Lula => (await _gs.LulaAsync(ctx.User.Id, 0)).AsT0.Multiplier,
-                    GambleTestTarget.Rps => (await _gs.RpsAsync(ctx.User.Id, 0, (byte)(i % 3))).AsT0.Multiplier,
-                    GambleTestTarget.Betroll => (await _gs.BetRollAsync(ctx.User.Id, 0)).AsT0.Multiplier,
-                    _ => throw new ArgumentOutOfRangeException(nameof(target))
-                };
+                GambleTestTarget.BetDraw => (await _gs.BetDrawAsync(ctx.User.Id, 0, 1, 0)).AsT0.Multiplier,
+                GambleTestTarget.BetDrawRB => (await _gs.BetDrawAsync(ctx.User.Id, 0, null, 1)).AsT0.Multiplier,
+                GambleTestTarget.BetDrawHL => (await _gs.BetDrawAsync(ctx.User.Id, 0, 0, null)).AsT0.Multiplier,
+                GambleTestTarget.Slot => (await _gs.SlotAsync(ctx.User.Id, 0)).AsT0.Multiplier,
+                GambleTestTarget.Betflip => (await _gs.BetFlipAsync(ctx.User.Id, 0, 0)).AsT0.Multiplier,
+                GambleTestTarget.BetflipT => (await _gs.BetFlipAsync(ctx.User.Id, 0, 1)).AsT0.Multiplier,
+                GambleTestTarget.Lula => (await _gs.LulaAsync(ctx.User.Id, 0)).AsT0.Multiplier,
+                GambleTestTarget.Rps => (await _gs.RpsAsync(ctx.User.Id, 0, (byte)(i % 3))).AsT0.Multiplier,
+                GambleTestTarget.Betroll => (await _gs.BetRollAsync(ctx.User.Id, 0)).AsT0.Multiplier,
+                _ => throw new ArgumentOutOfRangeException(nameof(target))
+            };
 
-                if (dict.ContainsKey(multi))
-                    dict[multi] += 1;
+            if (dict.ContainsKey(multi))
+                dict[multi] += 1;
+            else
+                dict.Add(multi, 1);
+
+            if (multi < 1)
+            {
+                if (streak <= 0)
+                    --streak;
                 else
-                    dict.Add(multi, 1);
+                    streak = -1;
 
-                if (multi < 1)
-                {
-                    if (streak <= 0)
-                        --streak;
-                    else
-                        streak = -1;
-
-                    maxL = Math.Max(maxL, -streak);
-                }
-                else if (multi > 1)
-                {
-                    if (streak >= 0)
-                        ++streak;
-                    else
-                        streak = 1;
-
-                    maxW = Math.Max(maxW, streak);
-                }
+                maxL = Math.Max(maxL, -streak);
             }
-            
-            var sb = new StringBuilder();
-            decimal payout = 0;
-            foreach (var key in dict.Keys.OrderByDescending(x => x))
+            else if (multi > 1)
             {
-                sb.AppendLine($"x**{key}** occured `{dict[key]}` times. {dict[key] * 1.0f / tests * 100}%");
-                payout += key * dict[key];
+                if (streak >= 0)
+                    ++streak;
+                else
+                    streak = 1;
+
+                maxW = Math.Max(maxW, streak);
             }
-
-            sb.AppendLine();
-            sb.AppendLine($"Longest win streak: `{maxW}`");
-            sb.AppendLine($"Longest lose streak: `{maxL}`");
-            
-            await SendConfirmAsync(GetText(strs.test_results_for(target)),
-                sb.ToString(),
-                footer: $"Total Bet: {tests} | Payout: {payout:F0} | {payout * 1.0M / tests * 100}%");
         }
 
+        var sb = new StringBuilder();
+        decimal payout = 0;
+        foreach (var key in dict.Keys.OrderByDescending(x => x))
+        {
+            sb.AppendLine($"x**{key}** occured `{dict[key]}` times. {dict[key] * 1.0f / tests * 100}%");
+            payout += key * dict[key];
+        }
+
+        sb.AppendLine();
+        sb.AppendLine($"Longest win streak: `{maxW}`");
+        sb.AppendLine($"Longest lose streak: `{maxL}`");
+
+        await SendConfirmAsync(GetText(strs.test_results_for(target)),
+            sb.ToString(),
+            footer: $"Total Bet: {tests} | Payout: {payout:F0} | {payout * 1.0M / tests * 100}%");
+    }
 }

src/NadekoBot/Modules/Gambling/GamblingConfig.cs

@@ -78,7 +78,7 @@ public class CurrencyConfig
     [Comment(@"What is the name of the currency")]
     public string Name { get; set; } = "Nadeko Flower";
 
-    [Comment(@"For how long will the transactions be kept in the database (curtrs)
+    [Comment(@"For how long (in days) will the transactions be kept in the database (curtrs)
 Set 0 to disable cleanup (keep transactions forever)")]
     public int TransactionsLifetime { get; set; } = 0;
 }

src/NadekoBot/Modules/Gambling/Shop/IShopService.cs

@@ -38,4 +38,6 @@ public interface IShopService
     /// <param name="toIndex">Destination index of the entry</param>
     /// <returns>Whether swap was successful</returns>
     Task<bool> MoveEntryAsync(ulong guildId, int fromIndex, int toIndex);
+
+    Task<bool> SetItemRoleRequirementAsync(ulong guildId, int index, ulong? roleId);
 }

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

@@ -98,6 +98,23 @@ public partial class Gambling
                 return;
             }
 
+            if (entry.RoleRequirement is ulong reqRoleId)
+            {
+                var role = ctx.Guild.GetRole(reqRoleId);
+                if (role is null)
+                {
+                    await ReplyErrorLocalizedAsync(strs.shop_item_req_role_not_found);
+                    return;
+                }
+
+                var guser = (IGuildUser)ctx.User;
+                if (!guser.RoleIds.Contains(reqRoleId))
+                {
+                    await ReplyErrorLocalizedAsync(strs.shop_item_req_role_unfulfilled(Format.Bold(role.ToString())));
+                    return;
+                }
+            }
+
             if (entry.Type == ShopEntryType.Role)
             {
                 var guser = (IGuildUser)ctx.User;
@@ -412,6 +429,27 @@ public partial class Gambling
                 await ctx.ErrorAsync();
         }
 
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.Administrator)]
+        public async Task ShopReq(int itemIndex, [Leftover] IRole role = null)
+        {
+            if (--itemIndex < 0)
+                return;
+
+            var succ = await _service.SetItemRoleRequirementAsync(ctx.Guild.Id, itemIndex, role?.Id);
+            if (!succ)
+            {
+                await ReplyErrorLocalizedAsync(strs.shop_item_not_found);
+                return;
+            }
+
+            if (role is null)
+                await ReplyConfirmLocalizedAsync(strs.shop_item_role_no_req(itemIndex));
+            else
+                await ReplyConfirmLocalizedAsync(strs.shop_item_role_req(itemIndex + 1, role));
+        }
+
         public IEmbedBuilder EntryToEmbed(ShopEntry entry)
         {
             var embed = _eb.Create().WithOkColor();
@@ -443,11 +481,17 @@ public partial class Gambling
 
         public string EntryToString(ShopEntry entry)
         {
+            var prepend = string.Empty;
+            if (entry.RoleRequirement is not null)
+                prepend = Format.Italics(GetText(strs.shop_item_requires_role($"<@&{entry.RoleRequirement}>")))
+                          + Environment.NewLine;
+
             if (entry.Type == ShopEntryType.Role)
-                return GetText(strs.shop_role(Format.Bold(ctx.Guild.GetRole(entry.RoleId)?.Name ?? "MISSING_ROLE")));
+                return prepend
+                       + GetText(strs.shop_role(Format.Bold(ctx.Guild.GetRole(entry.RoleId)?.Name ?? "MISSING_ROLE")));
             if (entry.Type == ShopEntryType.List)
-                return GetText(strs.unique_items_left(entry.Items.Count)) + "\n" + entry.Name;
-            return "";
+                return prepend + GetText(strs.unique_items_left(entry.Items.Count)) + "\n" + entry.Name;
+            return prepend;
         }
     }
 }

src/NadekoBot/Modules/Gambling/Shop/ShopService.cs

@@ -94,4 +94,20 @@ public class ShopService : IShopService, INService
         await uow.SaveChangesAsync();
         return true;
     }
+
+    public async Task<bool> SetItemRoleRequirementAsync(ulong guildId, int index, ulong? roleId)
+    {
+        await using var uow = _db.GetDbContext();
+        var entries = GetEntriesInternal(uow, guildId);
+
+        if (index >= entries.Count)
+            return false;
+
+        var entry = entries[index];
+
+        entry.RoleRequirement = roleId;
+
+        await uow.SaveChangesAsync();
+        return true;
+    }
 }

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

@@ -47,27 +47,6 @@ public partial class Gambling
         public Task Test()
             => Task.CompletedTask;
 
-        [Cmd]
-        [OwnerOnly]
-        public async Task SlotStats()
-        {
-            //i remembered to not be a moron
-            var paid = totalPaidOut;
-            var bet = totalBet;
-
-            if (bet <= 0)
-                bet = 1;
-
-            var embed = _eb.Create()
-                           .WithOkColor()
-                           .WithTitle("Slot Stats")
-                           .AddField("Total Bet", N(bet), true)
-                           .AddField("Paid Out", N(paid), true)
-                           .WithFooter($"Payout Rate: {paid * 1.0M / bet * 100:f4}%");
-
-            await ctx.Channel.EmbedAsync(embed);
-        }
-
         [Cmd]
         public async Task Slot(ShmartNumber amount)
         {

src/NadekoBot/Modules/Games/Trivia/Games.cs

@@ -112,25 +112,25 @@ public partial class Games
         
         private void RegisterEvents(TriviaGame trivia)
         {
-            trivia.OnQuestion += OnTriviaOnOnQuestion;
-            trivia.OnHint += OnTriviaOnOnHint;
-            trivia.OnGuess += OnTriviaOnOnGuess;
-            trivia.OnEnded += OnTriviaOnOnEnded;
-            trivia.OnStats += OnTriviaOnOnStats;
-            trivia.OnTimeout += OnTriviaOnOnTimeout;
+            trivia.OnQuestion += OnTriviaQuestion;
+            trivia.OnHint += OnTriviaHint;
+            trivia.OnGuess += OnTriviaGuess;
+            trivia.OnEnded += OnTriviaEnded;
+            trivia.OnStats += OnTriviaStats;
+            trivia.OnTimeout += OnTriviaTimeout;
         }
         
         private void UnregisterEvents(TriviaGame trivia)
         {
-            trivia.OnQuestion -= OnTriviaOnOnQuestion;
-            trivia.OnHint -= OnTriviaOnOnHint;
-            trivia.OnGuess -= OnTriviaOnOnGuess;
-            trivia.OnEnded -= OnTriviaOnOnEnded;
-            trivia.OnStats -= OnTriviaOnOnStats;
-            trivia.OnTimeout -= OnTriviaOnOnTimeout;
+            trivia.OnQuestion -= OnTriviaQuestion;
+            trivia.OnHint -= OnTriviaHint;
+            trivia.OnGuess -= OnTriviaGuess;
+            trivia.OnEnded -= OnTriviaEnded;
+            trivia.OnStats -= OnTriviaStats;
+            trivia.OnTimeout -= OnTriviaTimeout;
         }
 
-        private async Task OnTriviaOnOnHint(TriviaGame game, TriviaQuestion question)
+        private async Task OnTriviaHint(TriviaGame game, TriviaQuestion question)
         {
             try
             {
@@ -150,11 +150,11 @@ public partial class Games
             }
             catch (Exception ex)
             {
-                Log.Warning(ex, "Error editing triva message");
+                Log.Warning(ex, "Error editing trivia message");
             }
         }
 
-        private async Task OnTriviaOnOnQuestion(TriviaGame game, TriviaQuestion question)
+        private async Task OnTriviaQuestion(TriviaGame game, TriviaQuestion question)
         {
             try
             {
@@ -173,19 +173,16 @@ public partial class Games
 
                 questionMessage = await ctx.Channel.EmbedAsync(questionEmbed);
             }
-            catch (HttpException ex) when (ex.HttpCode is HttpStatusCode.NotFound or HttpStatusCode.Forbidden or HttpStatusCode.BadRequest)
+            catch (HttpException ex) when (ex.HttpCode is HttpStatusCode.NotFound or HttpStatusCode.Forbidden
+                                               or HttpStatusCode.BadRequest)
             {
                 Log.Warning("Unable to send trivia questions. Stopping immediately");
                 game.Stop();
-            }
-            catch (Exception ex)
-            {
-                Log.Warning(ex, "Error sending trivia embed");
-                await Task.Delay(2000);
+                throw;
             }
         }
 
-        private async Task OnTriviaOnOnTimeout(TriviaGame _, TriviaQuestion question)
+        private async Task OnTriviaTimeout(TriviaGame _, TriviaQuestion question)
         {
             try
             {
@@ -205,7 +202,7 @@ public partial class Games
             }
         }
 
-        private async Task OnTriviaOnOnStats(TriviaGame game)
+        private async Task OnTriviaStats(TriviaGame game)
         {
             try
             {
@@ -217,7 +214,7 @@ public partial class Games
             }
         }
 
-        private async Task OnTriviaOnOnEnded(TriviaGame game)
+        private async Task OnTriviaEnded(TriviaGame game)
         {
             try
             {
@@ -237,10 +234,9 @@ public partial class Games
             }
 
             UnregisterEvents(game);
-            await Task.Delay(1000);
         }
 
-        private async Task OnTriviaOnOnGuess(TriviaGame _, TriviaUser user, TriviaQuestion question, bool isWin)
+        private async Task OnTriviaGuess(TriviaGame _, TriviaUser user, TriviaQuestion question, bool isWin)
         {
             try
             {