From d6dc5cb88f7380c0ae8fbcb70ed5a1001700279d Mon Sep 17 00:00:00 2001
From: Cadence Ember <cadence@disroot.org>
Date: Sat, 14 Sep 2024 00:58:21 +1200
Subject: [PATCH] Type fixes

---
 scripts/seed.js                            |  2 +-
 src/d2m/converters/remove-reaction.test.js |  4 +++-
 src/matrix/api.js                          |  4 ++--
 src/web/routes/download-matrix.js          | 13 ++++++++-----
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/scripts/seed.js b/scripts/seed.js
index 01fc3e3..649f3fc 100644
--- a/scripts/seed.js
+++ b/scripts/seed.js
@@ -9,7 +9,7 @@ const {createServer} = require("http")
 
 const {prompt} = require("enquirer")
 const Input = require("enquirer/lib/prompts/input")
-const fetch = require("node-fetch")
+const fetch = require("node-fetch").default
 const {magenta, bold, cyan} = require("ansi-colors")
 const HeatSync = require("heatsync")
 const {SnowTransfer} = require("snowtransfer")
diff --git a/src/d2m/converters/remove-reaction.test.js b/src/d2m/converters/remove-reaction.test.js
index dc6eda5..b42c11a 100644
--- a/src/d2m/converters/remove-reaction.test.js
+++ b/src/d2m/converters/remove-reaction.test.js
@@ -10,7 +10,9 @@ function fakeSpecificReactionRemoval(userID, emoji, emojiID) {
 		channel_id: "THE_CHANNEL",
 		message_id: "THE_MESSAGE",
 		user_id: userID,
-		emoji: {id: emojiID, name: emoji}
+		emoji: {id: emojiID, name: emoji},
+		burst: false,
+		type: 0
 	}
 }
 
diff --git a/src/matrix/api.js b/src/matrix/api.js
index 4b1c676..4866495 100644
--- a/src/matrix/api.js
+++ b/src/matrix/api.js
@@ -3,7 +3,7 @@
 const Ty = require("../types")
 const assert = require("assert").strict
 
-const fetch = require("node-fetch")
+const fetch = require("node-fetch").default
 
 const passthrough = require("../passthrough")
 const { discord, sync, db } = passthrough
@@ -315,7 +315,7 @@ async function ping() {
 
 /**
  * @param {string} mxc
- * @param {RequestInit} [init]
+ * @param {fetch.RequestInit} [init]
  */
 function getMedia(mxc, init = {}) {
 	const mediaParts = mxc?.match(/^mxc:\/\/([^/]+)\/(\w+)$/)
diff --git a/src/web/routes/download-matrix.js b/src/web/routes/download-matrix.js
index 79f6a0e..137af7c 100644
--- a/src/web/routes/download-matrix.js
+++ b/src/web/routes/download-matrix.js
@@ -1,8 +1,9 @@
 // @ts-check
 
+const assert = require("assert/strict")
 const {defineEventHandler, getValidatedRouterParams, setResponseStatus, setResponseHeader, sendStream, createError} = require("h3")
 const {z} = require("zod")
-const fetch = require("node-fetch")
+const fetch = require("node-fetch").default
 
 /** @type {import("xxhash-wasm").XXHashAPI} */ // @ts-ignore
 let hasher = null
@@ -40,9 +41,11 @@ as.router.get(`/download/matrix/:server_name/:media_id`, defineEventHandler(asyn
 		}
 	})
 
-	setResponseStatus(event, res.status)
-	setResponseHeader(event, "Content-Type", res.headers.get("content-type"))
-	setResponseHeader(event, "Transfer-Encoding", "chunked")
+	const contentType = res.headers.get("content-type")
+	assert(contentType)
 
-	return sendStream(event, res.body)
+	setResponseStatus(event, res.status)
+	setResponseHeader(event, "Content-Type", contentType)
+	setResponseHeader(event, "Transfer-Encoding", "chunked")
+	return res.body
 }))