Skip to content

Commit 9cc72c5

Browse files
committed
update to jda 5.2.0 and use application emoji method
1 parent 21b955d commit 9cc72c5

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ repositories {
1919
}
2020

2121
dependencies {
22-
implementation("net.dv8tion", "JDA", "5.0.2")
22+
implementation("net.dv8tion", "JDA", "5.2.0")
2323
implementation("pw.chew", "jda-chewtils", "2.0")
2424
implementation("org.json", "json", "20240303")
2525
implementation("ch.qos.logback", "logback-classic", "1.5.6")

src/main/java/pw/chew/mlb/util/TeamEmoji.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package pw.chew.mlb.util;
22

33
import net.dv8tion.jda.api.JDA;
4+
import net.dv8tion.jda.api.entities.emoji.ApplicationEmoji;
45
import net.dv8tion.jda.api.entities.emoji.Emoji;
5-
import net.dv8tion.jda.api.utils.data.DataObject;
66
import org.json.JSONArray;
77
import org.json.JSONObject;
88
import org.slf4j.LoggerFactory;
@@ -24,15 +24,10 @@ public static void setupEmoji(JDA jda) {
2424

2525
// Retrieve Emoji from Discoed
2626
JSONArray teams = new JSONObject(RestClient.get("https://statsapi.mlb.com/api/v1/teams?sportIds=1,11,12,13,14&season=%s&fields=teams,id,name,clubName,active".formatted(SEASON))).getJSONArray("teams");
27-
// TODO: Convert this to native JDA calls when possible
28-
JSONArray emojis = new JSONObject(RestClient.get("https://discord.com/api/v10/applications/%s/emojis".formatted(jda.getSelfUser().getId()), jda.getToken())).getJSONArray("items");
27+
List<ApplicationEmoji> emojis = jda.retrieveApplicationEmojis().complete();
2928

3029
// iterate through emojis
31-
for (Object emojiObj : emojis) {
32-
JSONObject emojiJsonObj = (JSONObject) emojiObj;
33-
DataObject emojiData = DataObject.fromJson(emojiJsonObj.toString());
34-
Emoji emoji = Emoji.fromData(emojiData);
35-
30+
for (ApplicationEmoji emoji : emojis) {
3631
String emojiName = emoji.getName();
3732

3833
if (!emojiName.startsWith("team_")) {

0 commit comments

Comments
 (0)