* 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
2025-09-11 09:48:26 -04:00 · 2024-09-15 22:44:37 +00:00
parent 28ad6db2de
commit 021e7978da
86 changed files with 4899 additions and 82742 deletions
--- a/src/NadekoBot/Migrations/PostgreSql/20220916194523_autopub.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/20220916194523_autopub.cs
@@ -9,12 +9,6 @@ namespace NadekoBot.Migrations.PostgreSql
    {
        protected override void Up(MigrationBuilder migrationBuilder)
        {
-            migrationBuilder.AddColumn<decimal>(
-                name: "rolerequirement",
-                table: "shopentry",
-                type: "numeric(20,0)",
-                nullable: true);
-
            migrationBuilder.CreateTable(
                name: "autopublishchannel",
                columns: table => new
@@ -41,10 +35,6 @@ namespace NadekoBot.Migrations.PostgreSql
        {
            migrationBuilder.DropTable(
                name: "autopublishchannel");
-
-            migrationBuilder.DropColumn(
-                name: "rolerequirement",
-                table: "shopentry");
        }
    }
 }
--- a/src/NadekoBot/Migrations/PostgreSql/20240912124719_greet-settings.Designer.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/20240912124719_greet-settings.Designer.cs
--- a/src/NadekoBot/Migrations/PostgreSql/20240912124719_greet-settings.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/20240912124719_greet-settings.cs
@@ -0,0 +1,199 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.PostgreSql
+{
+    /// <inheritdoc />
+    public partial class greetsettings : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "greetsettings",
+                columns: table => new
+                {
+                    id = table.Column<int>(type: "integer", nullable: false)
+                              .Annotation("Npgsql:ValueGenerationStrategy",
+                                  NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    guildid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
+                    greettype = table.Column<int>(type: "integer", nullable: false),
+                    messagetext = table.Column<string>(type: "text", nullable: true),
+                    isenabled = table.Column<bool>(type: "boolean", nullable: false, defaultValue: false),
+                    channelid = table.Column<decimal>(type: "numeric(20,0)", nullable: true),
+                    autodeletetimer = table.Column<int>(type: "integer", nullable: false, defaultValue: 0)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("pk_greetsettings", x => x.id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "ix_greetsettings_guildid_greettype",
+                table: "greetsettings",
+                columns: new[] { "guildid", "greettype" },
+                unique: true);
+
+            MigrationQueries.GreetSettingsCopy(migrationBuilder);
+
+            migrationBuilder.DropColumn(
+                name: "autodeletebyemessagestimer",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "autodeletegreetmessagestimer",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "boostmessage",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "boostmessagechannelid",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "boostmessagedeleteafter",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "byemessagechannelid",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "channelbyemessagetext",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "channelgreetmessagetext",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "dmgreetmessagetext",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "greetmessagechannelid",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "sendboostmessage",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "sendchannelbyemessage",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "sendchannelgreetmessage",
+                table: "guildconfigs");
+
+            migrationBuilder.DropColumn(
+                name: "senddmgreetmessage",
+                table: "guildconfigs");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "greetsettings");
+
+            migrationBuilder.AddColumn<int>(
+                name: "autodeletebyemessagestimer",
+                table: "guildconfigs",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "autodeletegreetmessagestimer",
+                table: "guildconfigs",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "boostmessage",
+                table: "guildconfigs",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "boostmessagechannelid",
+                table: "guildconfigs",
+                type: "numeric(20,0)",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<int>(
+                name: "boostmessagedeleteafter",
+                table: "guildconfigs",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "byemessagechannelid",
+                table: "guildconfigs",
+                type: "numeric(20,0)",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<string>(
+                name: "channelbyemessagetext",
+                table: "guildconfigs",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "channelgreetmessagetext",
+                table: "guildconfigs",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "dmgreetmessagetext",
+                table: "guildconfigs",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "greetmessagechannelid",
+                table: "guildconfigs",
+                type: "numeric(20,0)",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "sendboostmessage",
+                table: "guildconfigs",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "sendchannelbyemessage",
+                table: "guildconfigs",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "sendchannelgreetmessage",
+                table: "guildconfigs",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "senddmgreetmessage",
+                table: "guildconfigs",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+        }
+    }
+}
--- a/src/NadekoBot/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs
+++ b/src/NadekoBot/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs
@@ -17,7 +17,7 @@ namespace NadekoBot.Migrations.PostgreSql
        {
 #pragma warning disable 612, 618
            modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.4")
+                .HasAnnotation("ProductVersion", "8.0.8")
                .HasAnnotation("Relational:MaxIdentifierLength", 63);

            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -1220,42 +1220,10 @@ namespace NadekoBot.Migrations.PostgreSql
                        .HasColumnType("text")
                        .HasColumnName("autoassignroleids");

-                    b.Property<int>("AutoDeleteByeMessagesTimer")
-                        .HasColumnType("integer")
-                        .HasColumnName("autodeletebyemessagestimer");
-
-                    b.Property<int>("AutoDeleteGreetMessagesTimer")
-                        .HasColumnType("integer")
-                        .HasColumnName("autodeletegreetmessagestimer");
-
                    b.Property<bool>("AutoDeleteSelfAssignedRoleMessages")
                        .HasColumnType("boolean")
                        .HasColumnName("autodeleteselfassignedrolemessages");

-                    b.Property<string>("BoostMessage")
-                        .HasColumnType("text")
-                        .HasColumnName("boostmessage");
-
-                    b.Property<decimal>("BoostMessageChannelId")
-                        .HasColumnType("numeric(20,0)")
-                        .HasColumnName("boostmessagechannelid");
-
-                    b.Property<int>("BoostMessageDeleteAfter")
-                        .HasColumnType("integer")
-                        .HasColumnName("boostmessagedeleteafter");
-
-                    b.Property<decimal>("ByeMessageChannelId")
-                        .HasColumnType("numeric(20,0)")
-                        .HasColumnName("byemessagechannelid");
-
-                    b.Property<string>("ChannelByeMessageText")
-                        .HasColumnType("text")
-                        .HasColumnName("channelbyemessagetext");
-
-                    b.Property<string>("ChannelGreetMessageText")
-                        .HasColumnType("text")
-                        .HasColumnName("channelgreetmessagetext");
-
                    b.Property<bool>("CleverbotEnabled")
                        .HasColumnType("boolean")
                        .HasColumnName("cleverbotenabled");
@@ -1276,10 +1244,6 @@ namespace NadekoBot.Migrations.PostgreSql
                        .HasColumnType("boolean")
                        .HasColumnName("disableglobalexpressions");

-                    b.Property<string>("DmGreetMessageText")
-                        .HasColumnType("text")
-                        .HasColumnName("dmgreetmessagetext");
-
                    b.Property<bool>("ExclusiveSelfAssignedRoles")
                        .HasColumnType("boolean")
                        .HasColumnName("exclusiveselfassignedroles");
@@ -1300,10 +1264,6 @@ namespace NadekoBot.Migrations.PostgreSql
                        .HasColumnType("numeric(20,0)")
                        .HasColumnName("gamevoicechannel");

-                    b.Property<decimal>("GreetMessageChannelId")
-                        .HasColumnType("numeric(20,0)")
-                        .HasColumnName("greetmessagechannelid");
-
                    b.Property<decimal>("GuildId")
                        .HasColumnType("numeric(20,0)")
                        .HasColumnName("guildid");
@@ -1328,22 +1288,6 @@ namespace NadekoBot.Migrations.PostgreSql
                        .HasColumnType("text")
                        .HasColumnName("prefix");

-                    b.Property<bool>("SendBoostMessage")
-                        .HasColumnType("boolean")
-                        .HasColumnName("sendboostmessage");
-
-                    b.Property<bool>("SendChannelByeMessage")
-                        .HasColumnType("boolean")
-                        .HasColumnName("sendchannelbyemessage");
-
-                    b.Property<bool>("SendChannelGreetMessage")
-                        .HasColumnType("boolean")
-                        .HasColumnName("sendchannelgreetmessage");
-
-                    b.Property<bool>("SendDmGreetMessage")
-                        .HasColumnType("boolean")
-                        .HasColumnName("senddmgreetmessage");
-
                    b.Property<bool>("StickyRoles")
                        .HasColumnType("boolean")
                        .HasColumnName("stickyroles");
@@ -3163,6 +3107,53 @@ namespace NadekoBot.Migrations.PostgreSql
                    b.ToTable("xpshopowneditem", (string)null);
                });

+            modelBuilder.Entity("NadekoBot.Services.GreetSettings", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AutoDeleteTimer")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("autodeletetimer");
+
+                    b.Property<decimal?>("ChannelId")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("channelid");
+
+                    b.Property<int>("GreetType")
+                        .HasColumnType("integer")
+                        .HasColumnName("greettype");
+
+                    b.Property<decimal>("GuildId")
+                        .HasColumnType("numeric(20,0)")
+                        .HasColumnName("guildid");
+
+                    b.Property<bool>("IsEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("isenabled");
+
+                    b.Property<string>("MessageText")
+                        .HasColumnType("text")
+                        .HasColumnName("messagetext");
+
+                    b.HasKey("Id")
+                        .HasName("pk_greetsettings");
+
+                    b.HasIndex("GuildId", "GreetType")
+                        .IsUnique()
+                        .HasDatabaseName("ix_greetsettings_guildid_greettype");
+
+                    b.ToTable("greetsettings", (string)null);
+                });
+
            modelBuilder.Entity("NadekoBot.Db.Models.AntiAltSetting", b =>
                {
                    b.HasOne("NadekoBot.Db.Models.GuildConfig", null)