Merge branch 'master' into greenkeeper/@types/event-stream-3.3.32

.travis.yml

@@ -4,7 +4,7 @@
 language: node_js
 
 node_js:
-  - 7.10.0
+  - 8.4.0
 
 env:
   - CXX=g++-4.8 NODE_ENV=production

appveyor.yml

@@ -3,7 +3,7 @@
 
 environment:
   matrix:
-    - nodejs_version: 7.10.0
+    - nodejs_version: 8.4.0
 
 build: off
 

package.json

@@ -32,7 +32,7 @@
     "@types/deep-equal": "1.0.1",
     "@types/elasticsearch": "5.0.14",
     "@types/event-stream": "3.3.32",
-    "@types/express": "4.0.36",
+    "@types/express": "4.0.37",
     "@types/gm": "1.17.32",
     "@types/gulp": "4.0.3",
     "@types/gulp-htmlmin": "1.3.30",
@@ -47,21 +47,21 @@
     "@types/is-root": "1.0.0",
     "@types/is-url": "1.2.28",
     "@types/js-yaml": "3.9.0",
-    "@types/mocha": "2.2.41",
+    "@types/mocha": "2.2.42",
     "@types/mongodb": "2.2.10",
-    "@types/monk": "1.0.5",
+    "@types/monk": "1.0.6",
     "@types/morgan": "1.7.32",
-    "@types/ms": "0.7.29",
+    "@types/ms": "0.7.30",
     "@types/multer": "1.3.2",
-    "@types/node": "8.0.24",
+    "@types/node": "8.0.25",
     "@types/ratelimiter": "2.1.28",
     "@types/redis": "2.6.0",
-    "@types/request": "2.0.1",
+    "@types/request": "2.0.3",
     "@types/rimraf": "2.0.0",
     "@types/riot": "3.6.0",
     "@types/serve-favicon": "2.2.28",
-    "@types/uuid": "3.4.0",
+    "@types/uuid": "3.4.1",
-    "@types/webpack": "3.0.9",
+    "@types/webpack": "3.0.10",
     "@types/webpack-stream": "3.2.7",
     "@types/websocket": "0.0.34",
     "chai": "4.1.1",
@@ -77,7 +77,7 @@
     "gulp-rename": "1.2.2",
     "gulp-replace": "0.6.1",
     "gulp-tslint": "8.1.2",
-    "gulp-typescript": "3.2.1",
+    "gulp-typescript": "3.2.2",
     "gulp-uglify": "3.0.0",
     "gulp-util": "3.0.8",
     "mocha": "3.5.0",
@@ -87,7 +87,7 @@
     "stylus": "0.54.5",
     "stylus-loader": "3.0.1",
     "swagger-jsdoc": "1.9.7",
-    "tslint": "5.6.0",
+    "tslint": "5.7.0",
     "uglify-es": "3.0.27",
     "uglify-es-webpack-plugin": "0.10.0",
     "uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony",
@@ -105,7 +105,7 @@
     "cors": "2.8.4",
     "cropperjs": "1.0.0-rc.3",
     "crypto": "1.0.1",
-    "debug": "3.0.0",
+    "debug": "3.0.1",
     "deep-equal": "1.0.1",
     "deepcopy": "0.6.3",
     "diskusage": "^0.2.2",
@@ -133,11 +133,11 @@
     "pug": "2.0.0-rc.3",
     "ratelimiter": "3.0.3",
     "recaptcha-promise": "0.1.3",
-    "reconnecting-websocket": "3.2.0",
+    "reconnecting-websocket": "3.2.1",
     "redis": "2.8.0",
     "request": "2.81.0",
     "rimraf": "2.6.1",
-    "riot": "3.6.2",
+    "riot": "3.6.3",
     "rndstr": "1.0.0",
     "s-age": "1.1.0",
     "serve-favicon": "2.4.3",

src/api/models/access-token.ts

@@ -2,7 +2,7 @@ import db from '../../db/mongodb';
 
 const collection = db.get('access_tokens');
 
-(collection as any).index('token'); // fuck type definition
+(collection as any).createIndex('token'); // fuck type definition
-(collection as any).index('hash'); // fuck type definition
+(collection as any).createIndex('hash'); // fuck type definition
 
 export default collection as any; // fuck type definition

src/api/models/app.ts

@@ -2,9 +2,9 @@ import db from '../../db/mongodb';
 
 const collection = db.get('apps');
 
-(collection as any).index('name_id'); // fuck type definition
+(collection as any).createIndex('name_id'); // fuck type definition
-(collection as any).index('name_id_lower'); // fuck type definition
+(collection as any).createIndex('name_id_lower'); // fuck type definition
-(collection as any).index('secret'); // fuck type definition
+(collection as any).createIndex('secret'); // fuck type definition
 
 export default collection as any; // fuck type definition
 

src/api/models/drive-file.ts

@@ -2,7 +2,7 @@ import db from '../../db/mongodb';
 
 const collection = db.get('drive_files');
 
-(collection as any).index('hash'); // fuck type definition
+(collection as any).createIndex('hash'); // fuck type definition
 
 export default collection as any; // fuck type definition
 

src/api/models/user.ts

@@ -2,8 +2,8 @@ import db from '../../db/mongodb';
 
 const collection = db.get('users');
 
-(collection as any).index('username'); // fuck type definition
+(collection as any).createIndex('username'); // fuck type definition
-(collection as any).index('token'); // fuck type definition
+(collection as any).createIndex('token'); // fuck type definition
 
 export default collection as any; // fuck type definition
 

test/api.js

@@ -53,8 +53,6 @@ describe('API', () => {
 		db.get('auth_sessions').drop()
 	]));
 
-	afterEach(cb => setTimeout(cb, 100));
-
 	it('greet server', done => {
 		_chai.request(server)
 			.get('/')