allow deleting message link content messages

Author: danthe1st

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

@@ -15,6 +15,7 @@
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.javadiscord.javabot.util.ExceptionLogger;
+import net.javadiscord.javabot.util.InteractionUtils;
 import net.javadiscord.javabot.util.WebhookUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -42,7 +43,12 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
 				Optional<RestAction<Message>> optional = parseMessageUrl(matcher.group(), event.getJDA());
 				optional.ifPresent(action -> action.queue(m -> {
 						WebhookUtil.ensureWebhookExists(webhookChannel,
-								wh -> WebhookUtil.mirrorMessageToWebhook(wh, m, m.getContentRaw(), messageChannel.getType().isThread() ? messageChannel.getIdLong() : 0, List.of(ActionRow.of(Button.link(m.getJumpUrl(), "Jump to Message"))), null));
+							wh -> WebhookUtil.mirrorMessageToWebhook(wh, m, m.getContentRaw(),
+									messageChannel.getType().isThread() ? messageChannel.getIdLong() : 0,
+									List.of(ActionRow.of(
+											Button.link(m.getJumpUrl(), "Jump to Message"),
+											Button.secondary(InteractionUtils.createDeleteInteractionId(m.getAuthor().getIdLong()), "\uD83D\uDDD1️"))),
+									null));
 					}, e -> ExceptionLogger.capture(e, getClass().getSimpleName())));
 			}
 		}

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

@@ -113,7 +113,11 @@ private InteractionCallbackAction<?> delete(@NotNull ButtonInteraction interacti
 	}
 
 	public static Button createDeleteButton(long senderId) {
-		return Button.secondary(DELETE_ORIGINAL_TEMPLATE.formatted(senderId), "\uD83D\uDDD1️");
+		return Button.secondary(createDeleteInteractionId(senderId), "\uD83D\uDDD1️");
+	}
+
+	public static String createDeleteInteractionId(long senderId) {
+		return DELETE_ORIGINAL_TEMPLATE.formatted(senderId);
 	}
 
 	private void kick(ModalInteraction interaction, @NotNull Guild guild, String memberId, String reason) {

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

@@ -65,6 +65,8 @@ public static void ensureWebhookExists(@NotNull IWebhookContainer channel, @NotN
 		channel.retrieveWebhooks().queue(webhooks -> {
 			Optional<Webhook> hook = webhooks.stream()
 					.filter(webhook -> webhook.getChannel().getIdLong() == channel.getIdLong())
+					.filter(wh -> wh.getOwner() != null)
+					.filter(wh -> wh.getOwner().getIdLong() == channel.getJDA().getSelfUser().getIdLong())
 					.filter(wh -> wh.getToken() != null)
 					.findAny();
 			if (hook.isPresent()) {