oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

Refactor

Browse source
This commit is contained in:
syuilo 2019-02-22 14:02:56 +09:00
parent e8d2959717
commit be3298639d
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
27 changed files with 98 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/server/api/endpoints/blocking/delete.ts
View file

@ -6,6 +6,7 @@ import Blocking from '../../../../models/blocking';
import deleteBlocking from '../../../../services/blocking/delete';
import define from '../../define';
import { ApiError } from '../../error';
import { getUser } from '../../common/getters';
export const meta = {
stability: 'stable',
@ -65,19 +66,11 @@ export default define(meta, async (ps, user) => {
}
// Get blockee
const blockee = await User.findOne({
_id: ps.userId
}, {
fields: {
data: false,
'profile': false
}
const blockee = await getUser(ps.userId).catch(e => {
if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw e;
});
if (blockee === null) {
throw new ApiError(meta.errors.noSuchUser);
}
// Check not blocking
const exist = await Blocking.findOne({
blockerId: blocker._id,