Skip to content

Commit af7a964

Browse files
Andre601Andre601
authored
Merge pull request #227 from botblock/development
v6.6.5
2 parents 7ccb6d9 + 69e475e commit af7a964

File tree

8 files changed

+135
-81
lines changed

8 files changed

+135
-81
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ body:
7575
```java
7676
7777
```
78+
render: "java"
7879
validations:
7980
required: true
8081
- type: input

‎.github/ISSUE_TEMPLATE/feature_request.yml

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ body:
3535
```java
3636
public boolean method(){ return true; }
3737
```
38+
render: "java"
3839
- type: textarea
3940
attributes:
4041
label: "Additional Information"

‎.github/workflows/generate_javadoc.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
ref: 'master'
1717
- name: Set up Java 11
18-
uses: actions/setup-java@v1
18+
uses: actions/setup-java@v2
1919
with:
2020
java-version: 1.11
2121
- name: Generate Javadoc
@@ -34,7 +34,7 @@ jobs:
3434
- name: Checkout Code
3535
uses: actions/[email protected]
3636
- name: Set up Java 11
37-
uses: actions/setup-java@v1
37+
uses: actions/setup-java@v2
3838
with:
3939
java-version: 1.11
4040
- name: Generate Jars

‎build.gradle

+1-1
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: 4)
10+
def ver = new Version(major: 6, minor: 6, patch: 5)
1111

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

‎contributors.md

+112-56
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,114 @@
1-
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
2-
[contributorsBadge]: https://img.shields.io/badge/Contributors_✨-10-green.svg?style=plastic
3-
<!-- ALL-CONTRIBUTORS-BADGE:END -->
1+
[all-contributors]: https://allcontributors.org
2+
[emojis]: https://allcontributors.org/docs/en/emoji-key
3+
4+
<!-- Austin Keener -->
5+
[dv8fromtheworld]: https://github.com/DV8FromTheWorld
6+
[jda]: https://github.com/DV8FromTheWorld/JDA
7+
8+
<!-- Ben Manes -->
9+
[benmanes]: https://github.com/ben-manes
10+
[caffeine]: https://github.com/ben-manes/Caffeine
11+
12+
<!-- CodeMC -->
13+
[codemc]: https://github.com/codemc
14+
15+
<!-- Dave -->
16+
[davidrockin]: https://github.com/DavidRockin
17+
[david_comment]: https://github.com/botblock/JavaBotBlockAPI/pull/3#issuecomment-522036554
18+
19+
<!-- Dependabot -->
20+
[dependabot]: https://github.com/Dependabot
21+
22+
<!-- Ghost_chu -->
23+
[ghostchu]: https://github.com/ghost-chu
24+
[ghostchu_commits]: https://github.com/botblock/JavaBotBlockAPI/commits?author=ghost-chu
25+
26+
<!-- Javacord -->
27+
[javacord]: https://github.com/javacord
28+
[javacord-lib]: https://github.com/javacord/Javacord
29+
30+
<!-- Sean Leary -->
31+
[stleary]: https://github.com/stleary
32+
[json-java]: https://github.com/stleary/JSON-java
33+
34+
<!-- Square -->
35+
[square]: https://github.com/square
36+
[okhttp]: https://github.com/square/OkHttp
437

538
# Contributors
6-
![contributorsBadge]
7-
8-
We appreciate any kind of contribution to the JavaBotBlockAPI, as it is our goal to improve over time.
9-
10-
Contributions aren't just limited to PRs or code examples.
11-
Bug reports, suggestions or general feedback to upcoming features are always apreciated and welcome.
12-
13-
# Emoji keys
14-
We use different Emojis as "Keys" to summarize what kind of contributions are under this category.
15-
16-
Below can you see a list of all currently listed emojis, their category and meaning.
17-
A full list of all available categories can be found [here](https://allcontributors.org/docs/en/emoji-key).
18-
19-
- 🤔 (Ideas)
20-
Suggesting new features, improvements or giving general feedback.
21-
- 🔌 (Plugin)
22-
Developed a library used by this project.
23-
- 🚇 (Infra)
24-
Provides a site, service or similar that is used by the project (e.g. CI-Server).
25-
- 🚧 (Maintenance)
26-
Helps maintaining this project, being it updating dependencies, or adding new features.
27-
- 📖 (Documentation)
28-
Helped updating or improving the documentation of this project.
29-
- 💻(Code)
30-
Contributed Code to improve the Project.
31-
32-
# List of contributors
33-
Below can you find a list of all currently aknowledged Contributors to our project.
34-
35-
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
36-
<!-- prettier-ignore-start -->
37-
<!-- markdownlint-disable -->
38-
<table>
39-
<tr>
40-
<td align="center"><a href="https://tkachuk.tech"><img src="https://avatars1.githubusercontent.com/u/1907079?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dave</b></sub></a><br /><a href="#ideas-DavidRockin" title="Ideas, Planning, & Feedback">🤔</a></td>
41-
<td align="center"><a href="http://linkedin.dv8tion.net"><img src="https://avatars1.githubusercontent.com/u/1479909?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Austin Keener</b></sub></a><br /><a href="#plugin-DV8FromTheWorld" title="Plugin/utility libraries">🔌</a></td>
42-
<td align="center"><a href="https://ci.codemc.io/"><img src="https://avatars2.githubusercontent.com/u/37156340?v=4?s=100" width="100px;" alt=""/><br /><sub><b>CodeMC</b></sub></a><br /><a href="#infra-CodeMC" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
43-
<td align="center"><a href="https://dependabot.com"><img src="https://avatars1.githubusercontent.com/u/27347476?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dependabot</b></sub></a><br /><a href="#maintenance-dependabot" title="Maintenance">🚧</a></td>
44-
<td align="center"><a href="https://www.linkedin.com/in/benmanes"><img src="https://avatars3.githubusercontent.com/u/378614?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ben Manes</b></sub></a><br /><a href="#plugin-ben-manes" title="Plugin/utility libraries">🔌</a></td>
45-
<td align="center"><a href="https://square.github.io"><img src="https://avatars0.githubusercontent.com/u/82592?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Square</b></sub></a><br /><a href="#plugin-square" title="Plugin/utility libraries">🔌</a></td>
46-
<td align="center"><a href="https://www.jetbrains.com"><img src="https://avatars2.githubusercontent.com/u/878437?v=4?s=100" width="100px;" alt=""/><br /><sub><b>JetBrains</b></sub></a><br /><a href="#plugin-JetBrains" title="Plugin/utility libraries">🔌</a></td>
47-
</tr>
48-
<tr>
49-
<td align="center"><a href="http://www.johnjleary.com"><img src="https://avatars3.githubusercontent.com/u/5107558?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sean Leary</b></sub></a><br /><a href="#plugin-stleary" title="Plugin/utility libraries">🔌</a></td>
50-
<td align="center"><a href="https://www.caseyjbrooks.com/"><img src="https://avatars2.githubusercontent.com/u/6157866?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Casey Brooks</b></sub></a><br /><a href="https://github.com/botblock/JavaBotBlockAPI/commits?author=cjbrooks12" title="Code">💻</a> <a href="https://github.com/botblock/JavaBotBlockAPI/commits?author=cjbrooks12" title="Documentation">📖</a></td>
51-
<td align="center"><a href="http://blog.mcsunnyside.com"><img src="https://avatars.githubusercontent.com/u/30802565?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ghost_chu</b></sub></a><br /><a href="https://github.com/botblock/JavaBotBlockAPI/commits?author=Ghost-chu" title="Code">💻</a></td>
52-
</tr>
53-
</table>
54-
55-
<!-- markdownlint-restore -->
56-
<!-- prettier-ignore-end -->
57-
58-
<!-- ALL-CONTRIBUTORS-LIST:END -->
39+
We aknowledge all contributions made to the project, be it Pull requests or even something simple like feedback and/or suggestions.
40+
41+
To thank every contributor did we adobt the [All Contributors][all-contributors] system and adjusted it slightly.
42+
This page lists every user/organisation who contributed to the project in some way. Please see the [Categories](#categories) below for an explanation about the different Emojis and their meaning.
43+
44+
## Categories
45+
This file follows a similar system like the All Contributors [Emoji Key System][emojis].
46+
Each Category has their own emoji which is listed here.
47+
48+
### 💻 Code
49+
Contributed code towards the project.
50+
This can be through Pull requests or, if having the rights for, through direct commits.
51+
52+
Will have a link to all commits made by this User/Bot/Organisation.
53+
54+
### 🤔 Feedback/Ideas
55+
Gave Ideas and or general feedback to improve the project.
56+
Will have links to all issues, Pull requests, Discussions and general comments the User/Organisation made.
57+
58+
### 🚇 Infrastructure
59+
Provides a place to host the project, jar files, documentation or similar.
60+
A common example would be a CI (Jenkins) Server.
61+
62+
### 🚧 Maintenance
63+
Helps keeping the project running through actions such as keeping dependencies up to date.
64+
65+
### 🔌 Plugin(s)
66+
Provides one or multiple dependencies used by the project.
67+
A link to the Project(s) will be provided.
68+
69+
## Contributors
70+
Here is a list of all the Contributors to our project and how they contributed to this project.
71+
72+
### [Austin Keener][dv8fromtheworld]
73+
74+
> Contributions: [🔌](#-plugins "Plugin(s)") ([JDA])
75+
76+
----
77+
### [Ben Manes][benmanes]
78+
79+
> Contribution: [🔌](#-plugins "Plugin(s)") ([Caffeine])
80+
81+
----
82+
### [CodeMC][codemc]
83+
84+
> Contributions: [🚇](#-infrastructure "Infrastructure")
85+
86+
----
87+
### [Dave][davidrockin]
88+
89+
> Contributions: [🤔](#-feedbackideas "Feedback/Ideas") ([#3 (Comment)][david_comment])
90+
91+
----
92+
### [Dependabot]
93+
94+
> Contributions: [🚧](#-maintenance "Maintenance")
95+
96+
----
97+
### [Ghost_chu][ghostchu]
98+
99+
> Contributions: [💻](#-code "Code") ([Commits][ghostchu_commits])
100+
101+
----
102+
### [Javacord]
103+
104+
> Contribution: [🔌](#-plugins "Plugin(s)") ([Javacord][javacord-lib])
105+
106+
----
107+
### [Sean Leary][stleary]
108+
109+
> Contribution: [🔌](#-plugins "Plugin(s)") ([JSON-java][json-java])
110+
111+
----
112+
### [Square][square]
113+
114+
> Contribution: [🔌](#-plugins "Plugin(s)") ([OkHttp])

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

+1-1
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 = 4;
42+
public static final int PATCH = 5;
4343

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

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

+16-20
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,23 @@
2626
import java.util.List;
2727

2828
/**
29-
* Class containing all (known) Bot lists.
30-
* <br>The static instances of this class allow the easy use within various methods of the JavaBotBlockAPI.
29+
* This class contains all known sites that are supported by BotBlock's APIs for getting Bot info, getting list info or
30+
* posting Bot info to a list.
3131
*
32-
* <p>Keep in mind that not all Sites support either GET or POST requests. You may use {@link #supportsGet() supportsGet()}
33-
* or {@link #supportsPost() supportsPost()} methods to check whether the instance supports GET and/or POST respectively.
32+
* <p>The static instances of this class allow an easy and quick usage in various methods of JavaBotBlockAPI without the
33+
* need to remember any bot list name.
34+
*
35+
* <h2>Supported HTTP Methods</h2>
36+
* The Javadoc comment of each instance lists what HTTP method is supported.
37+
* <br>If a List supports GET can you use all methods from the GetListAction and GetBotAction classes of the Request module
38+
* while Lists supporting POST also can be utilized within the {@link org.botblock.javabotblockapi.core.BotBlockAPI BotBlockAPI}
39+
* to posts Bot information to that list.
40+
*
41+
* <p>Trying to use a List for an action it doesn't support (i.e. using a List for POST while it only supports GET) will
42+
* result in exceptions being thrown.
43+
* <br><b>Instances marked as Deprecated won't support either method type. If a replacement is mentioned using the
44+
* {@link org.botblock.javabotblockapi.core.annotations.DeprecatedSince DeprecatedSince's} replacement value should it
45+
* be used in favour of the deprecated Instance.</b>
3446
*
3547
* @since 6.3.0
3648
*/
@@ -70,22 +82,6 @@ public class Site{
7082
*/
7183
public static final Site BLIST_XYZ = new Site("blist.xyz", HttpMethod.GET, HttpMethod.POST);
7284

73-
/**
74-
* <a href="https://botlist.space" target="_blank">botlist.space</a>
75-
*
76-
* <p>Supported methods:
77-
* <ul>
78-
* <li>GET</li>
79-
* <li>POST</li>
80-
* </ul>
81-
*
82-
* @deprecated Domain changed to {@link #DISCORDLIST_SPACE discordlist.space}
83-
*/
84-
@Deprecated
85-
@DeprecatedSince(major = 6, minor = 6, patch = 3, replacements = {"DISCORDLIST_SPACE"})
86-
@PlannedRemoval(major = 6, minor = 6, patch = 5)
87-
public static final Site BOTLIST_SPACE = new Site("botlist.space");
88-
8985
/**
9086
* <a href="https://botsdatabase.com" target="_blank">botsdatabase.com</a>
9187
*

‎javacord/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
api group: 'org.javacord', name: 'javacord', version: '3.1.2'
2+
api group: 'org.javacord', name: 'javacord', version: '3.3.0'
33
implementation project(":core")
44
implementation project(":request")
55
}

0 commit comments

Comments
 (0)