Finish doing lj-bot example

surajkumar · surajkumar · commit ba04843b4c5c · 2024-05-28T19:07:48.000+01:00
diff --git a/annotations/src/main/java/com/javadiscord/jdi/core/processor/validator/EventListenerValidator.java b/annotations/src/main/java/com/javadiscord/jdi/core/processor/validator/EventListenerValidator.java
@@ -308,7 +308,7 @@ public class EventListenerValidator {
         EXPECTED_PARAM_TYPES_MAP.put(
             ThreadCreate.class,
             new String[] {
-                "com.javadiscord.jdi.core.gateway.handlers.events.codec.models.channel.Thread",
+                "com.javadiscord.jdi.internal.gateway.handlers.events.codec.models.channel.Thread",
                 "com.javadiscord.jdi.core.Discord",
                 "com.javadiscord.jdi.core.Guild"
             }
diff --git a/api/src/main/java/com/javadiscord/jdi/core/api/ChannelRequest.java b/api/src/main/java/com/javadiscord/jdi/core/api/ChannelRequest.java
@@ -6,6 +6,7 @@
 import com.javadiscord.jdi.core.api.builders.*;
 import com.javadiscord.jdi.core.models.channel.Channel;
 import com.javadiscord.jdi.core.models.channel.ThreadMember;
+import com.javadiscord.jdi.core.models.emoji.Emoji;
 import com.javadiscord.jdi.core.models.invite.Invite;
 import com.javadiscord.jdi.core.models.message.Message;
 import com.javadiscord.jdi.core.models.message.MessageReaction;
@@ -65,7 +66,7 @@ Message.class, new CreateMessageBuilder(channelId).embeds(embeds).build()
     public AsyncResponse<MessageReaction> createReaction(
         long channelId,
         long messageId,
-        String emoji
+        Emoji emoji
     ) {
         return responseParser.callAndParse(
             MessageReaction.class, new CreateReactionRequest(channelId, messageId, emoji)
diff --git a/api/src/main/java/com/javadiscord/jdi/internal/api/channel/CreateReactionRequest.java b/api/src/main/java/com/javadiscord/jdi/internal/api/channel/CreateReactionRequest.java
@@ -1,12 +1,13 @@
 package com.javadiscord.jdi.internal.api.channel;
 
+import com.javadiscord.jdi.core.models.emoji.Emoji;
 import com.javadiscord.jdi.internal.api.DiscordRequest;
 import com.javadiscord.jdi.internal.api.DiscordRequestBuilder;
 
 public record CreateReactionRequest(
     long channelId,
     long messageId,
-    String emoji
+    Emoji emoji
 ) implements DiscordRequest {
     @Override
     public DiscordRequestBuilder create() {
diff --git a/example/lj-discord-bot/src/main/java/com/javadiscord/bot/Main.java b/example/lj-discord-bot/src/main/java/com/javadiscord/bot/Main.java
@@ -1,7 +1,7 @@
 package com.javadiscord.bot;
 
-import com.javadiscord.bot.commands.slash.jshell.JShellService;
 import com.javadiscord.bot.utils.chatgpt.ChatGPT;
+import com.javadiscord.bot.utils.jshell.JShellService;
 import com.javadiscord.jdi.core.Discord;
 import com.javadiscord.jdi.core.annotations.Component;
 
diff --git a/example/lj-discord-bot/src/main/java/com/javadiscord/bot/commands/slash/JShellCommand.java b/example/lj-discord-bot/src/main/java/com/javadiscord/bot/commands/slash/JShellCommand.java
@@ -1,7 +1,10 @@
-package com.javadiscord.bot.commands.slash.jshell;
+package com.javadiscord.bot.commands.slash;
 
 import java.awt.*;
 
+import com.javadiscord.bot.utils.jshell.JShellResponse;
+import com.javadiscord.bot.utils.jshell.JShellService;
+import com.javadiscord.bot.utils.jshell.JShellSnippet;
 import com.javadiscord.jdi.core.CommandOptionType;
 import com.javadiscord.jdi.core.annotations.CommandOption;
 import com.javadiscord.jdi.core.annotations.Inject;
diff --git a/example/lj-discord-bot/src/main/java/com/javadiscord/bot/listeners/QuestionListener.java b/example/lj-discord-bot/src/main/java/com/javadiscord/bot/listeners/QuestionListener.java
@@ -0,0 +1,93 @@
+package com.javadiscord.bot.listeners;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.javadiscord.bot.utils.chatgpt.ChatGPT;
+import com.javadiscord.jdi.core.Guild;
+import com.javadiscord.jdi.core.annotations.EventListener;
+import com.javadiscord.jdi.core.annotations.Inject;
+import com.javadiscord.jdi.core.annotations.MessageCreate;
+import com.javadiscord.jdi.core.annotations.ThreadCreate;
+import com.javadiscord.jdi.core.models.message.Message;
+import com.javadiscord.jdi.core.models.message.embed.Embed;
+import com.javadiscord.jdi.core.models.message.embed.EmbedAuthor;
+import com.javadiscord.jdi.internal.gateway.handlers.events.codec.models.channel.Thread;
+
+@EventListener
+public class QuestionListener {
+    private final List<Long> channelsThatNeedChatGpt = new ArrayList<>();
+
+    @Inject
+    private ChatGPT chatGPT;
+
+    @ThreadCreate
+    public void onQuestionCreate(Thread thread, Guild guild) {
+        if (thread.newlyCreated() && thread.parentId() == 1245064991275618511L) {
+
+            guild.channel().sendEmbed(
+                thread.id(), new Embed.Builder()
+                    .description(
+                        """
+                            # Important
+                            Please make sure your question has enough details for a helper to understand the problem.
+
+                            * If you are asking for help with code, please use a code block.
+                            * If you are asking for help with an error, please include the full error message.
+                            * Screenshots may also be useful. Please do not post screenshots of code, however.
+                            """
+                    )
+                    .image(
+                        "https://media.tenor.com/LoNa2zOMxoAAAAAC/its-very-important-it-matters.gif"
+                    )
+                    .build()
+            );
+
+            guild.channel().sendEmbed(
+                thread.id(), new Embed.Builder()
+                    .description(
+                        """
+                            Once your question has been answered, please close this thread by doing `/close`.
+                            """
+                    ).build()
+            );
+
+            channelsThatNeedChatGpt.add(thread.id());
+        }
+    }
+
+    @MessageCreate
+    public void sendChatGptAnswer(Message message, Guild guild) {
+        if (channelsThatNeedChatGpt.contains(message.id())) {
+            channelsThatNeedChatGpt.remove(message.id());
+
+            StringBuilder answer = new StringBuilder();
+            answer.append("## Here is an attempted answer by ChatGPT\n\n");
+
+            chatGPT.ask(message.content())
+                .ifPresentOrElse(
+                    strings -> {
+                        for (String string : strings) {
+                            answer.append(string).append("\n");
+                        }
+                    },
+                    () -> guild.channel().sendMessage(
+                        message.channelId(),
+                        "ChatGPT is currently unavailable."
+                    )
+                );
+
+            Embed embed =
+                new Embed.Builder()
+                    .author(
+                        new EmbedAuthor("", null, "https://chat.openai.com/favicon-32x32.png", null)
+                    )
+                    .color(Color.CYAN)
+                    .description(answer.toString())
+                    .build();
+
+            guild.channel().sendEmbed(message.channelId(), embed);
+        }
+    }
+}
diff --git a/example/lj-discord-bot/src/main/java/com/javadiscord/bot/listeners/SpamListener.java b/example/lj-discord-bot/src/main/java/com/javadiscord/bot/listeners/SpamListener.java
@@ -16,7 +16,7 @@ public class SpamListener {
 
     @MessageCreate
     public void onMessage(Message message, Guild guild) {
-        if (!message.author().bot() && CurseWords.containsCurseWord(message.content())) {
+        if (message.fromUser() && CurseWords.containsCurseWord(message.content())) {
             guild.channel().deleteMessage(message.channelId(), message.id());
             guild.user()
                 .createDM(message.id())
diff --git a/example/lj-discord-bot/src/main/java/com/javadiscord/bot/listeners/SuggestionListener.java b/example/lj-discord-bot/src/main/java/com/javadiscord/bot/listeners/SuggestionListener.java
@@ -3,31 +3,39 @@
 import com.javadiscord.jdi.core.Guild;
 import com.javadiscord.jdi.core.annotations.EventListener;
 import com.javadiscord.jdi.core.annotations.MessageCreate;
-import com.javadiscord.jdi.core.api.builders.StartThreadWithoutMessageBuilder;
+import com.javadiscord.jdi.core.api.builders.StartThreadFromMessageBuilder;
 import com.javadiscord.jdi.core.models.message.Message;
 
 @EventListener
 public class SuggestionListener {
 
     @MessageCreate
     public void onMessage(Message message, Guild guild) {
-        if (message.author().bot()) {
+        if (message.fromBot()) {
             return;
         }
 
         if (message.channelId() != 1244690778505216154L) {
             return;
         }
 
-        guild.channel().createReaction(message.channelId(), message.id(), "thumbup");
-        guild.channel().createReaction(message.channelId(), message.id(), "thumbsdown");
+        // guild.channel().createReaction(message.channelId(), message.id(), "thumbup");
+        // guild.channel().createReaction(message.channelId(), message.id(),
+        // "thumbsdown");
 
-        guild.channel().startThreadWithoutMessage(
-            new StartThreadWithoutMessageBuilder(
+        String title =
+            message.content().length() > 60
+                ? message.content().substring(0, 60)
+                : message.content();
+
+        guild.channel().startThreadFromMessage(
+            new StartThreadFromMessageBuilder(
                 message.channelId(),
-                "Suggestion!"
+                message.id(),
+                title
             )
-        );
+        ).onError(System.err::println)
+            .onSuccess(System.out::println);
     }
 
 }
diff --git a/example/lj-discord-bot/src/main/java/com/javadiscord/bot/utils/jshell/JShellResponse.java b/example/lj-discord-bot/src/main/java/com/javadiscord/bot/utils/jshell/JShellResponse.java
@@ -1,4 +1,4 @@
-package com.javadiscord.bot.commands.slash.jshell;
+package com.javadiscord.bot.utils.jshell;
 
 import java.util.List;
 
diff --git a/example/lj-discord-bot/src/main/java/com/javadiscord/bot/utils/jshell/JShellService.java b/example/lj-discord-bot/src/main/java/com/javadiscord/bot/utils/jshell/JShellService.java
@@ -1,4 +1,4 @@
-package com.javadiscord.bot.commands.slash.jshell;
+package com.javadiscord.bot.utils.jshell;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/example/lj-discord-bot/src/main/java/com/javadiscord/bot/utils/jshell/JShellSnippet.java b/example/lj-discord-bot/src/main/java/com/javadiscord/bot/utils/jshell/JShellSnippet.java
@@ -1,4 +1,4 @@
-package com.javadiscord.bot.commands.slash.jshell;
+package com.javadiscord.bot.utils.jshell;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/WebhookDecoder.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/WebhookDecoder.java
@@ -1,5 +1,6 @@
 package com.javadiscord.jdi.internal.gateway.handlers.events.codec.decoders;
 
+import com.javadiscord.jdi.core.models.webhook.Webhook;
 import com.javadiscord.jdi.internal.gateway.GatewayEvent;
 import com.javadiscord.jdi.internal.gateway.handlers.events.codec.EventDecoder;
 
@@ -8,14 +9,14 @@
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
-public class WebhookDecoder implements EventDecoder<WebhookDecoder> {
+public class WebhookDecoder implements EventDecoder<Webhook> {
     private static final ObjectMapper OBJECT_MAPPER =
         JsonMapper.builder().addModule(new JavaTimeModule()).build();
 
     @Override
-    public WebhookDecoder decode(GatewayEvent gatewayEvent) {
+    public Webhook decode(GatewayEvent gatewayEvent) {
         try {
-            return OBJECT_MAPPER.readValue(gatewayEvent.data().toString(), WebhookDecoder.class);
+            return OBJECT_MAPPER.readValue(gatewayEvent.data().toString(), Webhook.class);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }
diff --git a/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/Thread.java b/gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/models/channel/Thread.java
@@ -11,8 +11,8 @@ public record Thread(
     @JsonProperty("total_message_sent") int totalMessageSent,
     @JsonProperty("thread_metadata") ThreadMetadata threadMetadata,
     @JsonProperty("rate_limit_per_user") int rateLimitPerUser,
-    @JsonProperty("parent_id") String parentId,
-    @JsonProperty("owner_id") String ownerId,
+    @JsonProperty("parent_id") long parentId,
+    @JsonProperty("owner_id") long ownerId,
     @JsonProperty("newly_created") boolean newlyCreated,
     @JsonProperty("name") String name,
     @JsonProperty("message_count") int messageCount,
diff --git a/models/src/main/java/com/javadiscord/jdi/core/models/message/Message.java b/models/src/main/java/com/javadiscord/jdi/core/models/message/Message.java
@@ -49,4 +49,13 @@ public record Message(
     @JsonProperty("position") int position,
     @JsonProperty("role_subscription_data") RoleSubscriptionData roleSubscriptionData,
     @JsonProperty("resolved") ResolvedData resolved
-) {}
+) {
+
+    public boolean fromBot() {
+        return author.bot();
+    }
+
+    public boolean fromUser() {
+        return !author.bot();
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ public class EventListenerValidator {`
`308`	`308`	`EXPECTED_PARAM_TYPES_MAP.put(`
`309`	`309`	`ThreadCreate.class,`
`310`	`310`	`new String[] {`
`311`		`- "com.javadiscord.jdi.core.gateway.handlers.events.codec.models.channel.Thread",`
	`311`	`+ "com.javadiscord.jdi.internal.gateway.handlers.events.codec.models.channel.Thread",`
`312`	`312`	`"com.javadiscord.jdi.core.Discord",`
`313`	`313`	`"com.javadiscord.jdi.core.Guild"`
`314`	`314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.javadiscord.bot.commands.slash.jshell;`
	`1`	`+package com.javadiscord.bot.utils.jshell;`
`2`	`2`
`3`	`3`	`import java.util.List;`
`4`	`4`