summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints/clips/notes.ts
diff options
context:
space:
mode:
authorxianon <xianon@hotmail.co.jp>2022-04-19 22:59:39 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2022-04-23 19:44:25 +0900
commitdd86397e857f36fbc06d77feadef00f6c92a3e21 (patch)
tree3c64e267942fc33fb9c2c5fdb326c111d008a3c0 /packages/backend/src/server/api/endpoints/clips/notes.ts
parentfix ogp rendering and refactor (diff)
downloadsharkey-dd86397e857f36fbc06d77feadef00f6c92a3e21.tar.gz
sharkey-dd86397e857f36fbc06d77feadef00f6c92a3e21.tar.bz2
sharkey-dd86397e857f36fbc06d77feadef00f6c92a3e21.zip
fix: アンテナ、クリップ、リストの表示を速くする (#8518)
* アンテナノートを取得するクエリがタイムアウトしないように速くする * テーブル名を直接指定しないようにする * クリップの取得を速くする * リストの取得を速くする
Diffstat (limited to 'packages/backend/src/server/api/endpoints/clips/notes.ts')
-rw-r--r--packages/backend/src/server/api/endpoints/clips/notes.ts8
1 files changed, 2 insertions, 6 deletions
diff --git a/packages/backend/src/server/api/endpoints/clips/notes.ts b/packages/backend/src/server/api/endpoints/clips/notes.ts
index 4b6782fca0..4ace747efe 100644
--- a/packages/backend/src/server/api/endpoints/clips/notes.ts
+++ b/packages/backend/src/server/api/endpoints/clips/notes.ts
@@ -57,12 +57,8 @@ export default define(meta, paramDef, async (ps, user) => {
throw new ApiError(meta.errors.noSuchClip);
}
- const clipQuery = ClipNotes.createQueryBuilder('joining')
- .select('joining.noteId')
- .where('joining.clipId = :clipId', { clipId: clip.id });
-
const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
- .andWhere(`note.id IN (${ clipQuery.getQuery() })`)
+ .innerJoin(ClipNotes.metadata.targetName, 'clipNote', 'clipNote.noteId = note.id')
.innerJoinAndSelect('note.user', 'user')
.leftJoinAndSelect('user.avatar', 'avatar')
.leftJoinAndSelect('user.banner', 'banner')
@@ -74,7 +70,7 @@ export default define(meta, paramDef, async (ps, user) => {
.leftJoinAndSelect('renote.user', 'renoteUser')
.leftJoinAndSelect('renoteUser.avatar', 'renoteUserAvatar')
.leftJoinAndSelect('renoteUser.banner', 'renoteUserBanner')
- .setParameters(clipQuery.getParameters());
+ .andWhere('clipNote.clipId = :clipId', { clipId: clip.id });
if (user) {
generateVisibilityQuery(query, user);