From 3f2a8d959c10891921e8dcb5e5e6f6d44f9fb727 Mon Sep 17 00:00:00 2001
From: Cadence Ember <cadence@disroot.org>
Date: Sat, 26 Aug 2023 22:50:54 +1200
Subject: [PATCH] preemptively cache members as we find them

---
 m2d/converters/event-to-message.js |  2 +-
 m2d/event-dispatcher.js            | 10 ++++++++++
 types.d.ts                         |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/m2d/converters/event-to-message.js b/m2d/converters/event-to-message.js
index 8363d8f..f5d3c90 100644
--- a/m2d/converters/event-to-message.js
+++ b/m2d/converters/event-to-message.js
@@ -80,7 +80,7 @@ async function getMemberFromCacheOrHomeserver(roomID, mxid, api) {
 	const row = db.prepare("SELECT displayname, avatar_url FROM member_cache WHERE room_id = ? AND mxid = ?").get(roomID, mxid)
 	if (row) return row
 	return api.getStateEvent(roomID, "m.room.member", mxid).then(event => {
-		db.prepare("INSERT INTO member_cache (room_id, mxid, displayname, avatar_url) VALUES (?, ?, ?, ?)").run(roomID, mxid, event?.displayname || null, event?.avatar_url || null)
+		db.prepare("REPLACE INTO member_cache (room_id, mxid, displayname, avatar_url) VALUES (?, ?, ?, ?)").run(roomID, mxid, event?.displayname || null, event?.avatar_url || null)
 		return event
 	}).catch(() => {
 		return {displayname: null, avatar_url: null}
diff --git a/m2d/event-dispatcher.js b/m2d/event-dispatcher.js
index 3425fdb..9a575fc 100644
--- a/m2d/event-dispatcher.js
+++ b/m2d/event-dispatcher.js
@@ -91,3 +91,13 @@ async event => {
 	const name = event.content.name || null
 	db.prepare("UPDATE channel_room SET nick = ? WHERE room_id = ?").run(name, event.room_id)
 }))
+
+sync.addTemporaryListener(as, "type:m.room.member", guard("m.room.member",
+/**
+ * @param {Ty.Event.StateOuter<Ty.Event.M_Room_Member>} event
+ */
+async event => {
+	if (event.state_key[0] !== "@") return
+	if (utils.eventSenderIsFromDiscord(event.sender)) return
+	db.prepare("REPLACE INTO member_cache (room_id, mxid, displayname, avatar_url) VALUES (?, ?, ?, ?)").run(event.room_id, event.sender, event.content.displayname || null, event.content.avatar_url || null)
+}))
diff --git a/types.d.ts b/types.d.ts
index 2bf0af0..5475904 100644
--- a/types.d.ts
+++ b/types.d.ts
@@ -80,7 +80,7 @@ export namespace Event {
 
 	export type M_Room_Member = {
 		membership: string
-		display_name?: string
+		displayname?: string
 		avatar_url?: string
 	}