matrix-nodejs-homeserver 0.2.0 → 0.3.2

package/dist/api/rtc.d.ts

@@ -1,4 +1,3 @@
-import "../http/router.js";
 //#region src/api/rtc.d.ts
 export interface TurnOptions {
   uris: string[];

package/dist/api/rtc.js

@@ -1,52 +1,66 @@
 import { errors } from "../core/errors.js";
+import { string } from "../vendor/zod/v4/classic/schemas.js";
 import { body, fail } from "../http/input.js";
+import { procedure } from "../http/procedure.js";
 import { createHmac } from "node:crypto";
-import { z } from "zod";
 //#region src/api/rtc.ts
 function registerRtcRoutes(r) {
-	r.client("GET", "/voip/turnServer", async (ctx) => {
-		const s = await ctx.auth();
-		const turn = ctx.hs.config.rtc.turn;
-		if (!turn || !turn.uris.length) return {};
-		if (s.isGuest && !turn.allowGuests) throw errors.forbidden("Guests may not use TURN");
-		const ttl = turn.ttlSeconds ?? 86400;
-		if (turn.sharedSecret) {
-			const username = `${Math.floor(Date.now() / 1e3) + ttl}:${s.userId}`;
+	r.client("GET", "/voip/turnServer", procedure({
+		auth: "user",
+		handler: async (ctx) => {
+			const s = ctx.session;
+			const turn = ctx.hs.config.rtc.turn;
+			if (!turn || !turn.uris.length) return {};
+			if (s.isGuest && !turn.allowGuests) throw errors.forbidden("Guests may not use TURN");
+			const ttl = turn.ttlSeconds ?? 86400;
+			if (turn.sharedSecret) {
+				const username = `${Math.floor(Date.now() / 1e3) + ttl}:${s.userId}`;
+				return {
+					username,
+					password: createHmac("sha1", turn.sharedSecret).update(username).digest("base64"),
+					uris: turn.uris,
+					ttl
+				};
+			}
 			return {
-				username,
-				password: createHmac("sha1", turn.sharedSecret).update(username).digest("base64"),
+				username: turn.username ?? "",
+				password: turn.password ?? "",
 				uris: turn.uris,
 				ttl
 			};
 		}
-		return {
-			username: turn.username ?? "",
-			password: turn.password ?? "",
-			uris: turn.uris,
-			ttl
-		};
-	});
+	}));
 	const transports = async (ctx) => {
 		await ctx.auth();
 		return { rtc_transports: ctx.hs.config.rtc.transports ?? [] };
 	};
-	r.client("GET", "/rtc/transports", transports, ["v1"]);
-	r.get("/_matrix/client/unstable/org.matrix.msc4143/rtc/transports", transports);
+	r.client("GET", "/rtc/transports", procedure({ handler: transports }), ["v1"]);
+	r.get("/_matrix/client/unstable/org.matrix.msc4143/rtc/transports", procedure({ handler: transports }));
 	const base = "/_matrix/client/unstable/org.matrix.msc4140/delayed_events";
-	r.get(base, async (ctx) => {
-		const s = await ctx.auth();
-		return { delayed_events: await ctx.hs.delayedEvents.list(s.userId) };
-	});
-	r.post(`${base}/:delayId`, { input: body({ action: z.string(fail("M_MISSING_PARAM", "Missing action")) }) }, async (ctx) => {
-		const s = await ctx.auth();
-		await ctx.hs.delayedEvents.update(s.userId, ctx.params.delayId, ctx.input.action);
-		return {};
-	});
-	r.post(`${base}/:delayId/:action`, async (ctx) => {
-		const s = await ctx.auth();
-		await ctx.hs.delayedEvents.update(s.userId, ctx.params.delayId, ctx.params.action);
-		return {};
-	});
+	r.get(base, procedure({
+		auth: "user",
+		handler: async (ctx) => {
+			const s = ctx.session;
+			return { delayed_events: await ctx.hs.delayedEvents.list(s.userId) };
+		}
+	}));
+	r.post(`${base}/:delayId`, procedure({
+		auth: "user",
+		input: body({ action: string(fail("M_MISSING_PARAM", "Missing action")) }),
+		handler: async (ctx) => {
+			const s = ctx.session;
+			await ctx.hs.delayedEvents.update(s.userId, ctx.params.delayId, ctx.input.action);
+			return {};
+		}
+	}));
+	r.post(`${base}/:delayId/:action`, procedure({
+		auth: "user",
+		handler: async (ctx) => {
+			const s = ctx.session;
+			await ctx.hs.delayedEvents.update(s.userId, ctx.params.delayId, ctx.params.action);
+			return {};
+		}
+	}));
 }
 //#endregion
 export { registerRtcRoutes };

package/dist/api/search.js

@@ -1,9 +1,11 @@
 import { isObject } from "../core/json.js";
+import { M } from "../core/m.js";
 import { getState } from "../core/authrules.js";
+import { looseObject, string, unknown } from "../vendor/zod/v4/classic/schemas.js";
 import { body, fail } from "../http/input.js";
+import { procedure } from "../http/procedure.js";
 import { matchesFilter } from "./filters.js";
 import { paginate, topoToken } from "./rooms.js";
-import { z } from "zod";
 //#region src/api/search.ts
 const DEFAULT_KEYS = [
 	"content.body",
@@ -15,141 +17,145 @@ function valueAt(obj, path) {
 }
 function registerSearchRoutes(r) {
 	const missingTerm = fail("M_BAD_JSON", "Missing search_categories.room_events.search_term");
-	const searchBody = body({ search_categories: z.looseObject({ room_events: z.looseObject({
-		search_term: z.string(missingTerm),
-		keys: z.unknown().optional(),
-		filter: z.unknown().optional(),
-		order_by: z.unknown().optional()
+	const searchBody = body({ search_categories: looseObject({ room_events: looseObject({
+		search_term: string(missingTerm),
+		keys: unknown().optional(),
+		filter: unknown().optional(),
+		order_by: unknown().optional()
 	}, missingTerm) }, missingTerm) });
-	r.client("POST", "/search", { input: searchBody }, async (ctx) => {
-		const s = await ctx.auth();
-		const hs = ctx.hs;
-		const criteria = ctx.input.search_categories.room_events;
-		const terms = criteria.search_term.toLowerCase().split(/\s+/).filter(Boolean);
-		const keys = Array.isArray(criteria.keys) && criteria.keys.length ? criteria.keys : DEFAULT_KEYS;
-		const filter = isObject(criteria.filter) ? criteria.filter : {};
-		const limit = Math.min(filter.limit ?? 10, 100);
-		const orderBy = criteria.order_by === "recent" ? "recent" : "rank";
-		const offset = Number.parseInt(ctx.query.get("next_batch") ?? "0", 10) || 0;
-		let rooms = await hs.rooms.roomsForUser(s.userId);
-		if (filter.rooms) rooms = rooms.filter((r) => filter.rooms.includes(r));
-		if (filter.not_rooms) rooms = rooms.filter((r) => !filter.not_rooms.includes(r));
-		const hits = [];
-		for (const roomId of rooms) {
-			const rows = await hs.db.findMany("events", {
-				where: [{
-					field: "room_id",
-					value: roomId
-				}],
-				sortBy: {
-					field: "stream",
-					direction: "desc"
-				}
-			});
-			const candidates = [];
-			for (const row of rows) {
-				if (row.state_key !== null || !matchesFilter(filter, row.json)) continue;
-				let rank = 0;
-				const words = [];
-				for (const key of keys) {
-					const v = valueAt(row.json, key);
-					if (typeof v === "string") words.push(...v.toLowerCase().split(/[^\p{L}\p{N}]+/u));
-				}
-				if (terms.every((t) => words.includes(t))) for (const t of terms) rank += words.filter((w) => w === t).length;
-				if (rank > 0) candidates.push({
-					ev: hs.rooms.rowToStored(row),
-					rank
+	r.client("POST", "/search", procedure({
+		auth: "user",
+		input: searchBody,
+		handler: async (ctx) => {
+			const s = ctx.session;
+			const hs = ctx.hs;
+			const criteria = ctx.input.search_categories.room_events;
+			const terms = criteria.search_term.toLowerCase().split(/\s+/).filter(Boolean);
+			const keys = Array.isArray(criteria.keys) && criteria.keys.length ? criteria.keys : DEFAULT_KEYS;
+			const filter = isObject(criteria.filter) ? criteria.filter : {};
+			const limit = Math.min(filter.limit ?? 10, 100);
+			const orderBy = criteria.order_by === "recent" ? "recent" : "rank";
+			const offset = Number.parseInt(ctx.query.get("next_batch") ?? "0", 10) || 0;
+			let rooms = await hs.rooms.roomsForUser(s.userId);
+			if (filter.rooms) rooms = rooms.filter((r) => filter.rooms.includes(r));
+			if (filter.not_rooms) rooms = rooms.filter((r) => !filter.not_rooms.includes(r));
+			const hits = [];
+			for (const roomId of rooms) {
+				const rows = await hs.db.findMany("events", {
+					where: [{
+						field: "room_id",
+						value: roomId
+					}],
+					sortBy: {
+						field: "stream",
+						direction: "desc"
+					}
 				});
+				const candidates = [];
+				for (const row of rows) {
+					if (row.state_key !== null || !matchesFilter(filter, row.json)) continue;
+					let rank = 0;
+					const words = [];
+					for (const key of keys) {
+						const v = valueAt(row.json, key);
+						if (typeof v === "string") words.push(...v.toLowerCase().split(/[^\p{L}\p{N}]+/u));
+					}
+					if (terms.every((t) => words.includes(t))) for (const t of terms) rank += words.filter((w) => w === t).length;
+					if (rank > 0) candidates.push({
+						ev: hs.rooms.rowToStored(row),
+						rank
+					});
+				}
+				const visible = new Set((await hs.rooms.filterVisible(s.userId, roomId, candidates.map((c) => c.ev))).map((v) => v.pdu.event_id));
+				hits.push(...candidates.filter((c) => visible.has(c.ev.pdu.event_id)));
 			}
-			const visible = new Set((await hs.rooms.filterVisible(s.userId, roomId, candidates.map((c) => c.ev))).map((v) => v.pdu.event_id));
-			hits.push(...candidates.filter((c) => visible.has(c.ev.pdu.event_id)));
-		}
-		hits.sort((a, b) => orderBy === "rank" && b.rank !== a.rank ? b.rank - a.rank : b.ev.stream - a.ev.stream);
-		const page = hits.slice(offset, offset + limit);
-		const viewer = {
-			userId: s.userId,
-			deviceId: s.deviceId
-		};
-		const ec = isObject(criteria.event_context) ? criteria.event_context : null;
-		const results = [];
-		for (const hit of page) {
-			const result = {
-				rank: hit.rank,
-				result: hs.rooms.formatEvent(hit.ev, viewer)
+			hits.sort((a, b) => orderBy === "rank" && b.rank !== a.rank ? b.rank - a.rank : b.ev.stream - a.ev.stream);
+			const page = hits.slice(offset, offset + limit);
+			const viewer = {
+				userId: s.userId,
+				deviceId: s.deviceId
 			};
-			if (ec) {
-				const roomId = hit.ev.pdu.room_id;
-				const here = {
-					depth: hit.ev.pdu.depth,
-					stream: hit.ev.stream
+			const ec = isObject(criteria.event_context) ? criteria.event_context : null;
+			const results = [];
+			for (const hit of page) {
+				const result = {
+					rank: hit.rank,
+					result: hs.rooms.formatEvent(hit.ev, viewer)
 				};
-				const before = await paginate(hs, s.userId, roomId, {
-					from: here,
-					to: null,
-					dir: "b",
-					limit: ec.before_limit ?? 5
-				});
-				const after = await paginate(hs, s.userId, roomId, {
-					from: here,
-					to: null,
-					dir: "f",
-					limit: ec.after_limit ?? 5
-				});
-				const context = {
-					events_before: before.events.map((e) => hs.rooms.formatEvent(e, viewer)),
-					events_after: after.events.map((e) => hs.rooms.formatEvent(e, viewer)),
-					start: before.end ?? topoToken(before.events.at(-1) ?? hit.ev),
-					end: topoToken(after.events.at(-1) ?? hit.ev)
-				};
-				if (ec.include_profile) {
-					const state = await hs.rooms.currentState(roomId);
-					const profile_info = {};
-					for (const e of [
-						...before.events,
-						hit.ev,
-						...after.events
-					]) {
-						const m = getState(state, "m.room.member", e.pdu.sender)?.content;
-						profile_info[e.pdu.sender] = {
-							displayname: m?.displayname,
-							avatar_url: m?.avatar_url
-						};
+				if (ec) {
+					const roomId = hit.ev.pdu.room_id;
+					const here = {
+						depth: hit.ev.pdu.depth,
+						stream: hit.ev.stream
+					};
+					const before = await paginate(hs, s.userId, roomId, {
+						from: here,
+						to: null,
+						dir: "b",
+						limit: ec.before_limit ?? 5
+					});
+					const after = await paginate(hs, s.userId, roomId, {
+						from: here,
+						to: null,
+						dir: "f",
+						limit: ec.after_limit ?? 5
+					});
+					const context = {
+						events_before: before.events.map((e) => hs.rooms.formatEvent(e, viewer)),
+						events_after: after.events.map((e) => hs.rooms.formatEvent(e, viewer)),
+						start: before.end ?? topoToken(before.events.at(-1) ?? hit.ev),
+						end: topoToken(after.events.at(-1) ?? hit.ev)
+					};
+					if (ec.include_profile) {
+						const state = await hs.rooms.currentState(roomId);
+						const profile_info = {};
+						for (const e of [
+							...before.events,
+							hit.ev,
+							...after.events
+						]) {
+							const m = getState(state, M.ROOM.MEMBER, e.pdu.sender)?.content;
+							profile_info[e.pdu.sender] = {
+								displayname: m?.displayname,
+								avatar_url: m?.avatar_url
+							};
+						}
+						context.profile_info = profile_info;
 					}
-					context.profile_info = profile_info;
+					result.context = context;
 				}
-				result.context = context;
+				results.push(result);
 			}
-			results.push(result);
-		}
-		const out = {
-			results,
-			count: hits.length,
-			highlights: terms
-		};
-		if (page.length === limit && offset + limit <= hits.length) out.next_batch = String(offset + limit);
-		if (criteria.include_state) {
-			out.state = {};
-			for (const roomId of new Set(page.map((h) => h.ev.pdu.room_id))) out.state[roomId] = [...(await hs.rooms.currentState(roomId)).values()].map((e) => hs.rooms.formatEvent({
-				pdu: e,
-				stream: 0,
-				snapshot: 0,
-				txnId: null,
-				txnToken: null
-			}));
-		}
-		if (criteria.groupings?.group_by?.some?.((g) => g?.key === "room_id")) {
-			const groups = {};
-			hits.forEach((h, i) => {
-				(groups[h.ev.pdu.room_id] ??= {
-					results: [],
-					order: i,
-					next_batch: null
-				}).results.push(h.ev.pdu.event_id);
-			});
-			out.groups = { room_id: groups };
+			const out = {
+				results,
+				count: hits.length,
+				highlights: terms
+			};
+			if (page.length === limit && offset + limit <= hits.length) out.next_batch = String(offset + limit);
+			if (criteria.include_state) {
+				out.state = {};
+				for (const roomId of new Set(page.map((h) => h.ev.pdu.room_id))) out.state[roomId] = [...(await hs.rooms.currentState(roomId)).values()].map((e) => hs.rooms.formatEvent({
+					pdu: e,
+					stream: 0,
+					snapshot: 0,
+					txnId: null,
+					txnToken: null
+				}));
+			}
+			if (criteria.groupings?.group_by?.some?.((g) => g?.key === "room_id")) {
+				const groups = {};
+				hits.forEach((h, i) => {
+					(groups[h.ev.pdu.room_id] ??= {
+						results: [],
+						order: i,
+						next_batch: null
+					}).results.push(h.ev.pdu.event_id);
+				});
+				out.groups = { room_id: groups };
+			}
+			return { search_categories: { room_events: out } };
 		}
-		return { search_categories: { room_events: out } };
-	});
+	}));
 }
 //#endregion
 export { registerSearchRoutes };

package/dist/api/slidingsync.js

@@ -1,25 +1,27 @@
 import { isObject } from "../core/json.js";
+import { M, UNSTABLE } from "../core/m.js";
 import { splitStateKey, toClientEvent } from "../core/events.js";
 import { MatrixError } from "../core/errors.js";
 import { getState } from "../core/authrules.js";
+import { record, string, unknown } from "../vendor/zod/v4/classic/schemas.js";
 import { body, lenient } from "../http/input.js";
+import { procedure } from "../http/procedure.js";
 import { roomEphemeral, roomTimeline, toStripped } from "./sync.js";
-import { z } from "zod";
 //#region src/api/slidingsync.ts
 const slidingSyncBody = body({
-	conn_id: lenient(z.string()),
-	lists: lenient(z.record(z.string(), z.unknown())),
-	room_subscriptions: lenient(z.record(z.string(), z.unknown())),
-	extensions: lenient(z.record(z.string(), z.unknown()))
+	conn_id: lenient(string()),
+	lists: lenient(record(string(), unknown())),
+	room_subscriptions: lenient(record(string(), unknown())),
+	extensions: lenient(record(string(), unknown()))
 });
 const BUMP_TYPES = /* @__PURE__ */ new Set([
-	"m.room.create",
-	"m.room.message",
-	"m.room.encrypted",
-	"m.sticker",
-	"m.call.invite",
-	"m.poll.start",
-	"m.beacon_info"
+	M.ROOM.CREATE,
+	M.ROOM.MESSAGE,
+	M.ROOM.ENCRYPTED,
+	M.STICKER,
+	M.CALL.INVITE,
+	M.POLL.START,
+	M.BEACON_INFO
 ]);
 async function loadConnection(hs, s, connId) {
 	return hs.db.findOne("sliding_sync_connections", [
@@ -62,17 +64,25 @@ function matchesRequiredState(required, type, key, userId, lazyMembers) {
 		if (t !== "*" && t !== type) continue;
 		if (k === "*" || k === key) return true;
 		if (k === "$ME" && key === userId) return true;
-		if (k === "$LAZY" && type === "m.room.member" && lazyMembers.has(key)) return true;
+		if (k === "$LAZY" && type === M.ROOM.MEMBER && lazyMembers.has(key)) return true;
 	}
 	return false;
 }
 function registerSlidingSyncRoutes(r) {
-	r.post("/_matrix/client/unstable/org.matrix.simplified_msc3575/sync", { input: slidingSyncBody }, slidingSync);
-	r.post("/_matrix/client/v5/sync", { input: slidingSyncBody }, slidingSync);
+	r.post("/_matrix/client/unstable/org.matrix.simplified_msc3575/sync", procedure({
+		auth: "user",
+		input: slidingSyncBody,
+		handler: slidingSync
+	}));
+	r.post("/_matrix/client/v5/sync", procedure({
+		auth: "user",
+		input: slidingSyncBody,
+		handler: slidingSync
+	}));
 }
 async function slidingSync(ctx) {
 	const hs = ctx.hs;
-	const s = await ctx.auth();
+	const s = ctx.session;
 	const body = ctx.input;
 	const connId = body.conn_id ?? "";
 	const posParam = ctx.query.get("pos");
@@ -143,7 +153,7 @@ async function buildResponse(hs, s, body, conn, since, to) {
 		},
 		{
 			field: "type",
-			value: "m.direct"
+			value: M.DIRECT
 		}
 	]);
 	const dmRooms = new Set(Object.values(direct?.content ?? {}).flat().filter((x) => typeof x === "string"));
@@ -162,7 +172,7 @@ async function buildResponse(hs, s, body, conn, since, to) {
 			bump,
 			state
 		});
-		const invite = getState(state, "m.room.member", userId);
+		const invite = getState(state, M.ROOM.MEMBER, userId);
 		if (m.membership === "invite" && invite?.content?.is_direct) dmRooms.add(m.room_id);
 	}
 	infos.sort((a, b) => b.bump - a.bump);
@@ -174,8 +184,8 @@ async function buildResponse(hs, s, body, conn, since, to) {
 		let rooms = infos;
 		if (f.is_dm !== void 0) rooms = rooms.filter((r) => dmRooms.has(r.roomId) === f.is_dm);
 		if (f.is_invite !== void 0) rooms = rooms.filter((r) => r.membership === "invite" === f.is_invite);
-		if (f.is_encrypted !== void 0) rooms = rooms.filter((r) => !!getState(r.state, "m.room.encryption") === f.is_encrypted);
-		const roomType = (r) => getState(r.state, "m.room.create")?.content?.type ?? null;
+		if (f.is_encrypted !== void 0) rooms = rooms.filter((r) => !!getState(r.state, M.ROOM.ENCRYPTION) === f.is_encrypted);
+		const roomType = (r) => getState(r.state, M.ROOM.CREATE)?.content?.type ?? null;
 		if (f.room_types) rooms = rooms.filter((r) => f.room_types.includes(roomType(r)));
 		if (f.not_room_types) rooms = rooms.filter((r) => !f.not_room_types.includes(roomType(r)));
 		if (f.spaces) {
@@ -184,7 +194,7 @@ async function buildResponse(hs, s, body, conn, since, to) {
 				if (!await hs.rooms.exists(space)) continue;
 				for (const key of (await hs.rooms.currentState(space)).keys()) {
 					const [t, k] = splitStateKey(key);
-					if (t === "m.space.child") children.add(k);
+					if (t === M.SPACE.CHILD) children.add(k);
 				}
 			}
 			rooms = rooms.filter((r) => children.has(r.roomId));
@@ -265,13 +275,13 @@ async function buildRoom(hs, s, info, config, since, to, isDm) {
 		timeline: [],
 		required_state: []
 	};
-	const name = getState(state, "m.room.name")?.content?.name;
+	const name = getState(state, M.ROOM.NAME)?.content?.name;
 	if (typeof name === "string") room.name = name;
-	const avatar = getState(state, "m.room.avatar")?.content?.url;
+	const avatar = getState(state, M.ROOM.AVATAR)?.content?.url;
 	if (typeof avatar === "string") room.avatar = avatar;
 	if (isDm) room.is_dm = true;
 	if (info.membership === "invite" || info.membership === "knock") {
-		const own = getState(state, "m.room.member", userId);
+		const own = getState(state, M.ROOM.MEMBER, userId);
 		const ev = own?.event_id ? await hs.rooms.getEvent(own.event_id) : null;
 		if (ev) {
 			const key = info.membership === "invite" ? "invite_room_state" : "knock_room_state";
@@ -323,7 +333,7 @@ async function buildRoom(hs, s, info, config, since, to, isDm) {
 	const heroes = [];
 	for (const [key, ev] of state) {
 		const [type, sk] = splitStateKey(key);
-		if (type !== "m.room.member") continue;
+		if (type !== M.ROOM.MEMBER) continue;
 		const m = ev.content?.membership;
 		if (m === "join") joined++;
 		if (m === "invite") invited++;
@@ -410,10 +420,10 @@ async function buildExtensions(hs, s, ext, since, to, roomIds, next) {
 			if (r.room_id === "") global.push(ev);
 			else if (roomIds.includes(r.room_id) || since !== null) (rooms[r.room_id] ??= []).push(ev);
 		}
-		if (since === null && !global.some((e) => e.type === "m.push_rules")) {
+		if (since === null && !global.some((e) => e.type === M.PUSH_RULES)) {
 			const { loadRules } = await import("../core/pushrules.js");
 			global.push({
-				type: "m.push_rules",
+				type: M.PUSH_RULES,
 				content: { global: await loadRules(hs, userId) }
 			});
 		}
@@ -422,9 +432,9 @@ async function buildExtensions(hs, s, ext, since, to, roomIds, next) {
 			rooms
 		};
 	}
-	if (ext["io.element.msc4308.thread_subscriptions"]?.enabled) {
+	if (ext[UNSTABLE.IO.ELEMENT.MSC4308.THREAD_SUBSCRIPTIONS]?.enabled) {
 		const { threadSubscriptionsExtension } = await import("./threadsubs.js");
-		out["io.element.msc4308.thread_subscriptions"] = await threadSubscriptionsExtension(hs, userId, ext["io.element.msc4308.thread_subscriptions"], since, to);
+		out[UNSTABLE.IO.ELEMENT.MSC4308.THREAD_SUBSCRIPTIONS] = await threadSubscriptionsExtension(hs, userId, ext[UNSTABLE.IO.ELEMENT.MSC4308.THREAD_SUBSCRIPTIONS], since, to);
 	}
 	if (ext.receipts?.enabled || ext.typing?.enabled) {
 		const p = {
@@ -444,8 +454,8 @@ async function buildExtensions(hs, s, ext, since, to, roomIds, next) {
 		for (const roomId of since === null ? roomIds : [...joined]) {
 			if (!joined.has(roomId)) continue;
 			for (const e of await roomEphemeral(hs, p, roomId)) {
-				if (e.type === "m.receipt" && ext.receipts?.enabled) receipts[roomId] = e;
-				if (e.type === "m.typing" && ext.typing?.enabled && (since !== null || e.content.user_ids.length)) typing[roomId] = e;
+				if (e.type === M.RECEIPT && ext.receipts?.enabled) receipts[roomId] = e;
+				if (e.type === M.TYPING && ext.typing?.enabled && (since !== null || e.content.user_ids.length)) typing[roomId] = e;
 			}
 		}
 		if (ext.receipts?.enabled) out.receipts = { rooms: receipts };