From 8baa1984fccb5c1a763738fdbd4af92ea60b3cbb Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Tue, 16 Mar 2021 16:11:31 +0100 Subject: [PATCH 1/9] pre-fill field --- .github/ISSUE_TEMPLATE/bug_report.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 4ed61be..2c6d342 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -71,11 +71,9 @@ body: description: |- Put your code here. This code needs to be able to reproduce the bug consistently! - placeholder: |- + value: | ```java - public void error(){ - throw new Exception("ERROR"); - } + ``` validations: required: true From d99498bb69c0074f099272f4c640ad3999a7545f Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Wed, 7 Apr 2021 20:58:04 +0200 Subject: [PATCH 2/9] fix setup-java action --- .github/workflows/generate_javadoc.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/generate_javadoc.yml b/.github/workflows/generate_javadoc.yml index 853031a..b99f9d8 100644 --- a/.github/workflows/generate_javadoc.yml +++ b/.github/workflows/generate_javadoc.yml @@ -17,6 +17,7 @@ jobs: - name: Set up Java 11 uses: actions/setup-java@v2 with: + distribution: 'adobt' java-version: 1.11 - name: Generate Javadoc run: ./gradlew javadoc @@ -36,6 +37,7 @@ jobs: - name: Set up Java 11 uses: actions/setup-java@v2 with: + distribution: 'adobt' java-version: 1.11 - name: Generate Jars run: ./gradlew build From c5ea631ba5cf57ec5cb84893de5f8fa87fc733d2 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Wed, 7 Apr 2021 21:01:36 +0200 Subject: [PATCH 3/9] 'p' not 'b' --- .github/workflows/generate_javadoc.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate_javadoc.yml b/.github/workflows/generate_javadoc.yml index b99f9d8..4e072e3 100644 --- a/.github/workflows/generate_javadoc.yml +++ b/.github/workflows/generate_javadoc.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Java 11 uses: actions/setup-java@v2 with: - distribution: 'adobt' + distribution: 'adopt' java-version: 1.11 - name: Generate Javadoc run: ./gradlew javadoc @@ -37,7 +37,7 @@ jobs: - name: Set up Java 11 uses: actions/setup-java@v2 with: - distribution: 'adobt' + distribution: 'adopt' java-version: 1.11 - name: Generate Jars run: ./gradlew build From d243f7579acf5cc21f5056613ac3317f32cce98a Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Wed, 7 Apr 2021 21:06:08 +0200 Subject: [PATCH 4/9] Fix java version --- .github/workflows/generate_javadoc.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate_javadoc.yml b/.github/workflows/generate_javadoc.yml index 4e072e3..37bd3ab 100644 --- a/.github/workflows/generate_javadoc.yml +++ b/.github/workflows/generate_javadoc.yml @@ -18,7 +18,7 @@ jobs: uses: actions/setup-java@v2 with: distribution: 'adopt' - java-version: 1.11 + java-version: '11.0.10+9' - name: Generate Javadoc run: ./gradlew javadoc - name: Push changes @@ -38,7 +38,7 @@ jobs: uses: actions/setup-java@v2 with: distribution: 'adopt' - java-version: 1.11 + java-version: '11.0.10+9' - name: Generate Jars run: ./gradlew build - name: Zip files From f72011e6adb042ddfac395b92db4dc52014836af Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Fri, 30 Apr 2021 16:52:06 +0200 Subject: [PATCH 5/9] Fix using deprecated stuff --- .github/ISSUE_TEMPLATE/bug_report.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 5e4660d..c15c677 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -1,7 +1,6 @@ name: Bug Report description: Found a Bug about JavaBotBlockAPI? Use this template to report it! labels: "Type: Bug (Unconfirmed)" -issue_body: false body: - type: markdown attributes: From cf350953b6f89042c0333c70bfdac10963e4d66b Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Fri, 30 Apr 2021 16:52:31 +0200 Subject: [PATCH 6/9] Update feature_request.yml --- .github/ISSUE_TEMPLATE/feature_request.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index e11098c..fb2a0d3 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -1,7 +1,6 @@ name: Feature Request description: Suggest a new Feature for JavaBotBlockAPI labels: 'Type: Enhancement' -issue_body: false body: - type: markdown attributes: From 7117ba6a6f14fa181da7e43dc89c2dd4fd80cd82 Mon Sep 17 00:00:00 2001 From: Andre_601 <11576465+Andre601@users.noreply.github.com> Date: Fri, 30 Apr 2021 17:15:51 +0200 Subject: [PATCH 7/9] Auto approve PRs from Andre601 to master --- .github/workflows/auto_approve_pr.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/auto_approve_pr.yml diff --git a/.github/workflows/auto_approve_pr.yml b/.github/workflows/auto_approve_pr.yml new file mode 100644 index 0000000..d9c5dc8 --- /dev/null +++ b/.github/workflows/auto_approve_pr.yml @@ -0,0 +1,17 @@ +name: Automatically approve Pull requests + +on: + pull_request: + types: + - opened + branches: + - master + +jobs: + auto-approve: + runs-on: ubuntu-latest + if: ${{ github.actor == 'Andre601' }} + steps: + - uses: hmarr/auto-approve-action@v2 + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" From fc44e978a9581edfab57925b609860303318e8f3 Mon Sep 17 00:00:00 2001 From: Greg Date: Mon, 3 May 2021 15:41:29 +0200 Subject: [PATCH 8/9] Update outdated example --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aab243c..07f1dd9 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ The BotBlockAPI class contains a nested Builder class which allows a more stream ```java BotBlockAPI api = new BotBlockAPI.Builder() .addAuthToken("discordextremelist.xyz", "my_s3cr3t_t0k3n") - .addAuthToken(Site.BOTLIST_SPACE, "my_53cret_tok3n") + .addAuthToken(Site.DISCORDLIST_SPACE, "my_53cret_tok3n") .build(); ``` 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 9/9] 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: *