ensure webhook errors are properly logged

Author: danthe1st

checkstyle/checkstyle.xml

@@ -96,5 +96,6 @@ See https://checkstyle.org/ for more information.
         <module name="UnusedImports">
             <property name="processJavadoc" value="false"/>
         </module>
+        <module name="SuppressionCommentFilter"/>
     </module>
 </module>

src/main/java/net/javadiscord/javabot/listener/HugListener.java

@@ -10,6 +10,7 @@
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.javadiscord.javabot.data.config.BotConfig;
 import net.javadiscord.javabot.systems.moderation.AutoMod;
+import net.javadiscord.javabot.util.ExceptionLogger;
 import net.javadiscord.javabot.util.WebhookUtil;
 
 import javax.annotation.Nonnull;
@@ -77,7 +78,7 @@ public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
 			sb.append(content.substring(indexBkp));
 			WebhookUtil.ensureWebhookExists(textChannel,
 					wh -> sendWebhookMessage(wh, event.getMessage(), sb.toString(), threadId),
-					e -> log.error("Webhook lookup/creation failed", e));
+					e -> ExceptionLogger.capture(e, getClass().getSimpleName()));
 		}
 	}
 
@@ -98,7 +99,7 @@ private char copyCase(String original, int index, char newChar) {
 	private void sendWebhookMessage(Webhook webhook, Message originalMessage, String newMessageContent, long threadId) {
 		WebhookUtil.mirrorMessageToWebhook(webhook, originalMessage, newMessageContent, threadId, null, null)
 				.thenAccept(unused -> originalMessage.delete().queue()).exceptionally(e -> {
-					log.error("replacing the content 'fuck' with 'hug' in an incoming message failed", e);
+					ExceptionLogger.capture(e, getClass().getSimpleName());
 					return null;
 				});
 	}

src/main/java/net/javadiscord/javabot/systems/qotw/submissions/SubmissionManager.java

@@ -212,6 +212,9 @@ public void acceptSubmission(@NotNull ThreadChannel thread, @NotNull User author
 								WebhookUtil.mirrorMessageToWebhook(wh, message, message.getContentRaw(), newestPost.getIdLong(), null, lastMessage ? List.of(buildAuthorEmbed(author, bestAnswer)) : null).join();
 							}
 						}
+					}).exceptionally(err->{
+						ExceptionLogger.capture(err,getClass().getSimpleName());
+						return null;
 					}));
 		}
 		thread.getManager().setLocked(true).setArchived(true).queue();

src/main/java/net/javadiscord/javabot/util/MessageActionUtils.java

@@ -92,7 +92,12 @@ public static void copyMessagesToNewThread(StandardGuildMessageChannel targetCha
 						thread -> WebhookUtil.ensureWebhookExists(targetChannel, wh->{
 							CompletableFuture<ReadonlyMessage> future = CompletableFuture.completedFuture(null);
 							for (Message m : messages) {
-								future = future.thenCompose(unused -> WebhookUtil.mirrorMessageToWebhook(wh, m, m.getContentRaw(), thread.getIdLong(), null, null));
+								future = future
+										.thenCompose(unused -> WebhookUtil.mirrorMessageToWebhook(wh, m, m.getContentRaw(), thread.getIdLong(), null, null))
+										.exceptionally(err -> {
+											ExceptionLogger.capture(err, MessageActionUtils.class.getSimpleName());
+											return null;
+										});
 							}
 							future.thenAccept(unused -> onFinish.accept(thread));
 						})

src/main/java/net/javadiscord/javabot/util/WebhookUtil.java

@@ -51,14 +51,23 @@ public static void ensureWebhookExists(@NotNull IWebhookContainer channel, @NotN
 	 */
 	public static void ensureWebhookExists(@NotNull IWebhookContainer channel, @NotNull Consumer<? super Webhook> callback, @NotNull Consumer<? super Throwable> failureCallback) {
 
+		Consumer<? super Webhook> safeCallback = wh -> {
+			try {
+				callback.accept(wh);
+				//CHECKSTYLE:OFF: IllegalCatch - This should make sure it is properly logged if anything bad happens
+			} catch (Exception e) {
+				//CHECKSTYLE:ON: IllegalCatch
+				failureCallback.accept(e);
+			}
+		};
 		channel.retrieveWebhooks().queue(webhooks -> {
 			Optional<Webhook> hook = webhooks.stream()
 					.filter(webhook -> webhook.getChannel().getIdLong() == channel.getIdLong())
 					.filter(wh -> wh.getToken() != null).findAny();
 			if (hook.isPresent()) {
-				callback.accept(hook.get());
+				safeCallback.accept(hook.get());
 			} else {
-				channel.createWebhook("JavaBot-webhook").queue(callback, failureCallback);
+				channel.createWebhook("JavaBot-webhook").queue(safeCallback, failureCallback);
 			}
 		}, failureCallback);
 	}
@@ -98,6 +107,11 @@ public static CompletableFuture<ReadonlyMessage> mirrorMessageToWebhook(@NotNull
 					is -> message.addFile((attachment.isSpoiler() ? "SPOILER_" : "") + attachment.getFileName(), is));
 		}
 		return CompletableFuture.allOf(futures).thenCompose(unused -> client.send(message.build()))
-				.whenComplete((result, err) -> client.close());
+				.whenComplete((result, err) -> {
+					client.close();
+					if( err != null) {
+						ExceptionLogger.capture(err, WebhookUtil.class.getSimpleName());
+					}
+				});
 	}
 }