Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

User Webhook Message Links #321

Merged
merged 4 commits into from
Jul 24, 2022
Merged

User Webhook Message Links #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9c242d
First pass on implementing Webhook Message Links
jasonlessenich Jul 23, 2022
f307da9
Added Webhook button (doesnt work atm)
jasonlessenich Jul 24, 2022
2107a01
bumped `DynxstyGIT/discord-webhooks`
jasonlessenich Jul 24, 2022
2e525d6
optimize imports
jasonlessenich Jul 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies {
implementation("org.quartz-scheduler:quartz:2.3.2")

// Webhooks
implementation("club.minnced:discord-webhooks:0.8.0")
implementation("com.github.DynxstyGIT:discord-webhooks:74301a46a0")

// Lombok Annotations
compileOnly("org.projectlombok:lombok:1.18.24")
Expand Down
35 changes: 13 additions & 22 deletions src/main/java/net/javadiscord/javabot/listener/MessageLinkListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
package net.javadiscord.javabot.listener;

import net.dv8tion.jda.api.EmbedBuilder;
import club.minnced.discord.webhook.send.component.ActionRow;
import club.minnced.discord.webhook.send.component.Button;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.entities.*;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.GuildChannel;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.MessageChannel;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import net.dv8tion.jda.api.interactions.components.buttons.Button;
import net.dv8tion.jda.api.requests.RestAction;
import net.javadiscord.javabot.util.InteractionUtils;
import net.javadiscord.javabot.util.Responses;
import net.javadiscord.javabot.util.ExceptionLogger;
import net.javadiscord.javabot.util.WebhookUtil;
import org.jetbrains.annotations.NotNull;

import java.util.Arrays;
Expand All @@ -28,35 +31,23 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
if (event.getAuthor().isBot() || event.getAuthor().isSystem()) return;
Matcher matcher = MESSAGE_URL_PATTERN.matcher(event.getMessage().getContentRaw());
if (matcher.find()) {
Optional<RestAction<Message>> optional = this.parseMessageUrl(matcher.group(), event.getJDA());
Optional<RestAction<Message>> optional = parseMessageUrl(matcher.group(), event.getJDA());
optional.ifPresent(action -> action.queue(
m -> event.getMessage().replyEmbeds(this.buildUrlEmbed(m))
.setActionRow(Button.secondary(InteractionUtils.DELETE_ORIGINAL_TEMPLATE, "\uD83D\uDDD1️"), Button.link(m.getJumpUrl(), "View Original"))
.queue(),
e -> {}
m -> WebhookUtil.ensureWebhookExists(event.getChannel().asTextChannel(),
wh -> WebhookUtil.mirrorMessageToWebhook(wh, m, m.getContentRaw(), 0, ActionRow.of(Button.link(m.getJumpUrl(), "Jump to Message")))
), ExceptionLogger::capture
));
}
}

private MessageEmbed buildUrlEmbed(Message m) {
User author = m.getAuthor();
return new EmbedBuilder()
.setAuthor(author.getAsTag(), m.getJumpUrl(), author.getEffectiveAvatarUrl())
.setColor(Responses.Type.DEFAULT.getColor())
.setDescription(m.getContentRaw())
.setTimestamp(m.getTimeCreated())
.setFooter("#" + m.getChannel().getName())
.build();
}

/**
* Tries to parse a Discord Message Link to the corresponding Message object.
*
* @param url The Message Link.
* @param jda The {@link JDA} instance.
* @return An {@link Optional} containing the {@link RestAction} which retrieves the corresponding Message.
*/
private Optional<RestAction<Message>> parseMessageUrl(String url, JDA jda) {
private Optional<RestAction<Message>> parseMessageUrl(@NotNull String url, @NotNull JDA jda) {
RestAction<Message> optional = null;
String[] arr = url.split("/");
String[] segments = Arrays.copyOfRange(arr, 4, arr.length);
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/net/javadiscord/javabot/util/WebhookUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import club.minnced.discord.webhook.external.JDAWebhookClient;
import club.minnced.discord.webhook.send.AllowedMentions;
import club.minnced.discord.webhook.send.WebhookMessageBuilder;
import club.minnced.discord.webhook.send.component.Button;
import club.minnced.discord.webhook.send.component.LayoutComponent;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.Message.Attachment;
import net.dv8tion.jda.api.entities.TextChannel;
Expand Down Expand Up @@ -70,14 +72,16 @@ public static void ensureWebhookExists(@NotNull TextChannel channel, Consumer<?
* @return a {@link CompletableFuture} representing the action of sending
* the message
*/
public static CompletableFuture<Void> mirrorMessageToWebhook(@NotNull Webhook webhook, @NotNull Message originalMessage, String newMessageContent, long threadId) {
public static CompletableFuture<Void> mirrorMessageToWebhook(@NotNull Webhook webhook, @NotNull Message originalMessage, String newMessageContent, long threadId, LayoutComponent... components) {
JDAWebhookClient client = new WebhookClientBuilder(webhook.getIdLong(), webhook.getToken())
.setThreadId(threadId).buildJDA();
WebhookMessageBuilder message = new WebhookMessageBuilder().setContent(newMessageContent)
.setAllowedMentions(AllowedMentions.none())
.setAvatarUrl(originalMessage.getMember().getEffectiveAvatarUrl())
.setUsername(originalMessage.getMember().getEffectiveName());

if (components.length > 0) {
message.addComponents(components);
}
List<Attachment> attachments = originalMessage.getAttachments();
@SuppressWarnings("unchecked")
CompletableFuture<?>[] futures = new CompletableFuture<?>[attachments.size()];
Expand Down