signalmeow/sending: set urgent flag and content hint properly

mautrix · Sep 24, 2024 · 4727da4 · 4727da4
1 parent ce665b2
commit 4727da4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 9 deletions.
diff --git a/pkg/libsignalgo/sealedsender.go b/pkg/libsignalgo/sealedsender.go
@@ -42,7 +42,7 @@ func NewSealedSenderAddress(e164 string, uuid uuid.UUID, deviceID uint32) *Seale
 	}
 }
 
-func SealedSenderEncryptPlaintext(ctx context.Context, message []byte, forAddress *Address, fromSenderCert *SenderCertificate, sessionStore SessionStore, identityStore IdentityKeyStore) ([]byte, error) {
+func SealedSenderEncryptPlaintext(ctx context.Context, message []byte, contentHint UnidentifiedSenderMessageContentHint, forAddress *Address, fromSenderCert *SenderCertificate, sessionStore SessionStore, identityStore IdentityKeyStore) ([]byte, error) {
 	ciphertextMessage, err := Encrypt(ctx, message, forAddress, sessionStore, identityStore)
 	if err != nil {
 		return nil, err
@@ -51,7 +51,7 @@ func SealedSenderEncryptPlaintext(ctx context.Context, message []byte, forAddres
 	usmc, err := NewUnidentifiedSenderMessageContent(
 		ciphertextMessage,
 		fromSenderCert,
-		UnidentifiedSenderMessageContentHintDefault,
+		contentHint,
 		nil,
 	)
 	if err != nil {

diff --git a/pkg/libsignalgo/session_test.go b/pkg/libsignalgo/session_test.go
@@ -241,7 +241,7 @@ func TestSealedSenderEncrypt_Repeated(t *testing.T) {
 	}()
 	for i := 0; i < 100; i++ {
 		message := []byte(fmt.Sprintf("%04d vision", i))
-		ciphertext, err := libsignalgo.SealedSenderEncryptPlaintext(ctx, message, bobAddress, senderCert, aliceStore, aliceStore)
+		ciphertext, err := libsignalgo.SealedSenderEncryptPlaintext(ctx, message, libsignalgo.UnidentifiedSenderMessageContentHintDefault, bobAddress, senderCert, aliceStore, aliceStore)
 		require.NoError(t, err)
 		assert.NotNil(t, ciphertext)
 	}
@@ -279,7 +279,7 @@ func TestSealedSenderSession(t *testing.T) {
 	assert.NoError(t, err)
 
 	message := []byte("2020 vision")
-	ciphertext, err := libsignalgo.SealedSenderEncryptPlaintext(ctx, message, bobAddress, senderCert, aliceStore, aliceStore)
+	ciphertext, err := libsignalgo.SealedSenderEncryptPlaintext(ctx, message, libsignalgo.UnidentifiedSenderMessageContentHintDefault, bobAddress, senderCert, aliceStore, aliceStore)
 	require.NoError(t, err)
 	assert.NotNil(t, ciphertext)
 

diff --git a/pkg/signalmeow/sending.go b/pkg/signalmeow/sending.go
@@ -83,7 +83,7 @@ type MyMessage struct {
 }
 
 type MyMessages struct {
-	Timestamp int64       `json:"timestamp"`
+	Timestamp uint64      `json:"timestamp"`
 	Online    bool        `json:"online"`
 	Urgent    bool        `json:"urgent"`
 	Messages  []MyMessage `json:"messages"`
@@ -212,7 +212,7 @@ func (cli *Client) buildMessagesToSend(ctx context.Context, recipient libsignalg
 		var envelopeType int
 		var encryptedPayload []byte
 		if unauthenticated {
-			envelopeType, encryptedPayload, err = cli.buildSSMessageToSend(ctx, recipientAddress, paddedMessage)
+			envelopeType, encryptedPayload, err = cli.buildSSMessageToSend(ctx, recipientAddress, paddedMessage, getContentHint(content))
 		} else {
 			envelopeType, encryptedPayload, err = cli.buildAuthedMessageToSend(ctx, recipientAddress, paddedMessage)
 		}
@@ -264,14 +264,15 @@ func (cli *Client) buildAuthedMessageToSend(ctx context.Context, recipientAddres
 	return envelopeType, encryptedPayload, nil
 }
 
-func (cli *Client) buildSSMessageToSend(ctx context.Context, recipientAddress *libsignalgo.Address, paddedMessage []byte) (envelopeType int, encryptedPayload []byte, err error) {
+func (cli *Client) buildSSMessageToSend(ctx context.Context, recipientAddress *libsignalgo.Address, paddedMessage []byte, contentHint libsignalgo.UnidentifiedSenderMessageContentHint) (envelopeType int, encryptedPayload []byte, err error) {
 	cert, err := cli.senderCertificate(ctx)
 	if err != nil {
 		return 0, nil, err
 	}
 	encryptedPayload, err = libsignalgo.SealedSenderEncryptPlaintext(
 		ctx,
 		paddedMessage,
+		contentHint,
 		recipientAddress,
 		cert,
 		cli.Store.ACISessionStore,
@@ -782,6 +783,29 @@ func currentMessageTimestamp() uint64 {
 	return uint64(time.Now().UnixMilli())
 }
 
+func isSyncMessageUrgent(content *signalpb.SyncMessage) bool {
+	return content.Sent != nil || content.Request != nil
+}
+
+func isUrgent(content *signalpb.Content) bool {
+	return content.DataMessage != nil ||
+		content.CallMessage != nil ||
+		content.StoryMessage != nil ||
+		content.EditMessage != nil ||
+		(content.SyncMessage != nil && isSyncMessageUrgent(content.SyncMessage))
+}
+
+func getContentHint(content *signalpb.Content) libsignalgo.UnidentifiedSenderMessageContentHint {
+	if content.DataMessage != nil || content.EditMessage != nil {
+		// TODO add support for resending before setting this
+		//return libsignalgo.UnidentifiedSenderMessageContentHintResendable
+	}
+	if content.TypingMessage != nil || content.ReceiptMessage != nil {
+		return libsignalgo.UnidentifiedSenderMessageContentHintImplicit
+	}
+	return libsignalgo.UnidentifiedSenderMessageContentHintDefault
+}
+
 func (cli *Client) sendContent(
 	ctx context.Context,
 	recipient libsignalgo.ServiceID,
@@ -845,9 +869,9 @@ func (cli *Client) sendContent(
 	}
 
 	outgoingMessages := MyMessages{
-		Timestamp: int64(messageTimestamp),
+		Timestamp: messageTimestamp,
 		Online:    false,
-		Urgent:    true,
+		Urgent:    isUrgent(content),
 		Messages:  messages,
 	}
 	jsonBytes, err := json.Marshal(outgoingMessages)