Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-04-23 06:09:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-232] moving logging to separate module

Browse Source 
refactoring leave and join listener
This commit is contained in:
Sheldan
2021-04-24 16:00:58 +02:00
parent fa4c455ca2
commit 27763e985d
42 changed files with 1710 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/MessageUpdatedListenerBean.java
View File

@@ -1,12 +1,12 @@
package dev.sheldan.abstracto.core.listener;
import dev.sheldan.abstracto.core.listener.async.jda.AsyncMessageTextUpdatedListener;
import dev.sheldan.abstracto.core.listener.sync.jda.MessageTextUpdatedListener;
import dev.sheldan.abstracto.core.listener.async.jda.AsyncMessageUpdatedListener;
import dev.sheldan.abstracto.core.listener.sync.jda.MessageUpdatedListener;
import dev.sheldan.abstracto.core.metric.service.CounterMetric;
import dev.sheldan.abstracto.core.metric.service.MetricService;
import dev.sheldan.abstracto.core.metric.service.MetricTag;
import dev.sheldan.abstracto.core.models.cache.CachedMessage;
import dev.sheldan.abstracto.core.models.listener.MessageTextUpdatedModel;
import dev.sheldan.abstracto.core.models.listener.MessageUpdatedModel;
import dev.sheldan.abstracto.core.service.MessageCache;
import dev.sheldan.abstracto.core.utils.BeanUtils;
import lombok.extern.slf4j.Slf4j;
@@ -32,7 +32,7 @@ import static dev.sheldan.abstracto.core.listener.sync.jda.MessageReceivedListen
public class MessageUpdatedListenerBean extends ListenerAdapter {
@Autowired(required = false)
private List<MessageTextUpdatedListener> listenerList;
private List<MessageUpdatedListener> listenerList;
@Autowired
private MessageCache messageCache;
@@ -44,7 +44,7 @@ public class MessageUpdatedListenerBean extends ListenerAdapter {
private ListenerService listenerService;
@Autowired(required = false)
private List<AsyncMessageTextUpdatedListener> asyncListenerList;
private List<AsyncMessageUpdatedListener> asyncListenerList;
@Autowired
@Qualifier("messageUpdatedExecutor")
@@ -84,12 +84,12 @@ public class MessageUpdatedListenerBean extends ListenerAdapter {
@Transactional
public void executeListener(CachedMessage cachedMessage, GuildMessageUpdateEvent event) {
if(listenerList == null) return;
MessageTextUpdatedModel model = getModel(event, cachedMessage);
listenerList.forEach(messageTextUpdatedListener -> listenerService.executeFeatureAwareListener(messageTextUpdatedListener, model));
MessageUpdatedModel model = getModel(event, cachedMessage);
listenerList.forEach(messageUpdatedListener -> listenerService.executeFeatureAwareListener(messageUpdatedListener, model));
}
private MessageTextUpdatedModel getModel(GuildMessageUpdateEvent event, CachedMessage oldMessage) {
return MessageTextUpdatedModel
private MessageUpdatedModel getModel(GuildMessageUpdateEvent event, CachedMessage oldMessage) {
return MessageUpdatedModel
.builder()
.after(event.getMessage())
.before(oldMessage)
@@ -98,7 +98,7 @@ public class MessageUpdatedListenerBean extends ListenerAdapter {
private void executeAsyncListeners(GuildMessageUpdateEvent event, CachedMessage oldMessage) {
if(asyncListenerList == null) return;
MessageTextUpdatedModel model = getModel(event, oldMessage);
MessageUpdatedModel model = getModel(event, oldMessage);
asyncListenerList.forEach(messageTextUpdatedListener ->
listenerService.executeFeatureAwareListener(messageTextUpdatedListener, model, messageUpdatedExecutor)
);

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

@@ -46,7 +46,7 @@ public class AsyncLeaveListenerBean extends ListenerAdapter {
return MemberLeaveModel
.builder()
.leavingUser(serverUser)
.member(event.getMember())
.user(event.getUser())
.build();
}

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

@@ -50,7 +50,7 @@ public class LeaveListenerBean extends ListenerAdapter {
return MemberLeaveModel
.builder()
.leavingUser(serverUser)
.member(event.getMember())
.user(event.getUser())
.build();
}

8
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncMessageTextUpdatedListener.java
View File

@@ -1,8 +0,0 @@
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.MessageTextUpdatedModel;
public interface AsyncMessageTextUpdatedListener extends FeatureAwareListener<MessageTextUpdatedModel, DefaultListenerResult> {
}

8
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/listener/async/jda/AsyncMessageUpdatedListener.java Normal file
View File

@@ -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.MessageUpdatedModel;
public interface AsyncMessageUpdatedListener extends FeatureAwareListener<MessageUpdatedModel, DefaultListenerResult> {
}

4
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/listener/sync/jda/MessageTextUpdatedListener.java → abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/listener/sync/jda/MessageUpdatedListener.java
View File

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.core.listener.sync.jda;
import dev.sheldan.abstracto.core.Prioritized;
import dev.sheldan.abstracto.core.listener.DefaultListenerResult;
import dev.sheldan.abstracto.core.listener.FeatureAwareListener;
import dev.sheldan.abstracto.core.models.listener.MessageTextUpdatedModel;
import dev.sheldan.abstracto.core.models.listener.MessageUpdatedModel;
public interface MessageTextUpdatedListener extends FeatureAwareListener<MessageTextUpdatedModel, DefaultListenerResult>, Prioritized {
public interface MessageUpdatedListener extends FeatureAwareListener<MessageUpdatedModel, DefaultListenerResult>, Prioritized {
}

4
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/listener/MemberLeaveModel.java
View File

@@ -5,14 +5,14 @@ import dev.sheldan.abstracto.core.models.ServerUser;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.User;
@Getter
@Setter
@Builder
public class MemberLeaveModel implements FeatureAwareListenerModel {
private ServerUser leavingUser;
private Member member;
private User user;
@Override
public Long getServerId() {
return leavingUser.getServerId();

2
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/listener/MessageTextUpdatedModel.java → abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/listener/MessageUpdatedModel.java
View File

@@ -10,7 +10,7 @@ import net.dv8tion.jda.api.entities.Message;
@Getter
@Setter
@Builder
public class MessageTextUpdatedModel implements FeatureAwareListenerModel {
public class MessageUpdatedModel implements FeatureAwareListenerModel {
private CachedMessage before;
private Message after;