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

Refactor

Browse source
This commit is contained in:
syuilo 2018-11-02 13:47:44 +09:00
parent ddc3c5ba68
commit 174f8022eb
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
131 changed files with 512 additions and 917 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,9 @@
import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
const ms = require('ms');
import User, { pack, ILocalUser } from '../../../../models/user';
import User, { pack } from '../../../../models/user';
import Following from '../../../../models/following';
import create from '../../../../services/following/create';
import getParams from '../../get-params';
import define from '../../define';
export const meta = {
stability: 'stable',
@ -34,10 +34,7 @@ export const meta = {
}
};
export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) return rej(psErr);
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
const follower = user;
// 自分自身
@ -78,4 +75,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
// Send response
res(await pack(followee._id, user));
});
}));

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

@ -1,9 +1,9 @@
import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
const ms = require('ms');
import User, { pack, ILocalUser } from '../../../../models/user';
import User, { pack } from '../../../../models/user';
import Following from '../../../../models/following';
import deleteFollowing from '../../../../services/following/delete';
import getParams from '../../get-params';
import define from '../../define';
export const meta = {
stability: 'stable',
@ -34,10 +34,7 @@ export const meta = {
}
};
export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) return rej(psErr);
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
const follower = user;
// Check if the followee is yourself
@ -74,4 +71,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
// Send response
res(await pack(followee._id, user));
});
}));

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

@ -1,7 +1,7 @@
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import acceptFollowRequest from '../../../../../services/following/requests/accept';
import User, { ILocalUser } from '../../../../../models/user';
import getParams from '../../../get-params';
import User from '../../../../../models/user';
import define from '../../../define';
export const meta = {
desc: {
@ -21,10 +21,7 @@ export const meta = {
}
};
export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) return rej(psErr);
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
// Fetch follower
const follower = await User.findOne({
_id: ps.userId
@ -37,4 +34,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
await acceptFollowRequest(user, follower);
res();
});
}));

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

@ -1,7 +1,7 @@
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import cancelFollowRequest from '../../../../../services/following/requests/cancel';
import User, { pack, ILocalUser } from '../../../../../models/user';
import getParams from '../../../get-params';
import User, { pack } from '../../../../../models/user';
import define from '../../../define';
export const meta = {
desc: {
@ -21,10 +21,7 @@ export const meta = {
}
};
export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) return rej(psErr);
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
// Fetch followee
const followee = await User.findOne({
_id: ps.userId
@ -41,4 +38,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
}
res(await pack(followee._id, user));
});
}));

6
src/server/api/endpoints/following/requests/list.ts
View file

@ -1,6 +1,6 @@
//import $ from 'cafy'; import ID, { transform } from '../../../../../cafy-id';
import FollowRequest, { pack } from '../../../../../models/follow-request';
import { ILocalUser } from '../../../../../models/user';
import define from '../../../define';
export const meta = {
desc: {
@ -13,11 +13,11 @@ export const meta = {
kind: 'following-read'
};
export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
const reqs = await FollowRequest.find({
followeeId: user._id
});
// Send response
res(await Promise.all(reqs.map(req => pack(req))));
});
}));

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

@ -1,7 +1,7 @@
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import rejectFollowRequest from '../../../../../services/following/requests/reject';
import User, { ILocalUser } from '../../../../../models/user';
import getParams from '../../../get-params';
import User from '../../../../../models/user';
import define from '../../../define';
export const meta = {
desc: {
@ -21,10 +21,7 @@ export const meta = {
}
};
export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) return rej(psErr);
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
// Fetch follower
const follower = await User.findOne({
_id: ps.userId
@ -37,4 +34,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
await rejectFollowRequest(user, follower);
res();
});
}));

10
src/server/api/endpoints/following/stalk.ts
View file

@ -1,7 +1,6 @@
import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
import Following from '../../../../models/following';
import { ILocalUser } from '../../../../models/user';
import getParams from '../../get-params';
import define from '../../define';
export const meta = {
desc: {
@ -21,10 +20,7 @@ export const meta = {
}
};
export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) return rej(psErr);
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
const follower = user;
// Fetch following
@ -47,4 +43,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
res();
// TODO: イベント
});
}));

10
src/server/api/endpoints/following/unstalk.ts
View file

@ -1,7 +1,6 @@
import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
import Following from '../../../../models/following';
import { ILocalUser } from '../../../../models/user';
import getParams from '../../get-params';
import define from '../../define';
export const meta = {
desc: {
@ -21,10 +20,7 @@ export const meta = {
}
};
export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) return rej(psErr);
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
const follower = user;
// Fetch following
@ -47,4 +43,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
res();
// TODO: イベント
});
}));