From 75a5a1ff1a679857eeed509e2e1b3f7d72b17380 Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Sun, 4 Jul 2021 13:23:33 +0200
Subject: [PATCH] [OPB-28] enabling modmail adding overrides for moderation
 colors overriding ban notification text

---
 application/executable/pom.xml                |  5 ++
 deployment/image-packaging/pom.xml            | 69 +++++++++++++++++++
 .../deployment/config/artifact_versions.json  |  7 +-
 templates/overrides/pom.xml                   |  1 +
 .../template-overrides/moderation/pom.xml     | 39 +++++++++++
 .../moderation/src/main/assembly/assembly.xml | 15 ++++
 .../colors/moderation_action_color_en_US.ftl  |  5 ++
 .../template-overrides/modmail/pom.xml        | 38 ++++++++++
 .../modmail/src/main/assembly/assembly.xml    | 15 ++++
 .../config/colors/modmail_color_en_US.ftl     |  5 ++
 .../overrides/template-overrides/pom.xml      |  2 +
 .../translation-overrides/moderation/pom.xml  | 37 ++++++++++
 .../moderation/src/main/assembly/assembly.xml | 15 ++++
 .../ban/ban_notification_text_en_US.ftl       |  1 +
 .../overrides/translation-overrides/pom.xml   | 20 ++++++
 15 files changed, 272 insertions(+), 2 deletions(-)
 create mode 100644 templates/overrides/template-overrides/moderation/pom.xml
 create mode 100644 templates/overrides/template-overrides/moderation/src/main/assembly/assembly.xml
 create mode 100644 templates/overrides/template-overrides/moderation/src/main/resources/en_US/config/colors/moderation_action_color_en_US.ftl
 create mode 100644 templates/overrides/template-overrides/modmail/pom.xml
 create mode 100644 templates/overrides/template-overrides/modmail/src/main/assembly/assembly.xml
 create mode 100644 templates/overrides/template-overrides/modmail/src/main/resources/en_US/config/colors/modmail_color_en_US.ftl
 create mode 100644 templates/overrides/translation-overrides/moderation/pom.xml
 create mode 100644 templates/overrides/translation-overrides/moderation/src/main/assembly/assembly.xml
 create mode 100644 templates/overrides/translation-overrides/moderation/src/main/resources/en_US/commands/ban/ban_notification_text_en_US.ftl
 create mode 100644 templates/overrides/translation-overrides/pom.xml

diff --git a/application/executable/pom.xml b/application/executable/pom.xml
index 22abb69..a3c85da 100644
--- a/application/executable/pom.xml
+++ b/application/executable/pom.xml
@@ -100,6 +100,11 @@
             <artifactId>starboard-impl</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>dev.sheldan.abstracto.modules</groupId>
+            <artifactId>modmail-impl</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>dev.sheldan.abstracto.modules</groupId>
             <artifactId>logging-impl</artifactId>
diff --git a/deployment/image-packaging/pom.xml b/deployment/image-packaging/pom.xml
index 21341bb..30e2654 100644
--- a/deployment/image-packaging/pom.xml
+++ b/deployment/image-packaging/pom.xml
@@ -63,6 +63,17 @@
                             <destFileName>experience-tracking.zip</destFileName>
                         </artifactItem>
 
+
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.templates</groupId>
+                            <artifactId>modmail</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <destFileName>modmail.zip</destFileName>
+                        </artifactItem>
+
                         <artifactItem>
                             <groupId>dev.sheldan.abstracto-templates.templates</groupId>
                             <artifactId>moderation</artifactId>
@@ -232,6 +243,16 @@
                             <destFileName>core.zip</destFileName>
                         </artifactItem>
 
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.translations</groupId>
+                            <artifactId>modmail</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <destFileName>modmail.zip</destFileName>
+                        </artifactItem>
+
                         <artifactItem>
                             <groupId>dev.sheldan.abstracto-templates.translations</groupId>
                             <artifactId>utility</artifactId>
@@ -241,6 +262,7 @@
                             <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
                             <destFileName>utility.zip</destFileName>
                         </artifactItem>
+
                         <artifactItem>
                             <groupId>dev.sheldan.abstracto-templates.translations</groupId>
                             <artifactId>experience-tracking</artifactId>
@@ -250,6 +272,7 @@
                             <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
                             <destFileName>experience-tracking.zip</destFileName>
                         </artifactItem>
+
                         <artifactItem>
                             <groupId>dev.sheldan.abstracto-templates.translations</groupId>
                             <artifactId>entertainment</artifactId>
@@ -259,6 +282,7 @@
                             <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
                             <destFileName>entertainment.zip</destFileName>
                         </artifactItem>
+
                         <artifactItem>
                             <groupId>dev.sheldan.abstracto-templates.translations</groupId>
                             <artifactId>moderation</artifactId>
@@ -268,6 +292,7 @@
                             <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
                             <destFileName>moderation.zip</destFileName>
                         </artifactItem>
+
                         <artifactItem>
                             <groupId>dev.sheldan.abstracto-templates.translations</groupId>
                             <artifactId>link-embed</artifactId>
@@ -277,6 +302,7 @@
                             <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
                             <destFileName>link-embed.zip</destFileName>
                         </artifactItem>
+
                         <artifactItem>
                             <groupId>dev.sheldan.abstracto-templates.translations</groupId>
                             <artifactId>starboard</artifactId>
@@ -452,6 +478,17 @@
                             <destFileName>utility.zip</destFileName>
                         </artifactItem>
 
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto.modules</groupId>
+                            <artifactId>modmail-impl</artifactId>
+                            <version>${abstracto.version}</version>
+                            <classifier>liquibase</classifier>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <destFileName>modmail.zip</destFileName>
+                        </artifactItem>
+
                         <artifactItem>
                             <groupId>dev.sheldan.abstracto.modules</groupId>
                             <artifactId>moderation-impl</artifactId>
@@ -695,6 +732,38 @@
                             <destFileName>overrides-templates-statistic.zip</destFileName>
                         </artifactItem>
 
+                        <artifactItem>
+                            <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
+                            <artifactId>modmail</artifactId>
+                            <version>${project.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <destFileName>overrides-templates-modmail.zip</destFileName>
+                        </artifactItem>
+
+                        <artifactItem>
+                            <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
+                            <artifactId>moderation</artifactId>
+                            <version>${project.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <destFileName>overrides-templates-moderation.zip</destFileName>
+                        </artifactItem>
+
+                        <!-- overrides translations -->
+                        <artifactItem>
+                            <groupId>dev.sheldan.oneplus.bot.templates.overrides.translations</groupId>
+                            <artifactId>moderation</artifactId>
+                            <version>${project.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <destFileName>overrides-translation-moderation.zip</destFileName>
+                        </artifactItem>
+
+
                     </artifactItems>
                 </configuration>
             </plugin>
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 c16453a..2e5c43a 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,12 +1,14 @@
 {
   "template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "remind", "logging",
-    "suggestion", "invite-filter", "profanity-filter", "statistic", "experience-tracking", "moderation",
+    "suggestion", "invite-filter", "profanity-filter", "statistic", "experience-tracking", "moderation", "modmail",
     "starboard-custom",
     "overrides-templates-webservices", "overrides-templates-core", "overrides-templates-logging", "overrides-templates-statistic",
+    "overrides-templates-modmail", "overrides-templates-moderation",
     "news", "referral", "faq"],
   "translation_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "suggestion",
-    "remind", "logging", "invite-filter", "profanity-filter", "statistic", "experience-tracking", "moderation",
+    "remind", "logging", "invite-filter", "profanity-filter", "statistic", "experience-tracking", "moderation", "modmail",
     "starboard-custom",
+    "overrides-translation-moderation",
     "news", "setup", "referral", "faq"],
   "liquibase_artifacts": [
     { "zip": "scheduling", "file": "scheduling-changeLog.xml" },
@@ -24,6 +26,7 @@
     { "zip": "statistic", "file": "statistic-changeLog.xml"},
     { "zip": "experience-tracking", "file": "experience-changeLog.xml"},
     { "zip": "moderation", "file": "moderation-changeLog.xml"},
+    { "zip": "modmail", "file": "modMail-changeLog.xml"},
     { "zip": "setup", "file": "setup-changeLog.xml"},
     { "zip": "referral", "file": "referral-changeLog.xml"},
     { "zip": "starboard-custom", "file": "starboard-custom-changeLog.xml"},
diff --git a/templates/overrides/pom.xml b/templates/overrides/pom.xml
index 855f0ae..bb9b825 100644
--- a/templates/overrides/pom.xml
+++ b/templates/overrides/pom.xml
@@ -13,6 +13,7 @@
 
     <modules>
         <module>template-overrides</module>
+        <module>translation-overrides</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/templates/overrides/template-overrides/moderation/pom.xml b/templates/overrides/template-overrides/moderation/pom.xml
new file mode 100644
index 0000000..e9b0f75
--- /dev/null
+++ b/templates/overrides/template-overrides/moderation/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>template-overrides</artifactId>
+        <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
+        <version>1.4.5-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>moderation</artifactId>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <finalName>template-overrides-moderation-${project.version}</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/main/assembly/assembly.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
\ No newline at end of file
diff --git a/templates/overrides/template-overrides/moderation/src/main/assembly/assembly.xml b/templates/overrides/template-overrides/moderation/src/main/assembly/assembly.xml
new file mode 100644
index 0000000..aca1e51
--- /dev/null
+++ b/templates/overrides/template-overrides/moderation/src/main/assembly/assembly.xml
@@ -0,0 +1,15 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>zip</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <outputDirectory>.</outputDirectory>
+            <directory>${project.basedir}/src/main/resources</directory>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/templates/overrides/template-overrides/moderation/src/main/resources/en_US/config/colors/moderation_action_color_en_US.ftl b/templates/overrides/template-overrides/moderation/src/main/resources/en_US/config/colors/moderation_action_color_en_US.ftl
new file mode 100644
index 0000000..06457df
--- /dev/null
+++ b/templates/overrides/template-overrides/moderation/src/main/resources/en_US/config/colors/moderation_action_color_en_US.ftl
@@ -0,0 +1,5 @@
+"color" : {
+    "r": 151,
+    "g": 0,
+    "b": 69
+}
\ No newline at end of file
diff --git a/templates/overrides/template-overrides/modmail/pom.xml b/templates/overrides/template-overrides/modmail/pom.xml
new file mode 100644
index 0000000..b2995ed
--- /dev/null
+++ b/templates/overrides/template-overrides/modmail/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>template-overrides</artifactId>
+        <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
+        <version>1.4.5-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>modmail</artifactId>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <finalName>template-overrides-modmail-${project.version}</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/main/assembly/assembly.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/templates/overrides/template-overrides/modmail/src/main/assembly/assembly.xml b/templates/overrides/template-overrides/modmail/src/main/assembly/assembly.xml
new file mode 100644
index 0000000..aca1e51
--- /dev/null
+++ b/templates/overrides/template-overrides/modmail/src/main/assembly/assembly.xml
@@ -0,0 +1,15 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>zip</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <outputDirectory>.</outputDirectory>
+            <directory>${project.basedir}/src/main/resources</directory>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/templates/overrides/template-overrides/modmail/src/main/resources/en_US/config/colors/modmail_color_en_US.ftl b/templates/overrides/template-overrides/modmail/src/main/resources/en_US/config/colors/modmail_color_en_US.ftl
new file mode 100644
index 0000000..06457df
--- /dev/null
+++ b/templates/overrides/template-overrides/modmail/src/main/resources/en_US/config/colors/modmail_color_en_US.ftl
@@ -0,0 +1,5 @@
+"color" : {
+    "r": 151,
+    "g": 0,
+    "b": 69
+}
\ No newline at end of file
diff --git a/templates/overrides/template-overrides/pom.xml b/templates/overrides/template-overrides/pom.xml
index c86446e..102b0a7 100644
--- a/templates/overrides/template-overrides/pom.xml
+++ b/templates/overrides/template-overrides/pom.xml
@@ -17,6 +17,8 @@
         <module>core</module>
         <module>logging</module>
         <module>statistic</module>
+        <module>modmail</module>
+        <module>moderation</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/templates/overrides/translation-overrides/moderation/pom.xml b/templates/overrides/translation-overrides/moderation/pom.xml
new file mode 100644
index 0000000..6d0a8d3
--- /dev/null
+++ b/templates/overrides/translation-overrides/moderation/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>dev.sheldan.oneplus.bot.templates.overrides.translations</groupId>
+        <artifactId>translation-overrides</artifactId>
+        <version>1.4.5-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>moderation</artifactId>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <finalName>translation-overrides-moderation-${project.version}</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/main/assembly/assembly.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/templates/overrides/translation-overrides/moderation/src/main/assembly/assembly.xml b/templates/overrides/translation-overrides/moderation/src/main/assembly/assembly.xml
new file mode 100644
index 0000000..aca1e51
--- /dev/null
+++ b/templates/overrides/translation-overrides/moderation/src/main/assembly/assembly.xml
@@ -0,0 +1,15 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>zip</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <outputDirectory>.</outputDirectory>
+            <directory>${project.basedir}/src/main/resources</directory>
+        </fileSet>
+    </fileSets>
+</assembly>
\ 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/overrides/translation-overrides/moderation/src/main/resources/en_US/commands/ban/ban_notification_text_en_US.ftl
new file mode 100644
index 0000000..6bc6efe
--- /dev/null
+++ b/templates/overrides/translation-overrides/moderation/src/main/resources/en_US/commands/ban/ban_notification_text_en_US.ftl
@@ -0,0 +1 @@
+You were banned from the server ${serverName} for `${reason}`. You can appeal at: oneplus.appeals@pm.me.
\ No newline at end of file
diff --git a/templates/overrides/translation-overrides/pom.xml b/templates/overrides/translation-overrides/pom.xml
new file mode 100644
index 0000000..686d731
--- /dev/null
+++ b/templates/overrides/translation-overrides/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>overrides</artifactId>
+        <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
+        <version>1.4.5-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>dev.sheldan.oneplus.bot.templates.overrides.translations</groupId>
+    <artifactId>translation-overrides</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>moderation</module>
+    </modules>
+
+
+</project>
\ No newline at end of file