refactor

packages/frontend/src/components/MkSample.vue

@@ -87,7 +87,7 @@ export default defineComponent({
 		},
 
 		async openDrive() {
-			os.selectDriveFile();
+			os.selectDriveFile(false);
 		},
 
 		async selectUser() {

packages/frontend/src/os.ts

@@ -19,6 +19,7 @@ import MkContextMenu from '@/components/MkContextMenu.vue';
 import { MenuItem } from '@/types/menu';
 import copyToClipboard from './scripts/copy-to-clipboard';
 import { showMovedDialog } from './scripts/show-moved-dialog';
+import { DriveFile } from 'misskey-js/built/entities';
 
 export const openingWindowsCount = ref(0);
 
@@ -420,7 +421,7 @@ export async function selectUser(opts: { includeSelf?: boolean } = {}) {
 	});
 }
 
-export async function selectDriveFile(multiple: boolean) {
+export async function selectDriveFile(multiple: boolean): Promise<DriveFile[]> {
 	return new Promise((resolve, reject) => {
 		popup(defineAsyncComponent(() => import('@/components/MkDriveSelectDialog.vue')), {
 			type: 'file',
@@ -428,7 +429,7 @@ export async function selectDriveFile(multiple: boolean) {
 		}, {
 			done: files => {
 				if (files) {
-					resolve(multiple ? files : files[0]);
+					resolve(files);
 				}
 			},
 		}, 'closed');

packages/frontend/src/pages/page-editor/els/page-editor.el.image.vue

@@ -33,8 +33,8 @@ const emit = defineEmits<{
 let file: any = $ref(null);
 
 async function choose() {
-	os.selectDriveFile(false).then((fileResponse: any) => {
-		file = fileResponse;
+	os.selectDriveFile(false).then((fileResponse) => {
+		file = fileResponse[0];
 		emit('update:modelValue', {
 			...props.modelValue,
 			fileId: fileResponse.id,

packages/frontend/src/scripts/select-file.ts

@@ -6,19 +6,16 @@ import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
 import { uploadFile } from '@/scripts/upload';
 
-function select(src: any, label: string | null, multiple: boolean): Promise<DriveFile | DriveFile[]> {
+export function chooseFileFromPc(multiple: boolean, keepOriginal = false): Promise<DriveFile[]> {
 	return new Promise((res, rej) => {
-		const keepOriginal = ref(defaultStore.state.keepOriginalUploading);
-
-		const chooseFileFromPc = () => {
 		const input = document.createElement('input');
 		input.type = 'file';
 		input.multiple = multiple;
 		input.onchange = () => {
-				const promises = Array.from(input.files).map(file => uploadFile(file, defaultStore.state.uploadFolder, undefined, keepOriginal.value));
+			const promises = Array.from(input.files).map(file => uploadFile(file, defaultStore.state.uploadFolder, undefined, keepOriginal));
 
 			Promise.all(promises).then(driveFiles => {
-					res(multiple ? driveFiles : driveFiles[0]);
+				res(driveFiles);
 			}).catch(err => {
 				// アップロードのエラーは uploadFile 内でハンドリングされているためアラートダイアログを出したりはしてはいけない
 			});
@@ -32,15 +29,19 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 		(window as any).__misskey_input_ref__ = input;
 
 		input.click();
-		};
+	});
+}
 
-		const chooseFileFromDrive = () => {
+export function chooseFileFromDrive(multiple: boolean): Promise<DriveFile[]> {
+	return new Promise((res, rej) => {
 		os.selectDriveFile(multiple).then(files => {
 			res(files);
 		});
-		};
+	});
+}
 
-		const chooseFileFromUrl = () => {
+export function chooseFileFromUrl(): Promise<DriveFile> {
+	return new Promise((res, rej) => {
 		os.inputText({
 			title: i18n.ts.uploadFromUrl,
 			type: 'url',
@@ -53,7 +54,7 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 			const connection = stream.useChannel('main');
 			connection.on('urlUploadFinished', urlResponse => {
 				if (urlResponse.marker === marker) {
-						res(multiple ? [urlResponse.file] : urlResponse.file);
+					res(urlResponse.file);
 					connection.dispose();
 				}
 			});
@@ -69,7 +70,12 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 				text: i18n.ts.uploadFromUrlMayTakeTime,
 			});
 		});
-		};
+	});
+}
+
+function select(src: any, label: string | null, multiple: boolean): Promise<DriveFile[]> {
+	return new Promise((res, rej) => {
+		const keepOriginal = ref(defaultStore.state.keepOriginalUploading);
 
 		os.popupMenu([label ? {
 			text: label,
@@ -81,23 +87,23 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 		}, {
 			text: i18n.ts.upload,
 			icon: 'ti ti-upload',
-			action: chooseFileFromPc,
+			action: () => chooseFileFromPc(multiple, keepOriginal.value).then(files => res(files)),
 		}, {
 			text: i18n.ts.fromDrive,
 			icon: 'ti ti-cloud',
-			action: chooseFileFromDrive,
+			action: () => chooseFileFromDrive(multiple).then(files => res(files)),
 		}, {
 			text: i18n.ts.fromUrl,
 			icon: 'ti ti-link',
-			action: chooseFileFromUrl,
+			action: () => chooseFileFromUrl().then(file => res([file])),
 		}], src);
 	});
 }
 
 export function selectFile(src: any, label: string | null = null): Promise<DriveFile> {
-	return select(src, label, false) as Promise<DriveFile>;
+	return select(src, label, false).then(files => files[0]);
 }
 
 export function selectFiles(src: any, label: string | null = null): Promise<DriveFile[]> {
-	return select(src, label, true) as Promise<DriveFile[]>;
+	return select(src, label, true);
 }