fix: fixed some command groups incorrectly showing up as modules

fix: fixed one of the migrations which was preventing some bots from starting
docs: fixed changelog
2025-09-10 17:28:27 -04:00 · 2024-08-08 12:15:53 +00:00 · 2024-08-07 17:45:25 +00:00 · 2024-08-07 16:46:33 +00:00 · 2024-08-07 15:46:53 +00:00 · 2024-08-07 15:38:54 +00:00
222 changed files with 21231 additions and 2617 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,125 @@

 Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o

+## [5.1.7] - 08.08.2024
+
+### Fixed
+
+- Fixed some command groups incorrectly showing up as modules
+
+## [5.1.6] - 07.08.2024
+
+### Added
+
+- `.serverlist` is now paginated
+
+### Changed
+
+- `.listservers` renamed to `.serverlist`
+
+### Fixed
+
+- `.afk` messages can no longer ping, and the response is moved to DMs to avoid abuse
+- Possible fix for `.remind` timestamp
+
+### Removed
+- Removed old bloat / semi broken / dumb commands 
+  - `.memelist` / `.memegen` (too inconvenient to use)
+  - `.activity` (useless owner-only command)
+  - `.rafflecur` (Just use raffle and then award manually instead)
+  - `.rollduel` (we had this command?)
+- You can no longer bet on `.connect4`
+- `.economy` Removed.
+  - Was buggy and didn't really show the real state of the economy.
+  - It might come back improved in the future 
+- `.mal` Removed. Useless information / semi broken
+
+## [5.1.5] - 01.08.2024
+
+### Added
+
+- Added: Added a `.afk <msg>?` command which sets an afk message which will trigger whenever someone pings you
+  - Message will when you type a message in any channel that the bot sees, or after 8 hours, whichever comes first
+  - The specified message will be prefixed with "The user is afk: "
+  - The afk message will disappear 30 seconds after being triggered
+
+### Changed
+
+- Bot now shows a message when .prune fails due to already running error
+- Updated some bet descriptions to include 'all' 'half' usage instructions
+- Updated some command strings
+- dev: Vastly simplified medusa creation using dotnet templates, docs updated
+- Slight refactor of .wiki, time, .catfact, .wikia, .define, .bible and .quran commands, no significant change in functionality
+
+### Fixed
+
+-  .coins will no longer show double minus sign for negative changes
+- You can once again disable cleverbot responses using fake 'cleverbot:response' module name in permission commands
+
+### Removed
+- Removed .rip command
+
+## [5.1.4] - 13.07.2024
+
+### Added
+
+- Added `.coins` command which lists top 10 cryptos ordered by marketcap
+- Added Clubs rank in the leaderboard to `.clubinfo`
+- Bot owners can now check other people's bank balance (Not server owners, only bot owner, the person who is hosting the bot)
+- You can now send multiple waifu gifts at once to waifus. For example `.waifugift 3xRose @user` will give that user 3 roses
+  - The format is `<NUMBER>x<ITEM>`, no spaces
+- Added `.boosttest` command
+- Added support for any openai compatible api for the chatterbot feature change: 
+  - Changed games.yml to allow input of the apiUrl (needs to be openai compatible) and modelName as a string.
+
+### Changed
+
+- Updated command strings to clarify `.say` and `.send` usages
+
+### Fixed
+
+- Fixed `.waifugift` help string
+
+### Removed
+
+- Removed selfhost button from `.donate` command, no idea why it was there in the first place
+
+## [5.1.3] - 06.07.2024
+
+### Added
+
+- Added `.quran` command, which will show the provided ayah in english and arabic, including recitation by Alafasy
+
+### Changed
+
+- Replying to the bot's message in the channel where chatterbot is enabled will also trigger the ai response, as if you pinged the bot. This only works for chatterbot, but not for nadeko ai command prompts
+
+### Fixed
+
+- Fixed `.stickeradd` it now properly supports 300x300 image uploads.
+- Bot should now trim the invalid characters from chatterbot usernames to avoid openai errors
+- Fixed prompt triggering chatterbot responses twice
+
+## [5.1.2] - 29.06.2024
+
+### Fixed
+
+- Fixed `.honeypot` not unbanning and not pruning messages
+
+## [5.1.1] - 27.06.2024
+
+### Added
+
+- Added `.honeypot` command, which automatically softbans (ban and immediate unban) any user who posts in that channel.
+  - Useful to auto softban bots who spam every channel upon joining
+  - Users who run commands or expressions won't be softbanned. 
+  - Users who have ban member permissions are also excluded.
+
+### Fixed
+
+- Fixed `.betdraw` not respecting maxbet
+- Fixed `.xpshop` pagination for real this time?
+
 ## [5.1.0] - 25.06.2024

 ### Added
@@ -10,9 +129,9 @@ Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except da
  - You can send natural language questions, queries or execute commands. For example "@Nadeko how's the weather in paris" and it will return `.we Paris` and run it for you.
  - In case the bot can't execute a command using your query, It will fall back to your chatter bot, in case you have it enabled in data/games.yml. (Cleverbot or chatgpt)
  - (It's far from perfect so please don't ask the bot to do dangerous things like banning or pruning)
-  - Requires Patreon subscription, after which you'll be able to run it on global @Nadeko bot. If you're selfhosting, you also will need to acquire the api key from <https://dashy.nadeko.bot/api> (coming soon(ish)...)
+  - Requires Patreon subscription, after which you'll be able to run it on global @Nadeko bot. 
+    - Selfhosters: If you're selfhosting, you also will need to acquire the api key from <https://dashy.nadeko.bot/me> after pledging on patreon and put it in nadekoAiToken in creds.yml
 - Added support for `gpt-4o` in `data/games.yml`
- Added nadekoAiToken to `creds.yml`


 ### Changed
--- a/1
+++ b/1
@@ -8,7 +8,6 @@ COPY src/NadekoBot/*.csproj src/NadekoBot/
 COPY src/NadekoBot.Coordinator/*.csproj src/NadekoBot.Coordinator/
 COPY src/NadekoBot.Generators/*.csproj src/NadekoBot.Generators/
 COPY src/NadekoBot.Voice/*.csproj src/NadekoBot.Voice/
-COPY NuGet.Config ./

 # Restore the dependencies for the NadekoBot project
 RUN dotnet restore src/NadekoBot/
--- a/NadekoBot.sln
+++ b/NadekoBot.sln
@@ -12,7 +12,6 @@ ProjectSection(SolutionItems) = preProject
 	README.md = README.md
 	.gitlab-ci.yml = .gitlab-ci.yml
 	Dockerfile = Dockerfile
-	NuGet.Config = NuGet.Config
 	migrate.ps1 = migrate.ps1
 	remove-migration.ps1 = remove-migration.ps1
 EndProjectSection
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -1,6 +0,0 @@
-<configuration>
-    <packageSources>
-        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-        <add key="nadeko.bot" value="https://www.myget.org/F/nadeko/api/v3/index.json" protocolVersion="3" />
-    </packageSources>
-</configuration>
--- a/docs/medusa/creating-a-medusa.md
+++ b/docs/medusa/creating-a-medusa.md
@@ -1,8 +1,55 @@
 # Creating A Medusa

-## Theory
+## Getting started

-### Introduction
+This section will guide you through how to create a simple custom medusa. You can find the entirety of this code hosted [here](https://gitlab.com/nadeko/example_medusa)
+
+#### Prerequisite
+- [.net8 sdk](https://dotnet.microsoft.com/en-us/download) installed
+- Optional: use [vscode](https://code.visualstudio.com/download) to write code
+
+#### Guide
+
+- Open your favorite terminal and navigate to a folder where you will keep your project .
+
+- Create a new folder and move into it
+    - `mkdir example_medusa `
+    - `cd example_medusa`
+
+- Install nadeko-medusa template
+    - `dotnet new install nadeko-medusa`
+
+- Make a new Nadeko Medusa project
+    - `dotnet new nadeko-medusa`
+
+### Build it
+
+- Build your Medusa into a dll that Nadeko can load. In your terminal, type:
+    - `dotnet publish -o bin/medusae/example_medusa /p:DebugType=embedded`
+
+- Done. You can now try it out in action.
+
+### Try it out
+
+- Copy the `bin/medusae/example_medusa` folder into your NadekoBot's `data/medusae/` folder. (Nadeko version 4.1.0+)
+
+- Load it with `.meload example_medusa`
+
+- In the channel your bot can see, run the following commands to try it out
+    - `.hello` and
+    - `.hello @<someone>`
+
+- Check its information with
+    - `.meinfo example_medusa`
+
+- Unload it
+    - `.meunload example_medusa`
+
+- :tada: Congrats! You've just made your first medusa! :tada:
+
+
+
+## Theory

 Medusa system allows you to write independent medusae (known as "modules", "cogs" or "plugins" in other software) which you can then load, unload and update at will without restarting the bot.  
  
@@ -99,9 +146,9 @@ If you don't want any auxiliary files, and you don't want to bother making new .

 If you update your response strings .yml file(s) while the medusa is loaded and running, running `.stringsreload` will reload the responses without the need to reload the medusa or restart the bot.

-#### Config
+#### Bot medusa config file

- Medusa config is kept in `medusae/medusa.yml` file
+- Medusa config is kept in `data/medusae/medusa.yml` file in NadekoBot installation folder
 - At the moment this config only keeps track of which medusae are currently loaded (they will also be always loaded at startup)
 - If a medusa is causing issues and you're unable to unload it, you can remove it from the `loaded:` list in this config file and restart the bot. It won't be loaded next time the bot is started up

@@ -115,138 +162,4 @@ To make sure your medusa can be properly unloaded/reloaded you must:

 - If you are still having issues, you can always run `.meunload` followed by a bot restart, or if you want to find what is causing the medusa unloadability issues, you can check the [microsoft's assembly unloadability debugging guide](https://docs.microsoft.com/en-us/dotnet/standard/assembly/unloadability)

-## Practice

-This section will guide you through how to create a simple custom medusa. You can find the entirety of this code hosted [here](https://gitlab.com/nadeko/example_medusa)
-
-#### Prerequisite
- [.net6 sdk](https://dotnet.microsoft.com/en-us/download) installed
- Optional: use [vscode](https://code.visualstudio.com/download) to write code
-
-#### Guide
-
-
- Open your favorite terminal and navigate to a folder where you will keep your project .
-
- Create a new folder 
-    - `mkdir example_medusa`
- Create a new .net class library
-    - `dotnet new classlib`
- Open the current folder with your favorite editor/IDE. In this case we'll use VsCode
-    - `code .`
- Remove the `Class1.cs` file
- Replace the contents of the `.csproj` file with the following contents
-```xml
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        
-        <!-- Reduces some boilerplate in your .cs files -->
-        <ImplicitUsings>enable</ImplicitUsings>
-        
-        <!-- Use latest .net features -->
-        <LangVersion>preview</LangVersion>
-        <EnablePreviewFeatures>true</EnablePreviewFeatures>
-        <GenerateRequiresPreviewFeaturesAttribute>true</GenerateRequiresPreviewFeaturesAttribute>
-        
-        <!-- tell .net that this library will be used as a plugin -->
-        <EnableDynamicLoading>true</EnableDynamicLoading>
-    </PropertyGroup>
-    
-    <ItemGroup>
-        <!-- Base medusa package. You MUST reference this in order to have a working medusa -->
-        <!-- Also, this package comes from MyGet, which requires you to have a NuGet.Config file next to your .csproj -->
-        <PackageReference Include="Nadeko.Medusa" Version="4.3.9">
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-
-        <!-- Note: If you want to use NadekoBot services etc... You will have to manually clone 
-          the https://gitlab.com/kwoth/nadekobot repo locally and reference the NadekoBot.csproj because there is no NadekoBot package atm.
-          It is strongly recommended that you checkout a specific tag which matches your version of nadeko,
-          as there could be breaking changes even between minor versions of NadekoBot.
-          For example if you're running NadekoBot 4.1.0 locally for which you want to create a medusa for,
-          you should do "git checkout 4.1.0" in your NadekoBot solution and then reference the NadekoBot.csproj
-        -->
-    </ItemGroup>
-    
-    <!-- Copy shortcut and full strings to output (if they exist) -->
-    <ItemGroup>
-        <None Update="res.yml;cmds.yml;strings/**">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-</Project>
-
-```
- Create a `MySnek.cs` file and add the following contents
-```cs
-using Nadeko.Snake;
-using NadekoBot;
-using Discord;
-
-public sealed class MySnek : Snek
-{
-    [cmd]
-    public async Task Hello(AnyContext ctx)
-    {
-        await ctx.Channel.SendMessageAsync($"Hello everyone!");
-    }
-
-    [cmd]
-    public async Task Hello(AnyContext ctx, IUser target)
-    {
-        await ctx.ConfirmLocalizedAsync("hello", target);
-    }
-}
-```
- Create `res.yml` and `cmds.yml` files with the following contents
-`res.yml`
-```yml
-medusa.description: "This is my medusa's description"
-hello: "Hello {0}, from res.yml!"
-```
-
-`cmds.yml`
-```yml
-hello: 
-  desc: "This is a basic hello command"
-  args:
-    - ""
-    - "@Someone"
-```
-
- Add `NuGet.Config` file which will let you use the base Nadeko.Medusa package. This file should always look like this and you shouldn't change it
-
-```xml
-<configuration>
-    <packageSources>
-        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-        <add key="nadeko.bot" value="https://www.myget.org/F/nadeko/api/v3/index.json" protocolVersion="3" />
-    </packageSources>
-</configuration>
-```
-
-### Build it
-
- Build your Medusa into a dll that Nadeko can load. In your terminal, type:
-    - `dotnet publish -o bin/medusae/example_medusa /p:DebugType=embedded`
-
- Done. You can now try it out in action.
-
-### Try it out
-
- Copy the `bin/medusae/example_medusa` folder into your NadekoBot's `data/medusae/` folder. (Nadeko version 4.1.0+)
-
- Load it with `.meload example_medusa`
-
- In the channel your bot can see, run the following commands to try it out
-    - `.hello` and
-    - `.hello @<someone>`
-
- Check its information with
-    - `.meinfo example_medusa`
-
- Unload it
-    - `.meunload example_medusa`
-
- Congrats! You've just made your first medusa!
--- a/src/Nadeko.Medusa/Context/AnyContext.cs
+++ b/src/Nadeko.Medusa/Context/AnyContext.cs
@@ -1,5 +1,4 @@
 using Discord;
-using NadekoBot;

 namespace NadekoBot.Medusa;

--- a/src/Nadeko.Medusa/Nadeko.Medusa.csproj
+++ b/src/Nadeko.Medusa/Nadeko.Medusa.csproj
@@ -9,7 +9,7 @@
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="Discord.Net.Core" Version="3.204.0" />
+      <PackageReference Include="Discord.Net.Core" Version="3.15.3" />
      <PackageReference Include="Serilog" Version="3.1.1" />
      <PackageReference Include="YamlDotNet" Version="15.1.4" />
    </ItemGroup>
--- a/src/NadekoBot/.editorconfig
+++ b/src/NadekoBot/.editorconfig
@@ -77,7 +77,6 @@ csharp_style_var_when_type_is_apparent = true:suggestion

 # Expression-bodied members
 csharp_style_expression_bodied_accessors = true:suggestion
-csharp_style_expression_bodied_constructors = when_on_single_line:suggestion
 csharp_style_expression_bodied_indexers = true:suggestion
 csharp_style_expression_bodied_lambdas = true:suggestion
 csharp_style_expression_bodied_local_functions = true:suggestion
@@ -181,9 +180,9 @@ dotnet_naming_rule.private_readonly_field.symbols = private_readonly_field
 dotnet_naming_rule.private_readonly_field.style = begins_with_underscore
 dotnet_naming_rule.private_readonly_field.severity = warning

-dotnet_naming_rule.private_field.symbols = private_field
-dotnet_naming_rule.private_field.style = camel_case
-dotnet_naming_rule.private_field.severity = warning
+# dotnet_naming_rule.private_field.symbols = private_field
+# dotnet_naming_rule.private_field.style = camel_case
+# dotnet_naming_rule.private_field.severity = warning

 dotnet_naming_rule.const_fields.symbols = const_fields
 dotnet_naming_rule.const_fields.style = all_upper
--- a/src/NadekoBot/Bot.cs
+++ b/src/NadekoBot/Bot.cs
@@ -88,12 +88,12 @@ public sealed class Bot : IBot


    public IReadOnlyList<ulong> GetCurrentGuildIds()
-        => Client.Guilds.Select(x => x.Id).ToList();
+        => Client.Guilds.Select(x => x.Id).ToList().ToList();

    private void AddServices()
    {
        var startingGuildIdList = GetCurrentGuildIds();
-        var sw = Stopwatch.StartNew();
+        var startTime = Stopwatch.GetTimestamp();
        var bot = Client.CurrentUser;

        using (var uow = _db.GetDbContext())
@@ -114,7 +114,7 @@ public sealed class Bot : IBot
        // svcs.Components.Remove<IPlanner, Planner>();
        // svcs.Components.Add<IPlanner, RemovablePlanner>();

-        svcs.AddSingleton<IBotCredentials, IBotCredentials>(_ => _credsProvider.GetCreds());
+        svcs.AddSingleton<IBotCredentials>(_ => _credsProvider.GetCreds());
        svcs.AddSingleton<DbService, DbService>(_db);
        svcs.AddSingleton<IBotCredsProvider>(_credsProvider);
        svcs.AddSingleton<DiscordSocketClient>(Client);
@@ -160,9 +160,8 @@ public sealed class Bot : IBot
        {
            LoadTypeReaders(a);
        }
-
-        sw.Stop();
-        Log.Information("All services loaded in {ServiceLoadTime:F2}s", sw.Elapsed.TotalSeconds);
+        
+        Log.Information("All services loaded in {ServiceLoadTime:F2}s", Stopwatch.GetElapsedTime(startTime) .TotalSeconds);
    }

    private void LoadTypeReaders(Assembly assembly)
@@ -259,7 +258,7 @@ public sealed class Bot : IBot
        if (ShardId == 0)
            await _db.SetupAsync();

-        var sw = Stopwatch.StartNew();
+        var startTime = Stopwatch.GetTimestamp();

        await LoginAsync(_creds.Token);
        
@@ -274,8 +273,7 @@ public sealed class Bot : IBot
            Helpers.ReadErrorAndExit(9);
        }

-        sw.Stop();
-        Log.Information("Shard {ShardId} connected in {Elapsed:F2}s", Client.ShardId, sw.Elapsed.TotalSeconds);
+        Log.Information("Shard {ShardId} connected in {Elapsed:F2}s", Client.ShardId, Stopwatch.GetElapsedTime(startTime).TotalSeconds);
        var commandHandler = Services.GetRequiredService<CommandHandler>();

        // start handling messages received in commandhandler
--- a/src/NadekoBot/Db/Extensions/GuildConfigExtensions.cs
+++ b/src/NadekoBot/Db/Extensions/GuildConfigExtensions.cs
@@ -182,15 +182,6 @@ public static class GuildConfigExtensions
            .SelectMany(gc => gc.FollowedStreams)
            .ToList();

-    public static void SetCleverbotEnabled(this DbSet<GuildConfig> configs, ulong id, bool cleverbotEnabled)
-    {
-        var conf = configs.FirstOrDefault(gc => gc.GuildId == id);
-
-        if (conf is null)
-            return;
-
-        conf.CleverbotEnabled = cleverbotEnabled;
-    }

    public static XpSettings XpSettingsFor(this DbContext ctx, ulong guildId)
    {
--- a/src/NadekoBot/Db/Models/HoneypotChannel.cs
+++ b/src/NadekoBot/Db/Models/HoneypotChannel.cs
@@ -0,0 +1,11 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace NadekoBot.Db.Models;
+
+public class HoneypotChannel
+{
+    [Key]
+    public ulong GuildId { get; set; }
+    
+    public ulong ChannelId { get; set; }
+}
--- a/src/NadekoBot/Db/Models/anti/AntiRaidSetting.cs
+++ b/src/NadekoBot/Db/Models/anti/AntiRaidSetting.cs
@@ -1,6 +1,4 @@
 #nullable disable
-using System.ComponentModel.DataAnnotations.Schema;
-
 namespace NadekoBot.Db.Models;


--- a/src/NadekoBot/Db/NadekoContext.cs
+++ b/src/NadekoBot/Db/NadekoContext.cs
@@ -59,6 +59,7 @@ public abstract class NadekoContext : DbContext

    public DbSet<TodoModel> Todos { get; set; }
    public DbSet<ArchivedTodoListModel> TodosArchive { get; set; }
+    public DbSet<HoneypotChannel> HoneyPotChannels { get; set; }

    // todo add guild colors
    // public DbSet<GuildColors> GuildColors { get; set; }
--- a/src/NadekoBot/Migrations/MigrationQueries.cs
+++ b/src/NadekoBot/Migrations/MigrationQueries.cs
@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Migrations;
-using NadekoBot.Db.Models;

 namespace NadekoBot.Migrations;

@@ -50,5 +49,9 @@ left join guildconfigs on reactionrolemessage.guildconfigid = guildconfigs.id;")
        builder.Sql($"""
                     DELETE FROM "DelMsgOnCmdChannel" WHERE "GuildConfigId" is NULL;
                     """);
+
+        builder.Sql("""
+                    DELETE FROM "WarningPunishment" WHERE "GuildConfigId" NOT IN (SELECT "Id" from "GuildConfigs");
+                    """);
    }
 }
--- a/src/NadekoBot/Migrations/Mysql/20220409170652_mysql-init.cs
+++ b/src/NadekoBot/Migrations/Mysql/20220409170652_mysql-init.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable
--- a/src/NadekoBot/Migrations/Mysql/20220429044757_bank.cs
+++ b/src/NadekoBot/Migrations/Mysql/20220429044757_bank.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable
--- a/src/NadekoBot/Migrations/Mysql/20220504162509_new-rero.cs
+++ b/src/NadekoBot/Migrations/Mysql/20220504162509_new-rero.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable
--- a/src/NadekoBot/Migrations/Mysql/20220614071410_patronage-system.cs
+++ b/src/NadekoBot/Migrations/Mysql/20220614071410_patronage-system.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable
--- a/src/NadekoBot/Migrations/Mysql/20220623090718_stondel-db-cache.cs
+++ b/src/NadekoBot/Migrations/Mysql/20220623090718_stondel-db-cache.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable
--- a/src/NadekoBot/Migrations/Mysql/20220725155953_xpitemshop.cs
+++ b/src/NadekoBot/Migrations/Mysql/20220725155953_xpitemshop.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable
--- a/src/NadekoBot/Migrations/Mysql/20220808141855_remove-obsolete-xp-columns.cs
+++ b/src/NadekoBot/Migrations/Mysql/20220808141855_remove-obsolete-xp-columns.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable

--- a/src/NadekoBot/Migrations/Mysql/20220916194514_autopub.cs
+++ b/src/NadekoBot/Migrations/Mysql/20220916194514_autopub.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable
--- a/src/NadekoBot/Migrations/Mysql/20221003175743_gambling-stats.cs
+++ b/src/NadekoBot/Migrations/Mysql/20221003175743_gambling-stats.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable
--- a/src/NadekoBot/Migrations/Mysql/20240502233216_v5.cs
+++ b/src/NadekoBot/Migrations/Mysql/20240502233216_v5.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable
--- a/src/NadekoBot/Migrations/Mysql/20240518221440_guidlconfig-cleanup.cs
+++ b/src/NadekoBot/Migrations/Mysql/20240518221440_guidlconfig-cleanup.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable
--- a/src/NadekoBot/Migrations/Mysql/20240627033532_honeypot.Designer.cs
+++ b/src/NadekoBot/Migrations/Mysql/20240627033532_honeypot.Designer.cs
--- a/src/NadekoBot/Migrations/Mysql/20240627033532_honeypot.cs
+++ b/src/NadekoBot/Migrations/Mysql/20240627033532_honeypot.cs
@@ -0,0 +1,36 @@
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.Mysql
+{
+    /// <inheritdoc />
+    public partial class honeypot : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "honeypotchannels",
+                columns: table => new
+                {
+                    guildid = table.Column<ulong>(type: "bigint unsigned", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    channelid = table.Column<ulong>(type: "bigint unsigned", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_honeypotchannels", x => x.guildid);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "honeypotchannels");
+        }
+    }
+}
--- a/src/NadekoBot/Migrations/Mysql/MysqlContextModelSnapshot.cs
+++ b/src/NadekoBot/Migrations/Mysql/MysqlContextModelSnapshot.cs
@@ -1388,6 +1388,25 @@ namespace NadekoBot.Migrations.Mysql
                    b.ToTable("guildconfigs", (string)null);
                });

+            modelBuilder.Entity("NadekoBot.Db.Models.HoneypotChannel", b =>
+                {
+                    b.Property<ulong>("GuildId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint unsigned")
+                        .HasColumnName("guildid");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<ulong>("GuildId"));
+
+                    b.Property<ulong>("ChannelId")
+                        .HasColumnType("bigint unsigned")
+                        .HasColumnName("channelid");
+
+                    b.HasKey("GuildId")
+                        .HasName("pk_honeypotchannels");
+
+                    b.ToTable("honeypotchannels", (string)null);
+                });
+
            modelBuilder.Entity("NadekoBot.Db.Models.IgnoredLogItem", b =>
                {
                    b.Property<int>("Id")
--- a/src/NadekoBot/Migrations/PostgreSql/20220409170719_mysql-init.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/20220409170719_mysql-init.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;

 #nullable disable
--- a/src/NadekoBot/Migrations/PostgreSql/20220429044808_bank.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/20220429044808_bank.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;

 #nullable disable
--- a/src/NadekoBot/Migrations/PostgreSql/20220504162457_new-rero.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/20220504162457_new-rero.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;

 #nullable disable
--- a/src/NadekoBot/Migrations/PostgreSql/20220614071421_patronage-system.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/20220614071421_patronage-system.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable

--- a/src/NadekoBot/Migrations/PostgreSql/20220623090729_stondel-db-cache.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/20220623090729_stondel-db-cache.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;

 #nullable disable
--- a/src/NadekoBot/Migrations/PostgreSql/20220725155941_xpitemshop.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/20220725155941_xpitemshop.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;

 #nullable disable
--- a/src/NadekoBot/Migrations/PostgreSql/20220808142559_remove-obsolete-xp-columns.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/20220808142559_remove-obsolete-xp-columns.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable

--- a/src/NadekoBot/Migrations/PostgreSql/20220916194523_autopub.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/20220916194523_autopub.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;

 #nullable disable
--- a/src/NadekoBot/Migrations/PostgreSql/20221003175752_gambling-stats.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/20221003175752_gambling-stats.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;

 #nullable disable
--- a/src/NadekoBot/Migrations/PostgreSql/20240502233202_v5.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/20240502233202_v5.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;

 #nullable disable
--- a/src/NadekoBot/Migrations/PostgreSql/20240518221432_guidlconfig-cleanup.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/20240518221432_guidlconfig-cleanup.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;

 #nullable disable
--- a/src/NadekoBot/Migrations/PostgreSql/20240627033522_honeypot.Designer.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/20240627033522_honeypot.Designer.cs
--- a/src/NadekoBot/Migrations/PostgreSql/20240627033522_honeypot.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/20240627033522_honeypot.cs
@@ -0,0 +1,33 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.PostgreSql
+{
+    /// <inheritdoc />
+    public partial class honeypot : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "honeypotchannels",
+                columns: table => new
+                {
+                    guildid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
+                    channelid = table.Column<decimal>(type: "numeric(20,0)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_honeypotchannels", x => x.guildid);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "honeypotchannels");
+        }
+    }
+}
--- a/src/NadekoBot/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs
@@ -1387,6 +1387,23 @@ namespace NadekoBot.Migrations.PostgreSql
                    b.ToTable("guildconfigs", (string)null);
                });

+            modelBuilder.Entity("NadekoBot.Db.Models.HoneypotChannel", b =>
+                {
+                    b.Property<decimal>("GuildId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("guildid");
+
+                    b.Property<decimal>("ChannelId")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("channelid");
+
+                    b.HasKey("GuildId")
+                        .HasName("pk_honeypotchannels");
+
+                    b.ToTable("honeypotchannels", (string)null);
+                });
+
            modelBuilder.Entity("NadekoBot.Db.Models.IgnoredLogItem", b =>
                {
                    b.Property<int>("Id")
--- a/src/NadekoBot/Migrations/Sqlite/20210621042359_squash.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20210621042359_squash.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 namespace NadekoBot.Migrations
 {
--- a/src/NadekoBot/Migrations/Sqlite/20210707002343_cleanup.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20210707002343_cleanup.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 namespace NadekoBot.Migrations
 {
--- a/src/NadekoBot/Migrations/Sqlite/20210914180026_image-only-channels.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20210914180026_image-only-channels.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 namespace NadekoBot.Migrations
 {
--- a/src/NadekoBot/Migrations/Sqlite/20211015232708_nsfw-blacklist-tags.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20211015232708_nsfw-blacklist-tags.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 namespace NadekoBot.Migrations
 {
--- a/src/NadekoBot/Migrations/Sqlite/20211213145407_atl-rework.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20211213145407_atl-rework.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 namespace NadekoBot.Migrations
 {
--- a/src/NadekoBot/Migrations/Sqlite/20220110105942_filter-settings-cleanup.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20220110105942_filter-settings-cleanup.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable

--- a/src/NadekoBot/Migrations/Sqlite/20220409170828_clubs-refactor.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20220409170828_clubs-refactor.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable

--- a/src/NadekoBot/Migrations/Sqlite/20220428051304_bank.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20220428051304_bank.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable

--- a/src/NadekoBot/Migrations/Sqlite/20220503234243_new-rero.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20220503234243_new-rero.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable

--- a/src/NadekoBot/Migrations/Sqlite/20220614071359_patronage-system.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20220614071359_patronage-system.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable

--- a/src/NadekoBot/Migrations/Sqlite/20220623073903_stondel-db-cache.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20220623073903_stondel-db-cache.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable

--- a/src/NadekoBot/Migrations/Sqlite/20220725112348_xpitemshop.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20220725112348_xpitemshop.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable

--- a/src/NadekoBot/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable

--- a/src/NadekoBot/Migrations/Sqlite/20220916191702_autopub.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20220916191702_autopub.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable

--- a/src/NadekoBot/Migrations/Sqlite/20221003111019_gambling-stats.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20221003111019_gambling-stats.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable

--- a/src/NadekoBot/Migrations/Sqlite/20240502233144_v5.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20240502233144_v5.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable

--- a/src/NadekoBot/Migrations/Sqlite/20240518221424_guidlconfig-cleanup.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20240518221424_guidlconfig-cleanup.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable

--- a/src/NadekoBot/Migrations/Sqlite/20240627033508_honeypot.Designer.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20240627033508_honeypot.Designer.cs
--- a/src/NadekoBot/Migrations/Sqlite/20240627033508_honeypot.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20240627033508_honeypot.cs
@@ -0,0 +1,34 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations
+{
+    /// <inheritdoc />
+    public partial class honeypot : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "HoneyPotChannels",
+                columns: table => new
+                {
+                    GuildId = table.Column<ulong>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    ChannelId = table.Column<ulong>(type: "INTEGER", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_HoneyPotChannels", x => x.GuildId);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "HoneyPotChannels");
+        }
+    }
+}
--- a/src/NadekoBot/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs
+++ b/src/NadekoBot/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs
@@ -1033,6 +1033,20 @@ namespace NadekoBot.Migrations
                    b.ToTable("GuildConfigs");
                });

+            modelBuilder.Entity("NadekoBot.Db.Models.HoneypotChannel", b =>
+                {
+                    b.Property<ulong>("GuildId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<ulong>("ChannelId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("GuildId");
+
+                    b.ToTable("HoneyPotChannels");
+                });
+
            modelBuilder.Entity("NadekoBot.Db.Models.IgnoredLogItem", b =>
                {
                    b.Property<int>("Id")
--- a/src/NadekoBot/Modules/Administration/AdministrationService.cs
+++ b/src/NadekoBot/Modules/Administration/AdministrationService.cs
@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Db;
 using NadekoBot.Db.Models;
 using NadekoBot.Modules.Administration._common.results;

--- a/src/NadekoBot/Modules/Administration/AutoAssignableRoles/AutoAssignRoleService.cs
+++ b/src/NadekoBot/Modules/Administration/AutoAssignableRoles/AutoAssignRoleService.cs
@@ -4,7 +4,6 @@ using System.Net;
 using System.Threading.Channels;
 using LinqToDB;
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Db;

 namespace NadekoBot.Modules.Administration.Services;

--- a/src/NadekoBot/Modules/Administration/DangerousCommands/CleanupCommands.cs
+++ b/src/NadekoBot/Modules/Administration/DangerousCommands/CleanupCommands.cs
@@ -1,9 +1,11 @@
-namespace NadekoBot.Modules.Administration.DangerousCommands;
+using NadekoBot.Modules.Administration.DangerousCommands;
+
+namespace NadekoBot.Modules.Administration;

 public partial class Administration 
 {
    [Group]
-    public class CleanupCommands : CleanupModuleBase
+    public partial class CleanupCommands : CleanupModuleBase
    {
        private readonly ICleanupService _svc;

@@ -27,5 +29,15 @@ public partial class Administration
                  .Confirm($"{result.GuildCount} guilds' data remain in the database.")
                  .SendAsync();
        }
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.Administrator)]
+        public async Task Keep()
+        {
+            var result = await _svc.KeepGuild(Context.Guild.Id);
+
+            await Response().Text("This guild's bot data will be saved.").SendAsync();
+        }
    }
 }
--- a/src/NadekoBot/Modules/Administration/DangerousCommands/CleanupService.cs
+++ b/src/NadekoBot/Modules/Administration/DangerousCommands/CleanupService.cs
@@ -1,6 +1,7 @@
 using LinqToDB;
 using LinqToDB.Data;
 using LinqToDB.EntityFrameworkCore;
+using LinqToDB.Mapping;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Db.Models;

@@ -66,67 +67,88 @@ public sealed class CleanupService : ICleanupService, IReadyExecutor, INService
                 .Where(x => !tempTable.Select(x => x.GuildId)
                                       .Contains(x.GuildId))
                 .DeleteAsync();
-        
+
        // delete guild xp
        await ctx.GetTable<UserXpStats>()
                 .Where(x => !tempTable.Select(x => x.GuildId)
                                       .Contains(x.GuildId))
                 .DeleteAsync();
-        
+
        // delete expressions
        await ctx.GetTable<NadekoExpression>()
-                 .Where(x => x.GuildId != null && !tempTable.Select(x => x.GuildId)
-                                       .Contains(x.GuildId.Value))
+                 .Where(x => x.GuildId != null
+                             && !tempTable.Select(x => x.GuildId)
+                                          .Contains(x.GuildId.Value))
                 .DeleteAsync();
-        
+
        // delete quotes
        await ctx.GetTable<Quote>()
                 .Where(x => !tempTable.Select(x => x.GuildId)
                                       .Contains(x.GuildId))
                 .DeleteAsync();
-        
+
        // delete planted currencies
        await ctx.GetTable<PlantedCurrency>()
                 .Where(x => !tempTable.Select(x => x.GuildId)
                                       .Contains(x.GuildId))
                 .DeleteAsync();
-        
+
        // delete image only channels
        await ctx.GetTable<ImageOnlyChannel>()
                 .Where(x => !tempTable.Select(x => x.GuildId)
                                       .Contains(x.GuildId))
                 .DeleteAsync();
-        
+
        // delete reaction roles
        await ctx.GetTable<ReactionRoleV2>()
                 .Where(x => !tempTable.Select(x => x.GuildId)
                                       .Contains(x.GuildId))
                 .DeleteAsync();
-        
+
        // delete ignored users
        await ctx.GetTable<DiscordPermOverride>()
-                 .Where(x => x.GuildId != null && !tempTable.Select(x => x.GuildId)
-                                       .Contains(x.GuildId.Value))
+                 .Where(x => x.GuildId != null
+                             && !tempTable.Select(x => x.GuildId)
+                                          .Contains(x.GuildId.Value))
                 .DeleteAsync();
-        
+
        // delete perm overrides
        await ctx.GetTable<DiscordPermOverride>()
-                 .Where(x => x.GuildId != null && !tempTable.Select(x => x.GuildId)
-                                       .Contains(x.GuildId.Value))
+                 .Where(x => x.GuildId != null
+                             && !tempTable.Select(x => x.GuildId)
+                                          .Contains(x.GuildId.Value))
                 .DeleteAsync();
-        
+
        // delete repeaters
        await ctx.GetTable<Repeater>()
                 .Where(x => !tempTable.Select(x => x.GuildId)
                                       .Contains(x.GuildId))
                 .DeleteAsync();
-        
+
        return new()
        {
            GuildCount = guildIds.Keys.Count,
        };
    }
-    
+
+    public async Task<bool> KeepGuild(ulong guildId)
+    {
+        await using var db = _db.GetDbContext();
+        await using var ctx = db.CreateLinqToDBContext();
+
+        var table = ctx.CreateTable<KeptGuilds>(tableOptions: TableOptions.CheckExistence);
+        
+        if (await table.AnyAsyncLinqToDB(x => x.GuildId == guildId))
+            return false;
+
+        await table.InsertAsync(() => new()
+        {
+            GuildId = guildId
+        });
+
+        return true;
+    }
+
    private ValueTask OnKeepReport(KeepReport report)
    {
        guildIds[report.ShardId] = report.GuildIds;
@@ -136,11 +158,18 @@ public sealed class CleanupService : ICleanupService, IReadyExecutor, INService
    public async Task OnReadyAsync()
    {
        await _pubSub.Sub(_keepTriggerKey, OnKeepTrigger);
+        
+        _client.JoinedGuild += ClientOnJoinedGuild;

        if (_client.ShardId == 0)
            await _pubSub.Sub(_keepReportKey, OnKeepReport);
    }

+    private async Task ClientOnJoinedGuild(SocketGuild arg)
+    {
+        await KeepGuild(arg.Id);
+    }
+
    private ValueTask OnKeepTrigger(bool arg)
    {
        _pubSub.Pub(_keepReportKey,
@@ -152,4 +181,10 @@ public sealed class CleanupService : ICleanupService, IReadyExecutor, INService

        return default;
    }
+}
+
+public class KeptGuilds
+{
+    [PrimaryKey]
+    public ulong GuildId { get; set; }
 }
--- a/src/NadekoBot/Modules/Administration/DangerousCommands/_common/ICleanupService.cs
+++ b/src/NadekoBot/Modules/Administration/DangerousCommands/_common/ICleanupService.cs
@@ -3,4 +3,5 @@
 public interface ICleanupService
 {
    Task<KeepResult?> DeleteMissingGuildDataAsync();
+    Task<bool> KeepGuild(ulong guildId);
 }
--- a/src/NadekoBot/Modules/Administration/GameVoiceChannel/GameVoiceChannelService.cs
+++ b/src/NadekoBot/Modules/Administration/GameVoiceChannel/GameVoiceChannelService.cs
@@ -1,6 +1,4 @@
 #nullable disable
-using NadekoBot.Db;
-
 namespace NadekoBot.Modules.Administration.Services;

 public class GameVoiceChannelService : INService
--- a/src/NadekoBot/Modules/Administration/GreetBye/GreetCommands.cs
+++ b/src/NadekoBot/Modules/Administration/GreetBye/GreetCommands.cs
@@ -225,5 +225,19 @@ public partial class Administration
            if (!enabled)
                await Response().Pending(strs.greetdmmsg_enable($"`{prefix}greetdm`")).SendAsync();
        }
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.ManageGuild)]
+        [Ratelimit(5)]
+        public async Task BoostTest([Leftover] IGuildUser? user = null)
+        {
+            user ??= (IGuildUser)ctx.User;
+
+            await _service.BoostTest((ITextChannel)ctx.Channel, user);
+            var enabled = _service.GetBoostEnabled(ctx.Guild.Id);
+            if (!enabled)
+                await Response().Pending(strs.boostmsg_enable($"`{prefix}boost`")).SendAsync();
+        }
    }
 }
--- a/src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs
+++ b/src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs
@@ -1,5 +1,4 @@
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Db;
 using NadekoBot.Db.Models;
 using System.Threading.Channels;

@@ -242,7 +241,7 @@ public class GreetService : INService, IReadyExecutor
            guild: channel.Guild,
            channel: channel,
            users: users.ToArray());
-        
+
        var text = SmartText.CreateFrom(conf.ChannelGreetMessageText);
        text = await _repSvc.ReplaceAsync(text, repCtx);
        try
@@ -630,6 +629,13 @@ public class GreetService : INService, IReadyExecutor
        return conf.SendChannelByeMessage;
    }

+    public bool GetBoostEnabled(ulong guildId)
+    {
+        using var uow = _db.GetDbContext();
+        var conf = uow.GuildConfigsForId(guildId, set => set);
+        return conf.SendBoostMessage;
+    }
+
    #endregion

    #region Test Messages
--- a/src/NadekoBot/Modules/Administration/Honeypot/HoneyPotService.cs
+++ b/src/NadekoBot/Modules/Administration/Honeypot/HoneyPotService.cs
@@ -0,0 +1,95 @@
+using LinqToDB;
+using LinqToDB.EntityFrameworkCore;
+using NadekoBot.Common.ModuleBehaviors;
+using NadekoBot.Db.Models;
+using System.Threading.Channels;
+
+namespace NadekoBot.Modules.Administration.Honeypot;
+
+public sealed class HoneyPotService : IHoneyPotService, IReadyExecutor, IExecNoCommand, INService
+{
+    private readonly DbService _db;
+    private readonly CommandHandler _handler;
+
+    private ConcurrentHashSet<ulong> _channels = new();
+
+    private Channel<SocketGuildUser> _punishments = Channel.CreateBounded<SocketGuildUser>(
+        new BoundedChannelOptions(100)
+        {
+            FullMode = BoundedChannelFullMode.DropOldest,
+            SingleReader = true,
+            SingleWriter = false,
+        });
+
+    public HoneyPotService(DbService db, CommandHandler handler)
+    {
+        _db = db;
+        _handler = handler;
+    }
+
+    public async Task<bool> ToggleHoneypotChannel(ulong guildId, ulong channelId)
+    {
+        await using var uow = _db.GetDbContext();
+
+        var deleted = await uow.HoneyPotChannels
+                               .Where(x => x.GuildId == guildId)
+                               .DeleteWithOutputAsync();
+
+        if (deleted.Length > 0)
+        {
+            _channels.TryRemove(deleted[0].ChannelId);
+            return false;
+        }
+
+        await uow.HoneyPotChannels
+                 .ToLinqToDBTable()
+                 .InsertAsync(() => new HoneypotChannel
+                 {
+                     GuildId = guildId,
+                     ChannelId = channelId
+                 });
+
+        _channels.Add(channelId);
+
+        return true;
+    }
+
+    public async Task OnReadyAsync()
+    {
+        await using var uow = _db.GetDbContext();
+
+        var channels = await uow.HoneyPotChannels
+                                .Select(x => x.ChannelId)
+                                .ToListAsyncLinqToDB();
+
+        _channels = new(channels);
+
+        while (await _punishments.Reader.WaitToReadAsync())
+        {
+            while (_punishments.Reader.TryRead(out var user))
+            {
+                try
+                {
+                    Log.Information("Honeypot caught user {User} [{UserId}]", user, user.Id);
+                    await user.BanAsync(pruneDays: 1);
+                    await user.Guild.RemoveBanAsync(user.Id);
+                }
+                catch (Exception e)
+                {
+                    Log.Warning(e, "Failed banning {User} due to {Error}", user, e.Message);
+                }
+
+                await Task.Delay(1000);
+            }
+        }
+    }
+
+    public async Task ExecOnNoCommandAsync(IGuild guild, IUserMessage msg)
+    {
+        if (_channels.Contains(msg.Channel.Id) && msg.Author is SocketGuildUser sgu)
+        {
+            if (!sgu.GuildPermissions.BanMembers)
+                await _punishments.Writer.WriteAsync(sgu);
+        }
+    }
+}
--- a/src/NadekoBot/Modules/Administration/Honeypot/HoneypotCommands.cs
+++ b/src/NadekoBot/Modules/Administration/Honeypot/HoneypotCommands.cs
@@ -0,0 +1,29 @@
+using NadekoBot.Modules.Administration.Honeypot;
+
+namespace NadekoBot.Modules.Administration;
+
+public partial class Administration
+{
+    [Group]
+    public partial class HoneypotCommands : NadekoModule
+    {
+        private readonly IHoneyPotService _service;
+
+        public HoneypotCommands(IHoneyPotService service)
+            => _service = service;
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [RequireUserPermission(GuildPermission.Administrator)]
+        [RequireBotPermission(GuildPermission.BanMembers)]
+        public async Task Honeypot()
+        {
+            var enabled = await _service.ToggleHoneypotChannel(ctx.Guild.Id, ctx.Channel.Id);
+
+            if (enabled)
+                await Response().Confirm(strs.honeypot_on).SendAsync();
+            else
+                await Response().Confirm(strs.honeypot_off).SendAsync();
+        }
+    }
+}
--- a/src/NadekoBot/Modules/Administration/Honeypot/IHoneyPotService.cs
+++ b/src/NadekoBot/Modules/Administration/Honeypot/IHoneyPotService.cs
@@ -0,0 +1,6 @@
+namespace NadekoBot.Modules.Administration.Honeypot;
+
+public interface IHoneyPotService
+{
+    public Task<bool> ToggleHoneypotChannel(ulong guildId, ulong channelId);
+}
--- a/src/NadekoBot/Modules/Administration/Mute/MuteService.cs
+++ b/src/NadekoBot/Modules/Administration/Mute/MuteService.cs
@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Db;
 using NadekoBot.Db.Models;

 namespace NadekoBot.Modules.Administration.Services;
--- a/src/NadekoBot/Modules/Administration/Protection/ProtectionService.cs
+++ b/src/NadekoBot/Modules/Administration/Protection/ProtectionService.cs
@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Db;
 using NadekoBot.Db.Models;
 using System.Threading.Channels;

--- a/src/NadekoBot/Modules/Administration/Prune/PruneCommands.cs
+++ b/src/NadekoBot/Modules/Administration/Prune/PruneCommands.cs
@@ -65,23 +65,6 @@ public partial class Administration
            await progressMsg.DeleteAsync();
        }

-        private async Task SendResult(PruneResult result)
-        {
-            switch (result)
-            {
-                case PruneResult.Success:
-                    break;
-                case PruneResult.AlreadyRunning:
-                    break;
-                case PruneResult.FeatureLimit:
-                    await Response().Pending(strs.feature_limit_reached_owner).SendAsync();
-                    break;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(result), result, null);
-            }
-        }
-
        // prune x
        [Cmd]
        [RequireContext(ContextType.Guild)]
@@ -218,5 +201,27 @@ public partial class Administration

            await Response().Confirm(strs.prune_cancelled).SendAsync();
        }
+
+
+        private async Task SendResult(PruneResult result)
+        {
+            switch (result)
+            {
+                case PruneResult.Success:
+                    break;
+                case PruneResult.AlreadyRunning:
+                    var msg = await Response().Pending(strs.prune_already_running).SendAsync();
+                    msg.DeleteAfter(5);
+                    break;
+                case PruneResult.FeatureLimit:
+                    var msg2 = await Response().Pending(strs.feature_limit_reached_owner).SendAsync();
+                    msg2.DeleteAfter(10);
+                    break;
+                default:
+                    Log.Error("Unhandled result received in prune: {Result}", result);
+                    await Response().Error(strs.error_occured).SendAsync();
+                    break;
+            }
+        }
    }
 }
--- a/src/NadekoBot/Modules/Administration/Prune/PruneService.cs
+++ b/src/NadekoBot/Modules/Administration/Prune/PruneService.cs
@@ -26,21 +26,21 @@ public class PruneService : INService
    )
    {
        ArgumentNullException.ThrowIfNull(channel, nameof(channel));
+        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(amount);

        var originalAmount = amount;
-        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(amount);

        using var cancelSource = new CancellationTokenSource();
        if (!_pruningGuilds.TryAdd(channel.GuildId, cancelSource))
            return PruneResult.AlreadyRunning;

-        if (!await _ps.LimitHitAsync(LimitedFeatureName.Prune, channel.Guild.OwnerId))
-        {
-            return PruneResult.FeatureLimit;
-        }
-        
        try
        {
+            if (!await _ps.LimitHitAsync(LimitedFeatureName.Prune, channel.Guild.OwnerId))
+            {
+                return PruneResult.FeatureLimit;
+            }
+
            var now = DateTime.UtcNow;
            IMessage[] msgs;
            IMessage lastMessage = null;
--- a/src/NadekoBot/Modules/Administration/Role/IReactionRoleService.cs
+++ b/src/NadekoBot/Modules/Administration/Role/IReactionRoleService.cs
@@ -1,5 +1,4 @@
 #nullable disable
-using NadekoBot.Modules.Patronage;
 using NadekoBot.Db.Models;
 using OneOf;
 using OneOf.Types;
--- a/src/NadekoBot/Modules/Administration/Role/ReactionRoleCommands.cs
+++ b/src/NadekoBot/Modules/Administration/Role/ReactionRoleCommands.cs
@@ -33,7 +33,7 @@ public partial class Administration
            var msg = await ctx.Channel.GetMessageAsync(messageId);
            if (msg is null)
            {
-                await Response().Error(strs.not_found).SendAsync();
+                await Response().Error(strs.rero_message_not_found).SendAsync();
                return;
            }

--- a/src/NadekoBot/Modules/Administration/Role/ReactionRolesService.cs
+++ b/src/NadekoBot/Modules/Administration/Role/ReactionRolesService.cs
@@ -2,7 +2,6 @@
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Db;
 using NadekoBot.Modules.Patronage;
 using NadekoBot.Db.Models;
 using OneOf.Types;
--- a/src/NadekoBot/Modules/Administration/Role/StickyRolesService.cs
+++ b/src/NadekoBot/Modules/Administration/Role/StickyRolesService.cs
@@ -3,7 +3,6 @@ using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using NadekoBot.Db.Models;
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Db;

 namespace NadekoBot.Modules.Administration;

--- a/src/NadekoBot/Modules/Administration/Self/SelfCommands.cs
+++ b/src/NadekoBot/Modules/Administration/Self/SelfCommands.cs
@@ -546,7 +546,7 @@ public partial class Administration
            text = await repSvc.ReplaceAsync(text, repCtx);
            await Response().Channel(ch).Text(text).SendAsync();
         
-            await ctx.OkAsync();;
+            await ctx.OkAsync();
        }

        [Cmd]
--- a/src/NadekoBot/Modules/Administration/SelfAssignableRoles/SelfAssignedRolesService.cs
+++ b/src/NadekoBot/Modules/Administration/SelfAssignableRoles/SelfAssignedRolesService.cs
@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Db;
 using NadekoBot.Db.Models;

 namespace NadekoBot.Modules.Administration.Services;
--- a/src/NadekoBot/Modules/Administration/ServerLog/ServerLogCommandService.cs
+++ b/src/NadekoBot/Modules/Administration/ServerLog/ServerLogCommandService.cs
@@ -1,7 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Db;
 using NadekoBot.Modules.Administration.Services;
 using NadekoBot.Db.Models;

--- a/src/NadekoBot/Modules/Administration/Ticket/TicketCommands.cs
+++ b/src/NadekoBot/Modules/Administration/Ticket/TicketCommands.cs
@@ -0,0 +1,14 @@
+// namespace NadekoBot.Modules.Administration;
+//
+// public partial class Administration
+// {
+//     [Group]
+//     public partial class TicketCommands : NadekoModule
+//     {
+//         [Cmd]
+//         public async Task Ticket()
+//         {
+//             
+//         }
+//     }
+// }
--- a/src/NadekoBot/Modules/Administration/Timezone/GuildTimezoneService.cs
+++ b/src/NadekoBot/Modules/Administration/Timezone/GuildTimezoneService.cs
@@ -1,5 +1,4 @@
 #nullable disable
-using NadekoBot.Db;
 using NadekoBot.Db.Models;
 using NadekoBot.Common.ModuleBehaviors;

--- a/src/NadekoBot/Modules/Administration/UserPunish/UserPunishCommands.cs
+++ b/src/NadekoBot/Modules/Administration/UserPunish/UserPunishCommands.cs
@@ -273,6 +273,31 @@ public partial class Administration
                  .SendAsync();
        }

+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.Administrator)]
+        public Task WarnDelete(IGuildUser user, int index)
+            => WarnDelete(user.Id, index);
+        
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.Administrator)]
+        public async Task WarnDelete(ulong userId, int index)
+        {
+            if (--index < 0)
+                return;
+            
+            var warn = await _service.WarnDelete(userId, index);
+
+            if (warn is null)
+            {
+                await Response().Error(strs.warning_not_found).SendAsync();
+                return;
+            }
+            
+            await Response().Confirm(strs.warning_deleted(Format.Bold(index.ToString()))).SendAsync();
+        }
+
        [Cmd]
        [RequireContext(ContextType.Guild)]
        [UserPerm(GuildPerm.BanMembers)]
@@ -286,6 +311,7 @@ public partial class Administration
        {
            if (index < 0)
                return;
+             
            var success = await _service.WarnClearAsync(ctx.Guild.Id, userId, index, ctx.User.ToString());
            var userStr = Format.Bold((ctx.Guild as SocketGuild)?.GetUser(userId)?.ToString() ?? userId.ToString());
            if (index == 0)
--- a/src/NadekoBot/Modules/Administration/UserPunish/UserPunishService.cs
+++ b/src/NadekoBot/Modules/Administration/UserPunish/UserPunishService.cs
@@ -4,7 +4,6 @@ using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Common.TypeReaders.Models;
-using NadekoBot.Db;
 using NadekoBot.Modules.Permissions.Services;
 using NadekoBot.Db.Models;
 using Newtonsoft.Json;
@@ -89,9 +88,10 @@ public class UserPunishService : INService, IReadyExecutor
        {
            ps = uow.GuildConfigsForId(guildId, set => set.Include(x => x.WarnPunishments)).WarnPunishments;

-            previousCount = uow.Set<Warning>().ForId(guildId, userId)
-                .Where(w => !w.Forgiven && w.UserId == userId)
-                .Sum(x => x.Weight);
+            previousCount = uow.Set<Warning>()
+                               .ForId(guildId, userId)
+                               .Where(w => !w.Forgiven && w.UserId == userId)
+                               .Sum(x => x.Weight);

            uow.Set<Warning>().Add(warn);

@@ -103,7 +103,7 @@ public class UserPunishService : INService, IReadyExecutor
        var totalCount = previousCount + weight;

        var p = ps.Where(x => x.Count > previousCount && x.Count <= totalCount)
-            .MaxBy(x => x.Count);
+                  .MaxBy(x => x.Count);

        if (p is not null)
        {
@@ -244,33 +244,33 @@ public class UserPunishService : INService, IReadyExecutor
    {
        await using var uow = _db.GetDbContext();
        var cleared = await uow.Set<Warning>()
-            .Where(x => uow.Set<GuildConfig>()
-                            .Any(y => y.GuildId == x.GuildId
-                                      && y.WarnExpireHours > 0
-                                      && y.WarnExpireAction == WarnExpireAction.Clear)
-                        && x.Forgiven == false
-                        && x.DateAdded
-                        < DateTime.UtcNow.AddHours(-uow.Set<GuildConfig>()
-                            .Where(y => x.GuildId == y.GuildId)
-                            .Select(y => y.WarnExpireHours)
-                            .First()))
-            .UpdateAsync(_ => new()
-            {
-                Forgiven = true,
-                ForgivenBy = "expiry"
-            });
+                               .Where(x => uow.Set<GuildConfig>()
+                                              .Any(y => y.GuildId == x.GuildId
+                                                        && y.WarnExpireHours > 0
+                                                        && y.WarnExpireAction == WarnExpireAction.Clear)
+                                           && x.Forgiven == false
+                                           && x.DateAdded
+                                           < DateTime.UtcNow.AddHours(-uow.Set<GuildConfig>()
+                                                                          .Where(y => x.GuildId == y.GuildId)
+                                                                          .Select(y => y.WarnExpireHours)
+                                                                          .First()))
+                               .UpdateAsync(_ => new()
+                               {
+                                   Forgiven = true,
+                                   ForgivenBy = "expiry"
+                               });

        var deleted = await uow.Set<Warning>()
-            .Where(x => uow.Set<GuildConfig>()
-                            .Any(y => y.GuildId == x.GuildId
-                                      && y.WarnExpireHours > 0
-                                      && y.WarnExpireAction == WarnExpireAction.Delete)
-                        && x.DateAdded
-                        < DateTime.UtcNow.AddHours(-uow.Set<GuildConfig>()
-                            .Where(y => x.GuildId == y.GuildId)
-                            .Select(y => y.WarnExpireHours)
-                            .First()))
-            .DeleteAsync();
+                               .Where(x => uow.Set<GuildConfig>()
+                                              .Any(y => y.GuildId == x.GuildId
+                                                        && y.WarnExpireHours > 0
+                                                        && y.WarnExpireAction == WarnExpireAction.Delete)
+                                           && x.DateAdded
+                                           < DateTime.UtcNow.AddHours(-uow.Set<GuildConfig>()
+                                                                          .Where(y => x.GuildId == y.GuildId)
+                                                                          .Select(y => y.WarnExpireHours)
+                                                                          .First()))
+                               .DeleteAsync();

        if (cleared > 0 || deleted > 0)
        {
@@ -293,21 +293,21 @@ public class UserPunishService : INService, IReadyExecutor
        if (config.WarnExpireAction == WarnExpireAction.Clear)
        {
            await uow.Set<Warning>()
-                .Where(x => x.GuildId == guildId
-                            && x.Forgiven == false
-                            && x.DateAdded < DateTime.UtcNow.AddHours(-config.WarnExpireHours))
-                .UpdateAsync(_ => new()
-                {
-                    Forgiven = true,
-                    ForgivenBy = "expiry"
-                });
+                     .Where(x => x.GuildId == guildId
+                                 && x.Forgiven == false
+                                 && x.DateAdded < DateTime.UtcNow.AddHours(-config.WarnExpireHours))
+                     .UpdateAsync(_ => new()
+                     {
+                         Forgiven = true,
+                         ForgivenBy = "expiry"
+                     });
        }
        else if (config.WarnExpireAction == WarnExpireAction.Delete)
        {
            await uow.Set<Warning>()
-                .Where(x => x.GuildId == guildId
-                            && x.DateAdded < DateTime.UtcNow.AddHours(-config.WarnExpireHours))
-                .DeleteAsync();
+                     .Where(x => x.GuildId == guildId
+                                 && x.DateAdded < DateTime.UtcNow.AddHours(-config.WarnExpireHours))
+                     .DeleteAsync();
        }

        await uow.SaveChangesAsync();
@@ -425,8 +425,8 @@ public class UserPunishService : INService, IReadyExecutor
    {
        using var uow = _db.GetDbContext();
        return uow.GuildConfigsForId(guildId, gc => gc.Include(x => x.WarnPunishments))
-            .WarnPunishments.OrderBy(x => x.Count)
-            .ToArray();
+                  .WarnPunishments.OrderBy(x => x.Count)
+                  .ToArray();
    }

    public (IReadOnlyCollection<(string Original, ulong? Id, string Reason)> Bans, int Missing) MassKill(
@@ -436,20 +436,20 @@ public class UserPunishService : INService, IReadyExecutor
        var gusers = guild.Users;
        //get user objects and reasons
        var bans = people.Split("\n")
-            .Select(x =>
-            {
-                var split = x.Trim().Split(" ");
+                         .Select(x =>
+                         {
+                             var split = x.Trim().Split(" ");

-                var reason = string.Join(" ", split.Skip(1));
+                             var reason = string.Join(" ", split.Skip(1));

-                if (ulong.TryParse(split[0], out var id))
-                    return (Original: split[0], Id: id, Reason: reason);
+                             if (ulong.TryParse(split[0], out var id))
+                                 return (Original: split[0], Id: id, Reason: reason);

-                return (Original: split[0],
-                    gusers.FirstOrDefault(u => u.ToString().ToLowerInvariant() == x)?.Id,
-                    Reason: reason);
-            })
-            .ToArray();
+                             return (Original: split[0],
+                                 gusers.FirstOrDefault(u => u.ToString().ToLowerInvariant() == x)?.Id,
+                                 Reason: reason);
+                         })
+                         .ToArray();

        //if user is null, means that person couldn't be found
        var missing = bans.Count(x => !x.Id.HasValue);
@@ -483,11 +483,12 @@ public class UserPunishService : INService, IReadyExecutor
        }
        else if (template is null)
        {
-            uow.Set<BanTemplate>().Add(new()
-            {
-                GuildId = guildId,
-                Text = text
-            });
+            uow.Set<BanTemplate>()
+               .Add(new()
+               {
+                   GuildId = guildId,
+                   Text = text
+               });
        }
        else
            template.Text = text;
@@ -499,31 +500,31 @@ public class UserPunishService : INService, IReadyExecutor
    {
        await using var ctx = _db.GetDbContext();
        await ctx.Set<BanTemplate>()
-            .ToLinqToDBTable()
-            .InsertOrUpdateAsync(() => new()
-                {
-                    GuildId = guildId,
-                    Text = null,
-                    DateAdded = DateTime.UtcNow,
-                    PruneDays = pruneDays
-                },
-                old => new()
-                {
-                    PruneDays = pruneDays
-                },
-                () => new()
-                {
-                    GuildId = guildId
-                });
+                 .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.Set<BanTemplate>()
-            .Where(x => x.GuildId == guildId)
-            .Select(x => x.PruneDays)
-            .FirstOrDefaultAsyncLinqToDB();
+                        .Where(x => x.GuildId == guildId)
+                        .Select(x => x.PruneDays)
+                        .FirstOrDefaultAsyncLinqToDB();
    }

    public Task<SmartText> GetBanUserDmEmbed(
@@ -554,18 +555,18 @@ public class UserPunishService : INService, IReadyExecutor
        banReason = string.IsNullOrWhiteSpace(banReason) ? "-" : banReason;

        var repCtx = new ReplacementContext(client, guild)
-            .WithOverride("%ban.mod%", () => moderator.ToString())
-            .WithOverride("%ban.mod.fullname%", () => moderator.ToString())
-            .WithOverride("%ban.mod.name%", () => moderator.Username)
-            .WithOverride("%ban.mod.discrim%", () => moderator.Discriminator)
-            .WithOverride("%ban.user%", () => target.ToString())
-            .WithOverride("%ban.user.fullname%", () => target.ToString())
-            .WithOverride("%ban.user.name%", () => target.Username)
-            .WithOverride("%ban.user.discrim%", () => target.Discriminator)
-            .WithOverride("%reason%", () => banReason)
-            .WithOverride("%ban.reason%", () => banReason)
-            .WithOverride("%ban.duration%",
-                () => duration?.ToString(@"d\.hh\:mm") ?? "perma");
+                     .WithOverride("%ban.mod%", () => moderator.ToString())
+                     .WithOverride("%ban.mod.fullname%", () => moderator.ToString())
+                     .WithOverride("%ban.mod.name%", () => moderator.Username)
+                     .WithOverride("%ban.mod.discrim%", () => moderator.Discriminator)
+                     .WithOverride("%ban.user%", () => target.ToString())
+                     .WithOverride("%ban.user.fullname%", () => target.ToString())
+                     .WithOverride("%ban.user.name%", () => target.Username)
+                     .WithOverride("%ban.user.discrim%", () => target.Discriminator)
+                     .WithOverride("%reason%", () => banReason)
+                     .WithOverride("%ban.reason%", () => banReason)
+                     .WithOverride("%ban.duration%",
+                         () => duration?.ToString(@"d\.hh\:mm") ?? "perma");


        // if template isn't set, use the old message style
@@ -594,4 +595,24 @@ public class UserPunishService : INService, IReadyExecutor
        var output = SmartText.CreateFrom(template);
        return await _repSvc.ReplaceAsync(output, repCtx);
    }
+
+    public async Task<Warning> WarnDelete(ulong userId, int index)
+    {
+        await using var uow = _db.GetDbContext();
+
+        var warn = await uow.GetTable<Warning>()
+                            .Where(x => x.UserId == userId)
+                            .OrderByDescending(x => x.DateAdded)
+                            .Skip(index)
+                            .FirstOrDefaultAsyncLinqToDB();
+
+        if (warn is not null)
+        {
+            await uow.GetTable<Warning>()
+                     .Where(x => x.Id == warn.Id)
+                     .DeleteAsync();
+        }
+
+        return warn;
+    }
 }
--- a/src/NadekoBot/Modules/Administration/VcRole/VcRoleService.cs
+++ b/src/NadekoBot/Modules/Administration/VcRole/VcRoleService.cs
@@ -1,6 +1,5 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
-using NadekoBot.Db;
 using NadekoBot.Db.Models;

 namespace NadekoBot.Modules.Administration.Services;
--- a/src/NadekoBot/Modules/Expressions/NadekoExpressions.cs
+++ b/src/NadekoBot/Modules/Expressions/NadekoExpressions.cs
@@ -398,15 +398,14 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>

        var serialized = _service.ExportExpressions(ctx.Guild?.Id);
        await using var stream = await serialized.ToStream();
-        await ctx.Channel.SendFileAsync(stream, "exprs-export.yml");
+        await ctx.User.SendFileAsync(stream, $"exprs-export_{DateTime.UtcNow:yyyy-MM-dd-HH-mm-ss}_{(ctx.Guild?.Id.ToString() ?? "global")}.yml");
    }

    [Cmd]
-#if GLOBAL_NADEKO
-    [OwnerOnly]
-#endif
    public async Task ExprsImport([Leftover] string input = null)
    {
+        // todo cooldown on public bot for 1 day, limit 100
+        
        if (!AdminInGuildOrOwnerInDm())
        {
            await Response().Error(strs.expr_insuff_perms).SendAsync();
--- a/src/NadekoBot/Modules/Expressions/NadekoExpressionsService.cs
+++ b/src/NadekoBot/Modules/Expressions/NadekoExpressionsService.cs
@@ -2,7 +2,6 @@
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Common.Yml;
-using NadekoBot.Db;
 using NadekoBot.Db.Models;
 using System.Runtime.CompilerServices;
 using LinqToDB.EntityFrameworkCore;
--- a/src/NadekoBot/Modules/Gambling/Bank/BankCommands.cs
+++ b/src/NadekoBot/Modules/Gambling/Bank/BankCommands.cs
@@ -73,6 +73,27 @@ public partial class Gambling
                await Response().Error(strs.cant_dm).SendAsync();
            }
        }
+        
+        [Cmd]
+        [OwnerOnly]
+        public async Task BankBalance([Leftover] IUser user)
+        {
+            var bal = await _bank.GetBalanceAsync(user.Id);
+
+            var eb = _sender.CreateEmbed()
+                            .WithOkColor()
+                            .WithDescription(GetText(strs.bank_balance_other(user.ToString(), N(bal))));
+
+            try
+            {
+                await Response().User(ctx.User).Embed(eb).SendAsync();
+                await ctx.OkAsync();
+            }
+            catch
+            {
+                await Response().Error(strs.cant_dm).SendAsync();
+            }
+        }

        private async Task BankTakeInternalAsync(long amount, ulong userId)
        {
--- a/src/NadekoBot/Modules/Gambling/BlackJack/BlackJackCommands.cs
+++ b/src/NadekoBot/Modules/Gambling/BlackJack/BlackJackCommands.cs
@@ -3,7 +3,6 @@ using NadekoBot.Common.TypeReaders;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Common.Blackjack;
 using NadekoBot.Modules.Gambling.Services;
-using NadekoBot.Modules.Utility;

 namespace NadekoBot.Modules.Gambling;

--- a/src/NadekoBot/Modules/Gambling/Connect4/Connect4.cs
+++ b/src/NadekoBot/Modules/Gambling/Connect4/Connect4.cs
@@ -38,11 +38,11 @@ public sealed class Connect4Game : IDisposable

    public Phase CurrentPhase { get; private set; } = Phase.Joining;

-    public ImmutableArray<Field> GameState
-        => _gameState.ToImmutableArray();
+    public IReadOnlyList<Field> GameState
+        => _gameState.AsReadOnly();

-    public ImmutableArray<(ulong UserId, string Username)?> Players
-        => _players.ToImmutableArray();
+    public IReadOnlyCollection<(ulong UserId, string Username)?> Players
+        => _players.AsReadOnly();

    public (ulong UserId, string Username) CurrentPlayer
        => CurrentPhase == Phase.P1Move ? _players[0].Value : _players[1].Value;
@@ -56,7 +56,6 @@ public sealed class Connect4Game : IDisposable

    private readonly SemaphoreSlim _locker = new(1, 1);
    private readonly Options _options;
-    private readonly ICurrencyService _cs;
    private readonly NadekoRandom _rng;

    private Timer playerTimeoutTimer;
@@ -73,12 +72,11 @@ public sealed class Connect4Game : IDisposable
    public Connect4Game(
        ulong userId,
        string userName,
-        Options options,
-        ICurrencyService cs)
+        Options options
+    )
    {
        _players[0] = (userId, userName);
        _options = options;
-        _cs = cs;

        _rng = new();
        for (var i = 0; i < NUMBER_OF_COLUMNS * NUMBER_OF_ROWS; i++)
@@ -99,14 +97,13 @@ public sealed class Connect4Game : IDisposable
                {
                    _ = OnGameFailedToStart?.Invoke(this);
                    CurrentPhase = Phase.Ended;
-                    await _cs.AddAsync(_players[0].Value.UserId, _options.Bet, new("connect4", "refund"));
                }
            }
            finally { _locker.Release(); }
        });
    }

-    public async Task<bool> Join(ulong userId, string userName, int bet)
+    public async Task<bool> Join(ulong userId, string userName)
    {
        await _locker.WaitAsync();
        try
@@ -117,11 +114,6 @@ public sealed class Connect4Game : IDisposable
            if (_players[0].Value.UserId == userId) // same user can't join own game
                return false;

-            if (bet != _options.Bet) // can't join if bet amount is not the same
-                return false;
-
-            if (!await _cs.RemoveAsync(userId, bet, new("connect4", "bet"))) // user doesn't have enough money to gamble
-                return false;

            if (_rng.Next(0, 2) == 0) //rolling from 0-1, if number is 0, join as first player
            {
@@ -351,13 +343,8 @@ public sealed class Connect4Game : IDisposable

        if (result == Result.Draw)
        {
-            _cs.AddAsync(CurrentPlayer.UserId, _options.Bet, new("connect4", "draw"));
-            _cs.AddAsync(OtherPlayer.UserId, _options.Bet, new("connect4", "draw"));
            return;
        }
-
-        if (winId is not null)
-            _cs.AddAsync(winId.Value, (long)(_options.Bet * 1.98), new("connect4", "win"));
    }

    private Field GetPlayerPiece(ulong userId)
@@ -394,16 +381,10 @@ public sealed class Connect4Game : IDisposable
            HelpText = "Turn time in seconds. It has to be between 5 and 60. Default 15.")]
        public int TurnTimer { get; set; } = 15;

-        [Option('b', "bet", Required = false, Default = 0, HelpText = "Amount you bet. Default 0.")]
-        public int Bet { get; set; }
-
        public void NormalizeOptions()
        {
            if (TurnTimer is < 5 or > 60)
                TurnTimer = 15;
-
-            if (Bet < 0)
-                Bet = 0;
        }
    }
 }
--- a/src/NadekoBot/Modules/Gambling/Connect4/Connect4Commands.cs
+++ b/src/NadekoBot/Modules/Gambling/Connect4/Connect4Commands.cs
@@ -29,17 +29,15 @@ public partial class Gambling
        }

        private readonly DiscordSocketClient _client;
-        private readonly ICurrencyService _cs;

        private IUserMessage msg;

        private int repostCounter;

-        public Connect4Commands(DiscordSocketClient client, ICurrencyService cs, GamblingConfigService gamb)
+        public Connect4Commands(DiscordSocketClient client, GamblingConfigService gamb)
            : base(gamb)
        {
            _client = client;
-            _cs = cs;
        }

        [Cmd]
@@ -48,10 +46,8 @@ public partial class Gambling
        public async Task Connect4(params string[] args)
        {
            var (options, _) = OptionsParser.ParseFrom(new Connect4Game.Options(), args);
-            if (!await CheckBetOptional(options.Bet))
-                return;

-            var newGame = new Connect4Game(ctx.User.Id, ctx.User.ToString(), options, _cs);
+            var newGame = new Connect4Game(ctx.User.Id, ctx.User.ToString(), options);
            Connect4Game game;
            if ((game = _service.Connect4Games.GetOrAdd(ctx.Channel.Id, newGame)) != newGame)
            {
@@ -60,31 +56,17 @@ public partial class Gambling

                newGame.Dispose();
                //means game already exists, try to join
-                await game.Join(ctx.User.Id, ctx.User.ToString(), options.Bet);
+                await game.Join(ctx.User.Id, ctx.User.ToString());
                return;
            }

-            if (options.Bet > 0)
-            {
-                if (!await _cs.RemoveAsync(ctx.User.Id, options.Bet, new("connect4", "bet")))
-                {
-                    await Response().Error(strs.not_enough(CurrencySign)).SendAsync();
-                    _service.Connect4Games.TryRemove(ctx.Channel.Id, out _);
-                    game.Dispose();
-                    return;
-                }
-            }
-
            game.OnGameStateUpdated += Game_OnGameStateUpdated;
            game.OnGameFailedToStart += GameOnGameFailedToStart;
            game.OnGameEnded += GameOnGameEnded;
            _client.MessageReceived += ClientMessageReceived;

            game.Initialize();
-            if (options.Bet == 0)
-                await Response().Confirm(strs.connect4_created).SendAsync();
-            else
-                await Response().Error(strs.connect4_created_bet(N(options.Bet))).SendAsync();
+            await Response().Confirm(strs.connect4_created).SendAsync();

            Task ClientMessageReceived(SocketMessage arg)
            {
@@ -151,19 +133,19 @@ public partial class Gambling
                    title = GetText(strs.connect4_draw);

                return msg.ModifyAsync(x => x.Embed = _sender.CreateEmbed()
-                                                         .WithTitle(title)
-                                                         .WithDescription(GetGameStateText(game))
-                                                         .WithOkColor()
-                                                         .Build());
+                                                             .WithTitle(title)
+                                                             .WithDescription(GetGameStateText(game))
+                                                             .WithOkColor()
+                                                             .Build());
            }
        }

        private async Task Game_OnGameStateUpdated(Connect4Game game)
        {
            var embed = _sender.CreateEmbed()
-                           .WithTitle($"{game.CurrentPlayer.Username} vs {game.OtherPlayer.Username}")
-                           .WithDescription(GetGameStateText(game))
-                           .WithOkColor();
+                               .WithTitle($"{game.CurrentPlayer.Username} vs {game.OtherPlayer.Username}")
+                               .WithDescription(GetGameStateText(game))
+                               .WithOkColor();


            if (msg is null)
@@ -198,7 +180,7 @@ public partial class Gambling

            for (var i = 0; i < Connect4Game.NUMBER_OF_COLUMNS; i++)
                sb.Append(_numbers[i]);
-            
+
            return sb.ToString();
        }
    }
--- a/src/NadekoBot/Modules/Gambling/Draw/DrawCommands.cs
+++ b/src/NadekoBot/Modules/Gambling/Draw/DrawCommands.cs
@@ -17,7 +17,8 @@ public partial class Gambling
        private static readonly ConcurrentDictionary<IGuild, Deck> _allDecks = new();
        private readonly IImageCache _images;

-        public DrawCommands(IImageCache images, GamblingConfigService gcs) : base(gcs)
+        public DrawCommands(IImageCache images, GamblingConfigService gcs)
+            : base(gcs)
            => _images = images;

        private async Task InternalDraw(int count, ulong? guildId = null)
@@ -56,8 +57,8 @@ public partial class Gambling
                i.Dispose();

            var eb = _sender.CreateEmbed()
-                .WithOkColor();
-            
+                            .WithOkColor();
+
            var toSend = string.Empty;
            if (cardObjects.Count == 5)
                eb.AddField(GetText(strs.hand_value), Deck.GetHandValue(cardObjects), true);
@@ -71,7 +72,7 @@ public partial class Gambling

            if (count > 1)
                eb.AddField(GetText(strs.cards), count.ToString(), true);
-                
+
            await using var imageStream = await img.ToStreamAsync();
            await ctx.Channel.SendFileAsync(imageStream,
                imgName,
@@ -84,7 +85,7 @@ public partial class Gambling
            var cardBytes = await File.ReadAllBytesAsync($"data/images/cards/{cardName}.jpg");
            return Image.Load<Rgba32>(cardBytes);
        }
-        
+
        private async Task<Image<Rgba32>> GetCardImageAsync(Deck.Card currentCard)
        {
            var cardName = currentCard.ToString().ToLowerInvariant().Replace(' ', '_');
@@ -98,7 +99,7 @@ public partial class Gambling
        {
            if (num < 1)
                return;
-            
+
            if (num > 10)
                num = 10;

@@ -110,7 +111,7 @@ public partial class Gambling
        {
            if (num < 1)
                return;
-            
+
            if (num > 10)
                num = 10;

@@ -136,19 +137,29 @@ public partial class Gambling

        [Cmd]
        [RequireContext(ContextType.Guild)]
-        public Task BetDraw([OverrideTypeReader(typeof(BalanceTypeReader))] long amount, InputValueGuess val, InputColorGuess? col = null)
+        public Task BetDraw(
+            [OverrideTypeReader(typeof(BalanceTypeReader))]
+            long amount,
+            InputValueGuess val,
+            InputColorGuess? col = null)
            => BetDrawInternal(amount, val, col);
-        
+
        [Cmd]
        [RequireContext(ContextType.Guild)]
-        public Task BetDraw([OverrideTypeReader(typeof(BalanceTypeReader))] long amount, InputColorGuess col, InputValueGuess? val = null)
+        public Task BetDraw(
+            [OverrideTypeReader(typeof(BalanceTypeReader))]
+            long amount,
+            InputColorGuess col,
+            InputValueGuess? val = null)
            => BetDrawInternal(amount, val, col);
-        
+
        public async Task BetDrawInternal(long amount, InputValueGuess? val, InputColorGuess? col)
        {
-            if (amount <= 0)
+            if (!await CheckBetMandatory(amount))
+            {
                return;
-            
+            }
+
            var res = await _service.BetDrawAsync(ctx.User.Id,
                amount,
                (byte?)val,
@@ -161,13 +172,13 @@ public partial class Gambling
            }

            var eb = _sender.CreateEmbed()
-                .WithOkColor()
-                .WithAuthor(ctx.User)
-                .WithDescription(result.Card.GetEmoji())
-                .AddField(GetText(strs.guess), GetGuessInfo(val, col), true)
-                .AddField(GetText(strs.card), GetCardInfo(result.Card), true)
-                .AddField(GetText(strs.won), N((long)result.Won), false)
-                .WithImageUrl("attachment://card.png");
+                            .WithOkColor()
+                            .WithAuthor(ctx.User)
+                            .WithDescription(result.Card.GetEmoji())
+                            .AddField(GetText(strs.guess), GetGuessInfo(val, col), true)
+                            .AddField(GetText(strs.card), GetCardInfo(result.Card), true)
+                            .AddField(GetText(strs.won), N((long)result.Won), false)
+                            .WithImageUrl("attachment://card.png");

            using var img = await GetCardImageAsync(result.Card);
            await using var imgStream = await img.ToStreamAsync();
@@ -189,9 +200,10 @@ public partial class Gambling
                InputColorGuess.Black => "B ⚫",
                _ => "❓"
            };
-            
+
            return $"{val} / {col}";
        }
+
        private string GetCardInfo(RegularCard card)
        {
            var val = (int)card.Value switch
@@ -208,7 +220,7 @@ public partial class Gambling
                    RegularSuit.Diamonds or RegularSuit.Hearts => "R 🔴",
                    _ => "B ⚫"
                };
-            
+
            return $"{val} / {col}";
        }

--- a/src/NadekoBot/Modules/Gambling/Gambling.cs
+++ b/src/NadekoBot/Modules/Gambling/Gambling.cs
@@ -13,7 +13,6 @@ using System.Text;
 using NadekoBot.Modules.Gambling.Rps;
 using NadekoBot.Common.TypeReaders;
 using NadekoBot.Modules.Patronage;
-using NadekoBot.Modules.Utility;

 namespace NadekoBot.Modules.Gambling;

@@ -31,8 +30,6 @@ public partial class Gambling : GamblingModule<GamblingService>
    private readonly GamblingTxTracker _gamblingTxTracker;
    private readonly IPatronageService _ps;

-    private IUserMessage rdMsg;
-
    public Gambling(
        IGamblingService gs,
        DbService db,
@@ -105,34 +102,6 @@ public partial class Gambling : GamblingModule<GamblingService>
        await Response().Embed(eb).SendAsync();
    }

-    [Cmd]
-    public async Task Economy()
-    {
-        var ec = await _service.GetEconomyAsync();
-        decimal onePercent = 0;
-
-        // This stops the top 1% from owning more than 100% of the money
-        if (ec.Cash > 0)
-        {
-            onePercent = ec.OnePercent / (ec.Cash - ec.Bot);
-        }
-
-        // [21:03] Bob Page: Kinda remids me of US economy
-        var embed = _sender.CreateEmbed()
-                           .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 Response().Embed(embed).SendAsync();
-    }
-
    private async Task RemindTimelyAction(SocketMessageComponent smc, DateTime when)
    {
        var tt = TimestampTag.FromDateTime(when, TimestampTagStyles.Relative);
@@ -602,117 +571,6 @@ public partial class Gambling : GamblingModule<GamblingService>
        }
    }

-    [Cmd]
-    [RequireContext(ContextType.Guild)]
-    public async Task RollDuel(IUser u)
-    {
-        if (ctx.User.Id == u.Id)
-        {
-            return;
-        }
-
-        //since the challenge is created by another user, we need to reverse the ids
-        //if it gets removed, means challenge is accepted
-        if (_service.Duels.TryRemove((ctx.User.Id, u.Id), out var game))
-        {
-            await game.StartGame();
-        }
-    }
-
-    [Cmd]
-    [RequireContext(ContextType.Guild)]
-    public async Task RollDuel([OverrideTypeReader(typeof(BalanceTypeReader))] long amount, IUser u)
-    {
-        if (ctx.User.Id == u.Id)
-        {
-            return;
-        }
-
-        if (amount <= 0)
-        {
-            return;
-        }
-
-        var embed = _sender.CreateEmbed().WithOkColor().WithTitle(GetText(strs.roll_duel));
-
-        var description = string.Empty;
-
-        var game = new RollDuelGame(_cs, _client.CurrentUser.Id, ctx.User.Id, u.Id, amount);
-        //means challenge is just created
-        if (_service.Duels.TryGetValue((ctx.User.Id, u.Id), out var other))
-        {
-            if (other.Amount != amount)
-            {
-                await Response().Error(strs.roll_duel_already_challenged).SendAsync();
-            }
-            else
-            {
-                await RollDuel(u);
-            }
-
-            return;
-        }
-
-        if (_service.Duels.TryAdd((u.Id, ctx.User.Id), game))
-        {
-            game.OnGameTick += GameOnGameTick;
-            game.OnEnded += GameOnEnded;
-
-            await Response()
-                  .Confirm(strs.roll_duel_challenge(Format.Bold(ctx.User.ToString()),
-                      Format.Bold(u.ToString()),
-                      Format.Bold(N(amount))))
-                  .SendAsync();
-        }
-
-        async Task GameOnGameTick(RollDuelGame arg)
-        {
-            var rolls = arg.Rolls.Last();
-            description += $@"{Format.Bold(ctx.User.ToString())} rolled **{rolls.Item1}**
-{Format.Bold(u.ToString())} rolled **{rolls.Item2}**
--
-";
-            embed = embed.WithDescription(description);
-
-            if (rdMsg is null)
-            {
-                rdMsg = await Response().Embed(embed).SendAsync();
-            }
-            else
-            {
-                await rdMsg.ModifyAsync(x => { x.Embed = embed.Build(); });
-            }
-        }
-
-        async Task GameOnEnded(RollDuelGame rdGame, RollDuelGame.Reason reason)
-        {
-            try
-            {
-                if (reason == RollDuelGame.Reason.Normal)
-                {
-                    var winner = rdGame.Winner == rdGame.P1 ? ctx.User : u;
-                    description += $"\n**{winner}** Won {N((long)(rdGame.Amount * 2 * 0.98))}";
-
-                    embed = embed.WithDescription(description);
-
-                    await rdMsg.ModifyAsync(x => x.Embed = embed.Build());
-                }
-                else if (reason == RollDuelGame.Reason.Timeout)
-                {
-                    await Response().Error(strs.roll_duel_timeout).SendAsync();
-                }
-                else if (reason == RollDuelGame.Reason.NoFunds)
-                {
-                    await Response().Error(strs.roll_duel_no_funds).SendAsync();
-                }
-            }
-            finally
-            {
-                _service.Duels.TryRemove((u.Id, ctx.User.Id), out _);
-            }
-        }
-    }
-
    [Cmd]
    public async Task BetRoll([OverrideTypeReader(typeof(BalanceTypeReader))] long amount)
    {
--- a/src/NadekoBot/Modules/Gambling/GamblingService.cs
+++ b/src/NadekoBot/Modules/Gambling/GamblingService.cs
@@ -2,7 +2,6 @@
 using LinqToDB;
 using LinqToDB.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Db;
 using NadekoBot.Db.Models;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Common.Connect4;
@@ -129,38 +128,6 @@ public class GamblingService : INService, IReadyExecutor

    private static readonly TypedKey<EconomyResult> _ecoKey = new("nadeko:economy");

-    public async Task<EconomyResult> GetEconomyAsync()
-    {
-        var data = await _cache.GetOrAddAsync(_ecoKey,
-            async () =>
-            {
-                await using var uow = _db.GetDbContext();
-                var cash = uow.Set<DiscordUser>().GetTotalCurrency();
-                var onePercent = uow.Set<DiscordUser>().GetTopOnePercentCurrency(_client.CurrentUser.Id);
-                decimal planted = uow.Set<PlantedCurrency>().AsQueryable().Sum(x => x.Amount);
-                var waifus = uow.Set<WaifuInfo>().GetTotalValue();
-                var bot = await uow.Set<DiscordUser>().GetUserCurrencyAsync(_client.CurrentUser.Id);
-                decimal bank = await uow.GetTable<BankUser>()
-                    .SumAsyncLinqToDB(x => x.Balance);
-
-                var result = new EconomyResult
-                {
-                    Cash = cash,
-                    Planted = planted,
-                    Bot = bot,
-                    Waifus = waifus,
-                    OnePercent = onePercent,
-                    Bank = bank
-                };
-
-                return result;
-            },
-            TimeSpan.FromMinutes(3));
-
-        return data;
-    }
-
-
    private static readonly SemaphoreSlim _timelyLock = new(1, 1);

    private static TypedKey<Dictionary<ulong, long>> _timelyKey
--- a/src/NadekoBot/Modules/Gambling/PlantPick/PlantPickService.cs
+++ b/src/NadekoBot/Modules/Gambling/PlantPick/PlantPickService.cs
@@ -1,7 +1,6 @@
 #nullable disable
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Db;
 using NadekoBot.Db.Models;
 using SixLabors.Fonts;
 using SixLabors.ImageSharp;
@@ -32,7 +31,6 @@ public class PlantPickService : INService, IExecNoCommand

    public PlantPickService(
        DbService db,
-        CommandHandler cmd,
        IBotStrings strings,
        IImageCache images,
        FontProvider fonts,
@@ -108,7 +106,6 @@ public class PlantPickService : INService, IExecNoCommand
    ///     Get a random currency image stream, with an optional password sticked onto it.
    /// </summary>
    /// <param name="pass">Optional password to add to top left corner.</param>
-    /// <param name="extension">Extension of the file, defaults to png</param>
    /// <returns>Stream of the currency image</returns>
    public async Task<(Stream, string)> GetRandomCurrencyImageAsync(string pass)
    {
--- a/src/NadekoBot/Modules/Gambling/Raffle/CurrencyRaffleCommands.cs
+++ b/src/NadekoBot/Modules/Gambling/Raffle/CurrencyRaffleCommands.cs
@@ -1,61 +0,0 @@
-#nullable disable
-using NadekoBot.Common.TypeReaders;
-using NadekoBot.Modules.Gambling.Common;
-using NadekoBot.Modules.Gambling.Services;
-
-namespace NadekoBot.Modules.Gambling;
-
-public partial class Gambling
-{
-    public partial class CurrencyRaffleCommands : GamblingSubmodule<CurrencyRaffleService>
-    {
-        public enum Mixed { Mixed }
-
-        public CurrencyRaffleCommands(GamblingConfigService gamblingConfService)
-            : base(gamblingConfService)
-        {
-        }
-
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [Priority(0)]
-        public Task RaffleCur(Mixed _, [OverrideTypeReader(typeof(BalanceTypeReader))] long amount)
-            => RaffleCur(amount, true);
-
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [Priority(1)]
-        public async Task RaffleCur([OverrideTypeReader(typeof(BalanceTypeReader))] long amount, bool mixed = false)
-        {
-            if (!await CheckBetMandatory(amount))
-                return;
-
-            async Task OnEnded(IUser arg, long won)
-            {
-                await Response()
-                      .Confirm(GetText(strs.rafflecur_ended(CurrencyName,
-                          Format.Bold(arg.ToString()),
-                          won + CurrencySign)))
-                      .SendAsync();
-            }
-
-            var res = await _service.JoinOrCreateGame(ctx.Channel.Id, ctx.User, amount, mixed, OnEnded);
-
-            if (res.Item1 is not null)
-            {
-                await Response()
-                      .Confirm(GetText(strs.rafflecur(res.Item1.GameType.ToString())),
-                          string.Join("\n", res.Item1.Users.Select(x => $"{x.DiscordUser} ({N(x.Amount)})")),
-                          footer: GetText(strs.rafflecur_joined(ctx.User.ToString())))
-                      .SendAsync();
-            }
-            else
-            {
-                if (res.Item2 == CurrencyRaffleService.JoinErrorType.AlreadyJoinedOrInvalidAmount)
-                    await Response().Error(strs.rafflecur_already_joined).SendAsync();
-                else if (res.Item2 == CurrencyRaffleService.JoinErrorType.NotEnoughCurrency)
-                    await Response().Error(strs.not_enough(CurrencySign)).SendAsync();
-            }
-        }
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kwoth	c95d1421c6	fix: fixed some command groups incorrectly showing up as modules	2024-08-08 12:15:53 +00:00
Kwoth	f631f16690	fix: fixed one of the migrations which was preventing some bots from starting	2024-08-07 17:45:25 +00:00
Kwoth	d397c2dce8	docs: fixed changelog	2024-08-07 16:46:33 +00:00
Kwoth	273816b8a4	docs: Updated changelog, upped version to 5.1.6	2024-08-07 15:46:53 +00:00
Kwoth	3094c3248b	fix: fixed user id in afk message dm	2024-08-07 15:38:54 +00:00
Kwoth	ae6018f0e1	change: Afk messages should now be sent in DMs to prevent abuse	2024-08-07 15:29:39 +00:00
Kwoth	54adbedf9f	add: doing .gencmdlist will now generate a data/commandlist.json which is the same as the file you receive in discord	2024-08-06 14:58:13 +00:00
Kwoth	eb29e34f17	dev: More cleanup add: Added better placeholder links to some commands strings	2024-08-06 13:24:31 +00:00
Kwoth	4a402ee673	change: Removed a lot of old useless/broken commands. Improved .listserver. Full changes in changelog	2024-08-05 15:56:32 +00:00
Kwoth	764babdf06	dev: small cleanup, removed qodana	2024-08-05 14:13:23 +00:00
Kwoth	dd49d202b7	dev: small cleanup in clubs	2024-08-05 13:38:29 +00:00
Kwoth	a396c2d9dd	dev: removed unused usings, no functional change	2024-08-05 13:32:15 +00:00
Kwoth	15fe8b5daf	dev: Removed some unused code, no functional change	2024-08-05 13:18:44 +00:00
Kwoth	f8da25a6f3	fix: fixed docker build dev: allow qodana to fail	2024-08-05 12:25:05 +00:00
Kwoth	383acba443	dev: added qodana, trying it out	2024-08-05 12:20:27 +00:00
Kwoth	690c03b396	dev: lmgtfy should now be properly shortened, small refactor of .shorten command	2024-08-04 17:58:04 +00:00
Kwoth	f4ed907134	fix: Possible fix for a broken timestamp tag in remind list	2024-08-03 13:53:42 +00:00
Kwoth	1b0badd8d8	docs: Updated changelog	2024-08-02 02:44:46 +00:00
Kwoth	2c3ada4710	dev: using official version of discord.net docs: upped version to 5.1.5 dev: removed nuget.config as we no longer rely on myget dev: Fixed some build warnings	2024-08-01 02:36:49 +00:00
Kwoth	0df3c1a4a1	dev: small cleanup	2024-08-01 01:07:38 +00:00
Kwoth	ac589e0461	change: .define slightly improved and refactored	2024-07-31 13:43:13 +00:00
Kwoth	8f181eed85	change: .wikia slightly changed and refactored	2024-07-31 10:55:34 +00:00
Kwoth	6fefce4c4d	dev: refactored .bible and .quran, moved to their own folder and created ReligiousApiService for their logic	2024-07-30 14:18:44 +00:00
Kwoth	d9e080f4b9	change: .reroadd error message improved	2024-07-29 05:33:49 +00:00
Kwoth	762a2eca1f	change: .keep will also automatically trigger for any new server the bot joins	2024-07-29 04:31:09 +00:00
Kwoth	2fba771681	docs: slight update to lmgtfy command's strings	2024-07-28 19:53:14 +00:00
Kwoth	b5e2b6f483	dev: v3 .catfact	2024-07-28 10:10:19 +00:00
Kwoth	17e5ff8b89	dev: slightly updated .time	2024-07-28 10:02:06 +00:00
Kwoth	3d287b2afa	remove: Removed .rip command	2024-07-28 09:50:06 +00:00
Kwoth	3f33274cec	dev: Brough .wiki command to 2018 standards	2024-07-28 09:32:40 +00:00
Kwoth	ee9d8a51bf	add: Added .keep command which will add the current guild to the list of keptguilds. This is needed for the future database purge.	2024-07-28 00:33:31 +00:00
Kwoth	80a7678a82	dev: Updated imagesharp package	2024-07-26 22:36:19 +00:00
Kwoth	de8a0e2207	add: Added admin-only .warndelete command	2024-07-26 22:34:53 +00:00
Kwoth	122b3ae0d9	docs: Vastly simplified medusa creation using dotnet templates	2024-07-25 02:10:51 +00:00
Kwoth	b4307f9123	dev: reverted ci change, medusa will keep using myget	2024-07-25 00:59:37 +00:00
Kwoth	5ae18ba1bf	dev: added nuget source url to ci	2024-07-24 03:41:16 +00:00
Kwoth	44c8c9f459	dev: medusa package should now be published to nuget	2024-07-23 23:28:31 +00:00
Kwoth	4e177ff198	docs: Updated medusa docs a little bit	2024-07-22 01:26:11 +00:00
Kwoth	ad679a996d	docs: Updated some command strings	2024-07-21 23:57:41 +00:00
Kwoth	7d86a5e3eb	docs: Updated bot strings to clarify all half and x% usage	2024-07-20 23:07:05 +00:00
Kwoth	214c9a383c	change: Updated some bet descriptions to include 'all' 'half' usage instructions	2024-07-20 22:57:15 +00:00
Kwoth	f77e1c6b8c	fix: You can once again disable cleverbot responses using fake 'cleverbot:response' module name in permission commands	2024-07-19 16:57:37 +00:00
Kwoth	7e784b9507	change: show a message when .prune fails due to already running error	2024-07-18 13:24:37 +00:00
Kwoth	7a14991ed6	fix: Possible fix for .prune getting stuck after unsuccessful limit hit	2024-07-18 13:20:07 +00:00
Kwoth	4c5c2d7f6e	.cleverbot should be available on the public bot now	2024-07-17 15:18:56 +00:00
Kwoth	87b90b47ce	added: Added `.afk <msg>?` command which sets an afk message which will trigger whenever someone pings a user.	2024-07-16 19:09:10 +00:00
Kwoth	9f060243f0	change: .exexport will now send you the file in DMs, to avoid incident. change: .exexport will now have a timestamped name along with the server id	2024-07-14 16:11:04 +00:00
Kwoth	d3ab32a7ac	fix: .coins will no longer show double minus sign for negative changes	2024-07-14 13:38:56 +00:00
Kwoth	7bd081b7cf	docs: Updated CHANGELOG.md with the openai changes	2024-07-13 16:02:28 +00:00
Kwoth	3a5b482884	docs: Updated changelog, upped version to 5.1.4 fix: Fixed pipeline	2024-07-13 15:49:52 +00:00
Kwoth	db66264bc6	add: Added support for any openai compatible api for the chatterbot feature change: Changed games.yml to allow input of the apiUrl (needs to be openai compatible) and modelName as a string.	2024-07-13 15:36:49 +00:00
Kwoth	ae1ddd82d0	fix: Fixed .waifugift help string	2024-07-12 20:50:56 +00:00
Kwoth	8523abd6f1	add: Added multiplier option for waifu gifts. For example .waifugift 3xRose @user will give that user 3 roses	2024-07-12 17:18:47 +00:00
Kwoth	e1892c4ff4	remove: Removed selfhost button from .donate, no idea why it was there in the first place	2024-07-12 16:24:49 +00:00
Kwoth	a50a7b3b0e	add: Added user param to .bank balance command, but only Bot Owner can use it	2024-07-11 18:46:48 +00:00
Kwoth	9d2268a925	fix: fixed .clubinfo rank	2024-07-11 00:53:52 +00:00
Kwoth	d77a86c08b	add: Added club rank in .clubinfo	2024-07-10 08:31:01 +00:00
Kwoth	d605f685cf	docs: Updated command strings to clarify .say and .send usage	2024-07-08 16:24:59 +00:00
Kwoth	bbc1fd28c2	change: .coins cache will expire after an hour	2024-07-07 10:09:48 +00:00
Kwoth	cff8a258d0	fix: .coins will respect the user specified page now	2024-07-07 10:07:35 +00:00
Kwoth	1d760a548e	fix: cache .coins result to avoid ratelimits	2024-07-07 10:05:01 +00:00
Kwoth	25fa8a3852	add: Added .coins command which lists top 10 cryptos ordered by marketcap, paginated with 10 per page	2024-07-07 05:23:59 +00:00
Kwoth	ca13684c0d	docs: Updated CHANGELOG. dev: upped version to 5.1.3	2024-07-06 09:05:34 +00:00
Kwoth	0ad6b741e7	add: chatterbot, (but not prompting) will also trigger if the user replies to a bot's message	2024-07-05 04:55:33 +00:00
Kwoth	4ce756d760	fix: if prompt ai responds with chat, it will prevent further further execution of tthat input to prevent the same query running multiple times	2024-07-05 04:48:00 +00:00
Kwoth	5f2813d3af	fix: clean the bot username too from invalid characters for openai	2024-07-05 03:36:04 +00:00
Kwoth	1b7458529c	fix: bot should now trim the invalid characters from openai message usernames	2024-07-05 03:33:04 +00:00
Kwoth	9c9c8d7490	fix: fixed pipeline	2024-06-29 08:43:50 +00:00
Kwoth	2700bfdce8	fix: Fixed .stickeradd, it now properly supports 300x300 image uploads. closes #434	2024-06-29 08:42:47 +00:00
Kwoth	5498c5ce3f	add: Added .quran command, which will show the provided ayah in english and arabic, including recitation by Alafasy	2024-06-29 07:14:13 +00:00
Kwoth	6f444a8da0	fix: fixed pipeline, no functional change	2024-06-29 01:36:38 +00:00
Kwoth	454c14eee1	docs: Updated changelog	2024-06-29 01:25:48 +00:00
Kwoth	30aa8e8186	fix: fixed honeypot not unbanning and pruning	2024-06-29 01:24:14 +00:00
Kwoth	2ca141810c	docs: updated pagination, upped version to 5.1.1	2024-06-28 05:17:40 +00:00
Kwoth	9da8e4f1c1	fix: Fixed pagination, for real this time, closes #435 , dev: removed some old creds migration code, incremented creds version	2024-06-27 19:48:39 +00:00
Kwoth	ef471c32bb	add: Added .honeypot command fix: Fixed .betdraw not respecting max bet limit	2024-06-27 04:50:55 +00:00
Kwoth	49d557caec	fix: removed an extra in remind string	2024-06-25 16:01:59 +00:00
Kwoth	4366f908f3	dev: Using new stopwatch, some cleanup. No functional change	2024-06-25 07:09:16 +00:00
Kwoth	237e66495b	fix: Potential fix for the invalid syntax redis issue, unless the issue is caused by the older version of redis on the server itself	2024-06-25 03:32:21 +00:00