summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/clips/notes.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-11-15 17:35:40 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-11-15 17:35:40 +0900
commitcd34ade6383201d41e9623652e4e10800a91f739 (patch)
tree806c7248609179256845e4b3b733c24967734229 /src/server/api/endpoints/clips/notes.ts
parent12.57.2 (diff)
downloadsharkey-cd34ade6383201d41e9623652e4e10800a91f739.tar.gz
sharkey-cd34ade6383201d41e9623652e4e10800a91f739.tar.bz2
sharkey-cd34ade6383201d41e9623652e4e10800a91f739.zip
非ログイン時にクリップを取得できない問題を修正
Diffstat (limited to 'src/server/api/endpoints/clips/notes.ts')
-rw-r--r--src/server/api/endpoints/clips/notes.ts10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/server/api/endpoints/clips/notes.ts b/src/server/api/endpoints/clips/notes.ts
index 3d66623d63..13983d99f7 100644
--- a/src/server/api/endpoints/clips/notes.ts
+++ b/src/server/api/endpoints/clips/notes.ts
@@ -10,7 +10,7 @@ import { ApiError } from '../../error';
export const meta = {
tags: ['account', 'notes', 'clips'],
- requireCredential: true as const,
+ requireCredential: false as const,
kind: 'read:account',
@@ -51,7 +51,7 @@ export default define(meta, async (ps, user) => {
throw new ApiError(meta.errors.noSuchClip);
}
- if (!clip.isPublic && (clip.userId !== user.id)) {
+ if (!clip.isPublic && (user == null || (clip.userId !== user.id))) {
throw new ApiError(meta.errors.noSuchClip);
}
@@ -64,8 +64,10 @@ export default define(meta, async (ps, user) => {
.leftJoinAndSelect('note.user', 'user')
.setParameters(clipQuery.getParameters());
- generateVisibilityQuery(query, user);
- generateMutedUserQuery(query, user);
+ if (user) {
+ generateVisibilityQuery(query, user);
+ generateMutedUserQuery(query, user);
+ }
const notes = await query
.take(ps.limit!)