diff --git a/Xiao.js b/Xiao.js index eb5987d0..4d545ed5 100644 --- a/Xiao.js +++ b/Xiao.js @@ -110,9 +110,9 @@ client.on('message', async msg => { const recipient = client.phone.find(call => call.recipient.id === msg.channel.id); if (!origin && !recipient) return; const call = origin || recipient; - if (!call.ownerOrigin && (!msg.channel.topic || !msg.channel.topic.includes(''))) return; + if (!call.adminCall && (!msg.channel.topic || !msg.channel.topic.includes(''))) return; if (!call.active) return; - if (call.ownerOrigin && msg.guild.id === call.origin.guild.id && !client.isOwner(msg.author)) 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 33df0e8b..d1794842 100644 --- a/commands/phone/hang-up.js +++ b/commands/phone/hang-up.js @@ -18,7 +18,7 @@ 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.ownerOrigin && !this.client.isOwner(msg.author)) { + if (call.adminCall && !this.client.isOwner(msg.author)) { return msg.reply('☎️ You cannot hang up in an admin call.'); } const nonQuitter = msg.channel.id === call.origin.id ? call.recipient : call.origin; diff --git a/commands/phone/phone-info.js b/commands/phone/phone-info.js index df735c28..a3c5a341 100644 --- a/commands/phone/phone-info.js +++ b/commands/phone/phone-info.js @@ -27,7 +27,7 @@ module.exports = class PhoneInfoCommand extends Command { .addField('❯ Recipient Server', otherChannel.guild.name, true) .addField('❯ Recipient ID', otherChannel.id, true) .addField('❯ Call Duration', call.durationDisplay, true) - .addField('❯ Admin Call?', call.ownerOrigin ? 'Yes' : 'No', true) + .addField('❯ Admin Call?', call.adminCall ? 'Yes' : 'No', true) .addField('❯ Started By', call.startUser.tag, true); return msg.embed(embed); } diff --git a/structures/phone/PhoneCall.js b/structures/phone/PhoneCall.js index 9f0720a0..495d972e 100644 --- a/structures/phone/PhoneCall.js +++ b/structures/phone/PhoneCall.js @@ -4,7 +4,7 @@ require('moment-duration-format'); const { shorten, stripInvites, verify } = require('../../util/Util'); module.exports = class PhoneCall { - constructor(client, startUser, origin, recipient, ownerOrigin) { + constructor(client, startUser, origin, recipient, adminCall) { Object.defineProperty(this, 'client', { value: client }); this.id = `${origin.id}:${recipient.id}`; @@ -13,14 +13,14 @@ module.exports = class PhoneCall { this.startUser = startUser; this.active = false; this.timeout = null; - this.ownerOrigin = ownerOrigin || false; + this.adminCall = adminCall || false; this.cooldown = new Set(); this.ratelimitMeters = new Map(); this.timeStarted = null; } async start() { - if (this.ownerOrigin) { + if (this.adminCall) { await this.origin.send(`☎️ Admin call started with **${this.recipient.guild.name}**.`); await this.recipient.send(`☎️ An **ADMIN** call from **${this.origin.guild.name}** has begun.`); } else { @@ -40,7 +40,7 @@ module.exports = class PhoneCall { this.active = true; this.timeStarted = new Date(); this.setTimeout(); - if (this.ownerOrigin) return this; + if (this.adminCall) return this; const usage = this.client.registry.commands.get('hang-up').usage(); await this.origin.send(`☎️ **${this.recipient.guild.name}** picked up! Use ${usage} to hang up.`); await this.recipient.send(`☎️ Accepted call from **${this.origin.guild.name}**. Use ${usage} to hang up.`);