handlewhatsapp,matrix: provide stream order in messages

[skip cd]
mautrix · Oct 1, 2024 · 6e6c679 · 6e6c679
1 parent e3f9e64
commit 6e6c679
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/pkg/connector/events.go b/pkg/connector/events.go
@@ -93,12 +93,17 @@ type WAMessageEvent struct {
 	postHandle                    func()
 }
 
+func (evt *WAMessageEvent) GetStreamOrder() int64 {
+	return evt.Info.Timestamp.Unix()
+}
+
 var (
 	_ bridgev2.RemoteMessage                  = (*WAMessageEvent)(nil)
 	_ bridgev2.RemoteMessageUpsert            = (*WAMessageEvent)(nil)
 	_ bridgev2.RemoteMessageWithTransactionID = (*WAMessageEvent)(nil)
 	_ bridgev2.RemoteEventWithTimestamp       = (*WAMessageEvent)(nil)
 	_ bridgev2.RemoteEventThatMayCreatePortal = (*WAMessageEvent)(nil)
+	_ bridgev2.RemoteEventWithStreamOrder     = (*WAMessageEvent)(nil)
 	_ bridgev2.RemoteReaction                 = (*WAMessageEvent)(nil)
 	_ bridgev2.RemoteReactionRemove           = (*WAMessageEvent)(nil)
 	_ bridgev2.RemoteReactionWithMeta         = (*WAMessageEvent)(nil)
@@ -303,6 +308,10 @@ func (evt *WAUndecryptableMessage) ConvertMessage(ctx context.Context, portal *b
 	}, nil
 }
 
+func (evt *WAUndecryptableMessage) GetStreamOrder() int64 {
+	return evt.Info.Timestamp.Unix()
+}
+
 type WAMediaRetry struct {
 	*events.MediaRetry
 	wa *WhatsAppClient

diff --git a/pkg/connector/handlematrix.go b/pkg/connector/handlematrix.go
@@ -53,6 +53,7 @@ func (wa *WhatsAppClient) HandleMatrixMessage(ctx context.Context, msg *bridgev2
 				SenderDeviceID: wa.JID.Device,
 			},
 		},
+		StreamOrder:   resp.Timestamp.Unix(),
 		RemovePending: networkid.TransactionID(wrappedMsgID),
 	}, nil
 }