From dcc7db0af0a7f3f042e0ef7ab03e73416796f8d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 05:06:05 +0000 Subject: [PATCH 01/23] Bump caffeine from 2.8.0 to 3.0.1 Bumps [caffeine](https://github.com/ben-manes/caffeine) from 2.8.0 to 3.0.1. - [Release notes](https://github.com/ben-manes/caffeine/releases) - [Commits](https://github.com/ben-manes/caffeine/compare/v2.8.0...v3.0.1) Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 228583f..19bd6d2 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ allprojects { dependencies { api group: 'org.json', name: 'json', version: '20210307' - api group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '2.8.0' + api group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '3.0.1' api group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' api group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30' From cbab492fa808f98dc140955fe55819d068cbd811 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 May 2021 05:25:29 +0000 Subject: [PATCH 02/23] Bump caffeine from 3.0.1 to 3.0.2 Bumps [caffeine](https://github.com/ben-manes/caffeine) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/ben-manes/caffeine/releases) - [Commits](https://github.com/ben-manes/caffeine/compare/v3.0.1...v3.0.2) Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 19bd6d2..a709ef5 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ allprojects { dependencies { api group: 'org.json', name: 'json', version: '20210307' - api group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '3.0.1' + api group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '3.0.2' api group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' api group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30' From 9463d5c0551e7a6fab12b985c57c61f42ad66ba2 Mon Sep 17 00:00:00 2001 From: Andre601 <11576465+Andre601@users.noreply.github.com> Date: Mon, 3 May 2021 16:04:44 +0200 Subject: [PATCH 03/23] Version 6.6.6 ~ Totally not evil --- build.gradle | 2 +- .../botblock/javabotblockapi/core/Info.java | 2 +- .../botblock/javabotblockapi/core/Site.java | 52 ++++++++------ .../requests/GetBotAction.java | 68 ++----------------- .../requests/handler/RequestHandler.java | 8 +-- 5 files changed, 45 insertions(+), 87 deletions(-) diff --git a/build.gradle b/build.gradle index 228583f..d8695e2 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins{ id 'com.github.johnrengelman.shadow' version '5.2.0' } -def ver = new Version(major: 6, minor: 6, patch: 5) +def ver = new Version(major: 6, minor: 6, patch: 6) allprojects { apply plugin: 'maven-publish' diff --git a/core/src/main/java/org/botblock/javabotblockapi/core/Info.java b/core/src/main/java/org/botblock/javabotblockapi/core/Info.java index 242ddea..d9a1bde 100644 --- a/core/src/main/java/org/botblock/javabotblockapi/core/Info.java +++ b/core/src/main/java/org/botblock/javabotblockapi/core/Info.java @@ -39,7 +39,7 @@ public class Info{ /** * Patch version of the Wrapper. */ - public static final int PATCH = 5; + public static final int PATCH = 6; /** * Full version in the format {@code major.minor.patch}. diff --git a/core/src/main/java/org/botblock/javabotblockapi/core/Site.java b/core/src/main/java/org/botblock/javabotblockapi/core/Site.java index 2ddffc7..ebd7002 100644 --- a/core/src/main/java/org/botblock/javabotblockapi/core/Site.java +++ b/core/src/main/java/org/botblock/javabotblockapi/core/Site.java @@ -55,8 +55,13 @@ public class Site{ * + * + * @deprecated Website not responding. */ - public static final Site ARCANE_CENTER_XYZ = new Site("arcane-center.xyz", HttpMethod.POST); + @Deprecated + @DeprecatedSince(major = 6, minor = 6, patch = 6) + @PlannedRemoval(major = 6, minor = 6, patch = 8) + public static final Site ARCANE_CENTER_XYZ = new Site("arcane-center.xyz"); /** * bladebotlist.xyz @@ -82,6 +87,17 @@ public class Site{ */ public static final Site BLIST_XYZ = new Site("blist.xyz", HttpMethod.GET, HttpMethod.POST); + /** + * boatspace.xyz + * + *

Supported methods: + *

+ */ + public static final Site BOATSPACE_XYZ = new Site("boatspace.xyz", HttpMethod.GET, HttpMethod.POST); + /** * botsdatabase.com * @@ -90,8 +106,13 @@ public class Site{ *
  • GET
    • *
  • POST
    • * + * + * @deprecated Website not responding. */ - public static final Site BOTSDATABASE_COM = new Site("botsdatabase.com", HttpMethod.GET, HttpMethod.POST); + @Deprecated + @DeprecatedSince(major = 6, minor = 6, patch = 6) + @PlannedRemoval(major = 6, minor = 6, patch = 8) + public static final Site BOTSDATABASE_COM = new Site("botsdatabase.com"); /** * bots.discordlabs.org @@ -146,23 +167,6 @@ public class Site{ */ public static final Site DISCORD_BOATS = new Site("discord.boats", HttpMethod.GET, HttpMethod.POST); - /** - * discordbotdirectory.net - * - *

    Supported methods: - *

    - * - * @deprecated Site no longer exists. - * - * @since 6.3.0 - */ - @Deprecated - @DeprecatedSince(major = 6, minor = 6, patch = 4) - @PlannedRemoval(major = 6, minor = 6, patch = 6) - public static final Site DISCORDBOTDIRECTORY_NET = new Site("discordbotdirectory.net"); - /** * discordbotlist.com * @@ -231,6 +235,16 @@ public class Site{ */ public static final Site DISCORDLIST_SPACE = new Site("discordlist.space", HttpMethod.GET, HttpMethod.POST); + /** + * discordservices.net + * + *

    Supported methods: + *

    + */ + public static final Site DISCORDSERVICES_NET = new Site("discordservices.net", HttpMethod.POST); + /** * disforge.com * diff --git a/request/src/main/java/org/botblock/javabotblockapi/requests/GetBotAction.java b/request/src/main/java/org/botblock/javabotblockapi/requests/GetBotAction.java index e455da4..fc5d57b 100644 --- a/request/src/main/java/org/botblock/javabotblockapi/requests/GetBotAction.java +++ b/request/src/main/java/org/botblock/javabotblockapi/requests/GetBotAction.java @@ -124,36 +124,8 @@ public GetBotAction(boolean disableCache, @Nonnull String userAgent, @Nonnull St /** * Gets the full information of a bot. * - *

    The JSONObject may look like this: - * 

    
-     * {
-     *     "id": "123456789012345678",
-     *     "username": "MyBot",
-     *     "discriminator": "1234",
-     *     "owners": [
-     *         "234567890123456789"
-     *     ],
-     *     "server_count": 100,
-     *     "invite":{@literal "https://discordapp.com/oauth2/authorize?client_id=123456789012345678&scope=bot"},
-     *     "prefix": "?",
-     *     "website": "",
-     *     "github": "",
-     *     "support": "",
-     *     "library": "JDA",
-     *     "list_data": {
-     *         "somebotlist.com": [
-     *             {"data": "Unique bot list data"},
-     *             200
-     *         ],
-     *         "otherlist.org": [
-     *             {"data": "Unique bot list data"},
-     *             404
-     *         ]
-     *     }
-     * }
-     *
    - *
    With exception of id and list_data are all returned values based on how often one appears. - *
    Each entry in list data is unique to what the respective bot list returns. + * An example of how the returned JSON may look like can be found here:
    + * https://gist.github.com/Andre601/b18b1c4e88e9a405806ce7b6c29a0136 * *

    Following Exceptions can be thrown from the HTTP request: *