diff --git a/integration_test/channel/kickban.js b/integration_test/channel/kickban.js index 1fbb6758..f153bb93 100644 --- a/integration_test/channel/kickban.js +++ b/integration_test/channel/kickban.js @@ -228,7 +228,8 @@ describe('KickbanModule', () => { await tx.table('aliases') .insert([{ name: 'test_user', - ip: '1.2.3.4' + ip: '1.2.3.4', + time: Date.now() }]); }); }); @@ -385,7 +386,8 @@ describe('KickbanModule', () => { await tx.table('aliases') .insert({ name: 'test_user', - ip: longIP + ip: longIP, + time: Date.now() }); }).then(() => { kickban.handleCmdIPBan( @@ -489,7 +491,8 @@ describe('KickbanModule', () => { await tx.table('aliases') .insert({ name: 'another_user', - ip: '1.2.3.3' // different IP, same /24 range + ip: '1.2.3.3', // different IP, same /24 range + time: Date.now() }); }).then(() => { mockUser.socket.emit = (frame, obj) => { diff --git a/integration_test/db/aliases.js b/integration_test/db/aliases.js index 7b190e11..fbe72575 100644 --- a/integration_test/db/aliases.js +++ b/integration_test/db/aliases.js @@ -21,9 +21,9 @@ function addSomeAliases() { return cleanup().then(() => { return testDB.knex.table('aliases') .insert([ - { ip: testIPs[0], name: testNames[0] }, - { ip: testIPs[0], name: testNames[1] }, - { ip: testIPs[1], name: testNames[1] } + { ip: testIPs[0], name: testNames[0], time: Date.now() }, + { ip: testIPs[0], name: testNames[1], time: Date.now() }, + { ip: testIPs[1], name: testNames[1], time: Date.now() } ]); }); } diff --git a/package.json b/package.json index 00fe4cb3..b7581090 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Calvin Montgomery", "name": "CyTube", "description": "Online media synchronizer and chat", - "version": "3.64.1", + "version": "3.65.0", "repository": { "url": "http://github.com/calzoneman/sync" }, @@ -10,7 +10,7 @@ "dependencies": { "@calzoneman/express-babel-decorators": "^1.0.0", "@calzoneman/jsli": "^2.0.1", - "bcrypt": "^2.0.1", + "bcrypt": "^3.0.6", "bluebird": "^3.5.1", "body-parser": "^1.18.2", "cheerio": "^1.0.0-rc.2", @@ -56,21 +56,20 @@ "integration-test": "mocha --recursive --exit integration_test" }, "devDependencies": { - "babel-cli": "^6.26.0", - "babel-core": "^6.26.3", - "babel-eslint": "^8.2.2", - "babel-plugin-add-module-exports": "^0.2.1", - "babel-plugin-transform-decorators-legacy": "^1.3.4", - "babel-preset-env": "^1.5.2", + "@babel/cli": "^7.4.4", + "@babel/core": "^7.4.4", + "@babel/preset-env": "^7.4.4", + "babel-eslint": "^10.0.1", + "babel-plugin-add-module-exports": "^1.0.2", "coffeescript": "^1.9.2", - "eslint": "^4.19.1", - "mocha": "^5.2.0", - "sinon": "^2.3.2" + "eslint": "^5.16.0", + "mocha": "^6.1.4", + "sinon": "^7.3.2" }, "babel": { "presets": [ [ - "env", + "@babel/env", { "targets": { "node": "8" @@ -79,8 +78,7 @@ ] ], "plugins": [ - "add-module-exports", - "transform-decorators-legacy" + "add-module-exports" ] } }