Resolve conflicts

This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions

View file

@ -96,7 +96,7 @@ function extractKeywordsOne(id) {
// Fetch recent posts
const recentPosts = await Post.find({
user_id: id,
userId: id,
text: {
$exists: true
}