sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactorng

Browse Source
This commit is contained in:
syuilo
2018-07-07 19:19:00 +09:00
parent 865fd25af1
commit aa4ef6745a
132 changed files with 180 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/api/endpoints/i/favorites.ts
View File

@ -1,4 +1,4 @@
import $ from 'cafy'; import ID from '../../../../cafy-id';
import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
import Favorite, { pack } from '../../../../models/favorite';
import { ILocalUser } from '../../../../models/user';

2
src/server/api/endpoints/i/notifications.ts
View File

@ -1,4 +1,4 @@
import $ from 'cafy'; import ID from '../../../../cafy-id';
import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
import Notification from '../../../../models/notification';
import Mute from '../../../../models/mute';
import { pack } from '../../../../models/notification';

2
src/server/api/endpoints/i/pin.ts
View File

@ -1,4 +1,4 @@
import $ from 'cafy'; import ID from '../../../../cafy-id';
import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
import User, { ILocalUser } from '../../../../models/user';
import Note from '../../../../models/note';
import { pack } from '../../../../models/user';

2
src/server/api/endpoints/i/regenerate_token.ts
View File

@ -1,7 +1,7 @@
import $ from 'cafy';
import * as bcrypt from 'bcryptjs';
import User, { ILocalUser } from '../../../../models/user';
import event from '../../../../publishers/stream';
import event from '../../../../stream';
import generateUserToken from '../../common/generate-native-user-token';
/**

2
src/server/api/endpoints/i/signin_history.ts
View File

@ -1,4 +1,4 @@
import $ from 'cafy'; import ID from '../../../../cafy-id';
import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
import Signin, { pack } from '../../../../models/signin';
import { ILocalUser } from '../../../../models/user';

4
src/server/api/endpoints/i/update.ts
View File

@ -1,6 +1,6 @@
import $ from 'cafy'; import ID from '../../../../cafy-id';
import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack, ILocalUser } from '../../../../models/user';
import event from '../../../../publishers/stream';
import event from '../../../../stream';
import DriveFile from '../../../../models/drive-file';
import acceptAllFollowRequests from '../../../../services/following/requests/accept-all';
import { IApp } from '../../../../models/app';

2
src/server/api/endpoints/i/update_client_setting.ts
View File

@ -1,6 +1,6 @@
import $ from 'cafy';
import User, { ILocalUser } from '../../../../models/user';
import event from '../../../../publishers/stream';
import event from '../../../../stream';
/**
* Update myself

15
src/server/api/endpoints/i/update_home.ts
View File

@ -1,16 +1,15 @@
import $ from 'cafy';
import User, { ILocalUser } from '../../../../models/user';
import event from '../../../../publishers/stream';
import event from '../../../../stream';
export default async (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
// Get 'home' parameter
const [home, homeErr] = $.arr(
$.obj.strict()
.have('name', $.str)
.have('id', $.str)
.have('place', $.str)
.have('data', $.obj))
.get(params.home);
const [home, homeErr] = $.arr($.obj({
name: $.str,
id: $.str,
place: $.str,
data: $.obj()
}).strict()).get(params.home);
if (homeErr) return rej('invalid home param');
await User.update(user._id, {

13
src/server/api/endpoints/i/update_mobile_home.ts
View File

@ -1,15 +1,14 @@
import $ from 'cafy';
import User, { ILocalUser } from '../../../../models/user';
import event from '../../../../publishers/stream';
import event from '../../../../stream';
export default async (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
// Get 'home' parameter
const [home, homeErr] = $.arr(
$.obj.strict()
.have('name', $.str)
.have('id', $.str)
.have('data', $.obj))
.get(params.home);
const [home, homeErr] = $.arr($.obj({
name: $.str,
id: $.str,
data: $.obj()
}).strict()).get(params.home);
if (homeErr) return rej('invalid home param');
await User.update(user._id, {

4
src/server/api/endpoints/i/update_widget.ts
View File

@ -1,6 +1,6 @@
import $ from 'cafy';
import User, { ILocalUser } from '../../../../models/user';
import event from '../../../../publishers/stream';
import event from '../../../../stream';
export default async (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
// Get 'id' parameter
@ -8,7 +8,7 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
if (idErr) return rej('invalid id param');
// Get 'data' parameter
const [data, dataErr] = $.obj.get(params.data);
const [data, dataErr] = $.obj().get(params.data);
if (dataErr) return rej('invalid data param');
if (id == null && data == null) return rej('you need to set id and data params if home param unset');