added check to unmute user, in case the user left the guild

added checks if users being awarded a role are still in the guild

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/AUserExperienceServiceBean.java

@@ -180,7 +180,9 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
         boolean currentlyHasNoExperienceRole = userExperience.getCurrentExperienceRole() == null;
         if(role == null) {
             if(!currentlyHasNoExperienceRole){
-                roleService.removeRoleFromUser(user, userExperience.getCurrentExperienceRole().getRole());
+                if(botService.isUserInGuild(userExperience.getUser())) {
+                    roleService.removeRoleFromUser(user, userExperience.getCurrentExperienceRole().getRole());
+                }
             }
             userExperience.setCurrentExperienceRole(null);
             return;
@@ -190,7 +192,9 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
             if(currentlyHasNoExperienceRole || !role.getRole().getId().equals(userExperience.getCurrentExperienceRole().getRole().getId())) {
                 log.info("User {} in server {} gets a new role {}", user.getUserReference().getId(), user.getServerReference().getId(), role.getRole().getId());
                 if(!currentlyHasNoExperienceRole) {
-                    roleService.removeRoleFromUser(user, userExperience.getCurrentExperienceRole().getRole());
+                    if(botService.isUserInGuild(userExperience.getUser())) {
+                        roleService.removeRoleFromUser(user, userExperience.getCurrentExperienceRole().getRole());
+                    }
                 }
                 roleService.addRoleToUser(user, role.getRole());
             }

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/MuteServiceBean.java

@@ -20,6 +20,7 @@ import dev.sheldan.abstracto.scheduling.service.SchedulerService;
 import dev.sheldan.abstracto.templating.model.MessageToSend;
 import dev.sheldan.abstracto.templating.service.TemplateService;
 import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.TextChannel;
@@ -200,13 +201,18 @@ public class MuteServiceBean implements MuteService {
         log.info("Unmuting {} in server {}", mutingServer.getId(), mute.getMutedUser().getUserReference().getId());
         MuteRole muteRole = muteRoleManagementService.retrieveMuteRoleForServer(mutingServer);
         log.trace("Using the mute role {} mapping to role {}", muteRole.getId(), muteRole.getRole().getId());
-        roleService.removeRoleFromUser(mute.getMutedUser(), muteRole.getRole());
+        Guild guild = botService.getGuildById(mute.getMutingServer().getId()).orElseGet(null);
+        if(botService.isUserInGuild(guild, mute.getMutedUser())) {
+            roleService.removeRoleFromUser(mute.getMutedUser(), muteRole.getRole());
+        } else {
+            log.info("User to unmute left the guild.");
+        }
         UnMuteLog unMuteLog = UnMuteLog
                 .builder()
                 .mute(mute)
                 .mutingUser(botService.getMemberInServer(mute.getMutingUser()))
                 .unMutedUser(botService.getMemberInServer(mute.getMutedUser()))
-                .guild(botService.getGuildById(mute.getMutingServer().getId()).orElseGet(null))
+                .guild(guild)
                 .server(mute.getMutingServer())
                 .build();
         sendUnmuteLog(unMuteLog);

abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/templates/mute/unmute_log_embed_en_US.ftl

@@ -1,8 +1,10 @@
 {
-  "author": {
+  <#if unMutedUser?has_content>
-    "name": "${unMutedUser.effectiveName}",
+    "author": {
-    "avatar":  "${unMutedUser.user.effectiveAvatarUrl}"
+        "name": "${unMutedUser.effectiveName}",
-  },
+        "avatar":  "${unMutedUser.user.effectiveAvatarUrl}"
+    },
+  </#if>
   "title": {
     "title": "User has been unmuted"
   },
@@ -14,11 +16,20 @@
   "fields": [
     {
       "name": "Unmuted User",
-      "value": "${unMutedUser.effectiveName} ${unMutedUser.asMention} (${unMutedUser.idLong?c})"
+      <#if unMutedUser?has_content>
+        "value": "${unMutedUser.effectiveName} ${unMutedUser.asMention} (${unMutedUser.idLong?c})"
+      <#else>
+        "value": "User has left the server (${mute.mutedUser.userReference.id?c})"
+      </#if>
+
     },
     {
         "name": "Muted by",
-        "value": "${mutingUser.effectiveName} ${mutingUser.asMention} (${mutingUser.idLong?c})"
+         <#if mutingUser?has_content>
+            "value": "${mutingUser.effectiveName} ${mutingUser.asMention} (${mutingUser.idLong?c})"
+         <#else>
+                "value": "User has left the server (${mute.mutingUser.userReference.id?c})"
+         </#if>
     },
     {
         "name": "Location of the mute",

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/BotServiceBean.java

@@ -68,10 +68,25 @@ public class BotServiceBean implements BotService {
         if(guildById != null) {
             return guildById.getMemberById(memberId);
         } else {
-            throw new RuntimeException(String.format("Member %s not found in guild %s", memberId, serverId));
+            throw new RuntimeException(String.format("Guild %s not found.", serverId));
         }
     }
 
+    @Override
+    public boolean isUserInGuild(AUserInAServer aUserInAServer) {
+        Guild guildById = instance.getGuildById(aUserInAServer.getServerReference().getId());
+        if(guildById != null) {
+            return isUserInGuild(guildById, aUserInAServer);
+        } else {
+            throw new RuntimeException(String.format("Guild %s not found.", aUserInAServer.getServerReference().getId()));
+        }
+    }
+
+    @Override
+    public boolean isUserInGuild(Guild guild, AUserInAServer aUserInAServer) {
+        return guild.getMemberById(aUserInAServer.getUserReference().getId()) != null;
+    }
+
     @Override
     public Member getMemberInServer(AUserInAServer aUserInAServer) {
         return getMemberInServer(aUserInAServer.getServerReference().getId(), aUserInAServer.getUserReference().getId());

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/BotService.java

@@ -19,6 +19,8 @@ public interface BotService {
     JDA getInstance();
     GuildChannelMember getServerChannelUser(Long serverId, Long channelId, Long userId);
     Member getMemberInServer(Long serverId, Long memberId);
+    boolean isUserInGuild(AUserInAServer aUserInAServer);
+    boolean isUserInGuild(Guild guild, AUserInAServer aUserInAServer);
     Member getMemberInServer(AUserInAServer aUserInAServer);
     Member getMemberInServer(AServer server, AUser member);
     CompletableFuture<Void> deleteMessage(Long serverId, Long channelId, Long messageId);