diff --git a/commands/phone/phone.js b/commands/phone/phone.js index a79df9bb..e402cf08 100644 --- a/commands/phone/phone.js +++ b/commands/phone/phone.js @@ -57,11 +57,11 @@ module.exports = class PhoneCommand extends Command { channel = this.client.channels.cache.get(channelID); const user = this.client.users.cache.get(channelID); if (user) return msg.reply('You cannot call DM channels.'); - if (!channel || !channel.guild) return msg.reply('This channel does not exist.'); + if (!channel || !channel.guild) return msg.reply('That channel does not exist.'); if (!channel.topic || !channel.topic.includes('')) { - return msg.reply('This channel does not allow phone calls.'); + return msg.reply('That channel does not allow phone calls.'); } - if (this.client.inPhoneCall(channel)) return msg.reply('This channel is already in a call.'); + if (this.client.inPhoneCall(channel)) return msg.reply('That channel is already in a call.'); if (this.client.isBlockedFromPhone(msg.channel, channel, msg.author)) { return msg.reply('That channel has blocked this channel from calling them.'); } diff --git a/structures/Client.js b/structures/Client.js index 9074b531..9700eded 100644 --- a/structures/Client.js +++ b/structures/Client.js @@ -54,11 +54,11 @@ module.exports = class XiaoClient extends CommandoClient { isBlockedFromPhone(origin, recipient, caller) { return recipient.topic.includes(``) - && recipient.topic.includes(``) - && (origin.guild && recipient.topic.includes(``)) - && (origin.guild && origin.topic.includes(``)) - && (origin.guild && origin.topic.includes(``)) - && (origin.guild && origin.topic.includes(``)); + || recipient.topic.includes(``) + || (origin.guild && recipient.topic.includes(``)) + || (origin.guild && origin.topic.includes(``)) + || (origin.guild && origin.topic.includes(``)) + || (origin.guild && origin.topic.includes(``)); } importCommandLeaderboard() {