Fascinated/Bat
1
1
Fork 2
Code Issues 1 Pull Requests Actions Activity

use generic embed for interaction errors
All checks were successful
Deploy to Dokku / docker (ubuntu-latest) (push) Successful in 39s
Details

Browse Source
This commit is contained in:
Lee 2024-07-04 03:15:53 +01:00
parent 750b8cbfea
commit 49beb864d2
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/cc/fascinated/bat/common/EmbedUtils.java
View File

@ -42,4 +42,16 @@ public class EmbedUtils {
.setTimestamp(LocalDateTime.now())
.setColor(Colors.SUCCESS);
}
/**
* Builds a generic interaction error embed
*
* @param ex the exception
* @return the embed builder
*/
public static EmbedBuilder genericInteractionError(Exception ex) {
return EmbedUtils.errorEmbed()
.setDescription("An error occurred while processing your interaction. Please try again later.\n" +
"**Error:** ```java\n%s\n```" + ex.getLocalizedMessage());
}
}

6
src/main/java/cc/fascinated/bat/service/CommandService.java
View File

@ -237,11 +237,7 @@ public class CommandService extends ListenerAdapter {
System.currentTimeMillis() - before);
} catch (Exception ex) {
log.error("An error occurred while executing command \"{}\"", commandName, ex);
event.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription(ex.getLocalizedMessage())
.build())
.setEphemeral(true)
.queue();
event.replyEmbeds(EmbedUtils.genericInteractionError(ex).build()).setEphemeral(true).queue();
}
}
}

22
src/main/java/cc/fascinated/bat/service/EventService.java
View File

@ -147,14 +147,9 @@ public class EventService extends ListenerAdapter {
for (EventListener listener : LISTENERS) {
listener.onButtonInteraction(guild, user, event);
}
} catch (Exception e) {
log.error("An error occurred while handling a modal interaction.", e);
if (event.isAcknowledged()) {
return;
}
event.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("An error occurred while handling your interaction.\nError: ```java\n%s\n```".formatted(e.getMessage()))
.build()).queue();
} catch (Exception ex) {
log.error("An error occurred while handling a modal interaction.", ex);
event.replyEmbeds(EmbedUtils.genericInteractionError(ex).build()).setEphemeral(true).queue();
}
}
@ -170,14 +165,9 @@ public class EventService extends ListenerAdapter {
for (EventListener listener : LISTENERS) {
listener.onModalInteraction(guild, user, event);
}
} catch (Exception e) {
log.error("An error occurred while handling a modal interaction.", e);
if (event.isAcknowledged()) {
return;
}
event.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("An error occurred while handling your interaction.\nError: ```java\n%s\n```".formatted(e.getMessage()))
.build()).queue();
} catch (Exception ex) {
log.error("An error occurred while handling a modal interaction.", ex);
event.replyEmbeds(EmbedUtils.genericInteractionError(ex).build()).setEphemeral(true).queue();
}
}