Fixed VoiceXP bug, closes #374. Upped version to 4.3.4, Updated changelog

CHANGELOG.md

@@ -2,51 +2,7 @@
 
 Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
-## [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
+## Unreleased
 
 ## [4.3.3] - 06.08.2022
 

README.md

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

docs/guides/linux-guide.md

@@ -1,4 +1,4 @@
-w# Setting up NadekoBot on Linux
+# Setting up NadekoBot on Linux
 
 | Table of Contents                                   |
 | :-------------------------------------------------- |
@@ -160,30 +160,15 @@ 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. Run the installer: `bash linuxAIO.sh`
-
-3. There are a few options when it comes to running Nadeko.
-
-    - Run `3` to *Run the bot normally*
-    - Run `4` to *Run the bot with Auto Restart* (This is may or may not work)
-
-4. If option `4` was selected, you have the following options
-```
-1. Run Auto Restart normally without updating NadekoBot.
-2. Run Auto Restart and update NadekoBot.
-3. Exit
-
-Choose:
-[1] to Run NadekoBot with Auto Restart on "die" command without updating.
-[2] to Run with Auto Updating on restart after using "die" command.
-```
-- Run `1` to update the bot upon restart. (This is done using the `.die` command)
-- Run `2` to restart the bot without updating. (This is also done using the `.die` command)
-
-5. That's it! to detatch the tmux session:
+2. Navigate to the project's root directory
+    - Project root directory location example: `cd /home/user/nadekobot/`
+3. Enter the `output` directory:
+    - `cd output`
+4. Run the bot using:
+    - `dotnet NadekoBot.dll`
+5. Detatch the tmux session:
     - 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.)*

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

@@ -1,8 +1,5 @@
 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,7 +10,6 @@ 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.104.0" />
+      <PackageReference Include="Discord.Net.Core" Version="3.103.0" />
       <PackageReference Include="Serilog" Version="2.11.0" />
       <PackageReference Include="YamlDotNet" Version="11.2.1" />
     </ItemGroup>

src/NadekoBot/Bot.cs

@@ -3,12 +3,14 @@ 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;

src/NadekoBot/Common/Interaction/INadekoInteractionService.cs

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

src/NadekoBot/Common/Interaction/NadekoActionInteraction.cs

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

src/NadekoBot/Common/Interaction/NadekoInteractionArray.cs

@@ -0,0 +1,43 @@
+// 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

@@ -0,0 +1,42 @@
+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

@@ -1,20 +0,0 @@
-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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,26 @@
+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,7 +18,6 @@ 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);
@@ -37,7 +36,7 @@ public abstract class NadekoModule : ModuleBase
         string error,
         string url = null,
         string footer = null, 
-        NadekoInteraction inter = null)
+        NadekoButtonInteraction inter = null)
         => ctx.Channel.SendErrorAsync(_eb, title, error, url, footer);
     
     public Task<IUserMessage> SendConfirmAsync(
@@ -48,32 +47,32 @@ public abstract class NadekoModule : ModuleBase
         => ctx.Channel.SendConfirmAsync(_eb, title, text, url, footer);
 
     // 
-    public Task<IUserMessage> SendErrorAsync(string text, NadekoInteraction inter = null)
+    public Task<IUserMessage> SendErrorAsync(string text, NadekoButtonInteraction inter = null)
         => ctx.Channel.SendAsync(_eb, text, MessageType.Error, inter);
-    public Task<IUserMessage> SendConfirmAsync(string text, NadekoInteraction inter = null)
+    public Task<IUserMessage> SendConfirmAsync(string text, NadekoButtonInteraction inter = null)
         => ctx.Channel.SendAsync(_eb, text, MessageType.Ok, inter);
-    public Task<IUserMessage> SendPendingAsync(string text, NadekoInteraction inter = null)
+    public Task<IUserMessage> SendPendingAsync(string text, NadekoButtonInteraction inter = null)
         => ctx.Channel.SendAsync(_eb, text, MessageType.Pending, inter);
 
     
     // localized normal
-    public Task<IUserMessage> ErrorLocalizedAsync(LocStr str, NadekoInteraction inter = null)
+    public Task<IUserMessage> ErrorLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
         => SendErrorAsync(GetText(str), inter);
 
-    public Task<IUserMessage> PendingLocalizedAsync(LocStr str, NadekoInteraction inter = null)
+    public Task<IUserMessage> PendingLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
         => SendPendingAsync(GetText(str), inter);
 
-    public Task<IUserMessage> ConfirmLocalizedAsync(LocStr str, NadekoInteraction inter = null)
+    public Task<IUserMessage> ConfirmLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
         => SendConfirmAsync(GetText(str), inter);
 
     // localized replies
-    public Task<IUserMessage> ReplyErrorLocalizedAsync(LocStr str, NadekoInteraction inter = null)
+    public Task<IUserMessage> ReplyErrorLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
         => SendErrorAsync($"{Format.Bold(ctx.User.ToString())} {GetText(str)}", inter);
 
-    public Task<IUserMessage> ReplyPendingLocalizedAsync(LocStr str, NadekoInteraction inter = null)
+    public Task<IUserMessage> ReplyPendingLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
         => SendPendingAsync($"{Format.Bold(ctx.User.ToString())} {GetText(str)}", inter);
 
-    public Task<IUserMessage> ReplyConfirmLocalizedAsync(LocStr str, NadekoInteraction inter = null)
+    public Task<IUserMessage> ReplyConfirmLocalizedAsync(LocStr str, NadekoButtonInteraction inter = null)
         => SendConfirmAsync($"{Format.Bold(ctx.User.ToString())} {GetText(str)}", inter);
 
     public async Task<bool> PromptUserConfirmAsync(IEmbedBuilder embed)

src/NadekoBot/Db/Models/AntiProtection.cs

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

src/NadekoBot/Db/Models/BanTemplate.cs

@@ -5,5 +5,4 @@ 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,6 +17,8 @@ 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/UserXpStats.cs

@@ -8,6 +8,7 @@ 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 = 0,
-    Frame = 1,
+    Background,
+    Frame,
 }

src/NadekoBot/Db/MysqlContext.cs

@@ -10,6 +10,10 @@ 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,6 +65,8 @@ 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
 
@@ -164,6 +166,12 @@ 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);
 
@@ -205,6 +213,9 @@ 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);
@@ -330,10 +341,6 @@ public abstract class NadekoContext : DbContext
         #region BanTemplate
 
         modelBuilder.Entity<BanTemplate>().HasIndex(x => x.GuildId).IsUnique();
-        modelBuilder.Entity<BanTemplate>()
-            .Property(x => x.PruneDays)
-            .HasDefaultValue(null)
-            .IsRequired(false);
 
         #endregion
 

src/NadekoBot/Db/PostgreSqlContext.cs

@@ -8,6 +8,10 @@ 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,6 +9,10 @@ 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

@@ -1,49 +0,0 @@
-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

@@ -1,25 +0,0 @@
-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,6 +168,18 @@ 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")
@@ -675,10 +687,6 @@ 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");
@@ -2557,6 +2565,12 @@ 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/Postgresql/20220831142735_banprune.cs

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

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

@@ -1,49 +0,0 @@
-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

@@ -1,25 +0,0 @@
-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/NadekoSqliteContextModelSnapshot.cs

@@ -134,6 +134,16 @@ 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")
@@ -529,9 +539,6 @@ namespace NadekoBot.Migrations
                     b.Property<ulong>("GuildId")
                         .HasColumnType("INTEGER");
 
-                    b.Property<int?>("PruneDays")
-                        .HasColumnType("INTEGER");
-
                     b.Property<string>("Text")
                         .HasColumnType("TEXT");
 
@@ -1996,6 +2003,11 @@ namespace NadekoBot.Migrations
                     b.Property<ulong>("GuildId")
                         .HasColumnType("INTEGER");
 
+                    b.Property<DateTime>("LastLevelUp")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasDefaultValueSql("datetime('now')");
+
                     b.Property<int>("NotifyOnLevelUp")
                         .HasColumnType("INTEGER");
 

src/NadekoBot/Modules/Administration/Administration.cs

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

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

@@ -358,10 +358,9 @@ public class MuteService : INService
         IGuild guild,
         IUser user,
         TimeSpan after,
-        string reason,
-        int pruneDays)
+        string reason)
     {
-        await guild.AddBanAsync(user.Id, pruneDays, reason);
+        await guild.AddBanAsync(user.Id, 0, 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,14 +38,10 @@ 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,
-                minutes);
+                (int?)punishTime?.Time.TotalMinutes ?? 0);
 
             await ctx.OkAsync();
         }
@@ -60,9 +56,6 @@ 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();
@@ -130,9 +123,6 @@ public partial class Administration
             if (time is < 0 or > 60 * 24)
                 return;
 
-            if(action is PunishmentAction.TimeOut && time < 1)
-                return;
-
             var stats = await _service.StartAntiRaidAsync(ctx.Guild.Id, userThreshold, seconds, action, time);
 
             if (stats is null)
@@ -197,9 +187,6 @@ 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/UserPunish/UserPunishCommands.cs

@@ -345,10 +345,6 @@ 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)
@@ -429,8 +425,7 @@ public partial class Administration
                 }
             }
 
-            var banPrune = await _service.GetBanPruneAsync(ctx.Guild.Id) ?? 7;
-            await _mute.TimedBan(ctx.Guild, user, time.Time, (ctx.User + " | " + msg).TrimTo(512), banPrune);
+            await _mute.TimedBan(ctx.Guild, user, time.Time, (ctx.User + " | " + msg).TrimTo(512));
             var toSend = _eb.Create()
                             .WithOkColor()
                             .WithTitle("⛔️ " + GetText(strs.banned_user))
@@ -456,8 +451,7 @@ public partial class Administration
             var user = await ((DiscordSocketClient)Context.Client).Rest.GetGuildUserAsync(ctx.Guild.Id, userId);
             if (user is null)
             {
-                var banPrune = await _service.GetBanPruneAsync(ctx.Guild.Id) ?? 7;
-                await ctx.Guild.AddBanAsync(userId, banPrune, (ctx.User + " | " + msg).TrimTo(512));
+                await ctx.Guild.AddBanAsync(userId, 7, (ctx.User + " | " + msg).TrimTo(512));
 
                 await ctx.Channel.EmbedAsync(_eb.Create()
                                                 .WithOkColor()
@@ -492,8 +486,7 @@ public partial class Administration
                 dmFailed = true;
             }
 
-            var banPrune = await _service.GetBanPruneAsync(ctx.Guild.Id) ?? 7;
-            await ctx.Guild.AddBanAsync(user, banPrune, (ctx.User + " | " + msg).TrimTo(512));
+            await ctx.Guild.AddBanAsync(user, 7, (ctx.User + " | " + msg).TrimTo(512));
 
             var toSend = _eb.Create()
                             .WithOkColor()
@@ -507,26 +500,6 @@ 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)]
@@ -678,8 +651,7 @@ public partial class Administration
                 dmFailed = true;
             }
 
-            var banPrune = await _service.GetBanPruneAsync(ctx.Guild.Id) ?? 7;
-            await ctx.Guild.AddBanAsync(user, banPrune, ("Softban | " + ctx.User + " | " + msg).TrimTo(512));
+            await ctx.Guild.AddBanAsync(user, 7, ("Softban | " + ctx.User + " | " + msg).TrimTo(512));
             try { await ctx.Guild.RemoveBanAsync(user); }
             catch { await ctx.Guild.RemoveBanAsync(user); }
 
@@ -747,49 +719,6 @@ public partial class Administration
             await ctx.Channel.EmbedAsync(toSend);
         }
 
-        [Cmd]
-        [RequireContext(ContextType.Guild)]
-        [UserPerm(GuildPerm.ModerateMembers)]
-        [BotPerm(GuildPerm.ModerateMembers)]
-        [Priority(2)]
-        public async Task Timeout(IUser globalUser, StoopidTime time,  [Leftover] string msg = null)
-        {
-            var user = await ctx.Guild.GetUserAsync(globalUser.Id);
-
-            if (user is null)
-                return;
-            
-            if (!await CheckRoleHierarchy(user))
-                return;
-
-            var dmFailed = false;
-
-            try
-            {
-                var dmMessage = GetText(strs.timeoutdm(Format.Bold(ctx.Guild.Name), msg));
-                await user.EmbedAsync(_eb.Create(ctx)
-                        .WithPendingColor()
-                        .WithDescription(dmMessage));
-            }
-            catch
-            {
-                dmFailed = true;
-            }
-            
-            await user.SetTimeOutAsync(time.Time);
-
-            var toSend = _eb.Create()
-                .WithOkColor()
-                .WithTitle("⏳ " + GetText(strs.timedout_user))
-                .AddField(GetText(strs.username), user.ToString(), true)
-                .AddField("ID", user.Id.ToString(), true);
-
-            if (dmFailed)
-                toSend.WithFooter("⚠️ " + GetText(strs.unable_to_dm_user));
-
-            await ctx.Channel.EmbedAsync(toSend);
-        }
-
         [Cmd]
         [RequireContext(ContextType.Guild)]
         [UserPerm(GuildPerm.BanMembers)]
@@ -846,12 +775,11 @@ 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, banPrune, $"{ctx.User} | Massban");
+                    await ctx.Guild.AddBanAsync(toBan.Id, 7, $"{ctx.User} | Massban");
                 }
                 catch (Exception ex)
                 {
@@ -890,11 +818,10 @@ 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,
-                                       banPrune,
+                                       7,
                                        x.Reason,
                                        new()
                                        {

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

@@ -1,6 +1,5 @@
 #nullable disable
 using LinqToDB;
-using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Common.TypeReaders.Models;
@@ -128,7 +127,6 @@ public class UserPunishService : INService, IReadyExecutor
         if (!await CheckPermission(guild, p))
             return;
 
-        int banPrune;
         switch (p)
         {
             case PunishmentAction.Mute:
@@ -153,15 +151,13 @@ 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: banPrune);
+                    await guild.AddBanAsync(user, reason: reason, pruneDays: 7);
                 else
-                    await _mute.TimedBan(user.Guild, user, TimeSpan.FromMinutes(minutes), reason, banPrune);
+                    await _mute.TimedBan(user.Guild, user, TimeSpan.FromMinutes(minutes), reason);
                 break;
             case PunishmentAction.Softban:
-                banPrune = await GetBanPruneAsync(user.GuildId) ?? 7;
-                await guild.AddBanAsync(user, banPrune, $"Softban | {reason}");
+                await guild.AddBanAsync(user, 7, $"Softban | {reason}");
                 try
                 {
                     await guild.RemoveBanAsync(user);
@@ -197,9 +193,6 @@ 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;
         }
     }
 
@@ -231,8 +224,6 @@ 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;
         }
@@ -360,7 +351,7 @@ public class UserPunishService : INService, IReadyExecutor
             await uow.Warnings.ForgiveAll(guildId, userId, moderator);
         else
             toReturn = uow.Warnings.Forgive(guildId, userId, moderator, index - 1);
-        await uow.SaveChangesAsync();
+        uow.SaveChanges();
         return toReturn;
     }
 
@@ -381,9 +372,6 @@ 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);
@@ -493,37 +481,6 @@ 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,5 +1,7 @@
 #nullable disable
 
+using Nadeko.Common;
+
 namespace NadekoBot.Modules.NadekoExpressions;
 
 [Name("Expressions")]
@@ -23,10 +25,15 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
         => (ctx.Guild is null && _creds.IsOwner(ctx.User))
            || (ctx.Guild is not null && ((IGuildUser)ctx.User).GuildPermissions.Administrator);
 
-    private async Task ExprAddInternalAsync(string key, string 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;
         }
 
@@ -41,43 +48,12 @@ 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))
@@ -98,9 +74,7 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
                                                 message.Length > 1024 ? GetText(strs.redacted_too_long) : message));
         }
         else
-        {
             await ReplyErrorLocalizedAsync(strs.expr_no_found_id);
-        }
     }
 
     [Cmd]
@@ -108,9 +82,7 @@ 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);
 
@@ -181,9 +153,7 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
                                             .AddField(GetText(strs.response), ex.Response.TrimTo(1024)));
         }
         else
-        {
             await ReplyErrorLocalizedAsync(strs.expr_no_found_id);
-        }
     }
 
     [Cmd]
@@ -222,9 +192,7 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
                 succ.Add(emojiStr);
 
                 if (succ.Count >= 3)
-                {
                     break;
-                }
             }
             catch { }
         }

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

@@ -11,14 +11,10 @@ public partial class Gambling
     public partial class BankCommands : GamblingModule<IBankService>
     {
         private readonly IBankService _bank;
-        private readonly DiscordSocketClient _client;
 
-        public BankCommands(GamblingConfigService gcs,
-            IBankService bank,
-            DiscordSocketClient client) : base(gcs)
+        public BankCommands(GamblingConfigService gcs, IBankService bank) : base(gcs)
         {
             _bank = bank;
-            _client = client;
         }
 
         [Cmd]
@@ -72,50 +68,5 @@ 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,48 +15,6 @@ 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,6 +5,4 @@ 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

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

src/NadekoBot/Modules/Gambling/Gambling.cs

@@ -99,20 +99,39 @@ public partial class Gambling : GamblingModule<GamblingService>
         PrettyName = "Timely"
     };
 
-    private async Task RemindTimelyAction(SocketMessageComponent smc, DateTime when)
+    public class RemindMeInteraction : NInteraction
     {
-        var tt = TimestampTag.FromDateTime(when, TimestampTagStyles.Relative);
+        public RemindMeInteraction(
+            [NotNull] DiscordSocketClient client,
+            ulong userId,
+            [NotNull] Func<SocketMessageComponent, Task> action)
+            : base(client, userId, action)
+        {
+        }
 
-        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);
+        protected override NadekoInteractionData Data
+            => new NadekoInteractionData(
+                Emote: Emoji.Parse("⏰"),
+                CustomId: "timely:remind_me",
+                Text: "Remind me"
+            );
     }
 
+    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()
     {
@@ -128,7 +147,7 @@ public partial class Gambling : GamblingModule<GamblingService>
         {
             var now = DateTime.UtcNow;
             var relativeTag = TimestampTag.FromDateTime(now.Add(rem), TimestampTagStyles.Relative);
-            await ReplyPendingLocalizedAsync(strs.timely_already_claimed(relativeTag));
+            await ReplyErrorLocalizedAsync(strs.timely_already_claimed(relativeTag));
             return;
         }
 
@@ -138,17 +157,11 @@ public partial class Gambling : GamblingModule<GamblingService>
 
         await _cs.AddAsync(ctx.User.Id, val, new("timely", "claim"));
 
-        var inter = _inter
-            .Create(ctx.User.Id,
-                new SimpleInteraction<DateTime>(
-                    new ButtonBuilder(
-                        label: "Remind me",
-                        emote: Emoji.Parse("⏰"),
-                        customId: "timely:remind_me"),
-                    RemindTimelyAction,
-                    DateTime.UtcNow.Add(TimeSpan.FromHours(period))));
+        var inter = new RemindMeInteraction(_client,
+            ctx.User.Id,
+            RemindTimelyAction(DateTime.UtcNow.Add(TimeSpan.FromHours(period))));
         
-        await ReplyConfirmLocalizedAsync(strs.timely(N(val), period), inter);
+        await ReplyConfirmLocalizedAsync(strs.timely(N(val), period), inter.GetInteraction());
     }
 
     [Cmd]
@@ -349,7 +362,7 @@ public partial class Gambling : GamblingModule<GamblingService>
         await ReplyConfirmLocalizedAsync(strs.has(Format.Code(userId.ToString()), cur));
     }
 
-    private async Task BankAction(SocketMessageComponent smc, object _)
+    private async Task BankAction(SocketMessageComponent smc)
     {
         var balance = await _bank.GetBalanceAsync(ctx.User.Id);
 
@@ -359,12 +372,8 @@ public partial class Gambling : GamblingModule<GamblingService>
               .Pipe(text => smc.RespondConfirmAsync(_eb, text, ephemeral: true));
     }
 
-    private NadekoInteraction CreateCashInteraction()
-        => _inter.Create<object>(ctx.User.Id,
-            new(new(
-                    customId: "cash:bank_show_balance", 
-                    emote: new Emoji("🏦")),
-                BankAction));
+    private NadekoButtonInteraction CreateCashInteraction()
+        => new CashInteraction(_client, ctx.User.Id, BankAction).GetInteraction();
 
     [Cmd]
     [Priority(1)]

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

@@ -27,6 +27,12 @@ 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;
@@ -67,6 +73,16 @@ 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)
@@ -78,34 +94,43 @@ public partial class Gambling
 
             await ctx.Channel.TriggerTypingAsync();
 
-            if (await InternalSlotAsync(amount) is not SlotResult result)
-            {
-                await ReplyErrorLocalizedAsync(strs.not_enough(CurrencySign));
+            if (!_runningUsers.Add(ctx.User.Id))
                 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)
@@ -156,7 +181,7 @@ public partial class Gambling
         //         });
         // }
 
-        private string GetSlotMessageTextInternal(SlotResult result)
+        private string GetSlotMessageInternal(SlotResult result)
         {
             var multi = result.Multiplier.ToString("0.##");
             var msg = result.WinType switch
@@ -176,6 +201,7 @@ public partial class Gambling
 
             if (!maybeResult.TryPickT0(out var result, out var error))
             {
+                await ReplyErrorLocalizedAsync(strs.not_enough(CurrencySign));
                 return null;
             }
             

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, object _)
+    private Task SelfhostAction(SocketMessageComponent smc)
         => 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,13 +484,7 @@ public partial class Help : NadekoModule<HelpService>
     [OnlyPublicBot]
     public async Task Donate()
     {
-        // => 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 selfhostInter = new DonateSelfhostingInteraction(_client, ctx.User.Id, SelfhostAction);
         
         var eb = _eb.Create(ctx)
                     .WithOkColor()
@@ -531,7 +525,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);
+            await (await ctx.User.CreateDMChannelAsync()).EmbedAsync(eb, inter: selfhostInter.GetInteraction());
             _ = ctx.OkAsync();
         }
         catch

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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,12 @@
+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,4 +1,5 @@
 #nullable disable
+using Nadeko.Common;
 using NadekoBot.Modules.Music.Services;
 using NadekoBot.Services.Database.Models;
 

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

@@ -98,33 +98,6 @@ public partial class Utility
             await ctx.Channel.EmbedAsync(embed);
         }
 
-        [Cmd]
-        [RequireUserPermission(GuildPermission.ManageRoles)]
-        public async Task RoleInfo([Leftover] SocketRole role)
-        {
-            if (role.IsEveryone)
-                return;
-            
-            var createdAt = new DateTime(2015, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc)
-                .AddMilliseconds(role.Id >> 22);
-            var usercount = role.Members.LongCount();
-            var embed = _eb.Create()
-                .WithTitle(role.Name.TrimTo(128))
-                .WithDescription(role.Permissions.ToList().Join(" | "))
-                .AddField(GetText(strs.id), role.Id.ToString(), true)
-                .AddField(GetText(strs.created_at), $"{createdAt:dd.MM.yyyy HH:mm}", true)
-                .AddField(GetText(strs.users), usercount.ToString(), true)
-                .AddField(GetText(strs.color), $"#{role.Color.R:X2}{role.Color.G:X2}{role.Color.B:X2}", true)
-                .AddField(GetText(strs.mentionable), role.IsMentionable.ToString(), true)
-                .AddField(GetText(strs.hoisted), role.IsHoisted.ToString(), true)
-                .WithOkColor();
-
-            if (!string.IsNullOrWhiteSpace(role.GetIconUrl()))
-                embed = embed.WithThumbnailUrl(role.GetIconUrl());
-            
-            await ctx.Channel.EmbedAsync(embed);
-        }
-
         [Cmd]
         [RequireContext(ContextType.Guild)]
         public async Task UserInfo(IGuildUser usr = null)
@@ -138,10 +111,8 @@ public partial class Utility
             if (!string.IsNullOrWhiteSpace(user.Nickname))
                 embed.AddField(GetText(strs.nickname), user.Nickname, true);
             
-            var joinedAt = GetJoinedAt(user);
-            
             embed.AddField(GetText(strs.id), user.Id.ToString(), true)
-                 .AddField(GetText(strs.joined_server), $"{joinedAt?.ToString("dd.MM.yyyy HH:mm") ?? "?"}", true)
+                 .AddField(GetText(strs.joined_server), $"{user.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)}",
@@ -169,18 +140,6 @@ 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/Quote/IQuoteService.cs

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

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

@@ -1,4 +1,5 @@
-#nullable disable warnings
+#nullable disable warnings
+using Nadeko.Common;
 using NadekoBot.Common.Yml;
 using NadekoBot.Db;
 using NadekoBot.Services.Database.Models;
@@ -21,25 +22,23 @@ public partial class Utility
 ";
 
         private static readonly ISerializer _exportSerializer = new SerializerBuilder()
-            .WithEventEmitter(args
-                => new MultilineScalarFlowStyleEmitter(args))
-            .WithNamingConvention(
-                CamelCaseNamingConvention.Instance)
-            .WithIndentedSequences()
-            .ConfigureDefaultValuesHandling(DefaultValuesHandling
-                .OmitDefaults)
-            .DisableAliases()
-            .Build();
+                                                                .WithEventEmitter(args
+                                                                    => new MultilineScalarFlowStyleEmitter(args))
+                                                                .WithNamingConvention(
+                                                                    CamelCaseNamingConvention.Instance)
+                                                                .WithIndentedSequences()
+                                                                .ConfigureDefaultValuesHandling(DefaultValuesHandling
+                                                                    .OmitDefaults)
+                                                                .DisableAliases()
+                                                                .Build();
 
         private readonly DbService _db;
         private readonly IHttpClientFactory _http;
-        private readonly IQuoteService _qs;
 
-        public QuoteCommands(DbService db, IQuoteService qs, IHttpClientFactory http)
+        public QuoteCommands(DbService db, IHttpClientFactory http)
         {
             _db = db;
             _http = http;
-            _qs = qs;
         }
 
         [Cmd]
@@ -109,7 +108,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);
@@ -128,13 +127,13 @@ public partial class Utility
 
         private async Task ShowQuoteData(Quote data)
             => await ctx.Channel.EmbedAsync(_eb.Create(ctx)
-                .WithOkColor()
-                .WithTitle(GetText(strs.quote_id($"#{data.Id}")))
-                .AddField(GetText(strs.trigger), data.Keyword)
-                .AddField(GetText(strs.response),
-                    Format.Sanitize(data.Text).Replace("](", "]\\("))
-                .WithFooter(
-                    GetText(strs.created_by($"{data.AuthorName} ({data.AuthorId})"))));
+                                               .WithOkColor()
+                                               .WithTitle(GetText(strs.quote_id($"#{data.Id}")))
+                                               .AddField(GetText(strs.trigger), data.Keyword)
+                                               .AddField(GetText(strs.response),
+                                                   Format.Sanitize(data.Text).Replace("](", "]\\("))
+                                               .WithFooter(
+                                                   GetText(strs.created_by($"{data.AuthorName} ({data.AuthorId})"))));
 
         private async Task QuoteSearchinternalAsync(string? keyword, string textOrAuthor)
         {
@@ -257,28 +256,6 @@ 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)]
@@ -311,7 +288,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();
 
@@ -326,7 +303,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();
 
@@ -380,14 +357,14 @@ public partial class Utility
             {
                 var keyword = entry.Key;
                 await uow.Quotes.AddRangeAsync(entry.Value.Where(quote => !string.IsNullOrWhiteSpace(quote.Txt))
-                    .Select(quote => new Quote
-                    {
-                        GuildId = guildId,
-                        Keyword = keyword,
-                        Text = quote.Txt,
-                        AuthorId = quote.Aid,
-                        AuthorName = quote.An
-                    }));
+                                                    .Select(quote => new Quote
+                                                    {
+                                                        GuildId = guildId,
+                                                        Keyword = keyword,
+                                                        Text = quote.Txt,
+                                                        AuthorId = quote.Aid,
+                                                        AuthorName = quote.An
+                                                    }));
             }
 
             await uow.SaveChangesAsync();

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

@@ -1,32 +0,0 @@
-#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,27 +159,14 @@ public class RemindService : INService, IReadyExecutor
             if (ch is null)
                 return;
 
-            var st = SmartText.CreateFrom(r.Message);
-
-            if (st is SmartEmbedText set)
-            {
-                await ch.SendMessageAsync(null, embed: set.GetEmbed().Build());
-            }
-            else if (st is SmartEmbedTextArray seta)
-            {
-                await ch.SendMessageAsync(null, embeds: seta.GetEmbedBuilders().Map(x => x.Build()));
-            }
-            else
-            {
-                await ch.EmbedAsync(_eb.Create()
-                        .WithOkColor()
-                        .WithTitle("Reminder")
-                        .AddField("Created At",
-                            r.DateAdded.HasValue ? r.DateAdded.Value.ToLongDateString() : "?")
-                        .AddField("By",
-                            (await ch.GetUserAsync(r.UserId))?.ToString() ?? r.UserId.ToString()),
-                    r.Message);
-            }
+            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,41 +367,6 @@ public partial class Utility : NadekoModule
         await ConfirmLocalizedAsync(strs.emoji_added(em.ToString()));
     }
 
-    [Cmd]
-    [RequireContext(ContextType.Guild)]
-    [BotPerm(GuildPerm.ManageEmojisAndStickers)]
-    [UserPerm(GuildPerm.ManageEmojisAndStickers)]
-    [Priority(0)]
-    public async Task EmojiRemove(params Emote[] emotes)
-    {
-        if (emotes.Length == 0)
-            return;
-        
-        var g = (SocketGuild)ctx.Guild;
-        
-        var fails = new List<Emote>();
-        foreach (var emote in emotes)
-        {
-            var guildEmote = g.Emotes.FirstOrDefault(x => x.Id == emote.Id);
-            if (guildEmote is null)
-            {
-                fails.Add(emote);
-            }
-            else
-            {
-                await ctx.Guild.DeleteEmoteAsync(guildEmote);
-            }
-        }
-
-        if (fails.Count > 0)
-        {
-            await ReplyPendingLocalizedAsync(strs.emoji_not_removed(fails.Select(x => x.ToString()).Join(" ")));
-            return;
-        }
-
-        await ctx.OkAsync();
-    }
-
     [Cmd]
     [OwnerOnly]
     public async Task ListServers(int page = 1)

src/NadekoBot/Modules/Xp/Xp.cs

@@ -334,15 +334,15 @@ public partial class Xp : NadekoModule<XpService>
 
     public enum XpShopInputType
     {
-        Backgrounds = 0,
-        B = 0,
-        Bg = 0,
-        Bgs = 0,
-        Frames = 1,
-        F = 1,
-        Fr = 1,
-        Frs = 1,
-        Fs = 1,
+        Backgrounds = 1,
+        B = 1,
+        Bg = 1,
+        Bgs = 1,
+        Frames = 0,
+        F = 0,
+        Fr = 0,
+        Frs = 0,
+        Fs = 0,
     }
 
     [Cmd]
@@ -432,7 +432,8 @@ public partial class Xp : NadekoModule<XpService>
                     var button = new ButtonBuilder(ownedItem.IsUsing
                             ? GetText(strs.in_use)
                             : GetText(strs.use),
-                        "xpshop:use",
+                        "XP_SHOP_USE",
+                        ButtonStyle.Primary,
                         emote: Emoji.Parse("👐"),
                         isDisabled: ownedItem.IsUsing);
 
@@ -446,7 +447,8 @@ public partial class Xp : NadekoModule<XpService>
                 else
                 {
                     var button = new ButtonBuilder(GetText(strs.buy),
-                        "xpshop:buy",
+                        "XP_SHOP_BUY",
+                        ButtonStyle.Primary,
                         emote: Emoji.Parse("💰"));
 
                     var inter = new SimpleInteraction<(string key, XpShopItemType type)?>(
@@ -467,22 +469,12 @@ public partial class Xp : NadekoModule<XpService>
     {
         var result = await _service.BuyShopItemAsync(ctx.User.Id, (XpShopItemType)type, key);
 
-        NadekoInteraction GetUseInteraction()
-        {
-            return _inter.Create(ctx.User.Id,
-                new SimpleInteraction<object>(
-                    new ButtonBuilder(label: "Use", customId: "xpshop:use_item", emote: Emoji.Parse("👐")),
-                    async (smc, _) => await XpShopUse(type, key)
-                ));
-        }
-        
         if (result != BuyResult.Success)
         {
             var _ = result switch
             {
-                BuyResult.XpShopDisabled => await ReplyErrorLocalizedAsync(strs.xp_shop_disabled),
                 BuyResult.InsufficientFunds => await ReplyErrorLocalizedAsync(strs.not_enough(_gss.Data.Currency.Sign)),
-                BuyResult.AlreadyOwned => await ReplyErrorLocalizedAsync(strs.xpshop_already_owned, GetUseInteraction()),
+                BuyResult.AlreadyOwned => await ReplyErrorLocalizedAsync(strs.xpshop_already_owned),
                 BuyResult.UnknownItem => await ReplyErrorLocalizedAsync(strs.xpshop_item_not_found),
                 BuyResult.InsufficientPatronTier => await ReplyErrorLocalizedAsync(strs.patron_insuff_tier),
                 _ => throw new ArgumentOutOfRangeException()
@@ -491,8 +483,7 @@ public partial class Xp : NadekoModule<XpService>
         }
 
         await ReplyConfirmLocalizedAsync(strs.xpshop_buy_success(type.ToString().ToLowerInvariant(),
-                key.ToLowerInvariant()),
-            GetUseInteraction());
+            key.ToLowerInvariant()));
     }
     
     [Cmd]

src/NadekoBot/Modules/Xp/XpConfig.cs

@@ -27,9 +27,6 @@ public sealed partial class XpConfig : ICloneable<XpConfig>
     [Comment(@"The maximum amount of minutes the bot will keep track of a user in a voice channel")]
     public int VoiceMaxMinutes { get; set; } = 720;
 
-    [Comment(@"The amount of currency users will receive for each point of global xp that they earn")]
-    public float CurrencyPerXp { get; set; } = 0;
-
     [Comment(@"Xp Shop config")]
     public ShopConfig Shop { get; set; } = new();
 

src/NadekoBot/Modules/Xp/XpConfigService.cs

@@ -52,11 +52,11 @@ public sealed class XpConfigService : ConfigServiceBase<XpConfig>
             });
         }
         
-        if (data.Version < 6)
+        if (data.Version < 5)
         {
             ModifyConfig(c =>
             {
-                c.Version = 6;
+                c.Version = 5;
             });
         }
     }

src/NadekoBot/Modules/Xp/XpService.cs

@@ -176,16 +176,6 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
             var gxps = new List<UserXpStats>(globalToAdd.Count);
             await using (var ctx = _db.GetDbContext())
             {
-                var conf = _xpConfig.Data;
-                if (conf.CurrencyPerXp > 0)
-                {
-                    foreach (var user in globalToAdd)
-                    {
-                        var amount = user.Value.XpAmount * conf.CurrencyPerXp;
-                        await _cs.AddAsync(user.Key, (long)(amount), null);
-                    }
-                }
-                
                 // update global user xp in batches
                 // group by xp amount and update the same amounts at the same time
                 foreach (var group in globalToAdd.GroupBy(x => x.Value.XpAmount, x => x.Key))
@@ -198,15 +188,9 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
                             },
                             (_, n) => n);
 
-                    await ctx.Clubs
-                        .Where(x => x.Members.Any(m => group.Contains(m.UserId)))
-                        .UpdateAsync(old => new()
-                        {
-                            Xp = old.Xp + (group.Key * old.Members.Count(m => group.Contains(m.UserId)))
-                        });
-                    
                     dus.AddRange(items);
                 }
+
                 // update guild user xp in batches
                 foreach (var (guildId, toAdd) in guildToAdd)
                 {
@@ -223,41 +207,6 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
                                 (_, n) => n);
 
                         gxps.AddRange(items);
-                        
-                        var missingUserIds = group.Where(userId => !items.Any(x => x.UserId == userId)).ToArray();
-                        foreach (var userId in missingUserIds)
-                        {
-                            await ctx
-                                .UserXpStats
-                                .ToLinqToDBTable()
-                                .InsertOrUpdateAsync(() => new UserXpStats()
-                                    {
-                                        UserId = userId,
-                                        GuildId = guildId,
-                                        Xp = group.Key,
-                                        DateAdded = DateTime.UtcNow,
-                                        AwardedXp = 0,
-                                        NotifyOnLevelUp = XpNotificationLocation.None
-                                    },
-                                    _ => new()
-                                    {
-                                        
-                                    },
-                                    () => new()
-                                    {
-                                        UserId = userId
-                                    });
-                        }
-
-                        if (missingUserIds.Length > 0)
-                        {
-                            var missingItems = await ctx.UserXpStats
-                                .ToLinqToDBTable()
-                                .Where(x => missingUserIds.Contains(x.UserId))
-                                .ToArrayAsyncLinqToDB();
-                            
-                            gxps.AddRange(missingItems);
-                        }
                     }
                 }
             }
@@ -286,8 +235,8 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
                 if (guildToAdd.TryGetValue(du.GuildId, out var users)
                     && users.TryGetValue(du.UserId, out var xpGainData))
                 {
-                    var oldLevel = new LevelStats(du.Xp - xpGainData.XpAmount + du.AwardedXp);
-                    var newLevel = new LevelStats(du.Xp + du.AwardedXp);
+                    var oldLevel = new LevelStats(du.Xp - xpGainData.XpAmount);
+                    var newLevel = new LevelStats(du.Xp);
 
                     if (oldLevel.Level < newLevel.Level)
                     {
@@ -1445,7 +1394,7 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
         var conf = _xpConfig.Data;
 
         if (!conf.Shop.IsEnabled)
-            return BuyResult.XpShopDisabled;
+            return BuyResult.UnknownItem;
 
         var req = type == XpShopItemType.Background
             ? conf.Shop.BgsTierRequirement
@@ -1596,7 +1545,6 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
 public enum BuyResult
 {
     Success,
-    XpShopDisabled,
     AlreadyOwned,
     InsufficientFunds,
     UnknownItem,

src/NadekoBot/NadekoBot.csproj

@@ -27,7 +27,7 @@
         <PackageReference Include="CodeHollow.FeedReader" Version="1.2.4" />
         <PackageReference Include="CommandLineParser" Version="2.9.1" />
         <PackageReference Include="CsvHelper" Version="28.0.1" />
-        <PackageReference Include="Discord.Net" Version="3.104.0" />
+        <PackageReference Include="Discord.Net" Version="3.103.0" />
         <PackageReference Include="CoreCLR-NCalc" Version="2.2.110" />
         <PackageReference Include="Google.Apis.Urlshortener.v1" Version="1.41.1.138" />
         <PackageReference Include="Google.Apis.YouTube.v3" Version="1.57.0.2749" />

src/NadekoBot/Services/CommandHandler.cs

@@ -279,7 +279,6 @@ public class CommandHandler : INService, IReadyExecutor
                 // if it errored
                 if (error is not null)
                 {
-                    error = HumanizeError(error);
                     LogErroredExecution(error, usrMsg, channel as ITextChannel, blockTime, startTime);
                     
                     if (guild is not null)
@@ -293,15 +292,6 @@ public class CommandHandler : INService, IReadyExecutor
         await _behaviorHandler.RunOnNoCommandAsync(guild, usrMsg);
     }
 
-    private string HumanizeError(string error)
-    {
-        if (error.Contains("parse int", StringComparison.OrdinalIgnoreCase)
-            || error.Contains("parse float"))
-            return "Invalid number specified. Make sure you're specifying parameters in the correct order.";
-
-        return error;
-    }
-
     public Task<(bool Success, string Error, CommandInfo Info)> ExecuteCommandAsync(
         CommandContext context,
         string input,

src/NadekoBot/Services/Currency/DefaultWallet.cs

@@ -27,7 +27,7 @@ public class DefaultWallet : IWallet
                         .FirstOrDefaultAsync();
     }
 
-    public async Task<bool> Take(long amount, TxData? txData)
+    public async Task<bool> Take(long amount, TxData txData)
     {
         if (amount < 0)
             throw new ArgumentOutOfRangeException(nameof(amount), "Amount to take must be non negative.");
@@ -45,26 +45,23 @@ public class DefaultWallet : IWallet
         if (changed == 0)
             return false;
         
-        if (txData is not null)
-        {
-            await ctx
-                .GetTable<CurrencyTransaction>()
-                .InsertAsync(() => new()
-                {
-                    Amount = -amount,
-                    Note = txData.Note,
-                    UserId = userId,
-                    Type = txData.Type,
-                    Extra = txData.Extra,
-                    OtherId = txData.OtherId,
-                    DateAdded = DateTime.UtcNow
-                });
-        }
+        await ctx
+              .GetTable<CurrencyTransaction>()
+              .InsertAsync(() => new()
+              {
+                  Amount = -amount,
+                  Note = txData.Note,
+                  UserId = userId,
+                  Type = txData.Type,
+                  Extra = txData.Extra,
+                  OtherId = txData.OtherId,
+                  DateAdded = DateTime.UtcNow
+              });
 
         return true;
     }
 
-    public async Task Add(long amount, TxData? txData)
+    public async Task Add(long amount, TxData txData)
     {
         if (amount <= 0)
             throw new ArgumentOutOfRangeException(nameof(amount), "Amount must be greater than 0.");
@@ -95,19 +92,16 @@ public class DefaultWallet : IWallet
             await tran.CommitAsync();
         }
 
-        if (txData is not null)
-        {
-            await ctx.GetTable<CurrencyTransaction>()
-                .InsertAsync(() => new()
-                {
-                    Amount = amount,
-                    UserId = userId,
-                    Note = txData.Note,
-                    Type = txData.Type,
-                    Extra = txData.Extra,
-                    OtherId = txData.OtherId,
-                    DateAdded = DateTime.UtcNow
-                });
-        }
+        await ctx.GetTable<CurrencyTransaction>()
+                 .InsertAsync(() => new()
+                 {
+                     Amount = amount,
+                     UserId = userId,
+                     Note = txData.Note,
+                     Type = txData.Type,
+                     Extra = txData.Extra,
+                     OtherId = txData.OtherId,
+                     DateAdded = DateTime.UtcNow
+                 });
     }
 }

src/NadekoBot/Services/Currency/IWallet.cs

@@ -5,35 +5,31 @@ public interface IWallet
     public ulong UserId { get; }
 
     public Task<long> GetBalance();
-    public Task<bool> Take(long amount, TxData? txData);
-    public Task Add(long amount, TxData? txData);
+    public Task<bool> Take(long amount, TxData txData);
+    public Task Add(long amount, TxData txData);
 
     public async Task<bool> Transfer(
         long amount,
         IWallet to,
-        TxData? txData)
+        TxData txData)
     {
         if (amount <= 0)
             throw new ArgumentOutOfRangeException(nameof(amount), "Amount must be greater than 0.");
 
-        if (txData is not null)
-            txData = txData with
+        var succ = await Take(amount,
+            txData with
             {
                 OtherId = to.UserId
-            };
-        
-        var succ = await Take(amount, txData);
+            });
 
         if (!succ)
             return false;
 
-        if (txData is not null)
-            txData = txData with
+        await to.Add(amount,
+            txData with
             {
                 OtherId = UserId
-            };
-
-        await to.Add(amount, txData);
+            });
 
         return true;
     }

src/NadekoBot/Services/IEmbedBuilderService.cs

@@ -67,9 +67,6 @@ public sealed class DiscordEmbedBuilderWrapper : IEmbedBuilder
             _ => throw new ArgumentOutOfRangeException(nameof(color), "Unsupported EmbedColor type")
         };
 
-    public IEmbedBuilder WithDiscordColor(Color color)
-        => Wrap(embed.WithColor(color));
-
     public Embed Build()
         => embed.Build();
 

src/NadekoBot/Services/Impl/StatsService.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Services;
 
 public sealed class StatsService : IStatsService, IReadyExecutor, INService
 {
-    public const string BOT_VERSION = "4.3.6";
+    public const string BOT_VERSION = "4.3.4";
 
     public string Author
         => "Kwoth#2452";

src/NadekoBot/_Extensions/IMessageChannelExtensions.cs

@@ -33,7 +33,7 @@ public static class MessageChannelExtensions
     public static async Task<IUserMessage> SendAsync(
         this IMessageChannel channel,
         string? plainText,
-        NadekoInteraction? inter,
+        NadekoButtonInteraction? inter,
         Embed? embed = null,
         IReadOnlyCollection<Embed>? embeds = null,
         bool sanitizeAll = false)
@@ -72,7 +72,7 @@ public static class MessageChannelExtensions
         IEmbedBuilder? embed,
         string plainText = "",
         IReadOnlyCollection<IEmbedBuilder>? embeds = null,
-        NadekoInteraction? inter = null)
+        NadekoButtonInteraction? inter = null)
         => ch.SendAsync(plainText,
             inter,
             embed: embed?.Build(),
@@ -83,7 +83,7 @@ public static class MessageChannelExtensions
         IEmbedBuilderService eb,
         string text,
         MessageType type,
-        NadekoInteraction? inter = null)
+        NadekoButtonInteraction? inter = null)
     {
         var builder = eb.Create().WithDescription(text);
 

src/NadekoBot/_Extensions/SocketMessageComponentExtensions.cs

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

src/NadekoBot/data/aliases.yml

@@ -37,7 +37,7 @@ boost:
 boostmsg:
   - boostmsg
 boostdel:
-  - boostde
+  - boostdel
 logserver:
   - logserver
 logignore:
@@ -174,14 +174,6 @@ settopic:
 setchanlname:
   - setchanlname
   - schn
-# thread stuff
-threadcreate:
-  - threadcreate
-  - thcr
-threaddelete:
-  - threaddelete
-  - thdel
-  - thrm
 prune:
   - prune
   - clear
@@ -217,9 +209,6 @@ serverinfo:
 channelinfo:
   - channelinfo
   - cinfo
-roleinfo:
-  - roleinfo
-  - rinfo
 userinfo:
   - userinfo
   - uinfo
@@ -342,9 +331,6 @@ quoteid:
 quotedelete:
   - quotedelete
   - qdel
-quotedeleteauthor:
-  - quotedeleteauthor
-  - qdelauth
 draw:
   - draw
 drawnew:
@@ -388,7 +374,6 @@ award:
   - award
 take:
   - take
-  - seize
 betroll:
   - betroll
   - br
@@ -725,13 +710,6 @@ showemojis:
 emojiadd:
   - emojiadd
   - ea
-emojiremove:
-  - emojiremove
-  - emojirm
-  - er
-  - ed
-  - emojidel
-  - emojidelete
 deckshuffle:
   - deckshuffle
   - dsh
@@ -963,10 +941,6 @@ banmessagetest:
   - banmsgtest
 banmsgreset:
   - banmsgreset
-banprune:
-  - banprune
-timeout:
-  - timeout
 wait:
   - wait
 warnexpire:
@@ -1287,11 +1261,6 @@ expradd:
   - exadd
   - exa
   - acr
-expraddserver:
-  - expradds
-  - exadds
-  - exas
-  - expraddserver
 exprlist:
   - exprlist
   - exl
@@ -1339,7 +1308,6 @@ medusalist:
 medusainfo:
   - medusainfo
   - meinfo
-# Bank stuff
 bankdeposit:
   - deposit
   - d
@@ -1352,11 +1320,6 @@ bankbalance:
   - balance
   - b
   - bal
-banktake:
-  - take
-  - seize
-bankaward:
-  - award
 # Patron
 patron:
   - patron

src/NadekoBot/data/bot.yml

@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 4
+version: 3
 # Most commands, when executed, have a small colored line
 # next to the response. The color depends whether the command
 # is completed, errored or in progress (pending)
@@ -18,8 +18,6 @@ defaultLocale: en-US
 # Style in which executed commands will show up in the console.
 # Allowed values: Simple, Normal, None
 consoleOutputType: Normal
-# Whether the bot will check for new releases every hour
-checkForUpdates: true
 # Do you want any messages sent by users in Bot's DM to be forwarded to the owner(s)?
 forwardMessages: false
 # Do you want the message to be forwarded only to the first owner specified in the list of owners (in creds.yml),

src/NadekoBot/data/strings/commands/commands.en-US.yml

@@ -197,11 +197,7 @@ iamnot:
   args:
     - "Gamer"
 expradd:
-  desc: "Add an expression with a trigger and a response. Bot will post a response whenever someone types the trigger word.  Running this command in server requires the Administration permission. Running this command in DM is Bot Owner only and adds a new global expression. Guide here: <https://nadekobot.readthedocs.io/en/latest/custom-reactions/>"
-  args:
-    - "\"hello\" Hi there %user.mention%"
-expraddserver:
-  desc: "Add an expression with a trigger and a response in this server. Bot will post a response whenever someone types the trigger word. Guide here: <https://nadekobot.readthedocs.io/en/latest/custom-reactions/>"
+  desc: "Add an expression with a trigger and a response. Running this command in server requires the Administration permission. Running this command in DM is Bot Owner only and adds a new global expression. Guide here: <https://nadekobot.readthedocs.io/en/latest/custom-reactions/>"
   args:
     - "\"hello\" Hi there %user.mention%"
 exprlist:
@@ -316,11 +312,6 @@ kick:
   args:
     - "@Someone Get out!"
     - "\"Some Guy#1234\" Your behaviour is toxic."
-timeout:
-  desc: "Times the user out for the specified amount of time. You may optionally specify a reason, which will be sent to the user."
-  args:
-    - "@Someone 3h Shut up!"
-    - "@Someone 1h30m"
 mute:
   desc: "Mutes a mentioned user both from speaking and chatting. You can also specify time string for how long the user should be muted. You can optionally specify a reason."
   args:
@@ -432,10 +423,6 @@ channelinfo:
   desc: "Shows info about the channel. If no channel is supplied, it defaults to current one."
   args:
     - "#some-channel"
-roleinfo:
-  desc: "Shows info about the specified role."
-  args:
-    - "Gamers"
 userinfo:
   desc: "Shows info about the user. If no user is supplied, it defaults a user running the command."
   args:
@@ -632,10 +619,6 @@ quotedelete:
   desc: "Deletes a quote with the specified ID. You have to either have the Manage Messages permission or be the creator of the quote to delete it."
   args:
     - "123456"
-quotedeleteauthor:
-  desc: "Deletes all quotes by the specified author. If the author is not you, then ManageMessage server permission is required."
-  args:
-    - "@QuoteSpammer"
 draw:
   desc: "Draws a card from this server's deck. You can draw up to 10 cards by supplying a number of cards to draw."
   args:
@@ -793,9 +776,10 @@ linux:
   args:
     - "Spyware Windows"
 next:
-  desc: "Goes to the next song in the queue. You have to be in the same voice channel as the bot"
+  desc: "Goes to the next song in the queue. You have to be in the same voice channel as the bot. You can skip multiple songs, but in that case songs will not be requeued if {0}rcs or {0}rpl is enabled."
   args:
     - ""
+    - "5"
 play:
   desc: "If no parameters are specified, acts as `{0}next 1` command. If you specify a song number, it will jump to that song. If you specify a search query, acts as a `{0}q` command"
   args:
@@ -1233,10 +1217,6 @@ emojiadd:
     - ":someonesCustomEmoji:"
     - "MyEmojiName :someonesCustomEmoji:"
     - "owoNice https://cdn.discordapp.com/emojis/587930873811173386.png?size=128"
-emojiremove:
-  desc: "Removes the specified emoji or emojis from this server."
-  args:
-    - ":eagleWarrior: :plumedArcher:"
 deckshuffle:
   desc: "Reshuffles all cards back into the deck."
   args:
@@ -1684,13 +1664,6 @@ banmsgreset:
   desc: "Resets ban message to default. If you want to completely disable ban messages, use `{0}banmsg -`"
   args:
     - ""
-banprune:
-  desc: |-
-    Sets how many days of messages will be deleted when a user is banned.
-    Only works if the user is banned via the .ban command or punishment.
-    Allowed values: 0 - 7
-  args:
-    - "3"
 wait:
   desc: "Used only as a startup command. Waits a certain number of miliseconds before continuing the execution of the following startup commands."
   args:
@@ -2264,14 +2237,6 @@ bankbalance:
   desc: "Shows your current bank balance available for withdrawal."
   args:
     - ""
-banktake:
-  desc: "Takes the specified amount of currency from a user's bank"
-  args:
-    - "500 @MoniLaunder"
-bankaward:
-  desc: "Award the specified amount of currency to a user's bank"
-  args:
-    - "99999 @Bestie"
 patron:
   desc: "Check your patronage status and command usage quota. Bot owners can check targeted user's patronage status."
   args:
@@ -2313,11 +2278,3 @@ bettest:
     - ""
     - "betflip 1000"
     - "slot 2000"
-threadcreate:
-  desc: "Create a public thread with the specified title. You may optionally reply to a message to have it as a starting point."
-  args:
-    - "Q&A"
-threaddelete:
-  desc: "Delete a thread with the specified name in this channel. Case insensitive."
-  args:
-    - "Q&A"

src/NadekoBot/data/strings/responses/responses.ar.json

@@ -975,77 +975,5 @@
     "exprs_cleared": "",
     "expr_reset": "",
     "expr_set": "",
-    "expr_edited": "",
-    "stream_online_delete_enabled": "",
-    "stream_online_delete_disabled": "",
-    "club_create_error_name": "",
-    "club_desc_update": "",
-    "bank_accounts": "",
-    "module_description_medusa": "",
-    "list_of_medusae": "",
-    "list_of_unloaded": "",
-    "medusa_name_not_found": "",
-    "medusa_info": "",
-    "sneks_count": "",
-    "commands_count": "",
-    "no_medusa_loaded": "",
-    "no_medusa_available": "",
-    "loaded_medusae": "",
-    "medusa_not_loaded": "",
-    "medusa_possibly_cant_unload": "",
-    "medusa_loaded": "",
-    "medusa_unloaded": "",
-    "medusa_empty": "",
-    "medusa_already_loaded": "",
-    "medusa_invalid_not_found": "",
-    "bank_balance": "",
-    "bank_deposited": "",
-    "bank_withdrew": "",
-    "bank_withdraw_insuff": "",
-    "cmd_group_commands": "",
-    "limit_reached": "",
-    "feature_limit_reached_you": "",
-    "feature_limit_reached_owner": "",
-    "feature_limit_reached_either": "",
-    "tier": "",
-    "pledge": "",
-    "expires": "",
-    "commands": "",
-    "groups": "",
-    "modules": "",
-    "no_quota_found": "",
-    "patron_info": "",
-    "quotas": "",
-    "patron_not_enabled": "",
-    "results_in": "",
-    "patron_msg_sent": "",
-    "cards": "",
-    "hand_value": "",
-    "roll2": "",
-    "rolls": "",
-    "available_tests": "",
-    "test_results_for": "",
-    "multiplier": "",
-    "trivia_ended": "",
-    "card": "",
-    "guess": "",
-    "repeater_skip_next": "",
-    "repeater_dont_skip_next": "",
-    "remind_timely": "",
-    "xp_shop_disabled": "",
-    "timely_time": "",
-    "buy": "",
-    "use": "",
-    "in_use": "",
-    "xp_shop_item_cant_use": "",
-    "linkonly_enable": "",
-    "linkonly_disable": "",
-    "xp_shop_buy_required_tier": "",
-    "available_commands": "",
-    "xpadd_users": "",
-    "xpshop_buy_success": "",
-    "patron_insuff_tier": "",
-    "xpshop_already_owned": "",
-    "xpshop_item_not_found": "",
-    "xpshop_website": ""
+    "expr_edited": ""
 }

src/NadekoBot/data/strings/responses/responses.de-DE.json

@@ -1,5 +1,5 @@
 {
-    "api_key_missing": "Der API Key fehlt.",
+    "api_key_missing": "Der API Key der für diesen Befehl benötigt wird ist nicht angegeben.",
     "quote_deleted": "Zitat gelöscht",
     "redacted_too_long": "Wurde entfernt da es zu lang ist.",
     "trigger": "Auslöser",
@@ -10,7 +10,7 @@
     "banned_user": "Nutzer gebannt",
     "byedel_off": "Die automatische Löschung der Verabschiedungs Nachrichten wurde deaktiviert.",
     "byedel_on": "Verabschiedungs Nachrichten werden nach {0} Sekunden gelöscht.",
-    "byemsg_cur": "Derzeitige Verabschiedungs Nachricht: {0}",
+    "byemsg_cur": "Derzeitige Verabschiedungs Nachricht",
     "byemsg_enable": "Beim schreiben von {0} werden die Verabschiedungs Nachrichten aktiviert.",
     "byemsg_new": "Neue Verabschiedungs Nachricht gesetzt",
     "bye_off": "Abschiedansagen ausgeschaltet.",
@@ -922,9 +922,9 @@
     "pages": "Seiten",
     "favorites": "Favoriten",
     "tags": "Stichworte",
-    "invalid_emoji_link": "Der angegebene Link is entweder kein Bild, oder größer als 256KB.",
-    "emoji_add_error": "Fehler beim hinzufügen des Emoji. Es sind keine Emoji slots mehr vorhanden, oder die Bildgröße ist unangemessen.",
-    "emoji_added": "Neuen Emoji hinzugefügt: {0}",
+    "invalid_emoji_link": "",
+    "emoji_add_error": "",
+    "emoji_added": "",
     "boost_on": "",
     "boost_off": "",
     "boostmsg_cur": "",
@@ -932,16 +932,16 @@
     "boostmsg_new": "",
     "boostdel_off": "",
     "boostdel_on": "",
-    "log_ignored_channels": "Ignorierte Kanäle",
-    "log_ignored_users": "Ignorierte User",
-    "log_ignore_user": "Logging wird User {0} ignorieren",
-    "log_not_ignore_user": "Logging wird nicht länger User {0} ignorieren",
-    "log_ignore_chan": "Logging wird Kanal {0} ignorieren",
-    "log_not_ignore_chan": "Logging wird nicht länger Kanal {0} ignorieren",
+    "log_ignored_channels": "",
+    "log_ignored_users": "",
+    "log_ignore_user": "",
+    "log_not_ignore_user": "",
+    "log_ignore_chan": "",
+    "log_not_ignore_chan": "",
     "streams_cleared": "",
-    "warn_weight": "Gewicht: {0}",
-    "warn_count": "{0} momentan, {1} insgesamt",
-    "mass_ban_in_progress": "Es werden {0} User gebannt...",
+    "warn_weight": "",
+    "warn_count": "",
+    "mass_ban_in_progress": "",
     "mass_ban_completed": "",
     "reminder_server_list": "",
     "imageonly_enable": "",
@@ -975,77 +975,5 @@
     "exprs_cleared": "",
     "expr_reset": "",
     "expr_set": "",
-    "expr_edited": "",
-    "stream_online_delete_enabled": "",
-    "stream_online_delete_disabled": "",
-    "club_create_error_name": "",
-    "club_desc_update": "",
-    "bank_accounts": "",
-    "module_description_medusa": "",
-    "list_of_medusae": "",
-    "list_of_unloaded": "",
-    "medusa_name_not_found": "",
-    "medusa_info": "",
-    "sneks_count": "",
-    "commands_count": "",
-    "no_medusa_loaded": "",
-    "no_medusa_available": "",
-    "loaded_medusae": "",
-    "medusa_not_loaded": "",
-    "medusa_possibly_cant_unload": "",
-    "medusa_loaded": "",
-    "medusa_unloaded": "",
-    "medusa_empty": "",
-    "medusa_already_loaded": "",
-    "medusa_invalid_not_found": "",
-    "bank_balance": "",
-    "bank_deposited": "",
-    "bank_withdrew": "",
-    "bank_withdraw_insuff": "",
-    "cmd_group_commands": "",
-    "limit_reached": "",
-    "feature_limit_reached_you": "",
-    "feature_limit_reached_owner": "",
-    "feature_limit_reached_either": "",
-    "tier": "",
-    "pledge": "",
-    "expires": "",
-    "commands": "",
-    "groups": "",
-    "modules": "",
-    "no_quota_found": "",
-    "patron_info": "",
-    "quotas": "",
-    "patron_not_enabled": "",
-    "results_in": "",
-    "patron_msg_sent": "",
-    "cards": "",
-    "hand_value": "",
-    "roll2": "",
-    "rolls": "",
-    "available_tests": "",
-    "test_results_for": "",
-    "multiplier": "",
-    "trivia_ended": "",
-    "card": "",
-    "guess": "",
-    "repeater_skip_next": "",
-    "repeater_dont_skip_next": "",
-    "remind_timely": "",
-    "xp_shop_disabled": "",
-    "timely_time": "",
-    "buy": "",
-    "use": "",
-    "in_use": "",
-    "xp_shop_item_cant_use": "",
-    "linkonly_enable": "",
-    "linkonly_disable": "",
-    "xp_shop_buy_required_tier": "",
-    "available_commands": "",
-    "xpadd_users": "",
-    "xpshop_buy_success": "",
-    "patron_insuff_tier": "",
-    "xpshop_already_owned": "",
-    "xpshop_item_not_found": "",
-    "xpshop_website": ""
+    "expr_edited": ""
 }

src/NadekoBot/data/strings/responses/responses.en-US.json

@@ -12,7 +12,6 @@
   "invalid_emoji_link": "Specified link is either not an image or exceeds 256KB.",
   "emoji_add_error": "Error adding emoji. You either ran out of emoji slots, or image size is inadequate.",
   "emoji_added": "Added a new emoji: {0}",
-  "emoji_not_removed": "The following emojis were not removed: {0}",
   "fw_cleared": "Removed all filtered words and filtered words channel settings.",
   "aliases_cleared": "All {0} aliases on this server have been removed.",
   "no_results": "No results found.",
@@ -28,10 +27,6 @@
   "banmsg_default": "No ban message set. Default behavior will be used.",
   "banned_pl": "banned",
   "banned_user": "User Banned",
-  "ban_prune_disabled": "Banned user's messages will no longer be deleted.",
-  "ban_prune": "Bot will prune up to {0} day(s) worth of messages from banned user.",
-  "timeoutdm": "You have been timed out in {0} server.\nReason: {1}",
-  "timedout_user": "User Timed Out",
   "remove_roles_pl": "have had their roles removed",
   "bot_name": "Bot's name changed to {0}",
   "bot_status": "Bot status changed to {0}",
@@ -146,10 +141,6 @@
   "rar_err": "Failed to remove roles. I have insufficient permissions.",
   "rc": "Color of {0} role has been changed.",
   "rc_perms": "Error occurred due to invalid color or insufficient permissions.",
-  "color": "Color",
-  "icon": "Icon",
-  "hoisted": "Hoisted",
-  "mentionable": "Mentionable",
   "remrole": "Successfully removed role {0} from user {1}",
   "remrole_err": "Failed to remove role. I have insufficient permissions.",
   "renrole": "Role renamed.",
@@ -597,7 +588,6 @@
   "presence": "Presence",
   "presence_txt": "{0} Servers\n{1} Text Channels\n{2} Voice Channels",
   "quotes_deleted": "Deleted all quotes with {0} keyword.",
-  "quotes_deleted_count": "Deleted {0} quotes.",
   "quotes_page": "Page {0} of quotes",
   "quotes_page_none": "No quotes found on that page.",
   "quotes_remove_none": "No quotes found which you can remove.",

src/NadekoBot/data/strings/responses/responses.es-ES.json

@@ -975,77 +975,5 @@
     "exprs_cleared": "Se han eliminado las {0} expresiones de este servidor.",
     "expr_reset": "Las expresiones con la ID {0} ya no agregarán reacciones.",
     "expr_set": "La expresión con la ID {0} añadirá las siguientes reacciones al mensaje de respuesta: {1}",
-    "expr_edited": "Expresión editada.",
-    "stream_online_delete_enabled": "",
-    "stream_online_delete_disabled": "",
-    "club_create_error_name": "",
-    "club_desc_update": "",
-    "bank_accounts": "",
-    "module_description_medusa": "",
-    "list_of_medusae": "",
-    "list_of_unloaded": "",
-    "medusa_name_not_found": "",
-    "medusa_info": "",
-    "sneks_count": "",
-    "commands_count": "",
-    "no_medusa_loaded": "",
-    "no_medusa_available": "",
-    "loaded_medusae": "",
-    "medusa_not_loaded": "",
-    "medusa_possibly_cant_unload": "",
-    "medusa_loaded": "",
-    "medusa_unloaded": "",
-    "medusa_empty": "",
-    "medusa_already_loaded": "",
-    "medusa_invalid_not_found": "",
-    "bank_balance": "",
-    "bank_deposited": "",
-    "bank_withdrew": "",
-    "bank_withdraw_insuff": "",
-    "cmd_group_commands": "",
-    "limit_reached": "",
-    "feature_limit_reached_you": "",
-    "feature_limit_reached_owner": "",
-    "feature_limit_reached_either": "",
-    "tier": "",
-    "pledge": "",
-    "expires": "",
-    "commands": "",
-    "groups": "",
-    "modules": "",
-    "no_quota_found": "",
-    "patron_info": "",
-    "quotas": "",
-    "patron_not_enabled": "",
-    "results_in": "",
-    "patron_msg_sent": "",
-    "cards": "",
-    "hand_value": "",
-    "roll2": "",
-    "rolls": "",
-    "available_tests": "",
-    "test_results_for": "",
-    "multiplier": "",
-    "trivia_ended": "",
-    "card": "",
-    "guess": "",
-    "repeater_skip_next": "",
-    "repeater_dont_skip_next": "",
-    "remind_timely": "",
-    "xp_shop_disabled": "",
-    "timely_time": "",
-    "buy": "",
-    "use": "",
-    "in_use": "",
-    "xp_shop_item_cant_use": "",
-    "linkonly_enable": "",
-    "linkonly_disable": "",
-    "xp_shop_buy_required_tier": "",
-    "available_commands": "",
-    "xpadd_users": "",
-    "xpshop_buy_success": "",
-    "patron_insuff_tier": "",
-    "xpshop_already_owned": "",
-    "xpshop_item_not_found": "",
-    "xpshop_website": ""
+    "expr_edited": "Expresión editada."
 }

src/NadekoBot/data/strings/responses/responses.fr-FR.json

@@ -143,17 +143,17 @@
     "waifus_top_waifus": "Meilleures Waifu",
     "waifu_claimed": "a revendiqué {0} comme sa waifu pour {1} !",
     "waifu_divorced_like": "Vous avez divorcé d'une waifu qui vous aimait. Vous n'êtes qu'un monstre sans cœur, {0} a reçu {1} en compensation.",
-    "waifu_egomaniac": "vous ne pouvez pas tomber amoureux·se de vous-même, narcissique.",
+    "waifu_egomaniac": "vous ne pouvez pas tomber amoureux de vous-même, gros narcissique.",
     "waifu_fulfilled": "🎉 Leur amour est accompli 🎉\nLa nouvelle valeur de {0} est {1} !",
-    "waifu_not_enough": "Vous devrez payer {0} ou plus pour revendiquer cette waifu !",
+    "waifu_not_enough": "Vous devez payer {0} ou plus pour revendiquer cette waifu !",
     "waifu_not_yours": "Cette waifu n'est pas vôtre.",
     "waifu_not_yourself": "Vous ne pouvez pas vous revendiquer vous-même.",
-    "waifu_recent_divorce": "Vous avez récemment divorcé·e. Vous devrez attendre {0} heures et {1} minutes avant de pouvoir divorcer à nouveau.",
+    "waifu_recent_divorce": "Vous avez récemment divorcé. Vous devez attendre {0} heures et {1} minutes avant de pouvoir divorcer à nouveau.",
     "waifu_transfer_fail": "Vous n'êtes pas le propriétaire de cette waifu.",
     "waifu_transfer_success": "La propriété de {0} a été transférée de {1} à {2}.",
     "nobody": "Personne",
     "waifu_divorced_notlike": "Vous avez divorcé d'une waifu qui ne vous aimait pas. Vous avez reçu {0} en compensation.",
-    "waifu_reset": "Vos stats de waifu ont été réinitialisées.",
+    "waifu_reset": "Vos stats de waifu ont été réinitialisée.",
     "waifu_reset_fail": "Échec de la réinitialisation des stats de waifu. Assurez-vous d'avoir assez de devises.",
     "waifu_reset_confirm": "Cela réinitialisera vos stats de waifu",
     "acrophobia": "Acrophobie",
@@ -513,12 +513,12 @@
     "feed_out_of_range": "L'index est en dehors de la plage disponible.",
     "feed_removed": "Le flux est supprimé.",
     "feed_no_feed": "Vous n'avez souscrit à aucun fil d'actualité sur ce serveur.",
-    "timely_none": "Le propriétaire de ce bot n'a pas spécifié de récompense opportune.",
-    "timely_already_claimed": "Vous avez déjà obtenu votre récompense opportune. Vous ne pourrez l'obtenir de nouveau que {0}.",
+    "timely_none": "Le propriétaire de ce bot n'a pas spécifié de récompense récurrente.",
+    "timely_already_claimed": "Vous avez déjà obtenu votre récompense récurrente. Vous pourrez l'obtenir de nouveau dans {0}.",
     "timely": "Vous venez de réclamer vos {0}. Vous pourrez réclamer à nouveau dans {1}h.",
     "timely_set": "Les utilisateurs pourront réclamer {0} toutes les {1}h.",
-    "timely_set_none": "Les utilisateurs ne pourront réclamer aucune récompense opportune.",
-    "timely_reset": "Tous les utilisateurs pourront réclamer leurs récompenses opportunes de nouveau.",
+    "timely_set_none": "Les utilisateurs ne pourront réclamer aucune devise récurrente.",
+    "timely_reset": "Tous les utilisateurs peuvent réclamer leur devise récurrente de nouveau.",
     "market_cap": "Capitalisation Boursière",
     "volume_24h": "Volume (24h)",
     "change_7d_24h": "Change (7j/24h)",
@@ -975,77 +975,5 @@
     "exprs_cleared": "L'ensemble des {0} expressions du serveur ont été retirées.",
     "expr_reset": "L'expression avec l'id {0} ne rajoutera plus de réactions.",
     "expr_set": "L'expression avec l'id {0} ajoutera automatiquement ces réactions au message de réponse : {1}",
-    "expr_edited": "Expression éditée",
-    "stream_online_delete_enabled": "Aucune méduse de ce nom n'a été trouvée ou le fichier était invalide",
-    "stream_online_delete_disabled": "Les notifications de diffusions en ligne ne seront plus supprimées quand la diffusion sera hors ligne.",
-    "club_create_error_name": "Échec de la création du club. Un club existe du même nom existe déjà.",
-    "club_desc_update": "La description du club a été mise à jour",
-    "bank_accounts": "Comptes bancaires",
-    "module_description_medusa": "**Unique au propriétaire du bot.** Charger, décharger et maintenez des modules dynamiques. Découvrez en plus [ici](https://nadekobot.readthedocs.io/en/latest/medusa/creating-a-medusa/)",
-    "list_of_medusae": "Liste des méduses",
-    "list_of_unloaded": "Liste des méduses disponible",
-    "medusa_name_not_found": "Une méduse de ce nom n'existe pas ou n'est pas chargée.",
-    "medusa_info": "Information de la méduse",
-    "sneks_count": "Sneks ({0})",
-    "commands_count": "Commandes ({0})",
-    "no_medusa_loaded": "Aucunes méduses de chargées.",
-    "no_medusa_available": "Aucune méduse de disponible.",
-    "loaded_medusae": "Méduses chargées",
-    "medusa_not_loaded": "La méduse de ce nom n'est pas chargée.",
-    "medusa_possibly_cant_unload": "La méduse n'est probablement pas entièrement chargée. Redémarrez le bot si le problème persiste.",
-    "medusa_loaded": "La méduse {0} a été chargée.",
-    "medusa_unloaded": "La méduse {0} a été déchargée.",
-    "medusa_empty": "La méduse n'a pas été chargée puisqu'elle ne contient aucun Sneks.",
-    "medusa_already_loaded": "La méduse {0} est déjà chargée",
-    "medusa_invalid_not_found": "Aucune méduse de ce nom n'a été trouvée ou le fichier était invalide",
-    "bank_balance": "Vous disposez de {0} sur votre compte bancaire.",
-    "bank_deposited": "Vous avez déposé {0} sur votre compte bancaire.",
-    "bank_withdrew": "Vous avez retiré {0} de votre compte bancaire.",
-    "bank_withdraw_insuff": "Vous ne disposez pas suffisamment de {0} sur votre compte bancaire.",
-    "cmd_group_commands": "Groupe de commande '{0}'",
-    "limit_reached": "La limite des fonctionnalités de {0} a été atteinte.",
-    "feature_limit_reached_you": "Vous avez atteint la limite de {0} pour la fonctionnalité {1}. Vous pouvez augmenter cette limite en augmentant votre niveau de contribution.",
-    "feature_limit_reached_owner": "Le propriétaire du serveur a atteint la limite de {0} pour la fonctionnalité {1}. Ce dernier peut augmenter cette limite en augmentant son niveau de contribution.",
-    "feature_limit_reached_either": "La limite de {0} pour la fonctionnalité {1} a été atteinte. Soit vous ou le propriétaire du serveur peut augmenter cette limite en augmentant le niveau de contribution.",
-    "tier": "Niveau",
-    "pledge": "Promesse",
-    "expires": "Expire",
-    "commands": "Commandes",
-    "groups": "Groupes",
-    "modules": "Modules",
-    "no_quota_found": "Aucun quota de trouvé.",
-    "patron_info": "Info de la·e contributeur·rice",
-    "quotas": "<<< Quotas >>>",
-    "patron_not_enabled": "Le système de contribution est désactivé.",
-    "results_in": "{0} résulte en {1}s",
-    "patron_msg_sent": "L'envoi de messages aux contributeur·rice·s de niveau {1} et au-delà a été effectué. {1} ont été envoyés avec succès et {2} ont échoué.",
-    "cards": "Cartes",
-    "hand_value": "Valeur de la main",
-    "roll2": "Lancé",
-    "rolls": "Lancés",
-    "available_tests": "Tests disponibles",
-    "test_results_for": "Résultats du test pour {0}",
-    "multiplier": "Multiplier",
-    "trivia_ended": "Le jeu de culture générale est terminé",
-    "card": "Carte",
-    "guess": "Deviner",
-    "repeater_skip_next": "Le prochain rappel de ce répéteur sera ignoré.",
-    "repeater_dont_skip_next": "Le prochain rappel de ce répéteur ne sera pas ignoré.",
-    "remind_timely": "Je vous notifierai afin d'obtenir votre prochaine récompense {0}",
-    "xp_shop_disabled": "Le magasin d'XP est désactivé par le propriétaire, ou il n'y a aucun item à vendre.",
-    "timely_time": "C'est l'heure votre récompense opportune.",
-    "buy": "Acheter",
-    "use": "Utiliser",
-    "in_use": "En utilisation",
-    "xp_shop_item_cant_use": "Vous ne pouvez pas utiliser cet item car il ne vous appartient pas ou il n'existe pas.",
-    "linkonly_enable": "Ce channel est désormais limité aux liens.",
-    "linkonly_disable": "Ce channel n'est désormais plus limité aux liens.",
-    "xp_shop_buy_required_tier": "Acheter des items de ce magasin requiert d'être Tier Patron {0} ou au-delà.",
-    "available_commands": "Commandes disponibles",
-    "xpadd_users": "Ajout de {0} XP du serveur à l'utilisateur {1}.",
-    "xpshop_buy_success": "Vous avez acheté avec succès `{0}/{1}`",
-    "patron_insuff_tier": "Votre Tier Patron est insuffisant pour réaliser cette action.",
-    "xpshop_already_owned": "Vous disposez déjà de cet item.",
-    "xpshop_item_not_found": "Aucun item disposant de cette clé n'existe.",
-    "xpshop_website": "Vous pouvez voir la liste de tous les items du magasin d'XP ici: <https://xpshop.nadeko.bot>"
+    "expr_edited": "Expression éditée"
 }

src/NadekoBot/data/strings/responses/responses.id-ID.json

@@ -975,77 +975,5 @@
     "exprs_cleared": "",
     "expr_reset": "",
     "expr_set": "",
-    "expr_edited": "",
-    "stream_online_delete_enabled": "",
-    "stream_online_delete_disabled": "",
-    "club_create_error_name": "",
-    "club_desc_update": "",
-    "bank_accounts": "",
-    "module_description_medusa": "",
-    "list_of_medusae": "",
-    "list_of_unloaded": "",
-    "medusa_name_not_found": "",
-    "medusa_info": "",
-    "sneks_count": "",
-    "commands_count": "",
-    "no_medusa_loaded": "",
-    "no_medusa_available": "",
-    "loaded_medusae": "",
-    "medusa_not_loaded": "",
-    "medusa_possibly_cant_unload": "",
-    "medusa_loaded": "",
-    "medusa_unloaded": "",
-    "medusa_empty": "",
-    "medusa_already_loaded": "",
-    "medusa_invalid_not_found": "",
-    "bank_balance": "",
-    "bank_deposited": "",
-    "bank_withdrew": "",
-    "bank_withdraw_insuff": "",
-    "cmd_group_commands": "",
-    "limit_reached": "",
-    "feature_limit_reached_you": "",
-    "feature_limit_reached_owner": "",
-    "feature_limit_reached_either": "",
-    "tier": "",
-    "pledge": "",
-    "expires": "",
-    "commands": "",
-    "groups": "",
-    "modules": "",
-    "no_quota_found": "",
-    "patron_info": "",
-    "quotas": "",
-    "patron_not_enabled": "",
-    "results_in": "",
-    "patron_msg_sent": "",
-    "cards": "",
-    "hand_value": "",
-    "roll2": "",
-    "rolls": "",
-    "available_tests": "",
-    "test_results_for": "",
-    "multiplier": "",
-    "trivia_ended": "",
-    "card": "",
-    "guess": "",
-    "repeater_skip_next": "",
-    "repeater_dont_skip_next": "",
-    "remind_timely": "",
-    "xp_shop_disabled": "",
-    "timely_time": "",
-    "buy": "",
-    "use": "",
-    "in_use": "",
-    "xp_shop_item_cant_use": "",
-    "linkonly_enable": "",
-    "linkonly_disable": "",
-    "xp_shop_buy_required_tier": "",
-    "available_commands": "",
-    "xpadd_users": "",
-    "xpshop_buy_success": "",
-    "patron_insuff_tier": "",
-    "xpshop_already_owned": "",
-    "xpshop_item_not_found": "",
-    "xpshop_website": ""
+    "expr_edited": ""
 }

src/NadekoBot/data/strings/responses/responses.it-IT.json

@@ -975,77 +975,5 @@
     "exprs_cleared": "",
     "expr_reset": "",
     "expr_set": "",
-    "expr_edited": "",
-    "stream_online_delete_enabled": "",
-    "stream_online_delete_disabled": "",
-    "club_create_error_name": "",
-    "club_desc_update": "",
-    "bank_accounts": "",
-    "module_description_medusa": "",
-    "list_of_medusae": "",
-    "list_of_unloaded": "",
-    "medusa_name_not_found": "",
-    "medusa_info": "",
-    "sneks_count": "",
-    "commands_count": "",
-    "no_medusa_loaded": "",
-    "no_medusa_available": "",
-    "loaded_medusae": "",
-    "medusa_not_loaded": "",
-    "medusa_possibly_cant_unload": "",
-    "medusa_loaded": "",
-    "medusa_unloaded": "",
-    "medusa_empty": "",
-    "medusa_already_loaded": "",
-    "medusa_invalid_not_found": "",
-    "bank_balance": "",
-    "bank_deposited": "",
-    "bank_withdrew": "",
-    "bank_withdraw_insuff": "",
-    "cmd_group_commands": "",
-    "limit_reached": "",
-    "feature_limit_reached_you": "",
-    "feature_limit_reached_owner": "",
-    "feature_limit_reached_either": "",
-    "tier": "",
-    "pledge": "",
-    "expires": "",
-    "commands": "",
-    "groups": "",
-    "modules": "",
-    "no_quota_found": "",
-    "patron_info": "",
-    "quotas": "",
-    "patron_not_enabled": "",
-    "results_in": "",
-    "patron_msg_sent": "",
-    "cards": "",
-    "hand_value": "",
-    "roll2": "",
-    "rolls": "",
-    "available_tests": "",
-    "test_results_for": "",
-    "multiplier": "",
-    "trivia_ended": "",
-    "card": "",
-    "guess": "",
-    "repeater_skip_next": "",
-    "repeater_dont_skip_next": "",
-    "remind_timely": "",
-    "xp_shop_disabled": "",
-    "timely_time": "",
-    "buy": "",
-    "use": "",
-    "in_use": "",
-    "xp_shop_item_cant_use": "",
-    "linkonly_enable": "",
-    "linkonly_disable": "",
-    "xp_shop_buy_required_tier": "",
-    "available_commands": "",
-    "xpadd_users": "",
-    "xpshop_buy_success": "",
-    "patron_insuff_tier": "",
-    "xpshop_already_owned": "",
-    "xpshop_item_not_found": "",
-    "xpshop_website": ""
+    "expr_edited": ""
 }

src/NadekoBot/data/strings/responses/responses.nl-NL.json

@@ -1,22 +1,22 @@
 {
     "api_key_missing": "Api sleutel ontbreekt.",
-    "quote_deleted": "Citaat #{0} verwijderd.",
+    "quote_deleted": "Citaat #{0} verwijderd",
     "redacted_too_long": "Aangepast omdat het te lang is.",
-    "trigger": "Trigger, leiden tot",
+    "trigger": "Trigger",
     "response": "Reactie",
-    "fw_cleared": "Alle gefilterde woorden en gefilterde woorden kanaalinstellingen verwijderd.",
-    "aar_disabled": "**Automatisch toekennen van de rol** bij het toetreden van een gebruiker is nu **uitgeschakeld**.",
+    "fw_cleared": "Alle gefilterde woorden en gefilterde woordenkanalen verwijderd",
+    "aar_disabled": "Gebruikers die lid worden van deze server zullen niet automatisch rollen krijgen.",
     "bandm": "Je bent verbannen van de {0} server.\nReden: {1}",
     "banned_user": "Gebruiker is verbannen.",
     "byedel_off": "Automatisch verwijderen van afscheidsberichten is uitgeschakeld.",
     "byedel_on": "Afscheidsbericht wordt verwijderd na {0} seconden.",
-    "byemsg_cur": "Huidig afscheidsbericht: {0}",
-    "byemsg_enable": "Activeer afscheidsberichten door {0} te typen",
+    "byemsg_cur": "Huidig afscheidsbericht",
+    "byemsg_enable": "Zet afscheidsberichten aan met {0}",
     "byemsg_new": "Nieuw afscheidsbericht is ingesteld.",
     "bye_off": "Vertreknotificaties uitgezet.",
     "bye_on": "Vertreknotificaties ingesteld voor dit kanaal.",
     "cr": "Rol {0} is succesvol aangemaakt",
-    "dr": "Rol {0} is verwijderd.",
+    "dr": "De rol {0} is verwijderd.",
     "createtextchan": "Tekst kanaal {0} aangemaakt.",
     "createvoich": "Spraak-kanaal {0} aangemaakt.",
     "deafen": "Demping succesvol ingesteld.",
@@ -33,12 +33,12 @@
     "fwdm_stop": "Ik zal vanaf nu geen Priveberichten meer doorsturen.",
     "greetdel_off": "Automatisch verwijderen van welkomstberichten is uitgeschakeld.",
     "greetdel_on": "Welkomstberichten worden na {0} seconden verwijderd.",
-    "greetdmmsg_cur": "Huidige privebericht begroeting: {0}",
+    "greetdmmsg_cur": "Huidige privebericht begroeting",
     "greetdmmsg_enable": "Zet privebericht begroeting aan door {0} te typen.",
     "greetdmmsg_new": "Nieuw privebericht begroeting ingesteld.",
     "greetdm_off": "Begroetingsnotificaties per PB uitgezet.",
     "greetdm_on": "Begroetingsnotificaties per PB ingeschakeld.",
-    "greetmsg_cur": "Huidig welkomstbericht: {0}",
+    "greetmsg_cur": "Huidig welkomstbericht",
     "greetmsg_enable": "Typ {0} om welkomstberichten in te schakelen.",
     "greetmsg_new": "Nieuw welkomstbericht ingesteld.",
     "greet_off": "Begroetingsnotificaties uitgezet.",
@@ -131,7 +131,7 @@
     "animal_race_starting": "Start over {0} seconden, of als de race vol is.",
     "animal_race_won": "{0} als {1} heeft de race gewonnen!",
     "dice_invalid_number": "Ongeldig aantal. Je kunt {0}-{1} dobbelstenen gelijktijdig werpen.",
-    "dice_rolled": "{0} gegooid",
+    "dice_rolled": "{0} gegooid.",
     "dice_rolled_num": "Dobbelsteen gegooid: {0}",
     "changes_of_heart": "Verandering van hart",
     "claimed_by": "Geclaimd door",
@@ -946,106 +946,34 @@
     "reminder_server_list": "Lijst van serverherinneringen",
     "imageonly_enable": "Dit kanaal is nu alleen voor afbeeldingen.",
     "imageonly_disable": "Dit kanaal is niet langer alleen maar voor afbeeldingen.",
-    "transaction": "Valuta Transactie",
-    "finished_track": "Nummer Afgelopen",
-    "playing_track": "Nummer #{0} wordt gespeeld",
-    "queued_track": "Nummer in wachtrij",
-    "removed_track": "Nummer verwijderd",
-    "autoplaying": "Voegt automatisch nummers toe.",
-    "music_autoplay_on": "Muziek automatisch spelen ingeschakeld. Ik zal gerelateerde nummers in de wachtrij zetten als een nummer afloopt.",
-    "music_autoplay_off": "Automatisch spelen uitgezet.",
-    "track_moved": "Nummer verplaatst",
-    "atl_not_enabled": "Automatisch vertalen is voor dit kanaal niet ingeschakeld of je hebt een ongeldige taal ingevoerd.",
-    "channels": "Kanalen",
-    "track_not_found": "Nummer niet gevonden.",
-    "removed_track_error": "Er bestaat geen nummer op die positie.",
-    "market_cap_dominance": "Dominantie",
-    "circulating_supply": "Circulerende toevoer",
-    "module_description_expressions": "Stel een aangepaste reactie van de bot in op bepaalde woorden of zinnen.",
-    "deleted_x_servers": "{0} servers verwijderd.",
-    "curtr_gift": "Geschenk van {0} [{1}]",
-    "curtr_award": "Toegekend door de eigenaar van de bot {0} [{1}]",
-    "curtr_take": "Genomen door bot eigenaar {0} [{1}]",
-    "expr_deleted": "Uitdrukking verwijderd",
-    "expr_insuff_perms": "Onvoldoende rechten. Vereist Bot eigendom voor globale expressies, en Beheerder voor server expressies.",
-    "expressions": "Uitdrukkingen",
-    "expr_new": "Nieuwe Uitdrukking",
-    "expr_no_found": "Geen uitdrukking gevonden",
-    "expr_no_found_id": "Geen expressie gevonden met die id.",
-    "exprs_cleared": "Alle {0} expressies op deze server zijn verwijderd.",
-    "expr_reset": "Uitdrukking met id {0} zal niet langer reacties toevoegen.",
-    "expr_set": "Expressie met id {0} zal de volgende reacties toevoegen aan het antwoordbericht: {1}",
-    "expr_edited": "Uitdrukking bewerkt",
-    "stream_online_delete_enabled": "Online streammeldingen worden nu verwijderd wanneer de stream offline gaat.",
-    "stream_online_delete_disabled": "Meldingen van online streams worden niet langer verwijderd wanneer de stream offline gaat.",
-    "club_create_error_name": "Het aanmaken van de club is mislukt. Er bestaat al een club met die naam.",
-    "club_desc_update": "Club Beschrijving Bijgewerkt",
-    "bank_accounts": "Bankrekeningen",
-    "module_description_medusa": "**Alleen robot eigenaar.** Laadt, ontlaadt en behandelt dynamische modules. Lees meer [hier](https://nadekobot.readthedocs.io/en/latest/medusa/creating-a-medusa/)",
-    "list_of_medusae": "Lijst van Medusae",
-    "list_of_unloaded": "Lijst van beschikbare Medusae",
-    "medusa_name_not_found": "Medusa met die naam bestaat niet of is niet geladen.",
-    "medusa_info": "Medusa Informatie",
-    "sneks_count": "Sneks (Slangen) ({0})",
-    "commands_count": "Commando's ({0})",
-    "no_medusa_loaded": "Er zijn geen geladen medusae.",
-    "no_medusa_available": "Geen medusa beschikbaar.",
-    "loaded_medusae": "Geladen medusae.",
-    "medusa_not_loaded": "Medusa met die naam is niet geladen.",
-    "medusa_possibly_cant_unload": "Medusa is waarschijnlijk niet volledig ontladen. Start de bot opnieuw op als er problemen optreden.",
-    "medusa_loaded": "Medusa {0} is geladen.",
-    "medusa_unloaded": "Medusa {0} is uitgeladen.",
-    "medusa_empty": "",
-    "medusa_already_loaded": "Medusa {0} is al geladen",
-    "medusa_invalid_not_found": "Medusa is met deze naam niet gevonden, of het bestand is ongeldig,",
-    "bank_balance": "Je hebt {0} op je bankrekening.",
-    "bank_deposited": "Je hebt {0} op je bankrekening gestort.",
-    "bank_withdrew": "Je hebt {0} opgenomen van je bankrekening.",
-    "bank_withdraw_insuff": "Je hebt onvoldoende {0} op je bankrekening.",
-    "cmd_group_commands": "\"{0}\" commandogroep",
-    "limit_reached": "Feature limiet van {0} bereikt.",
-    "feature_limit_reached_you": "Jij hebt de limiet van {0} voor de {1} functie bereikt. U kunt in staat zijn om deze limiet te verhogen door het upgraden van uw patron tier.",
-    "feature_limit_reached_owner": "De server eigenaar heeft de limiet van {0} voor de {1} functie bereikt. De server eigenaar kan deze limiet wellicht opwaarderen door de patron tier te upgraden.",
-    "feature_limit_reached_either": "De limiet van {0} voor de {1} functie is bereikt. Jij of de server eigenaar kan deze limiet opwaarderen door de patron tier op te waarderen.",
-    "tier": "Niveau",
-    "pledge": "",
-    "expires": "Vervalt",
-    "commands": "Commando's",
-    "groups": "Groepen",
-    "modules": "Modulen",
-    "no_quota_found": "Geen quota gevonden",
-    "patron_info": "Patron Informatie",
-    "quotas": "",
-    "patron_not_enabled": "Patron systeem is uitgeschakeld.",
-    "results_in": "{0} resulteert in {1}s",
-    "patron_msg_sent": "Klaar met het verzenden van berichten naar patrons op niveau {1} en hoger. {1} succesvol verzonden en {2} mislukt.",
-    "cards": "Kaarten",
-    "hand_value": "",
-    "roll2": "Rol",
-    "rolls": "Rollen",
-    "available_tests": "Beschikbare testen",
-    "test_results_for": "Testresultaten voor {0}",
-    "multiplier": "Vermenigvuldiger",
-    "trivia_ended": "Trivia spel beëindigd",
-    "card": "Kaart",
-    "guess": "Gok",
-    "repeater_skip_next": "",
-    "repeater_dont_skip_next": "",
-    "remind_timely": "Ik zal u herinneren aan uw tijdige beloning {0}",
-    "xp_shop_disabled": "Xp shop is uitgeschakeld door de eigenaar, of er zijn geen items te koop.",
-    "timely_time": "Het is tijd voor uw tijdige beloning.",
-    "buy": "Koop",
-    "use": "Gebruiken",
-    "in_use": "In gebruik",
-    "xp_shop_item_cant_use": "Je kunt dit item niet gebruiken, omdat het niet bestaat of je het niet bezit.",
-    "linkonly_enable": "Dit kanaal is nu link-only.",
-    "linkonly_disable": "Dit kanaal is niet meer link-only.",
-    "xp_shop_buy_required_tier": "Voor het kopen van artikelen uit deze winkel is Patron Tier {0} of hoger vereist.",
-    "available_commands": "Beschikbare commando's",
-    "xpadd_users": "{0} server XP toegevoegd aan {1} gebruikers.",
-    "xpshop_buy_success": "Succesvol gekocht `{0}/{1}`",
-    "patron_insuff_tier": "Je Patron Tier is onvoldoende om deze actie uit te voeren.",
-    "xpshop_already_owned": "Je bezit dit voorwerp al.",
-    "xpshop_item_not_found": "Een item met die sleutel bestaat niet.",
-    "xpshop_website": "Je kan de lijst van alle Xp Shop artikelen hier zien: <https://xpshop.nadeko.bot>"
+    "transaction": "",
+    "finished_track": "",
+    "playing_track": "",
+    "queued_track": "",
+    "removed_track": "",
+    "autoplaying": "",
+    "music_autoplay_on": "",
+    "music_autoplay_off": "",
+    "track_moved": "",
+    "atl_not_enabled": "",
+    "channels": "",
+    "track_not_found": "",
+    "removed_track_error": "",
+    "market_cap_dominance": "",
+    "circulating_supply": "",
+    "module_description_expressions": "",
+    "deleted_x_servers": "",
+    "curtr_gift": "",
+    "curtr_award": "",
+    "curtr_take": "",
+    "expr_deleted": "",
+    "expr_insuff_perms": "",
+    "expressions": "",
+    "expr_new": "",
+    "expr_no_found": "",
+    "expr_no_found_id": "",
+    "exprs_cleared": "",
+    "expr_reset": "",
+    "expr_set": "",
+    "expr_edited": ""
 }

src/NadekoBot/data/strings/responses/responses.pl-PL.json

@@ -975,77 +975,5 @@
     "exprs_cleared": "",
     "expr_reset": "",
     "expr_set": "",
-    "expr_edited": "",
-    "stream_online_delete_enabled": "",
-    "stream_online_delete_disabled": "",
-    "club_create_error_name": "",
-    "club_desc_update": "",
-    "bank_accounts": "",
-    "module_description_medusa": "",
-    "list_of_medusae": "",
-    "list_of_unloaded": "",
-    "medusa_name_not_found": "",
-    "medusa_info": "",
-    "sneks_count": "",
-    "commands_count": "",
-    "no_medusa_loaded": "",
-    "no_medusa_available": "",
-    "loaded_medusae": "",
-    "medusa_not_loaded": "",
-    "medusa_possibly_cant_unload": "",
-    "medusa_loaded": "",
-    "medusa_unloaded": "",
-    "medusa_empty": "",
-    "medusa_already_loaded": "",
-    "medusa_invalid_not_found": "",
-    "bank_balance": "",
-    "bank_deposited": "",
-    "bank_withdrew": "",
-    "bank_withdraw_insuff": "",
-    "cmd_group_commands": "",
-    "limit_reached": "",
-    "feature_limit_reached_you": "",
-    "feature_limit_reached_owner": "",
-    "feature_limit_reached_either": "",
-    "tier": "",
-    "pledge": "",
-    "expires": "",
-    "commands": "",
-    "groups": "",
-    "modules": "",
-    "no_quota_found": "",
-    "patron_info": "",
-    "quotas": "",
-    "patron_not_enabled": "",
-    "results_in": "",
-    "patron_msg_sent": "",
-    "cards": "",
-    "hand_value": "",
-    "roll2": "",
-    "rolls": "",
-    "available_tests": "",
-    "test_results_for": "",
-    "multiplier": "",
-    "trivia_ended": "",
-    "card": "",
-    "guess": "",
-    "repeater_skip_next": "",
-    "repeater_dont_skip_next": "",
-    "remind_timely": "",
-    "xp_shop_disabled": "",
-    "timely_time": "",
-    "buy": "",
-    "use": "",
-    "in_use": "",
-    "xp_shop_item_cant_use": "",
-    "linkonly_enable": "",
-    "linkonly_disable": "",
-    "xp_shop_buy_required_tier": "",
-    "available_commands": "",
-    "xpadd_users": "",
-    "xpshop_buy_success": "",
-    "patron_insuff_tier": "",
-    "xpshop_already_owned": "",
-    "xpshop_item_not_found": "",
-    "xpshop_website": ""
+    "expr_edited": ""
 }

src/NadekoBot/data/strings/responses/responses.pt-BR.json

@@ -975,77 +975,5 @@
     "exprs_cleared": "Todas {0} expressões foram removidas deste servidor.",
     "expr_reset": "A expressão com o id {0} não adicionará mas reações.",
     "expr_set": "A expressão com a id {0} irá adicionar as seguintes reações na resposta: {1}  ",
-    "expr_edited": "Expressão editada",
-    "stream_online_delete_enabled": "",
-    "stream_online_delete_disabled": "",
-    "club_create_error_name": "",
-    "club_desc_update": "",
-    "bank_accounts": "",
-    "module_description_medusa": "",
-    "list_of_medusae": "",
-    "list_of_unloaded": "",
-    "medusa_name_not_found": "",
-    "medusa_info": "",
-    "sneks_count": "",
-    "commands_count": "",
-    "no_medusa_loaded": "",
-    "no_medusa_available": "",
-    "loaded_medusae": "",
-    "medusa_not_loaded": "",
-    "medusa_possibly_cant_unload": "",
-    "medusa_loaded": "",
-    "medusa_unloaded": "",
-    "medusa_empty": "",
-    "medusa_already_loaded": "",
-    "medusa_invalid_not_found": "",
-    "bank_balance": "",
-    "bank_deposited": "",
-    "bank_withdrew": "",
-    "bank_withdraw_insuff": "",
-    "cmd_group_commands": "",
-    "limit_reached": "",
-    "feature_limit_reached_you": "",
-    "feature_limit_reached_owner": "",
-    "feature_limit_reached_either": "",
-    "tier": "",
-    "pledge": "",
-    "expires": "",
-    "commands": "",
-    "groups": "",
-    "modules": "",
-    "no_quota_found": "",
-    "patron_info": "",
-    "quotas": "",
-    "patron_not_enabled": "",
-    "results_in": "",
-    "patron_msg_sent": "",
-    "cards": "",
-    "hand_value": "",
-    "roll2": "",
-    "rolls": "",
-    "available_tests": "",
-    "test_results_for": "",
-    "multiplier": "",
-    "trivia_ended": "",
-    "card": "",
-    "guess": "",
-    "repeater_skip_next": "",
-    "repeater_dont_skip_next": "",
-    "remind_timely": "",
-    "xp_shop_disabled": "",
-    "timely_time": "",
-    "buy": "",
-    "use": "",
-    "in_use": "",
-    "xp_shop_item_cant_use": "",
-    "linkonly_enable": "",
-    "linkonly_disable": "",
-    "xp_shop_buy_required_tier": "",
-    "available_commands": "",
-    "xpadd_users": "",
-    "xpshop_buy_success": "",
-    "patron_insuff_tier": "",
-    "xpshop_already_owned": "",
-    "xpshop_item_not_found": "",
-    "xpshop_website": ""
+    "expr_edited": "Expressão editada"
 }

src/NadekoBot/data/strings/responses/responses.ru-RU.json

@@ -975,77 +975,5 @@
     "exprs_cleared": "",
     "expr_reset": "",
     "expr_set": "",
-    "expr_edited": "",
-    "stream_online_delete_enabled": "",
-    "stream_online_delete_disabled": "",
-    "club_create_error_name": "",
-    "club_desc_update": "",
-    "bank_accounts": "",
-    "module_description_medusa": "",
-    "list_of_medusae": "",
-    "list_of_unloaded": "",
-    "medusa_name_not_found": "",
-    "medusa_info": "",
-    "sneks_count": "",
-    "commands_count": "",
-    "no_medusa_loaded": "",
-    "no_medusa_available": "",
-    "loaded_medusae": "",
-    "medusa_not_loaded": "",
-    "medusa_possibly_cant_unload": "",
-    "medusa_loaded": "",
-    "medusa_unloaded": "",
-    "medusa_empty": "",
-    "medusa_already_loaded": "",
-    "medusa_invalid_not_found": "",
-    "bank_balance": "",
-    "bank_deposited": "",
-    "bank_withdrew": "",
-    "bank_withdraw_insuff": "",
-    "cmd_group_commands": "",
-    "limit_reached": "",
-    "feature_limit_reached_you": "",
-    "feature_limit_reached_owner": "",
-    "feature_limit_reached_either": "",
-    "tier": "",
-    "pledge": "",
-    "expires": "",
-    "commands": "",
-    "groups": "",
-    "modules": "",
-    "no_quota_found": "",
-    "patron_info": "",
-    "quotas": "",
-    "patron_not_enabled": "",
-    "results_in": "",
-    "patron_msg_sent": "",
-    "cards": "",
-    "hand_value": "",
-    "roll2": "",
-    "rolls": "",
-    "available_tests": "",
-    "test_results_for": "",
-    "multiplier": "",
-    "trivia_ended": "",
-    "card": "",
-    "guess": "",
-    "repeater_skip_next": "",
-    "repeater_dont_skip_next": "",
-    "remind_timely": "",
-    "xp_shop_disabled": "",
-    "timely_time": "",
-    "buy": "",
-    "use": "",
-    "in_use": "",
-    "xp_shop_item_cant_use": "",
-    "linkonly_enable": "",
-    "linkonly_disable": "",
-    "xp_shop_buy_required_tier": "",
-    "available_commands": "",
-    "xpadd_users": "",
-    "xpshop_buy_success": "",
-    "patron_insuff_tier": "",
-    "xpshop_already_owned": "",
-    "xpshop_item_not_found": "",
-    "xpshop_website": ""
+    "expr_edited": ""
 }

src/NadekoBot/data/strings/responses/responses.uk-UA.json

@@ -975,77 +975,5 @@
     "exprs_cleared": "Всі {0} вирази на цьому сервері були вилучені.",
     "expr_reset": "Вираз з id {0} більше не получає реакцій.",
     "expr_set": "Вираз з цим id {0} буде получати вказані реакції до відповіді: {1}",
-    "expr_edited": "Вираз змінено",
-    "stream_online_delete_enabled": "",
-    "stream_online_delete_disabled": "",
-    "club_create_error_name": "",
-    "club_desc_update": "",
-    "bank_accounts": "",
-    "module_description_medusa": "",
-    "list_of_medusae": "",
-    "list_of_unloaded": "",
-    "medusa_name_not_found": "",
-    "medusa_info": "",
-    "sneks_count": "",
-    "commands_count": "",
-    "no_medusa_loaded": "",
-    "no_medusa_available": "",
-    "loaded_medusae": "",
-    "medusa_not_loaded": "",
-    "medusa_possibly_cant_unload": "",
-    "medusa_loaded": "",
-    "medusa_unloaded": "",
-    "medusa_empty": "",
-    "medusa_already_loaded": "",
-    "medusa_invalid_not_found": "",
-    "bank_balance": "",
-    "bank_deposited": "",
-    "bank_withdrew": "",
-    "bank_withdraw_insuff": "",
-    "cmd_group_commands": "",
-    "limit_reached": "",
-    "feature_limit_reached_you": "",
-    "feature_limit_reached_owner": "",
-    "feature_limit_reached_either": "",
-    "tier": "",
-    "pledge": "",
-    "expires": "",
-    "commands": "",
-    "groups": "",
-    "modules": "",
-    "no_quota_found": "",
-    "patron_info": "",
-    "quotas": "",
-    "patron_not_enabled": "",
-    "results_in": "",
-    "patron_msg_sent": "",
-    "cards": "",
-    "hand_value": "",
-    "roll2": "",
-    "rolls": "",
-    "available_tests": "",
-    "test_results_for": "",
-    "multiplier": "",
-    "trivia_ended": "",
-    "card": "",
-    "guess": "",
-    "repeater_skip_next": "",
-    "repeater_dont_skip_next": "",
-    "remind_timely": "",
-    "xp_shop_disabled": "",
-    "timely_time": "",
-    "buy": "",
-    "use": "",
-    "in_use": "",
-    "xp_shop_item_cant_use": "",
-    "linkonly_enable": "",
-    "linkonly_disable": "",
-    "xp_shop_buy_required_tier": "",
-    "available_commands": "",
-    "xpadd_users": "",
-    "xpshop_buy_success": "",
-    "patron_insuff_tier": "",
-    "xpshop_already_owned": "",
-    "xpshop_item_not_found": "",
-    "xpshop_website": ""
+    "expr_edited": "Вираз змінено"
 }

src/NadekoBot/data/strings/responses/responses.zh-CN.json

@@ -975,77 +975,5 @@
     "exprs_cleared": "",
     "expr_reset": "",
     "expr_set": "",
-    "expr_edited": "",
-    "stream_online_delete_enabled": "",
-    "stream_online_delete_disabled": "",
-    "club_create_error_name": "",
-    "club_desc_update": "",
-    "bank_accounts": "",
-    "module_description_medusa": "",
-    "list_of_medusae": "",
-    "list_of_unloaded": "",
-    "medusa_name_not_found": "",
-    "medusa_info": "",
-    "sneks_count": "",
-    "commands_count": "",
-    "no_medusa_loaded": "",
-    "no_medusa_available": "",
-    "loaded_medusae": "",
-    "medusa_not_loaded": "",
-    "medusa_possibly_cant_unload": "",
-    "medusa_loaded": "",
-    "medusa_unloaded": "",
-    "medusa_empty": "",
-    "medusa_already_loaded": "",
-    "medusa_invalid_not_found": "",
-    "bank_balance": "",
-    "bank_deposited": "",
-    "bank_withdrew": "",
-    "bank_withdraw_insuff": "",
-    "cmd_group_commands": "",
-    "limit_reached": "",
-    "feature_limit_reached_you": "",
-    "feature_limit_reached_owner": "",
-    "feature_limit_reached_either": "",
-    "tier": "",
-    "pledge": "",
-    "expires": "",
-    "commands": "",
-    "groups": "",
-    "modules": "",
-    "no_quota_found": "",
-    "patron_info": "",
-    "quotas": "",
-    "patron_not_enabled": "",
-    "results_in": "",
-    "patron_msg_sent": "",
-    "cards": "",
-    "hand_value": "",
-    "roll2": "",
-    "rolls": "",
-    "available_tests": "",
-    "test_results_for": "",
-    "multiplier": "",
-    "trivia_ended": "",
-    "card": "",
-    "guess": "",
-    "repeater_skip_next": "",
-    "repeater_dont_skip_next": "",
-    "remind_timely": "",
-    "xp_shop_disabled": "",
-    "timely_time": "",
-    "buy": "",
-    "use": "",
-    "in_use": "",
-    "xp_shop_item_cant_use": "",
-    "linkonly_enable": "",
-    "linkonly_disable": "",
-    "xp_shop_buy_required_tier": "",
-    "available_commands": "",
-    "xpadd_users": "",
-    "xpshop_buy_success": "",
-    "patron_insuff_tier": "",
-    "xpshop_already_owned": "",
-    "xpshop_item_not_found": "",
-    "xpshop_website": ""
+    "expr_edited": ""
 }

src/NadekoBot/data/strings/responses/responses.zh-TW.json

@@ -975,77 +975,5 @@
     "exprs_cleared": "此伺服器上的所有 {0} 表達式均已刪除。",
     "expr_reset": "ID 為 {0} 的表達式將不再添加反應。",
     "expr_set": "ID 為 {0} 的表達式將在響應消息中添加以下反應：{1}",
-    "expr_edited": "表達式編輯",
-    "stream_online_delete_enabled": "",
-    "stream_online_delete_disabled": "",
-    "club_create_error_name": "",
-    "club_desc_update": "",
-    "bank_accounts": "",
-    "module_description_medusa": "",
-    "list_of_medusae": "",
-    "list_of_unloaded": "",
-    "medusa_name_not_found": "",
-    "medusa_info": "",
-    "sneks_count": "",
-    "commands_count": "",
-    "no_medusa_loaded": "",
-    "no_medusa_available": "",
-    "loaded_medusae": "",
-    "medusa_not_loaded": "",
-    "medusa_possibly_cant_unload": "",
-    "medusa_loaded": "",
-    "medusa_unloaded": "",
-    "medusa_empty": "",
-    "medusa_already_loaded": "",
-    "medusa_invalid_not_found": "",
-    "bank_balance": "",
-    "bank_deposited": "",
-    "bank_withdrew": "",
-    "bank_withdraw_insuff": "",
-    "cmd_group_commands": "",
-    "limit_reached": "",
-    "feature_limit_reached_you": "",
-    "feature_limit_reached_owner": "",
-    "feature_limit_reached_either": "",
-    "tier": "",
-    "pledge": "",
-    "expires": "",
-    "commands": "",
-    "groups": "",
-    "modules": "",
-    "no_quota_found": "",
-    "patron_info": "",
-    "quotas": "",
-    "patron_not_enabled": "",
-    "results_in": "",
-    "patron_msg_sent": "",
-    "cards": "",
-    "hand_value": "",
-    "roll2": "",
-    "rolls": "",
-    "available_tests": "",
-    "test_results_for": "",
-    "multiplier": "",
-    "trivia_ended": "",
-    "card": "",
-    "guess": "",
-    "repeater_skip_next": "",
-    "repeater_dont_skip_next": "",
-    "remind_timely": "",
-    "xp_shop_disabled": "",
-    "timely_time": "",
-    "buy": "",
-    "use": "",
-    "in_use": "",
-    "xp_shop_item_cant_use": "",
-    "linkonly_enable": "",
-    "linkonly_disable": "",
-    "xp_shop_buy_required_tier": "",
-    "available_commands": "",
-    "xpadd_users": "",
-    "xpshop_buy_success": "",
-    "patron_insuff_tier": "",
-    "xpshop_already_owned": "",
-    "xpshop_item_not_found": "",
-    "xpshop_website": ""
+    "expr_edited": "表達式編輯"
 }

src/NadekoBot/data/xp.yml

@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 6
+version: 5
 # How much XP will the users receive per message
 xpPerMessage: 3
 # How often can the users receive XP in minutes
@@ -10,8 +10,6 @@ xpFromImage: 0
 voiceXpPerMinute: 0
 # The maximum amount of minutes the bot will keep track of a user in a voice channel
 voiceMaxMinutes: 720
-# The amount of currency users will receive for each point of global xp that they earn
-currencyPerXp: 0
 # Xp Shop config
 shop:
 # Whether the xp shop is enabled