diff --git a/commands/avatar-edit/bob-ross.js b/commands/avatar-edit/bob-ross.js index 844e465f..8e1f0e43 100644 --- a/commands/avatar-edit/bob-ross.js +++ b/commands/avatar-edit/bob-ross.js @@ -41,9 +41,9 @@ module.exports = class BobRossCommand extends Command { const avatar = await loadImage(body); ctx.fillStyle = 'white'; ctx.fillRect(0, 0, 600, 775); - ctx.rotate(3 * Math.PI / 180); + ctx.rotate(3 * (Math.PI / 180)); ctx.drawImage(avatar, 69, 102, 256, 256); - ctx.rotate(-3 * Math.PI / 180); + ctx.rotate(-3 * (Math.PI / 180)); ctx.drawImage(base, 0, 0); return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'bob-ross.png' }] }); } catch (err) { diff --git a/commands/avatar-edit/dexter.js b/commands/avatar-edit/dexter.js index 71c4a5e9..f3bc52e7 100644 --- a/commands/avatar-edit/dexter.js +++ b/commands/avatar-edit/dexter.js @@ -39,9 +39,9 @@ module.exports = class DexterCommand extends Command { const { body } = await snekfetch.get(avatarURL); const avatar = await loadImage(body); ctx.drawImage(base, 0, 0); - ctx.rotate(-11 * Math.PI / 180); + ctx.rotate(-11 * (Math.PI / 180)); ctx.drawImage(avatar, 234, 274, 225, 225); - ctx.rotate(11 * Math.PI / 180); + ctx.rotate(11 * (Math.PI / 180)); return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'dexter.png' }] }); } catch (err) { return msg.say(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); diff --git a/commands/avatar-edit/simba.js b/commands/avatar-edit/simba.js index 2cffc399..2af6f7c6 100644 --- a/commands/avatar-edit/simba.js +++ b/commands/avatar-edit/simba.js @@ -39,9 +39,9 @@ module.exports = class SimbaCommand extends Command { const { body } = await snekfetch.get(avatarURL); const avatar = await loadImage(body); ctx.drawImage(base, 0, 0); - ctx.rotate(-24 * Math.PI / 180); + ctx.rotate(-24 * (Math.PI / 180)); ctx.drawImage(avatar, 75, 160, 130, 150); - ctx.rotate(24 * Math.PI / 180); + ctx.rotate(24 * (Math.PI / 180)); return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'simba.png' }] }); } catch (err) { return msg.say(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); diff --git a/package.json b/package.json index e009e261..e31766ff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiaobot", - "version": "34.0.4", + "version": "34.0.5", "description": "Your personal server companion.", "main": "Shard.js", "scripts": { diff --git a/structures/Util.js b/structures/Util.js index 95053133..ebd5239f 100644 --- a/structures/Util.js +++ b/structures/Util.js @@ -62,7 +62,8 @@ class Util { } static list(arr, conj = 'and') { - return `${arr.slice(0, -1).join(', ')}${arr.length > 1 ? `${arr.length > 2 ? ',' : ''} ${conj} ` : ''}${arr.slice(-1)}`; // eslint-disable-line max-len + const { length } = arr; + return `${arr.slice(0, -1).join(', ')}${length > 1 ? `${length > 2 ? ',' : ''} ${conj} ` : ''}${arr.slice(-1)}`; } static shorten(text, maxLen = 2000) {