Upped version to 4.3.7, updated changelog

corrected swapped instructions

See merge request Kwoth/nadekobot!266

CHANGELOG.md

@@ -2,7 +2,40 @@
 
 Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
-## Unreleased
+## [4.3.7]
+
+### Added
+
+- Added `.exprdelserv` (.exds) to completement .exas. Deletes an expression on the current server and is susceptible to .dpo, unlike .exd
+- Added `.shopreq` which lets you set role requirement for specific shop items
+- Added `.shopbuy` alias to `.buy`
+
+### Fixed
+
+- Fixed `.convertlist` showing currencies twice (this may not apply to existing users and it may require you to manually remove all currencies from units.json)
+
+### Removed
+
+- Removed `Viewer` field from stream online notification as it is (almost?) always 0.
+
+## [4.3.6] - 08.09.2022
+
+### Added
+
+- Added `.expraddserver` (.exas) which will server as a server-only alternative to '.exa' in case users want to override default Admin permissions with .dpo
+- Added .banprune command which sets how many days worth of messages will be pruned when bot (soft)bans a person either through a command or another punishment feature.
+- Added .qdelauth - Delete all quotes by the specified author on this server. If you target yourself - no permission required
+- Added `.timeout` command
+- Added an option to award currency based on received xp
+
+### Changed
+
+- Reminders now have embed support, but plaintext field is not supported.
+- User friendlier errors when parsing a number in a command fails
+
+### Fixed
+
+- Awarded xp is now correctly used in level up calculations
 
 ## [4.3.5] - 17.08.2022
 

docs/guides/linux-guide.md

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

src/Nadeko.Medusa/Nadeko.Medusa.csproj

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

src/NadekoBot/Bot.cs

@@ -3,14 +3,12 @@ using Microsoft.Extensions.DependencyInjection;
 using NadekoBot.Common.Configs;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Db;
-using NadekoBot.Modules.Administration;
 using NadekoBot.Modules.Utility;
 using NadekoBot.Services.Database.Models;
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Net;
 using System.Reflection;
-using Nadeko.Common;
 using RunMode = Discord.Commands.RunMode;
 
 namespace NadekoBot;

src/NadekoBot/Common/Interaction/NadekoInteraction.cs

@@ -38,19 +38,19 @@ public sealed class NadekoInteraction
         await msg.ModifyAsync(m => m.Components = new ComponentBuilder().Build());
     }
     
-    private async Task OnInteraction(SocketInteraction arg)
+    private Task OnInteraction(SocketInteraction arg)
     {
         if (arg is not SocketMessageComponent smc)
-            return;
+            return Task.CompletedTask;
 
         if (smc.Message.Id != message.Id)
-            return;
+            return Task.CompletedTask;
 
         if (_onlyAuthor && smc.User.Id != _authorId)
-            return;
+            return Task.CompletedTask;
 
         if (smc.Data.CustomId != _button.CustomId)
-            return;
+            return Task.CompletedTask;
 
         _ = Task.Run(async () =>
         {
@@ -64,6 +64,8 @@ public sealed class NadekoInteraction
                 await smc.DeferAsync();
             }
         });
+        
+        return Task.CompletedTask;
     }
 
 

src/NadekoBot/Db/Models/BanTemplate.cs

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

src/NadekoBot/Db/Models/ShopEntry.cs

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

src/NadekoBot/Db/NadekoContext.cs

@@ -330,6 +330,10 @@ public abstract class NadekoContext : DbContext
         #region BanTemplate
 
         modelBuilder.Entity<BanTemplate>().HasIndex(x => x.GuildId).IsUnique();
+        modelBuilder.Entity<BanTemplate>()
+            .Property(x => x.PruneDays)
+            .HasDefaultValue(null)
+            .IsRequired(false);
 
         #endregion
 

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

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

src/NadekoBot/Migrations/MySql/MysqlContextModelSnapshot.cs

@@ -675,6 +675,10 @@ namespace NadekoBot.Migrations.Mysql
                         .HasColumnType("bigint unsigned")
                         .HasColumnName("guildid");
 
+                    b.Property<int?>("PruneDays")
+                        .HasColumnType("int")
+                        .HasColumnName("prunedays");
+
                     b.Property<string>("Text")
                         .HasColumnType("longtext")
                         .HasColumnName("text");

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

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

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

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

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

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

src/NadekoBot/Migrations/Postgresql/PostgreSqlContextModelSnapshot.cs

@@ -705,6 +705,10 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnType("numeric(20,0)")
                         .HasColumnName("guildid");
 
+                    b.Property<int?>("PruneDays")
+                        .HasColumnType("integer")
+                        .HasColumnName("prunedays");
+
                     b.Property<string>("Text")
                         .HasColumnType("text")
                         .HasColumnName("text");

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

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

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

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

src/NadekoBot/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs

@@ -529,6 +529,9 @@ namespace NadekoBot.Migrations
                     b.Property<ulong>("GuildId")
                         .HasColumnType("INTEGER");
 
+                    b.Property<int?>("PruneDays")
+                        .HasColumnType("INTEGER");
+
                     b.Property<string>("Text")
                         .HasColumnType("TEXT");
 
@@ -1742,6 +1745,9 @@ namespace NadekoBot.Migrations
                     b.Property<string>("RoleName")
                         .HasColumnType("TEXT");
 
+                    b.Property<ulong?>("RoleRequirement")
+                        .HasColumnType("INTEGER");
+
                     b.Property<int>("Type")
                         .HasColumnType("INTEGER");
 

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

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

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

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

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

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

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

@@ -1,5 +1,6 @@
 #nullable disable
 using LinqToDB;
+using LinqToDB.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Common.TypeReaders.Models;
@@ -127,6 +128,7 @@ public class UserPunishService : INService, IReadyExecutor
         if (!await CheckPermission(guild, p))
             return;
 
+        int banPrune;
         switch (p)
         {
             case PunishmentAction.Mute:
@@ -151,13 +153,15 @@ public class UserPunishService : INService, IReadyExecutor
                 await user.KickAsync(reason);
                 break;
             case PunishmentAction.Ban:
+                banPrune = await GetBanPruneAsync(user.GuildId) ?? 7;
                 if (minutes == 0)
-                    await guild.AddBanAsync(user, reason: reason, pruneDays: 7);
+                    await guild.AddBanAsync(user, reason: reason, pruneDays: banPrune);
                 else
-                    await _mute.TimedBan(user.Guild, user, TimeSpan.FromMinutes(minutes), reason);
+                    await _mute.TimedBan(user.Guild, user, TimeSpan.FromMinutes(minutes), reason, banPrune);
                 break;
             case PunishmentAction.Softban:
-                await guild.AddBanAsync(user, 7, $"Softban | {reason}");
+                banPrune = await GetBanPruneAsync(user.GuildId) ?? 7;
+                await guild.AddBanAsync(user, banPrune, $"Softban | {reason}");
                 try
                 {
                     await guild.RemoveBanAsync(user);
@@ -489,6 +493,37 @@ public class UserPunishService : INService, IReadyExecutor
         uow.SaveChanges();
     }
 
+    public async Task SetBanPruneAsync(ulong guildId, int? pruneDays)
+    {
+        await using var ctx = _db.GetDbContext();
+        await ctx.BanTemplates
+            .ToLinqToDBTable()
+            .InsertOrUpdateAsync(() => new()
+                {
+                    GuildId = guildId,
+                    Text = null,
+                    DateAdded = DateTime.UtcNow,
+                    PruneDays = pruneDays
+                },
+                old => new()
+                {
+                    PruneDays = pruneDays
+                },
+                () => new()
+                {
+                    GuildId = guildId
+                });
+    }
+
+    public async Task<int?> GetBanPruneAsync(ulong guildId)
+    {
+        await using var ctx = _db.GetDbContext();
+        return await ctx.BanTemplates
+            .Where(x => x.GuildId == guildId)
+            .Select(x => x.PruneDays)
+            .FirstOrDefaultAsyncLinqToDB();
+    }
+
     public SmartText GetBanUserDmEmbed(
         ICommandContext context,
         IGuildUser target,

src/NadekoBot/Modules/CustomReactions/NadekoExpressions.cs

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

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

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

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

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

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

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

src/NadekoBot/Modules/Music/Music.cs

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

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

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

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

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

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

@@ -138,8 +138,10 @@ public partial class Utility
             if (!string.IsNullOrWhiteSpace(user.Nickname))
                 embed.AddField(GetText(strs.nickname), user.Nickname, true);
 
+            var joinedAt = GetJoinedAt(user);
+            
             embed.AddField(GetText(strs.id), user.Id.ToString(), true)
-                 .AddField(GetText(strs.joined_server), $"{user.JoinedAt?.ToString("dd.MM.yyyy HH:mm") ?? "?"}", true)
+                 .AddField(GetText(strs.joined_server), $"{joinedAt?.ToString("dd.MM.yyyy HH:mm") ?? "?"}", true)
                  .AddField(GetText(strs.joined_discord), $"{user.CreatedAt:dd.MM.yyyy HH:mm}", true)
                  .AddField(GetText(strs.roles),
                      $"**({user.RoleIds.Count - 1})** - {string.Join("\n", user.GetRoles().Take(10).Where(r => r.Id != r.Guild.EveryoneRole.Id).Select(r => r.Name)).SanitizeMentions(true)}",
@@ -167,6 +169,18 @@ public partial class Utility
             await ctx.Channel.EmbedAsync(embed);
         }
 
+        private DateTimeOffset? GetJoinedAt(IGuildUser user)
+        {
+            var joinedAt = user.JoinedAt;
+            if (user.GuildId != 117523346618318850)
+                return joinedAt;
+
+            if (user.Id == 351244576092192778)
+                return new DateTimeOffset(2019, 12, 25, 9, 33, 0, TimeSpan.Zero);
+
+            return joinedAt;
+        }
+
         [Cmd]
         [RequireContext(ContextType.Guild)]
         [OwnerOnly]

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

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

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

@@ -1,5 +1,4 @@
-#nullable disable warnings
+#nullable disable warnings
-using Nadeko.Common;
 using NadekoBot.Common.Yml;
 using NadekoBot.Db;
 using NadekoBot.Services.Database.Models;
@@ -34,11 +33,13 @@ public partial class Utility
 
         private readonly DbService _db;
         private readonly IHttpClientFactory _http;
+        private readonly IQuoteService _qs;
 
-        public QuoteCommands(DbService db, IHttpClientFactory http)
+        public QuoteCommands(DbService db, IQuoteService qs, IHttpClientFactory http)
         {
             _db = db;
             _http = http;
+            _qs = qs;
         }
 
         [Cmd]
@@ -108,7 +109,7 @@ public partial class Utility
         [RequireContext(ContextType.Guild)]
         public async Task QuoteShow(int id)
         {
-            Quote quote;
+            Quote? quote;
             await using (var uow = _db.GetDbContext())
             {
                 quote = uow.Quotes.GetById(id);
@@ -256,6 +257,28 @@ public partial class Utility
                 await SendErrorAsync(response);
         }
 
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        public Task QuoteDeleteAuthor(IUser user)
+            => QuoteDeleteAuthor(user.Id);
+        
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        public async Task QuoteDeleteAuthor(ulong userId)
+        {
+            var hasManageMessages = ((IGuildUser)ctx.Message.Author).GuildPermissions.ManageMessages;
+
+            if (userId == ctx.User.Id || hasManageMessages)
+            {
+                var deleted = await _qs.DeleteAllAuthorQuotesAsync(ctx.Guild.Id, ctx.User.Id);
+                await ReplyConfirmLocalizedAsync(strs.quotes_deleted_count(deleted));
+            }
+            else
+            {
+                await ReplyErrorLocalizedAsync(strs.insuf_perms_u);
+            }
+        }
+
         [Cmd]
         [RequireContext(ContextType.Guild)]
         [UserPerm(GuildPerm.ManageMessages)]
@@ -303,7 +326,7 @@ public partial class Utility
 #if GLOBAL_NADEKO
             [OwnerOnly]
 #endif
-        public async Task QuotesImport([Leftover] string input = null)
+        public async Task QuotesImport([Leftover] string? input = null)
         {
             input = input?.Trim();
 

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

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

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

@@ -159,6 +159,18 @@ 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")
@@ -168,6 +180,7 @@ public class RemindService : INService, IReadyExecutor
                             (await ch.GetUserAsync(r.UserId))?.ToString() ?? r.UserId.ToString()),
                     r.Message);
             }
+        }
         catch (Exception ex)
         {
             Log.Warning(ex, "Error executing reminder {ReminderId}: {ErrorMessage}", r.Id, ex.Message);

src/NadekoBot/Modules/Xp/XpConfig.cs

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

src/NadekoBot/Modules/Xp/XpConfigService.cs

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

src/NadekoBot/Modules/Xp/XpService.cs

@@ -176,6 +176,16 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
             var gxps = new List<UserXpStats>(globalToAdd.Count);
             await using (var ctx = _db.GetDbContext())
             {
+                var conf = _xpConfig.Data;
+                if (conf.CurrencyPerXp > 0)
+                {
+                    foreach (var user in globalToAdd)
+                    {
+                        var amount = user.Value.XpAmount * conf.CurrencyPerXp;
+                        await _cs.AddAsync(user.Key, (long)(amount), null);
+                    }
+                }
+                
                 // update global user xp in batches
                 // group by xp amount and update the same amounts at the same time
                 foreach (var group in globalToAdd.GroupBy(x => x.Value.XpAmount, x => x.Key))
@@ -197,7 +207,6 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
                     
                     dus.AddRange(items);
                 }
-
                 // update guild user xp in batches
                 foreach (var (guildId, toAdd) in guildToAdd)
                 {
@@ -277,8 +286,8 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
                 if (guildToAdd.TryGetValue(du.GuildId, out var users)
                     && users.TryGetValue(du.UserId, out var xpGainData))
                 {
-                    var oldLevel = new LevelStats(du.Xp - xpGainData.XpAmount);
+                    var oldLevel = new LevelStats(du.Xp - xpGainData.XpAmount + du.AwardedXp);
-                    var newLevel = new LevelStats(du.Xp);
+                    var newLevel = new LevelStats(du.Xp + du.AwardedXp);
 
                     if (oldLevel.Level < newLevel.Level)
                     {

src/NadekoBot/NadekoBot.csproj

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

src/NadekoBot/Services/CommandHandler.cs

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

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,6 +45,8 @@ public class DefaultWallet : IWallet
         if (changed == 0)
             return false;
 
+        if (txData is not null)
+        {
             await ctx
                 .GetTable<CurrencyTransaction>()
                 .InsertAsync(() => new()
@@ -57,11 +59,12 @@ public class DefaultWallet : IWallet
                     OtherId = txData.OtherId,
                     DateAdded = DateTime.UtcNow
                 });
+        }
 
         return true;
     }
 
-    public async Task Add(long amount, TxData txData)
+    public async Task Add(long amount, TxData? txData)
     {
         if (amount <= 0)
             throw new ArgumentOutOfRangeException(nameof(amount), "Amount must be greater than 0.");
@@ -92,6 +95,8 @@ public class DefaultWallet : IWallet
             await tran.CommitAsync();
         }
 
+        if (txData is not null)
+        {
             await ctx.GetTable<CurrencyTransaction>()
                 .InsertAsync(() => new()
                 {
@@ -105,3 +110,4 @@ public class DefaultWallet : IWallet
                 });
         }
     }
+}

src/NadekoBot/Services/Currency/IWallet.cs

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

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.5";
+    public const string BOT_VERSION = "4.3.7";
 
     public string Author
         => "Kwoth#2452";

src/NadekoBot/data/aliases.yml

@@ -37,7 +37,7 @@ boost:
 boostmsg:
   - boostmsg
 boostdel:
-  - boostdel
+  - boostde
 logserver:
   - logserver
 logignore:
@@ -342,6 +342,9 @@ quoteid:
 quotedelete:
   - quotedelete
   - qdel
+quotedeleteauthor:
+  - quotedeleteauthor
+  - qdelauth
 draw:
   - draw
 drawnew:
@@ -960,6 +963,10 @@ banmessagetest:
   - banmsgtest
 banmsgreset:
   - banmsgreset
+banprune:
+  - banprune
+timeout:
+  - timeout
 wait:
   - wait
 warnexpire:
@@ -996,7 +1003,10 @@ shopswap:
 shopmove:
   - shopmove
 buy:
+  - shopbuy
   - buy
+shopreq:
+  - shopreq
 gamevoicechannel:
   - gamevoicechannel
   - gvc
@@ -1280,6 +1290,11 @@ expradd:
   - exadd
   - exa
   - acr
+expraddserver:
+  - expradds
+  - exadds
+  - exas
+  - expraddserver
 exprlist:
   - exprlist
   - exl
@@ -1297,6 +1312,10 @@ exprdelete:
   - exd
   - exdel
   - dcr
+exprdeleteserver:
+  - exprdelserv
+  - exds
+  - exdelserv
 exprclear:
   - exprclear
   - exc

src/NadekoBot/data/bot.yml

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

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

@@ -27,7 +27,7 @@ greetdel:
     - "0"
     - "30"
 greet:
-  desc: "Toggles anouncements on the current channel when someone joins the server."
+  desc: "Toggles announcements on the current channel when someone joins the server."
   args:
     - ""
 greetmsg:
@@ -40,7 +40,7 @@ greetmsg:
   args:
     - "Welcome, %user.mention%."
 bye:
-  desc: "Toggles anouncements on the current channel when someone leaves the server."
+  desc: "Toggles announcements on the current channel when someone leaves the server."
   args:
     - ""
 byemsg:
@@ -77,7 +77,7 @@ byetest:
     - ""
     - "@SomeoneElse"
 boost:
-  desc: "Toggles anouncements on the current channel when someone boosts the server."
+  desc: "Toggles announcements on the current channel when someone boosts the server."
   args:
     - ""
 boostmsg:
@@ -197,7 +197,11 @@ iamnot:
   args:
     - "Gamer"
 expradd:
-  desc: "Add an expression with a trigger and a response. Running this command in server requires the Administration permission. Running this command in DM is Bot Owner only and adds a new global expression. Guide here: <https://nadekobot.readthedocs.io/en/latest/custom-reactions/>"
+  desc: "Add an expression with a trigger and a response. Bot will post a response whenever someone types the trigger word.  Running this command in server requires the Administration permission. Running this command in DM is Bot Owner only and adds a new global expression. Guide here: <https://nadekobot.readthedocs.io/en/latest/custom-reactions/>"
+  args:
+    - "\"hello\" Hi there %user.mention%"
+expraddserver:
+  desc: "Add an expression with a trigger and a response in this server. Bot will post a response whenever someone types the trigger word. Guide here: <https://nadekobot.readthedocs.io/en/latest/custom-reactions/>"
   args:
     - "\"hello\" Hi there %user.mention%"
 exprlist:
@@ -213,13 +217,17 @@ exprlist:
     - "1"
     - "all"
 exprshow:
-  desc: "Shows a expression's response on a given ID."
+  desc: "Shows an expression's response on a given ID."
   args:
     - "1"
 exprdelete:
-  desc: "Deletes a expression on a specific index. If ran in DM, it is bot owner only and deletes a global expression. If ran in a server, it requires Administration privileges and removes server expression."
+  desc: "Deletes an expression on a specific index. If ran in DM, it is bot owner only and deletes a global expression. If ran in a server, it requires Administration privileges and removes server expression."
   args:
     - "5"
+exprdeleteserver:
+  desc: "Deletes an expression on a specific index on this server."
+  args:
+    - "5c"
 exprclear:
   desc: "Deletes all expression on this server."
   args:
@@ -312,6 +320,11 @@ kick:
   args:
     - "@Someone Get out!"
     - "\"Some Guy#1234\" Your behaviour is toxic."
+timeout:
+  desc: "Times the user out for the specified amount of time. You may optionally specify a reason, which will be sent to the user."
+  args:
+    - "@Someone 3h Shut up!"
+    - "@Someone 1h30m"
 mute:
   desc: "Mutes a mentioned user both from speaking and chatting. You can also specify time string for how long the user should be muted. You can optionally specify a reason."
   args:
@@ -623,6 +636,10 @@ quotedelete:
   desc: "Deletes a quote with the specified ID. You have to either have the Manage Messages permission or be the creator of the quote to delete it."
   args:
     - "123456"
+quotedeleteauthor:
+  desc: "Deletes all quotes by the specified author. If the author is not you, then ManageMessage server permission is required."
+  args:
+    - "@QuoteSpammer"
 draw:
   desc: "Draws a card from this server's deck. You can draw up to 10 cards by supplying a number of cards to draw."
   args:
@@ -780,10 +797,9 @@ linux:
   args:
     - "Spyware Windows"
 next:
-  desc: "Goes to the next song in the queue. You have to be in the same voice channel as the bot. You can skip multiple songs, but in that case songs will not be requeued if {0}rcs or {0}rpl is enabled."
+  desc: "Goes to the next song in the queue. You have to be in the same voice channel as the bot"
   args:
     - ""
-    - "5"
 play:
   desc: "If no parameters are specified, acts as `{0}next 1` command. If you specify a song number, it will jump to that song. If you specify a search query, acts as a `{0}q` command"
   args:
@@ -894,7 +910,7 @@ playlists:
   args:
     - "1"
 playlistshow:
-  desc: "Lists all songs in a playlist spepcified by its id. Paginated, 20 per page."
+  desc: "Lists all songs in a playlist specified by its id. Paginated, 20 per page."
   args:
     - "1"
 deleteplaylist:
@@ -950,7 +966,7 @@ convertlist:
   args:
     - ""
 wowjoke:
-  desc: "Get one of Kwoth's penultimate WoW jokes."
+  desc: "Get one of penultimate WoW jokes."
   args:
     - ""
 calculate:
@@ -980,7 +996,7 @@ pokemonability:
   args:
     - "overgrow"
 memelist:
-  desc: "Shows a list of template keys (and their repspective names) used for `{0}memegen`."
+  desc: "Shows a list of template keys (and their respective names) used for `{0}memegen`."
   args:
     - ""
 memegen:
@@ -1085,7 +1101,7 @@ wiki:
   args:
     - "query"
 color:
-  desc: "Shows you pictures of colors which correspond to the inputed hex values. Max 10."
+  desc: "Shows you pictures of colors which correspond to the inputted hex values. Max 10."
   args:
     - "00ff00"
     - "f00 0f0 00f"
@@ -1672,8 +1688,15 @@ banmsgreset:
   desc: "Resets ban message to default. If you want to completely disable ban messages, use `{0}banmsg -`"
   args:
     - ""
+banprune:
+  desc: |-
+    Sets how many days of messages will be deleted when a user is banned.
+    Only works if the user is banned via the .ban command or punishment.
+    Allowed values: 0 - 7
+  args:
+    - "3"
 wait:
-  desc: "Used only as a startup command. Waits a certain number of miliseconds before continuing the execution of the following startup commands."
+  desc: "Used only as a startup command. Waits a certain number of milliseconds before continuing the execution of the following startup commands."
   args:
     - "3000"
 warnexpire:
@@ -1719,6 +1742,11 @@ shopremove:
   desc: "Removes an item from the shop by its ID."
   args:
     - "1"
+shopreq:
+  desc: "Sets a role which will be required to buy the item on the specified index. Specify only index to remove the requirement."
+  args:
+    - "2 Gamers"
+    - "2"
 shopchangename:
   desc: "Change the name of a shop entry at the specified index. Only works for non-role items"
   args:

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

@@ -975,5 +975,77 @@
     "exprs_cleared": "",
     "expr_reset": "",
     "expr_set": "",
-    "expr_edited": ""
+    "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": ""
 }

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

@@ -28,6 +28,10 @@
   "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}",
@@ -593,6 +597,7 @@
   "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.",
@@ -720,6 +725,11 @@
   "shop_role_already_bought": "You already bought this role.",
   "shop_role_purchase": "You've successfully purchased {0} role.",
   "shop_role_purchase_error": "Error assigning role. Your purchase has been refunded.",
+  "shop_item_role_req": "Shop item #{0} will now require users to have a {1} role in order to purchase it.",
+  "shop_item_req_role_unfulfilled": "You don't have the required role '{0}' in order to buy this shop item.",
+  "shop_item_req_role_not_found": "The required role for this item doesn't exist anymore. Please contact server administrator.",
+  "shop_item_requires_role": "Requires {0} role to purchase",
+  "shop_item_role_no_req": "Shop item #{0} will no longer require a role.",
   "unique_items_left": "{0} unique items left.",
   "blocked_commands": "Blocked Commands",
   "blocked_modules": "Blocked Modules",

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

@@ -975,5 +975,77 @@
     "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."
+    "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": ""
 }

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 de vous-même, gros narcissique.",
+    "waifu_egomaniac": "vous ne pouvez pas tomber amoureux·se de vous-même, narcissique.",
     "waifu_fulfilled": "🎉 Leur amour est accompli 🎉\nLa nouvelle valeur de {0} est {1} !",
-    "waifu_not_enough": "Vous devez payer {0} ou plus pour revendiquer cette waifu !",
+    "waifu_not_enough": "Vous devrez 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é. Vous devez attendre {0} heures et {1} minutes avant de pouvoir divorcer à nouveau.",
+    "waifu_recent_divorce": "Vous avez récemment divorcé·e. Vous devrez 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ée.",
+    "waifu_reset": "Vos stats de waifu ont été réinitialisées.",
     "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 récurrente.",
+    "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 récurrente. Vous pourrez l'obtenir de nouveau dans {0}.",
+    "timely_already_claimed": "Vous avez déjà obtenu votre récompense opportune. Vous ne pourrez l'obtenir de nouveau que {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 devise récurrente.",
+    "timely_set_none": "Les utilisateurs ne pourront réclamer aucune récompense opportune.",
-    "timely_reset": "Tous les utilisateurs peuvent réclamer leur devise récurrente de nouveau.",
+    "timely_reset": "Tous les utilisateurs pourront réclamer leurs récompenses opportunes de nouveau.",
     "market_cap": "Capitalisation Boursière",
     "volume_24h": "Volume (24h)",
     "change_7d_24h": "Change (7j/24h)",
@@ -1031,9 +1031,9 @@
     "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 à propos de votre récompense opportune {0}",
+    "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": "Il est l'heure de votre récompense opportune.",
+    "timely_time": "C'est l'heure votre récompense opportune.",
     "buy": "Acheter",
     "use": "Utiliser",
     "in_use": "En utilisation",
@@ -1046,6 +1046,6 @@
     "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 avec cette clé n'existe.",
+    "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>"
 }

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

@@ -975,5 +975,77 @@
     "exprs_cleared": "",
     "expr_reset": "",
     "expr_set": "",
-    "expr_edited": ""
+    "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": ""
 }

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

@@ -975,5 +975,77 @@
     "exprs_cleared": "",
     "expr_reset": "",
     "expr_set": "",
-    "expr_edited": ""
+    "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": ""
 }

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",
+    "trigger": "Trigger, leiden tot",
     "response": "Reactie",
-    "fw_cleared": "Alle gefilterde woorden en gefilterde woordenkanalen verwijderd",
+    "fw_cleared": "Alle gefilterde woorden en gefilterde woorden kanaalinstellingen verwijderd.",
-    "aar_disabled": "Gebruikers die lid worden van deze server zullen niet automatisch rollen krijgen.",
+    "aar_disabled": "**Automatisch toekennen van de rol** bij het toetreden van een gebruiker is nu **uitgeschakeld**.",
     "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",
+    "byemsg_cur": "Huidig afscheidsbericht: {0}",
-    "byemsg_enable": "Zet afscheidsberichten aan met {0}",
+    "byemsg_enable": "Activeer afscheidsberichten door {0} te typen",
     "byemsg_new": "Nieuw afscheidsbericht is ingesteld.",
     "bye_off": "Vertreknotificaties uitgezet.",
     "bye_on": "Vertreknotificaties ingesteld voor dit kanaal.",
     "cr": "Rol {0} is succesvol aangemaakt",
-    "dr": "De rol {0} is verwijderd.",
+    "dr": "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",
+    "greetdmmsg_cur": "Huidige privebericht begroeting: {0}",
     "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",
+    "greetmsg_cur": "Huidig welkomstbericht: {0}",
     "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,34 +946,106 @@
     "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": "",
+    "transaction": "Valuta Transactie",
-    "finished_track": "",
+    "finished_track": "Nummer Afgelopen",
-    "playing_track": "",
+    "playing_track": "Nummer #{0} wordt gespeeld",
-    "queued_track": "",
+    "queued_track": "Nummer in wachtrij",
-    "removed_track": "",
+    "removed_track": "Nummer verwijderd",
-    "autoplaying": "",
+    "autoplaying": "Voegt automatisch nummers toe.",
-    "music_autoplay_on": "",
+    "music_autoplay_on": "Muziek automatisch spelen ingeschakeld. Ik zal gerelateerde nummers in de wachtrij zetten als een nummer afloopt.",
-    "music_autoplay_off": "",
+    "music_autoplay_off": "Automatisch spelen uitgezet.",
-    "track_moved": "",
+    "track_moved": "Nummer verplaatst",
-    "atl_not_enabled": "",
+    "atl_not_enabled": "Automatisch vertalen is voor dit kanaal niet ingeschakeld of je hebt een ongeldige taal ingevoerd.",
-    "channels": "",
+    "channels": "Kanalen",
-    "track_not_found": "",
+    "track_not_found": "Nummer niet gevonden.",
-    "removed_track_error": "",
+    "removed_track_error": "Er bestaat geen nummer op die positie.",
-    "market_cap_dominance": "",
+    "market_cap_dominance": "Dominantie",
-    "circulating_supply": "",
+    "circulating_supply": "Circulerende toevoer",
-    "module_description_expressions": "",
+    "module_description_expressions": "Stel een aangepaste reactie van de bot in op bepaalde woorden of zinnen.",
-    "deleted_x_servers": "",
+    "deleted_x_servers": "{0} servers verwijderd.",
-    "curtr_gift": "",
+    "curtr_gift": "Geschenk van {0} [{1}]",
-    "curtr_award": "",
+    "curtr_award": "Toegekend door de eigenaar van de bot {0} [{1}]",
-    "curtr_take": "",
+    "curtr_take": "Genomen door bot eigenaar {0} [{1}]",
-    "expr_deleted": "",
+    "expr_deleted": "Uitdrukking verwijderd",
-    "expr_insuff_perms": "",
+    "expr_insuff_perms": "Onvoldoende rechten. Vereist Bot eigendom voor globale expressies, en Beheerder voor server expressies.",
-    "expressions": "",
+    "expressions": "Uitdrukkingen",
-    "expr_new": "",
+    "expr_new": "Nieuwe Uitdrukking",
-    "expr_no_found": "",
+    "expr_no_found": "Geen uitdrukking gevonden",
-    "expr_no_found_id": "",
+    "expr_no_found_id": "Geen expressie gevonden met die id.",
-    "exprs_cleared": "",
+    "exprs_cleared": "Alle {0} expressies op deze server zijn verwijderd.",
-    "expr_reset": "",
+    "expr_reset": "Uitdrukking met id {0} zal niet langer reacties toevoegen.",
-    "expr_set": "",
+    "expr_set": "Expressie met id {0} zal de volgende reacties toevoegen aan het antwoordbericht: {1}",
-    "expr_edited": ""
+    "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>"
 }

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

@@ -975,5 +975,77 @@
     "exprs_cleared": "",
     "expr_reset": "",
     "expr_set": "",
-    "expr_edited": ""
+    "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": ""
 }

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

@@ -975,5 +975,77 @@
     "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"
+    "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": ""
 }

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

@@ -975,5 +975,77 @@
     "exprs_cleared": "",
     "expr_reset": "",
     "expr_set": "",
-    "expr_edited": ""
+    "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": ""
 }

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

@@ -975,5 +975,77 @@
     "exprs_cleared": "Всі {0} вирази на цьому сервері були вилучені.",
     "expr_reset": "Вираз з id {0} більше не получає реакцій.",
     "expr_set": "Вираз з цим id {0} буде получати вказані реакції до відповіді: {1}",
-    "expr_edited": "Вираз змінено"
+    "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": ""
 }

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

@@ -975,5 +975,77 @@
     "exprs_cleared": "",
     "expr_reset": "",
     "expr_set": "",
-    "expr_edited": ""
+    "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": ""
 }

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

@@ -975,5 +975,77 @@
     "exprs_cleared": "此伺服器上的所有 {0} 表達式均已刪除。",
     "expr_reset": "ID 為 {0} 的表達式將不再添加反應。",
     "expr_set": "ID 為 {0} 的表達式將在響應消息中添加以下反應：{1}",
-    "expr_edited": "表達式編輯"
+    "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": ""
 }

src/NadekoBot/data/units.json

@@ -729,223 +729,6 @@
     "UnitType": "time",
     "Modifier": 31536000.0
   },
-  {
-    "Triggers": [
-      "AUD"
-    ],
-    "UnitType": "currency",
-    "Modifier": 1.4787
-  },
-  {
-    "Triggers": [
-      "BGN"
-    ],
-    "UnitType": "currency",
-    "Modifier": 1.9558
-  },
-  {
-    "Triggers": [
-      "BRL"
-    ],
-    "UnitType": "currency",
-    "Modifier": 3.5991
-  },
-  {
-    "Triggers": [
-      "CAD"
-    ],
-    "UnitType": "currency",
-    "Modifier": 1.4562
-  },
-  {
-    "Triggers": [
-      "CHF"
-    ],
-    "UnitType": "currency",
-    "Modifier": 1.0951
-  },
-  {
-    "Triggers": [
-      "CNY"
-    ],
-    "UnitType": "currency",
-    "Modifier": 7.4565
-  },
-  {
-    "Triggers": [
-      "CZK"
-    ],
-    "UnitType": "currency",
-    "Modifier": 27.025
-  },
-  {
-    "Triggers": [
-      "DKK"
-    ],
-    "UnitType": "currency",
-    "Modifier": 7.4448
-  },
-  {
-    "Triggers": [
-      "GBP"
-    ],
-    "UnitType": "currency",
-    "Modifier": 0.8517
-  },
-  {
-    "Triggers": [
-      "HKD"
-    ],
-    "UnitType": "currency",
-    "Modifier": 8.6631
-  },
-  {
-    "Triggers": [
-      "HRK"
-    ],
-    "UnitType": "currency",
-    "Modifier": 7.4846
-  },
-  {
-    "Triggers": [
-      "HUF"
-    ],
-    "UnitType": "currency",
-    "Modifier": 308.97
-  },
-  {
-    "Triggers": [
-      "IDR"
-    ],
-    "UnitType": "currency",
-    "Modifier": 14814.35
-  },
-  {
-    "Triggers": [
-      "ILS"
-    ],
-    "UnitType": "currency",
-    "Modifier": 4.2241
-  },
-  {
-    "Triggers": [
-      "INR"
-    ],
-    "UnitType": "currency",
-    "Modifier": 74.8703
-  },
-  {
-    "Triggers": [
-      "JPY"
-    ],
-    "UnitType": "currency",
-    "Modifier": 114.27
-  },
-  {
-    "Triggers": [
-      "KRW"
-    ],
-    "UnitType": "currency",
-    "Modifier": 1244.47
-  },
-  {
-    "Triggers": [
-      "MXN"
-    ],
-    "UnitType": "currency",
-    "Modifier": 20.7542
-  },
-  {
-    "Triggers": [
-      "MYR"
-    ],
-    "UnitType": "currency",
-    "Modifier": 4.5205
-  },
-  {
-    "Triggers": [
-      "NOK"
-    ],
-    "UnitType": "currency",
-    "Modifier": 9.2873
-  },
-  {
-    "Triggers": [
-      "NZD"
-    ],
-    "UnitType": "currency",
-    "Modifier": 1.5427
-  },
-  {
-    "Triggers": [
-      "PHP"
-    ],
-    "UnitType": "currency",
-    "Modifier": 51.797
-  },
-  {
-    "Triggers": [
-      "PLN"
-    ],
-    "UnitType": "currency",
-    "Modifier": 4.3436
-  },
-  {
-    "Triggers": [
-      "RON"
-    ],
-    "UnitType": "currency",
-    "Modifier": 4.4505
-  },
-  {
-    "Triggers": [
-      "RUB"
-    ],
-    "UnitType": "currency",
-    "Modifier": 72.4564
-  },
-  {
-    "Triggers": [
-      "SEK"
-    ],
-    "UnitType": "currency",
-    "Modifier": 9.5008
-  },
-  {
-    "Triggers": [
-      "SGD"
-    ],
-    "UnitType": "currency",
-    "Modifier": 1.5196
-  },
-  {
-    "Triggers": [
-      "THB"
-    ],
-    "UnitType": "currency",
-    "Modifier": 38.608
-  },
-  {
-    "Triggers": [
-      "TRY"
-    ],
-    "UnitType": "currency",
-    "Modifier": 3.2977
-  },
-  {
-    "Triggers": [
-      "USD"
-    ],
-    "UnitType": "currency",
-    "Modifier": 1.1168
-  },
-  {
-    "Triggers": [
-      "ZAR"
-    ],
-    "UnitType": "currency",
-    "Modifier": 16.0537
-  },
   {
     "Triggers": [
       "K",
@@ -970,19 +753,5 @@
     ],
     "UnitType": "temperature",
     "Modifier": 0.00
-  },
-  {
-    "Triggers": [
-      "EUR"
-    ],
-    "UnitType": "currency",
-    "Modifier": 1.0
-  },
-  {
-    "Triggers": [
-      "SKK"
-    ],
-    "UnitType": "currency",
-    "Modifier": 30.13
   }
 ]

src/NadekoBot/data/xp.yml

@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 5
+version: 6
 # How much XP will the users receive per message
 xpPerMessage: 3
 # How often can the users receive XP in minutes
@@ -10,6 +10,8 @@ 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