From 995d8f2f5d1eed52a10485bca5fa2d81ed3a21e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?=
 <50144466+sim1222@users.noreply.github.com>
Date: Fri, 11 Mar 2022 22:03:36 +0900
Subject: [PATCH 01/15] Update post-form.vue

---
 packages/client/src/components/post-form.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/client/src/components/post-form.vue b/packages/client/src/components/post-form.vue
index 656689ddc..2b2ff24dd 100644
--- a/packages/client/src/components/post-form.vue
+++ b/packages/client/src/components/post-form.vue
@@ -47,6 +47,7 @@
 		<XNotePreview v-if="showPreview" class="preview" :text="text"/>
 		<footer>
 			<button v-tooltip="i18n.ts.attachFile" class="_button" @click="chooseFileFrom"><i class="fas fa-photo-video"></i></button>
+			<button v-tooltip="i18n.ts.attachVideoFile" class="_button" @click="chooseFileFromEnc"><i class="far fa-file-video"></i></button>
 			<button v-tooltip="i18n.ts.poll" class="_button" :class="{ active: poll }" @click="togglePoll"><i class="fas fa-poll-h"></i></button>
 			<button v-tooltip="i18n.ts.useCw" class="_button" :class="{ active: useCw }" @click="useCw = !useCw"><i class="fas fa-eye-slash"></i></button>
 			<button v-tooltip="i18n.ts.mention" class="_button" @click="insertMention"><i class="fas fa-at"></i></button>
@@ -81,6 +82,7 @@ import { Autocomplete } from '@/scripts/autocomplete';
 import * as os from '@/os';
 import { stream } from '@/stream';
 import { selectFiles } from '@/scripts/select-file';
+import { selectFilesEnc } from '@/scripts/select-file-enc';
 import { defaultStore, notePostInterruptors, postFormActions } from '@/store';
 import { throttle } from 'throttle-debounce';
 import MkInfo from '@/components/ui/info.vue';
@@ -355,6 +357,14 @@ function chooseFileFrom(ev) {
 	});
 }
 
+function chooseFileFromEnc(ev) {
+	selectFilesEnc(ev.currentTarget ?? ev.target, i18n.ts.attachVideoFile).then(files_ => {
+		for (const file of files_) {
+			files.push(file);
+		}
+	});
+}
+
 function detachFile(id) {
 	files = files.filter(x => x.id != id);
 }

From c99c4b73f4949df0f0af98b02deaf5acecc32fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?=
 <50144466+sim1222@users.noreply.github.com>
Date: Fri, 11 Mar 2022 22:05:08 +0900
Subject: [PATCH 02/15] Create select-file-enc.ts

---
 .../client/src/scripts/select-file-enc.ts     | 155 ++++++++++++++++++
 1 file changed, 155 insertions(+)
 create mode 100644 packages/client/src/scripts/select-file-enc.ts

diff --git a/packages/client/src/scripts/select-file-enc.ts b/packages/client/src/scripts/select-file-enc.ts
new file mode 100644
index 000000000..037e6425f
--- /dev/null
+++ b/packages/client/src/scripts/select-file-enc.ts
@@ -0,0 +1,155 @@
+import * as os from '@/os';
+import { stream } from '@/stream';
+import { i18n } from '@/i18n';
+import { defaultStore } from '@/store';
+import { DriveFile } from 'misskey-js/built/entities';
+import { fs } from 'fs';
+import { createFFmpeg, fetchFile } from '@ffmpeg/ffmpeg';
+
+
+function select(src: any, label: string | null, multiple: boolean): Promise<DriveFile | DriveFile[]> {
+	return new Promise((res, rej) => {
+
+		
+		const chooseFileFromPc = () => {
+			const input = document.createElement('input');
+			input.type = 'file';
+			input.onchange = () => {
+
+
+
+
+
+				const readFromBlobOrFile = (blob) => (
+					console.log('start readfrombloborfile'),
+					new Promise((resolve, reject) => {
+						const reader = new FileReader();
+						reader.onload = () => {
+							resolve(reader.result);
+						};
+						reader.onerror = ({ target: { error: { code } } }) => {
+							reject(os.alert({ type: 'error', text: 'file could not be read! ' + code }));
+						};
+						reader.readAsArrayBuffer(blob);
+					}
+				));
+
+
+					
+				
+					const ffmpeg = createFFmpeg({ log: true });
+					async function ffmpegconv() {
+						os.toast('Start const ffmpegconv');
+						console.log('Start const ffmpegconv');
+						var infilename = Array.from(input.files[0].name);
+						let video = null;
+						var outfilename = infilename.replace(/\.[^/.]+$/, '') + '.mp4';
+						os.toast('Start await beffile');
+						//ここでストップ
+						console.log('Start await beffile');
+						const befFile = new Uint8Array(await readFromBlobOrFile(input.files[0]));
+
+						os.toast('Loading FFmpeg.wasm');
+						console.log('Loading FFmpeg.wasm');
+						if (!ffmpeg.isLoaded()) {
+							os.toast('Loading FFmpeg.wasm-core');
+							console.log('Loading FFmpeg.wasm-core');
+							await ffmpeg.load();
+						}
+						os.toast('Set ffmpeg files');
+						console.log('Set ffmpeg files');
+						ffmpeg.FS('writeFile', infilename, await fetchFile(befFile));
+						os.toast('Converting')
+						await ffmpeg.run('-i', `video.avi`, '-c:v', 'copy', '-c:a', 'copy', `video.mp4`);
+						os.toast('Converted')
+						const aftFile = ffmpeg.FS('readFile', outfilename);
+						os.toast('Uploading')
+						video.value = URL.createObjectURL(new Blob([aftFile.buffer], { type: 'video/mp4' }));
+						os.upload(video, defaultStore.state.uploadFolder).then(res).catch(e => { os.alert({ type: 'error', text: e }) });
+					};
+					
+
+				//const promises = Array.from(input.files).map(file => os.upload(file, defaultStore.state.uploadFolder));
+
+				//Promise.all(promises).then(driveFiles => {
+				//	res(multiple ? driveFiles : driveFiles[0]);
+				//}).catch(e => {
+				//	os.alert({
+				//		type: 'error',
+				//		text: e
+				//	});
+				//});
+				os.toast('Try use FFmpeg.wasm')
+				ffmpegconv();
+				
+
+
+				// 一応廃棄
+				(window as any).__misskey_input_ref__ = null;
+			};
+
+			// https://qiita.com/fukasawah/items/b9dc732d95d99551013d
+			// iOS Safari で正常に動かす為のおまじない
+			(window as any).__misskey_input_ref__ = input;
+
+			input.click();
+
+
+
+		};
+
+		const chooseFileFromDrive = () => {
+			os.selectDriveFile(multiple).then(files => {
+				res(files);
+			});
+		};
+
+		const chooseFileFromUrl = () => {
+			os.inputText({
+				title: i18n.locale.uploadFromUrl,
+				type: 'url',
+				placeholder: i18n.locale.uploadFromUrlDescription
+			}).then(({ canceled, result: url }) => {
+				if (canceled) return;
+
+				const marker = Math.random().toString(); // TODO: UUIDとか使う
+
+				const connection = stream.useChannel('main');
+				connection.on('urlUploadFinished', data => {
+					if (data.marker === marker) {
+						res(multiple ? [data.file] : data.file);
+						connection.dispose();
+					}
+				});
+
+				os.api('drive/files/upload-from-url', {
+					url: url,
+					folderId: defaultStore.state.uploadFolder,
+					marker
+				});
+
+				os.alert({
+					title: i18n.locale.uploadFromUrlRequested,
+					text: i18n.locale.uploadFromUrlMayTakeTime
+				});
+			});
+		};
+
+		os.popupMenu([label ? {
+			text: label,
+			type: 'label'
+		} : undefined, {
+			text: i18n.locale.upload,
+			icon: 'fas fa-upload',
+			action: chooseFileFromPc
+		}], src);
+	});
+}
+
+export function selectFileEnc(src: any, label: string | null = null): Promise<DriveFile> {
+	return select(src, label, false) as Promise<DriveFile>;
+}
+
+export function selectFilesEnc(src: any, label: string | null = null): Promise<DriveFile[]> {
+	return select(src, label, true) as Promise<DriveFile[]>;
+}

From a81f8b82750f49e48c794ef6c5012cd1cbc132b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Fri, 11 Mar 2022 22:34:38 +0900
Subject: [PATCH 03/15] feat: Add video convert button

---
 packages/client/package.json                  |   1 +
 .../client/src/scripts/select-file-enc.ts     | 100 +++++-------------
 packages/client/src/scripts/select-file.ts    |   1 +
 3 files changed, 29 insertions(+), 73 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 7a1ae47c0..c4d1fb6a5 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -48,6 +48,7 @@
 		"chartjs-plugin-zoom": "1.2.0",
 		"compare-versions": "4.1.3",
 		"content-disposition": "0.5.4",
+		"convert-video": "1.0.0",
 		"css-loader": "6.7.1",
 		"cssnano": "5.1.1",
 		"date-fns": "2.28.0",
diff --git a/packages/client/src/scripts/select-file-enc.ts b/packages/client/src/scripts/select-file-enc.ts
index 037e6425f..529e9d0a9 100644
--- a/packages/client/src/scripts/select-file-enc.ts
+++ b/packages/client/src/scripts/select-file-enc.ts
@@ -1,87 +1,44 @@
+import { ref } from 'vue';
 import * as os from '@/os';
 import { stream } from '@/stream';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
 import { DriveFile } from 'misskey-js/built/entities';
-import { fs } from 'fs';
-import { createFFmpeg, fetchFile } from '@ffmpeg/ffmpeg';
-
+import VideoConverter from 'convert-video';
 
 function select(src: any, label: string | null, multiple: boolean): Promise<DriveFile | 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 = () => {
 
 
+				async function convertVideo(input) {
+					let sourceVideoFile = input.files[0];
+					let targetVideoFormat = 'mp4'
+					let convertedVideoDataObj = await VideoConverter.convert(sourceVideoFile, targetVideoFormat);
 
+					let convertedVideoFile = new File([convertedVideoDataObj.data], convertedVideoDataObj.name + "." + convertedVideoDataObj.format);
 
+					os.upload(convertedVideoFile, defaultStore.state.uploadFolder, undefined, keepOriginal.value).then(res).catch(e => { os.alert({ type: 'error', text: e }) });
+				}
 
-				const readFromBlobOrFile = (blob) => (
-					console.log('start readfrombloborfile'),
-					new Promise((resolve, reject) => {
-						const reader = new FileReader();
-						reader.onload = () => {
-							resolve(reader.result);
-						};
-						reader.onerror = ({ target: { error: { code } } }) => {
-							reject(os.alert({ type: 'error', text: 'file could not be read! ' + code }));
-						};
-						reader.readAsArrayBuffer(blob);
+				Array.from(input.files).map(file => {
+					if (file.type.indexOf('video') !== -1) {
+						console.log('convert video');
+						os.toast('Try convert to mp4');
+						convertVideo(file);
+					} else {
+						os.toast('It is not video file');
+						os.upload(file, defaultStore.state.uploadFolder, undefined, keepOriginal.value).then(res).catch(e => { os.alert({ type: 'error', text: e }) });
 					}
-				));
+				});
 
 
-					
-				
-					const ffmpeg = createFFmpeg({ log: true });
-					async function ffmpegconv() {
-						os.toast('Start const ffmpegconv');
-						console.log('Start const ffmpegconv');
-						var infilename = Array.from(input.files[0].name);
-						let video = null;
-						var outfilename = infilename.replace(/\.[^/.]+$/, '') + '.mp4';
-						os.toast('Start await beffile');
-						//ここでストップ
-						console.log('Start await beffile');
-						const befFile = new Uint8Array(await readFromBlobOrFile(input.files[0]));
-
-						os.toast('Loading FFmpeg.wasm');
-						console.log('Loading FFmpeg.wasm');
-						if (!ffmpeg.isLoaded()) {
-							os.toast('Loading FFmpeg.wasm-core');
-							console.log('Loading FFmpeg.wasm-core');
-							await ffmpeg.load();
-						}
-						os.toast('Set ffmpeg files');
-						console.log('Set ffmpeg files');
-						ffmpeg.FS('writeFile', infilename, await fetchFile(befFile));
-						os.toast('Converting')
-						await ffmpeg.run('-i', `video.avi`, '-c:v', 'copy', '-c:a', 'copy', `video.mp4`);
-						os.toast('Converted')
-						const aftFile = ffmpeg.FS('readFile', outfilename);
-						os.toast('Uploading')
-						video.value = URL.createObjectURL(new Blob([aftFile.buffer], { type: 'video/mp4' }));
-						os.upload(video, defaultStore.state.uploadFolder).then(res).catch(e => { os.alert({ type: 'error', text: e }) });
-					};
-					
-
-				//const promises = Array.from(input.files).map(file => os.upload(file, defaultStore.state.uploadFolder));
-
-				//Promise.all(promises).then(driveFiles => {
-				//	res(multiple ? driveFiles : driveFiles[0]);
-				//}).catch(e => {
-				//	os.alert({
-				//		type: 'error',
-				//		text: e
-				//	});
-				//});
-				os.toast('Try use FFmpeg.wasm')
-				ffmpegconv();
-				
 
 
 				// 一応廃棄
@@ -93,9 +50,6 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 			(window as any).__misskey_input_ref__ = input;
 
 			input.click();
-
-
-
 		};
 
 		const chooseFileFromDrive = () => {
@@ -106,9 +60,9 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 
 		const chooseFileFromUrl = () => {
 			os.inputText({
-				title: i18n.locale.uploadFromUrl,
+				title: i18n.ts.uploadFromUrl,
 				type: 'url',
-				placeholder: i18n.locale.uploadFromUrlDescription
+				placeholder: i18n.ts.uploadFromUrlDescription
 			}).then(({ canceled, result: url }) => {
 				if (canceled) return;
 
@@ -129,8 +83,8 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 				});
 
 				os.alert({
-					title: i18n.locale.uploadFromUrlRequested,
-					text: i18n.locale.uploadFromUrlMayTakeTime
+					title: i18n.ts.uploadFromUrlRequested,
+					text: i18n.ts.uploadFromUrlMayTakeTime
 				});
 			});
 		};
@@ -139,17 +93,17 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 			text: label,
 			type: 'label'
 		} : undefined, {
-			text: i18n.locale.upload,
+			text: i18n.ts.upload,
 			icon: 'fas fa-upload',
 			action: chooseFileFromPc
 		}], src);
 	});
 }
 
-export function selectFileEnc(src: any, label: string | null = null): Promise<DriveFile> {
+export function selectFile(src: any, label: string | null = null): Promise<DriveFile> {
 	return select(src, label, false) as Promise<DriveFile>;
 }
 
-export function selectFilesEnc(src: any, label: string | null = null): Promise<DriveFile[]> {
+export function selectFiles(src: any, label: string | null = null): Promise<DriveFile[]> {
 	return select(src, label, true) as Promise<DriveFile[]>;
 }
diff --git a/packages/client/src/scripts/select-file.ts b/packages/client/src/scripts/select-file.ts
index 23df4edf5..2c26fd6ca 100644
--- a/packages/client/src/scripts/select-file.ts
+++ b/packages/client/src/scripts/select-file.ts
@@ -5,6 +5,7 @@ import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
 import { DriveFile } from 'misskey-js/built/entities';
 
+
 function select(src: any, label: string | null, multiple: boolean): Promise<DriveFile | DriveFile[]> {
 	return new Promise((res, rej) => {
 		const keepOriginal = ref(defaultStore.state.keepOriginalUploading);

From ab59a5b659e87cc3053f729634a79a8048e631f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Fri, 11 Mar 2022 22:45:03 +0900
Subject: [PATCH 04/15] fix: dont export select-file-enc.ts

---
 packages/client/src/scripts/select-file-enc.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/scripts/select-file-enc.ts b/packages/client/src/scripts/select-file-enc.ts
index 529e9d0a9..f7dc8bccd 100644
--- a/packages/client/src/scripts/select-file-enc.ts
+++ b/packages/client/src/scripts/select-file-enc.ts
@@ -4,7 +4,7 @@ import { stream } from '@/stream';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
 import { DriveFile } from 'misskey-js/built/entities';
-import VideoConverter from 'convert-video';
+import { VideoConverter } from 'convert-video';
 
 function select(src: any, label: string | null, multiple: boolean): Promise<DriveFile | DriveFile[]> {
 	return new Promise((res, rej) => {
@@ -100,10 +100,10 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 	});
 }
 
-export function selectFile(src: any, label: string | null = null): Promise<DriveFile> {
+export function selectFileEnc(src: any, label: string | null = null): Promise<DriveFile> {
 	return select(src, label, false) as Promise<DriveFile>;
 }
 
-export function selectFiles(src: any, label: string | null = null): Promise<DriveFile[]> {
+export function selectFilesEnc(src: any, label: string | null = null): Promise<DriveFile[]> {
 	return select(src, label, true) as Promise<DriveFile[]>;
 }

From 5563d6bdeb0a5d039ec01c0b795785a056f3b6c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Fri, 11 Mar 2022 22:48:50 +0900
Subject: [PATCH 05/15] fix: wip

---
 packages/client/src/scripts/select-file-enc.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/scripts/select-file-enc.ts b/packages/client/src/scripts/select-file-enc.ts
index f7dc8bccd..34150d972 100644
--- a/packages/client/src/scripts/select-file-enc.ts
+++ b/packages/client/src/scripts/select-file-enc.ts
@@ -4,7 +4,7 @@ import { stream } from '@/stream';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
 import { DriveFile } from 'misskey-js/built/entities';
-import { VideoConverter } from 'convert-video';
+import * as VideoConverter from 'convert-video';
 
 function select(src: any, label: string | null, multiple: boolean): Promise<DriveFile | DriveFile[]> {
 	return new Promise((res, rej) => {

From 57a106a19287f5dcde725af3f0d01ca393b4995a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Sat, 12 Mar 2022 01:23:49 +0900
Subject: [PATCH 06/15] fix: wip

---
 packages/client/src/scripts/select-file-enc.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/scripts/select-file-enc.ts b/packages/client/src/scripts/select-file-enc.ts
index 34150d972..0b633b8cd 100644
--- a/packages/client/src/scripts/select-file-enc.ts
+++ b/packages/client/src/scripts/select-file-enc.ts
@@ -4,7 +4,7 @@ import { stream } from '@/stream';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
 import { DriveFile } from 'misskey-js/built/entities';
-import * as VideoConverter from 'convert-video';
+import { convert } from 'convert-video';
 
 function select(src: any, label: string | null, multiple: boolean): Promise<DriveFile | DriveFile[]> {
 	return new Promise((res, rej) => {
@@ -20,7 +20,7 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 				async function convertVideo(input) {
 					let sourceVideoFile = input.files[0];
 					let targetVideoFormat = 'mp4'
-					let convertedVideoDataObj = await VideoConverter.convert(sourceVideoFile, targetVideoFormat);
+					let convertedVideoDataObj = await convert(sourceVideoFile, targetVideoFormat);
 
 					let convertedVideoFile = new File([convertedVideoDataObj.data], convertedVideoDataObj.name + "." + convertedVideoDataObj.format);
 

From f269ceaee967dc70096946f4e86ca67ef05bae32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Sat, 12 Mar 2022 01:30:08 +0900
Subject: [PATCH 07/15] fix: wip

---
 packages/client/src/scripts/select-file-enc.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/scripts/select-file-enc.ts b/packages/client/src/scripts/select-file-enc.ts
index 0b633b8cd..afa24fffe 100644
--- a/packages/client/src/scripts/select-file-enc.ts
+++ b/packages/client/src/scripts/select-file-enc.ts
@@ -4,7 +4,7 @@ import { stream } from '@/stream';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
 import { DriveFile } from 'misskey-js/built/entities';
-import { convert } from 'convert-video';
+const convert = require( 'convert-video');
 
 function select(src: any, label: string | null, multiple: boolean): Promise<DriveFile | DriveFile[]> {
 	return new Promise((res, rej) => {

From 74e695a3204281d655ac7d0be4495bbbab1c3bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Sat, 12 Mar 2022 02:11:15 +0900
Subject: [PATCH 08/15] fix: wipppppppppppppppppppppp

---
 .../client/src/scripts/select-file-enc.ts     | 82 ++++++++++++++++++-
 1 file changed, 80 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/scripts/select-file-enc.ts b/packages/client/src/scripts/select-file-enc.ts
index afa24fffe..7f6b1a913 100644
--- a/packages/client/src/scripts/select-file-enc.ts
+++ b/packages/client/src/scripts/select-file-enc.ts
@@ -4,7 +4,6 @@ import { stream } from '@/stream';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
 import { DriveFile } from 'misskey-js/built/entities';
-const convert = require( 'convert-video');
 
 function select(src: any, label: string | null, multiple: boolean): Promise<DriveFile | DriveFile[]> {
 	return new Promise((res, rej) => {
@@ -16,12 +15,91 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 			input.multiple = multiple;
 			input.onchange = () => {
 
+				//ここから
+				// @ts-ignore
+				function VideoConverter (videoFileData, targetFormat) {
+					try {
+						targetFormat = targetFormat.toLowerCase();
+						let reader = new FileReader();
+						return new Promise(resolve => {
+							reader.onload = function (event) {
+								let contentType = 'video/'+targetFormat;
+
+								// @ts-ignore
+								let data = event.target.result.split(',');
+								let b64Data = data[1];
+								let blob = getBlobFromBase64Data(b64Data, contentType);
+								let blobUrl = URL.createObjectURL(blob);
+
+								let convertedVideo = {
+									name: videoFileData.name.substring(0, videoFileData.name.lastIndexOf(".")),
+									format: targetFormat,
+									data: blobUrl
+								}
+								// console.log("convertedVideo: ", convertedVideo);
+								resolve(convertedVideo);
+							}
+							reader.readAsDataURL(videoFileData);
+						});
+
+					} catch (e) {
+						console.log("Error occurred while converting : ", e);
+					}
+				}
+
+				function getBlobFromBase64Data(b64Data, contentType, sliceSize=512) {
+					const byteCharacters = atob(b64Data);
+					const byteArrays = [];
+
+					for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
+						const slice = byteCharacters.slice(offset, offset + sliceSize);
+
+						const byteNumbers = new Array(slice.length);
+						for (let i = 0; i < slice.length; i++) {
+							byteNumbers[i] = slice.charCodeAt(i);
+						}
+
+						const byteArray = new Uint8Array(byteNumbers);
+						// @ts-ignore
+						byteArrays.push(byteArray);
+					}
+
+					const blob = new Blob(byteArrays, {type: contentType});
+					return blob;
+				}
+
+				//ここまで
+
+				/*
+				MIT License
+
+				Copyright (c) 2021 Suvro Debnath
+
+				Permission is hereby granted, free of charge, to any person obtaining a copy
+				of this software and associated documentation files (the "Software"), to deal
+				in the Software without restriction, including without limitation the rights
+				to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+				copies of the Software, and to permit persons to whom the Software is
+				furnished to do so, subject to the following conditions:
+
+				The above copyright notice and this permission notice shall be included in all
+				copies or substantial portions of the Software.
+
+				THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+				IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+				FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+				AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+				LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+				OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+				SOFTWARE.
+				 */
 
 				async function convertVideo(input) {
 					let sourceVideoFile = input.files[0];
 					let targetVideoFormat = 'mp4'
-					let convertedVideoDataObj = await convert(sourceVideoFile, targetVideoFormat);
+					let convertedVideoDataObj = await VideoConverter(sourceVideoFile, targetVideoFormat);
 
+					// @ts-ignore
 					let convertedVideoFile = new File([convertedVideoDataObj.data], convertedVideoDataObj.name + "." + convertedVideoDataObj.format);
 
 					os.upload(convertedVideoFile, defaultStore.state.uploadFolder, undefined, keepOriginal.value).then(res).catch(e => { os.alert({ type: 'error', text: e }) });

From c63d7dc89843e8a6c4d4589bc9391bca277bf81f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Sat, 12 Mar 2022 02:19:56 +0900
Subject: [PATCH 09/15] fix: wippppppppppppppppppppppaaafaafawfwafwaafw

---
 packages/client/src/scripts/select-file-enc.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/scripts/select-file-enc.ts b/packages/client/src/scripts/select-file-enc.ts
index 7f6b1a913..5f2d5e95b 100644
--- a/packages/client/src/scripts/select-file-enc.ts
+++ b/packages/client/src/scripts/select-file-enc.ts
@@ -95,7 +95,7 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 				 */
 
 				async function convertVideo(input) {
-					let sourceVideoFile = input.files[0];
+					let sourceVideoFile = input;
 					let targetVideoFormat = 'mp4'
 					let convertedVideoDataObj = await VideoConverter(sourceVideoFile, targetVideoFormat);
 

From 90c89c3083df6e21914e04a93ab7c1ea33d089bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Sat, 12 Mar 2022 02:24:23 +0900
Subject: [PATCH 10/15] fix: debug

---
 packages/client/src/scripts/select-file-enc.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/scripts/select-file-enc.ts b/packages/client/src/scripts/select-file-enc.ts
index 5f2d5e95b..ee51cbdb2 100644
--- a/packages/client/src/scripts/select-file-enc.ts
+++ b/packages/client/src/scripts/select-file-enc.ts
@@ -97,8 +97,9 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 				async function convertVideo(input) {
 					let sourceVideoFile = input;
 					let targetVideoFormat = 'mp4'
+					console.log('start convert video');
 					let convertedVideoDataObj = await VideoConverter(sourceVideoFile, targetVideoFormat);
-
+					console.log('end convert video');
 					// @ts-ignore
 					let convertedVideoFile = new File([convertedVideoDataObj.data], convertedVideoDataObj.name + "." + convertedVideoDataObj.format);
 

From 78b9550ecac752c3593bc0244940abc01b95c670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Sun, 13 Mar 2022 14:09:44 +0900
Subject: [PATCH 11/15] fix: debug

---
 packages/client/src/scripts/select-file-enc.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/scripts/select-file-enc.ts b/packages/client/src/scripts/select-file-enc.ts
index ee51cbdb2..d5ea970a6 100644
--- a/packages/client/src/scripts/select-file-enc.ts
+++ b/packages/client/src/scripts/select-file-enc.ts
@@ -26,15 +26,15 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 								let contentType = 'video/'+targetFormat;
 
 								// @ts-ignore
-								let data = event.target.result.split(',');
-								let b64Data = data[1];
+								let fileData: ArrayBuffer = event.target.result.split(',');
+								let b64Data = fileData[1];
 								let blob = getBlobFromBase64Data(b64Data, contentType);
 								let blobUrl = URL.createObjectURL(blob);
 
 								let convertedVideo = {
 									name: videoFileData.name.substring(0, videoFileData.name.lastIndexOf(".")),
 									format: targetFormat,
-									data: blobUrl
+									fileData: blob
 								}
 								// console.log("convertedVideo: ", convertedVideo);
 								resolve(convertedVideo);
@@ -101,7 +101,7 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 					let convertedVideoDataObj = await VideoConverter(sourceVideoFile, targetVideoFormat);
 					console.log('end convert video');
 					// @ts-ignore
-					let convertedVideoFile = new File([convertedVideoDataObj.data], convertedVideoDataObj.name + "." + convertedVideoDataObj.format);
+					let convertedVideoFile = new File([convertedVideoDataObj.fileData], convertedVideoDataObj.name + "." + convertedVideoDataObj.format);
 
 					os.upload(convertedVideoFile, defaultStore.state.uploadFolder, undefined, keepOriginal.value).then(res).catch(e => { os.alert({ type: 'error', text: e }) });
 				}

From b48f76aad1953570fb9b31cfb9aea6229e075323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Sun, 13 Mar 2022 14:14:44 +0900
Subject: [PATCH 12/15] fix: update package.json

---
 packages/client/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index c4d1fb6a5..7a1ae47c0 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -48,7 +48,6 @@
 		"chartjs-plugin-zoom": "1.2.0",
 		"compare-versions": "4.1.3",
 		"content-disposition": "0.5.4",
-		"convert-video": "1.0.0",
 		"css-loader": "6.7.1",
 		"cssnano": "5.1.1",
 		"date-fns": "2.28.0",

From 84da9d4cd485762909835a80081fec14070fc999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Sun, 13 Mar 2022 14:37:55 +0900
Subject: [PATCH 13/15] fix: wip

---
 packages/client/src/scripts/select-file-enc.ts | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/scripts/select-file-enc.ts b/packages/client/src/scripts/select-file-enc.ts
index d5ea970a6..1b23e0717 100644
--- a/packages/client/src/scripts/select-file-enc.ts
+++ b/packages/client/src/scripts/select-file-enc.ts
@@ -31,10 +31,10 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 								let blob = getBlobFromBase64Data(b64Data, contentType);
 								let blobUrl = URL.createObjectURL(blob);
 
-								let convertedVideo = {
+								let convertedVideo: any = {
 									name: videoFileData.name.substring(0, videoFileData.name.lastIndexOf(".")),
 									format: targetFormat,
-									fileData: blob
+									data: blob
 								}
 								// console.log("convertedVideo: ", convertedVideo);
 								resolve(convertedVideo);
@@ -100,13 +100,14 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 					console.log('start convert video');
 					let convertedVideoDataObj = await VideoConverter(sourceVideoFile, targetVideoFormat);
 					console.log('end convert video');
+
 					// @ts-ignore
-					let convertedVideoFile = new File([convertedVideoDataObj.fileData], convertedVideoDataObj.name + "." + convertedVideoDataObj.format);
+					let convertedVideoFile = new File([convertedVideoDataObj.data], convertedVideoDataObj.name + "." + convertedVideoDataObj.format);
 
 					os.upload(convertedVideoFile, defaultStore.state.uploadFolder, undefined, keepOriginal.value).then(res).catch(e => { os.alert({ type: 'error', text: e }) });
 				}
 
-				Array.from(input.files).map(file => {
+				const promises = Array.from(input.files).map(file => {
 					if (file.type.indexOf('video') !== -1) {
 						console.log('convert video');
 						os.toast('Try convert to mp4');
@@ -118,6 +119,14 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 				});
 
 
+				Promise.all(promises).then(driveFiles => {
+					res(multiple ? driveFiles : driveFiles[0]);
+				}).catch(e => {
+					os.alert({
+						type: 'error',
+						text: e
+					});
+				});
 
 
 				// 一応廃棄

From 74a80b34059a38899c32b6ea51ed3bf7172c213d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Sun, 13 Mar 2022 16:11:08 +0900
Subject: [PATCH 14/15] feat: Add convert video container button

---
 packages/client/src/components/post-form.vue  | 10 +--
 .../client/src/scripts/select-file-enc.ts     | 78 +++++--------------
 2 files changed, 22 insertions(+), 66 deletions(-)

diff --git a/packages/client/src/components/post-form.vue b/packages/client/src/components/post-form.vue
index 2b2ff24dd..c0a7028b2 100644
--- a/packages/client/src/components/post-form.vue
+++ b/packages/client/src/components/post-form.vue
@@ -82,7 +82,7 @@ import { Autocomplete } from '@/scripts/autocomplete';
 import * as os from '@/os';
 import { stream } from '@/stream';
 import { selectFiles } from '@/scripts/select-file';
-import { selectFilesEnc } from '@/scripts/select-file-enc';
+import {selectFileEnc, selectFilesEnc} from '@/scripts/select-file-enc';
 import { defaultStore, notePostInterruptors, postFormActions } from '@/store';
 import { throttle } from 'throttle-debounce';
 import MkInfo from '@/components/ui/info.vue';
@@ -350,7 +350,7 @@ function focus() {
 }
 
 function chooseFileFrom(ev) {
-	selectFiles(ev.currentTarget ?? ev.target, i18n.ts.attachFile).then(files_ => {
+	selectFiles(ev.currentTarget ?? ev.target, i18n.ts.attachVideoFile).then(files_ => {
 		for (const file of files_) {
 			files.push(file);
 		}
@@ -358,10 +358,8 @@ function chooseFileFrom(ev) {
 }
 
 function chooseFileFromEnc(ev) {
-	selectFilesEnc(ev.currentTarget ?? ev.target, i18n.ts.attachVideoFile).then(files_ => {
-		for (const file of files_) {
-			files.push(file);
-		}
+	selectFileEnc(ev.currentTarget ?? ev.target, i18n.ts.attachFile).then(files_ => {
+		files.push(files_);
 	});
 }
 
diff --git a/packages/client/src/scripts/select-file-enc.ts b/packages/client/src/scripts/select-file-enc.ts
index 1b23e0717..eae57aa00 100644
--- a/packages/client/src/scripts/select-file-enc.ts
+++ b/packages/client/src/scripts/select-file-enc.ts
@@ -94,8 +94,17 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 				SOFTWARE.
 				 */
 
-				async function convertVideo(input) {
-					let sourceVideoFile = input;
+
+				Array.from(input.files).map(async file => {
+					if (file.type.indexOf('video') == -1) {
+						os.toast('It is not video file');
+						return
+					}
+
+					console.log('convert video');
+					os.toast('Try convert to mp4');
+					//convertVideo(file);
+					let sourceVideoFile = file;
 					let targetVideoFormat = 'mp4'
 					console.log('start convert video');
 					let convertedVideoDataObj = await VideoConverter(sourceVideoFile, targetVideoFormat);
@@ -104,27 +113,13 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 					// @ts-ignore
 					let convertedVideoFile = new File([convertedVideoDataObj.data], convertedVideoDataObj.name + "." + convertedVideoDataObj.format);
 
-					os.upload(convertedVideoFile, defaultStore.state.uploadFolder, undefined, keepOriginal.value).then(res).catch(e => { os.alert({ type: 'error', text: e }) });
-				}
-
-				const promises = Array.from(input.files).map(file => {
-					if (file.type.indexOf('video') !== -1) {
-						console.log('convert video');
-						os.toast('Try convert to mp4');
-						convertVideo(file);
-					} else {
-						os.toast('It is not video file');
-						os.upload(file, defaultStore.state.uploadFolder, undefined, keepOriginal.value).then(res).catch(e => { os.alert({ type: 'error', text: e }) });
-					}
-				});
-
-
-				Promise.all(promises).then(driveFiles => {
-					res(multiple ? driveFiles : driveFiles[0]);
-				}).catch(e => {
-					os.alert({
-						type: 'error',
-						text: e
+					os.upload(convertedVideoFile, defaultStore.state.uploadFolder).then(driveFiles => {
+						res(driveFiles);
+					}).catch(e => {
+						os.alert({
+							type: 'error',
+							text: e
+						});
 					});
 				});
 
@@ -140,43 +135,6 @@ function select(src: any, label: string | null, multiple: boolean): Promise<Driv
 			input.click();
 		};
 
-		const chooseFileFromDrive = () => {
-			os.selectDriveFile(multiple).then(files => {
-				res(files);
-			});
-		};
-
-		const chooseFileFromUrl = () => {
-			os.inputText({
-				title: i18n.ts.uploadFromUrl,
-				type: 'url',
-				placeholder: i18n.ts.uploadFromUrlDescription
-			}).then(({ canceled, result: url }) => {
-				if (canceled) return;
-
-				const marker = Math.random().toString(); // TODO: UUIDとか使う
-
-				const connection = stream.useChannel('main');
-				connection.on('urlUploadFinished', data => {
-					if (data.marker === marker) {
-						res(multiple ? [data.file] : data.file);
-						connection.dispose();
-					}
-				});
-
-				os.api('drive/files/upload-from-url', {
-					url: url,
-					folderId: defaultStore.state.uploadFolder,
-					marker
-				});
-
-				os.alert({
-					title: i18n.ts.uploadFromUrlRequested,
-					text: i18n.ts.uploadFromUrlMayTakeTime
-				});
-			});
-		};
-
 		os.popupMenu([label ? {
 			text: label,
 			type: 'label'

From 9c34f96cdd05318192ef84201e1db400d8bea111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Sun, 13 Mar 2022 16:14:57 +0900
Subject: [PATCH 15/15] feat: Add convert video container button lang

---
 locales/ja-JP.yml                            | 1 +
 locales/ja-NY.yml                            | 1 +
 packages/client/src/components/post-form.vue | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 13f9efe9b..3e0ad451a 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -222,6 +222,7 @@ currentPassword: "現在のパスワード"
 newPassword: "新しいパスワード"
 newPasswordRetype: "新しいパスワード(再入力)"
 attachFile: "ファイルを添付"
+attachVideoFile: "MOVファイルを添付"
 more: "もっと！"
 featured: "ハイライト"
 usernameOrUserId: "ユーザー名かユーザーID"
diff --git a/locales/ja-NY.yml b/locales/ja-NY.yml
index d9f16b961..546270ad8 100644
--- a/locales/ja-NY.yml
+++ b/locales/ja-NY.yml
@@ -221,6 +221,7 @@ currentPassword: "現在のパスワード"
 newPassword: "新しいパスワード"
 newPasswordRetype: "新しいパスワード(再入力)"
 attachFile: "ファイルを添付"
+attachVideoFile: "MOVファイルを添付"
 more: "もっと！"
 featured: "ハイライト"
 usernameOrUserId: "ユーザー名かユーザーID"
diff --git a/packages/client/src/components/post-form.vue b/packages/client/src/components/post-form.vue
index c0a7028b2..8e1633204 100644
--- a/packages/client/src/components/post-form.vue
+++ b/packages/client/src/components/post-form.vue
@@ -350,7 +350,7 @@ function focus() {
 }
 
 function chooseFileFrom(ev) {
-	selectFiles(ev.currentTarget ?? ev.target, i18n.ts.attachVideoFile).then(files_ => {
+	selectFiles(ev.currentTarget ?? ev.target, i18n.ts.attachFile).then(files_ => {
 		for (const file of files_) {
 			files.push(file);
 		}
@@ -358,7 +358,7 @@ function chooseFileFrom(ev) {
 }
 
 function chooseFileFromEnc(ev) {
-	selectFileEnc(ev.currentTarget ?? ev.target, i18n.ts.attachFile).then(files_ => {
+	selectFileEnc(ev.currentTarget ?? ev.target, i18n.ts.attachVideoFile).then(files_ => {
 		files.push(files_);
 	});
 }