Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-01-25 03:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed catch block in join listener for Exception, so the listener dont interrupt one another

Browse Source 
fixed join template
added join listener to check if a joined user should be muted
changed cached message to be an intant instead
fixed wrong id in mute table
moved the timestamps for mute notifications to the footer
fixed a case for message embeds, when the embed does not have a description
This commit is contained in:
Sheldan
2020-04-24 20:04:19 +02:00
parent b41a596acd
commit 0f8a39a336
15 changed files with 78 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/JoinMuteListener.java Normal file
View File

@@ -0,0 +1,36 @@
package dev.sheldan.abstracto.moderation.listener;
import dev.sheldan.abstracto.core.listener.JoinListener;
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import dev.sheldan.abstracto.moderation.config.ModerationFeatures;
import dev.sheldan.abstracto.moderation.service.MuteService;
import dev.sheldan.abstracto.moderation.service.management.MuteManagementService;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
@Slf4j
public class JoinMuteListener implements JoinListener {
@Autowired
private MuteManagementService muteManagementService;
@Autowired
private MuteService muteService;
@Override
public void execute(Member member, Guild guild, AUserInAServer aUserInAServer) {
if(muteManagementService.hasActiveMute(aUserInAServer)) {
log.info("Re-muting user {} which joined the server {}, because the mute has not ended yet.", member.getIdLong(), guild.getIdLong());
muteService.applyMuteRole(aUserInAServer);
}
}
@Override
public String getFeature() {
return ModerationFeatures.MUTING;
}
}

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

@@ -1,10 +1,11 @@
package dev.sheldan.abstracto.moderation.repository;
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import dev.sheldan.abstracto.moderation.models.database.Mute;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface MuteRepository extends JpaRepository<Mute, Long> {
boolean existsByMutedUserAndMuteEndedFalse(AUserInAServer userInAServer);
}

13
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/MuteServiceBean.java
View File

@@ -87,7 +87,7 @@ public class MuteServiceBean implements MuteService {
FullUser mutingUser = FullUser
.builder()
.aUserInAServer(userManagementService.loadUser(memberToMute))
.aUserInAServer(userManagementService.loadUser(mutingMember))
.member(mutingMember)
.build();
return muteUser(mutedUser, mutingUser, reason, unmuteDate, message);
@@ -123,8 +123,7 @@ public class MuteServiceBean implements MuteService {
throw new MuteException("Mute role for server has not been setup");
}
AUserInAServer userInServerBeingMuted = userBeingMuted.getAUserInAServer();
MuteRole muteRole = muteRoleManagementService.retrieveMuteRoleForServer(userInServerBeingMuted.getServerReference());
roleService.addRoleToUser(userInServerBeingMuted, muteRole.getRole());
applyMuteRole(userInServerBeingMuted);
AServerAChannelMessage origin = null;
if(message != null) {
AChannel channel = channelManagementService.loadChannel(message.getChannel().getIdLong());
@@ -147,6 +146,12 @@ public class MuteServiceBean implements MuteService {
return mute;
}
@Override
public void applyMuteRole(AUserInAServer aUserInAServer) {
MuteRole muteRole = muteRoleManagementService.retrieveMuteRoleForServer(aUserInAServer.getServerReference());
roleService.addRoleToUser(aUserInAServer, muteRole.getRole());
}
@Override
public void startUnmuteJobFor(Instant unmuteDate, Mute mute) {
Duration muteDuration = Duration.between(Instant.now(), unmuteDate);
@@ -205,6 +210,8 @@ public class MuteServiceBean implements MuteService {
.server(mute.getMutingServer())
.build();
sendUnmuteLog(unMuteLog);
mute.setMuteEnded(true);
muteManagementService.saveMute(mute);
}
@Override

14
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/MuteManagementServiceBean.java
View File

@@ -31,6 +31,7 @@ public class MuteManagementServiceBean implements MuteManagementService {
.mutingChannel(origin.getChannel())
.messageId(origin.getMessageId())
.reason(reason)
.muteEnded(false)
.build();
muteRepository.save(mute);
return mute;
@@ -40,4 +41,17 @@ public class MuteManagementServiceBean implements MuteManagementService {
public Mute findMute(Long muteId) {
return muteRepository.getOne(muteId);
}
@Override
public Mute saveMute(Mute mute) {
muteRepository.save(mute);
return mute;
}
@Override
public boolean hasActiveMute(AUserInAServer userInAServer) {
return muteRepository.existsByMutedUserAndMuteEndedFalse(userInAServer);
}
}

7
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/templates/mute/mute_log_embed_en_US.ftl
View File

@@ -28,10 +28,6 @@
"name": "Reason",
"value": "${mute.reason}"
},
{
"name": "Muted from",
"value": "${formatInstant(mute.muteDate, "yyyy-MM-dd HH:mm:ss")}"
},
{
"name": "Muted for",
"value": "${fmtDuration(muteDuration)}"
@@ -43,5 +39,6 @@
],
"footer": {
"text": "Mute #${mute.id}"
}
},
"timeStamp": "${mute.muteDate}"
}

3
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/templates/mute/unmute_log_embed_en_US.ftl
View File

@@ -39,5 +39,6 @@
],
"footer": {
"text": "Mute #${mute.id}"
}
},
"timeStamp": "${mute.muteTargetDate}"
}

2
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/database/Mute.java
View File

@@ -35,6 +35,8 @@ public class Mute {
private Instant muteTargetDate;
private Boolean muteEnded;
@Column
private Long messageId;

1
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/MuteService.java
View File

@@ -13,6 +13,7 @@ public interface MuteService {
Mute muteMember(Member memberToMute, Member userMuting, String reason, Instant unmuteDate, Message message);
Mute muteMember(AUserInAServer member, AUserInAServer userMuting, String reason, Instant unmuteDate, Message message);
Mute muteUser(FullUser userToMute, FullUser userMuting, String reason, Instant unmuteDate, Message message);
void applyMuteRole(AUserInAServer aUserInAServer);
void muteMemberWithLog(Member memberToMute, Member memberMuting, String reason, Instant unmuteDate, MuteLog log, Message message);
void startUnmuteJobFor(Instant unmuteDate, Mute mute);
void unmuteUser(Mute mute);

2
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/management/MuteManagementService.java
View File

@@ -9,4 +9,6 @@ import java.time.Instant;
public interface MuteManagementService {
Mute createMute(AUserInAServer aUserInAServer, AUserInAServer mutingUser, String reason, Instant unmuteDate, AServerAChannelMessage creation);
Mute findMute(Long muteId);
Mute saveMute(Mute mute);
boolean hasActiveMute(AUserInAServer userInAServer);
}

2
abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/templates/listener/embed/message_embed_en_US.ftl
View File

@@ -13,7 +13,7 @@
<#list embeddedMessage.embeds>
Embeds:
<#items as embed>
Description: ${embed.description} <#if embed.imageUrl?has_content> ImageUrl: ${embed.imageUrl} </#if>
Description: <#if embed.description?has_content >${embed.description}</#if> <#if embed.imageUrl?has_content> ImageUrl: ${embed.imageUrl} </#if>
</#items>
</#list>
",

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

@@ -38,7 +38,7 @@ public class JoinListenerBean extends ListenerAdapter {
try {
AUserInAServer aUserInAServer = userManagementService.loadUser(event.getMember());
executeListener(event, joinListener, aUserInAServer);
} catch (AbstractoRunTimeException e) {
} catch (Exception e) {
log.error("Listener {} failed with exception:", joinListener.getClass().getName(), e);
}
});

3
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/repository/ServerRepository.java
View File

@@ -4,9 +4,6 @@ import dev.sheldan.abstracto.core.models.database.AServer;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface ServerRepository extends JpaRepository<AServer, Long> {
List<AServer> findAll();
}

3
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageCacheBean.java
View File

@@ -19,6 +19,7 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import java.awt.*;
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@@ -128,7 +129,7 @@ public class MessageCacheBean implements MessageCache {
.content(message.getContentRaw())
.embeds(embeds)
.reactions(getFutures(futures))
.timeCreated(message.getTimeCreated())
.timeCreated(Instant.from(message.getTimeCreated()))
.attachmentUrls(attachmentUrls)
.build());
});

2
abstracto-application/core/core-impl/src/main/resources/seedData/templates/coreEvents/user_join_en_US.ftl
View File

@@ -1 +1 @@
User ${user.name}#${user.discriminator} (${userMention}) has joined the guild.
User ${user.name}#${user.discriminator} (${user.asMention}) has joined the guild.

4
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedMessage.java vendored
View File

@@ -5,7 +5,7 @@ import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import java.time.OffsetDateTime;
import java.time.Instant;
import java.util.List;
@Getter
@@ -16,7 +16,7 @@ public class CachedMessage {
private Long channelId;
private Long messageId;
private Long authorId;
private OffsetDateTime timeCreated;
private Instant timeCreated;
private String content;
private List<CachedEmbed> embeds;
private List<String> attachmentUrls;