restructured core module

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;

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;

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);

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 {

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;
 

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;
 

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;

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;

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<EmbedField> fields;
-    private EmbedFooter footer;
+    private List<CachedEmbedField> fields;
+    private CachedEmbedFooter footer;
     private OffsetDateTime timeStamp;
 }

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;

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;

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;

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;
 }

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;
 }

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;
 

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;

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;
 

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;
 

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;

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();

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;

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;

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")

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

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedConfiguration.java

@@ -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<EmbedField> fields;
-    private EmbedFooter footer;
-    private OffsetDateTime timeStamp;
-}

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<CachedMessage> putMessageInCache(Message message);

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;
 

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);

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;

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;