diff options
Diffstat (limited to 'src/services')
| -rw-r--r-- | src/services/drive/add-file.ts | 8 | ||||
| -rw-r--r-- | src/services/drive/upload-from-url.ts | 4 | ||||
| -rw-r--r-- | src/services/note/create.ts | 4 | ||||
| -rw-r--r-- | src/services/note/reaction/create.ts | 2 |
4 files changed, 10 insertions, 8 deletions
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<string>((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<Promise<void>> = []; 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<IDriveFile> => { +export default async (url: string, user: IUser, folderId: mongodb.ObjectID = null, uri: string = null): Promise<IDriveFile> => { log(`REQUESTED: ${url}`); let name = URL.parse(url).pathname.split('/').pop(); diff --git a/src/services/note/create.ts b/src/services/note/create.ts index 98415b8971..ef03c4e044 100644 --- a/src/services/note/create.ts +++ b/src/services/note/create.ts @@ -33,7 +33,7 @@ class NotificationManager { reason: Reason; }> = []; - constructor(user, note) { + constructor(user: IUser, note: any) { this.user = user; this.note = note; } @@ -451,7 +451,7 @@ export default async (user: IUser, data: { // $ne: note._id // } //}); - const existRenote = null; + const existRenote: INote | null = null; //#endregion if (!existRenote) { diff --git a/src/services/note/reaction/create.ts b/src/services/note/reaction/create.ts index 123c091c85..5b30bb5e15 100644 --- a/src/services/note/reaction/create.ts +++ b/src/services/note/reaction/create.ts @@ -36,7 +36,7 @@ export default async (user: IUser, note: INote, reaction: string) => new Promise res(); - const inc = {}; + const inc: {[key: string]: number} = {}; inc[`reactionCounts.${reaction}`] = 1; // Increment reactions count |