fix(roles): role update when linked to a specific guild (#411)

faceitFinder · May 8, 2024 · 13feb87 · 13feb87
1 parent 9475fd0
commit 13feb87
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 14 deletions.
diff --git a/commands/roles.js b/commands/roles.js
@@ -15,7 +15,7 @@ const SETUP_ELO = 'setup_elo'
 const REMOVE_ELO = 'remove_elo'
 
 const setupRoles = async (interaction) => {
-  if (getInteractionOption(interaction, 'remove_old')) await removeRoles(interaction)
+  await removeRoles(interaction, getInteractionOption(interaction, 'remove_old'))
 
   const roles = []
   const rolesFields = []
@@ -82,8 +82,7 @@ const setupRoles = async (interaction) => {
 }
 
 const generateRoles = async (interaction) => {
-  if (getInteractionOption(interaction, 'remove_old')) await removeRoles(interaction)
-
+  await removeRoles(interaction, getInteractionOption(interaction, 'remove_old'))
   const roles = []
 
   for (let i = 10; i >= 1; i--) {
@@ -145,16 +144,18 @@ const generateRoles = async (interaction) => {
   }
 }
 
-const removeRoles = async (interaction) => {
+const removeRoles = async (interaction, removeOnGuild) => {
   const guildRoles = await GuildRoles.getRolesOf(interaction.guild.id)
   if (!guildRoles) return
 
   const roles = getRoleIds(guildRoles)
 
   if (guildRoles) {
-    for (let i = 1; i <= 10; i++) {
-      if (guildRoles[`level${i}`] && interaction.guild.roles.cache.has(guildRoles[`level${i}`]))
-        await interaction.guild.roles.delete(guildRoles[`level${i}`]).catch(console.error)
+    if (removeOnGuild) {
+      for (let i = 1; i <= 10; i++) {
+        if (guildRoles[`level${i}`] && interaction.guild.roles.cache.has(guildRoles[`level${i}`]))
+          await interaction.guild.roles.delete(guildRoles[`level${i}`]).catch(console.error)
+      }
     }
 
     await GuildRoles.remove(interaction.guild.id)

diff --git a/functions/commands.js b/functions/commands.js
@@ -97,7 +97,7 @@ const getUsers = async (
 
   if (parameters.length === 0 && currentUser && searchCurrentUser) {
     parameters.push({ param: currentUser.faceitId, faceitId: true })
-    updateRoles(interaction.client, interaction.user.id)
+    updateRoles(interaction.client, interaction.user.id, interaction.guild.id)
   }
 
   let params = []

diff --git a/functions/roles.js b/functions/roles.js
@@ -51,7 +51,11 @@ const setupRoles = async (client, user, guildId, remove) => {
 const updateRoles = async (client, discordId, guildId, remove = false) => {
   let user, guilds
 
-  if (discordId) user = [await User.get(discordId)].flat()
+  if (discordId) {
+    user = [await User.get(discordId)].flat()
+    if (user.length > 1) user = user.filter(e => e.guildId === guildId)
+    guildId = user.at(0).guildId
+  }
 
   if (guildId) guilds = [guildId].flat()
   else guilds = (await GuildCustomRole.getAll()).map(e => e.guildId).filter((e, i, a) => a.indexOf(e) === i)

diff --git a/interactions/contextmenus/dailystats.js b/interactions/contextmenus/dailystats.js
@@ -15,7 +15,7 @@ module.exports = {
         discord: `<@${interaction.targetId}>`
       }), interaction.locale)
     }
-    await GuildRoles.updateRoles(interaction.client, user.discordId)
+    await GuildRoles.updateRoles(interaction.client, user.discordId, interaction.guild.id)
     return Dailystats.sendCardWithInfo(interaction, {
       param: user.faceitId,
       faceitId: true

diff --git a/interactions/contextmenus/last.js b/interactions/contextmenus/last.js
@@ -15,7 +15,7 @@ module.exports = {
         discord: `<@${interaction.targetId}>`
       }), interaction.locale)
     }
-    await GuildRoles.updateRoles(interaction.client, user.discordId)
+    await GuildRoles.updateRoles(interaction.client, user.discordId, interaction.guild.id)
     return Last.sendCardWithInfo(interaction, {
       param: user.faceitId,
       faceitId: true

diff --git a/interactions/contextmenus/laststats.js b/interactions/contextmenus/laststats.js
@@ -15,7 +15,7 @@ module.exports = {
         discord: `<@${interaction.targetId}>`
       }), interaction.locale)
     }
-    await GuildRoles.updateRoles(interaction.client, user.discordId)
+    await GuildRoles.updateRoles(interaction.client, user.discordId, interaction.guild.id)
     return Laststats.sendCardWithInfo(interaction, {
       param: user.faceitId,
       faceitId: true

diff --git a/interactions/contextmenus/monthstats.js b/interactions/contextmenus/monthstats.js
@@ -15,7 +15,7 @@ module.exports = {
         discord: `<@${interaction.targetId}>`
       }), interaction.locale)
     }
-    await GuildRoles.updateRoles(interaction.client, user.discordId)
+    await GuildRoles.updateRoles(interaction.client, user.discordId, interaction.guild.id)
     return Monthstats.sendCardWithInfo(interaction, {
       param: user.faceitId,
       faceitId: true

diff --git a/interactions/contextmenus/stats.js b/interactions/contextmenus/stats.js
@@ -15,7 +15,7 @@ module.exports = {
         discord: `<@${interaction.targetId}>`
       }), interaction.locale)
     }
-    await GuildRoles.updateRoles(interaction.client, user.discordId)
+    await GuildRoles.updateRoles(interaction.client, user.discordId, interaction.guild.id)
     return Stats.sendCardWithInfo(interaction, {
       param: user.faceitId,
       faceitId: true