diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7532d8f..7c8e375 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,5 +34,5 @@ jobs: env: REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/ VERSION: ${{ env.version }} - ABSTRACTO_VERSION: 1.3.8 + ABSTRACTO_VERSION: 1.3.9 ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/ \ No newline at end of file diff --git a/application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/config/ModerationCustomFeature.java b/application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/config/ModerationCustomFeature.java index 20308e2..e6e4e22 100644 --- a/application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/config/ModerationCustomFeature.java +++ b/application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/config/ModerationCustomFeature.java @@ -2,6 +2,7 @@ package dev.sheldan.oneplus.bot.custom.moderation.config; import dev.sheldan.abstracto.core.config.FeatureConfig; import dev.sheldan.abstracto.core.config.FeatureDefinition; +import dev.sheldan.abstracto.core.config.PostTargetEnum; import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureConfig; import dev.sheldan.oneplus.bot.custom.moderation.service.ModModeServiceBean; import org.springframework.beans.factory.annotation.Autowired; @@ -14,6 +15,8 @@ import java.util.List; @Component public class ModerationCustomFeature implements FeatureConfig { + public static final String WARN_NOTIFICATION_THRESHOLD = "warnNotificationThreshold"; + @Autowired private ModerationFeatureConfig moderationFeatureConfig; @@ -27,9 +30,14 @@ public class ModerationCustomFeature implements FeatureConfig { return Arrays.asList(moderationFeatureConfig); } + @Override + public List getRequiredPostTargets() { + return Arrays.asList(ModerationCustomPostTarget.WARN_THRESHOLD_NOTIFICATION); + } + @Override public List getRequiredSystemConfigKeys() { return Arrays.asList(ModModeServiceBean.MODMODE_ROLE_CONFIG_KEY, - ModModeServiceBean.MODMODE_CHANGED_ROLE_COLOR_CONFIG_KEY); + ModModeServiceBean.MODMODE_CHANGED_ROLE_COLOR_CONFIG_KEY, WARN_NOTIFICATION_THRESHOLD); } } diff --git a/application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/config/ModerationCustomPostTarget.java b/application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/config/ModerationCustomPostTarget.java new file mode 100644 index 0000000..b58fa58 --- /dev/null +++ b/application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/config/ModerationCustomPostTarget.java @@ -0,0 +1,15 @@ +package dev.sheldan.oneplus.bot.custom.moderation.config; + +import dev.sheldan.abstracto.core.config.PostTargetEnum; +import lombok.Getter; + +@Getter +public enum ModerationCustomPostTarget implements PostTargetEnum { + WARN_THRESHOLD_NOTIFICATION("warnThresholdNotification"); + + private String key; + + ModerationCustomPostTarget(String key) { + this.key = key; + } +} diff --git a/application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/listener/WarningAddedListener.java b/application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/listener/WarningAddedListener.java new file mode 100644 index 0000000..d36d6ba --- /dev/null +++ b/application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/listener/WarningAddedListener.java @@ -0,0 +1,98 @@ +package dev.sheldan.oneplus.bot.custom.moderation.listener; + +import dev.sheldan.abstracto.core.config.FeatureDefinition; +import dev.sheldan.abstracto.core.listener.DefaultListenerResult; +import dev.sheldan.abstracto.core.models.ServerUser; +import dev.sheldan.abstracto.core.models.database.AUserInAServer; +import dev.sheldan.abstracto.core.models.template.display.ChannelDisplay; +import dev.sheldan.abstracto.core.models.template.display.MemberDisplay; +import dev.sheldan.abstracto.core.service.*; +import dev.sheldan.abstracto.core.service.management.UserInServerManagementService; +import dev.sheldan.abstracto.core.templating.model.MessageToSend; +import dev.sheldan.abstracto.core.templating.service.TemplateService; +import dev.sheldan.abstracto.core.utils.FutureUtils; +import dev.sheldan.abstracto.moderation.listener.WarningCreatedListener; +import dev.sheldan.abstracto.moderation.model.listener.WarningCreatedEventModel; +import dev.sheldan.abstracto.moderation.service.management.WarnManagementService; +import dev.sheldan.oneplus.bot.custom.moderation.config.ModerationCustomFeature; +import dev.sheldan.oneplus.bot.custom.moderation.config.ModerationCustomFeatureDefinition; +import dev.sheldan.oneplus.bot.custom.moderation.config.ModerationCustomPostTarget; +import dev.sheldan.oneplus.bot.custom.moderation.model.template.WarningThresholdNotificationModel; +import lombok.extern.slf4j.Slf4j; +import net.dv8tion.jda.api.entities.TextChannel; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +@Component +@Slf4j +public class WarningAddedListener implements WarningCreatedListener { + + @Autowired + private ConfigService configService; + + @Autowired + private WarnManagementService warnManagementService; + + @Autowired + private UserInServerManagementService userInServerManagementService; + + @Autowired + private ChannelService channelService; + + @Autowired + private PostTargetService postTargetService; + + @Autowired + private TemplateService templateService; + + public static final String WARN_THRESHOLD_NOTIFICATION_TEMPLATE_KEY = "warning_threshold_notification"; + + @Override + public DefaultListenerResult execute(WarningCreatedEventModel model) { + Long warnNotificationAmount = configService.getLongValueOrConfigDefault(ModerationCustomFeature.WARN_NOTIFICATION_THRESHOLD, model.getServerId()); + ServerUser warnedUser = ServerUser + .builder() + .userId(model.getWarnedUserId()) + .serverId(model.getServerId()) + .build(); + AUserInAServer warnedUserInAServer = userInServerManagementService.loadOrCreateUser(warnedUser); + List activeWarnsForUser = warnManagementService.getActiveWarnsForUser(warnedUserInAServer) + .stream().map(warning -> warning.getWarnId().getId()).collect(Collectors.toList()); + Set warnIds = new HashSet<>(activeWarnsForUser); + // we cant be sure we receive the newly persisted warning yet, sadly + warnIds.add(model.getWarningId()); + if(warnIds.size() == warnNotificationAmount) { + Long serverId = model.getServerId(); + + Long channelId = model.getWarningChannelId(); + Long warnedUserId = model.getWarnedUserId(); + TextChannel channel = channelService.getTextChannelFromServer(serverId, channelId); + WarningThresholdNotificationModel notificationModel = WarningThresholdNotificationModel + .builder() + .channelDisplay(ChannelDisplay.fromChannel(channel)) + .memberDisplay(MemberDisplay.fromAUserInAServer(warnedUserInAServer)) + .messageId(model.getWarningMessageId()) + .warnCount(warnIds.size()) + .build(); + + MessageToSend messageToSend = templateService.renderEmbedTemplate(WARN_THRESHOLD_NOTIFICATION_TEMPLATE_KEY, notificationModel, serverId); + FutureUtils.toSingleFutureGeneric(postTargetService.sendEmbedInPostTarget(messageToSend, ModerationCustomPostTarget.WARN_THRESHOLD_NOTIFICATION, serverId)) + .thenAccept(unused -> log.info("Warn threshold notification sent for user {} in server {}.", warnedUserId, serverId)) + .exceptionally(throwable -> { + log.error("Failed to sent warn threshold notification for user {} in server {}.", warnedUserId, serverId, throwable); + return null; + }); + } + return DefaultListenerResult.PROCESSED; + } + + @Override + public FeatureDefinition getFeature() { + return ModerationCustomFeatureDefinition.MODERATION_CUSTOM; + } +} diff --git a/application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/model/template/WarningThresholdNotificationModel.java b/application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/model/template/WarningThresholdNotificationModel.java new file mode 100644 index 0000000..323f6fc --- /dev/null +++ b/application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/model/template/WarningThresholdNotificationModel.java @@ -0,0 +1,15 @@ +package dev.sheldan.oneplus.bot.custom.moderation.model.template; + +import dev.sheldan.abstracto.core.models.template.display.ChannelDisplay; +import dev.sheldan.abstracto.core.models.template.display.MemberDisplay; +import lombok.Builder; +import lombok.Getter; + +@Builder +@Getter +public class WarningThresholdNotificationModel { + private MemberDisplay memberDisplay; + private Integer warnCount; + private ChannelDisplay channelDisplay; + private Long messageId; +} diff --git a/application/oneplus-bot-customizations/moderation-custom/src/main/resources/moderation-custom.properties b/application/oneplus-bot-customizations/moderation-custom/src/main/resources/moderation-custom.properties index 987ec3a..9fd0d2c 100644 --- a/application/oneplus-bot-customizations/moderation-custom/src/main/resources/moderation-custom.properties +++ b/application/oneplus-bot-customizations/moderation-custom/src/main/resources/moderation-custom.properties @@ -5,4 +5,9 @@ abstracto.systemConfigs.modModeRoleId.name=modModeRoleId abstracto.systemConfigs.modModeRoleId.longValue=0 abstracto.systemConfigs.modModeNewRoleColor.name=modModeNewRoleColor -abstracto.systemConfigs.modModeNewRoleColor.stringValue=0,0,0 \ No newline at end of file +abstracto.systemConfigs.modModeNewRoleColor.stringValue=0,0,0 + +abstracto.systemConfigs.warnNotificationThreshold.name=warnNotificationThreshold +abstracto.systemConfigs.warnNotificationThreshold.longValue=3 + +abstracto.postTargets.warnThresholdNotification.name=warnThresholdNotification \ No newline at end of file diff --git a/deployment/docker-compose/src/main/resources/.env b/deployment/docker-compose/src/main/resources/.env index e3d4f29..d9fe338 100644 --- a/deployment/docker-compose/src/main/resources/.env +++ b/deployment/docker-compose/src/main/resources/.env @@ -29,4 +29,4 @@ PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev PGADMIN_DEFAULT_PASSWORD=admin TOKEN= YOUTUBE_API_KEY= -ONEPLUS_BOT_VERSION=1.5.7 \ No newline at end of file +ONEPLUS_BOT_VERSION=1.5.8 \ No newline at end of file diff --git a/deployment/image-packaging/pom.xml b/deployment/image-packaging/pom.xml index a194f41..80c6df1 100644 --- a/deployment/image-packaging/pom.xml +++ b/deployment/image-packaging/pom.xml @@ -221,8 +221,8 @@ - dev.sheldan.oneplus.bot.templates.modules - starboard-custom-templates + dev.sheldan.oneplus.bot.templates.customizations + starboard-customization-templates ${project.version} zip true @@ -453,8 +453,8 @@ - dev.sheldan.oneplus.bot.templates.translations - starboard-custom-translations + dev.sheldan.oneplus.bot.templates.translations.customizations + starboard-customization-translations ${project.version} zip true @@ -463,8 +463,8 @@ - dev.sheldan.oneplus.bot.templates.translations - moderation-custom + dev.sheldan.oneplus.bot.templates.translations.customizations + moderation-customization-translations ${project.version} zip true @@ -473,7 +473,7 @@ - dev.sheldan.oneplus.bot.templates.translations + dev.sheldan.oneplus.bot.templates.translations.customizations dynamic-activity-custom-translations ${project.version} zip @@ -484,7 +484,7 @@ - dev.sheldan.oneplus.bot.templates.translations + dev.sheldan.oneplus.bot.templates.translations.modules news-translations ${project.version} zip @@ -494,7 +494,7 @@ - dev.sheldan.oneplus.bot.templates.translations + dev.sheldan.oneplus.bot.templates.translations.modules setup-translations ${project.version} zip @@ -504,7 +504,7 @@ - dev.sheldan.oneplus.bot.templates.translations + dev.sheldan.oneplus.bot.templates.translations.modules referral-translations ${project.version} zip @@ -514,7 +514,7 @@ - dev.sheldan.oneplus.bot.templates.translations + dev.sheldan.oneplus.bot.templates.translations.modules faq-translations ${project.version} zip @@ -848,8 +848,8 @@ - dev.sheldan.oneplus.bot.templates.overrides.templates - core + dev.sheldan.oneplus.bot.templates.overrides + core-template-overrides ${project.version} zip true @@ -858,8 +858,8 @@ - dev.sheldan.oneplus.bot.templates.overrides.templates - webservices + dev.sheldan.oneplus.bot.templates.overrides + webservices-template-overrides ${project.version} zip true @@ -868,8 +868,8 @@ - dev.sheldan.oneplus.bot.templates.overrides.templates - logging + dev.sheldan.oneplus.bot.templates.overrides + logging-template-overrides ${project.version} zip true @@ -879,8 +879,8 @@ - dev.sheldan.oneplus.bot.templates.overrides.templates - statistic + dev.sheldan.oneplus.bot.templates.overrides + statistic-template-overrides ${project.version} zip true @@ -889,8 +889,8 @@ - dev.sheldan.oneplus.bot.templates.overrides.templates - modmail + dev.sheldan.oneplus.bot.templates.overrides + modmail-template-overrides ${project.version} zip true @@ -899,8 +899,8 @@ - dev.sheldan.oneplus.bot.templates.overrides.templates - moderation + dev.sheldan.oneplus.bot.templates.overrides + moderation-template-overrides ${project.version} zip true @@ -910,8 +910,8 @@ - dev.sheldan.oneplus.bot.templates.overrides.translations - moderation + dev.sheldan.oneplus.bot.templates.translations.overrides + moderation-translation-overrides ${project.version} zip true diff --git a/deployment/image-packaging/src/main/docker/grafana/dashboards/oneplus-bot-logs.json b/deployment/image-packaging/src/main/docker/grafana/dashboards/oneplus-bot-logs.json index 74743b6..d2657f0 100644 --- a/deployment/image-packaging/src/main/docker/grafana/dashboards/oneplus-bot-logs.json +++ b/deployment/image-packaging/src/main/docker/grafana/dashboards/oneplus-bot-logs.json @@ -21,13 +21,12 @@ { "datasource": "Loki", "gridPos": { - "h": 10, + "h": 14, "w": 24, "x": 0, "y": 0 }, "id": 2, - "maxDataPoints": 10000, "options": { "dedupStrategy": "none", "enableLogDetails": true, @@ -62,5 +61,5 @@ "timezone": "", "title": "OnePlus Bot logs", "uid": "1uGb0q4nz", - "version": 1 + "version": 2 } \ No newline at end of file diff --git a/pom.xml b/pom.xml index af97cd5..6349515 100644 --- a/pom.xml +++ b/pom.xml @@ -19,8 +19,8 @@ 1.8 - 1.3.8 - 1.2.20 + 1.3.9 + 1.2.21 diff --git a/templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/pom.xml b/templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/pom.xml new file mode 100644 index 0000000..764b767 --- /dev/null +++ b/templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/pom.xml @@ -0,0 +1,15 @@ + + + + dev.sheldan.oneplus.bot.templates.customizations + customization-templates + 1.5.8-SNAPSHOT + + 4.0.0 + + moderation-customization-templates + pom + + \ No newline at end of file diff --git a/templates/oneplus-bot-modules-templates/faq-templates/src/main/assembly/assembly.xml b/templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/src/main/assembly/assembly.xml similarity index 100% rename from templates/oneplus-bot-modules-templates/faq-templates/src/main/assembly/assembly.xml rename to templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/src/main/assembly/assembly.xml diff --git a/templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/src/main/resources/en_US/listener/warningCreatedListener/warning_threshold_notification_embed_en_US.ftl b/templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/src/main/resources/en_US/listener/warningCreatedListener/warning_threshold_notification_embed_en_US.ftl new file mode 100644 index 0000000..d6a1362 --- /dev/null +++ b/templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/src/main/resources/en_US/listener/warningCreatedListener/warning_threshold_notification_embed_en_US.ftl @@ -0,0 +1,13 @@ +{ + "title": { + "title": "<@safe_include "warning_threshold_reached_notification_title"/>" + }, + <#include "abstracto_color">, + <#assign warnedMemberMention=memberDisplay.memberMention> + <#assign warnedUserId=memberDisplay.userId> + <#assign memberMention=memberDisplay.memberMention> + <#assign warnCount=warnCount> + <#assign channelDisplay=channelDisplay> + <#assign messageId=messageId> + "description": "<@safe_include "warning_threshold_reached_notification_description"/>" +} \ No newline at end of file diff --git a/templates/oneplus-bot-templates/customization-templates/pom.xml b/templates/oneplus-bot-templates/customization-templates/pom.xml new file mode 100644 index 0000000..c07c679 --- /dev/null +++ b/templates/oneplus-bot-templates/customization-templates/pom.xml @@ -0,0 +1,22 @@ + + + + dev.sheldan.oneplus.bot.templates + oneplus-bot-templates + 1.5.8-SNAPSHOT + + 4.0.0 + + dev.sheldan.oneplus.bot.templates.customizations + customization-templates + pom + + + starboard-customization-templates + moderation-customization-templates + + + + \ No newline at end of file diff --git a/templates/oneplus-bot-modules-templates/starboard-custom-templates/pom.xml b/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/pom.xml similarity index 87% rename from templates/oneplus-bot-modules-templates/starboard-custom-templates/pom.xml rename to templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/pom.xml index 6067c01..2357ea5 100644 --- a/templates/oneplus-bot-modules-templates/starboard-custom-templates/pom.xml +++ b/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/pom.xml @@ -1,13 +1,13 @@ - dev.sheldan.oneplus.bot.templates.modules - oneplus-bot-modules-templates + dev.sheldan.oneplus.bot.templates.customizations + customization-templates 1.5.8-SNAPSHOT 4.0.0 - starboard-custom-templates + starboard-customization-templates pom diff --git a/templates/oneplus-bot-modules-templates/news-templates/src/main/assembly/assembly.xml b/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/assembly/assembly.xml similarity index 100% rename from templates/oneplus-bot-modules-templates/news-templates/src/main/assembly/assembly.xml rename to templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/assembly/assembly.xml diff --git a/templates/oneplus-bot-modules-templates/starboard-custom-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_notification_embed_en_US.ftl b/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_notification_embed_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/starboard-custom-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_notification_embed_en_US.ftl rename to templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_notification_embed_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/starboard-custom-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_notification_embed_en_US.ftl b/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_notification_embed_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/starboard-custom-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_notification_embed_en_US.ftl rename to templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_notification_embed_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/faq-templates/pom.xml b/templates/oneplus-bot-templates/module-templates/faq-templates/pom.xml similarity index 86% rename from templates/oneplus-bot-modules-templates/faq-templates/pom.xml rename to templates/oneplus-bot-templates/module-templates/faq-templates/pom.xml index d61ef6b..ec0765b 100644 --- a/templates/oneplus-bot-modules-templates/faq-templates/pom.xml +++ b/templates/oneplus-bot-templates/module-templates/faq-templates/pom.xml @@ -1,19 +1,14 @@ - oneplus-bot-modules-templates dev.sheldan.oneplus.bot.templates.modules + oneplus-bot-module-templates 1.5.8-SNAPSHOT 4.0.0 faq-templates - - 8 - 8 - - diff --git a/templates/oneplus-bot-modules-templates/referral-templates/src/main/assembly/assembly.xml b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/assembly/assembly.xml similarity index 100% rename from templates/oneplus-bot-modules-templates/referral-templates/src/main/assembly/assembly.xml rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/assembly/assembly.xml diff --git a/templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/commands/FAQUsage/FAQUsage_response_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/FAQUsage/FAQUsage_response_embed_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/commands/FAQUsage/FAQUsage_response_embed_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/FAQUsage/FAQUsage_response_embed_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/commands/faq/FAQ_response_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/faq/FAQ_response_embed_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/commands/faq/FAQ_response_embed_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/faq/FAQ_response_embed_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/commands/faq/FAQ_response_no_command_found_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/faq/FAQ_response_no_command_found_embed_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/commands/faq/FAQ_response_no_command_found_embed_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/faq/FAQ_response_no_command_found_embed_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_response_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_response_embed_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_response_embed_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_response_embed_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/exceptions/duplicated_command_or_alias_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/duplicated_command_or_alias_exception_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/exceptions/duplicated_command_or_alias_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/duplicated_command_or_alias_exception_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/exceptions/duplicated_faq_command_alias_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/duplicated_faq_command_alias_exception_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/exceptions/duplicated_faq_command_alias_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/duplicated_faq_command_alias_exception_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_alias_shadowing_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_alias_shadowing_exception_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_alias_shadowing_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_alias_shadowing_exception_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_not_found_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_not_found_exception_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_not_found_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_not_found_exception_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_response_duplicated_position_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_response_duplicated_position_exception_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_response_duplicated_position_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/faq_command_response_duplicated_position_exception_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/exceptions/global_faq_command_config_mismatch_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/global_faq_command_config_mismatch_exception_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/exceptions/global_faq_command_config_mismatch_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/global_faq_command_config_mismatch_exception_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/exceptions/global_faq_command_responses_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/global_faq_command_responses_exception_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/exceptions/global_faq_command_responses_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/global_faq_command_responses_exception_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/exceptions/no_faq_response_found_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/no_faq_response_found_exception_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/faq-templates/src/main/resources/en_US/exceptions/no_faq_response_found_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/exceptions/no_faq_response_found_exception_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/news-templates/pom.xml b/templates/oneplus-bot-templates/module-templates/news-templates/pom.xml similarity index 95% rename from templates/oneplus-bot-modules-templates/news-templates/pom.xml rename to templates/oneplus-bot-templates/module-templates/news-templates/pom.xml index 9e30fd5..e03b4ab 100644 --- a/templates/oneplus-bot-modules-templates/news-templates/pom.xml +++ b/templates/oneplus-bot-templates/module-templates/news-templates/pom.xml @@ -2,7 +2,7 @@ dev.sheldan.oneplus.bot.templates.modules - oneplus-bot-modules-templates + oneplus-bot-module-templates 1.5.8-SNAPSHOT 4.0.0 diff --git a/templates/oneplus-bot-modules-templates/starboard-custom-templates/src/main/assembly/assembly.xml b/templates/oneplus-bot-templates/module-templates/news-templates/src/main/assembly/assembly.xml similarity index 100% rename from templates/oneplus-bot-modules-templates/starboard-custom-templates/src/main/assembly/assembly.xml rename to templates/oneplus-bot-templates/module-templates/news-templates/src/main/assembly/assembly.xml diff --git a/templates/oneplus-bot-modules-templates/news-templates/src/main/resources/en_US/commands/news/news_post_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/commands/news/news_post_embed_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/news-templates/src/main/resources/en_US/commands/news/news_post_embed_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/commands/news/news_post_embed_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/news-templates/src/main/resources/en_US/exception/news_post_locked_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/exception/news_post_locked_exception_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/news-templates/src/main/resources/en_US/exception/news_post_locked_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/exception/news_post_locked_exception_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/news-templates/src/main/resources/en_US/exception/news_post_not_found_exception_en_US.ftl b/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/exception/news_post_not_found_exception_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/news-templates/src/main/resources/en_US/exception/news_post_not_found_exception_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/exception/news_post_not_found_exception_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/pom.xml b/templates/oneplus-bot-templates/module-templates/pom.xml similarity index 54% rename from templates/oneplus-bot-modules-templates/pom.xml rename to templates/oneplus-bot-templates/module-templates/pom.xml index ef0cbfb..f1939b6 100644 --- a/templates/oneplus-bot-modules-templates/pom.xml +++ b/templates/oneplus-bot-templates/module-templates/pom.xml @@ -1,22 +1,22 @@ - + dev.sheldan.oneplus.bot.templates - templates + oneplus-bot-templates 1.5.8-SNAPSHOT 4.0.0 dev.sheldan.oneplus.bot.templates.modules - oneplus-bot-modules-templates + oneplus-bot-module-templates pom - 1.5.8-SNAPSHOT + - starboard-custom-templates + faq-templates news-templates referral-templates - faq-templates - \ No newline at end of file diff --git a/templates/oneplus-bot-modules-templates/referral-templates/pom.xml b/templates/oneplus-bot-templates/module-templates/referral-templates/pom.xml similarity index 95% rename from templates/oneplus-bot-modules-templates/referral-templates/pom.xml rename to templates/oneplus-bot-templates/module-templates/referral-templates/pom.xml index 653fbc3..358ef33 100644 --- a/templates/oneplus-bot-modules-templates/referral-templates/pom.xml +++ b/templates/oneplus-bot-templates/module-templates/referral-templates/pom.xml @@ -1,8 +1,8 @@ - oneplus-bot-modules-templates dev.sheldan.oneplus.bot.templates.modules + oneplus-bot-module-templates 1.5.8-SNAPSHOT 4.0.0 diff --git a/templates/overrides/template-overrides/core/src/main/assembly/assembly.xml b/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/assembly/assembly.xml similarity index 100% rename from templates/overrides/template-overrides/core/src/main/assembly/assembly.xml rename to templates/oneplus-bot-templates/module-templates/referral-templates/src/main/assembly/assembly.xml diff --git a/templates/oneplus-bot-modules-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_no_referral_link_found_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_no_referral_link_found_embed_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_no_referral_link_found_embed_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_no_referral_link_found_embed_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_referral_post_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_referral_post_embed_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_referral_post_embed_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_referral_post_embed_en_US.ftl diff --git a/templates/oneplus-bot-modules-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_too_recent_post_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_too_recent_post_embed_en_US.ftl similarity index 100% rename from templates/oneplus-bot-modules-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_too_recent_post_embed_en_US.ftl rename to templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_too_recent_post_embed_en_US.ftl diff --git a/templates/overrides/pom.xml b/templates/oneplus-bot-templates/pom.xml similarity index 76% rename from templates/overrides/pom.xml rename to templates/oneplus-bot-templates/pom.xml index a93defd..957ac9f 100644 --- a/templates/overrides/pom.xml +++ b/templates/oneplus-bot-templates/pom.xml @@ -7,13 +7,14 @@ 4.0.0 - dev.sheldan.oneplus.bot.templates.overrides - overrides + oneplus-bot-templates pom - + 1.5.8-SNAPSHOT + module-templates + customization-templates template-overrides - translation-overrides + \ No newline at end of file diff --git a/templates/overrides/template-overrides/core/pom.xml b/templates/oneplus-bot-templates/template-overrides/core-template-overrides/pom.xml similarity index 91% rename from templates/overrides/template-overrides/core/pom.xml rename to templates/oneplus-bot-templates/template-overrides/core-template-overrides/pom.xml index 0a10098..dcd6d81 100644 --- a/templates/overrides/template-overrides/core/pom.xml +++ b/templates/oneplus-bot-templates/template-overrides/core-template-overrides/pom.xml @@ -1,13 +1,13 @@ + dev.sheldan.oneplus.bot.templates.overrides template-overrides - dev.sheldan.oneplus.bot.templates.overrides.templates 1.5.8-SNAPSHOT 4.0.0 - core + core-template-overrides diff --git a/templates/overrides/template-overrides/logging/src/main/assembly/assembly.xml b/templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/assembly/assembly.xml similarity index 100% rename from templates/overrides/template-overrides/logging/src/main/assembly/assembly.xml rename to templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/assembly/assembly.xml diff --git a/templates/overrides/template-overrides/core/src/main/resources/en_US/colors/abstracto_color_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/en_US/colors/abstracto_color_en_US.ftl similarity index 100% rename from templates/overrides/template-overrides/core/src/main/resources/en_US/colors/abstracto_color_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/en_US/colors/abstracto_color_en_US.ftl diff --git a/templates/overrides/template-overrides/core/src/main/resources/en_US/colors/exception_color_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/en_US/colors/exception_color_en_US.ftl similarity index 100% rename from templates/overrides/template-overrides/core/src/main/resources/en_US/colors/exception_color_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/en_US/colors/exception_color_en_US.ftl diff --git a/templates/overrides/template-overrides/core/src/main/resources/en_US/colors/success_color_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/en_US/colors/success_color_en_US.ftl similarity index 100% rename from templates/overrides/template-overrides/core/src/main/resources/en_US/colors/success_color_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/en_US/colors/success_color_en_US.ftl diff --git a/templates/overrides/template-overrides/core/src/main/resources/en_US/colors/warning_color_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/en_US/colors/warning_color_en_US.ftl similarity index 100% rename from templates/overrides/template-overrides/core/src/main/resources/en_US/colors/warning_color_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/core-template-overrides/src/main/resources/en_US/colors/warning_color_en_US.ftl diff --git a/templates/overrides/template-overrides/logging/pom.xml b/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/pom.xml similarity index 91% rename from templates/overrides/template-overrides/logging/pom.xml rename to templates/oneplus-bot-templates/template-overrides/logging-template-overrides/pom.xml index 6e4e561..5271426 100644 --- a/templates/overrides/template-overrides/logging/pom.xml +++ b/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/pom.xml @@ -1,13 +1,13 @@ - dev.sheldan.oneplus.bot.templates.overrides.templates + dev.sheldan.oneplus.bot.templates.overrides template-overrides 1.5.8-SNAPSHOT 4.0.0 - logging + logging-template-overrides diff --git a/templates/overrides/template-overrides/moderation/src/main/assembly/assembly.xml b/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/assembly/assembly.xml similarity index 100% rename from templates/overrides/template-overrides/moderation/src/main/assembly/assembly.xml rename to templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/assembly/assembly.xml diff --git a/templates/overrides/template-overrides/logging/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl similarity index 100% rename from templates/overrides/template-overrides/logging/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl diff --git a/templates/overrides/template-overrides/logging/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl similarity index 100% rename from templates/overrides/template-overrides/logging/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl diff --git a/templates/overrides/template-overrides/moderation/pom.xml b/templates/oneplus-bot-templates/template-overrides/moderation-template-overrides/pom.xml similarity index 91% rename from templates/overrides/template-overrides/moderation/pom.xml rename to templates/oneplus-bot-templates/template-overrides/moderation-template-overrides/pom.xml index d9146c0..7797d39 100644 --- a/templates/overrides/template-overrides/moderation/pom.xml +++ b/templates/oneplus-bot-templates/template-overrides/moderation-template-overrides/pom.xml @@ -1,13 +1,13 @@ + dev.sheldan.oneplus.bot.templates.overrides template-overrides - dev.sheldan.oneplus.bot.templates.overrides.templates 1.5.8-SNAPSHOT 4.0.0 - moderation + moderation-template-overrides diff --git a/templates/overrides/template-overrides/modmail/src/main/assembly/assembly.xml b/templates/oneplus-bot-templates/template-overrides/moderation-template-overrides/src/main/assembly/assembly.xml similarity index 100% rename from templates/overrides/template-overrides/modmail/src/main/assembly/assembly.xml rename to templates/oneplus-bot-templates/template-overrides/moderation-template-overrides/src/main/assembly/assembly.xml diff --git a/templates/overrides/template-overrides/moderation/src/main/resources/en_US/config/colors/moderation_action_color_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/moderation-template-overrides/src/main/resources/en_US/config/colors/moderation_action_color_en_US.ftl similarity index 100% rename from templates/overrides/template-overrides/moderation/src/main/resources/en_US/config/colors/moderation_action_color_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/moderation-template-overrides/src/main/resources/en_US/config/colors/moderation_action_color_en_US.ftl diff --git a/templates/overrides/template-overrides/modmail/pom.xml b/templates/oneplus-bot-templates/template-overrides/modmail-template-overrides/pom.xml similarity index 91% rename from templates/overrides/template-overrides/modmail/pom.xml rename to templates/oneplus-bot-templates/template-overrides/modmail-template-overrides/pom.xml index d698914..0512413 100644 --- a/templates/overrides/template-overrides/modmail/pom.xml +++ b/templates/oneplus-bot-templates/template-overrides/modmail-template-overrides/pom.xml @@ -1,13 +1,13 @@ + dev.sheldan.oneplus.bot.templates.overrides template-overrides - dev.sheldan.oneplus.bot.templates.overrides.templates 1.5.8-SNAPSHOT 4.0.0 - modmail + modmail-template-overrides diff --git a/templates/overrides/template-overrides/statistic/src/main/assembly/assembly.xml b/templates/oneplus-bot-templates/template-overrides/modmail-template-overrides/src/main/assembly/assembly.xml similarity index 100% rename from templates/overrides/template-overrides/statistic/src/main/assembly/assembly.xml rename to templates/oneplus-bot-templates/template-overrides/modmail-template-overrides/src/main/assembly/assembly.xml diff --git a/templates/overrides/template-overrides/modmail/src/main/resources/en_US/config/colors/modmail_color_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/modmail-template-overrides/src/main/resources/en_US/config/colors/modmail_color_en_US.ftl similarity index 100% rename from templates/overrides/template-overrides/modmail/src/main/resources/en_US/config/colors/modmail_color_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/modmail-template-overrides/src/main/resources/en_US/config/colors/modmail_color_en_US.ftl diff --git a/templates/oneplus-bot-templates/template-overrides/pom.xml b/templates/oneplus-bot-templates/template-overrides/pom.xml new file mode 100644 index 0000000..14b145b --- /dev/null +++ b/templates/oneplus-bot-templates/template-overrides/pom.xml @@ -0,0 +1,23 @@ + + + + dev.sheldan.oneplus.bot.templates + oneplus-bot-templates + 1.5.8-SNAPSHOT + + 4.0.0 + + dev.sheldan.oneplus.bot.templates.overrides + template-overrides + pom + + + webservices-template-overrides + core-template-overrides + logging-template-overrides + statistic-template-overrides + modmail-template-overrides + moderation-template-overrides + + + \ No newline at end of file diff --git a/templates/overrides/template-overrides/statistic/pom.xml b/templates/oneplus-bot-templates/template-overrides/statistic-template-overrides/pom.xml similarity index 91% rename from templates/overrides/template-overrides/statistic/pom.xml rename to templates/oneplus-bot-templates/template-overrides/statistic-template-overrides/pom.xml index 183352a..1151d9a 100644 --- a/templates/overrides/template-overrides/statistic/pom.xml +++ b/templates/oneplus-bot-templates/template-overrides/statistic-template-overrides/pom.xml @@ -1,13 +1,13 @@ - dev.sheldan.oneplus.bot.templates.overrides.templates + dev.sheldan.oneplus.bot.templates.overrides template-overrides 1.5.8-SNAPSHOT 4.0.0 - statistic + statistic-template-overrides diff --git a/templates/overrides/template-overrides/webservices/src/main/assembly/assembly.xml b/templates/oneplus-bot-templates/template-overrides/statistic-template-overrides/src/main/assembly/assembly.xml similarity index 100% rename from templates/overrides/template-overrides/webservices/src/main/assembly/assembly.xml rename to templates/oneplus-bot-templates/template-overrides/statistic-template-overrides/src/main/assembly/assembly.xml diff --git a/templates/overrides/template-overrides/statistic/src/main/resources/en_US/emotes/config/statistic_color_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/statistic-template-overrides/src/main/resources/en_US/emotes/config/statistic_color_en_US.ftl similarity index 100% rename from templates/overrides/template-overrides/statistic/src/main/resources/en_US/emotes/config/statistic_color_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/statistic-template-overrides/src/main/resources/en_US/emotes/config/statistic_color_en_US.ftl diff --git a/templates/overrides/template-overrides/webservices/pom.xml b/templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/pom.xml similarity index 91% rename from templates/overrides/template-overrides/webservices/pom.xml rename to templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/pom.xml index bb71a70..240b4de 100644 --- a/templates/overrides/template-overrides/webservices/pom.xml +++ b/templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/pom.xml @@ -1,13 +1,13 @@ - dev.sheldan.oneplus.bot.templates.overrides.templates + dev.sheldan.oneplus.bot.templates.overrides template-overrides 1.5.8-SNAPSHOT 4.0.0 - webservices + webservices-template-overrides pom diff --git a/templates/overrides/translation-overrides/moderation/src/main/assembly/assembly.xml b/templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/src/main/assembly/assembly.xml similarity index 100% rename from templates/overrides/translation-overrides/moderation/src/main/assembly/assembly.xml rename to templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/src/main/assembly/assembly.xml diff --git a/templates/overrides/template-overrides/webservices/src/main/resources/en_US/urban/commands/urbanDefine/urban_define_response_model_embed_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/src/main/resources/en_US/urban/commands/urbanDefine/urban_define_response_model_embed_en_US.ftl similarity index 100% rename from templates/overrides/template-overrides/webservices/src/main/resources/en_US/urban/commands/urbanDefine/urban_define_response_model_embed_en_US.ftl rename to templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/src/main/resources/en_US/urban/commands/urbanDefine/urban_define_response_model_embed_en_US.ftl diff --git a/templates/overrides/template-overrides/pom.xml b/templates/overrides/template-overrides/pom.xml deleted file mode 100644 index 3365aed..0000000 --- a/templates/overrides/template-overrides/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - dev.sheldan.oneplus.bot.templates.overrides - overrides - 1.5.8-SNAPSHOT - - 4.0.0 - - dev.sheldan.oneplus.bot.templates.overrides.templates - template-overrides - pom - - - - webservices - core - logging - statistic - modmail - moderation - - - \ No newline at end of file diff --git a/templates/pom.xml b/templates/pom.xml index aa11e13..db92350 100644 --- a/templates/pom.xml +++ b/templates/pom.xml @@ -8,9 +8,8 @@ - oneplus-bot-modules-templates + oneplus-bot-templates translations - overrides dev.sheldan.oneplus.bot.templates diff --git a/templates/translations/dynamic-activity-custom-translations/pom.xml b/templates/translations/customization-translations/dynamic-activity-customization-translations/pom.xml similarity index 90% rename from templates/translations/dynamic-activity-custom-translations/pom.xml rename to templates/translations/customization-translations/dynamic-activity-customization-translations/pom.xml index 1126c94..31580e7 100644 --- a/templates/translations/dynamic-activity-custom-translations/pom.xml +++ b/templates/translations/customization-translations/dynamic-activity-customization-translations/pom.xml @@ -1,8 +1,8 @@ - dev.sheldan.oneplus.bot.templates.translations - translations + dev.sheldan.oneplus.bot.templates.translations.customizations + customization-translations 1.5.8-SNAPSHOT 4.0.0 diff --git a/templates/translations/dynamic-activity-custom-translations/src/main/assembly/assembly.xml b/templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/assembly/assembly.xml similarity index 100% rename from templates/translations/dynamic-activity-custom-translations/src/main/assembly/assembly.xml rename to templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/assembly/assembly.xml diff --git a/templates/translations/dynamic-activity-custom-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_fans_en_US.ftl b/templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_fans_en_US.ftl similarity index 100% rename from templates/translations/dynamic-activity-custom-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_fans_en_US.ftl rename to templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_fans_en_US.ftl diff --git a/templates/translations/dynamic-activity-custom-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_help_en_US.ftl b/templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_help_en_US.ftl similarity index 100% rename from templates/translations/dynamic-activity-custom-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_help_en_US.ftl rename to templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_help_en_US.ftl diff --git a/templates/translations/dynamic-activity-custom-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_modmail_en_US.ftl b/templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_modmail_en_US.ftl similarity index 100% rename from templates/translations/dynamic-activity-custom-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_modmail_en_US.ftl rename to templates/translations/customization-translations/dynamic-activity-customization-translations/src/main/resources/en_US/dynamicActivity/dynamic_activity_modmail_en_US.ftl diff --git a/templates/translations/moderation-custom/pom.xml b/templates/translations/customization-translations/moderation-customization-translations/pom.xml similarity index 85% rename from templates/translations/moderation-custom/pom.xml rename to templates/translations/customization-translations/moderation-customization-translations/pom.xml index c57698a..800d82d 100644 --- a/templates/translations/moderation-custom/pom.xml +++ b/templates/translations/customization-translations/moderation-customization-translations/pom.xml @@ -1,13 +1,13 @@ - translations - dev.sheldan.oneplus.bot.templates.translations + dev.sheldan.oneplus.bot.templates.translations.customizations + customization-translations 1.5.8-SNAPSHOT 4.0.0 - moderation-custom + moderation-customization-translations diff --git a/templates/translations/faq-translations/src/main/assembly/assembly.xml b/templates/translations/customization-translations/moderation-customization-translations/src/main/assembly/assembly.xml similarity index 100% rename from templates/translations/faq-translations/src/main/assembly/assembly.xml rename to templates/translations/customization-translations/moderation-customization-translations/src/main/assembly/assembly.xml diff --git a/templates/translations/moderation-custom/src/main/resources/en_US/commands/modMode/help/modMode_description_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_description_en_US.ftl similarity index 100% rename from templates/translations/moderation-custom/src/main/resources/en_US/commands/modMode/help/modMode_description_en_US.ftl rename to templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_description_en_US.ftl diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_long_help_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_long_help_en_US.ftl new file mode 100644 index 0000000..f85723a --- /dev/null +++ b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_long_help_en_US.ftl @@ -0,0 +1 @@ +Changes the colors of the staff role (if enabled) to a defined color. If turned off, it removes the color again. \ No newline at end of file diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_parameter_newState_help_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_parameter_newState_help_en_US.ftl new file mode 100644 index 0000000..36ae3f8 --- /dev/null +++ b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/commands/modMode/help/modMode_parameter_newState_help_en_US.ftl @@ -0,0 +1 @@ +'true' to enable, anything else to disable. \ No newline at end of file diff --git a/templates/translations/moderation-custom/src/main/resources/en_US/config/feature_moderationCustom_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_moderationCustom_en_US.ftl similarity index 100% rename from templates/translations/moderation-custom/src/main/resources/en_US/config/feature_moderationCustom_en_US.ftl rename to templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_moderationCustom_en_US.ftl diff --git a/templates/translations/moderation-custom/src/main/resources/en_US/config/feature_setup_config_modModeNewRoleColor_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_modModeNewRoleColor_en_US.ftl similarity index 100% rename from templates/translations/moderation-custom/src/main/resources/en_US/config/feature_setup_config_modModeNewRoleColor_en_US.ftl rename to templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_modModeNewRoleColor_en_US.ftl diff --git a/templates/translations/moderation-custom/src/main/resources/en_US/config/feature_setup_config_modModeRoleId_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_modModeRoleId_en_US.ftl similarity index 100% rename from templates/translations/moderation-custom/src/main/resources/en_US/config/feature_setup_config_modModeRoleId_en_US.ftl rename to templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_modModeRoleId_en_US.ftl diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_warnNotificationThreshold_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_warnNotificationThreshold_en_US.ftl new file mode 100644 index 0000000..00e5db7 --- /dev/null +++ b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_config_warnNotificationThreshold_en_US.ftl @@ -0,0 +1 @@ +The amount of warnings to notify at. Default: ${defaultValue} \ No newline at end of file diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_posttarget_warnThresholdNotification_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_posttarget_warnThresholdNotification_en_US.ftl new file mode 100644 index 0000000..9aebe20 --- /dev/null +++ b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_posttarget_warnThresholdNotification_en_US.ftl @@ -0,0 +1 @@ +The channel in which warn threshold notifications should be sent to. Default: ${defaultValue} \ No newline at end of file diff --git a/templates/translations/moderation-custom/src/main/resources/en_US/exception/mod_role_not_found_exception_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/exception/mod_role_not_found_exception_en_US.ftl similarity index 100% rename from templates/translations/moderation-custom/src/main/resources/en_US/exception/mod_role_not_found_exception_en_US.ftl rename to templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/exception/mod_role_not_found_exception_en_US.ftl diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/listener/warningCreated/warning_threshold_reached_notification_description_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/listener/warningCreated/warning_threshold_reached_notification_description_en_US.ftl new file mode 100644 index 0000000..a29eac2 --- /dev/null +++ b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/listener/warningCreated/warning_threshold_reached_notification_description_en_US.ftl @@ -0,0 +1 @@ +The user ${warnedMemberMention} (${warnedUserId?c}) has reached ${warnCount} warnings. \ No newline at end of file diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/listener/warningCreated/warning_threshold_reached_notification_title_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/listener/warningCreated/warning_threshold_reached_notification_title_en_US.ftl new file mode 100644 index 0000000..0caa309 --- /dev/null +++ b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/listener/warningCreated/warning_threshold_reached_notification_title_en_US.ftl @@ -0,0 +1 @@ +A user has reached the threshold of warnings. \ No newline at end of file diff --git a/templates/translations/customization-translations/pom.xml b/templates/translations/customization-translations/pom.xml new file mode 100644 index 0000000..481cbb1 --- /dev/null +++ b/templates/translations/customization-translations/pom.xml @@ -0,0 +1,22 @@ + + + + dev.sheldan.oneplus.bot.templates.translations + translations + 1.5.8-SNAPSHOT + + 4.0.0 + + dev.sheldan.oneplus.bot.templates.translations.customizations + customization-translations + pom + + + dynamic-activity-customization-translations + moderation-customization-translations + starboard-customization-translations + + + \ No newline at end of file diff --git a/templates/translations/starboard-custom-translations/pom.xml b/templates/translations/customization-translations/starboard-customization-translations/pom.xml similarity index 86% rename from templates/translations/starboard-custom-translations/pom.xml rename to templates/translations/customization-translations/starboard-customization-translations/pom.xml index dafe30d..5e862e1 100644 --- a/templates/translations/starboard-custom-translations/pom.xml +++ b/templates/translations/customization-translations/starboard-customization-translations/pom.xml @@ -1,13 +1,13 @@ - dev.sheldan.oneplus.bot.templates.translations - translations + dev.sheldan.oneplus.bot.templates.translations.customizations + customization-translations 1.5.8-SNAPSHOT 4.0.0 - starboard-custom-translations + starboard-customization-translations pom diff --git a/templates/translations/moderation-custom/src/main/assembly/assembly.xml b/templates/translations/customization-translations/starboard-customization-translations/src/main/assembly/assembly.xml similarity index 100% rename from templates/translations/moderation-custom/src/main/assembly/assembly.xml rename to templates/translations/customization-translations/starboard-customization-translations/src/main/assembly/assembly.xml diff --git a/templates/translations/starboard-custom-translations/src/main/resources/en_US/config/feature_setup_posttarget_starboardNotification_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/config/feature_setup_posttarget_starboardNotification_en_US.ftl similarity index 100% rename from templates/translations/starboard-custom-translations/src/main/resources/en_US/config/feature_setup_posttarget_starboardNotification_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/config/feature_setup_posttarget_starboardNotification_en_US.ftl diff --git a/templates/translations/starboard-custom-translations/src/main/resources/en_US/config/feature_starboardNotification_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/config/feature_starboardNotification_en_US.ftl similarity index 100% rename from templates/translations/starboard-custom-translations/src/main/resources/en_US/config/feature_starboardNotification_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/config/feature_starboardNotification_en_US.ftl diff --git a/templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_description_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_description_en_US.ftl similarity index 100% rename from templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_description_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_description_en_US.ftl diff --git a/templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_title_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_title_en_US.ftl similarity index 100% rename from templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_title_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_title_en_US.ftl diff --git a/templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_description_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_description_en_US.ftl similarity index 100% rename from templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_description_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_description_en_US.ftl diff --git a/templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_title_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_title_en_US.ftl similarity index 100% rename from templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_title_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_title_en_US.ftl diff --git a/templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starboard_message_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starboard_message_en_US.ftl similarity index 100% rename from templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starboard_message_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starboard_message_en_US.ftl diff --git a/templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starboard_message_jump_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starboard_message_jump_en_US.ftl similarity index 100% rename from templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starboard_message_jump_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starboard_message_jump_en_US.ftl diff --git a/templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starred_message_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starred_message_en_US.ftl similarity index 100% rename from templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starred_message_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starred_message_en_US.ftl diff --git a/templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starred_user_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starred_user_en_US.ftl similarity index 100% rename from templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starred_user_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starred_user_en_US.ftl diff --git a/templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starring_user_en_US.ftl b/templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starring_user_en_US.ftl similarity index 100% rename from templates/translations/starboard-custom-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starring_user_en_US.ftl rename to templates/translations/customization-translations/starboard-customization-translations/src/main/resources/en_US/listener/starboardNotification/starboard_post_notification_field_starring_user_en_US.ftl diff --git a/templates/translations/moderation-custom/src/main/resources/en_US/commands/modMode/help/modMode_long_help_en_US.ftl b/templates/translations/moderation-custom/src/main/resources/en_US/commands/modMode/help/modMode_long_help_en_US.ftl deleted file mode 100644 index e69de29..0000000 diff --git a/templates/translations/moderation-custom/src/main/resources/en_US/commands/modMode/help/modMode_parameter_newState_help_en_US.ftl b/templates/translations/moderation-custom/src/main/resources/en_US/commands/modMode/help/modMode_parameter_newState_help_en_US.ftl deleted file mode 100644 index e69de29..0000000 diff --git a/templates/translations/faq-translations/pom.xml b/templates/translations/module-translations/faq-translations/pom.xml similarity index 90% rename from templates/translations/faq-translations/pom.xml rename to templates/translations/module-translations/faq-translations/pom.xml index 05a411d..bcdc756 100644 --- a/templates/translations/faq-translations/pom.xml +++ b/templates/translations/module-translations/faq-translations/pom.xml @@ -1,8 +1,8 @@ - translations - dev.sheldan.oneplus.bot.templates.translations + dev.sheldan.oneplus.bot.templates.translations.modules + module-translations 1.5.8-SNAPSHOT 4.0.0 diff --git a/templates/translations/news-translations/src/main/assembly/assembly.xml b/templates/translations/module-translations/faq-translations/src/main/assembly/assembly.xml similarity index 100% rename from templates/translations/news-translations/src/main/assembly/assembly.xml rename to templates/translations/module-translations/faq-translations/src/main/assembly/assembly.xml diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_available_commands_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_available_commands_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_available_commands_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_available_commands_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_no_commands_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_no_commands_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_no_commands_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/FAQ_response_no_command_found_message_no_commands_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_description_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_description_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_description_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_description_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_long_help_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_long_help_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_long_help_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_long_help_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_parameter_channel_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_parameter_channel_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_parameter_channel_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_parameter_channel_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_parameter_command_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_parameter_command_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_parameter_command_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQ/help/FAQ_parameter_command_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_command_display_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_command_display_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_command_display_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_command_display_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_no_usages_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_no_usages_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_no_usages_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_no_usages_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_usage_display_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_usage_display_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_usage_display_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/FAQUsage_usage_display_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_description_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_description_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_description_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_description_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_long_help_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_long_help_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_long_help_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_long_help_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_parameter_commandName_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_parameter_commandName_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_parameter_commandName_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/FAQUsage/help/FAQUsage_parameter_commandName_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_description_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_description_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_description_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_description_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_long_help_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_long_help_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_long_help_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_long_help_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_parameter_commandName_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_parameter_commandName_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_parameter_commandName_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/deleteFAQ/help/deleteFAQ_parameter_commandName_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_description_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_description_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_description_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_description_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_long_help_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_long_help_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_long_help_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_long_help_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_parameter_commandName_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_parameter_commandName_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_parameter_commandName_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/exportFAQ/help/exportFAQ_parameter_commandName_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_description_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_description_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_description_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_description_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_long_help_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_long_help_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_long_help_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_long_help_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_parameter_file_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_parameter_file_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_parameter_file_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/importFAQ/help/importFAQ_parameter_file_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/help/listFAQCommands_description_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/help/listFAQCommands_description_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/help/listFAQCommands_description_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/help/listFAQCommands_description_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/help/listFAQCommands_long_help_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/help/listFAQCommands_long_help_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/help/listFAQCommands_long_help_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/help/listFAQCommands_long_help_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_group_display_aliases_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_group_display_aliases_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_group_display_aliases_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_group_display_aliases_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_group_display_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_group_display_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_group_display_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_group_display_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_groups_header_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_groups_header_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_groups_header_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_channel_groups_header_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_command_display_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_command_display_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_command_display_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_command_display_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_command_header_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_command_header_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_command_header_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_command_header_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_no_commands_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_no_commands_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_no_commands_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_no_commands_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/config/channel_group_type_faq_name_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/config/channel_group_type_faq_name_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/config/channel_group_type_faq_name_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/config/channel_group_type_faq_name_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/config/feature_faq_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/config/feature_faq_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/config/feature_faq_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/config/feature_faq_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/config/module_faqModule_description_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/config/module_faqModule_description_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/config/module_faqModule_description_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/config/module_faqModule_description_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/config/setup_global_channel_group_info_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/config/setup_global_channel_group_info_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/config/setup_global_channel_group_info_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/config/setup_global_channel_group_info_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/exception/duplicated_command_or_alias_exception_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/duplicated_command_or_alias_exception_message_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/exception/duplicated_command_or_alias_exception_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/duplicated_command_or_alias_exception_message_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/exception/duplicated_faq_command_alias_exception_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/duplicated_faq_command_alias_exception_message_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/exception/duplicated_faq_command_alias_exception_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/duplicated_faq_command_alias_exception_message_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/exception/faq_command_alias_shadowing_exception_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/faq_command_alias_shadowing_exception_message_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/exception/faq_command_alias_shadowing_exception_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/faq_command_alias_shadowing_exception_message_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/exception/faq_command_not_found_exception_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/faq_command_not_found_exception_message_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/exception/faq_command_not_found_exception_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/faq_command_not_found_exception_message_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/exception/faq_command_response_duplicated_position_exception_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/faq_command_response_duplicated_position_exception_message_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/exception/faq_command_response_duplicated_position_exception_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/faq_command_response_duplicated_position_exception_message_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/exception/global_faq_command_config_mismatch_exception_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/global_faq_command_config_mismatch_exception_message_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/exception/global_faq_command_config_mismatch_exception_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/global_faq_command_config_mismatch_exception_message_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/exception/global_faq_command_responses_exception_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/global_faq_command_responses_exception_message_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/exception/global_faq_command_responses_exception_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/global_faq_command_responses_exception_message_en_US.ftl diff --git a/templates/translations/faq-translations/src/main/resources/en_US/exception/no_faq_response_found_exception_message_en_US.ftl b/templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/no_faq_response_found_exception_message_en_US.ftl similarity index 100% rename from templates/translations/faq-translations/src/main/resources/en_US/exception/no_faq_response_found_exception_message_en_US.ftl rename to templates/translations/module-translations/faq-translations/src/main/resources/en_US/exception/no_faq_response_found_exception_message_en_US.ftl diff --git a/templates/translations/news-translations/pom.xml b/templates/translations/module-translations/news-translations/pom.xml similarity index 90% rename from templates/translations/news-translations/pom.xml rename to templates/translations/module-translations/news-translations/pom.xml index db1970c..7829bce 100644 --- a/templates/translations/news-translations/pom.xml +++ b/templates/translations/module-translations/news-translations/pom.xml @@ -1,8 +1,8 @@ - dev.sheldan.oneplus.bot.templates.translations - translations + dev.sheldan.oneplus.bot.templates.translations.modules + module-translations 1.5.8-SNAPSHOT 4.0.0 diff --git a/templates/translations/referral-translations/src/main/assembly/assembly.xml b/templates/translations/module-translations/news-translations/src/main/assembly/assembly.xml similarity index 100% rename from templates/translations/referral-translations/src/main/assembly/assembly.xml rename to templates/translations/module-translations/news-translations/src/main/assembly/assembly.xml diff --git a/templates/translations/news-translations/src/main/resources/en_US/commands/news/help/news_description_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/news/help/news_description_en_US.ftl similarity index 100% rename from templates/translations/news-translations/src/main/resources/en_US/commands/news/help/news_description_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/news/help/news_description_en_US.ftl diff --git a/templates/translations/news-translations/src/main/resources/en_US/commands/news/help/news_long_help_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/news/help/news_long_help_en_US.ftl similarity index 100% rename from templates/translations/news-translations/src/main/resources/en_US/commands/news/help/news_long_help_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/news/help/news_long_help_en_US.ftl diff --git a/templates/translations/news-translations/src/main/resources/en_US/commands/news/help/news_parameter_text_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/news/help/news_parameter_text_en_US.ftl similarity index 100% rename from templates/translations/news-translations/src/main/resources/en_US/commands/news/help/news_parameter_text_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/news/help/news_parameter_text_en_US.ftl diff --git a/templates/translations/news-translations/src/main/resources/en_US/commands/news/news_post_description_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/news/news_post_description_en_US.ftl similarity index 100% rename from templates/translations/news-translations/src/main/resources/en_US/commands/news/news_post_description_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/news/news_post_description_en_US.ftl diff --git a/templates/translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_description_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_description_en_US.ftl similarity index 100% rename from templates/translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_description_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_description_en_US.ftl diff --git a/templates/translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_long_help_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_long_help_en_US.ftl similarity index 100% rename from templates/translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_long_help_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_long_help_en_US.ftl diff --git a/templates/translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_parameter_newsPostId_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_parameter_newsPostId_en_US.ftl similarity index 100% rename from templates/translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_parameter_newsPostId_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_parameter_newsPostId_en_US.ftl diff --git a/templates/translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_parameter_text_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_parameter_text_en_US.ftl similarity index 100% rename from templates/translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_parameter_text_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/en_US/commands/updateNews/help/updateNews_parameter_text_en_US.ftl diff --git a/templates/translations/news-translations/src/main/resources/en_US/config/feature_news_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/en_US/config/feature_news_en_US.ftl similarity index 100% rename from templates/translations/news-translations/src/main/resources/en_US/config/feature_news_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/en_US/config/feature_news_en_US.ftl diff --git a/templates/translations/news-translations/src/main/resources/en_US/config/feature_setup_posttarget_news_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/en_US/config/feature_setup_posttarget_news_en_US.ftl similarity index 100% rename from templates/translations/news-translations/src/main/resources/en_US/config/feature_setup_posttarget_news_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/en_US/config/feature_setup_posttarget_news_en_US.ftl diff --git a/templates/translations/news-translations/src/main/resources/en_US/config/module_newsModule_description_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/en_US/config/module_newsModule_description_en_US.ftl similarity index 100% rename from templates/translations/news-translations/src/main/resources/en_US/config/module_newsModule_description_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/en_US/config/module_newsModule_description_en_US.ftl diff --git a/templates/translations/news-translations/src/main/resources/en_US/exception/news_post_locked_exception_message_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/en_US/exception/news_post_locked_exception_message_en_US.ftl similarity index 100% rename from templates/translations/news-translations/src/main/resources/en_US/exception/news_post_locked_exception_message_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/en_US/exception/news_post_locked_exception_message_en_US.ftl diff --git a/templates/translations/news-translations/src/main/resources/en_US/exception/news_post_not_found_exception_text_en_US.ftl b/templates/translations/module-translations/news-translations/src/main/resources/en_US/exception/news_post_not_found_exception_text_en_US.ftl similarity index 100% rename from templates/translations/news-translations/src/main/resources/en_US/exception/news_post_not_found_exception_text_en_US.ftl rename to templates/translations/module-translations/news-translations/src/main/resources/en_US/exception/news_post_not_found_exception_text_en_US.ftl diff --git a/templates/translations/module-translations/pom.xml b/templates/translations/module-translations/pom.xml new file mode 100644 index 0000000..a35a17c --- /dev/null +++ b/templates/translations/module-translations/pom.xml @@ -0,0 +1,22 @@ + + + + dev.sheldan.oneplus.bot.templates.translations + translations + 1.5.8-SNAPSHOT + + 4.0.0 + + dev.sheldan.oneplus.bot.templates.translations.modules + module-translations + pom + + faq-translations + news-translations + referral-translations + setup-translations + + + \ No newline at end of file diff --git a/templates/translations/referral-translations/pom.xml b/templates/translations/module-translations/referral-translations/pom.xml similarity index 90% rename from templates/translations/referral-translations/pom.xml rename to templates/translations/module-translations/referral-translations/pom.xml index 90312b3..d2d6376 100644 --- a/templates/translations/referral-translations/pom.xml +++ b/templates/translations/module-translations/referral-translations/pom.xml @@ -1,8 +1,8 @@ - translations - dev.sheldan.oneplus.bot.templates.translations + dev.sheldan.oneplus.bot.templates.translations.modules + module-translations 1.5.8-SNAPSHOT 4.0.0 diff --git a/templates/translations/setup-translations/src/main/assembly/assembly.xml b/templates/translations/module-translations/referral-translations/src/main/assembly/assembly.xml similarity index 100% rename from templates/translations/setup-translations/src/main/assembly/assembly.xml rename to templates/translations/module-translations/referral-translations/src/main/assembly/assembly.xml diff --git a/templates/translations/referral-translations/src/main/resources/en_US/config/feature_referral_en_US.ftl b/templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/feature_referral_en_US.ftl similarity index 100% rename from templates/translations/referral-translations/src/main/resources/en_US/config/feature_referral_en_US.ftl rename to templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/feature_referral_en_US.ftl diff --git a/templates/translations/referral-translations/src/main/resources/en_US/config/feature_setup_posttarget_referral_en_US.ftl b/templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/feature_setup_posttarget_referral_en_US.ftl similarity index 100% rename from templates/translations/referral-translations/src/main/resources/en_US/config/feature_setup_posttarget_referral_en_US.ftl rename to templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/feature_setup_posttarget_referral_en_US.ftl diff --git a/templates/translations/referral-translations/src/main/resources/en_US/config/referral_link_type_accessories_en_US.ftl b/templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/referral_link_type_accessories_en_US.ftl similarity index 100% rename from templates/translations/referral-translations/src/main/resources/en_US/config/referral_link_type_accessories_en_US.ftl rename to templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/referral_link_type_accessories_en_US.ftl diff --git a/templates/translations/referral-translations/src/main/resources/en_US/config/referral_link_type_smartphoneIndia_en_US.ftl b/templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/referral_link_type_smartphoneIndia_en_US.ftl similarity index 100% rename from templates/translations/referral-translations/src/main/resources/en_US/config/referral_link_type_smartphoneIndia_en_US.ftl rename to templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/referral_link_type_smartphoneIndia_en_US.ftl diff --git a/templates/translations/referral-translations/src/main/resources/en_US/config/referral_link_type_smartphone_en_US.ftl b/templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/referral_link_type_smartphone_en_US.ftl similarity index 100% rename from templates/translations/referral-translations/src/main/resources/en_US/config/referral_link_type_smartphone_en_US.ftl rename to templates/translations/module-translations/referral-translations/src/main/resources/en_US/config/referral_link_type_smartphone_en_US.ftl diff --git a/templates/translations/referral-translations/src/main/resources/en_US/listener/no_referral_link_found_en_US.ftl b/templates/translations/module-translations/referral-translations/src/main/resources/en_US/listener/no_referral_link_found_en_US.ftl similarity index 100% rename from templates/translations/referral-translations/src/main/resources/en_US/listener/no_referral_link_found_en_US.ftl rename to templates/translations/module-translations/referral-translations/src/main/resources/en_US/listener/no_referral_link_found_en_US.ftl diff --git a/templates/translations/referral-translations/src/main/resources/en_US/listener/referralListener_referral_post_description_en_US.ftl b/templates/translations/module-translations/referral-translations/src/main/resources/en_US/listener/referralListener_referral_post_description_en_US.ftl similarity index 100% rename from templates/translations/referral-translations/src/main/resources/en_US/listener/referralListener_referral_post_description_en_US.ftl rename to templates/translations/module-translations/referral-translations/src/main/resources/en_US/listener/referralListener_referral_post_description_en_US.ftl diff --git a/templates/translations/referral-translations/src/main/resources/en_US/listener/too_recent_referral_post_en_US.ftl b/templates/translations/module-translations/referral-translations/src/main/resources/en_US/listener/too_recent_referral_post_en_US.ftl similarity index 100% rename from templates/translations/referral-translations/src/main/resources/en_US/listener/too_recent_referral_post_en_US.ftl rename to templates/translations/module-translations/referral-translations/src/main/resources/en_US/listener/too_recent_referral_post_en_US.ftl diff --git a/templates/translations/setup-translations/pom.xml b/templates/translations/module-translations/setup-translations/pom.xml similarity index 90% rename from templates/translations/setup-translations/pom.xml rename to templates/translations/module-translations/setup-translations/pom.xml index 999864a..c95a657 100644 --- a/templates/translations/setup-translations/pom.xml +++ b/templates/translations/module-translations/setup-translations/pom.xml @@ -1,8 +1,8 @@ - translations - dev.sheldan.oneplus.bot.templates.translations + dev.sheldan.oneplus.bot.templates.translations.modules + module-translations 1.5.8-SNAPSHOT 4.0.0 diff --git a/templates/translations/starboard-custom-translations/src/main/assembly/assembly.xml b/templates/translations/module-translations/setup-translations/src/main/assembly/assembly.xml similarity index 100% rename from templates/translations/starboard-custom-translations/src/main/assembly/assembly.xml rename to templates/translations/module-translations/setup-translations/src/main/assembly/assembly.xml diff --git a/templates/translations/setup-translations/src/main/resources/en_US/config/feature_setup_en_US.ftl b/templates/translations/module-translations/setup-translations/src/main/resources/en_US/config/feature_setup_en_US.ftl similarity index 100% rename from templates/translations/setup-translations/src/main/resources/en_US/config/feature_setup_en_US.ftl rename to templates/translations/module-translations/setup-translations/src/main/resources/en_US/config/feature_setup_en_US.ftl diff --git a/templates/translations/setup-translations/src/main/resources/en_US/config/feature_setup_posttarget_setup_en_US.ftl b/templates/translations/module-translations/setup-translations/src/main/resources/en_US/config/feature_setup_posttarget_setup_en_US.ftl similarity index 100% rename from templates/translations/setup-translations/src/main/resources/en_US/config/feature_setup_posttarget_setup_en_US.ftl rename to templates/translations/module-translations/setup-translations/src/main/resources/en_US/config/feature_setup_posttarget_setup_en_US.ftl diff --git a/templates/translations/pom.xml b/templates/translations/pom.xml index 508d8c8..020dc50 100644 --- a/templates/translations/pom.xml +++ b/templates/translations/pom.xml @@ -11,12 +11,8 @@ translations pom - starboard-custom-translations - news-translations - setup-translations - referral-translations - faq-translations - dynamic-activity-custom-translations - moderation-custom + customization-translations + module-translations + translation-overrides \ No newline at end of file diff --git a/templates/overrides/translation-overrides/moderation/pom.xml b/templates/translations/translation-overrides/moderation-translation-overrides/pom.xml similarity index 90% rename from templates/overrides/translation-overrides/moderation/pom.xml rename to templates/translations/translation-overrides/moderation-translation-overrides/pom.xml index 052d182..1190147 100644 --- a/templates/overrides/translation-overrides/moderation/pom.xml +++ b/templates/translations/translation-overrides/moderation-translation-overrides/pom.xml @@ -1,13 +1,13 @@ - dev.sheldan.oneplus.bot.templates.overrides.translations + dev.sheldan.oneplus.bot.templates.translations.overrides translation-overrides 1.5.8-SNAPSHOT 4.0.0 - moderation + moderation-translation-overrides diff --git a/templates/translations/translation-overrides/moderation-translation-overrides/src/main/assembly/assembly.xml b/templates/translations/translation-overrides/moderation-translation-overrides/src/main/assembly/assembly.xml new file mode 100644 index 0000000..aca1e51 --- /dev/null +++ b/templates/translations/translation-overrides/moderation-translation-overrides/src/main/assembly/assembly.xml @@ -0,0 +1,15 @@ + + zip + false + + zip + + + + . + ${project.basedir}/src/main/resources + + + \ No newline at end of file diff --git a/templates/overrides/translation-overrides/moderation/src/main/resources/en_US/commands/ban/ban_notification_text_en_US.ftl b/templates/translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/commands/ban/ban_notification_text_en_US.ftl similarity index 100% rename from templates/overrides/translation-overrides/moderation/src/main/resources/en_US/commands/ban/ban_notification_text_en_US.ftl rename to templates/translations/translation-overrides/moderation-translation-overrides/src/main/resources/en_US/commands/ban/ban_notification_text_en_US.ftl diff --git a/templates/overrides/translation-overrides/pom.xml b/templates/translations/translation-overrides/pom.xml similarity index 64% rename from templates/overrides/translation-overrides/pom.xml rename to templates/translations/translation-overrides/pom.xml index 7f3e01c..439aa6b 100644 --- a/templates/overrides/translation-overrides/pom.xml +++ b/templates/translations/translation-overrides/pom.xml @@ -1,17 +1,17 @@ - overrides - dev.sheldan.oneplus.bot.templates.overrides + dev.sheldan.oneplus.bot.templates.translations + translations 1.5.8-SNAPSHOT 4.0.0 - dev.sheldan.oneplus.bot.templates.overrides.translations + dev.sheldan.oneplus.bot.templates.translations.overrides translation-overrides pom - moderation + moderation-translation-overrides