natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2020-04-11 22:44:36 +09:00
parent b5981ab544 00e1dbfdfb
commit 4903eb4a4a
6 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/misc/detect-url-mime.ts
View File

@ -1,5 +1,5 @@
import { createTemp } from './create-temp'; import { createTemp } from './create-temp';
import { downloadUrl } from './donwload-url'; import { downloadUrl } from './download-url';
import { detectType } from './get-file-info'; import { detectType } from './get-file-info';
export async function detectUrlMime(url: string) { export async function detectUrlMime(url: string) {

2
src/misc/download-text-file.ts
View File

@ -2,7 +2,7 @@ import * as fs from 'fs';
import * as util from 'util'; import * as util from 'util';
import Logger from '../services/logger'; import Logger from '../services/logger';
import { createTemp } from './create-temp'; import { createTemp } from './create-temp';
import { downloadUrl } from './donwload-url'; import { downloadUrl } from './download-url';
const logger = new Logger('download-text-file'); const logger = new Logger('download-text-file');

0
src/misc/donwload-url.ts → src/misc/download-url.ts
View File

2
src/server/file/send-drive-file.ts
View File

@ -7,7 +7,7 @@ import { serverLogger } from '..';
import { contentDisposition } from '../../misc/content-disposition'; import { contentDisposition } from '../../misc/content-disposition';
import { DriveFiles } from '../../models'; import { DriveFiles } from '../../models';
import { InternalStorage } from '../../services/drive/internal-storage'; import { InternalStorage } from '../../services/drive/internal-storage';
import { downloadUrl } from '../../misc/donwload-url'; import { downloadUrl } from '../../misc/download-url';
import { detectType } from '../../misc/get-file-info'; import { detectType } from '../../misc/get-file-info';
import { convertToJpeg, convertToPngOrJpeg } from '../../services/drive/image-processor'; import { convertToJpeg, convertToPngOrJpeg } from '../../services/drive/image-processor';
import { GenerateVideoThumbnail } from '../../services/drive/generate-video-thumbnail'; import { GenerateVideoThumbnail } from '../../services/drive/generate-video-thumbnail';

2
src/server/proxy/proxy-media.ts
View File

@ -3,7 +3,7 @@ import * as Koa from 'koa';
import { serverLogger } from '..'; import { serverLogger } from '..';
import { IImage, convertToPng, convertToJpeg } from '../../services/drive/image-processor'; import { IImage, convertToPng, convertToJpeg } from '../../services/drive/image-processor';
import { createTemp } from '../../misc/create-temp'; import { createTemp } from '../../misc/create-temp';
import { downloadUrl } from '../../misc/donwload-url'; import { downloadUrl } from '../../misc/download-url';
import { detectType } from '../../misc/get-file-info'; import { detectType } from '../../misc/get-file-info';
export async function proxyMedia(ctx: Koa.Context) { export async function proxyMedia(ctx: Koa.Context) {

2
src/services/drive/upload-from-url.ts
View File

@ -2,7 +2,7 @@ import create from './add-file';
import { User } from '../../models/entities/user'; import { User } from '../../models/entities/user';
import { driveLogger } from './logger'; import { driveLogger } from './logger';
import { createTemp } from '../../misc/create-temp'; import { createTemp } from '../../misc/create-temp';
import { downloadUrl } from '../../misc/donwload-url'; import { downloadUrl } from '../../misc/download-url';
import { DriveFolder } from '../../models/entities/drive-folder'; import { DriveFolder } from '../../models/entities/drive-folder';
import { DriveFile } from '../../models/entities/drive-file'; import { DriveFile } from '../../models/entities/drive-file';
import { DriveFiles } from '../../models'; import { DriveFiles } from '../../models';