From a1b490afa756a71b9cef4afa424575bc223bc612 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 8 Apr 2018 02:30:37 +0900 Subject: Post --> Note Closes #1411 --- .../endpoints/users/get_frequently_replied_users.ts | 18 +++++++++--------- src/server/api/endpoints/users/posts.ts | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/server/api/endpoints/users') diff --git a/src/server/api/endpoints/users/get_frequently_replied_users.ts b/src/server/api/endpoints/users/get_frequently_replied_users.ts index 3a116c8e26..7a98f44e98 100644 --- a/src/server/api/endpoints/users/get_frequently_replied_users.ts +++ b/src/server/api/endpoints/users/get_frequently_replied_users.ts @@ -2,7 +2,7 @@ * Module dependencies */ import $ from 'cafy'; -import Post from '../../../../models/post'; +import Note from '../../../../models/note'; import User, { pack } from '../../../../models/user'; module.exports = (params, me) => new Promise(async (res, rej) => { @@ -27,8 +27,8 @@ module.exports = (params, me) => new Promise(async (res, rej) => { return rej('user not found'); } - // Fetch recent posts - const recentPosts = await Post.find({ + // Fetch recent notes + const recentNotes = await Note.find({ userId: user._id, replyId: { $exists: true, @@ -46,13 +46,13 @@ module.exports = (params, me) => new Promise(async (res, rej) => { }); // 投稿が少なかったら中断 - if (recentPosts.length === 0) { + if (recentNotes.length === 0) { return res([]); } - const replyTargetPosts = await Post.find({ + const replyTargetNotes = await Note.find({ _id: { - $in: recentPosts.map(p => p.replyId) + $in: recentNotes.map(p => p.replyId) }, userId: { $ne: user._id @@ -66,9 +66,9 @@ module.exports = (params, me) => new Promise(async (res, rej) => { const repliedUsers = {}; - // Extract replies from recent posts - replyTargetPosts.forEach(post => { - const userId = post.userId.toString(); + // Extract replies from recent notes + replyTargetNotes.forEach(note => { + const userId = note.userId.toString(); if (repliedUsers[userId]) { repliedUsers[userId]++; } else { diff --git a/src/server/api/endpoints/users/posts.ts b/src/server/api/endpoints/users/posts.ts index b6c533fb5b..f9f6345e34 100644 --- a/src/server/api/endpoints/users/posts.ts +++ b/src/server/api/endpoints/users/posts.ts @@ -3,11 +3,11 @@ */ import $ from 'cafy'; import getHostLower from '../../common/get-host-lower'; -import Post, { pack } from '../../../../models/post'; +import Note, { pack } from '../../../../models/note'; import User from '../../../../models/user'; /** - * Get posts of a user + * Get notes of a user * * @param {any} params * @param {any} me @@ -124,14 +124,14 @@ module.exports = (params, me) => new Promise(async (res, rej) => { //#endregion // Issue query - const posts = await Post + const notes = await Note .find(query, { limit: limit, sort: sort }); // Serialize - res(await Promise.all(posts.map(async (post) => - await pack(post, me) + res(await Promise.all(notes.map(async (note) => + await pack(note, me) ))); }); -- cgit v1.2.3-freya