Upped version to 4.3.7, updated changelog

corrected swapped instructions

See merge request Kwoth/nadekobot!266

CHANGELOG.md

@@ -2,6 +2,107 @@
 
 Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
+## [4.3.7]
+
+### Added
+
+- Added `.exprdelserv` (.exds) to completement .exas. Deletes an expression on the current server and is susceptible to .dpo, unlike .exd
+- Added `.shopreq` which lets you set role requirement for specific shop items
+- Added `.shopbuy` alias to `.buy`
+
+### Fixed
+
+- Fixed `.convertlist` showing currencies twice (this may not apply to existing users and it may require you to manually remove all currencies from units.json)
+
+### Removed
+
+- Removed `Viewer` field from stream online notification as it is (almost?) always 0.
+
+## [4.3.6] - 08.09.2022
+
+### Added
+
+- Added `.expraddserver` (.exas) which will server as a server-only alternative to '.exa' in case users want to override default Admin permissions with .dpo
+- Added .banprune command which sets how many days worth of messages will be pruned when bot (soft)bans a person either through a command or another punishment feature.
+- Added .qdelauth - Delete all quotes by the specified author on this server. If you target yourself - no permission required
+- Added `.timeout` command
+- Added an option to award currency based on received xp
+
+### Changed
+
+- Reminders now have embed support, but plaintext field is not supported.
+- User friendlier errors when parsing a number in a command fails
+
+### Fixed
+
+- Awarded xp is now correctly used in level up calculations
+
+## [4.3.5] - 17.08.2022
+
+### Added
+
+- Added a 'Use' button when a user already owns an item
+- Added a 'Pull Again' button to slots
+- Added `.roleinfo` command
+- Added `.emojiremove` command
+- Added `.threadcreate` and `.threaddelete` commands
+- Added `.bank seize` / `.bank award` owner only commands
+
+### Changed
+
+- Running a .timely command early now shows a pending color
+- .xp system is once again no longer opt in for servers
+  - It's still opt-in for global and requires users to run .xp at least once in order to start gaining global xp
+
+### Fixed
+
+- Fixed users not getting club xp
+
+## [4.3.4] - 07.08.2022
+
+### Fixed
+
+- Fixed users getting XP out of nowhere while voice xp is enabled
+
+## [4.3.3] - 06.08.2022
+
+### Added
+
+- Added `betroll` option to `.bettest` command
+- Added `.xpshopbuy` and `.xpshopuse` convenience commands
+- Added an optional preview url to teh xp shop item config model which will be shown instead of the real Url
+
+### Changed
+
+- Updated position of Username and Club name on the .xp card
+- Improved text visibility on the .xp card
+
+### Fixed
+
+- Possibly fixed .trivia not stopping bug
+- Fixed very low payout rate on `.betroll`
+- Fixed an issue with youtube song resolver which caused invalid data to be cached
+- Added client id to the cache key as a potential fix for VoiceXp 'bug'. The solution may be to use different redis instances for each bot, or to switch from botCache: from 'redis' to 'memory' in creds.yml
+- Bot owner should now be able to buy items from the xpshop when patron requirement is set
+- Fixed youtube-dl caching invalid data. Please use yt-dlp instead
+
+## [4.3.2] - 28.07.2022
+
+### Fixed
+
+- Fixed Reaction Roles not working properly with animated emojis
+- Fixed `.slot` alignment
+- Fixed `mysql` and `postgresql` reactionrole migration
+- Fixed repeat loop with `postgresql` db provider
+- Fixed `.bank withdraw <expression>` will now correctly use bank amount for calculation
+- [dev] Fixed medusa Reply*LocalizedAsync not working with placeholders
+
+## [4.3.1] - 27.07.2022
+
+### Changed
+
+- Check for updates will run once per hour as it was supposed to
+
 ## [4.3.0] - 27.07.2022
 
 ### Added
@@ -15,9 +116,10 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.
   - They payouts are very good, but seven always loses
 - Added `.lula` command. Plays the same as `.wof` but looks much nicer, and is easily customizable from gambling.yml without any changes to the sourcecode needed.
 - Added `.repeatskip` command which makes the next repeat trigger not post anything
-- Added `.imageonly` which will make the bot only allow link posts in the channel. Exclusive with `.imageonly`
+- Added `.linkonly` which will make the bot only allow link posts in the channel. Exclusive with `.imageonly`
 - Added release notifications. Bot owners will now receive new release notifications in dms if they have `checkForUpdates` set to `true` in data/bot.yml
-  - You can also configure it via `.conf bot checkforupdates <true/false>`
+  - You can also configure it via `.conf bot checkfor
+  - updates <true/false>`
 - Added `.xpshop` which lets bot owners add xp backgrounds and xp frames for sale by configuring `data/xp.yml`
   - You can also toggle xpshop feature via `.conf xp shop.is_enabled`
 

Dockerfile

@@ -42,6 +42,7 @@ COPY docker-entrypoint.sh /usr/local/sbin
 
 ENV shard_id=0
 ENV total_shards=1
+ENV NadekoBot__creds=/app/data/creds.yml
 
 VOLUME [ "/app/data" ]
 ENTRYPOINT [ "/usr/local/sbin/docker-entrypoint.sh" ]

README.md

@@ -1,8 +1,3 @@
-[![Discord](https://discordapp.com/api/guilds/117523346618318850/widget.png)](https://discord.gg/nadekobot)
-[![Documentation Status](https://readthedocs.org/projects/nadekobot/badge/?version=latest)](http://nadekobot.readthedocs.io/en/v4/?badge=v4)
-[![Discord Bots](https://discordbots.org/api/widget/status/116275390695079945.svg)](https://top.gg/bot/116275390695079945)  
-
-  
 [![nadeko0](https://cdn.nadeko.bot/tutorial/docs-top.png)](https://nadeko.bot/)  
   
 [![nadeko1](https://cdn.nadeko.bot/tutorial/docs-mid.png)](https://invite.nadeko.bot/)  

docker-entrypoint.sh

@@ -13,7 +13,15 @@ do
     fi
 done
 
-# fix folder permissions
+# creds.yml migration
+if [ -f /app/creds.yml ]; then
+    echo "Default location for creds.yml is now /app/data/creds.yml."
+    echo "Please move your creds.yml and update your docker-compose.yml accordingly."
+
+    export Nadeko_creds=/app/creds.yml
+fi
+
+# ensure nadeko can write on /app/data
 chown -R nadeko:nadeko "$data"
 
 # drop to regular user and launch command

docs/creds-guide.md

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

docs/guides/linux-guide.md

@@ -1,4 +1,4 @@
-# Setting up NadekoBot on Linux
+w# Setting up NadekoBot on Linux
 
 | Table of Contents                                   |
 | :-------------------------------------------------- |
@@ -69,7 +69,7 @@ Open Terminal (if you're on an installation with a window manager) and navigate
 
 ###### Prerequisites
 
-1. Nadeko requires redis to function
+1. (Optional) Installing Redis
     - ubuntu installation command: `sudo apt-get install redis-server`
 2. Playing music requires `ffmpeg`, `libopus`, `libsodium` and `youtube-dl` (which in turn requires python3)
     - ubuntu installation command: `sudo apt-get install ffmpeg libopus0 opus-tools libopus-dev libsodium-dev -y`
@@ -160,15 +160,30 @@ If you are presented with the installer main menu, exit it by choosing Option `8
 
 The above command will create a new session named **nadeko** *(you can replace “nadeko” with anything you prefer, it's your session name)*.
 
-2. Navigate to the project's root directory
-    - Project root directory location example: `cd /home/user/nadekobot/`
-3. Enter the `output` directory:
-    - `cd output`
-4. Run the bot using:
-    - `dotnet NadekoBot.dll`
-5. Detatch the tmux session:
+2. Run the installer: `bash linuxAIO.sh`
+
+3. There are a few options when it comes to running Nadeko.
+
+    - Run `3` to *Run the bot normally*
+    - Run `4` to *Run the bot with Auto Restart* (This is may or may not work)
+
+4. If option `4` was selected, you have the following options
+```
+1. Run Auto Restart normally without updating NadekoBot.
+2. Run Auto Restart and update NadekoBot.
+3. Exit
+
+Choose:
+[1] to Run NadekoBot with Auto Restart on "die" command without updating.
+[2] to Run with Auto Updating on restart after using "die" command.
+```
+- Run `1` to update the bot upon restart. (This is done using the `.die` command)
+- Run `2` to restart the bot without updating. (This is also done using the `.die` command)
+
+5. That's it! to detatch the tmux session:
     - Press `Ctrl` + `B`
     - Then press `D`
+
 Now check your Discord server, the bot should be online. Nadeko should now be running in the background of your system. 
 
 To re-open the tmux session to either update, restart, or whatever, execute `tmux a -t nadeko`. *(Make sure to replace "nadeko" with your session name. If you didn't change it, leave it as it.)*

docs/guides/windows-guide.md

@@ -19,7 +19,7 @@
 
 **Optional**
 
-- [Notepad++] (makes it easier to edit your credentials)
+- [Visual Studio Code](https://code.visualstudio.com/Download) (Highly suggested if you plan on editing files)
 - [Visual C++ 2010 (x86)] and [Visual C++ 2017 (x64)] (both are required if you want Nadeko to play music - restart Windows after installation)
 
 #### Setup

src/Nadeko.Common/NadekoRandom.cs

@@ -26,20 +26,6 @@ public class NadekoRandom : Random
         return Math.Abs(BitConverter.ToInt32(bytes, 0)) % maxValue;
     }
 
-    public byte Next(byte minValue, byte maxValue)
-    {
-        if (minValue > maxValue)
-            throw new ArgumentOutOfRangeException(nameof(maxValue));
-        
-        if (minValue == maxValue)
-            return minValue;
-        
-        var bytes = new byte[1];
-        _rng.GetBytes(bytes);
-        
-        return (byte)((bytes[0] % (maxValue - minValue)) + minValue);
-    }
-
     public override int Next(int minValue, int maxValue)
     {
         if (minValue > maxValue)

src/Nadeko.Common/ShmartBankAmount.cs

@@ -0,0 +1,19 @@
+namespace Nadeko.Common;
+
+public readonly struct ShmartBankAmount
+{
+    public long Amount { get; }
+    public ShmartBankAmount(long amount)
+    {
+        Amount = amount;
+    }
+    
+    public static implicit operator ShmartBankAmount(long num)
+        => new(num);
+
+    public static implicit operator long(ShmartBankAmount num)
+        => num.Amount;
+
+    public static implicit operator ShmartBankAmount(int num)
+        => new(num);
+}

src/Nadeko.Common/ShmartNumber.cs

@@ -3,12 +3,10 @@
 public readonly struct ShmartNumber : IEquatable<ShmartNumber>
 {
     public long Value { get; }
-    public string? Input { get; }
 
-    public ShmartNumber(long val, string? input = null)
+    public ShmartNumber(long val)
     {
         Value = val;
-        Input = input;
     }
 
     public static implicit operator ShmartNumber(long num)

src/Nadeko.Econ/Gambling/Betflip/BetflipGame.cs

@@ -12,7 +12,7 @@ public sealed class BetflipGame
 
     public BetflipResult Flip(byte guess, decimal amount)
     {
-        var side = _rng.Next(0, 2);
+        var side = (byte)_rng.Next(0, 2);
         if (side == guess)
         {
             return new BetflipResult()

src/Nadeko.Econ/Gambling/Betroll/BetrollGame.cs

@@ -13,7 +13,7 @@ public sealed class BetrollGame
 
     public BetrollResult Roll(decimal amount = 0)
     {
-        var roll = _rng.Next(0, 101);
+        var roll = _rng.Next(1, 101);
 
         for (var i = 0; i < _thresholdPairs.Length; i++)
         {

src/Nadeko.Econ/Gambling/Slot/SlotGame.cs

@@ -1,5 +1,8 @@
 namespace Nadeko.Econ.Gambling;
 
+//here is a payout chart
+//https://lh6.googleusercontent.com/-i1hjAJy_kN4/UswKxmhrbPI/AAAAAAAAB1U/82wq_4ZZc-Y/DE6B0895-6FC1-48BE-AC4F-14D1B91AB75B.jpg
+//thanks to judge for helping me with this
 public class SlotGame
 {
     private static readonly NadekoRandom _rng = new NadekoRandom();
@@ -8,9 +11,9 @@ public class SlotGame
     {
         var rolls = new[]
         {
-            _rng.Next(0, 6),
-            _rng.Next(0, 6),
-            _rng.Next(0, 6)
+            (byte)_rng.Next(0, 6),
+            (byte)_rng.Next(0, 6),
+            (byte)_rng.Next(0, 6)
         };
 
         ref var a = ref rolls[0];

src/Nadeko.Medusa/Extensions/MedusaExtensions.cs

@@ -47,7 +47,7 @@ public static class MedusaExtensions
         => ctx.Message.AddReactionAsync(new Emoji("🤔"));
 
     public static Task<IUserMessage> ErrorLocalizedAsync(this AnyContext ctx, string key, params object[]? args)
-        => ctx.SendErrorAsync(ctx.GetText(key));
+        => ctx.SendErrorAsync(ctx.GetText(key, args));
 
     public static Task<IUserMessage> PendingLocalizedAsync(this AnyContext ctx, string key, params object[]? args)
         => ctx.SendPendingAsync(ctx.GetText(key, args));
@@ -56,11 +56,11 @@ public static class MedusaExtensions
         => ctx.SendConfirmAsync(ctx.GetText(key, args));
 
     public static Task<IUserMessage> ReplyErrorLocalizedAsync(this AnyContext ctx, string key, params object[]? args)
-        => ctx.SendErrorAsync($"{Format.Bold(ctx.User.ToString())} {ctx.GetText(key)}");
+        => ctx.SendErrorAsync($"{Format.Bold(ctx.User.ToString())} {ctx.GetText(key, args)}");
 
     public static Task<IUserMessage> ReplyPendingLocalizedAsync(this AnyContext ctx, string key, params object[]? args)
-        => ctx.SendPendingAsync($"{Format.Bold(ctx.User.ToString())} {ctx.GetText(key)}");
+        => ctx.SendPendingAsync($"{Format.Bold(ctx.User.ToString())} {ctx.GetText(key, args)}");
 
     public static Task<IUserMessage> ReplyConfirmLocalizedAsync(this AnyContext ctx, string key, params object[]? args)
-        => ctx.SendConfirmAsync($"{Format.Bold(ctx.User.ToString())} {ctx.GetText(key)}");
+        => ctx.SendConfirmAsync($"{Format.Bold(ctx.User.ToString())} {ctx.GetText(key, args)}");
 }

src/Nadeko.Medusa/IEmbedBuilder.cs

@@ -10,6 +10,7 @@ public interface IEmbedBuilder
     IEmbedBuilder WithFooter(string text, string? iconUrl = null);
     IEmbedBuilder WithAuthor(string name, string? iconUrl = null, string? url = null);
     IEmbedBuilder WithColor(EmbedColor color);
+    IEmbedBuilder WithDiscordColor(Color color);
     Embed Build();
     IEmbedBuilder WithUrl(string url);
     IEmbedBuilder WithImageUrl(string url);

src/Nadeko.Medusa/Nadeko.Medusa.csproj

@@ -12,7 +12,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Discord.Net.Core" Version="3.103.0" />
+      <PackageReference Include="Discord.Net.Core" Version="3.104.0" />
       <PackageReference Include="Serilog" Version="2.11.0" />
       <PackageReference Include="YamlDotNet" Version="11.2.1" />
     </ItemGroup>

src/NadekoBot/Bot.cs

@@ -3,14 +3,12 @@ using Microsoft.Extensions.DependencyInjection;
 using NadekoBot.Common.Configs;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Db;
-using NadekoBot.Modules.Administration;
 using NadekoBot.Modules.Utility;
 using NadekoBot.Services.Database.Models;
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Net;
 using System.Reflection;
-using Nadeko.Common;
 using RunMode = Discord.Commands.RunMode;
 
 namespace NadekoBot;
@@ -35,13 +33,13 @@ public sealed class Bot
     private readonly IBotCredsProvider _credsProvider;
     // private readonly InteractionService _interactionService;
 
-    public Bot(int shardId, int? totalShards)
+    public Bot(int shardId, int? totalShards, string credPath = null)
     {
         if (shardId < 0)
             throw new ArgumentOutOfRangeException(nameof(shardId));
 
         ShardId = shardId;
-        _credsProvider = new BotCredsProvider(totalShards);
+        _credsProvider = new BotCredsProvider(totalShards, credPath);
         _creds = _credsProvider.GetCreds();
 
         _db = new(_credsProvider);

src/NadekoBot/Common/Interaction/INadekoInteractionService.cs

@@ -0,0 +1,8 @@
+namespace NadekoBot;
+
+public interface INadekoInteractionService
+{
+    public NadekoInteraction Create<T>(
+        ulong userId,
+        SimpleInteraction<T> inter);
+}

src/NadekoBot/Common/Interaction/NadekoActionInteraction.cs

@@ -1,29 +0,0 @@
-namespace NadekoBot;
-
-public sealed class NadekoButtonActionInteraction : NadekoButtonOwnInteraction
-{
-    private readonly NadekoInteractionData _data;
-    private readonly Func<SocketMessageComponent, Task> _action;
-
-    public NadekoButtonActionInteraction(
-        DiscordSocketClient client,
-        ulong authorId,
-        NadekoInteractionData data,
-        Func<SocketMessageComponent, Task> action
-    )
-        : base(client, authorId)
-    {
-        _data = data;
-        _action = action;
-    }
-
-    protected override string Name
-        => _data.CustomId;
-    protected override IEmote Emote
-        => _data.Emote;
-    protected override string? Text
-        => _data.Text;
-
-    public override Task ExecuteOnActionAsync(SocketMessageComponent smc)
-        => _action(smc);
-}

src/NadekoBot/Common/Interaction/NadekoInteraction.cs

@@ -1,25 +1,30 @@
 namespace NadekoBot;
 
-public abstract class NadekoButtonInteraction
+public sealed class NadekoInteraction
 {
-    // improvements:
-    //  - state in OnAction
-    //  - configurable delay
-    //  - 
-    protected abstract string Name { get; }
-    protected abstract IEmote Emote { get; }
-    protected virtual string? Text { get; } = null;
-
+    private readonly ulong _authorId;
+    private readonly ButtonBuilder _button;
+    private readonly Func<SocketMessageComponent, Task> _onClick;
+    private readonly bool _onlyAuthor;
     public DiscordSocketClient Client { get; }
 
-    protected readonly TaskCompletionSource<bool> _interactionCompletedSource;
+    private readonly TaskCompletionSource<bool> _interactionCompletedSource;
 
-    protected IUserMessage message = null!;
+    private IUserMessage message = null!;
 
-    protected NadekoButtonInteraction(DiscordSocketClient client)
+    public NadekoInteraction(DiscordSocketClient client,
+        ulong authorId,
+        ButtonBuilder button,
+        Func<SocketMessageComponent, Task> onClick,
+        bool onlyAuthor)
     {
-        Client = client;
+        _authorId = authorId;
+        _button = button;
+        _onClick = onClick;
+        _onlyAuthor = onlyAuthor;
         _interactionCompletedSource = new(TaskCreationOptions.RunContinuationsAsynchronously);
+        
+        Client = client;
     }
 
     public async Task RunAsync(IUserMessage msg)
@@ -27,29 +32,25 @@ public abstract class NadekoButtonInteraction
         message = msg;
 
         Client.InteractionCreated += OnInteraction;
-        await Task.WhenAny(Task.Delay(10_000), _interactionCompletedSource.Task);
+        await Task.WhenAny(Task.Delay(15_000), _interactionCompletedSource.Task);
         Client.InteractionCreated -= OnInteraction;
 
         await msg.ModifyAsync(m => m.Components = new ComponentBuilder().Build());
     }
     
-    protected abstract ValueTask<bool> Validate(SocketMessageComponent smc);
-    private async Task OnInteraction(SocketInteraction arg)
+    private Task OnInteraction(SocketInteraction arg)
     {
         if (arg is not SocketMessageComponent smc)
-            return;
+            return Task.CompletedTask;
 
         if (smc.Message.Id != message.Id)
-            return;
+            return Task.CompletedTask;
 
-        if (smc.Data.CustomId != Name)
-            return;
+        if (_onlyAuthor && smc.User.Id != _authorId)
+            return Task.CompletedTask;
 
-        if (!await Validate(smc))
-        {
-            await smc.DeferAsync();
-            return;
-        }
+        if (smc.Data.CustomId != _button.CustomId)
+            return Task.CompletedTask;
 
         _ = Task.Run(async () =>
         {
@@ -63,21 +64,19 @@ public abstract class NadekoButtonInteraction
                 await smc.DeferAsync();
             }
         });
+        
+        return Task.CompletedTask;
     }
 
 
-    public virtual MessageComponent CreateComponent()
+    public MessageComponent CreateComponent()
     {
         var comp = new ComponentBuilder()
-            .WithButton(GetButtonBuilder());
+            .WithButton(_button);
 
         return comp.Build();
     }
 
-    public ButtonBuilder GetButtonBuilder()
-        => new ButtonBuilder(style: ButtonStyle.Secondary, emote: Emote, customId: Name, label: Text);
-
-    public abstract Task ExecuteOnActionAsync(SocketMessageComponent smc);
+    public Task ExecuteOnActionAsync(SocketMessageComponent smc)
+        => _onClick(smc);
 }
-
-// this is all so wrong ...

src/NadekoBot/Common/Interaction/NadekoInteractionArray.cs

@@ -1,43 +0,0 @@
-// namespace NadekoBot;
-//
-// public class NadekoButtonInteractionArray : NadekoButtonInteraction
-// {
-//     private readonly ButtonBuilder[] _bbs;
-//     private readonly NadekoButtonInteraction[] _inters;
-//
-//     public NadekoButtonInteractionArray(params NadekoButtonInteraction[] inters)
-//         : base(inters[0].Client)
-//     {
-//         _inters = inters;
-//         _bbs = inters.Map(x => x.GetButtonBuilder());
-//     }
-//
-//     protected override string Name
-//         => throw new NotSupportedException();
-//     protected override IEmote Emote
-//         => throw new NotSupportedException();
-//
-//     protected override ValueTask<bool> Validate(SocketMessageComponent smc)
-//         => new(true);
-//
-//     public override Task ExecuteOnActionAsync(SocketMessageComponent smc)
-//     {
-//         for (var i = 0; i < _bbs.Length; i++)
-//         {
-//             if (_bbs[i].CustomId == smc.Data.CustomId)
-//                 return _inters[i].ExecuteOnActionAsync(smc);
-//         }
-//
-//         return Task.CompletedTask;
-//     }
-//
-//     public override MessageComponent CreateComponent()
-//     {
-//         var comp = new ComponentBuilder();
-//
-//         foreach (var bb in _bbs)
-//             comp.WithButton(bb);
-//         
-//         return comp.Build();
-//     }
-// }

src/NadekoBot/Common/Interaction/NadekoInteractionBuilder.cs

@@ -1,42 +0,0 @@
-namespace NadekoBot;
-
-/// <summary>
-/// Builder class for NadekoInteractions
-/// </summary>
-public class NadekoInteractionBuilder
-{
-    private NadekoInteractionData? iData;
-    private Func<SocketMessageComponent, Task>? action;
-    // private bool isOwn;
-
-    public NadekoInteractionBuilder WithData<T>(in T data)
-        where T : NadekoInteractionData
-    {
-        iData = data;
-        return this;
-    }
-
-    // public NadekoOwnInteractionBuiler WithIsOwn(bool isOwn = true)
-    // {
-    //     this.isOwn = isOwn;
-    //     return this;
-    
-    // }
-    
-    public NadekoInteractionBuilder WithAction(in Func<SocketMessageComponent, Task> fn)
-    {
-        this.action = fn;
-        return this;
-    }
-
-    public NadekoButtonActionInteraction Build(DiscordSocketClient client, ulong userId)
-    {
-        if (iData is null)
-            throw new InvalidOperationException("You have to specify the data before building the interaction");
-
-        if (action is null)
-            throw new InvalidOperationException("You have to specify the action before building the interaction");
-
-        return new(client, userId, iData, action);
-    }
-}

src/NadekoBot/Common/Interaction/NadekoInteractionService.cs

@@ -0,0 +1,20 @@
+namespace NadekoBot;
+
+public class NadekoInteractionService : INadekoInteractionService, INService
+{
+    private readonly DiscordSocketClient _client;
+
+    public NadekoInteractionService(DiscordSocketClient client)
+    {
+        _client = client;
+    }
+
+    public NadekoInteraction Create<T>(
+        ulong userId,
+        SimpleInteraction<T> inter)
+        => new NadekoInteraction(_client,
+            userId,
+            inter.Button,
+            inter.TriggerAsync,
+            onlyAuthor: true);
+}

src/NadekoBot/Common/Interaction/NadekoOwnInteraction.cs

@@ -1,15 +0,0 @@
-namespace NadekoBot;
-
-/// <summary>
-/// Interaction which only the author can use
-/// </summary>
-public abstract class NadekoButtonOwnInteraction : NadekoButtonInteraction
-{
-    protected readonly ulong _authorId;
-
-    protected NadekoButtonOwnInteraction(DiscordSocketClient client, ulong authorId) : base(client)
-        => _authorId = authorId;
-
-    protected override ValueTask<bool> Validate(SocketMessageComponent smc)
-        => new(smc.User.Id == _authorId);
-}

src/NadekoBot/Common/NInteraction.cs

@@ -1,26 +0,0 @@
-namespace NadekoBot.Common;
-
-public abstract class NInteraction
-{
-    private readonly DiscordSocketClient _client;
-    private readonly ulong _userId;
-    private readonly Func<SocketMessageComponent, Task> _action;
-
-    protected abstract NadekoInteractionData Data { get; }
-
-    public NInteraction(
-        DiscordSocketClient client,
-        ulong userId,
-        Func<SocketMessageComponent, Task> action)
-    {
-        _client = client;
-        _userId = userId;
-        _action = action;
-    }
-
-    public NadekoButtonInteraction GetInteraction()
-        => new NadekoInteractionBuilder()
-           .WithData(Data)
-           .WithAction(_action)
-           .Build(_client, _userId);
-}

src/NadekoBot/Common/NadekoModule.cs

@@ -18,6 +18,7 @@ public abstract class NadekoModule : ModuleBase
     public CommandHandler _cmdHandler { get; set; }
     public ILocalization _localization { get; set; }
     public IEmbedBuilderService _eb { get; set; }
+    public INadekoInteractionService _inter { get; set; }
 
     protected string prefix
         => _cmdHandler.GetPrefix(ctx.Guild);
@@ -36,7 +37,7 @@ public abstract class NadekoModule : ModuleBase
         string error,
         string url = null,
         string footer = null, 
-        NadekoButtonInteraction inter = null)
+        NadekoInteraction inter = null)
         => ctx.Channel.SendErrorAsync(_eb, title, error, url, footer);
     
     public Task<IUserMessage> SendConfirmAsync(
@@ -47,32 +48,32 @@ public abstract class NadekoModule : ModuleBase
         => ctx.Channel.SendConfirmAsync(_eb, title, text, url, footer);
 
     // 
-    public Task<IUserMessage> SendErrorAsync(string text, NadekoButtonInteraction inter = null)
+    public Task<IUserMessage> SendErrorAsync(string text, NadekoInteraction inter = null)
         => ctx.Channel.SendAsync(_eb, text, MessageType.Error, inter);
-    public Task<IUserMessage> SendConfirmAsync(string text, NadekoButtonInteraction inter = null)
+    public Task<IUserMessage> SendConfirmAsync(string text, NadekoInteraction inter = null)
         => ctx.Channel.SendAsync(_eb, text, MessageType.Ok, inter);
-    public Task<IUserMessage> SendPendingAsync(string text, NadekoButtonInteraction inter = null)
+    public Task<IUserMessage> SendPendingAsync(string text, NadekoInteraction inter = null)
         => ctx.Channel.SendAsync(_eb, text, MessageType.Pending, inter);
 
     
     // localized normal
-    public Task<IUserMessage> ErrorLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
+    public Task<IUserMessage> ErrorLocalizedAsync(LocStr str, NadekoInteraction inter = null)
         => SendErrorAsync(GetText(str), inter);
 
-    public Task<IUserMessage> PendingLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
+    public Task<IUserMessage> PendingLocalizedAsync(LocStr str, NadekoInteraction inter = null)
         => SendPendingAsync(GetText(str), inter);
 
-    public Task<IUserMessage> ConfirmLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
+    public Task<IUserMessage> ConfirmLocalizedAsync(LocStr str, NadekoInteraction inter = null)
         => SendConfirmAsync(GetText(str), inter);
 
     // localized replies
-    public Task<IUserMessage> ReplyErrorLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
+    public Task<IUserMessage> ReplyErrorLocalizedAsync(LocStr str, NadekoInteraction inter = null)
         => SendErrorAsync($"{Format.Bold(ctx.User.ToString())} {GetText(str)}", inter);
 
-    public Task<IUserMessage> ReplyPendingLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
+    public Task<IUserMessage> ReplyPendingLocalizedAsync(LocStr str, NadekoInteraction inter = null)
         => SendPendingAsync($"{Format.Bold(ctx.User.ToString())} {GetText(str)}", inter);
 
-    public Task<IUserMessage> ReplyConfirmLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
+    public Task<IUserMessage> ReplyConfirmLocalizedAsync(LocStr str, NadekoInteraction inter = null)
         => SendConfirmAsync($"{Format.Bold(ctx.User.ToString())} {GetText(str)}", inter);
 
     public async Task<bool> PromptUserConfirmAsync(IEmbedBuilder embed)

src/NadekoBot/Common/TypeReaders/Shmart/BaseShmartInputAmountReader.cs

@@ -0,0 +1,94 @@
+using System.Text.RegularExpressions;
+using NadekoBot.Db;
+using NadekoBot.Modules.Gambling.Services;
+using NCalc;
+using OneOf;
+
+namespace NadekoBot.Common.TypeReaders;
+
+public class BaseShmartInputAmountReader
+{
+    private static readonly Regex _percentRegex = new(@"^((?<num>100|\d{1,2})%)$", RegexOptions.Compiled);
+    protected readonly DbService _db;
+    protected readonly GamblingConfigService _gambling;
+
+    public BaseShmartInputAmountReader(DbService db, GamblingConfigService gambling)
+    {
+        _db = db;
+        _gambling = gambling;
+    }
+
+    public async ValueTask<OneOf<long, OneOf.Types.Error<string>>> ReadAsync(ICommandContext context, string input)
+    {
+        var i = input.Trim().ToUpperInvariant();
+
+        i = i.Replace("K", "000");
+
+        //can't add m because it will conflict with max atm
+
+        if (await TryHandlePercentage(context, i) is long num)
+        {
+            return num;
+        }
+
+        try
+        {
+            var expr = new Expression(i, EvaluateOptions.IgnoreCase);
+            expr.EvaluateParameter += (str, ev) => EvaluateParam(str, ev, context).GetAwaiter().GetResult();
+            return (long)decimal.Parse(expr.Evaluate().ToString()!);
+        }
+        catch (Exception)
+        {
+            return new OneOf.Types.Error<string>($"Invalid input: {input}");
+        }
+    }
+
+    private async Task EvaluateParam(string name, ParameterArgs args, ICommandContext ctx)
+    {
+        switch (name.ToUpperInvariant())
+        {
+            case "PI":
+                args.Result = Math.PI;
+                break;
+            case "E":
+                args.Result = Math.E;
+                break;
+            case "ALL":
+            case "ALLIN":
+                args.Result = await Cur(ctx);
+                break;
+            case "HALF":
+                args.Result = await Cur(ctx) / 2;
+                break;
+            case "MAX":
+                args.Result = await Max(ctx);
+                break;
+        }
+    }
+
+    protected virtual async Task<long> Cur(ICommandContext ctx)
+    {
+        await using var uow = _db.GetDbContext();
+        return await uow.DiscordUser.GetUserCurrencyAsync(ctx.User.Id);
+    }
+
+    protected virtual async Task<long> Max(ICommandContext ctx)
+    {
+        var settings = _gambling.Data;
+        var max = settings.MaxBet;
+        return max == 0 ? await Cur(ctx) : max;
+    }
+
+    private async Task<long?> TryHandlePercentage(ICommandContext ctx, string input)
+    {
+        var m = _percentRegex.Match(input);
+        
+        if (m.Captures.Count == 0)
+            return null;
+        
+        if (!long.TryParse(m.Groups["num"].ToString(), out var percent))
+            return null;
+
+        return (long)(await Cur(ctx) * (percent / 100.0f));
+    }
+}

src/NadekoBot/Common/TypeReaders/Shmart/ShmartBankAmountTypeReader.cs

@@ -0,0 +1,32 @@
+#nullable disable
+using NadekoBot.Modules.Gambling.Bank;
+using NadekoBot.Modules.Gambling.Services;
+
+namespace NadekoBot.Common.TypeReaders;
+
+public sealed class ShmartBankAmountTypeReader : NadekoTypeReader<ShmartBankAmount>
+{
+    private readonly IBankService _bank;
+    private readonly ShmartBankInputAmountReader _tr;
+
+    public ShmartBankAmountTypeReader(IBankService bank, DbService db, GamblingConfigService gambling)
+    {
+        _bank = bank;
+        _tr = new ShmartBankInputAmountReader(bank, db, gambling);
+    }
+
+    public override async ValueTask<TypeReaderResult<ShmartBankAmount>> ReadAsync(ICommandContext ctx, string input)
+    {
+        if (string.IsNullOrWhiteSpace(input))
+            return TypeReaderResult.FromError<ShmartBankAmount>(CommandError.ParseFailed, "Input is empty.");
+
+        var result = await _tr.ReadAsync(ctx, input);
+
+        if (result.TryPickT0(out var val, out var err))
+        {
+            return TypeReaderResult.FromSuccess<ShmartBankAmount>(new(val));
+        }
+
+        return TypeReaderResult.FromError<ShmartBankAmount>(CommandError.Unsuccessful, err.Value);
+    }
+}

src/NadekoBot/Common/TypeReaders/Shmart/ShmartBankInputAmountReader.cs

@@ -0,0 +1,21 @@
+using NadekoBot.Modules.Gambling.Bank;
+using NadekoBot.Modules.Gambling.Services;
+
+namespace NadekoBot.Common.TypeReaders;
+
+public sealed class ShmartBankInputAmountReader : BaseShmartInputAmountReader
+{
+    private readonly IBankService _bank;
+
+    public ShmartBankInputAmountReader(IBankService bank, DbService db, GamblingConfigService gambling)
+        : base(db, gambling)
+    {
+        _bank = bank;
+    }
+
+    protected override Task<long> Cur(ICommandContext ctx)
+        => _bank.GetBalanceAsync(ctx.User.Id);
+
+    protected override Task<long> Max(ICommandContext ctx)
+        => Cur(ctx);
+}

src/NadekoBot/Common/TypeReaders/Shmart/ShmartNumberTypeReader.cs

@@ -0,0 +1,29 @@
+#nullable disable
+using NadekoBot.Modules.Gambling.Services;
+
+namespace NadekoBot.Common.TypeReaders;
+
+public sealed class ShmartNumberTypeReader : NadekoTypeReader<ShmartNumber>
+{
+    private readonly BaseShmartInputAmountReader _tr;
+
+    public ShmartNumberTypeReader(DbService db, GamblingConfigService gambling)
+    {
+        _tr = new BaseShmartInputAmountReader(db, gambling);
+    }
+
+    public override async ValueTask<TypeReaderResult<ShmartNumber>> ReadAsync(ICommandContext ctx, string input)
+    {
+        if (string.IsNullOrWhiteSpace(input))
+            return TypeReaderResult.FromError<ShmartNumber>(CommandError.ParseFailed, "Input is empty.");
+
+        var result = await _tr.ReadAsync(ctx, input);
+
+        if (result.TryPickT0(out var val, out var err))
+        {
+            return TypeReaderResult.FromSuccess<ShmartNumber>(new(val));
+        }
+
+        return TypeReaderResult.FromError<ShmartNumber>(CommandError.Unsuccessful, err.Value);
+    }
+}

src/NadekoBot/Common/TypeReaders/ShmartNumberTypeReader.cs

@@ -1,100 +0,0 @@
-#nullable disable
-using NadekoBot.Db;
-using NadekoBot.Modules.Gambling.Services;
-using NCalc;
-using System.Text.RegularExpressions;
-using Nadeko.Common;
-
-namespace NadekoBot.Common.TypeReaders;
-
-public sealed class ShmartNumberTypeReader : NadekoTypeReader<ShmartNumber>
-{
-    private static readonly Regex _percentRegex = new(@"^((?<num>100|\d{1,2})%)$", RegexOptions.Compiled);
-    private readonly DbService _db;
-    private readonly GamblingConfigService _gambling;
-
-    public ShmartNumberTypeReader(DbService db, GamblingConfigService gambling)
-    {
-        _db = db;
-        _gambling = gambling;
-    }
-
-    public override ValueTask<TypeReaderResult<ShmartNumber>> ReadAsync(ICommandContext context, string input)
-    {
-        if (string.IsNullOrWhiteSpace(input))
-            return new(TypeReaderResult.FromError<ShmartNumber>(CommandError.ParseFailed, "Input is empty."));
-
-        var i = input.Trim().ToUpperInvariant();
-
-        i = i.Replace("K", "000");
-
-        //can't add m because it will conflict with max atm
-
-        if (TryHandlePercentage(context, i, out var num))
-            return new(TypeReaderResult.FromSuccess(new ShmartNumber(num, i)));
-        try
-        {
-            var expr = new Expression(i, EvaluateOptions.IgnoreCase);
-            expr.EvaluateParameter += (str, ev) => EvaluateParam(str, ev, context);
-            var lon = (long)decimal.Parse(expr.Evaluate().ToString());
-            return new(TypeReaderResult.FromSuccess(new ShmartNumber(lon, input)));
-        }
-        catch (Exception)
-        {
-            return ValueTask.FromResult(
-                TypeReaderResult.FromError<ShmartNumber>(CommandError.ParseFailed, $"Invalid input: {input}"));
-        }
-    }
-
-    private void EvaluateParam(string name, ParameterArgs args, ICommandContext ctx)
-    {
-        switch (name.ToUpperInvariant())
-        {
-            case "PI":
-                args.Result = Math.PI;
-                break;
-            case "E":
-                args.Result = Math.E;
-                break;
-            case "ALL":
-            case "ALLIN":
-                args.Result = Cur(ctx);
-                break;
-            case "HALF":
-                args.Result = Cur(ctx) / 2;
-                break;
-            case "MAX":
-                args.Result = Max(ctx);
-                break;
-        }
-    }
-
-    private long Cur(ICommandContext ctx)
-    {
-        using var uow = _db.GetDbContext();
-        return uow.DiscordUser.GetUserCurrency(ctx.User.Id);
-    }
-
-    private long Max(ICommandContext ctx)
-    {
-        var settings = _gambling.Data;
-        var max = settings.MaxBet;
-        return max == 0 ? Cur(ctx) : max;
-    }
-
-    private bool TryHandlePercentage(ICommandContext ctx, string input, out long num)
-    {
-        num = 0;
-        var m = _percentRegex.Match(input);
-        if (m.Captures.Count != 0)
-        {
-            if (!long.TryParse(m.Groups["num"].ToString(), out var percent))
-                return false;
-
-            num = (long)(Cur(ctx) * (percent / 100.0f));
-            return true;
-        }
-
-        return false;
-    }
-}

src/NadekoBot/Db/Extensions/DiscordUserExtensions.cs

@@ -108,8 +108,8 @@ public static class DiscordUserExtensions
                 .Take(count)
                 .ToList();
 
-    public static long GetUserCurrency(this DbSet<DiscordUser> users, ulong userId)
-        => users.AsNoTracking().FirstOrDefault(x => x.UserId == userId)?.CurrencyAmount ?? 0;
+    public static async Task<long> GetUserCurrencyAsync(this DbSet<DiscordUser> users, ulong userId)
+        => (await users.FirstOrDefaultAsyncLinqToDB(x => x.UserId == userId))?.CurrencyAmount ?? 0;
 
     public static void RemoveFromMany(this DbSet<DiscordUser> users, IEnumerable<ulong> ids)
     {

src/NadekoBot/Db/Models/AntiProtection.cs

@@ -49,7 +49,8 @@ public enum PunishmentAction
     ChatMute,
     VoiceMute,
     AddRole,
-    Warn
+    Warn,
+    TimeOut
 }
 
 public class AntiSpamIgnore : DbEntity

src/NadekoBot/Db/Models/BanTemplate.cs

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

src/NadekoBot/Db/Models/DiscordUser.cs

@@ -17,8 +17,6 @@ public class DiscordUser : DbEntity
     public bool IsClubAdmin { get; set; }
 
     public long TotalXp { get; set; }
-    public DateTime LastLevelUp { get; set; } = DateTime.UtcNow;
-    public DateTime LastXpGain { get; set; } = DateTime.MinValue;
     public XpNotificationLocation NotifyOnLevelUp { get; set; }
 
     public long CurrencyAmount { get; set; }

src/NadekoBot/Db/Models/ShopEntry.cs

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

src/NadekoBot/Db/Models/UserXpStats.cs

@@ -8,7 +8,6 @@ public class UserXpStats : DbEntity
     public long Xp { get; set; }
     public long AwardedXp { get; set; }
     public XpNotificationLocation NotifyOnLevelUp { get; set; }
-    public DateTime LastLevelUp { get; set; } = DateTime.UtcNow;
 }
 
 public enum XpNotificationLocation { None, Dm, Channel }

src/NadekoBot/Db/Models/XpShopOwnedItem.cs

@@ -13,6 +13,6 @@ public class XpShopOwnedItem : DbEntity
 
 public enum XpShopItemType
 {
-    Background,
-    Frame,
+    Background = 0,
+    Frame = 1,
 }

src/NadekoBot/Db/MysqlContext.cs

@@ -10,10 +10,6 @@ public sealed class MysqlContext : NadekoContext
 
     protected override string CurrencyTransactionOtherIdDefaultValue
         => "NULL";
-    protected override string DiscordUserLastXpGainDefaultValue
-        => "(UTC_TIMESTAMP - INTERVAL 1 year)";
-    protected override string LastLevelUpDefaultValue
-        => "(UTC_TIMESTAMP)";
 
     public MysqlContext(string connStr = "Server=localhost", string version = "8.0")
     {

src/NadekoBot/Db/NadekoContext.cs

@@ -65,8 +65,6 @@ public abstract class NadekoContext : DbContext
     #region Mandatory Provider-Specific Values
 
     protected abstract string CurrencyTransactionOtherIdDefaultValue { get; }
-    protected abstract string DiscordUserLastXpGainDefaultValue { get; }
-    protected abstract string LastLevelUpDefaultValue { get; }
 
     #endregion
 
@@ -166,12 +164,6 @@ public abstract class NadekoContext : DbContext
             du.Property(x => x.NotifyOnLevelUp)
               .HasDefaultValue(XpNotificationLocation.None);
 
-            du.Property(x => x.LastXpGain)
-              .HasDefaultValueSql(DiscordUserLastXpGainDefaultValue);
-
-            du.Property(x => x.LastLevelUp)
-              .HasDefaultValueSql(LastLevelUpDefaultValue);
-
             du.Property(x => x.TotalXp)
               .HasDefaultValue(0);
 
@@ -213,9 +205,6 @@ public abstract class NadekoContext : DbContext
            })
            .IsUnique();
 
-        xps.Property(x => x.LastLevelUp)
-           .HasDefaultValueSql(LastLevelUpDefaultValue);
-
         xps.HasIndex(x => x.UserId);
         xps.HasIndex(x => x.GuildId);
         xps.HasIndex(x => x.Xp);
@@ -341,6 +330,10 @@ public abstract class NadekoContext : DbContext
         #region BanTemplate
 
         modelBuilder.Entity<BanTemplate>().HasIndex(x => x.GuildId).IsUnique();
+        modelBuilder.Entity<BanTemplate>()
+            .Property(x => x.PruneDays)
+            .HasDefaultValue(null)
+            .IsRequired(false);
 
         #endregion
 

src/NadekoBot/Db/PostgreSqlContext.cs

@@ -8,10 +8,6 @@ public sealed class PostgreSqlContext : NadekoContext
 
     protected override string CurrencyTransactionOtherIdDefaultValue
         => "NULL";
-    protected override string DiscordUserLastXpGainDefaultValue
-        => "timezone('utc', now()) - interval '-1 year'";
-    protected override string LastLevelUpDefaultValue
-        => "timezone('utc', now())";
 
     public PostgreSqlContext(string connStr = "Host=localhost")
     {
@@ -20,6 +16,8 @@ public sealed class PostgreSqlContext : NadekoContext
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
+        AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
+        
         base.OnConfiguring(optionsBuilder);
         optionsBuilder
             .UseLowerCaseNamingConvention()

src/NadekoBot/Db/SqliteContext.cs

@@ -9,10 +9,6 @@ public sealed class SqliteContext : NadekoContext
 
     protected override string CurrencyTransactionOtherIdDefaultValue
         => "NULL";
-    protected override string DiscordUserLastXpGainDefaultValue
-        => "datetime('now', '-1 years')";
-    protected override string LastLevelUpDefaultValue
-        => "datetime('now')";
 
     public SqliteContext(string connectionString = "Data Source=data/NadekoBot.db", int commandTimeout = 60)
     {

src/NadekoBot/Migrations/MigrationQueries.cs

@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace NadekoBot.Migrations;
 
@@ -6,11 +7,36 @@ public static class MigrationQueries
 {
     public static void MigrateRero(MigrationBuilder migrationBuilder)
     {
-        migrationBuilder.Sql(
-            @"insert or ignore into reactionroles(guildid, channelid, messageid, emote, roleid, 'group', levelreq, dateadded)
+        if (migrationBuilder.IsMySql())
+        {
+            migrationBuilder.Sql(
+                @"INSERT IGNORE into reactionroles(guildid, channelid, messageid, emote, roleid, `group`, levelreq, dateadded)
 select guildid, channelid, messageid, emotename, roleid, exclusive, 0, reactionrolemessage.dateadded
 from reactionrole
 left join reactionrolemessage on reactionrolemessage.id = reactionrole.reactionrolemessageid
 left join guildconfigs on reactionrolemessage.guildconfigid = guildconfigs.id;");
+        }
+        else if (migrationBuilder.IsSqlite())
+        {
+            migrationBuilder.Sql(
+                @"insert or ignore into reactionroles(guildid, channelid, messageid, emote, roleid, 'group', levelreq, dateadded)
+select guildid, channelid, messageid, emotename, roleid, exclusive, 0, reactionrolemessage.dateadded
+from reactionrole
+left join reactionrolemessage on reactionrolemessage.id = reactionrole.reactionrolemessageid
+left join guildconfigs on reactionrolemessage.guildconfigid = guildconfigs.id;");
+        }
+        else if (migrationBuilder.IsNpgsql())
+        {
+            migrationBuilder.Sql(@"insert into reactionroles(guildid, channelid, messageid, emote, roleid, ""group"", levelreq, dateadded)
+            select guildid, channelid, messageid, emotename, roleid, exclusive::int, 0, reactionrolemessage.dateadded
+                from reactionrole
+                left join reactionrolemessage on reactionrolemessage.id = reactionrole.reactionrolemessageid
+            left join guildconfigs on reactionrolemessage.guildconfigid = guildconfigs.id
+            ON CONFLICT DO NOTHING;");
+        }
+        else
+        {
+            throw new NotSupportedException("This database provider doesn't have an implementation for MigrateRero");
+        }
     }
 }

src/NadekoBot/Migrations/MySql/20220808141855_remove-obsolete-xp-columns.cs

@@ -0,0 +1,49 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.Mysql
+{
+    public partial class removeobsoletexpcolumns : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "lastlevelup",
+                table: "userxpstats");
+
+            migrationBuilder.DropColumn(
+                name: "lastlevelup",
+                table: "discorduser");
+
+            migrationBuilder.DropColumn(
+                name: "lastxpgain",
+                table: "discorduser");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "lastlevelup",
+                table: "userxpstats",
+                type: "datetime(6)",
+                nullable: false,
+                defaultValueSql: "(UTC_TIMESTAMP)");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "lastlevelup",
+                table: "discorduser",
+                type: "datetime(6)",
+                nullable: false,
+                defaultValueSql: "(UTC_TIMESTAMP)");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "lastxpgain",
+                table: "discorduser",
+                type: "datetime(6)",
+                nullable: false,
+                defaultValueSql: "(UTC_TIMESTAMP - INTERVAL 1 year)");
+        }
+    }
+}

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

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

src/NadekoBot/Migrations/MySql/MysqlContextModelSnapshot.cs

@@ -168,18 +168,6 @@ namespace NadekoBot.Migrations.Mysql
                         .HasDefaultValue(false)
                         .HasColumnName("isclubadmin");
 
-                    b.Property<DateTime>("LastLevelUp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime(6)")
-                        .HasColumnName("lastlevelup")
-                        .HasDefaultValueSql("(UTC_TIMESTAMP)");
-
-                    b.Property<DateTime>("LastXpGain")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime(6)")
-                        .HasColumnName("lastxpgain")
-                        .HasDefaultValueSql("(UTC_TIMESTAMP - INTERVAL 1 year)");
-
                     b.Property<int>("NotifyOnLevelUp")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int")
@@ -687,6 +675,10 @@ namespace NadekoBot.Migrations.Mysql
                         .HasColumnType("bigint unsigned")
                         .HasColumnName("guildid");
 
+                    b.Property<int?>("PruneDays")
+                        .HasColumnType("int")
+                        .HasColumnName("prunedays");
+
                     b.Property<string>("Text")
                         .HasColumnType("longtext")
                         .HasColumnName("text");
@@ -2565,12 +2557,6 @@ namespace NadekoBot.Migrations.Mysql
                         .HasColumnType("bigint unsigned")
                         .HasColumnName("guildid");
 
-                    b.Property<DateTime>("LastLevelUp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("datetime(6)")
-                        .HasColumnName("lastlevelup")
-                        .HasDefaultValueSql("(UTC_TIMESTAMP)");
-
                     b.Property<int>("NotifyOnLevelUp")
                         .HasColumnType("int")
                         .HasColumnName("notifyonlevelup");

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

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

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

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

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

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

src/NadekoBot/Migrations/Postgresql/PostgreSqlContextModelSnapshot.cs

@@ -36,7 +36,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("balance");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<decimal>("UserId")
@@ -101,7 +101,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<string>("Description")
@@ -163,7 +163,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("currencyamount");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<string>("Discriminator")
@@ -176,18 +176,6 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasDefaultValue(false)
                         .HasColumnName("isclubadmin");
 
-                    b.Property<DateTime>("LastLevelUp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("lastlevelup")
-                        .HasDefaultValueSql("timezone('utc', now())");
-
-                    b.Property<DateTime>("LastXpGain")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("lastxpgain")
-                        .HasDefaultValueSql("timezone('utc', now()) - interval '-1 year'");
-
                     b.Property<int>("NotifyOnLevelUp")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("integer")
@@ -243,7 +231,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -322,7 +310,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("amountcents");
 
                     b.Property<DateTime>("LastCharge")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("lastcharge");
 
                     b.Property<string>("UniquePlatformUserId")
@@ -330,7 +318,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("uniqueplatformuserid");
 
                     b.Property<DateTime>("ValidThru")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("validthru");
 
                     b.HasKey("UserId")
@@ -357,7 +345,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<decimal>("MessageId")
@@ -388,7 +376,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<bool>("IsUsing")
@@ -471,7 +459,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("action");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int>("GuildConfigId")
@@ -518,7 +506,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.HasKey("Id")
@@ -544,7 +532,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("action");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int>("GuildConfigId")
@@ -595,7 +583,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("commandtext");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<decimal?>("GuildId")
@@ -642,7 +630,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<decimal>("GuildId")
@@ -676,7 +664,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<string>("Source")
@@ -710,13 +698,17 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<decimal>("GuildId")
                         .HasColumnType("numeric(20,0)")
                         .HasColumnName("guildid");
 
+                    b.Property<int?>("PruneDays")
+                        .HasColumnType("integer")
+                        .HasColumnName("prunedays");
+
                     b.Property<string>("Text")
                         .HasColumnType("text")
                         .HasColumnName("text");
@@ -741,7 +733,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<decimal>("ItemId")
@@ -768,7 +760,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -806,7 +798,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("commandname");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -840,7 +832,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("amount");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<string>("Extra")
@@ -890,7 +882,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -924,7 +916,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("command");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<decimal?>("GuildId")
@@ -955,7 +947,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<decimal>("ItemId")
@@ -993,7 +985,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int>("GuildConfigId")
@@ -1028,7 +1020,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -1054,7 +1046,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -1088,7 +1080,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -1118,7 +1110,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -1148,7 +1140,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -1174,7 +1166,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int>("GuildConfigId")
@@ -1253,7 +1245,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("cleverbotenabled");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<bool>("DeleteMessageOnCommand")
@@ -1381,7 +1373,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int>("ItemType")
@@ -1420,7 +1412,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("LogSettingId")
@@ -1450,7 +1442,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<decimal>("GuildId")
@@ -1493,7 +1485,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelupdatedid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<decimal>("GuildId")
@@ -1629,7 +1621,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("authorid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<string>("Name")
@@ -1652,7 +1644,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -1694,7 +1686,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("containsanywhere");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<bool>("DmResponse")
@@ -1733,7 +1725,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<decimal>("GuildId")
@@ -1763,7 +1755,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -1825,7 +1817,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<decimal>("GuildId")
@@ -1867,7 +1859,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("MusicPlaylistId")
@@ -1917,7 +1909,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<decimal>("GuildId")
@@ -1948,7 +1940,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int>("Index")
@@ -1982,7 +1974,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("PollId")
@@ -2025,7 +2017,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("authorname");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<decimal>("GuildId")
@@ -2068,7 +2060,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<string>("Emote")
@@ -2123,7 +2115,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<bool>("IsPrivate")
@@ -2143,7 +2135,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("userid");
 
                     b.Property<DateTime>("When")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("when");
 
                     b.HasKey("Id")
@@ -2169,7 +2161,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("channelid");
 
                     b.Property<DateTime>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<decimal>("GuildId")
@@ -2216,11 +2208,11 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("amountrewardedthismonth");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<DateTime>("LastReward")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("lastreward");
 
                     b.Property<string>("PlatformUserId")
@@ -2251,7 +2243,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<string>("Status")
@@ -2278,7 +2270,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int>("Group")
@@ -2323,7 +2315,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("authorid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -2373,7 +2365,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("ShopEntryId")
@@ -2403,7 +2395,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -2433,7 +2425,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -2463,7 +2455,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("StreamRoleSettingsId")
@@ -2501,7 +2493,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("addroleid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<bool>("Enabled")
@@ -2540,7 +2532,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("StreamRoleSettingsId")
@@ -2574,7 +2566,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -2582,7 +2574,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("guildconfigid");
 
                     b.Property<DateTime>("UnbanAt")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("unbanat");
 
                     b.Property<decimal>("UserId")
@@ -2608,7 +2600,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -2616,7 +2608,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("guildconfigid");
 
                     b.Property<DateTime>("UnmuteAt")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("unmuteat");
 
                     b.Property<decimal>("UserId")
@@ -2642,7 +2634,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -2654,7 +2646,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("roleid");
 
                     b.Property<DateTime>("UnbanAt")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("unbanat");
 
                     b.Property<decimal>("UserId")
@@ -2684,19 +2676,13 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("awardedxp");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<decimal>("GuildId")
                         .HasColumnType("numeric(20,0)")
                         .HasColumnName("guildid");
 
-                    b.Property<DateTime>("LastLevelUp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("lastlevelup")
-                        .HasDefaultValueSql("timezone('utc', now())");
-
                     b.Property<int>("NotifyOnLevelUp")
                         .HasColumnType("integer")
                         .HasColumnName("notifyonlevelup");
@@ -2741,7 +2727,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -2783,7 +2769,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("claimerid");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<long>("Price")
@@ -2823,7 +2809,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<string>("ItemEmoji")
@@ -2857,7 +2843,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("NewId")
@@ -2901,7 +2887,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<bool>("Forgiven")
@@ -2963,7 +2949,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("count");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int?>("GuildConfigId")
@@ -3005,7 +2991,7 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnName("amount");
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int>("Level")
@@ -3035,7 +3021,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int>("Level")
@@ -3074,7 +3060,7 @@ namespace NadekoBot.Migrations.PostgreSql
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<DateTime?>("DateAdded")
-                        .HasColumnType("timestamp with time zone")
+                        .HasColumnType("timestamp without time zone")
                         .HasColumnName("dateadded");
 
                     b.Property<int>("GuildConfigId")

src/NadekoBot/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.cs

@@ -0,0 +1,49 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations
+{
+    public partial class removeobsoletexpcolumns : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "LastLevelUp",
+                table: "UserXpStats");
+
+            migrationBuilder.DropColumn(
+                name: "LastLevelUp",
+                table: "DiscordUser");
+
+            migrationBuilder.DropColumn(
+                name: "LastXpGain",
+                table: "DiscordUser");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "LastLevelUp",
+                table: "UserXpStats",
+                type: "TEXT",
+                nullable: false,
+                defaultValueSql: "datetime('now')");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "LastLevelUp",
+                table: "DiscordUser",
+                type: "TEXT",
+                nullable: false,
+                defaultValueSql: "datetime('now')");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "LastXpGain",
+                table: "DiscordUser",
+                type: "TEXT",
+                nullable: false,
+                defaultValueSql: "datetime('now', '-1 years')");
+        }
+    }
+}

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

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

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

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

src/NadekoBot/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs

@@ -134,16 +134,6 @@ namespace NadekoBot.Migrations
                         .HasColumnType("INTEGER")
                         .HasDefaultValue(false);
 
-                    b.Property<DateTime>("LastLevelUp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT")
-                        .HasDefaultValueSql("datetime('now')");
-
-                    b.Property<DateTime>("LastXpGain")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT")
-                        .HasDefaultValueSql("datetime('now', '-1 years')");
-
                     b.Property<int>("NotifyOnLevelUp")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("INTEGER")
@@ -539,6 +529,9 @@ namespace NadekoBot.Migrations
                     b.Property<ulong>("GuildId")
                         .HasColumnType("INTEGER");
 
+                    b.Property<int?>("PruneDays")
+                        .HasColumnType("INTEGER");
+
                     b.Property<string>("Text")
                         .HasColumnType("TEXT");
 
@@ -1752,6 +1745,9 @@ namespace NadekoBot.Migrations
                     b.Property<string>("RoleName")
                         .HasColumnType("TEXT");
 
+                    b.Property<ulong?>("RoleRequirement")
+                        .HasColumnType("INTEGER");
+
                     b.Property<int>("Type")
                         .HasColumnType("INTEGER");
 
@@ -2003,11 +1999,6 @@ namespace NadekoBot.Migrations
                     b.Property<ulong>("GuildId")
                         .HasColumnType("INTEGER");
 
-                    b.Property<DateTime>("LastLevelUp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT")
-                        .HasDefaultValueSql("datetime('now')");
-
                     b.Property<int>("NotifyOnLevelUp")
                         .HasColumnType("INTEGER");
 

src/NadekoBot/Modules/Administration/Administration.cs

@@ -344,4 +344,36 @@ public partial class Administration : NadekoModule<AdministrationService>
 
         await ctx.OkAsync();
     }
+
+    [Cmd]
+    [BotPerm(ChannelPermission.CreatePublicThreads)]
+    [UserPerm(ChannelPermission.CreatePublicThreads)]
+    public async Task ThreadCreate([Leftover] string name)
+    {
+        if (ctx.Channel is not SocketTextChannel stc)
+            return;
+        
+        await stc.CreateThreadAsync(name, message: ctx.Message.ReferencedMessage);
+        await ctx.OkAsync();
+    }
+    
+    [Cmd]
+    [BotPerm(ChannelPermission.ManageThreads)]
+    [UserPerm(ChannelPermission.ManageThreads)]
+    public async Task ThreadDelete([Leftover] string name)
+    {
+        if (ctx.Channel is not SocketTextChannel stc)
+            return;
+
+        var t = stc.Threads.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.InvariantCultureIgnoreCase));
+
+        if (t is null)
+        {
+            await ReplyErrorLocalizedAsync(strs.not_found);
+            return;
+        }
+        
+        await t.DeleteAsync();
+        await ctx.OkAsync();
+    }
 }

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

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

src/NadekoBot/Modules/Administration/Protection/ProtectionCommands.cs

@@ -38,10 +38,14 @@ public partial class Administration
             if (minAgeMinutes < 1 || punishTimeMinutes < 0)
                 return;
 
+            var minutes = (int?)punishTime?.Time.TotalMinutes ?? 0;
+            if (action is PunishmentAction.TimeOut && minutes < 1)
+                minutes = 1;
+
             await _service.StartAntiAltAsync(ctx.Guild.Id,
                 minAgeMinutes,
                 action,
-                (int?)punishTime?.Time.TotalMinutes ?? 0);
+                minutes);
 
             await ctx.OkAsync();
         }
@@ -56,6 +60,9 @@ public partial class Administration
             if (minAgeMinutes < 1)
                 return;
 
+            if (action == PunishmentAction.TimeOut)
+                return;
+
             await _service.StartAntiAltAsync(ctx.Guild.Id, minAgeMinutes, action, roleId: role.Id);
 
             await ctx.OkAsync();
@@ -123,6 +130,9 @@ public partial class Administration
             if (time is < 0 or > 60 * 24)
                 return;
             
+            if(action is PunishmentAction.TimeOut && time < 1)
+                return;
+
             var stats = await _service.StartAntiRaidAsync(ctx.Guild.Id, userThreshold, seconds, action, time);
 
             if (stats is null)
@@ -187,6 +197,9 @@ public partial class Administration
             if (time is < 0 or > 60 * 24)
                 return;
 
+            if (action is PunishmentAction.TimeOut && time < 1)
+                return;
+
             var stats = await _service.StartAntiSpamAsync(ctx.Guild.Id, messageCount, action, time, role?.Id);
 
             await SendConfirmAsync(GetText(strs.prot_enable("Anti-Spam")),

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

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

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

@@ -58,7 +58,7 @@ public sealed class ReactionRolesService : IReadyExecutor, INService, IReactionR
     }
 
     private async Task<(IGuildUser, IRole)> GetUserAndRoleAsync(
-        SocketReaction r,
+        ulong userId,
         ReactionRoleV2 rero)
     {
         var guild = _client.GetGuild(rero.GuildId);
@@ -67,8 +67,8 @@ public sealed class ReactionRolesService : IReadyExecutor, INService, IReactionR
         if (role is null)
             return default;
 
-        var user = guild.GetUser(r.UserId) as IGuildUser
-                   ?? await _client.Rest.GetGuildUserAsync(guild.Id, r.UserId);
+        var user = guild.GetUser(userId) as IGuildUser
+                   ?? await _client.Rest.GetGuildUserAsync(guild.Id, userId);
 
         if (user is null)
             return default;
@@ -77,20 +77,23 @@ public sealed class ReactionRolesService : IReadyExecutor, INService, IReactionR
     }
 
     private Task ClientOnReactionRemoved(
-        Cacheable<IUserMessage, ulong> msg,
+        Cacheable<IUserMessage, ulong> cmsg,
         Cacheable<IMessageChannel, ulong> ch,
         SocketReaction r)
     {
-        if (!_cache.TryGetValue(msg.Id, out var reros))
+        if (!_cache.TryGetValue(cmsg.Id, out var reros))
             return Task.CompletedTask;
 
         _ = Task.Run(async () =>
         {
-            var rero = reros.FirstOrDefault(x => x.Emote == r.Emote.Name || x.Emote == r.Emote.ToString());
+            var emote = await GetFixedEmoteAsync(cmsg, r.Emote);
+            
+            var rero = reros.FirstOrDefault(x => x.Emote == emote.Name 
+                                                 || x.Emote == emote.ToString());
             if (rero is null)
                 return;
 
-            var (user, role) = await GetUserAndRoleAsync(r, rero);
+            var (user, role) = await GetUserAndRoleAsync(r.UserId, rero);
 
             if (user.IsBot)
                 return;
@@ -112,6 +115,24 @@ public sealed class ReactionRolesService : IReadyExecutor, INService, IReactionR
         return Task.CompletedTask;
     }
 
+    
+    // had to add this because for some reason, reactionremoved event's reaction doesn't have IsAnimated set,
+    // causing the .ToString() to be wrong on animated custom emotes
+    private async Task<IEmote> GetFixedEmoteAsync(
+        Cacheable<IUserMessage, ulong> cmsg,
+        IEmote inputEmote)
+    {
+        // this should only run for emote
+        if (inputEmote is not Emote e)
+            return inputEmote;
+
+        // try to get the message and pull
+        var msg = await cmsg.GetOrDownloadAsync();
+
+        var emote = msg.Reactions.Keys.FirstOrDefault(x => e.Equals(x));
+        return emote ?? inputEmote;
+    }
+
     private Task ClientOnReactionAdded(
         Cacheable<IUserMessage, ulong> msg,
         Cacheable<IMessageChannel, ulong> ch,
@@ -126,7 +147,7 @@ public sealed class ReactionRolesService : IReadyExecutor, INService, IReactionR
             if (rero is null)
                 return;
 
-            var (user, role) = await GetUserAndRoleAsync(r, rero);
+            var (user, role) = await GetUserAndRoleAsync(r.UserId, rero);
 
             if (user.IsBot)
                 return;

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

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

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

@@ -1,5 +1,6 @@
 #nullable disable
 using LinqToDB;
+using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Common.TypeReaders.Models;
@@ -127,6 +128,7 @@ public class UserPunishService : INService, IReadyExecutor
         if (!await CheckPermission(guild, p))
             return;
 
+        int banPrune;
         switch (p)
         {
             case PunishmentAction.Mute:
@@ -151,13 +153,15 @@ public class UserPunishService : INService, IReadyExecutor
                 await user.KickAsync(reason);
                 break;
             case PunishmentAction.Ban:
+                banPrune = await GetBanPruneAsync(user.GuildId) ?? 7;
                 if (minutes == 0)
-                    await guild.AddBanAsync(user, reason: reason, pruneDays: 7);
+                    await guild.AddBanAsync(user, reason: reason, pruneDays: banPrune);
                 else
-                    await _mute.TimedBan(user.Guild, user, TimeSpan.FromMinutes(minutes), reason);
+                    await _mute.TimedBan(user.Guild, user, TimeSpan.FromMinutes(minutes), reason, banPrune);
                 break;
             case PunishmentAction.Softban:
-                await guild.AddBanAsync(user, 7, $"Softban | {reason}");
+                banPrune = await GetBanPruneAsync(user.GuildId) ?? 7;
+                await guild.AddBanAsync(user, banPrune, $"Softban | {reason}");
                 try
                 {
                     await guild.RemoveBanAsync(user);
@@ -193,6 +197,9 @@ public class UserPunishService : INService, IReadyExecutor
             case PunishmentAction.Warn:
                 await Warn(guild, user.Id, mod, 1, reason);
                 break;
+            case PunishmentAction.TimeOut:
+                await user.SetTimeOutAsync(TimeSpan.FromMinutes(minutes));
+                break;
         }
     }
 
@@ -224,6 +231,8 @@ public class UserPunishService : INService, IReadyExecutor
                 return botUser.GuildPermissions.MuteMembers;
             case PunishmentAction.AddRole:
                 return botUser.GuildPermissions.ManageRoles;
+            case PunishmentAction.TimeOut:
+                return botUser.GuildPermissions.ModerateMembers;
             default:
                 return true;
         }
@@ -351,7 +360,7 @@ public class UserPunishService : INService, IReadyExecutor
             await uow.Warnings.ForgiveAll(guildId, userId, moderator);
         else
             toReturn = uow.Warnings.Forgive(guildId, userId, moderator, index - 1);
-        uow.SaveChanges();
+        await uow.SaveChangesAsync();
         return toReturn;
     }
 
@@ -372,6 +381,9 @@ public class UserPunishService : INService, IReadyExecutor
         if (punish is PunishmentAction.AddRole && role is null)
             return false;
 
+        if (punish is PunishmentAction.TimeOut && time is null)
+            return false;
+
         using var uow = _db.GetDbContext();
         var ps = uow.GuildConfigsForId(guildId, set => set.Include(x => x.WarnPunishments)).WarnPunishments;
         var toDelete = ps.Where(x => x.Count == number);
@@ -481,6 +493,37 @@ public class UserPunishService : INService, IReadyExecutor
         uow.SaveChanges();
     }
 
+    public async Task SetBanPruneAsync(ulong guildId, int? pruneDays)
+    {
+        await using var ctx = _db.GetDbContext();
+        await ctx.BanTemplates
+            .ToLinqToDBTable()
+            .InsertOrUpdateAsync(() => new()
+                {
+                    GuildId = guildId,
+                    Text = null,
+                    DateAdded = DateTime.UtcNow,
+                    PruneDays = pruneDays
+                },
+                old => new()
+                {
+                    PruneDays = pruneDays
+                },
+                () => new()
+                {
+                    GuildId = guildId
+                });
+    }
+
+    public async Task<int?> GetBanPruneAsync(ulong guildId)
+    {
+        await using var ctx = _db.GetDbContext();
+        return await ctx.BanTemplates
+            .Where(x => x.GuildId == guildId)
+            .Select(x => x.PruneDays)
+            .FirstOrDefaultAsyncLinqToDB();
+    }
+
     public SmartText GetBanUserDmEmbed(
         ICommandContext context,
         IGuildUser target,

src/NadekoBot/Modules/CustomReactions/NadekoExpressions.cs

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

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

@@ -1,5 +1,4 @@
-using Nadeko.Common;
-using NadekoBot.Modules.Gambling.Bank;
+using NadekoBot.Modules.Gambling.Bank;
 using NadekoBot.Modules.Gambling.Common;
 using NadekoBot.Modules.Gambling.Services;
 
@@ -12,10 +11,14 @@ public partial class Gambling
     public partial class BankCommands : GamblingModule<IBankService>
     {
         private readonly IBankService _bank;
+        private readonly DiscordSocketClient _client;
 
-        public BankCommands(GamblingConfigService gcs, IBankService bank) : base(gcs)
+        public BankCommands(GamblingConfigService gcs,
+            IBankService bank,
+            DiscordSocketClient client) : base(gcs)
         {
             _bank = bank;
+            _client = client;
         }
 
         [Cmd]
@@ -35,7 +38,7 @@ public partial class Gambling
         }
         
         [Cmd]
-        public async Task BankWithdraw(ShmartNumber amount)
+        public async Task BankWithdraw(ShmartBankAmount amount)
         {
             if (amount <= 0)
                 return;
@@ -69,5 +72,50 @@ public partial class Gambling
                 await ReplyErrorLocalizedAsync(strs.cant_dm);
             }
         }
+
+        private async Task BankTakeInternalAsync(long amount, ulong userId)
+        {
+            if (await _bank.TakeAsync(userId, amount))
+            {
+                await ReplyErrorLocalizedAsync(strs.take_fail(N(amount),
+                    _client.GetUser(userId)?.ToString()
+                    ?? userId.ToString(),
+                    CurrencySign));
+                return;
+            }
+            
+            await ctx.OkAsync();
+        }
+        
+        private async Task BankAwardInternalAsync(long amount, ulong userId)
+        {
+            if (await _bank.AwardAsync(userId, amount))
+            {
+                await ReplyErrorLocalizedAsync(strs.take_fail(N(amount),
+                    _client.GetUser(userId)?.ToString()
+                    ?? userId.ToString(),
+                    CurrencySign));
+                return;
+            }
+            
+            await ctx.OkAsync();
+        }
+
+        [Cmd]
+        [OwnerOnly]
+        [Priority(1)]
+        public async Task BankTake(long amount, [Leftover] IUser user)
+            => await BankTakeInternalAsync(amount, user.Id);
+        
+        [Cmd]
+        [OwnerOnly]
+        [Priority(0)]
+        public async Task BankTake(long amount, ulong userId)
+            => await BankTakeInternalAsync(amount, userId);
+        
+        [Cmd]
+        [OwnerOnly]
+        public async Task BankAward(long amount, [Leftover] IUser user)
+            => await BankAwardInternalAsync(amount, user.Id);
     }
 }

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

@@ -15,6 +15,48 @@ public sealed class BankService : IBankService, INService
         _db = db;
     }
 
+    public async Task<bool> AwardAsync(ulong userId, long amount)
+    {
+        if (amount <= 0)
+            throw new ArgumentOutOfRangeException(nameof(amount));
+
+        await using var ctx = _db.GetDbContext();
+        await ctx.BankUsers
+            .ToLinqToDBTable()
+            .InsertOrUpdateAsync(() => new()
+                {
+                    UserId = userId,
+                    Balance = amount
+                },
+                (old) => new()
+                {
+                    Balance = old.Balance + amount
+                },
+                () => new()
+                {
+                    UserId = userId
+                });
+
+        return true;
+    }
+    
+    public async Task<bool> TakeAsync(ulong userId, long amount)
+    {
+        if (amount <= 0)
+            throw new ArgumentOutOfRangeException(nameof(amount));
+        
+        await using var ctx = _db.GetDbContext();
+        var rows = await ctx.BankUsers
+            .ToLinqToDBTable()
+            .Where(x => x.UserId == userId && x.Balance >= amount)
+            .UpdateAsync((old) => new()
+            {
+                Balance = old.Balance - amount
+            });
+        
+        return rows > 0;
+    }
+
     public async Task<bool> DepositAsync(ulong userId, long amount)
     {
         if (amount <= 0)

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

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

src/NadekoBot/Modules/Gambling/CashInteraction.cs

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

src/NadekoBot/Modules/Gambling/Gambling.cs

@@ -99,39 +99,20 @@ public partial class Gambling : GamblingModule<GamblingService>
         PrettyName = "Timely"
     };
 
-    public class RemindMeInteraction : NInteraction
+    private async Task RemindTimelyAction(SocketMessageComponent smc, DateTime when)
     {
-        public RemindMeInteraction(
-            [NotNull] DiscordSocketClient client,
-            ulong userId,
-            [NotNull] Func<SocketMessageComponent, Task> action)
-            : base(client, userId, action)
-        {
-        }
+        var tt = TimestampTag.FromDateTime(when, TimestampTagStyles.Relative);
 
-        protected override NadekoInteractionData Data
-            => new NadekoInteractionData(
-                Emote: Emoji.Parse("⏰"),
-                CustomId: "timely:remind_me",
-                Text: "Remind me"
-            );
+        await _remind.AddReminderAsync(ctx.User.Id,
+            ctx.User.Id,
+            ctx.Guild.Id,
+            true,
+            when,
+            GetText(strs.timely_time));
+
+        await smc.RespondConfirmAsync(_eb, GetText(strs.remind_timely(tt)), ephemeral: true);
     }
 
-    private Func<SocketMessageComponent, Task> RemindTimelyAction(DateTime when)
-        => async smc =>
-        {
-            var tt = TimestampTag.FromDateTime(when, TimestampTagStyles.Relative);
-
-            await _remind.AddReminderAsync(ctx.User.Id,
-                ctx.User.Id,
-                ctx.Guild.Id,
-                true,
-                when,
-                GetText(strs.timely_time));
-
-            await smc.RespondConfirmAsync(_eb, GetText(strs.remind_timely(tt)), ephemeral: true);
-        };
-
     [Cmd]
     public async Task Timely()
     {
@@ -147,7 +128,7 @@ public partial class Gambling : GamblingModule<GamblingService>
         {
             var now = DateTime.UtcNow;
             var relativeTag = TimestampTag.FromDateTime(now.Add(rem), TimestampTagStyles.Relative);
-            await ReplyErrorLocalizedAsync(strs.timely_already_claimed(relativeTag));
+            await ReplyPendingLocalizedAsync(strs.timely_already_claimed(relativeTag));
             return;
         }
 
@@ -157,11 +138,17 @@ public partial class Gambling : GamblingModule<GamblingService>
 
         await _cs.AddAsync(ctx.User.Id, val, new("timely", "claim"));
 
-        var inter = new RemindMeInteraction(_client,
-            ctx.User.Id,
-            RemindTimelyAction(DateTime.UtcNow.Add(TimeSpan.FromHours(period))));
+        var inter = _inter
+            .Create(ctx.User.Id,
+                new SimpleInteraction<DateTime>(
+                    new ButtonBuilder(
+                        label: "Remind me",
+                        emote: Emoji.Parse("⏰"),
+                        customId: "timely:remind_me"),
+                    RemindTimelyAction,
+                    DateTime.UtcNow.Add(TimeSpan.FromHours(period))));
 
-        await ReplyConfirmLocalizedAsync(strs.timely(N(val), period), inter.GetInteraction());
+        await ReplyConfirmLocalizedAsync(strs.timely(N(val), period), inter);
     }
 
     [Cmd]
@@ -362,7 +349,7 @@ public partial class Gambling : GamblingModule<GamblingService>
         await ReplyConfirmLocalizedAsync(strs.has(Format.Code(userId.ToString()), cur));
     }
 
-    private async Task BankAction(SocketMessageComponent smc)
+    private async Task BankAction(SocketMessageComponent smc, object _)
     {
         var balance = await _bank.GetBalanceAsync(ctx.User.Id);
 
@@ -372,8 +359,12 @@ public partial class Gambling : GamblingModule<GamblingService>
               .Pipe(text => smc.RespondConfirmAsync(_eb, text, ephemeral: true));
     }
 
-    private NadekoButtonInteraction CreateCashInteraction()
-        => new CashInteraction(_client, ctx.User.Id, BankAction).GetInteraction();
+    private NadekoInteraction CreateCashInteraction()
+        => _inter.Create<object>(ctx.User.Id,
+            new(new(
+                    customId: "cash:bank_show_balance", 
+                    emote: new Emoji("🏦")),
+                BankAction));
 
     [Cmd]
     [Priority(1)]
@@ -663,7 +654,6 @@ public partial class Gambling : GamblingModule<GamblingService>
         if (win > 0)
         {
             str = GetText(strs.br_win(N(win), result.Threshold + (result.Roll == 100 ? " 👑" : "")));
-            await _cs.AddAsync(ctx.User, win, new("betroll", "win"));
         }
         else
         {
@@ -876,11 +866,12 @@ public partial class Gambling : GamblingModule<GamblingService>
         public enum GambleTestTarget
         {
             Slot,
+            Betroll,
+            Betflip,
+            BetflipT,
             BetDraw,
             BetDrawHL,
             BetDrawRB,
-            Betflip,
-            BetflipT,
             Lula,
             Rps,
         }
@@ -921,6 +912,7 @@ public partial class Gambling : GamblingModule<GamblingService>
                     GambleTestTarget.BetflipT => (await _gs.BetFlipAsync(ctx.User.Id, 0, 1)).AsT0.Multiplier,
                     GambleTestTarget.Lula => (await _gs.LulaAsync(ctx.User.Id, 0)).AsT0.Multiplier,
                     GambleTestTarget.Rps => (await _gs.RpsAsync(ctx.User.Id, 0, (byte)(i % 3))).AsT0.Multiplier,
+                    GambleTestTarget.Betroll => (await _gs.BetRollAsync(ctx.User.Id, 0)).AsT0.Multiplier,
                     _ => throw new ArgumentOutOfRangeException(nameof(target))
                 };
                 

src/NadekoBot/Modules/Gambling/GamblingService.cs

@@ -142,7 +142,7 @@ public class GamblingService : INService, IReadyExecutor
                 var onePercent = uow.DiscordUser.GetTopOnePercentCurrency(_client.CurrentUser.Id);
                 decimal planted = uow.PlantedCurrency.AsQueryable().Sum(x => x.Amount);
                 var waifus = uow.WaifuInfo.GetTotalValue();
-                var bot = uow.DiscordUser.GetUserCurrency(_client.CurrentUser.Id);
+                var bot = await uow.DiscordUser.GetUserCurrencyAsync(_client.CurrentUser.Id);
                 decimal bank = await uow.GetTable<BankUser>()
                                         .SumAsyncLinqToDB(x => x.Balance);
 

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

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

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

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

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

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

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

@@ -27,12 +27,6 @@ public partial class Gambling
         private static decimal totalBet;
         private static decimal totalPaidOut;
 
-        private static readonly ConcurrentHashSet<ulong> _runningUsers = new();
-
-        //here is a payout chart
-        //https://lh6.googleusercontent.com/-i1hjAJy_kN4/UswKxmhrbPI/AAAAAAAAB1U/82wq_4ZZc-Y/DE6B0895-6FC1-48BE-AC4F-14D1B91AB75B.jpg
-        //thanks to judge for helping me with this
-
         private readonly IImageCache _images;
         private readonly FontProvider _fonts;
         private readonly DbService _db;
@@ -73,16 +67,6 @@ public partial class Gambling
 
             await ctx.Channel.EmbedAsync(embed);
         }
-        public sealed class SlotInteraction : NInteraction
-        {
-            public SlotInteraction(DiscordSocketClient client, ulong userId, Func<SocketMessageComponent, Task> action) : base(client, userId, action)
-            {
-            }
-
-            protected override NadekoInteractionData Data { get; } = new(Emoji.Parse("🔁"),
-                "slot:again",
-                "Pull Again");
-        }
 
         [Cmd]
         public async Task Slot(ShmartNumber amount)
@@ -94,43 +78,34 @@ public partial class Gambling
 
             await ctx.Channel.TriggerTypingAsync();
 
-            if (!_runningUsers.Add(ctx.User.Id))
+            if (await InternalSlotAsync(amount) is not SlotResult result)
+            {
+                await ReplyErrorLocalizedAsync(strs.not_enough(CurrencySign));
                 return;
-
-            try
-            {
-                if (await InternalSlotAsync(amount) is not SlotResult result)
-                {
-                    await ReplyErrorLocalizedAsync(strs.not_enough(CurrencySign));
-                    return;
-                }
-
-                var msg = GetSlotMessageInternal(result);
-
-                using var image = await GenerateSlotImageAsync(amount, result);
-                await using var imgStream = await image.ToStreamAsync();
-
-
-                var eb = _eb.Create(ctx)
-                    .WithAuthor(ctx.User)
-                    .WithDescription(Format.Bold(msg))
-                    .WithImageUrl($"attachment://result.png")
-                    .WithOkColor();
-                
-                // var inter = slotInteraction.GetInteraction();
-                await ctx.Channel.SendFileAsync(imgStream,
-                    "result.png",
-                    embed: eb.Build()
-                    // components: inter.CreateComponent()
-                );
-
-                // await inter.RunAsync(resMsg);
-            }
-            finally
-            {
-                await Task.Delay(1000);
-                _runningUsers.TryRemove(ctx.User.Id);
             }
+
+            var text = GetSlotMessageTextInternal(result);
+
+            using var image = await GenerateSlotImageAsync(amount, result);
+            await using var imgStream = await image.ToStreamAsync();
+
+
+            var eb = _eb.Create(ctx)
+                .WithAuthor(ctx.User)
+                .WithDescription(Format.Bold(text))
+                .WithImageUrl($"attachment://result.png")
+                .WithOkColor();
+
+            var bb = new ButtonBuilder(emote: Emoji.Parse("🔁"), customId: "slot:again", label: "Pull Again");
+            var si = new SimpleInteraction<ShmartNumber>(bb, (_, amount) => Slot(amount), amount);
+
+            var inter = _inter.Create(ctx.User.Id, si);
+            var msg = await ctx.Channel.SendFileAsync(imgStream,
+                "result.png",
+                embed: eb.Build(),
+                components: inter.CreateComponent()
+            );
+            await inter.RunAsync(msg);
         }
 
         // private SlotInteraction CreateSlotInteractionIntenal(long amount)
@@ -181,7 +156,7 @@ public partial class Gambling
         //         });
         // }
 
-        private string GetSlotMessageInternal(SlotResult result)
+        private string GetSlotMessageTextInternal(SlotResult result)
         {
             var multi = result.Multiplier.ToString("0.##");
             var msg = result.WinType switch
@@ -201,7 +176,6 @@ public partial class Gambling
 
             if (!maybeResult.TryPickT0(out var result, out var error))
             {
-                await ReplyErrorLocalizedAsync(strs.not_enough(CurrencySign));
                 return null;
             }
             
@@ -235,7 +209,7 @@ public partial class Gambling
                     HorizontalAlignment = HorizontalAlignment.Center,
                     VerticalAlignment = VerticalAlignment.Center,
                     WrappingLength = 140,
-                    Origin = new(227, 92)
+                    Origin = new(298, 100)
                 },
                 ((long)result.Won).ToString(),
                 fontColor));
@@ -247,7 +221,7 @@ public partial class Gambling
                     HorizontalAlignment = HorizontalAlignment.Center,
                     VerticalAlignment = VerticalAlignment.Center,
                     WrappingLength = 135,
-                    Origin = new(129, 472)
+                    Origin = new(196, 480)
                 },
                 amount.ToString(),
                 fontColor));
@@ -256,8 +230,7 @@ public partial class Gambling
                 {
                     HorizontalAlignment = HorizontalAlignment.Center,
                     VerticalAlignment = VerticalAlignment.Center,
-                    WrappingLength = 135,
-                    Origin = new(325, 472)
+                    Origin = new(393, 480) 
                 },
                 ownedAmount.ToString(),
                 fontColor));

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

@@ -57,123 +57,133 @@ public sealed class TriviaGame
         // loop until game is stopped
         // each iteration is one round
         var firstRun = true;
-        while (!_isStopped)
+        try
         {
-            if (errorCount >= 5)
+            while (!_isStopped)
             {
-                Log.Warning("Trivia errored 5 times and will quit");
-                break;
-            }
-
-            // wait for 3 seconds before posting the next question
-            if (firstRun)
-            {
-                firstRun = false;
-            }
-            else
-            {
-                await Task.Delay(3000);
-            }
-
-            var maybeQuestion = await _questionPool.GetQuestionAsync();
-
-            if(!(maybeQuestion is TriviaQuestion question))
-            {
-                // if question is null (ran out of question, or other bugg ) - stop
-                break;
-            }
-
-            CurrentQuestion = question;
-            try
-            {
-                // clear out all of the past guesses
-                while (_inputs.Reader.TryRead(out _)) ;
-
-                await OnQuestion(this, question);
-            }
-            catch (Exception ex)
-            {
-                Log.Warning(ex, "Error executing OnQuestion: {Message}", ex.Message);
-                errorCount++;
-                continue;
-            }
-
-
-            // just keep looping through user inputs until someone guesses the answer
-            // or the timer expires
-            var halfGuessTimerTask = TimeOutFactory();
-            var hintSent = false;
-            var guessed = false;
-            while (true)
-            {
-                var readTask = _inputs.Reader.ReadAsync().AsTask();
-
-                // wait for either someone to attempt to guess
-                // or for timeout
-                var task = await Task.WhenAny(readTask, halfGuessTimerTask);
-
-                // if the task which completed is the timeout task
-                if (task == halfGuessTimerTask)
+                if (errorCount >= 5)
                 {
-                    // if hint is already sent, means time expired
-                    // break (end the round)
-                    if (hintSent)
-                        break;
+                    Log.Warning("Trivia errored 5 times and will quit");
+                    await OnEnded(this);
+                    break;
+                }
 
-                    // else, means half time passed, send a hint
-                    hintSent = true;
-                    // start a new countdown of the same length
-                    halfGuessTimerTask = TimeOutFactory();
-                    // send a hint out
-                    await OnHint(this, question);
+                // wait for 3 seconds before posting the next question
+                if (firstRun)
+                {
+                    firstRun = false;
+                }
+                else
+                {
+                    await Task.Delay(3000);
+                }
 
+                var maybeQuestion = await _questionPool.GetQuestionAsync();
+
+                if (!(maybeQuestion is TriviaQuestion question))
+                {
+                    // if question is null (ran out of question, or other bugg ) - stop
+                    break;
+                }
+
+                CurrentQuestion = question;
+                try
+                {
+                    // clear out all of the past guesses
+                    while (_inputs.Reader.TryRead(out _))
+                        ;
+
+                    await OnQuestion(this, question);
+                }
+                catch (Exception ex)
+                {
+                    Log.Warning(ex, "Error executing OnQuestion: {Message}", ex.Message);
+                    errorCount++;
                     continue;
                 }
 
-                // otherwise, read task is successful, and we're gonna
-                // get the user input data
-                var (user, input) = await readTask;
 
-                // check the guess
-                if (question.IsAnswerCorrect(input))
+                // just keep looping through user inputs until someone guesses the answer
+                // or the timer expires
+                var halfGuessTimerTask = TimeOutFactory();
+                var hintSent = false;
+                var guessed = false;
+                while (true)
                 {
-                    // add 1 point to the user
-                    var val = _users.AddOrUpdate(user.Id, 1, (_, points) => ++points);
-                    guessed = true;
+                    var readTask = _inputs.Reader.ReadAsync().AsTask();
 
-                    // reset inactivity counter
-                    inactivity = 0;
+                    // wait for either someone to attempt to guess
+                    // or for timeout
+                    var task = await Task.WhenAny(readTask, halfGuessTimerTask);
 
-                    var isWin = false;
-                    // if user won the game, tell the game to stop
-                    if (val >= _opts.WinRequirement)
+                    // if the task which completed is the timeout task
+                    if (task == halfGuessTimerTask)
                     {
-                        _isStopped = true;
-                        isWin = true;
+                        // if hint is already sent, means time expired
+                        // break (end the round)
+                        if (hintSent)
+                            break;
+
+                        // else, means half time passed, send a hint
+                        hintSent = true;
+                        // start a new countdown of the same length
+                        halfGuessTimerTask = TimeOutFactory();
+                        // send a hint out
+                        await OnHint(this, question);
+
+                        continue;
                     }
 
-                    // call onguess
-                    await OnGuess(this, user, question, isWin);
-                    break;
+                    // otherwise, read task is successful, and we're gonna
+                    // get the user input data
+                    var (user, input) = await readTask;
+
+                    // check the guess
+                    if (question.IsAnswerCorrect(input))
+                    {
+                        // add 1 point to the user
+                        var val = _users.AddOrUpdate(user.Id, 1, (_, points) => ++points);
+                        guessed = true;
+
+                        // reset inactivity counter
+                        inactivity = 0;
+
+                        var isWin = false;
+                        // if user won the game, tell the game to stop
+                        if (val >= _opts.WinRequirement)
+                        {
+                            _isStopped = true;
+                            isWin = true;
+                        }
+
+                        // call onguess
+                        await OnGuess(this, user, question, isWin);
+                        break;
+                    }
                 }
-            }
 
-            if (!guessed)
-            {
-                await OnTimeout(this, question);
-                
-                if (_opts.Timeout != 0 && ++inactivity >= _opts.Timeout)
+                if (!guessed)
                 {
-                    Log.Information("Trivia game is stopping due to inactivity");
-                    break;
+                    await OnTimeout(this, question);
+
+                    if (_opts.Timeout != 0 && ++inactivity >= _opts.Timeout)
+                    {
+                        Log.Information("Trivia game is stopping due to inactivity");
+                        break;
+                    }
                 }
             }
         }
+        catch
+        {
 
-        // make sure game is set as ended
-        _isStopped = true;
-        
-        await OnEnded(this);
+        }
+        finally
+        {
+            // make sure game is set as ended
+            _isStopped = true;
+            _ = OnEnded(this);
+        }
     }
 
     public IReadOnlyList<(ulong User, int points)> GetLeaderboard()

src/NadekoBot/Modules/Help/Help.cs

@@ -424,7 +424,7 @@ public partial class Help : NadekoModule<HelpService>
             }
             catch (Exception)
             {
-                Log.Information("No old version list found. Creating a new one.");
+                Log.Information("No old version list found. Creating a new one");
             }
 
             var versionList = JsonSerializer.Deserialize<List<string>>(versionListString);
@@ -469,7 +469,7 @@ public partial class Help : NadekoModule<HelpService>
             "https://nadekobot.readthedocs.io/en/latest/"));
 
 
-    private Task SelfhostAction(SocketMessageComponent smc)
+    private Task SelfhostAction(SocketMessageComponent smc, object _)
         => smc.RespondConfirmAsync(_eb,
             @"- In case you don't want or cannot Donate to NadekoBot project, but you 
 - NadekoBot is a completely free and fully [open source](https://gitlab.com/kwoth/nadekobot) project which means you can run your own ""selfhosted"" instance on your computer or server for free.
@@ -484,7 +484,13 @@ public partial class Help : NadekoModule<HelpService>
     [OnlyPublicBot]
     public async Task Donate()
     {
-        var selfhostInter = new DonateSelfhostingInteraction(_client, ctx.User.Id, SelfhostAction);
+        // => new NadekoInteractionData(new Emoji("🖥️"), "donate:selfhosting", "Selfhosting");
+        var selfhostInter = _inter.Create(ctx.User.Id,
+            new SimpleInteraction<object>(new ButtonBuilder(
+                    emote: new Emoji("🖥️"),
+                    customId: "donate:selfhosting",
+                    label: "Selfhosting"),
+                SelfhostAction));
         
         var eb = _eb.Create(ctx)
                     .WithOkColor()
@@ -525,7 +531,7 @@ Nadeko will DM you the welcome instructions, and you may start using the patron-
 
         try
         {
-            await (await ctx.User.CreateDMChannelAsync()).EmbedAsync(eb, inter: selfhostInter.GetInteraction());
+            await (await ctx.User.CreateDMChannelAsync()).EmbedAsync(eb, inter: selfhostInter);
             _ = ctx.OkAsync();
         }
         catch

src/NadekoBot/Modules/Help/Interactions/DonateSelfhostingInteraction.cs

@@ -1,12 +0,0 @@
-namespace NadekoBot.Modules.Help;
-
-public class DonateSelfhostingInteraction : NInteraction
-{
-    protected override NadekoInteractionData Data
-        => new NadekoInteractionData(new Emoji("🖥️"), "donate:selfhosting", "Selfhosting");
-    
-    public DonateSelfhostingInteraction(DiscordSocketClient client, ulong userId, Func<SocketMessageComponent, Task> action)
-        : base(client, userId, action)
-    {
-    }
-}

src/NadekoBot/Modules/Help/Interactions/DonateTroubleshootInteraction.cs

@@ -1,12 +0,0 @@
-namespace NadekoBot.Modules.Help;
-
-public class DonateTroubleshootInteraction : NInteraction
-{
-    protected override NadekoInteractionData Data
-        => new NadekoInteractionData(new Emoji("❓"), "donate:troubleshoot", "Troubleshoot");
-    
-    public DonateTroubleshootInteraction(DiscordSocketClient client, ulong userId, Func<SocketMessageComponent, Task> action)
-        : base(client, userId, action)
-    {
-    }
-}

src/NadekoBot/Modules/Music/Music.cs

@@ -1,5 +1,4 @@
 #nullable disable
-using Nadeko.Common;
 using NadekoBot.Modules.Music.Services;
 using NadekoBot.Services.Database.Models;
 

src/NadekoBot/Modules/Music/_Common/Resolvers/YtdlYoutubeResolver.cs

@@ -274,7 +274,7 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
         Log.Information("Resolving youtube song by search term: {YoutubeQuery}", query);
 
         var cachedData = await _trackCacher.GetCachedDataByQueryAsync(query, MusicPlatform.Youtube);
-        if (cachedData is null)
+        if (cachedData is null || string.IsNullOrWhiteSpace(cachedData.Title))
         {
             var stringData = await _ytdlSearchOperation.GetDataAsync(query);
             var trackData = ResolveYtdlData(stringData);

src/NadekoBot/Modules/Searches/StreamNotification/StreamNotificationService.cs

@@ -1,6 +1,4 @@
 #nullable disable
-using LinqToDB;
-using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Nadeko.Common;
 using NadekoBot.Common.ModuleBehaviors;
@@ -12,95 +10,6 @@ using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Modules.Searches.Services;
 
-public sealed class StreamOnlineMessageDeleterService : INService, IReadyExecutor
-{
-    private readonly StreamNotificationService _notifService;
-    private readonly DbService _db;
-    private readonly DiscordSocketClient _client;
-    private readonly IPubSub _pubSub;
-
-    public StreamOnlineMessageDeleterService(
-        StreamNotificationService notifService,
-        DbService db,
-        IPubSub pubSub,
-        DiscordSocketClient client)
-    {
-        _notifService = notifService;
-        _db = db;
-        _client = client;
-        _pubSub = pubSub;
-    }
-
-    public async Task OnReadyAsync()
-    {
-        _notifService.OnlineMessagesSent += OnOnlineMessagesSent;
-        
-        if(_client.ShardId == 0)
-            await _pubSub.Sub(_notifService.StreamsOfflineKey, OnStreamsOffline);
-    }
-
-    private async Task OnOnlineMessagesSent(FollowedStream.FType type, string name, IReadOnlyCollection<(ulong, ulong)> pairs)
-    {
-        await using var ctx = _db.GetDbContext();
-        foreach (var (channelId, messageId) in pairs)
-        {
-            await ctx.GetTable<StreamOnlineMessage>()
-                     .InsertAsync(() => new()
-                     {
-                         Name = name,
-                         Type = type,
-                         MessageId = messageId,
-                         ChannelId = channelId,
-                         DateAdded = DateTime.UtcNow,
-                     });
-        }
-    }
-
-    private async ValueTask OnStreamsOffline(List<StreamData> streamDatas)
-    {
-        if (_client.ShardId != 0)
-            return;
-
-        var pairs = await GetMessagesToDelete(streamDatas);
-
-        foreach (var (channelId, messageId) in pairs)
-        {
-            try
-            {
-                var textChannel = await _client.GetChannelAsync(channelId) as ITextChannel;
-                if (textChannel is null)
-                    continue;
-
-                await textChannel.DeleteMessageAsync(messageId);
-            }
-            catch
-            {
-                continue;
-            }
-        }
-    }
-
-    private async Task<IEnumerable<(ulong, ulong)>> GetMessagesToDelete(List<StreamData> streamDatas)
-    {
-        await using var ctx = _db.GetDbContext();
-
-        var toReturn = new List<(ulong, ulong)>();
-        foreach (var sd in streamDatas)
-        {
-            var key = sd.CreateKey();
-            var toDelete = await ctx.GetTable<StreamOnlineMessage>()
-                                    .Where(x => (x.Type == key.Type && x.Name == key.Name)
-                                                || Sql.DateDiff(Sql.DateParts.Day, x.DateAdded, DateTime.UtcNow) > 1)
-                                    .DeleteWithOutputAsync();
-            
-            toReturn.AddRange(toDelete.Select(x => (x.ChannelId, x.MessageId)));
-        }
-
-        return toReturn;
-    }
-}
-
-
 public sealed class StreamNotificationService : INService, IReadyExecutor
 {
     private readonly DbService _db;
@@ -370,7 +279,7 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
 
                              var message = string.IsNullOrWhiteSpace(fs.Message) ? "" : rep.Replace(fs.Message);
 
-                             var msg = await textChannel.EmbedAsync(GetEmbed(fs.GuildId, stream), message);
+                             var msg = await textChannel.EmbedAsync(GetEmbed(fs.GuildId, stream, false), message);
 
                              // only cache the ids of channel/message pairs 
                              if(_deleteOnOfflineServers.Contains(fs.GuildId))
@@ -563,18 +472,22 @@ public sealed class StreamNotificationService : INService, IReadyExecutor
         return data;
     }
 
-    public IEmbedBuilder GetEmbed(ulong guildId, StreamData status)
+    public IEmbedBuilder GetEmbed(ulong guildId, StreamData status, bool showViewers = true)
     {
         var embed = _eb.Create()
                        .WithTitle(status.Name)
                        .WithUrl(status.StreamUrl)
                        .WithDescription(status.StreamUrl)
-                       .AddField(GetText(guildId, strs.status), status.IsLive ? "🟢 Online" : "🔴 Offline", true)
-                       .AddField(GetText(guildId, strs.viewers),
-                           status.Viewers == 0 && !status.IsLive
-                               ? "-"
-                               : status.Viewers,
-                           true);
+                       .AddField(GetText(guildId, strs.status), status.IsLive ? "🟢 Online" : "🔴 Offline", true);
+
+        if (showViewers)
+        {
+            embed.AddField(GetText(guildId, strs.viewers),
+                status.Viewers == 0 && !status.IsLive
+                    ? "-"
+                    : status.Viewers,
+                true);
+        }
 
         if (status.IsLive)
             embed = embed.WithOkColor();

src/NadekoBot/Modules/Searches/StreamNotification/StreamOnlineMessageDeleterService.cs

@@ -0,0 +1,99 @@
+#nullable disable
+using LinqToDB;
+using LinqToDB.EntityFrameworkCore;
+using NadekoBot.Common.ModuleBehaviors;
+using NadekoBot.Db.Models;
+using NadekoBot.Modules.Searches.Common;
+
+namespace NadekoBot.Modules.Searches.Services;
+
+public sealed class StreamOnlineMessageDeleterService : INService, IReadyExecutor
+{
+    private readonly StreamNotificationService _notifService;
+    private readonly DbService _db;
+    private readonly DiscordSocketClient _client;
+    private readonly IPubSub _pubSub;
+
+    public StreamOnlineMessageDeleterService(
+        StreamNotificationService notifService,
+        DbService db,
+        IPubSub pubSub,
+        DiscordSocketClient client)
+    {
+        _notifService = notifService;
+        _db = db;
+        _client = client;
+        _pubSub = pubSub;
+    }
+
+    public async Task OnReadyAsync()
+    {
+        _notifService.OnlineMessagesSent += OnOnlineMessagesSent;
+
+        if (_client.ShardId == 0)
+            await _pubSub.Sub(_notifService.StreamsOfflineKey, OnStreamsOffline);
+    }
+
+    private async Task OnOnlineMessagesSent(
+        FollowedStream.FType type,
+        string name,
+        IReadOnlyCollection<(ulong, ulong)> pairs)
+    {
+        await using var ctx = _db.GetDbContext();
+        foreach (var (channelId, messageId) in pairs)
+        {
+            await ctx.GetTable<StreamOnlineMessage>()
+                     .InsertAsync(() => new()
+                     {
+                         Name = name,
+                         Type = type,
+                         MessageId = messageId,
+                         ChannelId = channelId,
+                         DateAdded = DateTime.UtcNow,
+                     });
+        }
+    }
+
+    private async ValueTask OnStreamsOffline(List<StreamData> streamDatas)
+    {
+        if (_client.ShardId != 0)
+            return;
+
+        var pairs = await GetMessagesToDelete(streamDatas);
+
+        foreach (var (channelId, messageId) in pairs)
+        {
+            try
+            {
+                var textChannel = await _client.GetChannelAsync(channelId) as ITextChannel;
+                if (textChannel is null)
+                    continue;
+
+                await textChannel.DeleteMessageAsync(messageId);
+            }
+            catch
+            {
+                continue;
+            }
+        }
+    }
+
+    private async Task<IEnumerable<(ulong, ulong)>> GetMessagesToDelete(List<StreamData> streamDatas)
+    {
+        await using var ctx = _db.GetDbContext();
+
+        var toReturn = new List<(ulong, ulong)>();
+        foreach (var sd in streamDatas)
+        {
+            var key = sd.CreateKey();
+            var toDelete = await ctx.GetTable<StreamOnlineMessage>()
+                                    .Where(x => (x.Type == key.Type && x.Name == key.Name)
+                                                || Sql.DateDiff(Sql.DateParts.Day, x.DateAdded, DateTime.UtcNow) > 1)
+                                    .DeleteWithOutputAsync();
+
+            toReturn.AddRange(toDelete.Select(x => (x.ChannelId, x.MessageId)));
+        }
+
+        return toReturn;
+    }
+}

src/NadekoBot/Modules/Utility/Info/InfoCommands.cs

@@ -98,6 +98,33 @@ public partial class Utility
             await ctx.Channel.EmbedAsync(embed);
         }
         
+        [Cmd]
+        [RequireUserPermission(GuildPermission.ManageRoles)]
+        public async Task RoleInfo([Leftover] SocketRole role)
+        {
+            if (role.IsEveryone)
+                return;
+            
+            var createdAt = new DateTime(2015, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc)
+                .AddMilliseconds(role.Id >> 22);
+            var usercount = role.Members.LongCount();
+            var embed = _eb.Create()
+                .WithTitle(role.Name.TrimTo(128))
+                .WithDescription(role.Permissions.ToList().Join(" | "))
+                .AddField(GetText(strs.id), role.Id.ToString(), true)
+                .AddField(GetText(strs.created_at), $"{createdAt:dd.MM.yyyy HH:mm}", true)
+                .AddField(GetText(strs.users), usercount.ToString(), true)
+                .AddField(GetText(strs.color), $"#{role.Color.R:X2}{role.Color.G:X2}{role.Color.B:X2}", true)
+                .AddField(GetText(strs.mentionable), role.IsMentionable.ToString(), true)
+                .AddField(GetText(strs.hoisted), role.IsHoisted.ToString(), true)
+                .WithOkColor();
+
+            if (!string.IsNullOrWhiteSpace(role.GetIconUrl()))
+                embed = embed.WithThumbnailUrl(role.GetIconUrl());
+            
+            await ctx.Channel.EmbedAsync(embed);
+        }
+
         [Cmd]
         [RequireContext(ContextType.Guild)]
         public async Task UserInfo(IGuildUser usr = null)
@@ -111,8 +138,10 @@ public partial class Utility
             if (!string.IsNullOrWhiteSpace(user.Nickname))
                 embed.AddField(GetText(strs.nickname), user.Nickname, true);
 
+            var joinedAt = GetJoinedAt(user);
+            
             embed.AddField(GetText(strs.id), user.Id.ToString(), true)
-                 .AddField(GetText(strs.joined_server), $"{user.JoinedAt?.ToString("dd.MM.yyyy HH:mm") ?? "?"}", true)
+                 .AddField(GetText(strs.joined_server), $"{joinedAt?.ToString("dd.MM.yyyy HH:mm") ?? "?"}", true)
                  .AddField(GetText(strs.joined_discord), $"{user.CreatedAt:dd.MM.yyyy HH:mm}", true)
                  .AddField(GetText(strs.roles),
                      $"**({user.RoleIds.Count - 1})** - {string.Join("\n", user.GetRoles().Take(10).Where(r => r.Id != r.Guild.EveryoneRole.Id).Select(r => r.Name)).SanitizeMentions(true)}",
@@ -140,6 +169,18 @@ public partial class Utility
             await ctx.Channel.EmbedAsync(embed);
         }
 
+        private DateTimeOffset? GetJoinedAt(IGuildUser user)
+        {
+            var joinedAt = user.JoinedAt;
+            if (user.GuildId != 117523346618318850)
+                return joinedAt;
+
+            if (user.Id == 351244576092192778)
+                return new DateTimeOffset(2019, 12, 25, 9, 33, 0, TimeSpan.Zero);
+
+            return joinedAt;
+        }
+
         [Cmd]
         [RequireContext(ContextType.Guild)]
         [OwnerOnly]

src/NadekoBot/Modules/Utility/Patronage/PatronageService.cs

@@ -715,8 +715,8 @@ public sealed class PatronageService
             return new()
             {
                 Name = key.PrettyName,
-                Quota = defaultValue,
-                IsPatronLimit = false,
+                Quota = 0,
+                IsPatronLimit = true,
             };
 
         return new()

src/NadekoBot/Modules/Utility/Quote/IQuoteService.cs

@@ -0,0 +1,6 @@
+namespace NadekoBot.Modules.Utility;
+
+public interface IQuoteService
+{
+    Task<int> DeleteAllAuthorQuotesAsync(ulong guildId, ulong userId);
+}

src/NadekoBot/Modules/Utility/Quote/QuoteCommands.cs

@@ -1,5 +1,4 @@
-#nullable disable warnings
-using Nadeko.Common;
+#nullable disable warnings
 using NadekoBot.Common.Yml;
 using NadekoBot.Db;
 using NadekoBot.Services.Database.Models;
@@ -22,23 +21,25 @@ public partial class Utility
 ";
 
         private static readonly ISerializer _exportSerializer = new SerializerBuilder()
-                                                                .WithEventEmitter(args
-                                                                    => new MultilineScalarFlowStyleEmitter(args))
-                                                                .WithNamingConvention(
-                                                                    CamelCaseNamingConvention.Instance)
-                                                                .WithIndentedSequences()
-                                                                .ConfigureDefaultValuesHandling(DefaultValuesHandling
-                                                                    .OmitDefaults)
-                                                                .DisableAliases()
-                                                                .Build();
+            .WithEventEmitter(args
+                => new MultilineScalarFlowStyleEmitter(args))
+            .WithNamingConvention(
+                CamelCaseNamingConvention.Instance)
+            .WithIndentedSequences()
+            .ConfigureDefaultValuesHandling(DefaultValuesHandling
+                .OmitDefaults)
+            .DisableAliases()
+            .Build();
 
         private readonly DbService _db;
         private readonly IHttpClientFactory _http;
+        private readonly IQuoteService _qs;
 
-        public QuoteCommands(DbService db, IHttpClientFactory http)
+        public QuoteCommands(DbService db, IQuoteService qs, IHttpClientFactory http)
         {
             _db = db;
             _http = http;
+            _qs = qs;
         }
 
         [Cmd]
@@ -108,7 +109,7 @@ public partial class Utility
         [RequireContext(ContextType.Guild)]
         public async Task QuoteShow(int id)
         {
-            Quote quote;
+            Quote? quote;
             await using (var uow = _db.GetDbContext())
             {
                 quote = uow.Quotes.GetById(id);
@@ -127,13 +128,13 @@ public partial class Utility
 
         private async Task ShowQuoteData(Quote data)
             => await ctx.Channel.EmbedAsync(_eb.Create(ctx)
-                                               .WithOkColor()
-                                               .WithTitle(GetText(strs.quote_id($"#{data.Id}")))
-                                               .AddField(GetText(strs.trigger), data.Keyword)
-                                               .AddField(GetText(strs.response),
-                                                   Format.Sanitize(data.Text).Replace("](", "]\\("))
-                                               .WithFooter(
-                                                   GetText(strs.created_by($"{data.AuthorName} ({data.AuthorId})"))));
+                .WithOkColor()
+                .WithTitle(GetText(strs.quote_id($"#{data.Id}")))
+                .AddField(GetText(strs.trigger), data.Keyword)
+                .AddField(GetText(strs.response),
+                    Format.Sanitize(data.Text).Replace("](", "]\\("))
+                .WithFooter(
+                    GetText(strs.created_by($"{data.AuthorName} ({data.AuthorId})"))));
 
         private async Task QuoteSearchinternalAsync(string? keyword, string textOrAuthor)
         {
@@ -256,6 +257,28 @@ public partial class Utility
                 await SendErrorAsync(response);
         }
 
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        public Task QuoteDeleteAuthor(IUser user)
+            => QuoteDeleteAuthor(user.Id);
+        
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        public async Task QuoteDeleteAuthor(ulong userId)
+        {
+            var hasManageMessages = ((IGuildUser)ctx.Message.Author).GuildPermissions.ManageMessages;
+
+            if (userId == ctx.User.Id || hasManageMessages)
+            {
+                var deleted = await _qs.DeleteAllAuthorQuotesAsync(ctx.Guild.Id, ctx.User.Id);
+                await ReplyConfirmLocalizedAsync(strs.quotes_deleted_count(deleted));
+            }
+            else
+            {
+                await ReplyErrorLocalizedAsync(strs.insuf_perms_u);
+            }
+        }
+
         [Cmd]
         [RequireContext(ContextType.Guild)]
         [UserPerm(GuildPerm.ManageMessages)]
@@ -288,7 +311,7 @@ public partial class Utility
             }
 
             var exprsDict = quotes.GroupBy(x => x.Keyword)
-                                  .ToDictionary(x => x.Key, x => x.Select(ExportedQuote.FromModel));
+                .ToDictionary(x => x.Key, x => x.Select(ExportedQuote.FromModel));
 
             var text = PREPEND_EXPORT + _exportSerializer.Serialize(exprsDict).UnescapeUnicodeCodePoints();
 
@@ -303,7 +326,7 @@ public partial class Utility
 #if GLOBAL_NADEKO
             [OwnerOnly]
 #endif
-        public async Task QuotesImport([Leftover] string input = null)
+        public async Task QuotesImport([Leftover] string? input = null)
         {
             input = input?.Trim();
 
@@ -357,14 +380,14 @@ public partial class Utility
             {
                 var keyword = entry.Key;
                 await uow.Quotes.AddRangeAsync(entry.Value.Where(quote => !string.IsNullOrWhiteSpace(quote.Txt))
-                                                    .Select(quote => new Quote
-                                                    {
-                                                        GuildId = guildId,
-                                                        Keyword = keyword,
-                                                        Text = quote.Txt,
-                                                        AuthorId = quote.Aid,
-                                                        AuthorName = quote.An
-                                                    }));
+                    .Select(quote => new Quote
+                    {
+                        GuildId = guildId,
+                        Keyword = keyword,
+                        Text = quote.Txt,
+                        AuthorId = quote.Aid,
+                        AuthorName = quote.An
+                    }));
             }
 
             await uow.SaveChangesAsync();

src/NadekoBot/Modules/Utility/Quote/QuoteService.cs

@@ -0,0 +1,32 @@
+#nullable disable warnings
+using LinqToDB;
+using LinqToDB.EntityFrameworkCore;
+using NadekoBot.Services.Database.Models;
+
+namespace NadekoBot.Modules.Utility;
+
+public sealed class QuoteService : IQuoteService, INService
+{
+    private readonly DbService _db;
+
+    public QuoteService(DbService db)
+    {
+        _db = db;
+    }
+    
+    /// <summary>
+    /// Delete all quotes created by the author in a guild
+    /// </summary>
+    /// <param name="guildId">ID of the guild</param>
+    /// <param name="userId">ID of the user</param>
+    /// <returns>Number of deleted qutoes</returns>
+    public async Task<int> DeleteAllAuthorQuotesAsync(ulong guildId, ulong userId)
+    {
+        await using var ctx = _db.GetDbContext();
+        var deleted = await ctx.GetTable<Quote>()
+            .Where(x => x.GuildId == guildId && x.AuthorId == userId)
+            .DeleteAsync();
+
+        return deleted;
+    }
+}

src/NadekoBot/Modules/Utility/Remind/RemindService.cs

@@ -159,14 +159,27 @@ public class RemindService : INService, IReadyExecutor
             if (ch is null)
                 return;
 
-            await ch.EmbedAsync(_eb.Create()
-                                   .WithOkColor()
-                                   .WithTitle("Reminder")
-                                   .AddField("Created At",
-                                       r.DateAdded.HasValue ? r.DateAdded.Value.ToLongDateString() : "?")
-                                   .AddField("By",
-                                       (await ch.GetUserAsync(r.UserId))?.ToString() ?? r.UserId.ToString()),
-                r.Message);
+            var st = SmartText.CreateFrom(r.Message);
+
+            if (st is SmartEmbedText set)
+            {
+                await ch.SendMessageAsync(null, embed: set.GetEmbed().Build());
+            }
+            else if (st is SmartEmbedTextArray seta)
+            {
+                await ch.SendMessageAsync(null, embeds: seta.GetEmbedBuilders().Map(x => x.Build()));
+            }
+            else
+            {
+                await ch.EmbedAsync(_eb.Create()
+                        .WithOkColor()
+                        .WithTitle("Reminder")
+                        .AddField("Created At",
+                            r.DateAdded.HasValue ? r.DateAdded.Value.ToLongDateString() : "?")
+                        .AddField("By",
+                            (await ch.GetUserAsync(r.UserId))?.ToString() ?? r.UserId.ToString()),
+                    r.Message);
+            }
         }
         catch (Exception ex)
         {

src/NadekoBot/Modules/Utility/Utility.cs

@@ -367,6 +367,41 @@ public partial class Utility : NadekoModule
         await ConfirmLocalizedAsync(strs.emoji_added(em.ToString()));
     }
 
+    [Cmd]
+    [RequireContext(ContextType.Guild)]
+    [BotPerm(GuildPerm.ManageEmojisAndStickers)]
+    [UserPerm(GuildPerm.ManageEmojisAndStickers)]
+    [Priority(0)]
+    public async Task EmojiRemove(params Emote[] emotes)
+    {
+        if (emotes.Length == 0)
+            return;
+        
+        var g = (SocketGuild)ctx.Guild;
+        
+        var fails = new List<Emote>();
+        foreach (var emote in emotes)
+        {
+            var guildEmote = g.Emotes.FirstOrDefault(x => x.Id == emote.Id);
+            if (guildEmote is null)
+            {
+                fails.Add(emote);
+            }
+            else
+            {
+                await ctx.Guild.DeleteEmoteAsync(guildEmote);
+            }
+        }
+
+        if (fails.Count > 0)
+        {
+            await ReplyPendingLocalizedAsync(strs.emoji_not_removed(fails.Select(x => x.ToString()).Join(" ")));
+            return;
+        }
+
+        await ctx.OkAsync();
+    }
+
     [Cmd]
     [OwnerOnly]
     public async Task ListServers(int page = 1)

src/NadekoBot/Modules/Xp/Xp.cs

@@ -334,14 +334,15 @@ public partial class Xp : NadekoModule<XpService>
 
     public enum XpShopInputType
     {
-        F = 0,
-        Frs = 0,
-        Fs = 0,
-        Frames = 0,
-        B = 1,
-        Bg = 1,
-        Bgs = 1,
-        Backgrounds = 1
+        Backgrounds = 0,
+        B = 0,
+        Bg = 0,
+        Bgs = 0,
+        Frames = 1,
+        F = 1,
+        Fr = 1,
+        Frs = 1,
+        Fs = 1,
     }
 
     [Cmd]
@@ -353,8 +354,11 @@ public partial class Xp : NadekoModule<XpService>
             return;
         }
 
-        await SendConfirmAsync(GetText(strs.available_commands), $@"`{prefix}xpshop bgs`
-`{prefix}xpshop frames`");
+        await SendConfirmAsync(GetText(strs.available_commands),
+            $@"`{prefix}xpshop bgs`
+`{prefix}xpshop frames`
+
+*{GetText(strs.xpshop_website)}*");
     }
     
     [Cmd]
@@ -394,13 +398,18 @@ public partial class Xp : NadekoModule<XpService>
                     .WithOkColor()
                     .WithTitle(item.Name)
                     .AddField(GetText(strs.price), Gambling.Gambling.N(item.Price, culture), true)
-                    // .AddField(GetText(strs.buy), $"{prefix}xpbuy {key}", true)
-                    .WithImageUrl(item.Url.ToString());
+                    .WithImageUrl(string.IsNullOrWhiteSpace(item.Preview)
+                        ? item.Url
+                        : item.Preview);
 
                 if (!string.IsNullOrWhiteSpace(item.Desc))
-                    eb.WithDescription(item.Desc);
+                    eb.AddField(GetText(strs.desc), item.Desc);
 
-                var tier = _service.GetXpShopTierRequirement();
+                if (key == "default")
+                    eb.WithDescription(GetText(strs.xpshop_website));
+
+
+                var tier = _service.GetXpShopTierRequirement(type);
                 if (tier != PatronTier.None)
                 {
                     eb.WithFooter(GetText(strs.xp_shop_buy_required_tier(tier.ToString())));
@@ -423,8 +432,7 @@ public partial class Xp : NadekoModule<XpService>
                     var button = new ButtonBuilder(ownedItem.IsUsing
                             ? GetText(strs.in_use)
                             : GetText(strs.use),
-                        "XP_SHOP_USE",
-                        ButtonStyle.Primary,
+                        "xpshop:use",
                         emote: Emoji.Parse("👐"),
                         isDisabled: ownedItem.IsUsing);
 
@@ -438,8 +446,7 @@ public partial class Xp : NadekoModule<XpService>
                 else
                 {
                     var button = new ButtonBuilder(GetText(strs.buy),
-                        "XP_SHOP_BUY",
-                        ButtonStyle.Primary,
+                        "xpshop:buy",
                         emote: Emoji.Parse("💰"));
 
                     var inter = new SimpleInteraction<(string key, XpShopItemType type)?>(
@@ -455,6 +462,53 @@ public partial class Xp : NadekoModule<XpService>
             addPaginatedFooter: false);
     }
 
+    [Cmd]
+    public async Task XpShopBuy(XpShopInputType type, string key)
+    {
+        var result = await _service.BuyShopItemAsync(ctx.User.Id, (XpShopItemType)type, key);
+
+        NadekoInteraction GetUseInteraction()
+        {
+            return _inter.Create(ctx.User.Id,
+                new SimpleInteraction<object>(
+                    new ButtonBuilder(label: "Use", customId: "xpshop:use_item", emote: Emoji.Parse("👐")),
+                    async (smc, _) => await XpShopUse(type, key)
+                ));
+        }
+        
+        if (result != BuyResult.Success)
+        {
+            var _ = result switch
+            {
+                BuyResult.XpShopDisabled => await ReplyErrorLocalizedAsync(strs.xp_shop_disabled),
+                BuyResult.InsufficientFunds => await ReplyErrorLocalizedAsync(strs.not_enough(_gss.Data.Currency.Sign)),
+                BuyResult.AlreadyOwned => await ReplyErrorLocalizedAsync(strs.xpshop_already_owned, GetUseInteraction()),
+                BuyResult.UnknownItem => await ReplyErrorLocalizedAsync(strs.xpshop_item_not_found),
+                BuyResult.InsufficientPatronTier => await ReplyErrorLocalizedAsync(strs.patron_insuff_tier),
+                _ => throw new ArgumentOutOfRangeException()
+            };
+            return;
+        }
+
+        await ReplyConfirmLocalizedAsync(strs.xpshop_buy_success(type.ToString().ToLowerInvariant(),
+                key.ToLowerInvariant()),
+            GetUseInteraction());
+    }
+    
+    [Cmd]
+    public async Task XpShopUse(XpShopInputType type, string key)
+    {
+        var result = await _service.UseShopItemAsync(ctx.User.Id, (XpShopItemType)type, key);
+
+        if (!result)
+        {
+            await ReplyConfirmLocalizedAsync(strs.xp_shop_item_cant_use);
+            return;
+        }
+
+        await ctx.OkAsync();
+    }
+    
     private async Task OnShopUse(SocketMessageComponent smc, (string? key, XpShopItemType type)? maybeState)
     {
         if (maybeState is not { } state)