Merge branch 'main' into appstate-debug

Author: tulir

client.go

@@ -143,6 +143,8 @@ type Client struct {
 	sessionRecreateHistoryLock sync.Mutex
 	// GetMessageForRetry is used to find the source message for handling retry receipts
 	// when the message is not found in the recently sent message cache.
+	// Note: in DMs, the "to" field may be different from what you originally sent to (LID vs phone number),
+	// make sure to check both if necessary.
 	GetMessageForRetry func(requester, to types.JID, id types.MessageID) *waE2E.Message
 	// PreRetryCallback is called before a retry receipt is accepted.
 	// If it returns false, the accepting will be cancelled and the retry receipt will be ignored.

internals.go

@@ -64,25 +64,39 @@ func (cli *Client) addRecentMessage(to types.JID, id types.MessageID, wa *waE2E.
 
 func (cli *Client) getRecentMessage(to types.JID, id types.MessageID) RecentMessage {
 	cli.recentMessagesLock.RLock()
-	msg, _ := cli.recentMessagesMap[recentMessageKey{to, id}]
-	cli.recentMessagesLock.RUnlock()
-	return msg
+	defer cli.recentMessagesLock.RUnlock()
+	return cli.recentMessagesMap[recentMessageKey{to, id}]
 }
 
-func (cli *Client) getMessageForRetry(ctx context.Context, receipt *events.Receipt, messageID types.MessageID) (RecentMessage, error) {
+func (cli *Client) getMessageForRetry(ctx context.Context, receipt *events.Receipt, messageID types.MessageID) (*RecentMessage, error) {
 	msg := cli.getRecentMessage(receipt.Chat, messageID)
-	if msg.IsEmpty() {
-		waMsg := cli.GetMessageForRetry(receipt.Sender, receipt.Chat, messageID)
-		if waMsg == nil {
-			return RecentMessage{}, fmt.Errorf("couldn't find message %s", messageID)
-		} else {
-			cli.Log.Debugf("Found message in GetMessageForRetry to accept retry receipt for %s/%s from %s", receipt.Chat, messageID, receipt.Sender)
-		}
-		msg = RecentMessage{wa: waMsg}
-	} else {
+	if !msg.IsEmpty() {
 		cli.Log.Debugf("Found message in local cache to accept retry receipt for %s/%s from %s", receipt.Chat, messageID, receipt.Sender)
+		return &msg, nil
+	}
+	var altChat types.JID
+	var err error
+	switch receipt.Chat.Server {
+	case types.DefaultUserServer:
+		altChat, err = cli.Store.LIDs.GetLIDForPN(ctx, receipt.Chat)
+	case types.HiddenUserServer:
+		altChat, err = cli.Store.LIDs.GetPNForLID(ctx, receipt.Chat)
+	}
+	if err != nil {
+		return nil, fmt.Errorf("failed to get alternate JID for %s: %w", receipt.Chat, err)
+	} else if !altChat.IsEmpty() {
+		msg = cli.getRecentMessage(altChat, messageID)
+		if !msg.IsEmpty() {
+			cli.Log.Debugf("Found message in local cache with alternate chat JID %s to accept retry receipt for %s/%s from %s", altChat, receipt.Chat, messageID, receipt.Sender)
+			return &msg, nil
+		}
+	}
+	waMsg := cli.GetMessageForRetry(receipt.Sender, receipt.Chat, messageID)
+	if waMsg != nil {
+		cli.Log.Debugf("Found message in GetMessageForRetry to accept retry receipt for %s/%s from %s", receipt.Chat, messageID, receipt.Sender)
+		return &RecentMessage{wa: waMsg}, nil
 	}
-	return msg, nil
+	return nil, nil
 }
 
 const recreateSessionTimeout = 1 * time.Hour
@@ -127,6 +141,8 @@ func (cli *Client) handleRetryReceipt(ctx context.Context, receipt *events.Recei
 	msg, err := cli.getMessageForRetry(ctx, receipt, messageID)
 	if err != nil {
 		return err
+	} else if msg == nil {
+		return fmt.Errorf("couldn't find message %s", messageID)
 	}
 	var fbConsumerMsg *waConsumerApplication.ConsumerApplication
 	if msg.fb != nil {