fixes

backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts

@@ -14,6 +14,7 @@ export const RunAutomodOnThreadCreate = typedGuildEventListener<AutomodPluginTyp
 
     const context: AutomodContext = {
       timestamp: Date.now(),
+      thread,
       threadChange: {
         created: thread,
       },
@@ -23,7 +24,7 @@ export const RunAutomodOnThreadCreate = typedGuildEventListener<AutomodPluginTyp
 
     // This is a hack to make this trigger compatible with the reply action
     const sourceChannel = thread.parent ?? pluginData.client.channels.cache.find((c) => c.id === thread.parentId);
-    messageBlock: if (sourceChannel?.isText()) {
+    if (sourceChannel?.isText()) {
       const sourceMessage = sourceChannel.messages.cache.find(
         (m) => m.thread?.id === thread.id || m.reference?.channelId === thread.id,
       );
@@ -56,6 +57,7 @@ export const RunAutomodOnThreadDelete = typedGuildEventListener<AutomodPluginTyp
 
     const context: AutomodContext = {
       timestamp: Date.now(),
+      thread,
       threadChange: {
         deleted: thread,
       },
@@ -84,10 +86,11 @@ export const RunAutomodOnThreadUpdate = typedGuildEventListener<AutomodPluginTyp
     }
 
     if (Object.keys(changes).length === 0) return;
-
+    console.log("got thread changes!");
     const context: AutomodContext = {
       timestamp: Date.now(),
       threadChange: changes,
+      thread,
       user,
     };
 

backend/src/plugins/Automod/triggers/threadArchive.ts

@@ -25,19 +25,19 @@ export const ThreadArchiveTrigger = automodTrigger<ThreadArchiveResult>()({
       return;
     }
 
-    if (triggerConfig.locked && !context.threadChange.locked) {
-      return;
-    } else if (triggerConfig.locked === false && !context.threadChange.unlocked) {
+    const thread = context.threadChange.archived;
+    console.log("matching thread_archive");
+
+    if (typeof triggerConfig.locked === "boolean" && thread.locked !== triggerConfig.locked) {
       return;
     }
-
-    const thread = context.threadChange.archived;
+    console.log("locked pass");
 
     if (triggerConfig.parent) {
       const parentIds = Array.isArray(triggerConfig.parent) ? triggerConfig.parent : [triggerConfig.parent];
       if (thread.parentId && !parentIds.includes(thread.parentId)) return;
     }
-
+    console.log("parent pass");
     return {
       extra: {
         matchedThreadId: thread.id,

backend/src/plugins/Automod/types.ts

@@ -117,6 +117,7 @@ export interface AutomodContext {
   user?: User;
   message?: SavedMessage;
   member?: GuildMember;
+  thread?: ThreadChannel;
   partialMember?: GuildMember | PartialGuildMember;
   joined?: boolean;
   rolesChanged?: {