Skip to content

Commit

Permalink
chore: upgrade JDA
Browse files Browse the repository at this point in the history
  • Loading branch information
vinceh121 committed Nov 3, 2023
1 parent 8b73219 commit 22b0024
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 54 deletions.
31 changes: 10 additions & 21 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,11 @@
</scm>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>

<repositories>
<repository>
<id>jcenter</id>
<name>jcenter-bintray</name>
<url>https://jcenter.bintray.com</url>
</repository>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
Expand All @@ -50,7 +45,7 @@
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>4.2.0_181</version>
<version>5.0.0-beta.17</version>
</dependency>
<dependency>
<groupId>com.github.vinceh121</groupId>
Expand All @@ -73,50 +68,44 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.21.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.14.0</version>
<version>2.21.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.reflections/reflections -->
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>0.9.12</version>
<version>0.10.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.10.0</version>
<version>1.11.0</version>
</dependency>

<!-- https://mvnrepository.com/artifact/io.dropwizard.metrics/metrics-core -->
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>4.1.13</version>
<version>4.2.21</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.dropwizard.metrics/metrics-jvm -->
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jvm</artifactId>
<version>4.1.13</version>
<version>4.2.21</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.dropwizard.metrics/metrics-graphite -->
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-graphite</artifactId>
<version>4.1.13</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.dropwizard.metrics/metrics-logback -->
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-logback</artifactId>
<version>4.1.13</version>
<version>4.2.21</version>
</dependency>
</dependencies>
<build>
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/me/vinceh121/knb/CheckingJob.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import net.dv8tion.jda.api.entities.Activity;
import net.dv8tion.jda.api.entities.MessageEmbed;
import net.dv8tion.jda.api.entities.MessageEmbed.Field;
import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;

public class CheckingJob implements Job {
public static final int COLOR_ARTICLE = 0xff7b1c;
Expand Down Expand Up @@ -127,7 +127,7 @@ private void processGrades(final Knb knb, final JKdecole kde, final UserInfo inf
}

final MessageEmbed emb = embBuild.build();
chan.sendMessage(emb).queue();
chan.sendMessageEmbeds(emb).queue();
}

private void processEmails(final Knb knb, final JKdecole kde, final UserInfo info, final UserInstance ui) {
Expand Down Expand Up @@ -169,7 +169,7 @@ private void processEmails(final Knb knb, final JKdecole kde, final UserInfo inf
}

final MessageEmbed emb = embBuild.build();
chan.sendMessage(emb).queue();
chan.sendMessageEmbeds(emb).queue();
}

private void processArticles(final Knb knb, final JKdecole kde, final UserInfo info, final UserInstance ui) {
Expand Down Expand Up @@ -208,7 +208,7 @@ private void processArticles(final Knb knb, final JKdecole kde, final UserInfo i
}

final MessageEmbed emb = embBuild.build();
chan.sendMessage(emb).queue();
chan.sendMessageEmbeds(emb).queue();
}

private void processHomework(final Knb knb, final JKdecole kde, final UserInfo info, final UserInstance ui) {
Expand Down Expand Up @@ -247,7 +247,7 @@ private void processHomework(final Knb knb, final JKdecole kde, final UserInfo i
}

final MessageEmbed emb = embBuild.build();
chan.sendMessage(emb).queue();
chan.sendMessageEmbeds(emb).queue();
}

private void sendWarning(final Knb knb, final TextChannel chan, final UserInstance ui, final String text) {
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/me/vinceh121/knb/CommandContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

import java.util.List;

import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;

public class CommandContext {
private GuildMessageReceivedEvent event;
private MessageReceivedEvent event;
private List<String> args;
private UserInstance userInstance;
private boolean adminCalled;

public GuildMessageReceivedEvent getEvent() {
public MessageReceivedEvent getEvent() {
return this.event;
}

public void setEvent(final GuildMessageReceivedEvent event) {
public void setEvent(final MessageReceivedEvent event) {
this.event = event;
}

Expand Down
13 changes: 7 additions & 6 deletions src/main/java/me/vinceh121/knb/CommandListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.Message.MentionType;
import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
import net.dv8tion.jda.api.hooks.ListenerAdapter;

Expand All @@ -50,7 +50,7 @@ public void onGuildJoin(final GuildJoinEvent event) {
try {
final TextChannel ch;
if (g.getDefaultChannel() != null) {
ch = g.getDefaultChannel();
ch = g.getDefaultChannel().asTextChannel();
} else {
ch = g.getTextChannels().get(0);
}
Expand All @@ -60,9 +60,9 @@ public void onGuildJoin(final GuildJoinEvent event) {
}

@Override
public void onGuildMessageReceived(final GuildMessageReceivedEvent event) {
public void onMessageReceived(MessageReceivedEvent event) {
final Message msg = event.getMessage();
if (!msg.isMentioned(this.knb.getJda().getSelfUser(), MentionType.USER)) {
if (!msg.getMentions().isMentioned(this.knb.getJda().getSelfUser(), MentionType.USER)) {
return;
}

Expand Down Expand Up @@ -144,7 +144,8 @@ public void onGuildMessageReceived(final GuildMessageReceivedEvent event) {
.queue();
return;
}
if (!event.getMember().hasPermission(event.getChannel(), Permission.MANAGE_CHANNEL)) {
if (!event.getMember()
.hasPermission(event.getChannel().asGuildMessageChannel(), Permission.MANAGE_CHANNEL)) {
event.getChannel()
.sendMessage(
"Vous devez avoir la permission `Gérer les salons` pour utiliser cette commande")
Expand Down
5 changes: 0 additions & 5 deletions src/main/java/me/vinceh121/knb/Knb.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;

import javax.security.auth.login.LoginException;

import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.impl.client.HttpClients;
Expand Down Expand Up @@ -125,9 +123,6 @@ public Knb() {
try {
this.jda = build.build();
this.jda.awaitReady();
} catch (final LoginException e) {
Knb.LOG.error("Failed to login to discord", e);
throw new RuntimeException(e);
} catch (final Exception e) {
Knb.LOG.error("Failed to init JDA", e);
throw new RuntimeException(e);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/vinceh121/knb/commands/CmdAdmins.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ protected void executeSync(final CommandContext ctx) {
for (final long id : this.knb.getConfig().getAdmins()) {
final User user = this.knb.getJda().retrieveUserById(id).complete();
sb.append("\t");
sb.append(user == null ? "<@" + id + ">" : user.getAsTag() + "\n");
sb.append(user == null ? "<@" + id + ">" : user.getEffectiveName() + "\n");
}
ctx.getEvent().getChannel().sendMessage(sb.toString()).queue();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import me.vinceh121.knb.CommandContext;
import me.vinceh121.knb.Knb;
import me.vinceh121.knb.UserInstance;
import net.dv8tion.jda.api.entities.PrivateChannel;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel;

public class CmdAnouncement extends AbstractCommand {
private static final Logger LOG = LogManager.getLogger(CmdAnouncement.class);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/vinceh121/knb/commands/CmdApropos.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ protected void executeSync(final CommandContext ctx) {

build.addField(CmdApropos.EASTER_FIELD.get(CmdApropos.RND.nextInt(CmdApropos.EASTER_FIELD.size())));

ctx.getEvent().getChannel().sendMessage(build.build()).queue();
ctx.getEvent().getChannel().sendMessageEmbeds(build.build()).queue();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/vinceh121/knb/commands/CmdAuth.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import me.vinceh121.knb.UserInstance;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;

public class CmdAuth extends AbstractCommand {

Expand All @@ -26,7 +26,7 @@ public boolean validateSyntax(final CommandContext ctx) {

@Override
protected void executeSync(final CommandContext ctx) {
final TextChannel chan = ctx.getEvent().getChannel();
final GuildMessageChannel chan = ctx.getEvent().getChannel().asGuildMessageChannel();
final Member mem = ctx.getEvent().getMember();

if (!mem.hasPermission(chan, Permission.MANAGE_CHANNEL)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import me.vinceh121.knb.Knb;
import me.vinceh121.knb.UserInstance;
import net.dv8tion.jda.api.entities.Message.MentionType;
import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;

public class CmdDataRequest extends AbstractCommand {

Expand Down
10 changes: 5 additions & 5 deletions src/main/java/me/vinceh121/knb/commands/CmdFeedback.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;

public class CmdFeedback extends AbstractCommand {

Expand All @@ -27,14 +27,14 @@ protected void executeSync(final CommandContext ctx) {

final User author = ctx.getEvent().getAuthor();
final Guild guild = ctx.getEvent().getGuild();
final TextChannel channel = ctx.getEvent().getChannel();
final TextChannel channel = ctx.getEvent().getChannel().asTextChannel();
final Message msg = ctx.getEvent().getMessage();

feedbackChannel.sendMessage(new EmbedBuilder().setTitle("Feedback", msg.getJumpUrl())
feedbackChannel.sendMessageEmbeds(new EmbedBuilder().setTitle("Feedback", msg.getJumpUrl())
.setDescription(String.join(" ", ctx.getArgs()))
.setAuthor(author.getAsTag(), author.getEffectiveAvatarUrl(), author.getEffectiveAvatarUrl())
.setAuthor(author.getEffectiveName(), author.getEffectiveAvatarUrl(), author.getEffectiveAvatarUrl())
.addField("Guild", guild.getName() + " (" + guild.getId() + ")", true)
.addField("User", author.getAsTag() + " (" + author.getId() + ")", true)
.addField("User", author.getEffectiveName() + " (" + author.getId() + ")", true)
.addField("Channel", channel.getName() + " (" + channel.getId() + ")", true)
.build()).queue(m -> {
channel.sendMessage("Votre commentaire a était envoyé, merci !").queue();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/vinceh121/knb/commands/CmdMove.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import me.vinceh121.knb.Knb;
import me.vinceh121.knb.UserInstance;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;

public class CmdMove extends AbstractCommand {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/vinceh121/knb/commands/CmdRelay.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ private void printCurrent(final CommandContext ctx) {
for (final RelayType r : RelayType.values()) {
build.addField(r.name(), ctx.getUserInstance().getRelays().contains(r) ? "ON" : "OFF", true);
}
ctx.getEvent().getChannel().sendMessage(build.build()).queue();
ctx.getEvent().getChannel().sendMessageEmbeds(build.build()).queue();
}

@Override
Expand Down

0 comments on commit 22b0024

Please sign in to comment.