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

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

10
src/server/api/endpoints/users/lists/push.ts
View file

@ -8,6 +8,7 @@ import renderFollow from '../../../../../remote/activitypub/renderer/follow';
import { deliver } from '../../../../../queue';
import define from '../../../define';
import { ApiError } from '../../../error';
import { getUser } from '../../../common/getters';
export const meta = {
desc: {
@ -68,14 +69,11 @@ export default define(meta, async (ps, me) => {
}
// Fetch the user
const user = await User.findOne({
_id: ps.userId
const user = await getUser(ps.userId).catch(e => {
if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw e;
});
if (user == null) {
throw new ApiError(meta.errors.noSuchUser);
}
if (userList.userIds.map(id => id.toHexString()).includes(user._id.toHexString())) {
throw new ApiError(meta.errors.alreadyAdded);
}