Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-03-15 02:39:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-xx] upgrade to JDA 5.0.0-alpha.21

Browse Source
This commit is contained in:
Sheldan
2022-10-16 11:54:23 +02:00
parent 48f62f8bdf
commit 3e38085a25
29 changed files with 54 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/repository/MuteRepository.java
View File

@@ -4,7 +4,6 @@ import dev.sheldan.abstracto.core.models.ServerSpecificId;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import dev.sheldan.abstracto.moderation.model.database.Mute;
import org.jetbrains.annotations.NotNull;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@@ -23,6 +22,5 @@ public interface MuteRepository extends JpaRepository<Mute, ServerSpecificId> {
List<Mute> findAllByServerOrderByMuteId_IdAsc(AServer server);
@NotNull
Optional<Mute> findByMuteId_IdAndMuteId_ServerId(Long muteId, Long serverId);
}

2
abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/repository/ModMailThreadRepository.java
View File

@@ -6,7 +6,6 @@ import dev.sheldan.abstracto.core.models.database.AUser;
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import dev.sheldan.abstracto.modmail.model.database.ModMailThread;
import dev.sheldan.abstracto.modmail.model.database.ModMailThreadState;
import org.jetbrains.annotations.NotNull;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.lang.NonNull;
import org.springframework.stereotype.Repository;
@@ -38,7 +37,6 @@ public interface ModMailThreadRepository extends JpaRepository<ModMailThread, Lo
List<ModMailThread> findByUserAndState(AUserInAServer userInAServer, ModMailThreadState state);
@NotNull
@Override
Optional<ModMailThread> findById(@NonNull Long aLong);
}

6
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/button/listener/SyncButtonClickedListenerBean.java
View File

@@ -14,13 +14,13 @@ import dev.sheldan.abstracto.core.utils.BeanUtils;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Nonnull;
import javax.annotation.PostConstruct;
import java.util.List;
import java.util.Optional;
@@ -60,7 +60,7 @@ public class SyncButtonClickedListenerBean extends ListenerAdapter {
private Gson gson;
@Override
public void onButtonInteraction(@NotNull ButtonInteractionEvent event) {
public void onButtonInteraction(@Nonnull ButtonInteractionEvent event) {
if(listenerList == null) return;
// TODO remove this and make this configurable
event.deferEdit().queue();
@@ -71,7 +71,7 @@ public class SyncButtonClickedListenerBean extends ListenerAdapter {
}
@Transactional
public void executeListenerLogic(@NotNull ButtonInteractionEvent event) {
public void executeListenerLogic(ButtonInteractionEvent event) {
ButtonClickedListenerModel model = null;
ButtonClickedListener listener = null;
try {

3
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/context/message/MessageContextCommandListenerBean.java
View File

@@ -14,7 +14,6 @@ import dev.sheldan.abstracto.core.service.FeatureModeService;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
@@ -64,7 +63,7 @@ public class MessageContextCommandListenerBean extends ListenerAdapter {
.build();
@Override
public void onMessageContextInteraction(@NotNull MessageContextInteractionEvent event) {
public void onMessageContextInteraction(MessageContextInteractionEvent event) {
if(listenerList == null) return;
CompletableFuture.runAsync(() -> self.executeListenerLogic(event), messageContextCommandExecutor).exceptionally(throwable -> {
log.error("Failed to execute listener logic in async message context event.", throwable);

6
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/modal/listener/ModalInteractionListenerBean.java
View File

@@ -14,13 +14,13 @@ import dev.sheldan.abstracto.core.utils.BeanUtils;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Nonnull;
import javax.annotation.PostConstruct;
import java.util.List;
import java.util.Optional;
@@ -60,7 +60,7 @@ public class ModalInteractionListenerBean extends ListenerAdapter {
private FeatureModeService featureModeService;
@Override
public void onModalInteraction(@NotNull ModalInteractionEvent event) {
public void onModalInteraction(@Nonnull ModalInteractionEvent event) {
if(listenerList == null) return;
// TODO remove this and make this configurable
event.deferEdit().queue();
@@ -71,7 +71,7 @@ public class ModalInteractionListenerBean extends ListenerAdapter {
}
@Transactional
public void executeListenerLogic(@NotNull ModalInteractionEvent event) {
public void executeListenerLogic(ModalInteractionEvent event) {
ModalInteractionListenerModel model = null;
ModalInteractionListener listener = null;
try {

6
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/slash/SlashCommandListenerBean.java
View File

@@ -15,13 +15,13 @@ import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Nonnull;
import javax.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.Arrays;
@@ -75,7 +75,7 @@ public class SlashCommandListenerBean extends ListenerAdapter {
}
@Override
public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent event) {
public void onSlashCommandInteraction(SlashCommandInteractionEvent event) {
try {
if(commands == null || commands.isEmpty()) return;
log.debug("Executing slash command in guild {} from user {}.", event.getGuild().getIdLong(), event.getMember().getIdLong());
@@ -111,7 +111,7 @@ public class SlashCommandListenerBean extends ListenerAdapter {
}
@Override
public void onCommandAutoCompleteInteraction(@NotNull CommandAutoCompleteInteractionEvent event) {
public void onCommandAutoCompleteInteraction(@Nonnull CommandAutoCompleteInteractionEvent event) {
try {
if(commands == null || commands.isEmpty()) return;
CompletableFuture.runAsync(() -> self.executeAutCompleteListenerLogic(event), slashCommandAutoCompleteExecutor).exceptionally(throwable -> {

3
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/entity/AsyncAChannelCreatedListenerBean.java
View File

@@ -11,7 +11,6 @@ import net.dv8tion.jda.api.entities.channel.Channel;
import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
import net.dv8tion.jda.api.events.channel.ChannelCreateEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
@@ -51,7 +50,7 @@ public class AsyncAChannelCreatedListenerBean extends ListenerAdapter {
}
@Transactional
public void createChannelInDatabase(@NotNull ChannelCreateEvent event) {
public void createChannelInDatabase(ChannelCreateEvent event) {
log.info("Creating text channel with ID {}.", event.getChannel().getIdLong());
if(event.getChannel() instanceof GuildChannel) {
AServer serverObject = serverManagementService.loadOrCreate(((GuildChannel)event.getChannel()).getGuild().getIdLong());

4
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncEmoteCreatedListenerBean.java
View File

@@ -5,13 +5,13 @@ import dev.sheldan.abstracto.core.models.listener.EmoteCreatedModel;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.emoji.EmojiAddedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Nonnull;
import java.util.List;
@Service
@@ -30,7 +30,7 @@ public class AsyncEmoteCreatedListenerBean extends ListenerAdapter {
@Override
@Transactional
public void onEmojiAdded(@NotNull EmojiAddedEvent event) {
public void onEmojiAdded(@Nonnull EmojiAddedEvent event) {
if(listenerList == null) return;
EmoteCreatedModel model = getModel(event);
listenerList.forEach(joinListener -> listenerService.executeFeatureAwareListener(joinListener, model, emoteCreatedListenerExecutor));

4
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncEmoteDeletedListenerBean.java
View File

@@ -5,13 +5,13 @@ import dev.sheldan.abstracto.core.models.listener.EmoteDeletedModel;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.emoji.EmojiRemovedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Nonnull;
import java.util.List;
@Service
@@ -30,7 +30,7 @@ public class AsyncEmoteDeletedListenerBean extends ListenerAdapter {
@Override
@Transactional
public void onEmojiRemoved(@NotNull EmojiRemovedEvent event) {
public void onEmojiRemoved(@Nonnull EmojiRemovedEvent event) {
if(listenerList == null) return;
EmoteDeletedModel model = getModel(event);
listenerList.forEach(deletedListener -> listenerService.executeFeatureAwareListener(deletedListener, model, emoteDeletedListenerExecutor));

4
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncEmoteUpdatedListenerBean.java
View File

@@ -5,13 +5,13 @@ import dev.sheldan.abstracto.core.models.listener.EmoteNameUpdatedModel;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.emoji.update.EmojiUpdateNameEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Nonnull;
import java.util.List;
@Service
@@ -30,7 +30,7 @@ public class AsyncEmoteUpdatedListenerBean extends ListenerAdapter {
@Override
@Transactional
public void onEmojiUpdateName(@NotNull EmojiUpdateNameEvent event) {
public void onEmojiUpdateName(@Nonnull EmojiUpdateNameEvent event) {
if(listenerList == null) return;
EmoteNameUpdatedModel model = getModel(event);
listenerList.forEach(deletedListener -> listenerService.executeFeatureAwareListener(deletedListener, model, emoteDeletedListenerExecutor));

4
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncMemberBoostTimeUpdateListenerBean.java
View File

@@ -5,12 +5,12 @@ import dev.sheldan.abstracto.core.models.listener.BoostTimeUpdatedModel;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.guild.member.update.GuildMemberUpdateBoostTimeEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Component;
import javax.annotation.Nonnull;
import java.util.List;
@Component
@@ -27,7 +27,7 @@ public class AsyncMemberBoostTimeUpdateListenerBean extends ListenerAdapter {
private ListenerService listenerService;
@Override
public void onGuildMemberUpdateBoostTime(@NotNull GuildMemberUpdateBoostTimeEvent event) {
public void onGuildMemberUpdateBoostTime(@Nonnull GuildMemberUpdateBoostTimeEvent event) {
if(listenerList == null) return;
BoostTimeUpdatedModel model = getModel(event);
listenerList.forEach(boostListener -> listenerService.executeFeatureAwareListener(boostListener, model, boostTimeUpdateListener));

4
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncMemberTimeoutListenerBean.java
View File

@@ -6,12 +6,12 @@ import dev.sheldan.abstracto.core.models.listener.MemberTimeoutUpdatedModel;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.guild.member.update.GuildMemberUpdateTimeOutEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Component;
import javax.annotation.Nonnull;
import java.util.List;
@Component
@@ -28,7 +28,7 @@ public class AsyncMemberTimeoutListenerBean extends ListenerAdapter {
private ListenerService listenerService;
@Override
public void onGuildMemberUpdateTimeOut(@NotNull GuildMemberUpdateTimeOutEvent event) {
public void onGuildMemberUpdateTimeOut(@Nonnull GuildMemberUpdateTimeOutEvent event) {
if(listenerList == null) return;
MemberTimeoutUpdatedModel model = getModel(event);
listenerList.forEach(leaveListener -> listenerService.executeFeatureAwareListener(leaveListener, model, memberTimeoutExecutor));

4
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncMessageEmbeddedListenerBean.java
View File

@@ -5,13 +5,13 @@ import dev.sheldan.abstracto.core.models.listener.GuildMessageEmbedEventModel;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.message.MessageEmbedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Nonnull;
import java.util.List;
@Component
@@ -33,7 +33,7 @@ public class AsyncMessageEmbeddedListenerBean extends ListenerAdapter {
@Override
@Transactional
public void onMessageEmbed(@NotNull MessageEmbedEvent event) {
public void onMessageEmbed(@Nonnull MessageEmbedEvent event) {
if(listenerList == null) return;
GuildMessageEmbedEventModel model = getModel(event);
listenerList.forEach(leaveListener -> listenerService.executeFeatureAwareListener(leaveListener, model, messageEmbeddedListener));

4
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncUserBannedListenerBean.java
View File

@@ -6,12 +6,12 @@ import dev.sheldan.abstracto.core.models.listener.UserBannedModel;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.guild.GuildBanEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Component;
import javax.annotation.Nonnull;
import java.util.List;
@Component
@@ -28,7 +28,7 @@ public class AsyncUserBannedListenerBean extends ListenerAdapter {
private ListenerService listenerService;
@Override
public void onGuildBan(@NotNull GuildBanEvent event) {
public void onGuildBan(@Nonnull GuildBanEvent event) {
if(listenerList == null) return;
UserBannedModel model = getModel(event);
listenerList.forEach(leaveListener -> listenerService.executeFeatureAwareListener(leaveListener, model, leaveListenerExecutor));

4
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncUserUnBannedListenerBean.java
View File

@@ -6,12 +6,12 @@ import dev.sheldan.abstracto.core.models.listener.UserUnBannedModel;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.guild.GuildUnbanEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Component;
import javax.annotation.Nonnull;
import java.util.List;
@Component
@@ -28,7 +28,7 @@ public class AsyncUserUnBannedListenerBean extends ListenerAdapter {
private ListenerService listenerService;
@Override
public void onGuildUnban(@NotNull GuildUnbanEvent event) {
public void onGuildUnban(@Nonnull GuildUnbanEvent event) {
if(listenerList == null) return;
UserUnBannedModel model = getModel(event);
listenerList.forEach(leaveListener -> listenerService.executeFeatureAwareListener(leaveListener, model, leaveListenerExecutor));

14
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncVoiceChannelJoinedListenerBean.java
View File

@@ -3,14 +3,14 @@ package dev.sheldan.abstracto.core.listener.async.jda;
import dev.sheldan.abstracto.core.listener.ListenerService;
import dev.sheldan.abstracto.core.models.listener.VoiceChannelJoinedModel;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.guild.voice.GuildVoiceJoinEvent;
import net.dv8tion.jda.api.events.guild.voice.GuildVoiceUpdateEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Component;
import javax.annotation.Nonnull;
import java.util.List;
@Component
@@ -28,13 +28,15 @@ public class AsyncVoiceChannelJoinedListenerBean extends ListenerAdapter {
private ListenerService listenerService;
@Override
public void onGuildVoiceJoin(@NotNull GuildVoiceJoinEvent event) {
public void onGuildVoiceUpdate(@Nonnull GuildVoiceUpdateEvent event) {
if(listenerList == null) return;
VoiceChannelJoinedModel model = getModel(event);
listenerList.forEach(leaveListener -> listenerService.executeFeatureAwareListener(leaveListener, model, voiceChatJoinedExecutor));
if(event.getChannelJoined() != null && event.getChannelLeft() == null) {
VoiceChannelJoinedModel model = getModel(event);
listenerList.forEach(leaveListener -> listenerService.executeFeatureAwareListener(leaveListener, model, voiceChatJoinedExecutor));
}
}
private VoiceChannelJoinedModel getModel(GuildVoiceJoinEvent event) {
private VoiceChannelJoinedModel getModel(GuildVoiceUpdateEvent event) {
return VoiceChannelJoinedModel
.builder()
.channel(event.getChannelJoined())

14
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncVoiceChannelLeftListenerBean.java
View File

@@ -3,14 +3,14 @@ package dev.sheldan.abstracto.core.listener.async.jda;
import dev.sheldan.abstracto.core.listener.ListenerService;
import dev.sheldan.abstracto.core.models.listener.VoiceChannelLeftModel;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.guild.voice.GuildVoiceLeaveEvent;
import net.dv8tion.jda.api.events.guild.voice.GuildVoiceUpdateEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Component;
import javax.annotation.Nonnull;
import java.util.List;
@Component
@@ -28,13 +28,15 @@ public class AsyncVoiceChannelLeftListenerBean extends ListenerAdapter {
private ListenerService listenerService;
@Override
public void onGuildVoiceLeave(@NotNull GuildVoiceLeaveEvent event) {
public void onGuildVoiceUpdate(@Nonnull GuildVoiceUpdateEvent event) {
if(listenerList == null) return;
VoiceChannelLeftModel model = getModel(event);
listenerList.forEach(leaveListener -> listenerService.executeFeatureAwareListener(leaveListener, model, voiceChatLeaveExecutor));
if(event.getChannelJoined() == null && event.getChannelLeft() != null) {
VoiceChannelLeftModel model = getModel(event);
listenerList.forEach(leaveListener -> listenerService.executeFeatureAwareListener(leaveListener, model, voiceChatLeaveExecutor));
}
}
private VoiceChannelLeftModel getModel(GuildVoiceLeaveEvent event) {
private VoiceChannelLeftModel getModel(GuildVoiceUpdateEvent event) {
return VoiceChannelLeftModel
.builder()
.channel(event.getChannelLeft())

4
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/sync/jda/EmoteCreatedListenerBean.java
View File

@@ -6,11 +6,11 @@ import dev.sheldan.abstracto.core.utils.BeanUtils;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.emoji.EmojiAddedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Nonnull;
import javax.annotation.PostConstruct;
import java.util.List;
@@ -26,7 +26,7 @@ public class EmoteCreatedListenerBean extends ListenerAdapter {
@Override
@Transactional
public void onEmojiAdded(@NotNull EmojiAddedEvent event) {
public void onEmojiAdded(@Nonnull EmojiAddedEvent event) {
if(createdListeners == null) return;
EmoteCreatedModel model = getModel(event);
createdListeners.forEach(listener -> listenerService.executeFeatureAwareListener(listener, model));

4
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/sync/jda/EmoteDeletedListenerBean.java
View File

@@ -9,11 +9,11 @@ import dev.sheldan.abstracto.core.utils.BeanUtils;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.emoji.EmojiRemovedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import javax.annotation.Nonnull;
import javax.annotation.PostConstruct;
import java.util.List;
@@ -38,7 +38,7 @@ public class EmoteDeletedListenerBean extends ListenerAdapter {
private ListenerService listenerService;
@Override
public void onEmojiRemoved(@NotNull EmojiRemovedEvent event) {
public void onEmojiRemoved(@Nonnull EmojiRemovedEvent event) {
if(deletedListeners == null) return;
EmoteDeletedModel model = getModel(event);
deletedListeners.forEach(listener -> listenerService.executeFeatureAwareListener(listener, model));

4
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/sync/jda/EmoteUpdatedListenerBean.java
View File

@@ -6,12 +6,12 @@ import dev.sheldan.abstracto.core.utils.BeanUtils;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.emoji.update.EmojiUpdateNameEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Nonnull;
import javax.annotation.PostConstruct;
import java.util.List;
@@ -28,7 +28,7 @@ public class EmoteUpdatedListenerBean extends ListenerAdapter {
@Override
@Transactional
public void onEmojiUpdateName(@NotNull EmojiUpdateNameEvent event) {
public void onEmojiUpdateName(@Nonnull EmojiUpdateNameEvent event) {
if(updatedListeners == null) return;
EmoteNameUpdatedModel model = getModel(event);
updatedListeners.forEach(emoteUpdatedListener -> listenerService.executeFeatureAwareListener(emoteUpdatedListener, model));

4
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/sync/jda/MessageEmbeddedListenerBean.java
View File

@@ -11,13 +11,13 @@ import dev.sheldan.abstracto.core.utils.BeanUtils;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.message.MessageEmbedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Nonnull;
import javax.annotation.PostConstruct;
import java.util.List;
@@ -48,7 +48,7 @@ public class MessageEmbeddedListenerBean extends ListenerAdapter {
@Override
@Transactional
public void onMessageEmbed(@NotNull MessageEmbedEvent event) {
public void onMessageEmbed(@Nonnull MessageEmbedEvent event) {
if(listenerList == null) return;
GuildMessageEmbedEventModel model = buildModel(event);
listenerList.forEach(messageReceivedListener -> listenerService.executeFeatureAwareListener(messageReceivedListener, model));

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/sync/jda/ReadyListener.java
View File

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.core.listener.sync.jda;
import dev.sheldan.abstracto.core.service.BotService;
import dev.sheldan.abstracto.core.service.StartupServiceBean;
import dev.sheldan.abstracto.scheduling.service.SchedulerService;
import net.dv8tion.jda.api.events.ReadyEvent;
import net.dv8tion.jda.api.events.session.ReadyEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;

3
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/metric/JDAMetrics.java
View File

@@ -6,7 +6,6 @@ import dev.sheldan.abstracto.core.metric.service.MetricTag;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.GenericEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -24,7 +23,7 @@ public class JDAMetrics extends ListenerAdapter {
private final HashMap<Class, CounterMetric> coveredEvents = new HashMap<>();
@Override
public void onGenericEvent(@NotNull GenericEvent event) {
public void onGenericEvent(GenericEvent event) {
if(!coveredEvents.containsKey(event.getClass())) {
String eventName = event.getClass().getSimpleName();
CounterMetric metric =

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/repository/ChannelRepository.java
View File

@@ -1,7 +1,6 @@
package dev.sheldan.abstracto.core.repository;
import dev.sheldan.abstracto.core.models.database.AChannel;
import org.jetbrains.annotations.NotNull;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.lang.NonNull;
import org.springframework.stereotype.Repository;
@@ -11,7 +10,6 @@ import java.util.Optional;
@Repository
public interface ChannelRepository extends JpaRepository<AChannel, Long> {
@NotNull
@Override
Optional<AChannel> findById(@NonNull Long aLong);

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/repository/DefaultEmoteRepository.java
View File

@@ -1,7 +1,6 @@
package dev.sheldan.abstracto.core.repository;
import dev.sheldan.abstracto.core.models.database.DefaultEmote;
import org.jetbrains.annotations.NotNull;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@@ -11,7 +10,6 @@ import java.util.List;
public interface DefaultEmoteRepository extends JpaRepository<DefaultEmote, Long> {
DefaultEmote getByEmoteKey(String emoteKey);
@NotNull
@Override
List<DefaultEmote> findAll();
}

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/repository/EmoteRepository.java
View File

@@ -2,7 +2,6 @@ package dev.sheldan.abstracto.core.repository;
import dev.sheldan.abstracto.core.models.database.AEmote;
import dev.sheldan.abstracto.core.models.database.AServer;
import org.jetbrains.annotations.NotNull;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.lang.NonNull;
import org.springframework.stereotype.Repository;
@@ -22,7 +21,6 @@ public interface EmoteRepository extends JpaRepository<AEmote, Integer> {
boolean existsByEmoteIdAndServerRef(String emoteId, AServer server);
@NotNull
@Override
Optional<AEmote> findById(@NonNull Integer aLong);
}

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java
View File

@@ -18,7 +18,6 @@ import net.dv8tion.jda.api.interactions.components.ActionRow;
import net.dv8tion.jda.api.requests.restaction.AuditableRestAction;
import net.dv8tion.jda.api.requests.restaction.MessageEditAction;
import net.dv8tion.jda.api.utils.messages.MessageEditData;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -166,7 +165,6 @@ public class MessageServiceBean implements MessageService {
FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInMessageChannelList(template, model, privateChannel)));
}
@NotNull
public CompletableFuture<PrivateChannel> openPrivateChannelForUser(User user) {
return user.openPrivateChannel().submit();
}

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/templating/repository/AutoLoadMacroRepository.java
View File

@@ -1,7 +1,6 @@
package dev.sheldan.abstracto.core.templating.repository;
import dev.sheldan.abstracto.core.templating.model.database.AutoLoadMacro;
import org.jetbrains.annotations.NotNull;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@@ -9,7 +8,6 @@ import java.util.List;
@Repository
public interface AutoLoadMacroRepository extends JpaRepository<AutoLoadMacro, String> {
@NotNull
@Override
List<AutoLoadMacro> findAll();
}

2
abstracto-application/pom.xml
View File

@@ -57,7 +57,7 @@
<properties>
<maven.build.timestamp.format>yyyy/MM/dd HH:mm</maven.build.timestamp.format>
<jda.version>5.0.0-alpha.19</jda.version>
<jda.version>5.0.0-alpha.21</jda.version>
<asciidoctor.maven.plugin.version>2.0.0-RC.1</asciidoctor.maven.plugin.version>
<asciidoctorj.pdf.version>1.5.3</asciidoctorj.pdf.version>
<asciidoctorj.version>2.3.0</asciidoctorj.version>