summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/blocking/create.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-03-24 11:34:29 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-03-24 11:34:29 +0900
commit3e11011229ef8459747acdf6d3008dc145280fec (patch)
tree8ebc85727c4d295f6583b63d9397651151d4394a /src/server/api/endpoints/blocking/create.ts
parentMerge branch 'develop' (diff)
parent12.75.1 (diff)
downloadmisskey-3e11011229ef8459747acdf6d3008dc145280fec.tar.gz
misskey-3e11011229ef8459747acdf6d3008dc145280fec.tar.bz2
misskey-3e11011229ef8459747acdf6d3008dc145280fec.zip
Merge branch 'develop'
Diffstat (limited to 'src/server/api/endpoints/blocking/create.ts')
-rw-r--r--src/server/api/endpoints/blocking/create.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/api/endpoints/blocking/create.ts b/src/server/api/endpoints/blocking/create.ts
index dfab338a8b..60fde8ad78 100644
--- a/src/server/api/endpoints/blocking/create.ts
+++ b/src/server/api/endpoints/blocking/create.ts
@@ -1,5 +1,5 @@
import $ from 'cafy';
-import { ID } from '../../../../misc/cafy-id';
+import { ID } from '@/misc/cafy-id';
import * as ms from 'ms';
import create from '../../../../services/blocking/create';
import define from '../../define';
@@ -62,7 +62,7 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
- const blocker = user;
+ const blocker = await Users.findOneOrFail(user.id);
// 自分自身
if (user.id === ps.userId) {
@@ -93,7 +93,7 @@ export default define(meta, async (ps, user) => {
noteUserId: blockee.id
});
- return await Users.pack(blockee.id, user, {
+ return await Users.pack(blockee.id, blocker, {
detail: true
});
});