summaryrefslogtreecommitdiff
path: root/src/remote
diff options
context:
space:
mode:
authormei23 <m@m544.net>2018-08-12 04:27:32 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2018-08-12 04:42:14 +0900
commitf56ec82f6b1ea5bca06be1d094a3785bcc1f1963 (patch)
treec6af7546a366afa00c2039111f24112695e8e7bc /src/remote
parent5.22.1 (diff)
downloadsharkey-f56ec82f6b1ea5bca06be1d094a3785bcc1f1963.tar.gz
sharkey-f56ec82f6b1ea5bca06be1d094a3785bcc1f1963.tar.bz2
sharkey-f56ec82f6b1ea5bca06be1d094a3785bcc1f1963.zip
Fix ActivityPub attachment url
Diffstat (limited to 'src/remote')
-rw-r--r--src/remote/activitypub/renderer/document.ts2
-rw-r--r--src/remote/activitypub/renderer/image.ts2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/remote/activitypub/renderer/document.ts b/src/remote/activitypub/renderer/document.ts
index 1985c6bc8b..1f4543d7ee 100644
--- a/src/remote/activitypub/renderer/document.ts
+++ b/src/remote/activitypub/renderer/document.ts
@@ -4,5 +4,5 @@ import { IDriveFile } from '../../../models/drive-file';
export default (file: IDriveFile) => ({
type: 'Document',
mediaType: file.contentType,
- url: `${config.drive_url}/${file._id}`
+ url: file.metadata.url || `${config.drive_url}/${file._id}`
});
diff --git a/src/remote/activitypub/renderer/image.ts b/src/remote/activitypub/renderer/image.ts
index 69bddd9188..b2f2555003 100644
--- a/src/remote/activitypub/renderer/image.ts
+++ b/src/remote/activitypub/renderer/image.ts
@@ -3,6 +3,6 @@ import { IDriveFile } from '../../../models/drive-file';
export default (file: IDriveFile) => ({
type: 'Image',
- url: `${config.drive_url}/${file._id}`,
+ url: file.metadata.url || `${config.drive_url}/${file._id}`,
sensitive: file.metadata.isSensitive
});