wip

packages/frontend/src/composables/use-uploader.ts

@@ -11,6 +11,7 @@ import { computed, markRaw, onMounted, onUnmounted, ref, triggerRef } from 'vue'
 import ExifReader from 'exifreader';
 import type { MenuItem } from '@/types/menu.js';
 import type { WatermarkPreset } from '@/utility/watermark.js';
+import type { ImageFramePreset } from '@/utility/image-frame-renderer.js';
 import { genId } from '@/utility/id.js';
 import { i18n } from '@/i18n.js';
 import { prefer } from '@/preferences.js';
@@ -87,6 +88,7 @@ export type UploaderItem = {
 	preprocessedFile?: Blob | null;
 	file: File;
 	watermarkPreset: WatermarkPreset | null;
+	imageFramePreset: ImageFramePreset | null;
 	isSensitive?: boolean;
 	caption?: string | null;
 	abort?: (() => void) | null;
@@ -151,6 +153,7 @@ export function useUploader(options: {
 			uploadFailed: false,
 			compressionLevel: IMAGE_COMPRESSION_SUPPORTED_TYPES.includes(file.type) ? prefer.s.defaultImageCompressionLevel : VIDEO_COMPRESSION_SUPPORTED_TYPES.includes(file.type) ? prefer.s.defaultVideoCompressionLevel : 0,
 			watermarkPreset: uploaderFeatures.value.watermark && $i.policies.watermarkAvailable ? (prefer.s.watermarkPresets.find(p => p.id === prefer.s.defaultWatermarkPresetId) ?? null) : null,
+			imageFramePreset: uploaderFeatures.value.imageEditing ? (prefer.s.imageFramePresets.find(p => p.id === prefer.s.defaultImageFramePresetId) ?? null) : null,
 			file: markRaw(file),
 		});
 		const reactiveItem = items.value.at(-1)!;
@@ -340,8 +343,8 @@ export function useUploader(options: {
 			!item.uploading &&
 			!item.uploaded
 		) {
-			function changePreset(presetId: string | null) {
+			function changePreset(preset: ImageFramePreset | null) {
-				item.imageFramePresetId = presetId;
+				item.imageFramePreset = preset;
 				preprocess(item).then(() => {
 					triggerRef(items);
 				});
@@ -354,16 +357,16 @@ export function useUploader(options: {
 				children: [{
 					type: 'radioOption',
 					text: i18n.ts.none,
-					active: computed(() => item.watermarkPreset == null),
+					active: computed(() => item.imageFramePreset == null),
 					action: () => changePreset(null),
 				}, {
 					type: 'divider',
-				}, ...prefer.s.watermarkPresets.map(preset => ({
+				}, ...prefer.s.imageFramePresets.map(preset => ({
 					type: 'radioOption' as const,
 					text: preset.name,
-					active: computed(() => item.watermarkPreset?.id === preset.id),
+					active: computed(() => item.imageFramePreset?.id === preset.id),
-					action: () => changePreset(preset.id),
+					action: () => changePreset(preset),
-				})), ...(prefer.s.watermarkPresets.length > 0 ? [{
+				})), ...(prefer.s.imageFramePresets.length > 0 ? [{
 					type: 'divider' as const,
 				}] : []), {
 					type: 'button',

packages/frontend/src/preferences/def.ts

@@ -13,6 +13,7 @@ import type { Plugin } from '@/plugin.js';
 import type { DeviceKind } from '@/utility/device-kind.js';
 import type { DeckProfile } from '@/deck.js';
 import type { WatermarkPreset } from '@/utility/watermark.js';
+import type { ImageFramePreset } from '@/utility/image-frame-renderer.js';
 import { genId } from '@/utility/id.js';
 import { DEFAULT_DEVICE_KIND } from '@/utility/device-kind.js';
 import { deepEqual } from '@/utility/deep-equal.js';
@@ -437,6 +438,30 @@ export const PREF_DEF = definePreferences({
 		accountDependent: true,
 		default: null as WatermarkPreset['id'] | null,
 	},
+	imageFramePresets: {
+		accountDependent: true,
+		default: [] as ImageFramePreset[],
+		mergeStrategy: (a, b) => {
+			const mergedItems = [] as typeof a;
+			for (const x of a.concat(b)) {
+				const sameIdItem = mergedItems.find(y => y.id === x.id);
+				if (sameIdItem != null) {
+					if (deepEqual(x, sameIdItem)) { // 完全な重複は無視
+						continue;
+					} else { // IDは同じなのに内容が違う場合はマージ不可とする
+						throw new Error();
+					}
+				} else {
+					mergedItems.push(x);
+				}
+			}
+			return mergedItems;
+		},
+	},
+	defaultImageFramePresetId: {
+		accountDependent: true,
+		default: null as ImageFramePreset['id'] | null,
+	},
 	defaultImageCompressionLevel: {
 		default: 2 as 0 | 1 | 2 | 3,
 	},

packages/frontend/src/utility/image-frame-renderer.ts

@@ -28,6 +28,12 @@ export type ImageFrameParams = {
 	borderRadius: number; // TODO
 };
 
+export type ImageFramePreset = {
+	id: string;
+	name: string;
+	params: ImageFrameParams;
+};
+
 export class ImageFrameRenderer {
 	private effector: ImageEffector<typeof FXS>;
 	private image: HTMLImageElement | ImageBitmap;