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-05-13 17:30:56 +09:00
parent 7c065584a1
commit edeeca8b5f
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/frontend/src/components/MkCropperDialog.vue
View File

@ -38,7 +38,7 @@ import * as os from '@/os.js';
import { i18n } from '@/i18n.js';
const props = defineProps<{
imageFile: File;
imageFile: File | Blob;
aspectRatio: number;
uploadFolder?: string | null;
}>();

19
packages/frontend/src/os.ts
View File

@ -9,6 +9,7 @@ import { markRaw, ref, defineAsyncComponent, nextTick } from 'vue';
import { EventEmitter } from 'eventemitter3';
import * as Misskey from 'misskey-js';
import { getProxiedImageUrl } from './utility/media-proxy.js';
import { uploadFile } from './utility/upload.js';
import type { Component, Ref } from 'vue';
import type { ComponentProps as CP } from 'vue-component-type-helpers';
import type { Form, GetFormResultType } from '@/utility/form.js';
@ -654,7 +655,7 @@ export async function pickEmoji(src: HTMLElement, opts: ComponentProps<typeof Mk
});
}
export async function cropImageFile(imageFile: File, options: {
export async function cropImageFile(imageFile: File | Blob, options: {
aspectRatio: number;
}): Promise<File> {
return new Promise(resolve => {
@ -672,7 +673,6 @@ export async function cropImageFile(imageFile: File, options: {
export async function createCroppedImageDriveFileFromImageDriveFile(imageDriveFile: Misskey.entities.DriveFile, options: {
aspectRatio: number;
uploadFolder?: string | null;
}): Promise<Misskey.entities.DriveFile> {
return new Promise(resolve => {
const imgUrl = getProxiedImageUrl(imageDriveFile.url, undefined, true);
@ -684,10 +684,17 @@ export async function createCroppedImageDriveFileFromImageDriveFile(imageDriveFi
canvas.width = image.width;
canvas.height = image.height;
ctx.drawImage(image, 0, 0);
const imageFile = new File([canvas.toBlob()], imageDriveFile.name, { type: imageDriveFile.type });
cropImageFile(imageFile).then(croppedImageFile => {
canvas.toBlob(blob => {
cropImageFile(blob, {
aspectRatio: options.aspectRatio,
}).then(croppedImageFile => {
uploadFile(croppedImageFile, {
name: imageDriveFile.name,
folderId: imageDriveFile.folderId,
}).then(driveFile => {
resolve(driveFile);
});
});
});
};
});