From c79e065d09b9a1c6c0d0db94fe60204fefc0e138 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Sat, 12 Aug 2023 00:53:06 +0100
Subject: [PATCH] ShowMeYourName: Option to use display names instead of
 usernames (#1634)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/showMeYourName/index.tsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/plugins/showMeYourName/index.tsx b/src/plugins/showMeYourName/index.tsx
index 473e2f7f..7123fc63 100644
--- a/src/plugins/showMeYourName/index.tsx
+++ b/src/plugins/showMeYourName/index.tsx
@@ -40,6 +40,11 @@ const settings = definePluginSettings({
             { label: "Username only", value: "user" },
         ],
     },
+    displayNames: {
+        type: OptionType.BOOLEAN,
+        description: "Use display names in place of usernames",
+        default: false
+    },
     inReplies: {
         type: OptionType.BOOLEAN,
         default: false,
@@ -50,7 +55,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "ShowMeYourName",
     description: "Display usernames next to nicks, or no nicks at all",
-    authors: [Devs.dzshn],
+    authors: [Devs.dzshn, Devs.TheKodeToad],
     patches: [
         {
             find: ".withMentionPrefix",
@@ -63,9 +68,11 @@ export default definePlugin({
     settings,
 
     renderUsername: ({ author, message, isRepliedMessage, withMentionPrefix }: UsernameProps) => {
-        if (message.interaction) return author?.nick;
         try {
-            const { username } = message.author;
+            let { username } = message.author;
+            if (settings.store.displayNames)
+                username = (message.author as any).globalName || username;
+
             const { nick } = author;
             const prefix = withMentionPrefix ? "@" : "";
             if (username === nick || isRepliedMessage && !settings.store.inReplies)