diff --git a/src/EllieBot/Bot.cs b/src/EllieBot/Bot.cs index 8dd9e1e..c9b7f25 100644 --- a/src/EllieBot/Bot.cs +++ b/src/EllieBot/Bot.cs @@ -309,6 +309,8 @@ public sealed class Bot : IBot "Failed running OnReadyAsync method on {Type} type: {Message}", toExec.GetType().Name, ex.Message); + + Environment.Exit(9); } }); diff --git a/src/EllieBot/Db/Models/filter/FilterChannelId.cs b/src/EllieBot/Db/Models/filter/FilterChannelId.cs index b08cd04..bf18668 100644 --- a/src/EllieBot/Db/Models/filter/FilterChannelId.cs +++ b/src/EllieBot/Db/Models/filter/FilterChannelId.cs @@ -8,7 +8,7 @@ public class FilterChannelId [Key] public int Id { get; set; } - public int GuildFilterConfigId { get; set; } + public int? GuildFilterConfigId { get; set; } public ulong ChannelId { get; set; } diff --git a/src/EllieBot/Db/Models/filter/FilterLinksChannelId.cs b/src/EllieBot/Db/Models/filter/FilterLinksChannelId.cs index 472f5cf..bc2b031 100644 --- a/src/EllieBot/Db/Models/filter/FilterLinksChannelId.cs +++ b/src/EllieBot/Db/Models/filter/FilterLinksChannelId.cs @@ -3,7 +3,7 @@ namespace EllieBot.Db.Models; public class FilterLinksChannelId : DbEntity { public ulong ChannelId { get; set; } - public int GuildFilterConfigId { get; set; } + public int? GuildFilterConfigId { get; set; } protected bool Equals(FilterLinksChannelId other) => ChannelId == other.ChannelId; diff --git a/src/EllieBot/Db/Models/filter/FilterWordsChannelId.cs b/src/EllieBot/Db/Models/filter/FilterWordsChannelId.cs index 63bdb30..e9b5078 100644 --- a/src/EllieBot/Db/Models/filter/FilterWordsChannelId.cs +++ b/src/EllieBot/Db/Models/filter/FilterWordsChannelId.cs @@ -3,7 +3,7 @@ namespace EllieBot.Db.Models; public class FilterWordsChannelId : DbEntity { - public int GuildFilterConfigId { get; set; } + public int? GuildFilterConfigId { get; set; } public ulong ChannelId { get; set; } protected bool Equals(FilterWordsChannelId other) diff --git a/src/EllieBot/Db/Models/filter/FilteredWord.cs b/src/EllieBot/Db/Models/filter/FilteredWord.cs index 5c20485..b12a69e 100644 --- a/src/EllieBot/Db/Models/filter/FilteredWord.cs +++ b/src/EllieBot/Db/Models/filter/FilteredWord.cs @@ -2,10 +2,10 @@ namespace EllieBot.Db.Models; public class FilteredWord : DbEntity { - public int GuildFilterConfigId { get; set; } - public string Word { get; set; } = string.Empty; + public int? GuildFilterConfigId { get; set; } + public string? Word { get; set; } public override bool Equals(object? obj) => obj is FilteredWord fw && fw.Word == Word; - + public override int GetHashCode() => Word.GetHashCode(); } \ No newline at end of file diff --git a/src/EllieBot/Db/Models/xp/ExcludedItem.cs b/src/EllieBot/Db/Models/xp/ExcludedItem.cs index e1f7ed9..a0b8b00 100644 --- a/src/EllieBot/Db/Models/xp/ExcludedItem.cs +++ b/src/EllieBot/Db/Models/xp/ExcludedItem.cs @@ -2,7 +2,7 @@ public class ExcludedItem : DbEntity { - public int XpSettingsId { get; set; } + public int? XpSettingsId { get; set; } public ulong ItemId { get; set; } public ExcludedItemType ItemType { get; set; }