From 2c7831c587d0f797e34d50fd44d373d67a2feaf9 Mon Sep 17 00:00:00 2001
From: Guzio <guzekk@protonmail.com>
Date: Thu, 19 Feb 2026 16:19:39 +0000
Subject: [PATCH] Small TypeScript coverage expansion

* The guard() function in m2d/event-dispatcher.js no longer takes (any, any), but a string and a function.

* m2d/send-event.js no longer complains that res.body has some missing fields. It would appear as though those missing fields weren't revelant to the fromWeb() function (into which res.body is passed), given that this code worked before and still contunes to work, so I just @ts-ignore'd res.body

This commit's developer's off-topic personal comment, related to this commit: This has nothing to do with improving thread UX, even tho this is what I was supposed to work on. However, in my attempts to discover in what file should I start, I stumbled upon those errors from m2d/send-event.js, so I fixed them. And after establishing that m2d/event-dispatcher.js is the file that I'm looking for, I also noticed that guard()'s @parm definitions could be improved, so I did that. Now - back to thread work...
---
 src/m2d/actions/send-event.js | 10 ++++++++--
 src/m2d/event-dispatcher.js   |  6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/m2d/actions/send-event.js b/src/m2d/actions/send-event.js
index 00557a1..bce45c6 100644
--- a/src/m2d/actions/send-event.js
+++ b/src/m2d/actions/send-event.js
@@ -39,14 +39,20 @@ async function resolvePendingFiles(message) {
 		if ("key" in p) {
 			// Encrypted file
 			const d = crypto.createDecipheriv("aes-256-ctr", Buffer.from(p.key, "base64url"), Buffer.from(p.iv, "base64url"))
-			await api.getMedia(p.mxc).then(res => stream.Readable.fromWeb(res.body).pipe(d))
+			await api.getMedia(p.mxc).then(res => stream.Readable.fromWeb(
+				// @ts-ignore
+				res.body
+			).pipe(d))
 			return {
 				name: p.name,
 				file: d
 			}
 		} else {
 			// Unencrypted file
-			const body = await api.getMedia(p.mxc).then(res => stream.Readable.fromWeb(res.body))
+			const body = await api.getMedia(p.mxc).then(res => stream.Readable.fromWeb(
+				// @ts-ignore
+				res.body
+			))
 			return {
 				name: p.name,
 				file: body
diff --git a/src/m2d/event-dispatcher.js b/src/m2d/event-dispatcher.js
index 70e293b..2091f7d 100644
--- a/src/m2d/event-dispatcher.js
+++ b/src/m2d/event-dispatcher.js
@@ -156,8 +156,12 @@ async function sendError(roomID, source, type, e, payload) {
 	} catch (e) {}
 }
 
+/**
+ * @param {string} type
+ * @param {(event: any, ...args: any)=>any} fn
+ */
 function guard(type, fn) {
-	return async function(event, ...args) {
+	return async function(/** @type {Ty.Event.Outer<any>} */ event, /** @type {any} */ ...args) {
 		try {
 			return await fn(event, ...args)
 		} catch (e) {