From 8fa6b0c9991313ced2cd49788a62df86d3c75a9c Mon Sep 17 00:00:00 2001
From: Toastie <toastie@toastiet0ast.com>
Date: Fri, 14 Mar 2025 15:57:52 +1300
Subject: [PATCH] fixing protection init and plantpick issues
---
.../Administration/Protection/ProtectionService.cs | 6 ++++--
.../Modules/Gambling/PlantPick/PlantPickService.cs | 9 +--------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/EllieBot/Modules/Administration/Protection/ProtectionService.cs b/src/EllieBot/Modules/Administration/Protection/ProtectionService.cs
index f83ba30..ef83a63 100644
--- a/src/EllieBot/Modules/Administration/Protection/ProtectionService.cs
+++ b/src/EllieBot/Modules/Administration/Protection/ProtectionService.cs
@@ -503,8 +503,9 @@ public class ProtectionService : IReadyExecutor, IEService
await using var uow = _db.GetDbContext();
var configs = await uow.GetTable<AntiAltSetting>()
+ .AsNoTracking()
.Where(x => Queries.GuildOnShard(x.GuildId, _shardData.TotalShards, _shardData.ShardId))
- .ToListAsyncLinqToDB();
+ .ToListAsyncEF();
foreach (var config in configs)
_antiAltGuilds[config.GuildId] = new(config);
@@ -522,8 +523,9 @@ public class ProtectionService : IReadyExecutor, IEService
}
var spamConfigs = await uow.GetTable<AntiSpamSetting>()
+ .AsNoTracking()
.Where(x => Queries.GuildOnShard(x.GuildId, _shardData.TotalShards, _shardData.ShardId))
- .ToListAsyncLinqToDB();
+ .ToListAsyncEF();
foreach (var config in spamConfigs)
{
diff --git a/src/EllieBot/Modules/Gambling/PlantPick/PlantPickService.cs b/src/EllieBot/Modules/Gambling/PlantPick/PlantPickService.cs
index 08e4587..8ade01d 100644
--- a/src/EllieBot/Modules/Gambling/PlantPick/PlantPickService.cs
+++ b/src/EllieBot/Modules/Gambling/PlantPick/PlantPickService.cs
@@ -25,13 +25,11 @@ public class PlantPickService : IEService, IExecNoCommand, IReadyExecutor
private readonly FontProvider _fonts;
private readonly ICurrencyService _cs;
private readonly CommandHandler _cmdHandler;
- private readonly EllieRandom _rng;
private readonly DiscordSocketClient _client;
private readonly GamblingConfigService _gss;
private readonly GamblingService _gs;
- private ConcurrentHashSet<ulong> _generationChannels;
- private readonly SemaphoreSlim _pickLock = new(1, 1);
+ private ConcurrentHashSet<ulong> _generationChannels = [];
public PlantPickService(
DbService db,
@@ -50,13 +48,9 @@ public class PlantPickService : IEService, IExecNoCommand, IReadyExecutor
_fonts = fonts;
_cs = cs;
_cmdHandler = cmdHandler;
- _rng = new();
_client = client;
_gss = gss;
_gs = gs;
-
- using var uow = db.GetDbContext();
- var guildIds = client.Guilds.Select(x => x.Id).ToList();
}
public Task ExecOnNoCommandAsync(IGuild guild, IUserMessage msg)
@@ -416,7 +410,6 @@ public class PlantPickService : IEService, IExecNoCommand, IReadyExecutor
public async Task OnReadyAsync()
{
-
await using var uow = _db.GetDbContext();
_generationChannels = (await uow.GetTable<GCChannelId>()
.Select(x => x.ChannelId)