summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/notes/children.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2019-04-07 21:50:36 +0900
committerGitHub <noreply@github.com>2019-04-07 21:50:36 +0900
commitf0a29721c9fb10f97faf386bc9d6b1b2fad97895 (patch)
treeb5c1d38d698589bb444c0881a431391db91eb5bc /src/server/api/endpoints/notes/children.ts
parentUpdate README.md [AUTOGEN] (#4639) (diff)
downloadsharkey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.tar.gz
sharkey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.tar.bz2
sharkey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.zip
Use PostgreSQL instead of MongoDB (#4572)
* wip * Update note.ts * Update timeline.ts * Update core.ts * wip * Update generate-visibility-query.ts * wip * wip * wip * wip * wip * Update global-timeline.ts * wip * wip * wip * Update vote.ts * wip * wip * Update create.ts * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update files.ts * wip * wip * Update CONTRIBUTING.md * wip * wip * wip * wip * wip * wip * wip * wip * Update read-notification.ts * wip * wip * wip * wip * wip * wip * wip * Update cancel.ts * wip * wip * wip * Update show.ts * wip * wip * Update gen-id.ts * Update create.ts * Update id.ts * wip * wip * wip * wip * wip * wip * wip * Docker: Update files about Docker (#4599) * Docker: Use cache if files used by `yarn install` was not updated This patch reduces the number of times to installing node_modules. For example, `yarn install` step will be skipped when only ".config/default.yml" is updated. * Docker: Migrate MongoDB to Postgresql Misskey uses Postgresql as a database instead of Mongodb since version 11. * Docker: Uncomment about data persistence This patch will save a lot of databases. * wip * wip * wip * Update activitypub.ts * wip * wip * wip * Update logs.ts * wip * Update drive-file.ts * Update register.ts * wip * wip * Update mentions.ts * wip * wip * wip * Update recommendation.ts * wip * Update index.ts * wip * Update recommendation.ts * Doc: Update docker.ja.md and docker.en.md (#1) (#4608) Update how to set up misskey. * wip * :v: * wip * Update note.ts * Update postgre.ts * wip * wip * wip * wip * Update add-file.ts * wip * wip * wip * Clean up * Update logs.ts * wip * :pizza: * wip * Ad notes * wip * Update api-visibility.ts * Update note.ts * Update add-file.ts * tests * tests * Update postgre.ts * Update utils.ts * wip * wip * Refactor * wip * Refactor * wip * wip * Update show-users.ts * Update update-instance.ts * wip * Update feed.ts * Update outbox.ts * Update outbox.ts * Update user.ts * wip * Update list.ts * Update update-hashtag.ts * wip * Update update-hashtag.ts * Refactor * Update update.ts * wip * wip * :v: * clean up * docs * Update push.ts * wip * Update api.ts * wip * :v: * Update make-pagination-query.ts * :v: * Delete hashtags.ts * Update instances.ts * Update instances.ts * Update create.ts * Update search.ts * Update reversi-game.ts * Update signup.ts * Update user.ts * id * Update example.yml * :art: * objectid * fix * reversi * reversi * Fix bug of chart engine * Add test of chart engine * Improve test * Better testing * Improve chart engine * Refactor * Add test of chart engine * Refactor * Add chart test * Fix bug * コミットし忘れ * Refactoring * :v: * Add tests * Add test * Extarct note tests * Refactor * 存在しないユーザーにメンションできなくなっていた問題を修正 * Fix bug * Update update-meta.ts * Fix bug * Update mention.vue * Fix bug * Update meta.ts * Update CONTRIBUTING.md * Fix bug * Fix bug * Fix bug * Clean up * Clean up * Update notification.ts * Clean up * Add mute tests * Add test * Refactor * Add test * Fix test * Refactor * Refactor * Add tests * Update utils.ts * Update utils.ts * Fix test * Update package.json * Update update.ts * Update manifest.ts * Fix bug * Fix bug * Add test * :art: * Update endpoint permissions * Updaye permisison * Update person.ts #4299 * データベースと同期しないように * Fix bug * Fix bug * Update reversi-game.ts * Use a feature of Node v11.7.0 to extract a public key (#4644) * wip * wip * :v: * Refactoring #1540 * test * test * test * test * test * test * test * Fix bug * Fix test * :sushi: * wip * #4471 * Add test for #4335 * Refactor * Fix test * Add tests * :clock4: * Fix bug * Add test * Add test * rename * Fix bug
Diffstat (limited to 'src/server/api/endpoints/notes/children.ts')
-rw-r--r--src/server/api/endpoints/notes/children.ts106
1 files changed, 23 insertions, 83 deletions
diff --git a/src/server/api/endpoints/notes/children.ts b/src/server/api/endpoints/notes/children.ts
index 3738459b71..72f2c39d6a 100644
--- a/src/server/api/endpoints/notes/children.ts
+++ b/src/server/api/endpoints/notes/children.ts
@@ -1,9 +1,11 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../misc/cafy-id';
-import Note, { packMany } from '../../../../models/note';
+import { ID } from '../../../../misc/cafy-id';
import define from '../../define';
-import { getFriends } from '../../common/get-friends';
-import { getHideUserIds } from '../../common/get-hide-users';
+import { makePaginationQuery } from '../../common/make-pagination-query';
+import { generateVisibilityQuery } from '../../common/generate-visibility-query';
+import { generateMuteQuery } from '../../common/generate-mute-query';
+import { Brackets } from 'typeorm';
+import { Notes } from '../../../../models';
export const meta = {
desc: {
@@ -18,7 +20,6 @@ export const meta = {
params: {
noteId: {
validator: $.type(ID),
- transform: transform,
desc: {
'ja-JP': '対象の投稿のID',
'en-US': 'Target note ID'
@@ -32,12 +33,10 @@ export const meta = {
sinceId: {
validator: $.optional.type(ID),
- transform: transform,
},
untilId: {
validator: $.optional.type(ID),
- transform: transform,
},
},
@@ -50,83 +49,24 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
- const [followings, hideUserIds] = await Promise.all([
- // フォローを取得
- // Fetch following
- user ? getFriends(user._id) : [],
+ const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
+ .andWhere(new Brackets(qb => { qb
+ .where(`note.replyId = :noteId`, { noteId: ps.noteId })
+ .orWhere(new Brackets(qb => { qb
+ .where(`note.renoteId = :noteId`, { noteId: ps.noteId })
+ .andWhere(new Brackets(qb => { qb
+ .where(`note.text IS NOT NULL`)
+ .orWhere(`note.fileIds != '{}'`)
+ .orWhere(`note.hasPoll = TRUE`);
+ }));
+ }));
+ }))
+ .leftJoinAndSelect('note.user', 'user');
- // 隠すユーザーを取得
- getHideUserIds(user)
- ]);
+ if (user) generateVisibilityQuery(query, user);
+ if (user) generateMuteQuery(query, user);
- const visibleQuery = user == null ? [{
- visibility: { $in: [ 'public', 'home' ] }
- }] : [{
- visibility: { $in: [ 'public', 'home' ] }
- }, {
- // myself (for followers/specified/private)
- userId: user._id
- }, {
- // to me (for specified)
- visibleUserIds: { $in: [ user._id ] }
- }, {
- visibility: 'followers',
- $or: [{
- // フォロワーの投稿
- userId: { $in: followings.map(f => f.id) },
- }, {
- // 自分の投稿へのリプライ
- '_reply.userId': user._id,
- }, {
- // 自分へのメンションが含まれている
- mentions: { $in: [ user._id ] }
- }]
- }];
+ const notes = await query.take(ps.limit).getMany();
- const q = {
- $and: [{
- $or: [{
- replyId: ps.noteId,
- }, {
- renoteId: ps.noteId,
- $or: [{
- text: { $ne: null }
- }, {
- fileIds: { $ne: [] }
- }, {
- poll: { $ne: null }
- }]
- }]
- }, {
- $or: visibleQuery
- }]
- } as any;
-
- if (hideUserIds && hideUserIds.length > 0) {
- q['userId'] = {
- $nin: hideUserIds
- };
- }
-
- const sort = {
- _id: -1
- };
-
- if (ps.sinceId) {
- sort._id = 1;
- q._id = {
- $gt: ps.sinceId
- };
- } else if (ps.untilId) {
- q._id = {
- $lt: ps.untilId
- };
- }
-
- const notes = await Note.find(q, {
- limit: ps.limit,
- sort: sort
- });
-
- return await packMany(notes, user);
+ return await Notes.packMany(notes, user);
});