mirror of
https://github.com/Sheldan/abstracto.git
synced 2026-04-05 00:53:04 +00:00
[AB-78] fixing users with previous experience not awarding the experience role if they join and are pending
This commit is contained in:
@@ -22,6 +22,11 @@ public class ListenerExecutorConfig {
|
||||
return executorService.setupExecutorFor("joinListener");
|
||||
}
|
||||
|
||||
@Bean(name = "memberPendingUpdateExecutor")
|
||||
public TaskExecutor memberPendingUpdateExecutor() {
|
||||
return executorService.setupExecutorFor("memberPendingUpdateListener");
|
||||
}
|
||||
|
||||
@Bean(name = "leaveListenerExecutor")
|
||||
public TaskExecutor leaveListenerExecutor() {
|
||||
return executorService.setupExecutorFor("leaveListener");
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
package dev.sheldan.abstracto.core.listener.async.jda;
|
||||
|
||||
import dev.sheldan.abstracto.core.listener.ListenerService;
|
||||
import dev.sheldan.abstracto.core.models.ServerUser;
|
||||
import dev.sheldan.abstracto.core.models.listener.MemberUpdatePendingModel;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.dv8tion.jda.api.events.guild.member.update.GuildMemberUpdatePendingEvent;
|
||||
import net.dv8tion.jda.api.hooks.ListenerAdapter;
|
||||
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
|
||||
@Slf4j
|
||||
public class AsyncMemberPendingUpdateListenerBean extends ListenerAdapter {
|
||||
|
||||
@Autowired(required = false)
|
||||
private List<AsyncUpdatePendingListener> listenerList;
|
||||
|
||||
@Autowired
|
||||
@Qualifier("memberPendingUpdateExecutor")
|
||||
private TaskExecutor memberPendingUpdateListenerExecutor;
|
||||
|
||||
@Autowired
|
||||
private ListenerService listenerService;
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void onGuildMemberUpdatePending(@Nonnull GuildMemberUpdatePendingEvent event) {
|
||||
if(listenerList == null) return;
|
||||
MemberUpdatePendingModel model = getModel(event);
|
||||
listenerList.forEach(joinListener -> listenerService.executeFeatureAwareListener(joinListener, model, memberPendingUpdateListenerExecutor));
|
||||
}
|
||||
|
||||
private MemberUpdatePendingModel getModel(GuildMemberUpdatePendingEvent event) {
|
||||
ServerUser serverUser = ServerUser
|
||||
.builder()
|
||||
.serverId(event.getGuild().getIdLong())
|
||||
.userId(event.getUser().getIdLong())
|
||||
.isBot(event.getUser().isBot())
|
||||
.build();
|
||||
return MemberUpdatePendingModel
|
||||
.builder()
|
||||
.user(serverUser)
|
||||
.member(event.getMember())
|
||||
.build();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
package dev.sheldan.abstracto.core.listener.async.jda;
|
||||
|
||||
import dev.sheldan.abstracto.core.listener.DefaultListenerResult;
|
||||
import dev.sheldan.abstracto.core.listener.FeatureAwareListener;
|
||||
import dev.sheldan.abstracto.core.models.listener.MemberUpdatePendingModel;
|
||||
|
||||
public interface AsyncUpdatePendingListener extends FeatureAwareListener<MemberUpdatePendingModel, DefaultListenerResult> {
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package dev.sheldan.abstracto.core.models.listener;
|
||||
|
||||
import dev.sheldan.abstracto.core.listener.FeatureAwareListenerModel;
|
||||
import dev.sheldan.abstracto.core.models.ServerUser;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import net.dv8tion.jda.api.entities.Member;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@Builder
|
||||
public class MemberUpdatePendingModel implements FeatureAwareListenerModel {
|
||||
private ServerUser user;
|
||||
private Member member;
|
||||
|
||||
@Override
|
||||
public Long getServerId() {
|
||||
return user.getServerId();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user