[FEATURE] Webhooks #147

blueysh · 2023-03-20T19:36:58Z

Pull Request

I have checked the PRs for upcoming features/bug fixes.

Changes

Internal code
Library
Documentation

Closes #28

Description

Adds Webhooks. This pull request isn't final yet (I think) so I will probably mark it as draft.

seailz

Don't try-catch the `DiscordRequest.UnhandledDiscordAPIErrorException" error. It should be added to the method signature.

blueysh · 2023-03-22T02:19:48Z

Don't try-catch the `DiscordRequest.UnhandledDiscordAPIErrorException" error. It should be added to the method signature.

@seailz Fixed. Any other comments on the current code?

src/main/java/com/seailz/discordjar/model/channel/GuildChannel.java

blueysh · 2023-03-22T12:23:34Z

Did you want me to keep the Webhook class or just IncomingWebhook now that there will only be one kind of Webhook?

seailz · 2023-03-22T23:07:07Z

Did you want me to keep the Webhook class or just IncomingWebhook now that there will only be one kind of Webhook?

leave it how it is atm

src/main/java/com/seailz/discordjar/model/webhook/Webhook.java

src/main/java/com/seailz/discordjar/model/webhook/IncomingWebhook.java

src/main/java/com/seailz/discordjar/model/channel/GuildChannel.java

src/main/java/com/seailz/discordjar/model/channel/internal/GuildChannelImpl.java

src/main/java/com/seailz/discordjar/model/webhook/IncomingWebhook.java

src/main/java/com/seailz/discordjar/model/webhook/Webhook.java

seailz · 2023-03-24T12:42:07Z

src/main/java/com/seailz/discordjar/model/webhook/Webhook.java

+ * @param url The URL of the Webhook.
+ * @param discordJar A discord.jar instance used internally.
+ */
+public record Webhook(


Please implement modify methods.

seailz · 2023-03-24T12:42:34Z

src/main/java/com/seailz/discordjar/model/webhook/Webhook.java

+ * @param url The URL of the Webhook.
+ * @param discordJar A discord.jar instance used internally.
+ */
+public record Webhook(


Please implement the ability to retrieve, edit, and delete webhook messages.

blueysh · 2023-05-19T17:45:35Z

Will eventually be re-opened. Fixing files

src/main/java/com/seailz/discordjar/model/channel/internal/GuildChannelImpl.java

seailz

Think these are the last things that need doing before we get this merged.

src/main/java/com/seailz/discordjar/model/channel/GuildChannel.java

src/main/java/com/seailz/discordjar/model/channel/internal/GuildChannelImpl.java

seailz · 2023-07-02T19:01:48Z

src/main/java/com/seailz/discordjar/model/webhook/IncomingWebhook.java

+ * @param user The user object tied to the Webhook.
+ * @param discordJar A discord.jar instance used internally.
+ */
+public record IncomingWebhook(


Please implement the ability to retrieve, edit, and delete webhook messages.

src/main/java/com/seailz/discordjar/utils/image/ImageUtils.java

src/main/java/com/seailz/discordjar/model/channel/internal/GuildChannelImpl.java

src/main/java/com/seailz/discordjar/model/webhook/IncomingWebhook.java

seailz · 2023-07-07T15:54:32Z

src/main/java/com/seailz/discordjar/model/webhook/IncomingWebhook.java

+    public EditWebhookMessageAction editMessage(String messageId, String content, List<Embed> embeds, List<Attachment> attachments, String usernameOverride, String avatarUrlOverride, String threadName){
+        return new EditWebhookMessageAction(messageId, content, embeds, attachments, usernameOverride, avatarUrlOverride, threadName, id, token, discordJar);
    }


Suggested change

public EditWebhookMessageAction editMessage(String messageId, String content, List<Embed> embeds, List<Attachment> attachments, String usernameOverride, String avatarUrlOverride, String threadName){

return new EditWebhookMessageAction(messageId, content, embeds, attachments, usernameOverride, avatarUrlOverride, threadName, id, token, discordJar);

}

public EditWebhookMessageAction editMessage(String messageId){

return new EditWebhookMessageAction(messageId, id, token, discordJar);

}

Please also add other messages for sending embeds, attachements, etc.

seailz · 2023-07-07T15:55:20Z

src/main/java/com/seailz/discordjar/action/webhook/WebhookExecuteAction.java

+    private final Snowflake channelId;
+    private final Snowflake webhookId;
+    private final Snowflake guildId;


These should all be strings - not snowflakes. This applies to the rest of the project, by the way.

seailz · 2023-07-07T15:56:24Z

src/main/java/com/seailz/discordjar/action/webhook/WebhookExecuteAction.java

+    public WebhookExecuteAction(String content, List<Embed> embeds, List<Attachment> attachments, String usernameOverride, String avatarUrlOverride, String threadName, DiscordJar discordJar, Snowflake channelId, Snowflake webhookId, Snowflake guildId, String webhookToken) {
+        this.content = content;
+        this.embeds = embeds;
+        this.attachments = attachments;
+        this.usernameOverride = usernameOverride;
+        this.avatarUrlOverride = avatarUrlOverride;
+        this.threadName = threadName;
+        this.discordJar = discordJar;
+        this.channelId = channelId;
+        this.webhookId = webhookId;
+        this.guildId = guildId;
+        this.webhookToken = webhookToken;
+    }


Suggested change

public WebhookExecuteAction(String content, List<Embed> embeds, List<Attachment> attachments, String usernameOverride, String avatarUrlOverride, String threadName, DiscordJar discordJar, Snowflake channelId, Snowflake webhookId, Snowflake guildId, String webhookToken) {

this.content = content;

this.embeds = embeds;

this.attachments = attachments;

this.usernameOverride = usernameOverride;

this.avatarUrlOverride = avatarUrlOverride;

this.threadName = threadName;

this.discordJar = discordJar;

this.channelId = channelId;

this.webhookId = webhookId;

this.guildId = guildId;

this.webhookToken = webhookToken;

}

public WebhookExecuteAction(String content, DiscordJar discordJar, String channelId, String webhookId, String guildId, String webhookToken) {

this.content = content;

this.discordJar = discordJar;

this.channelId = channelId;

this.webhookId = webhookId;

this.guildId = guildId;

this.webhookToken = webhookToken;

}

seailz · 2023-07-07T15:57:11Z

src/main/java/com/seailz/discordjar/model/webhook/IncomingWebhook.java

+    public WebhookExecuteAction execute(String content, List<Embed> embeds, List<Attachment> attachments, String usernameOverride, String avatarUrlOverride, String threadName){
+        return new WebhookExecuteAction(content, embeds, attachments, usernameOverride, avatarUrlOverride, threadName, discordJar, channelId, id, guildId, token);
    }


Suggested change

public WebhookExecuteAction execute(String content, List<Embed> embeds, List<Attachment> attachments, String usernameOverride, String avatarUrlOverride, String threadName){

return new WebhookExecuteAction(content, embeds, attachments, usernameOverride, avatarUrlOverride, threadName, discordJar, channelId, id, guildId, token);

}

public WebhookExecuteAction execute(String content) {

return new WebhookExecuteAction(content, discordJar, channelId, id, guildId, token);

}

seailz · 2023-07-07T15:58:05Z

src/main/java/com/seailz/discordjar/action/webhook/WebhookExecuteAction.java

+    public Response<Message> run() {
+        Response<Message> future = new Response<>();
+        new Thread(() -> {
+
+            JSONObject body = new JSONObject();
+            if (content != null) body.put("content", content);
+            if (embeds != null) body.put("embeds", new JSONArray(embeds));
+            if (attachments != null) body.put("attachments", new JSONArray(attachments));
+            if (usernameOverride != null) body.put("username", usernameOverride);
+            if (avatarUrlOverride != null) body.put("avatar_url", avatarUrlOverride);
+            if (threadName != null) {
+                body.put("thread_name", threadName);
+            }
+            DiscordRequest request = new DiscordRequest(
+                    body,
+                    new HashMap<>(),
+                    URLS.POST.GUILDS.CHANNELS.EXECUTE_WEBHOOK_WITH_WAIT.replace("{guild.id}", guildId.id()).replace("{channel.id}", channelId.id()).replace("{webhook.id}", webhookId.id()).replace("{webhook.token}", webhookToken),
+                    discordJar,
+                    URLS.POST.GUILDS.CHANNELS.EXECUTE_WEBHOOK_WITH_WAIT,
+                    RequestMethod.POST
+            );
+            try {
+                future.complete(Message.decompile(request.invoke().body(), discordJar));
+            } catch (DiscordRequest.UnhandledDiscordAPIErrorException e) {
+                future.completeError(new Response.Error(e));
+                return;
+            }
+
+        }).start();
+
+        return future;


Please add support for files - see the MessageCreateAction class for more details on how that works.

seailz · 2023-07-07T15:59:46Z

src/main/java/com/seailz/discordjar/utils/URLS.java

+                 * @param webhook.token The token of the webhook
+                 * @param wait Whether to wait for server confirmation
+                 */
+                public static final String EXECUTE_WEBHOOK_WITH_WAIT = "/webhooks/{webhook.id}/{webhook.token}?wait=true";


Please actually add support for this endpoint - also, query params should be implemented at use instead of as separate URLs.

seailz · 2023-07-07T16:00:28Z

src/main/java/com/seailz/discordjar/action/webhook/EditWebhookMessageAction.java

+    public EditWebhookMessageAction(String messageId, String content, List<Embed> embeds, List<Attachment> attachments, String usernameOverride, String avatarUrlOverride, String threadName, Snowflake webhookId, String webhookToken, DiscordJar discordJar) {
+        this.messageId = messageId;
+        this.content = content;
+        this.embeds = embeds;
+        this.attachments = attachments;
+        this.usernameOverride = usernameOverride;
+        this.avatarUrlOverride = avatarUrlOverride;
+        this.threadName = threadName;
+        this.webhookId = webhookId;
+        this.webhookToken = webhookToken;
+        this.discordJar = discordJar;
+    }


Suggested change

public EditWebhookMessageAction(String messageId, String content, List<Embed> embeds, List<Attachment> attachments, String usernameOverride, String avatarUrlOverride, String threadName, Snowflake webhookId, String webhookToken, DiscordJar discordJar) {

this.messageId = messageId;

this.content = content;

this.embeds = embeds;

this.attachments = attachments;

this.usernameOverride = usernameOverride;

this.avatarUrlOverride = avatarUrlOverride;

this.threadName = threadName;

this.webhookId = webhookId;

this.webhookToken = webhookToken;

this.discordJar = discordJar;

}

public EditWebhookMessageAction(String messageId, String webhookId, String webhookToken, DiscordJar discordJar) {

this.messageId = messageId;

this.webhookId = webhookId;

this.webhookToken = webhookToken;

this.discordJar = discordJar;

}

seailz · 2023-07-07T16:01:51Z

For future reference, a class that has an id field should implement the Snowflake interface - it's not meant to represent individual snowflakes.

seailz · 2023-07-07T16:02:53Z

src/main/java/com/seailz/discordjar/model/webhook/IncomingWebhook.java

-                URLS.POST.GUILDS.CHANNELS.EXECUTE_WEBHOOK,
-                RequestMethod.POST
-        );
+    public Message getMessage(String messageId) {


rename this to getMessageById please.

seailz changed the title ~~feat: start webhooks!!!!~~ [FEATURE] Webhooks Mar 21, 2023

seailz requested changes Mar 21, 2023

View reviewed changes

seailz requested changes Mar 22, 2023

View reviewed changes

src/main/java/com/seailz/discordjar/model/channel/GuildChannel.java Outdated Show resolved Hide resolved

blueysh requested a review from seailz March 23, 2023 18:30

seailz requested changes Mar 23, 2023

View reviewed changes

blueysh requested a review from seailz March 23, 2023 19:59

seailz requested changes Mar 24, 2023

View reviewed changes

blueysh closed this May 19, 2023

blueysh force-pushed the feature/webhooks branch from 6556ac8 to a8b3c15 Compare May 19, 2023 15:34

blueysh reopened this Jun 16, 2023

blueysh requested a review from seailz June 16, 2023 22:21

seailz requested changes Jul 1, 2023

View reviewed changes

blueysh requested a review from seailz July 2, 2023 18:58

seailz requested changes Jul 2, 2023

View reviewed changes

seailz assigned blueysh Jul 2, 2023

seailz added status: in progress PR or issue is currently in progress type: feature Issue or PR is a feature that should be implemented priority: medium Medium priority labels Jul 2, 2023

seailz added this to the discord.jar 1.0 milestone Jul 2, 2023

seailz requested changes Jul 5, 2023

View reviewed changes

src/main/java/com/seailz/discordjar/utils/image/ImageUtils.java Outdated Show resolved Hide resolved

src/main/java/com/seailz/discordjar/model/channel/internal/GuildChannelImpl.java Outdated Show resolved Hide resolved

seailz requested changes Jul 6, 2023

View reviewed changes

src/main/java/com/seailz/discordjar/model/channel/internal/GuildChannelImpl.java Outdated Show resolved Hide resolved

blueysh requested a review from seailz July 6, 2023 19:06

seailz requested changes Jul 6, 2023

View reviewed changes

src/main/java/com/seailz/discordjar/model/webhook/IncomingWebhook.java Outdated Show resolved Hide resolved

src/main/java/com/seailz/discordjar/model/webhook/IncomingWebhook.java Outdated Show resolved Hide resolved

blueysh requested a review from seailz July 7, 2023 05:17

seailz requested changes Jul 7, 2023

View reviewed changes

blueysh closed this Oct 2, 2023

blueysh force-pushed the feature/webhooks branch from fb70cbf to f892df8 Compare October 2, 2023 17:06

blueysh deleted the feature/webhooks branch October 2, 2023 17:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[FEATURE] Webhooks #147

[FEATURE] Webhooks #147

blueysh commented Mar 20, 2023 •

edited

seailz left a comment

blueysh commented Mar 22, 2023

blueysh commented Mar 22, 2023

seailz commented Mar 22, 2023

seailz Mar 24, 2023

seailz Mar 24, 2023

blueysh commented May 19, 2023

seailz left a comment

seailz Jul 2, 2023

seailz Jul 7, 2023

seailz Jul 7, 2023

seailz Jul 7, 2023

seailz Jul 7, 2023

seailz Jul 7, 2023

seailz Jul 7, 2023

seailz Jul 7, 2023

seailz commented Jul 7, 2023

seailz Jul 7, 2023

[FEATURE] Webhooks #147

[FEATURE] Webhooks #147

Conversation

blueysh commented Mar 20, 2023 • edited

Pull Request

Changes

Description

seailz left a comment

Choose a reason for hiding this comment

blueysh commented Mar 22, 2023

blueysh commented Mar 22, 2023

seailz commented Mar 22, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

blueysh commented May 19, 2023

seailz left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

seailz commented Jul 7, 2023

Choose a reason for hiding this comment

blueysh commented Mar 20, 2023 •

edited