From 256560e8ba491d32dcae1cf00d1b7fefc40b4a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
<67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 4 Jan 2025 15:16:58 +0900
Subject: [PATCH 1/2] =?UTF-8?q?enhance(frontend/aiscript):=20=E3=82=BB?=
=?UTF-8?q?=E3=83=BC=E3=83=96=E5=86=85=E5=AE=B9=E3=82=92=E5=89=8A=E9=99=A4?=
=?UTF-8?q?=E3=81=A7=E3=81=8D=E3=82=8BMk:remove=E3=82=92=E8=BF=BD=E5=8A=A0?=
=?UTF-8?q?=20(#15158)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* enhance(frontend/aiscript): セーブ内容を削除できる`Mk:remove`を追加
* fix
* Update Changelog
---
CHANGELOG.md | 1 +
packages/frontend/src/scripts/aiscript/api.ts | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8231015a2a..057177a854 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
- Enhance: PC画面でチャンネルが複数列で表示されるように
(Cherry-picked from https://github.com/Otaku-Social/maniakey/pull/13)
- Enhance: 照会に失敗した場合、その理由を表示するように
+- Enhance: AiScriptのセーブデータを明示的に削除する関数`Mk:remove`を追加
- Fix: 画面サイズが変わった際にナビゲーションバーが自動で折りたたまれない問題を修正
- Fix: サーバー情報メニューに区切り線が不足していたのを修正
- Fix: ノートがログインしているユーザーしか見れない場合にログインダイアログを閉じるとその後の動線がなくなる問題を修正
diff --git a/packages/frontend/src/scripts/aiscript/api.ts b/packages/frontend/src/scripts/aiscript/api.ts
index 46aed49330..8afe88eec6 100644
--- a/packages/frontend/src/scripts/aiscript/api.ts
+++ b/packages/frontend/src/scripts/aiscript/api.ts
@@ -75,12 +75,18 @@ export function createAiScriptEnv(opts) {
*/
'Mk:save': values.FN_NATIVE(([key, value]) => {
utils.assertString(key);
+ utils.expectAny(value);
miLocalStorage.setItem(`aiscript:${opts.storageKey}:${key.value}`, JSON.stringify(utils.valToJs(value)));
return values.NULL;
}),
'Mk:load': values.FN_NATIVE(([key]) => {
utils.assertString(key);
- return utils.jsToVal(JSON.parse(miLocalStorage.getItem(`aiscript:${opts.storageKey}:${key.value}`)));
+ return utils.jsToVal(miLocalStorage.getItemAsJson(`aiscript:${opts.storageKey}:${key.value}`) ?? null);
+ }),
+ 'Mk:remove': values.FN_NATIVE(([key]) => {
+ utils.assertString(key);
+ miLocalStorage.removeItem(`aiscript:${opts.storageKey}:${key.value}`);
+ return values.NULL;
}),
'Mk:url': values.FN_NATIVE(() => {
return values.STR(window.location.href);
From 1fbc129d7ba0bffe3911baa085e274b7151b9561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
<67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 4 Jan 2025 15:24:25 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix(frontend):=20=E3=83=95=E3=82=A1?=
=?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=AE=E6=B7=BB=E4=BB=98=E5=8F=AF=E8=83=BD?=
=?UTF-8?q?=E6=95=B0=E3=82=92=E8=B6=85=E3=81=88=E3=81=9F=E3=82=89=E3=83=8E?=
=?UTF-8?q?=E3=83=BC=E3=83=88=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92=E6=8A=BC?=
=?UTF-8?q?=E3=81=9B=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=20(#1512?=
=?UTF-8?q?6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix(frontend): ファイルの添付可能数を超えたらノートボタンを押せないように
* Update Changelog
* Update MkPostForm.vue
---
CHANGELOG.md | 1 +
packages/frontend/src/components/MkPostForm.vue | 1 +
packages/frontend/src/components/MkPostFormAttaches.vue | 8 +++++++-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 057177a854..8a4576a76c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
- Fix: `Ui:C:select`で値の変更が画面に反映されない問題を修正
- Fix: MiAuth認可画面で、認可処理に失敗した場合でもコールバックURLに遷移してしまう問題を修正
(Cherry-picked from https://github.com/TeamNijimiss/misskey/commit/800359623e41a662551d774de15b0437b6849bb4)
+- Fix: ノート作成画面でファイルの添付可能個数を超えてもノートボタンが押せていた問題を修正
### Server
- Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 0b5794d1e3..ba988ee715 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -251,6 +251,7 @@ const canPost = computed((): boolean => {
quoteId.value != null
) &&
(textLength.value <= maxTextLength.value) &&
+ (files.value.length <= 16) &&
(!poll.value || poll.value.choices.length >= 2);
});
diff --git a/packages/frontend/src/components/MkPostFormAttaches.vue b/packages/frontend/src/components/MkPostFormAttaches.vue
index 56e026aa3c..1336b61356 100644
--- a/packages/frontend/src/components/MkPostFormAttaches.vue
+++ b/packages/frontend/src/components/MkPostFormAttaches.vue
@@ -22,7 +22,9 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ 16 - props.modelValue.length }}/16
+ {{ 16 - props.modelValue.length }}/16
@@ -239,5 +241,9 @@ function showFileMenu(file: Misskey.entities.DriveFile, ev: MouseEvent | Keyboar
margin: 0;
padding: 0;
font-size: 90%;
+
+ &.exceeded {
+ color: var(--MI_THEME-error);
+ }
}