Upped version to 4.3.7, updated changelog

Added pagination to .reroli
Removed currencies from units.json as they're pulled from api
2025-09-10 17:28:27 -04:00 · 2022-09-14 02:46:03 +02:00 · 2022-09-14 02:44:31 +02:00 · 2022-09-13 21:50:48 +02:00 · 2022-09-13 21:33:20 +02:00 · 2022-09-12 01:22:58 +02:00
117 changed files with 41865 additions and 1301 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,89 @@

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

-## [4.3.1] - 27.07.2022
+## [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

- Check for updates will run once per hour as it was supposed to
+- 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

@@ -19,6 +97,12 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.
 - 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
@@ -32,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`

@@ -63,7 +148,7 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.
  - [dev] No longer using generator and partial methods for commands

 ### Fixed
- 
+
 - `.slot` will now show correct multipliers if they've been modified
 - Fix patron errors showing up even with permissions disabling the command
 - Fixed an issue with voice xp breaking xp gain.
@@ -118,14 +203,14 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.

 ### Fixed

- Fixed `.draw` command 
+- Fixed `.draw` command

 ## [4.2.10] - 29.06.2022

 - Fixed currency generation working only once

 ## [4.2.9] - 25.06.2022
-  
+
 ### Fixed

 - Fixed `creds_example.yml` misssing from output directory
@@ -285,7 +370,7 @@ Added `.patron` and `.patronmessage` commands
  - `ytdataapi` will use the official google api (requires `GoogleApiKey` specified in `creds.yml`) and YoutubeDataApi enabled in the dev console
  - `ytdl` will use `youtube-dl` program from the host machine. It must be downloaded and it's location must be added to path env variable.
  - `ytdlp` will use `yt-dlp` program from the host machine. Same as `youtube-dl` - must be in path env variable.
-  - `invidious` will use one of invidious instances specified in the `invidiousInstances` property. Very good. 
+  - `invidious` will use one of invidious instances specified in the `invidiousInstances` property. Very good.

 - `.google`, `.youtube` and `.image` moved to the new Search group

@@ -305,19 +390,19 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
 - `.feed` urls which error for more than 100 times will be automatically removed.
 - `.ve` is now enabled by default

- [dev] nadeko interaction slightly improved to make it less nonsense (they still don't make sense)  
- [dev] RewardedUsers table slightly changed to make it more general  
- [dev] renamed `// todo`s which aren't planned soon to `// FUTURE`  
- [dev] currency rewards have been reimplemented and moved to a separate service  
+- [dev] nadeko interaction slightly improved to make it less nonsense (they still don't make sense)
+- [dev] RewardedUsers table slightly changed to make it more general
+- [dev] renamed `// todo`s which aren't planned soon to `// FUTURE`
+- [dev] currency rewards have been reimplemented and moved to a separate service

 ### Fixed
- 
+
 - `.rh` no longer needs quotes for multi word roles
 - `.deletexp` will now properly delete server xp too
 - Fixed `.crypto` sparklines
 - [dev] added support for configs to properly parse enums without case sensitivity (ConfigParsers.InsensitiveEnum)
- [dev] Fixed a bug in .gencmdlist  
- [dev] small fixes to creds provider  
+- [dev] Fixed a bug in .gencmdlist
+- [dev] small fixes to creds provider

 ### Removed

@@ -350,7 +435,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf

 ## [4.1.3] - 06.05.2022

-### Added 
+### Added

 - Added support for embed arrays in commands such as .say, .greet, .bye, etc...
  - Website to create them is live at eb.nadeko.bot (old one is moved to oldeb.nadeko.bot)
@@ -363,18 +448,18 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
  - Users can deposit, withdraw and check the balance of their currency in the bank.
  - Users can't check other user's bank balances.
 - Added a button on a .$ command which, when clicked, sends you a message with your bank balance that only you can see.
- Added `.h <command group>`  
+- Added `.h <command group>`
  - Using this command will list all commands in the specified group
  - Atm only .bank is a proper group (`.h bank`)
 - Added "Bank Accounts" entry to `.economy`

 ### Changed

- Reaction roles rewritten completely 
-  - Supports multiple exclusivity groups per message 
+- Reaction roles rewritten completely
+  - Supports multiple exclusivity groups per message
  - Supports level requirements
  - However they can only be added one by one
-  - Use the following commands for more information 
+  - Use the following commands for more information
    - `.h .reroa`
    - `.h .reroli`
    - `.h .rerot`
@@ -405,7 +490,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
  - To change the db nadeko will use, simply change the `db type` in `creds.yml`
  - There is no migration code right now, which means that if you want to switch to another system you'll either have to manually export/import your database or start fresh
 - Medusa system
-  - A massive new feature which allows developers to create custom modules/plugins/cogs 
+  - A massive new feature which allows developers to create custom modules/plugins/cogs
  - They can be load/unloaded/updated at runtime without restarting the bot

 ### Changed
@@ -441,7 +526,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
 ### Fixed

 - Fixed the `id` which shows up when you add a new Expression
- Fixed some strings which were still referring to "CustomReaction(s)" instead of "Expression(s)" 
+- Fixed some strings which were still referring to "CustomReaction(s)" instead of "Expression(s)"

 ## [4.0.3] - 04.03.2022

@@ -467,20 +552,20 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
 ### Added
 - Added `.deleteemptyservers` command
 - Added `.curtr <id>` which lets you see full information about one of your own transactions with the specified id
- Added trovo.live support for stream notifications (`.stadd`) 
+- Added trovo.live support for stream notifications (`.stadd`)
 - Added unclaimed waifu decay functionality
  - Added 3 new settings to `data/gambling.yml` to control it:
    - waifu.decay.percent - How much % to subtract from unclaimed waifu
-    - waifu.decay.hourInterval - How often to decay the price 
+    - waifu.decay.hourInterval - How often to decay the price
    - waifu.decay.minPrice - Unclaimed waifus with price lower than the one specified here will not be affected by the decay
 - Added `currency.transactionsLifetime` to `data/gambling.yml` Any transaction older than the number of days specified will be automatically deleted
 - Added `.stock` command to check stock prices and charts
- Re-added `.qap / .queueautoplay` 
+- Re-added `.qap / .queueautoplay`

 ### Changed
 - CustomReactions module (and customreactions db table) has been renamed to Expressions.
-  - This was done to remove confusion about how it relates to discord Reactions (it doesn't, it was created and named before discord reactions existed) 
-  - Expression command now start with ex/expr and end with the name of the action or setting. 
+  - This was done to remove confusion about how it relates to discord Reactions (it doesn't, it was created and named before discord reactions existed)
+  - Expression command now start with ex/expr and end with the name of the action or setting.
  - For example `.exd` (`.dcr`) is expression delete, `.exa` (`.acr`)
  - Permissions (`.lp`) be automatically updated with "ACTUALEXPRESSIONS", "EXPRESSIONS" instead of "ACTUALCUSTOMREACTIONS" and "CUSTOMREACTIONS"
  - Permissions for `.ecr` (now `.exe`), `.scr` (now `.exs`), `.dcr` (now `.exd`), `.acr` (now `.exa`), `.lcr` (now `.exl`) will be automatically updated
@@ -497,8 +582,8 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
  - [dev] Added Type, Extra, OtherId fields to the database
 - [dev] CommandStrings will now use methodname as the key, and **not** the command name (first entry in aliases.yml)
  - In other words aliases.yml and commands.en-US.yml will use the same keys (once again)
- [dev] Reorganized module and submodule folders  
- [dev] Permissionv2 db table renamed to Permissions 
+- [dev] Reorganized module and submodule folders
+- [dev] Permissionv2 db table renamed to Permissions
 - [dev] Moved FilterWordsChannelId to a separate table

 ### Fixed
@@ -513,9 +598,9 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
 - Fixed embed color when disabling `.antialt`

 ### Removed
- Removed `.bce` - use `.config` or `.config bot` specifically for bot config  
- Removed obsolete placeholders: %users% %servers% %userfull% %username% %userdiscrim% %useravatar% %id% %uid% %chname% %cid% %sid% %members% %server_time% %shardid% %time% %mention%  
- Removed some obsolete commands and strings  
+- Removed `.bce` - use `.config` or `.config bot` specifically for bot config
+- Removed obsolete placeholders: %users% %servers% %userfull% %username% %userdiscrim% %useravatar% %id% %uid% %chname% %cid% %sid% %members% %server_time% %shardid% %time% %mention%
+- Removed some obsolete commands and strings
 - Removed code which migrated 2.x to v3 credentials, settings, etc...

 ## [3.0.13] - 14.01.2022
@@ -554,7 +639,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
  - Looks much nicer
    - Bot will now reply to user messages with a translation if `del` is disabled
    - Bot will make an embed with original and translated text with user avatar and name if `del` is enabled
-  - If the bot is unable to delete messages while having `del` enabled, it will reset back to the no-del behavior for the current session  
+  - If the bot is unable to delete messages while having `del` enabled, it will reset back to the no-del behavior for the current session

 ### Fixed
 - `.crypto` now supports top 5000 coins
@@ -568,7 +653,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
 ### Fixed
 - `.xprewsreset` now has correct permissions

-### Removed 
+### Removed
 - Removed slot.numbers from `images.yml` as they're no longer used

 ## [3.0.9] - 21.11.2021
@@ -578,7 +663,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf

 ### Added
 - Added `.emojiadd` with 3 overloads
-  - `.ea :customEmoji:` which copies another server's emoji 
+  - `.ea :customEmoji:` which copies another server's emoji
  - `.ea newName :customEmoji:` which copies emoji under a different name
  - `.ea emojiName <imagelink.png>` which creates a new emoji from the specified image
 - Patreon Access and Refresh Tokens should now be automatically updated once a month as long as the user has provided the necessary credentials in creds.yml file:
@@ -592,7 +677,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf

 ## [3.0.8] - 03.11.2021

-### Added 
+### Added
 - Created VotesApi project nad re-worked vote rewards handling
  - Updated votes entries in creds.yml with explanations on how to set up vote links

@@ -617,10 +702,10 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
  - They are called negative gifts
  - They show up at the end of the `.gifts` page and are marked with a broken heart
  - They have a separate multiplier (`waifu.multi.negative_gift_effect` default 0.5, changeable via `.config gambling` or `data/gambling.yml`)
-  - When gifted, the waifu's price will be reduced by the `price * multiplier` 
+  - When gifted, the waifu's price will be reduced by the `price * multiplier`
  - Negative gifts don't show up in `.waifuinfo` nor is the record of them kept in the database

-### Fixed 
+### Fixed
 - Fixed `%users%` and `%shard.usercount%` placeholders not showing correct values

 ## [3.0.6] - 27.09.2021
@@ -661,7 +746,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
 - Possible fix for `.repeat` bug
  - Slight adjustment for repeater logic
  - Timer should no longer increase on some repeaters
-  - Repeaters should no longer have periods when they're missing from the list  
+  - Repeaters should no longer have periods when they're missing from the list
 - Fixed several commands which used error color for success confirmation messages

 ## [3.0.3] - 15.09.2021
@@ -722,7 +807,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
  - Explanations on how to get the keys are added as the comments
 - Code cleanup
  - Command attributes cleaned up
-    - Removed dummy Remarks and Usages attributes as hey were unused for a few patches but stayed in the code to avoid big git diffsmigration code has ran and it can be safely removed 
+    - Removed dummy Remarks and Usages attributes as hey were unused for a few patches but stayed in the code to avoid big git diffsmigration code has ran and it can be safely removed
  - There are 2 projects: NadekoBot and NadekoBot.Coordinator
    - You can directly run NadekoBot as the regular bot with one shard
    - Run NadekoBot.Coordinator if you want more control over your shards and a grpc api for coordinator with which you can start, restart, kill and see status of shards
@@ -743,7 +828,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf

 ## [2.46.2] - 14.07.2021

-### Fixed 
+### Fixed

 - Fixed .save for local songs
 - Fixed .lq for local songs if the song names are too long
@@ -814,7 +899,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf

 ### Added

- Added `.crsexport` and `.crsimport` 
+- Added `.crsexport` and `.crsimport`
  - Allows for quick export/import of server or global custom reactions
  - Requires admin permissions for server crs, and owner for global crs
  - Explanation of the fields is in the comment at the top of the `.crsexport` .yml file
@@ -847,7 +932,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
 ### Added

 - Re-added `%music.playing%` and `%music.queued%` (#290)
- Added `%music.servers%` which shows how many servers have a song queued up to play  
+- Added `%music.servers%` which shows how many servers have a song queued up to play
 ℹ️ ^ Only available to `.ropl` / `.adpl` feature atm
 - `.autodc` re-added
 - `.qrp`, `.vol`, `.smch` `.autodc` will now persist
@@ -867,7 +952,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
 - Removing last song in the queue will no longer reset queue index
 - Having `.rpl` disabled will now correctly stop after the last song, closes #292

-### Removed 
+### Removed

 - `.sad` removed. It's more or less useless. Use `.qrp` and `.autodc` now for similar effect

@@ -882,7 +967,7 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf

 - Minor perf improvement for filter checks

-### Fixed 
+### Fixed

 - `.qs` result urls are now valid
 - Custom reactions with "`-`" as a response should once again disable that custom reaction completely
@@ -898,8 +983,8 @@ Note: Results of each `.youtube` query will be cached for 1 hour to improve perf
 - Much faster starting and skipping once the songs are in the queue
 - Higher quality audio (no stuttering too!)
 - Local tracks will now have durations if you have ffprobe installed (comes with ffmpeg)
- Bot supports joining a different vc without skipping the song if you use `.j` 
-  - ⚠️ **DO NOT DRAG THE BOT** to another vc, as it's not properly supported atm, and you will have to do `.play` after dragging it) 
+- Bot supports joining a different vc without skipping the song if you use `.j`
+  - ⚠️ **DO NOT DRAG THE BOT** to another vc, as it's not properly supported atm, and you will have to do `.play` after dragging it)
 - `.j` makes the bot join your voice channel
 - `.p` is now alias of play, pause is `.pause`
 - `.qs` should work without google api key now for most users as it is using a custom loader
--- a/README.md
+++ b/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/)  
--- a/docs/creds-guide.md
+++ b/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
 ```


--- a/docs/guides/linux-guide.md
+++ b/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.)*
--- a/src/Nadeko.Common/NadekoRandom.cs
+++ b/src/Nadeko.Common/NadekoRandom.cs
@@ -25,20 +25,6 @@ public class NadekoRandom : Random
        _rng.GetBytes(bytes);
        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)
    {
--- a/src/Nadeko.Econ/Gambling/Betflip/BetflipGame.cs
+++ b/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()
--- a/src/Nadeko.Econ/Gambling/Betroll/BetrollGame.cs
+++ b/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++)
        {
--- a/src/Nadeko.Econ/Gambling/Slot/SlotGame.cs
+++ b/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];
--- a/src/Nadeko.Medusa/IEmbedBuilder.cs
+++ b/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);
--- a/src/Nadeko.Medusa/Nadeko.Medusa.csproj
+++ b/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>
--- a/src/NadekoBot/Bot.cs
+++ b/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;
--- a/src/NadekoBot/Common/Interaction/INadekoInteractionService.cs
+++ b/src/NadekoBot/Common/Interaction/INadekoInteractionService.cs
@@ -0,0 +1,8 @@
+namespace NadekoBot;
+
+public interface INadekoInteractionService
+{
+    public NadekoInteraction Create<T>(
+        ulong userId,
+        SimpleInteraction<T> inter);
+}
--- a/src/NadekoBot/Common/Interaction/NadekoActionInteraction.cs
+++ b/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);
-}
--- a/src/NadekoBot/Common/Interaction/NadekoInteraction.cs
+++ b/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);
-}
-
-// this is all so wrong ...
+    public Task ExecuteOnActionAsync(SocketMessageComponent smc)
+        => _onClick(smc);
+}
--- a/src/NadekoBot/Common/Interaction/NadekoInteractionArray.cs
+++ b/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();
-//     }
-// }
--- a/src/NadekoBot/Common/Interaction/NadekoInteractionBuilder.cs
+++ b/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);
-    }
-}
--- a/src/NadekoBot/Common/Interaction/NadekoInteractionService.cs
+++ b/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);
+}
--- a/src/NadekoBot/Common/Interaction/NadekoOwnInteraction.cs
+++ b/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);
-}
--- a/src/NadekoBot/Common/NInteraction.cs
+++ b/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);
-}
--- a/src/NadekoBot/Common/NadekoModule.cs
+++ b/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)
--- a/src/NadekoBot/Db/Models/AntiProtection.cs
+++ b/src/NadekoBot/Db/Models/AntiProtection.cs
@@ -49,7 +49,8 @@ public enum PunishmentAction
    ChatMute,
    VoiceMute,
    AddRole,
-    Warn
+    Warn,
+    TimeOut
 }

 public class AntiSpamIgnore : DbEntity
--- a/src/NadekoBot/Db/Models/BanTemplate.cs
+++ b/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; }
 }
--- a/src/NadekoBot/Db/Models/DiscordUser.cs
+++ b/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; }
--- a/src/NadekoBot/Db/Models/ShopEntry.cs
+++ b/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
--- a/src/NadekoBot/Db/Models/UserXpStats.cs
+++ b/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 }
--- a/src/NadekoBot/Db/Models/XpShopOwnedItem.cs
+++ b/src/NadekoBot/Db/Models/XpShopOwnedItem.cs
@@ -13,6 +13,6 @@ public class XpShopOwnedItem : DbEntity

 public enum XpShopItemType
 {
-    Background,
-    Frame,
+    Background = 0,
+    Frame = 1,
 }
--- a/src/NadekoBot/Db/MysqlContext.cs
+++ b/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")
    {
--- a/src/NadekoBot/Db/NadekoContext.cs
+++ b/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

--- a/src/NadekoBot/Db/PostgreSqlContext.cs
+++ b/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")
    {
--- a/src/NadekoBot/Db/SqliteContext.cs
+++ b/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)
    {
--- a/src/NadekoBot/Migrations/MySql/20220808141855_remove-obsolete-xp-columns.Designer.cs
+++ b/src/NadekoBot/Migrations/MySql/20220808141855_remove-obsolete-xp-columns.Designer.cs
--- a/src/NadekoBot/Migrations/MySql/20220808141855_remove-obsolete-xp-columns.cs
+++ b/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)");
+        }
+    }
+}
--- a/src/NadekoBot/Migrations/MySql/20220831142722_banprune.Designer.cs
+++ b/src/NadekoBot/Migrations/MySql/20220831142722_banprune.Designer.cs
--- a/src/NadekoBot/Migrations/MySql/20220831142722_banprune.cs
+++ b/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");
+        }
+    }
+}
--- a/src/NadekoBot/Migrations/MySql/MysqlContextModelSnapshot.cs
+++ b/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");
--- a/src/NadekoBot/Migrations/Mysql/20220913192520_shop-role-req.Designer.cs
+++ b/src/NadekoBot/Migrations/Mysql/20220913192520_shop-role-req.Designer.cs
--- a/src/NadekoBot/Migrations/Mysql/20220913192520_shop-role-req.cs
+++ b/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");
+        }
+    }
+}
--- a/src/NadekoBot/Migrations/Mysql/MysqlContextModelSnapshot.cs
+++ b/src/NadekoBot/Migrations/Mysql/MysqlContextModelSnapshot.cs
--- a/src/NadekoBot/Migrations/PostgreSql/20220913192529_shop-role-req.Designer.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/20220913192529_shop-role-req.Designer.cs
--- a/src/NadekoBot/Migrations/PostgreSql/20220913192529_shop-role-req.cs
+++ b/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");
+        }
+    }
+}
--- a/src/NadekoBot/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs
--- a/src/NadekoBot/Migrations/Postgresql/20220808142559_remove-obsolete-xp-columns.Designer.cs
+++ b/src/NadekoBot/Migrations/Postgresql/20220808142559_remove-obsolete-xp-columns.Designer.cs
--- a/src/NadekoBot/Migrations/Postgresql/20220808142559_remove-obsolete-xp-columns.cs
+++ b/src/NadekoBot/Migrations/Postgresql/20220808142559_remove-obsolete-xp-columns.cs
--- a/src/NadekoBot/Migrations/Postgresql/20220831142735_banprune.Designer.cs
+++ b/src/NadekoBot/Migrations/Postgresql/20220831142735_banprune.Designer.cs
--- a/src/NadekoBot/Migrations/Postgresql/20220831142735_banprune.cs
+++ b/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");
+        }
+    }
+}
--- a/src/NadekoBot/Migrations/Postgresql/PostgreSqlContextModelSnapshot.cs
+++ b/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")
--- a/src/NadekoBot/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.Designer.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.Designer.cs
--- a/src/NadekoBot/Migrations/Sqlite/20220808141842_remove-obsolete-xp-columns.cs
+++ b/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')");
+        }
+    }
+}
--- a/src/NadekoBot/Migrations/Sqlite/20220831142504_banprune.Designer.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20220831142504_banprune.Designer.cs
--- a/src/NadekoBot/Migrations/Sqlite/20220831142504_banprune.cs
+++ b/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");
+        }
+    }
+}
--- a/src/NadekoBot/Migrations/Sqlite/20220913190532_shop-role-req.Designer.cs
+++ b/src/NadekoBot/Migrations/Sqlite/20220913190532_shop-role-req.Designer.cs
--- a/src/NadekoBot/Migrations/Sqlite/20220913190532_shop-role-req.cs
+++ b/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");
+        }
+    }
+}
--- a/src/NadekoBot/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs
+++ b/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");

--- a/src/NadekoBot/Modules/Administration/Administration.cs
+++ b/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();
+    }
 }
--- a/src/NadekoBot/Modules/Administration/Mute/MuteService.cs
+++ b/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));
--- a/src/NadekoBot/Modules/Administration/Protection/ProtectionCommands.cs
+++ b/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();
@@ -122,6 +129,9 @@ public partial class Administration
            var time = (int?)punishTime?.Time.TotalMinutes ?? 0;
            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);

@@ -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")),
--- a/src/NadekoBot/Modules/Administration/Role/ReactionRoleCommands.cs
+++ b/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]
--- a/src/NadekoBot/Modules/Administration/UserPunish/UserPunishCommands.cs
+++ b/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); }

@@ -718,6 +746,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)]
@@ -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()
                                       {
--- a/src/NadekoBot/Modules/Administration/UserPunish/UserPunishService.cs
+++ b/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,
--- a/src/NadekoBot/Modules/CustomReactions/NadekoExpressions.cs
+++ b/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 { }
        }
@@ -336,4 +379,4 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>

        await ctx.OkAsync();
    }
-}
+}
--- a/src/NadekoBot/Modules/Gambling/Bank/BankCommands.cs
+++ b/src/NadekoBot/Modules/Gambling/Bank/BankCommands.cs
@@ -11,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]
@@ -68,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);
    }
 }
--- a/src/NadekoBot/Modules/Gambling/Bank/BankService.cs
+++ b/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)
--- a/src/NadekoBot/Modules/Gambling/Bank/IBankService.cs
+++ b/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);
 }
--- a/src/NadekoBot/Modules/Gambling/CashInteraction.cs
+++ b/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)
-    {
-    }
-}
--- a/src/NadekoBot/Modules/Gambling/Gambling.cs
+++ b/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))));
-        
-        await ReplyConfirmLocalizedAsync(strs.timely(N(val), period), inter.GetInteraction());
+        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);
    }

    [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)]
@@ -875,11 +866,12 @@ public partial class Gambling : GamblingModule<GamblingService>
        public enum GambleTestTarget
        {
            Slot,
+            Betroll,
+            Betflip,
+            BetflipT,
            BetDraw,
            BetDrawHL,
            BetDrawRB,
-            Betflip,
-            BetflipT,
            Lula,
            Rps,
        }
@@ -920,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))
                };
                
--- a/src/NadekoBot/Modules/Gambling/Shop/IShopService.cs
+++ b/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);
 }
--- a/src/NadekoBot/Modules/Gambling/Shop/ShopCommands.cs
+++ b/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;
        }
    }
 }
--- a/src/NadekoBot/Modules/Gambling/Shop/ShopService.cs
+++ b/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;
+    }
 }
--- a/src/NadekoBot/Modules/Gambling/Slot/SlotCommands.cs
+++ b/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;
            }
            
--- a/src/NadekoBot/Modules/Games/Trivia/TriviaGame.cs
+++ b/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;

-            if (!guessed)
-            {
-                await OnTimeout(this, question);
-                
-                if (_opts.Timeout != 0 && ++inactivity >= _opts.Timeout)
+                    // 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)
                {
-                    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()
--- a/src/NadekoBot/Modules/Help/Help.cs
+++ b/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
--- a/src/NadekoBot/Modules/Help/Interactions/DonateSelfhostingInteraction.cs
+++ b/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)
-    {
-    }
-}
--- a/src/NadekoBot/Modules/Help/Interactions/DonateTroubleshootInteraction.cs
+++ b/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)
-    {
-    }
-}
--- a/src/NadekoBot/Modules/Music/Music.cs
+++ b/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;

--- a/src/NadekoBot/Modules/Music/_Common/Resolvers/YtdlYoutubeResolver.cs
+++ b/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);
--- a/src/NadekoBot/Modules/Searches/StreamNotification/StreamNotificationService.cs
+++ b/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();
--- a/src/NadekoBot/Modules/Searches/StreamNotification/StreamOnlineMessageDeleterService.cs
+++ b/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;
+    }
+}
--- a/src/NadekoBot/Modules/Utility/Info/InfoCommands.cs
+++ b/src/NadekoBot/Modules/Utility/Info/InfoCommands.cs
@@ -97,6 +97,33 @@ public partial class Utility
                           .WithOkColor();
            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)]
@@ -110,9 +137,11 @@ public partial class Utility
            var embed = _eb.Create().AddField(GetText(strs.name), $"**{user.Username}**#{user.Discriminator}", true);
            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]
--- a/src/NadekoBot/Modules/Utility/Patronage/PatronageService.cs
+++ b/src/NadekoBot/Modules/Utility/Patronage/PatronageService.cs
@@ -716,7 +716,7 @@ public sealed class PatronageService
            {
                Name = key.PrettyName,
                Quota = 0,
-                IsPatronLimit = false,
+                IsPatronLimit = true,
            };

        return new()
--- a/src/NadekoBot/Modules/Utility/Quote/IQuoteService.cs
+++ b/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);
+}
--- a/src/NadekoBot/Modules/Utility/Quote/QuoteCommands.cs
+++ b/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();
--- a/src/NadekoBot/Modules/Utility/Quote/QuoteService.cs
+++ b/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;
+    }
+}
--- a/src/NadekoBot/Modules/Utility/Remind/RemindService.cs
+++ b/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)
        {
--- a/src/NadekoBot/Modules/Utility/Utility.cs
+++ b/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)
--- a/src/NadekoBot/Modules/Xp/Xp.cs
+++ b/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]
@@ -352,9 +353,12 @@ public partial class Xp : NadekoModule<XpService>
            await ReplyErrorLocalizedAsync(strs.xp_shop_disabled);
            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)?>(
@@ -454,6 +461,53 @@ public partial class Xp : NadekoModule<XpService>
            1,
            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)
    {
--- a/src/NadekoBot/Modules/Xp/XpConfig.cs
+++ b/src/NadekoBot/Modules/Xp/XpConfig.cs
@@ -10,7 +10,7 @@ namespace NadekoBot.Modules.Xp;
 public sealed partial class XpConfig : ICloneable<XpConfig>
 {
    [Comment(@"DO NOT CHANGE")]
-    public int Version { get; set; } = 3;
+    public int Version { get; set; } = 5;

    [Comment(@"How much XP will the users receive per message")]
    public int XpPerMessage { get; set; } = 3;
@@ -26,6 +26,9 @@ public sealed partial class XpConfig : ICloneable<XpConfig>

    [Comment(@"The maximum amount of minutes the bot will keep track of a user in a voice channel")]
    public int VoiceMaxMinutes { get; set; } = 720;
+    
+    [Comment(@"The amount of currency users will receive for each point of global xp that they earn")]
+    public float CurrencyPerXp { get; set; } = 0;

    [Comment(@"Xp Shop config")]
    public ShopConfig Shop { get; set; } = new();
@@ -37,9 +40,13 @@ True -> Users can access the xp shop using .xpshop command
 False -> Users can't access the xp shop")]
        public bool IsEnabled { get; set; } = false;

-        [Comment(@"Which patron tier do users need in order to use the .xpshop command
+        [Comment(@"Which patron tier do users need in order to use the .xpshop bgs command
 Leave at 'None' if patron system is disabled or you don't want any restrictions")]
-        public PatronTier TierRequirement { get; set; } = PatronTier.None;
+        public PatronTier BgsTierRequirement { get; set; } = PatronTier.None;
+        
+        [Comment(@"Which patron tier do users need in order to use the .xpshop frames command
+Leave at 'None' if patron system is disabled or you don't want any restrictions")]
+        public PatronTier FramesTierRequirement { get; set; } = PatronTier.None;
        
        [Comment(@"Frames available for sale. Keys are unique IDs.
 Do not change keys as they are not publicly visible. Only change properties (name, price, id)
@@ -71,6 +78,9 @@ To remove an item from the shop, but keep previous purchases, set the price to -
        [Comment(@"Direct url to the .png image which will be applied to the user's XP card")]
        public string Url { get; set; }
        
+        [Comment(@"Optional preview url which will show instead of the real URL in the shop ")]
+        public string Preview { get; set; }
+        
        [Comment(@"Optional description of the item")]
        public string Desc { get; set; }
    }
--- a/src/NadekoBot/Modules/Xp/XpConfigService.cs
+++ b/src/NadekoBot/Modules/Xp/XpConfigService.cs
@@ -52,11 +52,11 @@ public sealed class XpConfigService : ConfigServiceBase<XpConfig>
            });
        }
        
-        if (data.Version < 3)
+        if (data.Version < 6)
        {
            ModifyConfig(c =>
            {
-                c.Version = 3;
+                c.Version = 6;
            });
        }
    }
--- a/src/NadekoBot/Modules/Xp/XpService.cs
+++ b/src/NadekoBot/Modules/Xp/XpService.cs
@@ -176,6 +176,16 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
            var gxps = new List<UserXpStats>(globalToAdd.Count);
            await using (var ctx = _db.GetDbContext())
            {
+                var conf = _xpConfig.Data;
+                if (conf.CurrencyPerXp > 0)
+                {
+                    foreach (var user in globalToAdd)
+                    {
+                        var amount = user.Value.XpAmount * conf.CurrencyPerXp;
+                        await _cs.AddAsync(user.Key, (long)(amount), null);
+                    }
+                }
+                
                // update global user xp in batches
                // group by xp amount and update the same amounts at the same time
                foreach (var group in globalToAdd.GroupBy(x => x.Value.XpAmount, x => x.Key))
@@ -188,9 +198,15 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
                            },
                            (_, n) => n);

+                    await ctx.Clubs
+                        .Where(x => x.Members.Any(m => group.Contains(m.UserId)))
+                        .UpdateAsync(old => new()
+                        {
+                            Xp = old.Xp + (group.Key * old.Members.Count(m => group.Contains(m.UserId)))
+                        });
+                    
                    dus.AddRange(items);
                }
-
                // update guild user xp in batches
                foreach (var (guildId, toAdd) in guildToAdd)
                {
@@ -205,8 +221,43 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
                                    Xp = old.Xp + group.Key
                                },
                                (_, n) => n);
-
+                        
                        gxps.AddRange(items);
+                        
+                        var missingUserIds = group.Where(userId => !items.Any(x => x.UserId == userId)).ToArray();
+                        foreach (var userId in missingUserIds)
+                        {
+                            await ctx
+                                .UserXpStats
+                                .ToLinqToDBTable()
+                                .InsertOrUpdateAsync(() => new UserXpStats()
+                                    {
+                                        UserId = userId,
+                                        GuildId = guildId,
+                                        Xp = group.Key,
+                                        DateAdded = DateTime.UtcNow,
+                                        AwardedXp = 0,
+                                        NotifyOnLevelUp = XpNotificationLocation.None
+                                    },
+                                    _ => new()
+                                    {
+                                        
+                                    },
+                                    () => new()
+                                    {
+                                        UserId = userId
+                                    });
+                        }
+
+                        if (missingUserIds.Length > 0)
+                        {
+                            var missingItems = await ctx.UserXpStats
+                                .ToLinqToDBTable()
+                                .Where(x => missingUserIds.Contains(x.UserId))
+                                .ToArrayAsyncLinqToDB();
+                            
+                            gxps.AddRange(missingItems);
+                        }
                    }
                }
            }
@@ -235,8 +286,8 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
                if (guildToAdd.TryGetValue(du.GuildId, out var users)
                    && users.TryGetValue(du.UserId, out var xpGainData))
                {
-                    var oldLevel = new LevelStats(du.Xp - xpGainData.XpAmount);
-                    var newLevel = new LevelStats(du.Xp);
+                    var oldLevel = new LevelStats(du.Xp - xpGainData.XpAmount + du.AwardedXp);
+                    var newLevel = new LevelStats(du.Xp + du.AwardedXp);

                    if (oldLevel.Level < newLevel.Level)
                    {
@@ -593,12 +644,12 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
    {
        if (ShouldTrackVoiceChannel(channel))
        {
-            foreach (var user in channel.Users)
+            foreach (var user in channel.ConnectedUsers)
                await ScanUserForVoiceXp(user, channel);
        }
        else
        {
-            foreach (var user in channel.Users)
+            foreach (var user in channel.ConnectedUsers)
                await UserLeftVoiceChannel(user, channel);
        }
    }
@@ -617,13 +668,13 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
    }

    private bool ShouldTrackVoiceChannel(SocketVoiceChannel channel)
-        => channel.Users.Where(UserParticipatingInVoiceChannel).Take(2).Count() >= 2;
+        => channel.ConnectedUsers.Where(UserParticipatingInVoiceChannel).Take(2).Count() >= 2;

    private bool UserParticipatingInVoiceChannel(SocketGuildUser user)
        => !user.IsDeafened && !user.IsMuted && !user.IsSelfDeafened && !user.IsSelfMuted;

    private TypedKey<long> GetVoiceXpKey(ulong userId)
-        => new($"xp:vc_join:{userId}");
+        => new($"xp:{_client.CurrentUser.Id}:vc_join:{userId}");
    
    private async Task UserJoinedVoiceChannel(SocketGuildUser user)
    {
@@ -634,6 +685,18 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
            TimeSpan.FromMinutes(_xpConfig.Data.VoiceMaxMinutes),
            overwrite: false);
    }
+    
+    // private void UserJoinedVoiceChannel(SocketGuildUser user)
+    // {
+    //     var key = $"{_creds.RedisKey()}_user_xp_vc_join_{user.Id}";
+    //     var value = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
+    //
+    //     _cache.Redis.GetDatabase()
+    //         .StringSet(key,
+    //             value,
+    //             TimeSpan.FromMinutes(_xpConfig.Data.VoiceMaxMinutes),
+    //             when: When.NotExists);
+    // }

    private async Task UserLeftVoiceChannel(SocketGuildUser user, SocketVoiceChannel channel)
    {
@@ -654,6 +717,7 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand

        if (actualXp > 0)
        {
+            Log.Information("Adding {Amount} voice xp to {User}", actualXp, user.ToString());
            await _xpGainQueue.Writer.WriteAsync(new()
            {
                Guild = channel.Guild,
@@ -663,6 +727,38 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
            });
        }
    }
+    
+    /*
+     * private void UserLeftVoiceChannel(SocketGuildUser user, SocketVoiceChannel channel)
+    {
+        var key = $"{_creds.RedisKey()}_user_xp_vc_join_{user.Id}";
+        var value = _cache.Redis.GetDatabase().StringGet(key);
+        _cache.Redis.GetDatabase().KeyDelete(key);
+
+        // Allow for if this function gets called multiple times when a user leaves a channel.
+        if (value.IsNull)
+            return;
+
+        if (!value.TryParse(out long startUnixTime))
+            return;
+
+        var dateStart = DateTimeOffset.FromUnixTimeSeconds(startUnixTime);
+        var dateEnd = DateTimeOffset.UtcNow;
+        var minutes = (dateEnd - dateStart).TotalMinutes;
+        var xp = _xpConfig.Data.VoiceXpPerMinute * minutes;
+        var actualXp = (int)Math.Floor(xp);
+
+        if (actualXp > 0)
+        {
+            _addMessageXp.Enqueue(new()
+            {
+                Guild = channel.Guild,
+                User = user,
+                XpAmount = actualXp
+            });
+        }
+    }
+     */

    private bool ShouldTrackXp(SocketGuildUser user, ulong channelId)
    {
@@ -767,8 +863,8 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
        return Enumerable.Empty<ulong>();
    }

-    private static TypedKey<bool> GetUserRewKey(ulong userId)
-        => new($"xp:user_gain:{userId}");
+    private TypedKey<bool> GetUserRewKey(ulong userId)
+        => new($"xp:{_client.CurrentUser.Id}:user_gain:{userId}");
    
    private async Task<bool> SetUserRewardedAsync(ulong userId)
        => await _c.AddAsync(GetUserRewKey(userId),
@@ -887,6 +983,8 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
                throw new ArgumentNullException(nameof(bgBytes));
            }

+            var outlinePen = new Pen(Color.Black, 1f);
+            
            using var img = Image.Load<Rgba32>(bgBytes, out var imageFormat);
            if (template.User.Name.Show)
            {
@@ -909,7 +1007,8 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
                            Origin = new(template.User.Name.Pos.X, template.User.Name.Pos.Y + 8)
                        },
                        "@" + username,
-                        template.User.Name.Color);
+                        Brushes.Solid(template.User.Name.Color),
+                        outlinePen);
                });
            }

@@ -929,7 +1028,8 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
                        Origin = new(template.Club.Name.Pos.X + 50, template.Club.Name.Pos.Y - 8)
                    },
                    clubName,
-                    template.Club.Name.Color));
+                    Brushes.Solid(template.Club.Name.Color),
+                    outlinePen));
            }

            Font GetTruncatedFont(
@@ -987,7 +1087,6 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
                });
            }

-            var pen = new Pen(Color.Black, 1.25f);

            var global = stats.Global;
            var guild = stats.Guild;
@@ -1012,7 +1111,7 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
                    },
                    $"{global.LevelXp}/{global.RequiredXp}",
                    Brushes.Solid(template.User.Xp.Global.Color),
-                    pen));
+                    outlinePen));
            }

            if (template.User.Xp.Guild.Show)
@@ -1026,7 +1125,7 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
                    },
                    $"{guild.LevelXp}/{guild.RequiredXp}",
                    Brushes.Solid(template.User.Xp.Guild.Color),
-                    pen));
+                    outlinePen));
            }

            if (stats.FullGuildStats.AwardedXp != 0 && template.User.Xp.Awarded.Show)
@@ -1038,10 +1137,11 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
                img.Mutate(x => x.DrawText($"({sign}{stats.FullGuildStats.AwardedXp})",
                    _fonts.NotoSans.CreateFont(template.User.Xp.Awarded.FontSize, FontStyle.Bold),
                    Brushes.Solid(template.User.Xp.Awarded.Color),
-                    pen,
+                    outlinePen,
                    new(awX, awY)));
            }

+            var rankPen = new Pen(Color.White, 1);
            //ranking
            if (template.User.GlobalRank.Show)
            {
@@ -1054,10 +1154,15 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
                    globalRankStr,
                    68);

-                img.Mutate(x => x.DrawText(globalRankStr,
-                    globalRankFont,
-                    template.User.GlobalRank.Color,
-                    new(template.User.GlobalRank.Pos.X, template.User.GlobalRank.Pos.Y)));
+                img.Mutate(x => x.DrawText(
+                    new TextOptions(globalRankFont)
+                    {
+                        Origin = new(template.User.GlobalRank.Pos.X, template.User.GlobalRank.Pos.Y)
+                    },
+                    globalRankStr,
+                    Brushes.Solid(template.User.GlobalRank.Color),
+                    rankPen
+                ));
            }

            if (template.User.GuildRank.Show)
@@ -1071,10 +1176,15 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
                    guildRankStr,
                    43);

-                img.Mutate(x => x.DrawText(guildRankStr,
-                    guildRankFont,
-                    template.User.GuildRank.Color,
-                    new(template.User.GuildRank.Pos.X, template.User.GuildRank.Pos.Y)));
+                img.Mutate(x => x.DrawText(
+                    new TextOptions(guildRankFont)
+                    {
+                        Origin = new(template.User.GuildRank.Pos.X, template.User.GuildRank.Pos.Y)
+                    },
+                    guildRankStr,
+                    Brushes.Solid(template.User.GuildRank.Color),
+                    rankPen
+                ));
            }

            //avatar
@@ -1335,13 +1445,17 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
        var conf = _xpConfig.Data;

        if (!conf.Shop.IsEnabled)
-            return BuyResult.UnknownItem;
+            return BuyResult.XpShopDisabled;

-        if (conf.Shop.TierRequirement != PatronTier.None)
+        var req = type == XpShopItemType.Background
+            ? conf.Shop.BgsTierRequirement
+            : conf.Shop.FramesTierRequirement;
+        
+        if (req != PatronTier.None && !_creds.IsOwner(userId))
        {
            var patron = await _ps.GetPatronAsync(userId);

-            if ((int)patron.Tier < (int)conf.Shop.TierRequirement)
+            if ((int)patron.Tier < (int)req)
                return BuyResult.InsufficientPatronTier;
        }
        
@@ -1468,8 +1582,12 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
        return false;
    }

-    public PatronTier GetXpShopTierRequirement()
-        => _xpConfig.Data.Shop.TierRequirement;
+    public PatronTier GetXpShopTierRequirement(Xp.XpShopInputType type)
+        => type switch
+        {
+            Xp.XpShopInputType.F => _xpConfig.Data.Shop.FramesTierRequirement,
+            _ => _xpConfig.Data.Shop.BgsTierRequirement,
+        };

    public bool IsShopEnabled()
        => _xpConfig.Data.Shop.IsEnabled;
@@ -1478,6 +1596,7 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
 public enum BuyResult
 {
    Success,
+    XpShopDisabled,
    AlreadyOwned,
    InsufficientFunds,
    UnknownItem,
--- a/src/NadekoBot/NadekoBot.csproj
+++ b/src/NadekoBot/NadekoBot.csproj
@@ -27,7 +27,7 @@
        <PackageReference Include="CodeHollow.FeedReader" Version="1.2.4" />
        <PackageReference Include="CommandLineParser" Version="2.9.1" />
        <PackageReference Include="CsvHelper" Version="28.0.1" />
-        <PackageReference Include="Discord.Net" Version="3.103.0" />
+        <PackageReference Include="Discord.Net" Version="3.104.0" />
        <PackageReference Include="CoreCLR-NCalc" Version="2.2.110" />
        <PackageReference Include="Google.Apis.Urlshortener.v1" Version="1.41.1.138" />
        <PackageReference Include="Google.Apis.YouTube.v3" Version="1.57.0.2749" />
--- a/src/NadekoBot/Services/CommandHandler.cs
+++ b/src/NadekoBot/Services/CommandHandler.cs
@@ -279,6 +279,7 @@ public class CommandHandler : INService, IReadyExecutor
                // if it errored
                if (error is not null)
                {
+                    error = HumanizeError(error);
                    LogErroredExecution(error, usrMsg, channel as ITextChannel, blockTime, startTime);
                    
                    if (guild is not null)
@@ -292,6 +293,15 @@ public class CommandHandler : INService, IReadyExecutor
        await _behaviorHandler.RunOnNoCommandAsync(guild, usrMsg);
    }

+    private string HumanizeError(string error)
+    {
+        if (error.Contains("parse int", StringComparison.OrdinalIgnoreCase)
+            || error.Contains("parse float"))
+            return "Invalid number specified. Make sure you're specifying parameters in the correct order.";
+
+        return error;
+    }
+
    public Task<(bool Success, string Error, CommandInfo Info)> ExecuteCommandAsync(
        CommandContext context,
        string input,
--- a/src/NadekoBot/Services/Currency/DefaultWallet.cs
+++ b/src/NadekoBot/Services/Currency/DefaultWallet.cs
@@ -27,7 +27,7 @@ public class DefaultWallet : IWallet
                        .FirstOrDefaultAsync();
    }

-    public async Task<bool> Take(long amount, TxData txData)
+    public async Task<bool> Take(long amount, TxData? txData)
    {
        if (amount < 0)
            throw new ArgumentOutOfRangeException(nameof(amount), "Amount to take must be non negative.");
@@ -44,24 +44,27 @@ public class DefaultWallet : IWallet

        if (changed == 0)
            return false;
-        
-        await ctx
-              .GetTable<CurrencyTransaction>()
-              .InsertAsync(() => new()
-              {
-                  Amount = -amount,
-                  Note = txData.Note,
-                  UserId = userId,
-                  Type = txData.Type,
-                  Extra = txData.Extra,
-                  OtherId = txData.OtherId,
-                  DateAdded = DateTime.UtcNow
-              });
+
+        if (txData is not null)
+        {
+            await ctx
+                .GetTable<CurrencyTransaction>()
+                .InsertAsync(() => new()
+                {
+                    Amount = -amount,
+                    Note = txData.Note,
+                    UserId = userId,
+                    Type = txData.Type,
+                    Extra = txData.Extra,
+                    OtherId = txData.OtherId,
+                    DateAdded = DateTime.UtcNow
+                });
+        }

        return true;
    }

-    public async Task Add(long amount, TxData txData)
+    public async Task Add(long amount, TxData? txData)
    {
        if (amount <= 0)
            throw new ArgumentOutOfRangeException(nameof(amount), "Amount must be greater than 0.");
@@ -92,16 +95,19 @@ public class DefaultWallet : IWallet
            await tran.CommitAsync();
        }

-        await ctx.GetTable<CurrencyTransaction>()
-                 .InsertAsync(() => new()
-                 {
-                     Amount = amount,
-                     UserId = userId,
-                     Note = txData.Note,
-                     Type = txData.Type,
-                     Extra = txData.Extra,
-                     OtherId = txData.OtherId,
-                     DateAdded = DateTime.UtcNow
-                 });
+        if (txData is not null)
+        {
+            await ctx.GetTable<CurrencyTransaction>()
+                .InsertAsync(() => new()
+                {
+                    Amount = amount,
+                    UserId = userId,
+                    Note = txData.Note,
+                    Type = txData.Type,
+                    Extra = txData.Extra,
+                    OtherId = txData.OtherId,
+                    DateAdded = DateTime.UtcNow
+                });
+        }
    }
 }
--- a/src/NadekoBot/Services/Currency/IWallet.cs
+++ b/src/NadekoBot/Services/Currency/IWallet.cs
@@ -5,31 +5,35 @@ public interface IWallet
    public ulong UserId { get; }

    public Task<long> GetBalance();
-    public Task<bool> Take(long amount, TxData txData);
-    public Task Add(long amount, TxData txData);
+    public Task<bool> Take(long amount, TxData? txData);
+    public Task Add(long amount, TxData? txData);

    public async Task<bool> Transfer(
        long amount,
        IWallet to,
-        TxData txData)
+        TxData? txData)
    {
        if (amount <= 0)
            throw new ArgumentOutOfRangeException(nameof(amount), "Amount must be greater than 0.");

-        var succ = await Take(amount,
-            txData with
+        if (txData is not null)
+            txData = txData with
            {
                OtherId = to.UserId
-            });
+            };
+        
+        var succ = await Take(amount, txData);

        if (!succ)
            return false;

-        await to.Add(amount,
-            txData with
+        if (txData is not null)
+            txData = txData with
            {
                OtherId = UserId
-            });
+            };
+
+        await to.Add(amount, txData);

        return true;
    }
--- a/src/NadekoBot/Services/IEmbedBuilderService.cs
+++ b/src/NadekoBot/Services/IEmbedBuilderService.cs
@@ -67,6 +67,9 @@ public sealed class DiscordEmbedBuilderWrapper : IEmbedBuilder
            _ => throw new ArgumentOutOfRangeException(nameof(color), "Unsupported EmbedColor type")
        };

+    public IEmbedBuilder WithDiscordColor(Color color)
+        => Wrap(embed.WithColor(color));
+
    public Embed Build()
        => embed.Build();

--- a/src/NadekoBot/Services/Impl/StatsService.cs
+++ b/src/NadekoBot/Services/Impl/StatsService.cs
@@ -7,7 +7,7 @@ namespace NadekoBot.Services;

 public sealed class StatsService : IStatsService, IReadyExecutor, INService
 {
-    public const string BOT_VERSION = "4.3.2";
+    public const string BOT_VERSION = "4.3.7";

    public string Author
        => "Kwoth#2452";
@@ -139,7 +139,7 @@ public sealed class StatsService : IStatsService, IReadyExecutor, INService
        textChannels = guilds.Sum(static g => g.Channels.Count(static cx => cx is ITextChannel));
        voiceChannels = guilds.Sum(static g => g.Channels.Count(static cx => cx is IVoiceChannel));
    }
-    
+
    public async Task OnReadyAsync()
    {
        InitializeChannelCount();
--- a/src/NadekoBot/_Extensions/IMessageChannelExtensions.cs
+++ b/src/NadekoBot/_Extensions/IMessageChannelExtensions.cs
@@ -33,7 +33,7 @@ public static class MessageChannelExtensions
    public static async Task<IUserMessage> SendAsync(
        this IMessageChannel channel,
        string? plainText,
-        NadekoButtonInteraction? inter,
+        NadekoInteraction? inter,
        Embed? embed = null,
        IReadOnlyCollection<Embed>? embeds = null,
        bool sanitizeAll = false)
@@ -72,7 +72,7 @@ public static class MessageChannelExtensions
        IEmbedBuilder? embed,
        string plainText = "",
        IReadOnlyCollection<IEmbedBuilder>? embeds = null,
-        NadekoButtonInteraction? inter = null)
+        NadekoInteraction? inter = null)
        => ch.SendAsync(plainText,
            inter,
            embed: embed?.Build(),
@@ -83,7 +83,7 @@ public static class MessageChannelExtensions
        IEmbedBuilderService eb,
        string text,
        MessageType type,
-        NadekoButtonInteraction? inter = null)
+        NadekoInteraction? inter = null)
    {
        var builder = eb.Create().WithDescription(text);

--- a/src/NadekoBot/_Extensions/SocketMessageComponentExtensions.cs
+++ b/src/NadekoBot/_Extensions/SocketMessageComponentExtensions.cs
@@ -56,7 +56,7 @@ public static class SocketMessageComponentExtensions
        IEmbedBuilder? embed,
        string plainText = "",
        IReadOnlyCollection<IEmbedBuilder>? embeds = null,
-        NadekoButtonInteraction? inter = null,
+        NadekoInteraction? inter = null,
        bool ephemeral = false)
        => smc.RespondAsync(plainText,
            embed: embed?.Build(),
@@ -69,7 +69,7 @@ public static class SocketMessageComponentExtensions
        string text,
        MessageType type,
        bool ephemeral = false,
-        NadekoButtonInteraction? inter = null)
+        NadekoInteraction? inter = null)
    {
        var builder = eb.Create().WithDescription(text);

--- a/src/NadekoBot/data/aliases.yml
+++ b/src/NadekoBot/data/aliases.yml
@@ -37,7 +37,7 @@ boost:
 boostmsg:
  - boostmsg
 boostdel:
-  - boostdel
+  - boostde
 logserver:
  - logserver
 logignore:
@@ -174,6 +174,14 @@ settopic:
 setchanlname:
  - setchanlname
  - schn
+# thread stuff
+threadcreate:
+  - threadcreate
+  - thcr
+threaddelete:
+  - threaddelete
+  - thdel
+  - thrm
 prune:
  - prune
  - clear
@@ -209,6 +217,9 @@ serverinfo:
 channelinfo:
  - channelinfo
  - cinfo
+roleinfo:
+  - roleinfo
+  - rinfo
 userinfo:
  - userinfo
  - uinfo
@@ -331,6 +342,9 @@ quoteid:
 quotedelete:
  - quotedelete
  - qdel
+quotedeleteauthor:
+  - quotedeleteauthor
+  - qdelauth
 draw:
  - draw
 drawnew:
@@ -374,6 +388,7 @@ award:
  - award
 take:
  - take
+  - seize
 betroll:
  - betroll
  - br
@@ -710,6 +725,13 @@ showemojis:
 emojiadd:
  - emojiadd
  - ea
+emojiremove:
+  - emojiremove
+  - emojirm
+  - er
+  - ed
+  - emojidel
+  - emojidelete
 deckshuffle:
  - deckshuffle
  - dsh
@@ -941,6 +963,10 @@ banmessagetest:
  - banmsgtest
 banmsgreset:
  - banmsgreset
+banprune:
+  - banprune
+timeout:
+  - timeout
 wait:
  - wait
 warnexpire:
@@ -977,7 +1003,10 @@ shopswap:
 shopmove:
  - shopmove
 buy:
+  - shopbuy
  - buy
+shopreq:
+  - shopreq
 gamevoicechannel:
  - gamevoicechannel
  - gvc
@@ -1064,6 +1093,10 @@ xpadd:
  - xpadd
 xpshop:
  - xpshop
+xpshopbuy:
+  - xpshopbuy
+xpshopuse:
+  - xpshopuse
 clubcreate:
  - clubcreate
 clubtransfer:
@@ -1257,6 +1290,11 @@ expradd:
  - exadd
  - exa
  - acr
+expraddserver:
+  - expradds
+  - exadds
+  - exas
+  - expraddserver
 exprlist:
  - exprlist
  - exl
@@ -1274,6 +1312,10 @@ exprdelete:
  - exd
  - exdel
  - dcr
+exprdeleteserver:
+  - exprdelserv
+  - exds
+  - exdelserv
 exprclear:
  - exprclear
  - exc
@@ -1304,6 +1346,7 @@ medusalist:
 medusainfo:
  - medusainfo
  - meinfo
+# Bank stuff
 bankdeposit:
  - deposit
  - d
@@ -1316,6 +1359,11 @@ bankbalance:
  - balance
  - b
  - bal
+banktake:
+  - take
+  - seize
+bankaward:
+  - award
 # Patron
 patron:
  - patron
--- a/src/NadekoBot/data/bot.yml
+++ b/src/NadekoBot/data/bot.yml
@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 3
+version: 4
 # Most commands, when executed, have a small colored line
 # next to the response. The color depends whether the command
 # is completed, errored or in progress (pending)
@@ -18,6 +18,8 @@ defaultLocale: en-US
 # Style in which executed commands will show up in the console.
 # Allowed values: Simple, Normal, None
 consoleOutputType: Normal
+# Whether the bot will check for new releases every hour
+checkForUpdates: true
 # Do you want any messages sent by users in Bot's DM to be forwarded to the owner(s)?
 forwardMessages: false
 # Do you want the message to be forwarded only to the first owner specified in the list of owners (in creds.yml),
--- a/src/NadekoBot/data/images/frame_silver.png
+++ b/src/NadekoBot/data/images/frame_silver.png
--- a/src/NadekoBot/data/strings/commands/commands.en-US.yml
+++ b/src/NadekoBot/data/strings/commands/commands.en-US.yml
@@ -27,7 +27,7 @@ greetdel:
    - "0"
    - "30"
 greet:
-  desc: "Toggles anouncements on the current channel when someone joins the server."
+  desc: "Toggles announcements on the current channel when someone joins the server."
  args:
    - ""
 greetmsg:
@@ -40,7 +40,7 @@ greetmsg:
  args:
    - "Welcome, %user.mention%."
 bye:
-  desc: "Toggles anouncements on the current channel when someone leaves the server."
+  desc: "Toggles announcements on the current channel when someone leaves the server."
  args:
    - ""
 byemsg:
@@ -77,7 +77,7 @@ byetest:
    - ""
    - "@SomeoneElse"
 boost:
-  desc: "Toggles anouncements on the current channel when someone boosts the server."
+  desc: "Toggles announcements on the current channel when someone boosts the server."
  args:
    - ""
 boostmsg:
@@ -197,7 +197,11 @@ iamnot:
  args:
    - "Gamer"
 expradd:
-  desc: "Add an expression with a trigger and a response. Running this command in server requires the Administration permission. Running this command in DM is Bot Owner only and adds a new global expression. Guide here: <https://nadekobot.readthedocs.io/en/latest/custom-reactions/>"
+  desc: "Add an expression with a trigger and a response. Bot will post a response whenever someone types the trigger word.  Running this command in server requires the Administration permission. Running this command in DM is Bot Owner only and adds a new global expression. Guide here: <https://nadekobot.readthedocs.io/en/latest/custom-reactions/>"
+  args:
+    - "\"hello\" Hi there %user.mention%"
+expraddserver:
+  desc: "Add an expression with a trigger and a response in this server. Bot will post a response whenever someone types the trigger word. Guide here: <https://nadekobot.readthedocs.io/en/latest/custom-reactions/>"
  args:
    - "\"hello\" Hi there %user.mention%"
 exprlist:
@@ -213,13 +217,17 @@ exprlist:
    - "1"
    - "all"
 exprshow:
-  desc: "Shows a expression's response on a given ID."
+  desc: "Shows an expression's response on a given ID."
  args:
    - "1"
 exprdelete:
-  desc: "Deletes a expression on a specific index. If ran in DM, it is bot owner only and deletes a global expression. If ran in a server, it requires Administration privileges and removes server expression."
+  desc: "Deletes an expression on a specific index. If ran in DM, it is bot owner only and deletes a global expression. If ran in a server, it requires Administration privileges and removes server expression."
  args:
    - "5"
+exprdeleteserver:
+  desc: "Deletes an expression on a specific index on this server."
+  args:
+    - "5c"
 exprclear:
  desc: "Deletes all expression on this server."
  args:
@@ -312,6 +320,11 @@ kick:
  args:
    - "@Someone Get out!"
    - "\"Some Guy#1234\" Your behaviour is toxic."
+timeout:
+  desc: "Times the user out for the specified amount of time. You may optionally specify a reason, which will be sent to the user."
+  args:
+    - "@Someone 3h Shut up!"
+    - "@Someone 1h30m"
 mute:
  desc: "Mutes a mentioned user both from speaking and chatting. You can also specify time string for how long the user should be muted. You can optionally specify a reason."
  args:
@@ -423,6 +436,10 @@ channelinfo:
  desc: "Shows info about the channel. If no channel is supplied, it defaults to current one."
  args:
    - "#some-channel"
+roleinfo:
+  desc: "Shows info about the specified role."
+  args:
+    - "Gamers"
 userinfo:
  desc: "Shows info about the user. If no user is supplied, it defaults a user running the command."
  args:
@@ -619,6 +636,10 @@ quotedelete:
  desc: "Deletes a quote with the specified ID. You have to either have the Manage Messages permission or be the creator of the quote to delete it."
  args:
    - "123456"
+quotedeleteauthor:
+  desc: "Deletes all quotes by the specified author. If the author is not you, then ManageMessage server permission is required."
+  args:
+    - "@QuoteSpammer"
 draw:
  desc: "Draws a card from this server's deck. You can draw up to 10 cards by supplying a number of cards to draw."
  args:
@@ -776,10 +797,9 @@ linux:
  args:
    - "Spyware Windows"
 next:
-  desc: "Goes to the next song in the queue. You have to be in the same voice channel as the bot. You can skip multiple songs, but in that case songs will not be requeued if {0}rcs or {0}rpl is enabled."
+  desc: "Goes to the next song in the queue. You have to be in the same voice channel as the bot"
  args:
    - ""
-    - "5"
 play:
  desc: "If no parameters are specified, acts as `{0}next 1` command. If you specify a song number, it will jump to that song. If you specify a search query, acts as a `{0}q` command"
  args:
@@ -890,7 +910,7 @@ playlists:
  args:
    - "1"
 playlistshow:
-  desc: "Lists all songs in a playlist spepcified by its id. Paginated, 20 per page."
+  desc: "Lists all songs in a playlist specified by its id. Paginated, 20 per page."
  args:
    - "1"
 deleteplaylist:
@@ -946,7 +966,7 @@ convertlist:
  args:
    - ""
 wowjoke:
-  desc: "Get one of Kwoth's penultimate WoW jokes."
+  desc: "Get one of penultimate WoW jokes."
  args:
    - ""
 calculate:
@@ -976,7 +996,7 @@ pokemonability:
  args:
    - "overgrow"
 memelist:
-  desc: "Shows a list of template keys (and their repspective names) used for `{0}memegen`."
+  desc: "Shows a list of template keys (and their respective names) used for `{0}memegen`."
  args:
    - ""
 memegen:
@@ -1081,7 +1101,7 @@ wiki:
  args:
    - "query"
 color:
-  desc: "Shows you pictures of colors which correspond to the inputed hex values. Max 10."
+  desc: "Shows you pictures of colors which correspond to the inputted hex values. Max 10."
  args:
    - "00ff00"
    - "f00 0f0 00f"
@@ -1217,6 +1237,10 @@ emojiadd:
    - ":someonesCustomEmoji:"
    - "MyEmojiName :someonesCustomEmoji:"
    - "owoNice https://cdn.discordapp.com/emojis/587930873811173386.png?size=128"
+emojiremove:
+  desc: "Removes the specified emoji or emojis from this server."
+  args:
+    - ":eagleWarrior: :plumedArcher:"
 deckshuffle:
  desc: "Reshuffles all cards back into the deck."
  args:
@@ -1664,8 +1688,15 @@ banmsgreset:
  desc: "Resets ban message to default. If you want to completely disable ban messages, use `{0}banmsg -`"
  args:
    - ""
+banprune:
+  desc: |-
+    Sets how many days of messages will be deleted when a user is banned.
+    Only works if the user is banned via the .ban command or punishment.
+    Allowed values: 0 - 7
+  args:
+    - "3"
 wait:
-  desc: "Used only as a startup command. Waits a certain number of miliseconds before continuing the execution of the following startup commands."
+  desc: "Used only as a startup command. Waits a certain number of milliseconds before continuing the execution of the following startup commands."
  args:
    - "3000"
 warnexpire:
@@ -1711,6 +1742,11 @@ shopremove:
  desc: "Removes an item from the shop by its ID."
  args:
    - "1"
+shopreq:
+  desc: "Sets a role which will be required to buy the item on the specified index. Specify only index to remove the requirement."
+  args:
+    - "2 Gamers"
+    - "2"
 shopchangename:
  desc: "Change the name of a shop entry at the specified index. Only works for non-role items"
  args:
@@ -2128,6 +2164,16 @@ xpshop:
    - "bgs"
    - "frames"
    - "bgs 3"
+xpshopbuy:
+  desc: "Buy an item from the xp shop by specifying the type and the key of the item."
+  args:
+    - "bg open_sea"
+    - "fr gold"
+xpshopuse:
+  desc: "Use a previously purchased item from the xp shop by specifying the type and the key of the item."
+  args:
+    - "bg synth"
+    - "fr default"
 bible:
  desc: "Shows bible verse. You need to supply book name and chapter:verse"
  args:
@@ -2227,6 +2273,14 @@ bankbalance:
  desc: "Shows your current bank balance available for withdrawal."
  args:
    - ""
+banktake:
+  desc: "Takes the specified amount of currency from a user's bank"
+  args:
+    - "500 @MoniLaunder"
+bankaward:
+  desc: "Award the specified amount of currency to a user's bank"
+  args:
+    - "99999 @Bestie"
 patron:
  desc: "Check your patronage status and command usage quota. Bot owners can check targeted user's patronage status."
  args:
@@ -2268,3 +2322,11 @@ bettest:
    - ""
    - "betflip 1000"
    - "slot 2000"
+threadcreate:
+  desc: "Create a public thread with the specified title. You may optionally reply to a message to have it as a starting point."
+  args:
+    - "Q&A"
+threaddelete:
+  desc: "Delete a thread with the specified name in this channel. Case insensitive."
+  args:
+    - "Q&A"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kwoth	3fc53b0609	Upped version to 4.3.7, updated changelog	2022-09-14 02:46:03 +02:00
Kwoth	62ec2241e4	Added pagination to .reroli	2022-09-14 02:44:31 +02:00
Kwoth	75f8254a8e	Removed currencies from units.json as they're pulled from api	2022-09-13 21:50:48 +02:00
Kwoth	f23ffe0c67	Added .shopreq - Shop items can now have a role requirement in order to purchase. Added .shopbuy alias for .buy	2022-09-13 21:33:20 +02:00
Kwoth	d1a818542c	Split stream deleter service into a separate file, there will no longer be a viewer count when the stream comes online, as it will (almost?) always show 0	2022-09-12 01:22:58 +02:00
Kwoth	15f67e3a51	more typos	2022-09-11 22:49:46 +02:00
Kwoth	412f346ac8	Fixed some typos in commands.en-US.yml	2022-09-10 22:53:03 +02:00
Kwoth	8107a80c4c	Added .exds to complement .exas	2022-09-09 21:02:16 +02:00
Kwoth	f1c7d7437a	Upped version to 4.3.6, Updated CHANGELOG.md	2022-09-08 20:41:06 +02:00
Kwoth	9a013db25f	Removed some unused usings	2022-09-04 12:19:15 +02:00
Kwoth	6f75161c80	Added .expraddserver (.exas) which will server as a server-only alternative to '.exa' in case users want to override default Admin permissions with .dpo	2022-09-03 17:21:38 +02:00
Kwoth	3f56e5b651	Merge branch 'v4' of https://gitlab.com/kwoth/nadekobot into v4	2022-09-03 10:28:46 +02:00
Kwoth	4875abbe86	Fake joined at for karney on nadeko server	2022-09-03 10:28:38 +02:00
Kwoth	83863f3a6c	Update responses.uk-UA.json (POEditor.com)	2022-09-02 12:27:52 +00:00
Kwoth	f07abad1ec	Update responses.es-ES.json (POEditor.com)	2022-09-02 12:27:51 +00:00
Kwoth	b6909a4120	Update responses.ru-RU.json (POEditor.com)	2022-09-02 12:27:49 +00:00
Kwoth	aaf7f04216	Update responses.pt-BR.json (POEditor.com)	2022-09-02 12:27:48 +00:00
Kwoth	628871b0da	Update responses.pl-PL.json (POEditor.com)	2022-09-02 12:27:47 +00:00
Kwoth	a50ad09c8d	Update responses.it-IT.json (POEditor.com)	2022-09-02 12:27:46 +00:00
Kwoth	1358ff50a4	Update responses.id-ID.json (POEditor.com)	2022-09-02 12:27:44 +00:00
Kwoth	ee9fede3b1	Update responses.de-DE.json (POEditor.com)	2022-09-02 12:27:43 +00:00
Kwoth	1d7e9e8471	Update responses.fr-FR.json (POEditor.com)	2022-09-02 12:27:42 +00:00
Kwoth	d2fe7f8d11	Update responses.nl-NL.json (POEditor.com)	2022-09-02 12:27:40 +00:00
Kwoth	75958efe17	Update responses.zh-TW.json (POEditor.com)	2022-09-02 12:27:39 +00:00
Kwoth	7746d2aca1	Update responses.zh-CN.json (POEditor.com)	2022-09-02 12:27:38 +00:00
Kwoth	e631df3326	Update responses.ar.json (POEditor.com)	2022-09-02 12:27:36 +00:00
Kwoth	ba44fdb55f	Reminders can now be embeds. But you won't be able to set plaintext	2022-08-31 20:37:58 +02:00
Kwoth	59a1e56dad	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. Also updated .next usage string.	2022-08-31 17:47:19 +02:00
Kwoth	cd6fe46c2b	More user friendly error when parsing of a number fails.	2022-08-31 13:40:41 +02:00
Kwoth	fb4f470b44	Added .qdelauth - Delete all quotes by the specified author on this server. If you target yourself - no permission required	2022-08-30 15:46:10 +02:00
Kwoth	b69e25edf4	Added .timeout command	2022-08-28 16:16:24 +02:00
Kwoth	9eae27bc15	Added an option to award currency based on received xp	2022-08-26 13:41:30 +02:00
Kwoth	bed36f8784	Fixed compilation warning (no functional change)	2022-08-24 17:31:21 +02:00
Kwoth	623f5ccd5e	Merge branch 'v4' of https://gitlab.com/kwoth/nadekobot into v4	2022-08-24 09:20:40 +02:00
Kwoth	6da8201c2d	Awarded xp is now correctly used in level up calculations, closes #376	2022-08-24 09:18:22 +02:00
Kwoth	d1c24d4721	Merge branch 'hokutochen-v4-patch-63590' into 'v4' corrected swapped instructions See merge request Kwoth/nadekobot!266	2022-08-23 01:11:50 +00:00
Hokuto Chen	7e5055268a	corrected swapped instructions	2022-08-23 01:11:50 +00:00
Kwoth	e84e33b94f	Merge branch 'hokutochen-v4-patch-01854' into 'v4' Update creds-guide.md See merge request Kwoth/nadekobot!265	2022-08-21 19:19:40 +00:00
Hokuto Chen	f21c96bdf4	Update creds-guide.md	2022-08-21 10:37:29 +00:00
Kwoth	430daf9b19	Merge branch 'hokutochen-v4-patch-16720' into 'v4' added auto restart option in docs See merge request Kwoth/nadekobot!264	2022-08-17 20:16:16 +00:00
Kwoth	7c8756096d	Upped version to 4.3.5	2022-08-17 22:10:07 +02:00
Kwoth	7d9e456fe5	Fixed .xpshopbuy having mixed up arguments for frames and bgs	2022-08-17 22:02:36 +02:00
Hokuto Chen	948db31384	added auto restart option in docs	2022-08-15 05:47:48 +00:00
Kwoth	df1a775fec	Revert "Reverted club xp updates, and non-opt in xp system as it's causing db locking" This reverts commit `6c169e057b`.	2022-08-14 23:35:13 +02:00
Kwoth	6c169e057b	Reverted club xp updates, and non-opt in xp system as it's causing db locking	2022-08-14 22:45:14 +02:00
Kwoth	b164da38e3	Added .roleinfo commands, added the ability to show colors other than ok error and pending to IEmbedBuilder	2022-08-11 17:04:51 +02:00
Kwoth	dc229ea2b3	Added Timeout as a punishment to warnpunish and anti* commands	2022-08-11 16:19:02 +02:00
Kwoth	b853495d65	Added .emojiremove command	2022-08-11 16:05:00 +02:00
Kwoth	0ff02cede9	Added .emojiremove	2022-08-11 15:56:07 +02:00
Kwoth	f7e0e635e6	Added .threadcreate and .threaddelete commadns which create and delete public threads	2022-08-11 15:42:37 +02:00
Kwoth	a065189023	Fixed .bank take, added .bank seize alias. Added .bank award	2022-08-11 15:14:08 +02:00
Kwoth	1affeb0683	Update responses.de-DE.json (POEditor.com)	2022-08-11 12:43:54 +00:00
Kwoth	6b3c9f01ca	Update responses.fr-FR.json (POEditor.com)	2022-08-11 12:43:53 +00:00
Kwoth	e9eb6ff2ad	Added '.bank take' owner only command	2022-08-11 14:39:44 +02:00
Kwoth	0170536d1c	Guild XP is no longer opt-in. Only global xp	2022-08-11 13:54:20 +02:00
Kwoth	c65e769128	Removed Badges from README.md	2022-08-11 11:00:22 +00:00
Kwoth	998779203a	Fixed users not gaining club xp	2022-08-10 12:31:52 +02:00
Kwoth	e0e4d697c3	Added pull again button to slot, fixed a double 'you don't have enough' message	2022-08-09 23:15:27 +02:00
Kwoth	e9c7293014	Running .timely command too early will now show a pending color, not an error color	2022-08-09 22:43:22 +02:00
Kwoth	cf876a4148	removed obsolete xp database columns	2022-08-08 17:36:39 +02:00
Kwoth	6b9a858f28	Added Use button on sucessful .xpshopbuy or when a user already owns the item	2022-08-08 16:17:30 +02:00
Kwoth	38e3badb87	Greatly unboilerplated and simplified nadeko interaction button construction	2022-08-07 17:00:36 +02:00
Kwoth	13d2fbd560	Fixed VoiceXP bug, closes #374 . Upped version to 4.3.4, Updated changelog	2022-08-07 13:08:07 +02:00
Kwoth	8d3f2f186a	Merge branch 'v4' of https://gitlab.com/kwoth/nadekobot into v4	2022-08-06 17:57:32 +02:00
Kwoth	9572b9dc43	Updated changelog.md	2022-08-06 17:56:53 +02:00
Kwoth	ca32086089	Updated changelog.md	2022-08-06 17:56:14 +02:00
Kwoth	57f839dbcd	Added client id 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	2022-08-06 17:47:24 +02:00
Kwoth	71d6eeb9dd	Possibly fixed #375 trivia bug	2022-08-06 17:28:31 +02:00
Kwoth	8c51cf8537	Added .xpshopbuy and .xpshopuse convenience commands	2022-08-06 13:26:41 +02:00
Kwoth	b683026cf3	Owner should also be able to buy items from the xp shop	2022-08-01 21:14:28 +02:00
Kwoth	bca2bc5af1	Fixed awarded amount position on the xp card	2022-08-01 20:59:35 +02:00
Kwoth	b385a83bdd	Updated position of the username and club in the .xp image	2022-08-01 17:46:41 +02:00
Kwoth	3bf0286c81	Feature limit should have IsPatronLimit enabled	2022-08-01 16:08:23 +02:00
Kwoth	98272f66e7	Made improvements to the XP card text visibility with other backgrounds	2022-08-01 12:01:01 +02:00
Kwoth	cf3788c6ea	Added an optional preview url to the xp shop items	2022-08-01 10:53:59 +02:00
Kwoth	4b3fc53cb6	Updated changelog	2022-07-31 21:31:29 +02:00
Kwoth	4e17dca856	Merge branch 'v4' of https://gitlab.com/kwoth/nadekobot into v4	2022-07-31 21:26:46 +02:00
Kwoth	82d89148f3	Added betroll bettest, fixed a bug which caused betroll to have very low payout	2022-07-31 21:26:34 +02:00
Kwoth	cc4c09b4d7	Merge branch 'hokutochen-v4-patch-85503' into 'v4' updated redis requirement for release See merge request Kwoth/nadekobot!262	2022-07-30 10:37:29 +00:00
Kwoth	616f01f8b2	Make sure broken youtube-dl didn't cache invalid data, closes #373	2022-07-30 10:29:33 +02:00
Hokuto Chen	56f89a02bc	updated redis requirement for release	2022-07-30 07:32:30 +00:00
Kwoth	48ce988d20	Fixed a mistake in CHANGELOG.md	2022-07-29 19:53:45 +02:00
Kwoth	119b1cdec2	Changelog fixed	2022-07-29 18:38:54 +02:00