added command to add/remove channels from channel groups

added storing the commands with their modules in the db
renamed command impl module

abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/service/WarnService.java

@@ -1,6 +1,5 @@
 package dev.sheldan.abstracto.moderation.service;
 
-import dev.sheldan.abstracto.core.models.ServerContext;
 import dev.sheldan.abstracto.moderation.models.template.WarnLog;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import net.dv8tion.jda.api.entities.Member;

abstracto-application/command/command-impl/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>command-support</artifactId>
+    <artifactId>command-impl</artifactId>
 
     <dependencies>
         <dependency>

abstracto-application/command/command-impl/src/main/java/dev/sheldan/abstracto/commands/CommandManager.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.commands.management;
+package dev.sheldan.abstracto.commands;
 
 import dev.sheldan.abstracto.command.Command;
 import dev.sheldan.abstracto.command.Module;
@@ -6,8 +6,8 @@ import dev.sheldan.abstracto.command.execution.CommandConfiguration;
 import dev.sheldan.abstracto.command.execution.Parameter;
 import dev.sheldan.abstracto.command.meta.CommandRegistry;
 import dev.sheldan.abstracto.command.meta.UnParsedCommandParameter;
-import dev.sheldan.abstracto.commands.management.exception.CommandNotFound;
-import dev.sheldan.abstracto.commands.management.exception.InsufficientParameters;
+import dev.sheldan.abstracto.commands.exception.CommandNotFound;
+import dev.sheldan.abstracto.commands.exception.InsufficientParameters;
 import net.dv8tion.jda.api.entities.Message;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,7 +26,7 @@ public class CommandManager implements CommandRegistry {
     public Command findCommandByParameters(String name, UnParsedCommandParameter unParsedCommandParameter) {
         Optional<Command> commandOptional = commands.stream().filter((Command o )-> {
             CommandConfiguration commandConfiguration = o.getConfiguration();
-            if(!commandConfiguration.getName().equals(name)) {
+            if(!commandConfiguration.getName().equalsIgnoreCase(name)) {
                 return false;
             }
             boolean parameterFit;

abstracto-application/command/command-impl/src/main/java/dev/sheldan/abstracto/commands/CommandReceivedHandler.java

@@ -1,13 +1,13 @@
-package dev.sheldan.abstracto.commands.management;
+package dev.sheldan.abstracto.commands;
 
 import dev.sheldan.abstracto.command.Command;
 import dev.sheldan.abstracto.command.CommandCondition;
 import dev.sheldan.abstracto.command.ConditionalCommand;
-import dev.sheldan.abstracto.command.PostCommandExecution;
+import dev.sheldan.abstracto.command.service.PostCommandExecution;
 import dev.sheldan.abstracto.command.execution.*;
 import dev.sheldan.abstracto.command.meta.UnParsedCommandParameter;
-import dev.sheldan.abstracto.commands.management.exception.IncorrectParameter;
-import dev.sheldan.abstracto.commands.management.exception.ParameterTooLong;
+import dev.sheldan.abstracto.commands.exception.IncorrectParameter;
+import dev.sheldan.abstracto.commands.exception.ParameterTooLong;
 import dev.sheldan.abstracto.core.Constants;
 import dev.sheldan.abstracto.core.exception.*;
 import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
@@ -26,8 +26,10 @@ import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Nonnull;
@@ -54,9 +56,13 @@ public class CommandReceivedHandler extends ListenerAdapter {
     @Autowired
     private ChannelManagementService channelManagementService;
 
+    @Autowired
+    @Lazy
+    private CommandReceivedHandler self;
+
     @Override
-    @Transactional
     @Async
+    @Transactional
     public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
         if(!commandManager.isCommand(event.getMessage())) {
             return;
@@ -85,9 +91,8 @@ public class CommandReceivedHandler extends ListenerAdapter {
                 if (!shouldExecute(commandContext, foundCommand, castedCommand.getConditions())) {
                     throw new FeatureDisabledException(String.format("Feature `%s` has been disabled. Command is not usable", foundCommand.getFeature()));
                 }
-
             }
-            CommandResult commandResult = foundCommand.execute(commandContext);
+            CommandResult commandResult = self.executeCommand(foundCommand, commandContext);
             for (PostCommandExecution postCommandExecution : executions) {
                 postCommandExecution.execute(commandContext, commandResult, foundCommand);
             }
@@ -100,6 +105,11 @@ public class CommandReceivedHandler extends ListenerAdapter {
         }
     }
 
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public CommandResult executeCommand(Command foundCommand, CommandContext commandContext) {
+        return foundCommand.execute(commandContext);
+    }
+
     public boolean shouldExecute(CommandContext commandContext, Command command, List<CommandCondition> conditions) {
         AtomicBoolean shouldExecute = new AtomicBoolean(true);
         if(conditions != null) {

abstracto-application/command/command-impl/src/main/java/dev/sheldan/abstracto/commands/ModuleManager.java

@@ -1,8 +1,9 @@
-package dev.sheldan.abstracto.commands.management;
+package dev.sheldan.abstracto.commands;
 
 import dev.sheldan.abstracto.command.*;
 import dev.sheldan.abstracto.command.Module;
 import dev.sheldan.abstracto.command.meta.CommandRegistry;
+import dev.sheldan.abstracto.command.service.ModuleRegistry;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

abstracto-application/command/command-impl/src/main/java/dev/sheldan/abstracto/commands/config/CommandConfig.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.commands.management.config;
+package dev.sheldan.abstracto.commands.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;

abstracto-application/command/command-impl/src/main/java/dev/sheldan/abstracto/commands/config/CommandConfigListener.java

@@ -0,0 +1,29 @@
+package dev.sheldan.abstracto.commands.config;
+
+import dev.sheldan.abstracto.command.Command;
+import dev.sheldan.abstracto.command.service.CommandService;
+import dev.sheldan.abstracto.core.listener.ServerConfigListener;
+import dev.sheldan.abstracto.core.models.database.AServer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class CommandConfigListener implements ServerConfigListener {
+
+    @Autowired
+    private List<Command> commandList;
+
+    @Autowired
+    private CommandService commandService;
+
+    @Override
+    public void updateServerConfig(AServer server) {
+        commandList.forEach(command -> {
+            if(!commandService.doesCommandExist(command.getConfiguration().getName())) {
+                commandService.createCommand(command.getConfiguration().getName(), command.getConfiguration().getModule());
+            }
+        });
+    }
+}

abstracto-application/command/command-impl/src/main/java/dev/sheldan/abstracto/commands/exception/CommandNotFound.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.commands.management.exception;
+package dev.sheldan.abstracto.commands.exception;
 
 import dev.sheldan.abstracto.command.Templatable;
 import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;

abstracto-application/command/command-impl/src/main/java/dev/sheldan/abstracto/commands/exception/IncorrectParameter.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.commands.management.exception;
+package dev.sheldan.abstracto.commands.exception;
 
 import dev.sheldan.abstracto.command.Command;
 import dev.sheldan.abstracto.command.Templatable;

abstracto-application/command/command-impl/src/main/java/dev/sheldan/abstracto/commands/exception/InsufficientParameters.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.commands.management.exception;
+package dev.sheldan.abstracto.commands.exception;
 
 import dev.sheldan.abstracto.command.Templatable;
 import dev.sheldan.abstracto.command.Command;

abstracto-application/command/command-impl/src/main/java/dev/sheldan/abstracto/commands/exception/ParameterTooLong.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.commands.management.exception;
+package dev.sheldan.abstracto.commands.exception;
 
 import dev.sheldan.abstracto.command.Command;
 import dev.sheldan.abstracto.command.Templatable;

abstracto-application/command/command-impl/src/main/java/dev/sheldan/abstracto/commands/post/ExceptionPostExecution.java

@@ -1,7 +1,7 @@
-package dev.sheldan.abstracto.commands.management.post;
+package dev.sheldan.abstracto.commands.post;
 
 import dev.sheldan.abstracto.command.Command;
-import dev.sheldan.abstracto.command.PostCommandExecution;
+import dev.sheldan.abstracto.command.service.PostCommandExecution;
 import dev.sheldan.abstracto.command.Templatable;
 import dev.sheldan.abstracto.command.execution.CommandContext;
 import dev.sheldan.abstracto.command.execution.CommandResult;

abstracto-application/command/command-impl/src/main/java/dev/sheldan/abstracto/commands/post/ReactionPostExecution.java

@@ -1,7 +1,7 @@
-package dev.sheldan.abstracto.commands.management.post;
+package dev.sheldan.abstracto.commands.post;
 
 import dev.sheldan.abstracto.command.Command;
-import dev.sheldan.abstracto.command.PostCommandExecution;
+import dev.sheldan.abstracto.command.service.PostCommandExecution;
 import dev.sheldan.abstracto.command.execution.CommandContext;
 import dev.sheldan.abstracto.command.execution.CommandResult;
 import dev.sheldan.abstracto.command.execution.ResultState;

abstracto-application/command/command-impl/src/main/java/dev/sheldan/abstracto/commands/repository/CommandRepository.java

@@ -0,0 +1,8 @@
+package dev.sheldan.abstracto.commands.repository;
+
+import dev.sheldan.abstracto.command.models.ACommand;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface CommandRepository extends JpaRepository<ACommand, Long> {
+    ACommand findByName(String name);
+}

abstracto-application/command/command-impl/src/main/java/dev/sheldan/abstracto/commands/repository/ModuleRepository.java

@@ -0,0 +1,8 @@
+package dev.sheldan.abstracto.commands.repository;
+
+import dev.sheldan.abstracto.command.models.AModule;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ModuleRepository extends JpaRepository<AModule, Long> {
+    AModule findByName(String name);
+}

abstracto-application/command/command-impl/src/main/java/dev/sheldan/abstracto/commands/service/CommandServiceBean.java

@@ -0,0 +1,32 @@
+package dev.sheldan.abstracto.commands.service;
+
+import dev.sheldan.abstracto.command.models.ACommand;
+import dev.sheldan.abstracto.command.models.AModule;
+import dev.sheldan.abstracto.command.service.CommandService;
+import dev.sheldan.abstracto.command.service.management.CommandManagementService;
+import dev.sheldan.abstracto.command.service.management.ModuleManagementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CommandServiceBean implements CommandService {
+
+    @Autowired
+    private ModuleManagementService moduleManagementService;
+
+    @Autowired
+    private CommandManagementService commandManagementService;
+
+    @Override
+    public ACommand createCommand(String name, String moduleName) {
+        AModule module = moduleManagementService.getOrCreate(moduleName);
+        return commandManagementService.createCommand(name, module);
+    }
+
+    @Override
+    public Boolean doesCommandExist(String name) {
+        return commandManagementService.doesCommandExist(name);
+    }
+
+
+}

abstracto-application/command/command-impl/src/main/java/dev/sheldan/abstracto/commands/service/management/CommandManagementServiceBean.java

@@ -0,0 +1,51 @@
+package dev.sheldan.abstracto.commands.service.management;
+
+import dev.sheldan.abstracto.command.models.ACommand;
+import dev.sheldan.abstracto.command.models.AModule;
+import dev.sheldan.abstracto.command.service.management.CommandManagementService;
+import dev.sheldan.abstracto.command.service.management.ModuleManagementService;
+import dev.sheldan.abstracto.commands.repository.CommandRepository;
+import dev.sheldan.abstracto.core.service.management.ServerManagementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CommandManagementServiceBean implements CommandManagementService {
+
+    @Autowired
+    private ServerManagementService serverManagementService;
+
+    @Autowired
+    private ModuleManagementService moduleManagementService;
+
+    @Autowired
+    private CommandRepository commandRepository;
+
+    @Override
+    public ACommand createCommand(String name, String moduleName) {
+        AModule module = moduleManagementService.findModuleByName(moduleName);
+        return createCommand(name, module);
+    }
+
+    @Override
+    public ACommand createCommand(String name, AModule module) {
+        ACommand command = ACommand
+                .builder()
+                .name(name)
+                .module(module)
+                .build();
+        commandRepository.save(command);
+        return command;
+    }
+
+    @Override
+    public ACommand findCommandByName(String name) {
+        return commandRepository.findByName(name);
+    }
+
+    @Override
+    public Boolean doesCommandExist(String name) {
+        return findCommandByName(name) != null;
+    }
+
+}

abstracto-application/command/command-impl/src/main/java/dev/sheldan/abstracto/commands/service/management/ModuleManagementServiceBean.java

@@ -0,0 +1,43 @@
+package dev.sheldan.abstracto.commands.service.management;
+
+import dev.sheldan.abstracto.command.models.AModule;
+import dev.sheldan.abstracto.command.service.management.ModuleManagementService;
+import dev.sheldan.abstracto.commands.repository.ModuleRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ModuleManagementServiceBean implements ModuleManagementService {
+
+    @Autowired
+    private ModuleRepository moduleRepository;
+
+    @Override
+    public AModule createModule(String name) {
+        AModule module = AModule.
+                builder()
+                .name(name)
+                .build();
+        moduleRepository.save(module);
+        return module;
+    }
+
+    @Override
+    public AModule getOrCreate(String name) {
+        AModule module = findModuleByName(name);
+        if(module == null) {
+            return createModule(name);
+        }
+        return module;
+    }
+
+    @Override
+    public AModule findModuleByName(String name) {
+        return moduleRepository.findByName(name);
+    }
+
+    @Override
+    public Boolean doesModuleExist(String name) {
+        return findModuleByName(name) != null;
+    }
+}

abstracto-application/command/command-int/src/main/java/dev/sheldan/abstracto/command/ModuleRegistry.java

@@ -1,9 +0,0 @@
-package dev.sheldan.abstracto.command;
-
-
-import java.util.List;
-
-public interface ModuleRegistry {
-    CommandHierarchy getDetailedModules();
-    List<Module> getModules();
-}

abstracto-application/command/command-int/src/main/java/dev/sheldan/abstracto/command/models/ACommand.java

@@ -0,0 +1,27 @@
+package dev.sheldan.abstracto.command.models;
+
+import lombok.*;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "command")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+public class ACommand {
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String name;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @Getter
+    @Setter
+    @JoinColumn(name = "module_id")
+    private AModule module;
+
+}

abstracto-application/command/command-int/src/main/java/dev/sheldan/abstracto/command/models/AModule.java

@@ -0,0 +1,34 @@
+package dev.sheldan.abstracto.command.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "module")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+public class AModule {
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String name;
+
+    @OneToMany(
+            fetch = FetchType.LAZY,
+            cascade = CascadeType.ALL,
+            orphanRemoval = true)
+    @Builder.Default
+    @JoinColumn(name = "module_id")
+    private List<ACommand> commands = new ArrayList<>();
+}

abstracto-application/command/command-int/src/main/java/dev/sheldan/abstracto/command/service/CommandService.java

@@ -0,0 +1,8 @@
+package dev.sheldan.abstracto.command.service;
+
+import dev.sheldan.abstracto.command.models.ACommand;
+
+public interface CommandService {
+    ACommand createCommand(String name, String moduleName);
+    Boolean doesCommandExist(String name);
+}

abstracto-application/command/command-int/src/main/java/dev/sheldan/abstracto/command/service/ModuleRegistry.java

@@ -0,0 +1,12 @@
+package dev.sheldan.abstracto.command.service;
+
+
+import dev.sheldan.abstracto.command.CommandHierarchy;
+import dev.sheldan.abstracto.command.Module;
+
+import java.util.List;
+
+public interface ModuleRegistry {
+    CommandHierarchy getDetailedModules();
+    List<Module> getModules();
+}

abstracto-application/command/command-int/src/main/java/dev/sheldan/abstracto/command/service/PostCommandExecution.java

@@ -1,5 +1,6 @@
-package dev.sheldan.abstracto.command;
+package dev.sheldan.abstracto.command.service;
 
+import dev.sheldan.abstracto.command.Command;
 import dev.sheldan.abstracto.command.execution.CommandContext;
 import dev.sheldan.abstracto.command.execution.CommandResult;
 

abstracto-application/command/command-int/src/main/java/dev/sheldan/abstracto/command/service/management/CommandManagementService.java

@@ -0,0 +1,11 @@
+package dev.sheldan.abstracto.command.service.management;
+
+import dev.sheldan.abstracto.command.models.ACommand;
+import dev.sheldan.abstracto.command.models.AModule;
+
+public interface CommandManagementService {
+    ACommand createCommand(String name, String moduleName);
+    ACommand createCommand(String name, AModule moduleName);
+    ACommand findCommandByName(String name);
+    Boolean doesCommandExist(String name);
+}

abstracto-application/command/command-int/src/main/java/dev/sheldan/abstracto/command/service/management/ModuleManagementService.java

@@ -0,0 +1,10 @@
+package dev.sheldan.abstracto.command.service.management;
+
+import dev.sheldan.abstracto.command.models.AModule;
+
+public interface ModuleManagementService {
+    AModule createModule(String name);
+    AModule getOrCreate(String name);
+    AModule findModuleByName(String name);
+    Boolean doesModuleExist(String name);
+}

abstracto-application/command/pom.xml

@@ -14,7 +14,7 @@
     <packaging>pom</packaging>
     <modules>
         <module>command-int</module>
-        <module>command-support</module>
+        <module>command-impl</module>
     </modules>
 
 

abstracto-application/core/core-impl/pom.xml

@@ -78,7 +78,7 @@
 
         <dependency>
             <groupId>dev.sheldan.abstracto.command</groupId>
-            <artifactId>command-support</artifactId>
+            <artifactId>command-int</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

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

@@ -0,0 +1,50 @@
+package dev.sheldan.abstracto.core.commands.channels;
+
+import dev.sheldan.abstracto.command.Command;
+import dev.sheldan.abstracto.command.execution.CommandConfiguration;
+import dev.sheldan.abstracto.command.execution.CommandContext;
+import dev.sheldan.abstracto.command.execution.CommandResult;
+import dev.sheldan.abstracto.command.execution.Parameter;
+import dev.sheldan.abstracto.config.AbstractoFeatures;
+import dev.sheldan.abstracto.core.service.ChannelGroupService;
+import net.dv8tion.jda.api.entities.TextChannel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Component
+public class AddToChannelGroup implements Command {
+
+
+    @Autowired
+    private ChannelGroupService channelGroupService;
+
+    @Override
+    public CommandResult execute(CommandContext commandContext) {
+        String name = (String) commandContext.getParameters().getParameters().get(0);
+        TextChannel channel = (TextChannel) commandContext.getParameters().getParameters().get(1);
+        channelGroupService.addChannelToChannelGroup(name, channel);
+        return CommandResult.fromSuccess();
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        Parameter channelGroupName = Parameter.builder().name("name").type(String.class).description("The name of the channel group to add the channel to.").build();
+        Parameter channelToAdd = Parameter.builder().name("channel").type(TextChannel.class).description("The mention of the channel to add to the group.").build();
+        List<Parameter> parameters = Arrays.asList(channelGroupName, channelToAdd);
+        return CommandConfiguration.builder()
+                .name("addToChannelGroup")
+                .module("channels")
+                .parameters(parameters)
+                .description("Adds the mentioned channel to the channel group.")
+                .causesReaction(true)
+                .build();
+    }
+
+    @Override
+    public String getFeature() {
+        return AbstractoFeatures.CORE;
+    }
+}

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

@@ -0,0 +1,46 @@
+package dev.sheldan.abstracto.core.commands.channels;
+
+import dev.sheldan.abstracto.command.Command;
+import dev.sheldan.abstracto.command.execution.CommandConfiguration;
+import dev.sheldan.abstracto.command.execution.CommandContext;
+import dev.sheldan.abstracto.command.execution.CommandResult;
+import dev.sheldan.abstracto.command.execution.Parameter;
+import dev.sheldan.abstracto.config.AbstractoFeatures;
+import dev.sheldan.abstracto.core.service.ChannelGroupService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Component
+public class CreateChannelGroup implements Command {
+
+    @Autowired
+    private ChannelGroupService channelGroupService;
+
+    @Override
+    public CommandResult execute(CommandContext commandContext) {
+        String groupName = (String) commandContext.getParameters().getParameters().get(0);
+        channelGroupService.createChannelGroup(groupName);
+        return CommandResult.fromSuccess();
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        Parameter channelGroupName = Parameter.builder().name("name").type(String.class).description("The name of the channel group to create.").build();
+        List<Parameter> parameters = Arrays.asList(channelGroupName);
+        return CommandConfiguration.builder()
+                .name("createChannelGroup")
+                .module("channels")
+                .parameters(parameters)
+                .description("Creates a channel group to which channels can be added to.")
+                .causesReaction(true)
+                .build();
+    }
+
+    @Override
+    public String getFeature() {
+        return AbstractoFeatures.CORE;
+    }
+}

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

@@ -0,0 +1,50 @@
+package dev.sheldan.abstracto.core.commands.channels;
+
+import dev.sheldan.abstracto.command.Command;
+import dev.sheldan.abstracto.command.execution.CommandConfiguration;
+import dev.sheldan.abstracto.command.execution.CommandContext;
+import dev.sheldan.abstracto.command.execution.CommandResult;
+import dev.sheldan.abstracto.command.execution.Parameter;
+import dev.sheldan.abstracto.config.AbstractoFeatures;
+import dev.sheldan.abstracto.core.service.ChannelGroupService;
+import net.dv8tion.jda.api.entities.TextChannel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Component
+public class RemoveFromChannelGroup implements Command {
+
+
+    @Autowired
+    private ChannelGroupService channelGroupService;
+
+    @Override
+    public CommandResult execute(CommandContext commandContext) {
+        String name = (String) commandContext.getParameters().getParameters().get(0);
+        TextChannel channel = (TextChannel) commandContext.getParameters().getParameters().get(1);
+        channelGroupService.removeChannelFromChannelGroup(name, channel);
+        return CommandResult.fromSuccess();
+    }
+
+    @Override
+    public CommandConfiguration getConfiguration() {
+        Parameter channelGroupName = Parameter.builder().name("name").type(String.class).description("The name of the channel group to remove the channel from.").build();
+        Parameter channelToAdd = Parameter.builder().name("channel").type(TextChannel.class).description("The mention of the channel to remove from the group.").build();
+        List<Parameter> parameters = Arrays.asList(channelGroupName, channelToAdd);
+        return CommandConfiguration.builder()
+                .name("removeFromChannelGroup")
+                .module("channels")
+                .parameters(parameters)
+                .description("Removes the mentioned channel from the channel group.")
+                .causesReaction(true)
+                .build();
+    }
+
+    @Override
+    public String getFeature() {
+        return AbstractoFeatures.CORE;
+    }
+}

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

@@ -3,6 +3,7 @@ package dev.sheldan.abstracto.core.commands.help;
 import dev.sheldan.abstracto.command.*;
 import dev.sheldan.abstracto.command.execution.*;
 import dev.sheldan.abstracto.command.module.ModuleInfo;
+import dev.sheldan.abstracto.command.service.ModuleRegistry;
 import dev.sheldan.abstracto.config.AbstractoFeatures;
 import dev.sheldan.abstracto.templating.TemplateService;
 import org.apache.commons.lang3.StringUtils;
@@ -10,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;
-import java.util.List;
 
 
 @Service

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/repository/ChannelGroupRepository.java

@@ -0,0 +1,8 @@
+package dev.sheldan.abstracto.core.repository;
+
+import dev.sheldan.abstracto.core.models.database.AChannelGroup;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ChannelGroupRepository extends JpaRepository<AChannelGroup, Long> {
+    AChannelGroup findByGroupName(String name);
+}

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/repository/ChannelRepository.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.repository;
+package dev.sheldan.abstracto.core.repository;
 
 import dev.sheldan.abstracto.core.models.database.AChannel;
 import org.springframework.data.jpa.repository.JpaRepository;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/repository/ConfigRepository.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.repository;
+package dev.sheldan.abstracto.core.repository;
 
 import dev.sheldan.abstracto.core.models.database.AConfig;
 import org.springframework.data.jpa.repository.JpaRepository;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/repository/EmoteRepository.java

@@ -1,8 +1,7 @@
-package dev.sheldan.abstracto.repository;
+package dev.sheldan.abstracto.core.repository;
 
 import dev.sheldan.abstracto.core.models.database.AEmote;
 import dev.sheldan.abstracto.core.models.database.AServer;
-import dev.sheldan.abstracto.core.models.database.AUser;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/repository/FeatureFlagRepository.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.repository;
+package dev.sheldan.abstracto.core.repository;
 
 import dev.sheldan.abstracto.core.models.database.AFeatureFlag;
 import dev.sheldan.abstracto.core.models.database.AServer;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/repository/PostTargetRepository.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.repository;
+package dev.sheldan.abstracto.core.repository;
 
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.PostTarget;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/repository/RoleRepository.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.repository;
+package dev.sheldan.abstracto.core.repository;
 
 import dev.sheldan.abstracto.core.models.database.ARole;
 import org.springframework.data.jpa.repository.JpaRepository;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/repository/ServerRepository.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.repository;
+package dev.sheldan.abstracto.core.repository;
 
 import dev.sheldan.abstracto.core.models.database.AServer;
 import org.springframework.data.jpa.repository.JpaRepository;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/repository/UserInServerRepository.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.repository;
+package dev.sheldan.abstracto.core.repository;
 
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUser;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/repository/UserRepository.java

@@ -1,4 +1,4 @@
-package dev.sheldan.abstracto.repository;
+package dev.sheldan.abstracto.core.repository;
 
 import dev.sheldan.abstracto.core.models.database.AUser;
 import org.springframework.data.jpa.repository.JpaRepository;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ChannelGroupServiceBean.java

@@ -0,0 +1,58 @@
+package dev.sheldan.abstracto.core.service;
+
+import dev.sheldan.abstracto.core.models.database.AChannel;
+import dev.sheldan.abstracto.core.models.database.AChannelGroup;
+import dev.sheldan.abstracto.core.service.management.ChannelGroupManagementService;
+import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
+import net.dv8tion.jda.api.entities.TextChannel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ChannelGroupServiceBean implements ChannelGroupService {
+
+    @Autowired
+    private ChannelGroupManagementService channelGroupManagementService;
+
+    @Autowired
+    private ChannelManagementService channelManagementService;
+
+    @Override
+    public AChannelGroup createChannelGroup(String name) {
+        return channelGroupManagementService.createChannelGroup(name);
+    }
+
+    @Override
+    public void addChannelToChannelGroup(String channelGroupName, TextChannel textChannel) {
+        addChannelToChannelGroup(channelGroupName, textChannel.getIdLong());
+    }
+
+    @Override
+    public void addChannelToChannelGroup(String channelGroupName, Long channelId) {
+        AChannel aChannel = channelManagementService.loadChannel(channelId);
+        addChannelToChannelGroup(channelGroupName, aChannel);
+    }
+
+    @Override
+    public void addChannelToChannelGroup(String channelGroupName, AChannel channel) {
+        AChannelGroup channelGroup = channelGroupManagementService.findByName(channelGroupName);
+        channelGroupManagementService.addChannelToChannelGroup(channelGroup, channel);
+    }
+
+    @Override
+    public void removeChannelFromChannelGroup(String channelGroupName, TextChannel textChannel) {
+        removeChannelFromChannelGroup(channelGroupName, textChannel.getIdLong());
+    }
+
+    @Override
+    public void removeChannelFromChannelGroup(String channelGroupName, Long channelId) {
+        AChannel aChannel = channelManagementService.loadChannel(channelId);
+        removeChannelFromChannelGroup(channelGroupName, aChannel);
+    }
+
+    @Override
+    public void removeChannelFromChannelGroup(String channelGroupName, AChannel channel) {
+        AChannelGroup channelGroup = channelGroupManagementService.findByName(channelGroupName);
+        channelGroupManagementService.removeChannelFromChannelGroup(channelGroup, channel);
+    }
+}

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/ChannelGroupManagementServiceBean.java

@@ -0,0 +1,55 @@
+package dev.sheldan.abstracto.core.service.management;
+
+import dev.sheldan.abstracto.core.exception.ChannelException;
+import dev.sheldan.abstracto.core.models.database.AChannel;
+import dev.sheldan.abstracto.core.models.database.AChannelGroup;
+import dev.sheldan.abstracto.core.repository.ChannelGroupRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.function.Predicate;
+
+@Component
+public class ChannelGroupManagementServiceBean implements ChannelGroupManagementService {
+
+    @Autowired
+    private ChannelGroupRepository channelGroupRepository;
+
+    @Override
+    public AChannelGroup createChannelGroup(String name) {
+        AChannelGroup channelGroup = AChannelGroup
+                .builder()
+                .groupName(name)
+                .build();
+        channelGroupRepository.save(channelGroup);
+        return channelGroup;
+    }
+
+    @Override
+    public AChannelGroup addChannelToChannelGroup(AChannelGroup channelGroup, AChannel channel) {
+        Predicate<AChannel> channelInGroupPredicate = channel1 -> channel1.getId().equals(channel.getId());
+        if(channelGroup.getChannels().stream().anyMatch(channelInGroupPredicate)) {
+            throw new ChannelException(String.format("Channel %s is already part of group %s.", channel.getId(), channelGroup.getGroupName()));
+        }
+        channelGroup.getChannels().add(channel);
+        channel.getGroups().add(channelGroup);
+        channelGroupRepository.save(channelGroup);
+        return channelGroup;
+    }
+
+    @Override
+    public void removeChannelFromChannelGroup(AChannelGroup channelGroup, AChannel channel) {
+        Predicate<AChannel> channelInGroupPredicate = channel1 -> channel1.getId().equals(channel.getId());
+        if(channelGroup.getChannels().stream().noneMatch(channelInGroupPredicate)) {
+            throw new ChannelException(String.format("Channel %s is not part of group %s.", channel.getId(), channelGroup.getGroupName()));
+        }
+        channelGroup.getChannels().removeIf(channelInGroupPredicate);
+        channel.getGroups().removeIf(channelGroup1 -> channelGroup1.getId().equals(channelGroup.getId()));
+        channelGroupRepository.save(channelGroup);
+    }
+
+    @Override
+    public AChannelGroup findByName(String name) {
+        return channelGroupRepository.findByGroupName(name);
+    }
+}

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

@@ -2,7 +2,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.repository.ChannelRepository;
+import dev.sheldan.abstracto.core.repository.ChannelRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/ConfigManagementServiceBean.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.core.service.management;
 
 import dev.sheldan.abstracto.core.models.database.AConfig;
 import dev.sheldan.abstracto.core.models.database.AServer;
-import dev.sheldan.abstracto.repository.ConfigRepository;
+import dev.sheldan.abstracto.core.repository.ConfigRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/EmoteManagementServiceBean.java

@@ -5,7 +5,7 @@ import dev.sheldan.abstracto.core.exception.EmoteException;
 import dev.sheldan.abstracto.core.models.database.AEmote;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.service.Bot;
-import dev.sheldan.abstracto.repository.EmoteRepository;
+import dev.sheldan.abstracto.core.repository.EmoteRepository;
 import net.dv8tion.jda.api.entities.Emote;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/FeatureFlagManagementServiceBean.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.core.service.management;
 
 import dev.sheldan.abstracto.core.models.database.AFeatureFlag;
 import dev.sheldan.abstracto.core.models.database.AServer;
-import dev.sheldan.abstracto.repository.FeatureFlagRepository;
+import dev.sheldan.abstracto.core.repository.FeatureFlagRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/PostTargetManagementBean.java

@@ -1,13 +1,12 @@
 package dev.sheldan.abstracto.core.service.management;
 
 import dev.sheldan.abstracto.core.DynamicKeyLoader;
-import dev.sheldan.abstracto.core.exception.ConfigurationException;
 import dev.sheldan.abstracto.core.exception.PostTargetException;
 import dev.sheldan.abstracto.core.models.database.AChannel;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.PostTarget;
 import dev.sheldan.abstracto.core.service.PostTargetService;
-import dev.sheldan.abstracto.repository.PostTargetRepository;
+import dev.sheldan.abstracto.core.repository.PostTargetRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/RoleManagementServiceBean.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.core.service.management;
 
 import dev.sheldan.abstracto.core.models.database.ARole;
-import dev.sheldan.abstracto.repository.RoleRepository;
+import dev.sheldan.abstracto.core.repository.RoleRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/ServerManagementServiceBean.java

@@ -1,7 +1,7 @@
 package dev.sheldan.abstracto.core.service.management;
 
 import dev.sheldan.abstracto.core.models.database.*;
-import dev.sheldan.abstracto.repository.ServerRepository;
+import dev.sheldan.abstracto.core.repository.ServerRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/UserManagementServiceBean.java

@@ -3,8 +3,8 @@ package dev.sheldan.abstracto.core.service.management;
 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.repository.UserInServerRepository;
-import dev.sheldan.abstracto.repository.UserRepository;
+import dev.sheldan.abstracto.core.repository.UserInServerRepository;
+import dev.sheldan.abstracto.core.repository.UserRepository;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Member;
 import org.springframework.beans.factory.annotation.Autowired;

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/listener/ChannelListener.java

@@ -5,7 +5,7 @@ import dev.sheldan.abstracto.core.service.management.ServerManagementService;
 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.repository.ServerRepository;
+import dev.sheldan.abstracto.core.repository.ServerRepository;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.events.channel.text.TextChannelCreateEvent;

abstracto-application/core/core-impl/src/main/resources/config/application.properties

@@ -17,4 +17,6 @@ spring.cache.caffeine.spec=maximumSize=500,expireAfterAccess=600s
 
 abstracto.startup.synchronize=true
 
-abstracto.parameter.lowerBound=50
+abstracto.parameter.lowerBound=50
+
+abstracto.features.core=true

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

@@ -6,6 +6,7 @@ import lombok.*;
 import net.dv8tion.jda.api.entities.ChannelType;
 
 import javax.persistence.*;
+import java.util.List;
 import java.util.Set;
 
 @Entity
@@ -22,7 +23,7 @@ public class AChannel implements SnowFlake {
 
     @Getter
     @ManyToMany(mappedBy = "channels")
-    private Set<AChannelGroup> groups;
+    private List<AChannelGroup> groups;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @Getter

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannelGroup.java

@@ -3,6 +3,7 @@ package dev.sheldan.abstracto.core.models.database;
 import lombok.*;
 
 import javax.persistence.*;
+import java.util.List;
 import java.util.Set;
 
 @Entity
@@ -26,7 +27,7 @@ public class AChannelGroup {
             name = "channel_in_group",
             joinColumns = @JoinColumn(name = "group_id"),
             inverseJoinColumns = @JoinColumn(name = "channel_id"))
-    private Set<AChannel> channels;
+    private List<AChannel> channels;
 
 
 }

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/ChannelGroupService.java

@@ -0,0 +1,15 @@
+package dev.sheldan.abstracto.core.service;
+
+import dev.sheldan.abstracto.core.models.database.AChannel;
+import dev.sheldan.abstracto.core.models.database.AChannelGroup;
+import net.dv8tion.jda.api.entities.TextChannel;
+
+public interface ChannelGroupService {
+    AChannelGroup createChannelGroup(String name);
+    void addChannelToChannelGroup(String channelGroupName, TextChannel textChannel);
+    void addChannelToChannelGroup(String channelGroupName, Long channelId);
+    void addChannelToChannelGroup(String channelGroupName, AChannel channel);
+    void removeChannelFromChannelGroup(String channelGroupName, TextChannel textChannel);
+    void removeChannelFromChannelGroup(String channelGroupName, Long channelId);
+    void removeChannelFromChannelGroup(String channelGroupName, AChannel channel);
+}

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/service/management/ChannelGroupManagementService.java

@@ -0,0 +1,11 @@
+package dev.sheldan.abstracto.core.service.management;
+
+import dev.sheldan.abstracto.core.models.database.AChannel;
+import dev.sheldan.abstracto.core.models.database.AChannelGroup;
+
+public interface ChannelGroupManagementService {
+    AChannelGroup createChannelGroup(String name);
+    AChannelGroup addChannelToChannelGroup(AChannelGroup channelGroup, AChannel channel);
+    void removeChannelFromChannelGroup(AChannelGroup channelGroup, AChannel channel);
+    AChannelGroup findByName(String name);
+}

abstracto-application/executable/pom.xml

@@ -30,23 +30,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
-        <dependency>
-            <groupId>dev.sheldan.abstracto.core</groupId>
-            <artifactId>core-interface</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <scope>runtime</scope>
         </dependency>
 
-        <dependency>
-            <groupId>dev.sheldan.abstracto.core</groupId>
-            <artifactId>core-interface</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>dev.sheldan.abstracto.core</groupId>
             <artifactId>core-impl</artifactId>
@@ -60,6 +49,13 @@
             <scope>runtime</scope>
         </dependency>
 
+        <dependency>
+            <groupId>dev.sheldan.abstracto.command</groupId>
+            <artifactId>command-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
         <!-- modules containing commands -->
 
         <dependency>