Upped version to 4.2.13, updated changelog

fixed withURL not working

See merge request Kwoth/nadekobot!286

CHANGELOG.md

@@ -2,6 +2,54 @@
 
 Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
+## [4.3.13] - 20.02.2023
+
+### Fixed
+
+- Fixed `.log userpresence`
+- `.q` will now use `yt-dlp` if anything other than `ytProvider: Ytdl` is set in `data/searches.yml`
+- Fixed Title links on some embeds
+
+## [4.3.12] - 12.02.2023
+
+### Fixed
+
+- Fixed `.betstats` not working on european locales
+- Timed `.ban` will work on users who are not in the server
+- Fixed some bugs in the medusa system 
+
+## [4.3.11] - 21.01.2023
+
+### Added
+
+- Added `.doas` Bot owner only command
+- Added `.stickeradd` command
+
+### Changed
+
+- `.waifuinfo` optimized
+- You can now specify an optional custom message in `.feed` and `.yun` which will be posted along with an update
+- Greet/bye messages will now get disabled if they're set to a deleted/unknown channel
+- Updated response strings
+- `.translate` now supports many more languages
+- `.translangs` prettier output
+
+### Fixed
+
+- Added logging for thread events
+- Fixed a bug for `.quotedeleteauthor` causing the executing user to delete own messages
+- Fixed TimeOut punishment not alklowing duration
+- Fixed a nullref in streamrole service
+- Fixed some potential causes for ratelimit due to default message retry settings
+- Fixed a patron rewards bug caused by monthly donation checking not accounting for year increase
+- Fixed a patron rewards bug for users who connected the same discord account with multiple patreon accounts
+- `.deletecurrency` will now also reset banked currency
+- Fixed DMHelpText reply
+- `.h` command show now properly show both channel and server user permission requirements
+- Many fixes and improvements to medusa system
+- Fixed trivia --nohint
+- `.joinrace` will no longer fail if the user isn't in the database yet
+
 ## [4.3.10] - 10.11.2022
 
 ### Added 

docs/guides/linux-guide.md

@@ -15,11 +15,14 @@ w# Setting up NadekoBot on Linux
 
 It is recommended that you use **Ubuntu 20.04**, as there have been nearly no problems with it. Also, **32-bit systems are incompatible**.
 
+
+### Ubuntu 22.04 is ruled as incompatible so double check which ubuntu version you are using. 
+
 ##### Compatible operating systems:
 
-- Ubuntu: 16.04, 18.04, 20.04, 21.04, 21.10, 22.04
+- Ubuntu: 16.04, 18.04, 20.04, 21.04, 21.10
 - Mint: 19, 20
-- Debian: 9, 10
+- Debian: 10, 11
 - CentOS: 7
 - openSUSE
 - Fedora: 33, 34, 35

docs/medusa/creating-a-medusa.md

@@ -147,6 +147,7 @@ This section will guide you through how to create a simple custom medusa. You ca
         <!-- Use latest .net features -->
         <LangVersion>preview</LangVersion>
         <EnablePreviewFeatures>true</EnablePreviewFeatures>
+        <GenerateRequiresPreviewFeaturesAttribute>true</GenerateRequiresPreviewFeaturesAttribute>
         
         <!-- tell .net that this library will be used as a plugin -->
         <EnableDynamicLoading>true</EnableDynamicLoading>

src/Nadeko.Medusa/Attributes/MedusaPermAttribute.cs

@@ -0,0 +1,10 @@
+namespace Nadeko.Snake;
+
+/// <summary>
+/// Used as a marker class for bot_perm and user_perm Attributes
+/// Has no functionality.
+/// </summary>
+public abstract class MedusaPermAttribute : Attribute
+{
+    
+}

src/Nadeko.Medusa/Attributes/bot_owner_onlyAttribute.cs

@@ -0,0 +1,7 @@
+namespace Nadeko.Snake;
+
+[AttributeUsage(AttributeTargets.Method)]
+public sealed class bot_owner_onlyAttribute : MedusaPermAttribute
+{
+    
+}

src/Nadeko.Medusa/Attributes/bot_permAttribute.cs

@@ -0,0 +1,23 @@
+using Discord;
+
+namespace Nadeko.Snake;
+
+[AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+public sealed class bot_permAttribute : MedusaPermAttribute
+{
+    public GuildPermission? GuildPerm { get; }
+    public ChannelPermission? ChannelPerm { get; }
+
+
+    public bot_permAttribute(GuildPermission perm)
+    {
+        GuildPerm = perm;
+        ChannelPerm = null;
+    }
+
+    public bot_permAttribute(ChannelPermission perm)
+    {
+        ChannelPerm = perm;
+        GuildPerm = null;
+    }
+}

src/Nadeko.Medusa/Attributes/user_permAttribute.cs

@@ -0,0 +1,22 @@
+using Discord;
+
+namespace Nadeko.Snake;
+
+[AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+public sealed class user_permAttribute : MedusaPermAttribute
+{
+    public GuildPermission? GuildPerm { get; }
+    public ChannelPermission? ChannelPerm { get; }
+    
+    public user_permAttribute(GuildPermission perm)
+    {
+        GuildPerm = perm;
+        ChannelPerm = null;
+    }
+
+    public user_permAttribute(ChannelPermission perm)
+    {
+        ChannelPerm = perm;
+        GuildPerm = null;
+    }
+}

src/Nadeko.Medusa/Context/AnyContext.cs

@@ -22,6 +22,11 @@ public abstract class AnyContext
     /// The user who invoked the command
     /// </summary>
     public abstract IUser User { get; }
+    
+    /// <summary>
+    /// Bot user
+    /// </summary>
+    public abstract ISelfUser Bot { get; }
 
     /// <summary>
     /// Provides access to strings used by this medusa

src/Nadeko.Medusa/Extensions/MedusaExtensions.cs

@@ -10,7 +10,7 @@ public static class MedusaExtensions
             embed: embed.Build(),
             options: new()
             {
-                RetryMode = RetryMode.AlwaysRetry
+                RetryMode = RetryMode.Retry502
             });
 
     // unlocalized

src/NadekoBot/Bot.cs

@@ -69,7 +69,7 @@ public sealed class Bot
                 : GatewayIntents.AllUnprivileged,
             LogGatewayIntentWarnings = false,
             FormatUsersInBidirectionalUnicode = false,
-            DefaultRetryMode = RetryMode.AlwaysRetry ^ RetryMode.RetryRatelimit
+            DefaultRetryMode = RetryMode.Retry502
         });
 
         _commandService = new(new()

src/NadekoBot/Common/Attributes/UserPerm.cs

@@ -3,7 +3,7 @@ using NadekoBot.Modules.Administration.Services;
 
 namespace Discord;
 
-[AttributeUsage(AttributeTargets.Method)]
+[AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
 public class UserPermAttribute : RequireUserPermissionAttribute
 {
     public UserPermAttribute(GuildPerm permission)

src/NadekoBot/Common/Creds.cs

@@ -53,6 +53,9 @@ go to https://www.patreon.com/portal -> my clients -> create client")]
 
     [Comment(@"Official cleverbot api key.")]
     public string CleverbotApiKey { get; set; }
+
+    [Comment(@"Official GPT-3 api key.")]
+    public string Gpt3ApiKey { get; set; }
     
     [Comment(@"Which cache implementation should bot use.
 'memory' - Cache will be in memory of the bot's process itself. Only use this on bots with a single shard. When the bot is restarted the cache is reset. 
@@ -118,7 +121,7 @@ Windows default
 
     public Creds()
     {
-        Version = 6;
+        Version = 7;
         Token = string.Empty;
         UsePrivilegedIntents = true;
         OwnerIds = new List<ulong>();
@@ -128,6 +131,7 @@ Windows default
         Patreon = new(string.Empty, string.Empty, string.Empty, string.Empty);
         BotListToken = string.Empty;
         CleverbotApiKey = string.Empty;
+        Gpt3ApiKey = string.Empty;
         BotCache = BotCacheImplemenation.Memory;
         RedisOptions = "localhost:6379,syncTimeout=30000,responseTimeout=30000,allowAdmin=true,password=";
         Db = new()

src/NadekoBot/Common/IBotCredentials.cs

@@ -14,6 +14,7 @@ public interface IBotCredentials
     int TotalShards { get; }
     Creds.PatreonSettings Patreon { get; }
     string CleverbotApiKey { get; }
+    string Gpt3ApiKey { get; }
     RestartConfig RestartCommand { get; }
     Creds.VotesSettings Votes { get; }
     string BotListToken { get; }

src/NadekoBot/Common/ILogCommandService.cs

@@ -29,4 +29,7 @@ public enum LogType
     VoicePresenceTts,
     UserMuted,
     UserWarned,
+    
+    ThreadDeleted,
+    ThreadCreated
 }

src/NadekoBot/Common/Medusa/Adapters/DmContextAdapter.cs

@@ -5,9 +5,11 @@ public sealed class DmContextAdapter : DmContext
     public override IMedusaStrings Strings { get; }
     public override IDMChannel Channel { get; }
     public override IUserMessage Message { get; }
+    public override ISelfUser Bot { get; }
     public override IUser User
         => Message.Author;
     
+    
     private readonly IServiceProvider _services;
     private readonly Lazy<IEmbedBuilderService> _ebs;
     private readonly Lazy<IBotStrings> _botStrings;
@@ -26,6 +28,7 @@ public sealed class DmContextAdapter : DmContext
 
         Channel = ch;
         Message = ctx.Message;
+        Bot = ctx.Client.CurrentUser;
         
         
         _ebs = new(_services.GetRequiredService<IEmbedBuilderService>());

src/NadekoBot/Common/Medusa/Adapters/FilterAdapter.cs

@@ -0,0 +1,31 @@
+namespace Nadeko.Medusa.Adapters;
+
+public class FilterAdapter : PreconditionAttribute
+{
+    private readonly FilterAttribute _filterAttribute;
+    private readonly IMedusaStrings _strings;
+
+    public FilterAdapter(FilterAttribute filterAttribute,
+        IMedusaStrings strings)
+    {
+        _filterAttribute = filterAttribute;
+        _strings = strings;
+    }
+
+    public override async Task<PreconditionResult> CheckPermissionsAsync(
+        ICommandContext context,
+        CommandInfo command,
+        IServiceProvider services)
+    {
+        var medusaContext = ContextAdapterFactory.CreateNew(context,
+            _strings,
+            services);
+
+        var result = await _filterAttribute.CheckAsync(medusaContext);
+        
+        if (!result)
+            return PreconditionResult.FromError($"Precondition '{_filterAttribute.GetType().Name}' failed.");
+        
+        return PreconditionResult.FromSuccess();
+    }
+}

src/NadekoBot/Common/Medusa/Adapters/GuildContextAdapter.cs

@@ -11,6 +11,7 @@ public sealed class GuildContextAdapter : GuildContext
     public override IMedusaStrings Strings { get; }
     public override IGuild Guild { get; }
     public override ITextChannel Channel { get; }
+    public override ISelfUser Bot { get; }
     public override IUserMessage Message
         => _ctx.Message;
 
@@ -28,6 +29,7 @@ public sealed class GuildContextAdapter : GuildContext
 
         Strings = strings;
         User = (IGuildUser)ctx.User;
+        Bot = ctx.Client.CurrentUser;
 
         _services = services;
         _ebs = new(_services.GetRequiredService<IEmbedBuilderService>());

src/NadekoBot/Common/Medusa/Config/MedusaConfigService.cs

@@ -22,8 +22,6 @@ public sealed class MedusaConfigService : ConfigServiceBase<MedusaConfig>, IMedu
 
     public void AddLoadedMedusa(string name)
     {
-        name = name.Trim().ToLowerInvariant();
-        
         ModifyConfig(conf =>
         {
             if (conf.Loaded is null)
@@ -36,8 +34,6 @@ public sealed class MedusaConfigService : ConfigServiceBase<MedusaConfig>, IMedu
     
     public void RemoveLoadedMedusa(string name)
     {
-        name = name.Trim().ToLowerInvariant();
-        
         ModifyConfig(conf =>
         {
             if (conf.Loaded is null)

src/NadekoBot/Common/Medusa/MedusaLoaderService.cs

@@ -1,5 +1,6 @@
 using Discord.Commands.Builders;
 using Microsoft.Extensions.DependencyInjection;
+using Nadeko.Medusa.Adapters;
 using NadekoBot.Common.ModuleBehaviors;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
@@ -382,6 +383,11 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
         {
             var m = mb.WithName(snekInfo.Name);
 
+            foreach (var f in snekInfo.Filters)
+            {
+                m.AddPrecondition(new FilterAdapter(f, strings));
+            }
+
             foreach (var cmd in snekInfo.Commands)
             {
                 m.AddCommand(cmd.Aliases.First(),
@@ -390,7 +396,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
                         new(cmd),
                         new(medusaServices),
                         strings),
-                    CreateCommandFactory(medusaName, cmd));
+                    CreateCommandFactory(medusaName, cmd, strings));
             }
 
             foreach (var subInfo in snekInfo.Subsneks)
@@ -399,7 +405,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
 
     private static readonly RequireContextAttribute _reqGuild = new RequireContextAttribute(ContextType.Guild);
     private static readonly RequireContextAttribute _reqDm = new RequireContextAttribute(ContextType.DM);
-    private Action<CommandBuilder> CreateCommandFactory(string medusaName, SnekCommandData cmd)
+    private Action<CommandBuilder> CreateCommandFactory(string medusaName, SnekCommandData cmd, IMedusaStrings strings)
         => (cb) =>
         {
             cb.AddAliases(cmd.Aliases.Skip(1).ToArray());
@@ -408,6 +414,31 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
                 cb.AddPrecondition(_reqGuild);
             else if (cmd.ContextType == CommandContextType.Dm)
                 cb.AddPrecondition(_reqDm);
+            
+            foreach (var f in cmd.Filters)
+                cb.AddPrecondition(new FilterAdapter(f, strings));
+
+            foreach (var ubp in cmd.UserAndBotPerms)
+            {
+                if (ubp is user_permAttribute up)
+                {
+                    if (up.GuildPerm is { } gp)
+                        cb.AddPrecondition(new UserPermAttribute(gp));
+                    else if (up.ChannelPerm is { } cp)
+                        cb.AddPrecondition(new UserPermAttribute(cp));
+                }
+                else if (ubp is bot_permAttribute bp)
+                {
+                    if (bp.GuildPerm is { } gp)
+                        cb.AddPrecondition(new BotPermAttribute(gp));
+                    else if (bp.ChannelPerm is { } cp)
+                        cb.AddPrecondition(new BotPermAttribute(cp));
+                }
+                else if (ubp is bot_owner_onlyAttribute)
+                {
+                    cb.AddPrecondition(new OwnerOnlyAttribute());
+                }
+            }
 
             cb.WithPriority(cmd.Priority);
             
@@ -428,6 +459,9 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
             pb.WithIsMultiple(paramData.IsParams)
               .WithIsOptional(paramData.IsOptional)
               .WithIsRemainder(paramData.IsLeftover);
+
+            if (paramData.IsOptional)
+                pb.WithDefault(paramData.DefaultValue);
         };
 
     [MethodImpl(MethodImplOptions.NoInlining)]
@@ -750,8 +784,10 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
         var cmds = new List<SnekCommandData>();
         foreach (var method in methodInfos)
         {
-            var filters = method.GetCustomAttributes<FilterAttribute>().ToArray();
-            var prio = method.GetCustomAttribute<prioAttribute>()?.Priority ?? 0;
+            var filters = method.GetCustomAttributes<FilterAttribute>(true).ToArray();
+            var userAndBotPerms = method.GetCustomAttributes<MedusaPermAttribute>(true)
+                                        .ToArray();
+            var prio = method.GetCustomAttribute<prioAttribute>(true)?.Priority ?? 0;
 
             var paramInfos = method.GetParameters();
             var cmdParams = new List<ParamData>();
@@ -767,6 +803,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
 
                 var leftoverAttribute = pi.GetCustomAttribute<leftoverAttribute>(true);
                 var hasDefaultValue = pi.HasDefaultValue;
+                var defaultValue = pi.DefaultValue;
                 var isLeftover = leftoverAttribute != null;
                 var isParams = pi.GetCustomAttribute<ParamArrayAttribute>() is not null;
                 var paramType = pi.ParameterType;
@@ -803,7 +840,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
                     continue;
                 }
 
-                canInject = false;
+                canInject = false;                                                                                           
 
                 if (isParams)
                 {
@@ -824,11 +861,11 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
                     throw new ArgumentException("Leftover attribute error.");
                 }
 
-                cmdParams.Add(new ParamData(paramType, paramName, hasDefaultValue, isLeftover, isParams));
+                cmdParams.Add(new ParamData(paramType, paramName, hasDefaultValue, defaultValue, isLeftover, isParams));
             }
 
 
-            var cmdAttribute = method.GetCustomAttribute<cmdAttribute>()!; 
+            var cmdAttribute = method.GetCustomAttribute<cmdAttribute>(true)!; 
             var aliases = cmdAttribute.Aliases;
             if (aliases.Length == 0)
                 aliases = new[] { method.Name.ToLowerInvariant() };
@@ -838,6 +875,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
                 method,
                 instance,
                 filters,
+                userAndBotPerms,
                 cmdContext,
                 diParams,
                 cmdParams,

src/NadekoBot/Common/Medusa/Models/ParamData.cs

@@ -4,6 +4,7 @@ public sealed record ParamData(
     Type Type,
     string Name,
     bool IsOptional,
+    object? DefaultValue,
     bool IsLeftover,
     bool IsParams
 );

src/NadekoBot/Common/Medusa/Models/SnekCommandData.cs

@@ -11,6 +11,7 @@ public sealed class SnekCommandData
         MethodInfo methodInfo,
         Snek module,
         FilterAttribute[] filters,
+        MedusaPermAttribute[] userAndBotPerms,
         CommandContextType contextType,
         IReadOnlyList<Type> injectedParams,
         IReadOnlyList<ParamData> parameters,
@@ -21,6 +22,7 @@ public sealed class SnekCommandData
         MethodInfo = methodInfo;
         Module = module;
         Filters = filters;
+        UserAndBotPerms = userAndBotPerms;
         ContextType = contextType;
         InjectedParams = injectedParams;
         Parameters = parameters;
@@ -28,6 +30,8 @@ public sealed class SnekCommandData
         OptionalStrings = strings;
     }
 
+    public MedusaPermAttribute[] UserAndBotPerms { get; set; }
+
     public CommandStrings OptionalStrings { get; set; }
 
     public IReadOnlyCollection<string> Aliases { get; }

src/NadekoBot/Db/Extensions/WaifuExtensions.cs

@@ -10,6 +10,7 @@ namespace NadekoBot.Db;
 
 public class WaifuInfoStats
 {
+    public int WaifuId { get; init; }
     public string FullName { get; init; }
     public long Price { get; init; }
     public string ClaimerName { get; init; }
@@ -17,9 +18,6 @@ public class WaifuInfoStats
     public int AffinityCount { get; init; }
     public int DivorceCount { get; init; }
     public int ClaimCount { get; init; }
-    public List<WaifuItem> Items { get; init; }
-    public List<string> Claims { get; init; }
-    public List<string> Fans { get; init; }
 }
 
 public static class WaifuExtensions
@@ -103,6 +101,7 @@ public static class WaifuExtensions
                                             .FirstOrDefault())
                           .Select(w => new WaifuInfoStats
                           {
+                              WaifuId = w.WaifuId,
                               FullName =
                                   ctx.Set<DiscordUser>()
                                      .AsQueryable()
@@ -135,17 +134,6 @@ public static class WaifuExtensions
                                                  && x.NewId == null
                                                  && x.UpdateType == WaifuUpdateType.Claimed),
                               Price = w.Price,
-                              Claims = ctx.WaifuInfo.AsQueryable()
-                                          .Include(x => x.Waifu)
-                                          .Where(x => x.ClaimerId == w.WaifuId)
-                                          .Select(x => x.Waifu.Username + "#" + x.Waifu.Discriminator)
-                                          .ToList(),
-                              Fans = ctx.WaifuInfo.AsQueryable()
-                                        .Include(x => x.Waifu)
-                                        .Where(x => x.AffinityId == w.WaifuId)
-                                        .Select(x => x.Waifu.Username + "#" + x.Waifu.Discriminator)
-                                        .ToList(),
-                              Items = w.Items
                           })
                           .FirstOrDefault();
 

src/NadekoBot/Db/Models/FeedSub.cs

@@ -8,6 +8,8 @@ public class FeedSub : DbEntity
 
     public ulong ChannelId { get; set; }
     public string Url { get; set; }
+    
+    public string Message { get; set; }
 
     public override int GetHashCode()
         => Url.GetHashCode(StringComparison.InvariantCulture) ^ GuildConfigId.GetHashCode();

src/NadekoBot/Db/Models/LogSetting.cs

@@ -19,6 +19,10 @@ public class LogSetting : DbEntity
     public ulong? ChannelCreatedId { get; set; }
     public ulong? ChannelDestroyedId { get; set; }
     public ulong? ChannelUpdatedId { get; set; }
+    
+    
+    public ulong? ThreadDeletedId { get; set; }
+    public ulong? ThreadCreatedId { get; set; }
 
     public ulong? UserMutedId { get; set; }
 

src/NadekoBot/Db/Models/Waifu.cs

@@ -7,7 +7,7 @@ public class WaifuInfo : DbEntity
 {
     public int WaifuId { get; set; }
     public DiscordUser Waifu { get; set; }
-
+    
     public int? ClaimerId { get; set; }
     public DiscordUser Claimer { get; set; }
 

src/NadekoBot/Db/Models/WaifuItem.cs

@@ -7,4 +7,4 @@ public class WaifuItem : DbEntity
     public int? WaifuInfoId { get; set; }
     public string ItemEmoji { get; set; }
     public string Name { get; set; }
-}
+}

src/NadekoBot/Migrations/Mysql/20221118195208_log-thread.cs

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

src/NadekoBot/Migrations/Mysql/20221122204432_feed-text.cs

@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.Mysql
+{
+    public partial class feedtext : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "message",
+                table: "feedsub",
+                type: "longtext",
+                nullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "message",
+                table: "feedsub");
+        }
+    }
+}

src/NadekoBot/Migrations/Mysql/MysqlContextModelSnapshot.cs

@@ -975,6 +975,10 @@ namespace NadekoBot.Migrations.Mysql
                         .HasColumnType("int")
                         .HasColumnName("guildconfigid");
 
+                    b.Property<string>("Message")
+                        .HasColumnType("longtext")
+                        .HasColumnName("message");
+
                     b.Property<string>("Url")
                         .IsRequired()
                         .HasColumnType("varchar(255)")
@@ -1518,6 +1522,14 @@ namespace NadekoBot.Migrations.Mysql
                         .HasColumnType("bigint unsigned")
                         .HasColumnName("messageupdatedid");
 
+                    b.Property<ulong?>("ThreadCreatedId")
+                        .HasColumnType("bigint unsigned")
+                        .HasColumnName("threadcreatedid");
+
+                    b.Property<ulong?>("ThreadDeletedId")
+                        .HasColumnType("bigint unsigned")
+                        .HasColumnName("threaddeletedid");
+
                     b.Property<ulong?>("UserBannedId")
                         .HasColumnType("bigint unsigned")
                         .HasColumnName("userbannedid");

src/NadekoBot/Migrations/PostgreSql/20221118195200_log-thread.cs

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

src/NadekoBot/Migrations/PostgreSql/20221122204423_feed-text.cs

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

src/NadekoBot/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs

@@ -1023,6 +1023,10 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnType("integer")
                         .HasColumnName("guildconfigid");
 
+                    b.Property<string>("Message")
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
                     b.Property<string>("Url")
                         .IsRequired()
                         .HasColumnType("text")
@@ -1590,6 +1594,14 @@ namespace NadekoBot.Migrations.PostgreSql
                         .HasColumnType("numeric(20,0)")
                         .HasColumnName("messageupdatedid");
 
+                    b.Property<decimal?>("ThreadCreatedId")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("threadcreatedid");
+
+                    b.Property<decimal?>("ThreadDeletedId")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("threaddeletedid");
+
                     b.Property<decimal?>("UserBannedId")
                         .HasColumnType("numeric(20,0)")
                         .HasColumnName("userbannedid");

src/NadekoBot/Migrations/Sqlite/20221118195152_log-thread.cs

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

src/NadekoBot/Migrations/Sqlite/20221122204324_feed-text.cs

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

src/NadekoBot/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs

@@ -37,7 +37,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("GuildId")
                         .IsUnique();
 
-                    b.ToTable("AutoPublishChannel");
+                    b.ToTable("AutoPublishChannel", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Db.Models.BankUser", b =>
@@ -60,7 +60,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("UserId")
                         .IsUnique();
 
-                    b.ToTable("BankUsers");
+                    b.ToTable("BankUsers", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b =>
@@ -75,7 +75,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("ClubApplicants");
+                    b.ToTable("ClubApplicants", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Db.Models.ClubBans", b =>
@@ -90,7 +90,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("ClubBans");
+                    b.ToTable("ClubBans", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Db.Models.ClubInfo", b =>
@@ -126,7 +126,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("OwnerId")
                         .IsUnique();
 
-                    b.ToTable("Clubs");
+                    b.ToTable("Clubs", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Db.Models.DiscordUser", b =>
@@ -185,7 +185,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("DiscordUser");
+                    b.ToTable("DiscordUser", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Db.Models.FollowedStream", b =>
@@ -219,7 +219,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("FollowedStream");
+                    b.ToTable("FollowedStream", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Db.Models.PatronQuota", b =>
@@ -246,7 +246,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("PatronQuotas");
+                    b.ToTable("PatronQuotas", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b =>
@@ -272,7 +272,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("UniquePlatformUserId")
                         .IsUnique();
 
-                    b.ToTable("Patrons");
+                    b.ToTable("Patrons", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Db.Models.StreamOnlineMessage", b =>
@@ -298,7 +298,7 @@ namespace NadekoBot.Migrations
 
                     b.HasKey("Id");
 
-                    b.ToTable("StreamOnlineMessages");
+                    b.ToTable("StreamOnlineMessages", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Db.Models.XpShopOwnedItem", b =>
@@ -328,7 +328,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("UserId", "ItemType", "ItemKey")
                         .IsUnique();
 
-                    b.ToTable("XpShopOwnedItem");
+                    b.ToTable("XpShopOwnedItem", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiAltSetting", b =>
@@ -357,7 +357,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("GuildConfigId")
                         .IsUnique();
 
-                    b.ToTable("AntiAltSetting");
+                    b.ToTable("AntiAltSetting", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiRaidSetting", b =>
@@ -389,7 +389,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("GuildConfigId")
                         .IsUnique();
 
-                    b.ToTable("AntiRaidSetting");
+                    b.ToTable("AntiRaidSetting", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamIgnore", b =>
@@ -411,7 +411,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("AntiSpamSettingId");
 
-                    b.ToTable("AntiSpamIgnore");
+                    b.ToTable("AntiSpamIgnore", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.AntiSpamSetting", b =>
@@ -443,7 +443,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("GuildConfigId")
                         .IsUnique();
 
-                    b.ToTable("AntiSpamSetting");
+                    b.ToTable("AntiSpamSetting", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.AutoCommand", b =>
@@ -481,7 +481,7 @@ namespace NadekoBot.Migrations
 
                     b.HasKey("Id");
 
-                    b.ToTable("AutoCommands");
+                    b.ToTable("AutoCommands", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.AutoTranslateChannel", b =>
@@ -509,7 +509,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildId");
 
-                    b.ToTable("AutoTranslateChannels");
+                    b.ToTable("AutoTranslateChannels", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.AutoTranslateUser", b =>
@@ -537,7 +537,7 @@ namespace NadekoBot.Migrations
 
                     b.HasAlternateKey("ChannelId", "UserId");
 
-                    b.ToTable("AutoTranslateUsers");
+                    b.ToTable("AutoTranslateUsers", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.BanTemplate", b =>
@@ -563,7 +563,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("GuildId")
                         .IsUnique();
 
-                    b.ToTable("BanTemplates");
+                    b.ToTable("BanTemplates", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.BlacklistEntry", b =>
@@ -583,7 +583,7 @@ namespace NadekoBot.Migrations
 
                     b.HasKey("Id");
 
-                    b.ToTable("Blacklist");
+                    b.ToTable("Blacklist", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandAlias", b =>
@@ -608,7 +608,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("CommandAlias");
+                    b.ToTable("CommandAlias", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.CommandCooldown", b =>
@@ -633,7 +633,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("CommandCooldown");
+                    b.ToTable("CommandCooldown", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.CurrencyTransaction", b =>
@@ -671,7 +671,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("CurrencyTransactions");
+                    b.ToTable("CurrencyTransactions", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.DelMsgOnCmdChannel", b =>
@@ -696,7 +696,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("DelMsgOnCmdChannel");
+                    b.ToTable("DelMsgOnCmdChannel", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.DiscordPermOverride", b =>
@@ -722,7 +722,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("GuildId", "Command")
                         .IsUnique();
 
-                    b.ToTable("DiscordPermOverrides");
+                    b.ToTable("DiscordPermOverrides", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.ExcludedItem", b =>
@@ -747,7 +747,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("XpSettingsId");
 
-                    b.ToTable("ExcludedItem");
+                    b.ToTable("ExcludedItem", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.FeedSub", b =>
@@ -765,6 +765,9 @@ namespace NadekoBot.Migrations
                     b.Property<int>("GuildConfigId")
                         .HasColumnType("INTEGER");
 
+                    b.Property<string>("Message")
+                        .HasColumnType("TEXT");
+
                     b.Property<string>("Url")
                         .IsRequired()
                         .HasColumnType("TEXT");
@@ -773,7 +776,7 @@ namespace NadekoBot.Migrations
 
                     b.HasAlternateKey("GuildConfigId", "Url");
 
-                    b.ToTable("FeedSub");
+                    b.ToTable("FeedSub", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterChannelId", b =>
@@ -795,7 +798,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("FilterChannelId");
+                    b.ToTable("FilterChannelId", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.FilteredWord", b =>
@@ -817,7 +820,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("FilteredWord");
+                    b.ToTable("FilteredWord", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterLinksChannelId", b =>
@@ -839,7 +842,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("FilterLinksChannelId");
+                    b.ToTable("FilterLinksChannelId", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.FilterWordsChannelId", b =>
@@ -861,7 +864,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("FilterWordsChannelId");
+                    b.ToTable("FilterWordsChannelId", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.GamblingStats", b =>
@@ -887,7 +890,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("Feature")
                         .IsUnique();
 
-                    b.ToTable("GamblingStats");
+                    b.ToTable("GamblingStats", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.GCChannelId", b =>
@@ -909,7 +912,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("GCChannelId");
+                    b.ToTable("GCChannelId", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.GroupName", b =>
@@ -935,7 +938,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("GuildConfigId", "Number")
                         .IsUnique();
 
-                    b.ToTable("GroupName");
+                    b.ToTable("GroupName", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.GuildConfig", b =>
@@ -1067,7 +1070,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("WarnExpireHours");
 
-                    b.ToTable("GuildConfigs");
+                    b.ToTable("GuildConfigs", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredLogItem", b =>
@@ -1093,7 +1096,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("LogSettingId", "LogItemId", "ItemType")
                         .IsUnique();
 
-                    b.ToTable("IgnoredLogChannels");
+                    b.ToTable("IgnoredLogChannels", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.IgnoredVoicePresenceChannel", b =>
@@ -1115,7 +1118,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("LogSettingId");
 
-                    b.ToTable("IgnoredVoicePresenceCHannels");
+                    b.ToTable("IgnoredVoicePresenceCHannels", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.ImageOnlyChannel", b =>
@@ -1141,7 +1144,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("ChannelId")
                         .IsUnique();
 
-                    b.ToTable("ImageOnlyChannels");
+                    b.ToTable("ImageOnlyChannels", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.LogSetting", b =>
@@ -1186,6 +1189,12 @@ namespace NadekoBot.Migrations
                     b.Property<ulong?>("MessageUpdatedId")
                         .HasColumnType("INTEGER");
 
+                    b.Property<ulong?>("ThreadCreatedId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<ulong?>("ThreadDeletedId")
+                        .HasColumnType("INTEGER");
+
                     b.Property<ulong?>("UserBannedId")
                         .HasColumnType("INTEGER");
 
@@ -1209,7 +1218,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("GuildId")
                         .IsUnique();
 
-                    b.ToTable("LogSettings");
+                    b.ToTable("LogSettings", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlayerSettings", b =>
@@ -1246,7 +1255,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("GuildId")
                         .IsUnique();
 
-                    b.ToTable("MusicPlayerSettings");
+                    b.ToTable("MusicPlayerSettings", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.MusicPlaylist", b =>
@@ -1269,7 +1278,7 @@ namespace NadekoBot.Migrations
 
                     b.HasKey("Id");
 
-                    b.ToTable("MusicPlaylists");
+                    b.ToTable("MusicPlaylists", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.MutedUserId", b =>
@@ -1291,7 +1300,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("MutedUserId");
+                    b.ToTable("MutedUserId", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.NadekoExpression", b =>
@@ -1329,7 +1338,7 @@ namespace NadekoBot.Migrations
 
                     b.HasKey("Id");
 
-                    b.ToTable("Expressions");
+                    b.ToTable("Expressions", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.NsfwBlacklistedTag", b =>
@@ -1351,7 +1360,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildId");
 
-                    b.ToTable("NsfwBlacklistedTags");
+                    b.ToTable("NsfwBlacklistedTags", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.Permissionv2", b =>
@@ -1391,7 +1400,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("Permissions");
+                    b.ToTable("Permissions", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.PlantedCurrency", b =>
@@ -1428,7 +1437,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("MessageId")
                         .IsUnique();
 
-                    b.ToTable("PlantedCurrency");
+                    b.ToTable("PlantedCurrency", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.PlaylistSong", b =>
@@ -1462,7 +1471,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("MusicPlaylistId");
 
-                    b.ToTable("PlaylistSong");
+                    b.ToTable("PlaylistSong", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.Poll", b =>
@@ -1488,7 +1497,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("GuildId")
                         .IsUnique();
 
-                    b.ToTable("Poll");
+                    b.ToTable("Poll", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.PollAnswer", b =>
@@ -1513,7 +1522,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("PollId");
 
-                    b.ToTable("PollAnswer");
+                    b.ToTable("PollAnswer", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.PollVote", b =>
@@ -1538,7 +1547,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("PollId");
 
-                    b.ToTable("PollVote");
+                    b.ToTable("PollVote", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.Quote", b =>
@@ -1574,7 +1583,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("Keyword");
 
-                    b.ToTable("Quotes");
+                    b.ToTable("Quotes", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.ReactionRoleV2", b =>
@@ -1615,7 +1624,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("MessageId", "Emote")
                         .IsUnique();
 
-                    b.ToTable("ReactionRoles");
+                    b.ToTable("ReactionRoles", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.Reminder", b =>
@@ -1649,7 +1658,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("When");
 
-                    b.ToTable("Reminders");
+                    b.ToTable("Reminders", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.Repeater", b =>
@@ -1684,7 +1693,7 @@ namespace NadekoBot.Migrations
 
                     b.HasKey("Id");
 
-                    b.ToTable("Repeaters");
+                    b.ToTable("Repeaters", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.RewardedUser", b =>
@@ -1713,7 +1722,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("PlatformUserId")
                         .IsUnique();
 
-                    b.ToTable("RewardedUsers");
+                    b.ToTable("RewardedUsers", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.RotatingPlayingStatus", b =>
@@ -1733,7 +1742,7 @@ namespace NadekoBot.Migrations
 
                     b.HasKey("Id");
 
-                    b.ToTable("RotatingStatus");
+                    b.ToTable("RotatingStatus", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.SelfAssignedRole", b =>
@@ -1764,7 +1773,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("GuildId", "RoleId")
                         .IsUnique();
 
-                    b.ToTable("SelfAssignableRoles");
+                    b.ToTable("SelfAssignableRoles", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntry", b =>
@@ -1807,7 +1816,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("ShopEntry");
+                    b.ToTable("ShopEntry", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.ShopEntryItem", b =>
@@ -1829,7 +1838,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("ShopEntryId");
 
-                    b.ToTable("ShopEntryItem");
+                    b.ToTable("ShopEntryItem", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredRole", b =>
@@ -1851,7 +1860,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("SlowmodeIgnoredRole");
+                    b.ToTable("SlowmodeIgnoredRole", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.SlowmodeIgnoredUser", b =>
@@ -1873,7 +1882,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("SlowmodeIgnoredUser");
+                    b.ToTable("SlowmodeIgnoredUser", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleBlacklistedUser", b =>
@@ -1898,7 +1907,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("StreamRoleSettingsId");
 
-                    b.ToTable("StreamRoleBlacklistedUser");
+                    b.ToTable("StreamRoleBlacklistedUser", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleSettings", b =>
@@ -1930,7 +1939,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("GuildConfigId")
                         .IsUnique();
 
-                    b.ToTable("StreamRoleSettings");
+                    b.ToTable("StreamRoleSettings", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.StreamRoleWhitelistedUser", b =>
@@ -1955,7 +1964,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("StreamRoleSettingsId");
 
-                    b.ToTable("StreamRoleWhitelistedUser");
+                    b.ToTable("StreamRoleWhitelistedUser", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.UnbanTimer", b =>
@@ -1980,7 +1989,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("UnbanTimer");
+                    b.ToTable("UnbanTimer", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.UnmuteTimer", b =>
@@ -2005,7 +2014,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("UnmuteTimer");
+                    b.ToTable("UnmuteTimer", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.UnroleTimer", b =>
@@ -2033,7 +2042,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("UnroleTimer");
+                    b.ToTable("UnroleTimer", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.UserXpStats", b =>
@@ -2073,7 +2082,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("UserId", "GuildId")
                         .IsUnique();
 
-                    b.ToTable("UserXpStats");
+                    b.ToTable("UserXpStats", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.VcRoleInfo", b =>
@@ -2098,7 +2107,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("VcRoleInfo");
+                    b.ToTable("VcRoleInfo", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuInfo", b =>
@@ -2133,7 +2142,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("WaifuId")
                         .IsUnique();
 
-                    b.ToTable("WaifuInfo");
+                    b.ToTable("WaifuInfo", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuItem", b =>
@@ -2158,7 +2167,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("WaifuInfoId");
 
-                    b.ToTable("WaifuItem");
+                    b.ToTable("WaifuItem", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.WaifuUpdate", b =>
@@ -2190,7 +2199,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("WaifuUpdates");
+                    b.ToTable("WaifuUpdates", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.Warning", b =>
@@ -2233,7 +2242,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("Warnings");
+                    b.ToTable("Warnings", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.WarningPunishment", b =>
@@ -2264,7 +2273,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("GuildConfigId");
 
-                    b.ToTable("WarningPunishment");
+                    b.ToTable("WarningPunishment", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.XpCurrencyReward", b =>
@@ -2289,7 +2298,7 @@ namespace NadekoBot.Migrations
 
                     b.HasIndex("XpSettingsId");
 
-                    b.ToTable("XpCurrencyReward");
+                    b.ToTable("XpCurrencyReward", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.XpRoleReward", b =>
@@ -2318,7 +2327,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("XpSettingsId", "Level")
                         .IsUnique();
 
-                    b.ToTable("XpRoleReward");
+                    b.ToTable("XpRoleReward", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Services.Database.Models.XpSettings", b =>
@@ -2341,7 +2350,7 @@ namespace NadekoBot.Migrations
                     b.HasIndex("GuildConfigId")
                         .IsUnique();
 
-                    b.ToTable("XpSettings");
+                    b.ToTable("XpSettings", (string)null);
                 });
 
             modelBuilder.Entity("NadekoBot.Db.Models.ClubApplicants", b =>

src/NadekoBot/Modules/Administration/DangerousCommands/DangerousCommandsService.cs

@@ -78,6 +78,7 @@ public class DangerousCommandsService : INService
 
         await ctx.CurrencyTransactions.DeleteAsync();
         await ctx.PlantedCurrency.DeleteAsync();
+        await ctx.BankUsers.DeleteAsync();
         await ctx.SaveChangesAsync();
     }
 

src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs

@@ -191,7 +191,7 @@ public class GreetService : INService, IReadyExecutor
             if (conf.AutoDeleteByeMessagesTimer > 0)
                 toDelete.DeleteAfter(conf.AutoDeleteByeMessagesTimer);
         }
-        catch (HttpException ex) when (ex.DiscordCode == DiscordErrorCode.InsufficientPermissions)
+        catch (HttpException ex) when (ex.DiscordCode == DiscordErrorCode.InsufficientPermissions || ex.DiscordCode == DiscordErrorCode.UnknownChannel)
         {
             Log.Warning(ex, "Missing permissions to send a bye message, the bye message will be disabled on server: {GuildId}", channel.GuildId);
             await SetBye(channel.GuildId, channel.Id, false);
@@ -224,7 +224,7 @@ public class GreetService : INService, IReadyExecutor
             if (conf.AutoDeleteGreetMessagesTimer > 0)
                 toDelete.DeleteAfter(conf.AutoDeleteGreetMessagesTimer);
         }
-        catch (HttpException ex) when (ex.DiscordCode == DiscordErrorCode.InsufficientPermissions)
+        catch (HttpException ex) when (ex.DiscordCode == DiscordErrorCode.InsufficientPermissions || ex.DiscordCode == DiscordErrorCode.UnknownChannel)
         {
             Log.Warning(ex, "Missing permissions to send a bye message, the greet message will be disabled on server: {GuildId}", channel.GuildId);
             await SetGreet(channel.GuildId, channel.Id, false);

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

@@ -356,24 +356,24 @@ public class MuteService : INService
 
     public async Task TimedBan(
         IGuild guild,
-        IUser user,
+        ulong userId,
         TimeSpan after,
         string reason,
         int pruneDays)
     {
-        await guild.AddBanAsync(user.Id, pruneDays, reason);
+        await guild.AddBanAsync(userId, pruneDays, reason);
         await using (var uow = _db.GetDbContext())
         {
             var config = uow.GuildConfigsForId(guild.Id, set => set.Include(x => x.UnbanTimer));
             config.UnbanTimer.Add(new()
             {
-                UserId = user.Id,
+                UserId = userId,
                 UnbanAt = DateTime.UtcNow + after
             }); // add teh unmute timer to the database
-            uow.SaveChanges();
+            await uow.SaveChangesAsync();
         }
 
-        StartUn_Timer(guild.Id, user.Id, after, TimerType.Ban); // start the timer
+        StartUn_Timer(guild.Id, userId, after, TimerType.Ban); // start the timer
     }
 
     public async Task TimedRole(

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

@@ -457,6 +457,7 @@ public class ProtectionService : INService
             case PunishmentAction.ChatMute:
             case PunishmentAction.VoiceMute:
             case PunishmentAction.AddRole:
+            case PunishmentAction.TimeOut:
                 return true;
             default:
                 return false;

src/NadekoBot/Modules/Administration/Self/DoAsUserMessage.cs

@@ -0,0 +1,138 @@
+using MessageType = Discord.MessageType;
+
+namespace NadekoBot.Modules.Administration;
+
+public sealed class DoAsUserMessage : IUserMessage
+{
+    private readonly string _message;
+    private IUserMessage _msg;
+    private readonly IUser _user;
+
+    public DoAsUserMessage(SocketUserMessage msg, IUser user, string message)
+    {
+        _msg = msg;
+        _user = user;
+        _message = message;
+    }
+
+    public ulong Id => _msg.Id;
+
+    public DateTimeOffset CreatedAt => _msg.CreatedAt;
+
+    public Task DeleteAsync(RequestOptions? options = null)
+    {
+        return _msg.DeleteAsync(options);
+    }
+
+    public Task AddReactionAsync(IEmote emote, RequestOptions? options = null)
+    {
+        return _msg.AddReactionAsync(emote, options);
+    }
+
+    public Task RemoveReactionAsync(IEmote emote, IUser user, RequestOptions? options = null)
+    {
+        return _msg.RemoveReactionAsync(emote, user, options);
+    }
+
+    public Task RemoveReactionAsync(IEmote emote, ulong userId, RequestOptions? options = null)
+    {
+        return _msg.RemoveReactionAsync(emote, userId, options);
+    }
+
+    public Task RemoveAllReactionsAsync(RequestOptions? options = null)
+    {
+        return _msg.RemoveAllReactionsAsync(options);
+    }
+
+    public Task RemoveAllReactionsForEmoteAsync(IEmote emote, RequestOptions? options = null)
+    {
+        return _msg.RemoveAllReactionsForEmoteAsync(emote, options);
+    }
+
+    public IAsyncEnumerable<IReadOnlyCollection<IUser>> GetReactionUsersAsync(IEmote emoji, int limit,
+        RequestOptions? options = null)
+    {
+        return _msg.GetReactionUsersAsync(emoji, limit, options);
+    }
+
+    public MessageType Type => _msg.Type;
+
+    public MessageSource Source => _msg.Source;
+
+    public bool IsTTS => _msg.IsTTS;
+
+    public bool IsPinned => _msg.IsPinned;
+
+    public bool IsSuppressed => _msg.IsSuppressed;
+
+    public bool MentionedEveryone => _msg.MentionedEveryone;
+
+    public string Content => _message;
+
+    public string CleanContent => _msg.CleanContent;
+
+    public DateTimeOffset Timestamp => _msg.Timestamp;
+
+    public DateTimeOffset? EditedTimestamp => _msg.EditedTimestamp;
+
+    public IMessageChannel Channel => _msg.Channel;
+
+    public IUser Author => _user;
+
+    public IReadOnlyCollection<IAttachment> Attachments => _msg.Attachments;
+
+    public IReadOnlyCollection<IEmbed> Embeds => _msg.Embeds;
+
+    public IReadOnlyCollection<ITag> Tags => _msg.Tags;
+
+    public IReadOnlyCollection<ulong> MentionedChannelIds => _msg.MentionedChannelIds;
+
+    public IReadOnlyCollection<ulong> MentionedRoleIds => _msg.MentionedRoleIds;
+
+    public IReadOnlyCollection<ulong> MentionedUserIds => _msg.MentionedUserIds;
+
+    public MessageActivity Activity => _msg.Activity;
+
+    public MessageApplication Application => _msg.Application;
+
+    public MessageReference Reference => _msg.Reference;
+
+    public IReadOnlyDictionary<IEmote, ReactionMetadata> Reactions => _msg.Reactions;
+
+    public IReadOnlyCollection<IMessageComponent> Components => _msg.Components;
+
+    public IReadOnlyCollection<IStickerItem> Stickers => _msg.Stickers;
+
+    public MessageFlags? Flags => _msg.Flags;
+
+    public IMessageInteraction Interaction => _msg.Interaction;
+
+    public Task ModifyAsync(Action<MessageProperties> func, RequestOptions? options = null)
+    {
+        return _msg.ModifyAsync(func, options);
+    }
+
+    public Task PinAsync(RequestOptions? options = null)
+    {
+        return _msg.PinAsync(options);
+    }
+
+    public Task UnpinAsync(RequestOptions? options = null)
+    {
+        return _msg.UnpinAsync(options);
+    }
+
+    public Task CrosspostAsync(RequestOptions? options = null)
+    {
+        return _msg.CrosspostAsync(options);
+    }
+
+    public string Resolve(TagHandling userHandling = TagHandling.Name, TagHandling channelHandling = TagHandling.Name,
+        TagHandling roleHandling = TagHandling.Name,
+        TagHandling everyoneHandling = TagHandling.Ignore, TagHandling emojiHandling = TagHandling.Name)
+    {
+        return _msg.Resolve(userHandling, channelHandling, roleHandling, everyoneHandling, emojiHandling);
+    }
+
+    public IUserMessage ReferencedMessage => _msg.ReferencedMessage;
+}

src/NadekoBot/Modules/Administration/Self/SelfCommands.cs

@@ -35,6 +35,26 @@ public partial class Administration
             _medusaLoader = medusaLoader;
         }
 
+        [Cmd]
+        [OwnerOnly]
+        public async Task DoAs(IUser user, [Leftover] string message)
+        {
+            if (ctx.User is not IGuildUser { GuildPermissions.Administrator: true })
+                return;
+
+            if (ctx.Guild is SocketGuild sg && ctx.Channel is ISocketMessageChannel ch
+                && ctx.Message is SocketUserMessage msg)
+            {
+                var fakeMessage = new DoAsUserMessage(msg, user, message);
+                
+                await _cmdHandler.TryRunCommand(sg, ch, fakeMessage);
+            }
+            else
+            {
+                await ReplyErrorLocalizedAsync(strs.error_occured);
+            }
+        }
+
         [Cmd]
         [RequireContext(ContextType.Guild)]
         [UserPerm(GuildPerm.Administrator)]

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

@@ -9,9 +9,9 @@ using NadekoBot.Services.Database.Models;
 namespace NadekoBot.Modules.Administration;
 
 public sealed class LogCommandService : ILogCommandService, IReadyExecutor
-    #if !GLOBAL_NADEKO
-    , INService // don't load this service on global nadeko
-    #endif
+#if !GLOBAL_NADEKO
+        , INService // don't load this service on global nadeko
+#endif
 {
     public ConcurrentDictionary<ulong, LogSetting> GuildLogSettings { get; }
 
@@ -49,15 +49,15 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
         _prot = prot;
         _tz = tz;
         _punishService = punishService;
-        
+
         using (var uow = db.GetDbContext())
         {
             var guildIds = client.Guilds.Select(x => x.Id).ToList();
             var configs = uow.LogSettings.AsQueryable()
-                             .AsNoTracking()
-                             .Where(x => guildIds.Contains(x.GuildId))
-                             .Include(ls => ls.LogIgnores)
-                             .ToList();
+                .AsNoTracking()
+                .Where(x => guildIds.Contains(x.GuildId))
+                .Include(ls => ls.LogIgnores)
+                .ToList();
 
             GuildLogSettings = configs.ToDictionary(ls => ls.GuildId).ToConcurrent();
         }
@@ -73,20 +73,144 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
         _client.UserVoiceStateUpdated += _client_UserVoiceStateUpdated;
         _client.UserVoiceStateUpdated += _client_UserVoiceStateUpdated_TTS;
         _client.GuildMemberUpdated += _client_GuildUserUpdated;
+        _client.PresenceUpdated += _client_PresenceUpdated;
         _client.UserUpdated += _client_UserUpdated;
         _client.ChannelCreated += _client_ChannelCreated;
         _client.ChannelDestroyed += _client_ChannelDestroyed;
         _client.ChannelUpdated += _client_ChannelUpdated;
         _client.RoleDeleted += _client_RoleDeleted;
 
+        _client.ThreadCreated += _client_ThreadCreated;
+        _client.ThreadDeleted += _client_ThreadDeleted;
+
         _mute.UserMuted += MuteCommands_UserMuted;
         _mute.UserUnmuted += MuteCommands_UserUnmuted;
 
         _prot.OnAntiProtectionTriggered += TriggeredAntiProtection;
-        
+
         _punishService.OnUserWarned += PunishServiceOnOnUserWarned;
     }
 
+    private async Task _client_PresenceUpdated(SocketUser user, SocketPresence? before, SocketPresence? after)
+    {
+        if (user is not SocketGuildUser gu)
+            return;
+
+        if (!GuildLogSettings.TryGetValue(gu.Guild.Id, out var logSetting)
+            || before is null
+            || after is null)
+            return;
+
+        ITextChannel? logChannel;
+
+        if (!user.IsBot
+            && logSetting.LogUserPresenceId is not null
+            && (logChannel =
+                await TryGetLogChannel(gu.Guild, logSetting, LogType.UserPresence)) is not null)
+        {
+            if (before.Status != after.Status)
+            {
+                var str = "🎭"
+                          + Format.Code(PrettyCurrentTime(gu.Guild))
+                          + GetText(logChannel.Guild,
+                              strs.user_status_change("👤" + Format.Bold(gu.Username),
+                                  Format.Bold(after.Status.ToString())));
+                PresenceUpdates.AddOrUpdate(logChannel,
+                    new List<string>
+                    {
+                        str
+                    },
+                    (_, list) =>
+                    {
+                        list.Add(str);
+                        return list;
+                    });
+            }
+            else if (before.Activities.FirstOrDefault()?.Name != after.Activities.FirstOrDefault()?.Name)
+            {
+                var str =
+                    $"👾`{PrettyCurrentTime(gu.Guild)}`👤__**{gu.Username}**__ is now playing **{after.Activities.FirstOrDefault()?.Name ?? "-"}**.";
+                PresenceUpdates.AddOrUpdate(logChannel,
+                    new List<string>
+                    {
+                        str
+                    },
+                    (_, list) =>
+                    {
+                        list.Add(str);
+                        return list;
+                    });
+            }
+        }
+    }
+
+    private Task _client_ThreadDeleted(Cacheable<SocketThreadChannel, ulong> sch)
+    {
+        _ = Task.Run(async () =>
+        {
+            try
+            {
+                if (sch.HasValue || sch.Value is not IGuildChannel ch)
+                    return;
+
+                if (!GuildLogSettings.TryGetValue(ch.Guild.Id, out var logSetting)
+                    || logSetting.ThreadDeletedId is null)
+                    return;
+
+                ITextChannel? logChannel;
+                if ((logChannel = await TryGetLogChannel(ch.Guild, logSetting, LogType.ThreadDeleted)) is null)
+                    return;
+
+                var title = GetText(logChannel.Guild, strs.thread_deleted);
+
+                await logChannel.EmbedAsync(_eb.Create()
+                    .WithOkColor()
+                    .WithTitle("🆕 " + title)
+                    .WithDescription($"{ch.Name} | {ch.Id}")
+                    .WithFooter(CurrentTime(ch.Guild)));
+            }
+            catch (Exception)
+            {
+                // ignored
+            }
+        });
+        return Task.CompletedTask;
+    }
+
+    private Task _client_ThreadCreated(SocketThreadChannel sch)
+    {
+        _ = Task.Run(async () =>
+        {
+            try
+            {
+                if (sch.Guild is not IGuildChannel ch)
+                    return;
+
+                if (!GuildLogSettings.TryGetValue(ch.Guild.Id, out var logSetting)
+                    || logSetting.ThreadCreatedId is null)
+                    return;
+
+                ITextChannel? logChannel;
+                if ((logChannel = await TryGetLogChannel(ch.Guild, logSetting, LogType.ThreadCreated)) is null)
+                    return;
+
+                var title = GetText(logChannel.Guild, strs.thread_created);
+
+                await logChannel.EmbedAsync(_eb.Create()
+                    .WithOkColor()
+                    .WithTitle("🆕 " + title)
+                    .WithDescription($"{ch.Name} | {ch.Id}")
+                    .WithFooter(CurrentTime(ch.Guild)));
+            }
+            catch (Exception)
+            {
+                // ignored
+            }
+        });
+
+        return Task.CompletedTask;
+    }
+
     public async Task OnReadyAsync()
         => await Task.WhenAll(PresenceUpdateTask(), IgnoreMessageIdsClearTask());
 
@@ -107,22 +231,24 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                 var keys = PresenceUpdates.Keys.ToList();
 
                 await keys.Select(key =>
-                          {
-                              if (!((SocketGuild)key.Guild).CurrentUser.GetPermissions(key).SendMessages)
-                                  return Task.CompletedTask;
+                    {
+                        if (!((SocketGuild)key.Guild).CurrentUser.GetPermissions(key).SendMessages)
+                            return Task.CompletedTask;
 
-                              if (PresenceUpdates.TryRemove(key, out var msgs))
-                              {
-                                  var title = GetText(key.Guild, strs.presence_updates);
-                                  var desc = string.Join(Environment.NewLine, msgs);
-                                  return key.SendConfirmAsync(_eb, title, desc.TrimTo(2048)!);
-                              }
+                        if (PresenceUpdates.TryRemove(key, out var msgs))
+                        {
+                            var title = GetText(key.Guild, strs.presence_updates);
+                            var desc = string.Join(Environment.NewLine, msgs);
+                            return key.SendConfirmAsync(_eb, title, desc.TrimTo(2048)!);
+                        }
 
-                              return Task.CompletedTask;
-                          })
-                          .WhenAll();
+                        return Task.CompletedTask;
+                    })
+                    .WhenAll();
+            }
+            catch
+            {
             }
-            catch { }
         }
     }
 
@@ -190,30 +316,29 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
         GuildLogSettings.AddOrUpdate(guildId, _ => logSetting, (_, _) => logSetting);
     }
 
-    
 
     private async Task PunishServiceOnOnUserWarned(Warning arg)
     {
         if (!GuildLogSettings.TryGetValue(arg.GuildId, out var logSetting) || logSetting.LogWarnsId is null)
             return;
-        
+
         var g = _client.GetGuild(arg.GuildId);
-        
+
         ITextChannel? logChannel;
         if ((logChannel = await TryGetLogChannel(g, logSetting, LogType.UserWarned)) is null)
             return;
 
         var embed = _eb.Create()
-                       .WithOkColor()
-                       .WithTitle($"⚠️ User Warned")
-                       .WithDescription($"<@{arg.UserId}> | {arg.UserId}")
-                       .AddField("Mod", arg.Moderator)
-                       .AddField("Reason", string.IsNullOrWhiteSpace(arg.Reason) ? "-" : arg.Reason, true)
-                       .WithFooter(CurrentTime(g));
+            .WithOkColor()
+            .WithTitle($"⚠️ User Warned")
+            .WithDescription($"<@{arg.UserId}> | {arg.UserId}")
+            .AddField("Mod", arg.Moderator)
+            .AddField("Reason", string.IsNullOrWhiteSpace(arg.Reason) ? "-" : arg.Reason, true)
+            .WithFooter(CurrentTime(g));
 
         await logChannel.EmbedAsync(embed);
     }
-    
+
     private Task _client_UserUpdated(SocketUser before, SocketUser uAfter)
     {
         _ = Task.Run(async () =>
@@ -237,18 +362,18 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                 if (before.Username != after.Username)
                 {
                     embed.WithTitle("👥 " + GetText(g, strs.username_changed))
-                         .WithDescription($"{before.Username}#{before.Discriminator} | {before.Id}")
-                         .AddField("Old Name", $"{before.Username}", true)
-                         .AddField("New Name", $"{after.Username}", true)
-                         .WithFooter(CurrentTime(g))
-                         .WithOkColor();
+                        .WithDescription($"{before.Username}#{before.Discriminator} | {before.Id}")
+                        .AddField("Old Name", $"{before.Username}", true)
+                        .AddField("New Name", $"{after.Username}", true)
+                        .WithFooter(CurrentTime(g))
+                        .WithOkColor();
                 }
                 else if (before.AvatarId != after.AvatarId)
                 {
                     embed.WithTitle("👥" + GetText(g, strs.avatar_changed))
-                         .WithDescription($"{before.Username}#{before.Discriminator} | {before.Id}")
-                         .WithFooter(CurrentTime(g))
-                         .WithOkColor();
+                        .WithDescription($"{before.Username}#{before.Discriminator} | {before.Id}")
+                        .WithFooter(CurrentTime(g))
+                        .WithOkColor();
 
                     var bav = before.RealAvatarUrl();
                     if (bav.IsAbsoluteUri)
@@ -412,10 +537,10 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                 }
 
                 var embed = _eb.Create()
-                               .WithAuthor(mutes)
-                               .WithTitle($"{usr.Username}#{usr.Discriminator} | {usr.Id}")
-                               .WithFooter(CurrentTime(usr.Guild))
-                               .WithOkColor();
+                    .WithAuthor(mutes)
+                    .WithTitle($"{usr.Username}#{usr.Discriminator} | {usr.Id}")
+                    .WithFooter(CurrentTime(usr.Guild))
+                    .WithOkColor();
 
                 await logChannel.EmbedAsync(embed);
             }
@@ -459,10 +584,10 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                 }
 
                 var embed = _eb.Create()
-                               .WithAuthor(mutes)
-                               .WithTitle($"{usr.Username}#{usr.Discriminator} | {usr.Id}")
-                               .WithFooter($"{CurrentTime(usr.Guild)}")
-                               .WithOkColor();
+                    .WithAuthor(mutes)
+                    .WithTitle($"{usr.Username}#{usr.Discriminator} | {usr.Id}")
+                    .WithFooter($"{CurrentTime(usr.Guild)}")
+                    .WithOkColor();
 
                 if (!string.IsNullOrWhiteSpace(reason))
                     embed.WithDescription(reason);
@@ -513,11 +638,11 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                 }
 
                 var embed = _eb.Create()
-                               .WithAuthor($"🛡 Anti-{protection}")
-                               .WithTitle(GetText(logChannel.Guild, strs.users) + " " + punishment)
-                               .WithDescription(string.Join("\n", users.Select(u => u.ToString())))
-                               .WithFooter(CurrentTime(logChannel.Guild))
-                               .WithOkColor();
+                    .WithAuthor($"🛡 Anti-{protection}")
+                    .WithTitle(GetText(logChannel.Guild, strs.users) + " " + punishment)
+                    .WithDescription(string.Join("\n", users.Select(u => u.ToString())))
+                    .WithFooter(CurrentTime(logChannel.Guild))
+                    .WithOkColor();
 
                 await logChannel.EmbedAsync(embed);
             }
@@ -566,16 +691,16 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                     && (logChannel = await TryGetLogChannel(before.Guild, logSetting, LogType.UserUpdated)) is not null)
                 {
                     var embed = _eb.Create()
-                                   .WithOkColor()
-                                   .WithFooter(CurrentTime(before.Guild))
-                                   .WithTitle($"{before.Username}#{before.Discriminator} | {before.Id}");
+                        .WithOkColor()
+                        .WithFooter(CurrentTime(before.Guild))
+                        .WithTitle($"{before.Username}#{before.Discriminator} | {before.Id}");
                     if (before.Nickname != after.Nickname)
                     {
                         embed.WithAuthor("👥 " + GetText(logChannel.Guild, strs.nick_change))
-                             .AddField(GetText(logChannel.Guild, strs.old_nick),
-                                 $"{before.Nickname}#{before.Discriminator}")
-                             .AddField(GetText(logChannel.Guild, strs.new_nick),
-                                 $"{after.Nickname}#{after.Discriminator}");
+                            .AddField(GetText(logChannel.Guild, strs.old_nick),
+                                $"{before.Nickname}#{before.Discriminator}")
+                            .AddField(GetText(logChannel.Guild, strs.new_nick),
+                                $"{after.Nickname}#{after.Discriminator}");
 
                         await logChannel.EmbedAsync(embed);
                     }
@@ -585,7 +710,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                         {
                             var diffRoles = after.Roles.Where(r => !before.Roles.Contains(r)).Select(r => r.Name);
                             embed.WithAuthor("⚔ " + GetText(logChannel.Guild, strs.user_role_add))
-                                 .WithDescription(string.Join(", ", diffRoles).SanitizeMentions());
+                                .WithDescription(string.Join(", ", diffRoles).SanitizeMentions());
 
                             await logChannel.EmbedAsync(embed);
                         }
@@ -593,59 +718,19 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                         {
                             await Task.Delay(1000);
                             var diffRoles = before.Roles.Where(r => !after.Roles.Contains(r) && !IsRoleDeleted(r.Id))
-                                                  .Select(r => r.Name)
-                                                  .ToList();
+                                .Select(r => r.Name)
+                                .ToList();
 
                             if (diffRoles.Any())
                             {
                                 embed.WithAuthor("⚔ " + GetText(logChannel.Guild, strs.user_role_rem))
-                                     .WithDescription(string.Join(", ", diffRoles).SanitizeMentions());
+                                    .WithDescription(string.Join(", ", diffRoles).SanitizeMentions());
 
                                 await logChannel.EmbedAsync(embed);
                             }
                         }
                     }
                 }
-
-                if (!before.IsBot
-                    && logSetting.LogUserPresenceId is not null
-                    && (logChannel =
-                        await TryGetLogChannel(before.Guild, logSetting, LogType.UserPresence)) is not null)
-                {
-                    if (before.Status != after.Status)
-                    {
-                        var str = "🎭"
-                                  + Format.Code(PrettyCurrentTime(after.Guild))
-                                  + GetText(logChannel.Guild,
-                                      strs.user_status_change("👤" + Format.Bold(after.Username),
-                                          Format.Bold(after.Status.ToString())));
-                        PresenceUpdates.AddOrUpdate(logChannel,
-                            new List<string>
-                            {
-                                str
-                            },
-                            (_, list) =>
-                            {
-                                list.Add(str);
-                                return list;
-                            });
-                    }
-                    else if (before.Activities.FirstOrDefault()?.Name != after.Activities.FirstOrDefault()?.Name)
-                    {
-                        var str =
-                            $"👾`{PrettyCurrentTime(after.Guild)}`👤__**{after.Username}**__ is now playing **{after.Activities.FirstOrDefault()?.Name ?? "-"}**.";
-                        PresenceUpdates.AddOrUpdate(logChannel,
-                            new List<string>
-                            {
-                                str
-                            },
-                            (_, list) =>
-                            {
-                                list.Add(str);
-                                return list;
-                            });
-                    }
-                }
             }
             catch
             {
@@ -684,15 +769,15 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                 if (before.Name != after.Name)
                 {
                     embed.WithTitle("ℹ️ " + GetText(logChannel.Guild, strs.ch_name_change))
-                         .WithDescription($"{after} | {after.Id}")
-                         .AddField(GetText(logChannel.Guild, strs.ch_old_name), before.Name);
+                        .WithDescription($"{after} | {after.Id}")
+                        .AddField(GetText(logChannel.Guild, strs.ch_old_name), before.Name);
                 }
                 else if (beforeTextChannel?.Topic != afterTextChannel?.Topic)
                 {
                     embed.WithTitle("ℹ️ " + GetText(logChannel.Guild, strs.ch_topic_change))
-                         .WithDescription($"{after} | {after.Id}")
-                         .AddField(GetText(logChannel.Guild, strs.old_topic), beforeTextChannel?.Topic ?? "-")
-                         .AddField(GetText(logChannel.Guild, strs.new_topic), afterTextChannel?.Topic ?? "-");
+                        .WithDescription($"{after} | {after.Id}")
+                        .AddField(GetText(logChannel.Guild, strs.old_topic), beforeTextChannel?.Topic ?? "-")
+                        .AddField(GetText(logChannel.Guild, strs.new_topic), afterTextChannel?.Topic ?? "-");
                 }
                 else
                     return;
@@ -725,6 +810,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                 ITextChannel? logChannel;
                 if ((logChannel = await TryGetLogChannel(ch.Guild, logSetting, LogType.ChannelDestroyed)) is null)
                     return;
+
                 string title;
                 if (ch is IVoiceChannel)
                     title = GetText(logChannel.Guild, strs.voice_chan_destroyed);
@@ -732,10 +818,10 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                     title = GetText(logChannel.Guild, strs.text_chan_destroyed);
 
                 await logChannel.EmbedAsync(_eb.Create()
-                                               .WithOkColor()
-                                               .WithTitle("🆕 " + title)
-                                               .WithDescription($"{ch.Name} | {ch.Id}")
-                                               .WithFooter(CurrentTime(ch.Guild)));
+                    .WithOkColor()
+                    .WithTitle("🆕 " + title)
+                    .WithDescription($"{ch.Name} | {ch.Id}")
+                    .WithFooter(CurrentTime(ch.Guild)));
             }
             catch
             {
@@ -768,10 +854,10 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                     title = GetText(logChannel.Guild, strs.text_chan_created);
 
                 await logChannel.EmbedAsync(_eb.Create()
-                                               .WithOkColor()
-                                               .WithTitle("🆕 " + title)
-                                               .WithDescription($"{ch.Name} | {ch.Id}")
-                                               .WithFooter(CurrentTime(ch.Guild)));
+                    .WithOkColor()
+                    .WithTitle("🆕 " + title)
+                    .WithDescription($"{ch.Name} | {ch.Id}")
+                    .WithFooter(CurrentTime(ch.Guild)));
             }
             catch (Exception)
             {
@@ -871,11 +957,11 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                 if ((logChannel = await TryGetLogChannel(guild, logSetting, LogType.UserLeft)) is null)
                     return;
                 var embed = _eb.Create()
-                               .WithOkColor()
-                               .WithTitle("❌ " + GetText(logChannel.Guild, strs.user_left))
-                               .WithDescription(usr.ToString())
-                               .AddField("Id", usr.Id.ToString())
-                               .WithFooter(CurrentTime(guild));
+                    .WithOkColor()
+                    .WithTitle("❌ " + GetText(logChannel.Guild, strs.user_left))
+                    .WithDescription(usr.ToString())
+                    .AddField("Id", usr.Id.ToString())
+                    .WithFooter(CurrentTime(guild));
 
                 if (Uri.IsWellFormedUriString(usr.GetAvatarUrl(), UriKind.Absolute))
                     embed.WithThumbnailUrl(usr.GetAvatarUrl());
@@ -904,17 +990,17 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                     return;
 
                 var embed = _eb.Create()
-                               .WithOkColor()
-                               .WithTitle("✅ " + GetText(logChannel.Guild, strs.user_joined))
-                               .WithDescription($"{usr.Mention} `{usr}`")
-                               .AddField("Id", usr.Id.ToString())
-                               .AddField(GetText(logChannel.Guild, strs.joined_server),
-                                   $"{usr.JoinedAt?.ToString("dd.MM.yyyy HH:mm") ?? "?"}",
-                                   true)
-                               .AddField(GetText(logChannel.Guild, strs.joined_discord),
-                                   $"{usr.CreatedAt:dd.MM.yyyy HH:mm}",
-                                   true)
-                               .WithFooter(CurrentTime(usr.Guild));
+                    .WithOkColor()
+                    .WithTitle("✅ " + GetText(logChannel.Guild, strs.user_joined))
+                    .WithDescription($"{usr.Mention} `{usr}`")
+                    .AddField("Id", usr.Id.ToString())
+                    .AddField(GetText(logChannel.Guild, strs.joined_server),
+                        $"{usr.JoinedAt?.ToString("dd.MM.yyyy HH:mm") ?? "?"}",
+                        true)
+                    .AddField(GetText(logChannel.Guild, strs.joined_discord),
+                        $"{usr.CreatedAt:dd.MM.yyyy HH:mm}",
+                        true)
+                    .WithFooter(CurrentTime(usr.Guild));
 
                 if (Uri.IsWellFormedUriString(usr.GetAvatarUrl(), UriKind.Absolute))
                     embed.WithThumbnailUrl(usr.GetAvatarUrl());
@@ -945,11 +1031,11 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                 if ((logChannel = await TryGetLogChannel(guild, logSetting, LogType.UserUnbanned)) is null)
                     return;
                 var embed = _eb.Create()
-                               .WithOkColor()
-                               .WithTitle("♻️ " + GetText(logChannel.Guild, strs.user_unbanned))
-                               .WithDescription(usr.ToString()!)
-                               .AddField("Id", usr.Id.ToString())
-                               .WithFooter(CurrentTime(guild));
+                    .WithOkColor()
+                    .WithTitle("♻️ " + GetText(logChannel.Guild, strs.user_unbanned))
+                    .WithDescription(usr.ToString()!)
+                    .AddField("Id", usr.Id.ToString())
+                    .WithFooter(CurrentTime(guild));
 
                 if (Uri.IsWellFormedUriString(usr.GetAvatarUrl(), UriKind.Absolute))
                     embed.WithThumbnailUrl(usr.GetAvatarUrl());
@@ -989,16 +1075,15 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                 }
                 catch
                 {
-                    
                 }
-                
+
                 var embed = _eb.Create()
-                               .WithOkColor()
-                               .WithTitle("🚫 " + GetText(logChannel.Guild, strs.user_banned))
-                               .WithDescription(usr.ToString()!)
-                               .AddField("Id", usr.Id.ToString())
-                               .AddField("Reason", string.IsNullOrWhiteSpace(reason) ? "-" : reason)
-                               .WithFooter(CurrentTime(guild));
+                    .WithOkColor()
+                    .WithTitle("🚫 " + GetText(logChannel.Guild, strs.user_banned))
+                    .WithDescription(usr.ToString()!)
+                    .AddField("Id", usr.Id.ToString())
+                    .AddField("Reason", string.IsNullOrWhiteSpace(reason) ? "-" : reason)
+                    .WithFooter(CurrentTime(guild));
 
                 var avatarUrl = usr.GetAvatarUrl();
 
@@ -1044,14 +1129,14 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
 
                 var resolvedMessage = msg.Resolve(TagHandling.FullName);
                 var embed = _eb.Create()
-                               .WithOkColor()
-                               .WithTitle("🗑 "
-                                          + GetText(logChannel.Guild, strs.msg_del(((ITextChannel)msg.Channel).Name)))
-                               .WithDescription(msg.Author.ToString()!)
-                               .AddField(GetText(logChannel.Guild, strs.content),
-                                   string.IsNullOrWhiteSpace(resolvedMessage) ? "-" : resolvedMessage)
-                               .AddField("Id", msg.Id.ToString())
-                               .WithFooter(CurrentTime(channel.Guild));
+                    .WithOkColor()
+                    .WithTitle("🗑 "
+                               + GetText(logChannel.Guild, strs.msg_del(((ITextChannel)msg.Channel).Name)))
+                    .WithDescription(msg.Author.ToString()!)
+                    .AddField(GetText(logChannel.Guild, strs.content),
+                        string.IsNullOrWhiteSpace(resolvedMessage) ? "-" : resolvedMessage)
+                    .AddField("Id", msg.Id.ToString())
+                    .WithFooter(CurrentTime(channel.Guild));
                 if (msg.Attachments.Any())
                 {
                     embed.AddField(GetText(logChannel.Guild, strs.attachments),
@@ -1104,19 +1189,19 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                     return;
 
                 var embed = _eb.Create()
-                               .WithOkColor()
-                               .WithTitle("📝 "
-                                          + GetText(logChannel.Guild,
-                                              strs.msg_update(((ITextChannel)after.Channel).Name)))
-                               .WithDescription(after.Author.ToString()!)
-                               .AddField(GetText(logChannel.Guild, strs.old_msg),
-                                   string.IsNullOrWhiteSpace(before.Content)
-                                       ? "-"
-                                       : before.Resolve(TagHandling.FullName))
-                               .AddField(GetText(logChannel.Guild, strs.new_msg),
-                                   string.IsNullOrWhiteSpace(after.Content) ? "-" : after.Resolve(TagHandling.FullName))
-                               .AddField("Id", after.Id.ToString())
-                               .WithFooter(CurrentTime(channel.Guild));
+                    .WithOkColor()
+                    .WithTitle("📝 "
+                               + GetText(logChannel.Guild,
+                                   strs.msg_update(((ITextChannel)after.Channel).Name)))
+                    .WithDescription(after.Author.ToString()!)
+                    .AddField(GetText(logChannel.Guild, strs.old_msg),
+                        string.IsNullOrWhiteSpace(before.Content)
+                            ? "-"
+                            : before.Resolve(TagHandling.FullName))
+                    .AddField(GetText(logChannel.Guild, strs.new_msg),
+                        string.IsNullOrWhiteSpace(after.Content) ? "-" : after.Resolve(TagHandling.FullName))
+                    .AddField("Id", after.Id.ToString())
+                    .WithFooter(CurrentTime(channel.Guild));
 
                 await logChannel.EmbedAsync(embed);
             }

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

@@ -402,12 +402,21 @@ public partial class Administration
         [UserPerm(GuildPerm.BanMembers)]
         [BotPerm(GuildPerm.BanMembers)]
         [Priority(1)]
-        public async Task Ban(StoopidTime time, IUser user, [Leftover] string msg = null)
+        public Task Ban(StoopidTime time, IUser user, [Leftover] string msg = null)
+            => Ban(time, user.Id, msg);
+        
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(GuildPerm.BanMembers)]
+        [BotPerm(GuildPerm.BanMembers)]
+        [Priority(0)]
+        public async Task Ban(StoopidTime time, ulong userId, [Leftover] string msg = null)
         {
             if (time.Time > TimeSpan.FromDays(49))
                 return;
 
-            var guildUser = await ((DiscordSocketClient)Context.Client).Rest.GetGuildUserAsync(ctx.Guild.Id, user.Id);
+            var guildUser = await ((DiscordSocketClient)Context.Client).Rest.GetGuildUserAsync(ctx.Guild.Id, userId);
+            
 
             if (guildUser is not null && !await CheckRoleHierarchy(guildUser))
                 return;
@@ -429,13 +438,14 @@ public partial class Administration
                 }
             }
 
+            var user = await ctx.Client.GetUserAsync(userId);
             var banPrune = await _service.GetBanPruneAsync(ctx.Guild.Id) ?? 7;
-            await _mute.TimedBan(ctx.Guild, user, time.Time, (ctx.User + " | " + msg).TrimTo(512), banPrune);
+            await _mute.TimedBan(ctx.Guild, userId, time.Time, (ctx.User + " | " + msg).TrimTo(512), banPrune);
             var toSend = _eb.Create()
                             .WithOkColor()
                             .WithTitle("⛔️ " + GetText(strs.banned_user))
-                            .AddField(GetText(strs.username), user.ToString(), true)
-                            .AddField("ID", user.Id.ToString(), true)
+                            .AddField(GetText(strs.username),  user?.ToString() ?? userId.ToString(), true)
+                            .AddField("ID", userId.ToString(), true)
                             .AddField(GetText(strs.duration),
                                 time.Time.Humanize(3, minUnit: TimeUnit.Minute, culture: Culture),
                                 true);

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

@@ -157,7 +157,7 @@ public class UserPunishService : INService, IReadyExecutor
                 if (minutes == 0)
                     await guild.AddBanAsync(user, reason: reason, pruneDays: banPrune);
                 else
-                    await _mute.TimedBan(user.Guild, user, TimeSpan.FromMinutes(minutes), reason, banPrune);
+                    await _mute.TimedBan(user.Guild, user.Id, TimeSpan.FromMinutes(minutes), reason, banPrune);
                 break;
             case PunishmentAction.Softban:
                 banPrune = await GetBanPruneAsync(user.GuildId) ?? 7;

src/NadekoBot/Modules/Gambling/Events/GameStatusEvent.cs

@@ -88,10 +88,6 @@ public class GameStatusEvent : ICurrencyEvent
                 await msg.ModifyAsync(m =>
                     {
                         m.Embed = GetEmbed(PotSize).Build();
-                    },
-                    new()
-                    {
-                        RetryMode = RetryMode.AlwaysRetry
                     });
             }
 

src/NadekoBot/Modules/Gambling/Events/ReactionEvent.cs

@@ -79,10 +79,6 @@ public class ReactionEvent : ICurrencyEvent
                 await msg.ModifyAsync(m =>
                     {
                         m.Embed = GetEmbed(PotSize).Build();
-                    },
-                    new()
-                    {
-                        RetryMode = RetryMode.AlwaysRetry
                     });
             }
 

src/NadekoBot/Modules/Gambling/Waifus/WaifuClaimCommands.cs

@@ -244,20 +244,29 @@ public partial class Gambling
 
             var waifuItems = _service.GetWaifuItems().ToDictionary(x => x.ItemEmoji, x => x);
 
-
             var nobody = GetText(strs.nobody);
-            var itemsStr = !wi.Items.Any()
+            var itemList = await _service.GetItems(wi.WaifuId);
+            var itemsStr = !itemList.Any()
                 ? "-"
                 : string.Join("\n",
-                    wi.Items.Where(x => waifuItems.TryGetValue(x.ItemEmoji, out _))
-                      .OrderBy(x => waifuItems[x.ItemEmoji].Price)
-                      .GroupBy(x => x.ItemEmoji)
-                      .Select(x => $"{x.Key} x{x.Count(),-3}")
-                      .Chunk(2)
-                      .Select(x => string.Join(" ", x)));
+                    itemList.Where(x => waifuItems.TryGetValue(x.ItemEmoji, out _))
+                        .OrderBy(x => waifuItems[x.ItemEmoji].Price)
+                        .GroupBy(x => x.ItemEmoji)
+                        .Select(x => $"{x.Key} x{x.Count(),-3}")
+                        .Chunk(2)
+                        .Select(x => string.Join(" ", x)));
 
-            var fansStr = wi.Fans.Shuffle().Take(30).Select(x => wi.Claims.Contains(x) ? $"{x} 💞" : x).Join('\n');
+            var claimsNames = (await _service.GetClaimNames(wi.WaifuId));
+            var claimsStr = claimsNames
+                .Shuffle()
+                .Take(30)
+                .Join('\n');
 
+            var fansList = await _service.GetFansNames(wi.WaifuId);
+            var fansStr = fansList
+                .Select((x) => claimsNames.Contains(x) ? $"{x} 💞" : x).Join('\n');
+
+            
             if (string.IsNullOrWhiteSpace(fansStr))
                 fansStr = "-";
 
@@ -275,9 +284,9 @@ public partial class Gambling
                            .AddField(GetText(strs.changes_of_heart), $"{wi.AffinityCount} - \"the {affInfo}\"", true)
                            .AddField(GetText(strs.divorces), wi.DivorceCount.ToString(), true)
                            .AddField("\u200B", "\u200B", true)
-                           .AddField(GetText(strs.fans(wi.Fans.Count)), fansStr, true)
+                           .AddField(GetText(strs.fans(fansList.Count)), fansStr, true)
                            .AddField($"Waifus ({wi.ClaimCount})",
-                               wi.ClaimCount == 0 ? nobody : string.Join("\n", wi.Claims.Shuffle().Take(30)),
+                               wi.ClaimCount == 0 ? nobody : claimsStr,
                                true)
                            .AddField(GetText(strs.gifts), itemsStr, true);
 

src/NadekoBot/Modules/Gambling/Waifus/WaifuService.cs

@@ -414,11 +414,8 @@ public class WaifuService : INService, IReadyExecutor
                 AffinityName = null,
                 ClaimCount = 0,
                 ClaimerName = null,
-                Claims = new(),
-                Fans = new(),
                 DivorceCount = 0,
                 FullName = null,
-                Items = new(),
                 Price = 1
             };
         }
@@ -426,14 +423,6 @@ public class WaifuService : INService, IReadyExecutor
         return wi;
     }
 
-    public async Task<WaifuInfoStats> GetFullWaifuInfoAsync(IGuildUser target)
-    {
-        await using var uow = _db.GetDbContext();
-        _ = uow.GetOrCreateUser(target);
-
-        return await GetFullWaifuInfoAsync(target.Id);
-    }
-
     public string GetClaimTitle(int count)
     {
         ClaimTitle title;
@@ -557,4 +546,38 @@ public class WaifuService : INService, IReadyExecutor
             }
         }
     }
+
+    public async Task<IReadOnlyCollection<string>> GetClaimNames(int waifuId)
+    {
+        await using var ctx = _db.GetDbContext();
+        return await ctx.GetTable<DiscordUser>()
+            .Where(x => ctx.GetTable<WaifuInfo>()
+                .Where(wi => wi.ClaimerId == waifuId)
+                .Select(wi => wi.WaifuId)
+                .Contains(x.Id))
+            .Select(x => $"{x.Username}#{x.Discriminator}")
+            .ToListAsyncEF();
+    }
+    public async Task<IReadOnlyCollection<string>> GetFansNames(int waifuId)
+    {
+        await using var ctx = _db.GetDbContext();
+        return await ctx.GetTable<DiscordUser>()
+            .Where(x => ctx.GetTable<WaifuInfo>()
+                .Where(wi => wi.AffinityId == waifuId)
+                .Select(wi => wi.WaifuId)
+                .Contains(x.Id))
+            .Select(x => $"{x.Username}#{x.Discriminator}")
+            .ToListAsyncEF();
+    }
+
+    public async Task<IReadOnlyCollection<WaifuItem>> GetItems(int waifuId)
+    {
+        await using var ctx = _db.GetDbContext();
+        return await ctx.GetTable<WaifuItem>()
+            .Where(x => x.WaifuInfoId == ctx.GetTable<WaifuInfo>()
+                .Where(x => x.WaifuId == waifuId)
+                .Select(x => x.Id)
+                .FirstOrDefault())
+            .ToListAsyncEF();
+    }
 }

src/NadekoBot/Modules/Games/ChatterBot/ChatterbotService.cs

@@ -1,6 +1,7 @@
 #nullable disable
 using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Db.Models;
+using NadekoBot.Modules.Games.Common;
 using NadekoBot.Modules.Games.Common.ChatterBot;
 using NadekoBot.Modules.Permissions;
 using NadekoBot.Modules.Permissions.Common;
@@ -27,6 +28,7 @@ public class ChatterBotService : IExecOnMessage
     private readonly IHttpClientFactory _httpFactory;
     private readonly IPatronageService _ps;
     private readonly CmdCdService _ccs;
+    private readonly GamesConfigService _gcs;
 
     public ChatterBotService(
         DiscordSocketClient client,
@@ -38,7 +40,8 @@ public class ChatterBotService : IExecOnMessage
         IBotCredentials creds,
         IEmbedBuilderService eb,
         IPatronageService ps,
-        CmdCdService cmdCdService)
+        CmdCdService cmdCdService,
+        GamesConfigService gcs)
     {
         _client = client;
         _perms = perms;
@@ -49,6 +52,7 @@ public class ChatterBotService : IExecOnMessage
         _httpFactory = factory;
         _ps = ps;
         _ccs = cmdCdService;
+        _gcs = gcs;
 
         _flKey = new FeatureLimitKey()
         {
@@ -64,11 +68,26 @@ public class ChatterBotService : IExecOnMessage
 
     public IChatterBotSession CreateSession()
     {
-        if (!string.IsNullOrWhiteSpace(_creds.CleverbotApiKey))
-            return new OfficialCleverbotSession(_creds.CleverbotApiKey, _httpFactory);
+        switch (_gcs.Data.ChatBot)
+        {
+            case ChatBotImplementation.Cleverbot:
+                if (!string.IsNullOrWhiteSpace(_creds.CleverbotApiKey))
+                    return new OfficialCleverbotSession(_creds.CleverbotApiKey, _httpFactory);
 
-        Log.Information("Cleverbot will not work as the api key is missing.");
-        return null;
+                Log.Information("Cleverbot will not work as the api key is missing.");
+                return null;
+            case ChatBotImplementation.Gpt3:
+                if (!string.IsNullOrWhiteSpace(_creds.Gpt3ApiKey))
+                    return new OfficialGpt3Session(_creds.Gpt3ApiKey,
+                        _gcs.Data.ChatGpt.Model,
+                        _gcs.Data.ChatGpt.MaxTokens,
+                        _httpFactory);
+
+                Log.Information("Gpt3 will not work as the api key is missing.");
+                return null;
+            default:
+                return null;
+        }
     }
 
     public string PrepareMessage(IUserMessage msg, out IChatterBotSession cleverbot)
@@ -102,7 +121,7 @@ public class ChatterBotService : IExecOnMessage
     {
         if (guild is not SocketGuild sg)
             return false;
-        
+
         try
         {
             var message = PrepareMessage(usrMsg, out var cbs);
@@ -147,7 +166,7 @@ public class ChatterBotService : IExecOnMessage
                 uint? monthly = quota.Quota is int mVal and >= 0
                     ? (uint)mVal
                     : null;
-                
+
                 var maybeLimit = await _ps.TryIncrementQuotaCounterAsync(sg.OwnerId,
                     sg.OwnerId == usrMsg.Author.Id,
                     FeatureType.Limit,
@@ -155,7 +174,7 @@ public class ChatterBotService : IExecOnMessage
                     null,
                     daily,
                     monthly);
-                
+
                 if (maybeLimit.TryPickT1(out var ql, out var counters))
                 {
                     if (ql.Quota == 0)
@@ -166,7 +185,7 @@ public class ChatterBotService : IExecOnMessage
                             "In order to use the cleverbot feature, the owner of this server should be [Patron Tier X](https://patreon.com/join/nadekobot) on patreon.",
                             footer:
                             "You may disable the cleverbot feature, and this message via '.cleverbot' command");
-                        
+
                         return true;
                     }
 
@@ -174,7 +193,7 @@ public class ChatterBotService : IExecOnMessage
                         null!,
                         $"You've reached your quota limit of **{ql.Quota}** responses {ql.QuotaPeriod.ToFullName()} for the cleverbot feature.",
                         footer: "You may wait for the quota reset or .");
-                    
+
                     return true;
                 }
             }
@@ -185,7 +204,7 @@ public class ChatterBotService : IExecOnMessage
                 title: null,
                 response.SanitizeMentions(true)
                 // , footer: counter > 0 ? counter.ToString() : null
-                );
+            );
 
             Log.Information(@"CleverBot Executed
 Server: {GuildName} [{GuildId}]

src/NadekoBot/Modules/Games/ChatterBot/_Common/ChatterBotResponse.cs

@@ -1,8 +0,0 @@
-#nullable disable
-namespace NadekoBot.Modules.Games.Common.ChatterBot;
-
-public class ChatterBotResponse
-{
-    public string Convo_id { get; set; }
-    public string BotSay { get; set; }
-}

src/NadekoBot/Modules/Games/ChatterBot/_Common/Gpt3Response.cs

@@ -0,0 +1,30 @@
+#nullable disable
+using System.Text.Json.Serialization;
+
+namespace NadekoBot.Modules.Games.Common.ChatterBot;
+
+public class Gpt3Response
+{
+    [JsonPropertyName("choices")]
+    public Choice[] Choices { get; set; }
+}
+
+public class Choice
+{
+    public string Text { get; set; }
+}
+
+public class Gpt3ApiRequest
+{
+    [JsonPropertyName("model")]
+    public string Model { get; init; }
+
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; init; }
+
+    [JsonPropertyName("temperature")]
+    public int Temperature { get; init; }
+
+    [JsonPropertyName("max_tokens")]
+    public int MaxTokens { get; init; }
+}

src/NadekoBot/Modules/Games/ChatterBot/_Common/OfficialGpt3Session.cs

@@ -0,0 +1,69 @@
+#nullable disable
+using Newtonsoft.Json;
+using System.Net.Http.Json;
+
+namespace NadekoBot.Modules.Games.Common.ChatterBot;
+
+public class OfficialGpt3Session : IChatterBotSession
+{
+    private string Uri
+        => $"https://api.openai.com/v1/completions";
+
+    private readonly string _apiKey;
+    private readonly string _model;
+    private readonly int _maxTokens;
+    private readonly IHttpClientFactory _httpFactory;
+
+    public OfficialGpt3Session(
+        string apiKey,
+        Gpt3Model model,
+        int maxTokens,
+        IHttpClientFactory factory)
+    {
+        _apiKey = apiKey;
+        _httpFactory = factory;
+        switch (model)
+        {
+            case Gpt3Model.Ada001:
+                _model = "text-ada-001";
+                break;
+            case Gpt3Model.Babbage001:
+                _model = "text-babbage-001";
+                break;
+            case Gpt3Model.Curie001:
+                _model = "text-curie-001";
+                break;
+            case Gpt3Model.Davinci003:
+                _model = "text-davinci-003";
+                break;
+        }
+
+        _maxTokens = maxTokens;
+    }
+
+    public async Task<string> Think(string input)
+    {
+        using var http = _httpFactory.CreateClient();
+        http.DefaultRequestHeaders.Authorization = new("Bearer", _apiKey);
+        var data = await http.PostAsJsonAsync(Uri, new Gpt3ApiRequest()
+        {
+            Model = _model,
+            Prompt = input,
+            MaxTokens = _maxTokens,
+            Temperature = 1,
+        });
+        var dataString = await data.Content.ReadAsStringAsync();
+        try
+        {
+            var response = JsonConvert.DeserializeObject<Gpt3Response>(dataString);
+
+            return response?.Choices[0]?.Text;
+        }
+        catch
+        {
+            Log.Warning("Unexpected GPT-3 response received: {ResponseString}", dataString);
+            return null;
+        }
+    }
+}
+

src/NadekoBot/Modules/Games/GamesConfig.cs

@@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Games.Common;
 public sealed partial class GamesConfig : ICloneable<GamesConfig>
 {
     [Comment("DO NOT CHANGE")]
-    public int Version { get; set; }
+    public int Version { get; set; } = 2;
 
     [Comment("Hangman related settings (.hangman command)")]
     public HangmanConfig Hangman { get; set; } = new()
@@ -95,6 +95,27 @@ public sealed partial class GamesConfig : ICloneable<GamesConfig>
             Name = "Unicorn"
         }
     };
+
+    [Comment(@"Which chatbot API should bot use.
+'cleverbot' - bot will use Cleverbot API. 
+'gpt3' - bot will use GPT-3 API")]
+    public ChatBotImplementation ChatBot { get; set; } = ChatBotImplementation.Gpt3;
+
+    public ChatGptConfig ChatGpt { get; set; } = new();
+}
+
+[Cloneable]
+public sealed partial class ChatGptConfig
+{
+    [Comment(@"Which GPT-3 Model should bot use.
+'ada' - cheapest and fastest 
+'babbage' - 2nd option
+'curie' - 3rd option
+'davinci' - Most expensive, slowest")]
+    public Gpt3Model Model { get; set; } = Gpt3Model.Ada001;
+
+    [Comment(@"The maximum number of tokens to use per GPT-3 API call")]
+    public int MaxTokens { get; set; } = 100;
 }
 
 [Cloneable]
@@ -120,4 +141,18 @@ public sealed partial class RaceAnimal
 {
     public string Icon { get; set; }
     public string Name { get; set; }
+}
+
+public enum ChatBotImplementation
+{
+    Cleverbot,
+    Gpt3
+}
+
+public enum Gpt3Model
+{
+    Ada001,
+    Babbage001,
+    Curie001,
+    Davinci003
 }

src/NadekoBot/Modules/Games/GamesConfigService.cs

@@ -28,6 +28,20 @@ public sealed class GamesConfigService : ConfigServiceBase<GamesConfig>
             long.TryParse,
             ConfigPrinters.ToString,
             val => val >= 0);
+        
+        AddParsedProp("chatbot",
+            gs => gs.ChatBot,
+            ConfigParsers.InsensitiveEnum,
+            ConfigPrinters.ToString);
+        AddParsedProp("gpt.model",
+            gs => gs.ChatGpt.Model,
+            ConfigParsers.InsensitiveEnum,
+            ConfigPrinters.ToString);
+        AddParsedProp("gpt.max_tokens",
+            gs => gs.ChatGpt.MaxTokens,
+            int.TryParse,
+            ConfigPrinters.ToString,
+            val => val > 0);
 
         Migrate();
     }
@@ -45,5 +59,14 @@ public sealed class GamesConfigService : ConfigServiceBase<GamesConfig>
                 };
             });
         }
+
+        if (data.Version < 2)
+        {
+            ModifyConfig(c =>
+            {
+                c.Version = 2;
+                c.ChatBot = ChatBotImplementation.Cleverbot;  
+            });
+        }
     }
 }

src/NadekoBot/Modules/Games/GamesService.cs

@@ -23,7 +23,6 @@ public class GamesService : INService, IReadyExecutor
 
     //channelId, game
     public ConcurrentDictionary<ulong, AcrophobiaGame> AcrophobiaGames { get; } = new();
-    public ConcurrentDictionary<ulong, TriviaGame> RunningTrivias { get; } = new();
     public Dictionary<ulong, TicTacToe> TicTacToeGames { get; } = new();
     public ConcurrentDictionary<ulong, TypingGame> RunningContests { get; } = new();
     public ConcurrentDictionary<ulong, NunchiGame> NunchiGames { get; } = new();

src/NadekoBot/Modules/Games/SpeedTyping/TypingGame.cs

@@ -74,11 +74,7 @@ public class TypingGame
 
             var time = _options.StartTime;
 
-            var msg = await Channel.SendMessageAsync($"Starting new typing contest in **{time}**...",
-                options: new()
-                {
-                    RetryMode = RetryMode.AlwaysRetry
-                });
+            var msg = await Channel.SendMessageAsync($"Starting new typing contest in **{time}**...");
 
             do
             {

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

@@ -131,9 +131,12 @@ public sealed class TriviaGame
                         hintSent = true;
                         // start a new countdown of the same length
                         halfGuessTimerTask = TimeOutFactory();
-                        // send a hint out
-                        await OnHint(this, question);
-                        
+                        if (!_opts.NoHint)
+                        {
+                            // send a hint out
+                            await OnHint(this, question);
+                        }
+
                         continue;
                     }
 

src/NadekoBot/Modules/Help/HelpService.cs

@@ -45,7 +45,7 @@ public class HelpService : IExecNoCommand, INService
 
             // only send dm help text if it contains one of the keywords, if they're specified
             // if they're not, then reply to every DM
-            if (settings.DmHelpTextKeywords.Any() && !settings.DmHelpTextKeywords.Any(k => msg.Content.Contains(k)))
+            if (settings.DmHelpTextKeywords is not null && !settings.DmHelpTextKeywords.Any(k => msg.Content.Contains(k)))
                 return Task.CompletedTask;
 
             var rep = new ReplacementBuilder().WithOverride("%prefix%", () => _bss.Data.Prefix)
@@ -152,18 +152,22 @@ public class HelpService : IExecNoCommand, INService
                   .Any(x => x is OnlyPublicBotAttribute))
             toReturn.Add("Only Public Bot");
 
-        var userPerm = (UserPermAttribute)cmd.Preconditions.FirstOrDefault(ca => ca is UserPermAttribute);
+        var userPermString = cmd.Preconditions
+                                .Where(ca => ca is UserPermAttribute)
+                                .Cast<UserPermAttribute>()
+                                .Select(userPerm =>
+                                {
+                                    if (userPerm.ChannelPermission is { } cPerm)
+                                        return GetPreconditionString(cPerm);
 
-        var userPermString = string.Empty;
-        if (userPerm is not null)
-        {
-            if (userPerm.ChannelPermission is { } cPerm)
-                userPermString = GetPreconditionString(cPerm);
-
-            if (userPerm.GuildPermission is { } gPerm)
-                userPermString = GetPreconditionString(gPerm);
-        }
+                                    if (userPerm.GuildPermission is { } gPerm)
+                                        return GetPreconditionString(gPerm);
 
+                                    return string.Empty;
+                                })
+                                .Where(x => !string.IsNullOrWhiteSpace(x))
+                                .Join('\n');
+        
         if (overrides is null)
         {
             if (!string.IsNullOrWhiteSpace(userPermString))
@@ -188,4 +192,4 @@ public class HelpService : IExecNoCommand, INService
 
     private string GetText(LocStr str, IGuild guild)
         => _strings.GetText(str, guild?.Id);
-}
+}

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

@@ -1,5 +1,6 @@
 using System.Globalization;
 using System.Text.RegularExpressions;
+using NadekoBot.Modules.Searches;
 
 namespace NadekoBot.Modules.Music;
 
@@ -27,10 +28,11 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
 
     private readonly IGoogleApiService _google;
 
-    public YtdlYoutubeResolver(ITrackCacher trackCacher, IGoogleApiService google)
+    public YtdlYoutubeResolver(ITrackCacher trackCacher, IGoogleApiService google, SearchesConfigService scs)
     {
         _trackCacher = trackCacher;
         _google = google;
+        
 
         _ytdlPlaylistOperation = new("-4 "
                                      + "--geo-bypass "
@@ -44,7 +46,7 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
                                      + "--no-check-certificate "
                                      + "-i "
                                      + "--yes-playlist "
-                                     + "-- \"{0}\"");
+                                     + "-- \"{0}\"", scs.Data.YtProvider != YoutubeSearcher.Ytdl);
 
         _ytdlIdOperation = new("-4 "
                                + "--geo-bypass "
@@ -56,7 +58,7 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
                                + "--get-thumbnail "
                                + "--get-duration "
                                + "--no-check-certificate "
-                               + "-- \"{0}\"");
+                               + "-- \"{0}\"", scs.Data.YtProvider != YoutubeSearcher.Ytdl);
 
         _ytdlSearchOperation = new("-4 "
                                    + "--geo-bypass "
@@ -69,7 +71,7 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
                                    + "--get-duration "
                                    + "--no-check-certificate "
                                    + "--default-search "
-                                   + "\"ytsearch:\" -- \"{0}\"");
+                                   + "\"ytsearch:\" -- \"{0}\"", scs.Data.YtProvider != YoutubeSearcher.Ytdl);
     }
 
     private YtTrackData ResolveYtdlData(string ytdlOutputString)

src/NadekoBot/Modules/Nsfw/ISearchImagesService.cs

@@ -22,6 +22,6 @@ public interface ISearchImagesService
     ValueTask<bool> ToggleBlacklistTag(ulong guildId, string tag);
     ValueTask<string[]> GetBlacklistedTags(ulong guildId);
     Task<UrlReply> Butts();
-    Task<Gallery> GetNhentaiByIdAsync(uint id);
-    Task<Gallery> GetNhentaiBySearchAsync(string search);
+    // Task<Gallery> GetNhentaiByIdAsync(uint id);
+    // Task<Gallery> GetNhentaiBySearchAsync(string search);
 }

src/NadekoBot/Modules/Nsfw/Nhentai/INhentaiService.cs

@@ -1,9 +1,9 @@
-using NadekoBot.Modules.Searches.Common;
-
-namespace NadekoBot.Modules.Nsfw;
-
-public interface INhentaiService
-{
-    Task<Gallery?> GetAsync(uint id);
-    Task<IReadOnlyList<uint>> GetIdsBySearchAsync(string search);
-}
+// using NadekoBot.Modules.Searches.Common;
+//
+// namespace NadekoBot.Modules.Nsfw;
+//
+// public interface INhentaiService
+// {
+//     Task<Gallery?> GetAsync(uint id);
+//     Task<IReadOnlyList<uint>> GetIdsBySearchAsync(string search);
+// }

src/NadekoBot/Modules/Nsfw/Nhentai/NhentaiScraperService.cs

@@ -1,115 +1,115 @@
-using AngleSharp.Html.Dom;
-using AngleSharp.Html.Parser;
-using NadekoBot.Modules.Searches.Common;
-
-namespace NadekoBot.Modules.Nsfw;
-
-public sealed class NhentaiScraperService : INhentaiService, INService
-{
-    private readonly IHttpClientFactory _httpFactory;
-
-    private static readonly HtmlParser _htmlParser = new(new()
-    {
-        IsScripting = false,
-        IsEmbedded = false,
-        IsSupportingProcessingInstructions = false,
-        IsKeepingSourceReferences = false,
-        IsNotSupportingFrames = true
-    });
-
-    public NhentaiScraperService(IHttpClientFactory httpFactory)
-    {
-        _httpFactory = httpFactory;
-    }
-
-    private HttpClient GetHttpClient()
-    {
-        var http = _httpFactory.CreateClient();
-        http.DefaultRequestHeaders.Add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.114 Safari/537.36");
-        http.DefaultRequestHeaders.Add("Cookie", "cf_clearance=I5pR71P4wJkRBFTLFjBndI.GwfKwT.Gx06uS8XNmRJo-1657214595-0-150; csrftoken=WMWRLtsQtBVQYvYkbqXKJHI9T1JwWCdd3tNhoxHn7aHLUYHAqe60XFUKAoWsJtda");
-        return http;
-    }
-    
-    public async Task<Gallery?> GetAsync(uint id)
-    {
-        using var http = GetHttpClient();
-        try
-        {
-            var url = $"https://nhentai.net/g/{id}/";
-            var strRes = await http.GetStringAsync(url);
-            var doc = await _htmlParser.ParseDocumentAsync(strRes);
-
-            var title = doc.QuerySelector("#info .title")?.TextContent;
-            var fullTitle = doc.QuerySelector("meta[itemprop=\"name\"]")?.Attributes["content"]?.Value
-                            ?? title;
-            var thumb = (doc.QuerySelector("#cover a img") as IHtmlImageElement)?.Dataset["src"];
-
-            var tagsElem = doc.QuerySelector("#tags");
-            
-            var pageCount = tagsElem?.QuerySelector("a.tag[href^=\"/search/?q=pages\"] span")?.TextContent;
-            var likes = doc.QuerySelector(".buttons .btn-disabled.btn.tooltip span span")?.TextContent?.Trim('(', ')');
-            var uploadedAt = (tagsElem?.QuerySelector(".tag-container .tags time.nobold") as IHtmlTimeElement)?.DateTime;
-
-            var tags = tagsElem?.QuerySelectorAll(".tag-container .tags > a.tag[href^=\"/tag\"]")
-                .Cast<IHtmlAnchorElement>()
-                .Select(x => new Tag()
-                {
-                    Name = x.QuerySelector("span:first-child")?.TextContent,
-                    Url = $"https://nhentai.net{x.PathName}"
-                })
-                .ToArray();
-
-            if (string.IsNullOrWhiteSpace(fullTitle))
-                return null;
-
-            if (!int.TryParse(pageCount, out var pc))
-                return null;
-
-            if (!int.TryParse(likes, out var lc))
-                return null;
-
-            if (!DateTime.TryParse(uploadedAt, out var ua))
-                return null;
-
-            return new Gallery(id,
-                url,
-                fullTitle,
-                title,
-                thumb,
-                pc,
-                lc,
-                ua,
-                tags);
-        }
-        catch (HttpRequestException)
-        {
-            Log.Warning("Nhentai with id {NhentaiId} not found", id);
-            return null;
-        }
-    }
-
-    public async Task<IReadOnlyList<uint>> GetIdsBySearchAsync(string search)
-    {
-        using var http = GetHttpClient();
-        try
-        {
-            var url = $"https://nhentai.net/search/?q={Uri.EscapeDataString(search)}&sort=popular-today";
-            var strRes = await http.GetStringAsync(url);
-            var doc = await _htmlParser.ParseDocumentAsync(strRes);
-
-            var elems = doc.QuerySelectorAll(".container .gallery a")
-                .Cast<IHtmlAnchorElement>()
-                .Where(x => x.PathName.StartsWith("/g/"))
-                .Select(x => x.PathName[3..^1])
-                .Select(uint.Parse)
-                .ToArray();
-            
-            return elems;
-        }
-        catch (HttpRequestException)
-        {
-            Log.Warning("Nhentai search for {NhentaiSearch} failed", search);
-            return Array.Empty<uint>();
-        }
-    }
-}
+// using AngleSharp.Html.Dom;
+// using AngleSharp.Html.Parser;
+// using NadekoBot.Modules.Searches.Common;
+//
+// namespace NadekoBot.Modules.Nsfw;
+//
+// public sealed class NhentaiScraperService : INhentaiService, INService
+// {
+//     private readonly IHttpClientFactory _httpFactory;
+//
+//     private static readonly HtmlParser _htmlParser = new(new()
+//     {
+//         IsScripting = false,
+//         IsEmbedded = false,
+//         IsSupportingProcessingInstructions = false,
+//         IsKeepingSourceReferences = false,
+//         IsNotSupportingFrames = true
+//     });
+//
+//     public NhentaiScraperService(IHttpClientFactory httpFactory)
+//     {
+//         _httpFactory = httpFactory;
+//     }
+//
+//     private HttpClient GetHttpClient()
+//     {
+//         var http = _httpFactory.CreateClient();
+//         http.DefaultRequestHeaders.Add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.114 Safari/537.36");
+//         http.DefaultRequestHeaders.Add("Cookie", "cf_clearance=I5pR71P4wJkRBFTLFjBndI.GwfKwT.Gx06uS8XNmRJo-1657214595-0-150; csrftoken=WMWRLtsQtBVQYvYkbqXKJHI9T1JwWCdd3tNhoxHn7aHLUYHAqe60XFUKAoWsJtda");
+//         return http;
+//     }
+//     
+//     public async Task<Gallery?> GetAsync(uint id)
+//     {
+//         using var http = GetHttpClient();
+//         try
+//         {
+//             var url = $"https://nhentai.net/g/{id}/";
+//             var strRes = await http.GetStringAsync(url);
+//             var doc = await _htmlParser.ParseDocumentAsync(strRes);
+//
+//             var title = doc.QuerySelector("#info .title")?.TextContent;
+//             var fullTitle = doc.QuerySelector("meta[itemprop=\"name\"]")?.Attributes["content"]?.Value
+//                             ?? title;
+//             var thumb = (doc.QuerySelector("#cover a img") as IHtmlImageElement)?.Dataset["src"];
+//
+//             var tagsElem = doc.QuerySelector("#tags");
+//             
+//             var pageCount = tagsElem?.QuerySelector("a.tag[href^=\"/search/?q=pages\"] span")?.TextContent;
+//             var likes = doc.QuerySelector(".buttons .btn-disabled.btn.tooltip span span")?.TextContent?.Trim('(', ')');
+//             var uploadedAt = (tagsElem?.QuerySelector(".tag-container .tags time.nobold") as IHtmlTimeElement)?.DateTime;
+//
+//             var tags = tagsElem?.QuerySelectorAll(".tag-container .tags > a.tag[href^=\"/tag\"]")
+//                 .Cast<IHtmlAnchorElement>()
+//                 .Select(x => new Tag()
+//                 {
+//                     Name = x.QuerySelector("span:first-child")?.TextContent,
+//                     Url = $"https://nhentai.net{x.PathName}"
+//                 })
+//                 .ToArray();
+//
+//             if (string.IsNullOrWhiteSpace(fullTitle))
+//                 return null;
+//
+//             if (!int.TryParse(pageCount, out var pc))
+//                 return null;
+//
+//             if (!int.TryParse(likes, out var lc))
+//                 return null;
+//
+//             if (!DateTime.TryParse(uploadedAt, out var ua))
+//                 return null;
+//
+//             return new Gallery(id,
+//                 url,
+//                 fullTitle,
+//                 title,
+//                 thumb,
+//                 pc,
+//                 lc,
+//                 ua,
+//                 tags);
+//         }
+//         catch (HttpRequestException)
+//         {
+//             Log.Warning("Nhentai with id {NhentaiId} not found", id);
+//             return null;
+//         }
+//     }
+//
+//     public async Task<IReadOnlyList<uint>> GetIdsBySearchAsync(string search)
+//     {
+//         using var http = GetHttpClient();
+//         try
+//         {
+//             var url = $"https://nhentai.net/search/?q={Uri.EscapeDataString(search)}&sort=popular-today";
+//             var strRes = await http.GetStringAsync(url);
+//             var doc = await _htmlParser.ParseDocumentAsync(strRes);
+//
+//             var elems = doc.QuerySelectorAll(".container .gallery a")
+//                 .Cast<IHtmlAnchorElement>()
+//                 .Where(x => x.PathName.StartsWith("/g/"))
+//                 .Select(x => x.PathName[3..^1])
+//                 .Select(uint.Parse)
+//                 .ToArray();
+//             
+//             return elems;
+//         }
+//         catch (HttpRequestException)
+//         {
+//             Log.Warning("Nhentai search for {NhentaiSearch} failed", search);
+//             return Array.Empty<uint>();
+//         }
+//     }
+// }

src/NadekoBot/Modules/Nsfw/Nsfw.cs

@@ -360,67 +360,65 @@ public partial class NSFW : NadekoModule<ISearchImagesService>
         }
     }
 
-    [Cmd]
-    [RequireContext(ContextType.Guild)]
-    [RequireNsfw(Group = "nsfw_or_dm")]
-    [RequireContext(ContextType.DM, Group = "nsfw_or_dm")]
-    [Priority(1)]
-    public async Task Nhentai(uint id)
-    {
-        var g = await _service.GetNhentaiByIdAsync(id);
-
-        if (g is null)
-        {
-            await ReplyErrorLocalizedAsync(strs.not_found);
-            return;
-        }
-
-        await SendNhentaiGalleryInternalAsync(g);
-    }
-
-    [Cmd]
-    [RequireContext(ContextType.Guild)]
-    [RequireNsfw(Group = "nsfw_or_dm")]
-    [RequireContext(ContextType.DM, Group = "nsfw_or_dm")]
-    [Priority(0)]
-    public async Task Nhentai([Leftover] string query)
-    {
-        var g = await _service.GetNhentaiBySearchAsync(query);
-
-        if (g is null)
-        {
-            await ReplyErrorLocalizedAsync(strs.not_found);
-            return;
-        }
-
-        await SendNhentaiGalleryInternalAsync(g);
-    }
-
-    private async Task SendNhentaiGalleryInternalAsync(Gallery g)
-    {
-        var count = 0;
-        var tagString = g.Tags.Shuffle()
-                         .Select(tag => $"[{tag.Name}]({tag.Url})")
-                         .TakeWhile(tag => (count += tag.Length) < 1000)
-                         .Join(" ");
-
-        var embed = _eb.Create()
-            .WithTitle(g.Title)
-            .WithDescription(g.FullTitle)
-            .WithImageUrl(g.Thumbnail)
-            .WithUrl(g.Url)
-            .AddField(GetText(strs.favorites), g.Likes, true)
-            .AddField(GetText(strs.pages), g.PageCount, true)
-            .AddField(GetText(strs.tags),
-                string.IsNullOrWhiteSpace(tagString)
-                    ? "?"
-                    : tagString,
-                true)
-            .WithFooter(g.UploadedAt.ToString("f"))
-            .WithOkColor();
-
-        await ctx.Channel.EmbedAsync(embed);
-    }
+    // [RequireNsfw(Group = "nsfw_or_dm")]
+    // [RequireContext(ContextType.DM, Group = "nsfw_or_dm")]
+    // [Priority(1)]
+    // public async Task Nhentai(uint id)
+    // {
+    //     var g = await _service.GetNhentaiByIdAsync(id);
+    //
+    //     if (g is null)
+    //     {
+    //         await ReplyErrorLocalizedAsync(strs.not_found);
+    //         return;
+    //     }
+    //
+    //     await SendNhentaiGalleryInternalAsync(g);
+    // }
+    //
+    // [Cmd]
+    // [RequireContext(ContextType.Guild)]
+    // [RequireNsfw(Group = "nsfw_or_dm")]
+    // [RequireContext(ContextType.DM, Group = "nsfw_or_dm")]
+    // [Priority(0)]
+    // public async Task Nhentai([Leftover] string query)
+    // {
+    //     var g = await _service.GetNhentaiBySearchAsync(query);
+    //
+    //     if (g is null)
+    //     {
+    //         await ReplyErrorLocalizedAsync(strs.not_found);
+    //         return;
+    //     }
+    //
+    //     await SendNhentaiGalleryInternalAsync(g);
+    // }
+    //
+    // private async Task SendNhentaiGalleryInternalAsync(Gallery g)
+    // {
+    //     var count = 0;
+    //     var tagString = g.Tags.Shuffle()
+    //                      .Select(tag => $"[{tag.Name}]({tag.Url})")
+    //                      .TakeWhile(tag => (count += tag.Length) < 1000)
+    //                      .Join(" ");
+    //
+    //     var embed = _eb.Create()
+    //         .WithTitle(g.Title)
+    //         .WithDescription(g.FullTitle)
+    //         .WithImageUrl(g.Thumbnail)
+    //         .WithUrl(g.Url)
+    //         .AddField(GetText(strs.favorites), g.Likes, true)
+    //         .AddField(GetText(strs.pages), g.PageCount, true)
+    //         .AddField(GetText(strs.tags),
+    //             string.IsNullOrWhiteSpace(tagString)
+    //                 ? "?"
+    //                 : tagString,
+    //             true)
+    //         .WithFooter(g.UploadedAt.ToString("f"))
+    //         .WithOkColor();
+    //
+    //     await ctx.Channel.EmbedAsync(embed);
+    // }
 
     private async Task InternalDapiCommand(
         string[] tags,

src/NadekoBot/Modules/Nsfw/SearchImagesService.cs

@@ -19,17 +19,15 @@ public class SearchImagesService : ISearchImagesService, INService
     private readonly SearchImageCacher _cache;
     private readonly IHttpClientFactory _httpFactory;
     private readonly DbService _db;
-    private readonly INhentaiService _nh;
 
     private readonly object _taglock = new();
 
     public SearchImagesService(
         DbService db,
         SearchImageCacher cacher,
-        IHttpClientFactory httpFactory,
-        INhentaiService nh)
+        IHttpClientFactory httpFactory
+        )
     {
-        _nh = nh;
         _db = db;
         _rng = new NadekoRandom();
         _cache = cacher;
@@ -277,6 +275,7 @@ public class SearchImagesService : ISearchImagesService, INService
         }
     }
 
+    /*
     #region Nhentai
 
     public Task<Gallery?> GetNhentaiByIdAsync(uint id)
@@ -294,4 +293,5 @@ public class SearchImagesService : ISearchImagesService, INService
     }
 
     #endregion
+    */
 }

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

@@ -16,7 +16,7 @@ public partial class Searches
         [Cmd]
         [RequireContext(ContextType.Guild)]
         [UserPerm(GuildPerm.ManageMessages)]
-        public Task YtUploadNotif(string url, [Leftover] ITextChannel channel = null)
+        public Task YtUploadNotif(string url, ITextChannel channel = null, [Leftover] string message = null)
         {
             var m = _ytChannelRegex.Match(url);
             if (!m.Success)
@@ -24,19 +24,19 @@ public partial class Searches
 
             var channelId = m.Groups["channelid"].Value;
 
-            return Feed("https://www.youtube.com/feeds/videos.xml?channel_id=" + channelId, channel);
+            return Feed("https://www.youtube.com/feeds/videos.xml?channel_id=" + channelId, channel, message);
         }
 
         [Cmd]
         [RequireContext(ContextType.Guild)]
         [UserPerm(GuildPerm.ManageMessages)]
-        public async Task Feed(string url, [Leftover] ITextChannel channel = null)
+        public async Task Feed(string url, ITextChannel channel = null, [Leftover] string message = null)
         {
             if (!Uri.TryCreate(url, UriKind.Absolute, out var uri) 
                 || (uri.Scheme != Uri.UriSchemeHttp && uri.Scheme != Uri.UriSchemeHttps))
             {
                 await ReplyErrorLocalizedAsync(strs.feed_invalid_url);
-                return;
+                return; 
             }
 
             channel ??= (ITextChannel)ctx.Channel;
@@ -51,7 +51,10 @@ public partial class Searches
                 return;
             }
 
-            var result = _service.AddFeed(ctx.Guild.Id, channel.Id, url);
+            if (ctx.User is not IGuildUser gu || !gu.GuildPermissions.Administrator)
+                message = message?.SanitizeMentions(true);
+            
+            var result = _service.AddFeed(ctx.Guild.Id, channel.Id, url, message);
             if (result == FeedAddResult.Success)
             {
                 await ReplyConfirmLocalizedAsync(strs.feed_added);

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

@@ -162,7 +162,6 @@ public class FeedsService : INService
                             }
                         }
 
-
                         embed.WithTitle(title.TrimTo(256));
 
                         var desc = feedItem.Description?.StripHtml();
@@ -171,15 +170,15 @@ public class FeedsService : INService
 
                         //send the created embed to all subscribed channels
                         var feedSendTasks = kvp.Value
-                                               .Where(x => x.GuildConfig is not null)
-                                               .Select(x => _client.GetGuild(x.GuildConfig.GuildId)
-                                                                   ?.GetTextChannel(x.ChannelId))
-                                               .Where(x => x is not null)
-                                               .Select(x => x.EmbedAsync(embed));
+                            .Where(x => x.GuildConfig is not null)
+                            .Select(x => _client.GetGuild(x.GuildConfig.GuildId)
+                                ?.GetTextChannel(x.ChannelId)
+                                ?.EmbedAsync(embed, x.Message))
+                            .Where(x => x is not null);
 
                         allSendTasks.Add(feedSendTasks.WhenAll());
 
-                        // as data retrieval was sucessful, reset error counter
+                        // as data retrieval was successful, reset error counter
                         ClearErrors(rssUrl);
                     }
                 }
@@ -207,7 +206,7 @@ public class FeedsService : INService
                   .ToList();
     }
 
-    public FeedAddResult AddFeed(ulong guildId, ulong channelId, string rssFeed)
+    public FeedAddResult AddFeed(ulong guildId, ulong channelId, string rssFeed, string message)
     {
         ArgumentNullException.ThrowIfNull(rssFeed, nameof(rssFeed));
 

src/NadekoBot/Modules/Searches/Searches.cs

@@ -1,4 +1,4 @@
-#nullable disable
+#nullable disable
 using Microsoft.Extensions.Caching.Memory;
 using NadekoBot.Modules.Administration.Services;
 using NadekoBot.Modules.Searches.Common;
@@ -325,7 +325,7 @@ public partial class Searches : NadekoModule<SearchesService>
                             return _eb.Create()
                                       .WithOkColor()
                                       .WithUrl(item.Permalink)
-                                      .WithAuthor(item.Word)
+                                      .WithTitle(item.Word)
                                       .WithDescription(item.Definition);
                         },
                         items.Length,
@@ -612,4 +612,4 @@ public partial class Searches : NadekoModule<SearchesService>
         [JsonProperty("result_url")]
         public string ResultUrl { get; set; }
     }
-}
+}

src/NadekoBot/Modules/Searches/Translate/TranslateService.cs

@@ -220,5 +220,5 @@ public sealed class TranslateService : ITranslateService, IExecNoCommand, IReady
     }
 
     public IEnumerable<string> GetLanguages()
-        => _google.Languages.Select(x => x.Key);
+        => _google.Languages.GroupBy(x => x.Value).Select(x => $"{x.AsEnumerable().Select(y => y.Key).Join(", ")}");
 }

src/NadekoBot/Modules/Searches/Translate/TranslatorCommands.cs

@@ -77,6 +77,19 @@ public partial class Searches
         [Cmd]
         [RequireContext(ContextType.Guild)]
         public async Task Translangs()
-            => await ctx.Channel.SendTableAsync(_service.GetLanguages(), str => $"{str,-15}");
+        {
+            var langs = _service.GetLanguages().ToList();
+            
+            var eb = _eb.Create()
+                        .WithTitle(GetText(strs.supported_languages))
+                        .WithOkColor();
+
+            foreach (var chunk in langs.Chunk(15))
+            {
+                eb.AddField("󠀁", chunk.Join("\n"), isInline: true);
+            }
+
+            await ctx.Channel.EmbedAsync(eb);
+        }
     }
 }

src/NadekoBot/Modules/Searches/_Common/Config/SearchesConfig.cs

@@ -30,7 +30,7 @@ public partial class SearchesConfig : ICloneable<SearchesConfig>
 - `ytdlp` - recommended easy, uses `yt-dlp`. Requires `yt-dlp` to be installed and it's path added to env variables
 
 - `invidious` - recommended advanced, uses invidious api. Requires at least one invidious instance specified in the `invidiousInstances` property")]
-    public YoutubeSearcher YtProvider { get; set; } = YoutubeSearcher.Ytdl;
+    public YoutubeSearcher YtProvider { get; set; } = YoutubeSearcher.Ytdlp;
 
     [Comment(@"Set the searx instance urls in case you want to use 'searx' for either img or web search.
 Nadeko will use a random one for each request.

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

@@ -199,7 +199,7 @@ public sealed class PatronageService
                 }
                 else
                 {
-                    if (dbPatron.LastCharge.Month < lastChargeUtc.Month)
+                    if (dbPatron.LastCharge.Month < lastChargeUtc.Month || dbPatron.LastCharge.Year < lastChargeUtc.Year)
                     {
                         // user is charged again for this month
                         // if his sub would end in teh future, extend it by one month.

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

@@ -270,7 +270,7 @@ public partial class Utility
 
             if (userId == ctx.User.Id || hasManageMessages)
             {
-                var deleted = await _qs.DeleteAllAuthorQuotesAsync(ctx.Guild.Id, ctx.User.Id);
+                var deleted = await _qs.DeleteAllAuthorQuotesAsync(ctx.Guild.Id, userId);
                 await ReplyConfirmLocalizedAsync(strs.quotes_deleted_count(deleted));
             }
             else

src/NadekoBot/Modules/Utility/StreamRole/StreamRoleService.cs

@@ -1,12 +1,9 @@
-#nullable disable
-using NadekoBot.Common.ModuleBehaviors;
+using NadekoBot.Common.ModuleBehaviors;
 using NadekoBot.Db;
 using NadekoBot.Modules.Utility.Common;
 using NadekoBot.Modules.Utility.Common.Exceptions;
 using NadekoBot.Services.Database.Models;
-using System.Diagnostics;
 using System.Net;
-using Nadeko.Common;
 
 namespace NadekoBot.Modules.Utility.Services;
 
@@ -31,15 +28,16 @@ public class StreamRoleService : IReadyExecutor, INService
         _queueRunner = new QueueRunner();
     }
 
-    private Task OnPresenceUpdate(SocketUser user, SocketPresence oldPresence, SocketPresence newPresence)
+    private Task OnPresenceUpdate(SocketUser user, SocketPresence? oldPresence, SocketPresence? newPresence)
     {
         
         _ = Task.Run(async () =>
         {
-            if (oldPresence.Activities.Count != newPresence.Activities.Count)
+            if (oldPresence?.Activities?.Count != newPresence?.Activities?.Count)
             {
                 var guildUsers = _client.Guilds
-                                        .Select(x => x.GetUser(user.Id));
+                                        .Select(x => x.GetUser(user.Id))
+                                        .Where(x => x is not null);
 
                 foreach (var guildUser in guildUsers)
                 {
@@ -131,7 +129,7 @@ public class StreamRoleService : IReadyExecutor, INService
     /// <param name="guild">Guild Id</param>
     /// <param name="keyword">Keyword to set</param>
     /// <returns>The keyword set</returns>
-    public async Task<string> SetKeyword(IGuild guild, string keyword)
+    public async Task<string?> SetKeyword(IGuild guild, string? keyword)
     {
         keyword = keyword?.Trim().ToLowerInvariant();
 
@@ -221,15 +219,15 @@ public class StreamRoleService : IReadyExecutor, INService
             await RescanUsers(guild);
     }
 
-    private async ValueTask RescanUser(IGuildUser user, StreamRoleSettings setting, IRole addRole = null)
+    private async ValueTask RescanUser(IGuildUser user, StreamRoleSettings setting, IRole? addRole = null)
         => await _queueRunner.EnqueueAsync(() => RescanUserInternal(user, setting, addRole));
 
-    private async Task RescanUserInternal(IGuildUser user, StreamRoleSettings setting, IRole addRole = null)
+    private async Task RescanUserInternal(IGuildUser user, StreamRoleSettings setting, IRole? addRole = null)
     {
         if (user.IsBot)
             return;
 
-        var g = (StreamingGame)user.Activities.FirstOrDefault(a
+        var g = (StreamingGame?)user.Activities.FirstOrDefault(a
             => a is StreamingGame
                && (string.IsNullOrWhiteSpace(setting.Keyword)
                    || a.Name.ToUpperInvariant().Contains(setting.Keyword.ToUpperInvariant())

src/NadekoBot/Modules/Utility/Utility.cs

@@ -402,6 +402,103 @@ public partial class Utility : NadekoModule
         await ctx.OkAsync();
     }
 
+
+    [Cmd]
+    [RequireContext(ContextType.Guild)]
+    [BotPerm(GuildPerm.ManageEmojisAndStickers)]
+    [UserPerm(GuildPerm.ManageEmojisAndStickers)]
+    public async Task StickerAdd(string name = null, string description = null, params string[] tags)
+    {
+        string format;
+        Stream stream;
+
+        if (ctx.Message.Stickers.Count is 1 && ctx.Message.Stickers.First() is SocketSticker ss)
+        {
+            name ??= ss.Name;
+            description = ss.Description;
+            tags = tags is null or { Length: 0 } ? ss.Tags.ToArray() : tags;
+            format = FormatToExtension(ss.Format);
+
+            using var http = _httpFactory.CreateClient();
+            stream = await http.GetStreamAsync(ss.GetStickerUrl());
+        }
+        // else if (ctx.Message.Attachments.FirstOrDefault() is { } attachment)
+        // {
+        //     var url = attachment?.Url;
+        //
+        //     if (url is null)
+        //         return;
+        //
+        //     if (name is null)
+        //     {
+        //         await ReplyErrorLocalizedAsync(strs.sticker_missing_name);
+        //         return;
+        //     }
+        //
+        //     format = Path.GetExtension(attachment.Filename);
+        //
+        //     if (attachment is not { Width: 300, Height: 300 })
+        //     {
+        //         await ReplyErrorLocalizedAsync(strs.sticker_invalid_size);
+        //         return;
+        //     }
+        //
+        //     using var http = _httpFactory.CreateClient();
+        //     
+        //     using var res = await http.GetAsync(url, HttpCompletionOption.ResponseHeadersRead);
+        //     if (res.GetContentLength() > 512.Kilobytes().Bytes)
+        //     {
+        //         await ReplyErrorLocalizedAsync(strs.invalid_emoji_link);
+        //         return;
+        //     }
+        //
+        //     stream = await res.Content.ReadAsStreamAsync();
+        // }
+        else
+        {
+            await ReplyErrorLocalizedAsync(strs.sticker_error);
+            return;
+        }
+        
+        try
+        {
+            if (tags.Length == 0)
+                tags = new[] { name };
+            
+            await ctx.Guild.CreateStickerAsync(name,
+                string.IsNullOrWhiteSpace(description) ? "Missing description" : description,
+                tags,
+                stream,
+                $"{name}.{format}");
+
+            await ctx.OkAsync();
+        }
+        catch (Exception ex)
+        {
+            Log.Warning(ex, "Error occurred while adding a sticker: {Message}", ex.Message);
+            await ReplyErrorLocalizedAsync(strs.error_occured);
+        }
+        finally
+        {
+            await stream.DisposeAsync();
+        }
+    }
+    
+    private static string FormatToExtension(StickerFormatType format)
+    {
+      switch (format)
+      {
+        case StickerFormatType.None:
+        case StickerFormatType.Png:
+        case StickerFormatType.Apng:
+          return "png";
+        case StickerFormatType.Lottie:
+          return "lottie";
+        default:
+          throw new ArgumentException(nameof (format));
+      }
+    }
+
     [Cmd]
     [OwnerOnly]
     public async Task ListServers(int page = 1)

src/NadekoBot/NadekoBot.csproj

@@ -40,7 +40,7 @@
         </PackageReference>
         <PackageReference Include="Html2Markdown" Version="5.0.2.561" />
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.2.0" />
-        
+
         <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
         <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
@@ -64,36 +64,36 @@
         <PackageReference Include="SixLabors.Shapes" Version="1.0.0-beta0009" />
         <PackageReference Include="StackExchange.Redis" Version="2.6.48" />
         <PackageReference Include="YamlDotNet" Version="11.2.1" />
-        
+
         <PackageReference Include="Humanizer" Version="2.14.1">
             <PrivateAssets>all</PrivateAssets>
             <Publish>True</Publish>
         </PackageReference>
-        
+
         <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
-        
+
         <!-- Db-related packages -->
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.7" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        
+
         <PackageReference Include="linq2db.EntityFrameworkCore" Version="6.8.0" />
-        
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.7" />        
+
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.7" />
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.5" />
         <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
-        
+
         <!-- Used by stream notifications -->
         <PackageReference Include="TwitchLib.Api" Version="3.4.1" />
-        
+
         <!-- Uncomment to check for disposable issues -->
 <!--        <PackageReference Include="IDisposableAnalyzers" Version="4.0.2">-->
 <!--            <PrivateAssets>all</PrivateAssets>-->
 <!--            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>-->
 <!--        </PackageReference>-->
-        
+
         <PackageReference Include="EFCore.NamingConventions" Version="6.0.0" />
     </ItemGroup>
 
@@ -128,7 +128,7 @@
         <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix).$(VersionSuffix)</Version>
         <Version Condition=" '$(Version)' == '' ">$(VersionPrefix)</Version>
     </PropertyGroup>
-    
+
     <PropertyGroup Condition=" '$(Configuration)' == 'GlobalNadeko' ">
         <!-- Define trace doesn't seem to affect the build at all so I had to remove $(DefineConstants)-->
         <DefineTrace>false</DefineTrace>

src/NadekoBot/Services/CommandHandler.cs

@@ -302,7 +302,7 @@ public class CommandHandler : INService, IReadyExecutor
     }
 
     public Task<(bool Success, string Error, CommandInfo Info)> ExecuteCommandAsync(
-        CommandContext context,
+        ICommandContext context,
         string input,
         int argPos,
         IServiceProvider serviceProvider,
@@ -311,7 +311,7 @@ public class CommandHandler : INService, IReadyExecutor
 
 
     public async Task<(bool Success, string Error, CommandInfo Info)> ExecuteCommand(
-        CommandContext context,
+        ICommandContext context,
         string input,
         IServiceProvider services,
         MultiMatchHandling multiMatchHandling = MultiMatchHandling.Exception)

src/NadekoBot/Services/Currency/CurrencyService.cs

@@ -88,6 +88,9 @@ public sealed class CurrencyService : ICurrencyService, INService
         long amount,
         TxData txData)
     {
+        if (amount == 0)
+            return true;
+        
         var wallet = await GetWalletAsync(userId);
         var result = await wallet.Take(amount, txData);
         if(result) 

src/NadekoBot/Services/Currency/GamblingTxTracker.cs

@@ -104,8 +104,7 @@ public sealed class GamblingTxTracker : ITxTracker, INService, IReadyExecutor
     public async Task<IReadOnlyCollection<GamblingStats>> GetAllAsync()
     {
         await using var ctx = _db.GetDbContext();
-        return await ctx
-            .GetTable<GamblingStats>()
-            .ToListAsync();
+        return await ctx.Set<GamblingStats>()
+            .ToListAsyncEF();
     }
 }

src/NadekoBot/Services/Impl/BotCredsProvider.cs

@@ -34,19 +34,19 @@ public sealed class BotCredsProvider : IBotCredsProvider
 
     public BotCredsProvider(int? totalShards = null, string credPath = null)
     {
-        _totalShards = totalShards;
-
-        if (!string.IsNullOrWhiteSpace(credPath))
-        {
-            CredsPath = credPath;
-            CredsExamplePath = Path.Combine(Path.GetDirectoryName(credPath), CREDS_EXAMPLE_FILE_NAME);
-        }
-        else
-        {
-            CredsPath = Path.Combine(Directory.GetCurrentDirectory(), CREDS_FILE_NAME);
-            CredsExamplePath = Path.Combine(Directory.GetCurrentDirectory(), CREDS_EXAMPLE_FILE_NAME);
+        _totalShards = totalShards;
+
+        if (!string.IsNullOrWhiteSpace(credPath))
+        {
+            CredsPath = credPath;
+            CredsExamplePath = Path.Combine(Path.GetDirectoryName(credPath), CREDS_EXAMPLE_FILE_NAME);
         }
-
+        else
+        {
+            CredsPath = Path.Combine(Directory.GetCurrentDirectory(), CREDS_FILE_NAME);
+            CredsExamplePath = Path.Combine(Directory.GetCurrentDirectory(), CREDS_EXAMPLE_FILE_NAME);
+        }
+
         try
         {
             if (!File.Exists(CredsExamplePath))
@@ -69,8 +69,8 @@ public sealed class BotCredsProvider : IBotCredsProvider
 
         _config = new ConfigurationBuilder().AddYamlFile(CredsPath, false, true)
                                             .AddEnvironmentVariables("NadekoBot_")
-                                            .Build();
-
+                                            .Build();
+
         _changeToken = ChangeToken.OnChange(() => _config.GetReloadToken(), Reload);
         Reload();
     }
@@ -131,14 +131,14 @@ public sealed class BotCredsProvider : IBotCredsProvider
 
         ymlData = Yaml.Serializer.Serialize(creds);
         File.WriteAllText(CREDS_FILE_NAME, ymlData);
-    }
-
+    }
+
     private string OldCredsJsonPath
         => Path.Combine(Directory.GetCurrentDirectory(), "credentials.json");
 
     private string OldCredsJsonBackupPath
-        => Path.Combine(Directory.GetCurrentDirectory(), "credentials.json.bak");
-
+        => Path.Combine(Directory.GetCurrentDirectory(), "credentials.json.bak");
+
     private void MigrateCredentials()
     {
         if (File.Exists(OldCredsJsonPath))
@@ -177,15 +177,18 @@ public sealed class BotCredsProvider : IBotCredsProvider
 
             Log.Warning(
                 "Data from credentials.json has been moved to creds.yml\nPlease inspect your creds.yml for correctness");
-        }
-
+        }
+
         if (File.Exists(CREDS_FILE_NAME))
         {
             var creds = Yaml.Deserializer.Deserialize<Creds>(File.ReadAllText(CREDS_FILE_NAME));
             if (creds.Version <= 5)
             {
-                creds.Version = 6;
                 creds.BotCache = BotCacheImplemenation.Redis;
+            }
+            if (creds.Version <= 6)
+            {
+                creds.Version = 7;
                 File.WriteAllText(CREDS_FILE_NAME, Yaml.Serializer.Serialize(creds));
             }
         }

src/NadekoBot/Services/Impl/GoogleApiService.cs

@@ -10,143 +10,11 @@ using System.Xml;
 
 namespace NadekoBot.Services;
 
-public class GoogleApiService : IGoogleApiService, INService
+public sealed partial class GoogleApiService : IGoogleApiService, INService
 {
     private static readonly Regex
         _plRegex = new("(?:youtu\\.be\\/|list=)(?<id>[\\da-zA-Z\\-_]*)", RegexOptions.Compiled);
 
-    public IReadOnlyDictionary<string, string> Languages { get; } = new Dictionary<string, string>
-    {
-        { "afrikaans", "af" },
-        { "albanian", "sq" },
-        { "arabic", "ar" },
-        { "armenian", "hy" },
-        { "azerbaijani", "az" },
-        { "basque", "eu" },
-        { "belarusian", "be" },
-        { "bengali", "bn" },
-        { "bulgarian", "bg" },
-        { "catalan", "ca" },
-        { "chinese-traditional", "zh-TW" },
-        { "chinese-simplified", "zh-CN" },
-        { "chinese", "zh-CN" },
-        { "croatian", "hr" },
-        { "czech", "cs" },
-        { "danish", "da" },
-        { "dutch", "nl" },
-        { "english", "en" },
-        { "esperanto", "eo" },
-        { "estonian", "et" },
-        { "filipino", "tl" },
-        { "finnish", "fi" },
-        { "french", "fr" },
-        { "galician", "gl" },
-        { "german", "de" },
-        { "georgian", "ka" },
-        { "greek", "el" },
-        { "haitian Creole", "ht" },
-        { "hebrew", "iw" },
-        { "hindi", "hi" },
-        { "hungarian", "hu" },
-        { "icelandic", "is" },
-        { "indonesian", "id" },
-        { "irish", "ga" },
-        { "italian", "it" },
-        { "japanese", "ja" },
-        { "korean", "ko" },
-        { "lao", "lo" },
-        { "latin", "la" },
-        { "latvian", "lv" },
-        { "lithuanian", "lt" },
-        { "macedonian", "mk" },
-        { "malay", "ms" },
-        { "maltese", "mt" },
-        { "norwegian", "no" },
-        { "persian", "fa" },
-        { "polish", "pl" },
-        { "portuguese", "pt" },
-        { "romanian", "ro" },
-        { "russian", "ru" },
-        { "serbian", "sr" },
-        { "slovak", "sk" },
-        { "slovenian", "sl" },
-        { "spanish", "es" },
-        { "swahili", "sw" },
-        { "swedish", "sv" },
-        { "tamil", "ta" },
-        { "telugu", "te" },
-        { "thai", "th" },
-        { "turkish", "tr" },
-        { "ukrainian", "uk" },
-        { "urdu", "ur" },
-        { "vietnamese", "vi" },
-        { "welsh", "cy" },
-        { "yiddish", "yi" },
-        { "af", "af" },
-        { "sq", "sq" },
-        { "ar", "ar" },
-        { "hy", "hy" },
-        { "az", "az" },
-        { "eu", "eu" },
-        { "be", "be" },
-        { "bn", "bn" },
-        { "bg", "bg" },
-        { "ca", "ca" },
-        { "zh-tw", "zh-TW" },
-        { "zh-cn", "zh-CN" },
-        { "hr", "hr" },
-        { "cs", "cs" },
-        { "da", "da" },
-        { "nl", "nl" },
-        { "en", "en" },
-        { "eo", "eo" },
-        { "et", "et" },
-        { "tl", "tl" },
-        { "fi", "fi" },
-        { "fr", "fr" },
-        { "gl", "gl" },
-        { "de", "de" },
-        { "ka", "ka" },
-        { "el", "el" },
-        { "ht", "ht" },
-        { "iw", "iw" },
-        { "hi", "hi" },
-        { "hu", "hu" },
-        { "is", "is" },
-        { "id", "id" },
-        { "ga", "ga" },
-        { "it", "it" },
-        { "ja", "ja" },
-        { "ko", "ko" },
-        { "lo", "lo" },
-        { "la", "la" },
-        { "lv", "lv" },
-        { "lt", "lt" },
-        { "mk", "mk" },
-        { "ms", "ms" },
-        { "mt", "mt" },
-        { "no", "no" },
-        { "fa", "fa" },
-        { "pl", "pl" },
-        { "pt", "pt" },
-        { "ro", "ro" },
-        { "ru", "ru" },
-        { "sr", "sr" },
-        { "sk", "sk" },
-        { "sl", "sl" },
-        { "es", "es" },
-        { "sw", "sw" },
-        { "sv", "sv" },
-        { "ta", "ta" },
-        { "te", "te" },
-        { "th", "th" },
-        { "tr", "tr" },
-        { "uk", "uk" },
-        { "ur", "ur" },
-        { "vi", "vi" },
-        { "cy", "cy" },
-        { "yi", "yi" }
-    };
 
     private readonly YouTubeService _yt;
     private readonly UrlshortenerService _sh;
@@ -155,7 +23,7 @@ public class GoogleApiService : IGoogleApiService, INService
     private readonly IBotCredsProvider _creds;
     private readonly IHttpClientFactory _httpFactory;
 
-    public GoogleApiService(IBotCredsProvider creds, IHttpClientFactory factory)
+    public GoogleApiService(IBotCredsProvider creds, IHttpClientFactory factory) : this()
     {
         _creds = creds;
         _httpFactory = factory;

src/NadekoBot/Services/Impl/GoogleApiService_SupportedLanguages.cs

@@ -0,0 +1,158 @@
+namespace NadekoBot.Services;
+
+public sealed partial class GoogleApiService
+{
+    private const string SUPPORTED = @"afrikaans af
+albanian sq
+amharic am
+arabic ar
+armenian hy
+assamese as
+aymara ay
+azerbaijani az
+bambara bm
+basque eu
+belarusian be
+bengali bn
+bhojpuri bho
+bosnian bs
+bulgarian bg
+catalan ca
+cebuano ceb
+chinese zh-CN
+chinese-trad zh-TW
+corsican co
+croatian hr
+czech cs
+danish da
+dhivehi dv
+dogri doi
+dutch nl
+english en
+esperanto eo
+estonian et
+ewe ee
+filipino fil
+finnish fi
+french fr
+frisian fy
+galician gl
+georgian ka
+german de
+greek el
+guarani gn
+gujarati gu
+haitian ht
+hausa ha
+hawaiian haw
+hebrew he 
+hindi hi
+hmong hmn
+hungarian hu
+icelandic is
+igbo ig
+ilocano ilo
+indonesian id
+irish ga
+italian it
+japanese ja
+javanese jv 
+kannada kn
+kazakh kk
+khmer km
+kinyarwanda rw
+konkani gom
+korean ko
+krio kri
+kurdish ku
+kurdish-sor ckb
+kyrgyz ky
+lao lo
+latin la
+latvian lv
+lingala ln
+lithuanian lt
+luganda lg
+luxembourgish lb
+macedonian mk
+maithili mai
+malagasy mg
+malay ms
+malayalam ml
+maltese mt
+maori mi
+marathi mr
+meiteilon mni-Mtei
+mizo lus
+mongolian mn
+myanmar my
+nepali ne
+norwegian no
+nyanja ny
+odia or
+oromo om
+pashto ps
+persian fa
+polish pl
+portuguese pt
+punjabi pa
+quechua qu
+romanian ro
+russian ru
+samoan sm
+sanskrit sa
+scots gd
+sepedi nso
+serbian sr
+sesotho st
+shona sn
+sindhi sd
+sinhala si
+slovak sk
+slovenian sl
+somali so
+spanish es
+sundanese su
+swahili sw
+swedish sv
+tagalog tl
+tajik tg
+tamil ta
+tatar tt
+telugu te
+thai th
+tigrinya ti
+tsonga ts
+turkish tr
+turkmen tk
+twi ak
+ukrainian uk
+urdu ur
+uyghur ug
+uzbek uz
+vietnamese vi
+welsh cy
+xhosa xh
+yiddish yi
+yoruba yo
+zulu zu";
+
+    
+    public IReadOnlyDictionary<string, string> Languages { get; }
+    
+    private GoogleApiService()
+    {
+        var langs = SUPPORTED.Split("\n")
+                             .Select(x => x.Split(' '))
+                             .ToDictionary(x => x[0].Trim(), x => x[1].Trim());
+        
+        foreach (var (_, v) in langs.ToArray())
+        {
+            langs.Add(v, v);
+        }
+
+        Languages = langs;
+
+    }
+
+}

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

src/NadekoBot/_Extensions/IMessageChannelExtensions.cs

@@ -23,11 +23,7 @@ public static class MessageChannelExtensions
             embeds: embeds is null
                 ? null
                 : embeds as Embed[] ?? embeds.ToArray(),
-            components: components,
-            options: new()
-            {
-                RetryMode = RetryMode.AlwaysRetry
-            });
+            components: components);
     }
 
     public static async Task<IUserMessage> SendAsync(
@@ -155,27 +151,6 @@ public static class MessageChannelExtensions
         string? footer = null)
         => ch.SendAsync(eb, MessageType.Error, title, text, url, footer);
 
-    // weird stuff
-    
-    public static Task<IUserMessage> SendTableAsync<T>(
-        this IMessageChannel ch,
-        string seed,
-        IEnumerable<T> items,
-        Func<T, string> howToPrint,
-        int columns = 3)
-        => ch.SendMessageAsync($@"{seed}```css
-{items.Chunk(columns)
-      .Select(ig => string.Concat(ig.Select(howToPrint)))
-      .Join("\n")}
-```");
-
-    public static Task<IUserMessage> SendTableAsync<T>(
-        this IMessageChannel ch,
-        IEnumerable<T> items,
-        Func<T, string> howToPrint,
-        int columns = 3)
-        => ch.SendTableAsync("", items, howToPrint, columns);
-
     public static Task SendPaginatedConfirmAsync(
         this ICommandContext ctx,
         int currentPage,

src/NadekoBot/_Extensions/SocketMessageComponentExtensions.cs

@@ -23,11 +23,7 @@ public static class SocketMessageComponentExtensions
                 ? null
                 : embeds as Embed[] ?? embeds.ToArray(),
             components: components,
-            ephemeral: ephemeral,
-            options: new()
-            {
-                RetryMode = RetryMode.AlwaysRetry
-            });
+            ephemeral: ephemeral);
     }
 
     public static Task RespondAsync(

src/NadekoBot/creds_example.yml

@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 6
+version: 7
 # Bot token. Do not share with anyone ever -> https://discordapp.com/developers/applications/
 token: ''
 # List of Ids of the users who have bot owner permissions
@@ -56,6 +56,8 @@ patreon:
 botListToken: ''
 # Official cleverbot api key.
 cleverbotApiKey: ''
+# Official GPT-3 api key.
+gpt3ApiKey: ''
 # Which cache implementation should bot use.
 # 'memory' - Cache will be in memory of the bot's process itself. Only use this on bots with a single shard. When the bot is restarted the cache is reset.
 # 'redis' - Uses redis (which needs to be separately downloaded and installed). The cache will persist through bot restarts. You can configure connection string in creds.yml

src/NadekoBot/data/aliases.yml

@@ -664,8 +664,6 @@ avatar:
   - av
 hentai:
   - hentai
-nhentai:
-  - nhentai
 danbooru:
   - danbooru
 derpibooru:
@@ -728,6 +726,9 @@ showemojis:
 emojiadd:
   - emojiadd
   - ea
+stickeradd:
+  - stickeradd
+  - sa
 emojiremove:
   - emojiremove
   - emojirm
@@ -804,6 +805,7 @@ hentaibomb:
   - hentaibomb
 cleverbot:
   - cleverbot
+  - chatgpt
 shorten:
   - shorten
 wikia:
@@ -1383,4 +1385,7 @@ patronmessage:
 eval:
   - eval
 autopublish:
-  - autopublish
+  - autopublish
+doas:
+  - doas
+  - execas 

src/NadekoBot/data/games.yml

@@ -1,5 +1,5 @@
 # DO NOT CHANGE
-version: 1
+version: 2
 # Hangman related settings (.hangman command)
 hangman:
 # The amount of currency awarded to the winner of a hangman game
@@ -8,8 +8,8 @@ hangman:
 trivia:
 # The amount of currency awarded to the winner of the trivia game.
   currencyReward: 0
-  # Users won't be able to start trivia games which have 
-# a smaller win requirement than the one specified by this setting.
+  # Users won't be able to start trivia games which have
+  # a smaller win requirement than the one specified by this setting.
   minimumWinReq: 1
 # List of responses for the .8ball command. A random one will be selected every time
 eightBallResponses:
@@ -54,3 +54,17 @@ raceAnimals:
     name: Crab
   - icon: "🦄"
     name: Unicorn
+# Which chatbot API should bot use.
+# 'cleverbot' - bot will use Cleverbot API.
+# 'gpt3' - bot will use GPT-3 API
+chatBot: gpt3
+
+chatGpt:
+  # Which GPT-3 Model should bot use.
+  # 'ada001' - cheapest and fastest
+  # 'babbage001' - 2nd option
+  # 'curie001' - 3rd option
+  # 'davinci003' - Most expensive, slowest
+  model: davinci003
+  # The maximum number of tokens to use per GPT-3 API call
+  maxTokens: 100

src/NadekoBot/data/searches.yml

@@ -18,7 +18,7 @@ imgSearchEngine: Google
 # - `ytdlp` - recommended easy, uses `yt-dlp`. Requires `yt-dlp` to be installed and it's path added to env variables
 # 
 # - `invidious` - recommended advanced, uses invidious api. Requires at least one invidious instance specified in the `invidiousInstances` property
-ytProvider: Ytdl
+ytProvider: Ytdlp
 # Set the searx instance urls in case you want to use 'searx' for either img or web search.
 # Nadeko will use a random one for each request.
 # Use a fully qualified url. Example: `https://my-searx-instance.mydomain.com`

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

@@ -1117,11 +1117,6 @@ hentai:
   desc: "Shows a hentai image from a random website (gelbooru, danbooru, konachan or yandere) with a given tag. Tag(s) are optional but preferred. Maximum is usually 2 tags. Only 1 tag allowed."
   args:
     - "yuri"
-nhentai:
-  desc: "Shows basic information about a hentai with the specified id, or a valid nhentai search query."
-  args:
-    - "273426"
-    - "cute girl"
 autohentai:
   desc: "Posts a hentai every X seconds with a random tag from the provided tags. Use `|` to separate tag groups. Random group will be chosen every time the image is sent. Max 2 tags per group. 20 seconds minimum. Provide no parameters to disable."
   args:
@@ -1245,6 +1240,11 @@ emojiremove:
   desc: "Removes the specified emoji or emojis from this server."
   args:
     - ":eagleWarrior: :plumedArcher:"
+stickeradd:
+  desc: "Adds the sticker from your message to this server. Send the sticker along with this command (in the same message)."
+  args:
+    - ""
+    - "name \"description\" tag1 tag2 tagN"
 deckshuffle:
   desc: "Reshuffles all cards back into the deck."
   args:
@@ -1372,7 +1372,7 @@ listservers:
   args:
     - "3"
 cleverbot:
-  desc: "Toggles cleverbot session. When enabled, the bot will reply to messages starting with bot mention in the server. Expressions starting with %bot.mention% won't work if cleverbot is enabled."
+  desc: "Toggles cleverbot/chatgpt session. When enabled, the bot will reply to messages starting with bot mention in the server. Expressions starting with %bot.mention% won't work if cleverbot/chatgpt is enabled."
   args:
     - ""
 shorten:
@@ -1991,13 +1991,22 @@ ytuploadnotif:
   desc: |-
     Subscribe to a youtube channel's upload rss feed.
     Shortcut for `.feed https://www.youtube.com/feeds/videos.xml?channel_id=%3Cyoutube_channel_id`
+    You can optionally specify a message which will be posted with an update.
   args:
-    - "https://www.youtube.com/channel/UCSJ4gkVC6NrvII8umztf0Ow"
+    - "https://www.youtube.com/channel/UCSJ4gkVC6NrvII8umztf0Ow" 
+    - "https://www.youtube.com/channel/UCSJ4gkVC6NrvII8umztf0Ow New video is posted"
 feed:
-  desc: "Subscribes to a feed. Bot will post an update up to once every 10 seconds. You can have up to 10 feeds on one server. All feeds must have unique URLs. Set a channel as a second optional parameter to specify where to send the updates."
+  desc: |-
+    Subscribes to a feed.
+    Bot will post an update up to once every 10 seconds.
+    You can have up to 10 feeds on one server.
+    All feeds must have unique URLs.
+    Set a channel as a second optional parameter to specify where to send the updates.
+    You can optionally specify a message after the channel name which will be posted with an update.
   args:
     - "https://blog.playstation.com/feed/"
     - "https://blog.playstation.com/feed/ #updates"
+    - "https://blog.playstation.com/feed/ #updates New playstation rss feed post!"
 feedremove:
   desc: "Stops tracking a feed on the given index. Use `{0}feeds` command to see a list of feeds and their indexes."
   args:
@@ -2345,4 +2354,8 @@ threaddelete:
 autopublish:
   desc: "Make the bot automatically publish all messages posted in the news channel this command was executed in."
   args:
-    - ""
+    - ""
+doas:
+  desc: "Execute the command as if you were the target user. Requires bot ownership and server administrator permission."
+  args:
+    - "@Thief .give all @Admin"

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

@@ -977,14 +977,14 @@
   "created_by": "Created by {0}",
   "module_footer": "{0}cmds {1}",
   "module_page_empty": "No module on this page.",
-  "module_description_help": "Get command help, descriptions and usage examples",  
-  "module_description_gambling": "Bet on dice rolls, blackjack, slots, coinflips and others",  
-  "module_description_games": "Play trivia, nunchi, hangman, connect4 and other games",  
-  "module_description_nsfw": "NSFW commands.",  
-  "module_description_music": "Play music from youtube, local files soundcloud and radio streams",  
-  "module_description_utility": "Manage custom quotes, repeating messages and check facts about the server",  
+  "module_description_help": "Get command help, descriptions and usage examples",
+  "module_description_gambling": "Bet on dice rolls, blackjack, slots, coinflips and others",
+  "module_description_games": "Play trivia, nunchi, hangman, connect4 and other games",
+  "module_description_nsfw": "NSFW commands.",
+  "module_description_music": "Play music from youtube, local files soundcloud and radio streams",
+  "module_description_utility": "Manage custom quotes, repeating messages and check facts about the server",
   "module_description_administration": "Moderation, punish users, setup self assignable roles and greet messages",
-  "module_description_expressions": "Setup custom bot responses to certain words or phrases",  
+  "module_description_expressions": "Setup custom bot responses to certain words or phrases",
   "module_description_permissions": "Setup perms for commands, filter words and set up command cooldowns",
   "module_description_searches": "Search for jokes, images of animals, anime and manga",
   "module_description_xp": "Gain xp based on chat activity, check users' xp cards",
@@ -1005,7 +1005,7 @@
   "linkonly_disable": "This channel is no longer link-only.",
   "deleted_x_servers": "Deleted {0} servers.",
   "curtr_gift": "Gift from {0} [{1}]",
-  "curtr_award": "Awarded by bot owner {0} [{1}]",  
+  "curtr_award": "Awarded by bot owner {0} [{1}]",
   "curtr_take": "Taken by bot owner {0} [{1}]",
   "list_of_medusae": "List of Medusae",
   "list_of_unloaded": "List of Available Medusae",
@@ -1051,5 +1051,11 @@
   "patron_insuff_tier": "Your Patron Tier insufficient to perform this action.",
   "xpshop_already_owned": "You already own this item.",
   "xpshop_item_not_found": "An item with that key doesn't exist.",
-  "xpshop_website": "You can see the list of all Xp Shop items here: <https://xpshop.nadeko.bot>"
+  "xpshop_website": "You can see the list of all Xp Shop items here: <https://xpshop.nadeko.bot>",
+  "sticker_invalid_size": "Stickers must be exactly 300x300 pixels.",
+  "sticker_error": "You must either send a sticker along with this command, or upload a 300x300 .png or .apng image.",
+  "sticker_missing_name": "Please specify a name for the sticker.",
+  "thread_deleted": "Thread Deleted",
+  "thread_created": "Thread Created",
+  "supported_languages": "Supported Languages"
 }

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

@@ -946,106 +946,106 @@
     "reminder_server_list": "Lista przypomnień serwera",
     "imageonly_enable": "Ten kanał działa od teraz w trybie tylko obrazki.",
     "imageonly_disable": "Ten kanał już nie działa w trybie tylko obrazki.",
-    "transaction": "",
-    "finished_track": "",
-    "playing_track": "",
-    "queued_track": "",
-    "removed_track": "",
-    "autoplaying": "",
-    "music_autoplay_on": "",
-    "music_autoplay_off": "",
-    "track_moved": "",
-    "atl_not_enabled": "",
-    "channels": "",
-    "track_not_found": "",
-    "removed_track_error": "",
-    "market_cap_dominance": "",
-    "circulating_supply": "",
-    "module_description_expressions": "",
-    "deleted_x_servers": "",
-    "curtr_gift": "",
-    "curtr_award": "",
-    "curtr_take": "",
-    "expr_deleted": "",
-    "expr_insuff_perms": "",
-    "expressions": "",
-    "expr_new": "",
-    "expr_no_found": "",
-    "expr_no_found_id": "",
-    "exprs_cleared": "",
-    "expr_reset": "",
-    "expr_set": "",
-    "expr_edited": "",
-    "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": ""
+    "transaction": "Transakcja Walutowa",
+    "finished_track": "Utwór zakończony",
+    "playing_track": "Odtwarzam utwór #{0}",
+    "queued_track": "Utwór zakolejkowany",
+    "removed_track": "Utwór usunięty",
+    "autoplaying": "Automatycznie dodaje powiązane utwory.",
+    "music_autoplay_on": "Automatyczne odtwarzanie muzyki włączone. Będę samodzielnie kolejkować powiązane utwory po zakończeniu bieżącego odtwarzania.",
+    "music_autoplay_off": "Automatyczne odtwarzanie muzyki wyłączone.",
+    "track_moved": "Utwór przesunięty",
+    "atl_not_enabled": "Automatyczne tłumaczenie nie jest włączone na tym kanale lub podano niewłaściwy język.",
+    "channels": "Kanały",
+    "track_not_found": "Nie znaleziono utworu.",
+    "removed_track_error": "Utwór o podanym indeksie nie istnieje",
+    "market_cap_dominance": "Dominacja",
+    "circulating_supply": "Podaż obiegowa",
+    "module_description_expressions": "Ustaw własne odpowiedzi bota na wybrane słowa lub wyrażenia",
+    "deleted_x_servers": "Usunięto {0} serwerów.",
+    "curtr_gift": "Prezent od {0} [{1}]",
+    "curtr_award": "Przyznane przez właściciela bota {0} [{1}]",
+    "curtr_take": "Zabrane przez właściciela bota {0} [{1}]",
+    "expr_deleted": "Wyrażenie usunięte",
+    "expr_insuff_perms": "Niewystarczające uprawnienia. Wymaga uprawnień Właściciela Bota dla globalnych wyrażeń, a uprawnień Administratora dla serwerowych wyrażeń.",
+    "expressions": "Wyrażenia",
+    "expr_new": "Nowe Wyrażenie",
+    "expr_no_found": "Nie znaleziono wyrażeń.",
+    "expr_no_found_id": "Nie znaleziono wyrażenia o podanym id.",
+    "exprs_cleared": "Wszystkie {0} wyrażenia na tym serwerze zostały usunięte.",
+    "expr_reset": "Wyrażenia o id {0} nie będą już dodawać reakcji.",
+    "expr_set": "Wyrażenia o id {0} będą dodawać następujące reakcje do odpowiedzi: {1}",
+    "expr_edited": "Wyrażenie Zedytowane",
+    "stream_online_delete_enabled": "Powiadomienia o trwającym streamie będą teraz usuwane kiedy stream się zakończy.",
+    "stream_online_delete_disabled": "Powiadomienia o trwającym streamie nie będą już usuwane kiedy stream się zakończy.",
+    "club_create_error_name": "Nie udało się utworzyć klubu. Klub o podanej nazwie już istnieje.",
+    "club_desc_update": "Zaktualizowano Opis Klubu",
+    "bank_accounts": "Konta Bankowe",
+    "module_description_medusa": "**Tylko dla Właściciela Bota.** Załaduj, rozładuj i zarządzaj dynamicznymi modułami. Czytaj więcej [tutaj](https://nadekobot.readthedocs.io/en/latest/medusa/creating-a-medusa/)",
+    "list_of_medusae": "Lista Meduz",
+    "list_of_unloaded": "Lista Dostępnych Meduz",
+    "medusa_name_not_found": "Meduza o podanej nazwie nie istnieje lub nie jest załadowana.",
+    "medusa_info": "Informacje o Meduzie",
+    "sneks_count": "Wonsze ({0})",
+    "commands_count": "Komendy ({0})",
+    "no_medusa_loaded": "Brak załadowanych meduz.",
+    "no_medusa_available": "Brak dostępnych meduz.",
+    "loaded_medusae": "Załadowane Meduzy",
+    "medusa_not_loaded": "Meduza o podanej nazwie nie jest załadowana.",
+    "medusa_possibly_cant_unload": "Meduza prawdopodobnie nie została załadowana w pełni. Zrestartuj bota jeśli pojawią się problemy.",
+    "medusa_loaded": "Meduza {0} została załadowana.",
+    "medusa_unloaded": "Meduza {0} została rozładowana.",
+    "medusa_empty": "Meduza nie została załadowana ponieważ nie zawiera żadnych Wonszy.",
+    "medusa_already_loaded": "Meduza {0} jest już załadowana",
+    "medusa_invalid_not_found": "Meduza o podanej nazwie nie została znaleziona lub plik był błędny",
+    "bank_balance": "Masz {0} na swoim koncie bankowym.",
+    "bank_deposited": "Wpłacono {0} na twoje konto bankowe.",
+    "bank_withdrew": "Wypłacono {0} z twojego konta bankowego.",
+    "bank_withdraw_insuff": "Nie masz wystarczającej ilości {0} na swoim koncie bankowym.",
+    "cmd_group_commands": "grupa komend '{0}'",
+    "limit_reached": "Osiągnięto limit funkcji wynoszący {0}.",
+    "feature_limit_reached_you": "Osiągnięto limit {0} funkcji {1}. Być może zwiększenie progu wspierania pozwoli podnieść ten limit.",
+    "feature_limit_reached_owner": "Właściciel servera osiągnął limit {0} funkcji {1}. Właściciel serwera może być w stanie zwiększyć ten limit przez zwiększenie progu wspierania.",
+    "feature_limit_reached_either": "Osiągnięto limit {0} funkcji {1}. Albo ty albo właściciel serwera możecie być w stanie zwiększyć ten limit przez zwiększenie progu wspierania.",
+    "tier": "Próg",
+    "pledge": "Deklaracja",
+    "expires": "Wygasa",
+    "commands": "Komendy",
+    "groups": "Grupy",
+    "modules": "Moduły",
+    "no_quota_found": "Nie znaleziono wartości",
+    "patron_info": "Informacje o Patronie",
+    "quotas": "<<< Kwoty >>>",
+    "patron_not_enabled": "System patronów jest wyłączony.",
+    "results_in": "wynikiem {0} jest {1}",
+    "patron_msg_sent": "Zakończono wysyłanie wiadomości do patronów na i powyżej progu {1}. {1} wysłano pomyślnie, a {2} nie udało się.",
+    "cards": "Karty",
+    "hand_value": "Siła ręki",
+    "roll2": "Rzut",
+    "rolls": "Rzuty",
+    "available_tests": "Dostępne Testy",
+    "test_results_for": "Wyniki testu na {0}",
+    "multiplier": "Mnożnik",
+    "trivia_ended": "Quiz zakończony",
+    "card": "Karta",
+    "guess": "Zgadnięcie",
+    "repeater_skip_next": "Następne wyzwolenie tego powtórzenia zostanie pominięte.",
+    "repeater_dont_skip_next": "Następne wyzwolenie tego powtórzenia nie będzie pominięte.",
+    "remind_timely": "Przypomnę ci o twojej nagrodzie okresowej {0}",
+    "xp_shop_disabled": "Sklep Xp został wyłączony przez właściciela, lub nie ma towarów na sprzedaż.",
+    "timely_time": "Czas odebrać twoją nagrodę okresową.",
+    "buy": "Kup",
+    "use": "Użyj",
+    "in_use": "W użyciu",
+    "xp_shop_item_cant_use": "Nie możesz użyć tego przedmiotu ponieważ nie istnieje lub nie posiadasz go.",
+    "linkonly_enable": "Ten kanał jest teraz w trybie tylko linki.",
+    "linkonly_disable": "Ten kanał nie jest już w trybie tylko linki.",
+    "xp_shop_buy_required_tier": "Kupowanie towarów w tym sklepie wymaga posiadania Rangi Patrona {0} lub wyższej.",
+    "available_commands": "Dostępne Komendy",
+    "xpadd_users": "Dodano {0} XP serwerowego dla {1} użytkowników.",
+    "xpshop_buy_success": "Pomyślnie zakupiono `{0}/{1}`",
+    "patron_insuff_tier": "Twoja Ranga Patrona jest niewystarczająca do wykonania tej akcji.",
+    "xpshop_already_owned": "Już posiadasz ten przedmiot.",
+    "xpshop_item_not_found": "Przedmiot o podanym kluczu nie istnieje.",
+    "xpshop_website": "Możesz sprawdzić listę wszystkich towarów Sklepu Xp tutaj: <https://xpshop.nadeko.bot>"
 }

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

@@ -195,7 +195,7 @@
     "trivia_times_up": "Час вийшов! Правильна відповідь {0}",
     "ttt_against_yourself": "Ви не можете грати проти себе.",
     "ttt_already_running": "Хрестики-нулики наразі розпочато на цьому сервері.",
-    "ttt_a_draw": "Нічия",
+    "ttt_a_draw": "Нічия!",
     "ttt_created": "створив гру в Хрестики-нулики.",
     "ttt_has_won": "{0} виграв!",
     "ttt_matched_three": "Зібрав три",
@@ -976,76 +976,76 @@
     "expr_reset": "Вираз з id {0} більше не получає реакцій.",
     "expr_set": "Вираз з цим id {0} буде получати вказані реакції до відповіді: {1}",
     "expr_edited": "Вираз змінено",
-    "stream_online_delete_enabled": "",
-    "stream_online_delete_disabled": "",
-    "club_create_error_name": "",
-    "club_desc_update": "",
-    "bank_accounts": "",
-    "module_description_medusa": "",
-    "list_of_medusae": "",
-    "list_of_unloaded": "",
-    "medusa_name_not_found": "",
-    "medusa_info": "",
-    "sneks_count": "",
-    "commands_count": "",
-    "no_medusa_loaded": "",
-    "no_medusa_available": "",
-    "loaded_medusae": "",
-    "medusa_not_loaded": "",
-    "medusa_possibly_cant_unload": "",
-    "medusa_loaded": "",
-    "medusa_unloaded": "",
-    "medusa_empty": "",
-    "medusa_already_loaded": "",
-    "medusa_invalid_not_found": "",
-    "bank_balance": "",
-    "bank_deposited": "",
-    "bank_withdrew": "",
-    "bank_withdraw_insuff": "",
-    "cmd_group_commands": "",
-    "limit_reached": "",
-    "feature_limit_reached_you": "",
-    "feature_limit_reached_owner": "",
-    "feature_limit_reached_either": "",
-    "tier": "",
-    "pledge": "",
-    "expires": "",
-    "commands": "",
-    "groups": "",
-    "modules": "",
-    "no_quota_found": "",
-    "patron_info": "",
-    "quotas": "",
-    "patron_not_enabled": "",
-    "results_in": "",
-    "patron_msg_sent": "",
-    "cards": "",
-    "hand_value": "",
-    "roll2": "",
-    "rolls": "",
-    "available_tests": "",
-    "test_results_for": "",
-    "multiplier": "",
-    "trivia_ended": "",
-    "card": "",
-    "guess": "",
-    "repeater_skip_next": "",
-    "repeater_dont_skip_next": "",
-    "remind_timely": "",
-    "xp_shop_disabled": "",
-    "timely_time": "",
-    "buy": "",
-    "use": "",
-    "in_use": "",
-    "xp_shop_item_cant_use": "",
-    "linkonly_enable": "",
-    "linkonly_disable": "",
-    "xp_shop_buy_required_tier": "",
-    "available_commands": "",
-    "xpadd_users": "",
-    "xpshop_buy_success": "",
-    "patron_insuff_tier": "",
-    "xpshop_already_owned": "",
-    "xpshop_item_not_found": "",
-    "xpshop_website": ""
+    "stream_online_delete_enabled": "Сповіщення про онлайн-стрім тепер видалятимуться, коли стрім переходить у режим офлайн.",
+    "stream_online_delete_disabled": "Сповіщення про онлайн-стрім більше не видалятимуться, коли стрім переходить у режим офлайн.",
+    "club_create_error_name": "Не вдалося створити клуб. Клуб з такою назвою вже існує.",
+    "club_desc_update": "Опис клубу оновлено",
+    "bank_accounts": "Банківські рахунки",
+    "module_description_medusa": "**Лише власник бота.** Завантажуйте, вивантажуйте та обробляйте динамічні модулі. Докладніше [тут](https://nadekobot.readthedocs.io/en/latest/medusa/creating-a-medusa/)",
+    "list_of_medusae": "Список Медуз",
+    "list_of_unloaded": "Список доступних Медуз",
+    "medusa_name_not_found": "Медуза з такою назвою не існує або не завантажується.",
+    "medusa_info": "Інформація про медузу",
+    "sneks_count": "Снеки ({0})",
+    "commands_count": "Команди ({0})",
+    "no_medusa_loaded": "Завантажених медуз немає.",
+    "no_medusa_available": "Медуза недоступна.",
+    "loaded_medusae": "Завантажені медузи",
+    "medusa_not_loaded": "Медуза з такою назвою не завантажується.",
+    "medusa_possibly_cant_unload": "Медуза, ймовірно, не повністю розвантажена. Перезапустіть бота, якщо виникнуть проблеми.",
+    "medusa_loaded": "Медуза {0} завантажена.",
+    "medusa_unloaded": "Медузу {0} вивантажено.",
+    "medusa_empty": "Медуза не була завантажена, оскільки не містила Снеків.",
+    "medusa_already_loaded": "Медуза {0} уже завантажено",
+    "medusa_invalid_not_found": "Медуза з такою назвою не знайдено або файл недійсний",
+    "bank_balance": "На вашому банківському рахунку є {0}.",
+    "bank_deposited": "Ви внесли {0} на свій банківський рахунок.",
+    "bank_withdrew": "Ви зняли {0} зі свого банківського рахунку.",
+    "bank_withdraw_insuff": "На вашому банківському рахунку недостатньо {0}.",
+    "cmd_group_commands": "Група команд '{0}'.",
+    "limit_reached": "Досягнуто ліміту функцій у {0}.",
+    "feature_limit_reached_you": "Ви досягли обмеження в {0} для функції {1}. Ви можете збільшити цей ліміт, підвищивши рівень свого патрона.",
+    "feature_limit_reached_owner": "Власник сервера досяг ліміту в {0} для функції {1}. Власник сервера може збільшити цей ліміт, підвищивши рівень патрона.",
+    "feature_limit_reached_either": "Досягнуто обмеження в {0} для функції {1}. Ви або власник сервера можете підвищити цей ліміт, підвищивши рівень патрона.",
+    "tier": "Рівень",
+    "pledge": "Застава",
+    "expires": "Вичерпується",
+    "commands": "Команди",
+    "groups": "Групи",
+    "modules": "Модулі",
+    "no_quota_found": "Цитата не знайдена",
+    "patron_info": "Інформація про патрона",
+    "quotas": "<<< Цитата >>>",
+    "patron_not_enabled": "Система патрона вимкнена.",
+    "results_in": "{0} призводить до {1}с",
+    "patron_msg_sent": "Надсилання повідомлень патронам рівня {1} і вище закінчено. {1} успішно надіслано та {2} не надіслано.",
+    "cards": "Карти",
+    "hand_value": "Вартість руки",
+    "roll2": "Кидок",
+    "rolls": "Кидки",
+    "available_tests": "Доступні тести",
+    "test_results_for": "Результати тесту для {0}",
+    "multiplier": "Множник",
+    "trivia_ended": "Гра вікторини закінчилася",
+    "card": "Карта",
+    "guess": "Вгадай",
+    "repeater_skip_next": "Наступний тригер цього повторювача буде пропущено.",
+    "repeater_dont_skip_next": "Наступний тригер цього повторювача не буде пропущено.",
+    "remind_timely": "Я нагадаю вам про вашу своєчасну винагороду {0}",
+    "xp_shop_disabled": "Магазин Xp відключений власником, або немає товарів у продажу.",
+    "timely_time": "Настав час вашої своєчасної винагороди.",
+    "buy": "Купити",
+    "use": "Використати",
+    "in_use": "У використані",
+    "xp_shop_item_cant_use": "Ви не можете використовувати цей предмет, оскільки він не існує або вам не належить.",
+    "linkonly_enable": "Цей канал тепер доступний лише для посилань.",
+    "linkonly_disable": "Цей канал більше не доступний лише для посилань.",
+    "xp_shop_buy_required_tier": "Для купівлі товарів у цьому магазині потрібен рівень патрона {0} або вищий.",
+    "available_commands": "Доступні команди",
+    "xpadd_users": "Додано {0} сервер XP до {1} користувачів.",
+    "xpshop_buy_success": "Успішно придбано `{0}/{1}`",
+    "patron_insuff_tier": "Рівень вашого патрона недостатній для виконання цієї дії.",
+    "xpshop_already_owned": "Ви вже володієте цим товаром.",
+    "xpshop_item_not_found": "Елемент із таким ключем не існує.",
+    "xpshop_website": "Ви можете переглянути список усіх товарів Xp магазина тут: <https://xpshop.nadeko.bot>"
 }