Merge branch 'develop' of https://github.com/syuilo/misskey into develop
This commit is contained in:
commit
4903eb4a4a
6 changed files with 5 additions and 5 deletions
|
@ -1,5 +1,5 @@
|
|||
import { createTemp } from './create-temp';
|
||||
import { downloadUrl } from './donwload-url';
|
||||
import { downloadUrl } from './download-url';
|
||||
import { detectType } from './get-file-info';
|
||||
|
||||
export async function detectUrlMime(url: string) {
|
||||
|
|
|
@ -2,7 +2,7 @@ import * as fs from 'fs';
|
|||
import * as util from 'util';
|
||||
import Logger from '../services/logger';
|
||||
import { createTemp } from './create-temp';
|
||||
import { downloadUrl } from './donwload-url';
|
||||
import { downloadUrl } from './download-url';
|
||||
|
||||
const logger = new Logger('download-text-file');
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ import { serverLogger } from '..';
|
|||
import { contentDisposition } from '../../misc/content-disposition';
|
||||
import { DriveFiles } from '../../models';
|
||||
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 { convertToJpeg, convertToPngOrJpeg } from '../../services/drive/image-processor';
|
||||
import { GenerateVideoThumbnail } from '../../services/drive/generate-video-thumbnail';
|
||||
|
|
|
@ -3,7 +3,7 @@ import * as Koa from 'koa';
|
|||
import { serverLogger } from '..';
|
||||
import { IImage, convertToPng, convertToJpeg } from '../../services/drive/image-processor';
|
||||
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';
|
||||
|
||||
export async function proxyMedia(ctx: Koa.Context) {
|
||||
|
|
|
@ -2,7 +2,7 @@ import create from './add-file';
|
|||
import { User } from '../../models/entities/user';
|
||||
import { driveLogger } from './logger';
|
||||
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 { DriveFile } from '../../models/entities/drive-file';
|
||||
import { DriveFiles } from '../../models';
|
||||
|
|
Loading…
Reference in a new issue