minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-11-03 16:24:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue with expression settings toggle, closes #353

Browse Source
This commit is contained in:
Kwoth
2022-04-13 18:14:58 +02:00
parent e4b98a0c07
commit 6159d84988
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NadekoBot/Modules/CustomReactions/NadekoExpressions.cs
View File

@@ -241,7 +241,7 @@ public partial class NadekoExpressions : NadekoModule<NadekoExpressionsService>
return; return;
} }
var (success, newVal) = await _service.ToggleExprOptionAsync(id, option); var (success, newVal) = await _service.ToggleExprOptionAsync(ctx.Guild?.Id, id, option);
if (!success) if (!success)
{ {
await ReplyErrorLocalizedAsync(strs.expr_no_found_id); await ReplyErrorLocalizedAsync(strs.expr_no_found_id);

7
src/NadekoBot/Modules/CustomReactions/NadekoExpressionsService.cs
View File

@@ -448,14 +448,15 @@ public sealed class NadekoExpressionsService : IEarlyBehavior, IReadyExecutor
await UpdateInternalAsync(guildId, expr); await UpdateInternalAsync(guildId, expr);
} }
public async Task<(bool Sucess, bool NewValue)> ToggleExprOptionAsync(int id, ExprField field) public async Task<(bool Sucess, bool NewValue)> ToggleExprOptionAsync(ulong? guildId, int id, ExprField field)
{ {
var newVal = false; var newVal = false;
NadekoExpression expr; NadekoExpression expr;
await using (var uow = _db.GetDbContext()) await using (var uow = _db.GetDbContext())
{ {
expr = uow.Expressions.GetById(id); expr = uow.Expressions.GetById(id);
if (expr is null)
if (expr is null || expr.GuildId != guildId)
return (false, false); return (false, false);
if (field == ExprField.AutoDelete) if (field == ExprField.AutoDelete)
newVal = expr.AutoDeleteTrigger = !expr.AutoDeleteTrigger; newVal = expr.AutoDeleteTrigger = !expr.AutoDeleteTrigger;
@@ -469,7 +470,7 @@ public sealed class NadekoExpressionsService : IEarlyBehavior, IReadyExecutor
await uow.SaveChangesAsync(); await uow.SaveChangesAsync();
} }
await UpdateInternalAsync(expr.GuildId, expr); await UpdateInternalAsync(guildId, expr);
return (true, newVal); return (true, newVal);
} }