[fix] quoting your own messages

annihilatorrrr · Feb 26, 2023 · 4432320 · 4432320
1 parent f3b1a39
commit 4432320
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/state/state.go b/state/state.go
@@ -10,7 +10,7 @@ import (
 	"gorm.io/gorm"
 )
 
-const WATGBRIDGE_VERSION = "1.1.1"
+const WATGBRIDGE_VERSION = "1.1.2"
 
 type state struct {
 	Config   *Config

diff --git a/telegram/handlers.go b/telegram/handlers.go
@@ -173,6 +173,9 @@ func BridgeTelegramToWhatsAppHandler(b *gotgbot.Bot, c *ext.Context) error {
 	// Status Update
 	if strings.HasSuffix(waChatID, "@broadcast") {
 		waChatID = participantID
+	} else if participantID != "" {
+		participant, _ := utils.WaParseJID(participantID)
+		participantID = participant.ToNonAD().String()
 	}
 
 	waChatJID, _ := utils.WaParseJID(waChatID)

diff --git a/utils/telegram.go b/utils/telegram.go
@@ -268,7 +268,7 @@ func TgSendToWhatsApp(b *gotgbot.Bot, c *ext.Context,
 			}(b, msg)
 		}
 
-		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.User, waChatJID.String(),
+		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.String(), waChatJID.String(),
 			cfg.Telegram.TargetChatID, msgToForward.MessageId, msgToForward.MessageThreadId)
 		if err != nil {
 			return TgReplyWithErrorByContext(b, c, "Failed to add to database", err)
@@ -340,7 +340,7 @@ func TgSendToWhatsApp(b *gotgbot.Bot, c *ext.Context,
 			}(b, msg)
 		}
 
-		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.User, waChatJID.String(),
+		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.String(), waChatJID.String(),
 			cfg.Telegram.TargetChatID, msgToForward.MessageId, msgToForward.MessageThreadId)
 		if err != nil {
 			return TgReplyWithErrorByContext(b, c, "Failed to add to database", err)
@@ -409,7 +409,7 @@ func TgSendToWhatsApp(b *gotgbot.Bot, c *ext.Context,
 			}(b, msg)
 		}
 
-		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.User, waChatJID.String(),
+		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.String(), waChatJID.String(),
 			cfg.Telegram.TargetChatID, msgToForward.MessageId, msgToForward.MessageThreadId)
 		if err != nil {
 			return TgReplyWithErrorByContext(b, c, "Failed to add to database", err)
@@ -481,7 +481,7 @@ func TgSendToWhatsApp(b *gotgbot.Bot, c *ext.Context,
 			}(b, msg)
 		}
 
-		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.User, waChatJID.String(),
+		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.String(), waChatJID.String(),
 			cfg.Telegram.TargetChatID, msgToForward.MessageId, msgToForward.MessageThreadId)
 		if err != nil {
 			return TgReplyWithErrorByContext(b, c, "Failed to add to database", err)
@@ -548,7 +548,7 @@ func TgSendToWhatsApp(b *gotgbot.Bot, c *ext.Context,
 			}(b, msg)
 		}
 
-		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.User, waChatJID.String(),
+		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.String(), waChatJID.String(),
 			cfg.Telegram.TargetChatID, msgToForward.MessageId, msgToForward.MessageThreadId)
 		if err != nil {
 			return TgReplyWithErrorByContext(b, c, "Failed to add to database", err)
@@ -615,7 +615,7 @@ func TgSendToWhatsApp(b *gotgbot.Bot, c *ext.Context,
 			}(b, msg)
 		}
 
-		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.User, waChatJID.String(),
+		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.String(), waChatJID.String(),
 			cfg.Telegram.TargetChatID, msgToForward.MessageId, msgToForward.MessageThreadId)
 		if err != nil {
 			return TgReplyWithErrorByContext(b, c, "Failed to add to database", err)
@@ -685,7 +685,7 @@ func TgSendToWhatsApp(b *gotgbot.Bot, c *ext.Context,
 			}(b, msg)
 		}
 
-		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.User, waChatJID.String(),
+		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.String(), waChatJID.String(),
 			cfg.Telegram.TargetChatID, msgToForward.MessageId, msgToForward.MessageThreadId)
 		if err != nil {
 			return TgReplyWithErrorByContext(b, c, "Failed to add to database", err)
@@ -794,7 +794,7 @@ func TgSendToWhatsApp(b *gotgbot.Bot, c *ext.Context,
 			}(b, msg)
 		}
 
-		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.User, waChatJID.String(),
+		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.String(), waChatJID.String(),
 			cfg.Telegram.TargetChatID, msgToForward.MessageId, msgToForward.MessageThreadId)
 		if err != nil {
 			return TgReplyWithErrorByContext(b, c, "Failed to add to database", err)
@@ -856,7 +856,7 @@ func TgSendToWhatsApp(b *gotgbot.Bot, c *ext.Context,
 			}(b, msg)
 		}
 
-		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.User, waChatJID.String(),
+		err = database.MsgIdAddNewPair(sentMsg.ID, waClient.Store.ID.String(), waChatJID.String(),
 			cfg.Telegram.TargetChatID, msgToForward.MessageId, msgToForward.MessageThreadId)
 		if err != nil {
 			return TgReplyWithErrorByContext(b, c, "Failed to add to database", err)