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

Refactoring, Clean up and bug fixes

Browse source
This commit is contained in:
syuilo 2018-11-02 03:32:24 +09:00
parent b4b9e76c8d
commit 931bdc6aac
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
108 changed files with 1722 additions and 1539 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
import $ from 'cafy';
import ID from '../../../../../misc/cafy-id';
import ID, { transform } from '../../../../../misc/cafy-id';
import UserList from '../../../../../models/user-list';
import { ILocalUser } from '../../../../../models/user';
import getParams from '../../../get-params';
@ -15,12 +15,14 @@ export const meta = {
kind: 'account-write',
params: {
listId: $.type(ID).note({
listId: {
validator: $.type(ID),
transform: transform,
desc: {
'ja-JP': '対象となるユーザーリストのID',
'en-US': 'ID of target user list'
}
})
}
}
};

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

@ -1,10 +1,11 @@
import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
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 { 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';
export const meta = {
desc: {
@ -14,20 +15,28 @@ export const meta = {
requireCredential: true,
kind: 'account-write'
kind: 'account-write',
params: {
listId: {
validator: $.type(ID),
transform: transform,
},
userId: {
validator: $.type(ID),
transform: transform,
},
}
};
/**
* Add a user to a user list
*/
export default async (params: any, me: ILocalUser) => new Promise(async (res, rej) => {
// Get 'listId' parameter
const [listId, listIdErr] = $.type(ID).get(params.listId);
if (listIdErr) return rej('invalid listId param');
const [ps, psErr] = getParams(meta, params);
if (psErr) return rej(psErr);
// Fetch the list
const userList = await UserList.findOne({
_id: listId,
_id: ps.listId,
userId: me._id,
});
@ -35,13 +44,9 @@ export default async (params: any, me: ILocalUser) => new Promise(async (res, re
return rej('list not found');
}
// Get 'userId' parameter
const [userId, userIdErr] = $.type(ID).get(params.userId);
if (userIdErr) return rej('invalid userId param');
// Fetch the user
const user = await User.findOne({
_id: userId
_id: ps.userId
});
if (user == null) {

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

@ -1,6 +1,7 @@
import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
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';
export const meta = {
desc: {
@ -10,17 +11,23 @@ export const meta = {
requireCredential: true,
kind: 'account-read'
kind: 'account-read',
params: {
listId: {
validator: $.type(ID),
transform: transform,
},
}
};
export default async (params: any, me: ILocalUser) => new Promise(async (res, rej) => {
// Get 'listId' parameter
const [listId, listIdErr] = $.type(ID).get(params.listId);
if (listIdErr) return rej('invalid listId param');
const [ps, psErr] = getParams(meta, params);
if (psErr) return rej(psErr);
// Fetch the list
const userList = await UserList.findOne({
_id: listId,
_id: ps.listId,
userId: me._id,
});

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

@ -1,5 +1,5 @@
import $ from 'cafy';
import ID from '../../../../../misc/cafy-id';
import ID, { transform } from '../../../../../misc/cafy-id';
import UserList, { pack } from '../../../../../models/user-list';
import { ILocalUser } from '../../../../../models/user';
import getParams from '../../../get-params';
@ -15,18 +15,22 @@ export const meta = {
kind: 'account-write',
params: {
listId: $.type(ID).note({
listId: {
validator: $.type(ID),
transform: transform,
desc: {
'ja-JP': '対象となるユーザーリストのID',
'en-US': 'ID of target user list'
}
}),
title: $.str.range(1, 100).note({
},
title: {
validator: $.str.range(1, 100),
desc: {
'ja-JP': 'このユーザーリストの名前',
'en-US': 'name of this user list'
}
})
}
}
};