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

automod: fix crash, improve user id detection

Browse source
This commit is contained in:
Dragory 2020-07-30 13:45:42 +03:00
parent 9125dba2ab
commit 2a08e70087
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/src/plugins/Automod/functions/runAutomod.ts
View file

@ -7,7 +7,7 @@ import { CleanAction } from "../actions/clean";
import { checkAndUpdateCooldown } from "./checkAndUpdateCooldown"; import { checkAndUpdateCooldown } from "./checkAndUpdateCooldown";
export async function runAutomod(pluginData: PluginData<AutomodPluginType>, context: AutomodContext) { export async function runAutomod(pluginData: PluginData<AutomodPluginType>, context: AutomodContext) {
const userId = context.user?.id || context.message?.user_id; const userId = context.user?.id || context.member?.id || context.message?.user_id;
const user = userId && pluginData.client.users.get(userId); const user = userId && pluginData.client.users.get(userId);
const member = userId && pluginData.guild.members.get(userId); const member = userId && pluginData.guild.members.get(userId);
const channelId = context.message?.channel_id; const channelId = context.message?.channel_id;
@ -23,7 +23,7 @@ export async function runAutomod(pluginData: PluginData<AutomodPluginType>, cont
for (const [ruleName, rule] of Object.entries(config.rules)) { for (const [ruleName, rule] of Object.entries(config.rules)) {
if (rule.enabled === false) continue; if (rule.enabled === false) continue;
if (!rule.affects_bots && user.bot) continue; if (!rule.affects_bots && user?.bot) continue;
if (rule.cooldown && checkAndUpdateCooldown(pluginData, rule, context)) { if (rule.cooldown && checkAndUpdateCooldown(pluginData, rule, context)) {
return; return;