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

added setup command which includes an interactive process in order to setup features

Browse Source 
the current supported features are post targets and system config
the wizard includes a summary step where the user can confirm the changes
removed some unnecessary validators, which were basically just validating the system config from some features
fixed post target name
This commit is contained in:
Sheldan
2020-05-22 17:25:44 +02:00
parent e2f71ef7a3
commit 992357b2cb
81 changed files with 1074 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/commands/ListDisabledExperienceRoles.java
+1 -2
View File
@@ -9,7 +9,6 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult;
import dev.sheldan.abstracto.core.command.execution.ContextConverter;
import dev.sheldan.abstracto.core.config.FeatureEnum;
import dev.sheldan.abstracto.core.models.FullRole;
import dev.sheldan.abstracto.core.models.database.ARole;
import dev.sheldan.abstracto.core.service.ChannelService;
import dev.sheldan.abstracto.core.service.RoleService;
import dev.sheldan.abstracto.experience.config.features.ExperienceFeature;
@@ -46,7 +45,7 @@ public class ListDisabledExperienceRoles extends AbstractConditionableCommand {
.build();
disabledExperienceRolesModel.getRoles().add(role);
});
channelService.sendTemplateInChannel("list_disabled_experience_roles", disabledExperienceRolesModel, commandContext.getChannel());
channelService.sendEmbedTemplateInChannel("list_disabled_experience_roles", disabledExperienceRolesModel, commandContext.getChannel());
return CommandResult.fromSuccess();
}
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/validator/ExperienceFeatureValidatorBean.java
-22
View File
@@ -1,22 +0,0 @@
package dev.sheldan.abstracto.experience.validator;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.models.FeatureValidationResult;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.service.FeatureValidatorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class ExperienceFeatureValidatorBean implements ExperienceFeatureValidator {
@Autowired
private FeatureValidatorService featureValidatorService;
@Override
public void featureIsSetup(FeatureConfig featureConfig, AServer server, FeatureValidationResult validationResult) {
featureValidatorService.checkSystemConfig("expMultiplier", server, validationResult);
featureValidatorService.checkSystemConfig("minExp", server, validationResult);
featureValidatorService.checkSystemConfig("maxExp", server, validationResult);
}
}
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/src/main/java/dev/sheldan/abstracto/experience/config/features/ExperienceFeatureConfig.java
+2 -8
View File
@@ -2,9 +2,6 @@ package dev.sheldan.abstracto.experience.config.features;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.config.FeatureEnum;
import dev.sheldan.abstracto.core.service.FeatureValidator;
import dev.sheldan.abstracto.experience.validator.ExperienceFeatureValidator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Arrays;
@@ -13,16 +10,13 @@ import java.util.List;
@Component
public class ExperienceFeatureConfig implements FeatureConfig {
@Autowired
private ExperienceFeatureValidator experienceFeatureValidator;
@Override
public FeatureEnum getFeature() {
return ExperienceFeature.EXPERIENCE;
}
@Override
public List<FeatureValidator> getAdditionalFeatureValidators() {
return Arrays.asList(experienceFeatureValidator);
public List<String> getRequiredSystemConfigKeys() {
return Arrays.asList("expMultiplier", "minExp", "maxExp");
}
}
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/src/main/java/dev/sheldan/abstracto/experience/validator/ExperienceFeatureValidator.java
-6
View File
@@ -1,6 +0,0 @@
package dev.sheldan.abstracto.experience.validator;
import dev.sheldan.abstracto.core.service.FeatureValidator;
public interface ExperienceFeatureValidator extends FeatureValidator {
}
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/MyWarnings.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class MyWarnings extends AbstractConditionableCommand {
model.setCurrentWarnCount(currentWarnCount);
Long totalWarnCount = warnManagementService.getTotalWarnsForUser(commandContext.getUserInitiatedContext().getAUserInAServer());
model.setTotalWarnCount(totalWarnCount);
channelService.sendTemplateInChannel("myWarnings_response", model, commandContext.getChannel());
channelService.sendEmbedTemplateInChannel("myWarnings_response", model, commandContext.getChannel());
return CommandResult.fromSuccess();
}
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/UserNotes.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class UserNotes extends AbstractConditionableCommand {
userNotes = userNoteManagementService.loadNotesForServer(commandContext.getUserInitiatedContext().getServer());
}
model.setUserNotes(userNotesConverter.fromNotes(userNotes));
channelService.sendTemplateInChannel("user_notes_response", model, commandContext.getChannel());
channelService.sendEmbedTemplateInChannel("user_notes_response", model, commandContext.getChannel());
return CommandResult.fromSuccess();
}
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/validator/WarnDecayFeatureValidatorBean.java
-20
View File
@@ -1,20 +0,0 @@
package dev.sheldan.abstracto.moderation.validator;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.models.FeatureValidationResult;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.service.FeatureValidatorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class WarnDecayFeatureValidatorBean implements WarnDecayFeatureValidator {
@Autowired
private FeatureValidatorService featureValidatorService;
@Override
public void featureIsSetup(FeatureConfig featureConfig, AServer server, FeatureValidationResult validationResult) {
featureValidatorService.checkSystemConfig("decayDays", server, validationResult);
}
}
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/config/features/WarningDecayFeature.java
+5 -8
View File
@@ -3,9 +3,7 @@ package dev.sheldan.abstracto.moderation.config.features;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.config.FeatureEnum;
import dev.sheldan.abstracto.core.config.PostTargetEnum;
import dev.sheldan.abstracto.core.service.FeatureValidator;
import dev.sheldan.abstracto.moderation.config.posttargets.WarnDecayPostTarget;
import dev.sheldan.abstracto.moderation.validator.WarnDecayFeatureValidator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -18,14 +16,17 @@ public class WarningDecayFeature implements FeatureConfig {
@Autowired
private WarningFeature warningFeature;
@Autowired
private WarnDecayFeatureValidator warnDecayFeatureValidator;
@Override
public FeatureEnum getFeature() {
return ModerationFeatures.AUTOMATIC_WARN_DECAY;
}
@Override
public List<String> getRequiredSystemConfigKeys() {
return Arrays.asList("decayDays");
}
@Override
public List<FeatureConfig> getRequiredFeatures() {
return Arrays.asList(warningFeature);
@@ -36,8 +37,4 @@ public class WarningDecayFeature implements FeatureConfig {
return Arrays.asList(WarnDecayPostTarget.DECAY_LOG);
}
@Override
public List<FeatureValidator> getAdditionalFeatureValidators() {
return Arrays.asList(warnDecayFeatureValidator);
}
}
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/config/posttargets/LoggingPostTarget.java
+1 -1
View File
@@ -5,7 +5,7 @@ import lombok.Getter;
@Getter
public enum LoggingPostTarget implements PostTargetEnum {
LEAVE_LOG("muteLog"), JOIN_LOG("joinLog"), DELETE_LOG("deleteLog"), EDIT_LOG("editLog");
LEAVE_LOG("leaveLog"), JOIN_LOG("joinLog"), DELETE_LOG("deleteLog"), EDIT_LOG("editLog");
private String key;
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/validator/WarnDecayFeatureValidator.java
-6
View File
@@ -1,6 +0,0 @@
package dev.sheldan.abstracto.moderation.validator;
import dev.sheldan.abstracto.core.service.FeatureValidator;
public interface WarnDecayFeatureValidator extends FeatureValidator {
}
abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailThreadServiceBean.java
+4 -4
View File
@@ -227,7 +227,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService {
.build();
menu.display(initialMessage.getChannel());
} else {
channelService.sendTemplateInChannel("modmail_no_server_available", new Object(), initialMessage.getChannel());
channelService.sendEmbedTemplateInChannel("modmail_no_server_available", new Object(), initialMessage.getChannel());
}
}
@@ -243,7 +243,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService {
.latestModMailThread(latestThread)
.pastModMailThreadCount((long)oldThreads.size())
.build();
List<CompletableFuture<Message>> messages = channelService.sendTemplateInChannel("modmail_thread_header", header, channel);
List<CompletableFuture<Message>> messages = channelService.sendEmbedTemplateInChannel("modmail_thread_header", header, channel);
CompletableFuture.allOf(messages.toArray(new CompletableFuture[0])).whenComplete((aVoid, throwable)-> {
if(throwable != null) {
log.error("Failed to send mod mail header for for user {}.", aUserInAServer.getAUserInAServer().getUserReference().getId(), throwable);
@@ -351,7 +351,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService {
.user(fullUser)
.throwable(throwable)
.build();
channelService.sendTemplateInChannel(template, modMailExceptionModel, channel);
channelService.sendEmbedTemplateInChannel(template, modMailExceptionModel, channel);
} catch (Exception e) {
log.error("Failed to notify about mod mail exception.", e);
}
@@ -443,7 +443,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService {
HashMap<String, String> closingMessage = new HashMap<>();
String defaultValue = templateService.renderSimpleTemplate("modmail_closing_user_message_description");
closingMessage.put("closingMessage", configService.getStringValue(MODMAIL_CLOSING_MESSAGE_TEXT, modMailThread.getServer().getId(), defaultValue));
messageFutures.addAll(channelService.sendTemplateInChannel("modmail_closing_user_message", closingMessage , privateChannel));
messageFutures.addAll(channelService.sendEmbedTemplateInChannel("modmail_closing_user_message", closingMessage , privateChannel));
} else {
log.trace("*Not* notifying user {}", user.getIdLong());
messageFutures.add(CompletableFuture.completedFuture(null));
abstracto-application/abstracto-modules/modmail/modmail-int/src/main/java/dev/sheldan/abstracto/modmail/config/ModMailFeature.java
+6 -1
View File
@@ -25,7 +25,7 @@ public class ModMailFeature implements FeatureConfig {
@Override
public List<PostTargetEnum> getRequiredPostTargets() {
return Arrays.asList(ModMailPostTargets.MOD_MAIL_PING);
return Arrays.asList(ModMailPostTargets.MOD_MAIL_PING, ModMailPostTargets.MOD_MAIL_LOG);
}
@Override
@@ -42,4 +42,9 @@ public class ModMailFeature implements FeatureConfig {
public List<FeatureMode> getAvailableModes() {
return Arrays.asList(ModMailMode.LOGGING, ModMailMode.NO_LOG);
}
@Override
public List<String> getRequiredSystemConfigKeys() {
return Arrays.asList("modMailClosingText");
}
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/config/Setup.java
+72
View File
@@ -0,0 +1,72 @@
package dev.sheldan.abstracto.core.commands.config;
import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
import dev.sheldan.abstracto.core.command.config.HelpInfo;
import dev.sheldan.abstracto.core.command.config.Parameter;
import dev.sheldan.abstracto.core.command.config.features.CoreFeatures;
import dev.sheldan.abstracto.core.command.execution.CommandContext;
import dev.sheldan.abstracto.core.command.execution.CommandResult;
import dev.sheldan.abstracto.core.command.service.management.FeatureManagementService;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.config.FeatureEnum;
import dev.sheldan.abstracto.core.interactive.InteractiveService;
import dev.sheldan.abstracto.core.models.AServerChannelUserId;
import dev.sheldan.abstracto.core.service.FeatureConfigService;
import dev.sheldan.abstracto.core.service.SetupService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Arrays;
import java.util.List;
@Component
public class Setup extends AbstractConditionableCommand {
@Autowired
private InteractiveService interactiveService;
@Autowired
private FeatureManagementService featureManagementService;
@Autowired
private FeatureConfigService featureConfigService;
@Autowired
private SetupService setupService;
@Override
public CommandResult execute(CommandContext commandContext) {
String name = (String) commandContext.getParameters().getParameters().get(0);
if(featureManagementService.featureExists(name)) {
FeatureConfig feature = featureConfigService.getFeatureDisplayForFeature(name);
AServerChannelUserId initiatingUser = AServerChannelUserId
.builder()
.guildId(commandContext.getGuild().getIdLong())
.channelId(commandContext.getChannel().getIdLong())
.userId(commandContext.getAuthor().getIdLong())
.build();
setupService.performSetup(feature, initiatingUser, commandContext.getMessage().getIdLong());
}
return CommandResult.fromSuccess();
}
@Override
public CommandConfiguration getConfiguration() {
Parameter newPrefixParameter = Parameter.builder().name("feature").type(String.class).build();
List<Parameter> parameters = Arrays.asList(newPrefixParameter);
HelpInfo helpInfo = HelpInfo.builder().build();
return CommandConfiguration.builder()
.name("setup")
.module(ConfigModuleInterface.CONFIG)
.parameters(parameters)
.help(helpInfo)
.causesReaction(true)
.build();
}
@Override
public FeatureEnum getFeature() {
return CoreFeatures.CORE_FEATURE;
}
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/AbstractConfigSetupStep.java
+38
View File
@@ -0,0 +1,38 @@
package dev.sheldan.abstracto.core.interactive;
import dev.sheldan.abstracto.core.exception.SetupStepException;
import dev.sheldan.abstracto.core.service.ChannelService;
import dev.sheldan.abstracto.templating.service.TemplateService;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.TextChannel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.util.Optional;
@Getter
@Setter
public abstract class AbstractConfigSetupStep implements SetupStep {
@Autowired
private InteractiveService interactiveService;
@Autowired
private TemplateService templateService;
@Autowired
private ChannelService channelService;
protected SetupExecution nextStep;
@Autowired
private InteractiveUtils interactiveUtils;
protected Runnable getTimeoutRunnable(Long serverId, Long channelId) {
return () -> {
interactiveUtils.sendTimeoutMessage(serverId, channelId);
};
}
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/InteractiveServiceBean.java
+117
View File
@@ -0,0 +1,117 @@
package dev.sheldan.abstracto.core.interactive;
import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
import com.jagrosh.jdautilities.menu.ButtonMenu;
import dev.sheldan.abstracto.core.models.FullUser;
import dev.sheldan.abstracto.core.models.database.AChannel;
import dev.sheldan.abstracto.core.models.database.AEmote;
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import dev.sheldan.abstracto.core.service.BotService;
import dev.sheldan.abstracto.core.service.ChannelService;
import dev.sheldan.abstracto.core.service.EmoteService;
import dev.sheldan.abstracto.core.service.MessageService;
import dev.sheldan.abstracto.templating.model.MessageToSend;
import dev.sheldan.abstracto.templating.service.TemplateService;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.entities.Emote;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
@Component
@Slf4j
public class InteractiveServiceBean implements InteractiveService {
@Autowired
private TemplateService templateService;
@Autowired
private ChannelService channelService;
@Autowired
private EventWaiter eventWaiter;
@Autowired
private MessageService messageService;
@Autowired
private EmoteService emoteService;
@Autowired
private BotService botService;
@Override
public void createMessageWithResponse(String templateKey, AUserInAServer responder, AChannel channel, Long messageId, Consumer<MessageReceivedEvent> action, Runnable finalAction) {
String message = templateService.renderSimpleTemplate(templateKey);
channelService.sendTextToAChannel(message, channel);
eventWaiter.waitForEvent(MessageReceivedEvent.class, event -> {
if(event != null) {
return event.getAuthor().getIdLong() == responder.getUserReference().getId() && event.getMessage().getIdLong() != messageId;
}
return false;
}, action, 1, TimeUnit.MINUTES, finalAction);
}
@Override
public void createMessageWithResponse(MessageToSend messageToSend, AUserInAServer responder, AChannel channel, Long messageId, Consumer<MessageReceivedEvent> action, Runnable finalAction) {
channelService.sendMessageToSendToAChannel(messageToSend, channel);
Long userId = responder.getUserReference().getId();
eventWaiter.waitForEvent(MessageReceivedEvent.class, event -> {
if(event != null) {
return event.getAuthor().getIdLong() == userId && event.getMessage().getIdLong() != messageId;
}
return false;
}, action, 1, TimeUnit.MINUTES, finalAction);
}
@Override
public void createMessageWithConfirmation(String text, AUserInAServer responder, AChannel channel, Long messageId, Consumer<Void> confirmation, Consumer<Void> denial, Runnable finalAction) {
Long serverId = responder.getServerReference().getId();
ButtonMenu.Builder builder = new ButtonMenu.Builder();
HashMap<String, Consumer<Void>> actions = new HashMap<>();
addEmoteToBuilder("confirmation", confirmation, serverId, builder, actions);
addEmoteToBuilder("denial", denial, serverId, builder, actions);
ButtonMenu menu = builder
.setEventWaiter(eventWaiter)
.setDescription(text)
.setAction(reactionEmote -> {
if(reactionEmote.isEmoji()) {
actions.get(reactionEmote.getEmoji()).accept(null);
} else {
actions.get(reactionEmote.getEmote().getId()).accept(null);
}
})
.build();
Optional<TextChannel> textChannelInGuild = channelService.getTextChannelInGuild(serverId, channel.getId());
textChannelInGuild.ifPresent(menu::display);
}
private void addEmoteToBuilder(String key, Consumer<Void> consumer, Long serverId, ButtonMenu.Builder builder, HashMap<String, Consumer<Void>> actions) {
AEmote emoteOrFakeEmote = emoteService.getEmoteOrFakeEmote(key, serverId);
if(emoteOrFakeEmote.getCustom()){
Optional<Emote> emote = botService.getEmote(serverId, emoteOrFakeEmote);
emote.ifPresent(emote1 -> {
builder.addChoice(emote1);
actions.put(emote1.getId(), consumer);
});
} else {
builder.addChoice(emoteOrFakeEmote.getEmoteKey());
actions.put(emoteOrFakeEmote.getEmoteKey(), consumer);
}
}
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/InteractiveUtils.java
+29
View File
@@ -0,0 +1,29 @@
package dev.sheldan.abstracto.core.interactive;
import dev.sheldan.abstracto.core.service.ChannelService;
import dev.sheldan.abstracto.templating.service.TemplateService;
import net.dv8tion.jda.api.entities.TextChannel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.Optional;
@Component
public class InteractiveUtils {
@Autowired
private TemplateService templateService;
@Autowired
private ChannelService channelService;
@Transactional
public void sendTimeoutMessage(Long serverId, Long channelId) {
String s = templateService.renderSimpleTemplate("setup_configuration_timeout");
Optional<TextChannel> channelOptional = channelService.getTextChannelInGuild(serverId, channelId);
channelOptional.ifPresent(channel -> {
channelService.sendTextToChannelNoFuture(s, channel);
});
}
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/PostTargetDelayedAction.java
+23
View File
@@ -0,0 +1,23 @@
package dev.sheldan.abstracto.core.interactive;
import dev.sheldan.abstracto.core.service.management.PostTargetManagement;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class PostTargetDelayedAction implements DelayedAction {
@Autowired
private PostTargetManagement postTargetManagement;
@Override
public void execute(DelayedActionConfig delayedActionConfig) {
PostTargetDelayedActionConfig concrete = (PostTargetDelayedActionConfig) delayedActionConfig;
postTargetManagement.createOrUpdate(concrete.getPostTargetKey(), concrete.getServerId(), concrete.getChannelId());
}
@Override
public boolean handles(DelayedActionConfig delayedActionConfig) {
return delayedActionConfig instanceof PostTargetDelayedActionConfig;
}
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/PostTargetDelayedActionConfig.java
+33
View File
@@ -0,0 +1,33 @@
package dev.sheldan.abstracto.core.interactive;
import dev.sheldan.abstracto.core.models.template.commands.PostTargetActionModel;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.TextChannel;
@Getter
@Setter
@Builder
public class PostTargetDelayedActionConfig implements DelayedActionConfig {
private String postTargetKey;
private Long serverId;
private Long channelId;
private TextChannel textChannel;
@Override
public String getTemplateName() {
return "setup_post_target_action";
}
@Override
public Object getTemplateModel() {
return PostTargetActionModel
.builder()
.channelId(channelId)
.channel(textChannel)
.postTargetKey(postTargetKey)
.build();
}
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/PostTargetSetupStep.java
+77
View File
@@ -0,0 +1,77 @@
package dev.sheldan.abstracto.core.interactive;
import dev.sheldan.abstracto.core.exception.ChannelNotFoundException;
import dev.sheldan.abstracto.core.models.AServerChannelUserId;
import dev.sheldan.abstracto.core.models.database.AChannel;
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import dev.sheldan.abstracto.core.service.ConfigService;
import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
@Component
@Slf4j
public class PostTargetSetupStep extends AbstractConfigSetupStep {
@Autowired
private ConfigService configService;
@Autowired
private InteractiveService interactiveService;
@Autowired
private UserInServerManagementService userInServerManagementService;
@Autowired
private ChannelManagementService channelManagementService;
@Autowired
private PostTargetSetupStep self;
@Override
public CompletableFuture<List<DelayedActionConfig>> execute(AServerChannelUserId user, SetupStepParameter parameter) {
PostTargetStepParameter systemConfigStepParameter = (PostTargetStepParameter) parameter;
String messageTemplateKey = "setup_posttarget_" + systemConfigStepParameter.getPostTargetKey();
Optional<AChannel> channel = channelManagementService.loadChannel(user.getChannelId());
CompletableFuture<List<DelayedActionConfig>> future = new CompletableFuture<>();
AUserInAServer aUserInAServer = userInServerManagementService.loadUser(user.getGuildId(), user.getUserId());
if(channel.isPresent()) {
Runnable finalAction = super.getTimeoutRunnable(user.getGuildId(), user.getChannelId());
Consumer<MessageReceivedEvent> configAction = (MessageReceivedEvent event) -> {
try {
if(event.getMessage().getMentionedChannels().size() == 0) {
future.completeExceptionally(new RuntimeException());
}
TextChannel textChannel = event.getMessage().getMentionedChannels().get(0);
PostTargetDelayedActionConfig build = PostTargetDelayedActionConfig
.builder()
.postTargetKey(systemConfigStepParameter.getPostTargetKey())
.serverId(user.getGuildId())
.textChannel(textChannel)
.channelId(textChannel.getIdLong())
.build();
List<DelayedActionConfig> delayedSteps = Arrays.asList(build);
future.complete(delayedSteps);
} catch (Exception e) {
log.error("Failed to handle post target step.", e);
future.completeExceptionally(e);
}
};
interactiveService.createMessageWithResponse(messageTemplateKey, aUserInAServer, channel.get(), parameter.getPreviousMessageId(), configAction, finalAction);
} else {
future.completeExceptionally(new ChannelNotFoundException(user.getGuildId(), user.getChannelId()));
}
return future;
}
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/PostTargetStepParameter.java
+13
View File
@@ -0,0 +1,13 @@
package dev.sheldan.abstracto.core.interactive;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@Builder
public class PostTargetStepParameter implements SetupStepParameter {
private Long previousMessageId;
private String postTargetKey;
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SetupSummaryStep.java
+83
View File
@@ -0,0 +1,83 @@
package dev.sheldan.abstracto.core.interactive;
import dev.sheldan.abstracto.core.exception.ChannelNotFoundException;
import dev.sheldan.abstracto.core.models.AServerChannelUserId;
import dev.sheldan.abstracto.core.models.database.AChannel;
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import dev.sheldan.abstracto.core.models.template.commands.SetupSummaryModel;
import dev.sheldan.abstracto.core.service.DelayedActionService;
import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
import dev.sheldan.abstracto.templating.model.MessageToSend;
import dev.sheldan.abstracto.templating.service.TemplateService;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
@Component
@Slf4j
public class SetupSummaryStep extends AbstractConfigSetupStep {
@Autowired
private InteractiveService interactiveService;
@Autowired
private TemplateService templateService;
@Autowired
private ChannelManagementService channelManagementService;
@Autowired
private UserInServerManagementService userInServerManagementService;
@Autowired
private DelayedActionService delayedActionService;
@Autowired
private SetupSummaryStep self;
@Override
public CompletableFuture<List<DelayedActionConfig>> execute(AServerChannelUserId user, SetupStepParameter generalParameter) {
SetupSummaryStepParameter parameter = (SetupSummaryStepParameter) generalParameter;
SetupSummaryModel model = SetupSummaryModel
.builder()
.actionConfigs(parameter.getDelayedActionList())
.build();
String messageToSend = templateService.renderTemplate("setup_confirmation", model);
Optional<AChannel> channel = channelManagementService.loadChannel(user.getChannelId());
CompletableFuture<List<DelayedActionConfig>> future = new CompletableFuture<>();
AUserInAServer aUserInAServer = userInServerManagementService.loadUser(user.getGuildId(), user.getUserId());
if(channel.isPresent()) {
Runnable finalAction = super.getTimeoutRunnable(user.getGuildId(), user.getChannelId());
Consumer<Void> confirmation = (Void none) -> {
try {
self.executeDelayedSteps(parameter);
future.complete(null);
} catch (Exception e) {
future.completeExceptionally(e);
}
};
Consumer<Void> denial = (Void none) -> {
log.info("Stopped wizard.");
};
interactiveService.createMessageWithConfirmation(messageToSend, aUserInAServer, channel.get(), parameter.getPreviousMessageId(), confirmation, denial, finalAction);
} else {
future.completeExceptionally(new ChannelNotFoundException(user.getGuildId(), user.getChannelId()));
}
return future;
}
@Transactional
public void executeDelayedSteps(SetupSummaryStepParameter parameter) {
delayedActionService.executeDelayedActions(parameter.getDelayedActionList());
}
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SetupSummaryStepParameter.java
+15
View File
@@ -0,0 +1,15 @@
package dev.sheldan.abstracto.core.interactive;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
@Getter
@Setter
@Builder
public class SetupSummaryStepParameter implements SetupStepParameter {
private Long previousMessageId;
private List<DelayedActionConfig> delayedActionList;
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SystemConfigDelayedAction.java
+25
View File
@@ -0,0 +1,25 @@
package dev.sheldan.abstracto.core.interactive;
import dev.sheldan.abstracto.core.service.ConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class SystemConfigDelayedAction implements DelayedAction {
@Autowired
private ConfigService configService;
@Override
public void execute(DelayedActionConfig delayedActionConfig) {
SystemConfigDelayedActionConfig concrete = (SystemConfigDelayedActionConfig) delayedActionConfig;
configService.setConfigValue(concrete.getConfigKey(), concrete.getServerId(), concrete.getValue());
}
@Override
public boolean handles(DelayedActionConfig delayedActionConfig) {
return delayedActionConfig instanceof SystemConfigDelayedActionConfig;
}
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SystemConfigDelayedActionConfig.java
+29
View File
@@ -0,0 +1,29 @@
package dev.sheldan.abstracto.core.interactive;
import dev.sheldan.abstracto.core.models.template.commands.SystemConfigActionModel;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@Builder
public class SystemConfigDelayedActionConfig implements DelayedActionConfig {
private String configKey;
private Long serverId;
private String value;
@Override
public String getTemplateName() {
return "setup_system_config_action";
}
@Override
public Object getTemplateModel() {
return SystemConfigActionModel
.builder()
.configKey(this.configKey)
.newValue(this.value)
.build();
}
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SystemConfigSetupStep.java
+78
View File
@@ -0,0 +1,78 @@
package dev.sheldan.abstracto.core.interactive;
import dev.sheldan.abstracto.core.exception.ChannelNotFoundException;
import dev.sheldan.abstracto.core.models.AServerChannelUserId;
import dev.sheldan.abstracto.core.models.database.AChannel;
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import dev.sheldan.abstracto.core.service.ConfigService;
import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
@Component
@Slf4j
public class SystemConfigSetupStep extends AbstractConfigSetupStep {
@Autowired
private ConfigService configService;
@Autowired
private InteractiveService interactiveService;
@Autowired
private UserInServerManagementService userInServerManagementService;
@Autowired
private ChannelManagementService channelManagementService;
@Autowired
private SystemConfigSetupStep self;
@Override
public CompletableFuture<List<DelayedActionConfig>> execute(AServerChannelUserId user, SetupStepParameter parameter) {
SystemConfigStepParameter systemConfigStepParameter = (SystemConfigStepParameter) parameter;
String messageTemplateKey = "setup_config_" + systemConfigStepParameter.getConfigKey();
Optional<AChannel> channel = channelManagementService.loadChannel(user.getChannelId());
CompletableFuture<List<DelayedActionConfig>> future = new CompletableFuture<>();
AUserInAServer aUserInAServer = userInServerManagementService.loadUser(user.getGuildId(), user.getUserId());
if(channel.isPresent()) {
Runnable finalAction = super.getTimeoutRunnable(user.getGuildId(), user.getChannelId());
Consumer<MessageReceivedEvent> configAction = (MessageReceivedEvent event) -> {
try {
self.checkValidity(user, systemConfigStepParameter, event);
SystemConfigDelayedActionConfig build = SystemConfigDelayedActionConfig
.builder()
.configKey(systemConfigStepParameter.getConfigKey())
.serverId(user.getGuildId())
.value(event.getMessage().getContentRaw())
.build();
List<DelayedActionConfig> delayedSteps = Arrays.asList(build);
future.complete(delayedSteps);
} catch (Exception e) {
future.completeExceptionally(e);
}
};
interactiveService.createMessageWithResponse(messageTemplateKey, aUserInAServer, channel.get(), parameter.getPreviousMessageId(), configAction, finalAction);
} else {
future.completeExceptionally(new ChannelNotFoundException(user.getGuildId(), user.getChannelId()));
}
return future;
}
@Transactional
public void checkValidity(AServerChannelUserId user, SystemConfigStepParameter systemConfigStepParameter, MessageReceivedEvent event) {
configService.validateConfig(systemConfigStepParameter.getConfigKey(), user.getGuildId(), event.getMessage().getContentRaw());
}
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interactive/SystemConfigStepParameter.java
+13
View File
@@ -0,0 +1,13 @@
package dev.sheldan.abstracto.core.interactive;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@Builder
public class SystemConfigStepParameter implements SetupStepParameter {
private Long previousMessageId;
private String configKey;
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java
+1 -1
View File
@@ -182,7 +182,7 @@ public class ChannelServiceBean implements ChannelService {
@Override
@Transactional
public List<CompletableFuture<Message>> sendTemplateInChannel(String templateKey, Object model, MessageChannel channel) {
public List<CompletableFuture<Message>> sendEmbedTemplateInChannel(String templateKey, Object model, MessageChannel channel) {
MessageToSend messageToSend = templateService.renderEmbedTemplate(templateKey, model);
return sendMessageToSendToChannel(messageToSend, channel);
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ConfigServiceBean.java
+24
View File
@@ -92,4 +92,28 @@ public class ConfigServiceBean implements ConfigService{
throw new ConfigurationKeyNotFoundException(name);
}
}
@Override
public boolean configIsFitting(String name, Long serverId, String value) {
try {
validateConfig(name, serverId, value);
return true;
} catch (Exception e) {
return false;
}
}
@Override
public void validateConfig(String name, Long serverId, String value) {
if(configManagementService.configExists(serverId, name)) {
AConfig existing = configManagementService.loadConfig(serverId, name);
if(existing.getDoubleValue() != null) {
Double.parseDouble(value);
} else if(existing.getLongValue() != null) {
Long.parseLong(value);
}
} else {
throw new ConfigurationKeyNotFoundException(name);
}
}
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/DelayedActionServiceBean.java
+25
View File
@@ -0,0 +1,25 @@
package dev.sheldan.abstracto.core.service;
import dev.sheldan.abstracto.core.interactive.DelayedAction;
import dev.sheldan.abstracto.core.interactive.DelayedActionConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
public class DelayedActionServiceBean implements DelayedActionService {
@Autowired
private List<DelayedAction> delayedActions;
@Override
public void executeDelayedActions(List<DelayedActionConfig> delayedActionConfigList) {
delayedActionConfigList.forEach(delayedActionConfig -> {
delayedActions.stream()
.filter(delayedAction -> delayedAction.handles(delayedActionConfig))
.findFirst()
.ifPresent(delayedAction -> delayedAction.execute(delayedActionConfig));
});
}
}
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageServiceBean.java
+26 -9
View File
@@ -13,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
@@ -37,27 +39,42 @@ public class MessageServiceBean implements MessageService {
@Override
public void addReactionToMessage(String emoteKey, Long serverId, Message message) {
addReactionToMessageWithFuture(emoteKey, serverId, message);
}
@Override
public CompletableFuture<Void> addReactionToMessageWithFuture(String emoteKey, Long serverId, Message message) {
Optional<Guild> guildByIdOptional = botService.getGuildById(serverId);
AEmote emote = emoteService.getEmoteOrFakeEmote(emoteKey, serverId);
if(guildByIdOptional.isPresent()) {
Guild guild = guildByIdOptional.get();
if(emote.getCustom()) {
Emote emoteById = botService.getInstance().getEmoteById(emote.getEmoteId());
if(emoteById != null) {
message.addReaction(emoteById).queue();
} else {
log.error("Emote with key {} and id {} for guild {} was not found.", emoteKey, emote.getEmoteId(), guild.getId());
throw new EmoteNotDefinedException(emoteKey);
}
if(emote.getCustom()) {
Emote emoteById = botService.getInstance().getEmoteById(emote.getEmoteId());
if(emoteById != null) {
return message.addReaction(emoteById).submit();
} else {
message.addReaction(emote.getEmoteKey()).queue();
log.error("Emote with key {} and id {} for guild {} was not found.", emoteKey, emote.getEmoteId(), guild.getId());
throw new EmoteNotDefinedException(emoteKey);
}
} else {
return message.addReaction(emote.getEmoteKey()).submit();
}
} else {
log.error("Cannot add reaction, guild not found {}", serverId);
throw new GuildException(serverId);
}
}
@Override
public List<CompletableFuture<Void>> addReactionsToMessageWithFuture(List<String> emoteKeys, Long serverId, Message message) {
List<CompletableFuture<Void>> futures = new ArrayList<>();
emoteKeys.forEach(s -> {
futures.add(addReactionToMessageWithFuture(s, serverId, message));
});
return futures;
}
@Override
public CompletableFuture<Void> deleteMessageInChannelInServer(Long serverId, Long channelId, Long messageId) {
return botService.deleteMessage(serverId, channelId, messageId);
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/SetupServiceBean.java
+117
View File
@@ -0,0 +1,117 @@
package dev.sheldan.abstracto.core.service;
import dev.sheldan.abstracto.core.interactive.DelayedActionConfig;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.interactive.*;
import dev.sheldan.abstracto.core.models.AServerChannelUserId;
import dev.sheldan.abstracto.core.models.template.commands.SetupCompletedNotificationModel;
import dev.sheldan.abstracto.templating.service.TemplateService;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.entities.TextChannel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@Component
@Slf4j
public class SetupServiceBean implements SetupService {
@Autowired
private SystemConfigSetupStep systemConfigSetupStep;
@Autowired
private PostTargetSetupStep postTargetSetupStep;
@Autowired
private DelayedActionService delayedActionService;
@Autowired
private SetupServiceBean self;
@Autowired
private SetupSummaryStep setupSummaryStep;
@Autowired
private ChannelService channelService;
@Autowired
private TemplateService templateService;
@Override
public void performSetup(FeatureConfig featureConfig, AServerChannelUserId user, Long initialMessageId) {
List<String> requiredSystemConfigKeys = featureConfig.getRequiredSystemConfigKeys();
List<SetupExecution> steps = new ArrayList<>();
requiredSystemConfigKeys.forEach(s -> {
SetupExecution execution = SetupExecution
.builder()
.step(systemConfigSetupStep)
.parameter(SystemConfigStepParameter.builder().configKey(s).build())
.build();
steps.add(execution);
});
featureConfig.getRequiredPostTargets().forEach(postTargetEnum -> {
SetupExecution execution = SetupExecution
.builder()
.step(postTargetSetupStep)
.parameter(PostTargetStepParameter.builder().postTargetKey(postTargetEnum.getKey()).build())
.build();
steps.add(execution);
});
for (int i = 0; i < steps.size(); i++) {
SetupExecution setupExecution = steps.get(i);
setupExecution.getParameter().setPreviousMessageId(initialMessageId);
if(i < steps.size() - 1) {
setupExecution.setNextStep(steps.get(i + 1));
}
}
executeSetup(featureConfig, steps, user, new ArrayList<>());
}
@Override
public void executeSetup(FeatureConfig featureConfig, List<SetupExecution> steps, AServerChannelUserId user, List<DelayedActionConfig> delayedActionConfigs) {
steps.stream().findFirst().ifPresent(execution -> executeStep(user, execution, delayedActionConfigs, featureConfig));
}
private void executeStep(AServerChannelUserId aUserInAServer, SetupExecution execution, List<DelayedActionConfig> delayedActionConfigs, FeatureConfig featureConfig) {
execution.getStep().execute(aUserInAServer, execution.getParameter()).thenAccept(aVoid -> {
delayedActionConfigs.addAll(aVoid);
if(execution.getNextStep() != null) {
executeStep(aUserInAServer, execution.getNextStep(), delayedActionConfigs, featureConfig);
} else {
self.executePostSetupSteps(delayedActionConfigs, aUserInAServer, execution.getParameter().getPreviousMessageId(), featureConfig);
}
}).exceptionally(throwable -> {
executeStep(aUserInAServer, execution, delayedActionConfigs, featureConfig);
return null;
});
}
@Transactional
public void executePostSetupSteps(List<DelayedActionConfig> delayedActionConfigs, AServerChannelUserId user, Long initialMessage, FeatureConfig featureConfig) {
SetupSummaryStepParameter parameter = SetupSummaryStepParameter
.builder()
.delayedActionList(delayedActionConfigs)
.previousMessageId(initialMessage)
.build();
setupSummaryStep.execute(user, parameter).thenAccept(ignored -> {
self.notifyAboutCompletion(user, featureConfig);
});
}
@Transactional
public void notifyAboutCompletion(AServerChannelUserId aServerChannelUserId, FeatureConfig featureConfig) {
String templateName = "setup_completion_notification";
SetupCompletedNotificationModel model = SetupCompletedNotificationModel
.builder()
.completedFeature(featureConfig)
.build();
String text = templateService.renderTemplate(templateName, model);
Optional<TextChannel> textChannel = channelService.getTextChannelInGuild(aServerChannelUserId.getGuildId(), aServerChannelUserId.getChannelId());
textChannel.ifPresent(channel -> channelService.sendTextToChannel(text, channel));
}
}
abstracto-application/core/core-impl/src/main/resources/abstracto.properties
+5 -1
View File
@@ -4,4 +4,8 @@ abstracto.parameter.lowerBound=50
abstracto.features.core.enabled=true
abstracto.prefix=!
abstracto.eventWaiter.threads=10
abstracto.eventWaiter.threads=10
abstracto.emoteNames.confirmation=confirmation,denial
abstracto.defaultEmotes.confirmation=\u2705
abstracto.defaultEmotes.denial=\u274c
abstracto-application/core/core-impl/src/main/resources/seedData/templates/coreCommands/setup/setup_completion_notification_en_US.ftl
+1
View File
@@ -0,0 +1 @@
<#assign featureName><#include "${completedFeature.feature.key}_feature"></#assign><#include "setup_completion_message">
abstracto-application/core/core-impl/src/main/resources/seedData/templates/coreCommands/setup/setup_confirmation_en_US.ftl
+5
View File
@@ -0,0 +1,5 @@
<#list actionConfigs as actionConfig>
<#assign param=actionConfig.templateModel>
<#include "${actionConfig.templateName}">
</#list>
abstracto-application/core/core-impl/src/main/resources/seedData/templates/coreCommands/setup/setup_post_target_action_en_US.ftl
+1
View File
@@ -0,0 +1 @@
<#assign postTargetKey>${param.postTargetKey}</#assign><#assign channel>${param.channel.asMention}</#assign><#include "setup_post_target_action_display">
abstracto-application/core/core-impl/src/main/resources/seedData/templates/coreCommands/setup/setup_system_config_action_en_US.ftl
+1
View File
@@ -0,0 +1 @@
<#assign configKey>${param.configKey}</#assign><#assign newValue>${param.newValue}</#assign><#include "setup_system_config_action_display">
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/SetupStepException.java
+19
View File
@@ -0,0 +1,19 @@
package dev.sheldan.abstracto.core.exception;
import dev.sheldan.abstracto.templating.Templatable;
public class SetupStepException extends AbstractoRunTimeException implements Templatable {
public SetupStepException(String message) {
super(message);
}
@Override
public String getTemplateName() {
return "setup_configuration_timeout";
}
@Override
public Object getTemplateModel() {
return new Object();
}
}
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/interactive/DelayedAction.java
+7
View File
@@ -0,0 +1,7 @@
package dev.sheldan.abstracto.core.interactive;
public interface DelayedAction {
void execute(DelayedActionConfig delayedActionConfig);
boolean handles(DelayedActionConfig delayedActionConfig);
}
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/interactive/DelayedActionConfig.java
+6
View File
@@ -0,0 +1,6 @@
package dev.sheldan.abstracto.core.interactive;
import dev.sheldan.abstracto.templating.Templatable;
public interface DelayedActionConfig extends Templatable {
}
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/interactive/InteractiveService.java
+14
View File
@@ -0,0 +1,14 @@
package dev.sheldan.abstracto.core.interactive;
import dev.sheldan.abstracto.core.models.database.AChannel;
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import dev.sheldan.abstracto.templating.model.MessageToSend;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import java.util.function.Consumer;
public interface InteractiveService {
void createMessageWithResponse(String templateKey, AUserInAServer responder, AChannel channel, Long messageId, Consumer<MessageReceivedEvent> action, Runnable finalAction);
void createMessageWithResponse(MessageToSend messageToSend, AUserInAServer responder, AChannel channel, Long messageId, Consumer<MessageReceivedEvent> action, Runnable finalAction);
void createMessageWithConfirmation(String text, AUserInAServer responder, AChannel channel, Long messageId, Consumer<Void> confirmation, Consumer<Void> denial, Runnable finalAction);
}
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/interactive/SetupExecution.java
+14
View File
@@ -0,0 +1,14 @@
package dev.sheldan.abstracto.core.interactive;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@Builder
public class SetupExecution {
private SetupStep step;
private SetupStepParameter parameter;
private SetupExecution nextStep;
}
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/interactive/SetupStep.java
+11
View File
@@ -0,0 +1,11 @@
package dev.sheldan.abstracto.core.interactive;
import dev.sheldan.abstracto.core.models.AServerChannelUserId;
import java.util.List;
import java.util.concurrent.CompletableFuture;
public interface SetupStep {
CompletableFuture<List<DelayedActionConfig>> execute(AServerChannelUserId aUserInAServer, SetupStepParameter parameter);
}
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/interactive/SetupStepParameter.java
+6
View File
@@ -0,0 +1,6 @@
package dev.sheldan.abstracto.core.interactive;
public interface SetupStepParameter {
Long getPreviousMessageId();
void setPreviousMessageId(Long previousMessageId);
}
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/AServerChannelUserId.java
+14
View File
@@ -0,0 +1,14 @@
package dev.sheldan.abstracto.core.models;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@Builder
public class AServerChannelUserId {
private Long guildId;
private Long channelId;
private Long userId;
}
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/PostTargetActionModel.java
+15
View File
@@ -0,0 +1,15 @@
package dev.sheldan.abstracto.core.models.template.commands;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.TextChannel;
@Getter
@Setter
@Builder
public class PostTargetActionModel {
private String postTargetKey;
private Long channelId;
private TextChannel channel;
}
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/SetupCompletedNotificationModel.java
+13
View File
@@ -0,0 +1,13 @@
package dev.sheldan.abstracto.core.models.template.commands;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@Builder
public class SetupCompletedNotificationModel {
private FeatureConfig completedFeature;
}
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/SetupSummaryModel.java
+15
View File
@@ -0,0 +1,15 @@
package dev.sheldan.abstracto.core.models.template.commands;
import dev.sheldan.abstracto.core.interactive.DelayedActionConfig;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
@Getter
@Setter
@Builder
public class SetupSummaryModel {
private List<DelayedActionConfig> actionConfigs;
}
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/SystemConfigActionModel.java
+13
View File
@@ -0,0 +1,13 @@
package dev.sheldan.abstracto.core.models.template.commands;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@Builder
public class SystemConfigActionModel {
private String configKey;
private Object newValue;
}
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/ChannelService.java
+1 -1
View File
@@ -28,7 +28,7 @@ public interface ChannelService {
void editMessageInAChannel(MessageToSend messageToSend, MessageChannel channel, Long messageId);
CompletableFuture<Void> deleteTextChannel(AChannel channel);
CompletableFuture<Void> deleteTextChannel(Long serverId, Long channelId);
List<CompletableFuture<Message>> sendTemplateInChannel(String templateKey, Object model, MessageChannel channel);
List<CompletableFuture<Message>> sendEmbedTemplateInChannel(String templateKey, Object model, MessageChannel channel);
CompletableFuture<TextChannel> createTextChannel(String name, AServer server, Long categoryId);
}
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/ConfigService.java
+2
View File
@@ -10,5 +10,7 @@ public interface ConfigService {
void setLongValue(String name, Long serverId, Long value);
void setConfigValue(String name, Long serverId, String value);
void setStringValue(String name, Long serverId, String value);
boolean configIsFitting(String name, Long serverId, String value);
void validateConfig(String name, Long serverId, String value);
}
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/DelayedActionService.java
+9
View File
@@ -0,0 +1,9 @@
package dev.sheldan.abstracto.core.service;
import dev.sheldan.abstracto.core.interactive.DelayedActionConfig;
import java.util.List;
public interface DelayedActionService {
void executeDelayedActions(List<DelayedActionConfig> delayedActionConfigList);
}
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/MessageService.java
+3
View File
@@ -7,10 +7,13 @@ import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.entities.User;
import java.util.List;
import java.util.concurrent.CompletableFuture;
public interface MessageService {
void addReactionToMessage(String emoteKey, Long serverId, Message message);
CompletableFuture<Void> addReactionToMessageWithFuture(String emoteKey, Long serverId, Message message);
List<CompletableFuture<Void>> addReactionsToMessageWithFuture(List<String> emoteKeys, Long serverId, Message message);
CompletableFuture<Void> deleteMessageInChannelInServer(Long serverId, Long channelId, Long messageId);
CompletableFuture<Message> createStatusMessage(MessageToSend messageToSend, AChannel channel);
void updateStatusMessage(AChannel channel, Long messageId, MessageToSend messageToSend);
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/SetupService.java
+13
View File
@@ -0,0 +1,13 @@
package dev.sheldan.abstracto.core.service;
import dev.sheldan.abstracto.core.interactive.DelayedActionConfig;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.interactive.SetupExecution;
import dev.sheldan.abstracto.core.models.AServerChannelUserId;
import java.util.List;
public interface SetupService {
void performSetup(FeatureConfig featureConfig, AServerChannelUserId user, Long initialMessageId);
void executeSetup(FeatureConfig featureConfig, List<SetupExecution> steps, AServerChannelUserId user, List<DelayedActionConfig> delayedActionConfigs);
}
abstracto-application/template-config/src/main/resources/templates/en_US/core/commands/setup/help/setup_description_en_US.ftl
+1
View File
@@ -0,0 +1 @@
Helps to setup the necessary configuration for a feature.
abstracto-application/template-config/src/main/resources/templates/en_US/core/commands/setup/help/setup_long_help_en_US.ftl
+2
View File
@@ -0,0 +1,2 @@
Guides you through an interactive wizard where post targets, system configs and other necessary configurations for a feature are setup.
At the end you have the possibility to review the changes, before applying them.
abstracto-application/template-config/src/main/resources/templates/en_US/core/commands/setup/help/setup_parameter_feature_en_US.ftl
+1
View File
@@ -0,0 +1 @@
The feature to setup.
abstracto-application/template-config/src/main/resources/templates/en_US/core/commands/setup/help/setup_usage_en_US.ftl
+1
View File
@@ -0,0 +1 @@
setup <featureName>
abstracto-application/template-config/src/main/resources/templates/en_US/core/commands/setup/setup_completion_message_en_US.ftl
+1
View File
@@ -0,0 +1 @@
${featureName} has been successfully setup.
abstracto-application/template-config/src/main/resources/templates/en_US/core/commands/setup/setup_confirmation_title_en_US.ftl
+1
View File
@@ -0,0 +1 @@
Do you want to apply this configuration?
abstracto-application/template-config/src/main/resources/templates/en_US/core/config/setup_config_cat_en_US.ftl
+1
View File
@@ -0,0 +1 @@
Mod mail category to be used for something
abstracto-application/template-config/src/main/resources/templates/en_US/core/config/setup_configuration_timeout_en_US.ftl
+1
View File
@@ -0,0 +1 @@
Timeout when using the setup wizard.
abstracto-application/template-config/src/main/resources/templates/en_US/core/config/setup_post_target_action_display_en_US.ftl
+1
View File
@@ -0,0 +1 @@
Post target ${postTargetKey} will be set to channel ${channel}.
abstracto-application/template-config/src/main/resources/templates/en_US/core/config/setup_system_config_action_display_en_US.ftl
+1
View File
@@ -0,0 +1 @@
System config ${configKey} will be set to ${newValue}.
abstracto-application/template-config/src/main/resources/templates/en_US/experience/config/setup_config_expMultiplier_en_US.ftl
+1
View File
@@ -0,0 +1 @@
The value each gained experience is multiplied by. Default 1.0
abstracto-application/template-config/src/main/resources/templates/en_US/experience/config/setup_config_maxExp_en_US.ftl
+1
View File
@@ -0,0 +1 @@
The maximum of experience given randomly. Default: 25
abstracto-application/template-config/src/main/resources/templates/en_US/experience/config/setup_config_minExp_en_US.ftl
+1
View File
@@ -0,0 +1 @@
The minimum experience given randomly. Default: 10
abstracto-application/template-config/src/main/resources/templates/en_US/moderation/config/setup_config_decayDays_en_US.ftl
+1
View File
@@ -0,0 +1 @@
The amount of days after which a warning is decayed.
abstracto-application/template-config/src/main/resources/templates/en_US/moderation/config/setup_posttarget_banLog_en_US.ftl
+1
View File
@@ -0,0 +1 @@
The channel in which where bans should be logged to.
abstracto-application/template-config/src/main/resources/templates/en_US/moderation/config/setup_posttarget_decayLog_en_US.ftl
+1
View File
@@ -0,0 +1 @@
The channel in which decayed warnings should be logged to.
abstracto-application/template-config/src/main/resources/templates/en_US/moderation/config/setup_posttarget_deleteLog_en_US.ftl
+1
View File
@@ -0,0 +1 @@
The channel in which deleted messages should be logged to.
abstracto-application/template-config/src/main/resources/templates/en_US/moderation/config/setup_posttarget_editLog_en_US.ftl
+1
View File
@@ -0,0 +1 @@
The channel in which edited messages should be logged to.
abstracto-application/template-config/src/main/resources/templates/en_US/moderation/config/setup_posttarget_joinLog_en_US.ftl
+1
View File
@@ -0,0 +1 @@
The channel in which guild joins should be logged to.
abstracto-application/template-config/src/main/resources/templates/en_US/moderation/config/setup_posttarget_kickLog_en_US.ftl
+1
View File
@@ -0,0 +1 @@
The channel in which kicks should be logged to.
abstracto-application/template-config/src/main/resources/templates/en_US/moderation/config/setup_posttarget_leaveLog_en_US.ftl
+1
View File
@@ -0,0 +1 @@
The channel where guild leavers should be logged to.
abstracto-application/template-config/src/main/resources/templates/en_US/moderation/config/setup_posttarget_muteLog_en_US.ftl
+1
View File
@@ -0,0 +1 @@
The channel where mutes should be logged to. Un-mutes will also be in this channel.
abstracto-application/template-config/src/main/resources/templates/en_US/moderation/config/setup_posttarget_warnLog_en_US.ftl
+1
View File
@@ -0,0 +1 @@
The channel where warnings should be logged to.
abstracto-application/template-config/src/main/resources/templates/en_US/modmail/config/setup_config_modMailClosingText_en_US.ftl
+1
View File
@@ -0,0 +1 @@
The text to close mod mail threads with.
abstracto-application/template-config/src/main/resources/templates/en_US/modmail/config/setup_posttarget_modmailLog_en_US.ftl
+1
View File
@@ -0,0 +1 @@
The channel towards which the closed mod mail threads should be logged to. (In the appropriate mode)
abstracto-application/template-config/src/main/resources/templates/en_US/modmail/config/setup_posttarget_modmailPing_en_US.ftl
+1
View File
@@ -0,0 +1 @@
The channel which should be used to notify the responsible people about new mod mail threads.
abstracto-application/template-config/src/main/resources/templates/en_US/utility/config/setup_posttarget_starboard_en_US.ftl
View File
abstracto-application/template-config/src/main/resources/templates/en_US/utility/config/setup_posttarget_suggestions_en_US.ftl
View File