diff --git a/index.js b/index.js index 5e7ec912f..795661d31 100644 --- a/index.js +++ b/index.js @@ -19,7 +19,7 @@ const config = require('./src/data/config.json'); // Grab tokens and secret files const debug = config.debug; -if (!debug) var tracer = require('dd-trace').init(); +if (!debug) require('dd-trace').init(); const request = require('./utils/request.js'); // Eris-Sharder @@ -29,7 +29,7 @@ var result, shards, firstShardID, lastShardID; // Helper files if (require('cluster').isMaster) { const global = require('./utils/global.js'); - const RamCheck = new (require('./utils/ramCheck.js'))(global); + new (require('./utils/ramCheck.js'))(global); } let clusters = 60; @@ -56,7 +56,7 @@ let clusters = 60; ); // Start sharder - const sharder = new Sharder('Bot ' + process.env.BOT_TOKEN, config.sharder.path, { + new Sharder('Bot ' + process.env.BOT_TOKEN, config.sharder.path, { name: config.sharder.name, clientOptions: config.eris.clientOptions, debug: true, diff --git a/package.json b/package.json index 412320241..8adc4210e 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": { "lint": "npx eslint .", - "lint:fix": "npx eslint --fix", + "lint:fix": "npx eslint --fix .", "prettier": "npx prettier --check .", "prettier:fix": "npx prettier --write .", "format": "npm run lint:fix && npm run prettier:fix" diff --git a/secret/macro.js b/secret/macro.js index 8f1353c69..a66095cf1 100644 --- a/secret/macro.js +++ b/secret/macro.js @@ -1,3 +1,5 @@ +/* eslint no-use-before-define: 0 */ + // Checks for macros exports.check = async function (p, command, { diff, now }) { return true; diff --git a/src/botHandlers/mysqlHandler.js b/src/botHandlers/mysqlHandler.js index b3b1740c2..9fbb6464c 100644 --- a/src/botHandlers/mysqlHandler.js +++ b/src/botHandlers/mysqlHandler.js @@ -48,7 +48,7 @@ exports.startTransaction = () => { delete result.rollback; delete result.query; clearTimeout(releaseTimer); - return new Promise((res, rej) => { + return new Promise((res) => { acon.rollback(() => { acon.release(); res(); diff --git a/src/botHandlers/questHandler.js b/src/botHandlers/questHandler.js index fcb40bc6c..e2a492bea 100644 --- a/src/botHandlers/questHandler.js +++ b/src/botHandlers/questHandler.js @@ -12,11 +12,6 @@ const quests = require('../data/quests.json'); const mysql = require('./mysqlHandler.js'); const global = require('../utils/global.js'); -const findQuest = { - rare: ['common', 'uncommon'], - epic: ['common', 'uncommon', 'rare'], - mythical: ['common', 'uncommon', 'rare', 'epic'], -}; const questBy = ['friendlyBattle', 'friendlyBattleBy', 'emoteBy', 'prayBy', 'curseBy', 'cookieBy']; module.exports = class Quest { @@ -72,7 +67,7 @@ async function check(msg, id, username, questName, result, count, extra) { } /* Check if the quest is complete */ - let text, rewardSql, sqls, variables, rewardVar; + let text, rewardSql, sql, variables, rewardVar; if (current >= needed) { sql = 'DELETE FROM quest WHERE qid = ? AND qname = ? AND uid = (SELECT uid FROM user WHERE id = ?);'; @@ -82,16 +77,16 @@ async function check(msg, id, username, questName, result, count, extra) { if (rewardType == 'lootbox') { text += '<:box:427352600476647425>'.repeat(reward); rewardSql = - "INSERT INTO lootbox (id,boxcount,claim) VALUES (?,?,'2017-01-01 10:10:10') ON DUPLICATE KEY UPDATE boxcount = boxcount + ?;"; + 'INSERT INTO lootbox (id,boxcount,claim) VALUES (?,?,\'2017-01-01 10:10:10\') ON DUPLICATE KEY UPDATE boxcount = boxcount + ?;'; rewardVar = [id, reward, reward]; } else if (rewardType == 'crate') { text += '<:crate:523771259302182922>'.repeat(reward); rewardSql = - "INSERT INTO crate (uid,boxcount,claim) VALUES ((SELECT uid FROM user WHERE id = ?),?,'2017-01-01 10:10:10') ON DUPLICATE KEY UPDATE boxcount = boxcount + ?;"; + 'INSERT INTO crate (uid,boxcount,claim) VALUES ((SELECT uid FROM user WHERE id = ?),?,\'2017-01-01 10:10:10\') ON DUPLICATE KEY UPDATE boxcount = boxcount + ?;'; rewardVar = [id, reward, reward]; } else if (rewardType == 'shards') { text += '<:weaponshard:655902978712272917>**x' + reward + '**'; - rewardSql = `INSERT INTO shards (uid,count) VALUES ((SELECT uid FROM user WHERE id = ?),?) ON DUPLICATE KEY UPDATE count = count + ?;`; + rewardSql = 'INSERT INTO shards (uid,count) VALUES ((SELECT uid FROM user WHERE id = ?),?) ON DUPLICATE KEY UPDATE count = count + ?;'; rewardVar = [id, reward, reward]; } else { text += global.toFancyNum(reward) + ' <:cowoncy:416043450337853441>'; diff --git a/src/commands/CommandInterface.js b/src/commands/CommandInterface.js index d80fb3173..0bcfc715b 100644 --- a/src/commands/CommandInterface.js +++ b/src/commands/CommandInterface.js @@ -30,7 +30,7 @@ module.exports = class CommandInterface { '` permission! Please reinvite the bot, or contact your server admin!', 4000 ); - params.logger.incr(`noperms`, 1, { permission: this.permissions }, params.msg); + params.logger.incr('noperms', 1, { permission: this.permissions }, params.msg); return; } } diff --git a/src/commands/command.js b/src/commands/command.js index c633691df..c23fa8daa 100644 --- a/src/commands/command.js +++ b/src/commands/command.js @@ -27,7 +27,7 @@ class Command { async execute(msg, raw) { // Parse content info - let { args, context } = await checkPrefix(this.main, msg) || {}; + let { args, context } = (await checkPrefix(this.main, msg)) || {}; const containsPoints = msg.content.toLowerCase().includes('owo') || msg.content.toLowerCase().includes('uwu'); if (!args) { @@ -86,7 +86,7 @@ class Command { if (msg.content.toLowerCase().indexOf(this.prefix) !== 0) { return false; } - let { args, context } = await checkPrefix(this.main, msg) || {}; + let { args, context } = (await checkPrefix(this.main, msg)) || {}; let command = args.shift().toLowerCase(); let commandObj = adminCommands[command]; if (!commandObj) { diff --git a/src/commands/commandList/admin/adminProfile.js b/src/commands/commandList/admin/adminProfile.js index b5f836551..291b12852 100644 --- a/src/commands/commandList/admin/adminProfile.js +++ b/src/commands/commandList/admin/adminProfile.js @@ -22,7 +22,7 @@ module.exports = new CommandInterface({ let user = p.args[0].match(/[0-9]+/)[0]; user = await p.fetch.getUser(user); if (!user) { - p.errorMsg(", I couldn't find that user!", 3000); + p.errorMsg(', I couldn\'t find that user!', 3000); } else { await profileUtil.displayProfile(p, user); } diff --git a/src/commands/commandList/admin/getPatreonRewards.js b/src/commands/commandList/admin/getPatreonRewards.js index 5c690cf33..fe99b347c 100644 --- a/src/commands/commandList/admin/getPatreonRewards.js +++ b/src/commands/commandList/admin/getPatreonRewards.js @@ -44,7 +44,7 @@ async function getPatreons(p) { console.log(patreons); let result = []; if (p.args[0] != 'ignoresql') { - let sql = `SELECT id FROM user INNER JOIN patreons ON user.uid = patreons.uid WHERE TIMESTAMPDIFF(MONTH,patreonTimer,NOW()) 1) name += 's'; - emoji = p.config.emoji.perkTicket.common; - break; - default: - p.errorMsg(', wrong ticket type for ' + id); - return; + case 1: + type = 'common_tickets'; + name = 'Common Ticket'; + if (Math.abs(count) > 1) name += 's'; + emoji = p.config.emoji.perkTicket.common; + break; + default: + p.errorMsg(', wrong ticket type for ' + id); + return; } // Fetch uid first diff --git a/src/commands/commandList/admin/lift.js b/src/commands/commandList/admin/lift.js index 6954e9959..19e1b96c3 100644 --- a/src/commands/commandList/admin/lift.js +++ b/src/commands/commandList/admin/lift.js @@ -43,7 +43,7 @@ module.exports = new CommandInterface({ )) ) { if (user.dmError) { - p.send('āš  **|** Penalty has been set to 0 for ' + user.username + ", I couldn't DM them."); + p.send('āš  **|** Penalty has been set to 0 for ' + user.username + ', I couldn\'t DM them.'); } else { p.send('Penalty has been set to 0 for ' + user.username); } diff --git a/src/commands/commandList/admin/prayfrom.js b/src/commands/commandList/admin/prayfrom.js index 28c2bcf2f..f4b8ba78c 100644 --- a/src/commands/commandList/admin/prayfrom.js +++ b/src/commands/commandList/admin/prayfrom.js @@ -74,7 +74,7 @@ async function banList(p) { } catch (e) { p.replyMsg( banEmoji, - ', **' + username + '** and ' + (count - 1) + " users have been banned, I couldn't DM them." + ', **' + username + '** and ' + (count - 1) + ' users have been banned, I couldn\'t DM them.' ); return; } @@ -112,7 +112,7 @@ async function displayList(p) { let result = await p.query(sql); if (!result[0] || !result[0].count || result[0].count == 0) { - p.errorMsg(', ' + username + " hasn't prayed to anyone!", 3000); + p.errorMsg(', ' + username + ' hasn\'t prayed to anyone!', 3000); return; } diff --git a/src/commands/commandList/admin/prayto.js b/src/commands/commandList/admin/prayto.js index eea944a83..6279f62f3 100644 --- a/src/commands/commandList/admin/prayto.js +++ b/src/commands/commandList/admin/prayto.js @@ -74,7 +74,7 @@ async function banList(p) { } catch (e) { p.replyMsg( banEmoji, - ', **' + username + '** and ' + (count - 1) + " users have been banned, I couldn't DM them" + ', **' + username + '** and ' + (count - 1) + ' users have been banned, I couldn\'t DM them' ); return; } diff --git a/src/commands/commandList/admin/resetCowoncy.js b/src/commands/commandList/admin/resetCowoncy.js index 76945421d..f90bb118d 100644 --- a/src/commands/commandList/admin/resetCowoncy.js +++ b/src/commands/commandList/admin/resetCowoncy.js @@ -49,7 +49,7 @@ module.exports = new CommandInterface({ } **|** I couldn't DM them.` ); } else { - p.send(`āš  **|** Failed to reset cowoncy`); + p.send('āš  **|** Failed to reset cowoncy'); } }, }); diff --git a/src/commands/commandList/admin/warn.js b/src/commands/commandList/admin/warn.js index 899831254..f50566f00 100644 --- a/src/commands/commandList/admin/warn.js +++ b/src/commands/commandList/admin/warn.js @@ -34,7 +34,7 @@ module.exports = new CommandInterface({ if (user && !user.dmError) { p.send(`šŸ“Ø **|** Sent a warning to **${user.username}#${user.discriminator}**`); } else { - p.send(`āš  **|** Failed to send a warning for that user`); + p.send('āš  **|** Failed to send a warning for that user'); } }, }); diff --git a/src/commands/commandList/battle/ab.js b/src/commands/commandList/battle/ab.js index d8efbc6fd..b6e6a4cdd 100644 --- a/src/commands/commandList/battle/ab.js +++ b/src/commands/commandList/battle/ab.js @@ -126,7 +126,7 @@ module.exports = new CommandInterface({ (SELECT * FROM (SELECT COUNT(id) FROM cowoncy c2 WHERE c2.id IN (${author.id},${sender.id}) AND c2.money >= ${bet}) c3) >= 2`; result = await p.query(sql); if (result.changedRows < 2) { - p.errorMsg(", looks like someone doesn't have enough money!", 3000); + p.errorMsg(', looks like someone doesn\'t have enough money!', 3000); return; } sql = `UPDATE cowoncy SET money = money + ${bet * 2} WHERE id = ${winner.id}; ${winSql}`; diff --git a/src/commands/commandList/battle/battleSetting.js b/src/commands/commandList/battle/battleSetting.js index 0e0de0648..3d5705559 100644 --- a/src/commands/commandList/battle/battleSetting.js +++ b/src/commands/commandList/battle/battleSetting.js @@ -48,7 +48,7 @@ async function display(p) { let embed = { color: p.config.embed_color, author: { - name: p.msg.author.username + "'s battle settings", + name: p.msg.author.username + '\'s battle settings', icon_url: p.msg.author.avatarURL, }, description: text, @@ -82,11 +82,11 @@ async function changeSettings(p) { }else*/ if (args[0] == 'display') { field = 'display'; if (args[1] == 'image') { - setting = "'image'"; + setting = '\'image\''; } else if (args[1] == 'text') { - setting = "'text'"; + setting = '\'text\''; } else if (args[1] == 'compact') { - setting = "'compact'"; + setting = '\'compact\''; } else { p.errorMsg(', the display settings can only be `image`, `compact`, or `text`!'); return; diff --git a/src/commands/commandList/battle/crate.js b/src/commands/commandList/battle/crate.js index ee133ee0e..b2e797dc6 100644 --- a/src/commands/commandList/battle/crate.js +++ b/src/commands/commandList/battle/crate.js @@ -41,7 +41,7 @@ module.exports = new CommandInterface({ let sql = `SELECT boxcount FROM crate INNER JOIN user ON crate.uid = user.uid WHERE id = ${p.msg.author.id};`; let result = await p.query(sql); if (!result || result[0].boxcount <= 0) { - p.errorMsg(", you don't have any more weapon crates!"); + p.errorMsg(', you don\'t have any more weapon crates!'); return; } let boxcount = result[0].boxcount; @@ -68,7 +68,7 @@ async function openCrate(p, count = 1) { let result = await p.query(sql); if (result[0].changedRows == 0 || !result[1][0]) { - p.errorMsg(", You don't have any weapon crates!", 3000); + p.errorMsg(', You don\'t have any weapon crates!', 3000); return; } diff --git a/src/commands/commandList/battle/rename.js b/src/commands/commandList/battle/rename.js index d4c8e77eb..30f2a35f0 100644 --- a/src/commands/commandList/battle/rename.js +++ b/src/commands/commandList/battle/rename.js @@ -37,7 +37,7 @@ module.exports = new CommandInterface({ /* Validity check */ animal = p.global.validAnimal(animal); if (!animal) { - return p.errorMsg(", I couldn't find that animal! D:"); + return p.errorMsg(', I couldn\'t find that animal! D:'); } if (input.length > 35) { return p.errorMsg(', The nickname is too long!', 3000); diff --git a/src/commands/commandList/battle/team.js b/src/commands/commandList/battle/team.js index 477736f75..5a2bb6133 100644 --- a/src/commands/commandList/battle/team.js +++ b/src/commands/commandList/battle/team.js @@ -53,7 +53,7 @@ module.exports = new CommandInterface({ /* No changing while in battle */ if (await battleUtil.inBattle(p)) p.errorMsg( - ", You cannot change your team while you're in battle! Please finish your `owo battle`!", + ', You cannot change your team while you\'re in battle! Please finish your `owo battle`!', 3000 ); else if (await battleFriendUtil.inBattle(p)) @@ -68,7 +68,7 @@ module.exports = new CommandInterface({ /* No changing while in battle */ if (await battleUtil.inBattle(p)) p.errorMsg( - ", You cannot change your team while you're in battle! Please finish your `owo battle`!", + ', You cannot change your team while you\'re in battle! Please finish your `owo battle`!', 3000 ); else if (await battleFriendUtil.inBattle(p)) @@ -95,7 +95,7 @@ async function displayTeam(p) { await teamUtil.displayTeam(p); } catch (err) { console.error(err); - p.errorMsg(`, something went wrong... Try again!`, 5000); + p.errorMsg(', something went wrong... Try again!', 5000); } } @@ -129,7 +129,7 @@ async function add(p) { await teamUtil.addMember(p, animal, pos); } catch (err) { console.error(err); - p.errorMsg(`, something went wrong... Try again!`, 5000); + p.errorMsg(', something went wrong... Try again!', 5000); } } @@ -162,7 +162,7 @@ async function remove(p) { await teamUtil.removeMember(p, remove); } catch (err) { console.error(err); - p.errorMsg(`, something went wrong... Try again!`, 5000); + p.errorMsg(', something went wrong... Try again!', 5000); } } @@ -183,6 +183,6 @@ async function rename(p) { await teamUtil.renameTeam(p, name); } catch (err) { console.error(err); - p.errorMsg(`, something went wrong... Try again!`, 5000); + p.errorMsg(', something went wrong... Try again!', 5000); } } diff --git a/src/commands/commandList/battle/teams.js b/src/commands/commandList/battle/teams.js index 77928636f..3cb33a573 100644 --- a/src/commands/commandList/battle/teams.js +++ b/src/commands/commandList/battle/teams.js @@ -108,7 +108,7 @@ async function displayTeams(p) { let activeTeam = 0; const teamsOrder = {}; if (!result[2].length) { - p.errorMsg(", you don't have a team! Create one with `owo team add {animalName}`!", 5000); + p.errorMsg(', you don\'t have a team! Create one with `owo team add {animalName}`!', 5000); return; } // Find current active team @@ -131,7 +131,7 @@ async function displayTeams(p) { const embed = teamUtil.createTeamEmbed(p, team, other); const teamOrder = teamsOrder[pgid]; if (teamOrder == null) { - p.errorMsg(", I couldn't parse your team... something went terribly wrong!", 3000); + p.errorMsg(', I couldn\'t parse your team... something went terribly wrong!', 3000); return; } teams[teamOrder] = embed; @@ -142,7 +142,7 @@ async function displayTeams(p) { if (!teams[i]) { teams[i] = { author: { - name: p.msg.author.username + "'s team", + name: p.msg.author.username + '\'s team', icon_url: p.msg.author.avatarURL, }, description: @@ -213,7 +213,7 @@ async function setTeam(p, teamNum, dontDisplay) { // You cant change teams if in battle if (await battleUtil.inBattle(p)) { p.errorMsg( - ", You cannot change your team while you're in battle! Please finish your `owo battle`!", + ', You cannot change your team while you\'re in battle! Please finish your `owo battle`!', 3000 ); return; @@ -228,12 +228,12 @@ async function setTeam(p, teamNum, dontDisplay) { // Fetch uid and pgid let sql = `SELECT uid FROM user WHERE id = ${p.msg.author.id}; SELECT pgid FROM user LEFT JOIN pet_team ON user.uid = pet_team.uid WHERE id = ${ - p.msg.author.id - } ORDER BY pgid LIMIT 1 OFFSET ${teamNum - 1}`; + p.msg.author.id +} ORDER BY pgid LIMIT 1 OFFSET ${teamNum - 1}`; let result = await p.query(sql); if (!result[0]) { - p.errorMsg(", you don't have any animals! Get some with `owo hunt`!", 3000); + p.errorMsg(', you don\'t have any animals! Get some with `owo hunt`!', 3000); return; } diff --git a/src/commands/commandList/battle/util/battleFriendUtil.js b/src/commands/commandList/battle/util/battleFriendUtil.js index 63e1839d1..4d5e714bd 100644 --- a/src/commands/commandList/battle/util/battleFriendUtil.js +++ b/src/commands/commandList/battle/util/battleFriendUtil.js @@ -66,16 +66,16 @@ exports.challenge = async function (p, opponent, bet = 0) { /* Error check for teams */ if (!result[0][0]) { - p.errorMsg(", The opponent doesn't have a team!", 3000); + p.errorMsg(', The opponent doesn\'t have a team!', 3000); return; } else if (!result[1][0]) { - p.errorMsg(", You don't have a team!", 3000); + p.errorMsg(', You don\'t have a team!', 3000); return; } else if (!result[2][0] || result[2][0].money < bet) { - p.errorMsg(", You don't have enough cowoncy!", 3000); + p.errorMsg(', You don\'t have enough cowoncy!', 3000); return; } else if (!result[3][0] || result[3][0].money < bet) { - p.errorMsg(", The opponent doesn't have enough cowoncy!", 3000); + p.errorMsg(', The opponent doesn\'t have enough cowoncy!', 3000); return; } else if (result[4][0]) { p.errorMsg(', There is already a pending battle!', 3000); @@ -269,7 +269,7 @@ function toEmbedRequest(p, stats, bet, sender, receiver, flags) { for (let i in text) { embed.fields.push({ name: - (sender.name ? sender.name : sender.username + "'s Team") + + (sender.name ? sender.name : sender.username + '\'s Team') + (sender.id == receiver.id ? '' : ' | ' + (stats[sender.id] ? stats[sender.id] : 0) + ' wins'), @@ -280,7 +280,7 @@ function toEmbedRequest(p, stats, bet, sender, receiver, flags) { for (let i in text2) { embed.fields.push({ name: - (receiver.name ? receiver.name : receiver.username + "'s Team") + + (receiver.name ? receiver.name : receiver.username + '\'s Team') + (sender.id == receiver.id ? '' : ' | ' + (stats[receiver.id] ? stats[receiver.id] : 0) + ' wins'), @@ -292,7 +292,7 @@ function toEmbedRequest(p, stats, bet, sender, receiver, flags) { embed.fields = [ { name: - (sender.name ? sender.name : sender.username + "'s Team") + + (sender.name ? sender.name : sender.username + '\'s Team') + (sender.id == receiver.id ? '' : ' | ' + (stats[sender.id] ? stats[sender.id] : 0) + ' wins'), @@ -301,7 +301,7 @@ function toEmbedRequest(p, stats, bet, sender, receiver, flags) { }, { name: - (receiver.name ? receiver.name : receiver.username + "'s Team") + + (receiver.name ? receiver.name : receiver.username + '\'s Team') + (sender.id == receiver.id ? '' : ' | ' + (stats[receiver.id] ? stats[receiver.id] : 0) + ' wins'), @@ -346,25 +346,25 @@ function parseFlag(p, flag) { if (flag.startsWith('display')) { flag = flag.replace('display', ''); switch (flag) { - case 'text': - return { flag: 'display', res: 'text' }; - break; - case 'compact': - return { flag: 'display', res: 'compact' }; - break; - case 'image': - return { flag: 'display', res: 'image' }; - break; - default: - return undefined; + case 'text': + return { flag: 'display', res: 'text' }; + break; + case 'compact': + return { flag: 'display', res: 'compact' }; + break; + case 'image': + return { flag: 'display', res: 'image' }; + break; + default: + return undefined; } } else if (flag.startsWith('log')) { flag = flag.replace('logs', '').replace('log', ''); switch (flag) { - case 'link': - return { flag: 'log', res: 'link' }; - default: - return { flag: 'log', res: 'log' }; + case 'link': + return { flag: 'log', res: 'link' }; + default: + return { flag: 'log', res: 'log' }; } } else if (flag.startsWith('lvl') || flag.startsWith('level')) { flag = flag.replace('level', '').replace('lvl', ''); diff --git a/src/commands/commandList/battle/util/battleUtil.js b/src/commands/commandList/battle/util/battleUtil.js index 7d02e507c..957c580f5 100644 --- a/src/commands/commandList/battle/util/battleUtil.js +++ b/src/commands/commandList/battle/util/battleUtil.js @@ -37,7 +37,7 @@ function teamFilter(userId) { } let minPgid = 0; -mysql.con.query(`SELECT pgid FROM pet_team ORDER BY pgid ASC LIMIT 1`, (err, result) => { +mysql.con.query('SELECT pgid FROM pet_team ORDER BY pgid ASC LIMIT 1', (err, result) => { if (err) throw err; minPgid = result[0]?.pgid || 0; }); @@ -132,7 +132,7 @@ exports.initBattle = async function (p, setting) { let count = await p.query(sql); let pgid = count[1][0]; if (!pgid) { - p.errorMsg(", You don't have a team! Set one with `owo team add {animal}`!"); + p.errorMsg(', You don\'t have a team! Set one with `owo team add {animal}`!'); return; } pgid = pgid.pgid; @@ -561,7 +561,7 @@ async function executeBattle(p, msg, action, setting) { /* tie */ if (enemyWin && playerWin) { - await finishBattle(msg, p, battle, 6381923, "It's a tie!", playerWin, enemyWin, null, setting); + await finishBattle(msg, p, battle, 6381923, 'It\'s a tie!', playerWin, enemyWin, null, setting); /* enemy wins */ } else if (enemyWin) { @@ -617,7 +617,7 @@ var calculateAll = (exports.calculateAll = function (p, battle, logs = []) { if (enemyWin || playerWin) { /* tie */ let color = 6381923; - let text = "It's a tie in " + logs.length + ' turns!'; + let text = 'It\'s a tie in ' + logs.length + ' turns!'; /* enemy wins */ if (enemyWin && !playerWin) { @@ -641,7 +641,7 @@ var calculateAll = (exports.calculateAll = function (p, battle, logs = []) { enemy: true, player: true, color: 6381923, - text: "Battle was too long! It's a tie!", + text: 'Battle was too long! It\'s a tie!', }); return logs; } @@ -859,7 +859,7 @@ function initSqlSaveBuffs(team) { return result.length == 0 ? '' : `INSERT INTO pet_team_battle_buff (pgid,pid,bfid,duration,qualities,pfrom) VALUES ${result.join( - ',' + ',' )} ON DUPLICATE KEY UPDATE duration=VALUES(duration),qualities=VALUES(qualities);`; } diff --git a/src/commands/commandList/battle/util/dailyWeaponUtil.js b/src/commands/commandList/battle/util/dailyWeaponUtil.js index b1dbfd47a..afe34e288 100644 --- a/src/commands/commandList/battle/util/dailyWeaponUtil.js +++ b/src/commands/commandList/battle/util/dailyWeaponUtil.js @@ -111,14 +111,14 @@ exports.buy = async function (p, id) { ' Weapon Shards**' ); } else { - p.errorMsg(", You don't have enough Weapon Shards!", 3000); + p.errorMsg(', You don\'t have enough Weapon Shards!', 3000); } return; } // Check if purchased already let purchased = await redis.hmget(redisKey + 'Purchased', [id + '' + p.msg.author.id]); - if (!!purchased[0]) { + if (purchased[0]) { p.errorMsg(', You already purchased this weapon, silly!', 3000); return; } @@ -143,7 +143,7 @@ exports.buy = async function (p, id) { weapon.shardPrice = markupPrices[weapon.rank.name]; if (!(await useShards(p, weapon.shardPrice))) { - p.errorMsg(", You don't have enough Weapon Shards!", 3000); + p.errorMsg(', You don\'t have enough Weapon Shards!', 3000); return; } @@ -153,7 +153,7 @@ exports.buy = async function (p, id) { let result = await p.query(weaponSql); let uwid = result.insertId; weaponEmojis = '`' + weaponUtil.shortenUWID(uwid) + '` ' + weaponEmojis; - let passiveSql = `INSERT INTO user_weapon_passive (uwid,pcount,wpid,stat) VALUES `; + let passiveSql = 'INSERT INTO user_weapon_passive (uwid,pcount,wpid,stat) VALUES '; for (let i = 0; i < weapon.passives.length; i++) { let tempPassive = weapon.passives[i]; weaponEmojis += tempPassive.emoji; @@ -187,7 +187,7 @@ async function useShards(p, count) { let sql = `UPDATE shards INNER JOIN user ON shards.uid = user.uid SET shards.count = shards.count - ${count} WHERE user.id = ${p.msg.author.id} AND shards.count >= ${count};`; let result = await p.query(sql); if (result.changedRows >= 1) { - p.logger.decr(`shards`, -1 * count, { type: 'shop' }, p.msg); + p.logger.decr('shards', -1 * count, { type: 'shop' }, p.msg); return true; } return false; @@ -241,19 +241,19 @@ function createEmbed(p, weapons, page) { /* Make description */ let desc = `**Name:** ${weapon.name}\n`; desc += `**Shop ID:** ${weapon.shopID}\n`; - if (weapon.purchased) desc += `**Price:** PURCHASED\n\n`; + if (weapon.purchased) desc += '**Price:** PURCHASED\n\n'; else desc += `**Price:** ${weapon.shardPrice} ${shardEmoji}\n\n`; desc += `**Quality:** ${weapon.rank.emoji} ${weapon.avgQuality}%\n`; desc += `**WP Cost:** ${Math.ceil(weapon.manaCost)} <:wp:531620120976687114>`; desc += `\n**Description:** ${weapon.desc}\n`; if (weapon.buffList.length > 0) { - desc += `\n`; + desc += '\n'; let buffs = weapon.getBuffs(); for (let i in buffs) { desc += `${buffs[i].emoji} **${buffs[i].name}** - ${buffs[i].desc}\n`; } } - if (weapon.passives.length <= 0) desc += `\n**Passives:** None`; + if (weapon.passives.length <= 0) desc += '\n**Passives:** None'; for (var i = 0; i < weapon.passives.length; i++) { let passive = weapon.passives[i]; desc += `\n${passive.emoji} **${passive.name}** - ${passive.desc}`; @@ -264,7 +264,7 @@ function createEmbed(p, weapons, page) { /* Construct embed */ return (embed = { author: { - name: "Today's Available Weapons", + name: 'Today\'s Available Weapons', icon_url: p.msg.author.avatarURL, }, color: p.config.embed_color, diff --git a/src/commands/commandList/battle/util/petUtil.js b/src/commands/commandList/battle/util/petUtil.js index 9c0e31491..5e98924c5 100644 --- a/src/commands/commandList/battle/util/petUtil.js +++ b/src/commands/commandList/battle/util/petUtil.js @@ -33,7 +33,7 @@ exports.getAnimals = async function (p) { exports.getDisplay = function (p, animals) { let embed = { author: { - name: p.msg.author.username + "'s pets", + name: p.msg.author.username + '\'s pets', icon_url: p.msg.author.avatarURL, }, color: p.config.embed_color, diff --git a/src/commands/commandList/battle/util/rerollUtil.js b/src/commands/commandList/battle/util/rerollUtil.js index e22e6c6f6..bbbbbc614 100644 --- a/src/commands/commandList/battle/util/rerollUtil.js +++ b/src/commands/commandList/battle/util/rerollUtil.js @@ -119,7 +119,7 @@ async function getWeapon(p, uwid) { ); return; } else if (weapon.unsellable) { - p.errorMsg(", I can't reroll this weapon!", 4000); + p.errorMsg(', I can\'t reroll this weapon!', 4000); return; } @@ -165,7 +165,7 @@ async function sendMessage(p, oldWeapon, newWeapon, rrType, msg) { if (!(await useShards(p))) { embed.color = 16711680; msg.edit({ - content: "You don't have enough " + shardEmoji + ' Weapon Shards!', + content: 'You don\'t have enough ' + shardEmoji + ' Weapon Shards!', embed, }); } else { @@ -188,7 +188,7 @@ async function useShards(p) { let sql = `UPDATE shards INNER JOIN user ON shards.uid = user.uid SET shards.count = shards.count - ${rerollPrice} WHERE user.id = ${p.msg.author.id} AND shards.count >= ${rerollPrice};`; let result = await p.query(sql); if (result.changedRows >= 1) { - p.logger.decr(`shards`, -1 * rerollPrice, { type: 'reroll' }, p.msg); + p.logger.decr('shards', -1 * rerollPrice, { type: 'reroll' }, p.msg); return true; } return false; @@ -237,13 +237,13 @@ function parseDescription(title, weapon) { desc += `**WP Cost:** ${Math.ceil(weapon.manaCost)} <:wp:531620120976687114>`; desc += `\n**Description:** ${weapon.desc}\n`; if (weapon.buffList.length > 0) { - desc += `\n`; + desc += '\n'; let buffs = weapon.getBuffs(); for (let i in buffs) { desc += `${buffs[i].emoji} **${buffs[i].name}** - ${buffs[i].desc}\n`; } } - if (weapon.passives.length <= 0) desc += `\n**Passives:** None`; + if (weapon.passives.length <= 0) desc += '\n**Passives:** None'; for (let i = 0; i < weapon.passives.length; i++) { let passive = weapon.passives[i]; desc += `\n${passive.emoji} **${passive.name}** - ${passive.desc}`; diff --git a/src/commands/commandList/battle/util/teamUtil.js b/src/commands/commandList/battle/util/teamUtil.js index 8bb950ca7..0c0742c37 100644 --- a/src/commands/commandList/battle/util/teamUtil.js +++ b/src/commands/commandList/battle/util/teamUtil.js @@ -45,7 +45,7 @@ exports.addMember = async function (p, animal, pos) { let usedPos = []; for (let i = 0; i < result[0].length; i++) { if (result[0][i].name == animal.value) { - p.errorMsg(`, This animal is already in your team!`, 3000); + p.errorMsg(', This animal is already in your team!', 3000); return; } @@ -64,7 +64,7 @@ exports.addMember = async function (p, animal, pos) { } if (!pos) { p.errorMsg( - `, Your team is full! Please specify a position with \`owo team add {animal} {position}\`!`, + ', Your team is full! Please specify a position with `owo team add {animal} {position}`!', 5000 ); return; @@ -72,10 +72,10 @@ exports.addMember = async function (p, animal, pos) { /* Check if user owns animal */ if (!result[1][0]) { - p.errorMsg(`, you do not own this animal!`, 3000); + p.errorMsg(', you do not own this animal!', 3000); return; } else if (false && result[1][0].count < 1) { - p.errorMsg(`, you need at least 1 animal in the zoo!`, 3000); + p.errorMsg(', you need at least 1 animal in the zoo!', 3000); return; } @@ -172,7 +172,7 @@ exports.removeMember = async function (p, remove) { result = await p.query(sql, remove); if (result[1][0] && !result[1][0].pid) { - p.errorMsg(", your team doesn't have an animal!"); + p.errorMsg(', your team doesn\'t have an animal!'); return; } @@ -192,9 +192,9 @@ exports.removeMember = async function (p, remove) { `, Successfully changed the team!\n**${p.config.emoji.blank} |** Your team: ${text}` ); } else if (!result[1]) { - p.errorMsg(`, You do not have a team!`, 3000); + p.errorMsg(', You do not have a team!', 3000); } else if (result[1].length == 1) { - p.errorMsg(`, You need to keep at least one animal in the team!`, 3000); + p.errorMsg(', You need to keep at least one animal in the team!', 3000); } else { p.errorMsg( `, I failed to remove that animal\n**${p.config.emoji.blank} |** Your team: ${text}`, @@ -240,7 +240,7 @@ exports.renameTeam = async function (p, teamName) { p.replaceMentions(`, You successfully changed your team name to: **${name}**`) ); } else { - p.errorMsg(", You don't have a team! Please set one with `owo team add {animal}`", 5000); + p.errorMsg(', You don\'t have a team! Please set one with `owo team add {animal}`', 5000); } }; @@ -348,7 +348,7 @@ const createTeamEmbed = (exports.createTeamEmbed = function (p, team, other = {} /* Construct msg */ return (embed = { author: { - name: p.msg.author.username + "'s " + p.replaceMentions(other.tname), + name: p.msg.author.username + '\'s ' + p.replaceMentions(other.tname), icon_url: p.msg.author.avatarURL, }, description: diff --git a/src/commands/commandList/battle/util/weaponUtil.js b/src/commands/commandList/battle/util/weaponUtil.js index 884788c9c..89fdbeee9 100644 --- a/src/commands/commandList/battle/util/weaponUtil.js +++ b/src/commands/commandList/battle/util/weaponUtil.js @@ -77,7 +77,7 @@ exports.getRandomWeapons = function (uid, count) { let weaponSql = `INSERT INTO user_weapon (uid,wid,stat,avg) VALUES (${uid ? uid : '?'},${ tempWeapon.id },'${tempWeapon.sqlStat}',${tempWeapon.avgQuality});`; - let passiveSql = `INSERT INTO user_weapon_passive (uwid,pcount,wpid,stat) VALUES `; + let passiveSql = 'INSERT INTO user_weapon_passive (uwid,pcount,wpid,stat) VALUES '; for (let j = 0; j < tempWeapon.passives.length; j++) { let tempPassive = tempWeapon.passives[j]; passiveSql += `(?,${j},${tempPassive.id},'${tempPassive.sqlStat}'),`; @@ -253,17 +253,17 @@ exports.askDisplay = async function (p, id, opt = {}) { return; } if (id == p.client.user.id) { - p.errorMsg("... trust me. You don't want to see what I have.", 3000); + p.errorMsg('... trust me. You don\'t want to see what I have.', 3000); return; } let user = p.getMention(id); if (!user) { - p.errorMsg(", I couldn't find that user! :(", 3000); + p.errorMsg(', I couldn\'t find that user! :(', 3000); return; } if (user.bot) { - p.errorMsg(", you dum dum! Bots don't carry weapons!", 3000); + p.errorMsg(', you dum dum! Bots don\'t carry weapons!', 3000); return; } @@ -323,7 +323,7 @@ var getDisplayPage = async function (p, user, page, sort, opt = {}) { WHERE user.id = ${user.id} `; if (wid) sql += `AND user_weapon.wid = ${wid} `; - sql += `ORDER BY `; + sql += 'ORDER BY '; if (sort === 1) sql += 'user_weapon.avg DESC,'; else if (sort === 2) sql += 'user_weapon.wid DESC, user_weapon.avg DESC,'; @@ -407,7 +407,7 @@ var getDisplayPage = async function (p, user, page, sort, opt = {}) { } /* Construct msg */ - let title = user.username + "'s " + (wid ? weapons[wid].name : 'weapons'); + let title = user.username + '\'s ' + (wid ? weapons[wid].name : 'weapons'); let embed = { author: { name: title, @@ -494,13 +494,13 @@ exports.describe = async function (p, uwid) { desc += `**WP Cost:** ${Math.ceil(weapon.manaCost)} <:wp:531620120976687114>`; desc += `\n**Description:** ${weapon.desc}\n`; if (weapon.buffList.length > 0) { - desc += `\n`; + desc += '\n'; let buffs = weapon.getBuffs(); for (let i in buffs) { desc += `${buffs[i].emoji} **${buffs[i].name}** - ${buffs[i].desc}\n`; } } - if (weapon.passives.length <= 0) desc += `\n**Passives:** None`; + if (weapon.passives.length <= 0) desc += '\n**Passives:** None'; for (var i = 0; i < weapon.passives.length; i++) { let passive = weapon.passives[i]; desc += `\n${passive.emoji} **${passive.name}** - ${passive.desc}`; @@ -509,7 +509,7 @@ exports.describe = async function (p, uwid) { /* Construct embed */ let embed = { author: { - name: username + "'s " + weapon.name, + name: username + '\'s ' + weapon.name, }, color: p.config.embed_color, thumbnail: { @@ -583,7 +583,7 @@ exports.equip = async function (p, uwid, pet) { }** is now wielding ${weapon.emoji} **${weapon.name}**!` ) ); - else p.errorMsg(`, Could not find a weapon with that id!`); + else p.errorMsg(', Could not find a weapon with that id!'); /* Already equipped */ } else if (result[1].affectedRows > 0) { @@ -601,7 +601,7 @@ exports.equip = async function (p, uwid, pet) { }** is already wielding ${weapon.emoji} **${weapon.name}**!` ) ); - else p.errorMsg(`, Could not find a weapon with that id!`); + else p.errorMsg(', Could not find a weapon with that id!'); /* A Failure (like me!) */ } else { @@ -616,7 +616,7 @@ exports.equip = async function (p, uwid, pet) { exports.unequip = async function (p, uwid) { uwid = expandUWID(uwid); if (!uwid) { - p.errorMsg(`, Could not find a weapon with that id!`); + p.errorMsg(', Could not find a weapon with that id!'); return; } @@ -640,7 +640,7 @@ exports.unequip = async function (p, uwid) { } **${nickname ? nickname : animal.name}**` ) ); - else p.errorMsg(`, Could not find a weapon with that id!`); + else p.errorMsg(', Could not find a weapon with that id!'); /* No body using weapon */ } else if (result[1].affectedRows > 0) { @@ -648,11 +648,11 @@ exports.unequip = async function (p, uwid) { weapon = weapon[Object.keys(weapon)[0]]; weapon = this.parseWeapon(weapon); if (weapon) p.replyMsg(weaponEmoji, `, No animal is using ${weapon.emoji} **${weapon.name}**`); - else p.errorMsg(`, Could not find a weapon with that id!`); + else p.errorMsg(', Could not find a weapon with that id!'); /* Invalid */ } else { - p.errorMsg(`, Could not find a weapon with that id!`); + p.errorMsg(', Could not find a weapon with that id!'); } }; @@ -747,7 +747,7 @@ exports.sell = async function (p, uwid) { weaponEmoji, `, You sold a(n) **${weapon.rank.name} ${weapon.name}** ${weapon.rank.emoji}${weapon.emoji} for **${price}** cowoncy!` ); - p.logger.incr(`cowoncy`, price, { type: 'sell' }, p.msg); + p.logger.incr('cowoncy', price, { type: 'sell' }, p.msg); }; var sellRank = (exports.sellRank = async function (p, rankLoc) { @@ -840,7 +840,7 @@ var sellRank = (exports.sellRank = async function (p, rankLoc) { p.config.emoji.blank } **| Sold:** ${weapons.join('')}` ); - p.logger.incr(`cowoncy`, price, { type: 'sell' }, p.msg); + p.logger.incr('cowoncy', price, { type: 'sell' }, p.msg); }); /* Shorten a uwid to base36 */ diff --git a/src/commands/commandList/battle/weapon.js b/src/commands/commandList/battle/weapon.js index 48936abff..65dc3127a 100644 --- a/src/commands/commandList/battle/weapon.js +++ b/src/commands/commandList/battle/weapon.js @@ -58,7 +58,7 @@ module.exports = new CommandInterface({ /* No changing while in battle */ if (await battleUtil.inBattle(p)) { p.errorMsg( - ", You cannot change your weapon while you're in battle! Please finish your `owo battle`!", + ', You cannot change your weapon while you\'re in battle! Please finish your `owo battle`!', 3000 ); return; @@ -90,7 +90,7 @@ module.exports = new CommandInterface({ /* No changing while in battle */ if (await battleUtil.inBattle(p)) { p.errorMsg( - ", You cannot change your weapon while you're in battle! Please finish your `owo battle`!", + ', You cannot change your weapon while you\'re in battle! Please finish your `owo battle`!', 3000 ); return; diff --git a/src/commands/commandList/battle/weapons/VanguardsBanner.js b/src/commands/commandList/battle/weapons/VanguardsBanner.js index 48306d66b..b58744ab8 100644 --- a/src/commands/commandList/battle/weapons/VanguardsBanner.js +++ b/src/commands/commandList/battle/weapons/VanguardsBanner.js @@ -12,7 +12,7 @@ const battleUtil = require('../util/battleUtil.js'); module.exports = class VanguardsBanner extends WeaponInterface { init() { this.id = 16; - this.name = "Vanguard's Banner"; + this.name = 'Vanguard\'s Banner'; this.basicDesc = ''; this.emojis = [ '<:cvban:618001307411677195>', diff --git a/src/commands/commandList/battle/weapons/shield.js b/src/commands/commandList/battle/weapons/shield.js index a32c24688..005750b93 100644 --- a/src/commands/commandList/battle/weapons/shield.js +++ b/src/commands/commandList/battle/weapons/shield.js @@ -12,7 +12,7 @@ const Logs = require('../util/logUtil.js'); module.exports = class Shield extends WeaponInterface { init() { this.id = 5; - this.name = "Defender's Aegis"; + this.name = 'Defender\'s Aegis'; this.basicDesc = ''; this.emojis = [ '<:cshield:546552025828163585>', diff --git a/src/commands/commandList/battle/weaponshards.js b/src/commands/commandList/battle/weaponshards.js index aea2e8352..67c65d86c 100644 --- a/src/commands/commandList/battle/weaponshards.js +++ b/src/commands/commandList/battle/weaponshards.js @@ -160,7 +160,7 @@ async function dismantleRank(p, rankLoc) { p.config.emoji.blank } **| Dismantled:** ${weapons.join('')}` ); - p.logger.incr(`shards`, price, { type: 'dismantle' }, p.msg); + p.logger.incr('shards', price, { type: 'dismantle' }, p.msg); } async function dismantleId(p, uwid) { @@ -247,5 +247,5 @@ async function dismantleId(p, uwid) { weapon.emoji } for **${p.global.toFancyNum(price)}** ${shardEmoji} Weapon Shard${price == 1 ? '' : 's'}!` ); - p.logger.incr(`shards`, price, { type: 'dismantle' }, p.msg); + p.logger.incr('shards', price, { type: 'dismantle' }, p.msg); } diff --git a/src/commands/commandList/economy/claim.js b/src/commands/commandList/economy/claim.js index c5c36c311..4f0146cbd 100644 --- a/src/commands/commandList/economy/claim.js +++ b/src/commands/commandList/economy/claim.js @@ -71,22 +71,22 @@ module.exports = new CommandInterface({ const type = reward.charAt(0); const count = parseInt(reward.substring(1)); switch (type) { - case 'c': - sql += `INSERT INTO cowoncy (id, money) VALUES (${p.msg.author.id}, ${count}) ON DUPLICATE KEY UPDATE money = money + ${count};`; - totalCowoncy += count; - break; - case 'l': - sql += `INSERT INTO lootbox (id,boxcount,claimcount,claim) VALUES (${p.msg.author.id},${count},0,'2017-01-01') ON DUPLICATE KEY UPDATE boxcount = boxcount + ${count};`; - totalLootbox += count; - break; - case 'w': - sql += `INSERT INTO crate (uid,cratetype,boxcount,claimcount,claim) VALUES (${uid},0,${count},0,'2017-01-01') ON DUPLICATE KEY UPDATE boxcount = boxcount + ${count};`; - totalWeaponCrate += count; - break; - case 'f': - sql += `INSERT INTO lootbox (id,fbox,claimcount,claim) VALUES (${p.msg.author.id},${count},0,'2017-01-01') ON DUPLICATE KEY UPDATE fbox = fbox + ${count};`; - totalFabledLootbox += count; - break; + case 'c': + sql += `INSERT INTO cowoncy (id, money) VALUES (${p.msg.author.id}, ${count}) ON DUPLICATE KEY UPDATE money = money + ${count};`; + totalCowoncy += count; + break; + case 'l': + sql += `INSERT INTO lootbox (id,boxcount,claimcount,claim) VALUES (${p.msg.author.id},${count},0,'2017-01-01') ON DUPLICATE KEY UPDATE boxcount = boxcount + ${count};`; + totalLootbox += count; + break; + case 'w': + sql += `INSERT INTO crate (uid,cratetype,boxcount,claimcount,claim) VALUES (${uid},0,${count},0,'2017-01-01') ON DUPLICATE KEY UPDATE boxcount = boxcount + ${count};`; + totalWeaponCrate += count; + break; + case 'f': + sql += `INSERT INTO lootbox (id,fbox,claimcount,claim) VALUES (${p.msg.author.id},${count},0,'2017-01-01') ON DUPLICATE KEY UPDATE fbox = fbox + ${count};`; + totalFabledLootbox += count; + break; } }); await p.query(sql); diff --git a/src/commands/commandList/economy/daily.js b/src/commands/commandList/economy/daily.js index 4e0e147c8..4accb7b21 100644 --- a/src/commands/commandList/economy/daily.js +++ b/src/commands/commandList/economy/daily.js @@ -101,7 +101,7 @@ function finalizeText( let sql = ''; if (showAnnouncement) { - sql += `SELECT * FROM announcement ORDER BY aid DESC LIMIT 1;`; + sql += 'SELECT * FROM announcement ORDER BY aid DESC LIMIT 1;'; sql += `INSERT INTO user_announcement (uid, aid) VALUES (${uid}, (SELECT aid FROM announcement ORDER BY aid DESC LIMIT 1)) ON DUPLICATE KEY UPDATE aid = (SELECT aid FROM announcement ORDER BY aid DESC LIMIT 1);`; } @@ -153,7 +153,7 @@ async function executeQuery( } rows = await p.query(sql); - p.logger.incr(`cowoncy`, gain + extra, { type: 'daily' }, p.msg); + p.logger.incr('cowoncy', gain + extra, { type: 'daily' }, p.msg); let embed, components; if (showAnnouncement && rows[0][0].url) { diff --git a/src/commands/commandList/economy/give.js b/src/commands/commandList/economy/give.js index a00321958..005ae0318 100644 --- a/src/commands/commandList/economy/give.js +++ b/src/commands/commandList/economy/give.js @@ -58,7 +58,7 @@ module.exports = new CommandInterface({ ); } else if (user.bot) { return this.send( - '**šŸš« | ' + this.msg.author.username + "**, You can't send cowoncy to a bot silly!", + '**šŸš« | ' + this.msg.author.username + '**, You can\'t send cowoncy to a bot silly!', 3000 ); } else if (user.id == this.msg.author.id) { @@ -89,7 +89,7 @@ module.exports = new CommandInterface({ let result = await con.query(sql); if (!result[0].changedRows) { - this.errorMsg(", you silly hooman! You don't have enough cowoncy!", 3000); + this.errorMsg(', you silly hooman! You don\'t have enough cowoncy!', 3000); return con.rollback(); } @@ -111,7 +111,7 @@ module.exports = new CommandInterface({ this.send(text); this.neo4j.give(this.msg, user, amount); - this.logger.incr(`cowoncy`, amount, { type: 'given' }, this.msg); - this.logger.decr(`cowoncy`, -1 * amount, { type: 'give' }, this.msg); + this.logger.incr('cowoncy', amount, { type: 'given' }, this.msg); + this.logger.decr('cowoncy', -1 * amount, { type: 'give' }, this.msg); }, }); diff --git a/src/commands/commandList/economy/quest.js b/src/commands/commandList/economy/quest.js index 1898f8a26..59d38523c 100644 --- a/src/commands/commandList/economy/quest.js +++ b/src/commands/commandList/economy/quest.js @@ -325,45 +325,45 @@ function parseQuest(questInfo) { let locked = !!questInfo.locked; switch (questInfo.qname) { - case 'hunt': - text = 'Manually hunt ' + count + ' times!'; - break; - case 'battle': - text = 'Battle ' + count + ' times!'; - break; - case 'gamble': - text = 'Gamble ' + count + ' times!'; - break; - case 'owo': - text = "Say 'owo' " + count + ' times!'; - break; - case 'emoteTo': - text = 'Use an action command on someone ' + count + ' times!'; - break; - case 'emoteBy': - text = 'Have a friend use an action command on you ' + count + ' times!'; - break; - case 'find': - text = 'Hunt 3 animals that are ' + count + ' rank!'; - break; - case 'cookieBy': - text = 'Receive a cookie from ' + count + ' friends!'; - break; - case 'prayBy': - text = 'Have a friend pray to you ' + count + ' times!'; - break; - case 'curseBy': - text = 'Have a friend curse you ' + count + ' times!'; - break; - case 'friendlyBattle': - text = 'Battle with a friend ' + count + ' times!'; - break; - case 'xp': - text = 'Earn ' + count + ' xp from hunting and battling!'; - break; - default: - text = 'Invalid Quest'; - break; + case 'hunt': + text = 'Manually hunt ' + count + ' times!'; + break; + case 'battle': + text = 'Battle ' + count + ' times!'; + break; + case 'gamble': + text = 'Gamble ' + count + ' times!'; + break; + case 'owo': + text = 'Say \'owo\' ' + count + ' times!'; + break; + case 'emoteTo': + text = 'Use an action command on someone ' + count + ' times!'; + break; + case 'emoteBy': + text = 'Have a friend use an action command on you ' + count + ' times!'; + break; + case 'find': + text = 'Hunt 3 animals that are ' + count + ' rank!'; + break; + case 'cookieBy': + text = 'Receive a cookie from ' + count + ' friends!'; + break; + case 'prayBy': + text = 'Have a friend pray to you ' + count + ' times!'; + break; + case 'curseBy': + text = 'Have a friend curse you ' + count + ' times!'; + break; + case 'friendlyBattle': + text = 'Battle with a friend ' + count + ' times!'; + break; + case 'xp': + text = 'Earn ' + count + ' xp from hunting and battling!'; + break; + default: + text = 'Invalid Quest'; + break; } return { text, reward, progress, locked }; diff --git a/src/commands/commandList/economy/utils/cowoncyUtils.js b/src/commands/commandList/economy/utils/cowoncyUtils.js index 852066f30..a6de48938 100644 --- a/src/commands/commandList/economy/utils/cowoncyUtils.js +++ b/src/commands/commandList/economy/utils/cowoncyUtils.js @@ -28,7 +28,7 @@ async function checkSender(user, amount, con) { let result = await con.query(sql); if (!result[0] || result[0].money < amount) { return { - error: ", you silly hooman! You don't have enough cowoncy!", + error: ', you silly hooman! You don\'t have enough cowoncy!', }; } @@ -60,7 +60,7 @@ async function checkSender(user, amount, con) { }; } else { return { - error: `, you cannot send any more cowoncy today.`, + error: ', you cannot send any more cowoncy today.', }; } } diff --git a/src/commands/commandList/emotes/images.js b/src/commands/commandList/emotes/images.js index 6568bc223..569a00c45 100644 --- a/src/commands/commandList/emotes/images.js +++ b/src/commands/commandList/emotes/images.js @@ -14,7 +14,7 @@ module.exports = new CommandInterface({ args: '{type}', - desc: "Grabs a gif/pic with the given type. To list all the types, type 'owo gif'. Some listed types may not work", + desc: 'Grabs a gif/pic with the given type. To list all the types, type \'owo gif\'. Some listed types may not work', example: ['owo pic neko', 'owo gif neko'], diff --git a/src/commands/commandList/emotes/user_emote.js b/src/commands/commandList/emotes/user_emote.js index ee23f85d8..403a1eff0 100644 --- a/src/commands/commandList/emotes/user_emote.js +++ b/src/commands/commandList/emotes/user_emote.js @@ -43,7 +43,7 @@ module.exports = new CommandInterface({ } let target = await p.getMention(args[0]); if (target == undefined) { - p.send("**šŸš« |** I couldn't find that user :c", 3000); + p.send('**šŸš« |** I couldn\'t find that user :c', 3000); return; } let emote = emotes[p.command]; diff --git a/src/commands/commandList/gamble/blackjack.js b/src/commands/commandList/gamble/blackjack.js index d5b07079f..01d48d22f 100644 --- a/src/commands/commandList/gamble/blackjack.js +++ b/src/commands/commandList/gamble/blackjack.js @@ -50,7 +50,7 @@ module.exports = new CommandInterface({ p.setCooldown(5); return; } else if (amount <= 0) { - p.send('**šŸš« | ' + msg.author.username + "**, You can't bet that much silly!", 3000); + p.send('**šŸš« | ' + msg.author.username + '**, You can\'t bet that much silly!', 3000); p.setCooldown(5); return; } diff --git a/src/commands/commandList/gamble/coinflip.js b/src/commands/commandList/gamble/coinflip.js index ef061b930..e5a2cd6c5 100644 --- a/src/commands/commandList/gamble/coinflip.js +++ b/src/commands/commandList/gamble/coinflip.js @@ -68,7 +68,7 @@ module.exports = new CommandInterface({ //Final syntax check if (bet == 0) { - p.errorMsg(", You can't bet 0 dum dum!", 3000); + p.errorMsg(', You can\'t bet 0 dum dum!', 3000); p.setCooldown(5); return; } else if (bet < 0) { @@ -84,7 +84,7 @@ module.exports = new CommandInterface({ let sql = 'SELECT money FROM cowoncy WHERE id = ' + msg.author.id + ';'; let result = await p.query(sql); if (result[0] == undefined || result[0].money == 0 || (bet != 'all' && result[0].money < bet)) { - p.send('**šŸš« | ' + msg.author.username + "**, You don't have enough cowoncy!", 3000); + p.send('**šŸš« | ' + msg.author.username + '**, You don\'t have enough cowoncy!', 3000); return; } else { if (bet == 'all') bet = result[0].money; @@ -92,7 +92,7 @@ module.exports = new CommandInterface({ if (maxBet && bet > maxBet) { bet = maxBet; } else if (bet <= 0) { - p.errorMsg(", you don't have any cowoncy silly!", 3000); + p.errorMsg(', you don\'t have any cowoncy silly!', 3000); p.setCooldown(5); return; } @@ -114,11 +114,11 @@ module.exports = new CommandInterface({ ';'; result = await p.query(sql); if (win) { - p.logger.incr(`cowoncy`, bet, { type: 'coinflip' }, p.msg); - p.logger.incr(`gamble`, 1, { type: 'coinflip' }, p.msg); + p.logger.incr('cowoncy', bet, { type: 'coinflip' }, p.msg); + p.logger.incr('gamble', 1, { type: 'coinflip' }, p.msg); } else { - p.logger.decr(`cowoncy`, bet * -1, { type: 'coinflip' }, p.msg); - p.logger.decr(`gamble`, -1, { type: 'coinflip' }, p.msg); + p.logger.decr('cowoncy', bet * -1, { type: 'coinflip' }, p.msg); + p.logger.decr('gamble', -1, { type: 'coinflip' }, p.msg); } let text = '**' + diff --git a/src/commands/commandList/gamble/drop.js b/src/commands/commandList/gamble/drop.js index 115833cfd..5a2090d3d 100644 --- a/src/commands/commandList/gamble/drop.js +++ b/src/commands/commandList/gamble/drop.js @@ -15,7 +15,7 @@ module.exports = new CommandInterface({ args: '{amount}', - desc: "This command is now deprecated. ~~Drop some cowoncy in a channel with 'owo drop {amount}'! Users can pick it up with 'owo pickup {amount}' If you try to pick up more than what's on the floor, you'll lose that amount! Be careful!~~", + desc: 'This command is now deprecated. ~~Drop some cowoncy in a channel with \'owo drop {amount}\'! Users can pick it up with \'owo pickup {amount}\' If you try to pick up more than what\'s on the floor, you\'ll lose that amount! Be careful!~~', example: ['owo drop 3000'], @@ -56,11 +56,11 @@ async function drop(p) { CALL CowoncyDrop(${p.msg.author.id},${p.msg.channel.id},${amount});`; let result = await p.query(sql); if (!result[0][0] || result[0][0].money < amount) { - p.errorMsg(", you don't have enough cowoncy! >:c", 3000); + p.errorMsg(', you don\'t have enough cowoncy! >:c', 3000); return; } p.neo4j.drop(p.msg, amount); - p.logger.decr(`cowoncy`, -1 * amount, { type: 'drop' }, p.msg); + p.logger.decr('cowoncy', -1 * amount, { type: 'drop' }, p.msg); p.send( '**šŸ’° | ' + p.msg.author.username + @@ -105,18 +105,18 @@ async function pickup(p) { '** cowoncy from this channel!' ); p.neo4j.pickup(p.msg, amount); - p.logger.incr(`cowoncy`, amount, { type: 'drop' }, p.msg); + p.logger.incr('cowoncy', amount, { type: 'drop' }, p.msg); } else { p.send( '**šŸ’° | ' + p.msg.author.username + - "**, there's not enough cowoncy on the floor!\n**<:blank:427371936482328596> |** You felt nice so you dropped **" + + '**, there\'s not enough cowoncy on the floor!\n**<:blank:427371936482328596> |** You felt nice so you dropped **' + amount + '** cowoncy!', 8000 ); p.neo4j.drop(p.msg, amount); - p.logger.decr(`cowoncy`, -1 * amount, { type: 'drop' }, p.msg); + p.logger.decr('cowoncy', -1 * amount, { type: 'drop' }, p.msg); } } @@ -127,7 +127,7 @@ async function handleWarning(p) { icon_url: p.msg.author.avatarURL, }, description: - "If you try to pickup more than what's on the floor, you'll drop it instead!\nReact with šŸ‘ to confirm you understand!", + 'If you try to pickup more than what\'s on the floor, you\'ll drop it instead!\nReact with šŸ‘ to confirm you understand!', color: p.config.embed_color, }; let msg = await p.send({ embed }); @@ -140,7 +140,7 @@ async function handleWarning(p) { collector.stop('done'); p.redis.hincrby('data_' + p.msg.author.id, key, 1); embed.color = 65280; - embed.author.name = "āœ… You're all set, " + p.msg.author.username + '!'; + embed.author.name = 'āœ… You\'re all set, ' + p.msg.author.username + '!'; embed.description = '**' + acceptEmoji + ' |** The **pickup** command is now enabled for you! Good luck!'; msg.edit({ embed }); @@ -172,7 +172,7 @@ async function pickup2(p) { let sql = `UPDATE cowoncydrop SET amount = amount - ${amount} WHERE amount >= ${amount} AND channel = ${p.msg.channel.id};`; let result = await con.query(sql); if (!result.changedRows) { - throw { errorMsg: ", there isn't enough cowoncy on the floor!" }; + throw { errorMsg: ', there isn\'t enough cowoncy on the floor!' }; } sql = `UPDATE cowoncy SET money = money + ${amount} WHERE id = ${p.msg.author.id};`; diff --git a/src/commands/commandList/gamble/lottery.js b/src/commands/commandList/gamble/lottery.js index 2b60219ef..c231d8b06 100644 --- a/src/commands/commandList/gamble/lottery.js +++ b/src/commands/commandList/gamble/lottery.js @@ -57,7 +57,7 @@ async function bet(con, msg, args, global, p) { sql += 'SELECT * FROM lottery WHERE id = ' + msg.author.id + ' AND valid = 1;'; let result = await p.query(sql); if (!result[0][0] || result[0][0].money < amount) { - p.errorMsg(", You don't have enough cowoncy!", 3000); + p.errorMsg(', You don\'t have enough cowoncy!', 3000); return; } else { if (all) amount = parseInt(result[0][0].money); @@ -90,7 +90,7 @@ async function bet(con, msg, args, global, p) { ';'; result = await p.query(sql); - p.logger.decr(`cowoncy`, -1 * amount, { type: 'lottery' }, p.msg); + p.logger.decr('cowoncy', -1 * amount, { type: 'lottery' }, p.msg); let sum = parseInt(result[1][0].sum); let count = result[1][0].count; @@ -108,7 +108,7 @@ async function bet(con, msg, args, global, p) { text: '*Percentage and jackpot may change over time', }, author: { - name: msg.author.username + "'s Lottery Submission", + name: msg.author.username + '\'s Lottery Submission', }, fields: [ { @@ -176,7 +176,7 @@ async function display(con, msg, p) { text: '*Percentage and jackpot may change over time', }, author: { - name: msg.author.username + "'s Lottery Status", + name: msg.author.username + '\'s Lottery Status', }, fields: [ { diff --git a/src/commands/commandList/gamble/slots.js b/src/commands/commandList/gamble/slots.js index 20cb70ed6..f8442bd33 100644 --- a/src/commands/commandList/gamble/slots.js +++ b/src/commands/commandList/gamble/slots.js @@ -58,11 +58,11 @@ module.exports = new CommandInterface({ } if (amount == 0 && !all) { - p.errorMsg(", uwu.. you can't bet 0 silly!", 3000); + p.errorMsg(', uwu.. you can\'t bet 0 silly!', 3000); p.setCooldown(5); return; } else if (amount < 0) { - p.errorMsg(", that... that's not how it works.", 3000); + p.errorMsg(', that... that\'s not how it works.', 3000); p.setCooldown(5); return; } @@ -73,7 +73,7 @@ module.exports = new CommandInterface({ if (all && result[0] != undefined) amount = result[0].money; if (maxBet && amount > maxBet) amount = maxBet; if (result[0] == undefined || result[0].money < amount || result[0].money <= 0) { - p.send('**šŸš« | ' + msg.author.username + "**, You don't have enough cowoncy!", 3000); + p.send('**šŸš« | ' + msg.author.username + '**, You don\'t have enough cowoncy!', 3000); } else { //Decide results let rslots = []; @@ -139,8 +139,8 @@ module.exports = new CommandInterface({ amount + ';'; result = await p.query(sql); - p.logger.incr(`cowoncy`, win - amount, { type: 'slots' }, p.msg); - p.logger.incr(`gamble`, logging, { type: 'slots' }, p.msg); + p.logger.incr('cowoncy', win - amount, { type: 'slots' }, p.msg); + p.logger.incr('gamble', logging, { type: 'slots' }, p.msg); //Display slots let machine = diff --git a/src/commands/commandList/memegen/distracted.js b/src/commands/commandList/memegen/distracted.js index b359688b6..2d656ec40 100644 --- a/src/commands/commandList/memegen/distracted.js +++ b/src/commands/commandList/memegen/distracted.js @@ -15,7 +15,7 @@ module.exports = new CommandInterface({ args: '{gfText|@user|emoji} | {womenText|@user|emoji} | {bfText|@user|emoji}', - desc: "Generate a distracted boyfriend meme! Seperate the three arguments with a '|' bar, or press 'Shift+Enter' between arguments", + desc: 'Generate a distracted boyfriend meme! Seperate the three arguments with a \'|\' bar, or press \'Shift+Enter\' between arguments', example: ['owo distracted Playing actual games | @OwO | @me'], diff --git a/src/commands/commandList/memegen/drake.js b/src/commands/commandList/memegen/drake.js index b78ed6b97..a1d356830 100644 --- a/src/commands/commandList/memegen/drake.js +++ b/src/commands/commandList/memegen/drake.js @@ -15,7 +15,7 @@ module.exports = new CommandInterface({ args: '{topText|@user|emoji} | {bottomText|@user|emoji}', - desc: "Generate a Drake meme! Seperate the two arguments with a '|' bar, or press 'Shift+Enter' between arguments", + desc: 'Generate a Drake meme! Seperate the two arguments with a \'|\' bar, or press \'Shift+Enter\' between arguments', example: ['owo drake Using Discord to communicate with friends | Using discord to play OwO bot'], diff --git a/src/commands/commandList/memegen/isthisa.js b/src/commands/commandList/memegen/isthisa.js index 48ac4b8e1..c63a8f9cd 100644 --- a/src/commands/commandList/memegen/isthisa.js +++ b/src/commands/commandList/memegen/isthisa.js @@ -16,7 +16,7 @@ module.exports = new CommandInterface({ args: '{bottomText} | {butterflyText|@user|emoji} | {personText|@user|emoji}', - desc: "Creates a 'is this a ___?' meme! You can also tag a user to use their image!", + desc: 'Creates a \'is this a ___?\' meme! You can also tag a user to use their image!', example: ['owo isthisa Is this an AI? | @OwO | me'], diff --git a/src/commands/commandList/memegen/spongebobchicken.js b/src/commands/commandList/memegen/spongebobchicken.js index 8714d504c..3c167f2e4 100644 --- a/src/commands/commandList/memegen/spongebobchicken.js +++ b/src/commands/commandList/memegen/spongebobchicken.js @@ -17,7 +17,7 @@ module.exports = new CommandInterface({ desc: 'Creates a spongebob chicken meme!', - example: ["owo spongebobchicken I don't like owo bot!"], + example: ['owo spongebobchicken I don\'t like owo bot!'], related: [], diff --git a/src/commands/commandList/memegen/tradeoffer.js b/src/commands/commandList/memegen/tradeoffer.js index f782d820a..69c7e4452 100644 --- a/src/commands/commandList/memegen/tradeoffer.js +++ b/src/commands/commandList/memegen/tradeoffer.js @@ -15,7 +15,7 @@ module.exports = new CommandInterface({ args: '{leftText|@user|emoji} | {rightText|@user|emoji} | {@user|emoji}', - desc: "Generate a Trade Offer meme! Seperate the arguments with a '|' bar, or press 'Shift+Enter' between arguments", + desc: 'Generate a Trade Offer meme! Seperate the arguments with a \'|\' bar, or press \'Shift+Enter\' between arguments', example: ['owo tradeoffer tons of animals | tons of captchas | @OwO'], diff --git a/src/commands/commandList/patreon/02kiss.js b/src/commands/commandList/patreon/02kiss.js index f20fa407d..4f8512e1d 100644 --- a/src/commands/commandList/patreon/02kiss.js +++ b/src/commands/commandList/patreon/02kiss.js @@ -35,11 +35,11 @@ module.exports = new CommandInterface({ } let target = p.getMention(p.args[0]); if (target == undefined) { - p.send("**šŸš« |** I couldn't find that user :c", 3000); + p.send('**šŸš« |** I couldn\'t find that user :c', 3000); return; } if (p.msg.author.id == target.id) { - let text = '**' + p.msg.author.username + "**! You can't kiss yourself!"; + let text = '**' + p.msg.author.username + '**! You can\'t kiss yourself!'; p.send(text); return; } diff --git a/src/commands/commandList/patreon/alastor.js b/src/commands/commandList/patreon/alastor.js index 3eacc59dc..c5bcb0d52 100644 --- a/src/commands/commandList/patreon/alastor.js +++ b/src/commands/commandList/patreon/alastor.js @@ -60,7 +60,7 @@ async function giveCrown(p) { let lastCrown = await p.redis.hget('cd_' + p.msg.author.id, table + '_crown'); lastCrown = lastCrown ? new Date(lastCrown) : new Date(); if (new Date() - lastCrown < 345600000) { - p.errorMsg(", Alastor doesn't need a crown"); + p.errorMsg(', Alastor doesn\'t need a crown'); return; } @@ -94,7 +94,7 @@ async function feed(p) { const afterMid = dateUtil.afterMidnight(lasttime); let streak = 1; - let title = p.msg.author.username + "'s Alastor"; + let title = p.msg.author.username + '\'s Alastor'; if (afterMid.after) { await p.redis.hset('cd_' + p.msg.author.id, table, afterMid.now); await p.redis.expire('cd_' + p.msg.author.id); @@ -130,7 +130,7 @@ async function display(p, title, gif) { const lasttime = await p.redis.hget('cd_' + p.msg.author.id, table); const afterMid = dateUtil.afterMidnight(lasttime); const streak = await p.redis.hget(p.msg.author.id, table); - if (!title) title = p.msg.author.username + "'s Alastor"; + if (!title) title = p.msg.author.username + '\'s Alastor'; if (!gif) gif = gif2; const embed = { diff --git a/src/commands/commandList/patreon/alterBattle.js b/src/commands/commandList/patreon/alterBattle.js index de378109f..bda180357 100644 --- a/src/commands/commandList/patreon/alterBattle.js +++ b/src/commands/commandList/patreon/alterBattle.js @@ -10,81 +10,81 @@ exports.alter = async function (p, user, text, type, setting) { const result = await checkDb(p, user.id, text, type); if (result) return result; switch (p.msg.channel.id) { - case '1054101525191995502': - return quincey(text, type, setting); - case '1056148694480715886': - return quincey(text, type, setting); - case '1056148656572596264': - return quincey(text, type, setting); + case '1054101525191995502': + return quincey(text, type, setting); + case '1056148694480715886': + return quincey(text, type, setting); + case '1056148656572596264': + return quincey(text, type, setting); } switch (user.id) { - case '176046069954641921': - return crown(text, type); - case '250383887312748545': - return elsa(text, type); - case '323347251705544704': - return rikudou(text, type); - case '192692796841263104': - return dalu(text, type); - case '283000589976338432': - return kuma(text, type); - case '536711790558576651': - return garcom(text); - case '229299825072537601': - return alradio(text, type); - case '166619476479967232': - return valentine(text, type); - case '403989717483257877': - return u_1s1k(text, type); - case '648741213154836500': - return lanre(text, type); - case '541103499992367115': - return ashley(text, type); - case '216710431572492289': - return arichy(text, type); - case '408875125283225621': - return kirito(text, type); - case '707939636835516457': - return direwolf(text, type); - case '468873774960476177': - return jiraya(text, type); - case '554617574646874113': - return notJames(text, type); - case '362964690248269824': - return theGoldenPatrik1(text, type); - case '456598711590715403': - return lexx(text, type); - case '617681365567275029': - return mercureid(text, type); - case '477168699112161281': - return leshoop(text, user, type); - case '612158581113880576': - return blade(text, type); - case '643225088123994118': - return becca(text, type); - case '691867503730622526': - return wibi(text, type); - case '663719460108107786': - return jekyll(text, type); - case '486067285333639169': - return life(text, type); - case '387975555233873920': - return scox(text, type); - case '460987842961866762': - return estee(text, type); - default: - return text; + case '176046069954641921': + return crown(text, type); + case '250383887312748545': + return elsa(text, type); + case '323347251705544704': + return rikudou(text, type); + case '192692796841263104': + return dalu(text, type); + case '283000589976338432': + return kuma(text, type); + case '536711790558576651': + return garcom(text); + case '229299825072537601': + return alradio(text, type); + case '166619476479967232': + return valentine(text, type); + case '403989717483257877': + return u_1s1k(text, type); + case '648741213154836500': + return lanre(text, type); + case '541103499992367115': + return ashley(text, type); + case '216710431572492289': + return arichy(text, type); + case '408875125283225621': + return kirito(text, type); + case '707939636835516457': + return direwolf(text, type); + case '468873774960476177': + return jiraya(text, type); + case '554617574646874113': + return notJames(text, type); + case '362964690248269824': + return theGoldenPatrik1(text, type); + case '456598711590715403': + return lexx(text, type); + case '617681365567275029': + return mercureid(text, type); + case '477168699112161281': + return leshoop(text, user, type); + case '612158581113880576': + return blade(text, type); + case '643225088123994118': + return becca(text, type); + case '691867503730622526': + return wibi(text, type); + case '663719460108107786': + return jekyll(text, type); + case '486067285333639169': + return life(text, type); + case '387975555233873920': + return scox(text, type); + case '460987842961866762': + return estee(text, type); + default: + return text; } }; exports.overrideDisplay = function (p, display) { switch (p.msg.channel.id) { - case '1054101525191995502': - return 'compact'; - case '1056148694480715886': - return 'compact'; - case '1056148656572596264': - return 'compact'; + case '1054101525191995502': + return 'compact'; + case '1056148694480715886': + return 'compact'; + case '1056148656572596264': + return 'compact'; } return display; }; @@ -94,15 +94,15 @@ async function checkDb(p, id, text, info) { let type; switch (text.color) { - case 65280: - type = 'win'; - break; - case 16711680: - type = 'lose'; - break; - case 6381923: - type = 'tie'; - break; + case 65280: + type = 'win'; + break; + case 16711680: + type = 'lose'; + break; + case 6381923: + type = 'tie'; + break; } const replacers = { username: p.msg.author.username, @@ -149,7 +149,7 @@ function crown(text, type) { url: 'http://cdn.discordapp.com/attachments/598115387158036500/615856437708455936/image0.gif', }; text.author.name = - 'Someone accidently stepped on ' + text.author.name.replace(' goes into battle', "'s garden"); + 'Someone accidently stepped on ' + text.author.name.replace(' goes into battle', '\'s garden'); text.color = 16776960; return text; } @@ -161,7 +161,7 @@ function elsa(text, type) { text.color = 7319500; text.author.name = text.author.name.replace( ' goes into battle!', - "'s Knights fight for their Queen's Glory!" + '\'s Knights fight for their Queen\'s Glory!' ); return text; } @@ -190,7 +190,7 @@ function kuma(text, type) { }; text.author.name = text.author.name.replace( ' goes into battle!', - "'s minions defend the Cookie King" + '\'s minions defend the Cookie King' ); return text; } @@ -210,12 +210,12 @@ function alradio(text, type) { url: 'https://cdn.discordapp.com/attachments/626155987904102402/686473789080600586/image0.gif', }; switch (text.color) { - case 16711680: - text.color = 1; - break; - case 65280: - text.color = 16777214; - break; + case 16711680: + text.color = 1; + break; + case 65280: + text.color = 16777214; + break; } return text; } @@ -225,27 +225,27 @@ function valentine(text, opt) { const sadcat = ''; text.author.name = text.author.name.replace( ' goes into battle!', - "'s Sailors arrive to defend Planet Earth!" + '\'s Sailors arrive to defend Planet Earth!' ); switch (text.color) { - case 16711680: - text.color = 13767684; - if (opt) { - text.footer.text = `ćƒ€ćƒ¼ć‚Æćƒ»ć‚­ćƒ³ć‚°ćƒ€ćƒ  took over in ${opt.turns}. You lost your streak of ${opt.streak} and gained ${opt.xp} xp.`; - } - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/533065456311861248/761460204407226398/tenor.gif', - }; - break; - case 65280: - text.color = 1; - if (opt) { - text.footer.text = `You defended in ${opt.turns}! Your Sailors gained ${opt.xp} xp! Streak: ${opt.streak}`; - } - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/533065456311861248/761168912795828234/battle.gif', - }; - break; + case 16711680: + text.color = 13767684; + if (opt) { + text.footer.text = `ćƒ€ćƒ¼ć‚Æćƒ»ć‚­ćƒ³ć‚°ćƒ€ćƒ  took over in ${opt.turns}. You lost your streak of ${opt.streak} and gained ${opt.xp} xp.`; + } + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/533065456311861248/761460204407226398/tenor.gif', + }; + break; + case 65280: + text.color = 1; + if (opt) { + text.footer.text = `You defended in ${opt.turns}! Your Sailors gained ${opt.xp} xp! Streak: ${opt.streak}`; + } + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/533065456311861248/761168912795828234/battle.gif', + }; + break; } return text; } @@ -256,17 +256,17 @@ function u_1s1k(text, opt) { ' goes Pew Pew Pew! Come At Me Bro!' ); switch (text.color) { - case 16711680: - if (opt) { - text.footer.text = `You lost in ${opt.turns}! Your Sailors gained ${opt.xp} xp! You lost your streak of ${opt.streak}`; - } - break; - case 65280: - text.color = 11393254; - if (opt) { - text.footer.text = `SUGOI! 1S1K won in ${opt.turns} turns! Team Zeno gained ${opt.xp} xp! Streak: ${opt.streak}`; - } - break; + case 16711680: + if (opt) { + text.footer.text = `You lost in ${opt.turns}! Your Sailors gained ${opt.xp} xp! You lost your streak of ${opt.streak}`; + } + break; + case 65280: + text.color = 11393254; + if (opt) { + text.footer.text = `SUGOI! 1S1K won in ${opt.turns} turns! Team Zeno gained ${opt.xp} xp! Streak: ${opt.streak}`; + } + break; } text.thumbnail = { url: 'https://cdn.discordapp.com/attachments/628936051490160661/758015069379493888/image0.gif', @@ -277,39 +277,39 @@ function u_1s1k(text, opt) { function lanre(text, opt) { text.author.name = 'Kanna San rides into battle with you! Bye bye bad guys!'; switch (text.color) { - case 16711680: - text.color = 1262169; - if (opt) { - text.footer.text = `Looks like chu met the wrong foe today fren. Fear not! Kanna has brought chu 50 chocolates to cheer chu up...rip ${opt.streak} streak`; - } - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/696512326114869289/767336849801740329/kl1love.png', - }; - break; - case 65280: - text.color = 5249624; - if (opt) { - text.footer.text = `You defended in ${opt.turns}! Your Sailors gained ${opt.xp} xp! Streak: ${opt.streak}`; - if (('' + opt.xp).includes('+')) { - text.footer.text = `Victory! Kanna has brought you ${opt.xp} bonus chocolates, which she will eat for herself. Streak: ${opt.streak}`; - text.thumbnail = { - url: 'https://media.discordapp.net/attachments/696512326114869289/767334256543924244/kannafire.gif', - }; - } else { - text.footer.text = `Victory! Kanna has brought you ${opt.xp} chocolates to enjoy under the kotatsu. Streak: ${opt.streak}`; - text.thumbnail = { - url: 'https://cdn.discordapp.com/emojis/555488195387850753.gif', - }; - } - } - break; - case 6381923: - text.color = 535886; - text.footer.text = `Waw, that was a strong enemy. Kanna is very sleepy, but you can eat her 100 chocolates before she wakes`; - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/696512326114869289/767336752988815380/470728420549197825_1.png', - }; - break; + case 16711680: + text.color = 1262169; + if (opt) { + text.footer.text = `Looks like chu met the wrong foe today fren. Fear not! Kanna has brought chu 50 chocolates to cheer chu up...rip ${opt.streak} streak`; + } + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/696512326114869289/767336849801740329/kl1love.png', + }; + break; + case 65280: + text.color = 5249624; + if (opt) { + text.footer.text = `You defended in ${opt.turns}! Your Sailors gained ${opt.xp} xp! Streak: ${opt.streak}`; + if (('' + opt.xp).includes('+')) { + text.footer.text = `Victory! Kanna has brought you ${opt.xp} bonus chocolates, which she will eat for herself. Streak: ${opt.streak}`; + text.thumbnail = { + url: 'https://media.discordapp.net/attachments/696512326114869289/767334256543924244/kannafire.gif', + }; + } else { + text.footer.text = `Victory! Kanna has brought you ${opt.xp} chocolates to enjoy under the kotatsu. Streak: ${opt.streak}`; + text.thumbnail = { + url: 'https://cdn.discordapp.com/emojis/555488195387850753.gif', + }; + } + } + break; + case 6381923: + text.color = 535886; + text.footer.text = 'Waw, that was a strong enemy. Kanna is very sleepy, but you can eat her 100 chocolates before she wakes'; + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/696512326114869289/767336752988815380/470728420549197825_1.png', + }; + break; } return text; } @@ -320,24 +320,24 @@ function ashley(text, opt) { ' tries to wreck the enemy team!' ); switch (text.color) { - case 16711680: - text.color = 2593784; - if (opt) { - text.footer.text = `The enemy stopped your destruction in ${opt.turns} turns. You lost your wrecking streak of ${opt.streak} and gained 50xp`; - } - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/661043173992169482/760890693778145280/felix_win.gif', - }; - break; - case 65280: - text.color = 9502720; - if (opt) { - text.footer.text = `You wrecked the enemy in ${opt.turns} turns! Your team gained ${opt.xp} xp! Teams wrecked: ${opt.streak}`; - } - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/661043173992169482/760890400734052462/ralph_win.gif', - }; - break; + case 16711680: + text.color = 2593784; + if (opt) { + text.footer.text = `The enemy stopped your destruction in ${opt.turns} turns. You lost your wrecking streak of ${opt.streak} and gained 50xp`; + } + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/661043173992169482/760890693778145280/felix_win.gif', + }; + break; + case 65280: + text.color = 9502720; + if (opt) { + text.footer.text = `You wrecked the enemy in ${opt.turns} turns! Your team gained ${opt.xp} xp! Teams wrecked: ${opt.streak}`; + } + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/661043173992169482/760890400734052462/ralph_win.gif', + }; + break; } return text; } @@ -348,21 +348,21 @@ function arichy(text, opt) { ', your Mage goes into the dungeon with her animal friends. They met a strong enemy :O' ); switch (text.color) { - case 16711680: - if (opt) { - text.footer.text = `Oh no! The enemy was too strong! You lost in ${opt.turns} turns! Your team gained 50xp and lost their streak of ${opt.streak}... Try again!`; - } - break; - case 65280: - if (opt) { - text.footer.text = `Dungeon Complete! You won in ${opt.turns} turns! Your team gained ${opt.xp} xp. Streak ${opt.streak}`; - } - break; - case 6381923: - if (opt) { - text.footer.text = `Oh, what a fight! You tried your best and both got exhausted. It's a tie! Your team gained ${opt.xp} xp! GG!`; - } - break; + case 16711680: + if (opt) { + text.footer.text = `Oh no! The enemy was too strong! You lost in ${opt.turns} turns! Your team gained 50xp and lost their streak of ${opt.streak}... Try again!`; + } + break; + case 65280: + if (opt) { + text.footer.text = `Dungeon Complete! You won in ${opt.turns} turns! Your team gained ${opt.xp} xp. Streak ${opt.streak}`; + } + break; + case 6381923: + if (opt) { + text.footer.text = `Oh, what a fight! You tried your best and both got exhausted. It's a tie! Your team gained ${opt.xp} xp! GG!`; + } + break; } text.thumbnail = { url: 'https://i.imgur.com/vvpFulp.gif', @@ -374,47 +374,47 @@ function kirito(text, opt) { text.author.name = 'Zero Two pilots Strelizia into battle with her darling! Slaughtering the klaxosaurs in their way. *rawr*'; switch (text.color) { - case 16711680: - text.color = 2500198; - if (opt) { - text.footer.text = `Ouch. The klaxosaurs managed to invade Cerasus within ${opt.turns} turns, losing your streak of ${opt.streak} wins. But don't fret, darling is here to lift your spirits!`; - } - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/731399149307691008/786994818118057984/shecry.jpg', - }; - break; - case 65280: - text.color = 15450599; - if (opt) { - if (('' + opt.xp).includes('+')) { - text.footer.text = `Zero Two managed to clear the battlefield out of klaxosaurs in ${opt.turns} turns! Gaining ${opt.xp} klaxosaur xp to empower her franxx with! You also reward her with a day to the beach. Streak: ${opt.streak}`; + case 16711680: + text.color = 2500198; + if (opt) { + text.footer.text = `Ouch. The klaxosaurs managed to invade Cerasus within ${opt.turns} turns, losing your streak of ${opt.streak} wins. But don't fret, darling is here to lift your spirits!`; + } + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/731399149307691008/786994818118057984/shecry.jpg', + }; + break; + case 65280: + text.color = 15450599; + if (opt) { + if (('' + opt.xp).includes('+')) { + text.footer.text = `Zero Two managed to clear the battlefield out of klaxosaurs in ${opt.turns} turns! Gaining ${opt.xp} klaxosaur xp to empower her franxx with! You also reward her with a day to the beach. Streak: ${opt.streak}`; + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/731399149307691008/786993695936872489/beachcutie.gif', + }; + } else { + if (Math.random() < 0.5) { + text.footer.text = `Zero Two managed to clear the battlefield out of klaxosaurs in ${opt.turns} turns! Bringing back ${opt.xp} honey bread and ham to snack on with her darling. Streak: ${opt.streak}`; text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/731399149307691008/786993695936872489/beachcutie.gif', + url: 'https://cdn.discordapp.com/attachments/731399149307691008/786992280014684160/honey.gif', }; } else { - if (Math.random() < 0.5) { - text.footer.text = `Zero Two managed to clear the battlefield out of klaxosaurs in ${opt.turns} turns! Bringing back ${opt.xp} honey bread and ham to snack on with her darling. Streak: ${opt.streak}`; - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/731399149307691008/786992280014684160/honey.gif', - }; - } else { - text.footer.text = `Zero Two managed to clear the battlefield out of klaxosaurs in ${opt.turns} turns! Gaining ${opt.xp} klaxosaur xp to empower her franxx with! You also set her to shower after shedding lots of sweat. Streak: ${opt.streak}`; - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/731399149307691008/787737189454315520/wateruwuwuwu.gif', - }; - } + text.footer.text = `Zero Two managed to clear the battlefield out of klaxosaurs in ${opt.turns} turns! Gaining ${opt.xp} klaxosaur xp to empower her franxx with! You also set her to shower after shedding lots of sweat. Streak: ${opt.streak}`; + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/731399149307691008/787737189454315520/wateruwuwuwu.gif', + }; } } - break; - case 6381923: - text.color = 5560773; - if (opt) { - text.footer.text = `Sheesh, close one. Zero Two will kill them next time! Here's 100 pats for now. Streak: ${opt.streak}`; - } - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/731399149307691008/786993997633159219/headpattie.png', - }; - break; + } + break; + case 6381923: + text.color = 5560773; + if (opt) { + text.footer.text = `Sheesh, close one. Zero Two will kill them next time! Here's 100 pats for now. Streak: ${opt.streak}`; + } + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/731399149307691008/786993997633159219/headpattie.png', + }; + break; } return text; } @@ -422,33 +422,33 @@ function kirito(text, opt) { function direwolf(text, opt) { text.author.name = 'Lucy and Yukino go into battle and open the TWELVE ZODIAC GATES!'; switch (text.color) { - case 16711680: - text.color = 16023551; - if (opt) { - text.footer.text = `The Celestial Spirits vanish! Lucy cries out for Natsu's help! You lost in ${opt.turns}! RIP ${opt.streak} KILLING SPREE!`; - } - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/771398927912009738/784165154798567444/image0.jpg', - }; - break; - case 65280: - text.color = 1709784; - if (opt) { - text.footer.text = `Lucy x Yukino are VICTORIOUS! You won in ${opt.turns} turns and your team gained ${opt.xp}! Vanquished: ${opt.streak}!`; - } - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/771398927912009738/784164939421581342/image0.gif', - }; - break; - case 6381923: - text.color = 11796735; - if (opt) { - text.footer.text = `What magical presence! The enemy remains at large! Natsu arrives on the scene enraged! Lucy x Yukino gain ${opt.xp}! Streak: ${opt.streak}!`; - } - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/771398927912009738/784164939987157013/image1.gif', - }; - break; + case 16711680: + text.color = 16023551; + if (opt) { + text.footer.text = `The Celestial Spirits vanish! Lucy cries out for Natsu's help! You lost in ${opt.turns}! RIP ${opt.streak} KILLING SPREE!`; + } + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/771398927912009738/784165154798567444/image0.jpg', + }; + break; + case 65280: + text.color = 1709784; + if (opt) { + text.footer.text = `Lucy x Yukino are VICTORIOUS! You won in ${opt.turns} turns and your team gained ${opt.xp}! Vanquished: ${opt.streak}!`; + } + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/771398927912009738/784164939421581342/image0.gif', + }; + break; + case 6381923: + text.color = 11796735; + if (opt) { + text.footer.text = `What magical presence! The enemy remains at large! Natsu arrives on the scene enraged! Lucy x Yukino gain ${opt.xp}! Streak: ${opt.streak}!`; + } + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/771398927912009738/784164939987157013/image1.gif', + }; + break; } return text; } @@ -456,92 +456,92 @@ function direwolf(text, opt) { function jiraya(text, opt) { text.author.name = 'Gojo Satoru and Itadori Yuji goes into battle against curses!'; switch (text.color) { - // lost - case 16711680: - text.color = 10027008; - if (opt) { - text.footer.text = `Oh no! Sukuna takes over Yuji and lays his Domain over Gojo's Domain. Gojo's Domain has shattered. Your streak of ${opt.streak} is broken! You lost in ${opt.turns} turns!`; - } - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/771398927912009738/811783217031413801/image2.gif', - }; - break; + // lost + case 16711680: + text.color = 10027008; + if (opt) { + text.footer.text = `Oh no! Sukuna takes over Yuji and lays his Domain over Gojo's Domain. Gojo's Domain has shattered. Your streak of ${opt.streak} is broken! You lost in ${opt.turns} turns!`; + } + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/771398927912009738/811783217031413801/image2.gif', + }; + break; // win - case 65280: - text.color = 2364785; - if (opt) { - text.footer.text = `Gojo used his domain expansion, Infinite Void and killed all the curses! You won in ${opt.turns} turns and your team gained ${opt.xp} xp! You've defeated a total of: ${opt.streak} curses!`; - } - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/771398927912009738/811783212548227072/image0.gif', - }; - break; + case 65280: + text.color = 2364785; + if (opt) { + text.footer.text = `Gojo used his domain expansion, Infinite Void and killed all the curses! You won in ${opt.turns} turns and your team gained ${opt.xp} xp! You've defeated a total of: ${opt.streak} curses!`; + } + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/771398927912009738/811783212548227072/image0.gif', + }; + break; //tie - case 6381923: - text.color = 16753920; - if (opt) { - text.footer.text = `Sukuna takes over Yuji, but Yuji fights him and doesn't let him win. Gojo and Yuji gain ${opt.xp} xp! Streak: ${opt.streak}!`; - } - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/771398927912009738/811783213965770822/image1.gif', - }; - break; + case 6381923: + text.color = 16753920; + if (opt) { + text.footer.text = `Sukuna takes over Yuji, but Yuji fights him and doesn't let him win. Gojo and Yuji gain ${opt.xp} xp! Streak: ${opt.streak}!`; + } + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/771398927912009738/811783213965770822/image1.gif', + }; + break; } return text; } function notJames(text, opt) { switch (text.color) { - // lost - case 16711680: - if (opt) { - text.author.name = 'chem has arrived to protect the Fallen Stars from outerspace invaders!'; - text.footer.text = `Defeat || Collected: 50 stardust || Lost: ${opt.streak} booms :c`; - } - text.color = 1262169; - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/769619375296610304/809631784752644106/cry.png', - }; - break; + // lost + case 16711680: + if (opt) { + text.author.name = 'chem has arrived to protect the Fallen Stars from outerspace invaders!'; + text.footer.text = `Defeat || Collected: 50 stardust || Lost: ${opt.streak} booms :c`; + } + text.color = 1262169; + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/769619375296610304/809631784752644106/cry.png', + }; + break; // win - case 65280: - if (opt) { - const stardust = ('' + opt.xp).includes('+') ? 'bonus stardust' : 'stardust'; - text.author.name = + case 65280: + if (opt) { + const stardust = ('' + opt.xp).includes('+') ? 'bonus stardust' : 'stardust'; + text.author.name = 'james has arrived to protect the Fallen Stars from outerspace invaders!'; - if (opt.streak % 10000 == 0) { - text.footer.text = `Victory || Collected: ${opt.xp} bonus star shards || Boomoos: ${opt.streak}`; - } else if (opt.streak % 1000 == 0) { - text.footer.text = `Victory || Collected: ${opt.xp} bonus star shards || Boomieos: ${opt.streak}`; - } else if (opt.streak % 100 == 0) { - text.footer.text = `Victory || Collected: ${opt.xp} bonus star shards || Boomies: ${opt.streak}`; - } else if (opt.streak % 10 == 0) { - text.footer.text = `Victory || Collected: ${opt.xp} bonus star shards || Booms: ${opt.streak}`; - } else { - text.footer.text = `Victory || Collected: ${opt.xp} ${stardust} || Booms: ${opt.streak}`; - } - } - text.color = 1190467; - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/769619375296610304/809631713624981564/official_cheer.gif', - }; - break; + if (opt.streak % 10000 == 0) { + text.footer.text = `Victory || Collected: ${opt.xp} bonus star shards || Boomoos: ${opt.streak}`; + } else if (opt.streak % 1000 == 0) { + text.footer.text = `Victory || Collected: ${opt.xp} bonus star shards || Boomieos: ${opt.streak}`; + } else if (opt.streak % 100 == 0) { + text.footer.text = `Victory || Collected: ${opt.xp} bonus star shards || Boomies: ${opt.streak}`; + } else if (opt.streak % 10 == 0) { + text.footer.text = `Victory || Collected: ${opt.xp} bonus star shards || Booms: ${opt.streak}`; + } else { + text.footer.text = `Victory || Collected: ${opt.xp} ${stardust} || Booms: ${opt.streak}`; + } + } + text.color = 1190467; + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/769619375296610304/809631713624981564/official_cheer.gif', + }; + break; //tie - case 6381923: - if (opt) { - text.author.name = + case 6381923: + if (opt) { + text.author.name = 'james has arrived to protect the Fallen Stars from outerspace invaders!'; - text.footer.text = `Tie || Collected: ${opt.xp} star fragments || Booms: ${opt.streak}`; - } - text.color = 4539717; - text.thumbnail = { - url: 'https://media.discordapp.net/attachments/759231534238269460/851260748192940052/0b004b50f2700762eb850e27e8a9b504.gif', - }; - break; + text.footer.text = `Tie || Collected: ${opt.xp} star fragments || Booms: ${opt.streak}`; + } + text.color = 4539717; + text.thumbnail = { + url: 'https://media.discordapp.net/attachments/759231534238269460/851260748192940052/0b004b50f2700762eb850e27e8a9b504.gif', + }; + break; } return text; } @@ -549,42 +549,42 @@ function notJames(text, opt) { function theGoldenPatrik1(text, opt) { text.author.name = 'The Balrog has entered Khazad-dĆ»m!'; switch (text.color) { - // lost - case 16711680: - if (opt) { - text.footer.text = `The Wizard was too strong today and you shall have to return to the Shadow for a time. You lost your streak of ${opt.streak} wins in ${opt.turns} turns`; - } - text.color = 16777215; - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/809113796756111370/809114509872463962/Loss.gif', - }; - break; + // lost + case 16711680: + if (opt) { + text.footer.text = `The Wizard was too strong today and you shall have to return to the Shadow for a time. You lost your streak of ${opt.streak} wins in ${opt.turns} turns`; + } + text.color = 16777215; + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/809113796756111370/809114509872463962/Loss.gif', + }; + break; // win - case 65280: - if (opt) { - if (('' + opt.xp).includes('+')) { - text.footer.text = `What a spectacular triumph! You conquered in ${opt.turns} turns and gained ${opt.xp} xp. Streak: ${opt.streak}.`; - } else { - text.footer.text = `Yet another victory! You conquered in ${opt.turns} turns and gained ${opt.xp} xp. Streak: ${opt.streak}.`; - } - } - text.color = 16747520; - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/809113796756111370/809114336831209482/Win.gif', - }; - break; + case 65280: + if (opt) { + if (('' + opt.xp).includes('+')) { + text.footer.text = `What a spectacular triumph! You conquered in ${opt.turns} turns and gained ${opt.xp} xp. Streak: ${opt.streak}.`; + } else { + text.footer.text = `Yet another victory! You conquered in ${opt.turns} turns and gained ${opt.xp} xp. Streak: ${opt.streak}.`; + } + } + text.color = 16747520; + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/809113796756111370/809114336831209482/Win.gif', + }; + break; //tie - case 6381923: - if (opt) { - text.footer.text = `Wow, that Wizard is stronger than he looks! You stalemated but still gained ${opt.xp} xp. Streak: ${opt.streak}.`; - } - text.color = 8421504; - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/809113796756111370/809114422630940733/Tie.gif', - }; - break; + case 6381923: + if (opt) { + text.footer.text = `Wow, that Wizard is stronger than he looks! You stalemated but still gained ${opt.xp} xp. Streak: ${opt.streak}.`; + } + text.color = 8421504; + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/809113796756111370/809114422630940733/Tie.gif', + }; + break; } return text; } @@ -600,38 +600,38 @@ function lexx(text, opt) { function mercureid(text, opt) { text.author.name = 'Mario and Luigi embark on a journey to rescue Princess Peach!'; switch (text.color) { - // lost - case 16711680: - if (opt) { - text.footer.text = `Mamma mia... You lost in ${opt.turns} turns and failed to rescue Princess Peach from the gnarly, fire-breathing Bowser :( . You receive ${opt.xp} mushrooms. Goombas destroyed: ${opt.streak}`; - } - text.color = 9722954; - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/815743547449016400/816246705417617448/053c39f4c14d99d4bc143c05dc3ca219.gif', - }; - break; + // lost + case 16711680: + if (opt) { + text.footer.text = `Mamma mia... You lost in ${opt.turns} turns and failed to rescue Princess Peach from the gnarly, fire-breathing Bowser :( . You receive ${opt.xp} mushrooms. Goombas destroyed: ${opt.streak}`; + } + text.color = 9722954; + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/815743547449016400/816246705417617448/053c39f4c14d99d4bc143c05dc3ca219.gif', + }; + break; // win - case 65280: - if (opt) { - text.footer.text = `Yahoo! In ${opt.turns} turns, you managed to jump through gaps and obstacles and save the Mushroom Kingdom! You receive ${opt.xp} mushrooms from Toad. Goombas destroyed: ${opt.streak}`; - } - text.color = 14381560; - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/815743547449016400/816246705770725386/source.gif', - }; - break; + case 65280: + if (opt) { + text.footer.text = `Yahoo! In ${opt.turns} turns, you managed to jump through gaps and obstacles and save the Mushroom Kingdom! You receive ${opt.xp} mushrooms from Toad. Goombas destroyed: ${opt.streak}`; + } + text.color = 14381560; + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/815743547449016400/816246705770725386/source.gif', + }; + break; //tie - case 6381923: - if (opt) { - text.footer.text = `Oh no! Bowser's minions were too strong :( . Luckily, you still have a spare 1-up mushroom to use. You receive ${opt.xp} mushrooms. Goombas destroyed: ${opt.streak}`; - } - text.color = 65475; - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/815743547449016400/816246706051219456/giphy_1.gif', - }; - break; + case 6381923: + if (opt) { + text.footer.text = `Oh no! Bowser's minions were too strong :( . Luckily, you still have a spare 1-up mushroom to use. You receive ${opt.xp} mushrooms. Goombas destroyed: ${opt.streak}`; + } + text.color = 65475; + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/815743547449016400/816246706051219456/giphy_1.gif', + }; + break; } return text; } @@ -639,29 +639,29 @@ function mercureid(text, opt) { function leshoop(text, user, opt) { text.author.name = `${user.username} goes into battle!`; switch (text.color) { - // lost - case 16711680: - if (opt) { - text.footer.text = `An astounding battle, but alas, your team was defeated in ${opt.turns} turns to gain a mere ${opt.xp} xp. You lost your streak of ${opt.streak} wins. ~ Until we meet again...`; - } - text.color = 16711680; - break; + // lost + case 16711680: + if (opt) { + text.footer.text = `An astounding battle, but alas, your team was defeated in ${opt.turns} turns to gain a mere ${opt.xp} xp. You lost your streak of ${opt.streak} wins. ~ Until we meet again...`; + } + text.color = 16711680; + break; // win - case 65280: - if (opt) { - text.footer.text = `Together we fight, and in ${opt.turns} turns achieve victory! Your team gained ${opt.xp} xp! Streak: ${opt.streak}`; - } - text.color = 10904029; - break; + case 65280: + if (opt) { + text.footer.text = `Together we fight, and in ${opt.turns} turns achieve victory! Your team gained ${opt.xp} xp! Streak: ${opt.streak}`; + } + text.color = 10904029; + break; //tie - case 6381923: - if (opt) { - text.footer.text = `There is no instance of a nation benefitting from prolonged warfare ~ After 20 turns, we agree upon peace. Your team gained ${opt.xp} xp! Streak: ${opt.streak}`; - } - text.color = 12895184; - break; + case 6381923: + if (opt) { + text.footer.text = `There is no instance of a nation benefitting from prolonged warfare ~ After 20 turns, we agree upon peace. Your team gained ${opt.xp} xp! Streak: ${opt.streak}`; + } + text.color = 12895184; + break; } text.thumbnail = { url: 'https://media1.tenor.com/images/93f5876e82ae575a6c4b4613d57f6e29/tenor.gif', @@ -672,38 +672,38 @@ function leshoop(text, user, opt) { function blade(text, opt) { text.author.name = 'BLaDe goes into brutal fight against deadly sins!'; switch (text.color) { - // win - case 65280: - if (opt) { - text.footer.text = `BLaDe uses his Telepathic abilities and gains control over enemy's mind.! You won in ${opt.turns} hits and gained ${opt.xp} xp! You've defeated a total of ${opt.streak} sins!`; - } - text.color = 65511; - text.thumbnail = { - url: 'https://i.imgur.com/QCUu8Jl.gif', - }; - break; + // win + case 65280: + if (opt) { + text.footer.text = `BLaDe uses his Telepathic abilities and gains control over enemy's mind.! You won in ${opt.turns} hits and gained ${opt.xp} xp! You've defeated a total of ${opt.streak} sins!`; + } + text.color = 65511; + text.thumbnail = { + url: 'https://i.imgur.com/QCUu8Jl.gif', + }; + break; // lost - case 16711680: - if (opt) { - text.footer.text = `Oops! BLaDe lost his Telepathic abilities while facing strong sins and got killed. He'll now be reborn! Your streak of killing ${opt.streak} sins is smashed! You lost after ${opt.turns} hits!`; - } - text.color = 16734464; - text.thumbnail = { - url: 'https://i.imgur.com/lG1bJJu.gif', - }; - break; + case 16711680: + if (opt) { + text.footer.text = `Oops! BLaDe lost his Telepathic abilities while facing strong sins and got killed. He'll now be reborn! Your streak of killing ${opt.streak} sins is smashed! You lost after ${opt.turns} hits!`; + } + text.color = 16734464; + text.thumbnail = { + url: 'https://i.imgur.com/lG1bJJu.gif', + }; + break; //tie - case 6381923: - if (opt) { - text.footer.text = `BLaDe uses Telepathy, but the sins were strong enough to withstand it for ${opt.turns} hits! You gain ${opt.xp} xp and killed a total of ${opt.streak} sins!`; - } - text.color = 7708416; - text.thumbnail = { - url: 'https://i.imgur.com/7rbtiBX.gif', - }; - break; + case 6381923: + if (opt) { + text.footer.text = `BLaDe uses Telepathy, but the sins were strong enough to withstand it for ${opt.turns} hits! You gain ${opt.xp} xp and killed a total of ${opt.streak} sins!`; + } + text.color = 7708416; + text.thumbnail = { + url: 'https://i.imgur.com/7rbtiBX.gif', + }; + break; } return text; } @@ -711,38 +711,38 @@ function blade(text, opt) { function becca(text, opt) { text.author.name = 'Becca is here! kenapa, tidak suka? Maju lo sini Jingan!'; switch (text.color) { - // win - case 65280: - if (opt) { - text.footer.text = `Anjass! Selow, benerin dulu tim Lu bagusin dulu weapon Lu baru ngajak gelud ngOokey!! Canda bahh, Becca bagi-bagi ${opt.xp} Boba Mwahh! šŸŒ» streak : ${opt.streak}`; - } - text.color = 16739566; - text.thumbnail = { - url: 'https://media.discordapp.net/attachments/818819441281728543/822653290146824192/image0-3.gif', - }; - break; + // win + case 65280: + if (opt) { + text.footer.text = `Anjass! Selow, benerin dulu tim Lu bagusin dulu weapon Lu baru ngajak gelud ngOokey!! Canda bahh, Becca bagi-bagi ${opt.xp} Boba Mwahh! šŸŒ» streak : ${opt.streak}`; + } + text.color = 16739566; + text.thumbnail = { + url: 'https://media.discordapp.net/attachments/818819441281728543/822653290146824192/image0-3.gif', + }; + break; // lost - case 16711680: - if (opt) { - text.footer.text = `Owo jingan! ngebug! Tidak ada Boba lagi anying! streak: ${opt.streak}`; - } - text.color = 11158527; - text.thumbnail = { - url: 'https://media.discordapp.net/attachments/818819441281728543/822653289770254386/image3-1.gif', - }; - break; + case 16711680: + if (opt) { + text.footer.text = `Owo jingan! ngebug! Tidak ada Boba lagi anying! streak: ${opt.streak}`; + } + text.color = 11158527; + text.thumbnail = { + url: 'https://media.discordapp.net/attachments/818819441281728543/822653289770254386/image3-1.gif', + }; + break; //tie - case 6381923: - if (opt) { - text.footer.text = `Waduh boleh juga Lu! Jangan cepat puas ini masih TIE bukan LOSE!! Canda wehhh, Becca bagi-bagi ${opt.xp} Boba Mwahh! streak : ${opt.streak}`; - } - text.color = 10878897; - text.thumbnail = { - url: 'https://media.discordapp.net/attachments/818819441281728543/822666934570188820/image3.gif', - }; - break; + case 6381923: + if (opt) { + text.footer.text = `Waduh boleh juga Lu! Jangan cepat puas ini masih TIE bukan LOSE!! Canda wehhh, Becca bagi-bagi ${opt.xp} Boba Mwahh! streak : ${opt.streak}`; + } + text.color = 10878897; + text.thumbnail = { + url: 'https://media.discordapp.net/attachments/818819441281728543/822666934570188820/image3.gif', + }; + break; } return text; } @@ -751,38 +751,38 @@ function wibi(text, opt) { text.author.name = 'Hela resurrected her army of Berserkers and Fenris by using a handful of the Eternal Flame!'; switch (text.color) { - // win - case 65280: - if (opt) { - text.footer.text = `Hela used her Necroswords to slaughter all of the Valkyries in ${opt.turns} turns! when a Valkyrie is killed she gains ${opt.xp} Powers of Darkness! Kneel... before your Queen! šŸŒ¹ Streak: ${opt.streak}`; - } - text.color = 16711900; - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/822630852613242891/823895147359764540/20210323_191545.gif', - }; - break; + // win + case 65280: + if (opt) { + text.footer.text = `Hela used her Necroswords to slaughter all of the Valkyries in ${opt.turns} turns! when a Valkyrie is killed she gains ${opt.xp} Powers of Darkness! Kneel... before your Queen! šŸŒ¹ Streak: ${opt.streak}`; + } + text.color = 16711900; + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/822630852613242891/823895147359764540/20210323_191545.gif', + }; + break; // lost - case 16711680: - if (opt) { - text.footer.text = `Hela was then defenseless as she witnessed Surtur lift up his Twilight Sword high above his head and prepared to fulfill his destiny once and for all. Streak: ${opt.streak}`; - } - text.color = 16216430; - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/822630852613242891/823895470950449172/main-qimg-aced64c8262f98155571b0f61432da56.gif', - }; - break; + case 16711680: + if (opt) { + text.footer.text = `Hela was then defenseless as she witnessed Surtur lift up his Twilight Sword high above his head and prepared to fulfill his destiny once and for all. Streak: ${opt.streak}`; + } + text.color = 16216430; + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/822630852613242891/823895470950449172/main-qimg-aced64c8262f98155571b0f61432da56.gif', + }; + break; //tie - case 6381923: - if (opt) { - text.footer.text = `Now, Hela turned out to be too powerful, and as Odinā€™s true heir, she was tied to Asgard. Thor realized he was not going to be able to defeat her! Streak: ${opt.streak}`; - } - text.color = 14549247; - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/822630852613242891/823895279350186014/20210323_192109.gif', - }; - break; + case 6381923: + if (opt) { + text.footer.text = `Now, Hela turned out to be too powerful, and as Odinā€™s true heir, she was tied to Asgard. Thor realized he was not going to be able to defeat her! Streak: ${opt.streak}`; + } + text.color = 14549247; + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/822630852613242891/823895279350186014/20210323_192109.gif', + }; + break; } return text; } @@ -790,38 +790,38 @@ function wibi(text, opt) { function jekyll(text, opt) { text.author.name = 'You and Levi Ackerman goes into the Ragako village to fight the titans!'; switch (text.color) { - // win - case 65280: - if (opt) { - text.footer.text = `Uwaa!! You're skillfully kill the titan to save your team from being eaten by it in just ${opt.turns} turns. You receive ${opt.xp} energies from the battle. Streak : ${opt.streak}`; - } - text.color = 9002290; - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/779341346812592131/825282484014940170/7UZ2.gif', - }; - break; + // win + case 65280: + if (opt) { + text.footer.text = `Uwaa!! You're skillfully kill the titan to save your team from being eaten by it in just ${opt.turns} turns. You receive ${opt.xp} energies from the battle. Streak : ${opt.streak}`; + } + text.color = 9002290; + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/779341346812592131/825282484014940170/7UZ2.gif', + }; + break; // lost - case 16711680: - if (opt) { - text.footer.text = `Sigh... You face such a powerful titan. You failed to save your team from being eaten by a titan in ${opt.turns} turns only. You receive ${opt.xp} energies from the battle. Streak : ${opt.streak}`; - } - text.color = 16777211; - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/779341346812592131/829027535076458557/48378.gif', - }; - break; + case 16711680: + if (opt) { + text.footer.text = `Sigh... You face such a powerful titan. You failed to save your team from being eaten by a titan in ${opt.turns} turns only. You receive ${opt.xp} energies from the battle. Streak : ${opt.streak}`; + } + text.color = 16777211; + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/779341346812592131/829027535076458557/48378.gif', + }; + break; //tie - case 6381923: - if (opt) { - text.footer.text = `Wew! Your team has survived from a long battle. Let's retreat until we become stronger to defeat the titans. You receive ${opt.xp} energies from the battle. Streak : ${opt.streak}`; - } - text.color = 1907739; - text.thumbnail = { - url: 'https://cdn.discordapp.com/attachments/779341346812592131/829027577301041173/original.gif', - }; - break; + case 6381923: + if (opt) { + text.footer.text = `Wew! Your team has survived from a long battle. Let's retreat until we become stronger to defeat the titans. You receive ${opt.xp} energies from the battle. Streak : ${opt.streak}`; + } + text.color = 1907739; + text.thumbnail = { + url: 'https://cdn.discordapp.com/attachments/779341346812592131/829027577301041173/original.gif', + }; + break; } return text; } @@ -829,26 +829,26 @@ function jekyll(text, opt) { function life(text, opt) { text.author.name = 'Kira goes into battle alongside Ryuk with his Deathnote'; switch (text.color) { - // win - case 65280: - if (opt) { - text.footer.text = `=> Kira opens his Deathnote and writes the name of his enemy, enemy is dead, they won in ${opt.turns} turns!, They gained ${opt.xp}! Streak: ${opt.streak}`; - } - break; + // win + case 65280: + if (opt) { + text.footer.text = `=> Kira opens his Deathnote and writes the name of his enemy, enemy is dead, they won in ${opt.turns} turns!, They gained ${opt.xp}! Streak: ${opt.streak}`; + } + break; // lost - case 16711680: - if (opt) { - text.footer.text = `=> Kira loses in ${opt.turns}!, Ryuk writes Kira's name on his Deathnote as promised Kira gained ${opt.xp}! Streak: ${opt.streak}`; - } - break; + case 16711680: + if (opt) { + text.footer.text = `=> Kira loses in ${opt.turns}!, Ryuk writes Kira's name on his Deathnote as promised Kira gained ${opt.xp}! Streak: ${opt.streak}`; + } + break; //tie - case 6381923: - if (opt) { - text.footer.text = `=> Kira opens his Deathnote and writes the name his of enemy, enemy came up with fake name , they tied in ${opt.turns} turns!, They gained ${opt.xp}! Streak: ${opt.streak}`; - } - break; + case 6381923: + if (opt) { + text.footer.text = `=> Kira opens his Deathnote and writes the name his of enemy, enemy came up with fake name , they tied in ${opt.turns} turns!, They gained ${opt.xp}! Streak: ${opt.streak}`; + } + break; } return text; } @@ -856,38 +856,38 @@ function life(text, opt) { function scox(text, opt) { text.author.name = 'Entering battlefield using all of soul reaper power'; switch (text.color) { - // win - case 65280: - if (opt) { - text.footer.text = `With final getsuga tenshou easily defeating all enemies in front off his eyes in ${opt.turns} turns ended up in gaining ${opt.xp} soul reaper powers, too easy for him! streak ${opt.streak}`; - } - text.color = 2722246; - text.thumbnail = { - url: 'https://media.discordapp.net/attachments/836296917385871390/843240718822408222/image0.gif', - }; - break; + // win + case 65280: + if (opt) { + text.footer.text = `With final getsuga tenshou easily defeating all enemies in front off his eyes in ${opt.turns} turns ended up in gaining ${opt.xp} soul reaper powers, too easy for him! streak ${opt.streak}`; + } + text.color = 2722246; + text.thumbnail = { + url: 'https://media.discordapp.net/attachments/836296917385871390/843240718822408222/image0.gif', + }; + break; // lost - case 16711680: - if (opt) { - text.footer.text = `Somehow, with final getsuga tenshou makes him lost a lot of soul reaper power, he end up by losing all his power! streak ${opt.streak}`; - } - text.color = 9807270; - text.thumbnail = { - url: 'https://media.discordapp.net/attachments/836296917385871390/843240856575016990/image0.gif', - }; - break; + case 16711680: + if (opt) { + text.footer.text = `Somehow, with final getsuga tenshou makes him lost a lot of soul reaper power, he end up by losing all his power! streak ${opt.streak}`; + } + text.color = 9807270; + text.thumbnail = { + url: 'https://media.discordapp.net/attachments/836296917385871390/843240856575016990/image0.gif', + }; + break; //tie - case 6381923: - if (opt) { - text.footer.text = `But, using final getsuga tenshou with wrong technique make the battle too long, need to think a better strategy! streak ${opt.streak}`; - } - text.color = 16187392; - text.thumbnail = { - url: 'https://media.discordapp.net/attachments/836296917385871390/843241504880984095/image0.gif', - }; - break; + case 6381923: + if (opt) { + text.footer.text = `But, using final getsuga tenshou with wrong technique make the battle too long, need to think a better strategy! streak ${opt.streak}`; + } + text.color = 16187392; + text.thumbnail = { + url: 'https://media.discordapp.net/attachments/836296917385871390/843241504880984095/image0.gif', + }; + break; } return text; } @@ -899,24 +899,24 @@ function estee(text, opt) { url: 'https://cdn.discordapp.com/attachments/810961856977174539/849221395417530398/ezgif.com-gif-maker_5.gif', }; switch (text.color) { - // win - case 65280: - if (opt) { - text.footer.text = `Death match ended, you won in ${opt.turns} turns, gained ${opt.xp}xp, streak ${opt.streak}`; - } - break; + // win + case 65280: + if (opt) { + text.footer.text = `Death match ended, you won in ${opt.turns} turns, gained ${opt.xp}xp, streak ${opt.streak}`; + } + break; // lost - case 16711680: - if (opt) { - text.footer.text = `Death match ended, you lost in ${opt.turns} turns, gained ${opt.xp}xp, streak ${opt.streak}`; - } - break; - case 6381923: - if (opt) { - text.footer.text = `Death match ended, you tied in ${opt.turns} turns, gained ${opt.xp}xp, streak ${opt.streak}`; - } - break; + case 16711680: + if (opt) { + text.footer.text = `Death match ended, you lost in ${opt.turns} turns, gained ${opt.xp}xp, streak ${opt.streak}`; + } + break; + case 6381923: + if (opt) { + text.footer.text = `Death match ended, you tied in ${opt.turns} turns, gained ${opt.xp}xp, streak ${opt.streak}`; + } + break; } return text; } diff --git a/src/commands/commandList/patreon/alterBuy.js b/src/commands/commandList/patreon/alterBuy.js index 129521098..cbb2f1dbe 100644 --- a/src/commands/commandList/patreon/alterBuy.js +++ b/src/commands/commandList/patreon/alterBuy.js @@ -7,10 +7,10 @@ exports.alter = function (p, text, opt) { switch (p.msg.author.id) { - case '459469724091154433': - return quincey(text, opt); - default: - return text; + case '459469724091154433': + return quincey(text, opt); + default: + return text; } }; @@ -18,36 +18,36 @@ function quincey(text, opt) { if (opt.type === 'ring') { let embed = {}; switch (opt.ring.id) { - case 1: - embed.description = `Quincey bought a <:Cring:873698208398852106> **Common Ring** `; - embed.color = 13391445; - break; - case 2: - embed.description = `Quincey bought an <:Ucring:876884532949831780> **Unommon Ring** `; - embed.color = 3978440; - break; - case 3: - embed.description = `Quincey bought a <:Rring:876884602772422698> **Rare Ring** `; - embed.color = 16107621; - break; - case 4: - embed.description = `Quincey bought an <:Ering:876884663958900736> **Epic Ring** `; - embed.color = 4611818; - break; - case 5: - embed.description = `Quincey bought a <:Mring:876884711656529980> **Mythic Ring** `; - embed.color = 10445814; - break; - case 6: - embed.description = `Quincey bought a **Legendary Ring** `; - embed.color = 16577355; - break; - case 7: - embed.description = `Quincey bought a **Fabled Ring** `; - embed.color = 10280698; - break; - default: - return text; + case 1: + embed.description = 'Quincey bought a <:Cring:873698208398852106> **Common Ring** '; + embed.color = 13391445; + break; + case 2: + embed.description = 'Quincey bought an <:Ucring:876884532949831780> **Unommon Ring** '; + embed.color = 3978440; + break; + case 3: + embed.description = 'Quincey bought a <:Rring:876884602772422698> **Rare Ring** '; + embed.color = 16107621; + break; + case 4: + embed.description = 'Quincey bought an <:Ering:876884663958900736> **Epic Ring** '; + embed.color = 4611818; + break; + case 5: + embed.description = 'Quincey bought a <:Mring:876884711656529980> **Mythic Ring** '; + embed.color = 10445814; + break; + case 6: + embed.description = 'Quincey bought a **Legendary Ring** '; + embed.color = 16577355; + break; + case 7: + embed.description = 'Quincey bought a **Fabled Ring** '; + embed.color = 10280698; + break; + default: + return text; } return { embed }; } diff --git a/src/commands/commandList/patreon/alterChecklist.js b/src/commands/commandList/patreon/alterChecklist.js index 7f722c62a..85d5fedac 100644 --- a/src/commands/commandList/patreon/alterChecklist.js +++ b/src/commands/commandList/patreon/alterChecklist.js @@ -12,17 +12,17 @@ const tada = 'šŸŽ‰'; exports.alter = function (id, opt) { switch (id) { - case '460987842961866762': - return estee(opt); - default: - return opt.embed; + case '460987842961866762': + return estee(opt); + default: + return opt.embed; } }; function estee(opt) { let embed = opt.embed; embed.color = 8421504; - embed.author.name = "ź§ą¼ŗš”¼š•¤š•„š•–š•–'š•¤ š”»š•–š•’š•„š•™ ā„•š• š•„š•–ą¼»ź§‚"; + embed.author.name = 'ź§ą¼ŗš”¼š•¤š•„š•–š•–\'š•¤ š”»š•–š•’š•„š•™ ā„•š• š•„š•–ą¼»ź§‚'; const tasks = [ 'ā™¤|Time of Death noted!', 'ā—‡|Souls collected!', diff --git a/src/commands/commandList/patreon/alterCookie.js b/src/commands/commandList/patreon/alterCookie.js index 4397d42d9..a7887d73c 100644 --- a/src/commands/commandList/patreon/alterCookie.js +++ b/src/commands/commandList/patreon/alterCookie.js @@ -20,12 +20,12 @@ exports.alter = function (id, text, info = {}) { function check(id, text, info) { switch (id) { - case '250383887312748545': - return elsa(text, info); - case '216710431572492289': - return arichy(text, info); - case '412812867348463636': - return erys(text, info); + case '250383887312748545': + return elsa(text, info); + case '216710431572492289': + return arichy(text, info); + case '412812867348463636': + return erys(text, info); } } @@ -64,7 +64,7 @@ function erys(text, info) { } else if (info.receive) { desc = ` **${info.to.username} | ${info.from.username}** made you freshly baked cookies, delivered by the magic cat <:receive2:993752859298517043>` + - `\n **|** Hope you enjoy them! nom`; + '\n **|** Hope you enjoy them! nom'; img = 'https://cdn.discordapp.com/attachments/936398283750907965/984144172229459988/cookie.gif'; color = 16436896; } else if (info.ready) { @@ -75,7 +75,7 @@ function erys(text, info) { } else { desc = ` **${info.to.username}**, **${info.from.username}** sent you a cookie from his catto's bakery! <:give2:993752856005980160>` + - `\n **|** It was made with love, hope it's tasty! nom`; + '\n **|** It was made with love, hope it\'s tasty! nom'; img = 'https://cdn.discordapp.com/attachments/936398283750907965/984144172229459988/cookie.gif'; color = 16436896; diff --git a/src/commands/commandList/patreon/alterCowoncy.js b/src/commands/commandList/patreon/alterCowoncy.js index 9f94f6f29..377ec6eee 100644 --- a/src/commands/commandList/patreon/alterCowoncy.js +++ b/src/commands/commandList/patreon/alterCowoncy.js @@ -9,10 +9,10 @@ const blank = '<:blank:427371936482328596>'; exports.alter = function (p, id, text, info) { switch (id) { - case '605994815317999635': - return rhine(p, info); - default: - return text; + case '605994815317999635': + return rhine(p, info); + default: + return text; } }; diff --git a/src/commands/commandList/patreon/alterGive.js b/src/commands/commandList/patreon/alterGive.js index 489e9807b..3f5b96df0 100644 --- a/src/commands/commandList/patreon/alterGive.js +++ b/src/commands/commandList/patreon/alterGive.js @@ -9,29 +9,29 @@ const blank = '<:blank:427371936482328596>'; exports.alter = function (p, id, text, info) { switch (id) { - case '456598711590715403': - return lexx(p, info); - case '605994815317999635': - return rhine(p, info); - case '379213399973953537': - return king(p, info); - case '816005571575808000': - return jayyy(p, info); - default: - return checkReceive(p, text, info); - return text; + case '456598711590715403': + return lexx(p, info); + case '605994815317999635': + return rhine(p, info); + case '379213399973953537': + return king(p, info); + case '816005571575808000': + return jayyy(p, info); + default: + return checkReceive(p, text, info); + return text; } }; function checkReceive(p, text, info) { info.receiver = true; switch (info.to.id) { - case '816005571575808000': - return jayyy(p, info); - case '605994815317999635': - return rhine(p, info); - default: - return text; + case '816005571575808000': + return jayyy(p, info); + case '605994815317999635': + return rhine(p, info); + default: + return text; } } diff --git a/src/commands/commandList/patreon/alterHunt.js b/src/commands/commandList/patreon/alterHunt.js index 63d91b69f..6e99f582a 100644 --- a/src/commands/commandList/patreon/alterHunt.js +++ b/src/commands/commandList/patreon/alterHunt.js @@ -11,72 +11,72 @@ exports.alter = async function (p, id, text, info) { const result = await checkDb(p, id, text, info); if (result) return result; switch (id) { - case '220934553861226498': - return geist(text); - case '369533933471268875': - return light(text); - case '242718397836558337': - return shippig(text); - case '255750356519223297': - return spotifybot(text); - case '358448141424394251': - return oliverLaVey(text); - case '371344384366739457': - return nou(text); - case '176046069954641921': - return crown(text); - case '289411794672418819': - return louis(text); - case '348828692539113490': - return michelle(text, info); - case '250383887312748545': - return elsa(text); - case '181264821713371136': - return pheonix(text); - case '192692796841263104': - return dalu(text); - case '336611676604596227': - return blacky(text); - case '576758923688804357': - return papershark(text); - case '283000589976338432': - return kuma(text); - case '536711790558576651': - return garcom(text, info); - case '229299825072537601': - return alradio(text, info); - case '408875125283225621': - return kirito(text, info); - case '549876586720133120': - return kitsune(text, info); - case '343094664414363658': - return tiggy(text, info); - case '166619476479967232': - return valentine(text, info); - case '403989717483257877': - return u_1s1k(text, info); - case '541103499992367115': - return ashley(text, info); - case '216710431572492289': - return arichy(text, info); - case '103409793972043776': - return potsun(text, info); - case '417350932662059009': - return sky(text, info); - case '707939636835516457': - return direwolf(text, info); - case '554617574646874113': - return notJames(text, info); - case '456598711590715403': - return lexx(text, info); - case '490709773495435285': - return koala(text, info); - case '468873774960476177': - return gojo(text, info); - case '183696273382178816': - return vanor(text, info); - default: - return text; + case '220934553861226498': + return geist(text); + case '369533933471268875': + return light(text); + case '242718397836558337': + return shippig(text); + case '255750356519223297': + return spotifybot(text); + case '358448141424394251': + return oliverLaVey(text); + case '371344384366739457': + return nou(text); + case '176046069954641921': + return crown(text); + case '289411794672418819': + return louis(text); + case '348828692539113490': + return michelle(text, info); + case '250383887312748545': + return elsa(text); + case '181264821713371136': + return pheonix(text); + case '192692796841263104': + return dalu(text); + case '336611676604596227': + return blacky(text); + case '576758923688804357': + return papershark(text); + case '283000589976338432': + return kuma(text); + case '536711790558576651': + return garcom(text, info); + case '229299825072537601': + return alradio(text, info); + case '408875125283225621': + return kirito(text, info); + case '549876586720133120': + return kitsune(text, info); + case '343094664414363658': + return tiggy(text, info); + case '166619476479967232': + return valentine(text, info); + case '403989717483257877': + return u_1s1k(text, info); + case '541103499992367115': + return ashley(text, info); + case '216710431572492289': + return arichy(text, info); + case '103409793972043776': + return potsun(text, info); + case '417350932662059009': + return sky(text, info); + case '707939636835516457': + return direwolf(text, info); + case '554617574646874113': + return notJames(text, info); + case '456598711590715403': + return lexx(text, info); + case '490709773495435285': + return koala(text, info); + case '468873774960476177': + return gojo(text, info); + case '183696273382178816': + return vanor(text, info); + default: + return text; } }; @@ -223,7 +223,7 @@ function spotifybot(text) { spotify + ' Hey **Spotify** *Make a New Playlist!*\n' + text - .replace(', hunt is empowered by', "'s Playlist is Sponsored by") + .replace(', hunt is empowered by', '\'s Playlist is Sponsored by') .replace(huntEmoji, '<:blank:427371936482328596>') .replace('**<:blank:427371936482328596> |** You found', nowplaying + ' **|** You added') .replace('xp**!', 'xp**! *Shuffle Play* ' + swipeup); @@ -255,7 +255,7 @@ function oliverLaVey(text) { tube + ' *New specimens inbound!*\n' + text - .replace(', hunt is empowered by', "'s research is empowered by") + .replace(', hunt is empowered by', '\'s research is empowered by') .replace(huntEmoji, dna) .replace('You found', 'You sampled') .replace('xp**!', 'xp**! *Downloading CRISPR-Cas9* ' + needle); @@ -335,7 +335,7 @@ function crown(text) { let crown = ''; if (text.indexOf('empowered by') >= 0) { text = text - .replace(', hunt is empowered by', "'s Elite Force marches into the forest with") + .replace(', hunt is empowered by', '\'s Elite Force marches into the forest with') .replace(huntEmoji, crown) .replace('You found', 'and after 1 week they found') .replace(' !', ''); @@ -344,7 +344,7 @@ function crown(text) { .replace(huntEmoji, crown) .replace( 'spent 5 <:cowoncy:416043450337853441> and caught a', - "'s Elite Force marches into the forest\n**<:blank:427371936482328596> |** and after 1 week they found a" + '\'s Elite Force marches into the forest\n**<:blank:427371936482328596> |** and after 1 week they found a' ); } let embed = { @@ -402,9 +402,9 @@ function michelle(text, info) { function elsa(text) { if (text.indexOf('empowered by') >= 0) { - text = text.replace(', hunt is empowered by', "'s Knights gather recruits! Using"); + text = text.replace(', hunt is empowered by', '\'s Knights gather recruits! Using'); } else { - text = text.replace(' spent 5 <:cowoncy:416043450337853441> and caught', "'s Knights found"); + text = text.replace(' spent 5 <:cowoncy:416043450337853441> and caught', '\'s Knights found'); } let embed = { description: text, @@ -460,7 +460,7 @@ function blacky(text) { text = text.replace(huntEmoji, ''); if (text.indexOf('empowered by') >= 0) { text = text - .replace(', hunt is empowered by', "'s umbreon is empowered by\n" + blank + ' **|**') + .replace(', hunt is empowered by', '\'s umbreon is empowered by\n' + blank + ' **|**') .replace('You found', 'and found'); } else { text = text @@ -536,7 +536,7 @@ function kuma(text) { text = text .replace( ' spent 5 <:cowoncy:416043450337853441> and caught', - "'s Cookie minions came back with" + '\'s Cookie minions came back with' ) .replace(huntEmoji, ck); } diff --git a/src/commands/commandList/patreon/alterHuntbot.js b/src/commands/commandList/patreon/alterHuntbot.js index 1ce6d850e..75797b26e 100644 --- a/src/commands/commandList/patreon/alterHuntbot.js +++ b/src/commands/commandList/patreon/alterHuntbot.js @@ -17,32 +17,32 @@ const essence = ''; exports.alter = function (id, text, type) { switch (id) { - case '111619509529387008': - return lexus(text, type); - case '242718397836558337': - return shippig(text, type); - case '255750356519223297': - return spotifybot(text, type); - case '250383887312748545': - return elsa(text, type); - case '192692796841263104': - return dalu(text, type); - case '323347251705544704': - return rikudou(text, type); - case '283000589976338432': - return kuma(text, type); - case '325273108418396160': - return spotifybot2(text, type); + case '111619509529387008': + return lexus(text, type); + case '242718397836558337': + return shippig(text, type); + case '255750356519223297': + return spotifybot(text, type); + case '250383887312748545': + return elsa(text, type); + case '192692796841263104': + return dalu(text, type); + case '323347251705544704': + return rikudou(text, type); + case '283000589976338432': + return kuma(text, type); + case '325273108418396160': + return spotifybot2(text, type); //case '408875125283225621': // return kirito(text,type); - case '575555630312456193': - return xmelanie(text, type); - case '216710431572492289': - return arichy(text, type); - case '352273158025379841': - return capz(text, type); - default: - return text; + case '575555630312456193': + return xmelanie(text, type); + case '216710431572492289': + return arichy(text, type); + case '352273158025379841': + return capz(text, type); + default: + return text; } }; @@ -50,107 +50,107 @@ function lexus(text, type) { let lunawave = ''; let lunajump = ''; switch (type) { - case 'hb': - text.color = 15704149; - text.fields[0].name = lunawave + ' `Bork! I am Luna! I will find friends for you, master!`'; - if (text.fields.length >= 9) { - text.fields[8].name = lunajump + ' Luna is still searching!'; - text.fields[8].value = text.fields[8].value - .replace( - 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', - 'Bork! I am still looking for friends. I will be back in' - ) - .replace('DONE', 'done') - .replace('`\n', '!`\n') - .replace('ANIMALS CAPTURED', 'friends made!'); - } - return text; - case 'progress': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, lunajump) + case 'hb': + text.color = 15704149; + text.fields[0].name = lunawave + ' `Bork! I am Luna! I will find friends for you, master!`'; + if (text.fields.length >= 9) { + text.fields[8].name = lunajump + ' Luna is still searching!'; + text.fields[8].value = text.fields[8].value .replace( 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', 'Bork! I am still looking for friends. I will be back in' ) - .replace('`\n', '!`\n') .replace('DONE', 'done') + .replace('`\n', '!`\n') .replace('ANIMALS CAPTURED', 'friends made!'); - return text; - case 'password': - text = text.replace(/<:[a-z]bot:[0-9]+>/gi, lunajump); - return text; - case 'spent': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, lunawave) - .replace('BEEP BOOP.', 'Arf!') - .replace('YOU SPENT', 'you spent') - .replace('I WILL BE BACK IN', 'I will be back in') - .replace('WITH', 'with') - .replace('ANIMALS', 'friends') - .replace('ESSENCE, AND', 'essence, and') - .replace('EXPERIENCE', 'experience!'); - return text; - case 'returned': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, lunawave) - .replace('BEEP BOOP. I AM BACK WITH', 'Woof! I am back with') - .replace('ANIMALS', 'friends') - .replace('ESSENCE, AND', 'essence, and') - .replace('EXPERIENCE', 'experience!'); - default: - return text; + } + return text; + case 'progress': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, lunajump) + .replace( + 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', + 'Bork! I am still looking for friends. I will be back in' + ) + .replace('`\n', '!`\n') + .replace('DONE', 'done') + .replace('ANIMALS CAPTURED', 'friends made!'); + return text; + case 'password': + text = text.replace(/<:[a-z]bot:[0-9]+>/gi, lunajump); + return text; + case 'spent': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, lunawave) + .replace('BEEP BOOP.', 'Arf!') + .replace('YOU SPENT', 'you spent') + .replace('I WILL BE BACK IN', 'I will be back in') + .replace('WITH', 'with') + .replace('ANIMALS', 'friends') + .replace('ESSENCE, AND', 'essence, and') + .replace('EXPERIENCE', 'experience!'); + return text; + case 'returned': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, lunawave) + .replace('BEEP BOOP. I AM BACK WITH', 'Woof! I am back with') + .replace('ANIMALS', 'friends') + .replace('ESSENCE, AND', 'essence, and') + .replace('EXPERIENCE', 'experience!'); + default: + return text; } } function shippig(text, type) { switch (type) { - case 'hb': - text.color = 6315775; - text.fields[0].name = + case 'hb': + text.color = 6315775; + text.fields[0].name = '<:pandabag:566537378303311872> `Hi! I am Roo! I will kidnap animals for you!`'; - if (text.fields.length >= 9) { - text.fields[8].name = ' Roo is still kidnapping!'; - text.fields[8].value = text.fields[8].value - .replace('BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', 'Roo will be back in') - .replace('DONE', 'done') - .replace('`\n', '!`\n') - .replace('ANIMALS CAPTURED', 'animals captured!'); - } - return text; - case 'progress': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, '') - .replace( - 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', - 'Roo is still kidnapping and will be back in' - ) - .replace('`\n', '!`\n') + if (text.fields.length >= 9) { + text.fields[8].name = ' Roo is still kidnapping!'; + text.fields[8].value = text.fields[8].value + .replace('BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', 'Roo will be back in') .replace('DONE', 'done') + .replace('`\n', '!`\n') .replace('ANIMALS CAPTURED', 'animals captured!'); - return text; - case 'password': - text = text.replace(/<:[a-z]bot:[0-9]+>/gi, '<:pandabag:566537378303311872>'); - return text; - case 'spent': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, '') - .replace('`BEEP BOOP. `', '') - .replace('YOU SPENT', 'you payed roo') - .replace('I WILL BE BACK IN', 'and will be back in') - .replace('WITH', 'with') - .replace('ANIMALS', 'animals') - .replace('ESSENCE, AND', 'essence, and') - .replace('EXPERIENCE', 'experience!'); - return text; - case 'returned': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, '<:pandabag:566537378303311872>') - .replace('BEEP BOOP. I AM BACK WITH', 'Roo kidnapped') - .replace('ANIMALS', 'animals') - .replace('ESSENCE, AND', 'essence, and') - .replace('EXPERIENCE', 'experience!'); - default: - return text; + } + return text; + case 'progress': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, '') + .replace( + 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', + 'Roo is still kidnapping and will be back in' + ) + .replace('`\n', '!`\n') + .replace('DONE', 'done') + .replace('ANIMALS CAPTURED', 'animals captured!'); + return text; + case 'password': + text = text.replace(/<:[a-z]bot:[0-9]+>/gi, '<:pandabag:566537378303311872>'); + return text; + case 'spent': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, '') + .replace('`BEEP BOOP. `', '') + .replace('YOU SPENT', 'you payed roo') + .replace('I WILL BE BACK IN', 'and will be back in') + .replace('WITH', 'with') + .replace('ANIMALS', 'animals') + .replace('ESSENCE, AND', 'essence, and') + .replace('EXPERIENCE', 'experience!'); + return text; + case 'returned': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, '<:pandabag:566537378303311872>') + .replace('BEEP BOOP. I AM BACK WITH', 'Roo kidnapped') + .replace('ANIMALS', 'animals') + .replace('ESSENCE, AND', 'essence, and') + .replace('EXPERIENCE', 'experience!'); + default: + return text; } } @@ -159,70 +159,70 @@ function spotifybot(text, type) { let swipeup = ''; let nowplaying = ''; switch (type) { - case 'hb': - text.color = 1947988; - delete text.author; - text.fields[0].name = + case 'hb': + text.color = 1947988; + delete text.author; + text.fields[0].name = nowplaying + ' ***Spotify*** *music stops playing...* OH NO! Need more Songs?\n' + spotify + ' `SPOTIFYBOT can add Songs to your Playlist.`'; - text.fields[1].value = text.fields[1].value.replace( - /(\r\n|\n|\r)/gm, - ' *Oh? You need better songs?*\n' - ); - text.fields[2].value = text.fields[2].value.replace( - /(\r\n|\n|\r)/gm, - ' *How about a longer Playlist?*\n' - ); - text.fields[3].value = text.fields[3].value.replace( - /(\r\n|\n|\r)/gm, - ' *Want Spotify Premium??*\n' - ); - text.fields[4].value = text.fields[4].value.replace( - /(\r\n|\n|\r)/gm, - ' *Hmm, what about a New Playlist?*\n' - ); - text.fields[5].value = text.fields[5].value.replace( - /(\r\n|\n|\r)/gm, - ' *Or do you want more Sponsors??*\n' - ); - if (text.fields.length >= 9) { - text.fields[8].name = spotify + ' SPOTIFYBOT is currently adding songs!'; - text.fields[8].value = text.fields[8].value - .replace( - 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', - 'Oops! Looks like the SPOTIFY Playlist is incomplete.\nNEW SONGS ADDED IN' - ) - .replace('ANIMALS CAPTURED', 'SONGS ADDED'); - } - return text; - case 'progress': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, spotify) + text.fields[1].value = text.fields[1].value.replace( + /(\r\n|\n|\r)/gm, + ' *Oh? You need better songs?*\n' + ); + text.fields[2].value = text.fields[2].value.replace( + /(\r\n|\n|\r)/gm, + ' *How about a longer Playlist?*\n' + ); + text.fields[3].value = text.fields[3].value.replace( + /(\r\n|\n|\r)/gm, + ' *Want Spotify Premium??*\n' + ); + text.fields[4].value = text.fields[4].value.replace( + /(\r\n|\n|\r)/gm, + ' *Hmm, what about a New Playlist?*\n' + ); + text.fields[5].value = text.fields[5].value.replace( + /(\r\n|\n|\r)/gm, + ' *Or do you want more Sponsors??*\n' + ); + if (text.fields.length >= 9) { + text.fields[8].name = spotify + ' SPOTIFYBOT is currently adding songs!'; + text.fields[8].value = text.fields[8].value .replace( 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', - 'Oops! Looks like the SPOTIFY Playlist is incomplete.`\n<:blank:427371936482328596> **|** `NEW SONGS ADDED IN' + 'Oops! Looks like the SPOTIFY Playlist is incomplete.\nNEW SONGS ADDED IN' ) - .replace('ANIMALS CAPTURED', 'SONGS ADDED!'); - return text; - case 'password': - text = text.replace(/<:[a-z]bot:[0-9]+>/gi, spotify); - return text; - case 'spent': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, spotify) - .replace('`BEEP BOOP. `', '') - .replace('cowoncy', 'cowoncy AND GOT Spotify Premium!') - .replace('ANIMALS', 'SONGS'); - return text; - case 'returned': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, spotify) - .replace('BEEP BOOP. I AM', 'SPOTIFY Playlist is ready! I AM') - .replace('ANIMALS', 'SONGS'); - default: - return text; + .replace('ANIMALS CAPTURED', 'SONGS ADDED'); + } + return text; + case 'progress': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, spotify) + .replace( + 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', + 'Oops! Looks like the SPOTIFY Playlist is incomplete.`\n<:blank:427371936482328596> **|** `NEW SONGS ADDED IN' + ) + .replace('ANIMALS CAPTURED', 'SONGS ADDED!'); + return text; + case 'password': + text = text.replace(/<:[a-z]bot:[0-9]+>/gi, spotify); + return text; + case 'spent': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, spotify) + .replace('`BEEP BOOP. `', '') + .replace('cowoncy', 'cowoncy AND GOT Spotify Premium!') + .replace('ANIMALS', 'SONGS'); + return text; + case 'returned': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, spotify) + .replace('BEEP BOOP. I AM', 'SPOTIFY Playlist is ready! I AM') + .replace('ANIMALS', 'SONGS'); + default: + return text; } } @@ -236,173 +236,173 @@ function elsa(text, type) { let trait5 = '<:trait5:665092925935452170>'; let trait6 = '<:trait6:665092925922738196>'; switch (type) { - case 'hb': - text.fields[1].name = text.fields[1].name - .replace('Efficiency', 'Knights in Attendance') - .replace('ā±', trait1); - text.fields[1].value = + case 'hb': + text.fields[1].name = text.fields[1].name + .replace('Efficiency', 'Knights in Attendance') + .replace('ā±', trait1); + text.fields[1].value = '*How many invitations are going out, my mistress?*\n' + text.fields[1].value; - text.fields[2].name = text.fields[2].name - .replace('Duration', 'Tournament Deadline') - .replace('ā³', trait2); - text.fields[2].value = + text.fields[2].name = text.fields[2].name + .replace('Duration', 'Tournament Deadline') + .replace('ā³', trait2); + text.fields[2].value = '*We need time to prepare for the tournament*\n' + text.fields[2].value; - text.fields[3].name = text.fields[3].name - .replace('Cost', 'Tournament Funds') - .replace('<:cowoncy:416043450337853441>', trait3); - text.fields[3].value = '*How much is my mistress willing to spare?*\n' + text.fields[3].value; + text.fields[3].name = text.fields[3].name + .replace('Cost', 'Tournament Funds') + .replace('<:cowoncy:416043450337853441>', trait3); + text.fields[3].value = '*How much is my mistress willing to spare?*\n' + text.fields[3].value; - text.fields[4].name = text.fields[4].name - .replace('Gain', 'Cosmos Power') - .replace('šŸ”§', trait4); - text.fields[4].value = + text.fields[4].name = text.fields[4].name + .replace('Gain', 'Cosmos Power') + .replace('šŸ”§', trait4); + text.fields[4].value = '*As your knights train, my mistress, the cosmos within them grows*\n' + text.fields[4].value; - text.fields[5].name = text.fields[5].name - .replace('Experience', 'Training for the Tournament') - .replace('āš”', trait5); - text.fields[5].value = + text.fields[5].name = text.fields[5].name + .replace('Experience', 'Training for the Tournament') + .replace('āš”', trait5); + text.fields[5].value = '*Even the strongest of knights must train so they are prepared to defend you*\n' + text.fields[5].value; - text.fields[7].name = text.fields[7].name - .replace('Animal Essence', 'The Cosmos Within You') - .replace('', trait6); - text.fields[7].value = text.fields[7].value - .replace('animals', 'knights') - .replace('essence', 'cosmos power') - .replace('xp', 'training xp') - .replace(/`/g, ''); + text.fields[7].name = text.fields[7].name + .replace('Animal Essence', 'The Cosmos Within You') + .replace('', trait6); + text.fields[7].value = text.fields[7].value + .replace('animals', 'knights') + .replace('essence', 'cosmos power') + .replace('xp', 'training xp') + .replace(/`/g, ''); - text.author.name = text.author.name.replace('HuntBot', 'Bronze Knight'); - text.description = shiryu1 + ' **`I will scour the cosmos for you, my mistress`**'; - text.color = 7319500; - if (text.fields.length >= 9) { - text.fields[8].name = shiryu1 + " I'm still gathering knights."; - text.fields[8].value = text.fields[8].value - .replace('BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', "I'll be back in") - .replace('DONE', 'done') - .replace('ANIMALS CAPTURED', 'knights found'); - } - text.fields.shift(); - return text; - case 'progress': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, shiryu1) - .replace( - 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', - "I'm still gathering knights. I'll be back in" - ) + text.author.name = text.author.name.replace('HuntBot', 'Bronze Knight'); + text.description = shiryu1 + ' **`I will scour the cosmos for you, my mistress`**'; + text.color = 7319500; + if (text.fields.length >= 9) { + text.fields[8].name = shiryu1 + ' I\'m still gathering knights.'; + text.fields[8].value = text.fields[8].value + .replace('BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', 'I\'ll be back in') .replace('DONE', 'done') .replace('ANIMALS CAPTURED', 'knights found'); - return text; - case 'password': - text = text.replace(/<:[a-z]bot:[0-9]+>/gi, shiryu1); - return text; - case 'spent': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, shiryu1) - .replace( - /BEEP BOOP\. `\*\*`[^`]+`\*\*`, YOU SPENT/gi, - 'As you wish, my mistress. You spent' - ) - .replace('I WILL BE BACK IN', 'I will return in') - .replace('WITH', 'with') - .replace('ANIMALS', 'animals') - .replace('ESSENCE, AND', 'essence, and') - .replace('EXPERIENCE', 'experience'); - return text; - case 'returned': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, shiryu2) - .replace('BEEP BOOP. I AM BACK WITH', 'Mistress, I have returned with') - .replace('ANIMALS', 'knights') - .replace('ESSENCE, AND', 'essence, and') - .replace('EXPERIENCE', 'experience'); - default: - return text; + } + text.fields.shift(); + return text; + case 'progress': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, shiryu1) + .replace( + 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', + 'I\'m still gathering knights. I\'ll be back in' + ) + .replace('DONE', 'done') + .replace('ANIMALS CAPTURED', 'knights found'); + return text; + case 'password': + text = text.replace(/<:[a-z]bot:[0-9]+>/gi, shiryu1); + return text; + case 'spent': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, shiryu1) + .replace( + /BEEP BOOP\. `\*\*`[^`]+`\*\*`, YOU SPENT/gi, + 'As you wish, my mistress. You spent' + ) + .replace('I WILL BE BACK IN', 'I will return in') + .replace('WITH', 'with') + .replace('ANIMALS', 'animals') + .replace('ESSENCE, AND', 'essence, and') + .replace('EXPERIENCE', 'experience'); + return text; + case 'returned': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, shiryu2) + .replace('BEEP BOOP. I AM BACK WITH', 'Mistress, I have returned with') + .replace('ANIMALS', 'knights') + .replace('ESSENCE, AND', 'essence, and') + .replace('EXPERIENCE', 'experience'); + default: + return text; } } function dalu(text, type) { let foxbot = '<:foxbot:653394747880374272>'; switch (type) { - case 'hb': - text.fields[0].name = + case 'hb': + text.fields[0].name = foxbot + ' `Hai Hai Master. I am KitsuneBot. Ready to find more food for you!`'; - text.fields[0].value = blank; - text.author.name = text.author.name.replace('HuntBot', 'KitsuneBot'); - text.color = 63996; - text.fields[1].name = text.fields[1].name.replace( - 'ā± Efficiency', - ' Found Enemies' - ); - text.fields[2].name = text.fields[2].name.replace( - 'ā³ Duration', - ' Hunt Time' - ); - text.fields[3].name = text.fields[3].name.replace( - '<:cowoncy:416043450337853441> Cost', - ' Endurance' - ); - text.fields[4].name = text.fields[4].name.replace( - 'šŸ”§ Gain', - ' Hunting Friends' - ); - text.fields[5].name = text.fields[5].name.replace( - 'āš” Experience', - ' Combat exp' - ); - text.fields[6].name = text.fields[6].name.replace( - 'šŸ“” Radar', - ' Rare Fox chance' - ); - text.fields[7].name = text.fields[7].name.replace( - ' Animal Essence', - ' Fox Helpers' - ); - if (text.fields.length >= 9) { - text.fields[8].name = foxbot + ' KitsuneBot will be back soon!'; - text.fields[8].value = text.fields[8].value.replace( - 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', - 'Estimated time to be back:' - ); - } - return text; - case 'progress': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, foxbot) - .replace('BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', 'Estimated time to be back:'); - return text; - case 'password': - text = text.split('\n')[0].replace(/<:[a-z]bot:[0-9]+>/gi, foxbot); - return text; - case 'spent': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, foxbot) - .replace('`BEEP BOOP. `', '') - .replace('YOU SPENT', 'you spent') - .replace('I WILL BE BACK IN', 'I will be back soon in') - .replace('WITH', 'with') - .replace('ANIMALS', 'animals') - .replace('ESSENCE', 'Hunting Friends') - .replace('AND', 'and') - .replace('EXPERIENCE', 'Combat exp'); - return text; - case 'returned': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, foxbot) - .replace('BEEP BOOP. I AM BACK WITH', 'I am back with') - .replace('ANIMALS', 'animals') - .replace('AND', 'and') - .replace('ESSENCE', 'Hunting Friends') - .replace('EXPERIENCE', 'Combat exp'); - return text; - default: - return text; + text.fields[0].value = blank; + text.author.name = text.author.name.replace('HuntBot', 'KitsuneBot'); + text.color = 63996; + text.fields[1].name = text.fields[1].name.replace( + 'ā± Efficiency', + ' Found Enemies' + ); + text.fields[2].name = text.fields[2].name.replace( + 'ā³ Duration', + ' Hunt Time' + ); + text.fields[3].name = text.fields[3].name.replace( + '<:cowoncy:416043450337853441> Cost', + ' Endurance' + ); + text.fields[4].name = text.fields[4].name.replace( + 'šŸ”§ Gain', + ' Hunting Friends' + ); + text.fields[5].name = text.fields[5].name.replace( + 'āš” Experience', + ' Combat exp' + ); + text.fields[6].name = text.fields[6].name.replace( + 'šŸ“” Radar', + ' Rare Fox chance' + ); + text.fields[7].name = text.fields[7].name.replace( + ' Animal Essence', + ' Fox Helpers' + ); + if (text.fields.length >= 9) { + text.fields[8].name = foxbot + ' KitsuneBot will be back soon!'; + text.fields[8].value = text.fields[8].value.replace( + 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', + 'Estimated time to be back:' + ); + } + return text; + case 'progress': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, foxbot) + .replace('BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', 'Estimated time to be back:'); + return text; + case 'password': + text = text.split('\n')[0].replace(/<:[a-z]bot:[0-9]+>/gi, foxbot); + return text; + case 'spent': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, foxbot) + .replace('`BEEP BOOP. `', '') + .replace('YOU SPENT', 'you spent') + .replace('I WILL BE BACK IN', 'I will be back soon in') + .replace('WITH', 'with') + .replace('ANIMALS', 'animals') + .replace('ESSENCE', 'Hunting Friends') + .replace('AND', 'and') + .replace('EXPERIENCE', 'Combat exp'); + return text; + case 'returned': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, foxbot) + .replace('BEEP BOOP. I AM BACK WITH', 'I am back with') + .replace('ANIMALS', 'animals') + .replace('AND', 'and') + .replace('ESSENCE', 'Hunting Friends') + .replace('EXPERIENCE', 'Combat exp'); + return text; + default: + return text; } } @@ -411,121 +411,121 @@ function rikudou(text, type) { let emoji2 = '<:emoji2:655689103316353034>'; let emoji3 = '<:emoji3:655689103555166208>'; switch (type) { - case 'hb': - text.fields[0].name = emoji1 + ' `Rikudou, are you ready to go on another mission?`'; - text.fields[0].value = emoji3 + ' The Mission Assignment Desk has a S rank mission for you!'; - text.color = 255; - text.fields[1].name = + case 'hb': + text.fields[0].name = emoji1 + ' `Rikudou, are you ready to go on another mission?`'; + text.fields[0].value = emoji3 + ' The Mission Assignment Desk has a S rank mission for you!'; + text.color = 255; + text.fields[1].name = text.fields[1].name.replace('Efficiency', 'Chakra Levels').slice(0, -1) + ' How are your chakra Levels doing?`'; - text.fields[2].name = + text.fields[2].name = text.fields[2].name.replace('Duration', 'Mission Length').slice(0, -1) + ' Phew! This is one tedious mission!`'; - text.fields[3].name = + text.fields[3].name = text.fields[3].name.replace('Cost', 'Ryō').slice(0, -1) + ' Do you have enough Ryō?`'; - text.fields[4].name = + text.fields[4].name = text.fields[4].name.slice(0, -1) + ' Want to become Hokage? Time to gain more Reputation!`'; - text.fields[5].name = + text.fields[5].name = text.fields[5].name.replace('Experience', 'Training').slice(0, -1) + ' Time for more training Shinobi!`'; - if (text.fields.length >= 9) { - text.fields[8].name = emoji2 + ' Rikudou is currently out on a mission!'; - text.fields[8].value = text.fields[8].value.replace( - 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', - 'Sorry, Rikudou is still out on a mission! You may request Rikudou for another mission at a later time. RIKUDOU WILL BE BACK IN' - ); - } - return text; - case 'progress': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, emoji2) - .replace( - 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', - 'Sorry, Rikudou is still out on a mission! You may request Rikudou for another mission at a later time.`\n' + + if (text.fields.length >= 9) { + text.fields[8].name = emoji2 + ' Rikudou is currently out on a mission!'; + text.fields[8].value = text.fields[8].value.replace( + 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', + 'Sorry, Rikudou is still out on a mission! You may request Rikudou for another mission at a later time. RIKUDOU WILL BE BACK IN' + ); + } + return text; + case 'progress': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, emoji2) + .replace( + 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', + 'Sorry, Rikudou is still out on a mission! You may request Rikudou for another mission at a later time.`\n' + blank + ' **|** `RIKUDOU WILL BE BACK IN' - ); - return text; - case 'password': - text = text.split('\n')[0].replace(/<:[a-z]bot:[0-9]+>/gi, emoji1); - return text; - case 'spent': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, emoji3) - .replace('`BEEP BOOP. `', '') - .replace('YOU SPENT', 'you spent') - .replace('I WILL BE BACK IN', 'I will be back in') - .replace('WITH', 'with') - .replace('ANIMALS', 'ninjas') - .replace('ESSENCE', 'essence') - .replace('AND', 'and') - .replace('EXPERIENCE', 'experience'); - return text; - case 'returned': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, emoji1) - .replace('BEEP BOOP. I AM BACK WITH', 'I am back with') - .replace('ANIMALS', 'ninjas') - .replace('AND', 'and') - .replace('ESSENCE', 'essence') - .replace('EXPERIENCE', 'experience'); - return text; - default: - return text; + ); + return text; + case 'password': + text = text.split('\n')[0].replace(/<:[a-z]bot:[0-9]+>/gi, emoji1); + return text; + case 'spent': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, emoji3) + .replace('`BEEP BOOP. `', '') + .replace('YOU SPENT', 'you spent') + .replace('I WILL BE BACK IN', 'I will be back in') + .replace('WITH', 'with') + .replace('ANIMALS', 'ninjas') + .replace('ESSENCE', 'essence') + .replace('AND', 'and') + .replace('EXPERIENCE', 'experience'); + return text; + case 'returned': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, emoji1) + .replace('BEEP BOOP. I AM BACK WITH', 'I am back with') + .replace('ANIMALS', 'ninjas') + .replace('AND', 'and') + .replace('ESSENCE', 'essence') + .replace('EXPERIENCE', 'experience'); + return text; + default: + return text; } } function kuma(text, type) { const bear = '<:kuma:674153774088060957>'; switch (type) { - case 'hb': - text.author.name = text.author.name.replace("'s HuntBot", "'s Cookie Collector"); - text.fields.shift(); - text.color = 13344488; - if (text.fields.length >= 7) { - text.fields[7].name = bear + " I'm still collecting minions master"; - text.fields[7].value = text.fields[7].value - .replace('BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', 'I will be back in') - .replace('DONE', 'done') - .replace('ANIMALS CAPTURED', 'minions recruited'); - } - return text; - case 'progress': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, bear) - .replace( - 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', - "I'm still collecting minions, master. I'll be back in" - ) + case 'hb': + text.author.name = text.author.name.replace('\'s HuntBot', '\'s Cookie Collector'); + text.fields.shift(); + text.color = 13344488; + if (text.fields.length >= 7) { + text.fields[7].name = bear + ' I\'m still collecting minions master'; + text.fields[7].value = text.fields[7].value + .replace('BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', 'I will be back in') .replace('DONE', 'done') .replace('ANIMALS CAPTURED', 'minions recruited'); - return text; - case 'password': - text = text.split('\n')[0].replace(/<:[a-z]bot:[0-9]+>/gi, bear); - return text; - case 'spent': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, bear) - .replace('`BEEP BOOP. `', '') - .replace('YOU SPENT', 'you spent') - .replace('I WILL BE BACK IN', 'I will be back in') - .replace('WITH', 'with') - .replace('ANIMALS', 'minions') - .replace('ESSENCE', 'essence') - .replace('AND', 'and') - .replace('EXPERIENCE', 'experience'); - return text; - case 'returned': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, bear) - .replace('BEEP BOOP. I AM BACK WITH', 'I am back with') - .replace('ANIMALS', 'minions') - .replace('AND', 'and') - .replace('ESSENCE', 'essence') - .replace('EXPERIENCE', 'experience'); - return text; - default: - return text; + } + return text; + case 'progress': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, bear) + .replace( + 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', + 'I\'m still collecting minions, master. I\'ll be back in' + ) + .replace('DONE', 'done') + .replace('ANIMALS CAPTURED', 'minions recruited'); + return text; + case 'password': + text = text.split('\n')[0].replace(/<:[a-z]bot:[0-9]+>/gi, bear); + return text; + case 'spent': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, bear) + .replace('`BEEP BOOP. `', '') + .replace('YOU SPENT', 'you spent') + .replace('I WILL BE BACK IN', 'I will be back in') + .replace('WITH', 'with') + .replace('ANIMALS', 'minions') + .replace('ESSENCE', 'essence') + .replace('AND', 'and') + .replace('EXPERIENCE', 'experience'); + return text; + case 'returned': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, bear) + .replace('BEEP BOOP. I AM BACK WITH', 'I am back with') + .replace('ANIMALS', 'minions') + .replace('AND', 'and') + .replace('ESSENCE', 'essence') + .replace('EXPERIENCE', 'experience'); + return text; + default: + return text; } } @@ -539,39 +539,39 @@ function spotifybot2(text, type) { const jump = ''; const angry = '<:birdangry:704924005546590268>'; switch (type) { - case 'hb': - text.author.name = 'OH NOO!! It looks like Ross has ran out of friend to play with!!'; - text.author.icon_url = 'https://cdn.discordapp.com/emojis/704924005546590268.png'; - text.color = 16312092; - text.fields[0].name = rainbow + '`ROSS can make friends and bring them to your zoo!`'; - text.fields[1].name = text.fields[1].name.replace('ā±', jump); - text.fields[1].value = text.fields[1].value.replace( - '\n', - '\n*Looks like Ross wants more friends!*\n' - ); - text.fields[2].name = text.fields[2].name.replace('ā³', pat); - text.fields[2].value = text.fields[2].value.replace( - '\n', - '\n*Maybe he needs more time to catch them?!*\n' - ); - text.fields[3].name = text.fields[3].name.replace('<:cowoncy:416043450337853441>', roll); - text.fields[3].value = text.fields[3].value.replace( - '\n', - '\n*Oh my.. Does he need more money?*\n' - ); - text.fields[4].name = text.fields[4].name.replace('šŸ”§', wave); - text.fields[4].value = text.fields[4].value.replace( - '\n', - '\n*Ross probably needs some help!*\n' - ); - text.fields[5].name = text.fields[5].name.replace('āš”', bongo); - text.fields[5].value = text.fields[5].value.replace( - '\n', - '\n*How about some friend making training!*\n' - ); - if (text.fields.length >= 9) { - text.fields[8].name = rainbow + 'ROSS is currently making new friends!'; - text.fields[8].value = + case 'hb': + text.author.name = 'OH NOO!! It looks like Ross has ran out of friend to play with!!'; + text.author.icon_url = 'https://cdn.discordapp.com/emojis/704924005546590268.png'; + text.color = 16312092; + text.fields[0].name = rainbow + '`ROSS can make friends and bring them to your zoo!`'; + text.fields[1].name = text.fields[1].name.replace('ā±', jump); + text.fields[1].value = text.fields[1].value.replace( + '\n', + '\n*Looks like Ross wants more friends!*\n' + ); + text.fields[2].name = text.fields[2].name.replace('ā³', pat); + text.fields[2].value = text.fields[2].value.replace( + '\n', + '\n*Maybe he needs more time to catch them?!*\n' + ); + text.fields[3].name = text.fields[3].name.replace('<:cowoncy:416043450337853441>', roll); + text.fields[3].value = text.fields[3].value.replace( + '\n', + '\n*Oh my.. Does he need more money?*\n' + ); + text.fields[4].name = text.fields[4].name.replace('šŸ”§', wave); + text.fields[4].value = text.fields[4].value.replace( + '\n', + '\n*Ross probably needs some help!*\n' + ); + text.fields[5].name = text.fields[5].name.replace('āš”', bongo); + text.fields[5].value = text.fields[5].value.replace( + '\n', + '\n*How about some friend making training!*\n' + ); + if (text.fields.length >= 9) { + text.fields[8].name = rainbow + 'ROSS is currently making new friends!'; + text.fields[8].value = text.fields[8].value .replace( 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', @@ -580,37 +580,37 @@ function spotifybot2(text, type) { .replace('ANIMALS CAPTURED', 'FRIENDS ADDED') + ' ' + woah; - } - return text; - case 'progress': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, rainbow) - .replace( - 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', - 'Awww.. ROSS isnā€™t done getting new friends yet!`\n' + + } + return text; + case 'progress': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, rainbow) + .replace( + 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', + 'Awww.. ROSS isnā€™t done getting new friends yet!`\n' + blank + ' **|** `NEW FRIENDS ADDED IN' - ) - .replace('ANIMALS CAPTURED', 'FRIENDS ADDED'); - return text; - case 'password': - text = text.split('\n')[0].replace(/<:[a-z]bot:[0-9]+>/gi, rainbow); - return text; - case 'spent': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, rainbow) - .replace('`BEEP BOOP. `', '') - .replace('cowoncy', 'cowoncy and youā€™re ready to find friends!') - .replace('ANIMALS', 'FRIENDS'); - return text; - case 'returned': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, rainbow) - .replace('BEEP BOOP. I AM BACK WITH', 'ROSS IS BACK WITH') - .replace('ANIMALS', 'FRIENDS'); - return text; - default: - return text; + ) + .replace('ANIMALS CAPTURED', 'FRIENDS ADDED'); + return text; + case 'password': + text = text.split('\n')[0].replace(/<:[a-z]bot:[0-9]+>/gi, rainbow); + return text; + case 'spent': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, rainbow) + .replace('`BEEP BOOP. `', '') + .replace('cowoncy', 'cowoncy and youā€™re ready to find friends!') + .replace('ANIMALS', 'FRIENDS'); + return text; + case 'returned': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, rainbow) + .replace('BEEP BOOP. I AM BACK WITH', 'ROSS IS BACK WITH') + .replace('ANIMALS', 'FRIENDS'); + return text; + default: + return text; } } @@ -624,197 +624,197 @@ function kirito(text, type) { const radar = '<:radar:737118875703050310>'; const essence = '<:ess:737118875400929374>'; switch (type) { - case 'hb': - text.author.name = 'Daaarling! I will hunt down Klaxosaurs for you with my Franxx!'; - text.author.icon_url = 'https://cdn.discordapp.com/emojis/580749862279184394.gif?v=1'; - text.fields[0].name = + case 'hb': + text.author.name = 'Daaarling! I will hunt down Klaxosaurs for you with my Franxx!'; + text.author.icon_url = 'https://cdn.discordapp.com/emojis/580749862279184394.gif?v=1'; + text.fields[0].name = 'Oh no! There seems to be Klaxosaurs heading to attack Plantation 13, shall I take them down?'; - text.color = 15450599; - text.fields[1].name = text.fields[1].name.replace( - 'ā± Efficiency', - efficiency + ' Klaxosaurs to Hunt' - ); - text.fields[1].value = + text.color = 15450599; + text.fields[1].name = text.fields[1].name.replace( + 'ā± Efficiency', + efficiency + ' Klaxosaurs to Hunt' + ); + text.fields[1].value = '*How many Klaxosaurs would you like me to hunt down?*\n' + text.fields[1].value; - text.fields[2].name = text.fields[2].name.replace( - 'ā³ Duration', - duration + ' Klaxosaur Hunting Duration' - ); - text.fields[2].value = + text.fields[2].name = text.fields[2].name.replace( + 'ā³ Duration', + duration + ' Klaxosaur Hunting Duration' + ); + text.fields[2].value = '*How long would you like to send me out for?*\n' + text.fields[2].value; - text.fields[3].name = text.fields[3].name.replace( - '<:cowoncy:416043450337853441> Cost', - cost + ' Hunting Funds' - ); - text.fields[3].value = + text.fields[3].name = text.fields[3].name.replace( + '<:cowoncy:416043450337853441> Cost', + cost + ' Hunting Funds' + ); + text.fields[3].value = '*How much will I be rewarded with for my hunting?*\n' + text.fields[3].value; - text.fields[4].name = text.fields[4].name.replace('šŸ”§ Gain', gain + ' Klaxosaur Points'); - text.fields[4].value = + text.fields[4].name = text.fields[4].name.replace('šŸ”§ Gain', gain + ' Klaxosaur Points'); + text.fields[4].value = '*How many Klaxosaur Points will I gather from hunting them down?*\n' + text.fields[4].value; - text.fields[5].name = text.fields[5].name.replace('āš” Experience', exp + ' Franxx XP'); - text.fields[5].value = '*How can I enhance my Franxx?*\n' + text.fields[5].value; - text.fields[6].name = text.fields[6].name.replace('šŸ“” Radar', radar + ' VIRM Elimination'); - text.fields[6].value = + text.fields[5].name = text.fields[5].name.replace('āš” Experience', exp + ' Franxx XP'); + text.fields[5].value = '*How can I enhance my Franxx?*\n' + text.fields[5].value; + text.fields[6].name = text.fields[6].name.replace('šŸ“” Radar', radar + ' VIRM Elimination'); + text.fields[6].value = '*Shall I eliminate VIRM today? They seem pretty tough..*\n' + text.fields[6].value; - text.fields[7].name = text.fields[7].name.replace( - ' Animal Essence', - essence + ' Franxx Points' - ); - if (text.fields.length >= 9) { - text.fields[8].name = bot + 'Zero Two is currently hunting!'; - text.fields[8].value = text.fields[8].value - .replace( - 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', - 'Daaarling! I am still hunting down Klaxosaurs. I will return in' - ) - .replace('DONE', 'done') - .replace('ANIMALS CAPTURED', 'Klaxosaurs Hunted'); - } - return text; - case 'progress': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, bot) + text.fields[7].name = text.fields[7].name.replace( + ' Animal Essence', + essence + ' Franxx Points' + ); + if (text.fields.length >= 9) { + text.fields[8].name = bot + 'Zero Two is currently hunting!'; + text.fields[8].value = text.fields[8].value .replace( 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', 'Daaarling! I am still hunting down Klaxosaurs. I will return in' ) .replace('DONE', 'done') .replace('ANIMALS CAPTURED', 'Klaxosaurs Hunted'); - return text; - case 'password': - text = text.split('\n')[0].replace(/<:[a-z]bot:[0-9]+>/gi, bot); - return text; - case 'spent': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, bot) - .replace('BEEP BOOP.', 'Daaarling!') - .replace('YOU SPENT', 'You spent') - .replace('I WILL BE BACK IN', 'I will return in') - .replace('WITH', 'with') - .replace('ANIMALS', 'Klaxosaurs') - .replace('ESSENCE, AND', 'Franxx Points, and') - .replace('EXPERIENCE', 'Franxx XP.'); - return text; - case 'returned': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, bot) - .replace('BEEP BOOP. I AM BACK WITH', 'Daaarling! I am back with') - .replace('ANIMALS', 'Klaxosaurs') - .replace('ESSENCE, AND', 'Franxx Points, and') - .replace('EXPERIENCE', 'Franxx XP'); - return text; - default: - return text; + } + return text; + case 'progress': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, bot) + .replace( + 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', + 'Daaarling! I am still hunting down Klaxosaurs. I will return in' + ) + .replace('DONE', 'done') + .replace('ANIMALS CAPTURED', 'Klaxosaurs Hunted'); + return text; + case 'password': + text = text.split('\n')[0].replace(/<:[a-z]bot:[0-9]+>/gi, bot); + return text; + case 'spent': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, bot) + .replace('BEEP BOOP.', 'Daaarling!') + .replace('YOU SPENT', 'You spent') + .replace('I WILL BE BACK IN', 'I will return in') + .replace('WITH', 'with') + .replace('ANIMALS', 'Klaxosaurs') + .replace('ESSENCE, AND', 'Franxx Points, and') + .replace('EXPERIENCE', 'Franxx XP.'); + return text; + case 'returned': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, bot) + .replace('BEEP BOOP. I AM BACK WITH', 'Daaarling! I am back with') + .replace('ANIMALS', 'Klaxosaurs') + .replace('ESSENCE, AND', 'Franxx Points, and') + .replace('EXPERIENCE', 'Franxx XP'); + return text; + default: + return text; } } function xmelanie(text, type) { switch (type) { - case 'hb': - text.color = 4584447; - text.fields[0].name = + case 'hb': + text.color = 4584447; + text.fields[0].name = '<:mickey:747723512768102453> Day of Disney '; - text.fields[1].name = text.fields[1].name.replace( - 'ā± Efficiency', - ' Fastpass ' - ); - text.fields[2].name = text.fields[2].name.replace( - 'ā³ Duration', - ' Park hours <:thumbsup:747725838459338833>' - ); - text.fields[3].name = text.fields[3].name.replace( - '<:cowoncy:416043450337853441> Cost', - '<:disneydollars:747725838417526807> Disney Dollars <:disneydollars:747725838417526807>' - ); - text.fields[4].name = text.fields[4].name.replace( - 'šŸ”§ Gain', - '<:elpdrum:747725838924906576> Memories ' - ); - text.fields[5].name = text.fields[5].name.replace( - 'āš” Experience', - ' Where dreams come true ' - ); - text.fields[6].name = text.fields[6].name.replace( - 'šŸ“” Radar', - ' Pixy Dust ' - ); - text.fields[7].name = text.fields[7].name.replace( - ' Animal Essence', - ' Magic of Disney ' - ); - return text; - default: - return text; + text.fields[1].name = text.fields[1].name.replace( + 'ā± Efficiency', + ' Fastpass ' + ); + text.fields[2].name = text.fields[2].name.replace( + 'ā³ Duration', + ' Park hours <:thumbsup:747725838459338833>' + ); + text.fields[3].name = text.fields[3].name.replace( + '<:cowoncy:416043450337853441> Cost', + '<:disneydollars:747725838417526807> Disney Dollars <:disneydollars:747725838417526807>' + ); + text.fields[4].name = text.fields[4].name.replace( + 'šŸ”§ Gain', + '<:elpdrum:747725838924906576> Memories ' + ); + text.fields[5].name = text.fields[5].name.replace( + 'āš” Experience', + ' Where dreams come true ' + ); + text.fields[6].name = text.fields[6].name.replace( + 'šŸ“” Radar', + ' Pixy Dust ' + ); + text.fields[7].name = text.fields[7].name.replace( + ' Animal Essence', + ' Magic of Disney ' + ); + return text; + default: + return text; } } function arichy(text, type) { switch (type) { - case 'hb': - text.author.name = "Arichyā€™s Wizard's Sanctum"; - text.fields[0].name = + case 'hb': + text.author.name = 'Arichyā€™s Wizard\'s Sanctum'; + text.fields[0].name = ' Welcome to our Sanctuary of Magic. Iā€™m Ari, the Archmage of this Kingdom.'; - text.fields[0].value = + text.fields[0].value = 'There are some tips which will help you feel like home.' + '\nIn our Kingdom we have Well of Power - you can use it for increasing your power and meet more allies.' + '\nTo upgrade one of traits, use the spell `owo upgrade {trait}`.' + '\nTo obtain more power, use `owo sacrifice {animal} {count}`.' + - "\nDon't worry, it will not harm any of our friends - you can visit them anytime in their Villages."; - text.fields[1].name = text.fields[1].name.replace( - 'ā± Efficiency', - '<:7_:839769858958032936> Thermal Void' - ); - text.fields[2].name = text.fields[2].name.replace( - 'ā³ Duration', - '<:6_:839769859130785822> Time Warp' - ); - text.fields[3].name = text.fields[3].name.replace( - '<:cowoncy:416043450337853441> Cost', - '<:5_:839769858987261972> Mana' - ); - text.fields[4].name = text.fields[4].name.replace( - 'šŸ”§ Gain', - '<:4_:839769858841640981> Arcane Power' - ); - text.fields[5].name = text.fields[5].name.replace( - 'āš” Experience', - '<:3_:839769858975334400> Intellect' - ); - text.fields[6].name = text.fields[6].name.replace( - 'šŸ“” Radar', - '<:2_:839769858932736020> Supernova' - ); - text.fields[7].name = text.fields[7].name.replace( - ' Animal Essence', - ' Well of Power' - ); - if (text.fields.length >= 9) { - text.fields[8].name = ' The Archmage is currently on a mission!'; - text.fields[8].value = text.fields[8].value - .replace( - 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', - 'If you have something urgent, please leave a message. I will be back in' - ) - .replace('DONE', 'of dungeon passed') - .replace('ANIMALS CAPTURED', 'Animals joined Kingdom'); - } - text.thumbnail = { - url: 'https://i.imgur.com/bWhw90x.gif', - }; - return text; - case 'progress': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, '') + '\nDon\'t worry, it will not harm any of our friends - you can visit them anytime in their Villages.'; + text.fields[1].name = text.fields[1].name.replace( + 'ā± Efficiency', + '<:7_:839769858958032936> Thermal Void' + ); + text.fields[2].name = text.fields[2].name.replace( + 'ā³ Duration', + '<:6_:839769859130785822> Time Warp' + ); + text.fields[3].name = text.fields[3].name.replace( + '<:cowoncy:416043450337853441> Cost', + '<:5_:839769858987261972> Mana' + ); + text.fields[4].name = text.fields[4].name.replace( + 'šŸ”§ Gain', + '<:4_:839769858841640981> Arcane Power' + ); + text.fields[5].name = text.fields[5].name.replace( + 'āš” Experience', + '<:3_:839769858975334400> Intellect' + ); + text.fields[6].name = text.fields[6].name.replace( + 'šŸ“” Radar', + '<:2_:839769858932736020> Supernova' + ); + text.fields[7].name = text.fields[7].name.replace( + ' Animal Essence', + ' Well of Power' + ); + if (text.fields.length >= 9) { + text.fields[8].name = ' The Archmage is currently on a mission!'; + text.fields[8].value = text.fields[8].value .replace( 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', 'If you have something urgent, please leave a message. I will be back in' ) .replace('DONE', 'of dungeon passed') .replace('ANIMALS CAPTURED', 'Animals joined Kingdom'); - return text; - default: - return text; + } + text.thumbnail = { + url: 'https://i.imgur.com/bWhw90x.gif', + }; + return text; + case 'progress': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, '') + .replace( + 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', + 'If you have something urgent, please leave a message. I will be back in' + ) + .replace('DONE', 'of dungeon passed') + .replace('ANIMALS CAPTURED', 'Animals joined Kingdom'); + return text; + default: + return text; } } @@ -823,42 +823,28 @@ function capz(text, type) { const emoji2 = '<:emoji2:1016115444811321354>'; const emoji3 = '<:emoji3:1016115442189860935>'; switch (type) { - case 'hb': - text.color = 10850303; - text.title = + case 'hb': + text.color = 10850303; + text.title = '<:hb:993769506184900659> `Howdy! I am ready to search for pets to make new friends!`'; - text.fields[1].name = text.fields[1].name.replace( - efficiency, - '<:efficiency:993769502095454229> ' - ); - text.fields[2].name = text.fields[2].name.replace( - duration, - '<:duration:993769501122379827> ' - ); - text.fields[3].name = text.fields[3].name.replace(cowoncy, '<:cost:993769499973140552>'); - text.fields[4].name = text.fields[4].name.replace(gain, '<:gain:993769505169870870> '); - text.fields[5].name = text.fields[5].name.replace(experience, '<:exp:993769504360378413> '); - text.fields[6].name = text.fields[6].name.replace(radar, '<:radar:1016113320127901746>'); - text.fields[7].name = text.fields[7].name - .replace(essence, '<:essence:993769503349542922>') - .replace('Animal', 'Empowered'); - if (text.fields.length >= 9) { - text.fields[8].name = '<:searching:993769508693090315> I am still searching for pets!'; - text.fields[8].value = text.fields[8].value - .replace( - 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', - 'Capz, I am still searching for pets! I will return in' - ) - .replace('`\n', '.`\n') - .replace('DONE', 'done') - .replace('ANIMALS CAPTURED', 'pets found!'); - } - text.fields.shift(); - text.author.name = text.author.name.replace('HuntBot', 'Huntbot'); - return text; - case 'progress': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, '<:searching:993769508693090315>') + text.fields[1].name = text.fields[1].name.replace( + efficiency, + '<:efficiency:993769502095454229> ' + ); + text.fields[2].name = text.fields[2].name.replace( + duration, + '<:duration:993769501122379827> ' + ); + text.fields[3].name = text.fields[3].name.replace(cowoncy, '<:cost:993769499973140552>'); + text.fields[4].name = text.fields[4].name.replace(gain, '<:gain:993769505169870870> '); + text.fields[5].name = text.fields[5].name.replace(experience, '<:exp:993769504360378413> '); + text.fields[6].name = text.fields[6].name.replace(radar, '<:radar:1016113320127901746>'); + text.fields[7].name = text.fields[7].name + .replace(essence, '<:essence:993769503349542922>') + .replace('Animal', 'Empowered'); + if (text.fields.length >= 9) { + text.fields[8].name = '<:searching:993769508693090315> I am still searching for pets!'; + text.fields[8].value = text.fields[8].value .replace( 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', 'Capz, I am still searching for pets! I will return in' @@ -866,29 +852,43 @@ function capz(text, type) { .replace('`\n', '.`\n') .replace('DONE', 'done') .replace('ANIMALS CAPTURED', 'pets found!'); - return text; - case 'returned': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, emoji1) - .replace('BEEP BOOP. I AM BACK WITH', 'Capz, I have returned with') - .replace('ANIMALS', 'pets') - .replace('ESSENCE, AND', 'essence, and') - .replace('EXPERIENCE', 'experience.'); - return text; - case 'password': - text = text.replace(/<:[a-z]bot:[0-9]+>/gi, emoji2); - return text; - case 'spent': - text = text - .replace(/<:[a-z]bot:[0-9]+>/gi, emoji3) - .replace(/BEEP BOOP\. `\*\*`[^`]+`\*\*`, YOU SPENT/gi, 'Capz, you spent') - .replace('I WILL BE BACK IN', 'I will return in') - .replace('WITH', 'with') - .replace('ANIMALS', 'pets') - .replace('ESSENCE, AND', 'essence, and') - .replace('EXPERIENCE', 'experience.'); - return text; - default: - return text; + } + text.fields.shift(); + text.author.name = text.author.name.replace('HuntBot', 'Huntbot'); + return text; + case 'progress': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, '<:searching:993769508693090315>') + .replace( + 'BEEP BOOP. I AM STILL HUNTING. I WILL BE BACK IN', + 'Capz, I am still searching for pets! I will return in' + ) + .replace('`\n', '.`\n') + .replace('DONE', 'done') + .replace('ANIMALS CAPTURED', 'pets found!'); + return text; + case 'returned': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, emoji1) + .replace('BEEP BOOP. I AM BACK WITH', 'Capz, I have returned with') + .replace('ANIMALS', 'pets') + .replace('ESSENCE, AND', 'essence, and') + .replace('EXPERIENCE', 'experience.'); + return text; + case 'password': + text = text.replace(/<:[a-z]bot:[0-9]+>/gi, emoji2); + return text; + case 'spent': + text = text + .replace(/<:[a-z]bot:[0-9]+>/gi, emoji3) + .replace(/BEEP BOOP\. `\*\*`[^`]+`\*\*`, YOU SPENT/gi, 'Capz, you spent') + .replace('I WILL BE BACK IN', 'I will return in') + .replace('WITH', 'with') + .replace('ANIMALS', 'pets') + .replace('ESSENCE, AND', 'essence, and') + .replace('EXPERIENCE', 'experience.'); + return text; + default: + return text; } } diff --git a/src/commands/commandList/patreon/alterInventory.js b/src/commands/commandList/patreon/alterInventory.js index 13189fa16..1e4576983 100644 --- a/src/commands/commandList/patreon/alterInventory.js +++ b/src/commands/commandList/patreon/alterInventory.js @@ -19,20 +19,20 @@ for (let i in gems) { exports.alter = function (p, text, info) { switch (p.msg.author.id) { - case '658299153042112512': - return grace(text); - case '456598711590715403': - return lexx(p, info); - case '427296171883626496': - return lIlIIIll(p, info); - case '460987842961866762': - return estee(p, info); - case '709396638661083146': - return rosie(p, info); - case '683742950668501001': - return dadada(p, info); - default: - return text; + case '658299153042112512': + return grace(text); + case '456598711590715403': + return lexx(p, info); + case '427296171883626496': + return lIlIIIll(p, info); + case '460987842961866762': + return estee(p, info); + case '709396638661083146': + return rosie(p, info); + case '683742950668501001': + return dadada(p, info); + default: + return text; } }; @@ -71,7 +71,7 @@ function grace(text) { text = text.replace(emojis[i], newEmojis[i]); } text = text.split('\n'); - text[0] = "š”Šš”Æš”žš” š”¢'š”° š”‡š”¦š”¤š”¦ š”–š”²š”­š”­š”©š”¦š”¢š”°"; + text[0] = 'š”Šš”Æš”žš” š”¢\'š”° š”‡š”¦š”¤š”¦ š”–š”²š”­š”­š”©š”¦š”¢š”°'; text = text.join('\n'); return text; @@ -100,7 +100,7 @@ function estee(p, info) { const embed = { color: p.config.embed_color, author: { - name: "ź§ā€¢āŠ¹Ł­š™“ššœššššŽššŽ'ššœ šš‚ššŽššŒšš›ššŽšš ššƒšš›ššŽššŠššœššžšš›ššŽššœŁ­āŠ¹ā€¢ź§‚", + name: 'ź§ā€¢āŠ¹Ł­š™“ššœššššŽššŽ\'ššœ šš‚ššŽššŒšš›ššŽšš ššƒšš›ššŽššŠššœššžšš›ššŽššœŁ­āŠ¹ā€¢ź§‚', }, image: { url: 'https://i.imgur.com/eK7F8Gv.gif', diff --git a/src/commands/commandList/patreon/alterMarry.js b/src/commands/commandList/patreon/alterMarry.js index b23be9c83..3ea30b4f2 100644 --- a/src/commands/commandList/patreon/alterMarry.js +++ b/src/commands/commandList/patreon/alterMarry.js @@ -9,10 +9,10 @@ const blank = '<:blank:427371936482328596>'; exports.alter = function (p, embed, opt) { switch (p.msg.author.id) { - case '460987842961866762': - return estee(p, embed, opt); - default: - return embed; + case '460987842961866762': + return estee(p, embed, opt); + default: + return embed; } }; diff --git a/src/commands/commandList/patreon/alterOwo.js b/src/commands/commandList/patreon/alterOwo.js index dd9557239..c73190f2c 100644 --- a/src/commands/commandList/patreon/alterOwo.js +++ b/src/commands/commandList/patreon/alterOwo.js @@ -9,9 +9,9 @@ const blank = '<:blank:427371936482328596>'; exports.alter = function (id, text, info) { switch (id) { - case '456598711590715403': - return lexx(text, info); - break; + case '456598711590715403': + return lexx(text, info); + break; } return text; }; diff --git a/src/commands/commandList/patreon/alterPray.js b/src/commands/commandList/patreon/alterPray.js index adb6a3d43..9237478fd 100644 --- a/src/commands/commandList/patreon/alterPray.js +++ b/src/commands/commandList/patreon/alterPray.js @@ -11,22 +11,22 @@ const curseEmoji = 'šŸ‘»'; exports.alter = function (id, text, info) { switch (id) { - case '192692796841263104': - return dalu(text, info); - case '456598711590715403': - return lexx(text, info); - case '417350932662059009': - return sky(text, info); - case '707939636835516457': - return dire(text, info); - case '856036736970260490': - return lapiis(text, info); - case '460987842961866762': - return estee(text, info); - case '683742950668501001': - return dadada(text, info); - default: - return text; + case '192692796841263104': + return dalu(text, info); + case '456598711590715403': + return lexx(text, info); + case '417350932662059009': + return sky(text, info); + case '707939636835516457': + return dire(text, info); + case '856036736970260490': + return lapiis(text, info); + case '460987842961866762': + return estee(text, info); + case '683742950668501001': + return dadada(text, info); + default: + return text; } }; diff --git a/src/commands/commandList/patreon/alterSlot.js b/src/commands/commandList/patreon/alterSlot.js index ae22882f1..70467ba20 100644 --- a/src/commands/commandList/patreon/alterSlot.js +++ b/src/commands/commandList/patreon/alterSlot.js @@ -16,10 +16,10 @@ const moving = ''; exports.alter = function (id, text) { switch (id) { - case '220934553861226498': - return geist(text); - default: - return text; + case '220934553861226498': + return geist(text); + default: + return text; } }; @@ -48,7 +48,7 @@ function geist(text) { text = text.replace(line1[0], ''); text += '\n' + line1[0].trim(); } - let line2 = text.match(/ and won <:cowoncy:416043450337853441> [0-9,]+/gi); + let line2 = text.match(/ {2}and won <:cowoncy:416043450337853441> [0-9,]+/gi); if (line2) { text = text.replace(line2[0], ''); text += '\n' + line2[0].trim(); diff --git a/src/commands/commandList/patreon/alterUpgrade.js b/src/commands/commandList/patreon/alterUpgrade.js index 5de92ca0b..fa14c42fb 100644 --- a/src/commands/commandList/patreon/alterUpgrade.js +++ b/src/commands/commandList/patreon/alterUpgrade.js @@ -9,10 +9,10 @@ const botEmoji = 'šŸ› '; exports.alter = function (id, text) { switch (id) { - case '255750356519223297': - return spotifybot(text); - default: - return text; + case '255750356519223297': + return spotifybot(text); + default: + return text; } }; diff --git a/src/commands/commandList/patreon/alterWeapon.js b/src/commands/commandList/patreon/alterWeapon.js index ba0d7b95f..ed0668b42 100644 --- a/src/commands/commandList/patreon/alterWeapon.js +++ b/src/commands/commandList/patreon/alterWeapon.js @@ -7,22 +7,22 @@ exports.alter = function (id, text, opt) { switch (id) { - case '408371860246364183': - return lanre(text, opt); - case '565212326291308545': - return eliza(text, opt); - case '413344554247258112': - return ameodssbxiw(text, opt); - case '427296171883626496': - return lIlIIIll(text, opt); - default: - return text; + case '408371860246364183': + return lanre(text, opt); + case '565212326291308545': + return eliza(text, opt); + case '413344554247258112': + return ameodssbxiw(text, opt); + case '427296171883626496': + return lIlIIIll(text, opt); + default: + return text; } }; function lanre(text, opt) { text.description = opt.desc; - text.author.name = "Senko's Stronghold"; + text.author.name = 'Senko\'s Stronghold'; text.image = { url: 'https://cdn.discordapp.com/attachments/757362062421655603/788818074706247690/image0.gif', }; diff --git a/src/commands/commandList/patreon/alterWeaponDisplay.js b/src/commands/commandList/patreon/alterWeaponDisplay.js index 7b0ac224c..ddcbdcae0 100644 --- a/src/commands/commandList/patreon/alterWeaponDisplay.js +++ b/src/commands/commandList/patreon/alterWeaponDisplay.js @@ -7,16 +7,16 @@ exports.alter = function (id, text, opt) { switch (id) { - case '459469724091154433': - return quincey(text, opt); - default: - return text; + case '459469724091154433': + return quincey(text, opt); + default: + return text; } }; function quincey(text, opt) { delete text.author.icon_url; - text.author.name = "Quincey's " + opt.weapon.name; + text.author.name = 'Quincey\'s ' + opt.weapon.name; let description = text.description.split('\n'); description[1] = '**Owner:** Quincey ' + description[2]; description.splice(3, 1); @@ -24,48 +24,48 @@ function quincey(text, opt) { text.description = description.join('\n'); switch (opt.weapon.rank?.name) { - case 'Common': - text.image = { - url: 'https://media.discordapp.net/attachments/606042546744852500/967107847592747108/ezgif-1-c261544e0a.gif', - }; - text.color = 13391445; - break; - case 'Uncommon': - text.image = { - url: 'https://media.discordapp.net/attachments/606042546744852500/967108215689084958/ezgif-1-db8ec58a09.gif ', - }; - text.color = 3978440; - break; - case 'Rare': - text.image = { - url: 'https://media.discordapp.net/attachments/606042546744852500/967108216607604746/ezgif-1-431e2a63a0.gif', - }; - text.color = 16107621; - break; - case 'Epic': - text.image = { - url: 'https://media.discordapp.net/attachments/606042546744852500/967108218029506632/ezgif-1-ecf20f91c3.gif', - }; - text.color = 4611818; - break; - case 'Mythical': - text.image = { - url: 'https://media.discordapp.net/attachments/606042546744852500/967108218985779210/ezgif-1-d7cad771e7.gif', - }; - text.color = 10445814; - break; - case 'Legendary': - text.image = { - url: 'https://media.discordapp.net/attachments/606042546744852500/967108219610726441/ezgif-1-09cded431c.gif', - }; - text.color = 16577355; - break; - case 'Fabled': - text.image = { - url: 'https://media.discordapp.net/attachments/606042546744852500/967108220227297380/ezgif-1-465fb20b21.gif', - }; - text.color = 10280698; - break; + case 'Common': + text.image = { + url: 'https://media.discordapp.net/attachments/606042546744852500/967107847592747108/ezgif-1-c261544e0a.gif', + }; + text.color = 13391445; + break; + case 'Uncommon': + text.image = { + url: 'https://media.discordapp.net/attachments/606042546744852500/967108215689084958/ezgif-1-db8ec58a09.gif ', + }; + text.color = 3978440; + break; + case 'Rare': + text.image = { + url: 'https://media.discordapp.net/attachments/606042546744852500/967108216607604746/ezgif-1-431e2a63a0.gif', + }; + text.color = 16107621; + break; + case 'Epic': + text.image = { + url: 'https://media.discordapp.net/attachments/606042546744852500/967108218029506632/ezgif-1-ecf20f91c3.gif', + }; + text.color = 4611818; + break; + case 'Mythical': + text.image = { + url: 'https://media.discordapp.net/attachments/606042546744852500/967108218985779210/ezgif-1-d7cad771e7.gif', + }; + text.color = 10445814; + break; + case 'Legendary': + text.image = { + url: 'https://media.discordapp.net/attachments/606042546744852500/967108219610726441/ezgif-1-09cded431c.gif', + }; + text.color = 16577355; + break; + case 'Fabled': + text.image = { + url: 'https://media.discordapp.net/attachments/606042546744852500/967108220227297380/ezgif-1-465fb20b21.gif', + }; + text.color = 10280698; + break; } return text; diff --git a/src/commands/commandList/patreon/alterZoo.js b/src/commands/commandList/patreon/alterZoo.js index 6ed96eb4a..a7b2e982e 100644 --- a/src/commands/commandList/patreon/alterZoo.js +++ b/src/commands/commandList/patreon/alterZoo.js @@ -24,26 +24,26 @@ const ranks = { exports.alter = function (id, text, opt) { switch (id) { - case '250383887312748545': - return elsa(text); - case '192692796841263104': - return dalu(text); - case '176046069954641921': - return crown(text); - case '658299153042112512': - return heysay(text); - case '575555630312456193': - return xmelanie(text); - case '343094664414363658': - return tiggy(text); - case '714215538821431398': - return ivy(text); - case '427296171883626496': - return lIlIIIll(text, opt); - case '460987842961866762': - return estee(text, opt); - default: - return text; + case '250383887312748545': + return elsa(text); + case '192692796841263104': + return dalu(text); + case '176046069954641921': + return crown(text); + case '658299153042112512': + return heysay(text); + case '575555630312456193': + return xmelanie(text); + case '343094664414363658': + return tiggy(text); + case '714215538821431398': + return ivy(text); + case '427296171883626496': + return lIlIIIll(text, opt); + case '460987842961866762': + return estee(text, opt); + default: + return text; } }; @@ -74,14 +74,14 @@ function elsa(text) { .replace('Zoo Points', '<:frozentitlefabled:653376194602991645>ilm Collection Points') .split('\n'); text[0] = - "<:elsasnowflake1:653376194414379029><:elsasnowflake2:653384773234065438> <:frozenN:653376194854518794>**erdy**<:frozenE:653376194594734117>**lsa's zoo!** <:elsasnowflake2:653384773234065438><:elsasnowflake1:653376194414379029>"; + '<:elsasnowflake1:653376194414379029><:elsasnowflake2:653384773234065438> <:frozenN:653376194854518794>**erdy**<:frozenE:653376194594734117>**lsa\'s zoo!** <:elsasnowflake2:653384773234065438><:elsasnowflake1:653376194414379029>'; return text.join('\n'); } function dalu(text) { text = text.replace('Zoo Points', 'Fox Friends').split('\n'); - text[0] = "**Dalu's Kitsune Home**"; + text[0] = '**Dalu\'s Kitsune Home**'; text.pop(); return text.join('\n'); } @@ -104,7 +104,7 @@ function crown(text) { }; text = replaceRanks(text, newRanks).split('\n'); text[0] = - " <:c:663634207175868425> <:r:663634208731824138> <:o:663634208400474113> <:w:663634208530366464> <:n_:663634208115392518> 's zoo! "; + ' <:c:663634207175868425> <:r:663634208731824138> <:o:663634208400474113> <:w:663634208530366464> <:n_:663634208115392518> \'s zoo! '; return text.join('\n'); } @@ -242,7 +242,7 @@ function estee(text, opt) { }; text = replaceRanks(text, newRanks).split('\n'); - text[0] = `ź§ą¼ŗ š“”š“¼š“½š“®š“®'š“¼ š“’š“®š“¶š“®š“½š“®š“»š”‚ ą¼»ź§‚`; + text[0] = 'ź§ą¼ŗ š“”š“¼š“½š“®š“®\'š“¼ š“’š“®š“¶š“®š“½š“®š“»š”‚ ą¼»ź§‚'; return text.join('\n'); } diff --git a/src/commands/commandList/patreon/angel.js b/src/commands/commandList/patreon/angel.js index adf0149ef..e7c93eec5 100644 --- a/src/commands/commandList/patreon/angel.js +++ b/src/commands/commandList/patreon/angel.js @@ -15,7 +15,7 @@ const ownerOnly = true; const giveAmount = 1; const desc = 'A pair of Angel wings to take you higher than the sky a placed called Heaven.'; const displayMsg = `, you currently have ?count? ${emoji} Angel Wing?plural?!`; -const brokeMsg = `, you do not have any Angel Wings to give! >:c`; +const brokeMsg = ', you do not have any Angel Wings to give! >:c'; const giveMsg = `, you have been given 1 ${emoji} Fly to the Heavens. `; diff --git a/src/commands/commandList/patreon/babyyoda.js b/src/commands/commandList/patreon/babyyoda.js index 17ddea98c..be6d0bfb2 100644 --- a/src/commands/commandList/patreon/babyyoda.js +++ b/src/commands/commandList/patreon/babyyoda.js @@ -63,7 +63,7 @@ async function giveBall(p) { let last = await p.redis.hget('cd_' + p.msg.author.id, cdBall); last = last ? new Date(last) : new Date(); if (new Date() - last < 345600000) { - return p.errorMsg(", Baby Yoda doesn't need a silver ball"); + return p.errorMsg(', Baby Yoda doesn\'t need a silver ball'); } let result = await p.redis.hincrby('data_' + p.msg.author.id, ball, -1); @@ -91,7 +91,7 @@ async function feed(p) { const afterMid = dateUtil.afterMidnight(lasttime); let streak = 1; - let title = p.msg.author.username + "'s Baby Yoda"; + let title = p.msg.author.username + '\'s Baby Yoda'; if (afterMid.after) { await p.redis.hset('cd_' + p.msg.author.id, cdFeed, afterMid.now); await p.redis.expire('cd_' + p.msg.author.id); @@ -127,7 +127,7 @@ async function display(p, title, gif = gif2) { const lasttime = await p.redis.hget('cd_' + p.msg.author.id, cdFeed); const afterMid = dateUtil.afterMidnight(lasttime); const streak = (await p.redis.hget('data_' + p.msg.author.id, table)) || 0; - if (!title) title = p.msg.author.username + "'s Baby Yoda"; + if (!title) title = p.msg.author.username + '\'s Baby Yoda'; const embed = { author: { diff --git a/src/commands/commandList/patreon/boba.js b/src/commands/commandList/patreon/boba.js index f4d1e01c4..9c35be7a9 100644 --- a/src/commands/commandList/patreon/boba.js +++ b/src/commands/commandList/patreon/boba.js @@ -14,8 +14,8 @@ const ownerOnly = true; const giveAmount = 1; const desc = 'This custom item can only be given by the owner of this command.'; const displayMsg = `, you currently have ?count? ${emoji} boba?plural?!`; -const brokeMsg = `, you do not have any bobas to give! >:c`; -const giveMsg = `, youā€™ve received 1 *delicious* boba. youā€™re the bubble to my tea.`; +const brokeMsg = ', you do not have any bobas to give! >:c'; +const giveMsg = ', youā€™ve received 1 *delicious* boba. youā€™re the bubble to my tea.'; let ownersString = `?${owners[owners.length - 1]}?`; if (owners.slice(0, -1).length) { diff --git a/src/commands/commandList/patreon/bonk.js b/src/commands/commandList/patreon/bonk.js index 1daa87a91..7488ee53f 100644 --- a/src/commands/commandList/patreon/bonk.js +++ b/src/commands/commandList/patreon/bonk.js @@ -42,11 +42,11 @@ module.exports = new CommandInterface({ } let target = p.getMention(p.args[0]); if (target == undefined) { - p.send("**šŸš« |** I couldn't find that user :c", 3000); + p.send('**šŸš« |** I couldn\'t find that user :c', 3000); return; } if (p.msg.author.id == target.id) { - let text = '**' + p.msg.author.username + "**, you can't bonk yourself!"; + let text = '**' + p.msg.author.username + '**, you can\'t bonk yourself!'; p.send(text); return; } diff --git a/src/commands/commandList/patreon/bully.js b/src/commands/commandList/patreon/bully.js index 793b8247f..b41c2517f 100644 --- a/src/commands/commandList/patreon/bully.js +++ b/src/commands/commandList/patreon/bully.js @@ -51,11 +51,11 @@ module.exports = new CommandInterface({ } let target = p.getMention(p.args[0]); if (target == undefined) { - p.send("**šŸš« |** I couldn't find that user :c", 3000); + p.send('**šŸš« |** I couldn\'t find that user :c', 3000); return; } if (p.msg.author.id == target.id) { - let text = '**' + p.msg.author.username + "**! Don't bully yourself!"; + let text = '**' + p.msg.author.username + '**! Don\'t bully yourself!'; p.send(text); return; } diff --git a/src/commands/commandList/patreon/catto.js b/src/commands/commandList/patreon/catto.js index d50304122..4c6ca496f 100644 --- a/src/commands/commandList/patreon/catto.js +++ b/src/commands/commandList/patreon/catto.js @@ -25,7 +25,7 @@ function sendDisplay(count) { this.replyMsg(emoji, msg); } function sendBroke() { - const msg = `, you do not have any cattos to give! >:c`; + const msg = ', you do not have any cattos to give! >:c'; this.errorMsg(brokeMsg, 3000); } function sendGive(giver, receiver) { @@ -33,11 +33,11 @@ function sendGive(giver, receiver) { let msg = `${emoji} **| ${receiver.username}**, you have received one catto from ${giver.username}! *meow~*\n${this.config.emoji.blank} **|** `; const rand = Math.random(); if (rand < 0.333) { - msg += `He's probably sleeping don't wake him up... `; + msg += 'He\'s probably sleeping don\'t wake him up... '; } else if (rand < 0.666) { - msg += `The purr-fect company for your lonely nights `; + msg += 'The purr-fect company for your lonely nights '; } else { - msg += `Maybe now you'll have 9 lives to waste...probably `; + msg += 'Maybe now you\'ll have 9 lives to waste...probably '; } this.send(msg); } diff --git a/src/commands/commandList/patreon/chicken.js b/src/commands/commandList/patreon/chicken.js index e789105da..86c07c1c5 100644 --- a/src/commands/commandList/patreon/chicken.js +++ b/src/commands/commandList/patreon/chicken.js @@ -96,7 +96,7 @@ async function give(p, user) { if (friendCount >= 7 && Math.random() <= 0.2) { const friendCount = await p.redis.hincrby('data_' + user.id, data, -3); const totalStolen = await p.redis.hincrby('data_custom', 'chicken', 3); - msg += `\n **|** ź’Ŗź’³ź’Ŗpsieee! The OwO-Jester has stolen 3 chickens out of your inventory! `; + msg += '\n **|** ź’Ŗź’³ź’Ŗpsieee! The OwO-Jester has stolen 3 chickens out of your inventory! '; } p.send(msg); diff --git a/src/commands/commandList/patreon/choose.js b/src/commands/commandList/patreon/choose.js index 4a7ffe1ba..005481b2a 100644 --- a/src/commands/commandList/patreon/choose.js +++ b/src/commands/commandList/patreon/choose.js @@ -45,7 +45,7 @@ module.exports = new CommandInterface({ let items = p.args.join(' ').replace(/[,;]/gi, '|').split('|'); if (items.length == 1) { - p.errorMsg(", you silly! I can't just choose from one item!", 3000); + p.errorMsg(', you silly! I can\'t just choose from one item!', 3000); return; } diff --git a/src/commands/commandList/patreon/collectibles/cloud.js b/src/commands/commandList/patreon/collectibles/cloud.js index 6a9de5156..f554db5a0 100644 --- a/src/commands/commandList/patreon/collectibles/cloud.js +++ b/src/commands/commandList/patreon/collectibles/cloud.js @@ -18,7 +18,7 @@ class Cloud extends Collectible { this.ownerOnly = true; this.giveAmount = 1; this.description = - "Soft mist of cotton gentle and sweet, combine me with thunder and I'll be your worst nightmare."; + 'Soft mist of cotton gentle and sweet, combine me with thunder and I\'ll be your worst nightmare.'; this.displayMsg = '?emoji? **| ?user?**, your sky has **?count?** fluffy clouds ?emoji?' + '\n?mergeEmoji? **|** Youā€™ve had **?mergeCount?** storms come your way! <:thunder:1056432512953491526>'; diff --git a/src/commands/commandList/patreon/collectibles/fear.js b/src/commands/commandList/patreon/collectibles/fear.js index 689fd1a8b..2bd26a81d 100644 --- a/src/commands/commandList/patreon/collectibles/fear.js +++ b/src/commands/commandList/patreon/collectibles/fear.js @@ -20,7 +20,7 @@ class Fear extends Collectible { this.ownerOnly = true; this.giveAmount = 1; this.description = - "What do you fear?\n\n fears can alarming, but we all overcome them... unless it's me noming you \n\nI'd nom you if I could\""; + 'What do you fear?\n\n fears can alarming, but we all overcome them... unless it\'s me noming you \n\nI\'d nom you if I could"'; this.displayMsg = '?emoji? **| ?user?**, you have overcome ?count? fear?plural? ?emoji?'; this.brokeMsg = ', you do not have any Fears! >:c'; this.giveMsg = diff --git a/src/commands/commandList/patreon/collectibles/lovenote.js b/src/commands/commandList/patreon/collectibles/lovenote.js index 7065c2767..9fdf3721b 100644 --- a/src/commands/commandList/patreon/collectibles/lovenote.js +++ b/src/commands/commandList/patreon/collectibles/lovenote.js @@ -83,7 +83,7 @@ class LoveNote extends Collectible { p.redis.hincrby(`data_${p.msg.author.id}`, this.data, this.mergeNeeded); p.redis.hincrby(`data_${p.msg.author.id}`, this.data2, this.mergeNeeded); p.send( - ` **| Seems like you donā€™t have enough love notes :c**`, + ' **| Seems like you donā€™t have enough love notes :c**', 3000 ); p.setCooldown(5); diff --git a/src/commands/commandList/patreon/collectibles/lxv.js b/src/commands/commandList/patreon/collectibles/lxv.js index 349a75840..d8eef5b2f 100644 --- a/src/commands/commandList/patreon/collectibles/lxv.js +++ b/src/commands/commandList/patreon/collectibles/lxv.js @@ -21,10 +21,10 @@ class Lxv extends Collectible { this.description = 'Make sure to give Hedge some love, and he might bring you a gift!\nOnly given out in lovesick. A server for OwO, anigame and ERPG grinders! .gg/lxv'; this.displayMsg = - "<:846997443278274610:1055044684382208010> **| ?user?**, you currently have ?count? ?emoji? lxv. Don't forget to take care of them!\n<:1039236830022868992:1055044688979185664> **|** Hedge has collected ?mergeCount? **lovesick** for you!"; + '<:846997443278274610:1055044684382208010> **| ?user?**, you currently have ?count? ?emoji? lxv. Don\'t forget to take care of them!\n<:1039236830022868992:1055044688979185664> **|** Hedge has collected ?mergeCount? **lovesick** for you!'; this.brokeMsg = ', you do not have any Lxv! >:c'; this.giveMsg = - "<:822030768981016577:1055044681429422080> **| ?receiver?**, you were walking around and **?giver?** surprised you with 2 lxv!\n?blank? **|** Remember to take care of them! or they'll run away <:821431807425642567:1055044680162742283>"; + '<:822030768981016577:1055044681429422080> **| ?receiver?**, you were walking around and **?giver?** surprised you with 2 lxv!\n?blank? **|** Remember to take care of them! or they\'ll run away <:821431807425642567:1055044680162742283>'; this.hasManualMerge = true; this.manualMergeCommands = ['pet']; @@ -45,14 +45,14 @@ class Lxv extends Collectible { if (afterMid.after) { if (afterMid.withinDay) { msg = - "<:846997443278274610:1055044684382208010> **| ?user?**, you currently have ?count? ?emoji? lxv. Don't forget to take care of them!\n<:1039236830022868992:1055044688979185664> **|** Hedge has collected ?mergeCount? **lovesick** for you!"; + '<:846997443278274610:1055044684382208010> **| ?user?**, you currently have ?count? ?emoji? lxv. Don\'t forget to take care of them!\n<:1039236830022868992:1055044688979185664> **|** Hedge has collected ?mergeCount? **lovesick** for you!'; } else { if (args.mergeCount > 0) { const result = await p.redis.hincrby(`data_${p.msg.author.id}`, this.manualMergeData, -1); args.mergeCount -= 1; await p.redis.hset(`data_${p.msg.author.id}`, `${this.data}_reset`, afterMid.now); msg = - "<:846997478246318080:1055044685153972225> **| ?user?**, you currently have ?count? ?emoji? lxv. One of them ran away because you didn't take care of it..." + + '<:846997478246318080:1055044685153972225> **| ?user?**, you currently have ?count? ?emoji? lxv. One of them ran away because you didn\'t take care of it...' + '\n<:1039236830022868992:1055044688979185664> **|** Hedge has collected ?mergeCount? **lovesick** for you!'; } else { msg = diff --git a/src/commands/commandList/patreon/collectibles/unicorn.js b/src/commands/commandList/patreon/collectibles/unicorn.js index f237541b6..9059d5c62 100644 --- a/src/commands/commandList/patreon/collectibles/unicorn.js +++ b/src/commands/commandList/patreon/collectibles/unicorn.js @@ -21,7 +21,7 @@ class Unicorn extends Collectible { 'The unicorn is a legendary creature with a single large, pointed, spiraling horn projecting from its forehead.' + '\nThe unicorn has captured the minds and hearts of many because of the unique properties it supposedly possessed. The unicorn is greatly desired but difficult or impossible to find.' + '\n"The Unicorn" song was made very popular by the Irish Rovers in 1968.' + - "\nAccording to the song, the unicorn was not a fantasy, but a creature that missed the boat by not boarding Noah's Ark in time to be saved from the Great Flood." + + '\nAccording to the song, the unicorn was not a fantasy, but a creature that missed the boat by not boarding Noah\'s Ark in time to be saved from the Great Flood.' + '\nNOTE: The Okapi is a real animal once known as the "African unicorn".'; this.displayMsg = '?emoji? **| ?user?**, you currently have ?count? Unicorn?plural?!'; this.brokeMsg = ', you do not have any Unicorns! >:c'; diff --git a/src/commands/commandList/patreon/destiny.js b/src/commands/commandList/patreon/destiny.js index 1ac4a17d2..c2b0ca8af 100644 --- a/src/commands/commandList/patreon/destiny.js +++ b/src/commands/commandList/patreon/destiny.js @@ -16,14 +16,14 @@ const dailyOnly = false; const giveAmount = 1; const desc = - "Destined to cross paths but never to meet.\nIn this lifetime, I loved your soul before I could touch you. Unable to change this time line, where we're not destined to complete our love story.\nIn this lifetime, this destiny, you're my last love, my one and only love.\nBut these promises are just sweet lies therefore, I owe you and will love you onto the next life to complete our story."; -const brokeMsg = `, you do not have any Destiny! >:c`; -const giveMsg = `, you have been given 1 Destined to love.`; + 'Destined to cross paths but never to meet.\nIn this lifetime, I loved your soul before I could touch you. Unable to change this time line, where we\'re not destined to complete our love story.\nIn this lifetime, this destiny, you\'re my last love, my one and only love.\nBut these promises are just sweet lies therefore, I owe you and will love you onto the next life to complete our story.'; +const brokeMsg = ', you do not have any Destiny! >:c'; +const giveMsg = ', you have been given 1 Destined to love.'; const hasMerge = false; const mergeNeeded = 3; const mergeEmoji = ''; -const mergeMsg = ``; +const mergeMsg = ''; function getDisplay(count, mergeCount) { return `, you currently have ?count? ${emoji} Destiny?plural?!`; diff --git a/src/commands/commandList/patreon/devil.js b/src/commands/commandList/patreon/devil.js index 4a2fdd032..b0d465a17 100644 --- a/src/commands/commandList/patreon/devil.js +++ b/src/commands/commandList/patreon/devil.js @@ -15,7 +15,7 @@ const ownerOnly = true; const giveAmount = 1; const desc = 'A pair of Devil wings to take you to the underworld a place called Hell.'; const displayMsg = `, you currently have ?count? ${emoji} Devil Wing?plural?!`; -const brokeMsg = `, you do not have any Devil Wings to give! >:c`; +const brokeMsg = ', you do not have any Devil Wings to give! >:c'; const giveMsg = `, you have been given 1 ${emoji} Falling into Hell.`; let ownersString = `?${owners[owners.length - 1]}?`; diff --git a/src/commands/commandList/patreon/dice.js b/src/commands/commandList/patreon/dice.js index 37638c97e..b85cf34b7 100644 --- a/src/commands/commandList/patreon/dice.js +++ b/src/commands/commandList/patreon/dice.js @@ -52,7 +52,7 @@ module.exports = new CommandInterface({ result = '**<:blank:427371936482328596> |** ' + message[Math.trunc(Math.random() * message.length)] + - " It's a **" + + ' It\'s a **' + result + '**!'; diff --git a/src/commands/commandList/patreon/dish.js b/src/commands/commandList/patreon/dish.js index bb4cd30bb..4c1b2f4cd 100644 --- a/src/commands/commandList/patreon/dish.js +++ b/src/commands/commandList/patreon/dish.js @@ -60,7 +60,7 @@ async function display(p) { p.replyMsg( dishEmoji, - ', you currently have ' + count + " dish(es) of iskender to enjoy! Eat while it's hot!" + ', you currently have ' + count + ' dish(es) of iskender to enjoy! Eat while it\'s hot!' ); } diff --git a/src/commands/commandList/patreon/duwasvivu.js b/src/commands/commandList/patreon/duwasvivu.js index 6906093d1..cc7b9c848 100644 --- a/src/commands/commandList/patreon/duwasvivu.js +++ b/src/commands/commandList/patreon/duwasvivu.js @@ -28,6 +28,6 @@ module.exports = new CommandInterface({ bot: false, execute: async function (p) { - p.send("Hi i'm duwas"); + p.send('Hi i\'m duwas'); }, }); diff --git a/src/commands/commandList/patreon/fate.js b/src/commands/commandList/patreon/fate.js index 71648c17f..6cdcf7cd6 100644 --- a/src/commands/commandList/patreon/fate.js +++ b/src/commands/commandList/patreon/fate.js @@ -13,10 +13,10 @@ const data = 'fate'; const ownerOnly = true; const giveAmount = 1; const desc = - "A fateful stone that connects People. Its glimmers can entwine their fates, just as how its glimmer links stars into the shapes of a heart's desires. No one knows where this stone comes from."; + 'A fateful stone that connects People. Its glimmers can entwine their fates, just as how its glimmer links stars into the shapes of a heart\'s desires. No one knows where this stone comes from.'; const displayMsg = `, you currently have ?count? ${emoji} Intertwined Fate?plural?!`; -const brokeMsg = `, you do not have any Interwined Fates to give! >:c`; -const giveMsg = `, you have been given an Interwined Fate.`; +const brokeMsg = ', you do not have any Interwined Fates to give! >:c'; +const giveMsg = ', you have been given an Interwined Fate.'; module.exports = new CommandInterface({ alias: [data], diff --git a/src/commands/commandList/patreon/frogEgg.js b/src/commands/commandList/patreon/frogEgg.js index d3997b826..cd164d161 100644 --- a/src/commands/commandList/patreon/frogEgg.js +++ b/src/commands/commandList/patreon/frogEgg.js @@ -102,9 +102,9 @@ async function trade(p) { await p.redis.hincrby('data_' + p.msg.author.id, data2, 1); await p.replyMsg( emoji, - `, you received a shiny silver ball! Save that ball to gift to baby yoda!` + ', you received a shiny silver ball! Save that ball to gift to baby yoda!' ); } else { - await p.errorMsg(`, you need at least 6 frog eggs to convert them into silver balls!`); + await p.errorMsg(', you need at least 6 frog eggs to convert them into silver balls!'); } } diff --git a/src/commands/commandList/patreon/gauntlet.js b/src/commands/commandList/patreon/gauntlet.js index 216198b86..713e895ba 100644 --- a/src/commands/commandList/patreon/gauntlet.js +++ b/src/commands/commandList/patreon/gauntlet.js @@ -98,7 +98,7 @@ async function useGauntlet(p) { let result = await p.redis.incr('gauntlet', p.msg.author.id, -1); if (result == null || result < 0) { if (result < 0) p.redis.incr('gauntlet', p.msg.author.id, 1); - p.errorMsg(", you don't have a gauntlet!", 3000); + p.errorMsg(', you don\'t have a gauntlet!', 3000); p.setCooldown(5); return; } @@ -111,7 +111,7 @@ async function useGauntlet(p) { p.replyMsg(reverseEmoji, ', you have saved the earth by reversing!'); } else if (rand < 21) { await p.redis.incr('universe_destroyed', p.msg.author.id, 1); - p.replyMsg(snapEmoji, ", you have destroyed half of the universe's population! Astrocity!"); + p.replyMsg(snapEmoji, ', you have destroyed half of the universe\'s population! Astrocity!'); } else { await p.redis.incr('pears', p.msg.author.id, 1); p.replyMsg(pearEmoji, ', you traded the mighty gauntlet for a sweet pear'); diff --git a/src/commands/commandList/patreon/genie.js b/src/commands/commandList/patreon/genie.js index 13be268c9..08dd7aaae 100644 --- a/src/commands/commandList/patreon/genie.js +++ b/src/commands/commandList/patreon/genie.js @@ -14,7 +14,7 @@ const ownerOnly = true; const giveAmount = 1; const desc = 'This custom item can only be given by the owner of this command.'; const displayMsg = `, you currently have ?count? ${emoji} Genie!`; -const brokeMsg = `, you do not have any Genies to give! >:c`; +const brokeMsg = ', you do not have any Genies to give! >:c'; const giveMsg = `, you have been given 1 ${emoji} Genie.`; let ownersString = `?${owners[owners.length - 1]}?`; diff --git a/src/commands/commandList/patreon/guillotine.js b/src/commands/commandList/patreon/guillotine.js index 28e5213f0..a08a8af2b 100644 --- a/src/commands/commandList/patreon/guillotine.js +++ b/src/commands/commandList/patreon/guillotine.js @@ -39,11 +39,11 @@ module.exports = new CommandInterface({ } let target = p.getMention(p.args[0]); if (target == undefined) { - p.send("**šŸš« |** I couldn't find that user :c", 3000); + p.send('**šŸš« |** I couldn\'t find that user :c', 3000); return; } if (p.msg.author.id == target.id) { - let text = '**' + p.msg.author.username + "**! You can't guillotine yourself!"; + let text = '**' + p.msg.author.username + '**! You can\'t guillotine yourself!'; p.send(text); return; } diff --git a/src/commands/commandList/patreon/king.js b/src/commands/commandList/patreon/king.js index b799691b3..52aa9e2da 100644 --- a/src/commands/commandList/patreon/king.js +++ b/src/commands/commandList/patreon/king.js @@ -15,7 +15,7 @@ const giveAmount = 1; const desc = 'A noble descendant of God, a royal ruler over mankind.\nBehind ever King is a powerful Queen.\nThe king of spades x "Guards take him away!"'; const displayMsg = `, you currently have ?count? ${emoji} King of Spade?plural?!`; -const brokeMsg = `, you do not have any King of Spades to give! >:c`; +const brokeMsg = ', you do not have any King of Spades to give! >:c'; const giveMsg = `, you have been given 1 ${emoji} King of Spade. You are my King.`; let ownersString = `?${owners[owners.length - 1]}?`; diff --git a/src/commands/commandList/patreon/latte.js b/src/commands/commandList/patreon/latte.js index c4cf9a8df..37da03185 100644 --- a/src/commands/commandList/patreon/latte.js +++ b/src/commands/commandList/patreon/latte.js @@ -14,7 +14,7 @@ const ownerOnly = true; const giveAmount = 1; const desc = 'This custom item can only be given by the owner of this command.'; const displayMsg = `, you currently have ?count? ${emoji} latte?plural?!`; -const brokeMsg = `, you do not have any lattes to give! >:c`; +const brokeMsg = ', you do not have any lattes to give! >:c'; const giveMsg = `, you have been given 1 ${emoji} latte.`; let ownersString = `?${owners[owners.length - 1]}?`; diff --git a/src/commands/commandList/patreon/magic.js b/src/commands/commandList/patreon/magic.js index 45a80e256..dbc627cff 100644 --- a/src/commands/commandList/patreon/magic.js +++ b/src/commands/commandList/patreon/magic.js @@ -15,7 +15,7 @@ const dailyOnly = false; const giveAmount = 2; const desc = 'Give some Black Magic to a friend!'; const displayMsg = `, you currently have ?count? ${emoji} Black Magic`; -const brokeMsg = `, you do not have any Black Magic to give! >:c`; +const brokeMsg = ', you do not have any Black Magic to give! >:c'; const giveMsg = `, you have been given 2 ${emoji} it fizzles and sparkles in your hand, these originated from the Black Magic Gang owo clan, trade these with other users to further spread the black magic upon these lands, GO! GO! BEFORE THEY CATCH YOU!`; let ownersString = `?${owners[owners.length - 1]}?`; diff --git a/src/commands/commandList/patreon/mochi.js b/src/commands/commandList/patreon/mochi.js index 2f342ad86..73f3be959 100644 --- a/src/commands/commandList/patreon/mochi.js +++ b/src/commands/commandList/patreon/mochi.js @@ -16,7 +16,7 @@ const giveAmount = 2; const desc = 'A bite size delectable snack you canā€™t live without. As sweet as pie, as cold as the winters breeze, nothing compares to my mochi.'; const displayMsg = `, you currently have ?count? ${emoji} mochi?plural?!`; -const brokeMsg = `, you do not have any mochis to give! >:c`; +const brokeMsg = ', you do not have any mochis to give! >:c'; const giveMsg = `, you have been given 2 ${emoji} sweet mochi :3`; let ownersString = `?${owners[owners.length - 1]}?`; diff --git a/src/commands/commandList/patreon/moon.js b/src/commands/commandList/patreon/moon.js index a7e2a8a30..5b836945e 100644 --- a/src/commands/commandList/patreon/moon.js +++ b/src/commands/commandList/patreon/moon.js @@ -15,7 +15,7 @@ const giveAmount = 1; const desc = 'I miss you like the moon misses the sun, forever separated by thousands of miles for thousands of years.\n\nDestined to chase it until the end of time.\n\nThe sun and moon misses each other without any hope of meeting ever.\n\nLove by the moon'; const displayMsg = `, you currently have ?count? ${emoji} You are my Moon!`; -const brokeMsg = `, you do not have any moons to give! >:c`; +const brokeMsg = ', you do not have any moons to give! >:c'; const giveMsg = `, you have been given 1 ${emoji} Love by the moon. `; diff --git a/src/commands/commandList/patreon/queen.js b/src/commands/commandList/patreon/queen.js index e187c22d4..6f964b9de 100644 --- a/src/commands/commandList/patreon/queen.js +++ b/src/commands/commandList/patreon/queen.js @@ -15,7 +15,7 @@ const giveAmount = 1; const desc = 'A noble descendant of God, a royal ruler over mankind.\nTreat her like a queen and she\'ll treat you like a king.\nThe queen of hearts x "Off with your head!"'; const displayMsg = `, you currently have ?count? ${emoji} Queen of Heart?plural?!`; -const brokeMsg = `, you do not have any Queen of Hearts to give! >:c`; +const brokeMsg = ', you do not have any Queen of Hearts to give! >:c'; const giveMsg = `, you have been given an 1 ${emoji} Queen of Heart. You are my Queen.`; let ownersString = `?${owners[owners.length - 1]}?`; diff --git a/src/commands/commandList/patreon/rain.js b/src/commands/commandList/patreon/rain.js index 3167a1121..140d81995 100644 --- a/src/commands/commandList/patreon/rain.js +++ b/src/commands/commandList/patreon/rain.js @@ -17,7 +17,7 @@ const giveAmount = 1; const desc = 'May Happiness Rain On You!\nMay Your Sorrows Be Washed Away In The Rainā€¦\n\nSometimes, If You Want The Rainbow, You Gotta Put Up With The Rain!\n\nCollect 8 Raindrops to get a Rainbow!'; -const brokeMsg = `, you do not have any Rain to give! >:c`; +const brokeMsg = ', you do not have any Rain to give! >:c'; const giveMsg = `, you have been given 1 ${emoji} raindrop!`; const hasMerge = true; @@ -27,9 +27,9 @@ const mergeMsg = `, you have been given 1 ${emoji} raindrop!\n${config.emoji.bla function getDisplay(count, mergeCount) { if (mergeCount) { - return `, you currently have ?count? raindrop?plural? and ?mergeCount? rainbow?mergePlural?! Sometimes, If You Want The Rainbow, You Gotta Put Up With The Rain!`; + return ', you currently have ?count? raindrop?plural? and ?mergeCount? rainbow?mergePlural?! Sometimes, If You Want The Rainbow, You Gotta Put Up With The Rain!'; } else { - return `, you currently have ?count? raindrop?plural?! May Happiness Rain On You!`; + return ', you currently have ?count? raindrop?plural?! May Happiness Rain On You!'; } } diff --git a/src/commands/commandList/patreon/strengthtest.js b/src/commands/commandList/patreon/strengthtest.js index 04bb24c16..8a530aec6 100644 --- a/src/commands/commandList/patreon/strengthtest.js +++ b/src/commands/commandList/patreon/strengthtest.js @@ -18,14 +18,14 @@ const comments = [ ['yikes.', 'oh.', 'Why.. are you so weak...?'], ['oh. Try harder next time', 'Do you even lift?', 'How do you even lift your arms?'], ['Below average.', 'Seriously?', 'Try harder next time!'], - ['You should work out more...', 'Do you even work out?', "That's all you got...?"], - ['You did ok', "Could've been better.", 'meh'], - ['Average strength', "You're pretty average :/"], + ['You should work out more...', 'Do you even work out?', 'That\'s all you got...?'], + ['You did ok', 'Could\'ve been better.', 'meh'], + ['Average strength', 'You\'re pretty average :/'], ['Pretty decent!', 'Not bad!', 'Better than average!'], - ["Woah! That's still pretty good!", "Pretty strong aren't you? ;)", 'Wish I was strong as you!'], - ["You're still pretty strong! ;)", "WOW you're strong!", 'Can I feel your muscles? ;o'], + ['Woah! That\'s still pretty good!', 'Pretty strong aren\'t you? ;)', 'Wish I was strong as you!'], + ['You\'re still pretty strong! ;)', 'WOW you\'re strong!', 'Can I feel your muscles? ;o'], ['SO CLOSE!', 'You were almost there...', 'Just a little bit more!!'], - ["You're the strongest person alive!", "Oh my. You're so strong!"], + ['You\'re the strongest person alive!', 'Oh my. You\'re so strong!'], ]; module.exports = new CommandInterface({ @@ -112,6 +112,6 @@ function getMessage(percent) { let msg = comments[Math.floor(percent)]; msg = msg[Math.floor(Math.random() * msg.length)]; percent = Math.floor(percent * 10); - if (percent == 99) msg = "You almost hit the bell, but couldn't quite do it..."; + if (percent == 99) msg = 'You almost hit the bell, but couldn\'t quite do it...'; return percent + '/100 ' + msg; } diff --git a/src/commands/commandList/patreon/sun.js b/src/commands/commandList/patreon/sun.js index 82b2243a9..90383f9db 100644 --- a/src/commands/commandList/patreon/sun.js +++ b/src/commands/commandList/patreon/sun.js @@ -15,7 +15,7 @@ const giveAmount = 1; const desc = 'I love you like the sun loves the moon, forever separated by thousands of miles for thousands of years.\nHe died every night just to let her breathe.\n\nThe sun and moon love each other without any hope of meeting ever.\n\nLive by the sun'; const displayMsg = `, you currently have ?count? ${emoji} You are my Sun!`; -const brokeMsg = `, you do not have any suns to give! >:c`; +const brokeMsg = ', you do not have any suns to give! >:c'; const giveMsg = `, you have been given 1 Live by the sun. `; diff --git a/src/commands/commandList/patreon/tequila.js b/src/commands/commandList/patreon/tequila.js index 56f2ea6ad..1ca80222b 100644 --- a/src/commands/commandList/patreon/tequila.js +++ b/src/commands/commandList/patreon/tequila.js @@ -16,7 +16,7 @@ const dailyOnly = false; const giveAmount = 1; const desc = 'This item can only be given out by the creator.'; -const brokeMsg = `, you do not have any tequilas to give! >:c`; +const brokeMsg = ', you do not have any tequilas to give! >:c'; const giveMsg = `, you have been given 1 ${emoji} tequila!`; const hasMerge = false; diff --git a/src/commands/commandList/patreon/truthordare.js b/src/commands/commandList/patreon/truthordare.js index a4a6edc43..4b75a627f 100644 --- a/src/commands/commandList/patreon/truthordare.js +++ b/src/commands/commandList/patreon/truthordare.js @@ -10,20 +10,20 @@ const CommandInterface = require('../../CommandInterface.js'); const truths = [ 'What is one thing you wish you could change about yourself?', 'Who is your crush?', - "What is the most food you've ever eaten in a single sitting?", - "What is the craziest pickup line you've ever used?", + 'What is the most food you\'ve ever eaten in a single sitting?', + 'What is the craziest pickup line you\'ve ever used?', 'What animal do you think you most look like?', 'How many selfies do you take a day?', 'What is one thing you would stand in line for an hour for?', 'When was the last time you cried?', - "What's the longest time you've ever gone without showering?", + 'What\'s the longest time you\'ve ever gone without showering?', 'What was your favorite childhood show?', - "What's your biggest fear?", + 'What\'s your biggest fear?', 'What person do you text the most?', 'If you could only eat one thing for the rest of your life, what would you choose?', - "What's your favorite part of your body?", + 'What\'s your favorite part of your body?', 'Who is your celebrity crush?', - "What's the strangest dream you've ever had?", + 'What\'s the strangest dream you\'ve ever had?', 'What are the top three things you look for in a boyfriend/girlfriend?', 'What is your worst habit?', 'What is your biggest insecurity?', @@ -33,7 +33,7 @@ const truths = [ 'Have you ever cheated in an exam?', 'Who would you like to kiss in this chat?', 'How many people have you kissed?', - "What's one thing you only do when you're alone?", + 'What\'s one thing you only do when you\'re alone?', 'If you had to cut one friend out of your life, who would it be?', 'Do you have a favourite friend and who?', 'If you could swap lives with someone in this chat, who would it be?', @@ -53,7 +53,7 @@ const dares = [ 'Eat a packet of hot sauce straight.', 'Do 20 squats.', 'Gulp down a raw egg.', - "Put five ice cubes in your mouth (you can't chew them, you just have to let them meltā€”brrr).", + 'Put five ice cubes in your mouth (you can\'t chew them, you just have to let them meltā€”brrr).', 'Shot gun a diet coke.', 'Empty a glass of cold water onto your head outside.', 'Lick a bar of soap.', @@ -75,7 +75,7 @@ const dares = [ 'Cut off some piece of hair.', 'Let darer post something on your social media.', 'Lick the floor.', - "For a guy, put on makeup. For a girl, wash off your make up (unless you don't wear make up, put some on).", + 'For a guy, put on makeup. For a girl, wash off your make up (unless you don\'t wear make up, put some on).', 'Write or draw something of groups choice somewhere on your body (that can be hidden with clothing) with a sharpie.', 'Do pushups until you canā€™t do any more, wait 5 seconds, and then do one more.', 'Let the group look through your phone for 2 minute (screen share).', @@ -88,7 +88,7 @@ const dares = [ 'Drink 3 big cups of water without stopping.', 'Post the last youtube video you watched.', 'Write darers name on some body part and send the picture.', - "List all your ex's alphabetically", + 'List all your ex\'s alphabetically', 'Break two eggs on your forehead.', ]; diff --git a/src/commands/commandList/patreon/turnip.js b/src/commands/commandList/patreon/turnip.js index 30014193a..006410cfc 100644 --- a/src/commands/commandList/patreon/turnip.js +++ b/src/commands/commandList/patreon/turnip.js @@ -13,9 +13,9 @@ const data = 'turnip'; const ownerOnly = true; const giveAmount = 1; const desc = - "Turnips are the lifeblood of the Nook family Fortune, if you would like one you must find it's creator ?owner?."; + 'Turnips are the lifeblood of the Nook family Fortune, if you would like one you must find it\'s creator ?owner?.'; const displayMsg = `, you currently have ?count? ${emoji} turnip?plural?!`; -const brokeMsg = `, you do not have any turnips to give! >:c`; +const brokeMsg = ', you do not have any turnips to give! >:c'; const giveMsg = ` has received a turnip! I hear they sell for quite a few bells and are quite rare! ${emoji}`; let ownersString = `?${owners[owners.length - 1]}?`; diff --git a/src/commands/commandList/patreon/zodiackey.js b/src/commands/commandList/patreon/zodiackey.js index 89b1a94b5..8a2d5fda9 100644 --- a/src/commands/commandList/patreon/zodiackey.js +++ b/src/commands/commandList/patreon/zodiackey.js @@ -135,7 +135,7 @@ async function display(p) { if (hasKeys) { p.send(text); } else { - p.errorMsg(`, you do not have any zodiac keys.`, 3000); + p.errorMsg(', you do not have any zodiac keys.', 3000); } p.setCooldown(5); } diff --git a/src/commands/commandList/points.js b/src/commands/commandList/points.js index 0582077c4..6206e47cf 100644 --- a/src/commands/commandList/points.js +++ b/src/commands/commandList/points.js @@ -14,7 +14,7 @@ module.exports = new CommandInterface({ args: '', - desc: "Gives the user a point. This is the same as just saying owo in your messages.\nYou weren't really suppose to find this.", + desc: 'Gives the user a point. This is the same as just saying owo in your messages.\nYou weren\'t really suppose to find this.', example: [], @@ -39,7 +39,7 @@ module.exports = new CommandInterface({ await p.query(sql); p.quest('owo'); - p.logger.incr(`cowoncy`, 2, { type: 'points' }, p.msg); - p.logger.incr(`points`, 1, {}, p.msg); + p.logger.incr('cowoncy', 2, { type: 'points' }, p.msg); + p.logger.incr('points', 1, {}, p.msg); }, }); diff --git a/src/commands/commandList/ranking/me.js b/src/commands/commandList/ranking/me.js index 239783d68..250c4fdcf 100644 --- a/src/commands/commandList/ranking/me.js +++ b/src/commands/commandList/ranking/me.js @@ -156,7 +156,7 @@ async function displayRanking(con, msg, sql, title, subText, p) { let below = rows[1]; let me = rows[2][0]; if (!me) { - p.send("You're at the very bottom c:"); + p.send('You\'re at the very bottom c:'); return; } let userRank = parseInt(me.rank); @@ -203,7 +203,7 @@ async function displayRanking(con, msg, sql, title, subText, p) { embed = '```md\n< ' + uname + - "'s " + + '\'s ' + title + ' >\n> Your rank is: ' + userRank + @@ -687,7 +687,7 @@ function getGuildRanking(con, msg, id, p) { let below = rows[1]; let me = rows[2][0]; if (!me) { - p.send("You haven't said 'owo' yet!"); + p.send('You haven\'t said \'owo\' yet!'); return; } let guildRank = parseInt(me.rank); @@ -754,7 +754,7 @@ function getGuildRanking(con, msg, id, p) { embed = '```md\n< ' + uname + - "'s Global Ranking >\n> Your guild rank is: " + + '\'s Global Ranking >\n> Your guild rank is: ' + guildRank + '\n>\t\tcollectively said owo ' + global.toFancyNum(rows[2][0].count) + @@ -764,7 +764,7 @@ function getGuildRanking(con, msg, id, p) { embed = '```md\n< ' + uname + - "'s Global Ranking >\n> Your guild rank is: " + + '\'s Global Ranking >\n> Your guild rank is: ' + guildRank + '\n>\t\tcollectively said owo ' + global.toFancyNum(rows[2][0].count) + @@ -1073,7 +1073,7 @@ async function getLevelRanking(global, p) { text = '```md\n< ' + p.msg.author.username + - "'s Global Level Ranking >\n> Your Rank: " + + '\'s Global Level Ranking >\n> Your Rank: ' + p.global.toFancyNum(userRank) + '\n>\t\tLvl ' + userLevel.level + @@ -1087,7 +1087,7 @@ async function getLevelRanking(global, p) { text = '```md\n< ' + p.msg.author.username + - "'s Level Ranking for " + + '\'s Level Ranking for ' + p.msg.channel.guild.name + ' >\n> Your Rank: ' + p.global.toFancyNum(userRank) + diff --git a/src/commands/commandList/shop/inventory.js b/src/commands/commandList/shop/inventory.js index 3b37c0e8f..7c2ea156e 100644 --- a/src/commands/commandList/shop/inventory.js +++ b/src/commands/commandList/shop/inventory.js @@ -22,7 +22,7 @@ module.exports = new CommandInterface({ args: '', - desc: "Displays your inventory! Use 'owo equip' to use them!", + desc: 'Displays your inventory! Use \'owo equip\' to use them!', example: [], @@ -52,7 +52,7 @@ module.exports = new CommandInterface({ ]); let inv = addToString(promises); - let text = '**====== ' + msg.author.username + "'s Inventory ======**\n" + inv; + let text = '**====== ' + msg.author.username + '\'s Inventory ======**\n' + inv; if (inv == '') text = 'Your inventory is empty :c'; text = alterInventory.alter(p, text, { user: p.msg.author, inv }); p.send(text); diff --git a/src/commands/commandList/shop/pages/WallpaperPage.js b/src/commands/commandList/shop/pages/WallpaperPage.js index 2e08e75cb..a22b4efac 100644 --- a/src/commands/commandList/shop/pages/WallpaperPage.js +++ b/src/commands/commandList/shop/pages/WallpaperPage.js @@ -18,7 +18,7 @@ module.exports = class WallpaperPage extends PageClass { } async totalPages() { - let sql = `SELECT COUNT(bid) AS count FROM backgrounds WHERE active = 1;`; + let sql = 'SELECT COUNT(bid) AS count FROM backgrounds WHERE active = 1;'; let result = await this.p.query(sql); let pages = Math.ceil(result[0].count / perPage); return pages; diff --git a/src/commands/commandList/shop/trade.js b/src/commands/commandList/shop/trade.js index 721c7bd0a..2e884e5ea 100644 --- a/src/commands/commandList/shop/trade.js +++ b/src/commands/commandList/shop/trade.js @@ -110,7 +110,7 @@ async function validate(p) { return { error: true }; } if (result[1][0]?.id) { - await p.errorMsg(`, you cannot trade with this user!`, 3000); + await p.errorMsg(', you cannot trade with this user!', 3000); return { error: true }; } if (item.tradeLimit) { @@ -162,7 +162,7 @@ async function sendMessage(p, { item, user, price, count }) { embed.description += `\n\nšŸ“‘ **You can only trade this item ${item.tradeLimit} times per day.**`; } if (item.giveOnly) { - embed.description += `\n\nāš ļø **You can not trade this item for cowoncy. Failure to follow these rules can result in a ban.**`; + embed.description += '\n\nāš ļø **You can not trade this item for cowoncy. Failure to follow these rules can result in a ban.**'; } const msg = await p.send({ embed }); return { msg, embed }; diff --git a/src/commands/commandList/shop/util/itemUtil.js b/src/commands/commandList/shop/util/itemUtil.js index 8bacf44d0..5e8641877 100644 --- a/src/commands/commandList/shop/util/itemUtil.js +++ b/src/commands/commandList/shop/util/itemUtil.js @@ -59,12 +59,12 @@ exports.getItems = async function (p) { exports.use = async function (id, p) { let item = getById(id); switch (item?.id) { - case 10: - case 14: - await useCommonTicket(item, p); - break; - default: - await p.errorMsg(', something went wrong using this item... :('); + case 10: + case 14: + await useCommonTicket(item, p); + break; + default: + await p.errorMsg(', something went wrong using this item... :('); } }; @@ -209,11 +209,11 @@ exports.desc = async function (p, id) { }; if (item.giveOnly) { - embed.fields[0].value += `\n\nšŸ’ø **This item can only be gifted. You cannot trade this for cowoncy.**`; + embed.fields[0].value += '\n\nšŸ’ø **This item can only be gifted. You cannot trade this for cowoncy.**'; } if (item.untradeable) { - embed.fields[0].value += `\n\nšŸš« **This item can not be traded.**`; + embed.fields[0].value += '\n\nšŸš« **This item can not be traded.**'; } if (item.tradeLimit) { diff --git a/src/commands/commandList/shop/util/shopUtil.js b/src/commands/commandList/shop/util/shopUtil.js index 3986ccc9b..b943446ce 100644 --- a/src/commands/commandList/shop/util/shopUtil.js +++ b/src/commands/commandList/shop/util/shopUtil.js @@ -40,7 +40,7 @@ exports.toSmallNum = function (count, digits) { }; exports.displayWallpaperShop = async function (p) { - let sql = `SELECT COUNT(bid) AS count FROM backgrounds WHERE active = 1;`; + let sql = 'SELECT COUNT(bid) AS count FROM backgrounds WHERE active = 1;'; let result = await p.query(sql); let totalPages = result[0].count; let currentPage = 1; diff --git a/src/commands/commandList/social/cookie.js b/src/commands/commandList/social/cookie.js index 102f71509..b323b30d6 100644 --- a/src/commands/commandList/social/cookie.js +++ b/src/commands/commandList/social/cookie.js @@ -48,7 +48,7 @@ async function give(p, con, msg, args, global, send) { } } if (msg.author.id == user.id) { - p.errorMsg(", you can't give yourself a cookie, silly!", 3000); + p.errorMsg(', you can\'t give yourself a cookie, silly!', 3000); return; } diff --git a/src/commands/commandList/social/define.js b/src/commands/commandList/social/define.js index d575ec465..eb991b19d 100644 --- a/src/commands/commandList/social/define.js +++ b/src/commands/commandList/social/define.js @@ -41,7 +41,7 @@ module.exports = new CommandInterface({ await ud.define(word, function (error, entries) { try { if (error) { - p.errorMsg(", I couldn't find that word! :c", 3000); + p.errorMsg(', I couldn\'t find that word! :c', 3000); } else { let pages = []; let count = 1; @@ -69,7 +69,7 @@ module.exports = new CommandInterface({ description: print || '*no description*', color: p.config.embed_color, author: { - name: "Definition of '" + entries[0].word + "'", + name: 'Definition of \'' + entries[0].word + '\'', icon_url: p.msg.author.avatarURL, }, url: url, diff --git a/src/commands/commandList/social/divorce.js b/src/commands/commandList/social/divorce.js index 8f402287e..05c66e8ba 100644 --- a/src/commands/commandList/social/divorce.js +++ b/src/commands/commandList/social/divorce.js @@ -48,7 +48,7 @@ module.exports = new CommandInterface({ let result = await p.query(sql); if (result.length < 1) { - p.errorMsg(", you can't divorce if you aren't married, silly butt!", 3000); + p.errorMsg(', you can\'t divorce if you aren\'t married, silly butt!', 3000); return; } diff --git a/src/commands/commandList/social/eightball.js b/src/commands/commandList/social/eightball.js index dbe0159ce..256e1bb30 100644 --- a/src/commands/commandList/social/eightball.js +++ b/src/commands/commandList/social/eightball.js @@ -19,7 +19,7 @@ const pronouns = [ 'nii-san', 'onee-san', 'love', - "ma'am", + 'ma\'am', 'sir', 'friend', 'b-baka', @@ -43,7 +43,7 @@ const answer = [ 'maybe', 'you bet', 'not a chance', - "it's a secret", + 'it\'s a secret', 'only for today', ]; const faces = [ @@ -73,7 +73,7 @@ const result = [ '?a?!!', '?p?... ?a?', '?a?! ?f?', - "don't tell anyone but ?a? ?f?", + 'don\'t tell anyone but ?a? ?f?', ]; module.exports = new CommandInterface({ diff --git a/src/commands/commandList/social/emoji.js b/src/commands/commandList/social/emoji.js index 3f9cf5f07..1e8e9416c 100644 --- a/src/commands/commandList/social/emoji.js +++ b/src/commands/commandList/social/emoji.js @@ -19,7 +19,7 @@ module.exports = new CommandInterface({ args: '{setguild|unsetguild|previous|emoji1 emoji2 emoji3...}', - desc: "Enlarge an emoji! You can list multiple emojis are use the 'previous' keyword to enlarge an emoji from the message above you!\nYou can also steal emojis if you use 'owo emoji setguild'.", + desc: 'Enlarge an emoji! You can list multiple emojis are use the \'previous\' keyword to enlarge an emoji from the message above you!\nYou can also steal emojis if you use \'owo emoji setguild\'.', example: ['owo emoji previous', 'owo emoji setguild'], @@ -192,7 +192,7 @@ async function setServer(p) { // Check if the bot has permissions if (!p.msg.channel.guild.members.get(p.client.user.id).permissions.has('manageEmojis')) { p.errorMsg( - ", I don't have permissions to add emojis! Please give me permission or reinvite me!\n" + + ', I don\'t have permissions to add emojis! Please give me permission or reinvite me!\n' + p.config.invitelink ); return; diff --git a/src/commands/commandList/social/level.js b/src/commands/commandList/social/level.js index 599f4784f..7fd690066 100644 --- a/src/commands/commandList/social/level.js +++ b/src/commands/commandList/social/level.js @@ -15,7 +15,7 @@ module.exports = new CommandInterface({ args: '[server|disabletext|enabletext]', - desc: "Display your Level! Increase your level by talking on Discord!\nYou can gain a maximum of 3000xp per day with a bonus of 500 for the first message of the day! SPAMMING MESSAGES WILL NOT COUNT.\nYou will get rewards for leveling up. If you missed a level up reward, you can type this command to claim it. You can disable level up messages for the guild by using 'owo level disabletext'.", + desc: 'Display your Level! Increase your level by talking on Discord!\nYou can gain a maximum of 3000xp per day with a bonus of 500 for the first message of the day! SPAMMING MESSAGES WILL NOT COUNT.\nYou will get rewards for leveling up. If you missed a level up reward, you can type this command to claim it. You can disable level up messages for the guild by using \'owo level disabletext\'.', example: ['owo level', 'owo level server', 'owo level disabletext'], diff --git a/src/commands/commandList/social/marry.js b/src/commands/commandList/social/marry.js index bb799a5fe..b8f9c02d3 100644 --- a/src/commands/commandList/social/marry.js +++ b/src/commands/commandList/social/marry.js @@ -76,7 +76,7 @@ module.exports = new CommandInterface({ ringId = parseInt(p.args[0]); } else { p.errorMsg( - ", invalid arguments! Please include the person you're marrying and the ring id.", + ', invalid arguments! Please include the person you\'re marrying and the ring id.', 3000 ); return; @@ -84,13 +84,13 @@ module.exports = new CommandInterface({ /* More validation checks */ if (ringId < 1 || ringId > 7) { - p.errorMsg(", that's not a valid ring id!", 3000); + p.errorMsg(', that\'s not a valid ring id!', 3000); return; } else if (id == p.msg.author.id) { - p.errorMsg(", silly. You can't marry yourself!", 3000); + p.errorMsg(', silly. You can\'t marry yourself!', 3000); return; } else if (id == p.client.user.id) { - p.errorMsg(", sorry love! I'm already taken c;", 3000); + p.errorMsg(', sorry love! I\'m already taken c;', 3000); return; } @@ -99,7 +99,7 @@ module.exports = new CommandInterface({ p.errorMsg(', please tag a user to marry them!', 3000); return; } else if (user.bot) { - p.errorMsg(", you silly hooman! You can't marry a bot!", 3000); + p.errorMsg(', you silly hooman! You can\'t marry a bot!', 3000); return; } @@ -132,7 +132,7 @@ async function propose(p, user, ringId) { sql += `SELECT * FROM user WHERE id = ${user.id}`; result = await p.query(sql); if (result[0].changedRows < 1) { - p.errorMsg(", You don't have this ring! Please buy one at `owo shop`!"); + p.errorMsg(', You don\'t have this ring! Please buy one at `owo shop`!'); return; } @@ -184,7 +184,7 @@ async function upgradeRing(p, user, ringId, result, ringResult) { p.errorMsg(', you or your friend is already married!'); return; } else if (ringResult.length < 1) { - p.errorMsg(", you cannot upgrade your ring if you don't have it silly!", 3000); + p.errorMsg(', you cannot upgrade your ring if you don\'t have it silly!', 3000); return; } else if (ringId == result.rid) { p.errorMsg(', you silly. You are already using a ring with the same rarity!'); @@ -235,7 +235,7 @@ async function upgradeRing(p, user, ringId, result, ringResult) { let iresult = await p.query(sql); if (iresult.changedRows < 1) { embed.description = - embed.description + "\n\nšŸš« I don't see the ring in your inventory... šŸ˜"; + embed.description + '\n\nšŸš« I don\'t see the ring in your inventory... šŸ˜'; msg.edit({ embed }); return; } diff --git a/src/commands/commandList/social/owoify.js b/src/commands/commandList/social/owoify.js index 6189f8881..10a5fdfd5 100644 --- a/src/commands/commandList/social/owoify.js +++ b/src/commands/commandList/social/owoify.js @@ -15,7 +15,7 @@ module.exports = new CommandInterface({ args: '{text}', - desc: "OwOify your text! You can also just type 'owo owoify' to OwOify the message above yours!", + desc: 'OwOify your text! You can also just type \'owo owoify\' to OwOify the message above yours!', example: ['owo owoify Hello, I like OwO Bot!', 'owo owoify'], diff --git a/src/commands/commandList/social/pray.js b/src/commands/commandList/social/pray.js index 69a1f7663..7710ad999 100644 --- a/src/commands/commandList/social/pray.js +++ b/src/commands/commandList/social/pray.js @@ -20,7 +20,7 @@ const curseLines = [ 'You feel very unlucky.', 'Oh no.', 'You should be careful...', - "I've got a bad feeling about this...", + 'I\'ve got a bad feeling about this...', 'oh boy.', 'rip', ]; @@ -148,8 +148,8 @@ module.exports = new CommandInterface({ p.send(text); if (user && quest) p.quest(quest, 1, user); if (opponentPoints && user) { - p.logger.incr(`pray`, 1, { from: p.msg.author.id, to: user.id }); + p.logger.incr('pray', 1, { from: p.msg.author.id, to: user.id }); p.macro.checkToCommands(p, user.id); - } else p.logger.incr(`pray`, 1, { from: p.msg.author.id, to: 'self' }); + } else p.logger.incr('pray', 1, { from: p.msg.author.id, to: 'self' }); }, }); diff --git a/src/commands/commandList/social/profile.js b/src/commands/commandList/social/profile.js index 16296172d..ab767b960 100644 --- a/src/commands/commandList/social/profile.js +++ b/src/commands/commandList/social/profile.js @@ -37,7 +37,7 @@ module.exports = new CommandInterface({ } else if (p.global.isUser(p.args[0]) || p.global.isInt(p.args[0])) { let user = p.args[0].match(/[0-9]+/)[0]; user = await p.fetch.getUser(user); - if (!user) p.errorMsg(", I couldn't find that user!", 3000); + if (!user) p.errorMsg(', I couldn\'t find that user!', 3000); else { let sql = `SELECT private FROM user INNER JOIN user_profile ON user.uid = user_profile.uid WHERE id = ${user.id};`; let result = await p.query(sql); diff --git a/src/commands/commandList/social/translate.js b/src/commands/commandList/social/translate.js index cc351fc93..35a448bc4 100644 --- a/src/commands/commandList/social/translate.js +++ b/src/commands/commandList/social/translate.js @@ -14,7 +14,7 @@ module.exports = new CommandInterface({ args: '{msg} -{language}', - desc: "Translates a message to a specific language. The default language will be english.\nUse 'owo listlang to list all the languages", + desc: 'Translates a message to a specific language. The default language will be english.\nUse \'owo listlang to list all the languages', example: ['owo translate Hello -ja', 'owo translate no hablo espanol -en'], diff --git a/src/commands/commandList/social/util/levelUtil.js b/src/commands/commandList/social/util/levelUtil.js index 46b64a194..af8b2836f 100644 --- a/src/commands/commandList/social/util/levelUtil.js +++ b/src/commands/commandList/social/util/levelUtil.js @@ -122,7 +122,7 @@ async function getInfo(p, user) { let sql = `SELECT user_profile.* from user_profile INNER JOIN user ON user.uid = user_profile.uid WHERE user.id = ${user.id};`; let result = await p.query(sql); let info = { - about: "I'm just a plain human.", + about: 'I\'m just a plain human.', title: 'An OwO Bot User', }; if (result[0]) { diff --git a/src/commands/commandList/social/util/profileUtil.js b/src/commands/commandList/social/util/profileUtil.js index 1ed3f5ad5..5d1ee8a3a 100644 --- a/src/commands/commandList/social/util/profileUtil.js +++ b/src/commands/commandList/social/util/profileUtil.js @@ -201,7 +201,7 @@ async function getInfo(p, user) { let sql = `SELECT user_profile.* from user_profile INNER JOIN user ON user.uid = user_profile.uid WHERE user.id = ${user.id};`; let result = await p.query(sql); let info = { - about: "I'm just a plain human.", + about: 'I\'m just a plain human.', title: 'An OwO Bot User', }; if (result[0]) { @@ -249,7 +249,7 @@ exports.editBackground = async function (p) { let sql = `SELECT u.uid,b.* FROM user u INNER JOIN user_backgrounds ub ON u.uid = ub.uid INNER JOIN backgrounds b ON ub.bid = b.bid WHERE u.id = ${p.msg.author.id} AND ub.bid = ${bid}`; let result = await p.query(sql); if (!result[0]) { - p.errorMsg(", You don't have a wallpaper with this id! Please buy one from `owo shop`!", 3000); + p.errorMsg(', You don\'t have a wallpaper with this id! Please buy one from `owo shop`!', 3000); return; } diff --git a/src/commands/commandList/social/util/ringUtil.js b/src/commands/commandList/social/util/ringUtil.js index 3964290b2..a977aecba 100644 --- a/src/commands/commandList/social/util/ringUtil.js +++ b/src/commands/commandList/social/util/ringUtil.js @@ -35,7 +35,7 @@ exports.buy = async function (p, id) { } // TODO neo4j - p.logger.decr(`cowoncy`, -1 * ring.price, { type: 'ring' }, p.msg); + p.logger.decr('cowoncy', -1 * ring.price, { type: 'ring' }, p.msg); let an = p.global.isVowel(ring.name) ? 'n' : ''; let text = `${cart} **| ${p.msg.author.username}**, you bought a${an} ${ring.emoji} **${ ring.name @@ -89,7 +89,7 @@ exports.sell = async function (p, id) { sql = `UPDATE cowoncy SET money = money + ${price} WHERE id = ${p.msg.author.id};`; await p.query(sql); // TODO neo4j - p.logger.incr(`cowoncy`, price, { type: 'ring' }, p.msg); + p.logger.incr('cowoncy', price, { type: 'ring' }, p.msg); p.replyMsg( sold, ', you sold a' + diff --git a/src/commands/commandList/social/util/wallpaperUtil.js b/src/commands/commandList/social/util/wallpaperUtil.js index f90275e87..b8c57ea96 100644 --- a/src/commands/commandList/social/util/wallpaperUtil.js +++ b/src/commands/commandList/social/util/wallpaperUtil.js @@ -32,7 +32,7 @@ exports.buy = async function (p, id) { sql = `UPDATE cowoncy SET money = money - ${price} WHERE id = ${p.msg.author.id} AND money >= ${price};`; let result2 = await p.query(sql); if (result2.affectedRows <= 0) { - p.errorMsg(", you don't have enough cowoncy! :c", 3000); + p.errorMsg(', you don\'t have enough cowoncy! :c', 3000); return; } diff --git a/src/commands/commandList/social/wallpaper.js b/src/commands/commandList/social/wallpaper.js index 9578e3729..0e4d8570a 100644 --- a/src/commands/commandList/social/wallpaper.js +++ b/src/commands/commandList/social/wallpaper.js @@ -89,7 +89,7 @@ async function createPage(p, page, totalPages) { let embed = { author: { - name: p.msg.author.username + "'s wallpapers", + name: p.msg.author.username + '\'s wallpapers', icon_url: p.msg.author.avatarURL, }, color: p.config.embed_color, @@ -106,7 +106,7 @@ async function createPage(p, page, totalPages) { if (result[0].profile) embed.description += ' *Currently Equipped*'; embed.bid = result[0].bid; } else { - embed.description = "You don't have any wallpapers! :c Purchase one in `owo shop`!"; + embed.description = 'You don\'t have any wallpapers! :c Purchase one in `owo shop`!'; delete embed.footer; } diff --git a/src/commands/commandList/utils/announcement.js b/src/commands/commandList/utils/announcement.js index fd0fdb528..c0ac0a32b 100644 --- a/src/commands/commandList/utils/announcement.js +++ b/src/commands/commandList/utils/announcement.js @@ -12,7 +12,7 @@ module.exports = new CommandInterface({ args: '{disable|enable}', - desc: "View the latest announcement! Announcements will also be displayed in your daily command! You can disable this by typing 'owo announcement disable'", + desc: 'View the latest announcement! Announcements will also be displayed in your daily command! You can disable this by typing \'owo announcement disable\'', example: ['owo announcement', 'owo announcement enable', 'owo announcement disable'], diff --git a/src/commands/commandList/utils/avatar.js b/src/commands/commandList/utils/avatar.js index d406a84ea..0ac82221b 100644 --- a/src/commands/commandList/utils/avatar.js +++ b/src/commands/commandList/utils/avatar.js @@ -12,7 +12,7 @@ module.exports = new CommandInterface({ args: '{@user}', - desc: "Look at your or other people's avatar!", + desc: 'Look at your or other people\'s avatar!', example: ['owo avatar @OwO'], diff --git a/src/commands/commandList/utils/checklist.js b/src/commands/commandList/utils/checklist.js index 3ade387c8..5f57ea329 100644 --- a/src/commands/commandList/utils/checklist.js +++ b/src/commands/commandList/utils/checklist.js @@ -108,7 +108,7 @@ module.exports = new CommandInterface({ let embed = { author: { - name: p.msg.author.username + "'s Checklist", + name: p.msg.author.username + '\'s Checklist', icon_url: p.msg.author.avatarURL, }, color: p.config.embed_color, @@ -197,7 +197,7 @@ function quests(p) { if (afterMid && !afterMid.after) { return { done: true, - desc: "You already claimed today's quest!" + rrText, + desc: 'You already claimed today\'s quest!' + rrText, emoji: 'šŸ“œ', }; } else diff --git a/src/commands/commandList/utils/color.js b/src/commands/commandList/utils/color.js index 9685d180c..5ee4cce62 100644 --- a/src/commands/commandList/utils/color.js +++ b/src/commands/commandList/utils/color.js @@ -67,11 +67,11 @@ module.exports = new CommandInterface({ palette = await Vibrant.from(url).getPalette(); } catch (err) { p.errorMsg( - '... sowwy, I couldnt parse the average color of ' + user.username + "'s profile!", + '... sowwy, I couldnt parse the average color of ' + user.username + '\'s profile!', 3000 ); } - title = ', here is the prominent color for ' + user.username + "'s profile picture!"; + title = ', here is the prominent color for ' + user.username + '\'s profile picture!'; colors = []; for (let i in palette) { let values = parseRGB(palette[i]._rgb); @@ -136,7 +136,7 @@ module.exports = new CommandInterface({ color.b > 255 || !/[0-9,A-F]{6}/g.test(color.hex)) ) { - p.errorMsg(", that's an invalid color!", 3000); + p.errorMsg(', that\'s an invalid color!', 3000); return; } @@ -350,24 +350,24 @@ function randHSL(p, args) { for (let i in args) { let arg = args[i].replace(/[:=]/gi, '').toUpperCase(); switch (arg.charAt(0)) { - case 'H': - h = parsePercent(arg); - if (h == -1) return; - break; - case 'S': - s = parsePercent(arg); - if (s == -1) return; - break; - case 'V': - l = parsePercent(arg); - if (l == -1) return; - break; - case 'L': - l = parsePercent(arg); - if (l == -1) return; - break; - default: - return; + case 'H': + h = parsePercent(arg); + if (h == -1) return; + break; + case 'S': + s = parsePercent(arg); + if (s == -1) return; + break; + case 'V': + l = parsePercent(arg); + if (l == -1) return; + break; + case 'L': + l = parsePercent(arg); + if (l == -1) return; + break; + default: + return; } } @@ -414,15 +414,15 @@ function rgbToHsl(r, g, b) { let d = max - min; s = l > 0.5 ? d / (2 - max - min) : d / (max + min); switch (max) { - case r: - h = (g - b) / d + (g < b ? 6 : 0); - break; - case g: - h = (b - r) / d + 2; - break; - case b: - h = (r - g) / d + 4; - break; + case r: + h = (g - b) / d + (g < b ? 6 : 0); + break; + case g: + h = (b - r) / d + 2; + break; + case b: + h = (r - g) / d + 4; + break; } h /= 6; } diff --git a/src/commands/commandList/utils/disable.js b/src/commands/commandList/utils/disable.js index 5870441fc..356f3df38 100644 --- a/src/commands/commandList/utils/disable.js +++ b/src/commands/commandList/utils/disable.js @@ -41,13 +41,13 @@ module.exports = new CommandInterface({ // If the user wants to disable all commands if (commands.includes('all')) { - let list = '(' + p.msg.channel.id + ",'all'),"; + let list = '(' + p.msg.channel.id + ',\'all\'),'; for (let key in p.mcommands) { if (key != 'disable' && key != 'enable') - list += '(' + p.msg.channel.id + ",'" + key + "'),"; + list += '(' + p.msg.channel.id + ',\'' + key + '\'),'; } for (let key in p.commandGroups) { - if (key != 'undefined') list += '(' + p.msg.channel.id + ",'" + key + "'),"; + if (key != 'undefined') list += '(' + p.msg.channel.id + ',\'' + key + '\'),'; } list = list.slice(0, -1); let sql = 'INSERT IGNORE INTO disabled (channel,command) VALUES ' + list + ';'; @@ -65,7 +65,7 @@ module.exports = new CommandInterface({ if (!command && p.commandGroups[commands[i]]) command = commands[i]; if (command && command != 'disabled' && command != 'enable' && command != 'undefined') { validCommand = true; - sql += '(' + p.msg.channel.id + ",'" + command + "'),"; + sql += '(' + p.msg.channel.id + ',\'' + command + '\'),'; } } sql = sql.slice(0, -1) + ';'; diff --git a/src/commands/commandList/utils/distored.js b/src/commands/commandList/utils/distored.js index 1bb86a472..fbb547a99 100644 --- a/src/commands/commandList/utils/distored.js +++ b/src/commands/commandList/utils/distored.js @@ -13,7 +13,7 @@ const text = [ 'Good luck!', 'Go get em!', 'Beep boop.', - "Good luck... You'll need it :)", + 'Good luck... You\'ll need it :)', 'I wish you luck!', ]; diff --git a/src/commands/commandList/utils/enable.js b/src/commands/commandList/utils/enable.js index a6b492b38..9c03ef2a0 100644 --- a/src/commands/commandList/utils/enable.js +++ b/src/commands/commandList/utils/enable.js @@ -75,9 +75,9 @@ module.exports = new CommandInterface({ await p.query( 'DELETE FROM disabled WHERE channel = ' + p.msg.channel.id + - " AND command IN ('all','" + - Array.from(remove).join("','") + - "');" + ' AND command IN (\'all\',\'' + + Array.from(remove).join('\',\'') + + '\');' ); } diff --git a/src/commands/commandList/utils/help.js b/src/commands/commandList/utils/help.js index a50f647f8..41eaf0239 100644 --- a/src/commands/commandList/utils/help.js +++ b/src/commands/commandList/utils/help.js @@ -42,26 +42,26 @@ module.exports = new CommandInterface({ else { let command = p.aliasToCommand[p.args[0]]; switch (command) { - case 'battle': - await battleHelpUtil.help(p, 0); - break; - case 'team': - await battleHelpUtil.help(p, 0); - break; - case 'weapon': - await battleHelpUtil.help(p, 2); - break; - case 'crate': - await battleHelpUtil.help(p, 1); - break; - case 'battlesetting': - await battleHelpUtil.help(p, 5); - break; - case 'weaponshard': - await battleHelpUtil.help(p, 6); - break; - default: - describe(p, p.send, p.args[0], p.commands[command]); + case 'battle': + await battleHelpUtil.help(p, 0); + break; + case 'team': + await battleHelpUtil.help(p, 0); + break; + case 'weapon': + await battleHelpUtil.help(p, 2); + break; + case 'crate': + await battleHelpUtil.help(p, 1); + break; + case 'battlesetting': + await battleHelpUtil.help(p, 5); + break; + case 'weaponshard': + await battleHelpUtil.help(p, 6); + break; + default: + describe(p, p.send, p.args[0], p.commands[command]); } } }, diff --git a/src/commands/commandList/utils/math.js b/src/commands/commandList/utils/math.js index e49522a05..6064fe66e 100644 --- a/src/commands/commandList/utils/math.js +++ b/src/commands/commandList/utils/math.js @@ -59,7 +59,7 @@ module.exports = new CommandInterface({ .catch(function (err) { if (err.message == 'Promise timed out after 1000 ms') p.errorMsg(', that expression is too difficult for me... :c', 3000); - else p.errorMsg("... I don't think that's an expression silly head", 3000); + else p.errorMsg('... I don\'t think that\'s an expression silly head', 3000); }) .then(function () { pool.terminate(); diff --git a/src/commands/commandList/utils/prefix.js b/src/commands/commandList/utils/prefix.js index ac3e223c5..e26e19484 100644 --- a/src/commands/commandList/utils/prefix.js +++ b/src/commands/commandList/utils/prefix.js @@ -16,7 +16,7 @@ const comments = [ 'nice.', ';)', 'I love it <3', - "It's perfect!", + 'It\'s perfect!', 'amazing.', 'wow', 'Wonderful', @@ -56,7 +56,7 @@ module.exports = new CommandInterface({ // Must have manage channels perm if (!p.msg.member.permissions.has('manageChannels')) { - p.errorMsg(", you're not an admin! >:c", 3000); + p.errorMsg(', you\'re not an admin! >:c', 3000); return; } diff --git a/src/commands/commandList/utils/rules.js b/src/commands/commandList/utils/rules.js index 94520bcea..9a5e41958 100644 --- a/src/commands/commandList/utils/rules.js +++ b/src/commands/commandList/utils/rules.js @@ -53,7 +53,7 @@ module.exports = new CommandInterface({ descriptionExtra = '\n\n*Clicking on the button means you will follow the rules and acknowlege the consequences*'; else if (result[0][0].opinion == 1) - descriptionExtra = "\n\nOwO what's this? You already agreed to these rules! <3"; + descriptionExtra = '\n\nOwO what\'s this? You already agreed to these rules! <3'; else descriptionExtra = '\n\nUwU you disagreed! You still have to follow these rules though! c:<'; let embed = { @@ -77,21 +77,21 @@ module.exports = new CommandInterface({ let components = !voted ? [ - { - type: 1, - components: [ - { - type: 2, - label: 'I accept the OwO Bot Rules', - style: 1, - custom_id: 'accept_rules', - emoji: { - id: null, - name: agreeEmoji, - }, + { + type: 1, + components: [ + { + type: 2, + label: 'I accept the OwO Bot Rules', + style: 1, + custom_id: 'accept_rules', + emoji: { + id: null, + name: agreeEmoji, }, - ], - }, + }, + ], + }, ] : null; let message = await p.send({ content, embed, components }); @@ -110,7 +110,7 @@ module.exports = new CommandInterface({ let sql = 'INSERT IGNORE INTO rules (uid,opinion) VALUES ((SELECT uid FROM user WHERE id = ?),1)'; embed.footer.text = p.global.toFancyNum(agree + 1) + ' Users agreed'; - embed.description = description + "\n\nOwO what's this? You agreed to these rules! <3"; + embed.description = description + '\n\nOwO what\'s this? You agreed to these rules! <3'; sql = 'INSERT IGNORE INTO user (id,count) VALUES (?,0);' + sql; // Query and edit existing message diff --git a/src/commands/commandList/utils/shard.js b/src/commands/commandList/utils/shard.js index 36fdda60c..44a36c532 100644 --- a/src/commands/commandList/utils/shard.js +++ b/src/commands/commandList/utils/shard.js @@ -117,14 +117,14 @@ module.exports = new CommandInterface({ }); function getPage(p, currentPage, shards, shardID) { - let desc = `\`\`\`\n[ID] cluster ping uptime status\n`; + let desc = '```\n[ID] cluster ping uptime status\n'; for (let i = currentPage * perPage; i < perPage + currentPage * perPage; i++) { if (shards[i]) desc += shards[i] + '\n'; } desc += '```'; let embed = { author: { - name: p.msg.author.username + ", here are the bot's shards!", + name: p.msg.author.username + ', here are the bot\'s shards!', icon_url: p.msg.author.avatarURL, }, description: desc, diff --git a/src/commands/commandList/utils/stats.js b/src/commands/commandList/utils/stats.js index 5d35705b0..88ca4e79e 100644 --- a/src/commands/commandList/utils/stats.js +++ b/src/commands/commandList/utils/stats.js @@ -57,7 +57,7 @@ module.exports = new CommandInterface({ let embed = { description: - "Here's a little bit of information! If you need help with commands, type `owo help`.", + 'Here\'s a little bit of information! If you need help with commands, type `owo help`.', color: p.config.embed_color, timestamp: new Date(), author: { diff --git a/src/commands/commandList/utils/suggest.js b/src/commands/commandList/utils/suggest.js index 77291f839..c3276b0c1 100644 --- a/src/commands/commandList/utils/suggest.js +++ b/src/commands/commandList/utils/suggest.js @@ -64,7 +64,7 @@ async function suggest(message) { const embed = { color: this.config.embed_color, author: { - name: this.msg.author.username + "'s suggestion", + name: this.msg.author.username + '\'s suggestion', icon_url: this.msg.author.avatarURL, }, description: message, @@ -172,7 +172,7 @@ async function confirmSuggestion(message) { color: this.config.embed_color, timestamp: new Date(), author: { - name: this.msg.author.username + "'s suggestion", + name: this.msg.author.username + '\'s suggestion', icon_url: this.msg.author.avatarURL, }, description: message, diff --git a/src/commands/commandList/utils/survey.js b/src/commands/commandList/utils/survey.js index 315476443..0a7ecad7a 100644 --- a/src/commands/commandList/utils/survey.js +++ b/src/commands/commandList/utils/survey.js @@ -72,7 +72,7 @@ async function getSurvey(uid) { let userSurvey, survey; try { let sql = `SELECT * FROM user_survey WHERE uid = ${uid};`; - sql += `SELECT * FROM survey_question WHERE sid = (SELECT sid FROM survey ORDER BY sid DESC LIMIT 1);`; + sql += 'SELECT * FROM survey_question WHERE sid = (SELECT sid FROM survey ORDER BY sid DESC LIMIT 1);'; const result = await con.query(sql); userSurvey = result[0][0]; diff --git a/src/commands/commandList/utils/utils/enabledUtil.js b/src/commands/commandList/utils/utils/enabledUtil.js index c3e9441ac..499d8bc2c 100644 --- a/src/commands/commandList/utils/utils/enabledUtil.js +++ b/src/commands/commandList/utils/utils/enabledUtil.js @@ -79,7 +79,7 @@ exports.createEmbed = async function (p) { }); if (commandString !== '') { embed.fields.push({ - name: groupName + (fieldsCount ? ` [${fieldsCount + 1}]` : ``), + name: groupName + (fieldsCount ? ` [${fieldsCount + 1}]` : ''), value: commandString, }); } diff --git a/src/commands/commandList/utils/vote.js b/src/commands/commandList/utils/vote.js index 839d3d59d..24acdcf59 100644 --- a/src/commands/commandList/utils/vote.js +++ b/src/commands/commandList/utils/vote.js @@ -48,13 +48,13 @@ module.exports = new CommandInterface({ box.sql = 'INSERT INTO lootbox(id,boxcount,claimcount,claim) VALUES (' + p.msg.author.id + - ",1,0,'2017-01-01') ON DUPLICATE KEY UPDATE boxcount = boxcount + 1;"; + ',1,0,\'2017-01-01\') ON DUPLICATE KEY UPDATE boxcount = boxcount + 1;'; box.text = '**<:box:427352600476647425> |** You received a lootbox!\n'; } else { box.sql = 'INSERT INTO crate(uid,cratetype,boxcount,claimcount,claim) VALUES ((SELECT uid FROM user WHERE id = ' + p.msg.author.id + - "),0,1,0,'2017-01-01') ON DUPLICATE KEY UPDATE boxcount = boxcount + 1;"; + '),0,1,0,\'2017-01-01\') ON DUPLICATE KEY UPDATE boxcount = boxcount + 1;'; box.text = '**<:crate:523771259302182922> |** You received a weapon crate!\n'; } var reward = 100; @@ -77,7 +77,7 @@ module.exports = new CommandInterface({ return; } p.logger.incr( - `cowoncy`, + 'cowoncy', reward + patreonBonus + weekendBonus, { type: 'vote' }, p.msg @@ -91,7 +91,7 @@ module.exports = new CommandInterface({ '\n'; if (weekend) text += - "**ā›± |** It's the weekend! You also earned a bonus of **" + + '**ā›± |** It\'s the weekend! You also earned a bonus of **' + weekendBonus + '** cowoncy!\n'; text += box.text; @@ -99,7 +99,7 @@ module.exports = new CommandInterface({ '**<:blank:427371936482328596> |** https://top.gg/bot/408785106942164992/vote'; p.send(text); //console.log("\x1b[33m",id+" has voted for the first time!"); - p.logger.incr(`votecount`, 1, {}, p.msg); + p.logger.incr('votecount', 1, {}, p.msg); }); } else if (result[0][0].time >= 12) { let box = {}; @@ -107,13 +107,13 @@ module.exports = new CommandInterface({ box.sql = 'INSERT INTO lootbox(id,boxcount,claimcount,claim) VALUES (' + p.msg.author.id + - ",1,0,'2017-01-01') ON DUPLICATE KEY UPDATE boxcount = boxcount + 1;"; + ',1,0,\'2017-01-01\') ON DUPLICATE KEY UPDATE boxcount = boxcount + 1;'; box.text = '**<:box:427352600476647425> |** You received a lootbox!\n'; } else { box.sql = 'INSERT INTO crate(uid,cratetype,boxcount,claimcount,claim) VALUES ((SELECT uid FROM user WHERE id = ' + p.msg.author.id + - "),0,1,0,'2017-01-01') ON DUPLICATE KEY UPDATE boxcount = boxcount + 1;"; + '),0,1,0,\'2017-01-01\') ON DUPLICATE KEY UPDATE boxcount = boxcount + 1;'; box.text = '**<:crate:523771259302182922> |** You received a weapon crate!\n'; } var bonus = 100 + result[0][0].count * 3; @@ -136,7 +136,7 @@ module.exports = new CommandInterface({ return; } p.logger.incr( - `cowoncy`, + 'cowoncy', bonus + patreonBonus + weekendBonus, { type: 'vote' }, p.msg @@ -150,7 +150,7 @@ module.exports = new CommandInterface({ '\n'; if (weekend) text += - "**ā›± |** It's the weekend! You also earned a bonus of **" + + '**ā›± |** It\'s the weekend! You also earned a bonus of **' + weekendBonus + '** cowoncy!\n'; text += box.text; @@ -158,7 +158,7 @@ module.exports = new CommandInterface({ '**<:blank:427371936482328596> |** https://top.gg/bot/408785106942164992/vote'; p.send(text); //console.log("\x1b[33m",id+" has voted and received cowoncy!"); - p.logger.incr(`votecount`, 1, {}, p.msg); + p.logger.incr('votecount', 1, {}, p.msg); }); } else { var text = '**ā˜‘ |** Click the link to vote and gain 100+ cowoncy!\n'; diff --git a/src/commands/commandList/zoo/autohunt.js b/src/commands/commandList/zoo/autohunt.js index 05d83bfc3..4350b9b6e 100644 --- a/src/commands/commandList/zoo/autohunt.js +++ b/src/commands/commandList/zoo/autohunt.js @@ -99,8 +99,8 @@ async function claim(p, msg, con, query, bot) { ORDER BY pt_act.pgid DESC, pt2.pgid ASC LIMIT 1) tmp ON tmp.pgid = pet_team.pgid SET animal.xp = animal.xp + (CASE WHEN tmp.pgid IS NULL THEN ${Math.round( - totalExp / 2 - )} ELSE ${totalExp} END) + totalExp / 2 + )} ELSE ${totalExp} END) WHERE user.id = ${msg.author.id};`; //Get all animal @@ -144,9 +144,9 @@ async function claim(p, msg, con, query, bot) { sql += 'INSERT INTO animal (id,name,count,totalcount) VALUES (' + msg.author.id + - ",'" + + ',\'' + animal + - "'," + + '\',' + total[animal].count + ',' + total[animal].count + @@ -179,14 +179,14 @@ async function claim(p, msg, con, query, bot) { for (let animal in total) { let tempAnimal = global.validAnimal(animal); logger.incr( - `animal`, + 'animal', total[animal].count, { rank: tempAnimal.rank, name: tempAnimal.name }, p.msg ); - logger.incr(`zoo`, tempAnimal.points * total[animal].count, {}, p.msg); + logger.incr('zoo', tempAnimal.points * total[animal].count, {}, p.msg); } - logger.incr(`essence`, totalGain, { type: 'huntbot' }, p.msg); + logger.incr('essence', totalGain, { type: 'huntbot' }, p.msg); } async function autohunt(p, msg, con, args, global, send) { @@ -262,7 +262,7 @@ async function autohunt(p, msg, con, args, global, send) { //Check if enough cowoncy if (!result[1][0] || result[1][0].money < cowoncy) { - send('**šŸš« | ' + msg.author.username + "**, You don't have enough cowoncy!", 3000); + send('**šŸš« | ' + msg.author.username + '**, You don\'t have enough cowoncy!', 3000); return; } @@ -279,11 +279,11 @@ async function autohunt(p, msg, con, args, global, send) { sql = 'INSERT INTO autohunt (id,start,huntcount,huntmin,password,passwordtime) VALUES (' + msg.author.id + - ",NOW(),0,0,'" + + ',NOW(),0,0,\'' + rand + - "',NOW()) ON DUPLICATE KEY UPDATE password = '" + + '\',NOW()) ON DUPLICATE KEY UPDATE password = \'' + rand + - "',passwordtime = NOW();"; + '\',passwordtime = NOW();'; result = await p.query(sql); let text = @@ -362,13 +362,13 @@ async function autohunt(p, msg, con, args, global, send) { huntcount + ',' + huntmin + - ",'') ON DUPLICATE KEY UPDATE start = NOW(), huntcount = " + + ',\'\') ON DUPLICATE KEY UPDATE start = NOW(), huntcount = ' + huntcount + ',huntmin = ' + huntmin + - ",password = '';"; + ',password = \'\';'; result = await p.query(sql); - logger.decr(`cowoncy`, -1 * cowoncy, { type: 'huntbot' }, p.msg); + logger.decr('cowoncy', -1 * cowoncy, { type: 'huntbot' }, p.msg); let min = huntmin % 60; let hour = Math.trunc(huntmin / 60); let timer = ''; @@ -450,7 +450,7 @@ async function display(p, msg, con, send) { let embed = { color: p.config.embed_color, author: { - name: msg.author.username + "'s HuntBot", + name: msg.author.username + '\'s HuntBot', icon_url: msg.author.avatarURL, }, fields: [ diff --git a/src/commands/commandList/zoo/catch.js b/src/commands/commandList/zoo/catch.js index 523cb3364..7162acdf2 100644 --- a/src/commands/commandList/zoo/catch.js +++ b/src/commands/commandList/zoo/catch.js @@ -66,7 +66,7 @@ module.exports = new CommandInterface({ ' AND activecount > 0;'; let result = await p.query(sql); if (result[0][0] == undefined || result[0][0].money < this.animals.rollprice) { - p.errorMsg(", You don't have enough cowoncy!", 3000); + p.errorMsg(', You don\'t have enough cowoncy!', 3000); } else { //Sort gem benefits let gems = {}; @@ -126,11 +126,11 @@ module.exports = new CommandInterface({ //text += "\nāš  **|** `battle` and `hunt` cooldowns have increased to prevent rateLimits issues.\n<:blank:427371936482328596> **|** They will revert back to `15s` in the future."; let result2 = await p.query(sql); - p.logger.decr(`cowoncy`, -5, { type: 'hunt' }, p.msg); + p.logger.decr('cowoncy', -5, { type: 'hunt' }, p.msg); for (let i in animal.animal) { let tempAnimal = p.global.validAnimal(animal.animal[i][1]); - p.logger.incr(`animal`, 1, { rank: tempAnimal.rank, name: tempAnimal.name }, p.msg); - p.logger.incr(`zoo`, tempAnimal.points, {}, p.msg); + p.logger.incr('animal', 1, { rank: tempAnimal.rank, name: tempAnimal.name }, p.msg); + p.logger.incr('zoo', tempAnimal.points, {}, p.msg); } p.quest('hunt'); p.quest('find', 1, animal.typeCount); @@ -198,7 +198,7 @@ function getAnimals(p, result, gems, uid) { for (let i = 0; i < animal.length; i++) { let type = animal[i][2]; xp += animal[i][3]; - insertAnimal += '(1,1,' + p.msg.author.id + ",'" + animal[i][1] + "'),"; + insertAnimal += '(1,1,' + p.msg.author.id + ',\'' + animal[i][1] + '\'),'; if (!typeCount[type]) typeCount[type] = 0; typeCount[type] += 1; } @@ -231,17 +231,17 @@ function getAnimals(p, result, gems, uid) { sql += 'UPDATE user_gem SET activecount = GREATEST(activecount - 1, 0) WHERE uid = ' + uid + - " AND gname = '" + + ' AND gname = \'' + gems['Patreon'].gname + - "';"; + '\';'; if (gems['Hunting']) { huntingActive = true; sql += 'UPDATE user_gem SET activecount = GREATEST(activecount - 1, 0) WHERE uid = ' + uid + - " AND gname = '" + + ' AND gname = \'' + gems['Hunting'].gname + - "';"; + '\';'; } if (gems['Empowering']) { empoweringActive = true; @@ -250,9 +250,9 @@ function getAnimals(p, result, gems, uid) { Math.trunc(animal.length / 2) + ', 0) WHERE uid = ' + uid + - " AND gname = '" + + ' AND gname = \'' + gems['Empowering'].gname + - "';"; + '\';'; } if (gems['Lucky']) { // make lucky gems last twice as long if you're running all 3 gems @@ -264,9 +264,9 @@ function getAnimals(p, result, gems, uid) { luckySubtract + ', 0) WHERE uid = ' + uid + - " AND gname = '" + + ' AND gname = \'' + gems['Lucky'].gname + - "';"; + '\';'; } /* Construct output message for user */ @@ -292,8 +292,8 @@ function getAnimals(p, result, gems, uid) { ? 1 : gems[i].type == 'Empowering' || (gems[i].type == 'Lucky' && huntingActive && empoweringActive) - ? Math.trunc(animal.length / 2) - : animal.length); + ? Math.trunc(animal.length / 2) + : animal.length); if (remaining < 0) remaining = 0; gemText += gems[i].emoji + '`[' + remaining + '/' + gems[i].length + ']` '; } diff --git a/src/commands/commandList/zoo/gemUtil.js b/src/commands/commandList/zoo/gemUtil.js index 367831a65..172c57c08 100644 --- a/src/commands/commandList/zoo/gemUtil.js +++ b/src/commands/commandList/zoo/gemUtil.js @@ -138,9 +138,9 @@ exports.desc = async function (p, id) { const sql = 'SELECT * FROM user NATURAL JOIN user_gem NATURAL JOIN gem WHERE id = ' + p.msg.author.id + - " AND gname = '" + + ' AND gname = \'' + gem.key + - "';"; + '\';'; const result = await p.query(sql); if (!result[0]) { p.errorMsg(', you do not have this item!', 3000); diff --git a/src/commands/commandList/zoo/lootbox.js b/src/commands/commandList/zoo/lootbox.js index c42bf14a4..29f1a1b5d 100644 --- a/src/commands/commandList/zoo/lootbox.js +++ b/src/commands/commandList/zoo/lootbox.js @@ -21,7 +21,7 @@ module.exports = new CommandInterface({ args: '{count}|fabled', - desc: "Opens a lootbox! Check how many you have in 'owo inv'!\nYou can get some more by hunting for animals. You can get a maximum of 3 lootboxes per day.\nYou can use the items by using 'owo use {id}'", + desc: 'Opens a lootbox! Check how many you have in \'owo inv\'!\nYou can get some more by hunting for animals. You can get a maximum of 3 lootboxes per day.\nYou can use the items by using \'owo use {id}\'', example: ['owo lb', 'owo lb 10', 'owo lb fabled'], @@ -41,7 +41,7 @@ module.exports = new CommandInterface({ let sql = `SELECT boxcount FROM lootbox WHERE id = ${p.msg.author.id};`; let result = await p.query(sql); if (!result || result[0].boxcount <= 0) { - p.errorMsg(", you don't have any more lootboxes!"); + p.errorMsg(', you don\'t have any more lootboxes!'); return; } let boxcount = result[0].boxcount; @@ -60,7 +60,7 @@ async function openBox(p) { let uid; if (result[0].changedRows == 0) { - p.errorMsg(", You don't have any lootboxes!", 3000); + p.errorMsg(', You don\'t have any lootboxes!', 3000); return; } else if (!result[1][0] || !result[1][0].uid) { sql = `INSERT IGNORE INTO user (id) VALUES (${p.msg.author.id});`; @@ -118,7 +118,7 @@ async function openMultiple(p, count) { let uid; if (result[0].changedRows == 0) { - p.errorMsg(", You don't have any lootboxes!", 3000); + p.errorMsg(', You don\'t have any lootboxes!', 3000); return; } else if (!result[1][0] || !result[1][0].uid) { sql = `INSERT IGNORE INTO user (id) VALUES (${p.msg.author.id});`; @@ -174,7 +174,7 @@ async function openFabledBox(p) { let uid; if (result[0].changedRows == 0) { - p.errorMsg(", You don't have any lootboxes!", 3000); + p.errorMsg(', You don\'t have any lootboxes!', 3000); return; } else if (!result[1][0] || !result[1][0].uid) { sql = `INSERT IGNORE INTO user (id) VALUES (${p.msg.author.id});`; diff --git a/src/commands/commandList/zoo/lootboxUtil.js b/src/commands/commandList/zoo/lootboxUtil.js index 3d9fc0a7d..ddcc331eb 100644 --- a/src/commands/commandList/zoo/lootboxUtil.js +++ b/src/commands/commandList/zoo/lootboxUtil.js @@ -95,7 +95,7 @@ const getRandomGems = (exports.getRandomGems = function (uid, count = 1, opts) { else gemResult[tempGem.id].count++; } - let sql = `INSERT INTO user_gem (uid,gname,gcount) VALUES `; + let sql = 'INSERT INTO user_gem (uid,gname,gcount) VALUES '; for (let i in gemResult) { sql += `(${uid},'${gemResult[i].gem.key}',${gemResult[i].count}),`; } @@ -112,7 +112,7 @@ exports.desc = function (p, id) { let embed; if (id == 49) { const text = - "**ID:** 49\nOpens a Fabled lootbox! All gems are fabled tier! Check how many you have in 'owo inv'!\nYou currently cannot get these lootboxes in the game.\nUse `owo inv` to check your inventory\nUse 'owo use {id}` to use the item!"; + '**ID:** 49\nOpens a Fabled lootbox! All gems are fabled tier! Check how many you have in \'owo inv\'!\nYou currently cannot get these lootboxes in the game.\nUse `owo inv` to check your inventory\nUse \'owo use {id}` to use the item!'; embed = { color: p.config.embed_color, fields: [ @@ -124,7 +124,7 @@ exports.desc = function (p, id) { }; } else { const text = - "**ID:** 50\nOpens a lootbox! Check how many you have in 'owo inv'!\nYou can get some more by hunting for animals. You can get a maximum of 3 lootboxes per day.\nUse `owo inv` to check your inventory\nUse 'owo use {id}` to use the item!"; + '**ID:** 50\nOpens a lootbox! Check how many you have in \'owo inv\'!\nYou can get some more by hunting for animals. You can get a maximum of 3 lootboxes per day.\nUse `owo inv` to check your inventory\nUse \'owo use {id}` to use the item!'; embed = { color: p.config.embed_color, fields: [ diff --git a/src/commands/commandList/zoo/owodex.js b/src/commands/commandList/zoo/owodex.js index dff502c91..533f289e9 100644 --- a/src/commands/commandList/zoo/owodex.js +++ b/src/commands/commandList/zoo/owodex.js @@ -45,8 +45,8 @@ module.exports = new CommandInterface({ } let sql = - 'SELECT * FROM animal WHERE id = ' + msg.author.id + " AND name = '" + animal.value + "';"; - sql += "SELECT SUM(totalcount) as total FROM animal WHERE name = '" + animal.value + "';"; + 'SELECT * FROM animal WHERE id = ' + msg.author.id + ' AND name = \'' + animal.value + '\';'; + sql += 'SELECT SUM(totalcount) as total FROM animal WHERE name = \'' + animal.value + '\';'; let result = await p.query(sql); if (!result[0][0]) { p.errorMsg(', I could not find that animal in your zoo!', 3000); @@ -76,7 +76,7 @@ module.exports = new CommandInterface({ let rarity = global.toFancyNum(result[1][0].total) + ' total caught'; let nickname = ''; if (result[0][0].nickname) nickname = '**Nickname:** ' + result[0][0].nickname + '\n'; - let desc = "*No description created\nHave a fun/creative description?\nUse 'owo feedback'!*"; + let desc = '*No description created\nHave a fun/creative description?\nUse \'owo feedback\'!*'; if (animal.desc) { desc = '*' + animal.desc.trim() + '*'; let ids = desc.match(/\?[0-9]+\?/g); diff --git a/src/commands/commandList/zoo/sacrifice.js b/src/commands/commandList/zoo/sacrifice.js index 48beb6349..44167b47a 100644 --- a/src/commands/commandList/zoo/sacrifice.js +++ b/src/commands/commandList/zoo/sacrifice.js @@ -121,7 +121,7 @@ async function sellAnimal(p, msg, con, animal, count, send, global) { } sql = - 'SELECT count FROM animal WHERE id = ' + msg.author.id + " AND name = '" + animal.value + "';"; + 'SELECT count FROM animal WHERE id = ' + msg.author.id + ' AND name = \'' + animal.value + '\';'; if (count == 'all') { sql += `UPDATE animal INNER JOIN autohunt ON animal.id = autohunt.id INNER JOIN (SELECT count FROM animal WHERE id = ${msg.author.id} AND name = '${animal.value}') AS sum SET essence = essence + (sum.count*${animal.essence}), autohunt.total = autohunt.total + (sum.count*${animal.essence}), saccount = saccount + animal.count, animal.count = 0 WHERE animal.id = ${msg.author.id} AND name = '${animal.value}' AND animal.count > 0;`; } else { @@ -137,7 +137,7 @@ async function sellAnimal(p, msg, con, animal, count, send, global) { if (count == 'all') { if (!result[0][0] || result[0][0].count <= 0) { - send('**šŸš« | ' + msg.author.username + "**, You don't have enough animals! >:c", 3000); + send('**šŸš« | ' + msg.author.username + '**, You don\'t have enough animals! >:c', 3000); } else { count = result[0][0].count; send( @@ -153,7 +153,7 @@ async function sellAnimal(p, msg, con, animal, count, send, global) { global.toFancyNum(count * animal.essence) + '**' ); - p.logger.incr(`essence`, count * animal.essence, { type: 'sacrifice' }, p.msg); + p.logger.incr('essence', count * animal.essence, { type: 'sacrifice' }, p.msg); } } else if (result[1] && result[1].affectedRows > 0) { send( @@ -169,10 +169,10 @@ async function sellAnimal(p, msg, con, animal, count, send, global) { global.toFancyNum(count * animal.essence) + '**' ); - p.logger.incr(`essence`, count * animal.essence, { type: 'sacrifice' }, p.msg); + p.logger.incr('essence', count * animal.essence, { type: 'sacrifice' }, p.msg); } else { send( - '**šŸš« | ' + msg.author.username + "**, You can't sacrifice more than you have silly! >:c", + '**šŸš« | ' + msg.author.username + '**, You can\'t sacrifice more than you have silly! >:c', 3000 ); } @@ -184,7 +184,7 @@ async function sellRank(p, msg, con, rank, send, global) { if (!result[0]) await p.query(`INSERT IGNORE INTO autohunt (id,essence) VALUES (${msg.author.id},0);`); - let animals = "('" + rank.animals.join("','") + "')"; + let animals = '(\'' + rank.animals.join('\',\'') + '\')'; let points = '(SELECT COALESCE(SUM(count),0) AS sum FROM animal WHERE id = ' + msg.author.id + @@ -209,7 +209,7 @@ async function sellRank(p, msg, con, rank, send, global) { result = await p.query(sql); if (result[1].affectedRows <= 0) { - send('**šŸš« | ' + msg.author.username + "**, You don't have enough animals! >:c", 3000); + send('**šŸš« | ' + msg.author.username + '**, You don\'t have enough animals! >:c', 3000); } else { count = 0; for (let i in result[0]) count += result[0][i].count; @@ -229,7 +229,7 @@ async function sellRank(p, msg, con, rank, send, global) { for (let i in result[0]) { let tempAnimal = p.global.validAnimal(result[0][i].name); - p.logger.incr(`essence`, count * rank.essence, { type: 'sacrifice' }, p.msg); + p.logger.incr('essence', count * rank.essence, { type: 'sacrifice' }, p.msg); } } } @@ -243,7 +243,7 @@ async function sellRanks(p, msg, con, ranks, send, global, p) { sql = ''; for (i in ranks) { let rank = ranks[i]; - let animals = "('" + rank.animals.join("','") + "')"; + let animals = '(\'' + rank.animals.join('\',\'') + '\')'; let points = '(SELECT COALESCE(SUM(count),0) AS sum FROM animal WHERE id = ' + msg.author.id + @@ -302,9 +302,9 @@ async function sellRanks(p, msg, con, ranks, send, global, p) { for (let j in result[count * 2]) { let temp = result[count * 2][j]; let tempAnimal = p.global.validAnimal(temp.name); - p.logger.incr(`essence`, temp.count * rank.essence, { type: 'sacrifice' }, p.msg); + p.logger.incr('essence', temp.count * rank.essence, { type: 'sacrifice' }, p.msg); } count++; } - } else send('**šŸš« | ' + msg.author.username + "**, You don't have enough animals! >:c", 3000); + } else send('**šŸš« | ' + msg.author.username + '**, You don\'t have enough animals! >:c', 3000); } diff --git a/src/commands/commandList/zoo/sell.js b/src/commands/commandList/zoo/sell.js index 755fcc95f..2fe54eecc 100644 --- a/src/commands/commandList/zoo/sell.js +++ b/src/commands/commandList/zoo/sell.js @@ -151,26 +151,26 @@ function sellAnimal(msg, con, animal, count, send, global, p) { count + ' WHERE id = ' + msg.author.id + - " AND name = '" + + ' AND name = \'' + animal.value + - "' AND count >= " + + '\' AND count >= ' + count + ';'; if (count == 'all') { sql = 'SELECT count FROM animal WHERE id = ' + msg.author.id + - " AND name = '" + + ' AND name = \'' + animal.value + - "';"; + '\';'; sql += 'UPDATE cowoncy NATURAL JOIN animal SET money = money + (count*' + animal.price + '), sellcount = sellcount + count, count = 0 WHERE id = ' + msg.author.id + - " AND name = '" + + ' AND name = \'' + animal.value + - "' AND count >= 1;"; + '\' AND count >= 1;'; } con.query(sql, function (err, result) { if (err) { @@ -179,7 +179,7 @@ function sellAnimal(msg, con, animal, count, send, global, p) { } if (count == 'all') { if (result[1].affectedRows <= 0) { - send('**šŸš« | ' + msg.author.username + "**, You don't have enough animals! >:c", 3000); + send('**šŸš« | ' + msg.author.username + '**, You don\'t have enough animals! >:c', 3000); } else { count = result[0][0].count; send( @@ -193,7 +193,7 @@ function sellAnimal(msg, con, animal, count, send, global, p) { global.toFancyNum(count * animal.price) + '**' ); - p.logger.incr(`cowoncy`, count * animal.price, { type: 'sell' }, p.msg); + p.logger.incr('cowoncy', count * animal.price, { type: 'sell' }, p.msg); // TODO neo4j } } else if (result.affectedRows > 0) { @@ -208,11 +208,11 @@ function sellAnimal(msg, con, animal, count, send, global, p) { global.toFancyNum(count * animal.price) + '**' ); - p.logger.incr(`cowoncy`, count * animal.price, { type: 'sell' }, p.msg); + p.logger.incr('cowoncy', count * animal.price, { type: 'sell' }, p.msg); // TODO neo4j } else { send( - '**šŸš« | ' + msg.author.username + "**, You can't sell more than you have silly! >:c", + '**šŸš« | ' + msg.author.username + '**, You can\'t sell more than you have silly! >:c', 3000 ); } @@ -220,7 +220,7 @@ function sellAnimal(msg, con, animal, count, send, global, p) { } function sellRank(msg, con, rank, send, global, p) { - let animals = "('" + rank.animals.join("','") + "')"; + let animals = '(\'' + rank.animals.join('\',\'') + '\')'; let sql = 'SELECT SUM(count) AS total FROM animal WHERE id = ' + msg.author.id + @@ -245,7 +245,7 @@ function sellRank(msg, con, rank, send, global, p) { return; } if (result[1].affectedRows <= 0) { - send('**šŸš« | ' + msg.author.username + "**, You don't have enough animals! >:c", 3000); + send('**šŸš« | ' + msg.author.username + '**, You don\'t have enough animals! >:c', 3000); } else { count = result[0][0].total; send( @@ -259,7 +259,7 @@ function sellRank(msg, con, rank, send, global, p) { global.toFancyNum(count * rank.price) + '**' ); - p.logger.incr(`cowoncy`, count * rank.price, { type: 'sell' }, p.msg); + p.logger.incr('cowoncy', count * rank.price, { type: 'sell' }, p.msg); // TODO neo4j } }); @@ -270,7 +270,7 @@ async function sellRanks(msg, con, ranks, send, global, p) { total = 0; for (i in ranks) { let rank = ranks[i]; - let animals = "('" + rank.animals.join("','") + "')"; + let animals = '(\'' + rank.animals.join('\',\'') + '\')'; let sql = 'SELECT SUM(count) AS total FROM animal WHERE id = ' + msg.author.id + @@ -313,9 +313,9 @@ async function sellRanks(msg, con, ranks, send, global, p) { global.toFancyNum(total) + '**' ); - p.logger.incr(`cowoncy`, total, { type: 'sell' }, p.msg); + p.logger.incr('cowoncy', total, { type: 'sell' }, p.msg); // TODO neo4j } else { - send('**šŸš« | ' + msg.author.username + "**, You don't have enough animals! >:c", 3000); + send('**šŸš« | ' + msg.author.username + '**, You don\'t have enough animals! >:c', 3000); } } diff --git a/src/commands/commandList/zoo/upgrade.js b/src/commands/commandList/zoo/upgrade.js index 82d079808..f03d33dad 100644 --- a/src/commands/commandList/zoo/upgrade.js +++ b/src/commands/commandList/zoo/upgrade.js @@ -70,7 +70,7 @@ module.exports = new CommandInterface({ all = true; // owo upg duration lvl - } else if ((args[1] && ('lvl' == args[1].toLowerCase()) || 'level' == args[1].toLowerCase())) { + } else if ((args[1] && 'lvl' == args[1].toLowerCase()) || 'level' == args[1].toLowerCase()) { if (args[0]) { trait = traits[args[0].toLowerCase()]; } diff --git a/src/commands/commandList/zoo/zoo.js b/src/commands/commandList/zoo/zoo.js index f1d5afe94..c9c76e7aa 100644 --- a/src/commands/commandList/zoo/zoo.js +++ b/src/commands/commandList/zoo/zoo.js @@ -36,7 +36,7 @@ module.exports = new CommandInterface({ args: '{display}', - desc: "Displays your zoo! Some animals are rarer than others! Use the 'display' args to display all your animals from your history!", + desc: 'Displays your zoo! Some animals are rarer than others! Use the \'display\' args to display all your animals from your history!', example: ['owo zoo', 'owo zoo display'], @@ -72,7 +72,7 @@ module.exports = new CommandInterface({ console.error(err); return; } - let header = 'šŸŒæ šŸŒ± šŸŒ³** ' + msg.author.username + "'s zoo! **šŸŒ³ šŸŒæ šŸŒ±\n"; + let header = 'šŸŒæ šŸŒ± šŸŒ³** ' + msg.author.username + '\'s zoo! **šŸŒ³ šŸŒæ šŸŒ±\n'; let text = display; var additional0 = ''; var additional = ''; diff --git a/src/eventHandlers/interactionCreate.js b/src/eventHandlers/interactionCreate.js index b81cb380c..759260823 100644 --- a/src/eventHandlers/interactionCreate.js +++ b/src/eventHandlers/interactionCreate.js @@ -7,21 +7,21 @@ exports.handle = function (interaction) { switch (interaction.type) { - case 2: - handleCommand.bind(this)(interaction); - break; - default: - break; + case 2: + handleCommand.bind(this)(interaction); + break; + default: + break; } }; function handleCommand(interaction) { switch (interaction.data.type) { - case 1: - handleSlash.bind(this)(interaction); - break; - default: - break; + case 1: + handleSlash.bind(this)(interaction); + break; + default: + break; } } @@ -41,18 +41,18 @@ function getInteractionArgs(interaction) { const result = {}; interaction.data.options?.forEach((option) => { switch (option.type) { - // User - case 6: - result[option.name] = interaction.data.resolved.members.get(option.value); - break; + // User + case 6: + result[option.name] = interaction.data.resolved.members.get(option.value); + break; // Sub command - case 2: - // console.log(option); - break; + case 2: + // console.log(option); + break; // Number - case 4: - result[option.name] = option.value; - break; + case 4: + result[option.name] = option.value; + break; } }); return result; diff --git a/src/eventHandlers/rawWS.js b/src/eventHandlers/rawWS.js index f512a16d3..4c0fe50e6 100644 --- a/src/eventHandlers/rawWS.js +++ b/src/eventHandlers/rawWS.js @@ -10,14 +10,14 @@ const axios = require('axios'); exports.handle = function (packet, id) { if (packet.t === 'INTERACTION_CREATE') { switch (packet.d.type) { - case 2: - handleApplicationCommand.bind(this)(packet); - break; + case 2: + handleApplicationCommand.bind(this)(packet); + break; // Buttons - case 3: - handleMessageComponent.bind(this)(packet); - break; + case 3: + handleMessageComponent.bind(this)(packet); + break; } } }; @@ -25,15 +25,15 @@ exports.handle = function (packet, id) { function handleApplicationCommand(packet) { const interaction = new Interaction(this.bot, packet.d); switch (packet.d.data.type) { - // Slash commands - case 1: - // this.command.executeInteraction(interaction); - break; + // Slash commands + case 1: + // this.command.executeInteraction(interaction); + break; // Message commands - case 3: - this.interactionHandlers.messages.emit(interaction); - break; + case 3: + this.interactionHandlers.messages.emit(interaction); + break; } } diff --git a/src/interactionHandlers/button/survey.js b/src/interactionHandlers/button/survey.js index c00e7d394..628e76c77 100644 --- a/src/interactionHandlers/button/survey.js +++ b/src/interactionHandlers/button/survey.js @@ -23,7 +23,7 @@ async function startSurvey(user, uid) { try { let sql = `SELECT * FROM user_survey WHERE uid = ${uid};`; - sql += `SELECT * FROM survey_question WHERE sid = (SELECT sid FROM survey ORDER BY sid DESC LIMIT 1);`; + sql += 'SELECT * FROM survey_question WHERE sid = (SELECT sid FROM survey ORDER BY sid DESC LIMIT 1);'; let result = await con.query(sql); const userSurvey = result[0][0]; diff --git a/src/utils/PagedMessage.js b/src/utils/PagedMessage.js index e923f5b77..070e318ba 100644 --- a/src/utils/PagedMessage.js +++ b/src/utils/PagedMessage.js @@ -97,7 +97,7 @@ class PagedMessage extends EventEmitter { disableComponents(this.components); embed.color = 6381923; await this.msg.edit({ - content: `This message is now inactive.`, + content: 'This message is now inactive.', embed, components: this.components, }); diff --git a/src/utils/ban.js b/src/utils/ban.js index dc6bd8e6a..84f51ce91 100644 --- a/src/utils/ban.js +++ b/src/utils/ban.js @@ -51,7 +51,7 @@ exports.check = async function (p, command) { if (command != 'points' && cooldown[author] == 4) await p.replyMsg( timerEmoji, - ", Please slow down~ You're a little **too fast** for me :c", + ', Please slow down~ You\'re a little **too fast** for me :c', 3000 ); return; @@ -63,7 +63,7 @@ exports.check = async function (p, command) { //Check if the command is enabled let commandNames = `'all','${command}'`; for (let i in p.commands[command].group) { - commandNames += ",'" + p.commands[command].group[i] + "'"; + commandNames += ',\'' + p.commands[command].group[i] + '\''; } let sql = `SELECT * FROM disabled WHERE command IN (${commandNames}) AND channel = ${channel}; SELECT id FROM timeout WHERE id IN (${author},${guild}) AND TIMESTAMPDIFF(HOUR,time,NOW()) < penalty; @@ -78,7 +78,7 @@ exports.check = async function (p, command) { setTimeout(() => { delete cooldown[author + command]; }, 10000); - if (command != 'points') await p.errorMsg(", you're banned from this command! >:c", 3000); + if (command != 'points') await p.errorMsg(', you\'re banned from this command! >:c', 3000); p.logger.logstashBanned(p.commandAlias, p); } else if (!result[0][0] || ['points', 'disable', 'enable'].includes(command)) { // Success @@ -131,7 +131,7 @@ exports.banCommand = async function (p, user, command, reason) { reason + '\n' + p.config.emoji.blank + - " **| I couldn't DM them.**" + ' **| I couldn\'t DM them.**' ); return; } @@ -172,7 +172,7 @@ exports.liftCommand = async function (p, user, command) { user.username + '#' + user.discriminator + - "**'s ban on `" + + '**\'s ban on `' + command + '` has been lifted!\n' + p.config.emoji.blank + @@ -180,7 +180,7 @@ exports.liftCommand = async function (p, user, command) { user.id + '\n' + p.config.emoji.blank + - " **| I couldn't DM them.**" + ' **| I couldn\'t DM them.**' ); return; } @@ -190,7 +190,7 @@ exports.liftCommand = async function (p, user, command) { user.username + '#' + user.discriminator + - "**'s ban on `" + + '**\'s ban on `' + command + '` has been lifted!\n' + p.config.emoji.blank + diff --git a/src/utils/dateUtil.js b/src/utils/dateUtil.js index e6df931b6..04c1d3c48 100644 --- a/src/utils/dateUtil.js +++ b/src/utils/dateUtil.js @@ -86,7 +86,7 @@ exports.afterMidnight = function (date) { function toMySQL(date) { return ( - "'" + + '\'' + date.getFullYear() + '-' + ('00' + (date.getMonth() + 1)).slice(-2) + @@ -98,6 +98,6 @@ function toMySQL(date) { ('00' + date.getMinutes()).slice(-2) + ':' + ('00' + date.getSeconds()).slice(-2) + - "'" + '\'' ); } diff --git a/src/utils/global.js b/src/utils/global.js index 83fb20582..d1f50abca 100644 --- a/src/utils/global.js +++ b/src/utils/global.js @@ -269,7 +269,7 @@ exports.filteredName = function (name) { .replace(/discord.gg/gi, 'discord,gg') .replace(/@everyone/gi, 'everyone') .replace(/<@!?[0-9]+>/gi, 'User') - .replace(/[*`]+/gi, "'") + .replace(/[*`]+/gi, '\'') .replace(/\|\|/g, 'ā”‚'); return { name, offensive: false }; @@ -313,12 +313,12 @@ exports.parseTime = function (diff) { /* gets uid from discord id */ exports.getUid = async function (id) { id = BigInt(id); - let sql = `SELECT uid FROM user where id = ?;`; + let sql = 'SELECT uid FROM user where id = ?;'; let result = await mysql.query(sql, id); if (result[0]?.uid) return result[0].uid; - sql = `INSERT INTO user (id, count) VALUES (?, 0);`; + sql = 'INSERT INTO user (id, count) VALUES (?, 0);'; result = await mysql.query(sql, id); return result.insertId; }; diff --git a/src/utils/patreon.js b/src/utils/patreon.js index 7a435c22b..69a906f0a 100644 --- a/src/utils/patreon.js +++ b/src/utils/patreon.js @@ -22,15 +22,15 @@ exports.parsePatreon = function (query) { // parse benefits switch (type) { - case 1: - animal = true; - break; - case 3: - animal = true; - cowoncy = true; - break; - default: - return null; + case 1: + animal = true; + break; + case 3: + animal = true; + cowoncy = true; + break; + default: + return null; } // Already expired diff --git a/src/utils/weeb.js b/src/utils/weeb.js index 96506b598..4cba836a8 100644 --- a/src/utils/weeb.js +++ b/src/utils/weeb.js @@ -42,7 +42,7 @@ exports.grab = function (p, ptype, ftype, text, notsfw, retry) { this.grab(p, ptype, ftype == 'jpg' ? 'png' : 'jpg', text, notsfw, false); } else p.errorMsg( - ", I couldn't find that image type! :c\nType `owo help gif` for the list of types!", + ', I couldn\'t find that image type! :c\nType `owo help gif` for the list of types!', 3000 ); });