diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-10-31 22:35:02 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-10-31 22:35:02 +0900 |
| commit | 1a51b9870039da8b328acc673b2e8cb08ae2e663 (patch) | |
| tree | 71784c690f794cf0b3f37f3de56ce7316643da19 /src/models | |
| parent | Revert "Clean up" (diff) | |
| download | sharkey-1a51b9870039da8b328acc673b2e8cb08ae2e663.tar.gz sharkey-1a51b9870039da8b328acc673b2e8cb08ae2e663.tar.bz2 sharkey-1a51b9870039da8b328acc673b2e8cb08ae2e663.zip | |
Refactor
Diffstat (limited to 'src/models')
| -rw-r--r-- | src/models/drive-file.ts | 13 | ||||
| -rw-r--r-- | src/models/user.ts | 10 |
2 files changed, 10 insertions, 13 deletions
diff --git a/src/models/drive-file.ts b/src/models/drive-file.ts index 5e2646a302..57f40be6a9 100644 --- a/src/models/drive-file.ts +++ b/src/models/drive-file.ts @@ -1,9 +1,9 @@ import * as mongo from 'mongodb'; const deepcopy = require('deepcopy'); import { pack as packFolder } from './drive-folder'; -import config from '../config'; import monkDb, { nativeDbConn } from '../db/mongodb'; import isObjectId from '../misc/is-objectid'; +import getDriveFileUrl from '../misc/get-drive-file-url'; const DriveFile = monkDb.get<IDriveFile>('driveFiles.files'); DriveFile.createIndex('md5'); @@ -33,7 +33,14 @@ export type IMetadata = { thumbnailUrl?: string; src?: string; deletedAt?: Date; + + /** + * このファイルの中身データがMongoDB内に保存されているのか否か + * オブジェクトストレージを利用している or リモートサーバーへの直リンクである + * な場合は false になります + */ withoutChunks?: boolean; + storage?: string; storageProps?: any; isSensitive?: boolean; @@ -128,8 +135,8 @@ export const pack = ( _target = Object.assign(_target, _file.metadata); - _target.url = _file.metadata.url ? _file.metadata.url : `${config.drive_url}/${_target.id}/${encodeURIComponent(_target.name)}`; - _target.thumbnailUrl = _file.metadata.thumbnailUrl ? _file.metadata.thumbnailUrl : _file.metadata.url ? _file.metadata.url : `${config.drive_url}/${_target.id}/${encodeURIComponent(_target.name)}?thumbnail`; + _target.url = getDriveFileUrl(file); + _target.thumbnailUrl = getDriveFileUrl(file, true); _target.isRemote = _file.metadata.isRemote; if (_target.properties == null) _target.properties = {}; diff --git a/src/models/user.ts b/src/models/user.ts index 57973d6ca1..ce877fe277 100644 --- a/src/models/user.ts +++ b/src/models/user.ts @@ -261,16 +261,6 @@ export const pack = ( if (_user.avatarUrl == null) { _user.avatarUrl = `${config.drive_url}/default-avatar.jpg`; - - // 互換性のため - if (_user.avatarId) { - _user.avatarUrl = `${config.drive_url}/${_user.avatarId}`; - } - } - - // 互換性のため - if (_user.bannerId && _user.bannerUrl == null) { - _user.bannerUrl = `${config.drive_url}/${_user.bannerId}`; } if (!meId || !meId.equals(_user.id) || !opts.detail) { |