usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip

This commit is contained in:
syuilo 2025-06-03 07:44:35 +09:00
parent 5342b024b2
commit c701016989
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/frontend/src/components/MkImageEffectorDialog.Layer.vue
View File

@ -38,7 +38,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<script setup lang="ts"> <script setup lang="ts">
import { ref, useTemplateRef, watch, onMounted, onUnmounted } from 'vue'; import { ref, useTemplateRef, watch, onMounted, onUnmounted } from 'vue';
import { v4 as uuid } from 'uuid';
import type { ImageEffectorLayer } from '@/utility/image-effector/ImageEffector.js'; import type { ImageEffectorLayer } from '@/utility/image-effector/ImageEffector.js';
import { i18n } from '@/i18n.js'; import { i18n } from '@/i18n.js';
import { ImageEffector } from '@/utility/image-effector/ImageEffector.js'; import { ImageEffector } from '@/utility/image-effector/ImageEffector.js';

4
packages/frontend/src/components/MkImageEffectorDialog.vue
View File

@ -49,7 +49,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<script setup lang="ts"> <script setup lang="ts">
import { ref, useTemplateRef, watch, onMounted, onUnmounted, reactive, nextTick } from 'vue'; import { ref, useTemplateRef, watch, onMounted, onUnmounted, reactive, nextTick } from 'vue';
import { v4 as uuid } from 'uuid';
import type { ImageEffectorLayer } from '@/utility/image-effector/ImageEffector.js'; import type { ImageEffectorLayer } from '@/utility/image-effector/ImageEffector.js';
import { i18n } from '@/i18n.js'; import { i18n } from '@/i18n.js';
import { ImageEffector } from '@/utility/image-effector/ImageEffector.js'; import { ImageEffector } from '@/utility/image-effector/ImageEffector.js';
@ -61,6 +60,7 @@ import XLayer from '@/components/MkImageEffectorDialog.Layer.vue';
import * as os from '@/os.js'; import * as os from '@/os.js';
import { deepClone } from '@/utility/clone.js'; import { deepClone } from '@/utility/clone.js';
import { FXS } from '@/utility/image-effector/fxs.js'; import { FXS } from '@/utility/image-effector/fxs.js';
import { genId } from '@/utility/id.js';
const props = defineProps<{ const props = defineProps<{
image: File; image: File;
@ -99,7 +99,7 @@ function addEffect(ev: MouseEvent) {
text: fx.name, text: fx.name,
action: () => { action: () => {
layers.push({ layers.push({
id: uuid(), id: genId(),
fxId: fx.id, fxId: fx.id,
params: Object.fromEntries(Object.entries(fx.params).map(([k, v]) => [k, v.default])), params: Object.fromEntries(Object.entries(fx.params).map(([k, v]) => [k, v.default])),
}); });

1
packages/frontend/src/components/MkWatermarkEditorDialog.Layer.vue
View File

@ -90,7 +90,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<script setup lang="ts"> <script setup lang="ts">
import { ref, useTemplateRef, watch, onMounted, onUnmounted } from 'vue'; import { ref, useTemplateRef, watch, onMounted, onUnmounted } from 'vue';
import { v4 as uuid } from 'uuid';
import type { ImageEffectorLayer } from '@/utility/image-effector/ImageEffector.js'; import type { ImageEffectorLayer } from '@/utility/image-effector/ImageEffector.js';
import type { WatermarkPreset } from '@/utility/watermark.js'; import type { WatermarkPreset } from '@/utility/watermark.js';
import { i18n } from '@/i18n.js'; import { i18n } from '@/i18n.js';

8
packages/frontend/src/components/MkWatermarkEditorDialog.vue
View File

@ -71,7 +71,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<script setup lang="ts"> <script setup lang="ts">
import { ref, useTemplateRef, watch, onMounted, onUnmounted, reactive, nextTick } from 'vue'; import { ref, useTemplateRef, watch, onMounted, onUnmounted, reactive, nextTick } from 'vue';
import { v4 as uuid } from 'uuid';
import type { WatermarkPreset } from '@/utility/watermark.js'; import type { WatermarkPreset } from '@/utility/watermark.js';
import { WatermarkRenderer } from '@/utility/watermark.js'; import { WatermarkRenderer } from '@/utility/watermark.js';
import { i18n } from '@/i18n.js'; import { i18n } from '@/i18n.js';
@ -83,12 +82,13 @@ import XLayer from '@/components/MkWatermarkEditorDialog.Layer.vue';
import * as os from '@/os.js'; import * as os from '@/os.js';
import { deepClone } from '@/utility/clone.js'; import { deepClone } from '@/utility/clone.js';
import { ensureSignin } from '@/i.js'; import { ensureSignin } from '@/i.js';
import { genId } from '@/utility/id.js';
const $i = ensureSignin(); const $i = ensureSignin();
function createTextLayer(): WatermarkPreset['layers'][number] { function createTextLayer(): WatermarkPreset['layers'][number] {
return { return {
id: uuid(), id: genId(),
type: 'text', type: 'text',
text: `(c) @${$i.username}`, text: `(c) @${$i.username}`,
align: { x: 'right', y: 'bottom' }, align: { x: 'right', y: 'bottom' },
@ -100,7 +100,7 @@ function createTextLayer(): WatermarkPreset['layers'][number] {
function createImageLayer(): WatermarkPreset['layers'][number] { function createImageLayer(): WatermarkPreset['layers'][number] {
return { return {
id: uuid(), id: genId(),
type: 'image', type: 'image',
imageId: null, imageId: null,
imageUrl: null, imageUrl: null,
@ -118,7 +118,7 @@ const props = defineProps<{
}>(); }>();
const preset = reactive<WatermarkPreset>(deepClone(props.preset) ?? { const preset = reactive<WatermarkPreset>(deepClone(props.preset) ?? {
id: uuid(), id: genId(),
name: '', name: '',
layers: [createTextLayer()], layers: [createTextLayer()],
}); });