diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-11-07 19:43:21 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-11-07 19:43:21 +0900 |
| commit | a8d05cba5a2ae5da44c47e37167f279ff0fe5f50 (patch) | |
| tree | e025f30c68302b83d3b7d7833499735e876951c6 /src/remote | |
| parent | 10.44.0 (diff) | |
| download | sharkey-a8d05cba5a2ae5da44c47e37167f279ff0fe5f50.tar.gz sharkey-a8d05cba5a2ae5da44c47e37167f279ff0fe5f50.tar.bz2 sharkey-a8d05cba5a2ae5da44c47e37167f279ff0fe5f50.zip | |
Fix #3149
Diffstat (limited to 'src/remote')
| -rw-r--r-- | src/remote/activitypub/models/image.ts | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/remote/activitypub/models/image.ts b/src/remote/activitypub/models/image.ts index 76e1bac901..ae353f5efc 100644 --- a/src/remote/activitypub/models/image.ts +++ b/src/remote/activitypub/models/image.ts @@ -4,6 +4,7 @@ import uploadFromUrl from '../../../services/drive/upload-from-url'; import { IRemoteUser } from '../../../models/user'; import DriveFile, { IDriveFile } from '../../../models/drive-file'; import Resolver from '../resolver'; +import fetchMeta from '../../../misc/fetch-meta'; const log = debug('misskey:activitypub'); @@ -24,7 +25,10 @@ export async function createImage(actor: IRemoteUser, value: any): Promise<IDriv log(`Creating the Image: ${image.url}`); - let file = await uploadFromUrl(image.url, actor, null, image.url, image.sensitive); + const instance = await fetchMeta(); + const cache = instance.cacheRemoteFiles; + + let file = await uploadFromUrl(image.url, actor, null, image.url, image.sensitive, false, !cache); if (file.metadata.isRemote) { // URLが異なっている場合、同じ画像が以前に異なるURLで登録されていたということなので、 |