2 files changed, 20 insertions, 1 deletions
diff --git a/src/server/api/endpoints/drive/files/show.ts b/src/server/api/endpoints/drive/files/show.ts
index 693439974e..39f4b7d2f7 100644
--- a/src/server/api/endpoints/drive/files/show.ts
+++ b/src/server/api/endpoints/drive/files/show.ts
@@ -91,6 +91,7 @@ export default define(meta, async (ps, user) => {
 
 	return await DriveFiles.pack(file, {
 		detail: true,
+		withUser: true,
 		self: true
 	});
 });
diff --git a/src/server/api/endpoints/drive/files/upload-from-url.ts b/src/server/api/endpoints/drive/files/upload-from-url.ts
index 04e13a05cf..296211c091 100644
--- a/src/server/api/endpoints/drive/files/upload-from-url.ts
+++ b/src/server/api/endpoints/drive/files/upload-from-url.ts
@@ -4,6 +4,7 @@ import * as ms from 'ms';
 import uploadFromUrl from '../../../../../services/drive/upload-from-url';
 import define from '../../../define';
 import { DriveFiles } from '../../../../../models';
+import { publishMainStream } from '../../../../../services/stream';
 
 export const meta = {
 	desc: {
@@ -41,6 +42,16 @@ export const meta = {
 			}
 		},
 
+		comment: {
+			validator: $.optional.nullable.str,
+			default: null as any,
+		},
+
+		marker: {
+			validator: $.optional.nullable.str,
+			default: null as any,
+		},
+
 		force: {
 			validator: $.optional.bool,
 			default: false,
@@ -52,5 +63,12 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	return await DriveFiles.pack(await uploadFromUrl(ps.url, user, ps.folderId, null, ps.isSensitive, ps.force), { self: true });
+	uploadFromUrl(ps.url, user, ps.folderId, null, ps.isSensitive, ps.force, false, ps.comment).then(file => {
+		DriveFiles.pack(file, { self: true }).then(packedFile => {
+			publishMainStream(user.id, 'urlUploadFinished', {
+				marker: ps.marker,
+				file: packedFile
+			});
+		});
+	});
 });