From a7dd033c3b11fd4e0f186cfb00c1a68ea4eab217 Mon Sep 17 00:00:00 2001
From: Declan Hoare <declanhoare@exemail.com.au>
Date: Sat, 23 Feb 2019 00:28:27 +1100
Subject: Allow sending discriminator with Discord username (#726)

---
 bridge/config/config.go    | 1 +
 bridge/discord/handlers.go | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'bridge')

diff --git a/bridge/config/config.go b/bridge/config/config.go
index f473ab04..7ab6aef4 100644
--- a/bridge/config/config.go
+++ b/bridge/config/config.go
@@ -136,6 +136,7 @@ type Protocol struct {
 	UseAPI                 bool       // mattermost, slack
 	UseSASL                bool       // IRC
 	UseTLS                 bool       // IRC
+	UseDiscriminator       bool       // discord
 	UseFirstName           bool       // telegram
 	UseUserName            bool       // discord
 	UseInsecureURL         bool       // telegram
diff --git a/bridge/discord/handlers.go b/bridge/discord/handlers.go
index 85bac2ec..85a36e1d 100644
--- a/bridge/discord/handlers.go
+++ b/bridge/discord/handlers.go
@@ -71,6 +71,9 @@ func (b *Bdiscord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreat
 		rmsg.Username = b.getNick(m.Author)
 	} else {
 		rmsg.Username = m.Author.Username
+		if b.GetBool("UseDiscriminator") {
+			rmsg.Username += "#" + m.Author.Discriminator
+		}
 	}
 
 	// if we have embedded content add it to text
-- 
cgit v1.2.3