From 4d4ac5dda5706e8ce5121137f16791d2f0ea7df6 Mon Sep 17 00:00:00 2001
From: mei23 <m@m544.net>
Date: Sat, 22 Jan 2022 20:17:29 +0900
Subject: [PATCH 1/2] wip

---
 .../backend/src/services/drive/add-file.ts    | 12 +++++++++---
 packages/client/package.json                  |  1 +
 packages/client/src/os.ts                     | 17 +++++++++++++++--
 packages/client/yarn.lock                     | 19 +++++++++++++++++++
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/services/drive/add-file.ts b/packages/backend/src/services/drive/add-file.ts
index 9de4465eb95b..c117fe9100e0 100644
--- a/packages/backend/src/services/drive/add-file.ts
+++ b/packages/backend/src/services/drive/add-file.ts
@@ -178,6 +178,7 @@ export async function generateAlts(path: string, type: string, generateWeb: bool
 	}
 
 	let img: sharp.Sharp | null = null;
+	let webpublicNeeded: boolean;
 
 	try {
 		img = sharp(path);
@@ -191,6 +192,9 @@ export async function generateAlts(path: string, type: string, generateWeb: bool
 				thumbnail: null,
 			};
 		}
+
+		webpublicNeeded = !!metadata.exif || !!metadata.icc || !!metadata.iptc || !!metadata.xmp || !!metadata.tifftagPhotoshop
+			|| !metadata.width || metadata.width > 2048 || !metadata.height || metadata.height > 2048;
 	} catch (e) {
 		logger.warn(`sharp failed: ${e}`);
 		return {
@@ -206,11 +210,13 @@ export async function generateAlts(path: string, type: string, generateWeb: bool
 		logger.info(`creating web image`);
 
 		try {
-			if (['image/jpeg'].includes(type)) {
+			if (['image/jpeg'].includes(type) && webpublicNeeded) {
 				webpublic = await convertSharpToJpeg(img, 2048, 2048);
-			} else if (['image/webp'].includes(type)) {
+			} else if (['image/webp'].includes(type) && webpublicNeeded) {
 				webpublic = await convertSharpToWebp(img, 2048, 2048);
-			} else if (['image/png', 'image/svg+xml'].includes(type)) {
+			} else if (['image/png'].includes(type) && webpublicNeeded) {
+				webpublic = await convertSharpToPng(img, 2048, 2048);
+			} else if (['image/svg+xml'].includes(type)) {
 				webpublic = await convertSharpToPng(img, 2048, 2048);
 			} else {
 				logger.debug(`web image not created (not an required image)`);
diff --git a/packages/client/package.json b/packages/client/package.json
index 6c4cf764d0c3..19a1fb5a6fb9 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -45,6 +45,7 @@
 		"autwh": "0.1.0",
 		"blurhash": "1.1.4",
 		"broadcast-channel": "4.9.0",
+		"browser-image-resizer": "2.2.1",
 		"chart.js": "3.7.0",
 		"chartjs-adapter-date-fns": "2.0.0",
 		"chartjs-plugin-zoom": "1.2.0",
diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index 378523e1bc7f..6e8a93822039 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -9,6 +9,7 @@ import MkPostFormDialog from '@/components/post-form-dialog.vue';
 import MkWaitingDialog from '@/components/waiting-dialog.vue';
 import { resolve } from '@/router';
 import { $i } from '@/account';
+import { readAndCompressImage } from 'browser-image-resizer';
 
 export const pendingApiRequestsCount = ref(0);
 
@@ -548,7 +549,7 @@ export function upload(file: File, folder?: any, name?: string): Promise<Misskey
 		const id = Math.random().toString();
 
 		const reader = new FileReader();
-		reader.onload = (e) => {
+		reader.onload = async (e) => {
 			const ctx = reactive({
 				id: id,
 				name: name || file.name || 'untitled',
@@ -557,12 +558,24 @@ export function upload(file: File, folder?: any, name?: string): Promise<Misskey
 				img: window.URL.createObjectURL(file)
 			});
 
+			let resizedImage: any;
+			if (file.type === 'image/jpeg') {
+				const config = {
+					quality: 0.85,
+					maxWidth: 2048,
+					maxHeight: 2048,
+					autoRotate: true,
+					debug: true
+				};
+				resizedImage = await readAndCompressImage(file, config)
+			}
+
 			uploads.value.push(ctx);
 
 			const data = new FormData();
 			data.append('i', $i.token);
 			data.append('force', 'true');
-			data.append('file', file);
+			data.append('file', resizedImage || file);
 
 			if (folder) data.append('folderId', folder);
 			if (name) data.append('name', name);
diff --git a/packages/client/yarn.lock b/packages/client/yarn.lock
index d983d01ba8df..fe297d10134c 100644
--- a/packages/client/yarn.lock
+++ b/packages/client/yarn.lock
@@ -1428,6 +1428,13 @@ broadcast-channel@4.9.0:
     rimraf "3.0.2"
     unload "2.3.1"
 
+browser-image-resizer@2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/browser-image-resizer/-/browser-image-resizer-2.2.1.tgz#61ba6d71edbdcc2caf2017c5687f5a8cf6301689"
+  integrity sha512-NwtjlgzKzX9zjI8bh77bnVeOrn6ZuOhD1u7NFjNClQbjCEwI4VH0GYqCh5Bcb0WIWZCDEVJFH9PH49Blk53nlw==
+  dependencies:
+    exifreader "^3.1.0"
+
 browser-stdout@1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
@@ -2748,6 +2755,13 @@ executable@^4.1.1:
   dependencies:
     pify "^2.2.0"
 
+exifreader@^3.1.0:
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/exifreader/-/exifreader-3.16.0.tgz#3c106eccd134e8f4786f9e8e600f8269c5296b80"
+  integrity sha512-RfdE1LrU3KJm8NFnU3jJG4/1quEancwTz1VgwzItP11fBoVnb3Vp7JL8bQKU8rSgZm+Roa3+BJ7zg4OtoFhTFA==
+  optionalDependencies:
+    xmldom "^0.1.31"
+
 exit-on-epipe@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692"
@@ -6417,6 +6431,11 @@ xml-js@^1.6.11:
   dependencies:
     sax "^1.2.4"
 
+xmldom@^0.1.31:
+  version "0.1.31"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
+  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
+
 y18n@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"

From bb11a37d1addc3ec161a2abc60c44a2474b46a09 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sat, 29 Jan 2022 14:53:16 +0900
Subject: [PATCH 2/2] Update packages/client/src/os.ts

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
---
 packages/client/src/os.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index 6e8a93822039..5664cded77b6 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -567,7 +567,7 @@ export function upload(file: File, folder?: any, name?: string): Promise<Misskey
 					autoRotate: true,
 					debug: true
 				};
-				resizedImage = await readAndCompressImage(file, config)
+				resizedImage = await readAndCompressImage(file, config);
 			}
 
 			uploads.value.push(ctx);