Merge branch 'master' into greenkeeper/swagger-jsdoc-1.9.4
This commit is contained in:
		
						commit
						ce4bd7e41a
					
				
							
								
								
									
										10
									
								
								package.json
								
								
								
								
							
							
						
						
									
										10
									
								
								package.json
								
								
								
								
							|  | @ -57,7 +57,7 @@ | |||
|     "@types/multer": "0.0.33", | ||||
|     "@types/ratelimiter": "2.1.28", | ||||
|     "@types/redis": "0.12.36", | ||||
|     "@types/request": "0.0.42", | ||||
|     "@types/request": "0.0.43", | ||||
|     "@types/rimraf": "0.0.28", | ||||
|     "@types/riot": "2.6.2", | ||||
|     "@types/serve-favicon": "2.2.28", | ||||
|  | @ -86,9 +86,9 @@ | |||
|     "stylus": "0.54.5", | ||||
|     "stylus-loader": "3.0.1", | ||||
|     "swagger-jsdoc": "1.9.4", | ||||
|     "tslint": "5.1.0", | ||||
|     "tslint": "5.2.0", | ||||
|     "uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#8f4b45f4f814c04918382949b4bcaf7a8d910281", | ||||
|     "webpack": "2.4.1" | ||||
|     "webpack": "2.5.0" | ||||
|   }, | ||||
|   "dependencies": { | ||||
|     "accesses": "2.5.0", | ||||
|  | @ -140,11 +140,11 @@ | |||
|     "s-age": "1.1.0", | ||||
|     "serve-favicon": "2.4.2", | ||||
|     "subdomain": "1.2.0", | ||||
|     "summaly": "2.0.1", | ||||
|     "summaly": "2.0.2", | ||||
|     "syuilo-password-strength": "0.0.1", | ||||
|     "tcp-port-used": "0.1.2", | ||||
|     "textarea-caret": "3.0.2", | ||||
|     "ts-node": "3.0.1", | ||||
|     "ts-node": "3.0.4", | ||||
|     "typescript": "2.3.2", | ||||
|     "uuid": "3.0.1", | ||||
|     "vhost": "3.0.2", | ||||
|  |  | |||
|  | @ -45,8 +45,8 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => { | |||
| 				_id: mediaId, | ||||
| 				user_id: user._id | ||||
| 			}, { | ||||
| 					_id: true | ||||
| 				}); | ||||
| 				_id: true | ||||
| 			}); | ||||
| 
 | ||||
| 			if (entity === null) { | ||||
| 				return rej('file not found'); | ||||
|  | @ -79,10 +79,10 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => { | |||
| 		const latestPost = await Post.findOne({ | ||||
| 			user_id: user._id | ||||
| 		}, { | ||||
| 				sort: { | ||||
| 					_id: -1 | ||||
| 				} | ||||
| 			}); | ||||
| 			sort: { | ||||
| 				_id: -1 | ||||
| 			} | ||||
| 		}); | ||||
| 
 | ||||
| 		// 直近と同じRepost対象かつ引用じゃなかったらエラー
 | ||||
| 		if (latestPost && | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue