Merge remote-tracking branch 'origin/main'

Author: seailz

README.md

@@ -16,7 +16,7 @@ Designed to make developing bots faster and simpler!
 <dependency>
 	<groupId>com.github.ice-games</groupId>
 	<artifactId>java-discord-framework</artifactId>
-	<version>1.2</version>
+	<version>1.4</version>
 </dependency>
  ```
 

SECURITY.md

@@ -4,6 +4,7 @@
 
 | Version | Supported          |
 | ------- | ------------------ |
+| 1.3     | :white_check_mark: |
 | 1.2     | :white_check_mark: |
 | 1.1     | :white_check_mark: |
 | 1.0     | :white_check_mark: |

pom.xml

@@ -59,7 +59,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>5.0.0-alpha.13</version>
+            <version>5.0.0-alpha.17</version>
         </dependency>
     </dependencies>
 

src/main/java/com/seailz/jdaframework/DiscordBot.java

@@ -8,11 +8,13 @@
 import com.seailz.jdaframework.contextmenu.listeners.UserContextMenuListener;
 import com.seailz.jdaframework.contextmenu.registry.ContextMenuRegistry;
 import com.seailz.jdaframework.modals.listeners.ModalListener;
+import com.seailz.jdaframework.select.SelectMenuListener;
 import lombok.Getter;
 import lombok.Setter;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
 import net.dv8tion.jda.api.hooks.EventListener;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 
@@ -32,6 +34,10 @@ public class DiscordBot {
     private static DiscordBot instance;
     @Getter
     private static HashMap<String, Consumer<ButtonInteractionEvent>> buttonRegistry;
+
+    @Getter
+    private static HashMap<String, Consumer<SelectMenuInteractionEvent>> selectRegistry;
+
     private String token;
     private JDA jda;
     private JDABuilder builder;
@@ -54,7 +60,8 @@ public DiscordBot(String token) {
                 new UserContextMenuListener(),
                 new CommandRunListener(),
                 new ModalListener(),
-                new ButtonListener()
+                new ButtonListener(),
+                new SelectMenuListener()
         );
     }
 

src/main/java/com/seailz/jdaframework/command/listener/CommandRunListener.java

@@ -12,8 +12,7 @@
 public class CommandRunListener extends ListenerAdapter {
     @Override
     public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent event) {
-        if (DiscordBot.getInstance().getRegistry().getCommands().containsKey(event.getName())) {
+        if (DiscordBot.getInstance().getRegistry().getCommands().containsKey(event.getName()))
             DiscordBot.getInstance().getRegistry().getCommands().get(event.getName()).onCommand(event);
-        }
     }
 }

src/main/java/com/seailz/jdaframework/modals/listeners/ModalListener.java

@@ -8,6 +8,7 @@
 import net.dv8tion.jda.api.interactions.modals.ModalMapping;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ConcurrentModificationException;
 import java.util.Map;
 
 /**
@@ -19,14 +20,18 @@
 public class ModalListener extends ListenerAdapter {
 
     @Override
-    public void onModalInteraction(@NotNull ModalInteractionEvent e){
+    public void onModalInteraction(@NotNull ModalInteractionEvent e)  {
+        Map.Entry<Member, Modal> culprit = null;
         for (Map.Entry<Member, Modal> modalEntry : ModalManager.getModals()) {
-            if (modalEntry.getValue().getId().equals(e.getModalId()) && modalEntry.getKey().getId().equals(e.getMember().getId())){
+            if (modalEntry.getValue().getId().equals(e.getModalId()) && modalEntry.getKey().getId().equals(e.getMember().getId())) {
                 ModalMapping[] mappings = e.getValues().toArray(new ModalMapping[0]);
                 modalEntry.getValue().getOnSubmit().accept(e.getMember(), mappings, e);
-                ModalManager.getModals().remove(modalEntry);
+                culprit = modalEntry;
+                break;
             }
         }
-    }
 
+        if (culprit != null)
+            ModalManager.getModals().remove(culprit);
+    }
 }

src/main/java/com/seailz/jdaframework/select/SelectMenuListener.java

@@ -0,0 +1,15 @@
+package com.seailz.jdaframework.select;
+
+import com.seailz.jdaframework.DiscordBot;
+import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import org.jetbrains.annotations.NotNull;
+
+public class SelectMenuListener extends ListenerAdapter {
+    @Override
+    public void onSelectMenuInteraction(@NotNull SelectMenuInteractionEvent event) {
+        if (DiscordBot.getSelectRegistry().containsKey(event.getSelectMenu().getId())) {
+            DiscordBot.getSelectRegistry().get(event.getSelectMenu().getId()).accept(event);
+        }
+    }
+}

src/main/java/com/seailz/jdaframework/select/SelectMenuManager.java

@@ -0,0 +1,14 @@
+package com.seailz.jdaframework.select;
+
+import com.seailz.jdaframework.DiscordBot;
+import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
+
+import java.util.function.Consumer;
+
+public class SelectMenuManager {
+
+    public static void listen(String id, Consumer<SelectMenuInteractionEvent> onClick) {
+        DiscordBot.getSelectRegistry().put(id, onClick);
+    }
+
+}

src/main/java/com/seailz/jdaframework/utils/TimestampUtil.java

@@ -0,0 +1,65 @@
+package com.seailz.jdaframework.utils;
+
+import java.util.Date;
+
+/**
+ * A util for creating timestamps, with ease.
+ * @author Seailz
+ */
+public class TimestampUtil {
+
+    /**
+     * Generates a Discord timestamp
+     * @param type The type of timestamp you want to create
+     * @param time The time it will represent
+     * @return The generated timestamp
+     */
+    public static String createTimestamp(Type type, Date time) {
+        if (type == Type.BASE)
+            return String.valueOf(time.getTime());
+        String base = "<t:" + time.getTime() + ":";
+
+        switch (type) {
+            case SHORT_DATE:
+                base += "d";
+            case LONG_DATE:
+                base += "D";
+            case SHORT_TIME:
+                base += "t";
+            case LONG_TIME:
+                base += "T";
+            case DATE_AND_TIME:
+                base += "f";
+            case LONG_DATE_AND_TIME:
+                base += "F";
+            case AGO:
+                base += "R";
+        }
+
+        base += ">";
+        return base;
+    }
+
+    /**
+     * Timestamp types
+     */
+    public enum Type {
+        SHORT_DATE,
+        // For example: 26/07/2022
+        LONG_DATE,
+        // For example: 26 July 2022
+        SHORT_TIME,
+        // For example 19:50
+        LONG_TIME,
+        // For example: 19:50:43
+        DATE_AND_TIME,
+        // For example: 26 July 2022 19:50
+        LONG_DATE_AND_TIME,
+        // For example: Tuesday, 26 July 2022 19:50
+        AGO,
+        // For example: 10 minutes ago
+        BASE
+        // For example: 1658861400
+    }
+
+}

src/main/java/com/seailz/jdaframework/utils/TriConsumer.java

@@ -35,6 +35,7 @@
  * @param <T>  Type
  * @param <U>  Value 1
  * @param <U1> Value 2
+ * @author Negative - https://www.github.com/negative-games
  */
 @FunctionalInterface
 public interface TriConsumer<T, U, U1> {