From 1224f1887ab8e74a42313e4f181e33d6b8fdcbc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadeusz=20=E2=80=9Etadzik=E2=80=9D=20So=C5=9Bnierz?=
 <tadeusz@sosnierz.com>
Date: Tue, 21 May 2024 10:49:20 +0200
Subject: [PATCH 1/2] Don't use origin_server_ts when tracking joins, use
 bridge-time instead

---
 src/bridge/MatrixHandler.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bridge/MatrixHandler.ts b/src/bridge/MatrixHandler.ts
index 94e03ac79..89a0885b7 100644
--- a/src/bridge/MatrixHandler.ts
+++ b/src/bridge/MatrixHandler.ts
@@ -414,7 +414,7 @@ export class MatrixHandler {
      */
     private _onMemberEvent(req: BridgeRequest, event: OnMemberEventData) {
         if (event.content.membership === 'join') {
-            this.memberJoinTs.set(`${event.room_id}/${event.state_key}`, event.origin_server_ts ?? Date.now());
+            this.memberJoinTs.set(`${event.room_id}/${event.state_key}`, Date.now());
         }
         else {
             this.memberJoinTs.delete(`${event.room_id}/${event.state_key}`);

From 8fcf80ad5c1d2dcc87ef7c01904e7ed4db192294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadeusz=20=E2=80=9Etadzik=E2=80=9D=20So=C5=9Bnierz?=
 <tadeusz@sosnierz.com>
Date: Tue, 21 May 2024 11:09:32 +0200
Subject: [PATCH 2/2] Changelog

---
 changelog.d/1804.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1804.misc

diff --git a/changelog.d/1804.misc b/changelog.d/1804.misc
new file mode 100644
index 000000000..fd2546f87
--- /dev/null
+++ b/changelog.d/1804.misc
@@ -0,0 +1 @@
+Don't use origin_server_ts when tracking joins, use bridge-time instead.