summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints/users/notes.ts
diff options
context:
space:
mode:
authortaichan <40626578+taichanNE30@users.noreply.github.com>2023-10-18 09:55:15 +0900
committerGitHub <noreply@github.com>2023-10-18 09:55:15 +0900
commitf6e1ee1d408bfad1d8e944fe886c9f59577423c1 (patch)
tree931fc9b128c5a85a1569a37ef4834d949239ad24 /packages/backend/src/server/api/endpoints/users/notes.ts
parentRemove unnecessary nullish coalescing (#12058) (diff)
downloadmisskey-f6e1ee1d408bfad1d8e944fe886c9f59577423c1.tar.gz
misskey-f6e1ee1d408bfad1d8e944fe886c9f59577423c1.tar.bz2
misskey-f6e1ee1d408bfad1d8e944fe886c9f59577423c1.zip
users/notesでDBから参照した際にチャンネル投稿のみ取得される問題を修正 (#12056)
* fix(backend): ユーザーのノート取得でDBにfallbackした際にチャンネルノートのみになる * Update CHANGELOG --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages/backend/src/server/api/endpoints/users/notes.ts')
-rw-r--r--packages/backend/src/server/api/endpoints/users/notes.ts5
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts
index 4f3d61ce07..2e9eb0dd86 100644
--- a/packages/backend/src/server/api/endpoints/users/notes.ts
+++ b/packages/backend/src/server/api/endpoints/users/notes.ts
@@ -151,7 +151,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
.leftJoinAndSelect('renote.user', 'renoteUser');
if (ps.withChannelNotes) {
- if (!isSelf) query.andWhere('channel.isSensitive = false');
+ if (!isSelf) query.andWhere(new Brackets(qb => {
+ qb.orWhere('note.channelId IS NULL');
+ qb.orWhere('channel.isSensitive = false');
+ }));
} else {
query.andWhere('note.channelId IS NULL');
}