Skip to content

Commit 9397fa7

Browse files
authored
Merge pull request #208 from botblock/development
Version 6.6.2
2 parents c05af91 + 8454730 commit 9397fa7

File tree

12 files changed

+42
-76
lines changed

12 files changed

+42
-76
lines changed

.github/workflows/auto-comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ jobs:
2020
with:
2121
ref: master
2222
- name: Comment on (un)labeled issue/Pull request
23-
uses: peaceiris/actions-label-commenter@v1.9.0
23+
uses: peaceiris/actions-label-commenter@v1.9.1
2424
with:
2525
github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/generate_javadoc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
files: 'build/libs/JavaBotBlockAPI-${{ github.event.release.tag_name }}.zip;build/libs/*.jar'
4949
repo-token: ${{ secrets.GITHUB_TOKEN }}
5050
sendMessage:
51-
needs: [generateJavadoc]
51+
needs: [generateJars]
5252
if: success()
5353
runs-on: ubuntu-latest
5454
steps:

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins{
77
id 'com.github.johnrengelman.shadow' version '5.2.0'
88
}
99

10-
def ver = new Version(major: 6, minor: 6, patch: 1)
10+
def ver = new Version(major: 6, minor: 6, patch: 2)
1111

1212
allprojects {
1313
apply plugin: 'maven-publish'

core/src/main/java/org/botblock/javabotblockapi/core/Info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class Info{
3939
/**
4040
* Patch version of the Wrapper.
4141
*/
42-
public static final int PATCH = 1;
42+
public static final int PATCH = 2;
4343

4444
/**
4545
* Full version in the format {@code major.minor.patch}.

core/src/main/java/org/botblock/javabotblockapi/core/JavaBotBlockAPIInfo.java

Lines changed: 0 additions & 60 deletions
This file was deleted.

core/src/main/java/org/botblock/javabotblockapi/core/Site.java

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,13 @@ public class Site{
175175
* <li>GET</li>
176176
* <li>POST</li>
177177
* </ul>
178+
*
179+
* @deprecated No longer available.
178180
*/
179-
public static final Site DISCORDAPPS_DEV = new Site("discordapps.dev", HttpMethod.GET, HttpMethod.POST);
181+
@Deprecated
182+
@DeprecatedSince(major = 6, minor = 6, patch = 2)
183+
@PlannedRemoval(major = 6, minor = 6, patch = 4)
184+
public static final Site DISCORDAPPS_DEV = new Site("discordapps.dev");
180185

181186
/**
182187
* <a href="https://discord.boats" target="_blank">discord.boats</a>
@@ -287,9 +292,27 @@ public class Site{
287292
* <li>GET</li>
288293
* <li>POST</li>
289294
* </ul>
295+
*
296+
* @deprecated Domain changed. Use {@link #INFINITYBOTLIST_XYZ INFINITYBOTLIST_XYZ} instead
290297
*/
298+
@Deprecated
299+
@DeprecatedSince(major = 6, minor = 5, patch = 2, replacements = {"INFINITYBOTLIST_XYZ"})
300+
@PlannedRemoval(minor = 6, major = 5, patch = 4)
291301
public static final Site INFINITYBOTLIST_COM = new Site("infinitybotlist.com", HttpMethod.GET, HttpMethod.POST);
292302

303+
/**
304+
* <a href="https://infinitybotlist.xyz" target="_blank">infinitybotlist.xyz</a>
305+
*
306+
* <p>Supported methods:
307+
* <ul>
308+
* <li>GET</li>
309+
* <li>POST</li>
310+
* </ul>
311+
*
312+
* @since 6.6.2
313+
*/
314+
public static final Site INFINITYBOTLIST_XYZ = new Site("infinitybotlist.xyz", HttpMethod.GET, HttpMethod.POST);
315+
293316
/**
294317
* <a href ="https://paradisebots.net" target="_blank">paradisebots.net</a>
295318
*

javacord/src/main/java/org/botblock/javabotblockapi/javacord/PostAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import org.botblock.javabotblockapi.core.BotBlockAPI;
2222
import org.botblock.javabotblockapi.core.CheckUtil;
23-
import org.botblock.javabotblockapi.core.JavaBotBlockAPIInfo;
23+
import org.botblock.javabotblockapi.core.Info;
2424
import org.botblock.javabotblockapi.core.exceptions.RateLimitedException;
2525
import org.botblock.javabotblockapi.requests.handler.RequestHandler;
2626
import org.javacord.api.DiscordApi;
@@ -67,7 +67,7 @@ public PostAction(DiscordApi api){
6767
"%s-%s/%s (Javacord) DBots/%s",
6868
api.getYourself().getName(),
6969
api.getYourself().getDiscriminator(),
70-
JavaBotBlockAPIInfo.VERSION,
70+
Info.VERSION,
7171
api.getYourself().getId()
7272
));
7373
this.scheduler = requestHandler.getScheduler();

jda/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
api(group: 'net.dv8tion', name: 'JDA', version: '4.2.0_228'){
2+
api(group: 'net.dv8tion', name: 'JDA', version: '4.2.0_229'){
33
exclude(module: 'opus-java')
44
}
55
implementation project(":core")

jda/src/main/java/org/botblock/javabotblockapi/jda/PostAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import net.dv8tion.jda.api.JDA;
2222
import net.dv8tion.jda.api.sharding.ShardManager;
2323
import org.botblock.javabotblockapi.core.BotBlockAPI;
24-
import org.botblock.javabotblockapi.core.JavaBotBlockAPIInfo;
24+
import org.botblock.javabotblockapi.core.Info;
2525
import org.botblock.javabotblockapi.core.exceptions.RateLimitedException;
2626
import org.botblock.javabotblockapi.core.CheckUtil;
2727
import org.botblock.javabotblockapi.requests.handler.RequestHandler;
@@ -82,7 +82,7 @@ public PostAction(@Nonnull JDA jda){
8282
"%s-%s/%s (JDA) DBots/%s",
8383
jda.getSelfUser().getName(),
8484
jda.getSelfUser().getDiscriminator(),
85-
JavaBotBlockAPIInfo.VERSION,
85+
Info.VERSION,
8686
jda.getSelfUser().getId()
8787
));
8888
this.scheduler = requestHandler.getScheduler();

request/src/main/java/org/botblock/javabotblockapi/requests/GetBotAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.botblock.javabotblockapi.requests;
2020

21-
import org.botblock.javabotblockapi.core.JavaBotBlockAPIInfo;
21+
import org.botblock.javabotblockapi.core.Info;
2222
import org.botblock.javabotblockapi.core.Site;
2323
import org.botblock.javabotblockapi.core.CheckUtil;
2424
import org.botblock.javabotblockapi.core.exceptions.RateLimitedException;
@@ -89,7 +89,7 @@ public GetBotAction(@Nonnull String id){
8989
public GetBotAction(boolean disableCache, @Nonnull String id){
9090
this(disableCache, String.format(
9191
"JavaBotBlockAPI-0000/%s (Unknown; +https://jbba.dev) DBots/{id}",
92-
JavaBotBlockAPIInfo.VERSION
92+
Info.VERSION
9393
), id);
9494
}
9595

0 commit comments

Comments
 (0)