commit fd5500425c4fd2a42d558e8a1dd7558040417b16
Author: Wim <wim@42.be>
Date: Sat May 23 19:15:26 2020 +0000
Fix forward from hidden users (telegram). Closes #1131 (#1143)
Use ForwardDate to check if a message is forwarded.
If we have a nil ForwardedFrom then make this an unknown user.
diff --git a/bridge/telegram/handlers.go b/bridge/telegram/handlers.go
index 56fd654..f73c8b0 100644
--- a/bridge/telegram/handlers.go
+++ b/bridge/telegram/handlers.go
@@ -3922 +3932 @@ func (b *Btelegram) handleGroups(rmsg *config.Message, message *tgbotapi.Message
// handleForwarded handles forwarded messages
func (b *Btelegram) handleForwarded(rmsg *config.Message, message *tgbotapi.Message) {
- if message.ForwardFrom != nil {
- usernameForward := ""
- if b.GetBool("UseFirstName") {
- usernameForward = message.ForwardFrom.FirstName
- }
- if usernameForward == "" {
- usernameForward = message.ForwardFrom.UserName
- if usernameForward == "" {
- usernameForward = message.ForwardFrom.FirstName
- }
- }
+ if message.ForwardDate == 0 {
+ return
+ }
+
+ if message.ForwardFrom == nil {
+ rmsg.Text = "Forwarded from " + unknownUser + ": " + rmsg.Text
+ return
+ }
+
+ usernameForward := ""
+ if b.GetBool("UseFirstName") {
+ usernameForward = message.ForwardFrom.FirstName
+ }
+
+ if usernameForward == "" {
+ usernameForward = message.ForwardFrom.UserName
if usernameForward == "" {
- usernameForward = unknownUser
+ usernameForward = message.ForwardFrom.FirstName
}
- rmsg.Text = "Forwarded from " + usernameForward + ": " + rmsg.Text
}
+
+ if usernameForward == "" {
+ usernameForward = unknownUser
+ }
+
+ rmsg.Text = "Forwarded from " + usernameForward + ": " + rmsg.Text
}
// handleQuoting handles quoting of previous messages
