diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Ban.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/Ban.java similarity index 82% rename from abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Ban.java rename to abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/Ban.java index f46ef9642..944c73868 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Ban.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/Ban.java @@ -1,13 +1,15 @@ -package dev.sheldan.abstracto.moderation.command; +package dev.sheldan.abstracto.moderation.commands; -import dev.sheldan.abstracto.core.command.AbstractConditionableCommand; -import dev.sheldan.abstracto.core.command.HelpInfo; +import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand; +import dev.sheldan.abstracto.core.command.config.HelpInfo; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.command.execution.*; import dev.sheldan.abstracto.moderation.Moderation; import dev.sheldan.abstracto.moderation.config.ModerationFeatures; -import dev.sheldan.abstracto.moderation.models.template.BanLog; +import dev.sheldan.abstracto.moderation.models.template.commands.BanLog; import dev.sheldan.abstracto.moderation.service.BanService; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.service.TemplateService; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.entities.Member; import org.springframework.beans.factory.annotation.Autowired; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/BanId.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/BanId.java similarity index 82% rename from abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/BanId.java rename to abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/BanId.java index f25a0baaa..f9fa24b47 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/BanId.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/BanId.java @@ -1,13 +1,15 @@ -package dev.sheldan.abstracto.moderation.command; +package dev.sheldan.abstracto.moderation.commands; -import dev.sheldan.abstracto.core.command.AbstractConditionableCommand; -import dev.sheldan.abstracto.core.command.HelpInfo; +import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand; +import dev.sheldan.abstracto.core.command.config.HelpInfo; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.command.execution.*; import dev.sheldan.abstracto.moderation.Moderation; import dev.sheldan.abstracto.moderation.config.ModerationFeatures; -import dev.sheldan.abstracto.moderation.models.template.BanIdLog; +import dev.sheldan.abstracto.moderation.models.template.commands.BanIdLog; import dev.sheldan.abstracto.moderation.service.BanService; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.service.TemplateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Kick.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/Kick.java similarity index 82% rename from abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Kick.java rename to abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/Kick.java index 71e5734db..bfbdb8ba1 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Kick.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/Kick.java @@ -1,13 +1,15 @@ -package dev.sheldan.abstracto.moderation.command; +package dev.sheldan.abstracto.moderation.commands; -import dev.sheldan.abstracto.core.command.AbstractConditionableCommand; -import dev.sheldan.abstracto.core.command.HelpInfo; +import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand; +import dev.sheldan.abstracto.core.command.config.HelpInfo; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.command.execution.*; import dev.sheldan.abstracto.moderation.Moderation; import dev.sheldan.abstracto.moderation.config.ModerationFeatures; -import dev.sheldan.abstracto.moderation.models.template.KickLogModel; +import dev.sheldan.abstracto.moderation.models.template.commands.KickLogModel; import dev.sheldan.abstracto.moderation.service.KickServiceBean; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.service.TemplateService; import net.dv8tion.jda.api.entities.Member; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/SlowMode.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/SlowMode.java similarity index 86% rename from abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/SlowMode.java rename to abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/SlowMode.java index 489148ba0..75aef5eb4 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/SlowMode.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/SlowMode.java @@ -1,9 +1,10 @@ -package dev.sheldan.abstracto.moderation.command; +package dev.sheldan.abstracto.moderation.commands; -import dev.sheldan.abstracto.core.command.*; -import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; +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.execution.CommandContext; -import dev.sheldan.abstracto.core.command.execution.Parameter; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.command.execution.CommandResult; import dev.sheldan.abstracto.moderation.Moderation; import dev.sheldan.abstracto.moderation.config.ModerationFeatures; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Warn.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/Warn.java similarity index 84% rename from abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Warn.java rename to abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/Warn.java index 3d8555dc5..51f82122e 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/command/Warn.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/commands/Warn.java @@ -1,14 +1,16 @@ -package dev.sheldan.abstracto.moderation.command; +package dev.sheldan.abstracto.moderation.commands; -import dev.sheldan.abstracto.core.command.AbstractConditionableCommand; -import dev.sheldan.abstracto.core.command.HelpInfo; +import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand; +import dev.sheldan.abstracto.core.command.config.HelpInfo; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.command.execution.*; import dev.sheldan.abstracto.core.service.management.UserManagementService; import dev.sheldan.abstracto.moderation.Moderation; import dev.sheldan.abstracto.moderation.config.ModerationFeatures; -import dev.sheldan.abstracto.moderation.models.template.WarnLog; +import dev.sheldan.abstracto.moderation.models.template.commands.WarnLog; import dev.sheldan.abstracto.moderation.service.WarnService; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.service.TemplateService; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.entities.Member; import org.springframework.beans.factory.annotation.Autowired; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/JoinLogger.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/JoinLogger.java index 25e0335d3..072a0af6a 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/JoinLogger.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/JoinLogger.java @@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.listener.JoinListener; import dev.sheldan.abstracto.core.service.PostTargetService; import dev.sheldan.abstracto.core.service.management.ServerManagementService; import dev.sheldan.abstracto.moderation.config.ModerationFeatures; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.service.TemplateService; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/LeaveLogger.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/LeaveLogger.java index d435f2d33..168c262bc 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/LeaveLogger.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/LeaveLogger.java @@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.listener.LeaveListener; import dev.sheldan.abstracto.core.service.PostTargetService; import dev.sheldan.abstracto.core.service.management.ServerManagementService; import dev.sheldan.abstracto.moderation.config.ModerationFeatures; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.service.TemplateService; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListener.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListener.java index 17fc602d7..a13e663a1 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListener.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListener.java @@ -2,14 +2,14 @@ package dev.sheldan.abstracto.moderation.listener; import dev.sheldan.abstracto.core.listener.MessageDeletedListener; import dev.sheldan.abstracto.core.models.cache.CachedMessage; -import dev.sheldan.abstracto.core.models.MessageToSend; +import dev.sheldan.abstracto.templating.model.MessageToSend; import dev.sheldan.abstracto.core.service.MessageCache; import dev.sheldan.abstracto.core.service.PostTargetService; import dev.sheldan.abstracto.core.utils.ContextUtils; import dev.sheldan.abstracto.moderation.config.ModerationFeatures; import dev.sheldan.abstracto.moderation.models.template.listener.MessageDeletedAttachmentLog; import dev.sheldan.abstracto.moderation.models.template.listener.MessageDeletedLog; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.service.TemplateService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java index a4100fcb5..10768550b 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java @@ -2,12 +2,12 @@ package dev.sheldan.abstracto.moderation.listener; import dev.sheldan.abstracto.core.listener.MessageTextUpdatedListener; import dev.sheldan.abstracto.core.models.cache.CachedMessage; -import dev.sheldan.abstracto.core.models.MessageToSend; +import dev.sheldan.abstracto.templating.model.MessageToSend; import dev.sheldan.abstracto.core.service.MessageCache; import dev.sheldan.abstracto.core.service.PostTargetService; import dev.sheldan.abstracto.moderation.config.ModerationFeatures; import dev.sheldan.abstracto.moderation.models.template.listener.MessageEditedLog; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.service.TemplateService; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.entities.Message; import org.springframework.beans.factory.annotation.Autowired; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/repository/WarnRepository.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/repository/WarnRepository.java index c31d1a584..0dd3a843b 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/repository/WarnRepository.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/repository/WarnRepository.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.moderation.repository; -import dev.sheldan.abstracto.moderation.models.Warning; +import dev.sheldan.abstracto.moderation.models.database.Warning; import org.springframework.data.jpa.repository.JpaRepository; public interface WarnRepository extends JpaRepository { diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/BanServiceBean.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/BanServiceBean.java index eacca2f2a..6cd161ed6 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/BanServiceBean.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/BanServiceBean.java @@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.exception.GuildException; import dev.sheldan.abstracto.core.models.context.ServerContext; import dev.sheldan.abstracto.core.service.Bot; import dev.sheldan.abstracto.core.service.PostTargetService; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.service.TemplateService; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; @@ -32,14 +32,14 @@ public class BanServiceBean implements BanService { @Override public void banMember(Member member, String reason, ServerContext banLog) { this.banUser(member.getGuild().getIdLong(), member.getIdLong(), reason); - String warnLogMessage = templateService.renderContextAwareTemplate(BAN_LOG_TEMPLATE, banLog); + String warnLogMessage = templateService.renderTemplate(BAN_LOG_TEMPLATE, banLog); postTargetService.sendTextInPostTarget(warnLogMessage, BAN_LOG_TARGET, banLog.getServer().getId()); } @Override public void banMember(Long guildId, Long userId, String reason, ServerContext banIdLog) { banUser(guildId, userId, reason); - String warnLogMessage = templateService.renderContextAwareTemplate(BAN_ID_LOG_TEMPLATE, banIdLog); + String warnLogMessage = templateService.renderTemplate(BAN_ID_LOG_TEMPLATE, banIdLog); postTargetService.sendTextInPostTarget(warnLogMessage, BAN_LOG_TARGET, guildId); } diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/KickServiceBean.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/KickServiceBean.java index d3dca993d..3da175307 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/KickServiceBean.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/KickServiceBean.java @@ -1,11 +1,10 @@ package dev.sheldan.abstracto.moderation.service; -import dev.sheldan.abstracto.core.exception.ChannelException; import dev.sheldan.abstracto.core.exception.GuildException; import dev.sheldan.abstracto.core.service.Bot; import dev.sheldan.abstracto.core.service.PostTargetService; -import dev.sheldan.abstracto.moderation.models.template.KickLogModel; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.moderation.models.template.commands.KickLogModel; +import dev.sheldan.abstracto.templating.service.TemplateService; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; @@ -42,7 +41,7 @@ public class KickServiceBean implements KickService { } private void sendKickLog(KickLogModel kickLogModel) { - String warnLogMessage = templateService.renderContextAwareTemplate(KICK_LOG_TEMPLATE, kickLogModel); + String warnLogMessage = templateService.renderTemplate(KICK_LOG_TEMPLATE, kickLogModel); postTargetService.sendTextInPostTarget(warnLogMessage, WARN_LOG_TARGET, kickLogModel.getServer().getId()); } } diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java index 8dd9f58e1..af55efffc 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java @@ -4,17 +4,17 @@ import dev.sheldan.abstracto.core.exception.UserException; import dev.sheldan.abstracto.core.models.context.ServerContext; import dev.sheldan.abstracto.core.models.database.AServer; import dev.sheldan.abstracto.core.models.database.AUser; -import dev.sheldan.abstracto.core.models.MessageToSend; -import dev.sheldan.abstracto.moderation.models.template.WarnLog; -import dev.sheldan.abstracto.moderation.models.template.WarnNotification; -import dev.sheldan.abstracto.moderation.models.Warning; +import dev.sheldan.abstracto.templating.model.MessageToSend; +import dev.sheldan.abstracto.moderation.models.template.commands.WarnLog; +import dev.sheldan.abstracto.moderation.models.template.commands.WarnNotification; +import dev.sheldan.abstracto.moderation.models.database.Warning; import dev.sheldan.abstracto.moderation.service.management.WarnManagementService; import dev.sheldan.abstracto.core.service.management.ServerManagementService; import dev.sheldan.abstracto.core.service.management.UserManagementService; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.core.service.Bot; import dev.sheldan.abstracto.core.service.PostTargetService; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.service.TemplateService; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Guild; @@ -98,7 +98,7 @@ public class WarnServiceBean implements WarnService { } private void sendWarnLog(ServerContext warnLogModel) { - String warnLogMessage = templateService.renderContextAwareTemplate(WARN_LOG_TEMPLATE, warnLogModel); + String warnLogMessage = templateService.renderTemplate(WARN_LOG_TEMPLATE, warnLogModel); postTargetService.sendTextInPostTarget(warnLogMessage, WARN_LOG_TARGET, warnLogModel.getServer().getId()); MessageToSend message = templateService.renderEmbedTemplate("warn_log", warnLogModel); postTargetService.sendEmbedInPostTarget(message, WARN_LOG_TARGET, warnLogModel.getServer().getId()); diff --git a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/WarnManagementServiceBean.java b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/WarnManagementServiceBean.java index 0bf735da2..7c40ba547 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/WarnManagementServiceBean.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/management/WarnManagementServiceBean.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.moderation.service.management; -import dev.sheldan.abstracto.moderation.models.Warning; +import dev.sheldan.abstracto.moderation.models.database.Warning; import dev.sheldan.abstracto.moderation.repository.WarnRepository; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import org.springframework.beans.factory.annotation.Autowired; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/Moderation.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/Moderation.java index fa7ca5fd9..cfb5602cc 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/Moderation.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/Moderation.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.moderation; -import dev.sheldan.abstracto.core.command.ModuleInterface; -import dev.sheldan.abstracto.core.command.module.ModuleInfo; +import dev.sheldan.abstracto.core.command.config.ModuleInterface; +import dev.sheldan.abstracto.core.command.config.ModuleInfo; import org.springframework.stereotype.Component; @Component diff --git a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/Warning.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/database/Warning.java similarity index 93% rename from abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/Warning.java rename to abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/database/Warning.java index 498f4e04b..ebdae9227 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/Warning.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/database/Warning.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.moderation.models; +package dev.sheldan.abstracto.moderation.models.database; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import lombok.AllArgsConstructor; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/BanIdLog.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/commands/BanIdLog.java similarity index 74% rename from abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/BanIdLog.java rename to abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/commands/BanIdLog.java index aec677488..2035b147c 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/BanIdLog.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/commands/BanIdLog.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.moderation.models.template; +package dev.sheldan.abstracto.moderation.models.template.commands; import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import lombok.Getter; @@ -12,8 +12,4 @@ public class BanIdLog extends UserInitiatedServerContext { private Member banningUser; private Long bannedUserId; - @Override - public String getTemplateSuffix() { - return ""; - } } diff --git a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/BanLog.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/commands/BanLog.java similarity index 85% rename from abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/BanLog.java rename to abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/commands/BanLog.java index 612467d29..d2384f004 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/BanLog.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/commands/BanLog.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.moderation.models.template; +package dev.sheldan.abstracto.moderation.models.template.commands; import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import lombok.Getter; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/KickLogModel.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/commands/KickLogModel.java similarity index 85% rename from abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/KickLogModel.java rename to abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/commands/KickLogModel.java index 1730194f2..9c7007088 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/KickLogModel.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/commands/KickLogModel.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.moderation.models.template; +package dev.sheldan.abstracto.moderation.models.template.commands; import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import lombok.Getter; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/WarnLog.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/commands/WarnLog.java similarity index 78% rename from abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/WarnLog.java rename to abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/commands/WarnLog.java index cb9c654da..9d9006f26 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/WarnLog.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/commands/WarnLog.java @@ -1,7 +1,7 @@ -package dev.sheldan.abstracto.moderation.models.template; +package dev.sheldan.abstracto.moderation.models.template.commands; import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; -import dev.sheldan.abstracto.moderation.models.Warning; +import dev.sheldan.abstracto.moderation.models.database.Warning; import lombok.Getter; import lombok.Setter; import lombok.experimental.SuperBuilder; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/WarnNotification.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/commands/WarnNotification.java similarity index 54% rename from abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/WarnNotification.java rename to abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/commands/WarnNotification.java index a3e631692..e818c2cf7 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/WarnNotification.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/commands/WarnNotification.java @@ -1,6 +1,6 @@ -package dev.sheldan.abstracto.moderation.models.template; +package dev.sheldan.abstracto.moderation.models.template.commands; -import dev.sheldan.abstracto.moderation.models.Warning; +import dev.sheldan.abstracto.moderation.models.database.Warning; import lombok.Builder; import lombok.Value; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/KickService.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/KickService.java index 895e3bb75..bbcbf5836 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/KickService.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/KickService.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.moderation.service; -import dev.sheldan.abstracto.moderation.models.template.KickLogModel; +import dev.sheldan.abstracto.moderation.models.template.commands.KickLogModel; import net.dv8tion.jda.api.entities.Member; public interface KickService { diff --git a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/WarnService.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/WarnService.java index 23b80f9c9..4c2fb5983 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/WarnService.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/WarnService.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.moderation.service; -import dev.sheldan.abstracto.moderation.models.template.WarnLog; +import dev.sheldan.abstracto.moderation.models.template.commands.WarnLog; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import net.dv8tion.jda.api.entities.Member; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/management/WarnManagementService.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/management/WarnManagementService.java index 9de6c551f..1caebdd77 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/management/WarnManagementService.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/management/WarnManagementService.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.moderation.service.management; -import dev.sheldan.abstracto.moderation.models.Warning; +import dev.sheldan.abstracto.moderation.models.database.Warning; import dev.sheldan.abstracto.core.models.database.AUserInAServer; public interface WarnManagementService { diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/ShowEmote.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/ShowEmote.java similarity index 81% rename from abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/ShowEmote.java rename to abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/ShowEmote.java index 54a43ed0f..55a0008a4 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/ShowEmote.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/ShowEmote.java @@ -1,11 +1,14 @@ -package dev.sheldan.abstracto.utility.command; +package dev.sheldan.abstracto.utility.commands; -import dev.sheldan.abstracto.core.command.*; +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.execution.*; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.service.TemplateService; import dev.sheldan.abstracto.utility.Utility; import dev.sheldan.abstracto.utility.config.UtilityFeatures; -import dev.sheldan.abstracto.utility.models.template.ShowEmoteLog; +import dev.sheldan.abstracto.utility.models.template.commands.ShowEmoteLog; import net.dv8tion.jda.api.entities.Emote; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/StarStats.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/StarStats.java similarity index 78% rename from abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/StarStats.java rename to abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/StarStats.java index f27bda405..7e075eec6 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/StarStats.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/StarStats.java @@ -1,17 +1,17 @@ -package dev.sheldan.abstracto.utility.command; +package dev.sheldan.abstracto.utility.commands; -import dev.sheldan.abstracto.core.command.AbstractConditionableCommand; -import dev.sheldan.abstracto.core.command.HelpInfo; -import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; +import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand; +import dev.sheldan.abstracto.core.command.config.HelpInfo; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.CommandResult; -import dev.sheldan.abstracto.core.command.execution.Parameter; -import dev.sheldan.abstracto.core.models.MessageToSend; +import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.templating.model.MessageToSend; import dev.sheldan.abstracto.core.service.ChannelService; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.service.TemplateService; import dev.sheldan.abstracto.utility.Utility; import dev.sheldan.abstracto.utility.config.UtilityFeatures; -import dev.sheldan.abstracto.utility.models.template.starboard.StarStatsModel; +import dev.sheldan.abstracto.utility.models.template.commands.starboard.StarStatsModel; import dev.sheldan.abstracto.utility.service.StarboardService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/remind/Remind.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/remind/Remind.java similarity index 84% rename from abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/remind/Remind.java rename to abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/remind/Remind.java index 50e658352..2999adddd 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/remind/Remind.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/remind/Remind.java @@ -1,11 +1,14 @@ -package dev.sheldan.abstracto.utility.command.remind; +package dev.sheldan.abstracto.utility.commands.remind; -import dev.sheldan.abstracto.core.command.*; +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.execution.*; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.utility.config.UtilityFeatures; import dev.sheldan.abstracto.utility.Utility; -import dev.sheldan.abstracto.utility.models.template.ReminderModel; +import dev.sheldan.abstracto.utility.models.template.commands.reminder.ReminderModel; import dev.sheldan.abstracto.utility.service.ReminderService; import net.dv8tion.jda.api.entities.MessageEmbed; import org.springframework.beans.factory.annotation.Autowired; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/suggest/Accept.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/suggest/Accept.java similarity index 82% rename from abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/suggest/Accept.java rename to abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/suggest/Accept.java index 2a73fac4b..32109d991 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/suggest/Accept.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/suggest/Accept.java @@ -1,11 +1,13 @@ -package dev.sheldan.abstracto.utility.command.suggest; +package dev.sheldan.abstracto.utility.commands.suggest; -import dev.sheldan.abstracto.core.command.AbstractConditionableCommand; -import dev.sheldan.abstracto.core.command.HelpInfo; +import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand; +import dev.sheldan.abstracto.core.command.config.HelpInfo; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.command.execution.*; import dev.sheldan.abstracto.utility.Utility; import dev.sheldan.abstracto.utility.config.UtilityFeatures; -import dev.sheldan.abstracto.utility.models.template.SuggestionLog; +import dev.sheldan.abstracto.utility.models.template.commands.SuggestionLog; import dev.sheldan.abstracto.utility.service.SuggestionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/suggest/Reject.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/suggest/Reject.java similarity index 82% rename from abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/suggest/Reject.java rename to abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/suggest/Reject.java index 7129bba79..6ab869950 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/suggest/Reject.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/suggest/Reject.java @@ -1,11 +1,13 @@ -package dev.sheldan.abstracto.utility.command.suggest; +package dev.sheldan.abstracto.utility.commands.suggest; -import dev.sheldan.abstracto.core.command.AbstractConditionableCommand; -import dev.sheldan.abstracto.core.command.HelpInfo; +import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand; +import dev.sheldan.abstracto.core.command.config.HelpInfo; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.command.execution.*; import dev.sheldan.abstracto.utility.Utility; import dev.sheldan.abstracto.utility.config.UtilityFeatures; -import dev.sheldan.abstracto.utility.models.template.SuggestionLog; +import dev.sheldan.abstracto.utility.models.template.commands.SuggestionLog; import dev.sheldan.abstracto.utility.service.SuggestionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/suggest/Suggest.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/suggest/Suggest.java similarity index 82% rename from abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/suggest/Suggest.java rename to abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/suggest/Suggest.java index 751e79453..c392dd497 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/suggest/Suggest.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/commands/suggest/Suggest.java @@ -1,11 +1,13 @@ -package dev.sheldan.abstracto.utility.command.suggest; +package dev.sheldan.abstracto.utility.commands.suggest; -import dev.sheldan.abstracto.core.command.AbstractConditionableCommand; -import dev.sheldan.abstracto.core.command.HelpInfo; +import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand; +import dev.sheldan.abstracto.core.command.config.HelpInfo; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.command.execution.*; import dev.sheldan.abstracto.utility.Utility; import dev.sheldan.abstracto.utility.config.UtilityFeatures; -import dev.sheldan.abstracto.utility.models.template.SuggestionLog; +import dev.sheldan.abstracto.utility.models.template.commands.SuggestionLog; import dev.sheldan.abstracto.utility.service.SuggestionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/MessageEmbedListener.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/embed/MessageEmbedListener.java similarity index 94% rename from abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/MessageEmbedListener.java rename to abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/embed/MessageEmbedListener.java index 05e5c4abd..5b6413ef3 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/MessageEmbedListener.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/embed/MessageEmbedListener.java @@ -1,10 +1,10 @@ -package dev.sheldan.abstracto.utility.listener; +package dev.sheldan.abstracto.utility.listener.embed; import dev.sheldan.abstracto.core.listener.MessageReceivedListener; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.core.service.MessageCache; import dev.sheldan.abstracto.core.service.management.UserManagementService; -import dev.sheldan.abstracto.utility.MessageEmbedLink; +import dev.sheldan.abstracto.utility.models.MessageEmbedLink; import dev.sheldan.abstracto.utility.config.UtilityFeatures; import dev.sheldan.abstracto.utility.service.MessageEmbedService; import lombok.extern.slf4j.Slf4j; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/MessageEmbedRemovalReactionListener.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/embed/MessageEmbedRemovalReactionListener.java similarity index 96% rename from abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/MessageEmbedRemovalReactionListener.java rename to abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/embed/MessageEmbedRemovalReactionListener.java index edf7c31ff..5416acbc6 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/MessageEmbedRemovalReactionListener.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/embed/MessageEmbedRemovalReactionListener.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.utility.listener; +package dev.sheldan.abstracto.utility.listener.embed; import dev.sheldan.abstracto.core.listener.ReactedAddedListener; import dev.sheldan.abstracto.core.models.cache.CachedMessage; @@ -9,7 +9,7 @@ import dev.sheldan.abstracto.core.service.MessageService; import dev.sheldan.abstracto.core.service.management.EmoteManagementService; import dev.sheldan.abstracto.core.utils.EmoteUtils; import dev.sheldan.abstracto.utility.config.UtilityFeatures; -import dev.sheldan.abstracto.utility.models.EmbeddedMessage; +import dev.sheldan.abstracto.utility.models.database.EmbeddedMessage; import dev.sheldan.abstracto.utility.service.management.MessageEmbedPostManagementService; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.entities.Emote; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/StarboardListener.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/starboard/StarboardListener.java similarity index 98% rename from abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/StarboardListener.java rename to abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/starboard/StarboardListener.java index aa25834cb..ae29b0785 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/StarboardListener.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/starboard/StarboardListener.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.utility.listener; +package dev.sheldan.abstracto.utility.listener.starboard; import dev.sheldan.abstracto.core.listener.ReactedAddedListener; import dev.sheldan.abstracto.core.listener.ReactedRemovedListener; @@ -14,7 +14,7 @@ import dev.sheldan.abstracto.core.service.management.EmoteManagementService; import dev.sheldan.abstracto.core.service.management.UserManagementService; import dev.sheldan.abstracto.core.utils.EmoteUtils; import dev.sheldan.abstracto.utility.config.UtilityFeatures; -import dev.sheldan.abstracto.utility.models.StarboardPost; +import dev.sheldan.abstracto.utility.models.database.StarboardPost; import dev.sheldan.abstracto.utility.service.StarboardService; import dev.sheldan.abstracto.utility.service.management.StarboardPostManagementService; import dev.sheldan.abstracto.utility.service.management.StarboardPostReactorManagementService; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/StarboardPostDeletedListener.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/starboard/StarboardPostDeletedListener.java similarity index 89% rename from abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/StarboardPostDeletedListener.java rename to abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/starboard/StarboardPostDeletedListener.java index 6cd62bdbf..bf53e11a5 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/StarboardPostDeletedListener.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/starboard/StarboardPostDeletedListener.java @@ -1,9 +1,9 @@ -package dev.sheldan.abstracto.utility.listener; +package dev.sheldan.abstracto.utility.listener.starboard; import dev.sheldan.abstracto.core.listener.MessageDeletedListener; import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.utility.config.UtilityFeatures; -import dev.sheldan.abstracto.utility.models.StarboardPost; +import dev.sheldan.abstracto.utility.models.database.StarboardPost; import dev.sheldan.abstracto.utility.service.management.StarboardPostManagementService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/EmbeddedMessageRepository.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/EmbeddedMessageRepository.java index 96fc27397..645eaa2f7 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/EmbeddedMessageRepository.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/EmbeddedMessageRepository.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.utility.repository; -import dev.sheldan.abstracto.utility.models.EmbeddedMessage; +import dev.sheldan.abstracto.utility.models.database.EmbeddedMessage; import org.springframework.data.jpa.repository.JpaRepository; public interface EmbeddedMessageRepository extends JpaRepository { diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/ReminderRepository.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/ReminderRepository.java index a24eae4ef..ef6546b24 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/ReminderRepository.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/ReminderRepository.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.utility.repository; -import dev.sheldan.abstracto.utility.models.Reminder; +import dev.sheldan.abstracto.utility.models.database.Reminder; import org.springframework.data.jpa.repository.JpaRepository; public interface ReminderRepository extends JpaRepository { diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/StarboardPostReactionRepository.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/StarboardPostReactionRepository.java index e01667854..199c8bf1e 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/StarboardPostReactionRepository.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/StarboardPostReactionRepository.java @@ -1,8 +1,8 @@ package dev.sheldan.abstracto.utility.repository; import dev.sheldan.abstracto.core.models.database.AUser; -import dev.sheldan.abstracto.utility.models.StarboardPost; -import dev.sheldan.abstracto.utility.models.StarboardPostReaction; +import dev.sheldan.abstracto.utility.models.database.StarboardPost; +import dev.sheldan.abstracto.utility.models.database.StarboardPostReaction; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/StarboardPostRepository.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/StarboardPostRepository.java index 8f65a2cf8..b937439a9 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/StarboardPostRepository.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/StarboardPostRepository.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.utility.repository; -import dev.sheldan.abstracto.utility.models.StarboardPost; +import dev.sheldan.abstracto.utility.models.database.StarboardPost; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/SuggestionRepository.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/SuggestionRepository.java index 0563056e3..cbf90c5c1 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/SuggestionRepository.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/SuggestionRepository.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.utility.repository; -import dev.sheldan.abstracto.utility.models.Suggestion; +import dev.sheldan.abstracto.utility.models.database.Suggestion; import org.springframework.data.jpa.repository.JpaRepository; public interface SuggestionRepository extends JpaRepository { diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/converter/StarStatsUserConverter.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/converter/StarStatsUserConverter.java index b48226c80..cb6ae3a39 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/converter/StarStatsUserConverter.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/repository/converter/StarStatsUserConverter.java @@ -3,7 +3,7 @@ package dev.sheldan.abstracto.utility.repository.converter; import dev.sheldan.abstracto.core.service.management.UserManagementService; import dev.sheldan.abstracto.core.models.database.AUser; import dev.sheldan.abstracto.core.service.Bot; -import dev.sheldan.abstracto.utility.models.template.starboard.StarStatsUser; +import dev.sheldan.abstracto.utility.models.template.commands.starboard.StarStatsUser; import dev.sheldan.abstracto.utility.repository.StarStatsUserResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/MessageEmbedServiceBean.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/MessageEmbedServiceBean.java index f7f7f5ab5..d3c1c46f3 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/MessageEmbedServiceBean.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/MessageEmbedServiceBean.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.utility.service; -import dev.sheldan.abstracto.core.listener.models.MessageEmbeddedModel; -import dev.sheldan.abstracto.core.models.MessageToSend; +import dev.sheldan.abstracto.core.models.template.listener.MessageEmbeddedModel; +import dev.sheldan.abstracto.templating.model.MessageToSend; import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.models.database.AServer; @@ -13,8 +13,8 @@ import dev.sheldan.abstracto.core.service.MessageService; import dev.sheldan.abstracto.core.service.management.ChannelManagementService; import dev.sheldan.abstracto.core.service.management.ServerManagementService; import dev.sheldan.abstracto.core.service.management.UserManagementService; -import dev.sheldan.abstracto.templating.TemplateService; -import dev.sheldan.abstracto.utility.MessageEmbedLink; +import dev.sheldan.abstracto.templating.service.TemplateService; +import dev.sheldan.abstracto.utility.models.MessageEmbedLink; import dev.sheldan.abstracto.utility.service.management.MessageEmbedPostManagementService; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.entities.Member; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/RemindServiceBean.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/RemindServiceBean.java index 0adfb6cb5..7ee430616 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/RemindServiceBean.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/RemindServiceBean.java @@ -7,19 +7,18 @@ import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.models.database.AServer; import dev.sheldan.abstracto.core.models.database.AUser; import dev.sheldan.abstracto.core.models.database.AUserInAServer; -import dev.sheldan.abstracto.core.models.MessageToSend; +import dev.sheldan.abstracto.templating.model.MessageToSend; import dev.sheldan.abstracto.core.service.Bot; -import dev.sheldan.abstracto.scheduling.model.SchedulerService; -import dev.sheldan.abstracto.templating.TemplateService; -import dev.sheldan.abstracto.utility.models.Reminder; -import dev.sheldan.abstracto.utility.models.template.ExecutedReminderModel; -import dev.sheldan.abstracto.utility.models.template.ReminderModel; +import dev.sheldan.abstracto.scheduling.service.SchedulerService; +import dev.sheldan.abstracto.templating.service.TemplateService; +import dev.sheldan.abstracto.utility.models.database.Reminder; +import dev.sheldan.abstracto.utility.models.template.commands.reminder.ExecutedReminderModel; +import dev.sheldan.abstracto.utility.models.template.commands.reminder.ReminderModel; import dev.sheldan.abstracto.utility.service.management.ReminderManagementService; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.TextChannel; -import org.apache.commons.lang3.StringUtils; import org.quartz.JobDataMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/StarboardServiceBean.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/StarboardServiceBean.java index 1d34c8c5c..8c81f6f80 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/StarboardServiceBean.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/StarboardServiceBean.java @@ -3,21 +3,21 @@ package dev.sheldan.abstracto.utility.service; import dev.sheldan.abstracto.core.service.management.EmoteManagementService; import dev.sheldan.abstracto.core.service.management.PostTargetManagement; import dev.sheldan.abstracto.core.service.management.UserManagementService; -import dev.sheldan.abstracto.core.models.AServerChannelMessage; +import dev.sheldan.abstracto.core.models.AServerAChannelMessage; import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.database.*; -import dev.sheldan.abstracto.core.models.MessageToSend; +import dev.sheldan.abstracto.templating.model.MessageToSend; import dev.sheldan.abstracto.core.service.Bot; import dev.sheldan.abstracto.core.service.ConfigService; import dev.sheldan.abstracto.core.service.EmoteService; import dev.sheldan.abstracto.core.service.PostTargetService; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.service.TemplateService; import dev.sheldan.abstracto.utility.config.StarboardConfig; -import dev.sheldan.abstracto.utility.models.StarboardPost; -import dev.sheldan.abstracto.utility.models.template.starboard.StarStatsModel; -import dev.sheldan.abstracto.utility.models.template.starboard.StarStatsPost; -import dev.sheldan.abstracto.utility.models.template.starboard.StarStatsUser; -import dev.sheldan.abstracto.utility.models.template.starboard.StarboardPostModel; +import dev.sheldan.abstracto.utility.models.database.StarboardPost; +import dev.sheldan.abstracto.utility.models.template.commands.starboard.StarStatsModel; +import dev.sheldan.abstracto.utility.models.template.commands.starboard.StarStatsPost; +import dev.sheldan.abstracto.utility.models.template.commands.starboard.StarStatsUser; +import dev.sheldan.abstracto.utility.models.template.commands.starboard.StarboardPostModel; import dev.sheldan.abstracto.utility.service.management.StarboardPostManagementService; import dev.sheldan.abstracto.utility.service.management.StarboardPostReactorManagementService; import lombok.extern.slf4j.Slf4j; @@ -81,13 +81,13 @@ public class StarboardServiceBean implements StarboardService { CompletableFuture.allOf(completableFutures.toArray(new CompletableFuture[0])).thenAccept(aVoid -> { try { Message message1 = completableFutures.get(0).get(); - AServerChannelMessage aServerChannelMessage = AServerChannelMessage + AServerAChannelMessage aServerAChannelMessage = AServerAChannelMessage .builder() .messageId(message1.getIdLong()) .channel(starboard.getChannelReference()) .server(userReacting.getServerReference()) .build(); - StarboardPost starboardPost = starboardPostManagementService.createStarboardPost(message, starredUser, userReacting, aServerChannelMessage); + StarboardPost starboardPost = starboardPostManagementService.createStarboardPost(message, starredUser, userReacting, aServerAChannelMessage); // TODO maybe in bulk, but numbers should be small enough userExceptAuthor.forEach(user -> { starboardPostReactorManagementService.addReactor(starboardPost, user); diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/SuggestionServiceBean.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/SuggestionServiceBean.java index 045774890..b74518fce 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/SuggestionServiceBean.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/SuggestionServiceBean.java @@ -3,15 +3,15 @@ package dev.sheldan.abstracto.utility.service; import dev.sheldan.abstracto.core.service.EmoteService; import dev.sheldan.abstracto.core.service.management.EmoteManagementService; import dev.sheldan.abstracto.core.models.database.AUserInAServer; -import dev.sheldan.abstracto.core.models.MessageToSend; +import dev.sheldan.abstracto.templating.model.MessageToSend; import dev.sheldan.abstracto.core.service.Bot; import dev.sheldan.abstracto.core.service.MessageService; import dev.sheldan.abstracto.core.service.PostTargetService; import dev.sheldan.abstracto.core.utils.MessageUtils; -import dev.sheldan.abstracto.templating.TemplateService; -import dev.sheldan.abstracto.utility.models.Suggestion; +import dev.sheldan.abstracto.templating.service.TemplateService; +import dev.sheldan.abstracto.utility.models.database.Suggestion; import dev.sheldan.abstracto.utility.models.SuggestionState; -import dev.sheldan.abstracto.utility.models.template.SuggestionLog; +import dev.sheldan.abstracto.utility.models.template.commands.SuggestionLog; import dev.sheldan.abstracto.utility.service.management.SuggestionManagementService; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.JDA; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/MessageEmbedPostManagementServiceBean.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/MessageEmbedPostManagementServiceBean.java index da27dc2ea..3ca9b838c 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/MessageEmbedPostManagementServiceBean.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/MessageEmbedPostManagementServiceBean.java @@ -6,7 +6,7 @@ import dev.sheldan.abstracto.core.models.database.AServer; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.core.service.MessageService; import dev.sheldan.abstracto.core.service.management.UserManagementService; -import dev.sheldan.abstracto.utility.models.EmbeddedMessage; +import dev.sheldan.abstracto.utility.models.database.EmbeddedMessage; import dev.sheldan.abstracto.utility.repository.EmbeddedMessageRepository; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.entities.Message; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/ReminderManagementServiceBean.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/ReminderManagementServiceBean.java index 8a2f4c187..04c69846f 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/ReminderManagementServiceBean.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/ReminderManagementServiceBean.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.utility.service.management; import dev.sheldan.abstracto.core.models.AServerAChannelAUser; -import dev.sheldan.abstracto.utility.models.Reminder; +import dev.sheldan.abstracto.utility.models.database.Reminder; import dev.sheldan.abstracto.utility.repository.ReminderRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostManagementServiceBean.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostManagementServiceBean.java index 6103c367f..07432cbe3 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostManagementServiceBean.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostManagementServiceBean.java @@ -1,9 +1,9 @@ package dev.sheldan.abstracto.utility.service.management; -import dev.sheldan.abstracto.core.models.AServerChannelMessage; +import dev.sheldan.abstracto.core.models.AServerAChannelMessage; import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.database.AUserInAServer; -import dev.sheldan.abstracto.utility.models.StarboardPost; +import dev.sheldan.abstracto.utility.models.database.StarboardPost; import dev.sheldan.abstracto.utility.repository.StarboardPostRepository; import dev.sheldan.abstracto.utility.repository.converter.StarStatsUserConverter; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +25,7 @@ public class StarboardPostManagementServiceBean implements StarboardPostManageme private StarStatsUserConverter converter; @Override - public StarboardPost createStarboardPost(CachedMessage starredMessage, AUserInAServer starredUser, AUserInAServer starringUser, AServerChannelMessage starboardPost) { + public StarboardPost createStarboardPost(CachedMessage starredMessage, AUserInAServer starredUser, AUserInAServer starringUser, AServerAChannelMessage starboardPost) { StarboardPost post = StarboardPost .builder() .author(starredUser.getUserReference()) diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostReactorManagementServiceBean.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostReactorManagementServiceBean.java index a0d5cf07e..178adb7b4 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostReactorManagementServiceBean.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostReactorManagementServiceBean.java @@ -1,17 +1,15 @@ package dev.sheldan.abstracto.utility.service.management; import dev.sheldan.abstracto.core.models.database.AUser; -import dev.sheldan.abstracto.utility.models.StarboardPost; -import dev.sheldan.abstracto.utility.models.StarboardPostReaction; -import dev.sheldan.abstracto.utility.models.template.starboard.StarStatsUser; +import dev.sheldan.abstracto.utility.models.database.StarboardPost; +import dev.sheldan.abstracto.utility.models.database.StarboardPostReaction; +import dev.sheldan.abstracto.utility.models.template.commands.starboard.StarStatsUser; import dev.sheldan.abstracto.utility.repository.StarStatsUserResult; import dev.sheldan.abstracto.utility.repository.StarboardPostReactionRepository; import dev.sheldan.abstracto.utility.repository.converter.StarStatsUserConverter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.Collections; -import java.util.Comparator; import java.util.List; @Component diff --git a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/SuggestionManagementServiceBean.java b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/SuggestionManagementServiceBean.java index f9022e464..c943b970e 100644 --- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/SuggestionManagementServiceBean.java +++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/SuggestionManagementServiceBean.java @@ -6,7 +6,7 @@ import dev.sheldan.abstracto.core.service.management.UserManagementService; import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.models.database.AServer; import dev.sheldan.abstracto.core.models.database.AUserInAServer; -import dev.sheldan.abstracto.utility.models.Suggestion; +import dev.sheldan.abstracto.utility.models.database.Suggestion; import dev.sheldan.abstracto.utility.models.SuggestionState; import dev.sheldan.abstracto.utility.repository.SuggestionRepository; import net.dv8tion.jda.api.entities.Member; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/Utility.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/Utility.java index 959e83986..6a486518b 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/Utility.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/Utility.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.utility; -import dev.sheldan.abstracto.core.command.ModuleInterface; -import dev.sheldan.abstracto.core.command.module.ModuleInfo; +import dev.sheldan.abstracto.core.command.config.ModuleInterface; +import dev.sheldan.abstracto.core.command.config.ModuleInfo; import org.springframework.stereotype.Component; @Component diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/MessageEmbedLink.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/MessageEmbedLink.java similarity index 83% rename from abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/MessageEmbedLink.java rename to abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/MessageEmbedLink.java index 4a41bb9f5..21b908e8f 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/MessageEmbedLink.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/MessageEmbedLink.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.utility; +package dev.sheldan.abstracto.utility.models; import lombok.Builder; import lombok.Getter; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/EmbeddedMessage.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/EmbeddedMessage.java similarity index 95% rename from abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/EmbeddedMessage.java rename to abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/EmbeddedMessage.java index b3a42e0e1..81e3d3db3 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/EmbeddedMessage.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/EmbeddedMessage.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.utility.models; +package dev.sheldan.abstracto.utility.models.database; import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.models.database.AServer; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/Reminder.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/Reminder.java similarity index 94% rename from abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/Reminder.java rename to abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/Reminder.java index d0d7213fa..4a2f266d1 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/Reminder.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/Reminder.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.utility.models; +package dev.sheldan.abstracto.utility.models.database; import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.models.database.AServer; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/StarboardPost.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/StarboardPost.java similarity index 95% rename from abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/StarboardPost.java rename to abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/StarboardPost.java index 3e4a3779d..8cfca2128 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/StarboardPost.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/StarboardPost.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.utility.models; +package dev.sheldan.abstracto.utility.models.database; import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.models.database.AUser; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/StarboardPostReaction.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/StarboardPostReaction.java similarity index 90% rename from abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/StarboardPostReaction.java rename to abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/StarboardPostReaction.java index dd066bb33..5d5db0da5 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/StarboardPostReaction.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/StarboardPostReaction.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.utility.models; +package dev.sheldan.abstracto.utility.models.database; import dev.sheldan.abstracto.core.models.database.AUser; import lombok.*; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/Suggestion.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/Suggestion.java similarity index 89% rename from abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/Suggestion.java rename to abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/Suggestion.java index 6d9f121e6..399e0714e 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/Suggestion.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/Suggestion.java @@ -1,8 +1,9 @@ -package dev.sheldan.abstracto.utility.models; +package dev.sheldan.abstracto.utility.models.database; import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.models.database.AServer; import dev.sheldan.abstracto.core.models.database.AUserInAServer; +import dev.sheldan.abstracto.utility.models.SuggestionState; import lombok.*; import javax.persistence.*; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/ShowEmoteLog.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/ShowEmoteLog.java similarity index 83% rename from abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/ShowEmoteLog.java rename to abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/ShowEmoteLog.java index c911253c7..5283e9e06 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/ShowEmoteLog.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/ShowEmoteLog.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.utility.models.template; +package dev.sheldan.abstracto.utility.models.template.commands; import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import lombok.Getter; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/SuggestionLog.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/SuggestionLog.java similarity index 80% rename from abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/SuggestionLog.java rename to abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/SuggestionLog.java index 44296595d..8ddaed670 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/SuggestionLog.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/SuggestionLog.java @@ -1,7 +1,7 @@ -package dev.sheldan.abstracto.utility.models.template; +package dev.sheldan.abstracto.utility.models.template.commands; import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; -import dev.sheldan.abstracto.utility.models.Suggestion; +import dev.sheldan.abstracto.utility.models.database.Suggestion; import lombok.Getter; import lombok.Setter; import lombok.experimental.SuperBuilder; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/ExecutedReminderModel.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/reminder/ExecutedReminderModel.java similarity index 81% rename from abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/ExecutedReminderModel.java rename to abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/reminder/ExecutedReminderModel.java index 68e5d4fcc..72f1d506f 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/ExecutedReminderModel.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/reminder/ExecutedReminderModel.java @@ -1,8 +1,8 @@ -package dev.sheldan.abstracto.utility.models.template; +package dev.sheldan.abstracto.utility.models.template.commands.reminder; import dev.sheldan.abstracto.core.models.context.ServerContext; import dev.sheldan.abstracto.core.utils.MessageUtils; -import dev.sheldan.abstracto.utility.models.Reminder; +import dev.sheldan.abstracto.utility.models.database.Reminder; import lombok.Getter; import lombok.Setter; import lombok.experimental.SuperBuilder; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/ReminderModel.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/reminder/ReminderModel.java similarity index 74% rename from abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/ReminderModel.java rename to abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/reminder/ReminderModel.java index fd9441c8c..b50b5a43a 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/ReminderModel.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/reminder/ReminderModel.java @@ -1,7 +1,7 @@ -package dev.sheldan.abstracto.utility.models.template; +package dev.sheldan.abstracto.utility.models.template.commands.reminder; import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; -import dev.sheldan.abstracto.utility.models.Reminder; +import dev.sheldan.abstracto.utility.models.database.Reminder; import lombok.Getter; import lombok.Setter; import lombok.experimental.SuperBuilder; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/starboard/StarStatsModel.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/starboard/StarStatsModel.java similarity index 83% rename from abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/starboard/StarStatsModel.java rename to abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/starboard/StarStatsModel.java index cd6ab2492..01b0af28f 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/starboard/StarStatsModel.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/starboard/StarStatsModel.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.utility.models.template.starboard; +package dev.sheldan.abstracto.utility.models.template.commands.starboard; import lombok.Builder; import lombok.Getter; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/starboard/StarStatsPost.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/starboard/StarStatsPost.java similarity index 86% rename from abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/starboard/StarStatsPost.java rename to abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/starboard/StarStatsPost.java index c85e12408..75149f148 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/starboard/StarStatsPost.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/starboard/StarStatsPost.java @@ -1,8 +1,8 @@ -package dev.sheldan.abstracto.utility.models.template.starboard; +package dev.sheldan.abstracto.utility.models.template.commands.starboard; import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.utils.MessageUtils; -import dev.sheldan.abstracto.utility.models.StarboardPost; +import dev.sheldan.abstracto.utility.models.database.StarboardPost; import lombok.Builder; import lombok.Getter; import lombok.Setter; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/starboard/StarStatsUser.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/starboard/StarStatsUser.java similarity index 80% rename from abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/starboard/StarStatsUser.java rename to abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/starboard/StarStatsUser.java index c14c20c31..eb1cd9465 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/starboard/StarStatsUser.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/starboard/StarStatsUser.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.utility.models.template.starboard; +package dev.sheldan.abstracto.utility.models.template.commands.starboard; import dev.sheldan.abstracto.core.models.database.AUser; import lombok.Builder; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/starboard/StarboardPostModel.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/starboard/StarboardPostModel.java similarity index 90% rename from abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/starboard/StarboardPostModel.java rename to abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/starboard/StarboardPostModel.java index 22aa7bef2..75a57f67b 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/starboard/StarboardPostModel.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/commands/starboard/StarboardPostModel.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.utility.models.template.starboard; +package dev.sheldan.abstracto.utility.models.template.commands.starboard; import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.context.ServerContext; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/MessageEmbedService.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/MessageEmbedService.java index e373ca823..8878fdab2 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/MessageEmbedService.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/MessageEmbedService.java @@ -2,7 +2,7 @@ package dev.sheldan.abstracto.utility.service; import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.database.AUserInAServer; -import dev.sheldan.abstracto.utility.MessageEmbedLink; +import dev.sheldan.abstracto.utility.models.MessageEmbedLink; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.TextChannel; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/ReminderService.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/ReminderService.java index 4f26b7c93..d39c0edbf 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/ReminderService.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/ReminderService.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.utility.service; import dev.sheldan.abstracto.core.models.database.AUserInAServer; -import dev.sheldan.abstracto.utility.models.template.ReminderModel; +import dev.sheldan.abstracto.utility.models.template.commands.reminder.ReminderModel; import java.time.Duration; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/StarboardService.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/StarboardService.java index 6c8ac57c7..7824aa3f5 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/StarboardService.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/StarboardService.java @@ -3,8 +3,8 @@ package dev.sheldan.abstracto.utility.service; import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.database.AUser; import dev.sheldan.abstracto.core.models.database.AUserInAServer; -import dev.sheldan.abstracto.utility.models.StarboardPost; -import dev.sheldan.abstracto.utility.models.template.starboard.StarStatsModel; +import dev.sheldan.abstracto.utility.models.database.StarboardPost; +import dev.sheldan.abstracto.utility.models.template.commands.starboard.StarStatsModel; import java.util.List; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/SuggestionService.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/SuggestionService.java index f00724d5f..797dd27b5 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/SuggestionService.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/SuggestionService.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.utility.service; -import dev.sheldan.abstracto.utility.models.template.SuggestionLog; +import dev.sheldan.abstracto.utility.models.template.commands.SuggestionLog; import net.dv8tion.jda.api.entities.Member; public interface SuggestionService { diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/MessageEmbedPostManagementService.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/MessageEmbedPostManagementService.java index aa9a463ff..08bce80c2 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/MessageEmbedPostManagementService.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/MessageEmbedPostManagementService.java @@ -2,7 +2,7 @@ package dev.sheldan.abstracto.utility.service.management; import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.database.AUserInAServer; -import dev.sheldan.abstracto.utility.models.EmbeddedMessage; +import dev.sheldan.abstracto.utility.models.database.EmbeddedMessage; import net.dv8tion.jda.api.entities.Message; import java.util.Optional; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/ReminderManagementService.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/ReminderManagementService.java index 97d065ae4..41c712a28 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/ReminderManagementService.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/ReminderManagementService.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.utility.service.management; import dev.sheldan.abstracto.core.models.AServerAChannelAUser; -import dev.sheldan.abstracto.utility.models.Reminder; +import dev.sheldan.abstracto.utility.models.database.Reminder; import java.time.Instant; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostManagementService.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostManagementService.java index 1f2c0d7c1..e1cf41c7f 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostManagementService.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostManagementService.java @@ -1,15 +1,15 @@ package dev.sheldan.abstracto.utility.service.management; -import dev.sheldan.abstracto.core.models.AServerChannelMessage; +import dev.sheldan.abstracto.core.models.AServerAChannelMessage; import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.database.AUserInAServer; -import dev.sheldan.abstracto.utility.models.StarboardPost; +import dev.sheldan.abstracto.utility.models.database.StarboardPost; import java.util.List; import java.util.Optional; public interface StarboardPostManagementService { - StarboardPost createStarboardPost(CachedMessage starredMessage, AUserInAServer starredUser, AUserInAServer starringUser, AServerChannelMessage starboardPost); + StarboardPost createStarboardPost(CachedMessage starredMessage, AUserInAServer starredUser, AUserInAServer starringUser, AServerAChannelMessage starboardPost); void setStarboardPostMessageId(StarboardPost post, Long messageId); List retrieveTopPosts(Long serverId, Integer count); List retrieveAllPosts(Long serverId); diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostReactorManagementService.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostReactorManagementService.java index b7d3977a8..47793d5cc 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostReactorManagementService.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostReactorManagementService.java @@ -1,8 +1,8 @@ package dev.sheldan.abstracto.utility.service.management; import dev.sheldan.abstracto.core.models.database.AUser; -import dev.sheldan.abstracto.utility.models.StarboardPost; -import dev.sheldan.abstracto.utility.models.template.starboard.StarStatsUser; +import dev.sheldan.abstracto.utility.models.database.StarboardPost; +import dev.sheldan.abstracto.utility.models.template.commands.starboard.StarStatsUser; import java.util.List; diff --git a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/SuggestionManagementService.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/SuggestionManagementService.java index 0abc90820..88eda546a 100644 --- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/SuggestionManagementService.java +++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/SuggestionManagementService.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.utility.service.management; import dev.sheldan.abstracto.core.models.database.AUserInAServer; -import dev.sheldan.abstracto.utility.models.Suggestion; +import dev.sheldan.abstracto.utility.models.database.Suggestion; import dev.sheldan.abstracto.utility.models.SuggestionState; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java index f6949a666..286111378 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java @@ -1,12 +1,17 @@ package dev.sheldan.abstracto.core.command; +import dev.sheldan.abstracto.core.command.condition.CommandCondition; +import dev.sheldan.abstracto.core.command.condition.ConditionResult; +import dev.sheldan.abstracto.core.command.condition.ConditionalCommand; +import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.config.Parameters; import dev.sheldan.abstracto.core.command.exception.IncorrectParameter; import dev.sheldan.abstracto.core.command.exception.ParameterTooLong; -import dev.sheldan.abstracto.core.command.models.ACommand; import dev.sheldan.abstracto.core.command.service.ChannelGroupCommandService; +import dev.sheldan.abstracto.core.command.service.CommandManager; import dev.sheldan.abstracto.core.command.service.PostCommandExecution; import dev.sheldan.abstracto.core.command.execution.*; -import dev.sheldan.abstracto.core.command.meta.UnParsedCommandParameter; +import dev.sheldan.abstracto.core.command.execution.UnParsedCommandParameter; import dev.sheldan.abstracto.core.Constants; import dev.sheldan.abstracto.core.command.service.management.CommandManagementService; import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException; @@ -35,7 +40,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Nonnull; import java.time.Duration; import java.util.*; -import java.util.concurrent.atomic.AtomicBoolean; @Service @Slf4j diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/post/ExceptionPostExecution.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/post/ExceptionPostExecution.java index 0100f2965..eeb177a16 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/post/ExceptionPostExecution.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/post/ExceptionPostExecution.java @@ -2,11 +2,11 @@ package dev.sheldan.abstracto.core.command.post; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.service.PostCommandExecution; -import dev.sheldan.abstracto.core.command.Templatable; +import dev.sheldan.abstracto.templating.Templatable; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.CommandResult; import dev.sheldan.abstracto.core.command.execution.ResultState; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.service.TemplateService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/repository/ChannelGroupCommandRepository.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/repository/ChannelGroupCommandRepository.java index 6a845ec9e..9f219dc84 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/repository/ChannelGroupCommandRepository.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/repository/ChannelGroupCommandRepository.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.command.repository; -import dev.sheldan.abstracto.core.command.models.ACommand; +import dev.sheldan.abstracto.core.command.models.database.ACommand; import dev.sheldan.abstracto.core.models.database.AChannelGroup; import dev.sheldan.abstracto.core.models.database.AChannelGroupCommand; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/repository/CommandRepository.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/repository/CommandRepository.java index 63311b68e..6e9a91706 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/repository/CommandRepository.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/repository/CommandRepository.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.command.repository; -import dev.sheldan.abstracto.core.command.models.ACommand; +import dev.sheldan.abstracto.core.command.models.database.ACommand; import org.springframework.data.jpa.repository.JpaRepository; public interface CommandRepository extends JpaRepository { diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/repository/ModuleRepository.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/repository/ModuleRepository.java index fa6a535d3..2295de24c 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/repository/ModuleRepository.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/repository/ModuleRepository.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.command.repository; -import dev.sheldan.abstracto.core.command.models.AModule; +import dev.sheldan.abstracto.core.command.models.database.AModule; import org.springframework.data.jpa.repository.JpaRepository; public interface ModuleRepository extends JpaRepository { diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/ChannelGroupCommandServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/ChannelGroupCommandServiceBean.java index f75a53ad7..590410c87 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/ChannelGroupCommandServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/ChannelGroupCommandServiceBean.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.command.service; -import dev.sheldan.abstracto.core.command.models.ACommand; +import dev.sheldan.abstracto.core.command.models.database.ACommand; import dev.sheldan.abstracto.core.command.service.management.ChannelGroupCommandManagementService; import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.models.database.AChannelGroupCommand; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandManager.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/CommandManager.java similarity index 89% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandManager.java rename to abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/CommandManager.java index 324a482e0..45e553869 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandManager.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/CommandManager.java @@ -1,11 +1,13 @@ -package dev.sheldan.abstracto.core.command; +package dev.sheldan.abstracto.core.command.service; +import dev.sheldan.abstracto.core.command.Command; +import dev.sheldan.abstracto.core.command.config.ModuleInterface; import dev.sheldan.abstracto.core.command.exception.CommandNotFound; import dev.sheldan.abstracto.core.command.exception.InsufficientParameters; -import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; -import dev.sheldan.abstracto.core.command.execution.Parameter; -import dev.sheldan.abstracto.core.command.meta.CommandRegistry; -import dev.sheldan.abstracto.core.command.meta.UnParsedCommandParameter; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.service.CommandRegistry; +import dev.sheldan.abstracto.core.command.execution.UnParsedCommandParameter; import net.dv8tion.jda.api.entities.Message; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/CommandServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/CommandServiceBean.java index 34dffacad..0ddc39f62 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/CommandServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/CommandServiceBean.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.core.command.service; -import dev.sheldan.abstracto.core.command.models.ACommand; -import dev.sheldan.abstracto.core.command.models.AModule; +import dev.sheldan.abstracto.core.command.models.database.ACommand; +import dev.sheldan.abstracto.core.command.models.database.AModule; import dev.sheldan.abstracto.core.command.service.management.CommandManagementService; import dev.sheldan.abstracto.core.command.service.management.ModuleManagementService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/ModuleManager.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/ModuleManager.java similarity index 91% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/ModuleManager.java rename to abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/ModuleManager.java index 97dc70641..53e29c0c3 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/ModuleManager.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/ModuleManager.java @@ -1,6 +1,10 @@ -package dev.sheldan.abstracto.core.command; +package dev.sheldan.abstracto.core.command.service; -import dev.sheldan.abstracto.core.command.meta.CommandRegistry; +import dev.sheldan.abstracto.core.command.Command; +import dev.sheldan.abstracto.core.command.config.CommandHierarchy; +import dev.sheldan.abstracto.core.command.config.ModuleInterface; +import dev.sheldan.abstracto.core.command.config.PackedModule; +import dev.sheldan.abstracto.core.command.service.CommandRegistry; import dev.sheldan.abstracto.core.command.service.ModuleRegistry; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/ChannelGroupCommandManagementServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/ChannelGroupCommandManagementServiceBean.java index 7ee0f44eb..e6de4f456 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/ChannelGroupCommandManagementServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/ChannelGroupCommandManagementServiceBean.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.command.service.management; -import dev.sheldan.abstracto.core.command.models.ACommand; +import dev.sheldan.abstracto.core.command.models.database.ACommand; import dev.sheldan.abstracto.core.command.repository.ChannelGroupCommandRepository; import dev.sheldan.abstracto.core.models.database.AChannelGroup; import dev.sheldan.abstracto.core.models.database.AChannelGroupCommand; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/CommandManagementServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/CommandManagementServiceBean.java index ba82b8e6f..24058575c 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/CommandManagementServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/CommandManagementServiceBean.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.core.command.service.management; -import dev.sheldan.abstracto.core.command.models.ACommand; -import dev.sheldan.abstracto.core.command.models.AModule; +import dev.sheldan.abstracto.core.command.models.database.ACommand; +import dev.sheldan.abstracto.core.command.models.database.AModule; import dev.sheldan.abstracto.core.command.repository.CommandRepository; import dev.sheldan.abstracto.core.service.management.ServerManagementService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/ModuleManagementServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/ModuleManagementServiceBean.java index b228c6399..fff8ef913 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/ModuleManagementServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/service/management/ModuleManagementServiceBean.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.command.service.management; -import dev.sheldan.abstracto.core.command.models.AModule; +import dev.sheldan.abstracto.core.command.models.database.AModule; import dev.sheldan.abstracto.core.command.repository.ModuleRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/Disable.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/Disable.java index db3583b1d..19b192bcc 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/Disable.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/Disable.java @@ -1,10 +1,10 @@ package dev.sheldan.abstracto.core.commands; import dev.sheldan.abstracto.core.command.Command; -import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.CommandResult; -import dev.sheldan.abstracto.core.command.execution.Parameter; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.commands.utility.UtilityModuleInterface; import dev.sheldan.abstracto.core.service.management.FeatureFlagManagementService; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/Enable.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/Enable.java index 85fbdd7cf..c11a6ed00 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/Enable.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/Enable.java @@ -1,10 +1,10 @@ package dev.sheldan.abstracto.core.commands; import dev.sheldan.abstracto.core.command.Command; -import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.CommandResult; -import dev.sheldan.abstracto.core.command.execution.Parameter; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.commands.utility.UtilityModuleInterface; import dev.sheldan.abstracto.core.service.management.FeatureFlagManagementService; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/AddToChannelGroup.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/AddToChannelGroup.java index 237ea8d08..a353174d1 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/AddToChannelGroup.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/AddToChannelGroup.java @@ -1,10 +1,10 @@ package dev.sheldan.abstracto.core.commands.channels; import dev.sheldan.abstracto.core.command.Command; -import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.CommandResult; -import dev.sheldan.abstracto.core.command.execution.Parameter; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.service.ChannelGroupService; import net.dv8tion.jda.api.entities.TextChannel; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/ChannelsModuleInterface.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/ChannelsModuleInterface.java index fdb047e97..278a4894c 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/ChannelsModuleInterface.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/ChannelsModuleInterface.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.core.commands.channels; -import dev.sheldan.abstracto.core.command.ModuleInterface; -import dev.sheldan.abstracto.core.command.module.ModuleInfo; +import dev.sheldan.abstracto.core.command.config.ModuleInterface; +import dev.sheldan.abstracto.core.command.config.ModuleInfo; import org.springframework.stereotype.Component; @Component diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/CreateChannelGroup.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/CreateChannelGroup.java index 6bcd15fd0..5692ad7fe 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/CreateChannelGroup.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/CreateChannelGroup.java @@ -1,10 +1,10 @@ package dev.sheldan.abstracto.core.commands.channels; import dev.sheldan.abstracto.core.command.Command; -import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.CommandResult; -import dev.sheldan.abstracto.core.command.execution.Parameter; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.service.ChannelGroupService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/DeleteChannelGroup.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/DeleteChannelGroup.java index 615f0b358..3caa00705 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/DeleteChannelGroup.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/DeleteChannelGroup.java @@ -1,10 +1,10 @@ package dev.sheldan.abstracto.core.commands.channels; import dev.sheldan.abstracto.core.command.Command; -import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.CommandResult; -import dev.sheldan.abstracto.core.command.execution.Parameter; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.service.ChannelGroupService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/DisableCommand.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/DisableCommand.java index 05237d1a8..8bbc07815 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/DisableCommand.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/DisableCommand.java @@ -1,10 +1,10 @@ package dev.sheldan.abstracto.core.commands.channels; import dev.sheldan.abstracto.core.command.Command; -import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.CommandResult; -import dev.sheldan.abstracto.core.command.execution.Parameter; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.service.ChannelGroupService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/EnableCommand.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/EnableCommand.java index 503080de5..fe79da52e 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/EnableCommand.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/EnableCommand.java @@ -1,10 +1,10 @@ package dev.sheldan.abstracto.core.commands.channels; import dev.sheldan.abstracto.core.command.Command; -import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.CommandResult; -import dev.sheldan.abstracto.core.command.execution.Parameter; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.service.ChannelGroupService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/ListChannelGroups.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/ListChannelGroups.java index 4fe77bfd5..5d2b9d231 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/ListChannelGroups.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/ListChannelGroups.java @@ -1,19 +1,19 @@ package dev.sheldan.abstracto.core.commands.channels; import dev.sheldan.abstracto.core.command.Command; -import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.CommandResult; import dev.sheldan.abstracto.core.command.execution.ContextConverter; import dev.sheldan.abstracto.core.config.AbstractoFeatures; -import dev.sheldan.abstracto.core.models.MessageToSend; -import dev.sheldan.abstracto.core.models.command.ChannelGroupChannelModel; -import dev.sheldan.abstracto.core.models.command.ChannelGroupModel; -import dev.sheldan.abstracto.core.models.command.ListChannelGroupsModel; +import dev.sheldan.abstracto.templating.model.MessageToSend; +import dev.sheldan.abstracto.core.models.template.commands.ChannelGroupChannelModel; +import dev.sheldan.abstracto.core.models.template.commands.ChannelGroupModel; +import dev.sheldan.abstracto.core.models.template.commands.ListChannelGroupsModel; import dev.sheldan.abstracto.core.models.database.AChannelGroup; import dev.sheldan.abstracto.core.service.ChannelService; import dev.sheldan.abstracto.core.service.management.ChannelGroupManagementService; -import dev.sheldan.abstracto.templating.TemplateService; +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; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/PostTarget.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/PostTarget.java index 1aa846157..da8e0824a 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/PostTarget.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/PostTarget.java @@ -1,13 +1,15 @@ package dev.sheldan.abstracto.core.commands.channels; import dev.sheldan.abstracto.core.command.Command; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.command.execution.*; import dev.sheldan.abstracto.core.config.AbstractoFeatures; -import dev.sheldan.abstracto.core.models.command.PostTargetErrorModel; +import dev.sheldan.abstracto.core.models.template.commands.PostTargetErrorModel; import dev.sheldan.abstracto.core.service.PostTargetService; import dev.sheldan.abstracto.core.service.management.ChannelManagementService; import dev.sheldan.abstracto.core.service.management.PostTargetManagement; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.service.TemplateService; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.GuildChannel; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/RemoveFromChannelGroup.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/RemoveFromChannelGroup.java index 0678be17a..4d61c5147 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/RemoveFromChannelGroup.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/RemoveFromChannelGroup.java @@ -1,10 +1,10 @@ package dev.sheldan.abstracto.core.commands.channels; import dev.sheldan.abstracto.core.command.Command; -import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.CommandResult; -import dev.sheldan.abstracto.core.command.execution.Parameter; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.service.ChannelGroupService; import net.dv8tion.jda.api.entities.TextChannel; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/Help.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/Help.java index 26f705c1b..72f28b290 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/Help.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/Help.java @@ -1,11 +1,11 @@ package dev.sheldan.abstracto.core.commands.help; import dev.sheldan.abstracto.core.command.*; +import dev.sheldan.abstracto.core.command.config.*; import dev.sheldan.abstracto.core.command.execution.*; -import dev.sheldan.abstracto.core.command.module.ModuleInfo; import dev.sheldan.abstracto.core.command.service.ModuleRegistry; import dev.sheldan.abstracto.core.config.AbstractoFeatures; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.service.TemplateService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/SupportModuleInterface.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/SupportModuleInterface.java index 6f1d98be1..1f85526c4 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/SupportModuleInterface.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/SupportModuleInterface.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.core.commands.help; -import dev.sheldan.abstracto.core.command.ModuleInterface; -import dev.sheldan.abstracto.core.command.module.ModuleInfo; +import dev.sheldan.abstracto.core.command.config.ModuleInterface; +import dev.sheldan.abstracto.core.command.config.ModuleInfo; import org.springframework.stereotype.Component; @Component diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/Echo.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/Echo.java index 85719bb4e..3fb00c9a4 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/Echo.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/Echo.java @@ -1,14 +1,14 @@ package dev.sheldan.abstracto.core.commands.utility; import dev.sheldan.abstracto.core.command.Command; -import dev.sheldan.abstracto.core.command.HelpInfo; -import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.HelpInfo; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; import dev.sheldan.abstracto.core.command.execution.CommandContext; -import dev.sheldan.abstracto.core.command.execution.Parameter; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.command.execution.CommandResult; import dev.sheldan.abstracto.core.config.AbstractoFeatures; -import dev.sheldan.abstracto.core.models.command.EchoModel; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.core.models.template.commands.EchoModel; +import dev.sheldan.abstracto.templating.service.TemplateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/Ping.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/Ping.java index 9b2a82adf..244c1987b 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/Ping.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/Ping.java @@ -1,12 +1,12 @@ package dev.sheldan.abstracto.core.commands.utility; import dev.sheldan.abstracto.core.command.Command; -import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.CommandResult; import dev.sheldan.abstracto.core.config.AbstractoFeatures; -import dev.sheldan.abstracto.core.models.command.PingModel; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.core.models.template.commands.PingModel; +import dev.sheldan.abstracto.templating.service.TemplateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/SetEmote.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/SetEmote.java index ffdceeeef..ab7f91dcc 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/SetEmote.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/SetEmote.java @@ -1,10 +1,10 @@ package dev.sheldan.abstracto.core.commands.utility; import dev.sheldan.abstracto.core.command.Command; -import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.CommandResult; -import dev.sheldan.abstracto.core.command.execution.Parameter; +import dev.sheldan.abstracto.core.command.config.Parameter; import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.service.EmoteService; import dev.sheldan.abstracto.core.service.management.EmoteManagementService; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/UtilityModuleInterface.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/UtilityModuleInterface.java index 6009286dc..a77958140 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/UtilityModuleInterface.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/UtilityModuleInterface.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.core.commands.utility; -import dev.sheldan.abstracto.core.command.ModuleInterface; -import dev.sheldan.abstracto.core.command.module.ModuleInfo; +import dev.sheldan.abstracto.core.command.config.ModuleInterface; +import dev.sheldan.abstracto.core.command.config.ModuleInfo; import org.springframework.stereotype.Component; @Component diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ReadyListener.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ReadyListener.java index f2daf6b46..f8d6759f4 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ReadyListener.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ReadyListener.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.listener; -import dev.sheldan.abstracto.core.service.StartupManager; +import dev.sheldan.abstracto.core.service.StartupServiceBean; import net.dv8tion.jda.api.events.ReadyEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import org.springframework.beans.factory.annotation.Autowired; @@ -13,7 +13,7 @@ import javax.annotation.Nonnull; public class ReadyListener extends ListenerAdapter { @Autowired - private StartupManager startup; + private StartupServiceBean startup; @Value("${abstracto.startup.synchronize}") private boolean synchronize; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/BotService.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/BotServiceBean.java similarity index 93% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/BotService.java rename to abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/BotServiceBean.java index f63658d39..7efecba23 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/BotService.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/BotServiceBean.java @@ -2,7 +2,7 @@ package dev.sheldan.abstracto.core.service; import dev.sheldan.abstracto.core.exception.ChannelException; import dev.sheldan.abstracto.core.exception.GuildException; -import dev.sheldan.abstracto.core.models.ServerChannelUser; +import dev.sheldan.abstracto.core.models.GuildChannelMember; import dev.sheldan.abstracto.core.models.database.AEmote; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.JDA; @@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture; @Service @Slf4j -public class BotService implements Bot { +public class BotServiceBean implements Bot { private JDA instance; @@ -41,7 +41,7 @@ public class BotService implements Bot { } @Override - public ServerChannelUser getServerChannelUser(Long serverId, Long channelId, Long userId) { + public GuildChannelMember getServerChannelUser(Long serverId, Long channelId, Long userId) { Optional guildOptional = getGuildById(serverId); if(guildOptional.isPresent()) { Guild guild = guildOptional.get(); @@ -49,7 +49,7 @@ public class BotService implements Bot { if(textChannelOptional.isPresent()) { TextChannel textChannel = textChannelOptional.get(); Member member = guild.getMemberById(userId); - return ServerChannelUser.builder().guild(guild).textChannel(textChannel).member(member).build(); + return GuildChannelMember.builder().guild(guild).textChannel(textChannel).member(member).build(); } else { throw new ChannelException(String.format("Text channel %s not found in guild %s", channelId, serverId)); } diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelGroupServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelGroupServiceBean.java index 407189c89..f22e9c93a 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelGroupServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelGroupServiceBean.java @@ -2,7 +2,7 @@ package dev.sheldan.abstracto.core.service; import dev.sheldan.abstracto.core.command.exception.ChannelGroupException; import dev.sheldan.abstracto.core.command.exception.CommandException; -import dev.sheldan.abstracto.core.command.models.ACommand; +import dev.sheldan.abstracto.core.command.models.database.ACommand; import dev.sheldan.abstracto.core.command.service.management.ChannelGroupCommandManagementService; import dev.sheldan.abstracto.core.command.service.management.CommandManagementService; import dev.sheldan.abstracto.core.models.database.AChannel; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java index 5fce7f71d..864ea5d37 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelServiceBean.java @@ -2,7 +2,7 @@ package dev.sheldan.abstracto.core.service; import dev.sheldan.abstracto.core.exception.ChannelException; import dev.sheldan.abstracto.core.exception.GuildException; -import dev.sheldan.abstracto.core.models.MessageToSend; +import dev.sheldan.abstracto.templating.model.MessageToSend; import dev.sheldan.abstracto.core.models.database.AChannel; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.entities.Guild; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java index ed75b32f1..9174ae1e0 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java @@ -6,7 +6,7 @@ import dev.sheldan.abstracto.core.exception.GuildException; import dev.sheldan.abstracto.core.service.management.PostTargetManagement; import dev.sheldan.abstracto.core.service.management.ServerManagementService; import dev.sheldan.abstracto.core.models.database.PostTarget; -import dev.sheldan.abstracto.core.models.MessageToSend; +import dev.sheldan.abstracto.templating.model.MessageToSend; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Message; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/StartupManager.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/StartupServiceBean.java similarity index 98% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/StartupManager.java rename to abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/StartupServiceBean.java index 711d7c12e..7791629b1 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/StartupManager.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/StartupServiceBean.java @@ -27,7 +27,7 @@ import java.util.stream.Collectors; @Slf4j @Service -public class StartupManager implements Startup { +public class StartupServiceBean implements Startup { @Autowired private Bot service; diff --git a/abstracto-application/core/core-interface/pom.xml b/abstracto-application/core/core-interface/pom.xml index 8c28c4b8a..8676a90d1 100644 --- a/abstracto-application/core/core-interface/pom.xml +++ b/abstracto-application/core/core-interface/pom.xml @@ -26,5 +26,10 @@ org.springframework.boot spring-boot-starter-data-jpa + + dev.sheldan.abstracto.templating + templating-interface + ${project.version} + \ No newline at end of file diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/Command.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/Command.java index 014bfc7db..34de556f7 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/Command.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/Command.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.command; -import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; +import dev.sheldan.abstracto.core.command.config.CommandConfiguration; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.CommandResult; import dev.sheldan.abstracto.core.listener.FeatureAware; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/ModuleInterface.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/ModuleInterface.java deleted file mode 100644 index 81f903d50..000000000 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/ModuleInterface.java +++ /dev/null @@ -1,9 +0,0 @@ -package dev.sheldan.abstracto.core.command; - - -import dev.sheldan.abstracto.core.command.module.ModuleInfo; - -public interface ModuleInterface { - ModuleInfo getInfo(); - String getParentModule(); -} diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/AbstractConditionableCommand.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/AbstractConditionableCommand.java similarity index 92% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/AbstractConditionableCommand.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/AbstractConditionableCommand.java index c701a15a4..31ef939ee 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/AbstractConditionableCommand.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/AbstractConditionableCommand.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.command; +package dev.sheldan.abstracto.core.command.condition; import dev.sheldan.abstracto.core.service.ChannelService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/CommandCondition.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/CommandCondition.java similarity index 64% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/CommandCondition.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/CommandCondition.java index afe062370..c1abebb58 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/CommandCondition.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/CommandCondition.java @@ -1,6 +1,7 @@ -package dev.sheldan.abstracto.core.command; +package dev.sheldan.abstracto.core.command.condition; +import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.execution.CommandContext; public interface CommandCondition { diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/CommandDisabledCondition.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/CommandDisabledCondition.java similarity index 85% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/CommandDisabledCondition.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/CommandDisabledCondition.java index 625f7cab1..a6da8553d 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/CommandDisabledCondition.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/CommandDisabledCondition.java @@ -1,7 +1,8 @@ -package dev.sheldan.abstracto.core.command; +package dev.sheldan.abstracto.core.command.condition; +import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.execution.CommandContext; -import dev.sheldan.abstracto.core.command.models.ACommand; +import dev.sheldan.abstracto.core.command.models.database.ACommand; import dev.sheldan.abstracto.core.command.service.ChannelGroupCommandService; import dev.sheldan.abstracto.core.command.service.management.CommandManagementService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/ConditionResult.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/ConditionResult.java similarity index 77% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/ConditionResult.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/ConditionResult.java index e49f0e245..a14654793 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/ConditionResult.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/ConditionResult.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.command; +package dev.sheldan.abstracto.core.command.condition; import lombok.Builder; import lombok.Getter; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/ConditionalCommand.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/ConditionalCommand.java similarity index 54% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/ConditionalCommand.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/ConditionalCommand.java index 319184103..ca02a1b5a 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/ConditionalCommand.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/ConditionalCommand.java @@ -1,4 +1,6 @@ -package dev.sheldan.abstracto.core.command; +package dev.sheldan.abstracto.core.command.condition; + +import dev.sheldan.abstracto.core.command.Command; import java.util.List; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/FeatureEnabledCondition.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/FeatureEnabledCondition.java similarity index 90% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/FeatureEnabledCondition.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/FeatureEnabledCondition.java index f30396a45..b3fe20263 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/FeatureEnabledCondition.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/condition/FeatureEnabledCondition.java @@ -1,5 +1,6 @@ -package dev.sheldan.abstracto.core.command; +package dev.sheldan.abstracto.core.command.condition; +import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.service.management.FeatureFlagManagementService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/module/AbstracatoModuleInterface.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/AbstracatoModuleInterface.java similarity index 77% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/module/AbstracatoModuleInterface.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/AbstracatoModuleInterface.java index a5fea80d9..6b8a5cc35 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/module/AbstracatoModuleInterface.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/AbstracatoModuleInterface.java @@ -1,6 +1,5 @@ -package dev.sheldan.abstracto.core.command.module; +package dev.sheldan.abstracto.core.command.config; -import dev.sheldan.abstracto.core.command.ModuleInterface; import org.springframework.stereotype.Service; @Service diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/CommandConfiguration.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/CommandConfiguration.java similarity index 83% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/CommandConfiguration.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/CommandConfiguration.java index 86dfdd45d..e7e0cae3d 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/CommandConfiguration.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/CommandConfiguration.java @@ -1,6 +1,5 @@ -package dev.sheldan.abstracto.core.command.execution; +package dev.sheldan.abstracto.core.command.config; -import dev.sheldan.abstracto.core.command.HelpInfo; import lombok.Builder; import lombok.Getter; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/CommandHierarchy.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/CommandHierarchy.java similarity index 94% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/CommandHierarchy.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/CommandHierarchy.java index 771a4de8c..d533e5afe 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/CommandHierarchy.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/CommandHierarchy.java @@ -1,5 +1,6 @@ -package dev.sheldan.abstracto.core.command; +package dev.sheldan.abstracto.core.command.config; +import dev.sheldan.abstracto.core.command.Command; import lombok.Builder; import lombok.Getter; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/HelpInfo.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/HelpInfo.java similarity index 77% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/HelpInfo.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/HelpInfo.java index 6930137ea..e5f44123a 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/HelpInfo.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/HelpInfo.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.command; +package dev.sheldan.abstracto.core.command.config; import lombok.Builder; import lombok.Getter; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/module/ModuleInfo.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/ModuleInfo.java similarity index 74% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/module/ModuleInfo.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/ModuleInfo.java index 96e72bf3c..a2b5e2652 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/module/ModuleInfo.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/ModuleInfo.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.command.module; +package dev.sheldan.abstracto.core.command.config; import lombok.Builder; import lombok.Getter; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/ModuleInterface.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/ModuleInterface.java new file mode 100644 index 000000000..61cf3c97d --- /dev/null +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/ModuleInterface.java @@ -0,0 +1,9 @@ +package dev.sheldan.abstracto.core.command.config; + + +import dev.sheldan.abstracto.core.command.config.ModuleInfo; + +public interface ModuleInterface { + ModuleInfo getInfo(); + String getParentModule(); +} diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/PackedModule.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/PackedModule.java similarity index 73% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/PackedModule.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/PackedModule.java index 2b60b6641..f6746ca00 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/PackedModule.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/PackedModule.java @@ -1,5 +1,6 @@ -package dev.sheldan.abstracto.core.command; +package dev.sheldan.abstracto.core.command.config; +import dev.sheldan.abstracto.core.command.Command; import lombok.Builder; import lombok.Getter; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/Parameter.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/Parameter.java similarity index 84% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/Parameter.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/Parameter.java index 358e511ee..6b8b0736b 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/Parameter.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/Parameter.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.command.execution; +package dev.sheldan.abstracto.core.command.config; import lombok.Builder; import lombok.Getter; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/Parameters.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/Parameters.java similarity index 74% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/Parameters.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/Parameters.java index cff7d92c0..998134a0a 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/Parameters.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/config/Parameters.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.command.execution; +package dev.sheldan.abstracto.core.command.config; import lombok.Builder; import lombok.Getter; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/exception/ChannelGroupException.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/ChannelGroupException.java similarity index 100% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/exception/ChannelGroupException.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/ChannelGroupException.java diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandException.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandException.java similarity index 100% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandException.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandException.java diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandNotFound.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandNotFound.java similarity index 89% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandNotFound.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandNotFound.java index e8ea795e0..a913e0b0f 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandNotFound.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/CommandNotFound.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.command.exception; -import dev.sheldan.abstracto.core.command.Templatable; +import dev.sheldan.abstracto.templating.Templatable; import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException; public class CommandNotFound extends AbstractoRunTimeException implements Templatable { diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/exception/IncorrectParameter.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/IncorrectParameter.java similarity index 94% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/exception/IncorrectParameter.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/IncorrectParameter.java index 2f91d9659..b47809c04 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/exception/IncorrectParameter.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/IncorrectParameter.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.core.command.exception; import dev.sheldan.abstracto.core.command.Command; -import dev.sheldan.abstracto.core.command.Templatable; +import dev.sheldan.abstracto.templating.Templatable; import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException; import java.util.HashMap; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/exception/InsufficientParameters.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/InsufficientParameters.java similarity index 94% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/exception/InsufficientParameters.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/InsufficientParameters.java index 953834bf7..d13d409b9 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/exception/InsufficientParameters.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/InsufficientParameters.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.command.exception; -import dev.sheldan.abstracto.core.command.Templatable; +import dev.sheldan.abstracto.templating.Templatable; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException; import lombok.Getter; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/exception/ParameterTooLong.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/ParameterTooLong.java similarity index 95% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/exception/ParameterTooLong.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/ParameterTooLong.java index 5a2f8a91f..f80d31040 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/exception/ParameterTooLong.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/exception/ParameterTooLong.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.core.command.exception; import dev.sheldan.abstracto.core.command.Command; -import dev.sheldan.abstracto.core.command.Templatable; +import dev.sheldan.abstracto.templating.Templatable; import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException; import java.util.HashMap; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/CommandContext.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/CommandContext.java index 3f40441d4..5e127eff7 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/CommandContext.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/CommandContext.java @@ -1,5 +1,6 @@ package dev.sheldan.abstracto.core.command.execution; +import dev.sheldan.abstracto.core.command.config.Parameters; import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import lombok.Builder; import lombok.Getter; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/meta/UnParsedCommandParameter.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/UnParsedCommandParameter.java similarity index 95% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/meta/UnParsedCommandParameter.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/UnParsedCommandParameter.java index adfd7d663..9edfe8752 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/meta/UnParsedCommandParameter.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/UnParsedCommandParameter.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.command.meta; +package dev.sheldan.abstracto.core.command.execution; import lombok.Getter; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/ACommand.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/ACommand.java similarity index 87% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/ACommand.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/ACommand.java index 57ed24d43..bfc627894 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/ACommand.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/ACommand.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.command.models; +package dev.sheldan.abstracto.core.command.models.database; import lombok.*; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/AModule.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/AModule.java similarity index 91% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/AModule.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/AModule.java index e19b3bd4b..4d84d98da 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/AModule.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/AModule.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.command.models; +package dev.sheldan.abstracto.core.command.models.database; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/ChannelGroupCommandService.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/ChannelGroupCommandService.java index 927914ba6..ce6b254d1 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/ChannelGroupCommandService.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/ChannelGroupCommandService.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.command.service; -import dev.sheldan.abstracto.core.command.models.ACommand; +import dev.sheldan.abstracto.core.command.models.database.ACommand; import dev.sheldan.abstracto.core.models.database.AChannel; public interface ChannelGroupCommandService { diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/meta/CommandRegistry.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/CommandRegistry.java similarity index 68% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/meta/CommandRegistry.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/CommandRegistry.java index fa0741821..10586e6ce 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/meta/CommandRegistry.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/CommandRegistry.java @@ -1,9 +1,9 @@ -package dev.sheldan.abstracto.core.command.meta; +package dev.sheldan.abstracto.core.command.service; import dev.sheldan.abstracto.core.command.Command; -import dev.sheldan.abstracto.core.command.ModuleInterface; -import dev.sheldan.abstracto.core.command.module.ModuleInfo; +import dev.sheldan.abstracto.core.command.config.ModuleInterface; +import dev.sheldan.abstracto.core.command.execution.UnParsedCommandParameter; import net.dv8tion.jda.api.entities.Message; import java.util.List; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/CommandService.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/CommandService.java index 0560231fa..ab6c4fa56 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/CommandService.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/CommandService.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.command.service; -import dev.sheldan.abstracto.core.command.models.ACommand; +import dev.sheldan.abstracto.core.command.models.database.ACommand; public interface CommandService { ACommand createCommand(String name, String moduleName); diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/ModuleRegistry.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/ModuleRegistry.java index 73ef5a98c..73c307762 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/ModuleRegistry.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/ModuleRegistry.java @@ -1,8 +1,8 @@ package dev.sheldan.abstracto.core.command.service; -import dev.sheldan.abstracto.core.command.CommandHierarchy; -import dev.sheldan.abstracto.core.command.ModuleInterface; +import dev.sheldan.abstracto.core.command.config.CommandHierarchy; +import dev.sheldan.abstracto.core.command.config.ModuleInterface; import java.util.List; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/management/ChannelGroupCommandManagementService.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/management/ChannelGroupCommandManagementService.java index 20457ed29..473488bd4 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/management/ChannelGroupCommandManagementService.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/management/ChannelGroupCommandManagementService.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.command.service.management; -import dev.sheldan.abstracto.core.command.models.ACommand; +import dev.sheldan.abstracto.core.command.models.database.ACommand; import dev.sheldan.abstracto.core.models.database.AChannelGroup; import dev.sheldan.abstracto.core.models.database.AChannelGroupCommand; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/management/CommandManagementService.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/management/CommandManagementService.java index 3507193a4..15e0df8da 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/management/CommandManagementService.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/management/CommandManagementService.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.core.command.service.management; -import dev.sheldan.abstracto.core.command.models.ACommand; -import dev.sheldan.abstracto.core.command.models.AModule; +import dev.sheldan.abstracto.core.command.models.database.ACommand; +import dev.sheldan.abstracto.core.command.models.database.AModule; public interface CommandManagementService { ACommand createCommand(String name, String moduleName); diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/management/ModuleManagementService.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/management/ModuleManagementService.java index f8d754c5c..1fef8f7d1 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/management/ModuleManagementService.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/service/management/ModuleManagementService.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.command.service.management; -import dev.sheldan.abstracto.core.command.models.AModule; +import dev.sheldan.abstracto.core.command.models.database.AModule; public interface ModuleManagementService { AModule createModule(String name); diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/AServerChannelMessage.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/AServerAChannelMessage.java similarity index 90% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/AServerChannelMessage.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/AServerAChannelMessage.java index 02d9937b1..24204b6e7 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/AServerChannelMessage.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/AServerAChannelMessage.java @@ -9,7 +9,7 @@ import lombok.Setter; @Getter @Setter @Builder -public class AServerChannelMessage { +public class AServerAChannelMessage { private AServer server; private AChannel channel; private Long messageId; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/ServerChannelUser.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/GuildChannelMember.java similarity index 91% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/ServerChannelUser.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/GuildChannelMember.java index c18b187ef..ba4be6d5b 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/ServerChannelUser.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/GuildChannelMember.java @@ -10,7 +10,7 @@ import net.dv8tion.jda.api.entities.TextChannel; @Getter @Setter @Builder -public class ServerChannelUser { +public class GuildChannelMember { public Guild guild; private TextChannel textChannel; private Member member; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/ContextAware.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/ContextAware.java deleted file mode 100644 index ae1dcee52..000000000 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/ContextAware.java +++ /dev/null @@ -1,5 +0,0 @@ -package dev.sheldan.abstracto.core.models.context; - -public interface ContextAware { - String getTemplateSuffix(); -} diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/ServerContext.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/ServerContext.java index 4e78cdbbe..ecc9eb147 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/ServerContext.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/ServerContext.java @@ -13,12 +13,8 @@ import net.dv8tion.jda.api.entities.Guild; @AllArgsConstructor @NoArgsConstructor @Setter -public class ServerContext implements ContextAware{ +public class ServerContext { private Guild guild; private AServer server; - @Override - public String getTemplateSuffix() { - return "server"; - } } diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/UserInitiatedServerContext.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/UserInitiatedServerContext.java index c7fabeea1..925509a85 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/UserInitiatedServerContext.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/UserInitiatedServerContext.java @@ -20,8 +20,4 @@ public class UserInitiatedServerContext extends ServerContext { private AUser user; private AUserInAServer aUserInAServer; - @Override - public String getTemplateSuffix() { - return ""; - } } diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannelGroupCommand.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannelGroupCommand.java index b871c436b..fdab0386e 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannelGroupCommand.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannelGroupCommand.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.models.database; -import dev.sheldan.abstracto.core.command.models.ACommand; +import dev.sheldan.abstracto.core.command.models.database.ACommand; import lombok.*; import javax.persistence.*; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/ChannelGroupChannelModel.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/ChannelGroupChannelModel.java similarity index 83% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/ChannelGroupChannelModel.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/ChannelGroupChannelModel.java index 20d85a271..6b2da31b6 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/ChannelGroupChannelModel.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/ChannelGroupChannelModel.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models.command; +package dev.sheldan.abstracto.core.models.template.commands; import dev.sheldan.abstracto.core.models.database.AChannel; import lombok.Builder; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/ChannelGroupModel.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/ChannelGroupModel.java similarity index 79% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/ChannelGroupModel.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/ChannelGroupModel.java index 12c5001e9..3ebafd0ca 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/ChannelGroupModel.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/ChannelGroupModel.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models.command; +package dev.sheldan.abstracto.core.models.template.commands; import lombok.Builder; import lombok.Getter; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/EchoModel.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/EchoModel.java similarity index 80% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/EchoModel.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/EchoModel.java index 5177cc60b..7bdef2a93 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/EchoModel.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/EchoModel.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models.command; +package dev.sheldan.abstracto.core.models.template.commands; import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/ListChannelGroupsModel.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/ListChannelGroupsModel.java similarity index 84% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/ListChannelGroupsModel.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/ListChannelGroupsModel.java index eb7f1987e..6142efe11 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/ListChannelGroupsModel.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/ListChannelGroupsModel.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models.command; +package dev.sheldan.abstracto.core.models.template.commands; import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import lombok.Getter; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/PingModel.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/PingModel.java similarity index 80% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/PingModel.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/PingModel.java index 1cf8c6662..6ebd41ae3 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/PingModel.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/PingModel.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models.command; +package dev.sheldan.abstracto.core.models.template.commands; import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import lombok.Getter; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/PostTargetErrorModel.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/PostTargetErrorModel.java similarity index 84% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/PostTargetErrorModel.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/PostTargetErrorModel.java index df38f843f..97b318a5b 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/PostTargetErrorModel.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/commands/PostTargetErrorModel.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models.command; +package dev.sheldan.abstracto.core.models.template.commands; import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import lombok.Getter; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/models/MessageEmbeddedModel.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/listener/MessageEmbeddedModel.java similarity index 90% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/models/MessageEmbeddedModel.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/listener/MessageEmbeddedModel.java index 0bc581588..285b2c769 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/models/MessageEmbeddedModel.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/template/listener/MessageEmbeddedModel.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.listener.models; +package dev.sheldan.abstracto.core.models.template.listener; import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/Bot.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/Bot.java index f855d51ff..5d1f8c8e3 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/Bot.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/Bot.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.service; -import dev.sheldan.abstracto.core.models.ServerChannelUser; +import dev.sheldan.abstracto.core.models.GuildChannelMember; import dev.sheldan.abstracto.core.models.database.AEmote; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Emote; @@ -17,7 +17,7 @@ import java.util.concurrent.CompletableFuture; public interface Bot { void login() throws LoginException; JDA getInstance(); - ServerChannelUser getServerChannelUser(Long serverId, Long channelId, Long userId); + GuildChannelMember getServerChannelUser(Long serverId, Long channelId, Long userId); Member getMemberInServer(Long serverId, Long memberId); CompletableFuture deleteMessage(Long serverId, Long channelId, Long messageId); Optional getEmote(Long serverId, AEmote emote); diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/ChannelService.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/ChannelService.java index beb3751b9..0b5c07f31 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/ChannelService.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/ChannelService.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.service; -import dev.sheldan.abstracto.core.models.MessageToSend; +import dev.sheldan.abstracto.templating.model.MessageToSend; import dev.sheldan.abstracto.core.models.database.AChannel; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.TextChannel; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/PostTargetService.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/PostTargetService.java index a4534936e..bfae3e3eb 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/PostTargetService.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/PostTargetService.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.core.service; import dev.sheldan.abstracto.core.models.database.PostTarget; -import dev.sheldan.abstracto.core.models.MessageToSend; +import dev.sheldan.abstracto.templating.model.MessageToSend; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/utils/ContextUtils.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/utils/ContextUtils.java index 95efaa59c..1090e0f69 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/utils/ContextUtils.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/utils/ContextUtils.java @@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.service.management.ChannelManagementService; import dev.sheldan.abstracto.core.service.management.ServerManagementService; import dev.sheldan.abstracto.core.service.management.UserManagementService; import dev.sheldan.abstracto.core.models.cache.CachedMessage; -import dev.sheldan.abstracto.core.models.ServerChannelUser; +import dev.sheldan.abstracto.core.models.GuildChannelMember; import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.core.service.Bot; @@ -33,15 +33,15 @@ public class ContextUtils { public UserInitiatedServerContext fromMessage(CachedMessage message, Class clazz) { Method m = null; - ServerChannelUser serverChannelUser = bot.getServerChannelUser(message.getServerId(), message.getChannelId(), message.getAuthorId()); + GuildChannelMember guildChannelMember = bot.getServerChannelUser(message.getServerId(), message.getChannelId(), message.getAuthorId()); try { m = clazz.getMethod("builder"); UserInitiatedServerContext.UserInitiatedServerContextBuilder builder = (UserInitiatedServerContext.UserInitiatedServerContextBuilder) m.invoke(null, null); AUserInAServer aUserInAServer = userManagementService.loadUser(message.getServerId(), message.getAuthorId()); return builder - .member(serverChannelUser.getMember()) - .guild(serverChannelUser.getGuild()) - .messageChannel(serverChannelUser.getTextChannel()) + .member(guildChannelMember.getMember()) + .guild(guildChannelMember.getGuild()) + .messageChannel(guildChannelMember.getTextChannel()) .channel(channelManagementService.loadChannel(message.getChannelId())) .server(serverManagementService.loadOrCreate(message.getServerId())) .aUserInAServer(aUserInAServer) diff --git a/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/config/JobConfigLoader.java b/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/config/JobConfigLoader.java index bd1e5b6d2..435349e8a 100644 --- a/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/config/JobConfigLoader.java +++ b/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/config/JobConfigLoader.java @@ -1,5 +1,6 @@ package dev.sheldan.abstracto.scheduling.config; +import dev.sheldan.abstracto.scheduling.model.SchedulerJobProperties; import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/factory/SchedulerJobConverter.java b/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/factory/SchedulerJobConverter.java index 861339ded..9536a802a 100644 --- a/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/factory/SchedulerJobConverter.java +++ b/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/factory/SchedulerJobConverter.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.scheduling.factory; -import dev.sheldan.abstracto.scheduling.config.SchedulerJobProperties; -import dev.sheldan.abstracto.scheduling.model.SchedulerJob; +import dev.sheldan.abstracto.scheduling.model.SchedulerJobProperties; +import dev.sheldan.abstracto.scheduling.model.database.SchedulerJob; import org.springframework.stereotype.Component; @Component diff --git a/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/config/SchedulerJobProperties.java b/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/model/SchedulerJobProperties.java similarity index 84% rename from abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/config/SchedulerJobProperties.java rename to abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/model/SchedulerJobProperties.java index 28576bc87..a583a45cb 100644 --- a/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/config/SchedulerJobProperties.java +++ b/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/model/SchedulerJobProperties.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.scheduling.config; +package dev.sheldan.abstracto.scheduling.model; import lombok.*; diff --git a/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/repository/SchedulerJobRepository.java b/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/repository/SchedulerJobRepository.java index 32c69a125..b39893821 100644 --- a/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/repository/SchedulerJobRepository.java +++ b/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/repository/SchedulerJobRepository.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.scheduling.repository; -import dev.sheldan.abstracto.scheduling.model.SchedulerJob; +import dev.sheldan.abstracto.scheduling.model.database.SchedulerJob; import org.springframework.data.jpa.repository.JpaRepository; public interface SchedulerJobRepository extends JpaRepository { diff --git a/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/service/SchedulerServiceBean.java b/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/service/SchedulerServiceBean.java index e1a7822e6..03048f832 100644 --- a/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/service/SchedulerServiceBean.java +++ b/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/service/SchedulerServiceBean.java @@ -1,8 +1,7 @@ package dev.sheldan.abstracto.scheduling.service; import dev.sheldan.abstracto.scheduling.factory.QuartzConfigFactory; -import dev.sheldan.abstracto.scheduling.model.SchedulerJob; -import dev.sheldan.abstracto.scheduling.model.SchedulerService; +import dev.sheldan.abstracto.scheduling.model.database.SchedulerJob; import dev.sheldan.abstracto.scheduling.service.management.SchedulerJobManagementServiceBean; import lombok.extern.slf4j.Slf4j; import org.quartz.*; diff --git a/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/service/SchedulerStartupService.java b/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/service/SchedulerStartupService.java index bedc7c987..fd70c4d8f 100644 --- a/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/service/SchedulerStartupService.java +++ b/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/service/SchedulerStartupService.java @@ -2,8 +2,7 @@ package dev.sheldan.abstracto.scheduling.service; import dev.sheldan.abstracto.scheduling.config.JobConfigLoader; import dev.sheldan.abstracto.scheduling.factory.SchedulerJobConverter; -import dev.sheldan.abstracto.scheduling.model.SchedulerJob; -import dev.sheldan.abstracto.scheduling.model.SchedulerService; +import dev.sheldan.abstracto.scheduling.model.database.SchedulerJob; import dev.sheldan.abstracto.scheduling.service.management.SchedulerJobManagementServiceBean; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/service/management/SchedulerJobManagementServiceBean.java b/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/service/management/SchedulerJobManagementServiceBean.java index e2ad715f1..506f984f0 100644 --- a/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/service/management/SchedulerJobManagementServiceBean.java +++ b/abstracto-application/scheduling/scheduling-impl/src/main/java/dev/sheldan/abstracto/scheduling/service/management/SchedulerJobManagementServiceBean.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.scheduling.service.management; -import dev.sheldan.abstracto.scheduling.model.SchedulerJob; +import dev.sheldan.abstracto.scheduling.model.database.SchedulerJob; import dev.sheldan.abstracto.scheduling.repository.SchedulerJobRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/abstracto-application/scheduling/scheduling-int/src/main/java/dev/sheldan/abstracto/scheduling/model/SchedulerJob.java b/abstracto-application/scheduling/scheduling-int/src/main/java/dev/sheldan/abstracto/scheduling/model/database/SchedulerJob.java similarity index 87% rename from abstracto-application/scheduling/scheduling-int/src/main/java/dev/sheldan/abstracto/scheduling/model/SchedulerJob.java rename to abstracto-application/scheduling/scheduling-int/src/main/java/dev/sheldan/abstracto/scheduling/model/database/SchedulerJob.java index fda54e846..b87ff6230 100644 --- a/abstracto-application/scheduling/scheduling-int/src/main/java/dev/sheldan/abstracto/scheduling/model/SchedulerJob.java +++ b/abstracto-application/scheduling/scheduling-int/src/main/java/dev/sheldan/abstracto/scheduling/model/database/SchedulerJob.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.scheduling.model; +package dev.sheldan.abstracto.scheduling.model.database; import lombok.*; diff --git a/abstracto-application/scheduling/scheduling-int/src/main/java/dev/sheldan/abstracto/scheduling/model/SchedulerService.java b/abstracto-application/scheduling/scheduling-int/src/main/java/dev/sheldan/abstracto/scheduling/service/SchedulerService.java similarity index 81% rename from abstracto-application/scheduling/scheduling-int/src/main/java/dev/sheldan/abstracto/scheduling/model/SchedulerService.java rename to abstracto-application/scheduling/scheduling-int/src/main/java/dev/sheldan/abstracto/scheduling/service/SchedulerService.java index d8b1e7b89..1df1520de 100644 --- a/abstracto-application/scheduling/scheduling-int/src/main/java/dev/sheldan/abstracto/scheduling/model/SchedulerService.java +++ b/abstracto-application/scheduling/scheduling-int/src/main/java/dev/sheldan/abstracto/scheduling/service/SchedulerService.java @@ -1,5 +1,6 @@ -package dev.sheldan.abstracto.scheduling.model; +package dev.sheldan.abstracto.scheduling.service; +import dev.sheldan.abstracto.scheduling.model.database.SchedulerJob; import org.quartz.JobDataMap; import java.util.Date; diff --git a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/seeding/TemplateSeedDataLoader.java b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/config/TemplateSeedDataLoader.java similarity index 88% rename from abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/seeding/TemplateSeedDataLoader.java rename to abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/config/TemplateSeedDataLoader.java index c5ad60b13..c3646daf2 100644 --- a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/seeding/TemplateSeedDataLoader.java +++ b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/config/TemplateSeedDataLoader.java @@ -1,6 +1,6 @@ -package dev.sheldan.abstracto.templating.seeding; +package dev.sheldan.abstracto.templating.config; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.service.management.TemplateManagementService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; @@ -24,7 +24,7 @@ public class TemplateSeedDataLoader { private Resource[] resources; @Autowired - private TemplateService service; + private TemplateManagementService service; @EventListener public void handleContextRefreshEvent(ContextRefreshedEvent ctxStartEvt) { diff --git a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/loading/DatabaseTemplateLoader.java b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/loading/DatabaseTemplateLoader.java index e2acdab5a..fa971d3dd 100644 --- a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/loading/DatabaseTemplateLoader.java +++ b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/loading/DatabaseTemplateLoader.java @@ -1,7 +1,8 @@ package dev.sheldan.abstracto.templating.loading; -import dev.sheldan.abstracto.templating.TemplateDto; -import dev.sheldan.abstracto.templating.TemplateService; +import dev.sheldan.abstracto.templating.model.database.Template; +import dev.sheldan.abstracto.templating.service.TemplateService; +import dev.sheldan.abstracto.templating.service.management.TemplateManagementService; import freemarker.cache.TemplateLoader; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -16,17 +17,20 @@ public class DatabaseTemplateLoader implements TemplateLoader { @Autowired private TemplateService templateService; + @Autowired + private TemplateManagementService templateManagementService; + @Override public Object findTemplateSource(String s) throws IOException { - return templateService.getTemplateByKey(s); + return templateManagementService.getTemplateByKey(s); } @Override public long getLastModified(Object o) { - TemplateDto casted = (TemplateDto) o; - TemplateDto templateDtoByKey = templateService.getTemplateByKey(casted.getKey()); - if(templateDtoByKey != null){ - return templateDtoByKey.getLastModified().getEpochSecond(); + Template casted = (Template) o; + Template templateByKey = templateManagementService.getTemplateByKey(casted.getKey()); + if(templateByKey != null){ + return templateByKey.getLastModified().getEpochSecond(); } else { return Long.MAX_VALUE; } @@ -34,7 +38,7 @@ public class DatabaseTemplateLoader implements TemplateLoader { @Override public Reader getReader(Object o, String s) throws IOException { - return new StringReader(((TemplateDto) o).getContent()); + return new StringReader(((Template) o).getContent()); } @Override diff --git a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/loading/TemplateRepository.java b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/loading/TemplateRepository.java index ca208a7dd..549a34b84 100644 --- a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/loading/TemplateRepository.java +++ b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/loading/TemplateRepository.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.templating.loading; -import dev.sheldan.abstracto.templating.TemplateDto; +import dev.sheldan.abstracto.templating.model.database.Template; import org.springframework.data.jpa.repository.JpaRepository; -public interface TemplateRepository extends JpaRepository { +public interface TemplateRepository extends JpaRepository { } diff --git a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedAuthor.java b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedAuthor.java similarity index 77% rename from abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedAuthor.java rename to abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedAuthor.java index ed5dd2c24..8f718065a 100644 --- a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedAuthor.java +++ b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedAuthor.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.templating.embed; +package dev.sheldan.abstracto.templating.model; import lombok.Getter; diff --git a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedColor.java b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedColor.java similarity index 76% rename from abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedColor.java rename to abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedColor.java index c38da0ef7..986af32e8 100644 --- a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedColor.java +++ b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedColor.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.templating.embed; +package dev.sheldan.abstracto.templating.model; import lombok.Getter; import lombok.Setter; diff --git a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedConfiguration.java b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedConfiguration.java similarity index 90% rename from abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedConfiguration.java rename to abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedConfiguration.java index 7101f29d7..f013f7c10 100644 --- a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedConfiguration.java +++ b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedConfiguration.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.templating.embed; +package dev.sheldan.abstracto.templating.model; import lombok.Getter; import lombok.Setter; diff --git a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedField.java b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedField.java similarity index 77% rename from abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedField.java rename to abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedField.java index 9e0a298e2..7d062981e 100644 --- a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedField.java +++ b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedField.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.templating.embed; +package dev.sheldan.abstracto.templating.model; import lombok.Getter; import lombok.Setter; diff --git a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedFooter.java b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedFooter.java similarity index 74% rename from abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedFooter.java rename to abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedFooter.java index a533068c8..5145fdf8c 100644 --- a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedFooter.java +++ b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedFooter.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.templating.embed; +package dev.sheldan.abstracto.templating.model; import lombok.Getter; import lombok.Setter; diff --git a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedTitle.java b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedTitle.java similarity index 74% rename from abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedTitle.java rename to abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedTitle.java index df875d8fe..c83653ae1 100644 --- a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/embed/EmbedTitle.java +++ b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/model/EmbedTitle.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.templating.embed; +package dev.sheldan.abstracto.templating.model; import lombok.Getter; import lombok.Setter; diff --git a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/loading/TemplateServiceBean.java b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/service/TemplateServiceBean.java similarity index 78% rename from abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/loading/TemplateServiceBean.java rename to abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/service/TemplateServiceBean.java index 44784f999..7f896704f 100644 --- a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/loading/TemplateServiceBean.java +++ b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/service/TemplateServiceBean.java @@ -1,12 +1,8 @@ -package dev.sheldan.abstracto.templating.loading; +package dev.sheldan.abstracto.templating.service; import com.google.gson.Gson; -import dev.sheldan.abstracto.core.models.context.ContextAware; -import dev.sheldan.abstracto.core.models.context.ServerContext; -import dev.sheldan.abstracto.core.models.MessageToSend; -import dev.sheldan.abstracto.templating.TemplateDto; -import dev.sheldan.abstracto.templating.TemplateService; -import dev.sheldan.abstracto.templating.embed.*; +import dev.sheldan.abstracto.templating.model.*; +import dev.sheldan.abstracto.templating.model.database.Template; import freemarker.template.Configuration; import freemarker.template.TemplateException; import lombok.extern.slf4j.Slf4j; @@ -18,7 +14,6 @@ import org.springframework.ui.freemarker.FreeMarkerTemplateUtils; import java.awt.*; import java.io.IOException; -import java.time.Instant; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -28,9 +23,6 @@ import java.util.stream.Collectors; @Component public class TemplateServiceBean implements TemplateService { - @Autowired - private TemplateRepository repository; - @Autowired private Configuration configuration; @@ -38,17 +30,7 @@ public class TemplateServiceBean implements TemplateService { private Gson gson; @Override - public TemplateDto getTemplateByKey(String key) { - return repository.getOne(key); - } - - @Override - public boolean templateExists(String key) { - return getTemplateByKey(key) != null; - } - - @Override - public String renderTemplate(TemplateDto templateDto) { + public String renderTemplate(Template template) { return null; } @@ -147,21 +129,4 @@ public class TemplateServiceBean implements TemplateService { return null; } } - - @Override - public String renderContextAwareTemplate(String key, ServerContext serverContext) { - return renderTemplate(getTemplateKey(key, serverContext), serverContext); - } - - private String getTemplateKey(String key, ContextAware contextAware) { - if(!contextAware.getTemplateSuffix().equals("")) { - return key + "_" + contextAware.getTemplateSuffix(); - } - return key; - } - - @Override - public void createTemplate(String key, String content) { - repository.save(TemplateDto.builder().key(key).content(content).lastModified(Instant.now()).build()); - } } diff --git a/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/service/management/TemplateManagementServiceBean.java b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/service/management/TemplateManagementServiceBean.java new file mode 100644 index 000000000..4e9f1e398 --- /dev/null +++ b/abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/service/management/TemplateManagementServiceBean.java @@ -0,0 +1,30 @@ +package dev.sheldan.abstracto.templating.service.management; + +import dev.sheldan.abstracto.templating.loading.TemplateRepository; +import dev.sheldan.abstracto.templating.model.database.Template; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.time.Instant; + +@Component +public class TemplateManagementServiceBean implements TemplateManagementService { + + @Autowired + private TemplateRepository repository; + + @Override + public Template getTemplateByKey(String key) { + return repository.getOne(key); + } + + @Override + public boolean templateExists(String key) { + return getTemplateByKey(key) != null; + } + + @Override + public void createTemplate(String key, String content) { + repository.save(Template.builder().key(key).content(content).lastModified(Instant.now()).build()); + } +} diff --git a/abstracto-application/templating/templating-interface/pom.xml b/abstracto-application/templating/templating-interface/pom.xml index 4c87a9d66..1057af57a 100644 --- a/abstracto-application/templating/templating-interface/pom.xml +++ b/abstracto-application/templating/templating-interface/pom.xml @@ -18,11 +18,10 @@ - dev.sheldan.abstracto.core - core-interface - ${project.version} - compile + net.dv8tion + JDA + \ No newline at end of file diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/Templatable.java b/abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/Templatable.java similarity index 68% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/Templatable.java rename to abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/Templatable.java index 2463cacba..638d3a004 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/Templatable.java +++ b/abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/Templatable.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.command; +package dev.sheldan.abstracto.templating; public interface Templatable { String getTemplateName(); diff --git a/abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/TemplateService.java b/abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/TemplateService.java deleted file mode 100644 index 34a18da8e..000000000 --- a/abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/TemplateService.java +++ /dev/null @@ -1,17 +0,0 @@ -package dev.sheldan.abstracto.templating; - -import dev.sheldan.abstracto.core.models.context.ServerContext; -import dev.sheldan.abstracto.core.models.MessageToSend; - -import java.util.HashMap; - -public interface TemplateService { - TemplateDto getTemplateByKey(String key); - boolean templateExists(String key); - String renderTemplate(TemplateDto templateDto); - MessageToSend renderEmbedTemplate(String key, Object model); - String renderTemplate(String key, HashMap parameters); - String renderTemplate(String key, Object model); - String renderContextAwareTemplate(String key, ServerContext serverContext); - void createTemplate(String key, String content); -} diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/MessageToSend.java b/abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/model/MessageToSend.java similarity index 84% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/MessageToSend.java rename to abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/model/MessageToSend.java index 6875fb42c..2c67e05dc 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/MessageToSend.java +++ b/abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/model/MessageToSend.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models; +package dev.sheldan.abstracto.templating.model; import lombok.Builder; import lombok.Getter; diff --git a/abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/TemplateDto.java b/abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/model/database/Template.java similarity index 87% rename from abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/TemplateDto.java rename to abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/model/database/Template.java index 5e18d9403..c31ff3534 100644 --- a/abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/TemplateDto.java +++ b/abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/model/database/Template.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.templating; +package dev.sheldan.abstracto.templating.model.database; import lombok.AllArgsConstructor; import lombok.Builder; @@ -16,7 +16,7 @@ import java.time.Instant; @NoArgsConstructor @AllArgsConstructor @Table(name = "template") -public class TemplateDto { +public class Template { @Id @Getter diff --git a/abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/service/TemplateService.java b/abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/service/TemplateService.java new file mode 100644 index 000000000..cc4849add --- /dev/null +++ b/abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/service/TemplateService.java @@ -0,0 +1,13 @@ +package dev.sheldan.abstracto.templating.service; + +import dev.sheldan.abstracto.templating.model.MessageToSend; +import dev.sheldan.abstracto.templating.model.database.Template; + +import java.util.HashMap; + +public interface TemplateService { + String renderTemplate(Template template); + MessageToSend renderEmbedTemplate(String key, Object model); + String renderTemplate(String key, HashMap parameters); + String renderTemplate(String key, Object model); +} diff --git a/abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/service/management/TemplateManagementService.java b/abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/service/management/TemplateManagementService.java new file mode 100644 index 000000000..7158c59b0 --- /dev/null +++ b/abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/service/management/TemplateManagementService.java @@ -0,0 +1,9 @@ +package dev.sheldan.abstracto.templating.service.management; + +import dev.sheldan.abstracto.templating.model.database.Template; + +public interface TemplateManagementService { + Template getTemplateByKey(String key); + boolean templateExists(String key); + void createTemplate(String key, String content); +}