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 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

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

@ -1,7 +1,6 @@
import $ from 'cafy';
import UserList, { pack } from '../../../../../models/user-list';
import { ILocalUser } from '../../../../../models/user';
import getParams from '../../../get-params';
import define from '../../../define';
export const meta = {
desc: {
@ -20,10 +19,7 @@ export const meta = {
}
};
export default async (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) => {
// insert
const userList = await UserList.insert({
createdAt: new Date(),
@ -34,4 +30,4 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
// Response
res(await pack(userList));
});
}));

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

@ -1,8 +1,7 @@
import $ from 'cafy';
import ID, { transform } from '../../../../../misc/cafy-id';
import UserList from '../../../../../models/user-list';
import { ILocalUser } from '../../../../../models/user';
import getParams from '../../../get-params';
import define from '../../../define';
export const meta = {
desc: {
@ -26,10 +25,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 userList = await UserList.findOne({
_id: ps.listId,
userId: user._id
@ -44,4 +40,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
});
res();
});
}));

6
src/server/api/endpoints/users/lists/list.ts
View file

@ -1,5 +1,5 @@
import UserList, { pack } from '../../../../../models/user-list';
import { ILocalUser } from '../../../../../models/user';
import define from '../../../define';
export const meta = {
desc: {
@ -11,11 +11,11 @@ export const meta = {
kind: 'account-read'
};
export default async (params: any, me: ILocalUser) => new Promise(async (res, rej) => {
export default define(meta, (ps, me) => new Promise(async (res, rej) => {
// Fetch lists
const userLists = await UserList.find({
userId: me._id,
});
res(await Promise.all(userLists.map(x => pack(x))));
});
}));

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

@ -1,11 +1,11 @@
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import UserList from '../../../../../models/user-list';
import User, { pack as packUser, isRemoteUser, getGhost, ILocalUser } from '../../../../../models/user';
import User, { pack as packUser, isRemoteUser, getGhost } from '../../../../../models/user';
import { publishUserListStream } from '../../../../../stream';
import ap from '../../../../../remote/activitypub/renderer';
import renderFollow from '../../../../../remote/activitypub/renderer/follow';
import { deliver } from '../../../../../queue';
import getParams from '../../../get-params';
import define from '../../../define';
export const meta = {
desc: {
@ -30,10 +30,7 @@ export const meta = {
}
};
export default async (params: any, me: ILocalUser) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) return rej(psErr);
export default define(meta, (ps, me) => new Promise(async (res, rej) => {
// Fetch the list
const userList = await UserList.findOne({
_id: ps.listId,
@ -74,4 +71,4 @@ export default async (params: any, me: ILocalUser) => new Promise(async (res, re
const content = ap(renderFollow(ghost, user));
deliver(ghost, content, user.inbox);
}
});
}));

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

@ -1,7 +1,6 @@
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import UserList, { pack } from '../../../../../models/user-list';
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 async (params: any, me: ILocalUser) => new Promise(async (res, rej) => {
const [ps, psErr] = getParams(meta, params);
if (psErr) return rej(psErr);
export default define(meta, (ps, me) => new Promise(async (res, rej) => {
// Fetch the list
const userList = await UserList.findOne({
_id: ps.listId,
@ -36,4 +32,4 @@ export default async (params: any, me: ILocalUser) => new Promise(async (res, re
}
res(await pack(userList));
});
}));

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

@ -1,8 +1,7 @@
import $ from 'cafy';
import ID, { transform } from '../../../../../misc/cafy-id';
import UserList, { pack } from '../../../../../models/user-list';
import { ILocalUser } from '../../../../../models/user';
import getParams from '../../../get-params';
import define from '../../../define';
export const meta = {
desc: {
@ -34,10 +33,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 the list
const userList = await UserList.findOne({
_id: ps.listId,
@ -57,4 +53,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
// Response
res(await pack(userList._id));
});
}));