cafy 5.xに移行
This commit is contained in:
		@@ -1,17 +1,12 @@
 | 
			
		||||
/**
 | 
			
		||||
 * Module dependencies
 | 
			
		||||
 */
 | 
			
		||||
import $ from 'cafy';
 | 
			
		||||
import $ from 'cafy'; import ID from '../../../../../cafy-id';
 | 
			
		||||
import { validateFileName, pack } from '../../../../../models/drive-file';
 | 
			
		||||
import create from '../../../../../services/drive/add-file';
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Create a file
 | 
			
		||||
 *
 | 
			
		||||
 * @param {any} file
 | 
			
		||||
 * @param {any} params
 | 
			
		||||
 * @param {any} user
 | 
			
		||||
 * @return {Promise<any>}
 | 
			
		||||
 */
 | 
			
		||||
module.exports = async (file, params, user): Promise<any> => {
 | 
			
		||||
	if (file == null) {
 | 
			
		||||
@@ -34,7 +29,7 @@ module.exports = async (file, params, user): Promise<any> => {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Get 'folderId' parameter
 | 
			
		||||
	const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.id().$;
 | 
			
		||||
	const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.type(ID).$;
 | 
			
		||||
	if (folderIdErr) throw 'invalid folderId param';
 | 
			
		||||
 | 
			
		||||
	try {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,15 +1,11 @@
 | 
			
		||||
/**
 | 
			
		||||
 * Module dependencies
 | 
			
		||||
 */
 | 
			
		||||
import $ from 'cafy';
 | 
			
		||||
import $ from 'cafy'; import ID from '../../../../../cafy-id';
 | 
			
		||||
import DriveFile, { pack } from '../../../../../models/drive-file';
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Find a file(s)
 | 
			
		||||
 *
 | 
			
		||||
 * @param {any} params
 | 
			
		||||
 * @param {any} user
 | 
			
		||||
 * @return {Promise<any>}
 | 
			
		||||
 */
 | 
			
		||||
module.exports = (params, user) => new Promise(async (res, rej) => {
 | 
			
		||||
	// Get 'name' parameter
 | 
			
		||||
@@ -17,7 +13,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 | 
			
		||||
	if (nameErr) return rej('invalid name param');
 | 
			
		||||
 | 
			
		||||
	// Get 'folderId' parameter
 | 
			
		||||
	const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.id().$;
 | 
			
		||||
	const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.type(ID).$;
 | 
			
		||||
	if (folderIdErr) return rej('invalid folderId param');
 | 
			
		||||
 | 
			
		||||
	// Issue query
 | 
			
		||||
 
 | 
			
		||||
@@ -1,19 +1,15 @@
 | 
			
		||||
/**
 | 
			
		||||
 * Module dependencies
 | 
			
		||||
 */
 | 
			
		||||
import $ from 'cafy';
 | 
			
		||||
import $ from 'cafy'; import ID from '../../../../../cafy-id';
 | 
			
		||||
import DriveFile, { pack } from '../../../../../models/drive-file';
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Show a file
 | 
			
		||||
 *
 | 
			
		||||
 * @param {any} params
 | 
			
		||||
 * @param {any} user
 | 
			
		||||
 * @return {Promise<any>}
 | 
			
		||||
 */
 | 
			
		||||
module.exports = async (params, user) => {
 | 
			
		||||
	// Get 'fileId' parameter
 | 
			
		||||
	const [fileId, fileIdErr] = $(params.fileId).id().$;
 | 
			
		||||
	const [fileId, fileIdErr] = $(params.fileId).type(ID).$;
 | 
			
		||||
	if (fileIdErr) throw 'invalid fileId param';
 | 
			
		||||
 | 
			
		||||
	// Fetch file
 | 
			
		||||
 
 | 
			
		||||
@@ -1,21 +1,17 @@
 | 
			
		||||
/**
 | 
			
		||||
 * Module dependencies
 | 
			
		||||
 */
 | 
			
		||||
import $ from 'cafy';
 | 
			
		||||
import $ from 'cafy'; import ID from '../../../../../cafy-id';
 | 
			
		||||
import DriveFolder from '../../../../../models/drive-folder';
 | 
			
		||||
import DriveFile, { validateFileName, pack } from '../../../../../models/drive-file';
 | 
			
		||||
import { publishDriveStream } from '../../../../../publishers/stream';
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Update a file
 | 
			
		||||
 *
 | 
			
		||||
 * @param {any} params
 | 
			
		||||
 * @param {any} user
 | 
			
		||||
 * @return {Promise<any>}
 | 
			
		||||
 */
 | 
			
		||||
module.exports = (params, user) => new Promise(async (res, rej) => {
 | 
			
		||||
	// Get 'fileId' parameter
 | 
			
		||||
	const [fileId, fileIdErr] = $(params.fileId).id().$;
 | 
			
		||||
	const [fileId, fileIdErr] = $(params.fileId).type(ID).$;
 | 
			
		||||
	if (fileIdErr) return rej('invalid fileId param');
 | 
			
		||||
 | 
			
		||||
	// Fetch file
 | 
			
		||||
@@ -35,7 +31,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 | 
			
		||||
	if (name) file.filename = name;
 | 
			
		||||
 | 
			
		||||
	// Get 'folderId' parameter
 | 
			
		||||
	const [folderId, folderIdErr] = $(params.folderId).optional.nullable.id().$;
 | 
			
		||||
	const [folderId, folderIdErr] = $(params.folderId).optional.nullable.type(ID).$;
 | 
			
		||||
	if (folderIdErr) return rej('invalid folderId param');
 | 
			
		||||
 | 
			
		||||
	if (folderId !== undefined) {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
/**
 | 
			
		||||
 * Module dependencies
 | 
			
		||||
 */
 | 
			
		||||
import $ from 'cafy';
 | 
			
		||||
import $ from 'cafy'; import ID from '../../../../../cafy-id';
 | 
			
		||||
import { pack } from '../../../../../models/drive-file';
 | 
			
		||||
import uploadFromUrl from '../../../../../services/drive/upload-from-url';
 | 
			
		||||
 | 
			
		||||
@@ -15,7 +15,7 @@ module.exports = async (params, user): Promise<any> => {
 | 
			
		||||
	if (urlErr) throw 'invalid url param';
 | 
			
		||||
 | 
			
		||||
	// Get 'folderId' parameter
 | 
			
		||||
	const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.id().$;
 | 
			
		||||
	const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.type(ID).$;
 | 
			
		||||
	if (folderIdErr) throw 'invalid folderId param';
 | 
			
		||||
 | 
			
		||||
	return pack(await uploadFromUrl(url, user, folderId));
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user