diff --git a/application/executable/pom.xml b/application/executable/pom.xml
index 5e068d40..c1ab007b 100644
--- a/application/executable/pom.xml
+++ b/application/executable/pom.xml
@@ -120,6 +120,16 @@
modmail-impl
+
+ dev.sheldan.abstracto.modules
+ experience-tracking-impl
+
+
+
+ dev.sheldan.abstracto.modules
+ logging-impl
+
+
diff --git a/deployment/image-packaging/pom.xml b/deployment/image-packaging/pom.xml
index 30626fe7..d75c65a0 100644
--- a/deployment/image-packaging/pom.xml
+++ b/deployment/image-packaging/pom.xml
@@ -63,6 +63,16 @@
assignable-roles.zip
+
+ dev.sheldan.abstracto-templates.templates
+ experience-tracking
+ ${abstracto.templates.version}
+ zip
+ true
+ ${file.basedir}/deployment/template-artifacts/
+ experience-tracking.zip
+
+
dev.sheldan.abstracto-templates.templates
modmail
@@ -228,6 +238,16 @@
link-embed.zip
+
+ dev.sheldan.abstracto-templates.translations
+ experience-tracking
+ ${abstracto.templates.version}
+ zip
+ true
+ ${file.basedir}/deployment/translation-artifacts/
+ experience-tracking.zip
+
+
dev.sheldan.abstracto-templates.translations
modmail
@@ -396,6 +416,28 @@
link-embed.zip
+
+ dev.sheldan.abstracto.modules
+ experience-tracking-impl
+ ${abstracto.version}
+ liquibase
+ zip
+ true
+ ${file.basedir}/deployment/liquibase-artifacts/
+ experience-tracking.zip
+
+
+
+ dev.sheldan.abstracto.modules
+ logging-impl
+ ${abstracto.version}
+ liquibase
+ zip
+ true
+ ${file.basedir}/deployment/liquibase-artifacts/
+ logging.zip
+
+
dev.sheldan.abstracto.modules
starboard-impl
@@ -587,6 +629,26 @@
moderation-template-overrides.zip
+
+ dev.sheldan.sissi.templates
+ experience-template-overrides
+ ${project.version}
+ zip
+ true
+ ${file.basedir}/deployment/template-artifacts/
+ experience-template-overrides.zip
+
+
+
+ dev.sheldan.sissi.templates
+ logging-template-overrides
+ ${project.version}
+ zip
+ true
+ ${file.basedir}/deployment/template-artifacts/
+ logging-template-overrides.zip
+
+
@@ -599,6 +661,26 @@
moderation-translation-overrides.zip
+
+ dev.sheldan.sissi.templates.translations.overrides
+ experience-translation-overrides
+ ${project.version}
+ zip
+ true
+ ${file.basedir}/deployment/translation-artifacts/
+ experience-translation-overrides.zip
+
+
+
+ dev.sheldan.sissi.templates.translations.overrides
+ logging-translation-overrides
+ ${project.version}
+ zip
+ true
+ ${file.basedir}/deployment/translation-artifacts/
+ logging-translation-overrides.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 09ac03e4..2e529262 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,21 +1,23 @@
{
"template_artifacts": [
- "core","starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices", "remind", "suggestion", "modmail", "assignable-roles",
+ "core","starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices", "remind", "suggestion", "modmail", "assignable-roles", "experience-tracking",
"quotes", "meetup", "debra",
"moderation-custom",
- "moderation-template-overrides"
+ "moderation-template-overrides", "experience-template-overrides", "logging-template-overrides"
],
"translation_artifacts": [
"core",
- "starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices", "suggestion", "remind", "modmail", "assignable-roles",
+ "starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices", "suggestion", "remind", "modmail", "assignable-roles", "experience-tracking",
"quotes", "meetup", "debra",
"moderation-custom",
- "moderation-translation-overrides"
+ "moderation-translation-overrides", "experience-translation-overrides", "logging-translation-overrides"
],
"liquibase_artifacts": [
{ "zip": "scheduling", "file": "scheduling-changeLog.xml" },
{ "zip": "core", "file": "core-changeLog.xml" },
{ "zip": "link-embed", "file": "link-embed-changeLog.xml"},
+ { "zip": "experience-tracking", "file": "experience-changeLog.xml"},
+ { "zip": "logging", "file": "logging-changeLog.xml"},
{ "zip": "starboard", "file": "starboard-changeLog.xml"},
{ "zip": "quotes", "file": "quotes-changeLog.xml"},
{ "zip": "meetup", "file": "meetup-changeLog.xml"},
diff --git a/pom.xml b/pom.xml
index 806f107e..2c27709b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@
1.8
- 1.4.7
- 1.4.5
+ 1.4.8-SNAPSHOT
+ 1.4.6-SNAPSHOT
diff --git a/templates/sissi-templates/template-overrides/experience-template-overrides/pom.xml b/templates/sissi-templates/template-overrides/experience-template-overrides/pom.xml
new file mode 100644
index 00000000..06c48b1c
--- /dev/null
+++ b/templates/sissi-templates/template-overrides/experience-template-overrides/pom.xml
@@ -0,0 +1,35 @@
+
+
+
+ dev.sheldan.sissi.templates
+ template-overrides
+ 1.3.6-SNAPSHOT
+
+ 4.0.0
+
+ experience-template-overrides
+
+
+
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+
+
+ package
+
+ single
+
+
+ experience-template-overrides-${project.version}
+ false
+
+ src/main/assembly/assembly.xml
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/templates/sissi-templates/template-overrides/experience-template-overrides/src/main/assembly/assembly.xml b/templates/sissi-templates/template-overrides/experience-template-overrides/src/main/assembly/assembly.xml
new file mode 100644
index 00000000..aca1e510
--- /dev/null
+++ b/templates/sissi-templates/template-overrides/experience-template-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/sissi-templates/template-overrides/experience-template-overrides/src/main/resources/en_US/listener/experienceTrackerListener/experience_level_up_notification_text_en_US.ftl b/templates/sissi-templates/template-overrides/experience-template-overrides/src/main/resources/en_US/listener/experienceTrackerListener/experience_level_up_notification_text_en_US.ftl
new file mode 100644
index 00000000..c6dc3cf5
--- /dev/null
+++ b/templates/sissi-templates/template-overrides/experience-template-overrides/src/main/resources/en_US/listener/experienceTrackerListener/experience_level_up_notification_text_en_US.ftl
@@ -0,0 +1,7 @@
+{
+ <#assign userMention=memberDisplay.memberMention>
+ <#assign pastLevel=oldLevel>
+ <#assign currentLevel=newLevel>
+ <#setting locale="de_DE">
+ "additionalMessage": "<@safe_include "experience_level_up_notification_text"/>"
+}
diff --git a/templates/sissi-templates/template-overrides/logging-template-overrides/pom.xml b/templates/sissi-templates/template-overrides/logging-template-overrides/pom.xml
new file mode 100644
index 00000000..b811a3e2
--- /dev/null
+++ b/templates/sissi-templates/template-overrides/logging-template-overrides/pom.xml
@@ -0,0 +1,35 @@
+
+
+
+ dev.sheldan.sissi.templates
+ template-overrides
+ 1.3.6-SNAPSHOT
+
+ 4.0.0
+
+ logging-template-overrides
+
+
+
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+
+
+ package
+
+ single
+
+
+ logging-template-overrides-${project.version}
+ false
+
+ src/main/assembly/assembly.xml
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/templates/sissi-templates/template-overrides/logging-template-overrides/src/main/assembly/assembly.xml b/templates/sissi-templates/template-overrides/logging-template-overrides/src/main/assembly/assembly.xml
new file mode 100644
index 00000000..aca1e510
--- /dev/null
+++ b/templates/sissi-templates/template-overrides/logging-template-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/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl b/templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl
new file mode 100644
index 00000000..98e15817
--- /dev/null
+++ b/templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl
@@ -0,0 +1,6 @@
+{
+ <#assign userMention>${member.asMention}#assign>
+ <#assign user>${member.user.name}#${member.user.discriminator} (${member.asMention}: ${member.id})#assign>
+ <#setting locale="de_DE">
+ "additionalMessage": "<@safe_include "user_joined_text"/>"
+}
\ No newline at end of file
diff --git a/templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl b/templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl
new file mode 100644
index 00000000..a1f9ad39
--- /dev/null
+++ b/templates/sissi-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl
@@ -0,0 +1,5 @@
+{
+ <#assign userName>${user.name}#${user.discriminator} (${user.id})#assign>
+ <#setting locale="de_DE">
+ "additionalMessage": "<@safe_include "user_left_text"/>"
+}
\ No newline at end of file
diff --git a/templates/sissi-templates/template-overrides/pom.xml b/templates/sissi-templates/template-overrides/pom.xml
index a7cc1668..efd8dd5e 100644
--- a/templates/sissi-templates/template-overrides/pom.xml
+++ b/templates/sissi-templates/template-overrides/pom.xml
@@ -11,6 +11,8 @@
pom
moderation-template-overrides
+ experience-template-overrides
+ logging-template-overrides
\ No newline at end of file
diff --git a/templates/sissi-translations/translation-overrides/experience-translation-overrides/pom.xml b/templates/sissi-translations/translation-overrides/experience-translation-overrides/pom.xml
new file mode 100644
index 00000000..447f5c82
--- /dev/null
+++ b/templates/sissi-translations/translation-overrides/experience-translation-overrides/pom.xml
@@ -0,0 +1,36 @@
+
+
+
+ dev.sheldan.sissi.templates.translations.overrides
+ translation-overrides
+ 1.3.6-SNAPSHOT
+
+ 4.0.0
+
+ experience-translation-overrides
+ pom
+
+
+
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+
+
+ package
+
+ single
+
+
+ experience-translation-overrides-${project.version}
+ false
+
+ src/main/assembly/assembly.xml
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/templates/sissi-translations/translation-overrides/experience-translation-overrides/src/main/assembly/assembly.xml b/templates/sissi-translations/translation-overrides/experience-translation-overrides/src/main/assembly/assembly.xml
new file mode 100644
index 00000000..aca1e510
--- /dev/null
+++ b/templates/sissi-translations/translation-overrides/experience-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/sissi-translations/translation-overrides/experience-translation-overrides/src/main/resources/de_DE/listener/experienceTrackerListener/experience_level_up_notification_text_de_DE.ftl b/templates/sissi-translations/translation-overrides/experience-translation-overrides/src/main/resources/de_DE/listener/experienceTrackerListener/experience_level_up_notification_text_de_DE.ftl
new file mode 100644
index 00000000..48de7734
--- /dev/null
+++ b/templates/sissi-translations/translation-overrides/experience-translation-overrides/src/main/resources/de_DE/listener/experienceTrackerListener/experience_level_up_notification_text_de_DE.ftl
@@ -0,0 +1 @@
+Sauber ${userMention}, host level ${currentLevel} erreicht!
\ No newline at end of file
diff --git a/templates/sissi-translations/translation-overrides/logging-translation-overrides/pom.xml b/templates/sissi-translations/translation-overrides/logging-translation-overrides/pom.xml
new file mode 100644
index 00000000..0e36a671
--- /dev/null
+++ b/templates/sissi-translations/translation-overrides/logging-translation-overrides/pom.xml
@@ -0,0 +1,36 @@
+
+
+
+ dev.sheldan.sissi.templates.translations.overrides
+ translation-overrides
+ 1.3.6-SNAPSHOT
+
+ 4.0.0
+
+ logging-translation-overrides
+ pom
+
+
+
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+
+
+ package
+
+ single
+
+
+ logging-translation-overrides-${project.version}
+ false
+
+ src/main/assembly/assembly.xml
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/templates/sissi-translations/translation-overrides/logging-translation-overrides/src/main/assembly/assembly.xml b/templates/sissi-translations/translation-overrides/logging-translation-overrides/src/main/assembly/assembly.xml
new file mode 100644
index 00000000..aca1e510
--- /dev/null
+++ b/templates/sissi-translations/translation-overrides/logging-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/sissi-translations/translation-overrides/logging-translation-overrides/src/main/resources/de_DE/listener/user_joined/user_joined_text_de_DE.ftl b/templates/sissi-translations/translation-overrides/logging-translation-overrides/src/main/resources/de_DE/listener/user_joined/user_joined_text_de_DE.ftl
new file mode 100644
index 00000000..729801f5
--- /dev/null
+++ b/templates/sissi-translations/translation-overrides/logging-translation-overrides/src/main/resources/de_DE/listener/user_joined/user_joined_text_de_DE.ftl
@@ -0,0 +1 @@
+Seas und griaß di, ${userMention}!
\ No newline at end of file
diff --git a/templates/sissi-translations/translation-overrides/logging-translation-overrides/src/main/resources/de_DE/listener/user_left/user_left_text_de_DE.ftl b/templates/sissi-translations/translation-overrides/logging-translation-overrides/src/main/resources/de_DE/listener/user_left/user_left_text_de_DE.ftl
new file mode 100644
index 00000000..db564b9a
--- /dev/null
+++ b/templates/sissi-translations/translation-overrides/logging-translation-overrides/src/main/resources/de_DE/listener/user_left/user_left_text_de_DE.ftl
@@ -0,0 +1 @@
+Dere, pfiatdi und baba, ${userName}!
\ No newline at end of file
diff --git a/templates/sissi-translations/translation-overrides/pom.xml b/templates/sissi-translations/translation-overrides/pom.xml
index efe335ae..485f3771 100644
--- a/templates/sissi-translations/translation-overrides/pom.xml
+++ b/templates/sissi-translations/translation-overrides/pom.xml
@@ -13,6 +13,8 @@
moderation-translation-overrides
+ experience-translation-overrides
+ logging-translation-overrides
\ No newline at end of file