diff --git a/abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/listener/AssignablePostReactionAdded.java b/abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/listener/AssignablePostReactionAdded.java index 395764979..e21750549 100644 --- a/abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/listener/AssignablePostReactionAdded.java +++ b/abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/listener/AssignablePostReactionAdded.java @@ -85,10 +85,10 @@ public class AssignablePostReactionAdded implements AsyncReactionAddedListener { AssignableRolePlace assignableRolePlace = assignablePlacePost.getAssignablePlace(); List> futures = new ArrayList<>(); for (AssignableRole assignableRole : assignablePlacePost.getAssignableRoles()) { - log.trace("Checking emote {} if it was reaction for assignable role place.", assignableRole.getEmote().getId()); + log.debug("Checking emote {} if it was reaction for assignable role place.", assignableRole.getEmote().getId()); if (emoteService.isReactionEmoteAEmote(model.getReaction().getReactionEmote(), assignableRole.getEmote())) { if(assignableRolePlace.getUniqueRoles()) { - log.trace("Assignable role place {} has unique roles configured. Removing existing reactions and roles.", assignableRolePlace.getId()); + log.debug("Assignable role place {} has unique roles configured. Removing existing reactions and roles.", assignableRolePlace.getId()); Optional byUserInServer = assignedRoleUserManagementService.findByUserInServerOptional(model.getUserReacting()); byUserInServer.ifPresent(user -> futures.add(assignableRolePlaceService.removeExistingReactionsAndRoles(assignableRolePlace, user))); } @@ -103,7 +103,7 @@ public class AssignablePostReactionAdded implements AsyncReactionAddedListener { } } if(!validReaction) { - log.trace("Reaction was not found in the configuration of assignable role place {}, removing reaction.", assignableRolePlace.getId()); + log.debug("Reaction was not found in the configuration of assignable role place {}, removing reaction.", assignableRolePlace.getId()); futures.add(reactionService.removeReactionFromMessage(model.getReaction(), model.getMessage(), model.getMemberReacting().getUser())); } Long assignableRolePlaceId = assignableRolePlace.getId(); @@ -126,7 +126,7 @@ public class AssignablePostReactionAdded implements AsyncReactionAddedListener { AssignableRolePlace place = assignableRolePlaceManagementService.findByPlaceId(assignableRolePlaceId); AUserInAServer userInAServer = userInServerManagementService.loadOrCreateUser(serverUser); if(place.getUniqueRoles()) { - log.trace("Assignable role place {} has unique roles. Deleting all existing references.", assignableRolePlaceId); + log.debug("Assignable role place {} has unique roles. Deleting all existing references.", assignableRolePlaceId); assignableRoleServiceBean.clearAllRolesOfUserInPlace(place, userInAServer); } AssignableRole role = assignableRoleManagementService.getRoleForReactionEmote(reaction.getReactionEmote(), place); @@ -167,7 +167,7 @@ public class AssignablePostReactionAdded implements AsyncReactionAddedListener { log.error("Failed to remove reaction on place post {} because place is inactive.", assignableRolePlacePostId, throwable); return null; }); - log.trace("Reaction for assignable place {} in sever {} was added, but place is inactive.", assignablePlacePost.getAssignablePlace().getKey(), model.getServerId()); + log.debug("Reaction for assignable place {} in sever {} was added, but place is inactive.", assignablePlacePost.getAssignablePlace().getKey(), model.getServerId()); } } return DefaultListenerResult.PROCESSED; diff --git a/abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/listener/AssignablePostReactionRemoved.java b/abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/listener/AssignablePostReactionRemoved.java index 6007c5d1e..b982c156e 100644 --- a/abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/listener/AssignablePostReactionRemoved.java +++ b/abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/listener/AssignablePostReactionRemoved.java @@ -68,7 +68,7 @@ public class AssignablePostReactionRemoved implements AsyncReactionRemovedListen }); return DefaultListenerResult.PROCESSED; } else { - log.trace("Reaction for assignable place {} in sever {} was added, but place is inactive.", assignablePlacePost.getAssignablePlace().getKey(), model.getServerId()); + log.debug("Reaction for assignable place {} in sever {} was added, but place is inactive.", assignablePlacePost.getAssignablePlace().getKey(), model.getServerId()); return DefaultListenerResult.PROCESSED; } } else { diff --git a/abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/service/AssignableRolePlaceServiceBean.java b/abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/service/AssignableRolePlaceServiceBean.java index cfb763035..715fa1723 100644 --- a/abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/service/AssignableRolePlaceServiceBean.java +++ b/abstracto-application/abstracto-modules/assignable-roles/assignable-roles-impl/src/main/java/dev/sheldan/abstracto/assignableroles/service/AssignableRolePlaceServiceBean.java @@ -152,7 +152,7 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic boolean emoteUsable = true; if(fakeEmote.getEmote() != null) { // it only may be unusable if its a custom emote - log.trace("Using custom emote {} to create assignable role {} for assignable role place {} in server {}.", + log.debug("Using custom emote {} to create assignable role {} for assignable role place {} in server {}.", fakeEmote.getEmote().getId(), roleId, placeId, serverId); emoteUsable = emoteService.isEmoteUsableByBot(fakeEmote.getEmote()) && fakeEmote.getEmote().isAvailable(); } @@ -161,7 +161,7 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic existingMessagePosts.sort(Comparator.comparingLong(AssignableRolePlacePost::getId)); if(!assignableRolePlace.getMessagePosts().isEmpty()){ - log.trace("There are already message posts on for the assignable role place {}.", assignableRolePlace.getId()); + log.debug("There are already message posts on for the assignable role place {}.", assignableRolePlace.getId()); AssignableRolePlacePost latestPost = existingMessagePosts.get(assignableRolePlace.getMessagePosts().size() - 1); AssignablePostMessage model = prepareAssignablePostMessageModel(assignableRolePlace); boolean forceNewMessage = latestPost.getAssignableRoles().size() >= 20; @@ -180,11 +180,11 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic if(channelOptional.isPresent()) { TextChannel textChannel = channelOptional.get(); if(latestPost.getAssignableRoles().size() < 20) { - log.trace("Adding reaction to existing post {} in channel {} in server {} for assignable role place {}.", + log.debug("Adding reaction to existing post {} in channel {} in server {} for assignable role place {}.", latestPost.getId(), assignableRolePlace.getChannel().getId(), serverId, placeId); return addReactionToExistingAssignableRolePlacePost(fakeEmote, description, roleId, latestPost, messageToSend, textChannel); } else { - log.trace("Adding new post to assignable role place {} in channel {} in server {}.", + log.debug("Adding new post to assignable role place {} in channel {} in server {}.", placeId, assignableRolePlace.getChannel().getId(), server.getId()); return addNewMessageToAssignableRolePlace(placeId, fakeEmote, description, roleId, messageToSend, textChannel); } @@ -192,7 +192,7 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic throw new ChannelNotInGuildException(latestPost.getUsedChannel().getId()); } } else { - log.trace("Added emote to assignable place {} in server {}, but no message post yet.", placeId, serverId); + log.debug("Added emote to assignable place {} in server {}, but no message post yet.", placeId, serverId); self.addAssignableRoleInstanceWithoutPost(placeId, roleId, fakeEmote, description, serverId); } } else { @@ -222,10 +222,10 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic int messagePostSize = latestPost.getAssignablePlace().getMessagePosts().size(); return channelService.retrieveMessageInChannel(textChannel, latestPostId) .thenCompose(message -> { - log.trace("Adding reaction to message {} in server {} for assignable role place {}.", message.getId(), serverId, placeId); + log.debug("Adding reaction to message {} in server {} for assignable role place {}.", message.getId(), serverId, placeId); return reactionService.addReactionToMessageAsync(fakeEmote.getFakeEmote(), serverId, message); }).thenCompose(aVoid -> { - log.trace("Editing embed for assignable role place post {} in assignable role place {} in server {}.", latestPostId, placeId, serverId); + log.debug("Editing embed for assignable role place post {} in assignable role place {} in server {}.", latestPostId, placeId, serverId); MessageEmbed embedToUse = messageToSend.getEmbeds().get(messagePostSize - 1); return channelService.editEmbedMessageInAChannel(embedToUse, textChannel, latestPostId); }).thenAccept(message -> @@ -250,7 +250,7 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic Long serverId = textChannel.getGuild().getIdLong(); return channelService.sendEmbedToChannel(embedToUse, textChannel) .thenCompose(message -> { - log.trace("Adding reaction for role {} to newly created message {} for assignable role place {} in server {}.", roleId, message.getId(), placeId, serverId); + log.debug("Adding reaction for role {} to newly created message {} for assignable role place {} in server {}.", roleId, message.getId(), placeId, serverId); return reactionService.addReactionToMessageAsync(fakeEmote.getFakeEmote(), serverId, message) .thenAccept(aVoid -> self.addNewlyCreatedAssignablePlacePost(placeId, description, roleId, message, fakeEmote) @@ -275,7 +275,7 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic AssignableRolePlace loadedPlace = rolePlaceManagementService.findByPlaceId(placeId); AEmote emote = emoteManagementService.createEmote(null, fakeEmote.getFakeEmote(), serverId, false); emote.setChangeable(false); - log.trace("Setting emote {} to not changeable, because it is part of an assignable role place {} in server {}.", emote.getId(), placeId, serverId); + log.debug("Setting emote {} to not changeable, because it is part of an assignable role place {} in server {}.", emote.getId(), placeId, serverId); AssignableRolePlacePost newPost = assignableRolePlacePostManagementServiceBean.createAssignableRolePlacePost(loadedPlace, message.getIdLong()); assignableRoleManagementServiceBean.addRoleToPlace(loadedPlace, emote, role, description, newPost); @@ -298,7 +298,7 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic log.info("Storing newly created assignable role {} to post {} to assignable role place {} in server {}.", roleId, messageId, placeId, serverId); AEmote emote = emoteManagementService.createEmote(null, fakeEmote.getFakeEmote(), serverId, false); emote.setChangeable(false); - log.trace("Setting emote {} to not changeable, because it is part of an assignable role place {} in server {}.", emote.getId(), placeId, serverId); + log.debug("Setting emote {} to not changeable, because it is part of an assignable role place {} in server {}.", emote.getId(), placeId, serverId); assignableRoleManagementServiceBean.addRoleToPlace(placeId, emote.getId(), roleId, description, messageId); } @@ -317,7 +317,7 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic log.info("Storing newly created assignable role {} without post to assignable role place {} in server {}.", roleId, placeId, serverId); AEmote emote = emoteManagementService.createEmote(null, fakeEmote.getFakeEmote(), serverId, false); emote.setChangeable(false); - log.trace("Setting emote {} to not changeable, because it is part of an assignable role place {} in server {}.", emote.getId(), placeId, serverId); + log.debug("Setting emote {} to not changeable, because it is part of an assignable role place {} in server {}.", emote.getId(), placeId, serverId); assignableRoleManagementServiceBean.addRoleToPlace(placeId, emote.getId(), roleId, description); } @@ -373,9 +373,9 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic List assignableRoles = assignableRolePlace.getAssignableRoles(); assignableRoles.sort(Comparator.comparing(AssignableRole::getPosition)); Long messageId = post.getId(); - log.trace("Removing field describing assignable role {} in assignable role place {} from post {}.", assignableRole.getId(), assignableRolePlace.getId(), messageId); + log.debug("Removing field describing assignable role {} in assignable role place {} from post {}.", assignableRole.getId(), assignableRolePlace.getId(), messageId); CompletableFuture fieldEditing = channelService.removeFieldFromMessage(textChannel, messageId, assignableRoles.indexOf(assignableRole)); - log.trace("Clearing reaction for emote {} on assignable role post {} in assignable role place {}.", assignableRole.getEmote().getId(), messageId, assignableRolePlace.getId()); + log.debug("Clearing reaction for emote {} on assignable role post {} in assignable role place {}.", assignableRole.getEmote().getId(), messageId, assignableRolePlace.getId()); CompletableFuture reactionRemoval = reactionService.clearReactionFromMessageWithFuture(assignableRole.getEmote(), assignableRolePlace.getServer().getId(), assignableRole.getAssignableRolePlacePost().getUsedChannel().getId(), assignableRole.getAssignableRolePlacePost().getId()); return CompletableFuture.allOf(fieldEditing, reactionRemoval); } else { @@ -429,7 +429,7 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic TextChannel textChannel = channelOptional.get(); Iterator iterator = messageToSend.getEmbeds().iterator(); place.getMessagePosts().forEach(post -> { - log.trace("Refreshing the posts for message post {} in channel {} in assignable role place {} in server {}.", post.getId(), textChannel.getId(), place.getId(), place.getServer().getId()); + log.debug("Refreshing the posts for message post {} in channel {} in assignable role place {} in server {}.", post.getId(), textChannel.getId(), place.getId(), place.getServer().getId()); CompletableFuture messageCompletableFuture = channelService.editEmbedMessageInAChannel(iterator.next(), textChannel, post.getId()); futures.add(messageCompletableFuture); }); @@ -444,7 +444,7 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic List existingMessagePosts = place.getMessagePosts(); if(!existingMessagePosts.isEmpty()) { MessageToSend renderedMessage = renderAssignablePlacePosts(place); - log.trace("There are {} current posts known for the assignable role place {}.", existingMessagePosts.size(), place.getId()); + log.debug("There are {} current posts known for the assignable role place {}.", existingMessagePosts.size(), place.getId()); existingMessagePosts.sort(Comparator.comparingLong(AssignableRolePlacePost::getId)); AssignableRolePlacePost firstPost = existingMessagePosts.get(0); Long channelId = firstPost.getUsedChannel().getId(); @@ -654,7 +654,7 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic .position(role.getPosition()) .awardedRole(jdaRole) .build(); - log.trace("Displaying config for role {} with emote {} in position {}.", role.getId(), emoteForRole.getId(), role.getPosition()); + log.debug("Displaying config for role {} with emote {} in position {}.", role.getId(), emoteForRole.getId(), role.getPosition()); roles.add(postRole); } AssignableRolePlaceConfig configModel = AssignableRolePlaceConfig @@ -712,10 +712,10 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic log.info("Removing all existing reactions and roles by user {} on assignable role place {} in server {}.", user.getId(), place.getId(), user.getUser().getServerReference().getId()); user.getRoles().forEach(assignableRole -> { futures.add(roleService.removeAssignableRoleFromUser(assignableRole, user.getUser())); - log.trace("Removing role {} from user {} in server {} because of assignable role clearing.", assignableRole.getRole().getId(), user.getUser().getUserReference().getId(), place.getServer().getId()); + log.debug("Removing role {} from user {} in server {} because of assignable role clearing.", assignableRole.getRole().getId(), user.getUser().getUserReference().getId(), place.getServer().getId()); AEmote emoteToUseObject = emoteManagementService.loadEmote(assignableRole.getEmote().getId()); AssignableRolePlacePost assignablePlacePost = assignableRole.getAssignableRolePlacePost(); - log.trace("Removing reaction with emote {} from user {} in server {} because of assignable role clearing.", emoteToUseObject.getId(), user.getUser().getUserReference().getId(), place.getServer().getId()); + log.debug("Removing reaction with emote {} from user {} in server {} because of assignable role clearing.", emoteToUseObject.getId(), user.getUser().getUserReference().getId(), place.getServer().getId()); futures.add(reactionService.removeReactionOfUserFromMessageWithFuture(emoteToUseObject, place.getServer().getId(), assignablePlacePost.getUsedChannel().getId(), assignablePlacePost.getId(), user.getUser().getUserReference().getId())); }); @@ -824,7 +824,7 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic current = rolesToAddIterator.next(); } } else if(startOfNewMessage && lastAddedRole != null) { - log.trace("Forcing new message for post of assignable role place {}.", place.getId()); + log.debug("Forcing new message for post of assignable role place {}.", place.getId()); lastAddedRole.setForceNewMessage(true); } } @@ -879,7 +879,7 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic public CompletableFuture addEmotes(List> assignablePlacePostsMessageFutures, Long assignablePlaceId) { AssignableRolePlace innerRolePlace = rolePlaceManagementService.findByPlaceId(assignablePlaceId); log.info("Adding emotes to assignable role place {}.", innerRolePlace); - log.trace("We have {} posts and {} roles.", assignablePlacePostsMessageFutures.size(), innerRolePlace.getAssignableRoles().size()); + log.debug("We have {} posts and {} roles.", assignablePlacePostsMessageFutures.size(), innerRolePlace.getAssignableRoles().size()); List roleStream = innerRolePlace.getAssignableRoles().stream().sorted(Comparator.comparingInt(AssignableRole::getPosition)).collect(Collectors.toList()); List> reactionFutures = new ArrayList<>(); @@ -890,7 +890,7 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic MessageEmbed embed = sentMessage.getEmbeds().get(0); List firstRoles = roleStream.subList(usedEmotes, usedEmotes + embed.getFields().size()); usedEmotes += embed.getFields().size(); - log.trace("Adding {} emotes to message {} for place {}. In total {} were added.", embed.getFields().size(), sentMessage.getId(), innerRolePlace.getId(), usedEmotes); + log.debug("Adding {} emotes to message {} for place {}. In total {} were added.", embed.getFields().size(), sentMessage.getId(), innerRolePlace.getId(), usedEmotes); List usedEmoteIds = firstRoles.stream().map(assignableRole -> assignableRole.getEmote().getId()).collect(Collectors.toList()); CompletableFuture firstMessageFuture = addingReactionsToAssignableRolePlacePost(sentMessage, usedEmoteIds); reactionFutures.add(firstMessageFuture); @@ -925,7 +925,7 @@ public class AssignableRolePlaceServiceBean implements AssignableRolePlaceServic Message message = messageCompletableFuture.join(); // this uses the actual embed count as a limit, so this relies on fields to be used for description, if this changes, this needs to be changed MessageEmbed embed = message.getEmbeds().get(0); - log.trace("Storing post {} with {} fields.", message.getId(), embed.getFields().size()); + log.debug("Storing post {} with {} fields.", message.getId(), embed.getFields().size()); List firstRoles = rolesToAdd.subList(usedEmotes, usedEmotes + embed.getFields().size()); usedEmotes += embed.getFields().size(); AssignableRolePlacePost post = assignableRolePlacePostManagementServiceBean.createAssignableRolePlacePost(updatedPlace, message.getIdLong()); diff --git a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/converter/LeaderBoardModelConverter.java b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/converter/LeaderBoardModelConverter.java index 12a7a38ee..20f72a4e2 100644 --- a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/converter/LeaderBoardModelConverter.java +++ b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/converter/LeaderBoardModelConverter.java @@ -42,7 +42,7 @@ public class LeaderBoardModelConverter { */ public List> fromLeaderBoard(LeaderBoard leaderBoard) { List> models = new ArrayList<>(); - log.trace("Converting {} entries to a list of leaderboard entries.", leaderBoard.getEntries().size()); + log.debug("Converting {} entries to a list of leaderboard entries.", leaderBoard.getEntries().size()); leaderBoard.getEntries().forEach(leaderBoardEntry -> { CompletableFuture entry = fromLeaderBoardEntry(leaderBoardEntry); models.add(entry); diff --git a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/AUserExperienceServiceBean.java b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/AUserExperienceServiceBean.java index d5a0bc350..000df0c69 100644 --- a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/AUserExperienceServiceBean.java +++ b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/AUserExperienceServiceBean.java @@ -94,7 +94,7 @@ public class AUserExperienceServiceBean implements AUserExperienceService { Long minute = Instant.now().getEpochSecond() / 60; Map> runtimeExperience = runTimeExperienceService.getRuntimeExperience(); if(runtimeExperience.containsKey(minute)) { - log.trace("Minute {} already tracked, adding user {} in server {}.", + log.debug("Minute {} already tracked, adding user {} in server {}.", minute, userInAServer.getUserReference().getId(), userInAServer.getServerReference().getId()); List existing = runtimeExperience.get(minute); for (ServerExperience server : existing) { @@ -105,7 +105,7 @@ public class AUserExperienceServiceBean implements AUserExperienceService { } } else { - log.trace("Minute {} did not exist yet. Creating new entry for user {} in server {}.", minute, userInAServer.getUserReference().getId(), userInAServer.getServerReference().getId()); + log.debug("Minute {} did not exist yet. Creating new entry for user {} in server {}.", minute, userInAServer.getUserReference().getId(), userInAServer.getServerReference().getId()); ServerExperience serverExperience = ServerExperience .builder() .serverId(userInAServer.getServerReference().getId()) @@ -124,13 +124,13 @@ public class AUserExperienceServiceBean implements AUserExperienceService { AExperienceLevel lastLevel = levels.get(0); for (AExperienceLevel level : levels) { if(level.getExperienceNeeded() >= experienceCount) { - log.trace("Calculated level {} for {} experience.", lastLevel.getLevel(), experienceCount); + log.debug("Calculated level {} for {} experience.", lastLevel.getLevel(), experienceCount); return lastLevel; } else { lastLevel = level; } } - log.trace("Calculated level {} for {} experience.", lastLevel.getLevel(), experienceCount); + log.debug("Calculated level {} for {} experience.", lastLevel.getLevel(), experienceCount); return lastLevel; } @@ -175,7 +175,7 @@ public class AUserExperienceServiceBean implements AUserExperienceService { gainedExperience = (int) Math.floor(gainedExperience * multiplier); Member member = memberService.getMemberInServer(userInAServer); if(member != null && !roleService.hasAnyOfTheRoles(member, disabledRoles)) { - log.trace("Handling {}. The user gains {}", userInAServer.getUserReference().getId(), gainedExperience); + log.debug("Handling {}. The user gains {}", userInAServer.getUserReference().getId(), gainedExperience); Optional aUserExperienceOptional = userExperienceManagementService.findByUserInServerIdOptional(userInAServerId); if(aUserExperienceOptional.isPresent()) { AUserExperience aUserExperience = aUserExperienceOptional.get(); @@ -196,7 +196,7 @@ public class AUserExperienceServiceBean implements AUserExperienceService { resultFutures.add(calculationResult); futures.add(resultFuture); } else { - log.trace("Experience gain was disabled. User did not gain any experience."); + log.debug("Experience gain was disabled. User did not gain any experience."); } } else { log.info("User experience for user {} was not found. Planning to create new instance.", userInAServer.getUserInServerId()); @@ -218,7 +218,7 @@ public class AUserExperienceServiceBean implements AUserExperienceService { futures.add(resultFuture); } } else { - log.trace("User {} has a role which makes the user unable to gain experience or the member could not be found in the server.", userInAServer.getUserInServerId()); + log.debug("User {} has a role which makes the user unable to gain experience or the member could not be found in the server.", userInAServer.getUserInServerId()); } }); }); @@ -244,7 +244,7 @@ public class AUserExperienceServiceBean implements AUserExperienceService { // if the member is actually _not_ in the guild anymore (would mean, joined, send a message, and left immediately) this check is required // this is backed by the cache if(!memberService.isUserInGuild(aUserInAServer)) { - log.trace("User {} is not in server {} anymore. No role calculation done.", aUserInAServer.getUserInServerId(), aUserInAServer.getServerReference().getId()); + log.debug("User {} is not in server {} anymore. No role calculation done.", aUserInAServer.getUserInServerId(), aUserInAServer.getServerReference().getId()); return CompletableFuture.completedFuture(RoleCalculationResult .builder() .userInServerId(aUserInAServer.getUserInServerId()) @@ -253,7 +253,7 @@ public class AUserExperienceServiceBean implements AUserExperienceService { } AExperienceRole role = experienceRoleService.calculateRole(roles, currentLevel); if(role == null) { - log.trace("No experience role calculated. Applying none to user {} in server {}.", + log.debug("No experience role calculated. Applying none to user {} in server {}.", aUserInAServer.getUserReference().getId(), aUserInAServer.getServerReference().getId()); return CompletableFuture.completedFuture(RoleCalculationResult .builder() @@ -263,7 +263,7 @@ public class AUserExperienceServiceBean implements AUserExperienceService { } Long experienceRoleId = role.getId(); Long userInServerId = aUserInAServer.getUserInServerId(); - log.trace("Applying {} as the first experience role for user {} in server {}.", + log.debug("Applying {} as the first experience role for user {} in server {}.", experienceRoleId, aUserInAServer.getUserReference().getId(), aUserInAServer.getServerReference().getId()); return roleService.addRoleToUserFuture(aUserInAServer, role.getRole()).thenApply(aVoid -> RoleCalculationResult .builder() @@ -331,12 +331,12 @@ public class AUserExperienceServiceBean implements AUserExperienceService { .build(); Long userInServerId = user.getUserInServerId(); Long serverId = user.getServerReference().getId(); - log.trace("Updating experience role for user {} in server {}", user.getUserReference().getId(), serverId); + log.debug("Updating experience role for user {} in server {}", user.getUserReference().getId(), serverId); AExperienceRole role = experienceRoleService.calculateRole(roles, currentLevel); boolean currentlyHasNoExperienceRole = userExperience.getCurrentExperienceRole() == null; // if calculation results in no role, do not add a role if(role == null) { - log.trace("User {} in server {} does not have an experience role, according to new calculation.", + log.debug("User {} in server {} does not have an experience role, according to new calculation.", user.getUserReference().getId(), serverId); // if the user has a experience role currently, remove it if(!currentlyHasNoExperienceRole){ @@ -395,7 +395,7 @@ public class AUserExperienceServiceBean implements AUserExperienceService { List roles = experienceRoleManagementService.getExperienceRolesForServer(server); for (int i = 0; i < aUserExperiences.size(); i++) { AUserExperience userExperience = aUserExperiences.get(i); - log.trace("Synchronizing {} out of {}", i, aUserExperiences.size()); + log.debug("Synchronizing {} out of {}", i, aUserExperiences.size()); results.add(updateUserRole(userExperience, roles, userExperience.getCurrentLevel().getLevel())); } return results; @@ -424,9 +424,9 @@ public class AUserExperienceServiceBean implements AUserExperienceService { if(result != null) { AUserInAServer user = userInServerManagementService.loadOrCreateUser(result.getUserInServerId()); AUserExperience userExperience = userExperienceManagementService.findUserInServer(user); - log.trace("Updating experience role for {} in server {} to {}", user.getUserInServerId(), user.getServerReference().getId(), result.getExperienceRoleId()); + log.debug("Updating experience role for {} in server {} to {}", user.getUserInServerId(), user.getServerReference().getId(), result.getExperienceRoleId()); if(result.getExperienceRoleId() != null) { - log.trace("User experience {} gets new experience role with id {}.", userExperience.getId(), result.getExperienceRoleId()); + log.debug("User experience {} gets new experience role with id {}.", userExperience.getId(), result.getExperienceRoleId()); AExperienceRole role; if(!experienceRoleHashMap.containsKey(result.getExperienceRoleId())) { role = experienceRoleManagementService.getExperienceRoleById(result.getExperienceRoleId()); @@ -436,7 +436,7 @@ public class AUserExperienceServiceBean implements AUserExperienceService { } userExperience.setCurrentExperienceRole(role); } else { - log.trace("User experience {} does not get a user experience role.", userExperience.getId()); + log.debug("User experience {} does not get a user experience role.", userExperience.getId()); userExperience.setCurrentExperienceRole(null); } } @@ -452,12 +452,12 @@ public class AUserExperienceServiceBean implements AUserExperienceService { int interval = Math.min(Math.max(experiences.size() / 10, 1), 100); for (int i = 0; i < experiences.size(); i++) { if((i % interval) == 1) { - log.trace("Updating feedback message with new index {} out of {}", i, experiences.size()); + log.debug("Updating feedback message with new index {} out of {}", i, experiences.size()); status = getUserSyncStatusUpdateModel(i, experiences.size(), serverId); messageService.updateStatusMessage(channel, statusMessage.getIdLong(), status); } futures.add(toExecute.apply(experiences.get(i))); - log.trace("Synchronizing {} out of {}", i, experiences.size()); + log.debug("Synchronizing {} out of {}", i, experiences.size()); } status = getUserSyncStatusUpdateModel(experiences.size(), experiences.size(), serverId); messageService.updateStatusMessage(channel, statusMessage.getIdLong(), status); @@ -506,10 +506,10 @@ public class AUserExperienceServiceBean implements AUserExperienceService { } page--; int pageSize = 10; - log.trace("Loading leaderboard page {} for server {}.", page, server.getId()); + log.debug("Loading leaderboard page {} for server {}.", page, server.getId()); List experiences = userExperienceManagementService.findLeaderBoardUsersPaginated(server, page * pageSize, (page + 1) * pageSize); List entries = new ArrayList<>(); - log.trace("Found {} experiences.", experiences.size()); + log.debug("Found {} experiences.", experiences.size()); for (int i = 0; i < experiences.size(); i++) { AUserExperience userExperience = experiences.get(i); entries.add(LeaderBoardEntry.builder().experience(userExperience).rank((page * pageSize) + i + 1).build()); @@ -519,7 +519,7 @@ public class AUserExperienceServiceBean implements AUserExperienceService { @Override public LeaderBoardEntry getRankOfUserInServer(AUserInAServer userInAServer) { - log.trace("Retrieving rank for {}", userInAServer.getUserReference().getId()); + log.debug("Retrieving rank for {}", userInAServer.getUserReference().getId()); AUserExperience aUserExperience = userExperienceManagementService.findUserInServer(userInAServer); Integer rank = 0; if(aUserExperience != null) { diff --git a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/ExperienceRoleServiceBean.java b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/ExperienceRoleServiceBean.java index 5129b3e10..e133e085d 100644 --- a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/ExperienceRoleServiceBean.java +++ b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/ExperienceRoleServiceBean.java @@ -130,7 +130,7 @@ public class ExperienceRoleServiceBean implements ExperienceRoleService { if(roles == null || roles.isEmpty()) { return null; } - log.trace("Calculating role for level {} in server {}. Using {} roles in our config.", currentLevel, roles.get(0).getServer().getId(), roles.size()); + log.debug("Calculating role for level {} in server {}. Using {} roles in our config.", currentLevel, roles.get(0).getServer().getId(), roles.size()); AExperienceRole lastRole = null; for (AExperienceRole experienceRole : roles) { if(currentLevel >= experienceRole.getLevel().getLevel()) { @@ -144,7 +144,7 @@ public class ExperienceRoleServiceBean implements ExperienceRoleService { @Override public AExperienceLevel getLevelOfNextRole(AExperienceLevel startLevel, AServer server) { - log.trace("Calculating level of next role for level {} in server {}.", startLevel.getLevel(), server.getId()); + log.debug("Calculating level of next role for level {} in server {}.", startLevel.getLevel(), server.getId()); List roles = experienceRoleManagementService.getExperienceRolesForServer(server); roles = roles.stream().filter(role -> role.getLevel().getLevel() > startLevel.getLevel()).collect(Collectors.toList()); roles.sort(Comparator.comparing(role -> role.getLevel().getLevel())); diff --git a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/management/ExperienceRoleManagementServiceBean.java b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/management/ExperienceRoleManagementServiceBean.java index da764ad45..fc523f5b8 100644 --- a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/management/ExperienceRoleManagementServiceBean.java +++ b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/service/management/ExperienceRoleManagementServiceBean.java @@ -81,7 +81,7 @@ public class ExperienceRoleManagementServiceBean implements ExperienceRoleManage AExperienceRole experienceRole; log.info("Setting role {} in server {} to level {}.", role.getId(), role.getServer().getId(), level.getLevel()); if(byRoleServerAndRoleOptional.isPresent()) { - log.trace("Role already existed. Updating."); + log.debug("Role already existed. Updating."); experienceRole = byRoleServerAndRoleOptional.get(); experienceRole.setLevel(level); } else { @@ -92,7 +92,7 @@ public class ExperienceRoleManagementServiceBean implements ExperienceRoleManage .server(role.getServer()) .role(role) .build(); - log.trace("Role did not exist. Creating new."); + log.debug("Role did not exist. Creating new."); return experienceRoleRepository.save(experienceRole); } return experienceRole; diff --git a/abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/listener/MessageEmbedListener.java b/abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/listener/MessageEmbedListener.java index f1d3c1ed3..0fbf9a532 100644 --- a/abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/listener/MessageEmbedListener.java +++ b/abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/listener/MessageEmbedListener.java @@ -64,7 +64,7 @@ public class MessageEmbedListener implements MessageReceivedListener { String messageRaw = message.getContentRaw(); List links = messageEmbedService.getLinksInMessage(messageRaw); if(!links.isEmpty()) { - log.trace("We found {} links to embed in message {} in channel {} in guild {}.", links.size(), message.getId(), message.getChannel().getId(), message.getGuild().getId()); + log.debug("We found {} links to embed in message {} in channel {} in guild {}.", links.size(), message.getId(), message.getChannel().getId(), message.getGuild().getId()); Long userEmbeddingUserInServerId = userInServerManagementService.loadOrCreateUser(message.getMember()).getUserInServerId(); for (MessageEmbedLink messageEmbedLink : links) { if(!messageEmbedLink.getServerId().equals(message.getGuild().getIdLong())) { diff --git a/abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/listener/MessageEmbedRemovalReactionListener.java b/abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/listener/MessageEmbedRemovalReactionListener.java index 7e21087ea..c91701d13 100644 --- a/abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/listener/MessageEmbedRemovalReactionListener.java +++ b/abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/listener/MessageEmbedRemovalReactionListener.java @@ -82,13 +82,13 @@ public class MessageEmbedRemovalReactionListener implements AsyncReactionAddedLi } }); } else { - log.trace("Somebody besides the original author and the user embedding added the removal reaction to the message {} in channel {} in server {}.", + log.debug("Somebody besides the original author and the user embedding added the removal reaction to the message {} in channel {} in server {}.", messageId, channelId, serverId); return DefaultListenerResult.IGNORED; } } else { - log.trace("Removal emote was placed on a message which was not recognized as an embedded message."); + log.debug("Removal emote was placed on a message which was not recognized as an embedded message."); return DefaultListenerResult.IGNORED; } return DefaultListenerResult.PROCESSED; diff --git a/abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/service/MessageEmbedServiceBean.java b/abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/service/MessageEmbedServiceBean.java index e2fe74576..f45e43246 100644 --- a/abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/service/MessageEmbedServiceBean.java +++ b/abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/service/MessageEmbedServiceBean.java @@ -118,7 +118,7 @@ public class MessageEmbedServiceBean implements MessageEmbedService { MessageToSend embed = templateService.renderEmbedTemplate(MESSAGE_EMBED_TEMPLATE, messageEmbeddedModel, target.getGuild().getIdLong()); AUserInAServer cause = userInServerManagementService.loadOrCreateUser(userEmbeddingUserInServerId); List> completableFutures = channelService.sendMessageToSendToChannel(embed, target); - log.trace("Embedding message {} from channel {} from server {}, because of user {}", cachedMessage.getMessageId(), + log.debug("Embedding message {} from channel {} from server {}, because of user {}", cachedMessage.getMessageId(), cachedMessage.getChannelId(), cachedMessage.getServerId(), cause.getUserReference().getId()); return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[0])).thenCompose(aVoid -> { Message createdMessage = completableFutures.get(0).join(); diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/InviteLinkFilterListener.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/InviteLinkFilterListener.java index 313fbd4ad..fe88931a4 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/InviteLinkFilterListener.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/InviteLinkFilterListener.java @@ -122,7 +122,7 @@ public class InviteLinkFilterListener implements MessageReceivedListener { MessageToSend messageToSend = templateService.renderEmbedTemplate(INVITE_LINK_DELETED_NOTIFICATION_EMBED_TEMPLATE_KEY, model, message.getGuild().getIdLong()); List> messageFutures = postTargetService.sendEmbedInPostTarget(messageToSend, InviteFilterPostTarget.INVITE_DELETE_LOG, serverId); FutureUtils.toSingleFutureGeneric(messageFutures).thenAccept(unused -> - log.trace("Successfully send notification about deleted invite link in message {}.", message.getIdLong()) + log.debug("Successfully send notification about deleted invite link in message {}.", message.getIdLong()) ).exceptionally(throwable -> { log.error("Failed to send notification about deleted invite link in message {}.", message.getIdLong()); return null; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListener.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListener.java index e3df9c55e..c4d0995cf 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListener.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListener.java @@ -70,7 +70,7 @@ public class MessageDeleteLogListener implements AsyncMessageDeletedListener { @Transactional public void executeListener(CachedMessage messageFromCache, Member authorMember) { - log.trace("Message {} in channel {} in guild {} was deleted.", messageFromCache.getMessageId(), messageFromCache.getChannelId(), messageFromCache.getServerId()); + log.debug("Message {} in channel {} in guild {} was deleted.", messageFromCache.getMessageId(), messageFromCache.getChannelId(), messageFromCache.getServerId()); TextChannel textChannel = channelService.getTextChannelFromServer(messageFromCache.getServerId(), messageFromCache.getChannelId()); MessageDeletedLog logModel = MessageDeletedLog @@ -83,7 +83,7 @@ public class MessageDeleteLogListener implements AsyncMessageDeletedListener { MessageToSend message = templateService.renderEmbedTemplate(MESSAGE_DELETED_TEMPLATE, logModel, messageFromCache.getServerId()); postTargetService.sendEmbedInPostTarget(message, LoggingPostTarget.DELETE_LOG, messageFromCache.getServerId()); if(messageFromCache.getAttachments() != null){ - log.trace("Notifying about deletions of {} attachments.", messageFromCache.getAttachments().size()); + log.debug("Notifying about deletions of {} attachments.", messageFromCache.getAttachments().size()); for (int i = 0; i < messageFromCache.getAttachments().size(); i++) { MessageDeletedAttachmentLog log = MessageDeletedAttachmentLog .builder() diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java index 3b509c49e..2d1748391 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java @@ -42,10 +42,10 @@ public class MessageEditedListener implements AsyncMessageTextUpdatedListener { Message messageAfter = model.getAfter(); CachedMessage messageBefore = model.getBefore(); if(messageBefore.getContent().equals(messageAfter.getContentRaw())) { - log.trace("Message content was the same. Possible reason was: message was not in cache."); + log.debug("Message content was the same. Possible reason was: message was not in cache."); return DefaultListenerResult.IGNORED; } - log.trace("Message {} in channel {} in guild {} was edited.", messageBefore.getMessageId(), messageBefore.getChannelId(), model.getServerId()); + log.debug("Message {} in channel {} in guild {} was edited.", messageBefore.getMessageId(), messageBefore.getChannelId(), model.getServerId()); TextChannel textChannel = channelService.getTextChannelFromServer(model.getServerId(), messageBefore.getChannelId()); MessageEditedLog log = MessageEditedLog .builder() diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/BanServiceBean.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/BanServiceBean.java index f414ac8f7..296f77910 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/BanServiceBean.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/BanServiceBean.java @@ -54,11 +54,11 @@ public class BanServiceBean implements BanService { CompletableFuture completableFuture; if(featureModeService.featureModeActive(ModerationFeatureDefinition.MODERATION, guildId, ModerationMode.BAN_LOG)) { MessageToSend banLogMessage = templateService.renderEmbedTemplate(template, banLog, guildId); - log.trace("Sending ban log message in guild {}.", guildId); + log.debug("Sending ban log message in guild {}.", guildId); List> notificationFutures = postTargetService.sendEmbedInPostTarget(banLogMessage, ModerationPostTarget.BAN_LOG, guildId); completableFuture = FutureUtils.toSingleFutureGeneric(notificationFutures); } else { - log.trace("Feature {} has mode {} for logging disabled for server {}. Not sending notification.", ModerationFeatureDefinition.MODERATION, ModerationMode.BAN_LOG, guildId); + log.debug("Feature {} has mode {} for logging disabled for server {}. Not sending notification.", ModerationFeatureDefinition.MODERATION, ModerationMode.BAN_LOG, guildId); completableFuture = CompletableFuture.completedFuture(null); } return completableFuture; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/KickServiceBean.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/KickServiceBean.java index aab79bb2a..e18a23479 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/KickServiceBean.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/KickServiceBean.java @@ -45,10 +45,10 @@ public class KickServiceBean implements KickService { CompletableFuture completableFuture; if(featureModeService.featureModeActive(ModerationFeatureDefinition.MODERATION, kickLogModel.getGuild().getIdLong(), ModerationMode.KICK_LOG)) { MessageToSend warnLogMessage = templateService.renderEmbedTemplate(KICK_LOG_TEMPLATE, kickLogModel, kickLogModel.getGuild().getIdLong()); - log.trace("Sending kick log message in guild {}.", kickLogModel.getGuild().getIdLong()); + log.debug("Sending kick log message in guild {}.", kickLogModel.getGuild().getIdLong()); completableFuture = FutureUtils.toSingleFutureGeneric(postTargetService.sendEmbedInPostTarget(warnLogMessage, ModerationPostTarget.KICK_LOG, kickLogModel.getGuild().getIdLong())); } else { - log.trace("Feature {} has mode {} for logging disabled for server {}. Not sending kick notification.", ModerationFeatureDefinition.MODERATION, ModerationMode.BAN_LOG, kickLogModel.getGuild().getIdLong()); + log.debug("Feature {} has mode {} for logging disabled for server {}. Not sending kick notification.", ModerationFeatureDefinition.MODERATION, ModerationMode.BAN_LOG, kickLogModel.getGuild().getIdLong()); completableFuture = CompletableFuture.completedFuture(null); } return completableFuture; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/MuteServiceBean.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/MuteServiceBean.java index 48352b928..93aad3f86 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/MuteServiceBean.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/MuteServiceBean.java @@ -195,7 +195,7 @@ public class MuteServiceBean implements MuteService { public String startUnMuteJobFor(Instant unMuteDate, Long muteId, Long serverId) { Duration muteDuration = Duration.between(Instant.now(), unMuteDate); if(muteDuration.getSeconds() < 60) { - log.trace("Directly scheduling the unMute, because it was below the threshold."); + log.debug("Directly scheduling the unMute, because it was below the threshold."); unMuteScheduler.schedule(() -> { try { self.endMute(muteId, serverId); @@ -205,7 +205,7 @@ public class MuteServiceBean implements MuteService { }, muteDuration.toNanos(), TimeUnit.NANOSECONDS); return null; } else { - log.trace("Starting scheduled job to execute unMute."); + log.debug("Starting scheduled job to execute unMute."); HashMap parameters = new HashMap<>(); parameters.put("muteId", muteId); parameters.put("serverId", serverId); @@ -223,7 +223,7 @@ public class MuteServiceBean implements MuteService { @Override public CompletableFuture muteMemberWithLog(MuteContext context) { - log.trace("Muting member {} in server {}.", context.getMutedUser().getId(), context.getMutedUser().getGuild().getId()); + log.debug("Muting member {} in server {}.", context.getMutedUser().getId(), context.getMutedUser().getGuild().getId()); AServer server = serverManagementService.loadOrCreate(context.getContext().getServerId()); Long nextCounterValue = counterService.getNextCounterValue(server, MUTE_COUNTER_KEY); context.setMuteId(nextCounterValue); @@ -243,13 +243,13 @@ public class MuteServiceBean implements MuteService { private CompletableFuture sendMuteLog(MuteContext muteLogModel, AServer server) { CompletableFuture completableFuture; if(featureModeService.featureModeActive(ModerationFeatureDefinition.MUTING, server, MutingMode.MUTE_LOGGING)) { - log.trace("Sending mute log to the mute post target."); + log.debug("Sending mute log to the mute post target."); MessageToSend message = templateService.renderEmbedTemplate(MUTE_LOG_TEMPLATE, muteLogModel, server.getId()); List> completableFutures = postTargetService.sendEmbedInPostTarget(message, MutingPostTarget.MUTE_LOG, muteLogModel.getContext().getServerId()); completableFuture = FutureUtils.toSingleFutureGeneric(completableFutures); } else { completableFuture = CompletableFuture.completedFuture(null); - log.trace("Not sending mute log, because feature mode {} in feature {} has been disabled for server {}.", MutingMode.MUTE_LOGGING, ModerationFeatureDefinition.WARNING, server.getId()); + log.debug("Not sending mute log, because feature mode {} in feature {} has been disabled for server {}.", MutingMode.MUTE_LOGGING, ModerationFeatureDefinition.WARNING, server.getId()); } return completableFuture; } @@ -257,13 +257,13 @@ public class MuteServiceBean implements MuteService { private CompletableFuture sendUnMuteLogMessage(UnMuteLog muteLogModel, AServer server) { CompletableFuture completableFuture; if(featureModeService.featureModeActive(ModerationFeatureDefinition.MUTING, server, MutingMode.MUTE_LOGGING)) { - log.trace("Sending unMute log for mute {} to the mute posttarget in server {}", muteLogModel.getMute().getMuteId().getId(), server.getId()); + log.debug("Sending unMute log for mute {} to the mute posttarget in server {}", muteLogModel.getMute().getMuteId().getId(), server.getId()); MessageToSend message = templateService.renderEmbedTemplate(UN_MUTE_LOG_TEMPLATE, muteLogModel, server.getId()); List> completableFutures = postTargetService.sendEmbedInPostTarget(message, MutingPostTarget.MUTE_LOG, server.getId()); completableFuture = FutureUtils.toSingleFutureGeneric(completableFutures); } else { completableFuture = CompletableFuture.completedFuture(null); - log.trace("Not sending unMute log, because feature mode {} in feature {} has been disabled for server {}.", MutingMode.UN_MUTE_LOGGING, ModerationFeatureDefinition.WARNING, server.getId()); + log.debug("Not sending unMute log, because feature mode {} in feature {} has been disabled for server {}.", MutingMode.UN_MUTE_LOGGING, ModerationFeatureDefinition.WARNING, server.getId()); } return completableFuture; } @@ -289,10 +289,10 @@ public class MuteServiceBean implements MuteService { CompletableFuture completableFuture; if(featureModeService.featureModeActive(ModerationFeatureDefinition.MUTING, guild.getIdLong(), MutingMode.MANUAL_UN_MUTE_LOGGING)) { completableFuture = self.sendUnmuteLog(muteId, guild, mutingMemberFuture, mutedMemberFuture); - log.trace("Sending un mute notification for manual un mute for mute {} in server {}.", muteId, guild.getIdLong()); + log.debug("Sending un mute notification for manual un mute for mute {} in server {}.", muteId, guild.getIdLong()); } else { completableFuture = CompletableFuture.completedFuture(null); - log.trace("Not sending unMute log, because feature mode {} in feature {} has been disabled for server {}.", MutingMode.MANUAL_UN_MUTE_LOGGING, ModerationFeatureDefinition.WARNING, guild.getIdLong()); + log.debug("Not sending unMute log, because feature mode {} in feature {} has been disabled for server {}.", MutingMode.MANUAL_UN_MUTE_LOGGING, ModerationFeatureDefinition.WARNING, guild.getIdLong()); } return completableFuture; @@ -308,7 +308,7 @@ public class MuteServiceBean implements MuteService { AServer mutingServer = mute.getServer(); log.info("UnMuting {} in server {}", mute.getMutedUser().getUserReference().getId(), mutingServer.getId()); MuteRole muteRole = muteRoleManagementService.retrieveMuteRoleForServer(mutingServer); - log.trace("Using the mute role {} mapping to role {}", muteRole.getId(), muteRole.getRole().getId()); + log.debug("Using the mute role {} mapping to role {}", muteRole.getId(), muteRole.getRole().getId()); Guild guild = guildService.getGuildById(mutingServer.getId()); CompletableFuture roleRemovalFuture; // TODO replace with future, because caching diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/PurgeServiceBean.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/PurgeServiceBean.java index d1786e924..4471f964a 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/PurgeServiceBean.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/PurgeServiceBean.java @@ -84,7 +84,7 @@ public class PurgeServiceBean implements PurgeService { return; } Message latestMessage = messagesToDeleteNow.get(messagesToDeleteNow.size() - 1); - log.trace("Deleting {} messages directly", messagesToDeleteNow.size()); + log.debug("Deleting {} messages directly", messagesToDeleteNow.size()); int newCurrentCount = currentCount + messagesToDeleteNow.size(); int newAmountToDelete = amountToDelete - PURGE_MAX_MESSAGES; Consumer consumer = deletionConsumer(newAmountToDelete, channel, purgedMember, totalCount, newCurrentCount, deletionFuture, currentStatusMessageId, latestMessage); @@ -119,12 +119,12 @@ public class PurgeServiceBean implements PurgeService { private CompletableFuture getOrCreatedStatusMessage(TextChannel channel, Integer totalCount, Long statusMessageId) { CompletableFuture statusMessageFuture; if(statusMessageId == 0) { - log.trace("Creating new status message in channel {} in server {} because of puring.", channel.getIdLong(), channel.getGuild().getId()); + log.debug("Creating new status message in channel {} in server {} because of puring.", channel.getIdLong(), channel.getGuild().getId()); PurgeStatusUpdateModel model = PurgeStatusUpdateModel.builder().currentlyDeleted(0).totalToDelete(totalCount).build(); MessageToSend messageToSend = templateService.renderTemplateToMessageToSend("purge_status_update", model, channel.getGuild().getIdLong()); statusMessageFuture = messageService.createStatusMessageId(messageToSend, channel); } else { - log.trace("Using existing status message {}.", statusMessageId); + log.debug("Using existing status message {}.", statusMessageId); statusMessageFuture = CompletableFuture.completedFuture(statusMessageId); } return statusMessageFuture; @@ -132,20 +132,20 @@ public class PurgeServiceBean implements PurgeService { private List filterMessagesToDelete(List retrievedHistory, Member purgedMember) { long twoWeeksAgo = TimeUtil.getDiscordTimestamp((System.currentTimeMillis() - (14 * 24 * 60 * 60 * 1000))); - log.trace("Filtering messages older than {}.", twoWeeksAgo); + log.debug("Filtering messages older than {}.", twoWeeksAgo); List messagesToDeleteNow = new ArrayList<>(); for (Message messageObj : retrievedHistory) { if (MiscUtil.parseSnowflake(messageObj.getId()) > twoWeeksAgo) { if(purgedMember != null) { if(messageObj.getAuthor().getIdLong() == purgedMember.getIdLong()) { - log.trace("Message {} is from filtered user {}. Purging.", messageObj.getId(), purgedMember.getIdLong()); + log.debug("Message {} is from filtered user {}. Purging.", messageObj.getId(), purgedMember.getIdLong()); messagesToDeleteNow.add(messageObj); } } else { messagesToDeleteNow.add(messageObj); } } else { - log.trace("Message {} was older than {}. Not purging.", messageObj.getId(), twoWeeksAgo); + log.debug("Message {} was older than {}. Not purging.", messageObj.getId(), twoWeeksAgo); } } return messagesToDeleteNow; @@ -154,7 +154,7 @@ public class PurgeServiceBean implements PurgeService { private Consumer deletionConsumer(Integer amountToDelete, TextChannel channel, Member purgedMember, Integer totalCount, Integer currentCount, CompletableFuture deletionFuture, Long currentStatusMessageId, Message earliestMessage) { return aVoid -> { if (amountToDelete >= 1) { - log.trace("Still more than 1 message to delete. Continuing."); + log.debug("Still more than 1 message to delete. Continuing."); purgeMessages(amountToDelete, channel, earliestMessage.getIdLong(), purgedMember, totalCount, currentCount, currentStatusMessageId).whenComplete((avoid, throwable) -> { if (throwable != null) { deletionFuture.completeExceptionally(throwable); @@ -164,12 +164,12 @@ public class PurgeServiceBean implements PurgeService { } ); } else { - log.trace("Completed purging of {} messages.", totalCount); + log.debug("Completed purging of {} messages.", totalCount); // Todo Move to message service channel.deleteMessageById(currentStatusMessageId).queueAfter(5, TimeUnit.SECONDS); deletionFuture.complete(null); } - log.trace("Setting status for {} out of {}", currentCount, totalCount); + log.debug("Setting status for {} out of {}", currentCount, totalCount); PurgeStatusUpdateModel finalUpdateModel = PurgeStatusUpdateModel.builder().currentlyDeleted(currentCount).totalToDelete(totalCount).build(); MessageToSend finalUpdateMessage = templateService.renderTemplateToMessageToSend("purge_status_update", finalUpdateModel); messageService.updateStatusMessage(channel, currentStatusMessageId, finalUpdateMessage); diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java index 21fc3efc0..fb8875294 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java @@ -100,11 +100,11 @@ public class WarnServiceBean implements WarnService { List> futures = new ArrayList<>(); futures.add(messageService.sendMessageToUser(warnedMember.getUser(), warnNotificationMessage)); if(featureModeService.featureModeActive(ModerationFeatureDefinition.WARNING, server.getId(), WarningMode.WARN_LOG)) { - log.trace("Logging warning for server {}.", server.getId()); + log.debug("Logging warning for server {}.", server.getId()); MessageToSend message = templateService.renderEmbedTemplate(WARN_LOG_TEMPLATE, context, server.getId()); futures.addAll(postTargetService.sendEmbedInPostTarget(message, WarningPostTarget.WARN_LOG, context.getGuild().getIdLong())); } else { - log.trace("Not logging warning because of feature {} with feature mode {} in server {}.", ModerationFeatureDefinition.WARNING, WarningMode.WARN_LOG, server.getId()); + log.debug("Not logging warning because of feature {} with feature mode {} in server {}.", ModerationFeatureDefinition.WARNING, WarningMode.WARN_LOG, server.getId()); } return FutureUtils.toSingleFutureGeneric(futures); @@ -139,10 +139,10 @@ public class WarnServiceBean implements WarnService { Long serverId = server.getId(); CompletableFuture completableFuture; if(featureModeService.featureModeActive(ModerationFeatureDefinition.AUTOMATIC_WARN_DECAY, server, WarnDecayMode.AUTOMATIC_WARN_DECAY_LOG)) { - log.trace("Sending log messages for automatic warn decay in server {}.", server.getId()); + log.debug("Sending log messages for automatic warn decay in server {}.", server.getId()); completableFuture = logDecayedWarnings(server, warningsToDecay); } else { - log.trace("Not logging automatic warn decay, because feature {} has its mode {} disabled in server {}.", ModerationFeatureDefinition.AUTOMATIC_WARN_DECAY, WarnDecayMode.AUTOMATIC_WARN_DECAY_LOG, server.getId()); + log.debug("Not logging automatic warn decay, because feature {} has its mode {} disabled in server {}.", ModerationFeatureDefinition.AUTOMATIC_WARN_DECAY, WarnDecayMode.AUTOMATIC_WARN_DECAY_LOG, server.getId()); completableFuture = CompletableFuture.completedFuture(null); } return completableFuture.thenAccept(aVoid -> @@ -175,13 +175,13 @@ public class WarnServiceBean implements WarnService { @Override public void decayWarning(Warning warning, Instant now) { - log.trace("Decaying warning {} in server {} with date {}.", warning.getWarnId().getId(), warning.getWarnId().getServerId(), now); + log.debug("Decaying warning {} in server {} with date {}.", warning.getWarnId().getId(), warning.getWarnId().getServerId(), now); warning.setDecayDate(now); warning.setDecayed(true); } private CompletableFuture logDecayedWarnings(AServer server, List warningsToDecay) { - log.trace("Loading members decaying {} warnings in server {}.", warningsToDecay.size(), server.getId()); + log.debug("Loading members decaying {} warnings in server {}.", warningsToDecay.size(), server.getId()); HashMap warningMembers = new HashMap<>(); List> allFutures = new ArrayList<>(); Long serverId = server.getId(); @@ -254,12 +254,12 @@ public class WarnServiceBean implements WarnService { log.info("Decaying ALL warning in server {}.", server.getId()); Long serverId = server.getId(); if(featureModeService.featureModeActive(ModerationFeatureDefinition.WARNING, server, WarningMode.WARN_DECAY_LOG)) { - log.trace("Logging warn decays in server {}", serverId); + log.debug("Logging warn decays in server {}", serverId); return logDecayedWarnings(server, warningsToDecay).thenAccept(aVoid -> self.decayWarnings(warnIds, serverId) ); } else { - log.trace("Not logging warn decays for manual decay in server {} because feature {} with feature mode: {}", serverId, ModerationFeatureDefinition.WARNING, WarningMode.WARN_DECAY_LOG); + log.debug("Not logging warn decays for manual decay in server {} because feature {} with feature mode: {}", serverId, ModerationFeatureDefinition.WARNING, WarningMode.WARN_DECAY_LOG); self.decayWarnings(warnIds, serverId); return CompletableFuture.completedFuture(null); } diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/MuteManagementServiceBean.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/MuteManagementServiceBean.java index 02c2136a0..243535a2d 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/MuteManagementServiceBean.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/MuteManagementServiceBean.java @@ -28,7 +28,7 @@ public class MuteManagementServiceBean implements MuteManagementService { @Override public Mute createMute(AUserInAServer mutedUser, AUserInAServer mutingUser, String reason, Instant unMuteDate, AServerAChannelMessage muteMessage, String triggerKey, Long muteId) { - log.trace("Creating mute for user {} executed by user {} in server {}, user will be un-muted at {}", + log.debug("Creating mute for user {} executed by user {} in server {}, user will be un-muted at {}", mutedUser.getUserReference().getId(), mutingUser.getUserReference().getId(), mutedUser.getServerReference().getId(), unMuteDate); ServerSpecificId id = new ServerSpecificId(muteMessage.getServer().getId(), muteId); Mute mute = Mute diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/MuteRoleManagementServiceBean.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/MuteRoleManagementServiceBean.java index fd18975b3..acd8e6520 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/MuteRoleManagementServiceBean.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/MuteRoleManagementServiceBean.java @@ -24,7 +24,7 @@ public class MuteRoleManagementServiceBean implements MuteRoleManagementService @Override public MuteRole createMuteRoleForServer(AServer server, ARole role) { - log.trace("Creating mute role for server {} to be role {}", server.getId(), role.getId()); + log.debug("Creating mute role for server {} to be role {}", server.getId(), role.getId()); MuteRole muteRole = MuteRole .builder() .role(role) @@ -42,11 +42,11 @@ public class MuteRoleManagementServiceBean implements MuteRoleManagementService public MuteRole setMuteRoleForServer(AServer server, ARole role) { log.info("Setting muted role for server {} to role {}", server.getId(), role.getId()); if(!muteRoleForServerExists(server)) { - log.trace("Mute role did not exist yet, updating for server {}.", server.getId()); + log.debug("Mute role did not exist yet, updating for server {}.", server.getId()); return createMuteRoleForServer(server, role); } else { MuteRole existing = retrieveMuteRoleForServer(server); - log.trace("Updating mute role for server {} to be role {} instead.", server.getId(), role.getId()); + log.debug("Updating mute role for server {} to be role {} instead.", server.getId(), role.getId()); existing.setRole(role); return existing; } diff --git a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/listener/ModMailMessageEditedListener.java b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/listener/ModMailMessageEditedListener.java index 58caf2532..ccee307ca 100644 --- a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/listener/ModMailMessageEditedListener.java +++ b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/listener/ModMailMessageEditedListener.java @@ -120,10 +120,10 @@ public class ModMailMessageEditedListener implements AsyncMessageTextUpdatedList long serverId = editingUser.getGuild().getIdLong(); if(modMailMessage.getCreatedMessageInChannel() != null) { AChannel channel = modMailMessage.getThreadReference().getChannel(); - log.trace("Editing message {} in mod mail channel {} for thread {} in server {} as well.", modMailMessage.getCreatedMessageInChannel(), channel.getId(), threadId, serverId); + log.debug("Editing message {} in mod mail channel {} for thread {} in server {} as well.", modMailMessage.getCreatedMessageInChannel(), channel.getId(), threadId, serverId); channelService.editMessageInAChannel(messageToSend, channel, modMailMessage.getCreatedMessageInChannel()); } - log.trace("Editing message {} in DM channel with user {} for thread {} in server {}.", modMailMessage.getCreatedMessageInDM(), targetMember.getUser().getIdLong(), threadId, serverId); + log.debug("Editing message {} in DM channel with user {} for thread {} in server {}.", modMailMessage.getCreatedMessageInDM(), targetMember.getUser().getIdLong(), threadId, serverId); messageService.editMessageInDMChannel(targetMember.getUser(), messageToSend, modMailMessage.getCreatedMessageInDM()); }); diff --git a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/listener/ModMailMessageListener.java b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/listener/ModMailMessageListener.java index ea463057f..b0b826765 100644 --- a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/listener/ModMailMessageListener.java +++ b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/listener/ModMailMessageListener.java @@ -47,7 +47,7 @@ public class ModMailMessageListener implements PrivateMessageReceivedListener { } AUser user = userManagementService.loadOrCreateUser(message.getAuthor().getIdLong()); if(modMailThreadManagementService.hasOpenModMailThread(user)) { - log.trace("User {} has an open modmail thread. Forwarding message {}.", user.getId(), message.getId()); + log.debug("User {} has an open modmail thread. Forwarding message {}.", user.getId(), message.getId()); // there is only one open mod mail thread for a user at a time, so we can select the first one // we cannot use the AUserInAServer directly, because a message in a private channel does not have a Member ModMailThread existingThread = modMailThreadManagementService.getOpenModMailThreadsForUser(user).get(0); diff --git a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailMessageServiceBean.java b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailMessageServiceBean.java index 3f652c0e8..66cd723e0 100644 --- a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailMessageServiceBean.java +++ b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailMessageServiceBean.java @@ -41,7 +41,7 @@ public class ModMailMessageServiceBean implements ModMailMessageService { } // all message must be from the same thread ModMailThread thread = modMailMessages.get(0).getThreadReference(); - log.trace("Loading {} mod mail messages from thread {} in server {}.", modMailMessages.size(), thread.getId(), thread.getServer().getId()); + log.debug("Loading {} mod mail messages from thread {} in server {}.", modMailMessages.size(), thread.getId(), thread.getServer().getId()); List messageIds = new ArrayList<>(); modMailMessages.forEach(modMailMessage -> { ServerChannelMessageUser.ServerChannelMessageUserBuilder serverChannelMessageBuilder = ServerChannelMessageUser @@ -50,7 +50,7 @@ public class ModMailMessageServiceBean implements ModMailMessageService { .serverId(thread.getServer().getId()); // if its not from a private chat, we need to set channel ID in order to fetch the data if(Boolean.FALSE.equals(modMailMessage.getDmChannel())) { - log.trace("Message {} was from DM.", modMailMessage.getMessageId()); + log.debug("Message {} was from DM.", modMailMessage.getMessageId()); serverChannelMessageBuilder .channelId(modMailMessage.getThreadReference().getChannel().getId()); serverChannelMessageBuilder.messageId(modMailMessage.getCreatedMessageInChannel()); @@ -72,7 +72,7 @@ public class ModMailMessageServiceBean implements ModMailMessageService { botService.getInstance().openPrivateChannelById(userId).queue(privateChannel -> { Iterator iterator = messageFutures.iterator(); messageIds.forEach(serverChannelMessage -> { - log.trace("Loading message {}.", serverChannelMessage.getMessageId()); + log.debug("Loading message {}.", serverChannelMessage.getMessageId()); CompletableFuture messageFuture; CompletableFuture memberFuture = memberService.getMemberInServerAsync(serverChannelMessage.getServerId(), serverChannelMessage.getUserId()); if(serverChannelMessage.getChannelId() == null){ diff --git a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailThreadServiceBean.java b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailThreadServiceBean.java index 10537fb34..9ed403bcd 100644 --- a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailThreadServiceBean.java +++ b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailThreadServiceBean.java @@ -206,10 +206,10 @@ public class ModMailThreadServiceBean implements ModMailThreadService { CompletableFuture headerFuture = sendModMailHeader(channel, member); CompletableFuture userReplyMessage; if(initialMessage != null){ - log.trace("Sending initial message {} of user {} to modmail thread {}.", initialMessage.getId(), member.getId(), channel.getId()); + log.debug("Sending initial message {} of user {} to modmail thread {}.", initialMessage.getId(), member.getId(), channel.getId()); userReplyMessage = self.sendUserReply(channel, 0L, initialMessage, member, false); } else { - log.trace("No initial message to send."); + log.debug("No initial message to send."); userReplyMessage = CompletableFuture.completedFuture(null); } CompletableFuture notificationFuture; @@ -230,7 +230,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { AUserInAServer aUserInAServer = userInServerManagementService.loadOrCreateUser(member); ModMailThread thread = createThreadObject(channel, aUserInAServer); if(initialMessage != null) { - log.trace("Adding initial message {} to modmail thread in channel {}.", initialMessage.getId(), channel.getId()); + log.debug("Adding initial message {} to modmail thread in channel {}.", initialMessage.getId(), channel.getId()); modMailMessageManagementService.addMessageToThread(thread, null, sendMessage, initialMessage, aUserInAServer, false, false); } } @@ -247,7 +247,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { log.info("Sending modmail notification for new modmail thread about user {} in server {}.", member.getId(), serverId); AServer server = serverManagementService.loadServer(serverId); List rolesToPing = modMailRoleManagementService.getRolesForServer(server); - log.trace("Pinging {} roles to notify about modmail thread about user {} in server {}.", rolesToPing.size(), member.getId(), serverId); + log.debug("Pinging {} roles to notify about modmail thread about user {} in server {}.", rolesToPing.size(), member.getId(), serverId); ModMailNotificationModel modMailNotificationModel = ModMailNotificationModel .builder() .member(member) @@ -323,7 +323,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { .setDescription(text) .setAction(reactionEmote -> { Long chosenServerId = choices.get(reactionEmote.getEmoji()); - log.trace("Executing action for creationg a modmail thread in server {} for user {}.", chosenServerId, initialMessage.getAuthor().getIdLong()); + log.debug("Executing action for creationg a modmail thread in server {} for user {}.", chosenServerId, initialMessage.getAuthor().getIdLong()); memberService.getMemberInServerAsync(chosenServerId, initialMessage.getAuthor().getIdLong()).thenCompose(member -> self.createModMailThreadForUser(member, initialMessage, initialMessage.getChannel(), true, new ArrayList<>()).exceptionally(throwable -> { log.error("Failed to setup thread correctly", throwable); @@ -332,7 +332,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { ); }) .build(); - log.trace("Displaying server choice message for user {} in channel {}.", user.getId(), initialMessage.getChannel().getId()); + log.debug("Displaying server choice message for user {} in channel {}.", user.getId(), initialMessage.getChannel().getId()); menu.display(initialMessage.getChannel()); } else if(availableGuilds.size() == 1) { // if exactly one server is available, open the thread directly @@ -362,7 +362,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { * @param member The {@link Member} which the {@link ModMailThread} is about */ private CompletableFuture sendModMailHeader(TextChannel channel, Member member) { - log.trace("Sending modmail thread header for tread in channel {} on server {}.", channel.getIdLong(), channel.getGuild().getId()); + log.debug("Sending modmail thread header for tread in channel {} on server {}.", channel.getIdLong(), channel.getGuild().getId()); AUserInAServer aUserInAServer = userInServerManagementService.loadOrCreateUser(member); ModMailThread latestThread = modMailThreadManagementService.getLatestModMailThread(aUserInAServer); List oldThreads = modMailThreadManagementService.getModMailThreadForUser(aUserInAServer); @@ -382,7 +382,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { Long channelId = modMailThread.getChannel().getId(); Long modmailThreadId = modMailThread.getId(); metricService.incrementCounter(MDOMAIL_THREAD_MESSAGE_RECEIVED); - log.trace("Relaying message {} to modmail thread {} for user {} to server {}.", messageFromUser.getId(), modMailThread.getId(), messageFromUser.getAuthor().getIdLong(), modMailThread.getServer().getId()); + log.debug("Relaying message {} to modmail thread {} for user {} to server {}.", messageFromUser.getId(), modMailThread.getId(), messageFromUser.getAuthor().getIdLong(), modMailThread.getServer().getId()); return memberService.getMemberInServerAsync(modMailThread.getServer().getId(), messageFromUser.getAuthor().getIdLong()).thenCompose(member -> { Optional textChannelFromServer = channelService.getTextChannelFromServerOptional(serverId, channelId); if(textChannelFromServer.isPresent()) { @@ -422,7 +422,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { if(subscriberList.isEmpty()) { subscriberMemberFutures.add(CompletableFuture.completedFuture(null)); } - log.trace("Pinging {} subscribers for modmail thread {}.", subscriberList.size(), modMailThreadId); + log.debug("Pinging {} subscribers for modmail thread {}.", subscriberList.size(), modMailThreadId); } else { subscriberMemberFutures.add(CompletableFuture.completedFuture(null)); } @@ -438,7 +438,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { List> completableFutures = channelService.sendMessageToSendToChannel(messageToSend, textChannel); return CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[0])) .thenCompose(aVoid -> { - log.trace("Adding read reaction to initial message for mod mail thread in channel {}.", textChannel.getGuild().getId()); + log.debug("Adding read reaction to initial message for mod mail thread in channel {}.", textChannel.getGuild().getId()); return reactionService.addReactionToMessageAsync("readReaction", textChannel.getGuild().getIdLong(), messageFromUser); }) .thenApply(aVoid -> { @@ -464,7 +464,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { Optional modMailThreadOpt = modMailThreadManagementService.getByChannelIdOptional(textChannel.getIdLong()); if(modMailThreadOpt.isPresent()) { ModMailThread modMailThread = modMailThreadOpt.get(); - log.trace("Adding created message {} based on messeage {} sent from user to modmail thread {} and setting status to {}.", messageInModMailThread.getId(), messageFromUser.getId(), modMailThread.getId(), ModMailThreadState.USER_REPLIED); + log.debug("Adding created message {} based on messeage {} sent from user to modmail thread {} and setting status to {}.", messageInModMailThread.getId(), messageFromUser.getId(), modMailThread.getId(), ModMailThreadState.USER_REPLIED); modMailMessageManagementService.addMessageToThread(modMailThread, null, messageInModMailThread, messageFromUser, modMailThread.getUser(), false, false); // update the state of the thread modMailThreadManagementService.setModMailThreadState(modMailThread, ModMailThreadState.USER_REPLIED); @@ -492,7 +492,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { .anonymous(anonymous) .threadUser(fullThreadUser); if(anonymous) { - log.trace("Message is sent anonymous."); + log.debug("Message is sent anonymous."); modMailModeratorReplyModelBuilder.moderator(memberService.getBotInGuild(modMailThread.getServer())); } else { // should be loaded, because we are currently processing a command caused by the message @@ -537,7 +537,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { ).toCompletableFuture().thenCompose(o -> o); } else { - log.trace("Not logging modmail thread {}.", modMailThreadId); + log.debug("Not logging modmail thread {}.", modMailThreadId); return memberService.getMemberInServerAsync(modMailThread.getUser()).thenCompose(member -> self.afterSuccessfulLog(modMailThreadId, notifyUser, member, undoActions) ); @@ -569,7 +569,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { */ @Transactional public CompletableFuture logMessagesToModMailLog(String note, Boolean notifyUser, Long modMailThreadId, List undoActions, LoadedModmailThreadMessageList messages, Long serverId, Long userId) { - log.trace("Logging {} modmail messages for modmail thread {}.", messages.getMessageList().size(), modMailThreadId); + log.debug("Logging {} modmail messages for modmail thread {}.", messages.getMessageList().size(), modMailThreadId); try { CompletableFutureList list = self.logModMailThread(modMailThreadId, messages, note, undoActions); return list.getMainFuture().thenCompose(avoid -> { @@ -603,7 +603,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { */ @Transactional public CompletableFuture afterSuccessfulLog(Long modMailThreadId, Boolean notifyUser, Member modMailThreaduser, List undoActions) { - log.trace("Mod mail logging for thread {} has completed. Starting post logging activities.", modMailThreadId); + log.debug("Mod mail logging for thread {} has completed. Starting post logging activities.", modMailThreadId); Optional modMailThreadOpt = modMailThreadManagementService.getByIdOptional(modMailThreadId); if(modMailThreadOpt.isPresent()) { if(notifyUser) { @@ -639,7 +639,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { ModMailThread modMailThread = modMailThreadOpt.get(); String failureMessage = "Failed to delete text channel containing mod mail thread {}"; try { - log.trace("Deleting channel {} which contained the modmail thread {}.", modMailThread.getChannel().getId(), modMailThreadId); + log.debug("Deleting channel {} which contained the modmail thread {}.", modMailThread.getChannel().getId(), modMailThreadId); return channelService.deleteTextChannel(modMailThread.getChannel()).thenAccept(avoid -> { undoActions.clear(); self.closeModMailThreadInDb(modMailThreadId); @@ -719,7 +719,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { .closedThread(modMailThread) .note(note) .build(); - log.trace("Sending close header and individual mod mail messages to mod mail log target for thread {}.", modMailThreadId); + log.debug("Sending close header and individual mod mail messages to mod mail log target for thread {}.", modMailThreadId); MessageToSend messageToSend = templateService.renderEmbedTemplate("modmail_close_header", headerModel, modMailThread.getServer().getId()); List> closeHeaderFutures = postTargetService.sendEmbedInPostTarget(messageToSend, ModMailPostTargets.MOD_MAIL_LOG, modMailThread.getServer().getId()); // TODO in case the rendering fails, the already sent messages are not deleted @@ -760,7 +760,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { List> messageFutures = new ArrayList<>(); // TODO order messages loadedMessages.forEach(message -> { - log.trace("Sending message {} of modmail thread {} to modmail log post target.", modMailThread.getId(), message.getMessage().getId()); + log.debug("Sending message {} of modmail thread {} to modmail log post target.", modMailThread.getId(), message.getMessage().getId()); MessageToSend messageToSend = templateService.renderEmbedTemplate("modmail_close_logged_message", message, modMailThread.getServer().getId()); List> logFuture = postTargetService.sendEmbedInPostTarget(messageToSend, ModMailPostTargets.MOD_MAIL_LOG, modMailThread.getServer().getId()); messageFutures.addAll(logFuture); @@ -784,7 +784,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService { Optional modMailThreadOpt = modMailThreadManagementService.getByIdOptional(modMailThreadId); if(modMailThreadOpt.isPresent()) { ModMailThread modMailThread = modMailThreadOpt.get(); - log.trace("Adding (anonymous: {}) message {} of moderator to modmail thread {} and setting state to {}.", anonymous, createdMessageInDM.getId(), modMailThreadId, ModMailThreadState.MOD_REPLIED); + log.debug("Adding (anonymous: {}) message {} of moderator to modmail thread {} and setting state to {}.", anonymous, createdMessageInDM.getId(), modMailThreadId, ModMailThreadState.MOD_REPLIED); modMailMessageManagementService.addMessageToThread(modMailThread, createdMessageInDM, modMailThreadMessage, replyCommandMessage, moderator, anonymous, true); modMailThreadManagementService.setModMailThreadState(modMailThread, ModMailThreadState.MOD_REPLIED); } else { diff --git a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/setup/ModMailCategorySetupBean.java b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/setup/ModMailCategorySetupBean.java index dbf1b63f5..74b9a5ebf 100644 --- a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/setup/ModMailCategorySetupBean.java +++ b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/setup/ModMailCategorySetupBean.java @@ -80,7 +80,7 @@ public class ModMailCategorySetupBean implements ModMailCategorySetup { if(configManagementService.configExists(user.getGuildId(), ModMailThreadServiceBean.MODMAIL_CATEGORY)) { Guild guild = guildService.getGuildById(user.getGuildId()); Long categoryId = configService.getLongValue(ModMailThreadServiceBean.MODMAIL_CATEGORY, user.getGuildId()); - log.trace("Previous modmail category exists for server {}. Loading value {}.", guild.getId(), categoryId); + log.debug("Previous modmail category exists for server {}. Loading value {}.", guild.getId(), categoryId); Category category = guild.getCategoryById(categoryId); model.setCategory(category); } @@ -109,7 +109,7 @@ public class ModMailCategorySetupBean implements ModMailCategorySetup { // directly validate whether or not the given category ID is a valid value modMailFeatureValidator.validateModMailCategory(featureValidationResult, guild, categoryId); if(Boolean.TRUE.equals(featureValidationResult.getValidationResult())) { - log.trace("Given category {} maps to a valid category in server {}.", categoryId, guild.getId()); + log.debug("Given category {} maps to a valid category in server {}.", categoryId, guild.getId()); ModMailCategoryDelayedActionConfig build = ModMailCategoryDelayedActionConfig .builder() .serverId(user.getGuildId()) diff --git a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/validator/ModMailFeatureValidatorBean.java b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/validator/ModMailFeatureValidatorBean.java index d5a842ac2..c644fb5f1 100644 --- a/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/validator/ModMailFeatureValidatorBean.java +++ b/abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/validator/ModMailFeatureValidatorBean.java @@ -46,9 +46,9 @@ public class ModMailFeatureValidatorBean implements ModMailFeatureValidator { if(guildById.isPresent()) { Guild guild = guildById.get(); boolean checkSucceeded = featureValidatorService.checkSystemConfig(ModMailThreadServiceBean.MODMAIL_CATEGORY, server, validationResult); - log.trace("Validating the modmail category for server {}.", server.getId()); + log.debug("Validating the modmail category for server {}.", server.getId()); if(checkSucceeded) { - log.trace("Modmail category has been set for server {}. Lets see if the category exists.", server.getId()); + log.debug("Modmail category has been set for server {}. Lets see if the category exists.", server.getId()); Long modMailCategory = configService.getLongValue(ModMailThreadServiceBean.MODMAIL_CATEGORY, server.getId()); validateModMailCategory(validationResult, guild, modMailCategory); } diff --git a/abstracto-application/abstracto-modules/remind/remind-impl/src/main/java/dev/sheldan/abstracto/remind/service/RemindServiceBean.java b/abstracto-application/abstracto-modules/remind/remind-impl/src/main/java/dev/sheldan/abstracto/remind/service/RemindServiceBean.java index 17efbb7fe..f9ee95561 100644 --- a/abstracto-application/abstracto-modules/remind/remind-impl/src/main/java/dev/sheldan/abstracto/remind/service/RemindServiceBean.java +++ b/abstracto-application/abstracto-modules/remind/remind-impl/src/main/java/dev/sheldan/abstracto/remind/service/RemindServiceBean.java @@ -138,7 +138,7 @@ public class RemindServiceBean implements ReminderService { @Transactional public CompletableFuture sendReminderText(Long reminderId, TextChannel channelToAnswerIn, Member member) { Reminder reminder = reminderManagementService.loadReminder(reminderId); - log.trace("Sending remind message for reminder {} to user user {} in server {}.", reminderId, member.getIdLong(), member.getGuild().getIdLong()); + log.debug("Sending remind message for reminder {} to user user {} in server {}.", reminderId, member.getIdLong(), member.getGuild().getIdLong()); ExecutedReminderModel build = ExecutedReminderModel .builder() .reminder(reminder) @@ -155,7 +155,7 @@ public class RemindServiceBean implements ReminderService { Reminder reminder = reminderManagementService.getReminderByAndByUserNotReminded(aUserInAServer, reminderId).orElseThrow(() -> new ReminderNotFoundException(reminderId)); reminder.setReminded(true); if(reminder.getJobTriggerKey() != null) { - log.trace("Stopping scheduled trigger {} for reminder {}.", reminder.getJobTriggerKey(), reminderId); + log.debug("Stopping scheduled trigger {} for reminder {}.", reminder.getJobTriggerKey(), reminderId); schedulerService.stopTrigger(reminder.getJobTriggerKey()); } } diff --git a/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/listener/StarboardListener.java b/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/listener/StarboardListener.java index 06d9ce030..7c1c91938 100644 --- a/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/listener/StarboardListener.java +++ b/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/listener/StarboardListener.java @@ -108,10 +108,10 @@ public abstract class StarboardListener { // TODO handle futures correctly starboardService.updateStarboardPost(starboardPost, message, userExceptAuthor); if(adding) { - log.trace("Adding reactor {} from message {}", userReacting.getUserReference().getId(), message.getMessageId()); + log.debug("Adding reactor {} from message {}", userReacting.getUserReference().getId(), message.getMessageId()); starboardPostReactorManagementService.addReactor(starboardPost, userReacting); } else { - log.trace("Removing reactor {} from message {}", userReacting.getUserReference().getId(), message.getMessageId()); + log.debug("Removing reactor {} from message {}", userReacting.getUserReference().getId(), message.getMessageId()); starboardPostReactorManagementService.removeReactor(starboardPost, userReacting); } } diff --git a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/DeletedEmoteStats.java b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/DeletedEmoteStats.java index 7f2a82e4d..12751fdc1 100644 --- a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/DeletedEmoteStats.java +++ b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/DeletedEmoteStats.java @@ -61,12 +61,12 @@ public class DeletedEmoteStats extends AbstractConditionableCommand { List> messagePromises = new ArrayList<>(); // only show the embed, if there are static emotes to show if(!emoteStatsModel.getStaticEmotes().isEmpty()) { - log.trace("Deleted emote stats has {} static emotes since {}.", emoteStatsModel.getStaticEmotes().size(), statsSince); + log.debug("Deleted emote stats has {} static emotes since {}.", emoteStatsModel.getStaticEmotes().size(), statsSince); messagePromises.addAll(channelService.sendEmbedTemplateInTextChannelList(EMOTE_STATS_STATIC_DELETED_RESPONSE, emoteStatsModel, commandContext.getChannel())); } // only show the embed, if there are animated emotes to show if(!emoteStatsModel.getAnimatedEmotes().isEmpty()) { - log.trace("Deleted emote stats has {} animated emotes since {}.", emoteStatsModel.getAnimatedEmotes(), statsSince); + log.debug("Deleted emote stats has {} animated emotes since {}.", emoteStatsModel.getAnimatedEmotes(), statsSince); messagePromises.addAll(channelService.sendEmbedTemplateInTextChannelList(EMOTE_STATS_ANIMATED_DELETED_RESPONSE, emoteStatsModel, commandContext.getChannel())); } // if neither static nor animated emote stats are available, show an embed indicating so diff --git a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/EmoteStats.java b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/EmoteStats.java index c9df45a04..f0e0769fa 100644 --- a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/EmoteStats.java +++ b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/EmoteStats.java @@ -62,12 +62,12 @@ public class EmoteStats extends AbstractConditionableCommand { List> messagePromises = new ArrayList<>(); // only show embed if static emote stats are available if(!emoteStatsModel.getStaticEmotes().isEmpty()) { - log.trace("Emote stats has {} static emotes since {}.", emoteStatsModel.getStaticEmotes().size(), statsSince); + log.debug("Emote stats has {} static emotes since {}.", emoteStatsModel.getStaticEmotes().size(), statsSince); messagePromises.addAll(channelService.sendEmbedTemplateInTextChannelList(EMOTE_STATS_STATIC_RESPONSE, emoteStatsModel, commandContext.getChannel())); } // only show embed if animated emote stats are available if(!emoteStatsModel.getAnimatedEmotes().isEmpty()) { - log.trace("Emote stats has {} animated emotes since {}.", emoteStatsModel.getAnimatedEmotes(), statsSince); + log.debug("Emote stats has {} animated emotes since {}.", emoteStatsModel.getAnimatedEmotes(), statsSince); messagePromises.addAll(channelService.sendEmbedTemplateInTextChannelList(EMOTE_STATS_ANIMATED_RESPONSE, emoteStatsModel, commandContext.getChannel())); } // show an embed if no emote stats are available indicating so diff --git a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/ExternalEmoteStats.java b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/ExternalEmoteStats.java index 24b612f3c..798bafd64 100644 --- a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/ExternalEmoteStats.java +++ b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/command/ExternalEmoteStats.java @@ -65,13 +65,13 @@ public class ExternalEmoteStats extends AbstractConditionableCommand { // only show embed if static emote stats are available if(!emoteStatsModel.getStaticEmotes().isEmpty()) { - log.trace("External emote stats has {} static emotes since {}.", emoteStatsModel.getStaticEmotes().size(), statsSince); + log.debug("External emote stats has {} static emotes since {}.", emoteStatsModel.getStaticEmotes().size(), statsSince); messagePromises.addAll(channelService.sendEmbedTemplateInTextChannelList(EMOTE_STATS_STATIC_EXTERNAL_RESPONSE, emoteStatsModel, commandContext.getChannel())); } // only show embed if animated emote stats are available if(!emoteStatsModel.getAnimatedEmotes().isEmpty()) { - log.trace("External emote stats has {} animated emotes since {}.", emoteStatsModel.getAnimatedEmotes(), statsSince); + log.debug("External emote stats has {} animated emotes since {}.", emoteStatsModel.getAnimatedEmotes(), statsSince); messagePromises.addAll(channelService.sendEmbedTemplateInTextChannelList(EMOTE_STATS_ANIMATED_EXTERNAL_RESPONSE, emoteStatsModel, commandContext.getChannel())); } diff --git a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/TrackedEmoteRuntimeServiceBean.java b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/TrackedEmoteRuntimeServiceBean.java index eaeb446c0..2ff481a5c 100644 --- a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/TrackedEmoteRuntimeServiceBean.java +++ b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/TrackedEmoteRuntimeServiceBean.java @@ -56,14 +56,14 @@ public class TrackedEmoteRuntimeServiceBean implements TrackedEmoteRuntimeServic } } else { // it did not exist for the server, create a new list of PersistingEmote - log.trace("Adding emote {} to list of server {}.", newPersistentEmote.getEmoteId(), guild.getIdLong()); + log.debug("Adding emote {} to list of server {}.", newPersistentEmote.getEmoteId(), guild.getIdLong()); elementsForKey.put(guild.getIdLong(), new ArrayList<>(Arrays.asList(newPersistentEmote))); } } else { // no entry for the minute exists yet, add a new one HashMap> serverEmotes = new HashMap<>(); serverEmotes.put(guild.getIdLong(), new ArrayList<>(Arrays.asList(newPersistentEmote))); - log.trace("Adding emote map entry for server {}.", guild.getIdLong()); + log.debug("Adding emote map entry for server {}.", guild.getIdLong()); trackedEmoteRunTimeStorage.put(key, serverEmotes); } } finally { diff --git a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/TrackedEmoteServiceBean.java b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/TrackedEmoteServiceBean.java index 90a67d7a8..73215e88e 100644 --- a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/TrackedEmoteServiceBean.java +++ b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/TrackedEmoteServiceBean.java @@ -114,7 +114,7 @@ public class TrackedEmoteServiceBean implements TrackedEmoteService { usedEmoteManagementService.createEmoteUsageForToday(trackedEmote, persistingEmote.getCount()); } } else { - log.trace("Tracking disabled for emote {} in server {}.", trackedEmote.getTrackedEmoteId().getId(), trackedEmote.getTrackedEmoteId().getServerId()); + log.debug("Tracking disabled for emote {} in server {}.", trackedEmote.getTrackedEmoteId().getId(), trackedEmote.getTrackedEmoteId().getServerId()); } }); // if tracked emote does not exists, we might want to create one (only for external emotes) diff --git a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/management/UsedEmoteManagementServiceBean.java b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/management/UsedEmoteManagementServiceBean.java index cf552e770..54f217066 100644 --- a/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/management/UsedEmoteManagementServiceBean.java +++ b/abstracto-application/abstracto-modules/statistic/statistic-impl/src/main/java/dev/sheldan/abstracto/statistic/emote/service/management/UsedEmoteManagementServiceBean.java @@ -33,7 +33,7 @@ public class UsedEmoteManagementServiceBean implements UsedEmoteManagementServic .emoteId(new UsedEmoteDay(trackedEmote.getTrackedEmoteId().getId(), trackedEmote.getTrackedEmoteId().getServerId(), Instant.now())) .amount(count) .build(); - log.trace("Creating emote usage for emote {} in server {} with count {}.", trackedEmote.getTrackedEmoteId().getId(), trackedEmote.getTrackedEmoteId().getServerId(), count); + log.debug("Creating emote usage for emote {} in server {} with count {}.", trackedEmote.getTrackedEmoteId().getId(), trackedEmote.getTrackedEmoteId().getServerId(), count); return usedEmoteRepository.save(usedEmote); } diff --git a/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/command/Accept.java b/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/command/Accept.java index 2221e5455..826665410 100644 --- a/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/command/Accept.java +++ b/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/command/Accept.java @@ -35,7 +35,7 @@ public class Accept extends AbstractConditionableCommand { List parameters = commandContext.getParameters().getParameters(); Long suggestionId = (Long) parameters.get(0); String text = parameters.size() == 2 ? (String) parameters.get(1) : ""; - log.trace("Using default reason for accept: {}.", parameters.size() != 2); + log.debug("Using default reason for accept: {}.", parameters.size() != 2); SuggestionLog suggestionModel = (SuggestionLog) ContextConverter.fromCommandContext(commandContext, SuggestionLog.class); return suggestionService.acceptSuggestion(suggestionId, text, suggestionModel) .thenApply(aVoid -> CommandResult.fromSuccess()); diff --git a/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/command/Reject.java b/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/command/Reject.java index 13a0359aa..c06523879 100644 --- a/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/command/Reject.java +++ b/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/command/Reject.java @@ -35,7 +35,7 @@ public class Reject extends AbstractConditionableCommand { List parameters = commandContext.getParameters().getParameters(); Long suggestionId = (Long) parameters.get(0); String text = parameters.size() == 2 ? (String) parameters.get(1) : ""; - log.trace("Using default reason for accept: {}.", parameters.size() != 2); + log.debug("Using default reason for accept: {}.", parameters.size() != 2); SuggestionLog suggestionModel = (SuggestionLog) ContextConverter.fromCommandContext(commandContext, SuggestionLog.class); return suggestionService.rejectSuggestion(suggestionId, text, suggestionModel) .thenApply(aVoid -> CommandResult.fromSuccess()); diff --git a/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/service/SuggestionServiceBean.java b/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/service/SuggestionServiceBean.java index 047e7e14c..16091d545 100644 --- a/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/service/SuggestionServiceBean.java +++ b/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/service/SuggestionServiceBean.java @@ -83,11 +83,11 @@ public class SuggestionServiceBean implements SuggestionService { List> completableFutures = postTargetService.sendEmbedInPostTarget(messageToSend, SuggestionPostTarget.SUGGESTION, guildId); return FutureUtils.toSingleFutureGeneric(completableFutures).thenCompose(aVoid -> { Message message = completableFutures.get(0).join(); - log.trace("Posted message, adding reaction for suggestion {} to message {}.", newSuggestionId, message.getId()); + log.debug("Posted message, adding reaction for suggestion {} to message {}.", newSuggestionId, message.getId()); CompletableFuture firstReaction = reactionService.addReactionToMessageAsync(SUGGESTION_YES_EMOTE, guildId, message); CompletableFuture secondReaction = reactionService.addReactionToMessageAsync(SUGGESTION_NO_EMOTE, guildId, message); return CompletableFuture.allOf(firstReaction, secondReaction).thenAccept(aVoid1 -> { - log.trace("Reaction added to message {} for suggestion {}.", message.getId(), newSuggestionId); + log.debug("Reaction added to message {} for suggestion {}.", message.getId(), newSuggestionId); self.persistSuggestionInDatabase(member, text, message, newSuggestionId); }); }); diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java index d6bc83f93..24a47fab8 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java @@ -211,7 +211,7 @@ public class CommandReceivedHandler extends ListenerAdapter { for (ParameterValidator parameterValidator : parameter.getValidators()) { boolean validate = parameterValidator.validate(parameters.getParameters().get(i)); if(!validate) { - log.trace("Parameter {} in command {} failed to validate.", parameter.getName(), foundCommand.getConfiguration().getName()); + log.debug("Parameter {} in command {} failed to validate.", parameter.getName(), foundCommand.getConfiguration().getName()); throw new CommandParameterValidationException(parameterValidator.getParameters(), parameterValidator.getExceptionTemplateName(), parameter); } } @@ -220,7 +220,7 @@ public class CommandReceivedHandler extends ListenerAdapter { @Transactional public void executePostCommandListener(Command foundCommand, CommandContext commandContext, CommandResult result) { - log.trace("Executing post command listeners for command from message {}.", commandContext.getMessage().getIdLong()); + log.debug("Executing post command listeners for command from message {}.", commandContext.getMessage().getIdLong()); for (PostCommandExecution postCommandExecution : executions) { postCommandExecution.execute(commandContext, result, foundCommand); } @@ -247,7 +247,7 @@ public class CommandReceivedHandler extends ListenerAdapter { if(command.getConfiguration().getParameters() == null || command.getConfiguration().getParameters().isEmpty()) { return CompletableFuture.completedFuture(Parameters.builder().parameters(parsedParameters).build()); } - log.trace("Parsing parameters for command {} based on message {}.", command.getConfiguration().getName(), message.getId()); + log.debug("Parsing parameters for command {} based on message {}.", command.getConfiguration().getName(), message.getId()); Iterator channelIterator = message.getMentionedChannels().iterator(); Iterator emoteIterator = message.getEmotesBag().iterator(); Iterator memberIterator = message.getMentionedMembers().iterator(); diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/post/SelfDestructPostExecution.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/post/SelfDestructPostExecution.java index 70ee58699..61109aae2 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/post/SelfDestructPostExecution.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/post/SelfDestructPostExecution.java @@ -22,7 +22,7 @@ public class SelfDestructPostExecution implements PostCommandExecution { public void execute(CommandContext commandContext, CommandResult commandResult, Command command) { if(commandResult.getResult().equals(ResultState.SELF_DESTRUCT)) { Message message = commandContext.getMessage(); - log.trace("Command {} is of type self destruct. Deleting message {} in channel {} in server {}.", + log.debug("Command {} is of type self destruct. Deleting message {} in channel {} in server {}.", command.getConfiguration().getName(), message.getId(), message.getChannel().getId(), message.getGuild().getId()); messageService.deleteMessage(message); } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/ChannelGroupCommandServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/ChannelGroupCommandServiceBean.java index 13ae4e949..55b3d45cb 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/ChannelGroupCommandServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/ChannelGroupCommandServiceBean.java @@ -29,7 +29,7 @@ public class ChannelGroupCommandServiceBean implements ChannelGroupCommandServic Optional channelInGroup = aChannelGroupCommand.getGroup() .getChannels().stream().filter(innerChannel -> innerChannel.getId().equals(channel.getId())).findAny(); if (channelInGroup.isPresent() && !aChannelGroupCommand.getEnabled()) { - log.trace("Command {} is disabled because the channel is part of group {} in server.", command.getName(), aChannelGroupCommand.getGroup().getId()); + log.debug("Command {} is disabled because the channel is part of group {} in server.", command.getName(), aChannelGroupCommand.getGroup().getId()); return false; } } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/ChannelGroupCommandManagementServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/ChannelGroupCommandManagementServiceBean.java index 6a7547ccd..90b1c5bc3 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/ChannelGroupCommandManagementServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/ChannelGroupCommandManagementServiceBean.java @@ -25,7 +25,7 @@ public class ChannelGroupCommandManagementServiceBean implements ChannelGroupCom AChannelGroupCommand groupCommand = groupCommandOptional.orElseGet(() -> createCommandInGroup(command, group)); groupCommand.setEnabled(enabled); - log.trace("Setting command {} enabled in group {} to {}.", command.getName(), group.getId(), enabled); + log.debug("Setting command {} enabled in group {} to {}.", command.getName(), group.getId(), enabled); groupCommandRepository.save(groupCommand); } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/PostTargetCommand.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/PostTargetCommand.java index 711ae6fe8..1b09c9dcf 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/PostTargetCommand.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/PostTargetCommand.java @@ -53,7 +53,7 @@ public class PostTargetCommand extends AbstractConditionableCommand { @Override public CompletableFuture executeAsync(CommandContext commandContext) { if(commandContext.getParameters().getParameters().isEmpty()) { - log.trace("Displaying existing post targets for guild {}.", commandContext.getGuild().getId()); + log.debug("Displaying existing post targets for guild {}.", commandContext.getGuild().getId()); PostTargetDisplayModel posttargetDisplayModel = (PostTargetDisplayModel) ContextConverter.fromCommandContext(commandContext, PostTargetDisplayModel.class); AServer server = serverManagementService.loadServer(commandContext.getGuild()); List postTargets = postTargetService.getPostTargets(server); diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/Help.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/Help.java index 4710e9cdb..0e6110011 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/Help.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/Help.java @@ -111,7 +111,7 @@ public class Help implements Command { if(moduleService.moduleExists(parameter)){ metricService.incrementCounter(HELP_COMMAND_MODULE_METRIC); ModuleDefinition moduleDefinition = moduleService.getModuleByName(parameter); - log.trace("Displaying help for module {}.", moduleDefinition.getInfo().getName()); + log.debug("Displaying help for module {}.", moduleDefinition.getInfo().getName()); SingleLevelPackedModule module = moduleService.getPackedModule(moduleDefinition); List commands = module.getCommands(); List filteredCommands = new ArrayList<>(); @@ -133,7 +133,7 @@ public class Help implements Command { if(commandOptional.isPresent()) { metricService.incrementCounter(HELP_COMMAND_COMMAND_METRIC); Command command = commandOptional.get(); - log.trace("Displaying help for command {}.", command.getConfiguration().getName()); + log.debug("Displaying help for command {}.", command.getConfiguration().getName()); ACommand aCommand = commandManagementService.findCommandByName(command.getConfiguration().getName()); List aliases = commandInServerAliasService.getAliasesForCommand(commandContext.getGuild().getIdLong(), command.getConfiguration().getName()); ACommandInAServer aCommandInAServer = commandInServerManagementService.getCommandForServer(aCommand, commandContext.getGuild().getIdLong()); @@ -158,7 +158,7 @@ public class Help implements Command { } private CompletableFuture displayHelpOverview(CommandContext commandContext) { - log.trace("Displaying help overview response."); + log.debug("Displaying help overview response."); ModuleDefinition moduleDefinition = moduleService.getDefaultModule(); List subModules = moduleService.getSubModules(moduleDefinition); HelpModuleOverviewModel model = (HelpModuleOverviewModel) ContextConverter.fromCommandContext(commandContext, HelpModuleOverviewModel.class); diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/PostTargetDelayedAction.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/PostTargetDelayedAction.java index 9814910d9..5a1e975ec 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/PostTargetDelayedAction.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/PostTargetDelayedAction.java @@ -15,7 +15,7 @@ public class PostTargetDelayedAction implements DelayedAction { @Override public void execute(DelayedActionConfig delayedActionConfig) { PostTargetDelayedActionConfig castedConfig = (PostTargetDelayedActionConfig) delayedActionConfig; - log.trace("Executing post target delayed step to set post target {} to channel {} in server {}.", castedConfig.getPostTargetKey(), castedConfig.getChannelId(), castedConfig.getServerId()); + log.debug("Executing post target delayed step to set post target {} to channel {} in server {}.", castedConfig.getPostTargetKey(), castedConfig.getChannelId(), castedConfig.getServerId()); postTargetManagement.createOrUpdate(castedConfig.getPostTargetKey(), castedConfig.getServerId(), castedConfig.getChannelId()); } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/PostTargetSetupStep.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/PostTargetSetupStep.java index 8ced82d29..81bb66c40 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/PostTargetSetupStep.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/PostTargetSetupStep.java @@ -72,7 +72,7 @@ public class PostTargetSetupStep extends AbstractConfigSetupStep { CompletableFuture future = new CompletableFuture<>(); AUserInAServer aUserInAServer = userInServerManagementService.loadOrCreateUser(user.getGuildId(), user.getUserId()); Runnable finalAction = super.getTimeoutRunnable(user.getGuildId(), user.getChannelId()); - log.trace("Executing setup for post target {} in server {} for user {}.", postTargetStepParameter.getPostTargetKey(), user.getGuildId(), user.getUserId()); + log.debug("Executing setup for post target {} in server {} for user {}.", postTargetStepParameter.getPostTargetKey(), user.getGuildId(), user.getUserId()); Consumer configAction = (MessageReceivedEvent event) -> { try { @@ -83,7 +83,7 @@ public class PostTargetSetupStep extends AbstractConfigSetupStep { result = SetupStepResult.fromCancelled(); } else { if(message.getMentionedChannels().size() == 0) { - log.trace("No mentioned channel was seen in channel, nothing provided."); + log.debug("No mentioned channel was seen in channel, nothing provided."); throw new NoChannelProvidedException(); } TextChannel textChannel = message.getMentionedChannels().get(0); @@ -94,7 +94,7 @@ public class PostTargetSetupStep extends AbstractConfigSetupStep { .textChannel(textChannel) .channelId(textChannel.getIdLong()) .build(); - log.trace("Setup for post target {} in server {} for user {} completed. Storing delayed action.", postTargetStepParameter.getPostTargetKey(), user.getGuildId(), user.getUserId()); + log.debug("Setup for post target {} in server {} for user {} completed. Storing delayed action.", postTargetStepParameter.getPostTargetKey(), user.getGuildId(), user.getUserId()); List delayedSteps = Arrays.asList(build); result = SetupStepResult .builder() diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SystemConfigDelayedAction.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SystemConfigDelayedAction.java index 7a3cc3471..b41394457 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SystemConfigDelayedAction.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SystemConfigDelayedAction.java @@ -16,7 +16,7 @@ public class SystemConfigDelayedAction implements DelayedAction { @Override public void execute(DelayedActionConfig delayedActionConfig) { SystemConfigDelayedActionConfig concrete = (SystemConfigDelayedActionConfig) delayedActionConfig; - log.trace("Executing delayed system config action for key {} in server {}.", concrete.getConfigKey(), concrete.getServerId()); + log.debug("Executing delayed system config action for key {} in server {}.", concrete.getConfigKey(), concrete.getServerId()); configService.setOrCreateConfigValue(concrete.getServerId(), concrete.getConfigKey(), concrete.getValue()); } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SystemConfigSetupStep.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SystemConfigSetupStep.java index 602a6dceb..c5b9bb980 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SystemConfigSetupStep.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SystemConfigSetupStep.java @@ -62,7 +62,7 @@ public class SystemConfigSetupStep extends AbstractConfigSetupStep { AChannel channel = channelManagementService.loadChannel(user.getChannelId()); CompletableFuture future = new CompletableFuture<>(); AUserInAServer aUserInAServer = userInServerManagementService.loadOrCreateUser(user.getGuildId(), user.getUserId()); - log.trace("Executing setup for system config {} in server {} for user {}.", systemConfigStepParameter.getConfigKey(), user.getGuildId(), user.getUserId()); + log.debug("Executing setup for system config {} in server {} for user {}.", systemConfigStepParameter.getConfigKey(), user.getGuildId(), user.getUserId()); Runnable finalAction = super.getTimeoutRunnable(user.getGuildId(), user.getChannelId()); Consumer configAction = (MessageReceivedEvent event) -> { @@ -79,7 +79,7 @@ public class SystemConfigSetupStep extends AbstractConfigSetupStep { log.info("It was decided to keep the original value for key {} in server {}.", systemConfigStepParameter.getConfigKey(), user.getGuildId()); } else { config = self.checkValidity(systemConfigStepParameter, event); - log.trace("The given value for key {} in server {} was valid.", systemConfigStepParameter.getConfigKey(), user.getGuildId()); + log.debug("The given value for key {} in server {} was valid.", systemConfigStepParameter.getConfigKey(), user.getGuildId()); } SystemConfigDelayedActionConfig build = SystemConfigDelayedActionConfig .builder() @@ -87,7 +87,7 @@ public class SystemConfigSetupStep extends AbstractConfigSetupStep { .serverId(user.getGuildId()) .value(config) .build(); - log.trace("Setup for system config {} in server {} for user {} completed. Storing delayed action.", systemConfigStepParameter.getConfigKey(), user.getGuildId(), user.getUserId()); + log.debug("Setup for system config {} in server {} for user {} completed. Storing delayed action.", systemConfigStepParameter.getConfigKey(), user.getGuildId(), user.getUserId()); List delayedSteps = Arrays.asList(build); result = SetupStepResult .builder() diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncPrivateMessageReceivedListenerBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncPrivateMessageReceivedListenerBean.java index 56f3e2175..e3f4b955c 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncPrivateMessageReceivedListenerBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncPrivateMessageReceivedListenerBean.java @@ -69,7 +69,7 @@ public class AsyncPrivateMessageReceivedListenerBean extends ListenerAdapter { @Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.SERIALIZABLE) public void executeIndividualPrivateMessageReceivedListener(CachedMessage cachedMessage, AsyncPrivateMessageReceivedListener messageReceivedListener) { - log.trace("Executing private message listener {} for member {}.", messageReceivedListener.getClass().getName(), cachedMessage.getAuthor().getAuthorId()); + log.debug("Executing private message listener {} for member {}.", messageReceivedListener.getClass().getName(), cachedMessage.getAuthor().getAuthorId()); messageReceivedListener.execute(cachedMessage); } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/sync/jda/PrivateMessageReceivedListenerBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/sync/jda/PrivateMessageReceivedListenerBean.java index 11cf34fb6..92ded6c69 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/sync/jda/PrivateMessageReceivedListenerBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/sync/jda/PrivateMessageReceivedListenerBean.java @@ -52,7 +52,7 @@ public class PrivateMessageReceivedListenerBean extends ListenerAdapter { @Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.SERIALIZABLE) public void executeIndividualPrivateMessageReceivedListener(@Nonnull PrivateMessageReceivedEvent event, PrivateMessageReceivedListener messageReceivedListener) { // no feature flag check, because we are in no server context - log.trace("Executing private message listener {} for member {}.", messageReceivedListener.getClass().getName(), event.getAuthor().getId()); + log.debug("Executing private message listener {} for member {}.", messageReceivedListener.getClass().getName(), event.getAuthor().getId()); messageReceivedListener.execute(event.getMessage()); } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/CacheEntityServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/CacheEntityServiceBean.java index ba6feb8d5..ed2453b29 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/CacheEntityServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/CacheEntityServiceBean.java @@ -85,7 +85,7 @@ public class CacheEntityServiceBean implements CacheEntityService { } List fields = embed.getFields(); if(!fields.isEmpty()) { - log.trace("Caching {} fields.", fields.size()); + log.debug("Caching {} fields.", fields.size()); List cachedEmbedFields = new ArrayList<>(); fields.forEach(field -> { CachedEmbedField build = CachedEmbedField @@ -159,13 +159,13 @@ public class CacheEntityServiceBean implements CacheEntityService { List aUsers = new ArrayList<>(); users.forEachAsync(user -> { - log.trace("Loading user {} for reaction.", user.getIdLong()); + log.debug("Loading user {} for reaction.", user.getIdLong()); if(reaction.getGuild() != null) { aUsers.add(ServerUser.builder().userId(user.getIdLong()).serverId(reaction.getGuild().getIdLong()).build()); } return true; }).whenComplete((o, throwable) -> { - log.trace("{} Users have been loaded. Completing future.", aUsers.size()); + log.debug("{} Users have been loaded. Completing future.", aUsers.size()); if(throwable != null) { log.error("Reaction user retrieval failed. Completing with what we have.", throwable); } @@ -181,24 +181,24 @@ public class CacheEntityServiceBean implements CacheEntityService { public CompletableFuture buildCachedMessageFromMessage(Message message) { CompletableFuture future = new CompletableFuture<>(); List attachments = new ArrayList<>(); - log.trace("Caching {} attachments.", message.getAttachments().size()); + log.debug("Caching {} attachments.", message.getAttachments().size()); message.getAttachments().forEach(attachment -> attachments.add(getCachedAttachment(attachment)) ); - log.trace("Caching {} embeds.", message.getEmbeds().size()); + log.debug("Caching {} embeds.", message.getEmbeds().size()); List embeds = new ArrayList<>(); message.getEmbeds().forEach(embed -> embeds.add(getCachedEmbedFromEmbed(embed)) ); - log.trace("Caching {} emotes.", message.getEmbeds().size()); + log.debug("Caching {} emotes.", message.getEmbeds().size()); List emotes = new ArrayList<>(); if(message.isFromGuild()) { message.getEmotesBag().forEach(emote -> emotes.add(getCachedEmoteFromEmote(emote, message.getGuild()))); } List> futures = new ArrayList<>(); - log.trace("Caching {} reactions.", message.getReactions().size()); + log.debug("Caching {} reactions.", message.getReactions().size()); message.getReactions().forEach(messageReaction -> futures.add(getCachedReactionFromReaction(messageReaction))); CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).thenAccept(aVoid -> { diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java index b61864b74..b035efbb4 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java @@ -123,7 +123,7 @@ public class ChannelServiceBean implements ChannelService { @Override public CompletableFuture sendMessageToChannel(Message message, MessageChannel channel) { - log.trace("Sending message {} from channel {} and server {} to channel {}.", + log.debug("Sending message {} from channel {} and server {} to channel {}.", message.getId(), message.getChannel().getId(), message.getGuild().getId(), channel.getId()); metricService.incrementCounter(MESSAGE_SEND_METRIC); return channel.sendMessage(message).allowedMentions(getAllowedMentionsFor(channel)).submit(); @@ -138,7 +138,7 @@ public class ChannelServiceBean implements ChannelService { @Override public CompletableFuture sendTextToChannel(String text, MessageChannel channel) { - log.trace("Sending text to channel {}.", channel.getId()); + log.debug("Sending text to channel {}.", channel.getId()); metricService.incrementCounter(MESSAGE_SEND_METRIC); return channel.sendMessage(text).allowedMentions(getAllowedMentionsFor(channel)).submit(); } @@ -162,7 +162,7 @@ public class ChannelServiceBean implements ChannelService { @Override public CompletableFuture sendEmbedToChannel(MessageEmbed embed, MessageChannel channel) { - log.trace("Sending embed to channel {}.", channel.getId()); + log.debug("Sending embed to channel {}.", channel.getId()); return sendEmbedToChannelInComplete(embed, channel).submit(); } @@ -259,14 +259,14 @@ public class ChannelServiceBean implements ChannelService { public CompletableFuture editMessageInAChannelFuture(MessageToSend messageToSend, MessageChannel channel, Long messageId) { MessageAction messageAction; if(!StringUtils.isBlank(messageToSend.getMessages().get(0))) { - log.trace("Editing message {} with new text content.", messageId); + log.debug("Editing message {} with new text content.", messageId); messageAction = channel.editMessageById(messageId, messageToSend.getMessages().get(0)); if(messageToSend.getEmbeds() != null && !messageToSend.getEmbeds().isEmpty()) { - log.trace("Also editing the embed for message {}.", messageId); + log.debug("Also editing the embed for message {}.", messageId); messageAction = messageAction.embed(messageToSend.getEmbeds().get(0)); } } else { - log.trace("Editing message {} with new embeds.", messageId); + log.debug("Editing message {} with new embeds.", messageId); if(messageToSend.getEmbeds() != null && !messageToSend.getEmbeds().isEmpty()) { messageAction = channel.editMessageById(messageId, messageToSend.getEmbeds().get(0)); } else { @@ -316,7 +316,7 @@ public class ChannelServiceBean implements ChannelService { return retrieveMessageInChannel(channel, messageId).thenCompose(message -> { EmbedBuilder embedBuilder = new EmbedBuilder(message.getEmbeds().get(embedIndex)); embedBuilder.getFields().remove(index.intValue()); - log.trace("Removing field with index {} from message {}.", index, messageId); + log.debug("Removing field with index {} from message {}.", index, messageId); return editEmbedMessageInAChannel(embedBuilder.build(), channel, messageId); }); } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ConditionServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ConditionServiceBean.java index 5647e08c6..951869c62 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ConditionServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ConditionServiceBean.java @@ -27,11 +27,11 @@ public class ConditionServiceBean implements ConditionService { .stream() .filter(systemCondition -> systemCondition.getConditionName().equalsIgnoreCase(context.getConditionName())) .findAny(); - log.trace("Checking condition {}.", context.getConditionName()); + log.debug("Checking condition {}.", context.getConditionName()); return matchingCondition.map(systemCondition -> { verifyConditionContext(context, systemCondition); boolean result = systemCondition.checkCondition(context); - log.trace("Condition resulted in {}.", result); + log.debug("Condition resulted in {}.", result); return result; }).orElse(true); } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/CounterServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/CounterServiceBean.java index 7201029ff..aeac9d0e3 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/CounterServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/CounterServiceBean.java @@ -15,7 +15,7 @@ public class CounterServiceBean implements CounterService { @Override public Long getNextCounterValue(AServer server, String key) { - log.trace("Retrieving new counter value for key {} in server {}.", key, server.getId()); + log.debug("Retrieving new counter value for key {} in server {}.", key, server.getId()); return counterRepository.getNewCounterForKey(server.getId(), key); } } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/DelayedActionServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/DelayedActionServiceBean.java index f539c58fd..7461a2c23 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/DelayedActionServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/DelayedActionServiceBean.java @@ -18,7 +18,7 @@ public class DelayedActionServiceBean implements DelayedActionService { @Override public void executeDelayedActions(List delayedActionConfigList) { delayedActionConfigList.forEach(delayedActionConfig -> { - log.trace("Executing delayed action {}.", delayedActionConfig.getClass().getSimpleName()); + log.debug("Executing delayed action {}.", delayedActionConfig.getClass().getSimpleName()); delayedActions.stream() .filter(delayedAction -> delayedAction.handles(delayedActionConfig)) .findFirst() diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/FeatureConfigServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/FeatureConfigServiceBean.java index 6e7540f81..ce9e317a2 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/FeatureConfigServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/FeatureConfigServiceBean.java @@ -105,19 +105,19 @@ public class FeatureConfigServiceBean implements FeatureConfigService { log.info("Verifying feature setup for feature {} in server {}.", featureConfig.getFeature().getKey(), server.getId()); FeatureValidationResult featureValidationResult = FeatureValidationResult.validationSuccessful(featureConfig); featureConfig.getRequiredPostTargets().forEach(s -> { - log.trace("Checking post target {}.", s.getKey()); + log.debug("Checking post target {}.", s.getKey()); featureValidatorService.checkPostTarget(s, server, featureValidationResult); }); featureConfig.getRequiredSystemConfigKeys().forEach(s -> { - log.trace("Checking system config key {}.", s); + log.debug("Checking system config key {}.", s); featureValidatorService.checkSystemConfig(s, server, featureValidationResult); }); featureConfig.getRequiredEmotes().forEach(s -> { - log.trace("Checking required emote {}.", s); + log.debug("Checking required emote {}.", s); featureValidatorService.checkEmote(s, server, featureValidationResult); } ); featureConfig.getAdditionalFeatureValidators().forEach(featureValidator -> { - log.trace("Executing additional feature validator {}.", featureValidator.getClass().getName()); + log.debug("Executing additional feature validator {}.", featureValidator.getClass().getName()); featureValidator.featureIsSetup(featureConfig, server, featureValidationResult); }); return featureValidationResult; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/FeatureSetupServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/FeatureSetupServiceBean.java index d4c9ae7b9..127222059 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/FeatureSetupServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/FeatureSetupServiceBean.java @@ -65,7 +65,7 @@ public class FeatureSetupServiceBean implements FeatureSetupService { List requiredSystemConfigKeys = featureConfig.getRequiredSystemConfigKeys(); List steps = new ArrayList<>(); requiredSystemConfigKeys.forEach(s -> { - log.trace("Feature requires system config key {}.", s); + log.debug("Feature requires system config key {}.", s); SetupExecution execution = SetupExecution .builder() .step(systemConfigSetupStep) @@ -74,7 +74,7 @@ public class FeatureSetupServiceBean implements FeatureSetupService { steps.add(execution); }); featureConfig.getRequiredPostTargets().forEach(postTargetEnum -> { - log.trace("Feature requires post target {}.", postTargetEnum.getKey()); + log.debug("Feature requires post target {}.", postTargetEnum.getKey()); SetupExecution execution = SetupExecution .builder() .step(postTargetSetupStep) @@ -83,7 +83,7 @@ public class FeatureSetupServiceBean implements FeatureSetupService { steps.add(execution); }); featureConfig.getCustomSetupSteps().forEach(setupStep -> { - log.trace("Feature requires custom setup step {}.", setupStep.getClass().getName()); + log.debug("Feature requires custom setup step {}.", setupStep.getClass().getName()); SetupExecution execution = SetupExecution .builder() .step(setupStep) @@ -118,16 +118,16 @@ public class FeatureSetupServiceBean implements FeatureSetupService { } private CompletableFuture executeStep(AServerChannelUserId aUserInAServer, SetupExecution execution, List delayedActionConfigs, FeatureConfig featureConfig) { - log.trace("Executing step {} in server {} in channel {} for user {}.", execution.getStep().getClass(), aUserInAServer.getGuildId(), aUserInAServer.getChannelId(), aUserInAServer.getUserId()); + log.debug("Executing step {} in server {} in channel {} for user {}.", execution.getStep().getClass(), aUserInAServer.getGuildId(), aUserInAServer.getChannelId(), aUserInAServer.getUserId()); return execution.getStep().execute(aUserInAServer, execution.getParameter()).thenAccept(aVoid -> { if(aVoid.getResult().equals(SetupStepResultType.SUCCESS)) { log.info("Step {} in server {} has been executed successfully. Proceeding.", execution.getStep().getClass(), aUserInAServer.getGuildId()); delayedActionConfigs.addAll(aVoid.getDelayedActionConfigList()); if(execution.getNextStep() != null) { - log.trace("Executing next step {}.", execution.getNextStep().getStep().getClass()); + log.debug("Executing next step {}.", execution.getNextStep().getStep().getClass()); executeStep(aUserInAServer, execution.getNextStep(), delayedActionConfigs, featureConfig); } else { - log.trace("Step was the last step. Executing post setup steps."); + log.debug("Step was the last step. Executing post setup steps."); self.executePostSetupSteps(delayedActionConfigs, aUserInAServer, execution.getParameter().getPreviousMessageId(), featureConfig); } } else { @@ -165,7 +165,7 @@ public class FeatureSetupServiceBean implements FeatureSetupService { @Transactional public void notifyAboutCompletion(AServerChannelUserId aServerChannelUserId, FeatureConfig featureConfig, SetupStepResult result) { - log.trace("Notifying user {} in channel {} in server {} about completion of setup for feature {}.", + log.debug("Notifying user {} in channel {} in server {} about completion of setup for feature {}.", aServerChannelUserId.getUserId(), aServerChannelUserId.getChannelId(), aServerChannelUserId.getGuildId(), featureConfig.getFeature().getKey()); String templateKey; if(result.getResult().equals(SetupStepResultType.CANCELLED)) { @@ -188,7 +188,7 @@ public class FeatureSetupServiceBean implements FeatureSetupService { @Transactional public void notifyAboutCancellation(AServerChannelUserId aServerChannelUserId, FeatureConfig featureConfig) { - log.trace("Notifying user {} in channel {} in server {} about cancellation of setup for feature {}.", + log.debug("Notifying user {} in channel {} in server {} about cancellation of setup for feature {}.", aServerChannelUserId.getUserId(), aServerChannelUserId.getChannelId(), aServerChannelUserId.getGuildId(), featureConfig.getFeature().getKey()); notifyUserWithTemplate(aServerChannelUserId, featureConfig, FEATURE_SETUP_CANCELLATION_NOTIFICATION_TEMPLATE); } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MemberServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MemberServiceBean.java index dcf4ce4aa..1416baf08 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MemberServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MemberServiceBean.java @@ -33,7 +33,7 @@ public class MemberServiceBean implements MemberService { @Override public GuildChannelMember getServerChannelUser(Long serverId, Long channelId, Long userId) { - log.trace("Trying to retrieve member {}, channel {} in server {} from cache.", userId, channelId, serverId); + log.debug("Trying to retrieve member {}, channel {} in server {} from cache.", userId, channelId, serverId); Guild guild = guildService.getGuildById(serverId); Optional textChannelOptional = channelService.getTextChannelFromServerOptional(guild, channelId); if(textChannelOptional.isPresent()) { @@ -47,7 +47,7 @@ public class MemberServiceBean implements MemberService { @Override public CompletableFuture getServerChannelUserAsync(Long serverId, Long channelId, Long userId) { - log.trace("Trying to retrieve member {}, channel {} in server {} async.", userId, channelId, serverId); + log.debug("Trying to retrieve member {}, channel {} in server {} async.", userId, channelId, serverId); CompletableFuture memberFuture = getMemberInServerAsync(serverId, userId); Guild guild = guildService.getGuildById(serverId); @@ -59,7 +59,7 @@ public class MemberServiceBean implements MemberService { @Override public Member getMemberInServer(Long serverId, Long memberId) { - log.trace("Retrieving member {} in server {} from cache.", memberId, serverId); + log.debug("Retrieving member {} in server {} from cache.", memberId, serverId); Guild guildById = guildService.getGuildById(serverId); if(guildById != null) { return guildById.getMemberById(memberId); @@ -70,7 +70,7 @@ public class MemberServiceBean implements MemberService { @Override public CompletableFuture getMemberInServerAsync(Long serverId, Long memberId) { - log.trace("Retrieving member {} in server {} from cache.", memberId, serverId); + log.debug("Retrieving member {} in server {} from cache.", memberId, serverId); Guild guildById = guildService.getGuildById(serverId); if(guildById != null) { return guildById.retrieveMemberById(memberId).submit(); diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageCacheBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageCacheBean.java index cfcb2882e..21a6e161b 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageCacheBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageCacheBean.java @@ -42,7 +42,7 @@ public class MessageCacheBean implements MessageCache { @Override @CachePut(key = "#message.id") public CompletableFuture putMessageInCache(Message message) { - log.info("Adding message {} to cache.", message.getId()); + log.debug("Adding message {} to cache.", message.getId()); return cacheEntityService.buildCachedMessageFromMessage(message); } @@ -50,27 +50,27 @@ public class MessageCacheBean implements MessageCache { @Override @CachePut(key = "#message.messageId.toString()") public CompletableFuture putMessageInCache(CachedMessage message) { - log.info("Adding cached message {} to cache.", message.getMessageId()); + log.debug("Adding cached message {} to cache.", message.getMessageId()); return CompletableFuture.completedFuture(message); } @Override @Cacheable(key = "#message.id") public CompletableFuture getMessageFromCache(Message message) { - log.trace("Retrieving message {}.", message.getId()); + log.debug("Retrieving message {}.", message.getId()); return getMessageFromCache(message.getGuild().getIdLong(), message.getChannel().getIdLong(), message.getIdLong()); } @Override @Cacheable(key = "#messageId.toString()") public CompletableFuture getMessageFromCache(Long guildId, Long textChannelId, Long messageId) { - log.info("Retrieving message {}.", messageId); + log.debug("Retrieving message {}.", messageId); return concreteSelf.loadMessage(guildId, textChannelId, messageId); } @Override public CompletableFuture loadMessage(Long guildId, Long textChannelId, Long messageId) { - log.info("Loading message {} from channel {} in server {}.", messageId, textChannelId, guildId); + log.debug("Loading message {} from channel {} in server {}.", messageId, textChannelId, guildId); CompletableFuture future = new CompletableFuture<>(); Optional guildOptional = guildService.getGuildByIdOptional(guildId); if(guildOptional.isPresent()) { diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java index ca9fbbec2..06b3544a8 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java @@ -129,7 +129,7 @@ public class MessageServiceBean implements MessageService { @Override public CompletableFuture sendEmbedToUserWithMessage(User user, String template, Object model) { - log.trace("Sending direct message with template {} to user {}.", template, user.getIdLong()); + log.debug("Sending direct message with template {} to user {}.", template, user.getIdLong()); return openPrivateChannelForUser(user).thenCompose(privateChannel -> channelService.sendEmbedTemplateInMessageChannelList(template, model, privateChannel).get(0)); } @@ -141,7 +141,7 @@ public class MessageServiceBean implements MessageService { @Override public CompletableFuture sendMessageToUser(User user, String text) { - log.trace("Sending direct string message to user {}.", user.getIdLong()); + log.debug("Sending direct string message to user {}.", user.getIdLong()); return user.openPrivateChannel().flatMap(privateChannel -> privateChannel.sendMessage(text)).submit(); } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java index ccc9034b1..9dca73a11 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java @@ -53,14 +53,14 @@ public class PostTargetServiceBean implements PostTargetService { @Override public CompletableFuture sendTextInPostTarget(String text, PostTarget target) { - log.trace("Sending text to post target {}.", target.getName()); + log.debug("Sending text to post target {}.", target.getName()); return channelService.sendTextToAChannel(text, target.getChannelReference()); } @Override public CompletableFuture sendEmbedInPostTarget(MessageEmbed embed, PostTarget target) { TextChannel textChannelForPostTarget = getTextChannelForPostTarget(target); - log.trace("Sending message embed to post target {}.", target.getName()); + log.debug("Sending message embed to post target {}.", target.getName()); return channelService.sendEmbedToChannel(embed, textChannelForPostTarget); } @@ -110,7 +110,7 @@ public class PostTargetServiceBean implements PostTargetService { @Override public CompletableFuture sendMessageInPostTarget(Message message, PostTarget target) { - log.trace("Send message {} towards post target {}.", message.getId(), target.getName()); + log.debug("Send message {} towards post target {}.", message.getId(), target.getName()); return channelService.sendMessageToAChannel(message, target.getChannelReference()); } @@ -123,7 +123,7 @@ public class PostTargetServiceBean implements PostTargetService { @Override public List> sendEmbedInPostTarget(MessageToSend message, PostTarget target) { TextChannel textChannelForPostTarget = getTextChannelForPostTarget(target); - log.trace("Send messageToSend towards post target {}.", target.getName()); + log.debug("Send messageToSend towards post target {}.", target.getName()); return channelService.sendMessageToSendToChannel(message, textChannelForPostTarget); } @@ -133,10 +133,10 @@ public class PostTargetServiceBean implements PostTargetService { // always takes the first one, only applicable for this scenario String messageText = message.getMessages().get(0); if(StringUtils.isBlank(messageText)) { - log.trace("Editing embeds of message {} in post target {}.", messageId, target.getName()); + log.debug("Editing embeds of message {} in post target {}.", messageId, target.getName()); return Arrays.asList(channelService.editEmbedMessageInAChannel(message.getEmbeds().get(0), textChannelForPostTarget, messageId)); } else { - log.trace("Editing message text and potentially text for message {} in post target {}.", messageId, target.getName()); + log.debug("Editing message text and potentially text for message {} in post target {}.", messageId, target.getName()); return Arrays.asList(channelService.editTextMessageInAChannel(messageText, message.getEmbeds().get(0), textChannelForPostTarget, messageId)); } } @@ -149,12 +149,12 @@ public class PostTargetServiceBean implements PostTargetService { futures.add(messageEditFuture); if(StringUtils.isBlank(messageToSend.getMessages().get(0).trim())) { channelService.retrieveMessageInChannel(textChannelForPostTarget, messageId).thenAccept(message -> { - log.trace("Editing existing message {} when upserting message embeds in channel {} in server {}.", + log.debug("Editing existing message {} when upserting message embeds in channel {} in server {}.", messageId, textChannelForPostTarget.getIdLong(), textChannelForPostTarget.getGuild().getId()); messageService.editMessage(message, messageToSend.getEmbeds().get(0)) .queue(messageEditFuture::complete, messageEditFuture::completeExceptionally); }).exceptionally(throwable -> { - log.trace("Creating new message when upserting message embeds for message {} in channel {} in server {}.", + log.debug("Creating new message when upserting message embeds for message {} in channel {} in server {}.", messageId, textChannelForPostTarget.getIdLong(), textChannelForPostTarget.getGuild().getId()); sendEmbedInPostTarget(messageToSend, target).get(0) .thenAccept(messageEditFuture::complete).exceptionally(innerThrowable -> { @@ -166,12 +166,12 @@ public class PostTargetServiceBean implements PostTargetService { }); } else { channelService.retrieveMessageInChannel(textChannelForPostTarget, messageId).thenAccept(message -> { - log.trace("Editing existing message {} when upserting message in channel {} in server {}.", + log.debug("Editing existing message {} when upserting message in channel {} in server {}.", messageId, textChannelForPostTarget.getIdLong(), textChannelForPostTarget.getGuild().getId()); messageService.editMessage(message, messageToSend.getMessages().get(0), messageToSend.getEmbeds().get(0)) .queue(messageEditFuture::complete, messageEditFuture::completeExceptionally); }).exceptionally(throwable -> { - log.trace("Creating new message when trying to upsert a message {} in channel {} in server {}.", + log.debug("Creating new message when trying to upsert a message {} in channel {} in server {}.", messageId, textChannelForPostTarget.getIdLong(), textChannelForPostTarget.getGuild().getId()); sendEmbedInPostTarget(messageToSend, target).get(0) .thenAccept(messageEditFuture::complete).exceptionally(innerThrowable -> { diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ProfanityServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ProfanityServiceBean.java index aab3bb33d..a313b94c4 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ProfanityServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ProfanityServiceBean.java @@ -43,7 +43,7 @@ public class ProfanityServiceBean implements ProfanityService { public String replaceProfanities(String input, Long serverId, String replacement) { if(regex.containsKey(serverId)) { List regexes = regex.get(serverId); - log.trace("Checking {} regexes for server {} with static replacement.", regexes.size(), serverId); + log.debug("Checking {} regexes for server {} with static replacement.", regexes.size(), serverId); for (PatternReplacement pattern: regexes) { Matcher matcher = pattern.getPattern().matcher(input); input = matcher.replaceAll(replacement); @@ -56,7 +56,7 @@ public class ProfanityServiceBean implements ProfanityService { public String replaceProfanitiesWithDefault(String input, Long serverId, String defaultReplacement) { if(regex.containsKey(serverId)) { List regexes = regex.get(serverId); - log.trace("Checking {} regexes for server {} with dynamic replacement.", regexes.size(), serverId); + log.debug("Checking {} regexes for server {} with dynamic replacement.", regexes.size(), serverId); for (PatternReplacement pattern: regexes) { Matcher matcher = pattern.getPattern().matcher(input); String replacement = pattern.getReplacement() != null ? pattern.getReplacement() : defaultReplacement; @@ -70,7 +70,7 @@ public class ProfanityServiceBean implements ProfanityService { public boolean containsProfanity(String input, Long serverId) { if(regex.containsKey(serverId)) { List regexes = regex.get(serverId); - log.trace("Checking existence of {} regexes for server {}.", regexes.size(), serverId); + log.debug("Checking existence of {} regexes for server {}.", regexes.size(), serverId); for (PatternReplacement pattern: regexes) { Matcher matcher = pattern.getPattern().matcher(input); if(matcher.matches()) { diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ReactionServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ReactionServiceBean.java index 504697fb4..855689d88 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ReactionServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ReactionServiceBean.java @@ -152,14 +152,14 @@ public class ReactionServiceBean implements ReactionService { if(Boolean.TRUE.equals(emote.getCustom())) { Emote emoteById = botService.getInstance().getEmoteById(emote.getEmoteId()); if(emoteById != null) { - log.trace("Adding custom emote {} as reaction to message {}.", emoteById.getId(), message.getId()); + log.debug("Adding custom emote {} as reaction to message {}.", emoteById.getId(), message.getId()); return addReactionToMessageAsync(emoteById, message); } else { log.error("Emote with key {} and id {} for guild {} was not found.", emote.getName() , emote.getEmoteId(), guild.getId()); throw new ConfiguredEmoteNotUsableException(emote); } } else { - log.trace("Adding default emote {} as reaction to message {}.", emote.getEmoteKey(), message.getId()); + log.debug("Adding default emote {} as reaction to message {}.", emote.getEmoteKey(), message.getId()); return addDefaultReactionToMessageAsync(emote.getEmoteKey(), message); } } @@ -192,10 +192,10 @@ public class ReactionServiceBean implements ReactionService { if(emoteById == null) { throw new EmoteNotInServerException(emote.getEmoteId()); } - log.trace("Removing single custom reaction for emote {} on message {}.", emoteById.getId(), message.getId()); + log.debug("Removing single custom reaction for emote {} on message {}.", emoteById.getId(), message.getId()); return removeReaction(message, emoteById); } else { - log.trace("Removing single default emote {} reaction from message {}.", emote.getEmoteKey(), message.getId()); + log.debug("Removing single default emote {} reaction from message {}.", emote.getEmoteKey(), message.getId()); return removeReaction(message, emote.getEmoteKey()); } } @@ -265,10 +265,10 @@ public class ReactionServiceBean implements ReactionService { if(emoteById == null) { throw new EmoteNotInServerException(emote.getEmoteId()); } - log.trace("Clearing reactions for custom emote {} on message {}.", emoteById.getId(), message.getId()); + log.debug("Clearing reactions for custom emote {} on message {}.", emoteById.getId(), message.getId()); return clearReaction(message, emoteById); } else { - log.trace("Clearing reactions for default emote {} on message {}.", emote.getEmoteKey(), message.getId()); + log.debug("Clearing reactions for default emote {} on message {}.", emote.getEmoteKey(), message.getId()); return clearReaction(message, emote.getEmoteKey()); } } @@ -330,10 +330,10 @@ public class ReactionServiceBean implements ReactionService { if(emoteById == null) { throw new EmoteNotInServerException(emote.getEmoteId()); } - log.trace("Removing reaction for custom emote {} from user {} on message {}.", emoteById.getId(), member.getId(), member.getId()); + log.debug("Removing reaction for custom emote {} from user {} on message {}.", emoteById.getId(), member.getId(), member.getId()); return removeReaction(message, emoteById, member.getUser()); } else { - log.trace("Removing reaction for default emote {} from user {} on message {}.", emote.getEmoteKey(), member.getId(), member.getId()); + log.debug("Removing reaction for default emote {} from user {} on message {}.", emote.getEmoteKey(), member.getId(), member.getId()); return removeReaction(message, emote.getEmoteKey(), member.getUser()); } } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/RoleServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/RoleServiceBean.java index c8d676481..eb777193c 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/RoleServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/RoleServiceBean.java @@ -204,7 +204,7 @@ public class RoleServiceBean implements RoleService { } Optional guildById = guildService.getGuildByIdOptional(role.getServer().getId()); if(guildById.isPresent()) { - log.trace("Loading role {} from server {}.", role.getId(), role.getServer().getId()); + log.debug("Loading role {} from server {}.", role.getId(), role.getServer().getId()); return guildById.get().getRoleById(role.getId()); } else { throw new GuildNotFoundException(role.getServer().getId()); diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/ConfigManagementServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/ConfigManagementServiceBean.java index 2a23e5afb..29e44f6cd 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/ConfigManagementServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/ConfigManagementServiceBean.java @@ -59,7 +59,7 @@ public class ConfigManagementServiceBean implements ConfigManagementService { .server(server) .name(name) .build(); - log.trace("Creating config entry for type string in server {} and key {}", serverId, name); + log.debug("Creating config entry for type string in server {} and key {}", serverId, name); return configRepository.save(config); } @@ -72,7 +72,7 @@ public class ConfigManagementServiceBean implements ConfigManagementService { .server(server) .name(name) .build(); - log.trace("Creating config entry for type double in server {} and key {}", serverId, name); + log.debug("Creating config entry for type double in server {} and key {}", serverId, name); return configRepository.save(config); } @@ -85,7 +85,7 @@ public class ConfigManagementServiceBean implements ConfigManagementService { .server(server) .name(name) .build(); - log.trace("Creating config entry for type long in server {} and key {}", serverId, name); + log.debug("Creating config entry for type long in server {} and key {}", serverId, name); return configRepository.save(config); } @@ -135,7 +135,7 @@ public class ConfigManagementServiceBean implements ConfigManagementService { public AConfig setDoubleValue(Long serverId, String name, Double value) { AConfig config = loadConfig(serverId, name); config.setDoubleValue(value); - log.trace("Setting double value of key {} in server {}.", name, serverId); + log.debug("Setting double value of key {} in server {}.", name, serverId); return config; } @@ -143,7 +143,7 @@ public class ConfigManagementServiceBean implements ConfigManagementService { public AConfig setLongValue(Long serverId, String name, Long value) { AConfig config = loadConfig(serverId, name); config.setLongValue(value); - log.trace("Setting long value of key {} in server {}.", name, serverId); + log.debug("Setting long value of key {} in server {}.", name, serverId); return config; } @@ -151,7 +151,7 @@ public class ConfigManagementServiceBean implements ConfigManagementService { public AConfig setStringValue(Long serverId, String name, String value) { AConfig config = loadConfig(serverId, name); config.setStringValue(value); - log.trace("Setting string value of key {} in server {}.", name, serverId); + log.debug("Setting string value of key {} in server {}.", name, serverId); return config; } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/EmoteManagementServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/EmoteManagementServiceBean.java index 11d9a4ed5..37a0053d0 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/EmoteManagementServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/EmoteManagementServiceBean.java @@ -115,7 +115,7 @@ public class EmoteManagementServiceBean implements EmoteManagementService { emote = this.createCustomEmote(name, emoteKey, emoteId, animated, server, true); } else { emote = emoteOptional.get(); - log.trace("Setting existing emote (a: {}, c: {}, id: {}, discord id: {}) to new custom emote configuration: new id {}, animated {}.", + log.debug("Setting existing emote (a: {}, c: {}, id: {}, discord id: {}) to new custom emote configuration: new id {}, animated {}.", emote.getAnimated(), emote.getCustom(), emote.getId(), emote.getEmoteId(), emoteId, animated); emote.setEmoteKey(emoteKey); emote.setEmoteId(emoteId); @@ -140,7 +140,7 @@ public class EmoteManagementServiceBean implements EmoteManagementService { emoteBeingSet = this.createDefaultEmote(name, emoteKey, server, true); } else { emoteBeingSet = emoteOptional.get(); - log.trace("Setting existing emote (a: {}, c: {}, id: {}, discord id: {}) to new default emote {}.", + log.debug("Setting existing emote (a: {}, c: {}, id: {}, discord id: {}) to new default emote {}.", emoteBeingSet.getAnimated(), emoteBeingSet.getCustom(), emoteBeingSet.getId(), emoteBeingSet.getEmoteId(), emoteKey); emoteBeingSet.setEmoteKey(emoteKey); emoteBeingSet.setCustom(false); @@ -158,13 +158,13 @@ public class EmoteManagementServiceBean implements EmoteManagementService { } else { AEmote emoteBeingSet = emoteOptional.get(); if(fakeEmote.getCustom()) { - log.trace("Setting existing emote (a: {}, c: {}, id: {}, discord id: {}) to new custom emote configuration: new id {}, animated {}.", + log.debug("Setting existing emote (a: {}, c: {}, id: {}, discord id: {}) to new custom emote configuration: new id {}, animated {}.", emoteBeingSet.getAnimated(), emoteBeingSet.getCustom(), emoteBeingSet.getId(), emoteBeingSet.getEmoteId(), fakeEmote.getEmoteId(), fakeEmote.getAnimated()); emoteBeingSet.setCustom(fakeEmote.getCustom()); emoteBeingSet.setEmoteId(fakeEmote.getEmoteId()); emoteBeingSet.setEmoteKey(fakeEmote.getEmoteKey()); } else { - log.trace("Setting existing emote (a: {}, c: {}, id: {}, discord id: {}) to new default emote {}.", + log.debug("Setting existing emote (a: {}, c: {}, id: {}, discord id: {}) to new default emote {}.", emoteBeingSet.getAnimated(), emoteBeingSet.getCustom(), emoteBeingSet.getId(), emoteBeingSet.getEmoteId(), fakeEmote.getEmoteKey()); emoteBeingSet.setCustom(false); emoteBeingSet.setEmoteKey(fakeEmote.getEmoteKey()); diff --git a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/condition/CommandDisallowedCondition.java b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/condition/CommandDisallowedCondition.java index 20f52342d..2383cbe57 100644 --- a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/condition/CommandDisallowedCondition.java +++ b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/condition/CommandDisallowedCondition.java @@ -41,7 +41,7 @@ public class CommandDisallowedCondition implements CommandCondition { for (ARole role : commandForServer.getAllowedRoles()) { Member author = context.getAuthor(); if (roleService.memberHasRole(author, role)) { - log.trace("Member {} is able to execute restricted command {}, because of role {}.", author.getIdLong(), aCommand.getName(), role.getId()); + log.debug("Member {} is able to execute restricted command {}, because of role {}.", author.getIdLong(), aCommand.getName(), role.getId()); return ConditionResult.builder().result(true).build(); } } diff --git a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/condition/FeatureEnabledCondition.java b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/condition/FeatureEnabledCondition.java index b376250e6..497e6ef83 100644 --- a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/condition/FeatureEnabledCondition.java +++ b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/condition/FeatureEnabledCondition.java @@ -27,7 +27,7 @@ public class FeatureEnabledCondition implements CommandCondition { if(feature != null) { featureFlagValue = featureFlagService.getFeatureFlagValue(feature, context.getGuild().getIdLong()); if(!featureFlagValue) { - log.trace("Feature {} is disabled, disallows command {} to be executed in guild {}.", feature.getKey(), command.getConfiguration().getName(), context.getGuild().getId()); + log.debug("Feature {} is disabled, disallows command {} to be executed in guild {}.", feature.getKey(), command.getConfiguration().getName(), context.getGuild().getId()); FeatureDisabledConditionDetail exception = new FeatureDisabledConditionDetail(featureConfigService.getFeatureDisplayForFeature(command.getFeature())); return ConditionResult.builder().result(false).conditionDetail(exception).build(); } diff --git a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/condition/ImmuneUserCondition.java b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/condition/ImmuneUserCondition.java index 83cf9e2e9..fab3ae219 100644 --- a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/condition/ImmuneUserCondition.java +++ b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/condition/ImmuneUserCondition.java @@ -38,7 +38,7 @@ public class ImmuneUserCondition implements CommandCondition { Member member = any.get(); for (ARole role : commandForServer.getImmuneRoles()) { if (roleService.memberHasRole(member, role)) { - log.trace("Member {} is immune against command {}, because of role {}.", member.getIdLong(), aCommand.getName(), role.getId()); + log.debug("Member {} is immune against command {}, because of role {}.", member.getIdLong(), aCommand.getName(), role.getId()); ImmuneUserConditionDetail exception = new ImmuneUserConditionDetail(roleService.getRoleFromGuild(role)); return ConditionResult.builder().result(false).conditionDetail(exception).build(); }