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 8f72f8359..17fc602d7 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 @@ -1,8 +1,8 @@ package dev.sheldan.abstracto.moderation.listener; import dev.sheldan.abstracto.core.listener.MessageDeletedListener; -import dev.sheldan.abstracto.core.models.CachedMessage; -import dev.sheldan.abstracto.core.models.embed.MessageToSend; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; +import dev.sheldan.abstracto.core.models.MessageToSend; import dev.sheldan.abstracto.core.service.MessageCache; import dev.sheldan.abstracto.core.service.PostTargetService; import dev.sheldan.abstracto.core.utils.ContextUtils; 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 df71ab4b0..a4100fcb5 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 @@ -1,8 +1,8 @@ package dev.sheldan.abstracto.moderation.listener; import dev.sheldan.abstracto.core.listener.MessageTextUpdatedListener; -import dev.sheldan.abstracto.core.models.CachedMessage; -import dev.sheldan.abstracto.core.models.embed.MessageToSend; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; +import dev.sheldan.abstracto.core.models.MessageToSend; import dev.sheldan.abstracto.core.service.MessageCache; import dev.sheldan.abstracto.core.service.PostTargetService; import dev.sheldan.abstracto.moderation.config.ModerationFeatures; 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 5c9042fab..eacca2f2a 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 @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.moderation.service; import dev.sheldan.abstracto.core.exception.GuildException; -import dev.sheldan.abstracto.core.models.ServerContext; +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; 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 2d0487961..8dd9f58e1 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 @@ -1,10 +1,10 @@ package dev.sheldan.abstracto.moderation.service; import dev.sheldan.abstracto.core.exception.UserException; -import dev.sheldan.abstracto.core.models.ServerContext; +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.embed.MessageToSend; +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; 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/BanIdLog.java index ec071efca..aec677488 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/BanIdLog.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.moderation.models.template; -import dev.sheldan.abstracto.core.models.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; 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/BanLog.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/BanLog.java index 468b01bae..612467d29 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/BanLog.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.moderation.models.template; -import dev.sheldan.abstracto.core.models.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; 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/KickLogModel.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/KickLogModel.java index 5b11213d6..1730194f2 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/KickLogModel.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.moderation.models.template; -import dev.sheldan.abstracto.core.models.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; 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/WarnLog.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/WarnLog.java index 0fd38bcd9..cb9c654da 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/WarnLog.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.moderation.models.template; -import dev.sheldan.abstracto.core.models.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import dev.sheldan.abstracto.moderation.models.Warning; import lombok.Getter; import lombok.Setter; diff --git a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/listener/MessageDeletedAttachmentLog.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/listener/MessageDeletedAttachmentLog.java index 9f34b3ba7..eba736774 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/listener/MessageDeletedAttachmentLog.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/listener/MessageDeletedAttachmentLog.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.moderation.models.template.listener; -import dev.sheldan.abstracto.core.models.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; 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/listener/MessageDeletedLog.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/listener/MessageDeletedLog.java index 251618c3b..f91814c54 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/listener/MessageDeletedLog.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/listener/MessageDeletedLog.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.moderation.models.template.listener; -import dev.sheldan.abstracto.core.models.CachedMessage; -import dev.sheldan.abstracto.core.models.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; 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/listener/MessageEditedLog.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/listener/MessageEditedLog.java index c27fdb88e..3b91910fa 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/listener/MessageEditedLog.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/listener/MessageEditedLog.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.moderation.models.template.listener; -import dev.sheldan.abstracto.core.models.CachedMessage; -import dev.sheldan.abstracto.core.models.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; 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/service/BanService.java b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/BanService.java index 87b3aa008..df4300bad 100644 --- a/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/BanService.java +++ b/abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/BanService.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.moderation.service; -import dev.sheldan.abstracto.core.models.ServerContext; +import dev.sheldan.abstracto.core.models.context.ServerContext; import net.dv8tion.jda.api.entities.Member; public interface BanService { 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/command/StarStats.java index dff510aa3..3d67a05a7 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/command/StarStats.java @@ -6,7 +6,7 @@ import dev.sheldan.abstracto.core.command.execution.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.embed.MessageToSend; +import dev.sheldan.abstracto.core.models.MessageToSend; import dev.sheldan.abstracto.templating.TemplateService; import dev.sheldan.abstracto.utility.Utility; import dev.sheldan.abstracto.utility.config.UtilityFeatures; 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/MessageEmbedListener.java index ec661b066..cc174d399 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/MessageEmbedListener.java @@ -4,14 +4,14 @@ import dev.sheldan.abstracto.core.listener.MessageReceivedListener; 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.CachedMessage; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; 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.core.models.listener.MessageEmbeddedModel; +import dev.sheldan.abstracto.core.listener.models.MessageEmbeddedModel; import dev.sheldan.abstracto.core.service.Bot; import dev.sheldan.abstracto.core.service.MessageCache; -import dev.sheldan.abstracto.core.models.embed.MessageToSend; +import dev.sheldan.abstracto.core.models.MessageToSend; import dev.sheldan.abstracto.templating.TemplateService; import dev.sheldan.abstracto.utility.config.UtilityFeatures; import lombok.extern.slf4j.Slf4j; 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/StarboardListener.java index af78d1cec..d69c827dc 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/StarboardListener.java @@ -2,8 +2,8 @@ package dev.sheldan.abstracto.utility.listener; import dev.sheldan.abstracto.core.listener.ReactedAddedListener; import dev.sheldan.abstracto.core.listener.ReactedRemovedListener; -import dev.sheldan.abstracto.core.models.CachedMessage; -import dev.sheldan.abstracto.core.models.CachedReaction; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; +import dev.sheldan.abstracto.core.models.cache.CachedReaction; import dev.sheldan.abstracto.core.models.database.AEmote; import dev.sheldan.abstracto.core.models.database.AUser; import dev.sheldan.abstracto.core.models.database.AUserInAServer; 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/StarboardPostDeletedListener.java index 53e5c6a6c..6cd62bdbf 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/StarboardPostDeletedListener.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.utility.listener; import dev.sheldan.abstracto.core.listener.MessageDeletedListener; -import dev.sheldan.abstracto.core.models.CachedMessage; +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.service.management.StarboardPostManagementService; 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 8e60a354d..1f6ab6f2b 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 @@ -6,7 +6,7 @@ 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.embed.MessageToSend; +import dev.sheldan.abstracto.core.models.MessageToSend; import dev.sheldan.abstracto.core.service.Bot; import dev.sheldan.abstracto.scheduling.model.SchedulerService; import dev.sheldan.abstracto.templating.TemplateService; 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 f30c423ac..83905d38e 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 @@ -1,14 +1,12 @@ package dev.sheldan.abstracto.utility.service; -import dev.sheldan.abstracto.core.exception.ChannelException; -import dev.sheldan.abstracto.core.exception.GuildException; 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.CachedMessage; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.database.*; -import dev.sheldan.abstracto.core.models.embed.MessageToSend; +import dev.sheldan.abstracto.core.models.MessageToSend; import dev.sheldan.abstracto.core.service.Bot; import dev.sheldan.abstracto.core.service.ConfigService; import dev.sheldan.abstracto.core.service.EmoteService; 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 1be61199f..3a058d656 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,7 +3,7 @@ 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.embed.MessageToSend; +import dev.sheldan.abstracto.core.models.MessageToSend; import dev.sheldan.abstracto.core.service.Bot; import dev.sheldan.abstracto.core.service.MessageService; import dev.sheldan.abstracto.core.service.PostTargetService; 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 8a32c1351..6103c367f 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,7 +1,7 @@ package dev.sheldan.abstracto.utility.service.management; import dev.sheldan.abstracto.core.models.AServerChannelMessage; -import dev.sheldan.abstracto.core.models.CachedMessage; +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.repository.StarboardPostRepository; 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/Suggestion.java index 80678b3c4..6d9f121e6 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/Suggestion.java @@ -1,6 +1,5 @@ package dev.sheldan.abstracto.utility.models; -import dev.sheldan.abstracto.core.models.AChannelType; import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.models.database.AServer; import dev.sheldan.abstracto.core.models.database.AUserInAServer; 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/ExecutedReminderModel.java index c7182df54..68e5d4fcc 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/ExecutedReminderModel.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.utility.models.template; -import dev.sheldan.abstracto.core.models.ServerContext; +import dev.sheldan.abstracto.core.models.context.ServerContext; import dev.sheldan.abstracto.core.utils.MessageUtils; import dev.sheldan.abstracto.utility.models.Reminder; import lombok.Getter; 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/ReminderModel.java index 22930719c..fd9441c8c 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/ReminderModel.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.utility.models.template; -import dev.sheldan.abstracto.core.models.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import dev.sheldan.abstracto.utility.models.Reminder; 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/ShowEmoteLog.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/ShowEmoteLog.java index 8a4ac8368..c911253c7 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/ShowEmoteLog.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.utility.models.template; -import dev.sheldan.abstracto.core.models.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; 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/SuggestionLog.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/SuggestionLog.java index ebd626147..44296595d 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/SuggestionLog.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.utility.models.template; -import dev.sheldan.abstracto.core.models.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import dev.sheldan.abstracto.utility.models.Suggestion; 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/StarboardPostModel.java b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/starboard/StarboardPostModel.java index aab64171b..22aa7bef2 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/starboard/StarboardPostModel.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.utility.models.template.starboard; -import dev.sheldan.abstracto.core.models.CachedMessage; -import dev.sheldan.abstracto.core.models.ServerContext; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; +import dev.sheldan.abstracto.core.models.context.ServerContext; import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.models.database.AUser; import lombok.Getter; 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 077eae8f9..6c8ac57c7 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 @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.utility.service; -import dev.sheldan.abstracto.core.models.CachedMessage; +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; 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 df9229330..1f2c0d7c1 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,7 +1,7 @@ package dev.sheldan.abstracto.utility.service.management; import dev.sheldan.abstracto.core.models.AServerChannelMessage; -import dev.sheldan.abstracto.core.models.CachedMessage; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.utility.models.StarboardPost; 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 ad2706388..a26a38a9f 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 @@ -12,7 +12,7 @@ import dev.sheldan.abstracto.core.service.management.ServerManagementService; 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.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.core.utils.ParseUtils; import lombok.extern.slf4j.Slf4j; 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 0051cff3c..db3583b1d 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 @@ -5,7 +5,7 @@ import dev.sheldan.abstracto.core.command.execution.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.config.AbstractoFeatures; +import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.commands.utility.UtilityModuleInterface; import dev.sheldan.abstracto.core.service.management.FeatureFlagManagementService; import org.springframework.beans.factory.annotation.Autowired; 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 12792aab0..85fbdd7cf 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 @@ -5,7 +5,7 @@ import dev.sheldan.abstracto.core.command.execution.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.config.AbstractoFeatures; +import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.commands.utility.UtilityModuleInterface; import dev.sheldan.abstracto.core.service.management.FeatureFlagManagementService; import org.springframework.beans.factory.annotation.Autowired; 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 59c592cf0..227e3c7d0 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 @@ -5,7 +5,7 @@ import dev.sheldan.abstracto.core.command.execution.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.config.AbstractoFeatures; +import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.service.ChannelGroupService; import net.dv8tion.jda.api.entities.TextChannel; import org.springframework.beans.factory.annotation.Autowired; 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 e30a283de..e29c70cae 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 @@ -5,7 +5,7 @@ import dev.sheldan.abstracto.core.command.execution.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.config.AbstractoFeatures; +import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.service.ChannelGroupService; 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 104d3b884..b1924db99 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 @@ -2,7 +2,7 @@ package dev.sheldan.abstracto.core.commands.channels; import dev.sheldan.abstracto.core.command.Command; import dev.sheldan.abstracto.core.command.execution.*; -import dev.sheldan.abstracto.config.AbstractoFeatures; +import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.models.command.PostTargetErrorModel; import dev.sheldan.abstracto.core.service.PostTargetService; import dev.sheldan.abstracto.core.service.management.ChannelManagementService; 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 e949c8a28..559897b13 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 @@ -5,7 +5,7 @@ import dev.sheldan.abstracto.core.command.execution.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.config.AbstractoFeatures; +import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.service.ChannelGroupService; import net.dv8tion.jda.api.entities.TextChannel; import org.springframework.beans.factory.annotation.Autowired; 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 c4750edd1..26f705c1b 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 @@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.command.*; 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.config.AbstractoFeatures; +import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.templating.TemplateService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; 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 ee313553c..85719bb4e 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,20 +1,18 @@ package dev.sheldan.abstracto.core.commands.utility; import dev.sheldan.abstracto.core.command.Command; -import dev.sheldan.abstracto.core.command.CommandCondition; import dev.sheldan.abstracto.core.command.HelpInfo; import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.Parameter; import dev.sheldan.abstracto.core.command.execution.CommandResult; -import dev.sheldan.abstracto.config.AbstractoFeatures; +import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.models.command.EchoModel; import dev.sheldan.abstracto.templating.TemplateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.Collections; import java.util.List; @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 2e8926715..9b2a82adf 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,19 +1,15 @@ package dev.sheldan.abstracto.core.commands.utility; import dev.sheldan.abstracto.core.command.Command; -import dev.sheldan.abstracto.core.command.CommandCondition; import dev.sheldan.abstracto.core.command.execution.CommandConfiguration; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.CommandResult; -import dev.sheldan.abstracto.config.AbstractoFeatures; +import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.models.command.PingModel; import dev.sheldan.abstracto.templating.TemplateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Collections; -import java.util.List; - @Service public class Ping implements Command { 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 b1f1d7b27..ffdceeeef 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 @@ -5,7 +5,7 @@ import dev.sheldan.abstracto.core.command.execution.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.config.AbstractoFeatures; +import dev.sheldan.abstracto.core.config.AbstractoFeatures; import dev.sheldan.abstracto.core.service.EmoteService; import dev.sheldan.abstracto.core.service.management.EmoteManagementService; import net.dv8tion.jda.api.entities.Emote; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/AbstractoFeatures.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/AbstractoFeatures.java similarity index 63% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/AbstractoFeatures.java rename to abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/AbstractoFeatures.java index d3e88084d..742564989 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/AbstractoFeatures.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/AbstractoFeatures.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.config; +package dev.sheldan.abstracto.core.config; public class AbstractoFeatures { public static String CORE = "core"; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/CoreConfig.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/CoreConfig.java similarity index 91% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/CoreConfig.java rename to abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/CoreConfig.java index a17efeb24..b7cc7b1c1 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/CoreConfig.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/CoreConfig.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.config; +package dev.sheldan.abstracto.core.config; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/FeatureFlagConfig.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/FeatureFlagConfig.java similarity index 89% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/FeatureFlagConfig.java rename to abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/FeatureFlagConfig.java index 0cb14f764..83bdba80d 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/FeatureFlagConfig.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/FeatureFlagConfig.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.config; +package dev.sheldan.abstracto.core.config; import lombok.Getter; import lombok.Setter; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/FeatureFlagListener.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/FeatureFlagListener.java similarity index 95% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/FeatureFlagListener.java rename to abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/FeatureFlagListener.java index fc91085d9..477a85515 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/FeatureFlagListener.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/FeatureFlagListener.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.config; +package dev.sheldan.abstracto.core.config; import dev.sheldan.abstracto.core.listener.ServerConfigListener; import dev.sheldan.abstracto.core.models.database.AServer; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/OffsetDateTimeAdapter.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/OffsetDateTimeAdapter.java similarity index 94% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/OffsetDateTimeAdapter.java rename to abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/OffsetDateTimeAdapter.java index 88b58178a..33944d122 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/OffsetDateTimeAdapter.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/OffsetDateTimeAdapter.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.config; +package dev.sheldan.abstracto.core.config; import com.google.gson.*; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/ChannelListener.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ChannelListener.java similarity index 95% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/ChannelListener.java rename to abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ChannelListener.java index 21ecea011..4078f2c7e 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/ChannelListener.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ChannelListener.java @@ -1,8 +1,8 @@ -package dev.sheldan.abstracto.listener; +package dev.sheldan.abstracto.core.listener; import dev.sheldan.abstracto.core.service.management.ChannelManagementService; import dev.sheldan.abstracto.core.service.management.ServerManagementService; -import dev.sheldan.abstracto.core.models.AChannelType; +import dev.sheldan.abstracto.core.models.database.AChannelType; import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.models.database.AServer; import dev.sheldan.abstracto.core.repository.ServerRepository; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/JoinListenerBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/JoinListenerBean.java similarity index 93% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/JoinListenerBean.java rename to abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/JoinListenerBean.java index 656019bfb..c1dac0508 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/JoinListenerBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/JoinListenerBean.java @@ -1,7 +1,6 @@ -package dev.sheldan.abstracto.listener; +package dev.sheldan.abstracto.core.listener; import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException; -import dev.sheldan.abstracto.core.listener.JoinListener; import dev.sheldan.abstracto.core.service.FeatureFlagService; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/LeaveListenerBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/LeaveListenerBean.java similarity index 93% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/LeaveListenerBean.java rename to abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/LeaveListenerBean.java index 85242cf31..4c7ece4f4 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/LeaveListenerBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/LeaveListenerBean.java @@ -1,7 +1,6 @@ -package dev.sheldan.abstracto.listener; +package dev.sheldan.abstracto.core.listener; import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException; -import dev.sheldan.abstracto.core.listener.LeaveListener; import dev.sheldan.abstracto.core.service.FeatureFlagService; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.events.guild.member.GuildMemberLeaveEvent; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/MessageDeletedListenerBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/MessageDeletedListenerBean.java similarity index 91% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/MessageDeletedListenerBean.java rename to abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/MessageDeletedListenerBean.java index 980d656af..e906acb15 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/MessageDeletedListenerBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/MessageDeletedListenerBean.java @@ -1,8 +1,7 @@ -package dev.sheldan.abstracto.listener; +package dev.sheldan.abstracto.core.listener; import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException; -import dev.sheldan.abstracto.core.listener.MessageDeletedListener; -import dev.sheldan.abstracto.core.models.CachedMessage; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.service.FeatureFlagService; import dev.sheldan.abstracto.core.service.MessageCache; import lombok.extern.slf4j.Slf4j; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/MessageReceivedListenerBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/MessageReceivedListenerBean.java similarity index 92% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/MessageReceivedListenerBean.java rename to abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/MessageReceivedListenerBean.java index 3f0a1f37d..c671b2f51 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/MessageReceivedListenerBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/MessageReceivedListenerBean.java @@ -1,6 +1,5 @@ -package dev.sheldan.abstracto.listener; +package dev.sheldan.abstracto.core.listener; -import dev.sheldan.abstracto.core.listener.MessageReceivedListener; import dev.sheldan.abstracto.core.service.FeatureFlagService; import dev.sheldan.abstracto.core.service.MessageCache; import lombok.extern.slf4j.Slf4j; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/MessageUpdatedListener.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/MessageUpdatedListener.java similarity index 92% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/MessageUpdatedListener.java rename to abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/MessageUpdatedListener.java index dc524a032..ca42bfb3f 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/MessageUpdatedListener.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/MessageUpdatedListener.java @@ -1,8 +1,7 @@ -package dev.sheldan.abstracto.listener; +package dev.sheldan.abstracto.core.listener; import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException; -import dev.sheldan.abstracto.core.listener.MessageTextUpdatedListener; -import dev.sheldan.abstracto.core.models.CachedMessage; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.service.FeatureFlagService; import dev.sheldan.abstracto.core.service.MessageCache; import lombok.extern.slf4j.Slf4j; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/ReactionUpdatedListener.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ReactionUpdatedListener.java similarity index 96% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/ReactionUpdatedListener.java rename to abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ReactionUpdatedListener.java index 37559c7c5..f267095a0 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/ReactionUpdatedListener.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ReactionUpdatedListener.java @@ -1,12 +1,10 @@ -package dev.sheldan.abstracto.listener; +package dev.sheldan.abstracto.core.listener; import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException; -import dev.sheldan.abstracto.core.listener.ReactedAddedListener; -import dev.sheldan.abstracto.core.listener.ReactedRemovedListener; import dev.sheldan.abstracto.core.service.FeatureFlagService; import dev.sheldan.abstracto.core.service.management.UserManagementService; -import dev.sheldan.abstracto.core.models.CachedMessage; -import dev.sheldan.abstracto.core.models.CachedReaction; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; +import dev.sheldan.abstracto.core.models.cache.CachedReaction; import dev.sheldan.abstracto.core.models.database.AUser; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.core.service.EmoteService; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/ReadyListener.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ReadyListener.java similarity index 93% rename from abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/ReadyListener.java rename to abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ReadyListener.java index 44d55c0d1..f2daf6b46 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/ReadyListener.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ReadyListener.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.listener; +package dev.sheldan.abstracto.core.listener; import dev.sheldan.abstracto.core.service.StartupManager; import net.dv8tion.jda.api.events.ReadyEvent; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageCacheBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageCacheBean.java index 31f59e8cf..b5265be4b 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageCacheBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageCacheBean.java @@ -4,10 +4,10 @@ import dev.sheldan.abstracto.core.exception.ChannelException; import dev.sheldan.abstracto.core.exception.GuildException; import dev.sheldan.abstracto.core.service.management.EmoteManagementService; import dev.sheldan.abstracto.core.service.management.UserManagementService; -import dev.sheldan.abstracto.core.models.CachedMessage; -import dev.sheldan.abstracto.core.models.CachedReaction; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; +import dev.sheldan.abstracto.core.models.cache.CachedReaction; import dev.sheldan.abstracto.core.models.database.AUser; -import dev.sheldan.abstracto.core.models.embed.*; +import dev.sheldan.abstracto.core.models.cache.*; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.entities.*; import net.dv8tion.jda.api.requests.restaction.pagination.ReactionPaginationAction; @@ -167,21 +167,21 @@ public class MessageCacheBean implements MessageCache { .builder(); MessageEmbed.AuthorInfo author = embed.getAuthor(); if(author != null) { - builder.author(EmbedAuthor.builder().avatar(author.getProxyIconUrl()).url(author.getUrl()).name(author.getName()).build()); + builder.author(CachedEmbedAuthor.builder().avatar(author.getProxyIconUrl()).url(author.getUrl()).name(author.getName()).build()); } List fields = embed.getFields(); if(!fields.isEmpty()) { - List embedFields = new ArrayList<>(); + List cachedEmbedFields = new ArrayList<>(); fields.forEach(field -> { - EmbedField build = EmbedField + CachedEmbedField build = CachedEmbedField .builder() .name(field.getName()) .value(field.getValue()) .inline(field.isInline()) .build(); - embedFields.add(build); + cachedEmbedFields.add(build); }); - builder.fields(embedFields); + builder.fields(cachedEmbedFields); } MessageEmbed.ImageInfo image = embed.getImage(); if(image != null) { @@ -189,7 +189,7 @@ public class MessageCacheBean implements MessageCache { } Color color = embed.getColor(); if(color != null) { - EmbedColor build = EmbedColor + CachedEmbedColor build = CachedEmbedColor .builder() .r(color.getRed()) .g(color.getGreen()) @@ -200,7 +200,7 @@ public class MessageCacheBean implements MessageCache { builder.description(embed.getDescription()); MessageEmbed.Footer footer = embed.getFooter(); if(footer != null) { - EmbedFooter build = EmbedFooter + CachedEmbedFooter build = CachedEmbedFooter .builder() .icon(footer.getProxyIconUrl()) .text(footer.getText()) 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 c4ec55c14..50d473329 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.embed.MessageToSend; +import dev.sheldan.abstracto.core.models.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/StartupManager.java index 95551a608..711d7c12e 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/StartupManager.java @@ -6,7 +6,7 @@ import dev.sheldan.abstracto.core.service.management.ChannelManagementService; import dev.sheldan.abstracto.core.service.management.RoleManagementService; import dev.sheldan.abstracto.core.service.management.ServerManagementService; import dev.sheldan.abstracto.core.models.database.AChannel; -import dev.sheldan.abstracto.core.models.AChannelType; +import dev.sheldan.abstracto.core.models.database.AChannelType; import dev.sheldan.abstracto.core.models.database.ARole; import dev.sheldan.abstracto.core.models.database.AServer; import lombok.extern.slf4j.Slf4j; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/ChannelManagementServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/ChannelManagementServiceBean.java index 99d9693f0..137d52a2f 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/ChannelManagementServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/ChannelManagementServiceBean.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.core.service.management; import dev.sheldan.abstracto.core.models.database.AChannel; -import dev.sheldan.abstracto.core.models.AChannelType; +import dev.sheldan.abstracto.core.models.database.AChannelType; import dev.sheldan.abstracto.core.repository.ChannelRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; 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 87f2ed929..3f40441d4 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,6 +1,6 @@ package dev.sheldan.abstracto.core.command.execution; -import dev.sheldan.abstracto.core.models.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import lombok.Builder; import lombok.Getter; import net.dv8tion.jda.api.JDA; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/ContextConverter.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/ContextConverter.java index 63105b9c3..5ccface53 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/ContextConverter.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/ContextConverter.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.command.execution; -import dev.sheldan.abstracto.core.models.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.InvocationTargetException; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/MessageDeletedListener.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/MessageDeletedListener.java index 7b203170c..726163dba 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/MessageDeletedListener.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/MessageDeletedListener.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.listener; -import dev.sheldan.abstracto.core.models.CachedMessage; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; public interface MessageDeletedListener extends FeatureAware { void execute(CachedMessage messageBefore); diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/MessageTextUpdatedListener.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/MessageTextUpdatedListener.java index 4e0648bfd..bbb4289e9 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/MessageTextUpdatedListener.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/MessageTextUpdatedListener.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.listener; -import dev.sheldan.abstracto.core.models.CachedMessage; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; import net.dv8tion.jda.api.entities.Message; public interface MessageTextUpdatedListener extends FeatureAware { diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/ReactedAddedListener.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/ReactedAddedListener.java index f0451b2fe..763e3f8f2 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/ReactedAddedListener.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/ReactedAddedListener.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.listener; -import dev.sheldan.abstracto.core.models.CachedMessage; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import net.dv8tion.jda.api.entities.MessageReaction; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/ReactedRemovedListener.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/ReactedRemovedListener.java index f79634182..73c13d0b3 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/ReactedRemovedListener.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/ReactedRemovedListener.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.listener; -import dev.sheldan.abstracto.core.models.CachedMessage; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import net.dv8tion.jda.api.entities.MessageReaction; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/listener/MessageEmbeddedModel.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/models/MessageEmbeddedModel.java similarity index 69% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/listener/MessageEmbeddedModel.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/models/MessageEmbeddedModel.java index 66fb91530..0bc581588 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/listener/MessageEmbeddedModel.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/models/MessageEmbeddedModel.java @@ -1,7 +1,7 @@ -package dev.sheldan.abstracto.core.models.listener; +package dev.sheldan.abstracto.core.listener.models; -import dev.sheldan.abstracto.core.models.CachedMessage; -import dev.sheldan.abstracto.core.models.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import lombok.Getter; import lombok.Setter; import lombok.experimental.SuperBuilder; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/MessageToSend.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/MessageToSend.java similarity index 82% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/MessageToSend.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/MessageToSend.java index e10864383..60b98d835 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/MessageToSend.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/MessageToSend.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models.embed; +package dev.sheldan.abstracto.core.models; import lombok.Builder; import lombok.Getter; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/CachedEmbed.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbed.java similarity index 56% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/CachedEmbed.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbed.java index 62f9d3551..9048f143a 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/CachedEmbed.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbed.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models.embed; +package dev.sheldan.abstracto.core.models.cache; import lombok.Builder; import lombok.Getter; @@ -11,13 +11,13 @@ import java.util.List; @Setter @Builder public class CachedEmbed { - private EmbedAuthor author; - private EmbedTitle title; - private EmbedColor color; + private CachedEmbedAuthor author; + private CachedEmbedTitle title; + private CachedEmbedColor color; private String description; private String thumbnail; private String imageUrl; - private List fields; - private EmbedFooter footer; + private List fields; + private CachedEmbedFooter footer; private OffsetDateTime timeStamp; } diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedAuthor.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedAuthor.java similarity index 67% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedAuthor.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedAuthor.java index 6ccc5bfc1..14cc5e19e 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedAuthor.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedAuthor.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models.embed; +package dev.sheldan.abstracto.core.models.cache; import lombok.Builder; @@ -8,7 +8,7 @@ import lombok.Setter; @Getter @Setter @Builder -public class EmbedAuthor { +public class CachedEmbedAuthor { private String name; private String url; private String avatar; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedColor.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedColor.java similarity index 67% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedColor.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedColor.java index 2354cd14b..960844ec0 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedColor.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedColor.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models.embed; +package dev.sheldan.abstracto.core.models.cache; import lombok.Builder; import lombok.Getter; @@ -7,7 +7,7 @@ import lombok.Setter; @Setter @Getter @Builder -public class EmbedColor { +public class CachedEmbedColor { private Integer r; private Integer g; private Integer b; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedField.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedField.java similarity index 68% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedField.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedField.java index 0bcf86cf2..d5ad86183 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedField.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedField.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models.embed; +package dev.sheldan.abstracto.core.models.cache; import lombok.Builder; import lombok.Getter; @@ -7,7 +7,7 @@ import lombok.Setter; @Getter @Setter @Builder -public class EmbedField { +public class CachedEmbedField { private String name; private String value; private Boolean inline; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedFooter.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedFooter.java similarity index 64% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedFooter.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedFooter.java index 76f9c716a..9581b728a 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedFooter.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedFooter.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models.embed; +package dev.sheldan.abstracto.core.models.cache; import lombok.Builder; import lombok.Getter; @@ -7,7 +7,7 @@ import lombok.Setter; @Getter @Setter @Builder -public class EmbedFooter { +public class CachedEmbedFooter { private String text; private String icon; } diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedTitle.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedTitle.java similarity index 58% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedTitle.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedTitle.java index f522ab343..8199b07bd 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedTitle.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedTitle.java @@ -1,10 +1,10 @@ -package dev.sheldan.abstracto.core.models.embed; +package dev.sheldan.abstracto.core.models.cache; import lombok.Getter; import lombok.Setter; @Getter @Setter -public class EmbedTitle { +public class CachedEmbedTitle { private String title; private String url; } diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/CachedMessage.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedMessage.java similarity index 83% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/CachedMessage.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedMessage.java index 32216e792..2fa342bd2 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/CachedMessage.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedMessage.java @@ -1,12 +1,10 @@ -package dev.sheldan.abstracto.core.models; +package dev.sheldan.abstracto.core.models.cache; -import dev.sheldan.abstracto.core.models.embed.CachedEmbed; import dev.sheldan.abstracto.core.utils.MessageUtils; import lombok.Builder; import lombok.Getter; import lombok.Setter; -import java.time.Instant; import java.time.OffsetDateTime; import java.util.List; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/CachedReaction.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedReaction.java similarity index 86% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/CachedReaction.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedReaction.java index ba860d450..5642c6391 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/CachedReaction.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedReaction.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models; +package dev.sheldan.abstracto.core.models.cache; import dev.sheldan.abstracto.core.models.database.AEmote; import dev.sheldan.abstracto.core.models.database.AUser; 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/command/EchoModel.java index 23f1a1d49..5177cc60b 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/command/EchoModel.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.core.models.command; -import dev.sheldan.abstracto.core.models.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import lombok.Getter; import lombok.experimental.SuperBuilder; 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/command/PingModel.java index c3b22897b..1cf8c6662 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/command/PingModel.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.models.command; -import dev.sheldan.abstracto.core.models.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import lombok.Getter; import lombok.experimental.SuperBuilder; 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/command/PostTargetErrorModel.java index 2c0bfe7a1..df38f843f 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/command/PostTargetErrorModel.java @@ -1,6 +1,6 @@ package dev.sheldan.abstracto.core.models.command; -import dev.sheldan.abstracto.core.models.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import lombok.Getter; import lombok.Setter; import lombok.experimental.SuperBuilder; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/ContextAware.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/ContextAware.java similarity index 56% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/ContextAware.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/ContextAware.java index 6b1eed263..ae1dcee52 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/ContextAware.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/ContextAware.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models; +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/ServerContext.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/ServerContext.java similarity index 91% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/ServerContext.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/ServerContext.java index 0cf3207d1..4e78cdbbe 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/ServerContext.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/ServerContext.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models; +package dev.sheldan.abstracto.core.models.context; import dev.sheldan.abstracto.core.models.database.AServer; import lombok.AllArgsConstructor; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/UserInitiatedServerContext.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/UserInitiatedServerContext.java similarity index 93% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/UserInitiatedServerContext.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/UserInitiatedServerContext.java index d2cb514ca..c7fabeea1 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/UserInitiatedServerContext.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/UserInitiatedServerContext.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models; +package dev.sheldan.abstracto.core.models.context; import dev.sheldan.abstracto.core.models.database.AChannel; import dev.sheldan.abstracto.core.models.database.AUser; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannel.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannel.java index 7a0b57041..a8691295b 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannel.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannel.java @@ -1,13 +1,11 @@ package dev.sheldan.abstracto.core.models.database; -import dev.sheldan.abstracto.core.models.AChannelType; import dev.sheldan.abstracto.core.models.SnowFlake; import lombok.*; import net.dv8tion.jda.api.entities.ChannelType; import javax.persistence.*; import java.util.List; -import java.util.Set; @Entity @Table(name="channel") diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/AChannelType.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannelType.java similarity index 58% rename from abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/AChannelType.java rename to abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannelType.java index d69a66d81..2182b8cdd 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/AChannelType.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannelType.java @@ -1,4 +1,4 @@ -package dev.sheldan.abstracto.core.models; +package dev.sheldan.abstracto.core.models.database; public enum AChannelType { TEXT, DM, VOICE, NEWS, CATEGORY, UNKOWN diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedConfiguration.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedConfiguration.java deleted file mode 100644 index 074364aa8..000000000 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedConfiguration.java +++ /dev/null @@ -1,20 +0,0 @@ -package dev.sheldan.abstracto.core.models.embed; - -import lombok.Getter; -import lombok.Setter; - -import java.time.OffsetDateTime; -import java.util.List; - -@Getter @Setter -public class EmbedConfiguration { - private EmbedAuthor author; - private EmbedTitle title; - private EmbedColor color; - private String description; - private String thumbnail; - private String imageUrl; - private List fields; - private EmbedFooter footer; - private OffsetDateTime timeStamp; -} diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/MessageCache.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/MessageCache.java index b36c85ea0..3c718b90b 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/MessageCache.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/MessageCache.java @@ -1,12 +1,11 @@ package dev.sheldan.abstracto.core.service; -import dev.sheldan.abstracto.core.models.CachedMessage; -import dev.sheldan.abstracto.core.models.CachedReaction; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; +import dev.sheldan.abstracto.core.models.cache.CachedReaction; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.MessageReaction; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; public interface MessageCache { CompletableFuture putMessageInCache(Message message); 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 6b030c67f..e42be5227 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,9 +1,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.database.PostTarget; -import dev.sheldan.abstracto.core.models.embed.MessageToSend; +import dev.sheldan.abstracto.core.models.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/service/management/ChannelManagementService.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/management/ChannelManagementService.java index 5f64f44f8..e3f45a2e6 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/management/ChannelManagementService.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/management/ChannelManagementService.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.core.service.management; import dev.sheldan.abstracto.core.models.database.AChannel; -import dev.sheldan.abstracto.core.models.AChannelType; +import dev.sheldan.abstracto.core.models.database.AChannelType; public interface ChannelManagementService { AChannel loadChannel(Long id); 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 5c7cf6644..95efaa59c 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 @@ -3,9 +3,9 @@ package dev.sheldan.abstracto.core.utils; 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.CachedMessage; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; import dev.sheldan.abstracto.core.models.ServerChannelUser; -import dev.sheldan.abstracto.core.models.UserInitiatedServerContext; +import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext; import dev.sheldan.abstracto.core.models.database.AUserInAServer; import dev.sheldan.abstracto.core.service.Bot; import lombok.extern.slf4j.Slf4j; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/utils/EmoteUtils.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/utils/EmoteUtils.java index 8917fb9e7..86866408e 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/utils/EmoteUtils.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/utils/EmoteUtils.java @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.core.utils; -import dev.sheldan.abstracto.core.models.CachedMessage; -import dev.sheldan.abstracto.core.models.CachedReaction; +import dev.sheldan.abstracto.core.models.cache.CachedMessage; +import dev.sheldan.abstracto.core.models.cache.CachedReaction; import dev.sheldan.abstracto.core.models.database.AEmote; import net.dv8tion.jda.api.entities.Emote; import net.dv8tion.jda.api.entities.MessageReaction; 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/loading/TemplateServiceBean.java index 47a599a9a..7223d9511 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/loading/TemplateServiceBean.java @@ -1,14 +1,13 @@ package dev.sheldan.abstracto.templating.loading; import com.google.gson.Gson; -import dev.sheldan.abstracto.core.models.ContextAware; -import dev.sheldan.abstracto.core.models.ServerContext; -import dev.sheldan.abstracto.core.models.embed.MessageToSend; +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 freemarker.template.Configuration; -import freemarker.template.Template; import freemarker.template.TemplateException; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.EmbedBuilder; @@ -18,7 +17,6 @@ import org.springframework.ui.freemarker.FreeMarkerTemplateUtils; import java.awt.*; import java.io.IOException; -import java.io.StringReader; import java.time.Instant; import java.util.HashMap; 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 index 36c3bb39c..34a18da8e 100644 --- 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 @@ -1,7 +1,7 @@ package dev.sheldan.abstracto.templating; -import dev.sheldan.abstracto.core.models.ServerContext; -import dev.sheldan.abstracto.core.models.embed.MessageToSend; +import dev.sheldan.abstracto.core.models.context.ServerContext; +import dev.sheldan.abstracto.core.models.MessageToSend; import java.util.HashMap;