diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2022-01-23 22:52:35 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-23 22:52:35 +0900 |
| commit | 7aecf15f9473ceafc625c07f69241a37bd61ecbf (patch) | |
| tree | e62d3f1360b8e3f73ef09eb124af477d9fdffba2 /packages/backend/src/remote | |
| parent | Unifying Misskey-specific IRIs in JSON-LD `@context` Resolve #8116 (#8178) (diff) | |
| download | sharkey-7aecf15f9473ceafc625c07f69241a37bd61ecbf.tar.gz sharkey-7aecf15f9473ceafc625c07f69241a37bd61ecbf.tar.bz2 sharkey-7aecf15f9473ceafc625c07f69241a37bd61ecbf.zip | |
refactor, enhance: ドライブ引数のオブジェクト化, 追加時のcomment指定 (#8180)
* refactor: ドライブの引数をオブジェクト化する Resolve #8177
* Resolve #8181
* fix
* archivePath
Diffstat (limited to 'packages/backend/src/remote')
| -rw-r--r-- | packages/backend/src/remote/activitypub/models/image.ts | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/packages/backend/src/remote/activitypub/models/image.ts b/packages/backend/src/remote/activitypub/models/image.ts index 902eb36a17..6f60b7827d 100644 --- a/packages/backend/src/remote/activitypub/models/image.ts +++ b/packages/backend/src/remote/activitypub/models/image.ts @@ -1,4 +1,4 @@ -import uploadFromUrl from '@/services/drive/upload-from-url'; +import { uploadFromUrl } from '@/services/drive/upload-from-url'; import { IRemoteUser } from '@/models/entities/user'; import Resolver from '../resolver'; import { fetchMeta } from '@/misc/fetch-meta'; @@ -28,9 +28,15 @@ export async function createImage(actor: IRemoteUser, value: any): Promise<Drive logger.info(`Creating the Image: ${image.url}`); const instance = await fetchMeta(); - const cache = instance.cacheRemoteFiles; - let file = await uploadFromUrl(image.url, actor, null, image.url, image.sensitive, false, !cache, truncate(image.name, DB_MAX_IMAGE_COMMENT_LENGTH)); + let file = await uploadFromUrl({ + url: image.url, + user: actor, + uri: image.url, + sensitive: image.sensitive, + isLink: !instance.cacheRemoteFiles, + comment: truncate(image.name, DB_MAX_IMAGE_COMMENT_LENGTH) + }); if (file.isLink) { // URLが異なっている場合、同じ画像が以前に異なるURLで登録されていたということなので、 |