diff options
| -rw-r--r-- | bridge/telegram/handlers.go | 12 | ||||
| -rw-r--r-- | matterbridge.toml.sample | 6 |
2 files changed, 18 insertions, 0 deletions
diff --git a/bridge/telegram/handlers.go b/bridge/telegram/handlers.go index 7710f106..d9b104a3 100644 --- a/bridge/telegram/handlers.go +++ b/bridge/telegram/handlers.go @@ -71,6 +71,9 @@ func (b *Btelegram) handleForwarded(rmsg *config.Message, message *tgbotapi.Mess if b.GetBool("UseFirstName") { usernameForward = message.ForwardFrom.FirstName } + if b.GetBool("UseFullName") { + usernameForward = message.ForwardFrom.FirstName + " " + message.ForwardFrom.LastName + } if usernameForward == "" { usernameForward = message.ForwardFrom.UserName @@ -94,6 +97,9 @@ func (b *Btelegram) handleQuoting(rmsg *config.Message, message *tgbotapi.Messag if b.GetBool("UseFirstName") { usernameReply = message.ReplyToMessage.From.FirstName } + if b.GetBool("UseFullName") { + usernameReply = message.ReplyToMessage.From.FirstName + " " + message.ReplyToMessage.From.LastName + } if usernameReply == "" { usernameReply = message.ReplyToMessage.From.UserName if usernameReply == "" { @@ -117,6 +123,9 @@ func (b *Btelegram) handleUsername(rmsg *config.Message, message *tgbotapi.Messa if b.GetBool("UseFirstName") { rmsg.Username = message.From.FirstName } + if b.GetBool("UseFullName") { + rmsg.Username = message.From.FirstName + " " + message.From.LastName + } if rmsg.Username == "" { rmsg.Username = message.From.UserName if rmsg.Username == "" { @@ -134,6 +143,9 @@ func (b *Btelegram) handleUsername(rmsg *config.Message, message *tgbotapi.Messa if b.GetBool("UseFirstName") { rmsg.Username = message.SenderChat.FirstName } + if b.GetBool("UseFullName") { + rmsg.Username = message.SenderChat.FirstName + " " + message.SenderChat.LastName + } if rmsg.Username == "" || rmsg.Username == "Channel_Bot" { rmsg.Username = message.SenderChat.UserName diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample index 7dd52834..656949fc 100644 --- a/matterbridge.toml.sample +++ b/matterbridge.toml.sample @@ -1036,6 +1036,12 @@ DisableWebPagePreview=false #OPTIONAL (default false) UseFirstName=false +#If enabled use the "Full Name" as username. If this is empty use the Username +#If disabled use the "Username" as username. If this is empty use the First Name and Last Name as Full Name +#If all names are empty, username will be "unknown" +#OPTIONAL (default false) +UseFullName=false + #WARNING! If enabled this will relay GIF/stickers/documents and other attachments as URLs #Those URLs will contain your bot-token. This may not be what you want. #For now there is no secure way to relay GIF/stickers/documents without seeing your token. |