commit 257e23d5aef2e33217dc76c07ab5c845df8487a0
Author: Joseph Mansy <36427684+yousefmansy1@users.noreply.github.com>
Date: Thu Mar 09 13:02:31 2023 +0000
Use AuthorSignature as a fallback username (telegram) (#1979)
This comes in handy for annoucement type channels where neither the SenderChat or From structs contain name information.
Also Tweak username logic as when using a full name the username field can be " " instead of "".
diff --git a/bridge/telegram/handlers.go b/bridge/telegram/handlers.go
index b9cc7e6..5ffb1ec 100644
--- a/bridge/telegram/handlers.go
+++ b/bridge/telegram/handlers.go
@@ -1287 +1289 @@ func (b *Btelegram) handleUsername(rmsg *config.Message, message *tgbotapi.Messa
rmsg.Username = message.From.FirstName
}
if b.GetBool("UseFullName") {
- rmsg.Username = message.From.FirstName + " " + message.From.LastName
+ if message.From.FirstName != "" && message.From.LastName != "" {
+ rmsg.Username = message.From.FirstName + " " + message.From.LastName
+ }
}
if rmsg.Username == "" {
rmsg.Username = message.From.UserName
@@ -1487 +1509 @@ func (b *Btelegram) handleUsername(rmsg *config.Message, message *tgbotapi.Messa
rmsg.Username = message.SenderChat.FirstName
}
if b.GetBool("UseFullName") {
- rmsg.Username = message.SenderChat.FirstName + " " + message.SenderChat.LastName
+ if message.SenderChat.FirstName != "" && message.SenderChat.LastName != "" {
+ rmsg.Username = message.SenderChat.FirstName + " " + message.SenderChat.LastName
+ }
}
if rmsg.Username == "" || rmsg.Username == "Channel_Bot" {
@@ -1646 +16811 @@ func (b *Btelegram) handleUsername(rmsg *config.Message, message *tgbotapi.Messa
}
}
+ // Fallback on author signature (used in "channel" type of chat)
+ if rmsg.Username == "" && message.AuthorSignature != "" {
+ rmsg.Username = message.AuthorSignature
+ }
+
// if we really didn't find a username, set it to unknown
if rmsg.Username == "" {
rmsg.Username = unknownUser
