diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 66563cf..07ddbef 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.2.6 + ABSTRACTO_VERSION: 1.2.7 ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/ \ No newline at end of file diff --git a/deployment/image-packaging/pom.xml b/deployment/image-packaging/pom.xml index 64248bb..96b2f8a 100644 --- a/deployment/image-packaging/pom.xml +++ b/deployment/image-packaging/pom.xml @@ -287,6 +287,17 @@ starboard-custom.zip + + + dev.sheldan.oneplus.bot.templates.overrides.templates + webservices + ${project.version} + zip + true + ${file.basedir}/deployment/template-artifacts/ + overrides-templates-webservices.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 5234852..de6c3f8 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,5 +1,5 @@ { - "template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "starboard-custom"], + "template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "starboard-custom", "overrides-templates-webservices"], "translation_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "starboard-custom"], "liquibase_artifacts": [ { "zip": "scheduling", "file": "scheduling-changeLog.xml" }, diff --git a/pom.xml b/pom.xml index 34f3dc1..78ef000 100644 --- a/pom.xml +++ b/pom.xml @@ -18,8 +18,9 @@ 1.8 1.8 - 1.2.6 - 1.2.2 + + 1.2.7 + 1.2.3 diff --git a/templates/overrides/pom.xml b/templates/overrides/pom.xml new file mode 100644 index 0000000..244649e --- /dev/null +++ b/templates/overrides/pom.xml @@ -0,0 +1,20 @@ + + + + dev.sheldan.oneplus.bot.templates + templates + 1.3.7-SNAPSHOT + + 4.0.0 + + dev.sheldan.oneplus.bot.templates.overrides + overrides + pom + + + template-overrides + + + \ No newline at end of file diff --git a/templates/overrides/template-overrides/pom.xml b/templates/overrides/template-overrides/pom.xml new file mode 100644 index 0000000..9c2ba9e --- /dev/null +++ b/templates/overrides/template-overrides/pom.xml @@ -0,0 +1,23 @@ + + + + dev.sheldan.oneplus.bot.templates.overrides + overrides + 1.3.7-SNAPSHOT + + 4.0.0 + + dev.sheldan.oneplus.bot.templates.overrides.templates + template-overrides + pom + + + + webservices + + + + + \ No newline at end of file diff --git a/templates/overrides/template-overrides/webservices/pom.xml b/templates/overrides/template-overrides/webservices/pom.xml new file mode 100644 index 0000000..e2985dd --- /dev/null +++ b/templates/overrides/template-overrides/webservices/pom.xml @@ -0,0 +1,39 @@ + + + + dev.sheldan.oneplus.bot.templates.overrides.templates + template-overrides + 1.3.7-SNAPSHOT + + 4.0.0 + + webservices + pom + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + package + + single + + + template-overrides-webservices-${project.version} + false + + src/main/assembly/assembly.xml + + + + + + + + + \ No newline at end of file diff --git a/templates/overrides/template-overrides/webservices/src/main/assembly/assembly.xml b/templates/overrides/template-overrides/webservices/src/main/assembly/assembly.xml new file mode 100644 index 0000000..aca1e51 --- /dev/null +++ b/templates/overrides/template-overrides/webservices/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/webservices/src/main/resources/en_US/urban/commands/urbanDefine/urban_define_response_model_embed_en_US.ftl b/templates/overrides/template-overrides/webservices/src/main/resources/en_US/urban/commands/urbanDefine/urban_define_response_model_embed_en_US.ftl new file mode 100644 index 0000000..5d5e4fd --- /dev/null +++ b/templates/overrides/template-overrides/webservices/src/main/resources/en_US/urban/commands/urbanDefine/urban_define_response_model_embed_en_US.ftl @@ -0,0 +1,17 @@ +{ + <#include "abstracto_color">, + "fields": [ + { + "name": "<@safe_include "urban_search_command_response_embed_field_title_link"/>", + "value": "[<@safe_include "urban_search_command_response_embed_field_value_jump"/>](${definition.url?json_string})", + "inline": "true" + }, + { + "name": "<@safe_include "urban_search_command_response_embed_field_title_example"/>", + "value": "${definition.example?json_string}" + } + ], + "timeStamp": "${definition.creationDate}", + "additionalMessage": "${definition.definition?json_string}", + "messageLimit": 1 +} \ No newline at end of file diff --git a/templates/pom.xml b/templates/pom.xml index f52cf27..5e2f855 100644 --- a/templates/pom.xml +++ b/templates/pom.xml @@ -10,6 +10,7 @@ oneplus-bot-modules translations + overrides dev.sheldan.oneplus.bot.templates