Send notes to self properly

Author: tulir

pkg/signalmeow/sending.go

@@ -582,6 +582,29 @@ func (cli *Client) SendGroupMessage(ctx context.Context, gid types.GroupIdentifi
 	return result, nil
 }
 
+func (cli *Client) sendSyncCopy(ctx context.Context, content *signalpb.Content, messageTS uint64, result *SuccessfulSendResult) bool {
+	// If we have other devices, send Sync messages to them too
+	if cli.howManyOtherDevicesDoWeHave(ctx) > 0 {
+		var syncContent *signalpb.Content
+		if content.GetDataMessage() != nil {
+			syncContent = syncMessageFromSoloDataMessage(content.DataMessage, *result)
+		} else if content.GetEditMessage() != nil {
+			syncContent = syncMessageFromSoloEditMessage(content.EditMessage, *result)
+		} else if content.GetReceiptMessage().GetType() == signalpb.ReceiptMessage_READ {
+			syncContent = syncMessageFromReadReceiptMessage(ctx, content.ReceiptMessage, result.RecipientUUID)
+		}
+		if syncContent != nil {
+			_, selfSendErr := cli.sendContent(ctx, cli.Store.ACI, messageTS, syncContent, 0)
+			if selfSendErr != nil {
+				zerolog.Ctx(ctx).Err(selfSendErr).Msg("Failed to send sync message to myself")
+			} else {
+				return true
+			}
+		}
+	}
+	return false
+}
+
 func (cli *Client) SendMessage(ctx context.Context, recipientID uuid.UUID, content *signalpb.Content) SendMessageResult {
 	// Assemble the content to send
 	var messageTimestamp uint64
@@ -593,6 +616,19 @@ func (cli *Client) SendMessage(ctx context.Context, recipientID uuid.UUID, conte
 		messageTimestamp = currentMessageTimestamp()
 	}
 
+	isDeliveryReceipt := content.ReceiptMessage != nil && content.GetReceiptMessage().GetType() == signalpb.ReceiptMessage_DELIVERY
+	if recipientID == cli.Store.ACI && !isDeliveryReceipt {
+		res := &SuccessfulSendResult{
+			RecipientUUID: recipientID,
+			Unidentified:  false,
+		}
+		ok := cli.sendSyncCopy(ctx, content, messageTimestamp, res)
+		return SendMessageResult{
+			WasSuccessful:        ok,
+			SuccessfulSendResult: res,
+		}
+	}
+
 	// Send to the recipient
 	sentUnidentified, err := cli.sendContent(ctx, recipientID, messageTimestamp, content, 0)
 	if err != nil {
@@ -612,28 +648,8 @@ func (cli *Client) SendMessage(ctx context.Context, recipientID uuid.UUID, conte
 		},
 	}
 
-	// TODO: don't fetch every time
-	// (But for now this makes sure we know about all our other devices)
-	// ((Actually I don't think this is necessary?))
-	//FetchAndProcessPreKey(ctx, device, device.Data.ACI, -1)
+	cli.sendSyncCopy(ctx, content, messageTimestamp, result.SuccessfulSendResult)
 
-	// If we have other devices, send Sync messages to them too
-	if cli.howManyOtherDevicesDoWeHave(ctx) > 0 {
-		var syncContent *signalpb.Content
-		if content.GetDataMessage() != nil {
-			syncContent = syncMessageFromSoloDataMessage(content.DataMessage, *result.SuccessfulSendResult)
-		} else if content.GetEditMessage() != nil {
-			syncContent = syncMessageFromSoloEditMessage(content.EditMessage, *result.SuccessfulSendResult)
-		} else if content.GetReceiptMessage().GetType() == signalpb.ReceiptMessage_READ {
-			syncContent = syncMessageFromReadReceiptMessage(ctx, content.ReceiptMessage, recipientID)
-		}
-		if syncContent != nil {
-			_, selfSendErr := cli.sendContent(ctx, cli.Store.ACI, messageTimestamp, syncContent, 0)
-			if selfSendErr != nil {
-				zerolog.Ctx(ctx).Err(selfSendErr).Msg("Failed to send sync message to myself")
-			}
-		}
-	}
 	return result
 }
 

portal.go

@@ -267,16 +267,13 @@ func (portal *Portal) GetRelayUser() *User {
 	return portal.relayUser
 }
 
-func isUUID(s string) bool {
-	if _, uuidErr := uuid.Parse(s); uuidErr == nil {
-		return true
-	}
-	return false
+func (portal *Portal) IsPrivateChat() bool {
+	return portal.UserID() != uuid.Nil
 }
 
-func (portal *Portal) IsPrivateChat() bool {
-	// If ChatID is a UUID, it's a private chat, otherwise it's base64 and a group chat
-	return isUUID(portal.ChatID)
+func (portal *Portal) IsNoteToSelf() bool {
+	userID := portal.UserID()
+	return userID != uuid.Nil && userID == portal.Receiver
 }
 
 func (portal *Portal) MainIntent() *appservice.IntentAPI {
@@ -1264,6 +1261,10 @@ func (portal *Portal) setTyping(userIDs []id.UserID, isTyping bool) {
 }
 
 func (portal *Portal) HandleMatrixTyping(newTyping []id.UserID) {
+	if portal.IsNoteToSelf() {
+		return
+	}
+
 	portal.currentlyTypingLock.Lock()
 	defer portal.currentlyTypingLock.Unlock()
 	startedTyping, stoppedTyping := typingDiff(portal.currentlyTyping, newTyping)