|
|
|
@ -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
|
|
|
|
|