From dac962580b40c5828e70bc4745ce33e049720c6b Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 23 Mar 2020 19:06:46 +0900 Subject: テーマインポート機能を実装するなど MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/web/views/base.pug | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server') diff --git a/src/server/web/views/base.pug b/src/server/web/views/base.pug index e6751ecca2..76114e6f5a 100644 --- a/src/server/web/views/base.pug +++ b/src/server/web/views/base.pug @@ -16,9 +16,9 @@ html link(rel='icon' href= icon || '/favicon.ico') link(rel='apple-touch-icon' href= icon || '/apple-touch-icon.png') link(rel='manifest' href='/manifest.json') - link(rel='prefetch' href='https://xn--931a.moe/assets/info.png') - link(rel='prefetch' href='https://xn--931a.moe/assets/not-found.png') - link(rel='prefetch' href='https://xn--931a.moe/assets/error.png') + link(rel='prefetch' href='https://xn--931a.moe/assets/info.jpg') + link(rel='prefetch' href='https://xn--931a.moe/assets/not-found.jpg') + link(rel='prefetch' href='https://xn--931a.moe/assets/error.jpg') title block title -- cgit v1.2.3-freya From 833c39969b89c0d5de0b6616a253afea03e5fbb7 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 23 Mar 2020 19:42:26 +0900 Subject: Refactor --- src/server/api/endpoints/notes/state.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server') diff --git a/src/server/api/endpoints/notes/state.ts b/src/server/api/endpoints/notes/state.ts index 2ec4a93d5b..b41b56162c 100644 --- a/src/server/api/endpoints/notes/state.ts +++ b/src/server/api/endpoints/notes/state.ts @@ -28,15 +28,15 @@ export default define(meta, async (ps, user) => { const [favorite, watching] = await Promise.all([ NoteFavorites.count({ where: { - userId: user.id, - noteId: ps.noteId + userId: user.id, + noteId: ps.noteId }, take: 1 }), NoteWatchings.count({ where: { - userId: user.id, - noteId: ps.noteId + userId: user.id, + noteId: ps.noteId }, take: 1 }) -- cgit v1.2.3-freya From a43a225740a8c27455435022fec31a3599234a86 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 23 Mar 2020 19:47:02 +0900 Subject: Fix #6180 --- src/server/api/endpoints/notes/timeline.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/server') diff --git a/src/server/api/endpoints/notes/timeline.ts b/src/server/api/endpoints/notes/timeline.ts index 3eed9f0ca8..d60136a9ca 100644 --- a/src/server/api/endpoints/notes/timeline.ts +++ b/src/server/api/endpoints/notes/timeline.ts @@ -102,6 +102,13 @@ export const meta = { }; export default define(meta, async (ps, user) => { + const hasFollowing = (await Followings.count({ + where: { + followerId: user.id, + }, + take: 1 + })) !== 0; + //#region Construct query const followingQuery = Followings.createQueryBuilder('following') .select('following.followeeId') @@ -110,8 +117,8 @@ export default define(meta, async (ps, user) => { const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate) .andWhere(new Brackets(qb => { qb - .where(`note.userId IN (${ followingQuery.getQuery() })`) - .orWhere('note.userId = :meId', { meId: user.id }); + .where('note.userId = :meId', { meId: user.id }); + if (hasFollowing) qb.orWhere(`note.userId IN (${ followingQuery.getQuery() })`); })) .leftJoinAndSelect('note.user', 'user') .setParameters(followingQuery.getParameters()); -- cgit v1.2.3-freya