StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix error when using an unknown counter from Automod

Browse source
This commit is contained in:
Dragory 2021-04-11 13:44:48 +03:00
parent 8763a06ef1
commit ad8aab3937
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
4 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
backend/src/plugins/Automod/actions/addToCounter.ts
View file

@ -1,6 +1,7 @@
import * as t from "io-ts";
import { automodAction } from "../helpers";
import { CountersPlugin } from "../../Counters/CountersPlugin";
import { LogType } from "../../../data/LogType";
export const AddToCounterAction = automodAction({
configType: t.type({
@ -10,8 +11,15 @@ export const AddToCounterAction = automodAction({
defaultConfig: {},
async apply({ pluginData, contexts, actionConfig, matchResult }) {
async apply({ pluginData, contexts, actionConfig, matchResult, ruleName }) {
const countersPlugin = pluginData.getPlugin(CountersPlugin);
if (!countersPlugin.counterExists(actionConfig.counter)) {
pluginData.state.logs.log(LogType.BOT_ALERT, {
body: `Unknown counter \`${actionConfig.counter}\` in \`add_to_counter\` action of Automod rule \`${ruleName}\``,
});
return;
}
countersPlugin.changeCounterValue(
actionConfig.counter,
contexts[0].message?.channel_id || null,

10
backend/src/plugins/Automod/actions/setCounter.ts
View file

@ -1,6 +1,7 @@
import * as t from "io-ts";
import { automodAction } from "../helpers";
import { CountersPlugin } from "../../Counters/CountersPlugin";
import { LogType } from "../../../data/LogType";
export const SetCounterAction = automodAction({
configType: t.type({
@ -10,8 +11,15 @@ export const SetCounterAction = automodAction({
defaultConfig: {},
async apply({ pluginData, contexts, actionConfig, matchResult }) {
async apply({ pluginData, contexts, actionConfig, matchResult, ruleName }) {
const countersPlugin = pluginData.getPlugin(CountersPlugin);
if (!countersPlugin.counterExists(actionConfig.counter)) {
pluginData.state.logs.log(LogType.BOT_ALERT, {
body: `Unknown counter \`${actionConfig.counter}\` in \`add_to_counter\` action of Automod rule \`${ruleName}\``,
});
return;
}
countersPlugin.setCounterValue(
actionConfig.counter,
contexts[0].message?.channel_id || null,

3
backend/src/plugins/Counters/CountersPlugin.ts
View file

@ -24,6 +24,7 @@ import {
} from "../../data/entities/CounterTrigger";
import { getPrettyNameForCounter } from "./functions/getPrettyNameForCounter";
import { getPrettyNameForCounterTrigger } from "./functions/getPrettyNameForCounterTrigger";
import { counterExists } from "./functions/counterExists";
const MAX_COUNTERS = 5;
const MAX_TRIGGERS_PER_COUNTER = 5;
@ -115,6 +116,8 @@ export const CountersPlugin = zeppelinGuildPlugin<CountersPluginType>()("counter
configPreprocessor,
public: {
counterExists: mapToPublicFn(counterExists),
// Change a counter's value by a relative amount, e.g. +5
changeCounterValue: mapToPublicFn(changeCounterValue),

7
backend/src/plugins/Counters/functions/counterExists.ts Normal file
View file

@ -0,0 +1,7 @@
import { GuildPluginData } from "knub";
import { CountersPluginType } from "../types";
export function counterExists(pluginData: GuildPluginData<CountersPluginType>, counterName: string) {
const config = pluginData.config.get();
return config.counters[counterName] != null;
}