From 0a7eda239fe642a96fef61256245282397ffab3c Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Tue, 26 Sep 2023 23:19:55 +0200
Subject: [PATCH] [OPB-xxx] removing discriminators

---
 .../resources/en_US/commands/news/news_post_embed_en_US.ftl     | 2 +-
 .../en_US/listener/user_joined/user_join_embed_en_US.ftl        | 2 +-
 .../en_US/listener/user_left/user_leave_embed_en_US.ftl         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/commands/news/news_post_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/commands/news/news_post_embed_en_US.ftl
index d718475..98fd4ed 100644
--- a/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/commands/news/news_post_embed_en_US.ftl
+++ b/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/commands/news/news_post_embed_en_US.ftl
@@ -1,6 +1,6 @@
 {
   <#assign roleMention="<@&479202891358535681>"/>
-  <#assign authorMention>${author.user.name}#${author.user.discriminator}</#assign>
+  <#assign authorMention>${author.user.name}</#assign>
     "additionalMessage": "<@safe_include "news_post_description"/>",
     "embeds": [
         {
diff --git a/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl
index 8fe6172..6c780c5 100644
--- a/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl
+++ b/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl
@@ -1,4 +1,4 @@
 {
-<#assign user>${member.user.name}#${member.user.discriminator} (${member.asMention}: ${member.id})</#assign>
+<#assign user>${member.user.name} (${member.asMention}: ${member.id})</#assign>
   "additionalMessage": "<@safe_include "user_joined_text"/>"
 }
\ No newline at end of file
diff --git a/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl
index 879c7a0..119bf4d 100644
--- a/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl
+++ b/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl
@@ -1,4 +1,4 @@
 {
-<#assign user>${user.name}#${user.discriminator} (${user.id})</#assign>
+<#assign user>${user.name} (${user.id})</#assign>
   "additionalMessage": "<@safe_include "user_left_text"/>"
 }
\ No newline at end of file