Initial v6 version #32

Manually merged
toastie_t0ast merged 54 commits from v6-dev into v6 2025-02-28 23:18:39 +00:00
3 changed files with 10 additions and 16 deletions
Showing only changes of commit fda37f0e15 - Show all commits
.gitignore
src/EllieBot/Db

3
.gitignore vendored
View file

@ -377,4 +377,5 @@ site/
## AI
.aider.*
PROMPT.md
PROMPT.md
.aider*

View file

@ -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 = []
});
}

View file

@ -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; } = [];
}