Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve error handling of API (#4345)

Browse source 
* wip

* wip

* wip

* Update attached_notes.ts

* wip

* Refactor

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update call.ts

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* ✌️

* Fix
This commit is contained in:
syuilo 2019-02-22 11:46:58 +09:00 • committed by GitHub
parent fc52e95ad0
commit 2756f553c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
181 changed files with 2010 additions and 1322 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/server/api/endpoints/users/lists/pull.ts
View file

@ -4,6 +4,7 @@ import UserList from '../../../../../models/user-list';
import User, { pack as packUser } from '../../../../../models/user';
import { publishUserListStream } from '../../../../../services/stream';
import define from '../../../define';
import { ApiError } from '../../../error';
export const meta = {
desc: {
@ -29,10 +30,24 @@ export const meta = {
'en-US': 'Target user ID'
}
},
},
errors: {
noSuchList: {
message: 'No such list.',
code: 'NO_SUCH_LIST',
id: '7f44670e-ab16-43b8-b4c1-ccd2ee89cc02'
},
noSuchUser: {
message: 'No such user.',
code: 'NO_SUCH_USER',
id: '588e7f72-c744-4a61-b180-d354e912bda2'
}
}
};
export default define(meta, (ps, me) => new Promise(async (res, rej) => {
export default define(meta, async (ps, me) => {
// Fetch the list
const userList = await UserList.findOne({
_id: ps.listId,
@ -40,7 +55,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
});
if (userList == null) {
return rej('list not found');
throw new ApiError(meta.errors.noSuchList);
}
// Fetch the user
@ -49,7 +64,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
});
if (user == null) {
return rej('user not found');
throw new ApiError(meta.errors.noSuchUser);
}
// Pull the user
@ -59,7 +74,5 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
}
});
res();
publishUserListStream(userList._id, 'userRemoved', await packUser(user));
}));
});