Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-01-28 08:38:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-xxx] more instrumenting changes

Browse Source
This commit is contained in:
Sheldan
2025-11-28 20:31:28 +01:00
parent 0d5b7c5855
commit bd00f6d248
4 changed files with 362 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -351,19 +351,21 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
.build(); .build();
boolean userChangesLevel = !Objects.equals(newLevel.getLevel(), aUserExperience.getCurrentLevel().getLevel()); boolean userChangesLevel = !Objects.equals(newLevel.getLevel(), aUserExperience.getCurrentLevel().getLevel());
Integer oldLevel = aUserExperience.getCurrentLevel() != null ? aUserExperience.getCurrentLevel().getLevel() : 0; Integer oldLevel = aUserExperience.getCurrentLevel() != null ? aUserExperience.getCurrentLevel().getLevel() : 0;
if(userChangesLevel) { if (userChangesLevel) {
log.info("User {} in server {} changed level. New {}, Old {}.", member.getIdLong(), log.info("User {} in server {} changed level. New {}, Old {}.", member.getIdLong(),
member.getGuild().getIdLong(), newLevel.getLevel(), member.getGuild().getIdLong(), newLevel.getLevel(),
oldLevel); oldLevel);
aUserExperience.setCurrentLevel(newLevel); aUserExperience.setCurrentLevel(newLevel);
AExperienceRole calculatedNewRole = experienceRoleService.calculateRole(roles, newLevel.getLevel()); AExperienceRole calculatedNewRole = experienceRoleService.calculateRole(roles, newLevel.getLevel());
Long oldRoleId = aUserExperience.getCurrentExperienceRole() != null && aUserExperience.getCurrentExperienceRole().getRole() != null ? aUserExperience.getCurrentExperienceRole().getRole().getId() : null; Long oldRoleId = aUserExperience.getCurrentExperienceRole() != null && aUserExperience.getCurrentExperienceRole().getRole() != null ?
aUserExperience.getCurrentExperienceRole().getRole().getId() : null;
Long newRoleId = calculatedNewRole != null && calculatedNewRole.getRole() != null ? calculatedNewRole.getRole().getId() : null; Long newRoleId = calculatedNewRole != null && calculatedNewRole.getRole() != null ? calculatedNewRole.getRole().getId() : null;
result.setOldRoleId(oldRoleId); result.setOldRoleId(oldRoleId);
result.setNewRoleId(newRoleId); result.setNewRoleId(newRoleId);
if(message != null if (message != null
&& aUserExperience.getLevelUpNotification() && aUserExperience.getLevelUpNotification()
&& featureModeService.featureModeActive(ExperienceFeatureDefinition.EXPERIENCE, serverId, ExperienceFeatureMode.LEVEL_UP_NOTIFICATION)) { &&
featureModeService.featureModeActive(ExperienceFeatureDefinition.EXPERIENCE, serverId, ExperienceFeatureMode.LEVEL_UP_NOTIFICATION)) {
LevelUpNotificationModel model = LevelUpNotificationModel LevelUpNotificationModel model = LevelUpNotificationModel
.builder() .builder()
.memberDisplay(MemberDisplay.fromMember(member)) .memberDisplay(MemberDisplay.fromMember(member))
@@ -376,16 +378,19 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
.build(); .build();
MessageToSend messageToSend = templateService.renderEmbedTemplate("experience_level_up_notification", model, serverId); MessageToSend messageToSend = templateService.renderEmbedTemplate("experience_level_up_notification", model, serverId);
FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(messageToSend, message.getChannel())).thenAccept(unused -> { FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(messageToSend, message.getChannel())).thenAccept(unused -> {
log.info("Sent level up notification to user {} in server {} in channel {}.", member.getIdLong(), serverId, message.getChannel().getIdLong()); log.info("Sent level up notification to user {} in server {} in channel {}.", member.getIdLong(), serverId,
message.getChannel().getIdLong());
}).exceptionally(throwable -> { }).exceptionally(throwable -> {
log.warn("Failed to send level up notification to user {} in server {} in channel {}.", member.getIdLong(), serverId, message.getChannel().getIdLong()); log.warn("Failed to send level up notification to user {} in server {} in channel {}.", member.getIdLong(), serverId,
message.getChannel().getIdLong());
return null; return null;
}); });
} }
aUserExperience.setCurrentExperienceRole(calculatedNewRole); aUserExperience.setCurrentExperienceRole(calculatedNewRole);
} }
aUserExperience.setMessageCount(aUserExperience.getMessageCount() + 1L); aUserExperience.setMessageCount(aUserExperience.getMessageCount() + 1L);
if(userChangesLevel && featureModeService.featureModeActive(ExperienceFeatureDefinition.EXPERIENCE, server, ExperienceFeatureMode.LEVEL_ACTION)) { if (userChangesLevel &&
featureModeService.featureModeActive(ExperienceFeatureDefinition.EXPERIENCE, server, ExperienceFeatureMode.LEVEL_ACTION)) {
levelActionService.applyLevelActionsToUser(aUserExperience, oldLevel) levelActionService.applyLevelActionsToUser(aUserExperience, oldLevel)
.thenAccept(unused -> { .thenAccept(unused -> {
log.info("Executed level actions for user {}.", userInServerId); log.info("Executed level actions for user {}.", userInServerId);
@@ -395,31 +400,36 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
return null; return null;
}); });
} }
if(aUserExperienceOptional.isEmpty()) { if (aUserExperienceOptional.isEmpty()) {
userExperienceManagementService.saveUser(aUserExperience); userExperienceManagementService.saveUser(aUserExperience);
} }
if(!Objects.equals(result.getOldRoleId(), result.getNewRoleId())) { if (!Objects.equals(result.getOldRoleId(), result.getNewRoleId())) {
if(result.getOldRoleId() != null && result.getNewRoleId() != null) { if (result.getOldRoleId() != null && result.getNewRoleId() != null) {
roleService.updateRolesIds(member, Arrays.asList(result.getOldRoleId()), Arrays.asList(result.getNewRoleId())).thenAccept(unused -> { roleService.updateRolesIds(member, Arrays.asList(result.getOldRoleId()), Arrays.asList(result.getNewRoleId())).thenAccept(unused -> {
log.debug("Removed role {} from and added role {} to member {} in server {}.", result.getOldRoleId(), result.getNewRoleId(), member.getIdLong(), member.getGuild().getIdLong()); log.debug("Removed role {} from and added role {} to member {} in server {}.", result.getOldRoleId(), result.getNewRoleId(),
member.getIdLong(), member.getGuild().getIdLong());
}).exceptionally(throwable -> { }).exceptionally(throwable -> {
log.warn("Failed to remove role {} from and add role {} to member {} in server {}.", result.getOldRoleId(), result.getNewRoleId(), member.getIdLong(), member.getGuild().getIdLong(), throwable); log.warn("Failed to remove role {} from and add role {} to member {} in server {}.", result.getOldRoleId(), result.getNewRoleId(),
member.getIdLong(), member.getGuild().getIdLong(), throwable);
return null; return null;
}); });
} else { } else {
if(result.getOldRoleId() != null) { if (result.getOldRoleId() != null) {
roleService.removeRoleFromMemberAsync(member, result.getOldRoleId()).thenAccept(unused -> { roleService.removeRoleFromMemberAsync(member, result.getOldRoleId()).thenAccept(unused -> {
log.debug("Removed role {} from member {} in server {}.", result.getOldRoleId(), member.getIdLong(), member.getGuild().getIdLong()); log.debug("Removed role {} from member {} in server {}.", result.getOldRoleId(), member.getIdLong(),
member.getGuild().getIdLong());
}).exceptionally(throwable -> { }).exceptionally(throwable -> {
log.warn("Failed to remove role {} from member {} in server {}.", result.getOldRoleId(), member.getIdLong(), member.getGuild().getIdLong(), throwable); log.warn("Failed to remove role {} from member {} in server {}.", result.getOldRoleId(), member.getIdLong(),
member.getGuild().getIdLong(), throwable);
return null; return null;
}); });
} }
if(result.getNewRoleId() != null) { if (result.getNewRoleId() != null) {
roleService.addRoleToMemberAsync(member, result.getNewRoleId()).thenAccept(unused -> { roleService.addRoleToMemberAsync(member, result.getNewRoleId()).thenAccept(unused -> {
log.debug("Added role {} to member {} in server {}.", result.getNewRoleId(), member.getIdLong(), member.getGuild().getIdLong()); log.debug("Added role {} to member {} in server {}.", result.getNewRoleId(), member.getIdLong(), member.getGuild().getIdLong());
}).exceptionally(throwable -> { }).exceptionally(throwable -> {
log.warn("Failed to add role {} to member {} in server {}.", result.getOldRoleId(), member.getIdLong(), member.getGuild().getIdLong(), throwable); log.warn("Failed to add role {} to member {} in server {}.", result.getOldRoleId(), member.getIdLong(),
member.getGuild().getIdLong(), throwable);
return null; return null;
}); });
} }
@@ -432,6 +442,7 @@ public class AUserExperienceServiceBean implements AUserExperienceService {
newSpan.end(); newSpan.end();
}); });
} }
}
@Override @Override
public boolean experienceGainEnabledInChannel(MessageChannel messageChannel) { public boolean experienceGainEnabledInChannel(MessageChannel messageChannel) {

36
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/InteractionServiceBean.java
View File

@@ -267,27 +267,27 @@ public class InteractionServiceBean implements InteractionService {
Span newSpan = tracer.nextSpan().name("send-message-to-interaction"); Span newSpan = tracer.nextSpan().name("send-message-to-interaction");
try (Tracer.SpanInScope ws = this.tracer.withSpan(newSpan.start())) { try (Tracer.SpanInScope ws = this.tracer.withSpan(newSpan.start())) {
ReplyCallbackAction action = null; ReplyCallbackAction action = null;
if(messageToSend.getUseComponentsV2()) { if (messageToSend.getUseComponentsV2()) {
action = callback.replyComponents(messageToSend.getComponents()).useComponentsV2(); action = callback.replyComponents(messageToSend.getComponents()).useComponentsV2();
} else { } else {
if(messageToSend.getMessages() != null && !messageToSend.getMessages().isEmpty()) { if (messageToSend.getMessages() != null && !messageToSend.getMessages().isEmpty()) {
metricService.incrementCounter(MESSAGE_SEND_METRIC); metricService.incrementCounter(MESSAGE_SEND_METRIC);
action = callback.reply(messageToSend.getMessages().get(0)); action = callback.reply(messageToSend.getMessages().get(0));
} }
if(messageToSend.getEmbeds() != null && !messageToSend.getEmbeds().isEmpty()) { if (messageToSend.getEmbeds() != null && !messageToSend.getEmbeds().isEmpty()) {
if(action != null) { if (action != null) {
action = action.addEmbeds(messageToSend.getEmbeds().subList(0, Math.min(10, messageToSend.getEmbeds().size()))); action = action.addEmbeds(messageToSend.getEmbeds().subList(0, Math.min(10, messageToSend.getEmbeds().size())));
} else { } else {
action = callback.replyEmbeds(messageToSend.getEmbeds()); action = callback.replyEmbeds(messageToSend.getEmbeds());
} }
} }
if(messageToSend.hasFilesToSend()) { if (messageToSend.hasFilesToSend()) {
List<FileUpload> attachedFiles = messageToSend List<FileUpload> attachedFiles = messageToSend
.getAttachedFiles() .getAttachedFiles()
.stream() .stream()
.map(AttachedFile::convertToFileUpload) .map(AttachedFile::convertToFileUpload)
.collect(Collectors.toList()); .collect(Collectors.toList());
if(action != null) { if (action != null) {
action.setFiles(attachedFiles); action.setFiles(attachedFiles);
} else { } else {
metricService.incrementCounter(MESSAGE_SEND_METRIC); metricService.incrementCounter(MESSAGE_SEND_METRIC);
@@ -297,31 +297,32 @@ public class InteractionServiceBean implements InteractionService {
// this should be last, because we are "faking" a message, by inserting a ., in case there has not been a reply yet // this should be last, because we are "faking" a message, by inserting a ., in case there has not been a reply yet
// we could also throw an exception, but we are allowing this to go through // we could also throw an exception, but we are allowing this to go through
List<ActionRow> actionRows = messageToSend.getActionRows(); List<ActionRow> actionRows = messageToSend.getActionRows();
if(actionRows != null && !actionRows.isEmpty()) { if (actionRows != null && !actionRows.isEmpty()) {
if(action == null) { if (action == null) {
action = callback.reply("."); action = callback.reply(".");
} }
action = action.setComponents(actionRows); action = action.setComponents(actionRows);
AServer server; AServer server;
if(ContextUtils.isGuildKnown(callback)) { if (ContextUtils.isGuildKnown(callback)) {
server = serverManagementService.loadServer(callback.getGuild().getIdLong()); server = serverManagementService.loadServer(callback.getGuild().getIdLong());
} else { } else {
server = null; server = null;
} }
actionRows.forEach(components -> components.forEach(component -> { actionRows.forEach(components -> components.forEach(component -> {
if(component instanceof ActionComponent) { if (component instanceof ActionComponent) {
String id = ((ActionComponent)component).getId(); String id = ((ActionComponent) component).getId();
MessageToSend.ComponentConfig payload = messageToSend.getComponentPayloads().get(id); MessageToSend.ComponentConfig payload = messageToSend.getComponentPayloads().get(id);
if(payload != null && payload.getPersistCallback()) { if (payload != null && payload.getPersistCallback()) {
componentPayloadManagementService.createPayload(id, payload.getPayload(), payload.getPayloadType(), payload.getComponentOrigin(), server, payload.getComponentType()); componentPayloadManagementService.createPayload(id, payload.getPayload(), payload.getPayloadType(),
payload.getComponentOrigin(), server, payload.getComponentType());
} }
} }
})); }));
} }
} }
if(messageToSend.getEphemeral()) { if (messageToSend.getEphemeral()) {
if(ContextUtils.hasGuild(callback)) { if (ContextUtils.hasGuild(callback)) {
log.info("Sending ephemeral message to interaction in guild {} in channel {} for user {}.", log.info("Sending ephemeral message to interaction in guild {} in channel {} for user {}.",
callback.getGuild().getIdLong(), callback.getChannel().getId(), callback.getGuild().getIdLong(), callback.getChannel().getId(),
callback.getUser().getIdLong()); callback.getUser().getIdLong());
@@ -329,11 +330,11 @@ public class InteractionServiceBean implements InteractionService {
log.info("Sending ephemeral message to user {}.", callback.getUser().getIdLong()); log.info("Sending ephemeral message to user {}.", callback.getUser().getIdLong());
} }
metricService.incrementCounter(EPHEMERAL_MESSAGES_SEND); metricService.incrementCounter(EPHEMERAL_MESSAGES_SEND);
if(action != null) { if (action != null) {
action = action.setEphemeral(messageToSend.getEphemeral()); action = action.setEphemeral(messageToSend.getEphemeral());
} }
} }
if(ContextUtils.isGuildKnown(callback)) { if (ContextUtils.isGuildKnown(callback)) {
Set<Message.MentionType> allowedMentions = allowedMentionService.getAllowedMentionsFor(callback.getMessageChannel(), messageToSend); Set<Message.MentionType> allowedMentions = allowedMentionService.getAllowedMentionsFor(callback.getMessageChannel(), messageToSend);
if (action != null) { if (action != null) {
action = action.setAllowedMentions(allowedMentions); action = action.setAllowedMentions(allowedMentions);
@@ -346,7 +347,6 @@ public class InteractionServiceBean implements InteractionService {
return action.submit(); return action.submit();
} }
} }
}
@Override @Override
public CompletableFuture<InteractionHook> replyMessage(String templateKey, Object model, IReplyCallback callback) { public CompletableFuture<InteractionHook> replyMessage(String templateKey, Object model, IReplyCallback callback) {

96
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/slash/SlashCommandListenerBean.java
View File

@@ -19,23 +19,31 @@ import dev.sheldan.abstracto.core.interaction.slash.payload.SlashCommandConfirma
import dev.sheldan.abstracto.core.metric.service.CounterMetric; import dev.sheldan.abstracto.core.metric.service.CounterMetric;
import dev.sheldan.abstracto.core.metric.service.MetricService; import dev.sheldan.abstracto.core.metric.service.MetricService;
import dev.sheldan.abstracto.core.metric.service.MetricTag; import dev.sheldan.abstracto.core.metric.service.MetricTag;
import dev.sheldan.abstracto.core.metric.service.MetricUtils;
import dev.sheldan.abstracto.core.models.database.AServer; import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.service.ConfigService; import dev.sheldan.abstracto.core.service.ConfigService;
import dev.sheldan.abstracto.core.service.management.ServerManagementService; import dev.sheldan.abstracto.core.service.management.ServerManagementService;
import dev.sheldan.abstracto.core.utils.ContextUtils;
import dev.sheldan.abstracto.scheduling.model.JobParameters; import dev.sheldan.abstracto.scheduling.model.JobParameters;
import dev.sheldan.abstracto.scheduling.service.SchedulerService; import dev.sheldan.abstracto.scheduling.service.SchedulerService;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import dev.sheldan.abstracto.core.utils.ContextUtils;
import dev.sheldan.abstracto.core.metric.service.MetricUtils;
import io.micrometer.observation.Observation; import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationRegistry; import io.micrometer.observation.ObservationRegistry;
import io.micrometer.tracing.Span; import io.micrometer.tracing.Span;
import io.micrometer.tracing.Tracer; import io.micrometer.tracing.Tracer;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import javax.annotation.Nonnull;
import javax.annotation.PostConstruct;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent; import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
@@ -50,15 +58,6 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Nonnull;
import javax.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
@Component @Component
@Slf4j @Slf4j
public class SlashCommandListenerBean extends ListenerAdapter { public class SlashCommandListenerBean extends ListenerAdapter {
@@ -124,7 +123,7 @@ public class SlashCommandListenerBean extends ListenerAdapter {
.build(); .build();
public List<Command> getSlashCommands() { public List<Command> getSlashCommands() {
if(commands == null || commands.isEmpty()) { if (commands == null || commands.isEmpty()) {
return new ArrayList<>(); return new ArrayList<>();
} }
return commands.stream() return commands.stream()
@@ -138,8 +137,10 @@ public class SlashCommandListenerBean extends ListenerAdapter {
Observation observation = Observation.createNotStarted("slash-command-received", this.observationRegistry); Observation observation = Observation.createNotStarted("slash-command-received", this.observationRegistry);
observation.observe(() -> { observation.observe(() -> {
try { try {
if(commands == null || commands.isEmpty()) return; if (commands == null || commands.isEmpty()) {
if(ContextUtils.hasGuild(event.getInteraction())) { return;
}
if (ContextUtils.hasGuild(event.getInteraction())) {
log.debug("Executing slash command in guild {} from user {}.", event.getGuild().getIdLong(), event.getUser().getIdLong()); log.debug("Executing slash command in guild {} from user {}.", event.getGuild().getIdLong(), event.getUser().getIdLong());
} else { } else {
log.debug("Executing slash command by user {}", event.getUser().getIdLong()); log.debug("Executing slash command by user {}", event.getUser().getIdLong());
@@ -158,6 +159,7 @@ public class SlashCommandListenerBean extends ListenerAdapter {
}); });
} catch (Exception exception) { } catch (Exception exception) {
log.error("Failed to process slash command interaction event.", exception); log.error("Failed to process slash command interaction event.", exception);
}
}); });
} }
@@ -165,7 +167,7 @@ public class SlashCommandListenerBean extends ListenerAdapter {
@Transactional @Transactional
public CompletableFuture<Void> executeListenerLogic(SlashCommandInteractionEvent event) { public CompletableFuture<Void> executeListenerLogic(SlashCommandInteractionEvent event) {
Optional<Command> potentialCommand = findCommand(event); Optional<Command> potentialCommand = findCommand(event);
if(potentialCommand.isPresent()) { if (potentialCommand.isPresent()) {
Command command = potentialCommand.get(); Command command = potentialCommand.get();
metricService.incrementCounter(SLASH_COMMANDS_PROCESSED_COUNTER); metricService.incrementCounter(SLASH_COMMANDS_PROCESSED_COUNTER);
try { try {
@@ -195,8 +197,11 @@ public class SlashCommandListenerBean extends ListenerAdapter {
@Override @Override
public void onCommandAutoCompleteInteraction(@Nonnull CommandAutoCompleteInteractionEvent event) { public void onCommandAutoCompleteInteraction(@Nonnull CommandAutoCompleteInteractionEvent event) {
try { try {
if(commands == null || commands.isEmpty()) return; if (commands == null || commands.isEmpty()) {
CompletableFuture.runAsync(() -> self.executeAutCompleteListenerLogic(event), MetricUtils.wrapExecutor(slashCommandAutoCompleteExecutor)).exceptionally(throwable -> { return;
}
CompletableFuture.runAsync(() -> self.executeAutCompleteListenerLogic(event), MetricUtils.wrapExecutor(slashCommandAutoCompleteExecutor))
.exceptionally(throwable -> {
log.error("Failed to execute listener logic in async auto complete interaction event.", throwable); log.error("Failed to execute listener logic in async auto complete interaction event.", throwable);
return null; return null;
}); });
@@ -212,13 +217,15 @@ public class SlashCommandListenerBean extends ListenerAdapter {
try { try {
List<String> fullRepliesList = command.performAutoComplete(event); List<String> fullRepliesList = command.performAutoComplete(event);
List<String> replies = fullRepliesList.subList(0, Math.min(fullRepliesList.size(), OptionData.MAX_CHOICES)); List<String> replies = fullRepliesList.subList(0, Math.min(fullRepliesList.size(), OptionData.MAX_CHOICES));
event.replyChoiceStrings(replies).queue(unused -> {}, event.replyChoiceStrings(replies).queue(unused -> {
},
throwable -> { throwable -> {
if(ContextUtils.hasGuild(event)) { if (ContextUtils.hasGuild(event)) {
log.error("Failed to respond to complete of command {} in guild {} by user {}.", log.error("Failed to respond to complete of command {} in guild {} by user {}.",
command.getConfiguration().getName(), event.getGuild().getIdLong(), event.getUser().getIdLong()); command.getConfiguration().getName(), event.getGuild().getIdLong(), event.getUser().getIdLong());
} else { } else {
log.error("Failed to resp ond to complete of command {} for user {}.", command.getConfiguration().getName(), event.getUser().getIdLong()); log.error("Failed to resp ond to complete of command {} for user {}.", command.getConfiguration().getName(),
event.getUser().getIdLong());
} }
}); });
} catch (Exception exception) { } catch (Exception exception) {
@@ -228,8 +235,9 @@ public class SlashCommandListenerBean extends ListenerAdapter {
} }
@Transactional @Transactional
public void continueSlashCommand(Long interactionId, ButtonInteractionEvent buttonInteractionEvent, SlashCommandConfirmationPayload slashCommandConfirmationPayload) { public void continueSlashCommand(Long interactionId, ButtonInteractionEvent buttonInteractionEvent,
if(COMMANDS_WAITING_FOR_CONFIRMATION.containsKey(interactionId)) { SlashCommandConfirmationPayload slashCommandConfirmationPayload) {
if (COMMANDS_WAITING_FOR_CONFIRMATION.containsKey(interactionId)) {
DriedSlashCommand driedSlashCommand = COMMANDS_WAITING_FOR_CONFIRMATION.get(interactionId); DriedSlashCommand driedSlashCommand = COMMANDS_WAITING_FOR_CONFIRMATION.get(interactionId);
Command commandInstance = driedSlashCommand.getCommand(); Command commandInstance = driedSlashCommand.getCommand();
String commandName = commandInstance.getConfiguration().getName(); String commandName = commandInstance.getConfiguration().getName();
@@ -250,23 +258,28 @@ public class SlashCommandListenerBean extends ListenerAdapter {
return null; return null;
}); });
} else { } else {
log.warn("Interaction was not found in internal map - not continuing interaction from user {} in server {}.", buttonInteractionEvent.getUser().getIdLong(), buttonInteractionEvent.getGuild().getIdLong()); log.warn("Interaction was not found in internal map - not continuing interaction from user {} in server {}.",
buttonInteractionEvent.getUser().getIdLong(), buttonInteractionEvent.getGuild().getIdLong());
} }
} }
@Transactional @Transactional
public void cleanupSlashCommandConfirmation(SlashCommandConfirmationPayload slashCommandConfirmationPayload, ButtonInteractionEvent buttonInteractionEvent) { public void cleanupSlashCommandConfirmation(SlashCommandConfirmationPayload slashCommandConfirmationPayload,
log.debug("Cleaning up component {} and {}.", slashCommandConfirmationPayload.getConfirmationPayloadId(), slashCommandConfirmationPayload.getAbortPayloadId()); ButtonInteractionEvent buttonInteractionEvent) {
componentPayloadManagementService.deletePayloads(Arrays.asList(slashCommandConfirmationPayload.getAbortPayloadId(), slashCommandConfirmationPayload.getConfirmationPayloadId())); log.debug("Cleaning up component {} and {}.", slashCommandConfirmationPayload.getConfirmationPayloadId(),
slashCommandConfirmationPayload.getAbortPayloadId());
componentPayloadManagementService.deletePayloads(
Arrays.asList(slashCommandConfirmationPayload.getAbortPayloadId(), slashCommandConfirmationPayload.getConfirmationPayloadId()));
} }
@Transactional @Transactional
public void removeSlashCommandConfirmationInteraction(Long interactionId, String confirmationPayload, String abortPayload) { public void removeSlashCommandConfirmationInteraction(Long interactionId, String confirmationPayload, String abortPayload) {
if(COMMANDS_WAITING_FOR_CONFIRMATION.containsKey(interactionId)) { if (COMMANDS_WAITING_FOR_CONFIRMATION.containsKey(interactionId)) {
DriedSlashCommand removedSlashCommand = COMMANDS_WAITING_FOR_CONFIRMATION.remove(interactionId); DriedSlashCommand removedSlashCommand = COMMANDS_WAITING_FOR_CONFIRMATION.remove(interactionId);
SlashCommandInteractionEvent event = removedSlashCommand.getEvent(); SlashCommandInteractionEvent event = removedSlashCommand.getEvent();
event.getInteraction().getHook().deleteOriginal().queue(); event.getInteraction().getHook().deleteOriginal().queue();
log.info("Remove interaction for command {} in server {} from user {}.", removedSlashCommand.getCommand().getConfiguration().getName(), event.getGuild().getIdLong(), event.getUser().getIdLong()); log.info("Remove interaction for command {} in server {} from user {}.", removedSlashCommand.getCommand().getConfiguration().getName(),
event.getGuild().getIdLong(), event.getUser().getIdLong());
} else { } else {
log.info("Did not find interaction to clean up."); log.info("Did not find interaction to clean up.");
} }
@@ -274,9 +287,9 @@ public class SlashCommandListenerBean extends ListenerAdapter {
} }
@Transactional(rollbackFor = AbstractoRunTimeException.class) @Transactional(rollbackFor = AbstractoRunTimeException.class)
public void executeCommand(SlashCommandInteractionEvent event, Command command, ConditionResult conditionResult) { public CompletableFuture<Void> executeCommand(SlashCommandInteractionEvent event, Command command, ConditionResult conditionResult) {
String commandName = command.getConfiguration().getName(); String commandName = command.getConfiguration().getName();
if(command.getConfiguration().isRequiresConfirmation() && conditionResult.isResult()) { if (command.getConfiguration().isRequiresConfirmation() && conditionResult.isResult()) {
DriedSlashCommand slashCommand = DriedSlashCommand DriedSlashCommand slashCommand = DriedSlashCommand
.builder() .builder()
.command(command) .command(command)
@@ -310,6 +323,7 @@ public class SlashCommandListenerBean extends ListenerAdapter {
.commandName(commandName) .commandName(commandName)
.build(); .build();
Long userId = event.getUser().getIdLong(); Long userId = event.getUser().getIdLong();
CompletableFuture<Void> replyFuture =
interactionService.replyEmbed(COMMAND_CONFIRMATION_MESSAGE_TEMPLATE_KEY, model, event).thenAccept(interactionHook -> { interactionService.replyEmbed(COMMAND_CONFIRMATION_MESSAGE_TEMPLATE_KEY, model, event).thenAccept(interactionHook -> {
log.info("Sent confirmation for command {} in server {} for user {}.", commandName, serverId, userId); log.info("Sent confirmation for command {} in server {} for user {}.", commandName, serverId, userId);
}).exceptionally(throwable -> { }).exceptionally(throwable -> {
@@ -317,12 +331,14 @@ public class SlashCommandListenerBean extends ListenerAdapter {
return null; return null;
}); });
scheduleConfirmationDeletion(event.getIdLong(), confirmationId, abortId, serverId); scheduleConfirmationDeletion(event.getIdLong(), confirmationId, abortId, serverId);
return replyFuture;
} else { } else {
CompletableFuture<CommandResult> commandOutput; CompletableFuture<CommandResult> commandOutput;
if(conditionResult.isResult()) { if (conditionResult.isResult()) {
commandOutput = command.executeSlash(event).thenApply(commandResult -> { commandOutput = command.executeSlash(event).thenApply(commandResult -> {
if(ContextUtils.hasGuild(event)) { if (ContextUtils.hasGuild(event)) {
log.info("Command {} in server {} was executed by user {}.", command.getConfiguration().getName(), event.getGuild().getIdLong(), event.getUser().getIdLong()); log.info("Command {} in server {} was executed by user {}.", command.getConfiguration().getName(), event.getGuild().getIdLong(),
event.getUser().getIdLong());
} else { } else {
log.info("Command {} was executed by user {}.", command.getConfiguration().getName(), event.getUser().getId()); log.info("Command {} was executed by user {}.", command.getConfiguration().getName(), event.getUser().getId());
} }
@@ -331,7 +347,7 @@ public class SlashCommandListenerBean extends ListenerAdapter {
} else { } else {
commandOutput = CompletableFuture.completedFuture(CommandResult.fromCondition(conditionResult)); commandOutput = CompletableFuture.completedFuture(CommandResult.fromCondition(conditionResult));
} }
commandOutput.thenAccept(commandResult -> { return commandOutput.thenAccept(commandResult -> {
self.executePostCommandListener(command, event, commandResult); self.executePostCommandListener(command, event, commandResult);
}).exceptionally(throwable -> { }).exceptionally(throwable -> {
log.error("Error while handling post execution of command {}", commandName, throwable); log.error("Error while handling post execution of command {}", commandName, throwable);

36
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java
View File

@@ -219,18 +219,18 @@ public class ChannelServiceBean implements ChannelService {
try (Tracer.SpanInScope ws = this.tracer.withSpan(newSpan.start())) { try (Tracer.SpanInScope ws = this.tracer.withSpan(newSpan.start())) {
newSpan.tag("channel.id", textChannel.getIdLong()); newSpan.tag("channel.id", textChannel.getIdLong());
messageToSend.setEphemeral(false); messageToSend.setEphemeral(false);
if(textChannel instanceof GuildMessageChannel guildMessageChannel) { if (textChannel instanceof GuildMessageChannel guildMessageChannel) {
long maxFileSize = guildMessageChannel.getGuild().getMaxFileSize(); long maxFileSize = guildMessageChannel.getGuild().getMaxFileSize();
// in this case, we cannot upload the file, so we need to fail // in this case, we cannot upload the file, so we need to fail
messageToSend.getAttachedFiles().forEach(attachedFile -> { messageToSend.getAttachedFiles().forEach(attachedFile -> {
if(attachedFile.getFile().length() > maxFileSize) { if (attachedFile.getFile().length() > maxFileSize) {
throw new UploadFileTooLargeException(attachedFile.getFile().length(), maxFileSize); throw new UploadFileTooLargeException(attachedFile.getFile().length(), maxFileSize);
} }
}); });
} }
List<CompletableFuture<Message>> futures = new ArrayList<>(); List<CompletableFuture<Message>> futures = new ArrayList<>();
List<MessageCreateAction> allMessageActions = new ArrayList<>(); List<MessageCreateAction> allMessageActions = new ArrayList<>();
if(messageToSend.getUseComponentsV2() && messageToSend.getComponents() != null && !messageToSend.getComponents().isEmpty()) { if (messageToSend.getUseComponentsV2() && messageToSend.getComponents() != null && !messageToSend.getComponents().isEmpty()) {
metricService.incrementCounter(MESSAGE_SEND_METRIC); metricService.incrementCounter(MESSAGE_SEND_METRIC);
allMessageActions.add(textChannel.sendMessageComponents(messageToSend.getComponents()).useComponentsV2()); allMessageActions.add(textChannel.sendMessageComponents(messageToSend.getComponents()).useComponentsV2());
} else { } else {
@@ -239,16 +239,16 @@ public class ChannelServiceBean implements ChannelService {
metricService.incrementCounter(MESSAGE_SEND_METRIC); metricService.incrementCounter(MESSAGE_SEND_METRIC);
String text = messageToSend.getMessages().get(i); String text = messageToSend.getMessages().get(i);
List<MessageEmbed> messageEmbeds = new ArrayList<>(); List<MessageEmbed> messageEmbeds = new ArrayList<>();
while(embedIterator.hasNext()) { while (embedIterator.hasNext()) {
MessageEmbed embedToAdd = embedIterator.next(); MessageEmbed embedToAdd = embedIterator.next();
if((currentEmbedLength(messageEmbeds) + embedToAdd.getLength()) >= MessageEmbed.EMBED_MAX_LENGTH_BOT) { if ((currentEmbedLength(messageEmbeds) + embedToAdd.getLength()) >= MessageEmbed.EMBED_MAX_LENGTH_BOT) {
break; break;
} }
messageEmbeds.add(embedToAdd); messageEmbeds.add(embedToAdd);
embedIterator.remove(); embedIterator.remove();
} }
MessageCreateAction messageAction = textChannel.sendMessage(text); MessageCreateAction messageAction = textChannel.sendMessage(text);
if(!messageEmbeds.isEmpty()) { if (!messageEmbeds.isEmpty()) {
messageAction.setEmbeds(messageEmbeds); messageAction.setEmbeds(messageEmbeds);
} }
allMessageActions.add(messageAction); allMessageActions.add(messageAction);
@@ -257,9 +257,9 @@ public class ChannelServiceBean implements ChannelService {
// reset the iterator, because if the if in the above while iterator loop applied, we already took it out from the iterator // reset the iterator, because if the if in the above while iterator loop applied, we already took it out from the iterator
// but we didnt add it yet, so it would be lost // but we didnt add it yet, so it would be lost
embedIterator = messageToSend.getEmbeds().iterator(); embedIterator = messageToSend.getEmbeds().iterator();
while(embedIterator.hasNext()) { while (embedIterator.hasNext()) {
MessageEmbed embedToAdd = embedIterator.next(); MessageEmbed embedToAdd = embedIterator.next();
if((currentEmbedLength(messageEmbeds) + embedToAdd.getLength()) >= MessageEmbed.EMBED_MAX_LENGTH_BOT && !messageEmbeds.isEmpty()) { if ((currentEmbedLength(messageEmbeds) + embedToAdd.getLength()) >= MessageEmbed.EMBED_MAX_LENGTH_BOT && !messageEmbeds.isEmpty()) {
allMessageActions.add(textChannel.sendMessageEmbeds(messageEmbeds)); allMessageActions.add(textChannel.sendMessageEmbeds(messageEmbeds));
metricService.incrementCounter(MESSAGE_SEND_METRIC); metricService.incrementCounter(MESSAGE_SEND_METRIC);
messageEmbeds = new ArrayList<>(); messageEmbeds = new ArrayList<>();
@@ -267,13 +267,13 @@ public class ChannelServiceBean implements ChannelService {
messageEmbeds.add(embedToAdd); messageEmbeds.add(embedToAdd);
} }
if(!messageEmbeds.isEmpty()) { if (!messageEmbeds.isEmpty()) {
allMessageActions.add(textChannel.sendMessageEmbeds(messageEmbeds)); allMessageActions.add(textChannel.sendMessageEmbeds(messageEmbeds));
metricService.incrementCounter(MESSAGE_SEND_METRIC); metricService.incrementCounter(MESSAGE_SEND_METRIC);
} }
List<ActionRow> actionRows = messageToSend.getActionRows(); List<ActionRow> actionRows = messageToSend.getActionRows();
if(!actionRows.isEmpty()) { if (!actionRows.isEmpty()) {
List<List<ActionRow>> groupedActionRows = ListUtils.partition(actionRows, ComponentService.MAX_BUTTONS_PER_ROW); List<List<ActionRow>> groupedActionRows = ListUtils.partition(actionRows, ComponentService.MAX_BUTTONS_PER_ROW);
for (int i = 0; i < allMessageActions.size(); i++) { for (int i = 0; i < allMessageActions.size(); i++) {
allMessageActions.set(i, allMessageActions.get(i).setComponents(groupedActionRows.get(i))); allMessageActions.set(i, allMessageActions.get(i).setComponents(groupedActionRows.get(i)));
@@ -283,7 +283,7 @@ public class ChannelServiceBean implements ChannelService {
allMessageActions.add(textChannel.sendMessage(".").setComponents(groupedActionRows.get(i))); allMessageActions.add(textChannel.sendMessage(".").setComponents(groupedActionRows.get(i)));
} }
AServer server = null; AServer server = null;
if(textChannel instanceof GuildChannel) { if (textChannel instanceof GuildChannel) {
GuildChannel channel = (GuildChannel) textChannel; GuildChannel channel = (GuildChannel) textChannel;
server = serverManagementService.loadServer(channel.getGuild()); server = serverManagementService.loadServer(channel.getGuild());
} }
@@ -293,20 +293,21 @@ public class ChannelServiceBean implements ChannelService {
String id = ((ActionComponent) component).getId(); String id = ((ActionComponent) component).getId();
MessageToSend.ComponentConfig payload = messageToSend.getComponentPayloads().get(id); MessageToSend.ComponentConfig payload = messageToSend.getComponentPayloads().get(id);
if (payload != null && payload.getPersistCallback()) { if (payload != null && payload.getPersistCallback()) {
componentPayloadManagementService.createPayload(id, payload.getPayload(), payload.getPayloadType(), payload.getComponentOrigin(), server, payload.getComponentType()); componentPayloadManagementService.createPayload(id, payload.getPayload(), payload.getPayloadType(),
payload.getComponentOrigin(), server, payload.getComponentType());
} }
} }
} }
} }
} }
if(messageToSend.hasFilesToSend()) { if (messageToSend.hasFilesToSend()) {
List<FileUpload> attachedFiles = messageToSend List<FileUpload> attachedFiles = messageToSend
.getAttachedFiles() .getAttachedFiles()
.stream() .stream()
.map(AttachedFile::convertToFileUpload) .map(AttachedFile::convertToFileUpload)
.collect(Collectors.toList()); .collect(Collectors.toList());
if(!allMessageActions.isEmpty()) { if (!allMessageActions.isEmpty()) {
// in case there has not been a message, we need to increment it // in case there has not been a message, we need to increment it
allMessageActions.set(0, allMessageActions.get(0).addFiles(attachedFiles)); allMessageActions.set(0, allMessageActions.get(0).addFiles(attachedFiles));
} else { } else {
@@ -314,19 +315,20 @@ public class ChannelServiceBean implements ChannelService {
allMessageActions.add(textChannel.sendFiles(attachedFiles)); allMessageActions.add(textChannel.sendFiles(attachedFiles));
} }
} }
}
Set<Message.MentionType> allowedMentions = allowedMentionService.getAllowedMentionsFor(textChannel, messageToSend); Set<Message.MentionType> allowedMentions = allowedMentionService.getAllowedMentionsFor(textChannel, messageToSend);
allMessageActions.forEach(messageAction -> { allMessageActions.forEach(messageAction -> {
if(messageToSend.getReferencedMessageId() != null) { if (messageToSend.getReferencedMessageId() != null) {
messageAction = messageAction.setMessageReference(messageToSend.getReferencedMessageId()); messageAction = messageAction.setMessageReference(messageToSend.getReferencedMessageId());
if(messageToSend.getMessageConfig() != null && !messageToSend.getMessageConfig().getMentionsReferencedMessage()) { if (messageToSend.getMessageConfig() != null && !messageToSend.getMessageConfig().getMentionsReferencedMessage()) {
messageAction = messageAction.mentionRepliedUser(false); messageAction = messageAction.mentionRepliedUser(false);
} }
} }
futures.add(messageAction.setAllowedMentions(allowedMentions).submit()); futures.add(messageAction.setAllowedMentions(allowedMentions).submit());
}); });
}
return futures; return futures;
} }
}
private Integer currentEmbedLength(List<MessageEmbed> messageEmbeds) { private Integer currentEmbedLength(List<MessageEmbed> messageEmbeds) {
return messageEmbeds.stream().mapToInt(MessageEmbed::getLength).sum(); return messageEmbeds.stream().mapToInt(MessageEmbed::getLength).sum();