Remove unnecessary dependency

Nincodedo · Nov 1, 2024 · 158ea5c · 158ea5c
1 parent e6a084f
commit 158ea5c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 40 deletions.
diff --git a/ninbot-app/pom.xml b/ninbot-app/pom.xml
@@ -11,10 +11,6 @@
     <artifactId>ninbot-app</artifactId>
     <name>Ninbot Application</name>
     <dependencies>
-        <dependency>
-            <groupId>club.minnced</groupId>
-            <artifactId>discord-webhooks</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.bernardomg.tabletop</groupId>
             <artifactId>dice</artifactId>

diff --git a/ninbot-shared-parent/pom.xml b/ninbot-shared-parent/pom.xml
@@ -22,7 +22,6 @@
         <commons-lang.version>2.6</commons-lang.version>
         <commons-text.version>1.12.0</commons-text.version>
         <dice.version>2.2.5</dice.version>
-        <discord-webhooks.version>0.8.4</discord-webhooks.version>
         <imgscalr-lib.version>4.2</imgscalr-lib.version>
         <instancio-junit.version>5.0.2</instancio-junit.version>
         <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
@@ -54,11 +53,6 @@
     </properties>
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>club.minnced</groupId>
-                <artifactId>discord-webhooks</artifactId>
-                <version>${discord-webhooks.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.bernardomg.tabletop</groupId>
                 <artifactId>dice</artifactId>

diff --git a/nincord-common/pom.xml b/nincord-common/pom.xml
@@ -11,10 +11,6 @@
     <artifactId>nincord-common</artifactId>
     <name>Nincord Common Library</name>
     <dependencies>
-        <dependency>
-            <groupId>club.minnced</groupId>
-            <artifactId>discord-webhooks</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>

diff --git a/...mmon/src/main/java/dev/nincodedo/nincord/message/MessageReceivedEventMessageExecutor.java b/...mmon/src/main/java/dev/nincodedo/nincord/message/MessageReceivedEventMessageExecutor.java
@@ -1,6 +1,5 @@
 package dev.nincodedo.nincord.message;
 
-import dev.nincodedo.nincord.logging.FormatLogObject;
 import dev.nincodedo.nincord.message.impersonation.Impersonation;
 import dev.nincodedo.nincord.message.impersonation.Impersonator;
 import lombok.extern.slf4j.Slf4j;
@@ -10,8 +9,6 @@
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 
-import java.util.concurrent.ExecutionException;
-
 @Slf4j
 public class MessageReceivedEventMessageExecutor extends MessageExecutor {
 
@@ -39,11 +36,7 @@ private void sendMessage(MessageCreateData message) {
         } else {
             Impersonator impersonator = new Impersonator(impersonation, getGuild(),
                     messageReceivedEvent.getChannel());
-            try {
-                impersonator.sendMessage(message).get();
-            } catch (InterruptedException | ExecutionException e) {
-                log.error("Failed to send webhook message in server {}", FormatLogObject.guildName(getGuild()), e);
-            }
+            impersonator.sendMessage(message);
         }
     }
 

diff --git a/nincord-common/src/main/java/dev/nincodedo/nincord/message/impersonation/Impersonator.java b/nincord-common/src/main/java/dev/nincodedo/nincord/message/impersonation/Impersonator.java
@@ -1,12 +1,9 @@
 package dev.nincodedo.nincord.message.impersonation;
 
-import club.minnced.discord.webhook.receive.ReadonlyMessage;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 
-import java.util.concurrent.CompletableFuture;
-
 public class Impersonator {
 
     private Impersonation impersonation;
@@ -22,11 +19,10 @@ public Impersonator(Impersonation impersonation, Guild guild, MessageChannel mes
         this.webhookHelper = new WebhookHelper();
     }
 
-    public CompletableFuture<ReadonlyMessage> sendMessage(MessageCreateData message) {
+    public void sendMessage(MessageCreateData message) {
         setupWebhook();
-        var future = webhookHelper.sendMessage(message);
+        webhookHelper.sendMessage(message);
         tearDown();
-        return future;
     }
 
     private void tearDown() {

diff --git a/nincord-common/src/main/java/dev/nincodedo/nincord/message/impersonation/WebhookHelper.java b/nincord-common/src/main/java/dev/nincodedo/nincord/message/impersonation/WebhookHelper.java
@@ -1,9 +1,5 @@
 package dev.nincodedo.nincord.message.impersonation;
 
-import club.minnced.discord.webhook.WebhookClient;
-import club.minnced.discord.webhook.WebhookClientBuilder;
-import club.minnced.discord.webhook.receive.ReadonlyMessage;
-import club.minnced.discord.webhook.send.WebhookMessageBuilder;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Guild;
@@ -13,13 +9,11 @@
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.managers.WebhookManager;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
-import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
 
 @Slf4j
 class WebhookHelper {
@@ -58,11 +52,8 @@ public WebhookManager setWebhookIcon(String iconUrl) {
         return webhook.getManager();
     }
 
-    public @NotNull CompletableFuture<ReadonlyMessage> sendMessage(MessageCreateData message) {
-        WebhookMessageBuilder messageBuilder = new WebhookMessageBuilder();
-        messageBuilder.append(message.getContent());
-        try (WebhookClient client = new WebhookClientBuilder(webhook.getUrl()).build()) {
-            return client.send(messageBuilder.build());
-        }
+    public void sendMessage(MessageCreateData message) {
+        var client = net.dv8tion.jda.api.entities.WebhookClient.createClient(webhook.getJDA(), webhook.getUrl());
+        client.sendMessage(message).queue();
     }
 }