From f5d6c895aa681aac0b227042ae2a9d96ad1d7737 Mon Sep 17 00:00:00 2001 From: Tiago R Date: Sat, 1 Jul 2023 11:58:01 +0100 Subject: [PATCH] Fix counters set_value not defaulting nulls if not using per_user/per_channel (#366) --- backend/src/plugins/Automod/actions/setCounter.ts | 2 +- backend/src/plugins/Counters/functions/setCounterValue.ts | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/src/plugins/Automod/actions/setCounter.ts b/backend/src/plugins/Automod/actions/setCounter.ts index 5db5a80d..3286fb4b 100644 --- a/backend/src/plugins/Automod/actions/setCounter.ts +++ b/backend/src/plugins/Automod/actions/setCounter.ts @@ -15,7 +15,7 @@ export const SetCounterAction = automodAction({ const countersPlugin = pluginData.getPlugin(CountersPlugin); if (!countersPlugin.counterExists(actionConfig.counter)) { pluginData.getPlugin(LogsPlugin).logBotAlert({ - body: `Unknown counter \`${actionConfig.counter}\` in \`add_to_counter\` action of Automod rule \`${ruleName}\``, + body: `Unknown counter \`${actionConfig.counter}\` in \`set_counter\` action of Automod rule \`${ruleName}\``, }); return; } diff --git a/backend/src/plugins/Counters/functions/setCounterValue.ts b/backend/src/plugins/Counters/functions/setCounterValue.ts index 7a988ee2..55b6f78f 100644 --- a/backend/src/plugins/Counters/functions/setCounterValue.ts +++ b/backend/src/plugins/Counters/functions/setCounterValue.ts @@ -25,6 +25,9 @@ export async function setCounterValue( throw new Error(`Counter is per user but no user ID was supplied`); } + channelId = counter.per_channel ? channelId : null; + userId = counter.per_user ? userId : null; + const counterId = pluginData.state.counterIds[counterName]; const lock = await pluginData.locks.acquire(counterIdLock(counterId));