From c44969612088da09af4d88ae72380c821d688ac3 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 20 Jun 2023 15:29:46 +0300
Subject: [PATCH] Handle usernames properly in bridge state remote name

---
 user.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/user.go b/user.go
index 7e68b10..d2a26ee 100644
--- a/user.go
+++ b/user.go
@@ -74,6 +74,9 @@ func (user *User) GetRemoteID() string {
 
 func (user *User) GetRemoteName() string {
 	if user.Session != nil && user.Session.State != nil && user.Session.State.User != nil {
+		if user.Session.State.User.Discriminator == "0" {
+			return fmt.Sprintf("@%s", user.Session.State.User.Username)
+		}
 		return fmt.Sprintf("%s#%s", user.Session.State.User.Username, user.Session.State.User.Discriminator)
 	}
 	return user.DiscordID