From dedf26aa8ca74a2b9b4347d8b9dc353cbcde31c7 Mon Sep 17 00:00:00 2001 From: Dragon Fire Date: Thu, 29 Apr 2021 18:08:31 -0400 Subject: [PATCH] Remove all adminCall stuff --- Xiao.js | 3 +-- commands/phone/hang-up.js | 3 --- commands/phone/phone-info.js | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Xiao.js b/Xiao.js index 26da2fb9..09fdb3b2 100644 --- a/Xiao.js +++ b/Xiao.js @@ -252,9 +252,8 @@ client.on('message', async msg => { if (!origin && !recipient) return; const call = origin || recipient; if (call.originDM && call.startUser.id !== msg.author.id) return; - if (!call.adminCall && (msg.guild && (!msg.channel.topic || !msg.channel.topic.includes('')))) return; + if (msg.guild && (!msg.channel.topic || !msg.channel.topic.includes(''))) return; if (!call.active) return; - if (call.adminCall && msg.guild.id === call.origin.guild.id && !client.isOwner(msg.author)) return; try { await call.send(origin ? call.recipient : call.origin, msg, hasText, hasImage, hasEmbed); } catch { diff --git a/commands/phone/hang-up.js b/commands/phone/hang-up.js index 9d51a0fd..484130db 100644 --- a/commands/phone/hang-up.js +++ b/commands/phone/hang-up.js @@ -17,9 +17,6 @@ module.exports = class HangUpCommand extends Command { if (!origin && !recipient) return msg.reply('☎️ This channel is not in a phone call.'); const call = origin || recipient; if (!call.active) return msg.reply('☎️ This call is not currently active.'); - if (call.adminCall && !this.client.isOwner(msg.author)) { - return msg.reply('☎️ You cannot hang up in an admin call.'); - } const otherChannel = call.origin.id === msg.channel.id ? call.recipient : call.origin; if (this.client.phone.isBlocked(msg.channel, otherChannel, msg.author)) { return msg.reply('☎️ You are blocked from hanging up this phone call.'); diff --git a/commands/phone/phone-info.js b/commands/phone/phone-info.js index e1119485..2945ce48 100644 --- a/commands/phone/phone-info.js +++ b/commands/phone/phone-info.js @@ -29,7 +29,6 @@ module.exports = class PhoneInfoCommand extends Command { .addField('❯ Recipient Server', otherChannelDM ? 'DM' : otherChannel.guild.name, true) .addField('❯ Recipient ID', otherChannel.id, true) .addField('❯ Call Duration', call.durationDisplay, true) - .addField('❯ Admin Call?', call.adminCall ? 'Yes' : 'No', true) .addField('❯ Started By', call.startUser.tag, true); return msg.embed(embed); }