Updated changelog.md

Cmdcd and cleanup

See merge request Kwoth/nadekobot!269

CHANGELOG.md

@@ -4,6 +4,87 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.
 
 ## Unreleased
 
+## [4.3.8] - 02.10.2022
+
+### Added
+
+- Added `.autopublish` command which will automatically publish messages posted in the channel.
+- Added `--after <messageid>` option to prune which will make prune only delete messages after the specified message id.
+
+### Changed
+
+- `.prune` options `--after` and `--safe` are now proper command options, and will show in .h help
+- `.cmdcd` code mostly rewritten, slight QoL improvements.
+- Clarified `.remind` permission requirements in help text
+- `.cmdcds` looks a little better, and is paginated
+
+### Fixed
+
+- Fixed trivia bugs
+- Fixed `.yun` not working with channels with underscore in the name
+
+## [4.3.7] - 14.09.2022
+
+### Added
+
+- Added `.exprdelserv` (.exds) to completement .exas. Deletes an expression on the current server and is susceptible to .dpo, unlike .exd
+- Added `.shopreq` which lets you set role requirement for specific shop items
+- Added `.shopbuy` alias to `.buy`
+
+### Fixed
+
+- Fixed `.convertlist` showing currencies twice (this may not apply to existing users and it may require you to manually remove all currencies from units.json)
+
+### Removed
+
+- Removed `Viewer` field from stream online notification as it is (almost?) always 0.
+
+## [4.3.6] - 08.09.2022
+
+### Added
+
+- Added `.expraddserver` (.exas) which will server as a server-only alternative to '.exa' in case users want to override default Admin permissions with .dpo
+- Added .banprune command which sets how many days worth of messages will be pruned when bot (soft)bans a person either through a command or another punishment feature.
+- Added .qdelauth - Delete all quotes by the specified author on this server. If you target yourself - no permission required
+- Added `.timeout` command
+- Added an option to award currency based on received xp
+
+### Changed
+
+- Reminders now have embed support, but plaintext field is not supported.
+- User friendlier errors when parsing a number in a command fails
+
+### Fixed
+
+- Awarded xp is now correctly used in level up calculations
+
+## [4.3.5] - 17.08.2022
+
+### 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
@@ -15,7 +96,7 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.
 ### Changed
 
 - Updated position of Username and Club name on the .xp card
-- Improved text visibility on the .xp card 
+- Improved text visibility on the .xp card
 
 ### Fixed
 
@@ -88,7 +169,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.
@@ -143,14 +224,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
@@ -310,7 +391,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
 
@@ -330,19 +411,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] 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] RewardedUsers table slightly changed to make it more general
-- [dev] renamed `// todo`s which aren't planned soon to `// FUTURE`  
+- [dev] renamed `// todo`s which aren't planned soon to `// FUTURE`
-- [dev] currency rewards have been reimplemented and moved to a separate service  
+- [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] Fixed a bug in .gencmdlist
-- [dev] small fixes to creds provider  
+- [dev] small fixes to creds provider
 
 ### Removed
 
@@ -375,7 +456,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)
@@ -388,18 +469,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 
+- Reaction roles rewritten completely
-  - Supports multiple exclusivity groups per message 
+  - 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`
@@ -430,7 +511,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
@@ -466,7 +547,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
 
@@ -492,20 +573,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) 
+  - 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. 
+  - 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
@@ -522,8 +603,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] Reorganized module and submodule folders
-- [dev] Permissionv2 db table renamed to Permissions 
+- [dev] Permissionv2 db table renamed to Permissions
 - [dev] Moved FilterWordsChannelId to a separate table
 
 ### Fixed
@@ -538,9 +619,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 `.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 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 some obsolete commands and strings
 - Removed code which migrated 2.x to v3 credentials, settings, etc...
 
 ## [3.0.13] - 14.01.2022
@@ -579,7 +660,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
@@ -593,7 +674,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
@@ -603,7 +684,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:
@@ -617,7 +698,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
 
@@ -642,10 +723,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
@@ -686,7 +767,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
@@ -747,7 +828,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
@@ -768,7 +849,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
@@ -839,7 +920,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
@@ -872,7 +953,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
@@ -892,7 +973,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
 
@@ -907,7 +988,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
@@ -923,8 +1004,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` 
+- 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) 
+  - ⚠️ **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

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/)  

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:
+OwnerIds:
-        - 105635576866156544
+  - 105635576866156544
 ```
 
 For multiple owners, it should look like this:
 
 ```yml
-    OwnerIds:
+OwnerIds:
-        - 105635123466156544
+  - 105635123466156544
-        - 145521851676884992
+  - 145521851676884992
-        - 341420590009417729
+  - 341420590009417729
 ```
 
 

docs/guides/linux-guide.md

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

src/Nadeko.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();

src/Nadeko.Medusa/IEmbedBuilder.cs

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

src/Nadeko.Medusa/Nadeko.Medusa.csproj

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

src/NadekoBot/Bot.cs

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

src/NadekoBot/Common/Interaction/INadekoInteractionService.cs

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

src/NadekoBot/Common/Interaction/NadekoActionInteraction.cs

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

src/NadekoBot/Common/Interaction/NadekoInteraction.cs

@@ -1,25 +1,30 @@
 namespace NadekoBot;
 
-public abstract class NadekoButtonInteraction
+public sealed class NadekoInteraction
 {
-    // improvements:
+    private readonly ulong _authorId;
-    //  - state in OnAction
+    private readonly ButtonBuilder _button;
-    //  - configurable delay
+    private readonly Func<SocketMessageComponent, Task> _onClick;
-    //  - 
+    private readonly bool _onlyAuthor;
-    protected abstract string Name { get; }
-    protected abstract IEmote Emote { get; }
-    protected virtual string? Text { get; } = null;
-
     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 Task OnInteraction(SocketInteraction arg)
-    private async 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)
+        if (_onlyAuthor && smc.User.Id != _authorId)
-            return;
+            return Task.CompletedTask;
 
-        if (!await Validate(smc))
+        if (smc.Data.CustomId != _button.CustomId)
-        {
+            return Task.CompletedTask;
-            await smc.DeferAsync();
-            return;
-        }
 
         _ = 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()
+    public Task ExecuteOnActionAsync(SocketMessageComponent smc)
-        => new ButtonBuilder(style: ButtonStyle.Secondary, emote: Emote, customId: Name, label: Text);
+        => _onClick(smc);
-
+}
-    public abstract Task ExecuteOnActionAsync(SocketMessageComponent smc);
-}
-
-// this is all so wrong ...

src/NadekoBot/Common/Interaction/NadekoInteractionArray.cs

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

src/NadekoBot/Common/Interaction/NadekoInteractionBuilder.cs

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

src/NadekoBot/Common/Interaction/NadekoInteractionService.cs

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

src/NadekoBot/Common/Interaction/NadekoOwnInteraction.cs

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

src/NadekoBot/Common/NInteraction.cs

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

src/NadekoBot/Common/NadekoModule.cs

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

src/NadekoBot/Common/TypeReaders/GuildUserTypeReader.cs

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

src/NadekoBot/Db/Extensions/CurrencyTransactionExtensions.cs

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

src/NadekoBot/Db/Models/AntiProtection.cs

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

src/NadekoBot/Db/Models/AutoPublishChannel.cs

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

src/NadekoBot/Db/Models/BanTemplate.cs

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

src/NadekoBot/Db/Models/DiscordUser.cs

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

src/NadekoBot/Db/Models/ShopEntry.cs

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

src/NadekoBot/Db/Models/UserXpStats.cs

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

src/NadekoBot/Db/Models/XpShopOwnedItem.cs

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

src/NadekoBot/Db/MysqlContext.cs

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

src/NadekoBot/Db/NadekoContext.cs

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

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")
     {

src/NadekoBot/Db/SqliteContext.cs

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

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

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

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

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

src/NadekoBot/Migrations/MySql/MysqlContextModelSnapshot.cs

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

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

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

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

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

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

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

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

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

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

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

src/NadekoBot/Migrations/Postgresql/PostgreSqlContextModelSnapshot.cs

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

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

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

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

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

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

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

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

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

src/NadekoBot/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs

@@ -17,6 +17,29 @@ namespace NadekoBot.Migrations
 #pragma warning disable 612, 618
             modelBuilder.HasAnnotation("ProductVersion", "6.0.7");
 
+            modelBuilder.Entity("NadekoBot.Db.Models.AutoPublishChannel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<ulong>("ChannelId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<ulong>("GuildId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GuildId")
+                        .IsUnique();
+
+                    b.ToTable("AutoPublishChannel");
+                });
+
             modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b =>
                 {
                     b.Property<int>("Id")
@@ -134,16 +157,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 +552,9 @@ namespace NadekoBot.Migrations
                     b.Property<ulong>("GuildId")
                         .HasColumnType("INTEGER");
 
+                    b.Property<int?>("PruneDays")
+                        .HasColumnType("INTEGER");
+
                     b.Property<string>("Text")
                         .HasColumnType("TEXT");
 
@@ -1752,6 +1768,9 @@ namespace NadekoBot.Migrations
                     b.Property<string>("RoleName")
                         .HasColumnType("TEXT");
 
+                    b.Property<ulong?>("RoleRequirement")
+                        .HasColumnType("INTEGER");
+
                     b.Property<int>("Type")
                         .HasColumnType("INTEGER");
 
@@ -2003,11 +2022,6 @@ namespace NadekoBot.Migrations
                     b.Property<ulong>("GuildId")
                         .HasColumnType("INTEGER");
 
-                    b.Property<DateTime>("LastLevelUp")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT")
-                        .HasDefaultValueSql("datetime('now')");
-
                     b.Property<int>("NotifyOnLevelUp")
                         .HasColumnType("INTEGER");
 

src/NadekoBot/Modules/Administration/Administration.cs

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

src/NadekoBot/Modules/Administration/AdministrationService.cs

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

src/NadekoBot/Modules/Administration/AutoPublishService.cs

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

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

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

src/NadekoBot/Modules/Administration/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")),

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

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

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

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

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

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

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

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

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

@@ -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()
                                        {

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

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

src/NadekoBot/Modules/CustomReactions/NadekoExpressions.cs

@@ -1,7 +1,5 @@
 #nullable disable
 
-using Nadeko.Common;
-
 namespace NadekoBot.Modules.NadekoExpressions;
 
 [Name("Expressions")]
@@ -25,15 +23,10 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
         => (ctx.Guild is null && _creds.IsOwner(ctx.User))
            || (ctx.Guild is not null && ((IGuildUser)ctx.User).GuildPermissions.Administrator);
 
-    [Cmd]
+    private async Task ExprAddInternalAsync(string key, string message)
-    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;
         }
 
@@ -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 ExprDeleteInternalAsync(kwum id)
-    public async Task ExprDelete(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();
     }
-}
+}

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);
     }
 }

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

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

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

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

src/NadekoBot/Modules/Gambling/CashInteraction.cs

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

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

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

src/NadekoBot/Modules/Gambling/Gambling.cs

@@ -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(
+        var tt = TimestampTag.FromDateTime(when, TimestampTagStyles.Relative);
-            [NotNull] DiscordSocketClient client,
-            ulong userId,
-            [NotNull] Func<SocketMessageComponent, Task> action)
-            : base(client, userId, action)
-        {
-        }
 
-        protected override NadekoInteractionData Data
+        await _remind.AddReminderAsync(ctx.User.Id,
-            => new NadekoInteractionData(
+            ctx.User.Id,
-                Emote: Emoji.Parse("⏰"),
+            ctx.Guild.Id,
-                CustomId: "timely:remind_me",
+            true,
-                Text: "Remind me"
+            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,
+        var inter = _inter
-            ctx.User.Id,
+            .Create(ctx.User.Id,
-            RemindTimelyAction(DateTime.UtcNow.Add(TimeSpan.FromHours(period))));
+                new SimpleInteraction<DateTime>(
-        
+                    new ButtonBuilder(
-        await ReplyConfirmLocalizedAsync(strs.timely(N(val), period), inter.GetInteraction());
+                        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]
@@ -262,7 +249,7 @@ public partial class Gambling : GamblingModule<GamblingService>
         List<CurrencyTransaction> trs;
         await using (var uow = _db.GetDbContext())
         {
-            trs = uow.CurrencyTransactions.GetPageFor(userId, page);
+            trs = await uow.CurrencyTransactions.GetPageFor(userId, page);
         }
 
         var embed = _eb.Create()
@@ -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()
+    private NadekoInteraction CreateCashInteraction()
-        => new CashInteraction(_client, ctx.User.Id, BankAction).GetInteraction();
+        => _inter.Create<object>(ctx.User.Id,
+            new(new(
+                    customId: "cash:bank_show_balance", 
+                    emote: new Emoji("🏦")),
+                BankAction));
 
     [Cmd]
     [Priority(1)]

src/NadekoBot/Modules/Gambling/GamblingConfig.cs

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,5 @@
 using System.Threading.Channels;
+using Exception = System.Exception;
 
 namespace NadekoBot.Modules.Games.Common.Trivia;
 
@@ -64,7 +65,6 @@ public sealed class TriviaGame
                 if (errorCount >= 5)
                 {
                     Log.Warning("Trivia errored 5 times and will quit");
-                    await OnEnded(this);
                     break;
                 }
 
@@ -80,7 +80,7 @@ public sealed class TriviaGame
 
                 var maybeQuestion = await _questionPool.GetQuestionAsync();
 
-                if (!(maybeQuestion is TriviaQuestion question))
+                if (maybeQuestion is not { } question)
                 {
                     // if question is null (ran out of question, or other bugg ) - stop
                     break;
@@ -110,7 +110,8 @@ public sealed class TriviaGame
                 var guessed = false;
                 while (true)
                 {
-                    var readTask = _inputs.Reader.ReadAsync().AsTask();
+                    using var readCancel = new CancellationTokenSource();
+                    var readTask = _inputs.Reader.ReadAsync(readCancel.Token).AsTask();
 
                     // wait for either someone to attempt to guess
                     // or for timeout
@@ -119,6 +120,8 @@ public sealed class TriviaGame
                     // if the task which completed is the timeout task
                     if (task == halfGuessTimerTask)
                     {
+                        readCancel.Cancel();
+                        
                         // if hint is already sent, means time expired
                         // break (end the round)
                         if (hintSent)
@@ -130,7 +133,7 @@ public sealed class TriviaGame
                         halfGuessTimerTask = TimeOutFactory();
                         // send a hint out
                         await OnHint(this, question);
-
+                        
                         continue;
                     }
 
@@ -147,6 +150,7 @@ public sealed class TriviaGame
 
                         // reset inactivity counter
                         inactivity = 0;
+                        errorCount = 0;
 
                         var isWin = false;
                         // if user won the game, tell the game to stop
@@ -174,9 +178,9 @@ public sealed class TriviaGame
                 }
             }
         }
-        catch
+        catch (Exception ex)
         {
-
+            Log.Error(ex, "Fatal error in trivia game: {ErrorMessage}", ex.Message);
         }
         finally
         {

src/NadekoBot/Modules/Help/Help.cs

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

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

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

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

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

src/NadekoBot/Modules/Music/Music.cs

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

src/NadekoBot/Modules/Permissions/CommandCooldown/CmdCdService.cs

@@ -1,68 +1,119 @@
 #nullable disable
 using NadekoBot.Common.ModuleBehaviors;
-using NadekoBot.Services.Database.Models;
 
 namespace NadekoBot.Modules.Permissions.Services;
 
-public class CmdCdService : IExecPreCommand, INService
+public sealed class CmdCdService : IExecPreCommand, IReadyExecutor, INService
 {
-    public ConcurrentDictionary<ulong, ConcurrentHashSet<CommandCooldown>> CommandCooldowns { get; }
+    private readonly ConcurrentDictionary<ulong, ConcurrentDictionary<string, int>> _settings = new();
-    public ConcurrentDictionary<ulong, ConcurrentHashSet<ActiveCooldown>> ActiveCooldowns { get; } = new();
 
-    public int Priority { get; } = 0;
+    private readonly ConcurrentDictionary<(ulong, string), ConcurrentDictionary<ulong, DateTime>> _activeCooldowns =
+        new();
+
+    public int Priority => 0;
 
     public CmdCdService(Bot bot)
-        => CommandCooldowns = new(bot.AllGuildConfigs.ToDictionary(k => k.GuildId,
-            v => new ConcurrentHashSet<CommandCooldown>(v.CommandCooldowns)));
-
-    public Task<bool> TryBlock(IGuild guild, IUser user, string commandName)
     {
-        if (guild is null)
+        _settings = bot
-            return Task.FromResult(false);
+            .AllGuildConfigs
+            .ToDictionary(x => x.GuildId, x => x.CommandCooldowns
+                .ToDictionary(c => c.CommandName, c => c.Seconds)
+                .ToConcurrent())
+            .ToConcurrent();
+    }
 
-        var cmdcds = CommandCooldowns.GetOrAdd(guild.Id, new ConcurrentHashSet<CommandCooldown>());
+    public Task<bool> ExecPreCommandAsync(ICommandContext context, string moduleName, CommandInfo command)
-        CommandCooldown cdRule;
+        => TryBlock(context.Guild, context.User, command.Name.ToLowerInvariant());
-        if ((cdRule = cmdcds.FirstOrDefault(cc => cc.CommandName == commandName)) is not null)
+
+    public async Task<bool> TryBlock(IGuild guild, IUser user, string commandName)
+    {
+        if (!_settings.TryGetValue(guild.Id, out var cooldownSettings))
+            return false;
+
+        if (!cooldownSettings.TryGetValue(commandName, out var cdSeconds))
+            return false;
+
+        var cooldowns = _activeCooldowns.GetOrAdd(
+            (guild.Id, commandName),
+            static _ => new());
+
+        // if user is not already on cooldown, add 
+        if (cooldowns.TryAdd(user.Id, DateTime.UtcNow))
         {
-            var activeCdsForGuild = ActiveCooldowns.GetOrAdd(guild.Id, new ConcurrentHashSet<ActiveCooldown>());
+            return false;
-            if (activeCdsForGuild.FirstOrDefault(ac => ac.UserId == user.Id && ac.Command == commandName) is not null)
-                return Task.FromResult(true);
-
-            activeCdsForGuild.Add(new()
-            {
-                UserId = user.Id,
-                Command = commandName
-            });
-
-            _ = Task.Run(async () =>
-            {
-                try
-                {
-                    await Task.Delay(cdRule.Seconds * 1000);
-                    activeCdsForGuild.RemoveWhere(ac => ac.Command == commandName && ac.UserId == user.Id);
-                }
-                catch
-                {
-                    // ignored
-                }
-            });
         }
 
-        return Task.FromResult(false);
+        // if there is an entry, maybe it expired. Try to check if it expired and don't fail if it did
+        // - just update
+        if (cooldowns.TryGetValue(user.Id, out var oldValue))
+        {
+            var diff = DateTime.UtcNow - oldValue;
+            if (diff.Seconds > cdSeconds)
+            {
+                if (cooldowns.TryUpdate(user.Id, DateTime.UtcNow, oldValue))
+                    return false;
+            }
+        }
+
+        return true;
     }
 
-    public Task<bool> ExecPreCommandAsync(ICommandContext ctx, string moduleName, CommandInfo command)
+    public async Task OnReadyAsync()
     {
-        var guild = ctx.Guild;
+        using var timer = new PeriodicTimer(TimeSpan.FromHours(1));
-        var user = ctx.User;
-        var commandName = command.Name.ToLowerInvariant();
 
-        return TryBlock(guild, user, commandName);
+        while (await timer.WaitForNextTickAsync())
+        {
+            var now = DateTime.UtcNow;
+            // once per hour delete expired entries
+            foreach (var ((guildId, commandName), dict) in _activeCooldowns)
+            {
+                // if this pair no longer has associated config, that means it has been removed.
+                // remove all cooldowns
+                if (!_settings.TryGetValue(guildId, out var inner)
+                    || !inner.TryGetValue(commandName, out var cdSeconds))
+                {
+                    _activeCooldowns.Remove((guildId, commandName), out _);
+                    continue;
+                }
+                
+                Cleanup(dict, cdSeconds);
+            }
+        }
     }
-}
 
-public class ActiveCooldown
+    private void Cleanup(ConcurrentDictionary<ulong, DateTime> dict, int cdSeconds)
-{
+    {
-    public string Command { get; set; }
+        var now = DateTime.UtcNow;
-    public ulong UserId { get; set; }
+        foreach (var (key, _) in dict.Where(x => (now - x.Value).Seconds > cdSeconds).ToArray())
+        {
+            dict.TryRemove(key, out _);
+        }
+    }
+
+    public void ClearCooldowns(ulong guildId, string cmdName)
+    {
+        if (_settings.TryGetValue(guildId, out var dict))
+            dict.TryRemove(cmdName, out _);
+
+        _activeCooldowns.TryRemove((guildId, cmdName), out _);
+    }
+
+    public void AddCooldown(ulong guildId, string name, int secs)
+    {
+        var sett = _settings.GetOrAdd(guildId, static _ => new());
+        sett[name] = secs;
+
+        // force cleanup 
+        if (_activeCooldowns.TryGetValue((guildId, name), out var dict))
+            Cleanup(dict, secs);
+    }
+
+    public IReadOnlyCollection<(string CommandName, int Seconds)> GetCommandCooldowns(ulong guildId)
+    {
+        if (!_settings.TryGetValue(guildId, out var dict))
+            return Array.Empty<(string, int)>();
+
+        return dict.Select(x => (x.Key, x.Value)).ToArray();
+    }
 }

src/NadekoBot/Modules/Permissions/CommandCooldown/CmdCdsCommands.cs

@@ -1,4 +1,5 @@
 #nullable disable
+using Humanizer.Localisation;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.TypeReaders;
 using NadekoBot.Db;
@@ -12,12 +13,6 @@ public partial class Permissions
     [Group]
     public partial class CmdCdsCommands : NadekoModule
     {
-        private ConcurrentDictionary<ulong, ConcurrentHashSet<CommandCooldown>> CommandCooldowns
-            => _service.CommandCooldowns;
-
-        private ConcurrentDictionary<ulong, ConcurrentHashSet<ActiveCooldown>> ActiveCooldowns
-            => _service.ActiveCooldowns;
-
         private readonly DbService _db;
         private readonly CmdCdService _service;
 
@@ -40,12 +35,10 @@ public partial class Permissions
             await using (var uow = _db.GetDbContext())
             {
                 var config = uow.GuildConfigsForId(channel.Guild.Id, set => set.Include(gc => gc.CommandCooldowns));
-                var localSet = CommandCooldowns.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet<CommandCooldown>());
 
                 var toDelete = config.CommandCooldowns.FirstOrDefault(cc => cc.CommandName == name);
                 if (toDelete is not null)
                     uow.Set<CommandCooldown>().Remove(toDelete);
-                localSet.RemoveWhere(cc => cc.CommandName == name);
                 if (secs != 0)
                 {
                     var cc = new CommandCooldown
@@ -54,7 +47,7 @@ public partial class Permissions
                         Seconds = secs
                     };
                     config.CommandCooldowns.Add(cc);
-                    localSet.Add(cc);
+                    _service.AddCooldown(channel.Guild.Id, name, secs);
                 }
 
                 await uow.SaveChangesAsync();
@@ -62,8 +55,7 @@ public partial class Permissions
 
             if (secs == 0)
             {
-                var activeCds = ActiveCooldowns.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet<ActiveCooldown>());
+                _service.ClearCooldowns(ctx.Guild.Id, cmdName);
-                activeCds.RemoveWhere(ac => ac.Command == name);
                 await ReplyConfirmLocalizedAsync(strs.cmdcd_cleared(Format.Bold(name)));
             }
             else
@@ -84,19 +76,29 @@ public partial class Permissions
 
         [Cmd]
         [RequireContext(ContextType.Guild)]
-        public async Task AllCmdCooldowns()
+        public async Task AllCmdCooldowns(int page = 1)
         {
+            if (--page < 0)
+                return;
+            
             var channel = (ITextChannel)ctx.Channel;
-            var localSet = CommandCooldowns.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet<CommandCooldown>());
+            var localSet = _service.GetCommandCooldowns(ctx.Guild.Id);
 
             if (!localSet.Any())
                 await ReplyConfirmLocalizedAsync(strs.cmdcd_none);
             else
             {
-                await channel.SendTableAsync("",
+                await ctx.SendPaginatedConfirmAsync(page, curPage =>
-                    localSet.Select(c => c.CommandName + ": " + c.Seconds + GetText(strs.sec)),
+                {
-                    s => $"{s,-30}",
+                    var items = localSet.Skip(curPage * 15)
-                    2);
+                        .Take(15)
+                        .Select(x => $"{Format.Code(x.CommandName)}: {x.Seconds.Seconds().Humanize(maxUnit: TimeUnit.Second, culture: Culture)}");
+
+                    return _eb.Create(ctx)
+                        .WithOkColor()
+                        .WithDescription(items.Join("\n"));
+
+                }, localSet.Count, 15);
             }
         }
     }

src/NadekoBot/Modules/Searches/Feeds/FeedCommands.cs

@@ -11,7 +11,7 @@ public partial class Searches
     public partial class FeedCommands : NadekoModule<FeedsService>
     {
         private static readonly Regex _ytChannelRegex =
-            new(@"youtube\.com\/(?:c\/|channel\/|user\/)?(?<channelid>[a-zA-Z0-9\-]{1,})");
+            new(@"youtube\.com\/(?:c\/|channel\/|user\/)?(?<channelid>[a-zA-Z0-9\-_]{1,})");
 
         [Cmd]
         [RequireContext(ContextType.Guild)]

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.status), status.IsLive ? "🟢 Online" : "🔴 Offline", true);
-                       .AddField(GetText(guildId, strs.viewers),
+
-                           status.Viewers == 0 && !status.IsLive
+        if (showViewers)
-                               ? "-"
+        {
-                               : status.Viewers,
+            embed.AddField(GetText(guildId, strs.viewers),
-                           true);
+                status.Viewers == 0 && !status.IsLive
+                    ? "-"
+                    : status.Viewers,
+                true);
+        }
 
         if (status.IsLive)
             embed = embed.WithOkColor();

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

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

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

@@ -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]

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

@@ -286,8 +286,7 @@ public sealed class PatronageService
         }
     }
 
-    public async Task<bool> ExecPreCommandAsync(
+    public async Task<bool> ExecPreCommandAsync(ICommandContext ctx,
-        ICommandContext ctx,
         string moduleName,
         CommandInfo command)
     {

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

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

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

@@ -1,5 +1,4 @@
-#nullable disable warnings
+#nullable disable warnings
-using Nadeko.Common;
 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
+            .WithEventEmitter(args
-                                                                    => new MultilineScalarFlowStyleEmitter(args))
+                => new MultilineScalarFlowStyleEmitter(args))
-                                                                .WithNamingConvention(
+            .WithNamingConvention(
-                                                                    CamelCaseNamingConvention.Instance)
+                CamelCaseNamingConvention.Instance)
-                                                                .WithIndentedSequences()
+            .WithIndentedSequences()
-                                                                .ConfigureDefaultValuesHandling(DefaultValuesHandling
+            .ConfigureDefaultValuesHandling(DefaultValuesHandling
-                                                                    .OmitDefaults)
+                .OmitDefaults)
-                                                                .DisableAliases()
+            .DisableAliases()
-                                                                .Build();
+            .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()
+                .WithOkColor()
-                                               .WithTitle(GetText(strs.quote_id($"#{data.Id}")))
+                .WithTitle(GetText(strs.quote_id($"#{data.Id}")))
-                                               .AddField(GetText(strs.trigger), data.Keyword)
+                .AddField(GetText(strs.trigger), data.Keyword)
-                                               .AddField(GetText(strs.response),
+                .AddField(GetText(strs.response),
-                                                   Format.Sanitize(data.Text).Replace("](", "]\\("))
+                    Format.Sanitize(data.Text).Replace("](", "]\\("))
-                                               .WithFooter(
+                .WithFooter(
-                                                   GetText(strs.created_by($"{data.AuthorName} ({data.AuthorId})"))));
+                    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
+                    .Select(quote => new Quote
-                                                    {
+                    {
-                                                        GuildId = guildId,
+                        GuildId = guildId,
-                                                        Keyword = keyword,
+                        Keyword = keyword,
-                                                        Text = quote.Txt,
+                        Text = quote.Txt,
-                                                        AuthorId = quote.Aid,
+                        AuthorId = quote.Aid,
-                                                        AuthorName = quote.An
+                        AuthorName = quote.An
-                                                    }));
+                    }));
             }
 
             await uow.SaveChangesAsync();

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

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

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

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

src/NadekoBot/Modules/Utility/Utility.cs

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