diff --git a/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts b/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts index b0c74ee4..2687778e 100644 --- a/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts +++ b/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts @@ -12,7 +12,6 @@ export const RunAutomodOnThreadCreate = typedGuildEventListener()({ event: "threadUpdate", async listener({ pluginData, args: { oldThread, newThread: thread } }) { - const user = thread.ownerId ? await pluginData.client.users.fetch(thread.ownerId).catch(() => void 0) : void 0; + const user = thread.ownerId + ? await pluginData.client.users.fetch(thread.ownerId).catch(() => undefined) + : undefined; + const changes: AutomodContext["threadChange"] = {}; if (oldThread.archived !== thread.archived) { - changes.archived = thread.archived ? thread : void 0; - changes.unarchived = !thread.archived ? thread : void 0; + changes.archived = thread.archived ? thread : undefined; + changes.unarchived = !thread.archived ? thread : undefined; } if (oldThread.locked !== thread.locked) { - changes.locked = thread.locked ? thread : void 0; - changes.unlocked = !thread.locked ? thread : void 0; + changes.locked = thread.locked ? thread : undefined; + changes.unlocked = !thread.locked ? thread : undefined; } if (Object.keys(changes).length === 0) return; @@ -75,8 +76,8 @@ export const RunAutomodOnThreadUpdate = typedGuildEventListener { diff --git a/backend/src/plugins/Automod/triggers/threadArchive.ts b/backend/src/plugins/Automod/triggers/threadArchive.ts index b8d73c5a..40cd43df 100644 --- a/backend/src/plugins/Automod/triggers/threadArchive.ts +++ b/backend/src/plugins/Automod/triggers/threadArchive.ts @@ -14,7 +14,6 @@ interface ThreadArchiveResult { export const ThreadArchiveTrigger = automodTrigger()({ configType: t.type({ - parent: tNullable(t.union([t.string, t.array(t.string)])), locked: tNullable(t.boolean), }), @@ -31,11 +30,6 @@ export const ThreadArchiveTrigger = automodTrigger()({ return; } - if (triggerConfig.parent) { - const parentIds = Array.isArray(triggerConfig.parent) ? triggerConfig.parent : [triggerConfig.parent]; - if (thread.parentId && !parentIds.includes(thread.parentId)) return; - } - return { extra: { matchedThreadId: thread.id, diff --git a/backend/src/plugins/Automod/triggers/threadUnarchive.ts b/backend/src/plugins/Automod/triggers/threadUnarchive.ts index b2669ab8..05e729f1 100644 --- a/backend/src/plugins/Automod/triggers/threadUnarchive.ts +++ b/backend/src/plugins/Automod/triggers/threadUnarchive.ts @@ -14,7 +14,6 @@ interface ThreadUnarchiveResult { export const ThreadUnarchiveTrigger = automodTrigger()({ configType: t.type({ - parent: tNullable(t.union([t.string, t.array(t.string)])), locked: tNullable(t.boolean), }), @@ -31,11 +30,6 @@ export const ThreadUnarchiveTrigger = automodTrigger()({ return; } - if (triggerConfig.parent) { - const parentIds = Array.isArray(triggerConfig.parent) ? triggerConfig.parent : [triggerConfig.parent]; - if (thread.parentId && !parentIds.includes(thread.parentId)) return; - } - return { extra: { matchedThreadId: thread.id,