summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/clips
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-08-17 22:01:46 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-08-17 22:01:46 +0900
commitdf67836c1ad281d2622b52bdf7c767b2dfc0e6a5 (patch)
tree5a2c4e5b681857d846d5fea1f4058b72e80651da /src/server/api/endpoints/clips
parentMerge branch 'develop' (diff)
parentMerge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff)
downloadmisskey-df67836c1ad281d2622b52bdf7c767b2dfc0e6a5.tar.gz
misskey-df67836c1ad281d2622b52bdf7c767b2dfc0e6a5.tar.bz2
misskey-df67836c1ad281d2622b52bdf7c767b2dfc0e6a5.zip
Merge branch 'develop'
Diffstat (limited to 'src/server/api/endpoints/clips')
-rw-r--r--src/server/api/endpoints/clips/notes.ts2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/api/endpoints/clips/notes.ts b/src/server/api/endpoints/clips/notes.ts
index 5fd17584d3..4bece5a2c8 100644
--- a/src/server/api/endpoints/clips/notes.ts
+++ b/src/server/api/endpoints/clips/notes.ts
@@ -6,6 +6,7 @@ import { makePaginationQuery } from '../../common/make-pagination-query';
import { generateVisibilityQuery } from '../../common/generate-visibility-query';
import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
import { ApiError } from '../../error';
+import { generateBlockedUserQuery } from '../../common/generate-block-query';
export const meta = {
tags: ['account', 'notes', 'clips'],
@@ -81,6 +82,7 @@ export default define(meta, async (ps, user) => {
if (user) {
generateVisibilityQuery(query, user);
generateMutedUserQuery(query, user);
+ generateBlockedUserQuery(query, user);
}
const notes = await query