From 794f360bc22a92746e14736fffa83e55962f0f49 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 10 Mar 2025 09:40:41 +0000
Subject: [PATCH 1/2] Bump version to 2025.3.2-alpha.5
---
package.json | 2 +-
packages/misskey-js/package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index ff891ab9a4..70ff19ad4d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "misskey",
- "version": "2025.3.2-alpha.4",
+ "version": "2025.3.2-alpha.5",
"codename": "nasubi",
"repository": {
"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index d98d2f3ed1..0ca8b36732 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
{
"type": "module",
"name": "misskey-js",
- "version": "2025.3.2-alpha.4",
+ "version": "2025.3.2-alpha.5",
"description": "Misskey SDK for JavaScript",
"license": "MIT",
"main": "./built/index.js",
From 6841cdfa76f1c18041c766247b61ba2f47f2dfec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?=
<66072112+r-ca@users.noreply.github.com>
Date: Mon, 10 Mar 2025 19:35:37 +0900
Subject: [PATCH 2/2] =?UTF-8?q?enhance(frontend):=20CW=E3=81=AE=E6=B3=A8?=
=?UTF-8?q?=E9=87=88=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=81=8C=E5=85=A5?=
=?UTF-8?q?=E5=8A=9B=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84?=
=?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=AFPost=E3=83=9C=E3=82=BF=E3=83=B3?=
=?UTF-8?q?=E3=82=92=E9=9D=9E=E3=82=A2=E3=82=AF=E3=83=86=E3=82=A3=E3=83=96?=
=?UTF-8?q?=E3=81=AB=20(#15639)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* add condition to disable post button when CW text is empty
* standardize condition by using 1<= inserted of 0<
* unify CW text length condition to improve readability
* add missing CW state check
* fix state check, add empty/null check, improve max length validation
* simplify CW validation by removing minimum length check
* Update CHANGELOG
* remove CW text validation in post()
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
CHANGELOG.md | 2 ++
packages/frontend/src/components/MkPostForm.vue | 16 +++++++---------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e3215dc6c..748f3aa8eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@
- Feat: 設定の管理が強化されました
- 自動でバックアップされるように
- Enhance: プラグインの管理が強化されました
+- Enhance: CWの注釈テキストが入力されていない場合, Postボタンを非アクティブに
+- Enhance: CWを無効にした場合, 注釈テキストが最大入力文字数を超えていても投稿できるように
- Enhance: テーマ設定画面のデザインを改善
- Fix: テーマ切り替え時に一部の色が変わらない問題を修正
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 6a72663157..5e379d08b7 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -265,7 +265,13 @@ const canPost = computed((): boolean => {
quoteId.value != null
) &&
(textLength.value <= maxTextLength.value) &&
- (cwTextLength.value <= maxCwTextLength) &&
+ (
+ useCw.value ?
+ (
+ cw.value != null && cw.value.trim() !== '' &&
+ cwTextLength.value <= maxCwTextLength
+ ) : true
+ ) &&
(files.value.length <= 16) &&
(!poll.value || poll.value.choices.length >= 2);
});
@@ -744,14 +750,6 @@ function isAnnoying(text: string): boolean {
}
async function post(ev?: MouseEvent) {
- if (useCw.value && (cw.value == null || cw.value.trim() === '')) {
- os.alert({
- type: 'error',
- text: i18n.ts.cwNotationRequired,
- });
- return;
- }
-
if (ev) {
const el = (ev.currentTarget ?? ev.target) as HTMLElement | null;