From 67905089ba1609e52984b5bb9c7e0bf27c2cbbb9 Mon Sep 17 00:00:00 2001
From: anon724 <30612019+anon724@users.noreply.github.com>
Date: Tue, 1 Aug 2017 09:18:55 -0700
Subject: [PATCH] Add UseUserName option (discord) (#234)

---
 bridge/config/config.go   | 1 +
 bridge/discord/discord.go | 7 ++++++-
 matterbridge.toml.sample  | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/bridge/config/config.go b/bridge/config/config.go
index c03a3ab5..a90cb9a9 100644
--- a/bridge/config/config.go
+++ b/bridge/config/config.go
@@ -77,6 +77,7 @@ type Protocol struct {
 	UseSASL                bool   // IRC
 	UseTLS                 bool   // IRC
 	UseFirstName           bool   // telegram
+	UseUserName            bool   // discord
 	UseInsecureURL         bool   // telegram
 	WebhookBindAddress     string // mattermost, slack
 	WebhookURL             string // mattermost, slack
diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go
index 926aa807..4b325653 100644
--- a/bridge/discord/discord.go
+++ b/bridge/discord/discord.go
@@ -181,7 +181,12 @@ func (b *bdiscord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreat
 	if b.UseChannelID {
 		rmsg.Channel = "ID:" + m.ChannelID
 	}
-	rmsg.Username = b.getNick(m.Author)
+
+	if !b.Config.UseUserName {
+		rmsg.Username = b.getNick(m.Author)
+	} else {
+		rmsg.Username = m.Author.Username
+	}
 
 	if b.Config.ShowEmbeds && m.Message.Embeds != nil {
 		for _, embed := range m.Message.Embeds {
diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample
index dac68da8..e31c23e4 100644
--- a/matterbridge.toml.sample
+++ b/matterbridge.toml.sample
@@ -443,6 +443,10 @@ Server="yourservername"
 #OPTIONAL (default false)
 ShowEmbeds=false
 
+#Shows the username (minus the discriminator) instead of the server nickname
+#OPTIONAL (default false)
+UseUserName=false
+
 #Specify WebhookURL. If given, will relay messages using the Webhook, which gives a better look to messages.
 #OPTIONAL (default empty)
 WebhookURL="Yourwebhooktokenhere"