From 41e49be9b390f1aa107eb5c03fed8ebac5df0c73 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Sun, 17 Oct 2021 01:53:29 +0200
Subject: [PATCH] :bug: fix typing

---
 api/src/routes/channels/#channel_id/typing.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/api/src/routes/channels/#channel_id/typing.ts b/api/src/routes/channels/#channel_id/typing.ts
index 45ed76db..56652368 100644
--- a/api/src/routes/channels/#channel_id/typing.ts
+++ b/api/src/routes/channels/#channel_id/typing.ts
@@ -9,14 +9,13 @@ router.post("/", route({ permission: "SEND_MESSAGES" }), async (req: Request, re
 	const user_id = req.user_id;
 	const timestamp = Date.now();
 	const channel = await Channel.findOneOrFail({ id: channel_id });
-	const member = await Member.findOneOrFail({ where: { id: user_id }, relations: ["roles", "user"] });
+	const member = await Member.findOne({ where: { id: user_id, guild_id: channel.guild_id }, relations: ["roles", "user"] });
 
 	await emitEvent({
 		event: "TYPING_START",
 		channel_id: channel_id,
 		data: {
-			// this is the paylod
-			member: { ...member, roles: member.roles?.map((x) => x.id) },
+			...(member ? { member: { ...member, roles: member?.roles?.map((x) => x.id) } } : null),
 			channel_id,
 			timestamp,
 			user_id,