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

Fix channel/category/thread matching for threads in Automod overrides

Browse source
This commit is contained in:
Dragory 2021-09-05 20:58:50 +03:00
parent 9dea0e7d17
commit 497d334b15
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
import { Snowflake, TextChannel } from "discord.js";
import { Snowflake, TextChannel, ThreadChannel } from "discord.js";
import { GuildPluginData } from "knub";
import { availableActions } from "../actions/availableActions";
import { CleanAction } from "../actions/clean";
@ -11,8 +11,14 @@ export async function runAutomod(pluginData: GuildPluginData<AutomodPluginType>,
const userId = context.user?.id || context.member?.id || context.message?.user_id;
const user = context.user || (userId && pluginData.client.users!.cache.get(userId as Snowflake));
const member = context.member || (userId && pluginData.guild.members.cache.get(userId as Snowflake)) || null;
const channelId = context.message?.channel_id;
const channel = channelId ? (pluginData.guild.channels.cache.get(channelId as Snowflake) as TextChannel) : null;
const channelIdOrThreadId = context.message?.channel_id;
const channelOrThread = channelIdOrThreadId
? (pluginData.guild.channels.cache.get(channelIdOrThreadId as Snowflake) as TextChannel | ThreadChannel)
: null;
const channelId = channelOrThread?.isThread() ? channelOrThread.parent?.id : channelIdOrThreadId;
const threadId = channelOrThread?.isThread() ? channelOrThread.id : null;
const channel = channelOrThread?.isThread() ? channelOrThread.parent : channelOrThread;
const categoryId = channel?.parentId;
// Don't apply Automod on Zeppelin itself
@ -23,6 +29,7 @@ export async function runAutomod(pluginData: GuildPluginData<AutomodPluginType>,
const config = await pluginData.config.getMatchingConfig({
channelId,
categoryId,
threadId,
userId,
member,
});