* dev: Greet stuff moved to its own table in the database. GreetSettings

* fix: Fixed placeholders not working
* fix: Fixed some countries in countries.yml for hangman game
* add: Added custom status overload for \`.adpl\`
* dev: Removed some unused strings
* fix: Fixed postgres support in Nadeko
* remove: Removed mysql support, it was broken for a while and some queries weren't compiling.
* dev: Updated image library
* fix: Some command strings fixed and clarified

src/NadekoBot/Db/Extensions/GuildConfigExtensions.cs

@@ -33,8 +33,8 @@ public static class GuildConfigExtensions
     {
         var conf = ctx.GuildConfigsForId(guildId,
             set => set.Include(y => y.StreamRole)
-                .Include(y => y.StreamRole.Whitelist)
-                .Include(y => y.StreamRole.Blacklist));
+                      .Include(y => y.StreamRole.Whitelist)
+                      .Include(y => y.StreamRole.Blacklist));
 
         if (conf.StreamRole is null)
             conf.StreamRole = new();
@@ -44,22 +44,27 @@ public static class GuildConfigExtensions
 
     private static IQueryable<GuildConfig> IncludeEverything(this DbSet<GuildConfig> configs)
         => configs
-            .AsSplitQuery()
-            .Include(gc => gc.CommandCooldowns)
-            .Include(gc => gc.FollowedStreams)
-            .Include(gc => gc.StreamRole)
-            .Include(gc => gc.DelMsgOnCmdChannels)
-            .Include(gc => gc.XpSettings)
-                .ThenInclude(x => x.ExclusionList)
-            ;
+           .AsSplitQuery()
+           .Include(gc => gc.CommandCooldowns)
+           .Include(gc => gc.FollowedStreams)
+           .Include(gc => gc.StreamRole)
+           .Include(gc => gc.DelMsgOnCmdChannels)
+           .Include(gc => gc.XpSettings)
+           .ThenInclude(x => x.ExclusionList);
 
-    public static Task<GuildConfig[]> GetAllGuildConfigs(
+    public static async Task<GuildConfig[]> GetAllGuildConfigs(
         this DbSet<GuildConfig> configs,
-        IReadOnlyList<ulong> availableGuilds)
-        => configs.IncludeEverything()
-                  .Where(x => availableGuilds.Contains(x.GuildId))
-                  .AsNoTracking()
-                  .ToArrayAsyncEF();
+        List<ulong> availableGuilds)
+    {
+        var result = await configs
+                           .AsQueryable()
+                           .Include(x => x.CommandCooldowns)
+                           .Where(x => availableGuilds.Contains(x.GuildId))
+                           .AsNoTracking()
+                           .ToArrayAsync();
+
+        return result;
+    }
 
     /// <summary>
     ///     Gets and creates if it doesn't exist a config for a guild.
@@ -85,13 +90,14 @@ public static class GuildConfigExtensions
 
         if (config is null)
         {
-            ctx.Set<GuildConfig>().Add(config = new()
-            {
-                GuildId = guildId,
-                Permissions = Permissionv2.GetDefaultPermlist,
-                WarningsInitialized = true,
-                WarnPunishments = DefaultWarnPunishments
-            });
+            ctx.Set<GuildConfig>()
+               .Add(config = new()
+               {
+                   GuildId = guildId,
+                   Permissions = Permissionv2.GetDefaultPermlist,
+                   WarningsInitialized = true,
+                   WarnPunishments = DefaultWarnPunishments
+               });
             ctx.SaveChanges();
         }
 
@@ -127,18 +133,18 @@ public static class GuildConfigExtensions
     public static LogSetting LogSettingsFor(this DbContext ctx, ulong guildId)
     {
         var logSetting = ctx.Set<LogSetting>()
-            .AsQueryable()
-            .Include(x => x.LogIgnores)
-            .Where(x => x.GuildId == guildId)
-            .FirstOrDefault();
+                            .AsQueryable()
+                            .Include(x => x.LogIgnores)
+                            .Where(x => x.GuildId == guildId)
+                            .FirstOrDefault();
 
         if (logSetting is null)
         {
             ctx.Set<LogSetting>()
-                .Add(logSetting = new()
-                {
-                    GuildId = guildId
-                });
+               .Add(logSetting = new()
+               {
+                   GuildId = guildId
+               });
             ctx.SaveChanges();
         }
 
@@ -154,18 +160,20 @@ public static class GuildConfigExtensions
 
     public static GuildConfig GcWithPermissionsFor(this DbContext ctx, ulong guildId)
     {
-        var config = ctx.Set<GuildConfig>().AsQueryable()
-            .Where(gc => gc.GuildId == guildId)
-            .Include(gc => gc.Permissions)
-            .FirstOrDefault();
+        var config = ctx.Set<GuildConfig>()
+                        .AsQueryable()
+                        .Where(gc => gc.GuildId == guildId)
+                        .Include(gc => gc.Permissions)
+                        .FirstOrDefault();
 
         if (config is null) // if there is no guildconfig, create new one
         {
-            ctx.Set<GuildConfig>().Add(config = new()
-            {
-                GuildId = guildId,
-                Permissions = Permissionv2.GetDefaultPermlist
-            });
+            ctx.Set<GuildConfig>()
+               .Add(config = new()
+               {
+                   GuildId = guildId,
+                   Permissions = Permissionv2.GetDefaultPermlist
+               });
             ctx.SaveChanges();
         }
         else if (config.Permissions is null || !config.Permissions.Any()) // if no perms, add default ones
@@ -182,21 +190,21 @@ public static class GuildConfigExtensions
 
     public static IEnumerable<FollowedStream> GetFollowedStreams(this DbSet<GuildConfig> configs, List<ulong> included)
         => configs.AsQueryable()
-            .Where(gc => included.Contains(gc.GuildId))
-            .Include(gc => gc.FollowedStreams)
-            .SelectMany(gc => gc.FollowedStreams)
-            .ToList();
+                  .Where(gc => included.Contains(gc.GuildId))
+                  .Include(gc => gc.FollowedStreams)
+                  .SelectMany(gc => gc.FollowedStreams)
+                  .ToList();
 
 
     public static XpSettings XpSettingsFor(this DbContext ctx, ulong guildId)
     {
         var gc = ctx.GuildConfigsForId(guildId,
             set => set.Include(x => x.XpSettings)
-                .ThenInclude(x => x.RoleRewards)
-                .Include(x => x.XpSettings)
-                .ThenInclude(x => x.CurrencyRewards)
-                .Include(x => x.XpSettings)
-                .ThenInclude(x => x.ExclusionList));
+                      .ThenInclude(x => x.RoleRewards)
+                      .Include(x => x.XpSettings)
+                      .ThenInclude(x => x.CurrencyRewards)
+                      .Include(x => x.XpSettings)
+                      .ThenInclude(x => x.ExclusionList));
 
         if (gc.XpSettings is null)
             gc.XpSettings = new();
@@ -206,15 +214,15 @@ public static class GuildConfigExtensions
 
     public static IEnumerable<GeneratingChannel> GetGeneratingChannels(this DbSet<GuildConfig> configs)
         => configs.AsQueryable()
-            .Include(x => x.GenerateCurrencyChannelIds)
-            .Where(x => x.GenerateCurrencyChannelIds.Any())
-            .SelectMany(x => x.GenerateCurrencyChannelIds)
-            .Select(x => new GeneratingChannel
-            {
-                ChannelId = x.ChannelId,
-                GuildId = x.GuildConfig.GuildId
-            })
-            .ToArray();
+                  .Include(x => x.GenerateCurrencyChannelIds)
+                  .Where(x => x.GenerateCurrencyChannelIds.Any())
+                  .SelectMany(x => x.GenerateCurrencyChannelIds)
+                  .Select(x => new GeneratingChannel
+                  {
+                      ChannelId = x.ChannelId,
+                      GuildId = x.GuildConfig.GuildId
+                  })
+                  .ToArray();
 
     public class GeneratingChannel
     {

src/NadekoBot/Db/Models/GuildConfig.cs

@@ -13,21 +13,23 @@ public class GuildConfig : DbEntity
 
     public string AutoAssignRoleIds { get; set; }
 
-    //greet stuff
-    public int AutoDeleteGreetMessagesTimer { get; set; } = 30;
-    public int AutoDeleteByeMessagesTimer { get; set; } = 30;
-
-    public ulong GreetMessageChannelId { get; set; }
-    public ulong ByeMessageChannelId { get; set; }
-
-    public bool SendDmGreetMessage { get; set; }
-    public string DmGreetMessageText { get; set; } = "Welcome to the %server% server, %user%!";
-
-    public bool SendChannelGreetMessage { get; set; }
-    public string ChannelGreetMessageText { get; set; } = "Welcome to the %server% server, %user%!";
-
-    public bool SendChannelByeMessage { get; set; }
-    public string ChannelByeMessageText { get; set; } = "%user% has left!";
+    // //greet stuff
+    // public int AutoDeleteGreetMessagesTimer { get; set; } = 30;
+    // public int AutoDeleteByeMessagesTimer { get; set; } = 30;
+    //
+    // public ulong GreetMessageChannelId { get; set; }
+    // public ulong ByeMessageChannelId { get; set; }
+    //
+    // public bool SendDmGreetMessage { get; set; }
+    // public string DmGreetMessageText { get; set; } = "Welcome to the %server% server, %user%!";
+    //
+    // public bool SendChannelGreetMessage { get; set; }
+    // public string ChannelGreetMessageText { get; set; } = "Welcome to the %server% server, %user%!";
+    //
+    // public bool SendChannelByeMessage { get; set; }
+    // public string ChannelByeMessageText { get; set; } = "%user% has left!";
+    // public bool SendBoostMessage { get; set; }
+    // pulic int BoostMessageDeleteAfter { get; set; }
 
     //self assignable roles
     public bool ExclusiveSelfAssignedRoles { get; set; }
@@ -98,10 +100,6 @@ public class GuildConfig : DbEntity
 
     #region Boost Message
 
-    public bool SendBoostMessage { get; set; }
-    public string BoostMessage { get; set; } = "%user% just boosted this server!";
-    public ulong BoostMessageChannelId { get; set; }
-    public int BoostMessageDeleteAfter { get; set; }
     public bool StickyRoles { get; set; }
 
     #endregion

src/NadekoBot/Db/MysqlContext.cs

@@ -1,38 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using NadekoBot.Db.Models;
-
-namespace NadekoBot.Db;
-
-public sealed class MysqlContext : NadekoContext
-{
-    private readonly string _connStr;
-    private readonly string _version;
-
-    protected override string CurrencyTransactionOtherIdDefaultValue
-        => "NULL";
-
-    public MysqlContext(string connStr = "Server=localhost", string version = "8.0")
-    {
-        _connStr = connStr;
-        _version = version;
-    }
-
-    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-    {
-        base.OnConfiguring(optionsBuilder);
-        optionsBuilder
-            .UseLowerCaseNamingConvention()
-            .UseMySql(_connStr, ServerVersion.Parse(_version));
-    }
-
-    protected override void OnModelCreating(ModelBuilder modelBuilder)
-    {
-        base.OnModelCreating(modelBuilder);
-        
-        // mysql is case insensitive by default
-        // we can set binary collation to change that
-        modelBuilder.Entity<ClubInfo>()
-                    .Property(x => x.Name)
-                    .UseCollation("utf8mb4_bin");
-    }
-}

src/NadekoBot/Db/NadekoContext.cs

@@ -10,6 +10,7 @@ namespace NadekoBot.Db;
 public abstract class NadekoContext : DbContext
 {
     public DbSet<GuildConfig> GuildConfigs { get; set; }
+    public DbSet<GreetSettings> GreetSettings { get; set; }
 
     public DbSet<Quote> Quotes { get; set; }
     public DbSet<Reminder> Reminders { get; set; }
@@ -149,7 +150,7 @@ public abstract class NadekoContext : DbContext
                     .OnDelete(DeleteBehavior.Cascade);
 
         // start antispam 
-        
+
         modelBuilder.Entity<GuildConfig>()
                     .HasOne(x => x.AntiSpamSetting)
                     .WithOne()
@@ -678,6 +679,29 @@ public abstract class NadekoContext : DbContext
                     .OnDelete(DeleteBehavior.Cascade);
 
         #endregion
+
+        #region GreetSettings
+
+        modelBuilder
+            .Entity<GreetSettings>(gs => gs.HasIndex(x => new
+                                           {
+                                               x.GuildId,
+                                               x.GreetType
+                                           })
+                                           .IsUnique());
+
+        modelBuilder.Entity<GreetSettings>(gs =>
+        {
+            gs
+                .Property(x => x.IsEnabled)
+                .HasDefaultValue(false);
+            
+            gs
+                .Property(x => x.AutoDeleteTimer)
+                .HasDefaultValue(0);
+        });
+
+        #endregion
     }
 
 #if DEBUG

src/NadekoBot/Db/NadekoDbService.cs

@@ -44,8 +44,6 @@ public sealed class NadekoDbService : DbService
             case "postgres":
             case "pgsql":
                 return new PostgreSqlContext(connString);
-            case "mysql":
-                return new MysqlContext(connString);
             case "sqlite":
                 return new SqliteContext(connString);
             default: