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

15
src/server/api/endpoints/following/create.ts
View file

@ -6,6 +6,7 @@ import Following from '../../../../models/following';
import create from '../../../../services/following/create';
import define from '../../define';
import { ApiError } from '../../error';
import { getUser } from '../../common/getters';
export const meta = {
stability: 'stable',
@ -77,19 +78,11 @@ export default define(meta, async (ps, user) => {
}
// Get followee
const followee = await User.findOne({
_id: ps.userId
}, {
fields: {
data: false,
profile: false
}
const followee = await getUser(ps.userId).catch(e => {
if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw e;
});
if (followee === null) {
throw new ApiError(meta.errors.noSuchUser);
}
// Check if already following
const exist = await Following.findOne({
followerId: follower._id,

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

@ -6,6 +6,7 @@ import Following from '../../../../models/following';
import deleteFollowing from '../../../../services/following/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 followee
const followee = await User.findOne({
_id: ps.userId
}, {
fields: {
data: false,
'profile': false
}
const followee = await getUser(ps.userId).catch(e => {
if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw e;
});
if (followee === null) {
throw new ApiError(meta.errors.noSuchUser);
}
// Check not following
const exist = await Following.findOne({
followerId: follower._id,

10
src/server/api/endpoints/following/requests/accept.ts
View file

@ -4,6 +4,7 @@ import acceptFollowRequest from '../../../../../services/following/requests/acce
import User from '../../../../../models/user';
import define from '../../../define';
import { ApiError } from '../../../error';
import { getUser } from '../../../common/getters';
export const meta = {
desc: {
@ -37,14 +38,11 @@ export const meta = {
export default define(meta, async (ps, user) => {
// Fetch follower
const follower = await User.findOne({
_id: ps.userId
const follower = await getUser(ps.userId).catch(e => {
if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw e;
});
if (follower === null) {
throw new ApiError(meta.errors.noSuchUser);
}
await acceptFollowRequest(user, follower);
return;

10
src/server/api/endpoints/following/requests/cancel.ts
View file

@ -4,6 +4,7 @@ import cancelFollowRequest from '../../../../../services/following/requests/canc
import User, { pack } from '../../../../../models/user';
import define from '../../../define';
import { ApiError } from '../../../error';
import { getUser } from '../../../common/getters';
export const meta = {
desc: {
@ -43,14 +44,11 @@ export const meta = {
export default define(meta, async (ps, user) => {
// Fetch followee
const followee = await User.findOne({
_id: ps.userId
const followee = await getUser(ps.userId).catch(e => {
if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw e;
});
if (followee === null) {
throw new ApiError(meta.errors.noSuchUser);
}
try {
await cancelFollowRequest(followee, user);
} catch (e) {

10
src/server/api/endpoints/following/requests/reject.ts
View file

@ -4,6 +4,7 @@ import rejectFollowRequest from '../../../../../services/following/requests/reje
import User from '../../../../../models/user';
import define from '../../../define';
import { ApiError } from '../../../error';
import { getUser } from '../../../common/getters';
export const meta = {
desc: {
@ -37,14 +38,11 @@ export const meta = {
export default define(meta, async (ps, user) => {
// Fetch follower
const follower = await User.findOne({
_id: ps.userId
const follower = await getUser(ps.userId).catch(e => {
if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
throw e;
});
if (follower === null) {
throw new ApiError(meta.errors.noSuchUser);
}
await rejectFollowRequest(user, follower);
return;