summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-10-11 12:26:07 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-10-11 12:26:07 +0900
commitcf3624a54fed61930355aeb58baaf75aea820e08 (patch)
tree8cc06e07f3723a19ab51055df18c0ede33d51a9e
parentUpdate CHANGELOG.md (diff)
downloadmisskey-cf3624a54fed61930355aeb58baaf75aea820e08.tar.gz
misskey-cf3624a54fed61930355aeb58baaf75aea820e08.tar.bz2
misskey-cf3624a54fed61930355aeb58baaf75aea820e08.zip
fix(backend): users/notesでセンシティブチャンネルの投稿が含まれる場合がある問題を修正
-rw-r--r--CHANGELOG.md1
-rw-r--r--packages/backend/src/server/api/endpoints/users/notes.ts4
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb6ecb1fb0..42fd7dadba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
### Server
- Fix: フォローしているユーザーからの自分の投稿への返信がタイムラインに含まれない問題を修正
+- Fix: users/notesでセンシティブチャンネルの投稿が含まれる場合がある問題を修正
## 2023.10.0
### NOTE
diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts
index dfef35986e..df0951ce74 100644
--- a/packages/backend/src/server/api/endpoints/users/notes.ts
+++ b/packages/backend/src/server/api/endpoints/users/notes.ts
@@ -150,7 +150,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
.leftJoinAndSelect('reply.user', 'replyUser')
.leftJoinAndSelect('renote.user', 'renoteUser');
- if (!ps.withChannelNotes) {
+ if (ps.withChannelNotes) {
+ if (!isSelf) query.andWhere('channel.isSensitive = false');
+ } else {
query.andWhere('note.channelId IS NULL');
}