arthur/xiao
1
0
Fork 0
mirror of https://github.com/arthur-pbty/xiao.git synced 2026-06-26 14:19:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Dragon Fire
2020-12-03 15:08:42 -05:00
parent 3411c1e210
commit 15fc86c899
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands/phone/phone.js
+3 -3
View File
@@ -57,11 +57,11 @@ module.exports = class PhoneCommand extends Command {
channel = this.client.channels.cache.get(channelID); channel = this.client.channels.cache.get(channelID);
const user = this.client.users.cache.get(channelID); const user = this.client.users.cache.get(channelID);
if (user) return msg.reply('You cannot call DM channels.'); 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('<xiao:phone>')) { if (!channel.topic || !channel.topic.includes('<xiao:phone>')) {
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)) { if (this.client.isBlockedFromPhone(msg.channel, channel, msg.author)) {
return msg.reply('That channel has blocked this channel from calling them.'); return msg.reply('That channel has blocked this channel from calling them.');
} }
structures/Client.js
+5 -5
View File
@@ -54,11 +54,11 @@ module.exports = class XiaoClient extends CommandoClient {
isBlockedFromPhone(origin, recipient, caller) { isBlockedFromPhone(origin, recipient, caller) {
return recipient.topic.includes(`<xiao:phone:block:${origin.id}>`) return recipient.topic.includes(`<xiao:phone:block:${origin.id}>`)
&& recipient.topic.includes(`<xiao:phone:block:${caller.id}>`) || recipient.topic.includes(`<xiao:phone:block:${caller.id}>`)
&& (origin.guild && recipient.topic.includes(`<xiao:phone:block:${origin.guild.id}>`)) || (origin.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.id}>`))
&& (origin.guild && origin.topic.includes(`<xiao:phone:block:${recipient.guild.id}>`)) || (origin.guild && origin.topic.includes(`<xiao:phone:block:${recipient.guild.id}>`))
&& (origin.guild && origin.topic.includes(`<xiao:phone:block:${caller.id}>`)); || (origin.guild && origin.topic.includes(`<xiao:phone:block:${caller.id}>`));
} }
importCommandLeaderboard() { importCommandLeaderboard() {