toastie-stuff/elliebot
Archived
3
0
Fork 0
forked from EllieBotDevs/elliebot
Code Pull requests Releases Activity

some more cleanup/attempts to fix a weird mysql error

Browse source 
Also updated .gitignore to ignore ellie-menu.ps1 and updated the script link in EllieBot.sln
This commit is contained in:
Toastie 2024-09-09 14:04:08 +12:00
parent f15d1d2495
commit 140a35b82a
No known key found for this signature in database
4 changed files with 10 additions and 9 deletions
src/EllieBot
Bot.cs
Db/Extensions
GuildConfigExtensions.cs

8
src/EllieBot/Bot.cs
View file

@ -90,16 +90,16 @@ public sealed class Bot : IBot
public IReadOnlyList<ulong> GetCurrentGuildIds()
=> Client.Guilds.Select(x => x.Id).ToList().AsReadOnly();
private void AddServices()
private async Task AddServices()
{
var startingGuildIdList = GetCurrentGuildIds();
var startTime = Stopwatch.GetTimestamp();
var bot = Client.CurrentUser;
using (var uow = _db.GetDbContext())
await using (var uow = _db.GetDbContext())
{
uow.EnsureUserCreated(bot.Id, bot.Username, bot.Discriminator, bot.AvatarId);
AllGuildConfigs = uow.GuildConfigs.GetAllGuildConfigs(startingGuildIdList);
AllGuildConfigs = await uow.GuildConfigs.GetAllGuildConfigs(startingGuildIdList);
}
// var svcs = new StandardKernel(new NinjectSettings()
@ -265,7 +265,7 @@ public sealed class Bot : IBot
Log.Information("Shard {ShardId} loading services...", Client.ShardId);
try
{
AddServices();
await AddServices();
}
catch (Exception ex)
{

8
src/EllieBot/Db/Extensions/GuildConfigExtensions.cs
View file

@ -1,5 +1,6 @@
#nullable disable
using Microsoft.EntityFrameworkCore;
using LinqToDB.EntityFrameworkCore;
using EllieBot.Db.Models;
namespace EllieBot.Db;
@ -42,7 +43,7 @@ public static class GuildConfigExtensions
}
private static IQueryable<GuildConfig> IncludeEverything(this DbSet<GuildConfig> configs)
=> configs.AsQueryable()
=> configs
.AsSplitQuery()
.Include(gc => gc.CommandCooldowns)
.Include(gc => gc.FollowedStreams)
@ -51,14 +52,13 @@ public static class GuildConfigExtensions
.Include(gc => gc.XpSettings)
.ThenInclude(x => x.ExclusionList);
public static IReadOnlyCollection<GuildConfig> GetAllGuildConfigs(
public static Task<GuildConfig[]> GetAllGuildConfigs(
this DbSet<GuildConfig> configs,
IReadOnlyList<ulong> availableGuilds)
=> configs.IncludeEverything()
.AsNoTracking()
.Where(x => availableGuilds.Contains(x.GuildId))
.ToList()
.AsReadOnly();
.ToArrayAsyncEF();
/// <summary>
/// Gets and creates if it doesn't exist a config for a guild.