From 1a51b9870039da8b328acc673b2e8cb08ae2e663 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 31 Oct 2018 22:35:02 +0900
Subject: Refactor

---
 src/remote/activitypub/renderer/document.ts | 4 ++--
 src/remote/activitypub/renderer/image.ts    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/remote/activitypub/renderer')

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
 });
-- 
cgit v1.2.3-freya