Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-01-26 13:46:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-xxx] adding information whether a modmail thread comes from an appeal to storage and to modmail notification

Browse Source
This commit is contained in:
Sheldan
2024-11-06 21:46:19 +01:00
parent 5b90d429c2
commit 90816649e2
14 changed files with 159 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/command/Contact.java
View File

@@ -88,7 +88,7 @@ public class Contact extends AbstractConditionableCommand {
List<CompletableFuture<Message>> futures = channelService.sendEmbedTemplateInTextChannelList(MODMAIL_THREAD_ALREADY_EXISTS_TEMPLATE, model, commandContext.getChannel());
return FutureUtils.toSingleFutureGeneric(futures).thenApply(aVoid -> CommandResult.fromIgnored());
} else {
return modMailThreadService.createModMailThreadForUser(targetUser.getUser(), targetUser.getGuild(), null, false, commandContext.getUndoActions())
return modMailThreadService.createModMailThreadForUser(targetUser.getUser(), targetUser.getGuild(), null, false, commandContext.getUndoActions(), false)
.thenCompose(unused -> modMailThreadService.sendContactNotification(targetUser.getUser(), unused, commandContext.getChannel()))
.thenApply(aVoid -> CommandResult.fromSuccess());
}
@@ -112,7 +112,7 @@ public class Contact extends AbstractConditionableCommand {
.thenApply(interactionHook -> CommandResult.fromSuccess());
} else {
CompletableFuture<InteractionHook> response = interactionService.replyEmbed(CONTACT_RESPONSE, event);
CompletableFuture<MessageChannel> threadFuture = modMailThreadService.createModMailThreadForUser(user, event.getGuild(), null, false, new ArrayList<>());
CompletableFuture<MessageChannel> threadFuture = modMailThreadService.createModMailThreadForUser(user, event.getGuild(), null, false, new ArrayList<>(), false);
return CompletableFuture.allOf(response, threadFuture)
.thenCompose(unused -> modMailThreadService.sendContactNotification(user, threadFuture.join(), response.join()))
.thenApply(o -> CommandResult.fromSuccess());

3
abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/listener/ModMailInitialButtonListener.java
View File

@@ -53,10 +53,11 @@ public class ModMailInitialButtonListener implements ButtonClickedListener {
log.debug("Executing action for creationg a modmail thread in server {} for user {}.", chosenServer.getServerId(), userId);
ArrayList<UndoActionInstance> undoActions = new ArrayList<>();
Guild guild = guildService.getGuildById(chosenServer.getServerId());
boolean appeal = chosenServer.getAppealModmail() != null && chosenServer.getAppealModmail();
channelService.retrieveMessageInChannel(model.getEvent().getChannel(), choices.getMessageId())
.thenCompose(originalMessage -> {
try {
return modMailThreadService.createModMailThreadForUser(model.getEvent().getUser(), guild, originalMessage, true, undoActions);
return modMailThreadService.createModMailThreadForUser(model.getEvent().getUser(), guild, originalMessage, true, undoActions, appeal);
} catch (Exception ex) {
log.error("Failed to setup thread correctly", ex);
undoActionService.performActions(undoActions);

211
abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailThreadServiceBean.java
View File

@@ -190,7 +190,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService {
public static final String MODMAIL_INITIAL_ORIGIN = "modmailInitial";
@Override
public CompletableFuture<MessageChannel> createModMailThreadForUser(User user, Guild guild, Message initialMessage, boolean userInitiated, List<UndoActionInstance> undoActions) {
public CompletableFuture<MessageChannel> createModMailThreadForUser(User user, Guild guild, Message initialMessage, boolean userInitiated, List<UndoActionInstance> undoActions, boolean appeal) {
Long serverId = guild.getIdLong();
AServer server = serverManagementService.loadServer(serverId);
metricService.incrementCounter(MODMAIL_THREAD_CREATED_COUNTER);
@@ -204,7 +204,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService {
.build();
String channelName = templateService.renderTemplate(TEXT_CHANNEL_NAME_TEMPLATE_KEY, model, serverId);
if (featureModeService.featureModeActive(ModMailFeatureDefinition.MOD_MAIL, serverId, ModMailMode.THREAD_CONTAINER)) {
MessageToSend notificationMessageToSend = getModmailNotificationMessageToSend(user, null, serverId, false);
MessageToSend notificationMessageToSend = getModmailNotificationMessageToSend(user, null, serverId, false, appeal);
Optional<GuildMessageChannel> modmailContainerOptional = postTargetService.getPostTargetChannel(ModMailPostTargets.MOD_MAIL_CONTAINER, serverId);
if(modmailContainerOptional.isEmpty()) {
throw new AbstractoRunTimeException("Modmail thread container not setup.");
@@ -220,7 +220,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService {
.thenCompose(unused -> channelService.createThreadWithStarterMessage(textChannel, channelName, notificationMessage.get(0).join().getIdLong()))
.thenCompose(threadChannel -> {
undoActions.add(UndoActionInstance.getChannelDeleteAction(serverId, threadChannel.getIdLong()));
return self.performModMailThreadSetup(user, initialMessage, threadChannel, userInitiated, undoActions)
return self.performModMailThreadSetup(user, initialMessage, threadChannel, userInitiated, undoActions, appeal)
.thenCompose(unused -> CompletableFuture.completedFuture(threadChannel));
});
} else {
@@ -229,7 +229,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService {
CompletableFuture<TextChannel> textChannelFuture = channelService.createTextChannel(channelName, server, categoryId);
return textChannelFuture.thenCompose(channel -> {
undoActions.add(UndoActionInstance.getChannelDeleteAction(serverId, channel.getIdLong()));
return self.performModMailThreadSetup(user, initialMessage, channel, userInitiated, undoActions)
return self.performModMailThreadSetup(user, initialMessage, channel, userInitiated, undoActions, appeal)
.thenCompose(unused -> CompletableFuture.completedFuture(channel));
});
}
@@ -264,10 +264,11 @@ public class ModMailThreadServiceBean implements ModMailThreadService {
* @param channel The created {@link TextChannel} in which the mod mail thread is dealt with
* @param userInitiated Whether the thread was initiated by a member
* @param undoActions The list of actions to undo, in case an exception occurs
* @param appeal Whether the modmail thread is for the purpose of an appeal
* @return A {@link CompletableFuture future} which completes when the setup is done
*/
@Transactional
public CompletableFuture<Void> performModMailThreadSetup(User user, Message initialMessage, GuildMessageChannel channel, boolean userInitiated, List<UndoActionInstance> undoActions) {
public CompletableFuture<Void> performModMailThreadSetup(User user, Message initialMessage, GuildMessageChannel channel, boolean userInitiated, List<UndoActionInstance> undoActions, boolean appeal) {
log.info("Performing modmail thread setup for channel {} for user {} in server {}. It was initiated by a user: {}.", channel.getIdLong(), user.getId(), channel.getGuild().getId(), userInitiated);
CompletableFuture<Void> headerFuture = sendModMailHeader(channel, user);
CompletableFuture<Message> userReplyMessage;
@@ -280,21 +281,21 @@ public class ModMailThreadServiceBean implements ModMailThreadService {
}
CompletableFuture notificationFuture;
if (userInitiated) {
notificationFuture = self.sendModMailNotification(user, channel);
notificationFuture = self.sendModMailNotification(user, channel, appeal);
} else {
notificationFuture = CompletableFuture.completedFuture(null);
}
return CompletableFuture.allOf(headerFuture, notificationFuture, userReplyMessage).thenAccept(aVoid -> {
undoActions.clear();
self.setupModMailThreadInDB(initialMessage, channel, user, userReplyMessage.join());
self.setupModMailThreadInDB(initialMessage, channel, user, userReplyMessage.join(), appeal);
});
}
@Transactional
public void setupModMailThreadInDB(Message initialMessage, GuildMessageChannel channel, User user, Message sendMessage) {
public void setupModMailThreadInDB(Message initialMessage, GuildMessageChannel channel, User user, Message sendMessage, boolean appeal) {
log.info("Persisting info about modmail thread {} in database.", channel.getIdLong());
AUserInAServer aUserInAServer = userInServerManagementService.loadOrCreateUser(channel.getGuild().getIdLong(), user.getIdLong());
ModMailThread thread = createThreadObject(channel, aUserInAServer);
ModMailThread thread = createThreadObject(channel, aUserInAServer, appeal);
if(initialMessage != null) {
log.debug("Adding initial message {} to modmail thread in channel {}.", initialMessage.getId(), channel.getId());
modMailMessageManagementService.addMessageToThread(thread, null, sendMessage, initialMessage, aUserInAServer, false, false);
@@ -305,16 +306,17 @@ public class ModMailThreadServiceBean implements ModMailThreadService {
* Sends the message containing the pings to notify the staff members to handle the opened {@link ModMailThread}
* @param user The {@link FullUserInServer} which opened the thread
* @param channel The created {@link GuildMessageChannel} in which the mod mail thread is dealt with
* @param appeal Whether the modmail thread is for the purpose of an appeal
* @return A {@link CompletableFuture future} which completes when the notification has been sent
*/
@Transactional
public CompletableFuture<Void> sendModMailNotification(User user, GuildMessageChannel channel) {
public CompletableFuture<Void> sendModMailNotification(User user, GuildMessageChannel channel, boolean appeal) {
Long serverId = channel.getGuild().getIdLong();
MessageToSend messageToSend = getModmailNotificationMessageToSend(user, channel, serverId, true);
MessageToSend messageToSend = getModmailNotificationMessageToSend(user, channel, serverId, true, appeal);
return FutureUtils.toSingleFutureGeneric(postTargetService.sendEmbedInPostTarget(messageToSend, ModMailPostTargets.MOD_MAIL_PING, serverId));
}
private MessageToSend getModmailNotificationMessageToSend(User user, GuildMessageChannel channel, Long serverId, boolean pingRole) {
private MessageToSend getModmailNotificationMessageToSend(User user, GuildMessageChannel channel, Long serverId, boolean pingRole, boolean appeal) {
log.info("Sending modmail notification for new modmail thread about user {} in server {}.", user.getId(), serverId);
AServer server = serverManagementService.loadServer(serverId);
List<ModMailRole> rolesToPing;
@@ -328,6 +330,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService {
.builder()
.userDisplay(UserDisplay.fromUser(user))
.roles(rolesToPing)
.appeal(appeal)
.channel(channel)
.build();
return templateService.renderEmbedTemplate("modmail_notification_message", modMailNotificationModel, serverId);
@@ -337,14 +340,15 @@ public class ModMailThreadServiceBean implements ModMailThreadService {
* Creates the instance of the {@link ModMailThread} in the database.
* @param channel The {@link GuildMessageChannel} in which the {@link ModMailThread} is being done
* @param user The {@link AUserInAServer} which the thread is about
* @param appeal Whether the modmail thread is for the purpose of an appeal
* @return The created instance of {@link ModMailThread}
*/
public ModMailThread createThreadObject(GuildMessageChannel channel, AUserInAServer user) {
public ModMailThread createThreadObject(GuildMessageChannel channel, AUserInAServer user, boolean appeal) {
log.info("Creating database objects related to modmail thread in channel {} and about user {} in server {}.", channel.getIdLong(), user.getUserReference().getId(), channel.getGuild().getId());
boolean useThreads = featureModeService.featureModeActive(ModMailFeatureDefinition.MOD_MAIL, channel.getGuild().getIdLong(), ModMailMode.THREAD_CONTAINER);
AChannel aChannel = channelManagementService.createChannel(channel.getIdLong(), useThreads ? AChannelType.PUBLIC_THREAD : AChannelType.TEXT, user.getServerReference());
log.info("Creating mod mail thread in channel {} with db channel {}", channel.getIdLong(), aChannel.getId());
return modMailThreadManagementService.createModMailThread(user, aChannel);
return modMailThreadManagementService.createModMailThread(user, aChannel, appeal);
}
@Override
@@ -368,103 +372,108 @@ public class ModMailThreadServiceBean implements ModMailThreadService {
AServer server = serverManagementService.loadServer(guild);
servers.add(server);
});
if(!servers.isEmpty()) {
log.info("There are {} shared servers between user and the bot.", servers.size());
List<ServerChoice> availableGuilds = new ArrayList<>();
Set<Long> alreadyConsideredServers = new HashSet<>();
for (AServer server : servers) {
// only take the servers in which mod mail is actually enabled, would not make much sense to make the
// other servers available
boolean possibleForModmail = featureFlagService.isFeatureEnabled(modMailFeatureConfig, server);
if (possibleForModmail) {
Guild guild = guildService.getGuildById(server.getId());
ServerChoice serverChoice = ServerChoice
.builder()
.serverId(guild.getIdLong())
.serverName(guild.getName())
.build();
availableGuilds.add(serverChoice);
}
alreadyConsideredServers.add(server.getId());
}
List<AServer> restOfKnownServers = serverManagementService.getAllServers()
.stream()
.filter(server -> alreadyConsideredServers.contains(server.getId()))
.toList();
for (AServer server : restOfKnownServers) {
boolean possibleForModmail = false;
Long actualServerId = 0L;
Long potentialMainServer = configService.getLongValue(ModMailFeatureConfig.MOD_MAIL_APPEAL_SERVER, server.getId()); // what _other_ server is the appeal server
if(potentialMainServer != 0) {
if(featureModeService.featureModeActive(ModMailFeatureDefinition.MOD_MAIL, potentialMainServer, ModMailMode.MOD_MAIL_APPEALS)) {
Long configuredAppealServerId = configService.getLongValue(ModMailFeatureConfig.MOD_MAIL_APPEAL_SERVER, potentialMainServer);
if(configuredAppealServerId != 0 && configuredAppealServerId.equals(server.getId())) { // if the other server has set the current server as the appeal config
Guild otherGuild = guildService.getGuildById(potentialMainServer);
if(otherGuild != null) { // check if we are part of that server
possibleForModmail = true;
actualServerId = potentialMainServer;
log.info("Server {} was available, because it is using server {} as a mod mail appeal server.", server.getId(), otherGuild.getIdLong());
}
if(servers.isEmpty()) {
log.warn("User {} which was not known in any of the servers tried to contact the bot.", user.getId());
return;
}
log.info("There are {} shared servers between user and the bot.", servers.size());
List<ServerChoice> availableGuilds = new ArrayList<>();
Set<Long> alreadyConsideredServers = new HashSet<>();
for (AServer server : servers) {
// only take the servers in which mod mail is actually enabled, would not make much sense to make the
// other servers available
boolean possibleForModmail = featureFlagService.isFeatureEnabled(modMailFeatureConfig, server);
if (possibleForModmail) {
Guild guild = guildService.getGuildById(server.getId());
ServerChoice serverChoice = ServerChoice
.builder()
.serverId(guild.getIdLong())
.serverName(guild.getName())
.build();
availableGuilds.add(serverChoice);
}
alreadyConsideredServers.add(server.getId());
}
List<AServer> restOfKnownServers = serverManagementService.getAllServers()
.stream()
.filter(server -> alreadyConsideredServers.contains(server.getId()))
.toList();
for (AServer server : restOfKnownServers) {
boolean possibleForModmail = false;
Long actualServerId = 0L;
Long potentialMainServer = configService.getLongValue(ModMailFeatureConfig.MOD_MAIL_APPEAL_SERVER, server.getId()); // what _other_ server is the appeal server
if(potentialMainServer != 0) {
if(featureModeService.featureModeActive(ModMailFeatureDefinition.MOD_MAIL, potentialMainServer, ModMailMode.MOD_MAIL_APPEALS)) {
Long configuredAppealServerId = configService.getLongValue(ModMailFeatureConfig.MOD_MAIL_APPEAL_SERVER, potentialMainServer);
if(configuredAppealServerId != 0 && configuredAppealServerId.equals(server.getId())) { // if the other server has set the current server as the appeal config
Guild otherGuild = guildService.getGuildById(potentialMainServer);
if(otherGuild != null) { // check if we are part of that server
possibleForModmail = true;
actualServerId = potentialMainServer;
log.info("Server {} was available, because it is using server {} as a mod mail appeal server.", server.getId(), otherGuild.getIdLong());
}
} else {
log.info("Server {} has set the appeal server {}, but that server does not have mod mail appeals enabled.", server.getId(), potentialMainServer);
}
}
if(possibleForModmail) {
Guild guild = guildService.getGuildById(actualServerId);
ServerChoice serverChoice = ServerChoice
.builder()
.serverId(guild.getIdLong())
.serverName(guild.getName())
.build();
availableGuilds.add(serverChoice);
} else {
log.info("Server {} has set the appeal server {}, but that server does not have mod mail appeals enabled.", server.getId(), potentialMainServer);
}
}
log.info("There were {} available servers found.", availableGuilds.size());
// if more than 1 server is available, show a choice dialog
ArrayList<UndoActionInstance> undoActions = new ArrayList<>();
if(availableGuilds.size() > 1) {
Map<String, ServerChoice> choices = new HashMap<>();
ServerChoices serverChoices = ServerChoices
if(possibleForModmail) {
Guild guild = guildService.getGuildById(actualServerId);
ServerChoice serverChoice = ServerChoice
.builder()
.commonGuilds(choices)
.userId(initialMessage.getAuthor().getIdLong())
.messageId(initialMessage.getIdLong())
.serverId(guild.getIdLong())
.serverName(guild.getName())
.appealModmail(true)
.build();
availableGuilds.forEach(serverChoice -> choices.put(componentService.generateComponentId(), serverChoice));
ModMailServerChooserModel modMailServerChooserModel = ModMailServerChooserModel
.builder()
.choices(serverChoices)
.build();
MessageToSend messageToSend = templateService.renderEmbedTemplate("modmail_modal_server_choice", modMailServerChooserModel);
FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(messageToSend, initialMessage.getChannel()))
.thenAccept(unused -> self.persistInitialCallbacks(serverChoices))
.exceptionally(throwable -> {
log.error("Failed to setup prompt message correctly", throwable);
undoActionService.performActions(undoActions);
return null;
});
log.debug("Displaying server choice message for user {} in channel {}.", user.getId(), initialMessage.getChannel().getId());
} else if(availableGuilds.size() == 1) {
// if exactly one server is available, open the thread directly
Long chosenServerId = availableGuilds.get(0).getServerId();
Guild guild = guildService.getGuildById(chosenServerId);
log.info("Only one server available to modmail. Directly opening modmail thread for user {} in server {}.", initialMessage.getAuthor().getId(), chosenServerId);
createModMailThreadForUser(initialMessage.getAuthor(), guild , initialMessage, true, undoActions)
.thenAccept(messageChannel -> {
log.info("Setup modmail thread for user {} in guild {}.", initialMessage.getAuthor().getIdLong(), guild.getIdLong());
}).exceptionally(throwable -> {
log.error("Failed to setup modmail channel in guild {} for user {}.", guild.getIdLong(), initialMessage.getAuthor().getIdLong(), throwable);
availableGuilds.add(serverChoice);
}
}
log.info("There were {} available servers found.", availableGuilds.size());
// if more than 1 server is available, show a choice dialog
ArrayList<UndoActionInstance> undoActions = new ArrayList<>();
if(availableGuilds.size() > 1) {
Map<String, ServerChoice> choices = new HashMap<>();
ServerChoices serverChoices = ServerChoices
.builder()
.commonGuilds(choices)
.userId(initialMessage.getAuthor().getIdLong())
.messageId(initialMessage.getIdLong())
.build();
availableGuilds.forEach(serverChoice -> choices.put(componentService.generateComponentId(), serverChoice));
ModMailServerChooserModel modMailServerChooserModel = ModMailServerChooserModel
.builder()
.choices(serverChoices)
.build();
MessageToSend messageToSend = templateService.renderEmbedTemplate("modmail_modal_server_choice", modMailServerChooserModel);
FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(messageToSend, initialMessage.getChannel()))
.thenAccept(unused -> self.persistInitialCallbacks(serverChoices))
.exceptionally(throwable -> {
log.error("Failed to setup prompt message correctly", throwable);
undoActionService.performActions(undoActions);
return null;
});
} else {
log.info("No server available to open a modmail thread in.");
// in case there is no server available, send an error message
channelService.sendEmbedTemplateInMessageChannelList("modmail_no_server_available", new Object(), initialMessage.getChannel());
}
log.debug("Displaying server choice message for user {} in channel {}.", user.getId(), initialMessage.getChannel().getId());
} else if(availableGuilds.size() == 1) {
// if exactly one server is available, open the thread directly
ServerChoice onlyChoice = availableGuilds.get(0);
Long chosenServerId = onlyChoice.getServerId();
Guild guild = guildService.getGuildById(chosenServerId);
boolean appeal = onlyChoice.getAppealModmail();
log.info("Only one server available to modmail. Directly opening modmail thread for user {} in server {}.", initialMessage.getAuthor().getId(), chosenServerId);
createModMailThreadForUser(initialMessage.getAuthor(), guild , initialMessage, true, undoActions, appeal)
.thenAccept(messageChannel -> {
log.info("Setup modmail thread for user {} in guild {}.", initialMessage.getAuthor().getIdLong(), guild.getIdLong());
}).exceptionally(throwable -> {
log.error("Failed to setup modmail channel in guild {} for user {}.", guild.getIdLong(), initialMessage.getAuthor().getIdLong(), throwable);
return null;
});
} else {
log.warn("User {} which was not known in any of the servers tried to contact the bot.", user.getId());
log.info("No server available to open a modmail thread in.");
// in case there is no server available, send an error message
channelService.sendEmbedTemplateInMessageChannelList("modmail_no_server_available", new Object(), initialMessage.getChannel());
}
}

4
abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/management/ModMailThreadManagementServiceBean.java
View File

@@ -98,10 +98,11 @@ public class ModMailThreadManagementServiceBean implements ModMailThreadManageme
* The status of the created instance is INITIAL.
* @param userInAServer The {@link AUserInAServer} for which the thread was created for
* @param channel An instance of {@link AChannel} in which the conversation with the member is handled
* @param appeal Whether the modmail thread is for the purpose of an appeal
* @return the created {@link ModMailThread} instance
*/
@Override
public ModMailThread createModMailThread(AUserInAServer userInAServer, AChannel channel) {
public ModMailThread createModMailThread(AUserInAServer userInAServer, AChannel channel, boolean appeal) {
ModMailThread thread = ModMailThread
.builder()
.id(channel.getId())
@@ -111,6 +112,7 @@ public class ModMailThreadManagementServiceBean implements ModMailThreadManageme
.server(userInAServer.getServerReference())
.state(ModMailThreadState.INITIAL)
.updated(Instant.now())
.appeal(appeal)
.build();
log.info("Create modmail thread in channel {} for user {} in server {}.",

6
abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/migrations/1.5.51/collection.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
<include file="tables/tables.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>

12
abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/migrations/1.5.51/tables/modmail_thread.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
<changeSet author="Sheldan" id="mod_mail_thread-add_appeal_boolean">
<addColumn tableName="mod_mail_thread">
<column name="appeal" type="BOOLEAN" defaultValue="false">
<constraints nullable="false" />
</column>
</addColumn>
</changeSet>
</databaseChangeLog>

6
abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/migrations/1.5.51/tables/tables.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
<include file="modmail_thread.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>

1
abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/migrations/modMail-changeLog.xml
View File

@@ -4,4 +4,5 @@
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
<include file="1.0-modmail/collection.xml" relativeToChangelogFile="true"/>
<include file="1.5.37/collection.xml" relativeToChangelogFile="true"/>
<include file="1.5.51/collection.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>

3
abstracto-application/abstracto-modules/modmail/modmail-int/src/main/java/dev/sheldan/abstracto/modmail/model/database/ModMailThread.java
View File

@@ -59,6 +59,9 @@ public class ModMailThread implements Serializable {
@Column(name = "closed")
private Instant closed;
@Column(name = "appeal", nullable = false)
private Boolean appeal;
/**
* The messages which were officially posted in the context of the mod mail thread. Either via command (from the
* staff side of view) or by messaging the bot (from the member view)

3
abstracto-application/abstracto-modules/modmail/modmail-int/src/main/java/dev/sheldan/abstracto/modmail/model/dto/ServerChoicePayload.java
View File

@@ -8,11 +8,14 @@ import lombok.Getter;
@Builder
public class ServerChoicePayload {
private Long serverId;
@Builder.Default
private Boolean appealModmail = false;
public static ServerChoicePayload fromServerChoice(ServerChoice choice) {
return ServerChoicePayload
.builder()
.serverId(choice.getServerId())
.appealModmail(choice.getAppealModmail())
.build();
}
}

4
abstracto-application/abstracto-modules/modmail/modmail-int/src/main/java/dev/sheldan/abstracto/modmail/model/template/ModMailNotificationModel.java
View File

@@ -32,4 +32,8 @@ public class ModMailNotificationModel extends ServerContext {
* The {@link GuildMessageChannel} in which the mod mail thread is handled
*/
private GuildMessageChannel channel;
/**
* Whether the modmail is created for the purpose of an appeal
*/
private boolean appeal;
}

2
abstracto-application/abstracto-modules/modmail/modmail-int/src/main/java/dev/sheldan/abstracto/modmail/model/template/ServerChoice.java
View File

@@ -8,4 +8,6 @@ import lombok.Getter;
public class ServerChoice {
private String serverName;
private Long serverId;
@Builder.Default
private Boolean appealModmail = false;
}

5
abstracto-application/abstracto-modules/modmail/modmail-int/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailThreadService.java
View File

@@ -25,11 +25,12 @@ public interface ModMailThreadService {
* @param user The {@link User} to create the mod mail thread for
* @param guild The {@link Guild} in which the mod mail thread should be created in
* @param initialMessage The initial message sparking this mod mail thread, null in case it was created by a command
* @param userInitiated Whether or not the mod mail thread was initiated by a user
* @param userInitiated Whether the mod mail thread was initiated by a user
* @param undoActions A list of {@link dev.sheldan.abstracto.core.models.UndoAction actions} to be undone in case the operation fails. This list will be filled in the method.
* @param appeal Whether the modmail thread was created for the purpose of an appeal
* @return A {@link CompletableFuture future} which completes when the modmail thread is set up
*/
CompletableFuture<MessageChannel> createModMailThreadForUser(User user, Guild guild, Message initialMessage, boolean userInitiated, List<UndoActionInstance> undoActions);
CompletableFuture<MessageChannel> createModMailThreadForUser(User user, Guild guild, Message initialMessage, boolean userInitiated, List<UndoActionInstance> undoActions, boolean appeal);
CompletableFuture<Void> sendContactNotification(User user, MessageChannel createdMessageChannel, MessageChannel feedBackChannel);
CompletableFuture<Void> sendContactNotification(User user, MessageChannel createdMessageChannel, InteractionHook interactionHook);

3
abstracto-application/abstracto-modules/modmail/modmail-int/src/main/java/dev/sheldan/abstracto/modmail/service/management/ModMailThreadManagementService.java
View File

@@ -104,9 +104,10 @@ public interface ModMailThreadManagementService {
* Creates an instance of {@link ModMailThread} with the appropriate parameters and returns the created instance.
* @param userInAServer The {@link AUserInAServer} for which the thread was created for
* @param channel An instance of {@link AChannel} in which the conversation with the member is handled
* @param appeal Whether the modmail thread is for the purpose of an appeal
* @return The created instance of {@link ModMailThread}
*/
ModMailThread createModMailThread(AUserInAServer userInAServer, AChannel channel);
ModMailThread createModMailThread(AUserInAServer userInAServer, AChannel channel, boolean appeal);
/**
* Updates the {@link ModMailThread} with the new state and saves the instance.