Merge pull request #61 from Chiissu/dev

quick bug fix

Author: ZakaHaceCosas

example.env

@@ -2,5 +2,4 @@ TOKEN="YOUR_TOKEN"
 OWNER="YOUR_USER_ID"
 DEV_ERROR_CHANNEL_ID="YOUR_CHANNEL_ID"
 TOPGG_TOKEN="YOUR_TOPGG_TOKEN"
-ENABLE_TOPGG="false"
 ENABLE_MEDIA_FETCHING="false"

src/commands/help/variables.ts

@@ -29,14 +29,14 @@ export async function run(interaction: ChatInputCommandInteraction) {
         name: "👀  • Simple example",
         value: [
           `A simple example: \`${example}\` will result in:`,
-          `> ${replaceVariables(example, interaction.guild!, interaction.user)}`,
+          `> ${await replaceVariables(example, interaction.guild!, interaction.user)}`,
         ].join("\n"),
       },
       {
         name: "🎛  • Another example",
         value: [
           `Adding more stuff:\n\`${exampleTwo}\`\nwill result in:`,
-          `> ${replaceVariables(exampleTwo, interaction.guild!, interaction.user)}`,
+          `> ${await replaceVariables(exampleTwo, interaction.guild!, interaction.user)}`,
         ].join("\n"),
       },
       {

src/commands/news/add.ts

@@ -60,13 +60,13 @@ export async function run(interaction: ChatInputCommandInteraction) {
   interaction.client.once("interactionCreate", async i => {
     if (!i.isModalSubmit()) return;
 
-    const title = replaceVariables(
+    const title = await replaceVariables(
       i.fields.getTextInputValue("title"),
       interaction.guild!,
       interaction.user,
     );
 
-    const body = replaceVariables(
+    const body = await replaceVariables(
       i.fields.getTextInputValue("body"),
       interaction.guild!,
       interaction.user,

src/events/guildMemberAdd.ts

@@ -25,7 +25,11 @@ export default (async function run(member) {
       iconURL: avatar,
     })
     .setDescription(
-      replaceVariables((await getSetting(guildID, "welcome", "join_text")) as string, guild, user),
+      await replaceVariables(
+        (await getSetting(guildID, "welcome", "join_text")) as string,
+        guild,
+        user,
+      ),
     )
     .setFooter({ text: `User ID: ${user.id}` })
     .setColor(await colorize({ user, avatar, hue: 200 }));
@@ -42,7 +46,7 @@ export default (async function run(member) {
       setting: { category: "welcome", setting: "join_channel" },
     })
   ) {
-    if (roles) await member.roles.add([...kominator(roles as string)]);
+    if (roles && !user.bot) await member.roles.add([...kominator(roles as string)]);
     await channel.send({ embeds: [embed] });
   }
 
@@ -51,7 +55,11 @@ export default (async function run(member) {
   if (!dmChannel || user.bot) return;
 
   embed.setDescription(
-    replaceVariables((await getSetting(guildID, "welcome", "dm_text")) as string, guild, user),
+    await replaceVariables(
+      (await getSetting(guildID, "welcome", "dm_text")) as string,
+      guild,
+      user,
+    ),
   );
 
   try {

src/events/guildMemberRemove.ts

@@ -28,7 +28,11 @@ export default (async function run(member: GuildMember) {
       iconURL: avatar,
     })
     .setDescription(
-      replaceVariables((await getSetting(guildID, "welcome", "leave_text")) as string, guild, user),
+      await replaceVariables(
+        (await getSetting(guildID, "welcome", "leave_text")) as string,
+        guild,
+        user,
+      ),
     )
     .setFooter({ text: `User ID: ${user.id}` })
     .setColor(await colorize({ user, avatar, hue: 200 }));

src/utils/replace.ts

@@ -32,15 +32,15 @@ export function replace(
  * @param {User} user User.
  * @returns {string} String with values replaced. The function is async because it depends on `fetchOwner()`.
  */
-export function replaceVariables(text: string, guild: Guild, user: User): string {
+export async function replaceVariables(text: string, guild: Guild, user: User): Promise<string> {
   const replacementVariables: Replacements = [
     { text: "(name)", replacement: user.displayName },
     { text: "(username)", replacement: user.username },
     { text: "(count)", replacement: guild.memberCount },
     { text: "(servername)", replacement: guild.name },
     {
       text: "(serverowner)",
-      replacement: guild.members.cache.find(u => u.id == guild.ownerId)!.displayName,
+      replacement: (await guild.members.fetch(guild.ownerId)).displayName,
     },
     { text: "(currentdate)", replacement: mention(Date.now(), "DEFAULT_TIMESTAMP") },
     { text: "(currentdate, simple)", replacement: mention(Date.now(), "SIMPLE_TIMESTAMP") },