From fda37f0e15ab5cb9845aa1c78f988a9c1476663e Mon Sep 17 00:00:00 2001
From: Toastie <toastie@toastiet0ast.com>
Date: Mon, 3 Feb 2025 15:27:24 +1300
Subject: [PATCH] nullref fixes
---
.gitignore | 3 ++-
src/EllieBot/Db/Extensions/DbExtensions.cs | 19 ++++++-------------
src/EllieBot/Db/Models/GuildConfig.cs | 4 ++--
3 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/.gitignore b/.gitignore
index a6cf868..eda3552 100644
--- a/.gitignore
+++ b/.gitignore
@@ -377,4 +377,5 @@ site/
## AI
.aider.*
-PROMPT.md
\ No newline at end of file
+PROMPT.md
+.aider*
\ No newline at end of file
diff --git a/src/EllieBot/Db/Extensions/DbExtensions.cs b/src/EllieBot/Db/Extensions/DbExtensions.cs
index ae95155..51a37ae 100644
--- a/src/EllieBot/Db/Extensions/DbExtensions.cs
+++ b/src/EllieBot/Db/Extensions/DbExtensions.cs
@@ -10,28 +10,22 @@ public static class DbExtensions
where T : DbEntity
=> set.FirstOrDefault(x => x.Id == id);
- public static GuildConfig GuildConfigsForId(this DbContext ctx, ulong guildId)
- {
- var query = ctx.Set<GuildConfig>().Where(gc => gc.GuildId == guildId);
- return query.FirstOrDefault();
- }
-
public static GuildFilterConfig FilterConfigForId(
this DbContext ctx,
ulong guildId,
Func<IQueryable<GuildFilterConfig>, IQueryable<GuildFilterConfig>> includes = default)
{
includes ??= static set => set;
-
+
var gfc = includes(ctx.Set<GuildFilterConfig>()
- .Where(gc => gc.GuildId == guildId))
+ .Where(gc => gc.GuildId == guildId))
.FirstOrDefault();
if (gfc is null)
{
- ctx.Add(gfc = new GuildFilterConfig()
+ ctx.Add(gfc = new()
{
- GuildId = guildId
+ GuildId = guildId,
});
}
@@ -46,15 +40,14 @@ public static class DbExtensions
includes ??= static set => set;
var gc = includes(ctx.Set<GuildConfig>()
- .Where(gc => gc.GuildId == guildId))
+ .Where(gc => gc.GuildId == guildId))
.FirstOrDefault();
if (gc is null)
{
- ctx.Add(gc = new GuildConfig()
+ ctx.Add(gc = new()
{
GuildId = guildId,
- Permissions = []
});
}
diff --git a/src/EllieBot/Db/Models/GuildConfig.cs b/src/EllieBot/Db/Models/GuildConfig.cs
index 72fcf7b..7d1f152 100644
--- a/src/EllieBot/Db/Models/GuildConfig.cs
+++ b/src/EllieBot/Db/Models/GuildConfig.cs
@@ -64,6 +64,6 @@ public class GuildConfig : DbEntity
public string TimeZoneId { get; set; }
public string Locale { get; set; }
-
- public List<Permissionv2> Permissions { get; set; }
+
+ public List<Permissionv2> Permissions { get; set; } = [];
}
\ No newline at end of file