usbharu
/
misskey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wu

This commit is contained in:
syuilo 2025-10-31 18:54:49 +09:00
parent 149066522e
commit 7bb9d3d0af
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/frontend/src/composables/use-uploader.ts
View File

@ -11,7 +11,7 @@ import { computed, markRaw, onMounted, onUnmounted, ref, triggerRef } from 'vue'
import ExifReader from 'exifreader'; import ExifReader from 'exifreader';
import type { MenuItem } from '@/types/menu.js'; import type { MenuItem } from '@/types/menu.js';
import type { WatermarkPreset } from '@/utility/watermark.js'; import type { WatermarkPreset } from '@/utility/watermark.js';
import type { ImageFramePreset } from '@/utility/image-frame-renderer.js'; import type { ImageFrameParams, ImageFramePreset } from '@/utility/image-frame-renderer.js';
import { genId } from '@/utility/id.js'; import { genId } from '@/utility/id.js';
import { i18n } from '@/i18n.js'; import { i18n } from '@/i18n.js';
import { prefer } from '@/preferences.js'; import { prefer } from '@/preferences.js';
@ -88,7 +88,7 @@ export type UploaderItem = {
preprocessedFile?: Blob | null; preprocessedFile?: Blob | null;
file: File; file: File;
watermarkPreset: WatermarkPreset | null; watermarkPreset: WatermarkPreset | null;
imageFramePreset: ImageFramePreset | null; imageFrameParams: ImageFrameParams | null;
isSensitive?: boolean; isSensitive?: boolean;
caption?: string | null; caption?: string | null;
abort?: (() => void) | null; abort?: (() => void) | null;
@ -153,7 +153,7 @@ export function useUploader(options: {
uploadFailed: false, uploadFailed: false,
compressionLevel: IMAGE_COMPRESSION_SUPPORTED_TYPES.includes(file.type) ? prefer.s.defaultImageCompressionLevel : VIDEO_COMPRESSION_SUPPORTED_TYPES.includes(file.type) ? prefer.s.defaultVideoCompressionLevel : 0, 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, 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, imageFrameParams: null,
file: markRaw(file), file: markRaw(file),
}); });
const reactiveItem = items.value.at(-1)!; const reactiveItem = items.value.at(-1)!;
@ -357,7 +357,7 @@ export function useUploader(options: {
children: [{ children: [{
type: 'radioOption', type: 'radioOption',
text: i18n.ts.none, text: i18n.ts.none,
active: computed(() => item.imageFramePreset == null), active: computed(() => item.imageFrameParams == null),
action: () => changePreset(null), action: () => changePreset(null),
}, { }, {
type: 'divider', type: 'divider',

4
packages/frontend/src/preferences/def.ts
View File

@ -458,10 +458,6 @@ export const PREF_DEF = definePreferences({
return mergedItems; return mergedItems;
}, },
}, },
defaultImageFramePresetId: {
accountDependent: true,
default: null as ImageFramePreset['id'] | null,
},
defaultImageCompressionLevel: { defaultImageCompressionLevel: {
default: 2 as 0 | 1 | 2 | 3, default: 2 as 0 | 1 | 2 | 3,
}, },

2
packages/frontend/src/utility/image-frame-renderer.ts
View File

@ -15,6 +15,8 @@ const FXS = [
FX_frame, FX_frame,
] as const satisfies ImageEffectorFx<string, any>[]; ] as const satisfies ImageEffectorFx<string, any>[];
// TODO: 上部にもラベルを配置できるようにする
export type ImageFrameParams = { export type ImageFrameParams = {
borderThickness: number; borderThickness: number;
labelThickness: number; labelThickness: number;