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

13
src/server/api/endpoints/drive/folders/create.ts
View file

@ -1,4 +1,4 @@
import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder';
import { publishDriveStream } from '../../../../../stream';
import { ILocalUser } from '../../../../../models/user';
@ -17,20 +17,23 @@ export const meta = {
kind: 'drive-write',
params: {
name: $.str.optional.pipe(isValidFolderName).note({
name: {
validator: $.str.optional.pipe(isValidFolderName),
default: 'Untitled',
desc: {
'ja-JP': 'フォルダ名',
'en-US': 'Folder name'
}
}),
},
parentId: $.type(ID).optional.nullable.note({
parentId: {
validator: $.type(ID).optional.nullable,
transform: transform,
desc: {
'ja-JP': '親フォルダID',
'en-US': 'Parent folder ID'
}
})
}
}
};

8
src/server/api/endpoints/drive/folders/delete.ts
View file

@ -1,4 +1,4 @@
import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import DriveFolder from '../../../../../models/drive-folder';
import { ILocalUser } from '../../../../../models/user';
import getParams from '../../../get-params';
@ -18,12 +18,14 @@ export const meta = {
kind: 'drive-write',
params: {
folderId: $.type(ID).note({
folderId: {
validator: $.type(ID),
transform: transform,
desc: {
'ja-JP': '対象のフォルダID',
'en-US': 'Target folder ID'
}
})
}
}
};

33
src/server/api/endpoints/drive/folders/find.ts
View file

@ -1,30 +1,39 @@
import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import DriveFolder, { pack } from '../../../../../models/drive-folder';
import { ILocalUser } from '../../../../../models/user';
import getParams from '../../../get-params';
export const meta = {
requireCredential: true,
kind: 'drive-read'
kind: 'drive-read',
params: {
name: {
validator: $.str
},
parentId: {
validator: $.type(ID).optional.nullable,
transform: transform,
default: null as any,
desc: {
'ja-JP': 'フォルダID'
}
},
}
};
export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
// Get 'name' parameter
const [name, nameErr] = $.str.get(params.name);
if (nameErr) return rej('invalid name param');
const [ps, psErr] = getParams(meta, params);
if (psErr) return rej(psErr);
// Get 'parentId' parameter
const [parentId = null, parentIdErr] = $.type(ID).optional.nullable.get(params.parentId);
if (parentIdErr) return rej('invalid parentId param');
// Issue query
const folders = await DriveFolder
.find({
name: name,
userId: user._id,
parentId: parentId
parentId: ps.parentId
});
// Serialize
res(await Promise.all(folders.map(folder => pack(folder))));
});

8
src/server/api/endpoints/drive/folders/show.ts
View file

@ -1,4 +1,4 @@
import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import DriveFolder, { pack } from '../../../../../models/drive-folder';
import { ILocalUser } from '../../../../../models/user';
import getParams from '../../../get-params';
@ -16,12 +16,14 @@ export const meta = {
kind: 'drive-read',
params: {
folderId: $.type(ID).note({
folderId: {
validator: $.type(ID),
transform: transform,
desc: {
'ja-JP': '対象のフォルダID',
'en-US': 'Target folder ID'
}
})
}
}
};

19
src/server/api/endpoints/drive/folders/update.ts
View file

@ -1,4 +1,4 @@
import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder';
import { publishDriveStream } from '../../../../../stream';
import { ILocalUser } from '../../../../../models/user';
@ -17,26 +17,31 @@ export const meta = {
kind: 'drive-write',
params: {
folderId: $.type(ID).note({
folderId: {
validator: $.type(ID),
transform: transform,
desc: {
'ja-JP': '対象のフォルダID',
'en-US': 'Target folder ID'
}
}),
},
name: $.str.optional.pipe(isValidFolderName).note({
name: {
validator: $.str.optional.pipe(isValidFolderName),
desc: {
'ja-JP': 'フォルダ名',
'en-US': 'Folder name'
}
}),
},
parentId: $.type(ID).optional.nullable.note({
parentId: {
validator: $.type(ID).optional.nullable,
transform: transform,
desc: {
'ja-JP': '親フォルダID',
'en-US': 'Parent folder ID'
}
})
}
}
};