From a5777ab4b46a7179d016960a8c30e0bc96702d41 Mon Sep 17 00:00:00 2001
From: Dragon Fire <danielbodendahl@gmail.com>
Date: Thu, 3 Dec 2020 15:21:23 -0500
Subject: [PATCH] Fix

---
 structures/Client.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/structures/Client.js b/structures/Client.js
index 9700eded..f14839e3 100644
--- a/structures/Client.js
+++ b/structures/Client.js
@@ -53,11 +53,11 @@ module.exports = class XiaoClient extends CommandoClient {
 	}
 
 	isBlockedFromPhone(origin, recipient, caller) {
-		return recipient.topic.includes(`<xiao:phone:block:${origin.id}>`)
-			|| recipient.topic.includes(`<xiao:phone:block:${caller.id}>`)
-			|| (origin.guild && recipient.topic.includes(`<xiao:phone:block:${origin.guild.id}>`))
+		return (recipient.guild && recipient.topic.includes(`<xiao:phone:block:${origin.id}>`))
+			|| (recipient.guild && recipient.topic.includes(`<xiao:phone:block:${caller.id}>`))
+			|| (origin.guild && recipient.guild && recipient.topic.includes(`<xiao:phone:block:${origin.guild.id}>`))
 			|| (origin.guild && origin.topic.includes(`<xiao:phone:block:${recipient.id}>`))
-			|| (origin.guild && origin.topic.includes(`<xiao:phone:block:${recipient.guild.id}>`))
+			|| (origin.guild && recipient.guild && origin.topic.includes(`<xiao:phone:block:${recipient.guild.id}>`))
 			|| (origin.guild && origin.topic.includes(`<xiao:phone:block:${caller.id}>`));
 	}