moved tags & self_roles into the staff_commands package

jasonlessenich · jasonlessenich · commit 263808b9fb67 · 2022-07-25T17:32:13.000+02:00
diff --git a/src/main/java/net/javadiscord/javabot/Bot.java b/src/main/java/net/javadiscord/javabot/Bot.java
@@ -28,14 +28,14 @@
 import net.javadiscord.javabot.systems.moderation.server_lock.ServerLockManager;
 import net.javadiscord.javabot.systems.qotw.commands.questions_queue.AddQuestionSubcommand;
 import net.javadiscord.javabot.systems.qotw.submissions.SubmissionInteractionManager;
-import net.javadiscord.javabot.systems.self_roles.SelfRoleInteractionManager;
+import net.javadiscord.javabot.systems.staff_commands.self_roles.SelfRoleInteractionManager;
 import net.javadiscord.javabot.systems.staff_commands.embeds.AddEmbedFieldSubcommand;
 import net.javadiscord.javabot.systems.staff_commands.embeds.CreateEmbedSubcommand;
 import net.javadiscord.javabot.systems.staff_commands.embeds.EditEmbedSubcommand;
 import net.javadiscord.javabot.systems.starboard.StarboardManager;
-import net.javadiscord.javabot.systems.tags.CustomTagManager;
-import net.javadiscord.javabot.systems.tags.commands.CreateCustomTagSubcommand;
-import net.javadiscord.javabot.systems.tags.commands.EditCustomTagSubcommand;
+import net.javadiscord.javabot.systems.staff_commands.tags.CustomTagManager;
+import net.javadiscord.javabot.systems.staff_commands.tags.commands.CreateCustomTagSubcommand;
+import net.javadiscord.javabot.systems.staff_commands.tags.commands.EditCustomTagSubcommand;
 import net.javadiscord.javabot.systems.user_commands.leaderboard.ExperienceLeaderboardSubcommand;
 import net.javadiscord.javabot.tasks.MetricsUpdater;
 import net.javadiscord.javabot.tasks.PresenceUpdater;
diff --git a/src/main/java/net/javadiscord/javabot/systems/staff_commands/self_roles/ChangeSelfRoleStatusSubcommand.java b/src/main/java/net/javadiscord/javabot/systems/staff_commands/self_roles/ChangeSelfRoleStatusSubcommand.java
@@ -1,4 +1,4 @@
-package net.javadiscord.javabot.systems.self_roles;
+package net.javadiscord.javabot.systems.staff_commands.self_roles;
 
 import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
 import net.dv8tion.jda.api.EmbedBuilder;
diff --git a/src/main/java/net/javadiscord/javabot/systems/staff_commands/self_roles/CreateSelfRoleSubcommand.java b/src/main/java/net/javadiscord/javabot/systems/staff_commands/self_roles/CreateSelfRoleSubcommand.java
@@ -1,4 +1,4 @@
-package net.javadiscord.javabot.systems.self_roles;
+package net.javadiscord.javabot.systems.staff_commands.self_roles;
 
 import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
 import net.dv8tion.jda.api.EmbedBuilder;
diff --git a/src/main/java/net/javadiscord/javabot/systems/staff_commands/self_roles/SelfRoleCommand.java b/src/main/java/net/javadiscord/javabot/systems/staff_commands/self_roles/SelfRoleCommand.java
@@ -1,4 +1,4 @@
-package net.javadiscord.javabot.systems.self_roles;
+package net.javadiscord.javabot.systems.staff_commands.self_roles;
 
 import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
 import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
diff --git a/src/main/java/net/javadiscord/javabot/systems/staff_commands/self_roles/SelfRoleInteractionManager.java b/src/main/java/net/javadiscord/javabot/systems/staff_commands/self_roles/SelfRoleInteractionManager.java
@@ -1,4 +1,4 @@
-package net.javadiscord.javabot.systems.self_roles;
+package net.javadiscord.javabot.systems.staff_commands.self_roles;
 
 import com.dynxsty.dih4jda.interactions.ComponentIdBuilder;
 import com.dynxsty.dih4jda.interactions.components.ButtonHandler;
diff --git a/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/CustomTagManager.java b/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/CustomTagManager.java
@@ -1,4 +1,4 @@
-package net.javadiscord.javabot.systems.tags;
+package net.javadiscord.javabot.systems.staff_commands.tags;
 
 import com.dynxsty.dih4jda.util.AutoCompleteUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -10,8 +10,8 @@
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.requests.restaction.interactions.AutoCompleteCallbackAction;
-import net.javadiscord.javabot.systems.tags.dao.CustomTagRepository;
-import net.javadiscord.javabot.systems.tags.model.CustomTag;
+import net.javadiscord.javabot.systems.staff_commands.tags.dao.CustomTagRepository;
+import net.javadiscord.javabot.systems.staff_commands.tags.model.CustomTag;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/CreateCustomTagSubcommand.java b/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/CreateCustomTagSubcommand.java
@@ -1,4 +1,4 @@
-package net.javadiscord.javabot.systems.tags.commands;
+package net.javadiscord.javabot.systems.staff_commands.tags.commands;
 
 import com.dynxsty.dih4jda.interactions.components.ModalHandler;
 import net.dv8tion.jda.api.EmbedBuilder;
@@ -15,7 +15,7 @@
 import net.dv8tion.jda.api.interactions.modals.ModalMapping;
 import net.dv8tion.jda.api.requests.restaction.interactions.InteractionCallbackAction;
 import net.javadiscord.javabot.Bot;
-import net.javadiscord.javabot.systems.tags.model.CustomTag;
+import net.javadiscord.javabot.systems.staff_commands.tags.model.CustomTag;
 import net.javadiscord.javabot.util.ExceptionLogger;
 import net.javadiscord.javabot.util.Responses;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/CustomTagsAdminCommand.java b/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/CustomTagsAdminCommand.java
@@ -1,4 +1,4 @@
-package net.javadiscord.javabot.systems.tags.commands;
+package net.javadiscord.javabot.systems.staff_commands.tags.commands;
 
 import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
diff --git a/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/CustomTagsSubcommand.java b/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/CustomTagsSubcommand.java
@@ -1,4 +1,4 @@
-package net.javadiscord.javabot.systems.tags.commands;
+package net.javadiscord.javabot.systems.staff_commands.tags.commands;
 
 import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/DeleteCustomTagSubcommand.java b/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/DeleteCustomTagSubcommand.java
@@ -1,4 +1,4 @@
-package net.javadiscord.javabot.systems.tags.commands;
+package net.javadiscord.javabot.systems.staff_commands.tags.commands;
 
 import com.dynxsty.dih4jda.interactions.commands.AutoCompletable;
 import net.dv8tion.jda.api.EmbedBuilder;
@@ -13,9 +13,9 @@
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
 import net.javadiscord.javabot.Bot;
 import net.javadiscord.javabot.data.h2db.DbHelper;
-import net.javadiscord.javabot.systems.tags.CustomTagManager;
-import net.javadiscord.javabot.systems.tags.dao.CustomTagRepository;
-import net.javadiscord.javabot.systems.tags.model.CustomTag;
+import net.javadiscord.javabot.systems.staff_commands.tags.CustomTagManager;
+import net.javadiscord.javabot.systems.staff_commands.tags.dao.CustomTagRepository;
+import net.javadiscord.javabot.systems.staff_commands.tags.model.CustomTag;
 import net.javadiscord.javabot.util.Responses;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/EditCustomTagSubcommand.java b/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/EditCustomTagSubcommand.java
@@ -1,4 +1,4 @@
-package net.javadiscord.javabot.systems.tags.commands;
+package net.javadiscord.javabot.systems.staff_commands.tags.commands;
 
 import com.dynxsty.dih4jda.interactions.ComponentIdBuilder;
 import com.dynxsty.dih4jda.interactions.commands.AutoCompletable;
@@ -21,9 +21,9 @@
 import net.dv8tion.jda.api.requests.restaction.interactions.InteractionCallbackAction;
 import net.javadiscord.javabot.Bot;
 import net.javadiscord.javabot.data.h2db.DbHelper;
-import net.javadiscord.javabot.systems.tags.CustomTagManager;
-import net.javadiscord.javabot.systems.tags.dao.CustomTagRepository;
-import net.javadiscord.javabot.systems.tags.model.CustomTag;
+import net.javadiscord.javabot.systems.staff_commands.tags.CustomTagManager;
+import net.javadiscord.javabot.systems.staff_commands.tags.dao.CustomTagRepository;
+import net.javadiscord.javabot.systems.staff_commands.tags.model.CustomTag;
 import net.javadiscord.javabot.util.Responses;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/ListCustomTagsCommand.java b/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/ListCustomTagsCommand.java
@@ -1,12 +1,12 @@
-package net.javadiscord.javabot.systems.tags.commands;
+package net.javadiscord.javabot.systems.staff_commands.tags.commands;
 
 import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import net.dv8tion.jda.api.utils.MarkdownUtil;
 import net.javadiscord.javabot.data.h2db.DbHelper;
-import net.javadiscord.javabot.systems.tags.dao.CustomTagRepository;
-import net.javadiscord.javabot.systems.tags.model.CustomTag;
+import net.javadiscord.javabot.systems.staff_commands.tags.dao.CustomTagRepository;
+import net.javadiscord.javabot.systems.staff_commands.tags.model.CustomTag;
 import net.javadiscord.javabot.util.Responses;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/TagCommand.java b/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/TagCommand.java
@@ -1,4 +1,4 @@
-package net.javadiscord.javabot.systems.tags.commands;
+package net.javadiscord.javabot.systems.staff_commands.tags.commands;
 
 import com.dynxsty.dih4jda.interactions.commands.AutoCompletable;
 import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
@@ -9,8 +9,8 @@
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import net.javadiscord.javabot.Bot;
-import net.javadiscord.javabot.systems.tags.CustomTagManager;
-import net.javadiscord.javabot.systems.tags.model.CustomTag;
+import net.javadiscord.javabot.systems.staff_commands.tags.CustomTagManager;
+import net.javadiscord.javabot.systems.staff_commands.tags.model.CustomTag;
 import net.javadiscord.javabot.util.Responses;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/dao/CustomTagRepository.java b/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/dao/CustomTagRepository.java
@@ -1,7 +1,7 @@
-package net.javadiscord.javabot.systems.tags.dao;
+package net.javadiscord.javabot.systems.staff_commands.tags.dao;
 
 import lombok.RequiredArgsConstructor;
-import net.javadiscord.javabot.systems.tags.model.CustomTag;
+import net.javadiscord.javabot.systems.staff_commands.tags.model.CustomTag;
 import net.javadiscord.javabot.util.ExceptionLogger;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/model/CustomTag.java b/src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/model/CustomTag.java
@@ -1,9 +1,9 @@
-package net.javadiscord.javabot.systems.tags.model;
+package net.javadiscord.javabot.systems.staff_commands.tags.model;
 
 import lombok.Data;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.MessageEmbed;
-import net.javadiscord.javabot.systems.tags.CustomTagManager;
+import net.javadiscord.javabot.systems.staff_commands.tags.CustomTagManager;
 import org.jetbrains.annotations.NotNull;
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package net.javadiscord.javabot.systems.self_roles;`
	`1`	`+package net.javadiscord.javabot.systems.staff_commands.self_roles;`
`2`	`2`
`3`	`3`	`import com.dynxsty.dih4jda.interactions.commands.SlashCommand;`
`4`	`4`	`import net.dv8tion.jda.api.EmbedBuilder;`