Merge remote-tracking branch 'origin/main'

README.md

@@ -20,6 +20,8 @@ https://discord.gg/tmvS8A57J4
 
 ## Getting Started
 
+Before we start - please note that discord.jar is still a work in progress and there are some risks of deploying it in a production enviroment.
+
 ### Prerequisites
 
 <b>You'll need to add discord.jar to your project's dependencies. We are currently using

src/main/java/com/seailz/discordjar/DiscordJar.java

@@ -18,6 +18,7 @@
 import com.seailz.discordjar.events.EventDispatcher;
 import com.seailz.discordjar.gateway.GatewayFactory;
 import com.seailz.discordjar.http.HttpOnlyApplication;
+import com.seailz.discordjar.model.api.APIRelease;
 import com.seailz.discordjar.model.application.Application;
 import com.seailz.discordjar.model.application.Intent;
 import com.seailz.discordjar.model.channel.*;
@@ -39,9 +40,8 @@
 import com.seailz.discordjar.utils.rest.DiscordResponse;
 import com.seailz.discordjar.utils.rest.RequestQueueHandler;
 import com.seailz.discordjar.utils.permission.Permission;
-import com.seailz.discordjar.utils.rest.Response;
 import com.seailz.discordjar.utils.rest.ratelimit.Bucket;
-import com.seailz.discordjar.utils.version.APIVersion;
+import com.seailz.discordjar.model.api.version.APIVersion;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONArray;
@@ -132,39 +132,39 @@ public class DiscordJar {
      */
     @Deprecated(forRemoval = true)
     public DiscordJar(String token, EnumSet<Intent> intents, APIVersion version) throws ExecutionException, InterruptedException {
-        this(token, intents, version, false, null, false, -1, -1);
+        this(token, intents, version, false, null, false, -1, -1, APIRelease.STABLE);
     }
 
     /**
      * @deprecated Use {@link DiscordJarBuilder} instead.
      */
     @Deprecated(forRemoval = true)
     public DiscordJar(String token, EnumSet<Intent> intents, APIVersion version, boolean debug) throws ExecutionException, InterruptedException {
-        this(token, intents, version, false, null, debug, -1, -1);
+        this(token, intents, version, false, null, debug, -1, -1, APIRelease.STABLE);
     }
 
     /**
      * @deprecated Use {@link DiscordJarBuilder} instead.
      */
     @Deprecated(forRemoval = true)
     public DiscordJar(String token, APIVersion version) throws ExecutionException, InterruptedException {
-        this(token, EnumSet.of(Intent.ALL), version, false, null, false, -1, -1);
+        this(token, EnumSet.of(Intent.ALL), version, false, null, false, -1, -1, APIRelease.STABLE);
     }
 
     /**
      * @deprecated Use {@link DiscordJarBuilder} instead.
      */
     @Deprecated(forRemoval = true)
     public DiscordJar(String token, APIVersion version, boolean httpOnly, HTTPOnlyInfo httpOnlyInfo) throws ExecutionException, InterruptedException {
-        this(token, EnumSet.noneOf(Intent.class), version, httpOnly, httpOnlyInfo, false, -1, -1);
+        this(token, EnumSet.noneOf(Intent.class), version, httpOnly, httpOnlyInfo, false, -1, -1, APIRelease.STABLE);
     }
 
     /**
      * @deprecated Use {@link DiscordJarBuilder} instead.
      */
     @Deprecated(forRemoval = true)
     public DiscordJar(String token, boolean httpOnly, HTTPOnlyInfo httpOnlyInfo) throws ExecutionException, InterruptedException {
-        this(token, EnumSet.noneOf(Intent.class), APIVersion.getLatest(), httpOnly, httpOnlyInfo, false, -1, -1);
+        this(token, EnumSet.noneOf(Intent.class), APIVersion.getLatest(), httpOnly, httpOnlyInfo, false, -1, -1, APIRelease.STABLE);
     }
 
         /**
@@ -190,12 +190,12 @@ public DiscordJar(String token, boolean httpOnly, HTTPOnlyInfo httpOnlyInfo) thr
          * @deprecated Use {@link DiscordJarBuilder} instead. This constructor will be set to protected in the future.
          */
         @Deprecated
-    public DiscordJar(String token, EnumSet<Intent> intents, APIVersion version, boolean httpOnly, HTTPOnlyInfo httpOnlyInfo, boolean debug, int shardId, int numShards) throws ExecutionException, InterruptedException {
+    public DiscordJar(String token, EnumSet<Intent> intents, APIVersion version, boolean httpOnly, HTTPOnlyInfo httpOnlyInfo, boolean debug, int shardId, int numShards, APIRelease release) throws ExecutionException, InterruptedException {
         System.setProperty("sun.net.http.allowRestrictedHeaders", "true");
         new RequestQueueHandler(this);
         this.token = token;
         this.intents = intents;
-        new URLS(version);
+        new URLS(release, version);
         logger = Logger.getLogger("DISCORD.JAR");
         this.commandDispatcher = new CommandDispatcher();
         this.queuedRequests = new ArrayList<>();
@@ -479,14 +479,15 @@ public User getUserById(long id) {
      * @return A {@link Channel} object
      */
     @Nullable
-    public Channel getChannelById(String id) throws IllegalArgumentException {
+    public Channel getChannelById(String id) {
         Checker.isSnowflake(id, "Given id is not a snowflake");
         Cache<Channel> cc = getChannelCache();
         Channel res;
         try {
             res = cc.getById(id);
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Couldn't retrieve channel.");
+        } catch (DiscordRequest.UnhandledDiscordAPIErrorException e) {
+            if (e.getHttpCode() == 404) return null;
+            throw new DiscordRequest.DiscordAPIErrorException(e);
         }
         return res;
     }
@@ -507,11 +508,7 @@ public MessagingChannel getTextChannelById(String id) {
             if (e.getHttpCode() == 404) return null;
             throw new DiscordRequest.DiscordAPIErrorException(e);
         }
-        try {
-            return MessagingChannel.decompile(raw, this);
-        } catch (DiscordRequest.UnhandledDiscordAPIErrorException e) {
-            throw new DiscordRequest.DiscordAPIErrorException(e);
-        }
+        return MessagingChannel.decompile(raw, this);
     }
 
     /**
@@ -530,11 +527,7 @@ public com.seailz.discordjar.model.channel.thread.Thread getThreadById(String id
             if (e.getHttpCode() == 404) return null;
             throw new DiscordRequest.DiscordAPIErrorException(e);
         }
-        try {
-            return com.seailz.discordjar.model.channel.thread.Thread.decompile(raw, this);
-        } catch (DiscordRequest.UnhandledDiscordAPIErrorException e) {
-            throw new DiscordRequest.DiscordAPIErrorException(e);
-        }
+        return com.seailz.discordjar.model.channel.thread.Thread.decompile(raw, this);
     }
 
     /**
@@ -572,11 +565,7 @@ public ForumChannel getForumChannelById(String id) {
             if (e.getHttpCode() == 404) return null;
             throw new DiscordRequest.DiscordAPIErrorException(e);
         }
-        try {
-            return ForumChannel.decompile(raw, this);
-        } catch (DiscordRequest.UnhandledDiscordAPIErrorException e) {
-            throw new DiscordRequest.DiscordAPIErrorException(e);
-        }
+        return ForumChannel.decompile(raw, this);
     }
 
     /**
@@ -595,11 +584,7 @@ public Category getCategoryById(String id) {
             if (e.getHttpCode() == 404) return null;
             throw new DiscordRequest.DiscordAPIErrorException(e);
         }
-        try {
-            return Category.decompile(raw, this);
-        } catch (DiscordRequest.UnhandledDiscordAPIErrorException e) {
-            throw new DiscordRequest.DiscordAPIErrorException(e);
-        }
+        return Category.decompile(raw, this);
     }
 
     /**
@@ -815,23 +800,19 @@ public void registerCommands(CommandListener... listeners) {
             boolean canUseInDms = (ann instanceof SlashCommandInfo) ? ((SlashCommandInfo) ann).canUseInDms() : ((ContextCommandInfo) ann).canUseInDms();
             boolean nsfw = (ann instanceof SlashCommandInfo) ? ((SlashCommandInfo) ann).nsfw() : ((ContextCommandInfo) ann).nsfw();
             new Thread(() -> {
-                try {
-                    registerCommand(
-                            new Command(
-                                    name,
-                                    listener.getType(),
-                                    description,
-                                    (listener instanceof SlashCommandListener) ? ((SlashCommandListener) listener).getOptions() : new ArrayList<>(),
-                                    nameLocales,
-                                    descriptionLocales,
-                                    defaultMemberPermissions,
-                                    canUseInDms,
-                                    nsfw
-                            )
-                    );
-                } catch (DiscordRequest.UnhandledDiscordAPIErrorException e) {
-                    throw new DiscordRequest.DiscordAPIErrorException(e);
-                }
+                registerCommand(
+                        new Command(
+                                name,
+                                listener.getType(),
+                                description,
+                                (listener instanceof SlashCommandListener) ? ((SlashCommandListener) listener).getOptions() : new ArrayList<>(),
+                                nameLocales,
+                                descriptionLocales,
+                                defaultMemberPermissions,
+                                canUseInDms,
+                                nsfw
+                        )
+                );
             }).start();
             commandDispatcher.registerCommand(name, listener);
 
@@ -849,7 +830,7 @@ public void registerCommands(CommandListener... listeners) {
         }
     }
 
-    protected void registerCommand(Command command) throws DiscordRequest.UnhandledDiscordAPIErrorException {
+    protected void registerCommand(Command command) {
         Checker.check(!(command.name().length() > 1 && command.name().length() < 32), "Command name must be within 1 and 32 characters!");
         Checker.check(!Objects.equals(command.description(), "") && !(command.description().length() > 1 && command.description().length() < 100), "Command description must be within 1 and 100 characters!");
         Checker.check(command.options().size() > 25, "Application commands can only have up to 25 options!");
@@ -874,7 +855,11 @@ protected void registerCommand(Command command) throws DiscordRequest.UnhandledD
                 this,
                 URLS.BASE_URL,
                 RequestMethod.POST);
-        commandReq.invoke();
+        try {
+            commandReq.invoke();
+        } catch (DiscordRequest.UnhandledDiscordAPIErrorException e) {
+            throw new DiscordRequest.DiscordAPIErrorException(e);
+        }
     }
 
     /**

src/main/java/com/seailz/discordjar/DiscordJarBuilder.java

@@ -1,11 +1,12 @@
 package com.seailz.discordjar;
 
+import com.seailz.discordjar.model.api.APIRelease;
 import com.seailz.discordjar.model.application.Intent;
 import com.seailz.discordjar.utils.HTTPOnlyInfo;
 import com.seailz.discordjar.utils.URLS;
 import com.seailz.discordjar.utils.rest.DiscordRequest;
 import com.seailz.discordjar.utils.rest.DiscordResponse;
-import com.seailz.discordjar.utils.version.APIVersion;
+import com.seailz.discordjar.model.api.version.APIVersion;
 import org.json.JSONObject;
 import org.springframework.web.bind.annotation.RequestMethod;
 
@@ -24,6 +25,7 @@ public class DiscordJarBuilder {
     private final String token;
     private EnumSet<Intent> intents;
     private APIVersion apiVersion = APIVersion.getLatest();
+    private APIRelease apiRelease = APIRelease.STABLE;
     private boolean httpOnly;
     private HTTPOnlyInfo httpOnlyInfo;
     private boolean debug;
@@ -76,6 +78,10 @@ public DiscordJarBuilder setAPIVersion(APIVersion apiVersion) {
         return this;
     }
 
+    public void setAPIRelease(APIRelease apiRelease) {
+        this.apiRelease = apiRelease;
+    }
+
     public DiscordJarBuilder setHTTPOnly(boolean httpOnly) {
         this.httpOnly = httpOnly;
         return this;
@@ -123,7 +129,7 @@ public DiscordJar build() {
         if (intents == null) defaultIntents();
         if (httpOnly && httpOnlyInfo == null) throw new IllegalStateException("HTTPOnly is enabled but no HTTPOnlyInfo was provided.");
         try {
-            return new DiscordJar(token, intents, apiVersion, httpOnly, httpOnlyInfo, debug, shardId, numShards);
+            return new DiscordJar(token, intents, apiVersion, httpOnly, httpOnlyInfo, debug, shardId, numShards, apiRelease);
         } catch (ExecutionException | InterruptedException e) {
             throw new RuntimeException(e);
         }

src/main/java/com/seailz/discordjar/action/automod/AutomodRuleCreateAction.java

@@ -186,7 +186,7 @@ public CompletableFuture<AutomodRule> run() {
             try {
                 return AutomodRule.decompile(request.invoke().body(), discordJar);
             } catch (DiscordRequest.UnhandledDiscordAPIErrorException e) {
-                throw new RuntimeException(e);
+                throw new DiscordRequest.DiscordAPIErrorException(e);
             }
         });
         Checker.notNull(name, "name");

src/main/java/com/seailz/discordjar/action/automod/AutomodRuleModifyAction.java

@@ -192,7 +192,7 @@ public CompletableFuture<AutomodRule> run() {
             try {
                 return AutomodRule.decompile(request.invoke().body(), discordJar);
             } catch (DiscordRequest.UnhandledDiscordAPIErrorException e) {
-                throw new RuntimeException(e);
+                throw new DiscordRequest.DiscordAPIErrorException(e);
             }
         });
         Checker.notNull(name, "name");

src/main/java/com/seailz/discordjar/action/guild/GetCurrentUserGuildsAction.java

@@ -78,7 +78,7 @@ public int limit() {
      *
      * @return {@link List A list of}  <b>partial</b> {@link Guild guilds}
      */
-    public List<Guild> run() throws DiscordRequest.UnhandledDiscordAPIErrorException {
+    public List<Guild> run() {
         String url = URLS.GET.GUILDS.GET_CURRENT_USER_GUILDS;
         if (before != null || after != null || limit != 0) {
             url += "?";
@@ -90,14 +90,19 @@ public List<Guild> run() throws DiscordRequest.UnhandledDiscordAPIErrorException
                 url += "limit=" + limit + "&";
         }
 
-        DiscordResponse response = new DiscordRequest(
-                new JSONObject(),
-                new HashMap<>(),
-                url,
-                discordJar,
-                URLS.GET.GUILDS.GET_CURRENT_USER_GUILDS,
-                RequestMethod.GET
-        ).invoke();
+        DiscordResponse response = null;
+        try {
+            response = new DiscordRequest(
+                    new JSONObject(),
+                    new HashMap<>(),
+                    url,
+                    discordJar,
+                    URLS.GET.GUILDS.GET_CURRENT_USER_GUILDS,
+                    RequestMethod.GET
+            ).invoke();
+        } catch (DiscordRequest.UnhandledDiscordAPIErrorException e) {
+            throw new DiscordRequest.DiscordAPIErrorException(e);
+        }
 
         List<Guild> returnGuilds = new ArrayList<>();
         response.arr().forEach(guild -> returnGuilds.add(Guild.decompile((JSONObject) guild, discordJar)));

src/main/java/com/seailz/discordjar/cache/Cache.java

@@ -134,9 +134,9 @@ public T getById(String id) throws DiscordRequest.UnhandledDiscordAPIErrorExcept
         if (returnObject.get() == null) {
             // request from discord
             DiscordResponse response;
-            response = new DiscordRequest(
-                    discordRequest.body(), discordRequest.headers(), discordRequest.url().replaceAll("%s", id), discordJar, discordRequest.url(), RequestMethod.GET
-            ).invoke();
+                response = new DiscordRequest(
+                        discordRequest.body(), discordRequest.headers(), discordRequest.url().replaceAll("%s", id), discordJar, discordRequest.url(), RequestMethod.GET
+                ).invoke();
             Method decompile;
             try {
                 decompile = clazz.getMethod("decompile", JSONObject.class, DiscordJar.class);
@@ -168,10 +168,15 @@ public T getById(String id) throws DiscordRequest.UnhandledDiscordAPIErrorExcept
         return returnObject.get() == null ? null : (T) returnObject.get();
     }
 
-    public JSONObject getFresh(String id) throws DiscordRequest.UnhandledDiscordAPIErrorException {
-        DiscordResponse response = new DiscordRequest(
-                discordRequest.body(), discordRequest.headers(), discordRequest.url().replaceAll("%s", id), discordJar, discordRequest.url(), RequestMethod.GET
-        ).invoke();
+    public JSONObject getFresh(String id) {
+        DiscordResponse response = null;
+        try {
+            response = new DiscordRequest(
+                    discordRequest.body(), discordRequest.headers(), discordRequest.url().replaceAll("%s", id), discordJar, discordRequest.url(), RequestMethod.GET
+            ).invoke();
+        } catch (DiscordRequest.UnhandledDiscordAPIErrorException e) {
+            throw new DiscordRequest.DiscordAPIErrorException(e);
+        }
         return response.body();
     }
 

src/main/java/com/seailz/discordjar/cache/JsonCache.java

@@ -87,9 +87,13 @@ default void reset(int interval) {
      *
      * @see #howToUpdateFresh()
      */
-    default void updateFresh() throws DiscordRequest.UnhandledDiscordAPIErrorException {
+    default void updateFresh() {
         if (howToUpdateFresh() == null) return;
-        update(howToUpdateFresh().invoke().body());
+        try {
+            update(howToUpdateFresh().invoke().body());
+        } catch (DiscordRequest.UnhandledDiscordAPIErrorException e) {
+            throw new DiscordRequest.DiscordAPIErrorException(e);
+        }
     }
 
     /**

src/main/java/com/seailz/discordjar/events/model/automod/AutoModExecutionEvent.java

@@ -30,7 +30,7 @@ public AutomodRule.Action getAction() {
      * The rule that was triggered.
      */
     @Nullable
-    public AutomodRule getRule() throws DiscordRequest.UnhandledDiscordAPIErrorException {
+    public AutomodRule getRule() {
         if (getGuild() == null) return null;
         return getGuild().getAutomodRuleById(
                 getJson().getJSONObject("d").getString("rule_id")
@@ -50,7 +50,7 @@ public GuildChannel getChannel() {
     }
 
     @Nullable
-    public User getUser() throws DiscordRequest.UnhandledDiscordAPIErrorException {
+    public User getUser() {
         return getBot().getUserById(getJson().getJSONObject("d").getString("user_id"));
     }
 

src/main/java/com/seailz/discordjar/events/model/automod/rule/AutoModRuleEvent.java

@@ -14,7 +14,7 @@ public AutoModRuleEvent(@NotNull DiscordJar bot, long sequence, @NotNull JSONObj
     }
 
     @NotNull
-    public AutomodRule getRule() throws DiscordRequest.UnhandledDiscordAPIErrorException {
+    public AutomodRule getRule() {
         return AutomodRule.decompile(getJson().getJSONObject("d"), getBot());
     }
 }

src/main/java/com/seailz/discordjar/events/model/guild/GuildEvent.java

@@ -15,7 +15,7 @@ public GuildEvent(@NotNull DiscordJar bot, long sequence, @NotNull JSONObject da
     }
 
     @Nullable
-    public Guild getGuild() throws DiscordRequest.UnhandledDiscordAPIErrorException {
+    public Guild getGuild() {
         return getBot().getGuildById(getJson().getJSONObject("d").getString("guild_id"));
     }