update

1 files changed, 9 insertions, 2 deletions

diff --git a/teleirc/matterbridge/bridge/telegram/handlers.go b/teleirc/matterbridge/bridge/telegram/handlers.go
index a9d9bd6..31ca78f 100644
--- a/teleirc/matterbridge/bridge/telegram/handlers.go
+++ b/teleirc/matterbridge/bridge/telegram/handlers.go
@@ -163,8 +163,15 @@ func (b *Btelegram) handleUsername(rmsg *config.Message, message *tgbotapi.Messa
 			b.handleDownloadAvatar(message.SenderChat.ID, rmsg.Channel)
 		}
 	}
-
-	// if we really didn't find a username, set it to unknown
+	if rmsg.Username == "" {
+		rmsg.Username = unknownUser
+	}
+	rmsg.Username = strings.TrimSpace(rmsg.Username);
+	if rmsg.Username == "" {
+		if message.SenderChat != nil && message.SenderChat.UserName != "" {
+			rmsg.Username = message.SenderChat.UserName
+		}
+	}
 	if rmsg.Username == "" {
 		rmsg.Username = unknownUser
 	}