From 0db751af4401e036e8007a670ba92affea015bd7 Mon Sep 17 00:00:00 2001 From: anthorob Date: Sun, 14 Jul 2024 00:12:14 -0400 Subject: [PATCH] refactor(LogHandler): use the exception itself instead of a string for buildSentryErrorMessage --- src/main/java/me/bobert/netneutrality/core/LogHandler.java | 2 +- .../me/bobert/netneutrality/music/TrackLoadingHandler.java | 2 +- .../java/me/bobert/netneutrality/music/TrackScheduler.java | 2 +- .../java/me/bobert/netneutrality/utils/MessageFunction.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/me/bobert/netneutrality/core/LogHandler.java b/src/main/java/me/bobert/netneutrality/core/LogHandler.java index c8b7fcc..9e9a09b 100644 --- a/src/main/java/me/bobert/netneutrality/core/LogHandler.java +++ b/src/main/java/me/bobert/netneutrality/core/LogHandler.java @@ -79,7 +79,7 @@ public class LogHandler { private static void tryGracefulSlashContextError(CommandException exception, CommandContext context) { if (context instanceof SlashCommandContext slashCommandContext) { - slashCommandContext.reply(MessageFunction.buildSentryErrorMessage(exception.getMessage())); + slashCommandContext.reply(MessageFunction.buildSentryErrorMessage(exception)); } } } diff --git a/src/main/java/me/bobert/netneutrality/music/TrackLoadingHandler.java b/src/main/java/me/bobert/netneutrality/music/TrackLoadingHandler.java index f4accf2..01cd090 100644 --- a/src/main/java/me/bobert/netneutrality/music/TrackLoadingHandler.java +++ b/src/main/java/me/bobert/netneutrality/music/TrackLoadingHandler.java @@ -124,6 +124,6 @@ public class TrackLoadingHandler implements AudioLoadResultHandler { LogHandler.log(e); if (!silent) - context.replyToMessage(MessageFunction.buildSentryErrorMessage("Failed to load track: " + e.getMessage())); + context.replyToMessage(MessageFunction.buildSentryErrorMessage(new RuntimeException("Failed to load track: " + e.getMessage()))); } } diff --git a/src/main/java/me/bobert/netneutrality/music/TrackScheduler.java b/src/main/java/me/bobert/netneutrality/music/TrackScheduler.java index 2860151..99de059 100644 --- a/src/main/java/me/bobert/netneutrality/music/TrackScheduler.java +++ b/src/main/java/me/bobert/netneutrality/music/TrackScheduler.java @@ -118,7 +118,7 @@ public class TrackScheduler extends AudioEventAdapter { public void onTrackException(AudioPlayer player, AudioTrack track, FriendlyException exception) { logger.debug("Guild {}: exception while playing track [{}]: {}", guild.getId(), track.getIdentifier(), exception.getMessage()); LogHandler.log(exception); - sendMessageToChannel(MessageFunction.buildSentryErrorMessage(String.format("Error while playing track [%s]: %s", track.getInfo().title, exception.getMessage()))); + sendMessageToChannel(MessageFunction.buildSentryErrorMessage(new RuntimeException(String.format("Error while playing track [%s]: %s", track.getInfo().title, exception.getMessage())))); } @Override diff --git a/src/main/java/me/bobert/netneutrality/utils/MessageFunction.java b/src/main/java/me/bobert/netneutrality/utils/MessageFunction.java index 5b31a74..3cd26b6 100644 --- a/src/main/java/me/bobert/netneutrality/utils/MessageFunction.java +++ b/src/main/java/me/bobert/netneutrality/utils/MessageFunction.java @@ -212,11 +212,11 @@ public class MessageFunction { return messages; } - public static MessageEmbed buildSentryErrorMessage(String error) { + public static MessageEmbed buildSentryErrorMessage(Exception ex) { EmbedBuilder message = new EmbedBuilder(); message.setColor(Color.RED); message.setTitle(":warning: Error during execution :warning:"); - message.addField("Error message:", error, false); + message.addField("Error message:", ex.getMessage(), false); message.addField("Error ID:", Sentry.getLastEventId().toString(), false); message.setTimestamp(OffsetDateTime.now());