From c30960d6bf9e1d7aabd8233553027d6dff7fc973 Mon Sep 17 00:00:00 2001 From: "Acid Chicken (硫酸鶏)" Date: Sun, 2 Feb 2020 05:42:58 +0900 Subject: Fix hashtags contained in private notes are shown in trends (#5805) * Update trend.ts * Fix query * Update create.ts * Update create.ts * Update trend.ts --- src/server/api/endpoints/hashtags/trend.ts | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/server/api') diff --git a/src/server/api/endpoints/hashtags/trend.ts b/src/server/api/endpoints/hashtags/trend.ts index a004732f81..f820f0bed5 100644 --- a/src/server/api/endpoints/hashtags/trend.ts +++ b/src/server/api/endpoints/hashtags/trend.ts @@ -1,3 +1,4 @@ +import { Brackets } from 'typeorm'; import define from '../../define'; import { fetchMeta } from '../../../../misc/fetch-meta'; import { Notes } from '../../../../models'; @@ -59,6 +60,10 @@ export default define(meta, async () => { const tagNotes = await Notes.createQueryBuilder('note') .where(`note.createdAt > :date`, { date: new Date(now.getTime() - rangeA) }) + .andWhere(new Brackets(qb => { qb + .where(`note.visibility = 'public'`) + .orWhere(`note.visibility = 'home'`); + })) .andWhere(`note.tags != '{}'`) .select(['note.tags', 'note.userId']) .cache(60000) // 1 min -- cgit v1.2.3-freya