fix: check guild on tracker events

GodderE2D · May 30, 2024 · a4ebe62 · a4ebe62
1 parent 007b552
commit a4ebe62
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/src/functions/tracking/handleMemberUpdate.ts b/src/functions/tracking/handleMemberUpdate.ts
@@ -12,7 +12,7 @@ export async function handleMemberUpdate(tracker: TrackedContent & { report: Rep
       const embed = new EmbedBuilder()
         .setColor(colours.fuchsia)
         .setDescription(
-          `Tracked user <@${entry.target}> had their nickname ${change.new ? "changed" : "reset"}${
+          `Tracked user ${entry.target} had their nickname ${change.new ? "changed" : "reset"}${
             change.old ? ` from \`${change.old}\`` : ""
           }${change.new ? ` to \`${change.new}\`` : ""} by ${
             entry.executorId !== entry.targetId ? `<@${entry.executorId}>` : "themselves"

diff --git a/src/listeners/tracking/message/messageDelete.ts b/src/listeners/tracking/message/messageDelete.ts
@@ -14,10 +14,10 @@ export class TrackingMessageDeleteListener extends Listener {
     });
   }
   public async run(message: Message) {
-    if (!message.member) return;
+    if (!message.inGuild()) return;
 
     const trackers = await prisma.trackedContent.findMany({
-      where: { type: "Message", contentId: message.id },
+      where: { type: "Message", contentId: message.id, guildId: message.guild.id },
       include: { report: true },
     });
 

diff --git a/src/listeners/tracking/message/messageUpdate.ts b/src/listeners/tracking/message/messageUpdate.ts
@@ -14,10 +14,10 @@ export class TrackingMessageUpdateListener extends Listener {
     });
   }
   public async run(oldMessage: Message, newMessage: Message) {
-    if (!newMessage.member) return;
+    if (!newMessage.inGuild()) return;
 
     const trackers = await prisma.trackedContent.findMany({
-      where: { type: "Message", contentId: newMessage.id },
+      where: { type: "Message", contentId: newMessage.id, guildId: newMessage.guild.id },
       include: { report: true },
     });
 

diff --git a/src/listeners/tracking/user/guildAuditLogEntryCreate.ts b/src/listeners/tracking/user/guildAuditLogEntryCreate.ts
@@ -1,5 +1,5 @@
 import { Events, Listener } from "@sapphire/framework";
-import { AuditLogEvent, EmbedBuilder, GuildAuditLogsEntry, User } from "discord.js";
+import { AuditLogEvent, EmbedBuilder, Guild, GuildAuditLogsEntry, User } from "discord.js";
 
 import colours from "../../../constants/colours.js";
 import { handleMemberUpdate } from "../../../functions/tracking/handleMemberUpdate.js";
@@ -15,15 +15,15 @@ export class TrackingGuildAuditLogEntryCreateListener extends Listener {
     });
   }
 
-  public async run(entry: GuildAuditLogsEntry) {
+  public async run(entry: GuildAuditLogsEntry, guild: Guild) {
     if (![AuditLogEvent.MemberBanRemove, AuditLogEvent.MemberUpdate].includes(entry.action)) return;
 
     if (!(entry.target instanceof User)) {
       return logger.warn(`Tracking target ${entry.target} is not a User, returning`);
     }
 
     const trackers = await prisma.trackedContent.findMany({
-      where: { type: "User", contentId: entry.target.id },
+      where: { type: "User", contentId: entry.target.id, guildId: guild.id },
       include: { report: true },
     });
 

diff --git a/src/listeners/tracking/user/guildMemberAdd.ts b/src/listeners/tracking/user/guildMemberAdd.ts
@@ -19,7 +19,7 @@ export class TrackingGuildMemberAddListener extends Listener {
     if ((member.joinedTimestamp ?? Infinity) < Date.now() - 60_000) return;
 
     const trackers = await prisma.trackedContent.findMany({
-      where: { type: "User", contentId: member.id },
+      where: { type: "User", contentId: member.id, guildId: member.guild.id },
       include: { report: true },
     });
 

diff --git a/src/listeners/tracking/user/guildMemberRemove.ts b/src/listeners/tracking/user/guildMemberRemove.ts
@@ -19,7 +19,7 @@ export class TrackingGuildMemberRemoveListener extends Listener {
     if (await member.fetch().catch(() => undefined)) return;
 
     const trackers = await prisma.trackedContent.findMany({
-      where: { type: "User", contentId: member.id },
+      where: { type: "User", contentId: member.id, guildId: member.guild.id },
       include: { report: true },
     });