diff --git a/.eslintrc.json b/.eslintrc.json index e493cb38..96c307a2 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -112,7 +112,11 @@ "semi-spacing": "error", "semi": "error", "space-before-blocks": "error", - "space-before-function-paren": ["error", "never"], + "space-before-function-paren": ["error", { + "anonymous": "never", + "named": "never", + "asyncArrow": "always" + }], "space-in-parens": "error", "space-infix-ops": "error", "space-unary-ops": "error", diff --git a/commands/games/battle.js b/commands/games/battle.js index fb47d4a3..2dba7634 100644 --- a/commands/games/battle.js +++ b/commands/games/battle.js @@ -103,12 +103,8 @@ module.exports = class BattleCommand extends Command { this.fighting.delete(msg.guild.id); return msg.say(stripIndents` The match is over! - **Winner:** ${userHP > oppoHP ? - `${msg.author.username} (${userHP}HP)` : - `${opponent.username} (${oppoHP}HP)`} - **Loser:** ${userHP > oppoHP ? - `${opponent.username} (${oppoHP}HP)` : - `${msg.author.username} (${userHP}HP)`} + **Winner:** ${userHP > oppoHP ? `${msg.author.username} (${userHP})` : `${opponent.username} (${oppoHP})`} + **Loser:** ${userHP > oppoHP ? `${opponent.username} (${oppoHP})` : `${msg.author.username} (${userHP})`} `); } }; diff --git a/package.json b/package.json index 83a3d39b..4b202fe8 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ }, "homepage": "https://github.com/dragonfire535/xiaobot#readme", "engines": { - "node": "8.1.0" + "node": "8.1.1" }, "dependencies": { "bufferutil": "^3.0.1", @@ -46,14 +46,14 @@ "moment": "^2.18.1", "moment-duration-format": "^1.3.0", "node-opus": "^0.2.6", - "pg": "^6.2.3", - "sequelize": "^3.30.4", + "pg": "^6.2.4", + "sequelize": "^4.1.0", "snekfetch": "^3.1.11", "tsubaki": "^1.1.1", "xml2js": "^0.4.17", "zalgolize": "^1.2.4" }, "devDependencies": { - "eslint": "^3.19.0" + "eslint": "^4.0.0" } }