From 9f773abd7eae83c25072dbde29b61cc44fae21d7 Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Sat, 24 Apr 2021 16:06:10 +0200 Subject: [PATCH] [OPB-13] adding logging module and customizing leave message templates --- application/executable/pom.xml | 5 +++ ...wsMessageSourceMessageUpdatedListener.java | 8 ++-- deployment/image-packaging/pom.xml | 41 +++++++++++++++++++ .../deployment/config/artifact_versions.json | 7 ++-- .../template-overrides/logging/pom.xml | 38 +++++++++++++++++ .../logging/src/main/assembly/assembly.xml | 15 +++++++ .../user_joined/user_join_embed_en_US.ftl | 4 ++ .../user_left/user_leave_embed_en_US.ftl | 4 ++ .../overrides/template-overrides/pom.xml | 3 +- 9 files changed, 116 insertions(+), 9 deletions(-) create mode 100644 templates/overrides/template-overrides/logging/pom.xml create mode 100644 templates/overrides/template-overrides/logging/src/main/assembly/assembly.xml create mode 100644 templates/overrides/template-overrides/logging/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl create mode 100644 templates/overrides/template-overrides/logging/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl diff --git a/application/executable/pom.xml b/application/executable/pom.xml index 01dd698..c931ff3 100644 --- a/application/executable/pom.xml +++ b/application/executable/pom.xml @@ -95,6 +95,11 @@ starboard-impl + + dev.sheldan.abstracto.modules + logging-impl + + dev.sheldan.oneplus.bot.application.custom starboard-custom diff --git a/application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/listener/NewsMessageSourceMessageUpdatedListener.java b/application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/listener/NewsMessageSourceMessageUpdatedListener.java index e250c19..b16fed0 100644 --- a/application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/listener/NewsMessageSourceMessageUpdatedListener.java +++ b/application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/listener/NewsMessageSourceMessageUpdatedListener.java @@ -2,8 +2,8 @@ package dev.sheldan.oneplus.bot.modules.news.listener; import dev.sheldan.abstracto.core.config.FeatureDefinition; import dev.sheldan.abstracto.core.listener.DefaultListenerResult; -import dev.sheldan.abstracto.core.listener.async.jda.AsyncMessageTextUpdatedListener; -import dev.sheldan.abstracto.core.models.listener.MessageTextUpdatedModel; +import dev.sheldan.abstracto.core.listener.async.jda.AsyncMessageUpdatedListener; +import dev.sheldan.abstracto.core.models.listener.MessageUpdatedModel; import dev.sheldan.oneplus.bot.modules.news.config.NewsFeatureDefinition; import dev.sheldan.oneplus.bot.modules.news.model.database.NewsPost; import dev.sheldan.oneplus.bot.modules.news.service.NewsServiceBean; @@ -16,7 +16,7 @@ import java.util.Optional; @Component @Slf4j -public class NewsMessageSourceMessageUpdatedListener implements AsyncMessageTextUpdatedListener { +public class NewsMessageSourceMessageUpdatedListener implements AsyncMessageUpdatedListener { @Autowired private NewsPostManagementServiceBean newsPostManagementServiceBean; @@ -25,7 +25,7 @@ public class NewsMessageSourceMessageUpdatedListener implements AsyncMessageText private NewsServiceBean newsServiceBean; @Override - public DefaultListenerResult execute(MessageTextUpdatedModel model) { + public DefaultListenerResult execute(MessageUpdatedModel model) { Optional existingPostOptional = newsPostManagementServiceBean.getNewsPostForSourceMessage(model.getAfter().getIdLong()); if(existingPostOptional.isPresent()) { NewsPost newsPost = existingPostOptional.get(); diff --git a/deployment/image-packaging/pom.xml b/deployment/image-packaging/pom.xml index 147d72d..9cce141 100644 --- a/deployment/image-packaging/pom.xml +++ b/deployment/image-packaging/pom.xml @@ -109,6 +109,16 @@ remind.zip + + dev.sheldan.abstracto-templates.templates + logging + ${abstracto.templates.version} + zip + true + ${file.basedir}/deployment/template-artifacts/ + logging.zip + + dev.sheldan.oneplus.bot.templates.modules starboard-custom-templates @@ -206,6 +216,16 @@ remind.zip + + dev.sheldan.abstracto-templates.translations + logging + ${abstracto.templates.version} + zip + true + ${file.basedir}/deployment/translation-artifacts/ + logging.zip + + dev.sheldan.oneplus.bot.templates.translations starboard-custom @@ -328,6 +348,17 @@ remind.zip + + dev.sheldan.abstracto.modules + logging-impl + ${abstracto.version} + liquibase + zip + true + ${file.basedir}/deployment/liquibase-artifacts/ + logging.zip + + dev.sheldan.oneplus.bot.application.custom @@ -373,6 +404,16 @@ overrides-templates-webservices.zip + + dev.sheldan.oneplus.bot.templates.overrides.templates + logging + ${project.version} + zip + true + ${file.basedir}/deployment/template-artifacts/ + overrides-templates-logging.zip + + diff --git a/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json b/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json index f47623b..60cd5ef 100644 --- a/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json +++ b/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json @@ -1,8 +1,8 @@ { - "template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "remind", - "starboard-custom", "overrides-templates-webservices", "overrides-templates-core", "news"], + "template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "remind", "logging", + "starboard-custom", "overrides-templates-webservices", "overrides-templates-core", "overrides-templates-logging", "news"], "translation_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", - "remind", "starboard-custom", "news"], + "remind", "logging", "starboard-custom", "news"], "liquibase_artifacts": [ { "zip": "scheduling", "file": "scheduling-changeLog.xml" }, { "zip": "core", "file": "core-changeLog.xml" }, @@ -12,6 +12,7 @@ { "zip": "webservices", "file": "webservices-changeLog.xml"}, { "zip": "starboard", "file": "starboard-changeLog.xml"}, { "zip": "remind", "file": "remind-changeLog.xml"}, + { "zip": "logging", "file": "logging-changeLog.xml"}, { "zip": "starboard-custom", "file": "starboard-custom-changeLog.xml"}, { "zip": "news", "file": "news-changeLog.xml"} ] diff --git a/templates/overrides/template-overrides/logging/pom.xml b/templates/overrides/template-overrides/logging/pom.xml new file mode 100644 index 0000000..13b648d --- /dev/null +++ b/templates/overrides/template-overrides/logging/pom.xml @@ -0,0 +1,38 @@ + + + + dev.sheldan.oneplus.bot.templates.overrides.templates + template-overrides + 1.3.9-SNAPSHOT + + 4.0.0 + + logging + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + package + + single + + + template-overrides-logging-${project.version} + false + + src/main/assembly/assembly.xml + + + + + + + + + \ No newline at end of file diff --git a/templates/overrides/template-overrides/logging/src/main/assembly/assembly.xml b/templates/overrides/template-overrides/logging/src/main/assembly/assembly.xml new file mode 100644 index 0000000..aca1e51 --- /dev/null +++ b/templates/overrides/template-overrides/logging/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/template-overrides/logging/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl b/templates/overrides/template-overrides/logging/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl new file mode 100644 index 0000000..8fe6172 --- /dev/null +++ b/templates/overrides/template-overrides/logging/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl @@ -0,0 +1,4 @@ +{ +<#assign user>${member.user.name}#${member.user.discriminator} (${member.asMention}: ${member.id}) + "additionalMessage": "<@safe_include "user_joined_text"/>" +} \ No newline at end of file diff --git a/templates/overrides/template-overrides/logging/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl b/templates/overrides/template-overrides/logging/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl new file mode 100644 index 0000000..879c7a0 --- /dev/null +++ b/templates/overrides/template-overrides/logging/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl @@ -0,0 +1,4 @@ +{ +<#assign user>${user.name}#${user.discriminator} (${user.id}) + "additionalMessage": "<@safe_include "user_left_text"/>" +} \ No newline at end of file diff --git a/templates/overrides/template-overrides/pom.xml b/templates/overrides/template-overrides/pom.xml index ef7e8fd..b5ad8b7 100644 --- a/templates/overrides/template-overrides/pom.xml +++ b/templates/overrides/template-overrides/pom.xml @@ -15,8 +15,7 @@ webservices core + logging - - \ No newline at end of file