Prevent app from spawning a shit load of threads

Author: duncte123

build.gradle.kts

@@ -75,14 +75,14 @@ dependencies {
     implementation(group = "me.duncte123", name = "weebJava", version = "3.0.1_3")
 
     // botCommons
-    implementation(group = "me.duncte123", name = "botCommons", version = "2.3.9")
+    implementation(group = "me.duncte123", name = "botCommons", version = "2.3.10")
 
     // JDA (java discord api)
     implementation(group = "net.dv8tion", name = "JDA", version = "4.4.0_350") {
         exclude(module = "opus-java")
     }
 
-    implementation(group = "com.dunctebot", name = "sourcemanagers", version = "1.7.2")
+    implementation(group = "com.dunctebot", name = "sourcemanagers", version = "1.8.0")
 //    implementation(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.78")
     implementation(group = "com.github.walkyst", name = "lavaplayer-fork", version = "1.3.96")
     implementation(group = "com.github.DuncteBot", name = "Lavalink-Client", version = "c1d8b73") {

src/main/java/ml/duncte123/skybot/CommandManager.java

@@ -161,7 +161,6 @@ public CommandManager(Variables variables) {
         this.addCommand(new ClearLeftGuildsCommand());
         this.addCommand(new ClintCommand());
         this.addCommand(new CommandDumpCommand());
-        this.addCommand(new CoffeeCommand());
         this.addCommand(new CoinCommand());
         this.addCommand(new ColorCommand());
         this.addCommand(new CookieCommand());

src/main/java/ml/duncte123/skybot/commands/animals/DogCommand.java

@@ -18,6 +18,7 @@
 
 package ml.duncte123.skybot.commands.animals;
 
+import com.github.natanbc.reliqua.limiter.RateLimiter;
 import io.sentry.Sentry;
 import me.duncte123.botcommons.messaging.EmbedUtils;
 import me.duncte123.botcommons.web.WebUtils;
@@ -41,7 +42,7 @@ public DogCommand() {
     public void execute(@Nonnull CommandContext ctx) {
         final String base = "https://random.dog/";
         try {
-            WebUtils.ins.getText(base + "woof").async((it) -> {
+            WebUtils.ins.getText(base + "woof", (it) -> it.setRateLimiter(RateLimiter.directLimiter())).async((it) -> {
                 final String finalS = base + it;
 
                 if (finalS.contains(".mp4")) {

src/main/java/ml/duncte123/skybot/commands/animals/KittyCommand.java

@@ -18,6 +18,7 @@
 
 package ml.duncte123.skybot.commands.animals;
 
+import com.github.natanbc.reliqua.limiter.RateLimiter;
 import me.duncte123.botcommons.messaging.EmbedUtils;
 import me.duncte123.botcommons.web.WebUtils;
 import ml.duncte123.skybot.objects.command.Command;
@@ -44,7 +45,11 @@ public void execute(@Nonnull CommandContext ctx) {
         final String apiKey = ctx.getConfig().apis.thecatapi;
         final String url = "https://api.thecatapi.com/v1/images/search?limit=1";
 
-        WebUtils.ins.getJSONArray(url, null, (req) -> req.header("x-api-key", apiKey)).async((json) -> {
+        WebUtils.ins.getJSONArray(
+            url,
+            (it) -> it.setRateLimiter(RateLimiter.directLimiter()),
+            (req) -> req.header("x-api-key", apiKey)
+        ).async((json) -> {
             sendEmbed(ctx, EmbedUtils.embedImage(
                 json.get(0).get("url").asText()
             ));

src/main/java/ml/duncte123/skybot/commands/uncategorized/ChangeLogCommand.java

@@ -18,6 +18,7 @@
 
 package ml.duncte123.skybot.commands.uncategorized;
 
+import com.github.natanbc.reliqua.limiter.RateLimiter;
 import me.duncte123.botcommons.messaging.EmbedUtils;
 import me.duncte123.botcommons.web.WebUtils;
 import ml.duncte123.skybot.objects.command.Command;
@@ -59,7 +60,10 @@ public void execute(@Nonnull CommandContext ctx) {
     }
 
     private void fetchLatetstGitHubCommits(CommandContext ctx) {
-        WebUtils.ins.getJSONObject("https://api.github.com/repos/DuncteBot/SkyBot/releases/latest").async(json -> {
+        WebUtils.ins.getJSONObject(
+            "https://api.github.com/repos/DuncteBot/SkyBot/releases/latest",
+            (it) -> it.setRateLimiter(RateLimiter.directLimiter())
+        ).async(json -> {
             final String body = json.get("body").asText();
             final String version = json.get("tag_name").asText();
             final EmbedBuilder builder = EmbedUtils.getDefaultEmbed()

src/main/java/ml/duncte123/skybot/commands/utils/EnlargeCommand.java

@@ -18,6 +18,7 @@
 
 package ml.duncte123.skybot.commands.utils;
 
+import com.github.natanbc.reliqua.limiter.RateLimiter;
 import io.sentry.Sentry;
 import me.duncte123.botcommons.web.WebUtils;
 import ml.duncte123.skybot.objects.command.Command;
@@ -105,7 +106,7 @@ public void execute(@NotNull CommandContext ctx) {
     }
 
     private void uploadFile(final String url, final CommandContext ctx) {
-        WebUtils.ins.getByteStream(url).async(
+        WebUtils.ins.getByteStream(url, (it) -> it.setRateLimiter(RateLimiter.directLimiter())).async(
             (bytes) -> {
                 final String[] split = url.split("/");
                 final String fileName = split[split.length - 1];

src/main/java/ml/duncte123/skybot/objects/apis/BlargBot.java

@@ -21,8 +21,10 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.natanbc.reliqua.limiter.RateLimiter;
 import com.github.natanbc.reliqua.request.PendingRequest;
 import me.duncte123.botcommons.web.ContentType;
+import me.duncte123.botcommons.web.WebParserUtils;
 import me.duncte123.botcommons.web.WebUtils;
 import me.duncte123.weebJava.helpers.IOHelper;
 import okhttp3.RequestBody;
@@ -71,15 +73,15 @@ public PendingRequest<byte[]> getTheSearch(String text) {
 
 
     private PendingRequest<byte[]> makeRequest(String path, JsonNode body) {
-        return WebUtils.ins.prepareRaw(
+        return WebUtils.ins.prepareBuilder(
             defaultRequest()
                 .url("https://api.blargbot.xyz/api/v1/" + path)
                 .header("Content-Type", ContentType.JSON.getType())
                 .post(RequestBody.create(null, jsonToString(body)))
-                .addHeader("Authorization", token)
-                .build(),
-            IOHelper::read
-        );
+                .addHeader("Authorization", token),
+            (it) -> it.setRateLimiter(RateLimiter.directLimiter()),
+            null
+        ).build(IOHelper::read, WebParserUtils::handleError);
     }
 
     private byte[] jsonToString(JsonNode body) {

src/main/java/ml/duncte123/skybot/objects/apis/alexflipnote/Alexflipnote.java

@@ -20,7 +20,10 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.natanbc.reliqua.limiter.RateLimiter;
 import com.github.natanbc.reliqua.request.PendingRequest;
+import com.github.natanbc.reliqua.util.ResponseMapper;
+import me.duncte123.botcommons.web.WebParserUtils;
 import me.duncte123.botcommons.web.WebUtils;
 import me.duncte123.weebJava.helpers.IOHelper;
 import me.duncte123.weebJava.helpers.QueryBuilder;
@@ -41,7 +44,7 @@ public Alexflipnote(ObjectMapper mapper, String apiKey) {
     }
 
     public PendingRequest<FlipnoteColourObj> getColour(String color) {
-        return WebUtils.ins.prepareRaw(
+        return prepareRaw(
             makeRequest("https://api.alexflipnote.dev/", "colour/" + color),
             (r) -> {
                 final JsonNode node = mapper.readTree(Objects.requireNonNull(r.body()).byteStream());
@@ -53,85 +56,92 @@ public PendingRequest<FlipnoteColourObj> getColour(String color) {
 
     public PendingRequest<byte[]> getTrash(String face, String trash) {
         final QueryBuilder builder = new QueryBuilder().append("face", face).append("trash", trash);
-        return WebUtils.ins.prepareRaw(
+        return prepareRaw(
             makeRequest("trash" + builder.build()),
             IOHelper::read
         );
     }
 
     public PendingRequest<byte[]> getAchievement(String text) {
         final QueryBuilder builder = new QueryBuilder().append("text", text);
-        return WebUtils.ins.prepareRaw(
+        return prepareRaw(
             makeRequest("achievement" + builder.build()),
             IOHelper::read
         );
     }
 
     public PendingRequest<byte[]> getScroll(String text) {
         final QueryBuilder builder = new QueryBuilder().append("text", text);
-        return WebUtils.ins.prepareRaw(
+        return prepareRaw(
             makeRequest("scroll" + builder.build()),
             IOHelper::read
         );
     }
 
     public PendingRequest<byte[]> getDidYouMean(String input, String correction) {
         final QueryBuilder builder = new QueryBuilder().append("top", input).append("bottom", correction);
-        return WebUtils.ins.prepareRaw(
+        return prepareRaw(
             makeRequest("didyoumean" + builder.build()),
             IOHelper::read
         );
     }
 
     public PendingRequest<byte[]> getFacts(String text) {
         final QueryBuilder builder = new QueryBuilder().append("text", text);
-        return WebUtils.ins.prepareRaw(
+        return prepareRaw(
             makeRequest("facts" + builder.build()),
             IOHelper::read
         );
     }
 
     public PendingRequest<byte[]> getCaptcha(String text) {
         final QueryBuilder builder = new QueryBuilder().append("text", text);
-        return WebUtils.ins.prepareRaw(
+        return prepareRaw(
             makeRequest("captcha" + builder.build()),
             IOHelper::read
         );
     }
 
     public PendingRequest<byte[]> getJokeoverhead(String image) {
         final QueryBuilder builder = new QueryBuilder().append("image", image);
-        return WebUtils.ins.prepareRaw(
+        return prepareRaw(
             makeRequest("jokeoverhead" + builder.build()),
             IOHelper::read
         );
     }
 
     public PendingRequest<byte[]> getSalty(String image) {
         final QueryBuilder builder = new QueryBuilder().append("image", image);
-        return WebUtils.ins.prepareRaw(
+        return prepareRaw(
             makeRequest("salty" + builder.build()),
             IOHelper::read
         );
     }
 
     public PendingRequest<byte[]> getPornhub(String text1, String text2) {
         final QueryBuilder builder = new QueryBuilder().append("text", text1).append("text2", text2);
-        return WebUtils.ins.prepareRaw(
+        return prepareRaw(
             makeRequest("pornhub" + builder.build()),
             IOHelper::read
         );
     }
 
-    private Request makeRequest(String path) {
+    private <T> PendingRequest<T> prepareRaw(Request.Builder builder, ResponseMapper<T> mapper) {
+        return WebUtils.ins.prepareBuilder(
+            builder,
+            (it) -> it.setRateLimiter(RateLimiter.directLimiter()),
+            null
+        ).build(mapper, WebParserUtils::handleError);
+    }
+
+    private Request.Builder makeRequest(String path) {
         return makeRequest("https://flipnote.duncte.bot/", path);
     }
 
-    private Request makeRequest(String url, String path) {
+    private Request.Builder makeRequest(String url, String path) {
         return defaultRequest()
             .url(url + path)
             .addHeader("Authorization", this.apiKey)
-            .get()
-            .build();
+            .get();
     }
 }

src/main/java/ml/duncte123/skybot/utils/AirUtils.java

@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.github.natanbc.reliqua.limiter.RateLimiter;
 import com.github.natanbc.reliqua.request.PendingRequest;
 import com.jagrosh.jdautilities.commons.utils.FinderUtil;
 import fredboat.audio.player.LavalinkManager;
@@ -372,6 +373,7 @@ public static PendingRequest<String> shortenUrl(String url, String googleKey, Ob
                 "https://firebasedynamiclinks.googleapis.com/v1/shortLinks?key=" + googleKey,
                 JSONRequestBody.fromJackson(json)
             )
+                .setRateLimiter(RateLimiter.directLimiter())
                 .build(
                     (r) -> {
                         final ObjectNode response = toJSONObject(r, mapper);

src/main/java/ml/duncte123/skybot/utils/AudioUtils.java

@@ -62,8 +62,8 @@ public AudioUtils(DunctebotConfig.Apis config, Variables variables) {
         playerManager.registerSourceManager(new SpotifyAudioSourceManager(sourceManager, config));
         playerManager.registerSourceManager(sourceManager);
 
-        DuncteBotSources.registerCustom(playerManager, "en-AU", 6);
-        DuncteBotSources.registerCustom(LavalinkUtil.getPlayerManager(), "en-AU", 6);
+        DuncteBotSources.registerDuncteBot(playerManager, "en-AU", 6);
+        DuncteBotSources.registerDuncteBot(LavalinkUtil.getPlayerManager(), "en-AU", 6);
 
         playerManager.registerSourceManager(SoundCloudAudioSourceManager.createDefault());
         playerManager.registerSourceManager(new BandcampAudioSourceManager());