Merge branch 'master' into feat/federation feat/federation

1 files changed, 1 insertions, 1 deletions

diff --git a/src/activitypub/util/transforms/index.ts b/src/activitypub/util/transforms/index.ts

index e8107ca0..7333233e 100644
--- a/src/activitypub/util/transforms/index.ts
+++ b/src/activitypub/util/transforms/index.ts
@@ -126,7 +126,7 @@ export const messageFromAP = async (data: APNote): Promise<Message> => {
 	const member =
 		channel instanceof Channel
 			? await Member.findOneOrFail({
-					where: { id: user.id, guild_id: channel.guild.id },
+					where: { id: user.id, guild_id: channel.guild!.id },
 			  })
 			: undefined;