From 73ca42bd66a31d37fbdccde07b2f084645ce53e3 Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Sat, 24 Apr 2021 16:03:07 +0200
Subject: [PATCH] [AB-232] splitting logging functionality to separate module
 changing user join/leave template to be an embed

---
 .../en_US/events/user_join_en_US.ftl          |  1 -
 .../en_US/events/user_leave_en_US.ftl         |  1 -
 abstracto-modules/logging/pom.xml             | 38 +++++++++++++++++++
 .../logging/src/main/assembly/assembly.xml    | 15 ++++++++
 ...message_deleted_attachment_embed_en_US.ftl |  0
 .../message_deleted_embed_en_US.ftl           |  0
 .../message_edited_embed_en_US.ftl            |  0
 .../user_joined/user_join_embed_en_US.ftl     |  5 +++
 .../user_left/user_leave_embed_en_US.ftl      |  5 +++
 abstracto-modules/pom.xml                     |  1 +
 translations/logging/pom.xml                  | 37 ++++++++++++++++++
 .../logging/src/main/assembly/assembly.xml    | 15 ++++++++
 .../en_US/config/feature_logging_en_US.ftl    |  0
 ...ature_setup_posttarget_deleteLog_en_US.ftl |  0
 ...feature_setup_posttarget_editLog_en_US.ftl |  0
 ...feature_setup_posttarget_joinLog_en_US.ftl |  0
 ...eature_setup_posttarget_leaveLog_en_US.ftl |  0
 ...messageDeleted_attachment_footer_en_US.ftl |  0
 ...ted_attachment_link_display_text_en_US.ftl |  0
 ...eted_attachment_link_field_title_en_US.ftl |  0
 .../messageDeleted_description_text_en_US.ftl |  0
 ...Deleted_message_link_field_title_en_US.ftl |  0
 ...ted_original_message_field_title_en_US.ftl |  0
 .../messageEdited_description_text_en_US.ftl  |  0
 .../messageEdited_link_field_title_en_US.ftl  |  0
 ...geEdited_new_message_field_title_en_US.ftl |  0
 ...ted_original_message_field_title_en_US.ftl |  0
 .../user_joined/user_joined_text_en_US.ftl    |  0
 .../user_left/user_left_text_en_US.ftl        |  0
 translations/pom.xml                          |  1 +
 30 files changed, 117 insertions(+), 2 deletions(-)
 delete mode 100644 abstracto-modules/core/src/main/resources/en_US/events/user_join_en_US.ftl
 delete mode 100644 abstracto-modules/core/src/main/resources/en_US/events/user_leave_en_US.ftl
 create mode 100644 abstracto-modules/logging/pom.xml
 create mode 100644 abstracto-modules/logging/src/main/assembly/assembly.xml
 rename abstracto-modules/{moderation => logging}/src/main/resources/en_US/listener/message_deleted/message_deleted_attachment_embed_en_US.ftl (100%)
 rename abstracto-modules/{moderation => logging}/src/main/resources/en_US/listener/message_deleted/message_deleted_embed_en_US.ftl (100%)
 rename abstracto-modules/{moderation => logging}/src/main/resources/en_US/listener/message_edited/message_edited_embed_en_US.ftl (100%)
 create mode 100644 abstracto-modules/logging/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl
 create mode 100644 abstracto-modules/logging/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl
 create mode 100644 translations/logging/pom.xml
 create mode 100644 translations/logging/src/main/assembly/assembly.xml
 rename translations/{moderation => logging}/src/main/resources/en_US/config/feature_logging_en_US.ftl (100%)
 rename translations/{moderation => logging}/src/main/resources/en_US/config/feature_setup_posttarget_deleteLog_en_US.ftl (100%)
 rename translations/{moderation => logging}/src/main/resources/en_US/config/feature_setup_posttarget_editLog_en_US.ftl (100%)
 rename translations/{moderation => logging}/src/main/resources/en_US/config/feature_setup_posttarget_joinLog_en_US.ftl (100%)
 rename translations/{moderation => logging}/src/main/resources/en_US/config/feature_setup_posttarget_leaveLog_en_US.ftl (100%)
 rename translations/{moderation => logging}/src/main/resources/en_US/listener/message_deleted/messageDeleted_attachment_footer_en_US.ftl (100%)
 rename translations/{moderation => logging}/src/main/resources/en_US/listener/message_deleted/messageDeleted_attachment_link_display_text_en_US.ftl (100%)
 rename translations/{moderation => logging}/src/main/resources/en_US/listener/message_deleted/messageDeleted_attachment_link_field_title_en_US.ftl (100%)
 rename translations/{moderation => logging}/src/main/resources/en_US/listener/message_deleted/messageDeleted_description_text_en_US.ftl (100%)
 rename translations/{moderation => logging}/src/main/resources/en_US/listener/message_deleted/messageDeleted_message_link_field_title_en_US.ftl (100%)
 rename translations/{moderation => logging}/src/main/resources/en_US/listener/message_deleted/messageDeleted_original_message_field_title_en_US.ftl (100%)
 rename translations/{moderation => logging}/src/main/resources/en_US/listener/message_edited/messageEdited_description_text_en_US.ftl (100%)
 rename translations/{moderation => logging}/src/main/resources/en_US/listener/message_edited/messageEdited_link_field_title_en_US.ftl (100%)
 rename translations/{moderation => logging}/src/main/resources/en_US/listener/message_edited/messageEdited_new_message_field_title_en_US.ftl (100%)
 rename translations/{moderation => logging}/src/main/resources/en_US/listener/message_edited/messageEdited_original_message_field_title_en_US.ftl (100%)
 rename translations/{moderation => logging}/src/main/resources/en_US/listener/user_joined/user_joined_text_en_US.ftl (100%)
 rename translations/{moderation => logging}/src/main/resources/en_US/listener/user_left/user_left_text_en_US.ftl (100%)

diff --git a/abstracto-modules/core/src/main/resources/en_US/events/user_join_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/events/user_join_en_US.ftl
deleted file mode 100644
index c3111d44..00000000
--- a/abstracto-modules/core/src/main/resources/en_US/events/user_join_en_US.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#assign user>${user.name}#${user.discriminator} (${user.asMention})</#assign><@safe_include "user_joined_text"/>
diff --git a/abstracto-modules/core/src/main/resources/en_US/events/user_leave_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/events/user_leave_en_US.ftl
deleted file mode 100644
index c1fc8ebe..00000000
--- a/abstracto-modules/core/src/main/resources/en_US/events/user_leave_en_US.ftl
+++ /dev/null
@@ -1 +0,0 @@
-<#assign user>${user.name}#${user.discriminator} (${user.asMention})</#assign><@safe_include "user_left_text"/>
diff --git a/abstracto-modules/logging/pom.xml b/abstracto-modules/logging/pom.xml
new file mode 100644
index 00000000..ffc19c0c
--- /dev/null
+++ b/abstracto-modules/logging/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>
+        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
+        <artifactId>abstracto-modules</artifactId>
+        <version>1.2.5-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>logging</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>logging-templates-${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/abstracto-modules/logging/src/main/assembly/assembly.xml b/abstracto-modules/logging/src/main/assembly/assembly.xml
new file mode 100644
index 00000000..aca1e510
--- /dev/null
+++ b/abstracto-modules/logging/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/abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_attachment_embed_en_US.ftl b/abstracto-modules/logging/src/main/resources/en_US/listener/message_deleted/message_deleted_attachment_embed_en_US.ftl
similarity index 100%
rename from abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_attachment_embed_en_US.ftl
rename to abstracto-modules/logging/src/main/resources/en_US/listener/message_deleted/message_deleted_attachment_embed_en_US.ftl
diff --git a/abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_embed_en_US.ftl b/abstracto-modules/logging/src/main/resources/en_US/listener/message_deleted/message_deleted_embed_en_US.ftl
similarity index 100%
rename from abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_embed_en_US.ftl
rename to abstracto-modules/logging/src/main/resources/en_US/listener/message_deleted/message_deleted_embed_en_US.ftl
diff --git a/abstracto-modules/moderation/src/main/resources/en_US/listener/message_edited/message_edited_embed_en_US.ftl b/abstracto-modules/logging/src/main/resources/en_US/listener/message_edited/message_edited_embed_en_US.ftl
similarity index 100%
rename from abstracto-modules/moderation/src/main/resources/en_US/listener/message_edited/message_edited_embed_en_US.ftl
rename to abstracto-modules/logging/src/main/resources/en_US/listener/message_edited/message_edited_embed_en_US.ftl
diff --git a/abstracto-modules/logging/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl b/abstracto-modules/logging/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl
new file mode 100644
index 00000000..8616095f
--- /dev/null
+++ b/abstracto-modules/logging/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl
@@ -0,0 +1,5 @@
+{
+<#assign user>${member.user.name}#${member.user.discriminator} (${member.asMention}: ${member.id})</#assign>
+  "description": "<@safe_include "user_joined_text"/>",
+  <#include "abstracto_color"/>
+}
\ No newline at end of file
diff --git a/abstracto-modules/logging/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl b/abstracto-modules/logging/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl
new file mode 100644
index 00000000..39d0fe25
--- /dev/null
+++ b/abstracto-modules/logging/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl
@@ -0,0 +1,5 @@
+{
+<#assign user>${user.name}#${user.discriminator} (${user.id})</#assign>
+  "description": "<@safe_include "user_left_text"/>",
+  <#include "abstracto_color"/>
+}
\ No newline at end of file
diff --git a/abstracto-modules/pom.xml b/abstracto-modules/pom.xml
index 00f5ab71..1632c001 100644
--- a/abstracto-modules/pom.xml
+++ b/abstracto-modules/pom.xml
@@ -28,6 +28,7 @@
         <module>starboard</module>
         <module>suggestion</module>
         <module>webservices</module>
+        <module>logging</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/translations/logging/pom.xml b/translations/logging/pom.xml
new file mode 100644
index 00000000..f6d57ef8
--- /dev/null
+++ b/translations/logging/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>
+        <artifactId>translations</artifactId>
+        <groupId>dev.sheldan.abstracto-templates.translations</groupId>
+        <version>1.2.5-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>logging</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>logging-translations-${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/translations/logging/src/main/assembly/assembly.xml b/translations/logging/src/main/assembly/assembly.xml
new file mode 100644
index 00000000..aca1e510
--- /dev/null
+++ b/translations/logging/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/translations/moderation/src/main/resources/en_US/config/feature_logging_en_US.ftl b/translations/logging/src/main/resources/en_US/config/feature_logging_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/config/feature_logging_en_US.ftl
rename to translations/logging/src/main/resources/en_US/config/feature_logging_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/config/feature_setup_posttarget_deleteLog_en_US.ftl b/translations/logging/src/main/resources/en_US/config/feature_setup_posttarget_deleteLog_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/config/feature_setup_posttarget_deleteLog_en_US.ftl
rename to translations/logging/src/main/resources/en_US/config/feature_setup_posttarget_deleteLog_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/config/feature_setup_posttarget_editLog_en_US.ftl b/translations/logging/src/main/resources/en_US/config/feature_setup_posttarget_editLog_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/config/feature_setup_posttarget_editLog_en_US.ftl
rename to translations/logging/src/main/resources/en_US/config/feature_setup_posttarget_editLog_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/config/feature_setup_posttarget_joinLog_en_US.ftl b/translations/logging/src/main/resources/en_US/config/feature_setup_posttarget_joinLog_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/config/feature_setup_posttarget_joinLog_en_US.ftl
rename to translations/logging/src/main/resources/en_US/config/feature_setup_posttarget_joinLog_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/config/feature_setup_posttarget_leaveLog_en_US.ftl b/translations/logging/src/main/resources/en_US/config/feature_setup_posttarget_leaveLog_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/config/feature_setup_posttarget_leaveLog_en_US.ftl
rename to translations/logging/src/main/resources/en_US/config/feature_setup_posttarget_leaveLog_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/listener/message_deleted/messageDeleted_attachment_footer_en_US.ftl b/translations/logging/src/main/resources/en_US/listener/message_deleted/messageDeleted_attachment_footer_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/listener/message_deleted/messageDeleted_attachment_footer_en_US.ftl
rename to translations/logging/src/main/resources/en_US/listener/message_deleted/messageDeleted_attachment_footer_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/listener/message_deleted/messageDeleted_attachment_link_display_text_en_US.ftl b/translations/logging/src/main/resources/en_US/listener/message_deleted/messageDeleted_attachment_link_display_text_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/listener/message_deleted/messageDeleted_attachment_link_display_text_en_US.ftl
rename to translations/logging/src/main/resources/en_US/listener/message_deleted/messageDeleted_attachment_link_display_text_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/listener/message_deleted/messageDeleted_attachment_link_field_title_en_US.ftl b/translations/logging/src/main/resources/en_US/listener/message_deleted/messageDeleted_attachment_link_field_title_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/listener/message_deleted/messageDeleted_attachment_link_field_title_en_US.ftl
rename to translations/logging/src/main/resources/en_US/listener/message_deleted/messageDeleted_attachment_link_field_title_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/listener/message_deleted/messageDeleted_description_text_en_US.ftl b/translations/logging/src/main/resources/en_US/listener/message_deleted/messageDeleted_description_text_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/listener/message_deleted/messageDeleted_description_text_en_US.ftl
rename to translations/logging/src/main/resources/en_US/listener/message_deleted/messageDeleted_description_text_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/listener/message_deleted/messageDeleted_message_link_field_title_en_US.ftl b/translations/logging/src/main/resources/en_US/listener/message_deleted/messageDeleted_message_link_field_title_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/listener/message_deleted/messageDeleted_message_link_field_title_en_US.ftl
rename to translations/logging/src/main/resources/en_US/listener/message_deleted/messageDeleted_message_link_field_title_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/listener/message_deleted/messageDeleted_original_message_field_title_en_US.ftl b/translations/logging/src/main/resources/en_US/listener/message_deleted/messageDeleted_original_message_field_title_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/listener/message_deleted/messageDeleted_original_message_field_title_en_US.ftl
rename to translations/logging/src/main/resources/en_US/listener/message_deleted/messageDeleted_original_message_field_title_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/listener/message_edited/messageEdited_description_text_en_US.ftl b/translations/logging/src/main/resources/en_US/listener/message_edited/messageEdited_description_text_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/listener/message_edited/messageEdited_description_text_en_US.ftl
rename to translations/logging/src/main/resources/en_US/listener/message_edited/messageEdited_description_text_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/listener/message_edited/messageEdited_link_field_title_en_US.ftl b/translations/logging/src/main/resources/en_US/listener/message_edited/messageEdited_link_field_title_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/listener/message_edited/messageEdited_link_field_title_en_US.ftl
rename to translations/logging/src/main/resources/en_US/listener/message_edited/messageEdited_link_field_title_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/listener/message_edited/messageEdited_new_message_field_title_en_US.ftl b/translations/logging/src/main/resources/en_US/listener/message_edited/messageEdited_new_message_field_title_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/listener/message_edited/messageEdited_new_message_field_title_en_US.ftl
rename to translations/logging/src/main/resources/en_US/listener/message_edited/messageEdited_new_message_field_title_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/listener/message_edited/messageEdited_original_message_field_title_en_US.ftl b/translations/logging/src/main/resources/en_US/listener/message_edited/messageEdited_original_message_field_title_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/listener/message_edited/messageEdited_original_message_field_title_en_US.ftl
rename to translations/logging/src/main/resources/en_US/listener/message_edited/messageEdited_original_message_field_title_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/listener/user_joined/user_joined_text_en_US.ftl b/translations/logging/src/main/resources/en_US/listener/user_joined/user_joined_text_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/listener/user_joined/user_joined_text_en_US.ftl
rename to translations/logging/src/main/resources/en_US/listener/user_joined/user_joined_text_en_US.ftl
diff --git a/translations/moderation/src/main/resources/en_US/listener/user_left/user_left_text_en_US.ftl b/translations/logging/src/main/resources/en_US/listener/user_left/user_left_text_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/listener/user_left/user_left_text_en_US.ftl
rename to translations/logging/src/main/resources/en_US/listener/user_left/user_left_text_en_US.ftl
diff --git a/translations/pom.xml b/translations/pom.xml
index 5606a0d7..5deedd71 100644
--- a/translations/pom.xml
+++ b/translations/pom.xml
@@ -28,6 +28,7 @@
         <module>suggestion</module>
         <module>repost-detection</module>
         <module>webservices</module>
+        <module>logging</module>
     </modules>
 
 </project>
\ No newline at end of file