diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-04-09 05:14:47 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-04-09 05:14:47 +0900 |
| commit | d8a87379ca512a01ad0177697b830ca0ce8dc104 (patch) | |
| tree | afa283c74bbef2fd6758f0b24847d434a69f4b26 /src/remote/activitypub | |
| parent | Merge pull request #1423 from syuilo/hoge (diff) | |
| download | sharkey-d8a87379ca512a01ad0177697b830ca0ce8dc104.tar.gz sharkey-d8a87379ca512a01ad0177697b830ca0ce8dc104.tar.bz2 sharkey-d8a87379ca512a01ad0177697b830ca0ce8dc104.zip | |
Fix bug
Diffstat (limited to 'src/remote/activitypub')
| -rw-r--r-- | src/remote/activitypub/objects/image.ts | 9 | ||||
| -rw-r--r-- | src/remote/activitypub/type.ts | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/remote/activitypub/objects/image.ts b/src/remote/activitypub/objects/image.ts index 7f79fc5c06..d7bc5aff2f 100644 --- a/src/remote/activitypub/objects/image.ts +++ b/src/remote/activitypub/objects/image.ts @@ -3,13 +3,20 @@ import * as debug from 'debug'; import uploadFromUrl from '../../../services/drive/upload-from-url'; import { IRemoteUser } from '../../../models/user'; import { IDriveFile } from '../../../models/drive-file'; +import Resolver from '../resolver'; const log = debug('misskey:activitypub'); /** * Imageを作成します。 */ -export async function createImage(actor: IRemoteUser, image): Promise<IDriveFile> { +export async function createImage(actor: IRemoteUser, value): Promise<IDriveFile> { + const image = await new Resolver().resolve(value); + + if (image.url == null) { + throw new Error('invalid image: url not privided'); + } + log(`Creating the Image: ${image.url}`); return await uploadFromUrl(image.url, actor); diff --git a/src/remote/activitypub/type.ts b/src/remote/activitypub/type.ts index 983eb621fa..08e5493dd4 100644 --- a/src/remote/activitypub/type.ts +++ b/src/remote/activitypub/type.ts @@ -14,6 +14,7 @@ export interface IObject { content: string; icon?: any; image?: any; + url?: string; } export interface IActivity extends IObject { |