Merge pull request #959 from MarkusTheOrt/main

Fix Applying the levels on levelup

Author: FozzieHi

src/commands/moderation/UserInfo.ts

@@ -120,6 +120,8 @@ export class UserInfoCommand extends Command {
             member.communicationDisabledUntilTimestamp > Date.now())
             ? "Yes"
             : "No",
+          "Level/XP",
+          `${dbUser.level}/${dbUser.experience}`,
         ],
         {
           author: { name: getDisplayTag(member), icon_url: user.displayAvatarURL() },

src/services/ExperienceService.ts

@@ -115,14 +115,16 @@ export async function handleMessageExperience(message: Message) {
       false,
     );
 
-    const roleToAssign = Object.keys(Constants.XP.level_roles).find(
-      (levelRequired) => nextLevel === +levelRequired,
-    );
-    if (roleToAssign != null) {
-      await (message.member as GuildMember).roles.add(
-        roleToAssign,
-        "Member Leveled Up",
-      );
+    const member = message.member as GuildMember;
+    const rolesToAssign = Object.entries(Constants.XP.level_roles)
+      .filter(
+        ([levelRequired, roleId]) =>
+          nextLevel >= +levelRequired && !member.roles.cache.has(roleId),
+      )
+      .map(([, foundLevel]) => foundLevel);
+
+    if (rolesToAssign.length > 0) {
+      await member.roles.add(rolesToAssign, "Member Leveled Up");
     }
 
     await genericLog(