Merge pull request #62 from Chiissu/dev

ZakaHaceCosas · web-flow · commit 73b03e8d29fb · 2025-08-20T16:30:07.000+02:00
this better help
diff --git a/src/commands/moderation/ban.ts b/src/commands/moderation/ban.ts
@@ -76,6 +76,6 @@ export async function run(interaction: ChatInputCommandInteraction) {
     );
     await guild.members.ban(user.id, { reason: reason ?? undefined });
   } catch (error) {
-    return await errorEmbed({ interaction, error, forward: true });
+    return await errorEmbed({ interaction, error, forward: true, fileName: "ban.ts" });
   }
 }
diff --git a/src/commands/moderation/clear.ts b/src/commands/moderation/clear.ts
@@ -108,6 +108,7 @@ export async function run(interaction: ChatInputCommandInteraction) {
       interaction,
       error,
       forward: true,
+      fileName: "clear.ts",
     });
   }
 
diff --git a/src/commands/moderation/delwarn.ts b/src/commands/moderation/delwarn.ts
@@ -52,6 +52,7 @@ export async function run(interaction: ChatInputCommandInteraction) {
       interaction,
       error,
       forward: true,
+      fileName: "delwarn.ts",
     });
   }
 
diff --git a/src/commands/moderation/kick.ts b/src/commands/moderation/kick.ts
@@ -44,6 +44,6 @@ export async function run(interaction: ChatInputCommandInteraction) {
     );
     await guild.members.cache.get(user.id)?.kick(reason ?? undefined);
   } catch (error) {
-    return await errorEmbed({ interaction, error, forward: true });
+    return await errorEmbed({ interaction, error, forward: true, fileName: "kick.ts" });
   }
 }
diff --git a/src/commands/moderation/lock.ts b/src/commands/moderation/lock.ts
@@ -82,6 +82,7 @@ export async function run(interaction: ChatInputCommandInteraction) {
       interaction,
       error,
       forward: true,
+      fileName: "lock.ts",
     });
   }
 }
diff --git a/src/commands/moderation/mute.ts b/src/commands/moderation/mute.ts
@@ -80,6 +80,6 @@ export async function run(interaction: ChatInputCommandInteraction) {
       .get(user.id)
       ?.edit({ communicationDisabledUntil: time, reason: reason ?? undefined });
   } catch (error) {
-    await errorEmbed({ interaction, error, forward: true });
+    await errorEmbed({ interaction, error, forward: true, fileName: "mute.ts" });
   }
 }
diff --git a/src/commands/moderation/unban.ts b/src/commands/moderation/unban.ts
@@ -33,6 +33,6 @@ export async function run(interaction: ChatInputCommandInteraction) {
       interaction.guild?.members.unban(user.id, reason ?? undefined),
     ]);
   } catch (error) {
-    await errorEmbed({ interaction, error, forward: true });
+    await errorEmbed({ interaction, error, forward: true, fileName: "unban.ts" });
   }
 }
diff --git a/src/commands/moderation/unlock.ts b/src/commands/moderation/unlock.ts
@@ -78,6 +78,6 @@ export async function run(interaction: ChatInputCommandInteraction) {
       ),
     ]);
   } catch (error) {
-    await errorEmbed({ interaction, error, forward: true });
+    await errorEmbed({ interaction, error, forward: true, fileName: "unlock.ts" });
   }
 }
diff --git a/src/commands/moderation/unmute.ts b/src/commands/moderation/unmute.ts
@@ -54,6 +54,6 @@ export async function run(interaction: ChatInputCommandInteraction) {
     );
     await target?.edit({ communicationDisabledUntil: null });
   } catch (error) {
-    await errorEmbed({ interaction, error, forward: true });
+    await errorEmbed({ interaction, error, forward: true, fileName: "unmute.ts" });
   }
 }
diff --git a/src/commands/news/add.ts b/src/commands/news/add.ts
@@ -54,7 +54,7 @@ export async function run(interaction: ChatInputCommandInteraction) {
   try {
     await interaction.showModal(newsModal);
   } catch (error) {
-    await errorEmbed({ interaction, error, forward: true });
+    await errorEmbed({ interaction, error, forward: true, fileName: "add.ts" });
   }
 
   interaction.client.once("interactionCreate", async i => {
@@ -78,7 +78,7 @@ export async function run(interaction: ChatInputCommandInteraction) {
     try {
       await sendChannelNews(guild, id, interaction);
     } catch (error) {
-      await errorEmbed({ interaction, error, forward: true });
+      await errorEmbed({ interaction, error, forward: true, fileName: "add.ts" });
     }
 
     await i.reply({
diff --git a/src/commands/news/edit.ts b/src/commands/news/edit.ts
@@ -65,7 +65,7 @@ export async function run(interaction: ChatInputCommandInteraction) {
   try {
     await interaction.showModal(editModal);
   } catch (error) {
-    await errorEmbed({ interaction, error, forward: true });
+    await errorEmbed({ interaction, error, forward: true, fileName: "edit.ts" });
   }
 
   interaction.client.once("interactionCreate", async i => {
diff --git a/src/events/guildAuditLogEntryCreate.ts b/src/events/guildAuditLogEntryCreate.ts
@@ -20,6 +20,7 @@ export default function createAuditLogHandler(client: Client) {
           title: `Audit log event ${auditEventName} does not have a valid run function.`,
           log: true,
           forward: true,
+          fileName: "guildAuditLogEntryCreate.ts",
         });
 
       await auditEvents[auditEventPos].run(auditEntry, client);
@@ -30,6 +31,7 @@ export default function createAuditLogHandler(client: Client) {
         title: `Error running audit log event ${auditEventName}.`,
         log: true,
         forward: true,
+        fileName: "guildAuditLogEntryCreate.ts",
       });
     }
   } as Event<"guildAuditLogEntryCreate">;
diff --git a/src/events/guildCreate.ts b/src/events/guildCreate.ts
@@ -31,6 +31,12 @@ export default (async function run(guild) {
     if (!welcomeChannel.permissionsFor(guild.client.user)?.has("SendMessages")) return;
     await welcomeChannel.send({ embeds: [embed] });
   } catch (error) {
-    return await errorEmbed({ client, error, log: true, forward: true });
+    return await errorEmbed({
+      client,
+      error,
+      log: true,
+      forward: true,
+      fileName: "guildCreate.ts",
+    });
   }
 } as Event<"guildCreate">);
diff --git a/src/events/guildMemberAdd.ts b/src/events/guildMemberAdd.ts
@@ -65,6 +65,12 @@ export default (async function run(member) {
   try {
     await dmChannel.send({ embeds: [embed] });
   } catch (error) {
-    return await errorEmbed({ client: member.client, error, log: true, forward: true });
+    return await errorEmbed({
+      client: member.client,
+      error,
+      log: true,
+      forward: true,
+      fileName: "guildMemberAdd.ts",
+    });
   }
 } as Event<"guildMemberAdd">);
diff --git a/src/events/messageCreate.ts b/src/events/messageCreate.ts
@@ -36,6 +36,7 @@ export default (async function run(message) {
               title: `Easter egg ${easterEgg.name} does not have a valid run function: ${easterEgg}.`,
               log: true,
               forward: true,
+              fileName: "messageCreate.ts",
             });
             continue;
           }
@@ -48,6 +49,7 @@ export default (async function run(message) {
             title: `Error running easter egg ${easterEgg.name}`,
             log: true,
             forward: true,
+            fileName: "messageCreate.ts",
           });
         }
       }
diff --git a/src/events/messageDelete.ts b/src/events/messageDelete.ts
@@ -46,6 +46,7 @@ export default (async function run(message) {
         error,
         title: "Error fetching meta image",
         forward: true,
+        fileName: "messageDelete.ts",
       });
     }
 
@@ -83,6 +84,12 @@ export default (async function run(message) {
     if (video) files.push(new AttachmentBuilder(video, { name: "tenor.mp4" }));
     return await logChannel(guild, { embeds: [embed], files });
   } catch (error) {
-    return await errorEmbed({ client, error, log: true, forward: true });
+    return await errorEmbed({
+      client,
+      error,
+      log: true,
+      forward: true,
+      fileName: "messageDelete.ts",
+    });
   }
 } as Event<"messageDelete">);
diff --git a/src/events/messageReactionAdd.ts b/src/events/messageReactionAdd.ts
@@ -19,6 +19,7 @@ export default (async function run(reaction, user) {
         title: "Error fetching reaction.",
         log: true,
         forward: true,
+        fileName: "messageReactionAdd.ts",
       });
     }
 
@@ -32,6 +33,7 @@ export default (async function run(reaction, user) {
         title: "Error fetching user.",
         log: true,
         forward: true,
+        fileName: "messageReactionAdd.ts",
       });
     }
   }
@@ -147,6 +149,7 @@ export default (async function run(reaction, user) {
       title: "Error handling starboard message.",
       log: true,
       forward: true,
+      fileName: "messageReactionAdd.ts",
     });
   }
 } as Event<"messageReactionAdd">);
diff --git a/src/events/messageUpdate.ts b/src/events/messageUpdate.ts
@@ -40,6 +40,7 @@ export default (async function run(oldMessage, newMessage) {
       error,
       title: "Error fetching meta image",
       forward: true,
+      fileName: "messageUpdate.ts",
     });
   }
 
diff --git a/src/handlers/events.ts b/src/handlers/events.ts
@@ -52,6 +52,7 @@ export async function loadEasterEggs() {
             title: `Easter egg ${easterEggFile} does not have a run function.`,
             log: true,
             forward: true,
+            fileName: "events.ts",
           });
           continue;
         }
@@ -72,6 +73,7 @@ export async function loadEasterEggs() {
           title: `Error loading easter egg ${easterEggFile}`,
           log: true,
           forward: true,
+          fileName: "events.ts",
         });
       }
     }
@@ -82,6 +84,7 @@ export async function loadEasterEggs() {
       title: `Error loading easter eggs.`,
       log: true,
       forward: true,
+      fileName: "events.ts",
     });
   }
 }
@@ -110,6 +113,7 @@ export async function loadAuditEvents(client: Client) {
             title: `Audit log event ${auditEventFile} does not have a run function.`,
             log: true,
             forward: true,
+            fileName: "events.ts",
           });
           continue;
         }
@@ -130,6 +134,7 @@ export async function loadAuditEvents(client: Client) {
           title: `Error loading audit log event ${auditEventFile}.`,
           log: true,
           forward: true,
+          fileName: "events.ts",
         });
       }
     }
@@ -140,6 +145,7 @@ export async function loadAuditEvents(client: Client) {
       title: `Error loading audit log events.`,
       log: true,
       forward: true,
+      fileName: "events.ts",
     });
   }
 }
diff --git a/src/utils/database/settings.ts b/src/utils/database/settings.ts
@@ -257,6 +257,7 @@ export async function getSetting<
       title: `Setting ${key}.${setting} does not exist in the database. Guild: ${guildID}.`,
       log: true,
       forward: true,
+      fileName: "database/settings.ts",
     });
     return null;
   }
@@ -362,6 +363,12 @@ export async function deletePublicServer(guildId: string) {
   try {
     deletePublicQuery.all(JSON.stringify(guildId));
   } catch (error) {
-    return await errorEmbed({ client, error, log: true, forward: true });
+    return await errorEmbed({
+      client,
+      error,
+      log: true,
+      forward: true,
+      fileName: "database/settings.ts",
+    });
   }
 }
diff --git a/src/utils/database/userSettings.ts b/src/utils/database/userSettings.ts
@@ -57,6 +57,7 @@ export async function getUserSettingsTable<
       title: `Setting ${key}.${setting} does not exist in the database at all.`,
       log: true,
       forward: true,
+      fileName: "database/userSettings.ts",
     });
     return null;
   }
@@ -78,6 +79,7 @@ export async function getUserSetting<
       title: `Setting ${key}.${setting} does not exist in the database. User: ${userID}.`,
       log: true,
       forward: true,
+      fileName: "database/userSettings.ts",
     });
     return null;
   }
diff --git a/src/utils/embeds/errorEmbed.ts b/src/utils/embeds/errorEmbed.ts
@@ -31,8 +31,9 @@ export async function errorEmbed(options: {
   reason?: string;
   log?: boolean;
   forward?: boolean;
+  fileName?: string;
 }) {
-  const { interaction, title, reason, log, forward } = options;
+  const { interaction, title, reason, log, forward, fileName } = options;
   const client = options.client ? options.client : interaction ? interaction.client : null;
   if (!client && !interaction)
     return console.error(
@@ -56,7 +57,7 @@ export async function errorEmbed(options: {
 
   if (options.error) {
     embed.addFields(
-      { name: "💬 • Error message", value: codeBlock(error.message) },
+      { name: "💬 • Error message", value: `${codeBlock(error.message)} in \`${fileName}\`` },
       {
         name: "📜 • Error stack",
         value: stack
diff --git a/src/utils/embeds/modEmbed.ts b/src/utils/embeds/modEmbed.ts
@@ -178,7 +178,13 @@ export async function modEmbed(options: Options & { silent?: boolean }, reason?:
     try {
       editModeration(guild.id, `${previousID}`, reason ?? "", expiresAt ?? null);
     } catch (error) {
-      return await errorEmbed({ interaction, error, log: true, forward: true });
+      return await errorEmbed({
+        interaction,
+        error,
+        log: true,
+        forward: true,
+        fileName: "modEmbed.ts",
+      });
     }
     author = author.concat(`  •  #${previousID}`);
   }
@@ -204,7 +210,13 @@ export async function modEmbed(options: Options & { silent?: boolean }, reason?:
       );
       author = author.concat(`  •  #${id}`);
     } catch (error) {
-      return await errorEmbed({ interaction, error, log: true, forward: true });
+      return await errorEmbed({
+        interaction,
+        error,
+        log: true,
+        forward: true,
+        fileName: "modEmbed.ts",
+      });
     }
   }
 
diff --git a/src/utils/unbanScheduler.ts b/src/utils/unbanScheduler.ts
@@ -29,6 +29,7 @@ export function scheduleUnban(
             reason: "User not found in the guild's ban list's cache.",
             log: true,
             forward: true,
+            fileName: "unbanScheduler.ts",
           });
         }
 
@@ -41,6 +42,7 @@ export function scheduleUnban(
             reason: "Moderator not found in the guild cache.",
             log: true,
             forward: true,
+            fileName: "unbanScheduler.ts",
           });
         }
 
@@ -69,6 +71,7 @@ export function scheduleUnban(
             reason: "The guild is undefined.",
             log: true,
             forward: true,
+            fileName: "unbanScheduler.ts",
           });
         }
         return await errorEmbed({
@@ -77,6 +80,7 @@ export function scheduleUnban(
           title: `Failed to unban user ${userID} in guild ${guildID}`,
           log: true,
           forward: true,
+          fileName: "unbanScheduler.ts",
         });
       }
     },
@@ -99,6 +103,7 @@ export async function rescheduleUnbans(client: Client) {
         title: `Invalid expiresAt value for ban: ${ban.expiresAt}.`,
         log: true,
         forward: true,
+        fileName: "unbanScheduler.ts",
       });
       continue;
     }

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,6 @@ export async function run(interaction: ChatInputCommandInteraction) {`
`76`	`76`	`);`
`77`	`77`	`await guild.members.ban(user.id, { reason: reason ?? undefined });`
`78`	`78`	`} catch (error) {`
`79`		`- return await errorEmbed({ interaction, error, forward: true });`
	`79`	`+ return await errorEmbed({ interaction, error, forward: true, fileName: "ban.ts" });`
`80`	`80`	`}`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ export async function run(interaction: ChatInputCommandInteraction) {`
`108`	`108`	`interaction,`
`109`	`109`	`error,`
`110`	`110`	`forward: true,`
	`111`	`+ fileName: "clear.ts",`
`111`	`112`	`});`
`112`	`113`	`}`
`113`	`114`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ export async function run(interaction: ChatInputCommandInteraction) {`
`52`	`52`	`interaction,`
`53`	`53`	`error,`
`54`	`54`	`forward: true,`
	`55`	`+ fileName: "delwarn.ts",`
`55`	`56`	`});`
`56`	`57`	`}`
`57`	`58`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,6 @@ export async function run(interaction: ChatInputCommandInteraction) {`
`44`	`44`	`);`
`45`	`45`	`await guild.members.cache.get(user.id)?.kick(reason ?? undefined);`
`46`	`46`	`} catch (error) {`
`47`		`- return await errorEmbed({ interaction, error, forward: true });`
	`47`	`+ return await errorEmbed({ interaction, error, forward: true, fileName: "kick.ts" });`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ export async function run(interaction: ChatInputCommandInteraction) {`
`82`	`82`	`interaction,`
`83`	`83`	`error,`
`84`	`84`	`forward: true,`
	`85`	`+ fileName: "lock.ts",`
`85`	`86`	`});`
`86`	`87`	`}`
`87`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,6 @@ export async function run(interaction: ChatInputCommandInteraction) {`
`80`	`80`	`.get(user.id)`
`81`	`81`	`?.edit({ communicationDisabledUntil: time, reason: reason ?? undefined });`
`82`	`82`	`} catch (error) {`
`83`		`- await errorEmbed({ interaction, error, forward: true });`
	`83`	`+ await errorEmbed({ interaction, error, forward: true, fileName: "mute.ts" });`
`84`	`84`	`}`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@ export async function run(interaction: ChatInputCommandInteraction) {`
`33`	`33`	`interaction.guild?.members.unban(user.id, reason ?? undefined),`
`34`	`34`	`]);`
`35`	`35`	`} catch (error) {`
`36`		`- await errorEmbed({ interaction, error, forward: true });`
	`36`	`+ await errorEmbed({ interaction, error, forward: true, fileName: "unban.ts" });`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,6 @@ export async function run(interaction: ChatInputCommandInteraction) {`
`78`	`78`	`),`
`79`	`79`	`]);`
`80`	`80`	`} catch (error) {`
`81`		`- await errorEmbed({ interaction, error, forward: true });`
	`81`	`+ await errorEmbed({ interaction, error, forward: true, fileName: "unlock.ts" });`
`82`	`82`	`}`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,6 @@ export async function run(interaction: ChatInputCommandInteraction) {`
`54`	`54`	`);`
`55`	`55`	`await target?.edit({ communicationDisabledUntil: null });`
`56`	`56`	`} catch (error) {`
`57`		`- await errorEmbed({ interaction, error, forward: true });`
	`57`	`+ await errorEmbed({ interaction, error, forward: true, fileName: "unmute.ts" });`
`58`	`58`	`}`
`59`	`59`	`}`