mirror of
https://github.com/paricafe/misskey.git
synced 2024-12-12 14:46:44 -06:00
a6a91fec3a
* add: safeFloatParserを追加 * fix: 欠けていた型を追加 * refactor: pageBlockTypesをjson-schemaに移植 * refactor: components/global内の型エラーが出ている箇所を修正 * lint: fix null check style * refactor: fix type error * refactor: fix some type errors * fix: 翻訳が抜けていた箇所を修正 * refactor: getJsonSchemaで正しいスキーマが返されるように修正 * fix: MkChartの型エラーとbytesオプションが機能していない問題を修正 * fix(misskey-js): `drive`->`folderUpdated`のpayloadの型が間違っていたのを修正 * refactor: fix some type errors * change: Captcha読み込み中の文言をLoadingに変更 * refactor(backend/misskey-js): MainEventの型を改善 * refactor: chartjs-plugin-gradientが二重でpluginに登録されていたのを修正 * update: misskey-js.api.md * refactor: fix some type errors * fix: backendのtypecheckが落ちていたのを修正 * update: misskey-js.api.md * add: json-schemaのnoteにpollの型定義を追加 * refactor: noteのjson-schemaの型を改善 * refactor: MkPoll * refactor: fix some type errors * change: UserLiteにisLockedを持たせるように * fix: notificationスキーマにroleが含まれていないのを修正 * Revert "change: UserLiteにisLockedを持たせるように" This reverts commit 1bb0c8e7a9b19a4e9f21bf7381712b98f27672a5. * fix: フォロー通知から鍵垢へのフォローを行うと処理中のまま止まってしまう問題を修正 * refactor: noteスキーマのvisibilityにenumを追加 * change: deepCloneのCloneableTypeにundefinedを追加 * refactor: fix some type errors * refactor: `allowEmpty: false`を使用していた箇所を`minLength: 1`に置き換え * enhance: API 'retension' のresponseの型を追加 * fix: Chart関連のtooltipが正しい位置に表示されない問題を修正 * refactor: fix some type errors * fix: 型情報が不足していたのを修正 * enhance: announcementスキーマにenumを追加 * enhance: ロールポリシーの型定義をRoleServiceからjson-schemaに移植 * refactor: policiesを`ref: RolePolicies`に統一 * fix: API `meta` のレスポンスの型にpoliciesが含まれていないのを修正 * refactor: fix some type errors * fix: backendのlintが落ちているのを修正 * fix: MkFoldableSectionの開閉時のanimationが適用されていない問題を修正 * fix: backendのtypecheckが落ちているのを修正 * update: run build-misskey-js-with-types * fix: MkDialogのmount時に文字数制限の判定が行われない問題を修正 * update: CHANGELOG.md * refactor: MkUserSelectDialogの型を改善 * fix: deepCloneでundefinedはcloneしないように (#9207) * change: frontendのcloneをbackend側にも反映 * update: CHANGELOG.md * fix: RoleServiceからPackを通して型RolePoliciesに依存させないように * Update packages/frontend/src/scripts/get-note-summary.ts * revert RoleService.ts changes * change: optional chaining -> non-null assertion * remove: unused import * fix: propsで渡されたuserがUserLiteの場合に意図しない動作になってしまうのを修正 * change: fix null check style * refactor: fix type error * change: fix null check style * Update packages/frontend/src/components/MkDrive.vue Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * refactor: css moduleでglobalを使わないように * refactor: roleのiconUrlは必ず存在するものとして扱うように * enhance: MenuButtonのactiveにcomputedを受け付けられるように * Update packages/frontend/src/components/MkNotePreview.vue * Update MkWindow.vue * refactor: notification.noteは必ず存在するものとして扱うように * Update packages/frontend/src/components/MkNotification.vue Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * fix: MkSignupDialogでdoneのemit時にresを含んでいなかったのを修正 * Update packages/frontend/src/scripts/clone.ts Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * refactor: 不要な返り値の型を削除 * refactor: 不要なnullチェックを削除 * update: misskey-js-autogen * update: clone.ts * refactor * Update MkNotification.vue * Update MkNotification.vue * ✌️ * Update MkNotification.vue * Update MkNotification.vue * Update MkNotification.vue * Update MkNotifications.vue * Update MkUserSetupDialog.Profile.vue * Update MkUserCardMini.vue * ✌️ * Update MkMenu.vue --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
219 lines
5.1 KiB
Vue
219 lines
5.1 KiB
Vue
<!--
|
|
SPDX-FileCopyrightText: syuilo and other misskey contributors
|
|
SPDX-License-Identifier: AGPL-3.0-only
|
|
-->
|
|
|
|
<template>
|
|
<div v-show="props.modelValue.length != 0" :class="$style.root">
|
|
<Sortable :modelValue="props.modelValue" :class="$style.files" itemKey="id" :animation="150" :delay="100" :delayOnTouchOnly="true" @update:modelValue="v => emit('update:modelValue', v)">
|
|
<template #item="{element}">
|
|
<div :class="$style.file" @click="showFileMenu(element, $event)" @contextmenu.prevent="showFileMenu(element, $event)">
|
|
<MkDriveFileThumbnail :data-id="element.id" :class="$style.thumbnail" :file="element" fit="cover"/>
|
|
<div v-if="element.isSensitive" :class="$style.sensitive">
|
|
<i class="ti ti-eye-exclamation" style="margin: auto;"></i>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</Sortable>
|
|
<p :class="$style.remain">{{ 16 - props.modelValue.length }}/16</p>
|
|
</div>
|
|
</template>
|
|
|
|
<script lang="ts" setup>
|
|
import { defineAsyncComponent, inject } from 'vue';
|
|
import * as Misskey from 'misskey-js';
|
|
import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue';
|
|
import * as os from '@/os.js';
|
|
import { misskeyApi } from '@/scripts/misskey-api.js';
|
|
import { i18n } from '@/i18n.js';
|
|
|
|
const Sortable = defineAsyncComponent(() => import('vuedraggable').then(x => x.default));
|
|
|
|
const props = defineProps<{
|
|
modelValue: any[];
|
|
detachMediaFn?: (id: string) => void;
|
|
}>();
|
|
|
|
const mock = inject<boolean>('mock', false);
|
|
|
|
const emit = defineEmits<{
|
|
(ev: 'update:modelValue', value: any[]): void;
|
|
(ev: 'detach', id: string): void;
|
|
(ev: 'changeSensitive', file: Misskey.entities.DriveFile, isSensitive: boolean): void;
|
|
(ev: 'changeName', file: Misskey.entities.DriveFile, newName: string): void;
|
|
(ev: 'replaceFile', file: Misskey.entities.DriveFile, newFile: Misskey.entities.DriveFile): void;
|
|
}>();
|
|
|
|
let menuShowing = false;
|
|
|
|
function detachMedia(id: string) {
|
|
if (mock) return;
|
|
|
|
if (props.detachMediaFn) {
|
|
props.detachMediaFn(id);
|
|
} else {
|
|
emit('detach', id);
|
|
}
|
|
}
|
|
|
|
async function detachAndDeleteMedia(file: Misskey.entities.DriveFile) {
|
|
if (mock) return;
|
|
|
|
detachMedia(file.id);
|
|
|
|
const { canceled } = await os.confirm({
|
|
type: 'warning',
|
|
text: i18n.t('driveFileDeleteConfirm', { name: file.name }),
|
|
});
|
|
|
|
if (canceled) return;
|
|
|
|
os.apiWithDialog('drive/files/delete', {
|
|
fileId: file.id,
|
|
});
|
|
}
|
|
|
|
function toggleSensitive(file) {
|
|
if (mock) {
|
|
emit('changeSensitive', file, !file.isSensitive);
|
|
return;
|
|
}
|
|
|
|
misskeyApi('drive/files/update', {
|
|
fileId: file.id,
|
|
isSensitive: !file.isSensitive,
|
|
}).then(() => {
|
|
emit('changeSensitive', file, !file.isSensitive);
|
|
});
|
|
}
|
|
|
|
async function rename(file) {
|
|
if (mock) return;
|
|
|
|
const { canceled, result } = await os.inputText({
|
|
title: i18n.ts.enterFileName,
|
|
default: file.name,
|
|
minLength: 1,
|
|
});
|
|
if (canceled) return;
|
|
misskeyApi('drive/files/update', {
|
|
fileId: file.id,
|
|
name: result,
|
|
}).then(() => {
|
|
emit('changeName', file, result);
|
|
file.name = result;
|
|
});
|
|
}
|
|
|
|
async function describe(file) {
|
|
if (mock) return;
|
|
|
|
os.popup(defineAsyncComponent(() => import('@/components/MkFileCaptionEditWindow.vue')), {
|
|
default: file.comment !== null ? file.comment : '',
|
|
file: file,
|
|
}, {
|
|
done: caption => {
|
|
let comment = caption.length === 0 ? null : caption;
|
|
misskeyApi('drive/files/update', {
|
|
fileId: file.id,
|
|
comment: comment,
|
|
}).then(() => {
|
|
file.comment = comment;
|
|
});
|
|
},
|
|
}, 'closed');
|
|
}
|
|
|
|
async function crop(file: Misskey.entities.DriveFile): Promise<void> {
|
|
if (mock) return;
|
|
|
|
const newFile = await os.cropImage(file, { aspectRatio: NaN });
|
|
emit('replaceFile', file, newFile);
|
|
}
|
|
|
|
function showFileMenu(file: Misskey.entities.DriveFile, ev: MouseEvent): void {
|
|
if (menuShowing) return;
|
|
|
|
const isImage = file.type.startsWith('image/');
|
|
os.popupMenu([{
|
|
text: i18n.ts.renameFile,
|
|
icon: 'ti ti-forms',
|
|
action: () => { rename(file); },
|
|
}, {
|
|
text: file.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive,
|
|
icon: file.isSensitive ? 'ti ti-eye-exclamation' : 'ti ti-eye',
|
|
action: () => { toggleSensitive(file); },
|
|
}, {
|
|
text: i18n.ts.describeFile,
|
|
icon: 'ti ti-text-caption',
|
|
action: () => { describe(file); },
|
|
}, ...isImage ? [{
|
|
text: i18n.ts.cropImage,
|
|
icon: 'ti ti-crop',
|
|
action: () : void => { crop(file); },
|
|
}] : [], {
|
|
text: i18n.ts.attachCancel,
|
|
icon: 'ti ti-circle-x',
|
|
action: () => { detachMedia(file.id); },
|
|
}, {
|
|
type: 'divider',
|
|
}, {
|
|
text: i18n.ts.deleteFile,
|
|
icon: 'ti ti-trash',
|
|
danger: true,
|
|
action: () => { detachAndDeleteMedia(file); },
|
|
}], ev.currentTarget ?? ev.target).then(() => menuShowing = false);
|
|
menuShowing = true;
|
|
}
|
|
</script>
|
|
|
|
<style lang="scss" module>
|
|
.root {
|
|
padding: 8px 16px;
|
|
position: relative;
|
|
}
|
|
|
|
.files {
|
|
display: flex;
|
|
flex-wrap: wrap;
|
|
}
|
|
|
|
.file {
|
|
position: relative;
|
|
width: 64px;
|
|
height: 64px;
|
|
margin-right: 4px;
|
|
border-radius: 4px;
|
|
overflow: hidden;
|
|
cursor: move;
|
|
}
|
|
|
|
.thumbnail {
|
|
width: 100%;
|
|
height: 100%;
|
|
z-index: 1;
|
|
color: var(--fg);
|
|
}
|
|
|
|
.sensitive {
|
|
display: flex;
|
|
position: absolute;
|
|
width: 64px;
|
|
height: 64px;
|
|
top: 0;
|
|
left: 0;
|
|
z-index: 2;
|
|
background: rgba(17, 17, 17, .7);
|
|
color: #fff;
|
|
}
|
|
|
|
.remain {
|
|
display: block;
|
|
position: absolute;
|
|
top: 8px;
|
|
right: 8px;
|
|
margin: 0;
|
|
padding: 0;
|
|
font-size: 90%;
|
|
}
|
|
</style>
|