From daa409cd8285633427ffb3a89d3296824365e918 Mon Sep 17 00:00:00 2001 From: rinsuki <428rinsuki+git@gmail.com> Date: Sun, 17 Jun 2018 20:04:19 +0900 Subject: [noImplicitAny: true] src/services/drive --- src/services/drive/add-file.ts | 8 ++++---- src/services/drive/upload-from-url.ts | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index d7f71e8665..4167df0662 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -7,7 +7,7 @@ import * as crypto from 'crypto'; import * as _gm from 'gm'; import * as debug from 'debug'; import fileType = require('file-type'); -import prominence = require('prominence'); +const prominence = require('prominence'); import DriveFile, { IMetadata, getDriveFileBucket, IDriveFile } from '../../models/drive-file'; import DriveFolder from '../../models/drive-folder'; @@ -33,7 +33,7 @@ const writeChunks = (name: string, readable: stream.Readable, type: string, meta readable.pipe(writeStream); })); -const writeThumbnailChunks = (name: string, readable: stream.Readable, originalId) => +const writeThumbnailChunks = (name: string, readable: stream.Readable, originalId: mongodb.ObjectID) => getDriveFileThumbnailBucket() .then(bucket => new Promise((resolve, reject) => { const writeStream = bucket.openUploadStream(name, { @@ -89,7 +89,7 @@ export default async function( const calcHash = new Promise((res, rej) => { const readable = fs.createReadStream(path); const hash = crypto.createHash('md5'); - const chunks = []; + const chunks: Buffer[] = []; readable .on('error', rej) .pipe(hash) @@ -201,7 +201,7 @@ export default async function( return driveFolder; }; - const properties = {}; + const properties: {[key: string]: any} = {}; let propPromises: Array> = []; diff --git a/src/services/drive/upload-from-url.ts b/src/services/drive/upload-from-url.ts index e216ca603d..f83d57d415 100644 --- a/src/services/drive/upload-from-url.ts +++ b/src/services/drive/upload-from-url.ts @@ -8,10 +8,12 @@ import * as request from 'request'; import { IDriveFile, validateFileName } from '../../models/drive-file'; import create from './add-file'; import config from '../../config'; +import { IUser } from '../../models/user'; +import * as mongodb from "mongodb"; const log = debug('misskey:drive:upload-from-url'); -export default async (url: string, user, folderId = null, uri: string = null): Promise => { +export default async (url: string, user: IUser, folderId: mongodb.ObjectID = null, uri: string = null): Promise => { log(`REQUESTED: ${url}`); let name = URL.parse(url).pathname.split('/').pop(); -- cgit v1.2.3-freya