diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-05-04 15:30:56 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-05-04 15:30:56 +0900 |
| commit | f62603fd9dd27f9c2242def65c5dc8ba940af848 (patch) | |
| tree | 5e2baa185352f11b43b5f7283f7853396c11212a | |
| parent | :v: (diff) | |
| download | misskey-f62603fd9dd27f9c2242def65c5dc8ba940af848.tar.gz misskey-f62603fd9dd27f9c2242def65c5dc8ba940af848.tar.bz2 misskey-f62603fd9dd27f9c2242def65c5dc8ba940af848.zip | |
ドライブのファイルにユーザー情報を非正規化
| -rw-r--r-- | src/models/drive-file.ts | 1 | ||||
| -rw-r--r-- | src/services/drive/add-file.ts | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/models/drive-file.ts b/src/models/drive-file.ts index 2a7e95363a..183cc72ee8 100644 --- a/src/models/drive-file.ts +++ b/src/models/drive-file.ts @@ -25,6 +25,7 @@ export const getDriveFileBucket = async (): Promise<mongo.GridFSBucket> => { export type IMetadata = { properties: any; userId: mongo.ObjectID; + _user: any; folderId: mongo.ObjectID; comment: string; uri: string; diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index e7f3572c74..50ee117342 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -15,7 +15,7 @@ import DriveFolder from '../../models/drive-folder'; import { pack } from '../../models/drive-file'; import event, { publishDriveStream } from '../../publishers/stream'; import getAcct from '../../acct/render'; -import { IUser, isLocalUser } from '../../models/user'; +import { IUser, isLocalUser, isRemoteUser } from '../../models/user'; import DriveFileThumbnail, { getDriveFileThumbnailBucket, DriveFileThumbnailChunk } from '../../models/drive-file-thumbnail'; import genThumbnail from '../../drive/gen-thumbnail'; @@ -284,6 +284,9 @@ const addFile = async ( const metadata = { userId: user._id, + _user: { + host: user.host + }, folderId: folder !== null ? folder._id : null, comment: comment, properties: properties |