From d64dc458999afdc0bfd5f662a583bd1a0f6eebb3 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Mon, 29 Oct 2018 20:32:42 +0900 Subject: User blocking (Following part) (#3035) * block wip * UndoBlock * UnBlock * wip * follow * UI * fix --- src/server/api/endpoints/blocking/create.ts | 75 +++++++++++++++++++++++++++++ src/server/api/endpoints/blocking/delete.ts | 75 +++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+) create mode 100644 src/server/api/endpoints/blocking/create.ts create mode 100644 src/server/api/endpoints/blocking/delete.ts (limited to 'src/server/api/endpoints/blocking') diff --git a/src/server/api/endpoints/blocking/create.ts b/src/server/api/endpoints/blocking/create.ts new file mode 100644 index 0000000000..c235731190 --- /dev/null +++ b/src/server/api/endpoints/blocking/create.ts @@ -0,0 +1,75 @@ +import $ from 'cafy'; import ID from '../../../../misc/cafy-id'; +const ms = require('ms'); +import User, { pack, ILocalUser } from '../../../../models/user'; +import Blocking from '../../../../models/blocking'; +import create from '../../../../services/blocking/create'; +import getParams from '../../get-params'; + +export const meta = { + stability: 'stable', + + desc: { + 'ja-JP': '指定したユーザーをブロックします。', + 'en-US': 'Block a user.' + }, + + limit: { + duration: ms('1hour'), + max: 100 + }, + + requireCredential: true, + + kind: 'following-write', + + params: { + userId: $.type(ID).note({ + desc: { + 'ja-JP': '対象のユーザーのID', + 'en-US': 'Target user ID' + } + }) + } +}; + +export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => { + const [ps, psErr] = getParams(meta, params); + if (psErr) return rej(psErr); + + const blocker = user; + + // 自分自身 + if (user._id.equals(ps.userId)) { + return rej('blockee is yourself'); + } + + // Get blockee + const blockee = await User.findOne({ + _id: ps.userId + }, { + fields: { + data: false, + profile: false + } + }); + + if (blockee === null) { + return rej('user not found'); + } + + // Check if already blocking + const exist = await Blocking.findOne({ + blockerId: blocker._id, + blockeeId: blockee._id + }); + + if (exist !== null) { + return rej('already blocking'); + } + + // Create blocking + await create(blocker, blockee); + + // Send response + res(await pack(blockee._id, user)); +}); diff --git a/src/server/api/endpoints/blocking/delete.ts b/src/server/api/endpoints/blocking/delete.ts new file mode 100644 index 0000000000..dd0cf6b515 --- /dev/null +++ b/src/server/api/endpoints/blocking/delete.ts @@ -0,0 +1,75 @@ +import $ from 'cafy'; import ID from '../../../../misc/cafy-id'; +const ms = require('ms'); +import User, { pack, ILocalUser } from '../../../../models/user'; +import Blocking from '../../../../models/blocking'; +import deleteBlocking from '../../../../services/blocking/delete'; +import getParams from '../../get-params'; + +export const meta = { + stability: 'stable', + + desc: { + 'ja-JP': '指定したユーザーのブロックを解除します。', + 'en-US': 'Unblock a user.' + }, + + limit: { + duration: ms('1hour'), + max: 100 + }, + + requireCredential: true, + + kind: 'following-write', + + params: { + userId: $.type(ID).note({ + desc: { + 'ja-JP': '対象のユーザーのID', + 'en-US': 'Target user ID' + } + }) + } +}; + +export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => { + const [ps, psErr] = getParams(meta, params); + if (psErr) return rej(psErr); + + const blocker = user; + + // Check if the blockee is yourself + if (user._id.equals(ps.userId)) { + return rej('blockee is yourself'); + } + + // Get blockee + const blockee = await User.findOne({ + _id: ps.userId + }, { + fields: { + data: false, + 'profile': false + } + }); + + if (blockee === null) { + return rej('user not found'); + } + + // Check not blocking + const exist = await Blocking.findOne({ + blockerId: blocker._id, + blockeeId: blockee._id + }); + + if (exist === null) { + return rej('already not blocking'); + } + + // Delete blocking + await deleteBlocking(blocker, blockee); + + // Send response + res(await pack(blockee._id, user)); +}); -- cgit v1.2.3-freya