From db8edb26f0943f1a21305e0af886201b0ebd49e5 Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Sat, 16 May 2020 23:40:02 +0200 Subject: [PATCH] upgraded to new JDA version and changed some deprecated methods --- .../sheldan/abstracto/core/listener/LeaveListenerBean.java | 4 ++-- .../dev/sheldan/abstracto/core/service/BotServiceBean.java | 6 ++---- pom.xml | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/LeaveListenerBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/LeaveListenerBean.java index 7012536fa..eb9a18a77 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/LeaveListenerBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/LeaveListenerBean.java @@ -5,7 +5,7 @@ import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException; import dev.sheldan.abstracto.core.service.FeatureConfigService; import dev.sheldan.abstracto.core.service.FeatureFlagService; import lombok.extern.slf4j.Slf4j; -import net.dv8tion.jda.api.events.guild.member.GuildMemberLeaveEvent; +import net.dv8tion.jda.api.events.guild.member.GuildMemberRemoveEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,7 +29,7 @@ public class LeaveListenerBean extends ListenerAdapter { @Override @Transactional - public void onGuildMemberLeave(@Nonnull GuildMemberLeaveEvent event) { + public void onGuildMemberRemove(@Nonnull GuildMemberRemoveEvent event) { listenerList.forEach(leaveListener -> { FeatureConfig feature = featureConfigService.getFeatureDisplayForFeature(leaveListener.getFeature()); if(!featureFlagService.isFeatureEnabled(feature, event.getGuild().getIdLong())) { diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/BotServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/BotServiceBean.java index 904eaf4f0..6bf31f883 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/BotServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/BotServiceBean.java @@ -26,14 +26,12 @@ import java.util.concurrent.CompletableFuture; @Slf4j public class BotServiceBean implements BotService { - public static final String GUILD_NOT_FOUND = "Guild %s not found."; private JDA instance; @Override public void login() throws LoginException { - JDABuilder builder = new JDABuilder(System.getenv("TOKEN")); + JDABuilder builder = JDABuilder.createDefault(System.getenv("TOKEN")); - builder.setDisabledCacheFlags(EnumSet.of(CacheFlag.ACTIVITY)); builder.setBulkDeleteSplittingEnabled(false); this.instance = builder.build(); @@ -147,7 +145,7 @@ public class BotServiceBean implements BotService { Guild guild = guildOptional.get(); return Optional.ofNullable(guild.getTextChannelById(textChannelId)); } - throw new GuildException(GUILD_NOT_FOUND, serverId); + throw new GuildException(serverId); } @Override diff --git a/pom.xml b/pom.xml index e853b219f..c1455b668 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ - 4.1.1_126 + 4.1.1_152 3.0.3 2.0.0-RC.1 1.5.3