src/m2d/actions/send-event.js

@@ -39,20 +39,14 @@ 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(
+			await api.getMedia(p.mxc).then(res => stream.Readable.fromWeb(res.body).pipe(d))
-				// @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(
+			const body = await api.getMedia(p.mxc).then(res => stream.Readable.fromWeb(res.body))
-				// @ts-ignore
-				res.body
-			))
 			return {
 				name: p.name,
 				file: body

src/m2d/event-dispatcher.js

@@ -156,12 +156,8 @@ 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(/** @type {Ty.Event.Outer<any>} */ event, /** @type {any} */ ...args) {
+	return async function(event, ...args) {
 		try {
 			return await fn(event, ...args)
 		} catch (e) {