From 10a7a036a26954f5bdd7bd2e2a715639ac7b6b9b Mon Sep 17 00:00:00 2001 From: yukineko <27853966+hideki0403@users.noreply.github.com> Date: Mon, 20 Nov 2023 17:48:52 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E3=83=87=E3=82=B3=E3=83=AC?= =?UTF-8?q?=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=9A=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=81=8B=E3=82=89=E7=9B=B4=E6=8E=A5=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=82=92=E3=82=A2=E3=83=83=E3=83=97=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=81=8A=E3=82=88=E3=81=B3=E8=A8=AD=E5=AE=9A=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/pages/avatar-decorations.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/pages/avatar-decorations.vue b/packages/frontend/src/pages/avatar-decorations.vue index 715f2344932f..291b1c8d40dc 100644 --- a/packages/frontend/src/pages/avatar-decorations.vue +++ b/packages/frontend/src/pages/avatar-decorations.vue @@ -13,6 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+ {{ i18n.ts.selectFile }} @@ -38,9 +39,7 @@ import { } from 'vue'; import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/MkInput.vue'; import MkTextarea from '@/components/MkTextarea.vue'; -import MkSwitch from '@/components/MkSwitch.vue'; -import MkRadios from '@/components/MkRadios.vue'; -import MkInfo from '@/components/MkInfo.vue'; +import { selectFile } from '@/scripts/select-file.js'; import * as os from '@/os.js'; import { i18n } from '@/i18n.js'; import { definePageMetadata } from '@/scripts/page-metadata.js'; @@ -48,6 +47,13 @@ import MkFolder from '@/components/MkFolder.vue'; let avatarDecorations: any[] = $ref([]); +async function selectImage(decoration, ev) { + const file = await selectFile(ev.currentTarget ?? ev.target, null); + const candidate = file.name.replace(/\.(.+)$/, ''); + decoration.name = candidate; + decoration.url = file.url; +} + function add() { avatarDecorations.unshift({ _id: Math.random().toString(36), From 1c1259493d3b7f1413067e210851b147e9f56bf4 Mon Sep 17 00:00:00 2001 From: yukineko <27853966+hideki0403@users.noreply.github.com> Date: Mon, 20 Nov 2023 18:03:05 +0900 Subject: [PATCH 2/3] update: CHANGELOG.md --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bdbb2aade36..3c364ef98825 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,8 @@ - Feat: モデレーターがユーザーのアイコンもしくはバナー画像を未設定状態にできる機能を追加 (cherry-pick from https://github.com/TeamNijimiss/misskey/commit/e0eb5a752f6e5616d6312bb7c9790302f9dbff83) ### Client -- fix: 「設定のバックアップ」で一部の項目がバックアップに含まれていなかった問題を修正 +- Feat: コントロールパネルのアイコンデコレーションページから直接ファイルをアップロードおよび設定できるように +- Fix: 「設定のバックアップ」で一部の項目がバックアップに含まれていなかった問題を修正 ### Server - From 625e1054db84591e7407985e06ebfaed159409f9 Mon Sep 17 00:00:00 2001 From: yukineko <27853966+hideki0403@users.noreply.github.com> Date: Mon, 20 Nov 2023 18:10:40 +0900 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=E4=B8=8D=E8=A6=81=E3=81=AA?= =?UTF-8?q?=E5=AE=9A=E7=BE=A9=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/pages/avatar-decorations.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/frontend/src/pages/avatar-decorations.vue b/packages/frontend/src/pages/avatar-decorations.vue index 291b1c8d40dc..046d74a7397b 100644 --- a/packages/frontend/src/pages/avatar-decorations.vue +++ b/packages/frontend/src/pages/avatar-decorations.vue @@ -49,8 +49,7 @@ let avatarDecorations: any[] = $ref([]); async function selectImage(decoration, ev) { const file = await selectFile(ev.currentTarget ?? ev.target, null); - const candidate = file.name.replace(/\.(.+)$/, ''); - decoration.name = candidate; + decoration.name = file.name.replace(/\.(.+)$/, ''); decoration.url = file.url; }