Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

3 files changed, 21 insertions, 2 deletions

diff --git a/packages/frontend/src/scripts/form.ts b/packages/frontend/src/scripts/form.ts
index 7f321cc0ae..635803a2bc 100644
--- a/packages/frontend/src/scripts/form.ts
+++ b/packages/frontend/src/scripts/form.ts
@@ -1,3 +1,4 @@
+type EnumItem = string | {label: string; value: string;};
 export type FormItem = {
 	label?: string;
 	type: 'string';
@@ -20,7 +21,7 @@ export type FormItem = {
 	type: 'enum';
 	default: string | null;
 	hidden?: boolean;
-	enum: string[];
+	enum: EnumItem[];
 } | {
 	label?: string;
 	type: 'radio';
diff --git a/packages/frontend/src/scripts/upload/compress-config.ts b/packages/frontend/src/scripts/upload/compress-config.ts
index 793c78ad20..55d469c5e4 100644
--- a/packages/frontend/src/scripts/upload/compress-config.ts
+++ b/packages/frontend/src/scripts/upload/compress-config.ts
@@ -1,7 +1,15 @@
 import isAnimated from 'is-file-animated';
+import { isWebpSupported } from './isWebpSupported';
 import type { BrowserImageResizerConfig } from 'browser-image-resizer';
 
 const compressTypeMap = {
+	'image/jpeg': { quality: 0.90, mimeType: 'image/webp' },
+	'image/png': { quality: 1, mimeType: 'image/webp' },
+	'image/webp': { quality: 0.90, mimeType: 'image/webp' },
+	'image/svg+xml': { quality: 1, mimeType: 'image/webp' },
+} as const;
+
+const compressTypeMapFallback = {
 	'image/jpeg': { quality: 0.85, mimeType: 'image/jpeg' },
 	'image/png': { quality: 1, mimeType: 'image/png' },
 	'image/webp': { quality: 0.85, mimeType: 'image/jpeg' },
@@ -9,7 +17,7 @@ const compressTypeMap = {
 } as const;
 
 export async function getCompressionConfig(file: File): Promise<BrowserImageResizerConfig | undefined> {
-	const imgConfig = compressTypeMap[file.type];
+	const imgConfig = (isWebpSupported() ? compressTypeMap : compressTypeMapFallback)[file.type];
 	if (!imgConfig || await isAnimated(file)) {
 		return;
 	}
diff --git a/packages/frontend/src/scripts/upload/isWebpSupported.ts b/packages/frontend/src/scripts/upload/isWebpSupported.ts
new file mode 100644
index 0000000000..cde8b9d785
--- /dev/null
+++ b/packages/frontend/src/scripts/upload/isWebpSupported.ts
@@ -0,0 +1,10 @@
+let isWebpSupportedCache: boolean | undefined;
+export function isWebpSupported() {
+	if (isWebpSupportedCache === undefined) {
+		const canvas = document.createElement('canvas');
+		canvas.width = 1;
+		canvas.height = 1;
+		isWebpSupportedCache = canvas.toDataURL('image/webp').startsWith('data:image/webp');
+	}
+	return isWebpSupportedCache;
+}