diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-05-21 14:13:03 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-21 14:13:03 +0900 |
| commit | da34acd35fdeca50cba2de809e85de1f22eb5b70 (patch) | |
| tree | d16449fb3f88a077e199a411b6eafb1e3f9b4411 /src/server | |
| parent | Update deps (diff) | |
| download | sharkey-da34acd35fdeca50cba2de809e85de1f22eb5b70.tar.gz sharkey-da34acd35fdeca50cba2de809e85de1f22eb5b70.tar.bz2 sharkey-da34acd35fdeca50cba2de809e85de1f22eb5b70.zip | |
Resolve #6563 (#7524)
* Resolve #6563
* Update note.ts
* Update generate-visibility-query.ts
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/api/common/generate-visibility-query.ts | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/notes/mentions.ts | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/api/common/generate-visibility-query.ts b/src/server/api/common/generate-visibility-query.ts index 72ed1c46ea..00a50f8211 100644 --- a/src/server/api/common/generate-visibility-query.ts +++ b/src/server/api/common/generate-visibility-query.ts @@ -22,7 +22,7 @@ export function generateVisibilityQuery(q: SelectQueryBuilder<any>, me?: { id: U // または 自分自身 .orWhere('note.userId = :userId1', { userId1: me.id }) // または 自分宛て - .orWhere(':userId2 = ANY(note.visibleUserIds)', { userId2: me.id }) + .orWhere(`'{"${me.id}"}' <@ note.visibleUserIds`) .orWhere(new Brackets(qb => { qb // または フォロワー宛ての投稿であり、 .where('note.visibility = \'followers\'') diff --git a/src/server/api/endpoints/notes/mentions.ts b/src/server/api/endpoints/notes/mentions.ts index 34936c9b54..dddd08eee6 100644 --- a/src/server/api/endpoints/notes/mentions.ts +++ b/src/server/api/endpoints/notes/mentions.ts @@ -60,8 +60,8 @@ export default define(meta, async (ps, user) => { const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId) .andWhere(new Brackets(qb => { qb - .where(`:meId = ANY(note.mentions)`, { meId: user.id }) - .orWhere(`:meId = ANY(note.visibleUserIds)`, { meId: user.id }); + .where(`'{"${user.id}"}' <@ note.mentions`) + .orWhere(`'{"${user.id}"}' <@ note.visibleUserIds`); })) .innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.reply', 'reply') |