summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api
diff options
context:
space:
mode:
authorshiosyakeyakini <blueskis382@gmail.com>2023-12-03 10:18:28 +0900
committerGitHub <noreply@github.com>2023-12-03 10:18:28 +0900
commit4de4a2e14369acb79f070795e482a60700d97b12 (patch)
tree5c6c70b24456c5fe337589bbd6c22407bfcf089d /packages/backend/src/server/api
parentRevert "fix #12528 (#12536)" (#12548) (diff)
downloadsharkey-4de4a2e14369acb79f070795e482a60700d97b12.tar.gz
sharkey-4de4a2e14369acb79f070795e482a60700d97b12.tar.bz2
sharkey-4de4a2e14369acb79f070795e482a60700d97b12.zip
fix: withChannelNotesとwithFilesを同時に指定したときの考慮 (#12550)
Co-authored-by: sorairo <sorairo@shiosyakeyakini.info>
Diffstat (limited to 'packages/backend/src/server/api')
-rw-r--r--packages/backend/src/server/api/endpoints/users/notes.ts3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts
index 56983f7bc4..4a358b39cb 100644
--- a/packages/backend/src/server/api/endpoints/users/notes.ts
+++ b/packages/backend/src/server/api/endpoints/users/notes.ts
@@ -113,6 +113,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
redisTimelines,
useDbFallback: true,
noteFilter: note => {
+ if (ps.withFiles && note.fileIds.length === 0) {
+ return false;
+ }
if (me && isUserRelated(note, userIdsWhoMeMuting, true)) return false;
if (note.renoteId) {