minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-12 02:08:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fixed claimed waifu decay that was introduced in a recent patch

Browse Source 
dev: Cleaned up a little bit in medusa loading. Clean medusa unloading will be broken for a while probably
This commit is contained in:
Kwoth
2024-09-23 18:18:38 +00:00
parent a362ee90fc
commit 716e092fd0
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NadekoBot/Modules/Gambling/Waifus/WaifuService.cs
View File

@@ -577,7 +577,7 @@ public class WaifuService : INService, IReadyExecutor
{ {
await using var uow = _db.GetDbContext(); await using var uow = _db.GetDbContext();
await uow.GetTable<WaifuInfo>() await uow.GetTable<WaifuInfo>()
.Where(x => x.Price > minPrice && x.ClaimerId == null) .Where(x => x.Price > minPrice && x.ClaimerId != null)
.UpdateAsync(old => new() .UpdateAsync(old => new()
{ {
Price = (long)(old.Price * claimedMulti) Price = (long)(old.Price * claimedMulti)

40
src/NadekoBot/_common/Medusa/Common/MedusaLoaderService.cs
View File

@@ -250,6 +250,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
} }
catch (Exception ex) when (ex is FileNotFoundException or BadImageFormatException) catch (Exception ex) when (ex is FileNotFoundException or BadImageFormatException)
{ {
Log.Error(ex, "An error occurred loading a medusa");
return MedusaLoadResult.NotFound; return MedusaLoadResult.NotFound;
} }
catch (Exception ex) catch (Exception ex)
@@ -334,23 +335,34 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
var a = ctx.LoadFromAssemblyPath(Path.GetFullPath(path)); var a = ctx.LoadFromAssemblyPath(Path.GetFullPath(path));
// ctx.LoadDependencies(a); // ctx.LoadDependencies(a);
iocModule = null;
// load services // load services
iocModule = new MedusaNinjectIocModule(_cont, a, safeName); try
iocModule.Load();
var sis = LoadSneksFromAssembly(safeName, a);
typeReaders = LoadTypeReadersFromAssembly(a, strings);
if (sis.Count == 0)
{ {
iocModule.Unload(); iocModule = new MedusaNinjectIocModule(_cont, a, safeName);
return false; iocModule.Load();
var sis = LoadSneksFromAssembly(safeName, a);
typeReaders = LoadTypeReadersFromAssembly(a, strings);
if (sis.Count == 0)
{
iocModule.Unload();
ctx.Unload();
return false;
}
ctxWr = new(ctx);
snekData = sis;
return true;
}
catch
{
iocModule?.Unload();
ctx.Unload();
throw;
} }
ctxWr = new(ctx);
snekData = sis;
return true;
} }
private static readonly Type _paramParserType = typeof(ParamParser<>); private static readonly Type _paramParserType = typeof(ParamParser<>);