toastie_t0ast/elliebot
1
0
Fork 0
forked from EllieBotDevs/elliebot
Code Issues Pull requests Projects Releases Packages Activity Actions

fixed protection commands not properly turning on

Browse source
This commit is contained in:
Toastie 2025-03-16 15:44:51 +13:00
parent 77628be826
commit 62a01d3d06
Signed by: toastie_t0ast
GPG key ID: 0861BE54AD481DC7
11 changed files with 22 additions and 41 deletions

3
src/EllieBot/Db/Models/FollowedStream.cs
View file

@ -1,3 +1,4 @@
#nullable disable
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
@ -17,7 +18,7 @@ public class FollowedStream
public int Id { get; set; }
public ulong GuildId { get; set; }
public ulong ChannelId { get; set; }
public string Username { get; set; } = string.Empty;
public string Username { get; set; }
public string? PrettyName { get; set; } = null;
public FType Type { get; set; }
public string? Message { get; set; } = null;

4
src/EllieBot/Db/Models/anti/AntiAltSetting.cs
View file

@ -11,11 +11,7 @@ public class AntiAltSetting
{
[Key]
public int Id { get; set; }
public int GuildConfigId { get; set; }
public ulong GuildId { get; set; }
public TimeSpan MinAge { get; set; }
public PunishmentAction Action { get; set; }
public int ActionDurationMinutes { get; set; }

2
src/EllieBot/Db/Models/anti/AntiSpamSetting.cs
View file

@ -8,8 +8,6 @@ namespace EllieBot.Db.Models;
#nullable disable
public class AntiSpamSetting : DbEntity
{
public int GuildConfigId { get; set; }
public ulong GuildId { get; set; }
public PunishmentAction Action { get; set; }

9
src/EllieBot/Migrations/PostgreSql/20250315225518_prot-delete-gcid.sql Normal file
View file

@ -0,0 +1,9 @@
START TRANSACTION;
ALTER TABLE antispamsetting DROP COLUMN guildconfigid;
ALTER TABLE antialtsetting DROP COLUMN guildconfigid;
INSERT INTO "__EFMigrationsHistory" (migrationid, productversion)
VALUES ('20250315225518_prot-delete-gcid', '9.0.1');
COMMIT;

10
src/EllieBot/Migrations/PostgreSql/20250315193847_init.Designer.cs → src/EllieBot/Migrations/PostgreSql/20250315225539_init.Designer.cs generated
View file

@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace EllieBot.Migrations.PostgreSql
{
[DbContext(typeof(PostgreSqlContext))]
[Migration("20250315193847_init")]
[Migration("20250315225539_init")]
partial class init
{
/// <inheritdoc />
@ -42,10 +42,6 @@ namespace EllieBot.Migrations.PostgreSql
.HasColumnType("integer")
.HasColumnName("actiondurationminutes");
b.Property<int>("GuildConfigId")
.HasColumnType("integer")
.HasColumnName("guildconfigid");
b.Property<decimal>("GuildId")
.HasColumnType("numeric(20,0)")
.HasColumnName("guildid");
@ -158,10 +154,6 @@ namespace EllieBot.Migrations.PostgreSql
.HasColumnType("timestamp without time zone")
.HasColumnName("dateadded");
b.Property<int>("GuildConfigId")
.HasColumnType("integer")
.HasColumnName("guildconfigid");
b.Property<decimal>("GuildId")
.HasColumnType("numeric(20,0)")
.HasColumnName("guildid");

2
src/EllieBot/Migrations/PostgreSql/20250315193847_init.cs → src/EllieBot/Migrations/PostgreSql/20250315225539_init.cs
View file

@ -18,7 +18,6 @@ namespace EllieBot.Migrations.PostgreSql
{
id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
guildconfigid = table.Column<int>(type: "integer", nullable: false),
guildid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
minage = table.Column<TimeSpan>(type: "interval", nullable: false),
action = table.Column<int>(type: "integer", nullable: false),
@ -54,7 +53,6 @@ namespace EllieBot.Migrations.PostgreSql
{
id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
guildconfigid = table.Column<int>(type: "integer", nullable: false),
guildid = table.Column<decimal>(type: "numeric(20,0)", nullable: false),
action = table.Column<int>(type: "integer", nullable: false),
messagethreshold = table.Column<int>(type: "integer", nullable: false),

8
src/EllieBot/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs
View file

@ -39,10 +39,6 @@ namespace EllieBot.Migrations.PostgreSql
.HasColumnType("integer")
.HasColumnName("actiondurationminutes");
b.Property<int>("GuildConfigId")
.HasColumnType("integer")
.HasColumnName("guildconfigid");
b.Property<decimal>("GuildId")
.HasColumnType("numeric(20,0)")
.HasColumnName("guildid");
@ -155,10 +151,6 @@ namespace EllieBot.Migrations.PostgreSql
.HasColumnType("timestamp without time zone")
.HasColumnName("dateadded");
b.Property<int>("GuildConfigId")
.HasColumnType("integer")
.HasColumnName("guildconfigid");
b.Property<decimal>("GuildId")
.HasColumnType("numeric(20,0)")
.HasColumnName("guildid");

9
src/EllieBot/Migrations/Sqlite/20250315225515_prot-delete-gcid.sql Normal file
View file

@ -0,0 +1,9 @@
BEGIN TRANSACTION;
ALTER TABLE "AntiSpamSetting" DROP COLUMN "GuildConfigId";
ALTER TABLE "AntiAltSetting" DROP COLUMN "GuildConfigId";
INSERT INTO "__EFMigrationsHistory" ("MigrationId", "ProductVersion")
VALUES ('20250315225515_prot-delete-gcid', '9.0.1');
COMMIT;

8
src/EllieBot/Migrations/Sqlite/20250315193844_init.Designer.cs → src/EllieBot/Migrations/Sqlite/20250315225536_init.Designer.cs generated
View file

@ -11,7 +11,7 @@ using EllieBot.Db;
namespace EllieBot.Migrations.Sqlite
{
[DbContext(typeof(SqliteContext))]
[Migration("20250315193844_init")]
[Migration("20250315225536_init")]
partial class init
{
/// <inheritdoc />
@ -32,9 +32,6 @@ namespace EllieBot.Migrations.Sqlite
b.Property<int>("ActionDurationMinutes")
.HasColumnType("INTEGER");
b.Property<int>("GuildConfigId")
.HasColumnType("INTEGER");
b.Property<ulong>("GuildId")
.HasColumnType("INTEGER");
@ -118,9 +115,6 @@ namespace EllieBot.Migrations.Sqlite
b.Property<DateTime?>("DateAdded")
.HasColumnType("TEXT");
b.Property<int>("GuildConfigId")
.HasColumnType("INTEGER");
b.Property<ulong>("GuildId")
.HasColumnType("INTEGER");

2
src/EllieBot/Migrations/Sqlite/20250315193844_init.cs → src/EllieBot/Migrations/Sqlite/20250315225536_init.cs
View file

@ -17,7 +17,6 @@ namespace EllieBot.Migrations.Sqlite
{
Id = table.Column<int>(type: "INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true),
GuildConfigId = table.Column<int>(type: "INTEGER", nullable: false),
GuildId = table.Column<ulong>(type: "INTEGER", nullable: false),
MinAge = table.Column<TimeSpan>(type: "TEXT", nullable: false),
Action = table.Column<int>(type: "INTEGER", nullable: false),
@ -53,7 +52,6 @@ namespace EllieBot.Migrations.Sqlite
{
Id = table.Column<int>(type: "INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true),
GuildConfigId = table.Column<int>(type: "INTEGER", nullable: false),
GuildId = table.Column<ulong>(type: "INTEGER", nullable: false),
Action = table.Column<int>(type: "INTEGER", nullable: false),
MessageThreshold = table.Column<int>(type: "INTEGER", nullable: false),

6
src/EllieBot/Migrations/Sqlite/SqliteContextModelSnapshot.cs
View file

@ -29,9 +29,6 @@ namespace EllieBot.Migrations.Sqlite
b.Property<int>("ActionDurationMinutes")
.HasColumnType("INTEGER");
b.Property<int>("GuildConfigId")
.HasColumnType("INTEGER");
b.Property<ulong>("GuildId")
.HasColumnType("INTEGER");
@ -115,9 +112,6 @@ namespace EllieBot.Migrations.Sqlite
b.Property<DateTime?>("DateAdded")
.HasColumnType("TEXT");
b.Property<int>("GuildConfigId")
.HasColumnType("INTEGER");
b.Property<ulong>("GuildId")
.HasColumnType("INTEGER");