summaryrefslogtreecommitdiff
path: root/src/remote/activitypub/renderer
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-10-31 22:35:02 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-10-31 22:35:02 +0900
commit1a51b9870039da8b328acc673b2e8cb08ae2e663 (patch)
tree71784c690f794cf0b3f37f3de56ce7316643da19 /src/remote/activitypub/renderer
parentRevert "Clean up" (diff)
downloadmisskey-1a51b9870039da8b328acc673b2e8cb08ae2e663.tar.gz
misskey-1a51b9870039da8b328acc673b2e8cb08ae2e663.tar.bz2
misskey-1a51b9870039da8b328acc673b2e8cb08ae2e663.zip
Refactor
Diffstat (limited to 'src/remote/activitypub/renderer')
-rw-r--r--src/remote/activitypub/renderer/document.ts4
-rw-r--r--src/remote/activitypub/renderer/image.ts4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/remote/activitypub/renderer/document.ts b/src/remote/activitypub/renderer/document.ts
index 1f4543d7ee..17721e9417 100644
--- a/src/remote/activitypub/renderer/document.ts
+++ b/src/remote/activitypub/renderer/document.ts
@@ -1,8 +1,8 @@
-import config from '../../../config';
import { IDriveFile } from '../../../models/drive-file';
+import getDriveFileUrl from '../../../misc/get-drive-file-url';
export default (file: IDriveFile) => ({
type: 'Document',
mediaType: file.contentType,
- url: file.metadata.url || `${config.drive_url}/${file._id}`
+ url: getDriveFileUrl(file)
});
diff --git a/src/remote/activitypub/renderer/image.ts b/src/remote/activitypub/renderer/image.ts
index b2f2555003..ec637b9521 100644
--- a/src/remote/activitypub/renderer/image.ts
+++ b/src/remote/activitypub/renderer/image.ts
@@ -1,8 +1,8 @@
-import config from '../../../config';
import { IDriveFile } from '../../../models/drive-file';
+import getDriveFileUrl from '../../../misc/get-drive-file-url';
export default (file: IDriveFile) => ({
type: 'Image',
- url: file.metadata.url || `${config.drive_url}/${file._id}`,
+ url: getDriveFileUrl(file),
sensitive: file.metadata.isSensitive
});