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

restructured core module

Browse Source
This commit is contained in:
Sheldan
2020-04-04 18:19:24 +02:00
parent 9b46f8d187
commit 4b3765ee0f
88 changed files with 127 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageDeleteLogListener.java
View File

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

4
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/MessageEditedListener.java
View File

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

2
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/BanServiceBean.java
View File

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

4
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/service/WarnServiceBean.java
View File

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

2
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/BanIdLog.java
View File

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

2
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/BanLog.java
View File

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

2
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/KickLogModel.java
View File

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

2
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/WarnLog.java
View File

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

2
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/listener/MessageDeletedAttachmentLog.java
View File

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

4
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/listener/MessageDeletedLog.java
View File

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

4
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/models/template/listener/MessageEditedLog.java
View File

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

2
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/BanService.java
View File

@@ -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 {

2
abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/StarStats.java
View File

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

6
abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/MessageEmbedListener.java
View File

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

4
abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/StarboardListener.java
View File

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

2
abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/listener/StarboardPostDeletedListener.java
View File

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

2
abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/RemindServiceBean.java
View File

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

6
abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/StarboardServiceBean.java
View File

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

2
abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/SuggestionServiceBean.java
View File

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

2
abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostManagementServiceBean.java
View File

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

1
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/Suggestion.java
View File

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

2
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/ExecutedReminderModel.java
View File

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

2
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/ReminderModel.java
View File

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

2
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/ShowEmoteLog.java
View File

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

2
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/SuggestionLog.java
View File

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

4
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/template/starboard/StarboardPostModel.java
View File

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

2
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/StarboardService.java
View File

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

2
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/service/management/StarboardPostManagementService.java
View File

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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java
View File

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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/Disable.java
View File

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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/Enable.java
View File

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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/AddToChannelGroup.java
View File

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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/CreateChannelGroup.java
View File

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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/PostTarget.java
View File

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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/RemoveFromChannelGroup.java
View File

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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/help/Help.java
View File

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

4
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/Echo.java
View File

@@ -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

6
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/Ping.java
View File

@@ -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 {

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/utility/SetEmote.java
View File

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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/AbstractoFeatures.java → abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/AbstractoFeatures.java
View File

@@ -1,4 +1,4 @@
package dev.sheldan.abstracto.config;
package dev.sheldan.abstracto.core.config;
public class AbstractoFeatures {
public static String CORE = "core";

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/CoreConfig.java → abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/CoreConfig.java
View File

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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/FeatureFlagConfig.java → abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/FeatureFlagConfig.java
View File

@@ -1,4 +1,4 @@
package dev.sheldan.abstracto.config;
package dev.sheldan.abstracto.core.config;
import lombok.Getter;
import lombok.Setter;

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/FeatureFlagListener.java → abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/FeatureFlagListener.java
View File

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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/config/OffsetDateTimeAdapter.java → abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/config/OffsetDateTimeAdapter.java
View File

@@ -1,4 +1,4 @@
package dev.sheldan.abstracto.config;
package dev.sheldan.abstracto.core.config;
import com.google.gson.*;

4
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/ChannelListener.java → abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ChannelListener.java
View File

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

3
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/JoinListenerBean.java → abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/JoinListenerBean.java
View File

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

3
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/LeaveListenerBean.java → abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/LeaveListenerBean.java
View File

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

5
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/MessageDeletedListenerBean.java → abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/MessageDeletedListenerBean.java
View File

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

3
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/MessageReceivedListenerBean.java → abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/MessageReceivedListenerBean.java
View File

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

5
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/MessageUpdatedListener.java → abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/MessageUpdatedListener.java
View File

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

8
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/ReactionUpdatedListener.java → abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ReactionUpdatedListener.java
View File

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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/ReadyListener.java → abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/listener/ReadyListener.java
View File

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

20
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MessageCacheBean.java
View File

@@ -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<MessageEmbed.Field> fields = embed.getFields();
if(!fields.isEmpty()) {
List<EmbedField> embedFields = new ArrayList<>();
List<CachedEmbedField> 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())

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java
View File

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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/StartupManager.java
View File

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

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/ChannelManagementServiceBean.java
View File

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

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/CommandContext.java
View File

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

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/execution/ContextConverter.java
View File

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

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/MessageDeletedListener.java
View File

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

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/MessageTextUpdatedListener.java
View File

@@ -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 {

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/ReactedAddedListener.java
View File

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

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/ReactedRemovedListener.java
View File

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

6
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/listener/MessageEmbeddedModel.java → abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/listener/models/MessageEmbeddedModel.java
View File

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

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/MessageToSend.java → abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/MessageToSend.java
View File

@@ -1,4 +1,4 @@
package dev.sheldan.abstracto.core.models.embed;
package dev.sheldan.abstracto.core.models;
import lombok.Builder;
import lombok.Getter;

12
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/CachedEmbed.java → abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbed.java vendored
View File

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

4
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedAuthor.java → abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedAuthor.java vendored
View File

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

4
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedColor.java → abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedColor.java vendored
View File

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

4
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedField.java → abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedField.java vendored
View File

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

4
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedFooter.java → abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedFooter.java vendored
View File

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

4
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/embed/EmbedTitle.java → abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedEmbedTitle.java vendored
View File

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

4
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/CachedMessage.java → abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedMessage.java vendored
View File

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

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/CachedReaction.java → abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/cache/CachedReaction.java vendored
View File

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

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/EchoModel.java
View File

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

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/PingModel.java
View File

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

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/command/PostTargetErrorModel.java
View File

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

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/ContextAware.java → abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/ContextAware.java
View File

@@ -1,4 +1,4 @@
package dev.sheldan.abstracto.core.models;
package dev.sheldan.abstracto.core.models.context;
public interface ContextAware {
String getTemplateSuffix();

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/ServerContext.java → abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/ServerContext.java
View File

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

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/UserInitiatedServerContext.java → abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/context/UserInitiatedServerContext.java
View File

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

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannel.java
View File

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

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/AChannelType.java → abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannelType.java
View File

@@ -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

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

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

5
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/MessageCache.java
View File

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

4
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/PostTargetService.java
View File

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

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/management/ChannelManagementService.java
View File

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

4
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/utils/ContextUtils.java
View File

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

4
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/utils/EmoteUtils.java
View File

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

8
abstracto-application/templating/templating-impl/src/main/java/dev/sheldan/abstracto/templating/loading/TemplateServiceBean.java
View File

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

4
abstracto-application/templating/templating-interface/src/main/java/dev/sheldan/abstracto/templating/TemplateService.java
View File

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