diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-02-05 03:51:54 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-02-05 03:51:54 +0900 |
| commit | 861302f0fd2c47d78f6b9c78697a649fcf1342c8 (patch) | |
| tree | 297a327fb3dff61f78251d175733fa48ee8e27e7 /src/models/drive-file.ts | |
| parent | アニメーションを自動再生しないオプション (#4131) (diff) | |
| download | misskey-861302f0fd2c47d78f6b9c78697a649fcf1342c8.tar.gz misskey-861302f0fd2c47d78f6b9c78697a649fcf1342c8.tar.bz2 misskey-861302f0fd2c47d78f6b9c78697a649fcf1342c8.zip | |
アニメーション画像を無効にする際、サーバーサイドではなくクライアントサイドでURLを変更するように
Diffstat (limited to 'src/models/drive-file.ts')
| -rw-r--r-- | src/models/drive-file.ts | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/models/drive-file.ts b/src/models/drive-file.ts index e788ac2b2f..62a544c214 100644 --- a/src/models/drive-file.ts +++ b/src/models/drive-file.ts @@ -1,11 +1,10 @@ import * as mongo from 'mongodb'; import * as deepcopy from 'deepcopy'; import { pack as packFolder } from './drive-folder'; -import { pack as packUser, IUser } from './user'; +import { pack as packUser } from './user'; import monkDb, { nativeDbConn, dbLogger } from '../db/mongodb'; import isObjectId from '../misc/is-objectid'; import getDriveFileUrl, { getOriginalUrl } from '../misc/get-drive-file-url'; -import wrapUrl from '../misc/wrap-url'; const DriveFile = monkDb.get<IDriveFile>('driveFiles.files'); DriveFile.createIndex('md5'); @@ -134,7 +133,6 @@ export const packMany = ( detail?: boolean self?: boolean, withUser?: boolean, - me?: string | mongo.ObjectID | IUser, } ) => { return Promise.all(files.map(f => pack(f, options))); @@ -149,7 +147,6 @@ export const pack = ( detail?: boolean, self?: boolean, withUser?: boolean, - me?: string | mongo.ObjectID | IUser, } ) => new Promise<any>(async (resolve, reject) => { const opts = Object.assign({ @@ -192,11 +189,6 @@ export const pack = ( _target.url = getDriveFileUrl(_file); _target.thumbnailUrl = getDriveFileUrl(_file, true); - - if (_target.thumbnailUrl != null) { - _target.thumbnailUrl = wrapUrl(_target.thumbnailUrl, options.me); - } - _target.isRemote = _file.metadata.isRemote; if (_target.properties == null) _target.properties = {}; |