commit a4d75512094f6fda9358dcc7c3264cd5286e4bc5
Author: Alexander <emu.sas@gmail.com>
Date: Fri Mar 25 23:42:28 2022 +0000
Add UseFullName option (telegram) (#1777)
diff --git a/bridge/telegram/handlers.go b/bridge/telegram/handlers.go
index 7710f10..d9b104a 100644
--- a/bridge/telegram/handlers.go
+++ b/bridge/telegram/handlers.go
@@ -716 +719 @@ 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
@@ -946 +979 @@ 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 == "" {
@@ -1176 +1239 @@ 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 == "" {
@@ -1346 +1439 @@ 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 7dd5283..656949f 100644
--- a/matterbridge.toml.sample
+++ b/matterbridge.toml.sample
@@ -10366 +103612 @@ 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.
