Add getAll methods

Author: Andre601

README.md

@@ -5,7 +5,7 @@
 
 [Javadocs]: https://docs.botblock.org/JavaBotBlockAPI/
 
-[BadgeDownload]: https://img.shields.io/badge/dynamic/json.svg?label=Bintray&query=name&style=plastic&url=https%3A%2F%2Fapi.bintray.com%2Fpackages%2Fandre601%2Fmaven%2FJavaBotBlockAPI%2Fversions%2F_latest
+[BadgeDownload]: https://img.shields.io/bintray/v/andre601/maven/JavaBotBlockAPI?label=Bintray&style=plastic
 [Download]: https://bintray.com/andre601/maven/JavaBotBlockAPI/_latestVersion
 
 [image]: https://raw.githubusercontent.com/botblock/JavaBotBlockAPI/master/src/main/resources/JavaBotBlockAPI.png
@@ -78,35 +78,35 @@ Remember to use `.build();` at the end to create the class.
 
 ### Auto Posting
 JavaBotBlockAPI allows you to post the guild counts automatically every X minutes.  
-To do this, you first need to get an instance of the RequestHandler and then call `.startAutoPosting(...)`.
+To do this, you first need to get an instance of the PostAction and then call `.enableAutoPost(...)`.
 
 Here is an example:
 ```java
-RequestHandler handler = new RequestHandler();
+PostAction postAction = new PostAction();
 
 // api is the instance of the BotBlockAPI
-handler.startAutoPosting(jda, api);
+postAction.enableAutoPost(jda, api);
 ```
 The delay in which you post the guild counts is set through the `.setUpdateInterval(int)` method in the BotBlockAPI.Builder().
 
 ### Cancel auto posting
-To cancel the auto posting just call `.stopAutoPosting();` in the RequestHandler and it should cancel the scheduler.
+To cancel the auto posting just call `.disableAutoPost();` in the RequestHandler and it should cancel the scheduler.
 
 ### Manually posting
 There are methods that allow you to post the guild counts manually.  
-To Post your guild counts, just call the `.postGuilds(..., ...)` method in the RequestHandler.
+To Post your guild counts, just call the `.postGuilds(...)` method in the PostAction.
 
 ```java
-RequestHandler handler = new RequestHandler();
+PostAction postAction = new PostAction();
 
 // api is the instance of the BotBlockAPI
-handler.postGuilds(jda, api);
+postAction.postGuilds(jda, api);
 ```
 
 ## GET methods
-Since version 2.0.0 of JavaBotBlockAPI can you get certain informations of a bot or the available Botlists on the BotBlock API.
+Since version 2.0.0 of JavaBotBlockAPI can you get certain information of a bot or the available Bot lists on the BotBlock API.
 
-### All available Botlists
+### All available Bot lists
 You can call `.getBotlists()` to receive a JSONObject with all available Botlists in the BotBlockAPI.
 
 The returned JSONObject could look like this:
@@ -134,8 +134,8 @@ The returned JSONObject could look like this:
 ```
 
 ### Single Botlist
-Calling `.getBotlist(String)` returns a specific Botlist as JSONObject.  
-For example does `.getBotlist("lbots.org")` return the following JSONObject:
+Calling `.getBotlist(..., Site|String)` returns a specific Botlist as JSONObject.  
+For example does `.getBotlist("123456789012345678", "lbots.org")` return the following JSONObject:
 ```json
 {
     "api_docs": "https://lbots.org/api/docs",
@@ -179,7 +179,7 @@ The JSONObject can look like this:
 `name`, `owners`, `server_count` and `invite` is based on the most common appearances of the data.
 
 ### Botinfo from all Botlists
-You can call `.getBotInfos(...)` to only receive the bot info from all the Botlists.
+You can call `.getBotListInfo(...)` to only receive the bot info from all the Botlists.
 
 The returned JSONObject can look like this:
 ```json
@@ -197,7 +197,7 @@ The returned JSONObject can look like this:
 `{"data"}` is the JSON that is returned by the provided Botlist meaning it's different for each site.
 
 ### Botinfo of a single site
-With `.getBotInfo(..., String)` can you receive the info of a specific site.  
+With `.getBotListInfo(..., Site|String)` can you receive the info of a specific site.  
 The returned data depends on the selected site and can be different for each one.
 
 ### Owners

build.gradle

@@ -24,7 +24,7 @@ dependencies{
     api group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.2.2'
     api group: 'org.json', name: 'json', version: '20190722'
     api group: 'org.jetbrains', name: 'annotations', version: '17.0.0'
-    api(group: 'net.dv8tion', name: 'JDA', version: '4.0.0_52'){
+    api(group: 'net.dv8tion', name: 'JDA', version: '4.0.0_55'){
         exclude(module: 'opus-java')
     }
     api group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '2.8.0'

src/main/java/com/andre601/javabotblockapi/requests/GetAction.java

@@ -19,6 +19,10 @@
 package com.andre601.javabotblockapi.requests;
 
 
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.sharding.ShardManager;
+import org.json.JSONObject;
+
 /**
  * Class to perform GET actions with.
  */
@@ -44,4 +48,160 @@ public GetAction(){
     public GetAction(boolean disableCache){
         this.disableCache = disableCache;
     }
+    
+    /**
+     * Gets the full information of a bot.
+     * <br>This may return null.
+     *
+     * <p>The JSONObject may look like this:
+     * <br><pre><code>
+     * {
+     *     "id": "123456789012345678",
+     *     "username": "MyBot",
+     *     "discriminator": "1234",
+     *     "owners": [
+     *         "234567890123456789"
+     *     ],
+     *     "server_count": 100,
+     *     "invite":{@literal "https://discordapp.com/oauth2/authorize?client_id=123456789012345678&scope=bot"},
+     *     "list_data": {
+     *         "somebotlist.com": [
+     *             {"data"},
+     *             200
+     *         ],
+     *         "otherlist.org": [
+     *             {"data"},
+     *             404
+     *         ]
+     *     }
+     * }
+     * </code></pre>
+     * <br><b>{@code {"data"}}</b> depends on what the bot list returns.
+     * 
+     * @param  jda
+     *         The {@link net.dv8tion.jda.api.JDA JDA instance} to use.
+     *         
+     * @return A possibly-null JSONObject containing the bots information.
+     */
+    public JSONObject getAll(JDA jda){
+        return REQUEST_HANDLER.performGetBot(jda.getSelfUser().getId(), disableCache);
+    }
+    
+    /**
+     * Gets the full information of a bot.
+     * <br>This may return null.
+     *
+     * <p>The JSONObject may look like this:
+     * <br><pre><code>
+     * {
+     *     "id": "123456789012345678",
+     *     "username": "MyBot",
+     *     "discriminator": "1234",
+     *     "owners": [
+     *         "234567890123456789"
+     *     ],
+     *     "server_count": 100,
+     *     "invite":{@literal "https://discordapp.com/oauth2/authorize?client_id=123456789012345678&scope=bot"},
+     *     "list_data": {
+     *         "somebotlist.com": [
+     *             {"data"},
+     *             200
+     *         ],
+     *         "otherlist.org": [
+     *             {"data"},
+     *             404
+     *         ]
+     *     }
+     * }
+     * </code></pre>
+     * <br><b>{@code {"data"}}</b> depends on what the bot list returns.
+     *
+     * @param  id
+     *         The bots id to use.
+     *
+     * @return A possibly-null JSONObject containing the bots information.
+     */
+    public JSONObject getAll(Long id){
+        return REQUEST_HANDLER.performGetBot(Long.toString(id), disableCache);
+    }
+    
+    /**
+     * Gets the full information of a bot.
+     * <br>This may return null.
+     *
+     * <p>The JSONObject may look like this:
+     * <br><pre><code>
+     * {
+     *     "id": "123456789012345678",
+     *     "username": "MyBot",
+     *     "discriminator": "1234",
+     *     "owners": [
+     *         "234567890123456789"
+     *     ],
+     *     "server_count": 100,
+     *     "invite":{@literal "https://discordapp.com/oauth2/authorize?client_id=123456789012345678&scope=bot"},
+     *     "list_data": {
+     *         "somebotlist.com": [
+     *             {"data"},
+     *             200
+     *         ],
+     *         "otherlist.org": [
+     *             {"data"},
+     *             404
+     *         ]
+     *     }
+     * }
+     * </code></pre>
+     * <br><b>{@code {"data"}}</b> depends on what the bot list returns.
+     *
+     * @param  shardManager
+     *         The {@link net.dv8tion.jda.api.sharding.ShardManager ShardManager instance} to use.
+     *
+     * @return A possibly-null JSONObject containing the bots information.
+     */
+    public JSONObject getAll(ShardManager shardManager){
+        JDA jda = shardManager.getShardById(0);
+        if(jda == null)
+            return null;
+        
+        return REQUEST_HANDLER.performGetBot(jda.getSelfUser().getId(), disableCache);
+    }
+    
+    /**
+     * Gets the full information of a bot.
+     * <br>This may return null.
+     *
+     * <p>The JSONObject may look like this:
+     * <br><pre><code>
+     * {
+     *     "id": "123456789012345678",
+     *     "username": "MyBot",
+     *     "discriminator": "1234",
+     *     "owners": [
+     *         "234567890123456789"
+     *     ],
+     *     "server_count": 100,
+     *     "invite":{@literal "https://discordapp.com/oauth2/authorize?client_id=123456789012345678&scope=bot"},
+     *     "list_data": {
+     *         "somebotlist.com": [
+     *             {"data"},
+     *             200
+     *         ],
+     *         "otherlist.org": [
+     *             {"data"},
+     *             404
+     *         ]
+     *     }
+     * }
+     * </code></pre>
+     * <br><b>{@code {"data"}}</b> depends on what the bot list returns.
+     *
+     * @param  id
+     *         The bots id to use.
+     *
+     * @return A possibly-null JSONObject containing the bots information.
+     */
+    public JSONObject getAll(String id){
+        return REQUEST_HANDLER.performGetBot(id, disableCache);
+    }
 }