diff options
| author | Acid Chicken (硫酸鶏) <root@acid-chicken.com> | 2020-02-02 05:42:58 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-02 05:42:58 +0900 |
| commit | c30960d6bf9e1d7aabd8233553027d6dff7fc973 (patch) | |
| tree | ba5fd9a7e9be51c9d2a886f55b439eb2b9bde420 /src | |
| parent | Merge pull request #5795 from syuilo/patch/autogen/v11 (diff) | |
| download | sharkey-c30960d6bf9e1d7aabd8233553027d6dff7fc973.tar.gz sharkey-c30960d6bf9e1d7aabd8233553027d6dff7fc973.tar.bz2 sharkey-c30960d6bf9e1d7aabd8233553027d6dff7fc973.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/api/endpoints/hashtags/trend.ts | 5 | ||||
| -rw-r--r-- | src/services/note/create.ts | 4 |
2 files changed, 8 insertions, 1 deletions
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 diff --git a/src/services/note/create.ts b/src/services/note/create.ts index e6433ac04d..8bcf0d7d09 100644 --- a/src/services/note/create.ts +++ b/src/services/note/create.ts @@ -203,7 +203,9 @@ export default async (user: User, data: Option, silent = false) => new Promise<N } // ハッシュタグ更新 - updateHashtags(user, tags); + if (data.visibility === 'public' || data.visibility === 'home') { + updateHashtags(user, tags); + } // Increment notes count (user) incNotesCountOfUser(user); |