From 76670112667ae19ce5a76a09480211a972db6358 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: Fri, 4 Jul 2025 18:49:21 +0900
Subject: [PATCH 1/3] =?UTF-8?q?fix(frontend):=20=E3=82=A6=E3=82=A7?=
=?UTF-8?q?=E3=83=AB=E3=82=AB=E3=83=A0=E3=82=BF=E3=82=A4=E3=83=A0=E3=83=A9?=
=?UTF-8?q?=E3=82=A4=E3=83=B3=E3=81=AE=E3=83=A1=E3=83=87=E3=82=A3=E3=82=A2?=
=?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=8CCW=E3=82=92=E8=80=83=E6=85=AE?=
=?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?=
=?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20(#16247)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix(frontend): ウェルカムタイムラインのメディア表示がCWを考慮していない問題を修正
* Update Changelog
---
CHANGELOG.md | 1 +
packages/frontend/src/pages/welcome.timeline.note.vue | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90c4ce48a6..8e3c9dfc77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
- Fix: ファイルがドライブの既定アップロード先に指定したフォルダにアップロードされない問題を修正
- Fix: プラグインをアンインストールしてもセーブデータが残る問題を修正
- Fix: 数時間後Misskeyのタブに戻った際に、タブがスロットリングされている間の更新アニメーションを延々見せ続けられる問題を修正
+- Fix: 非ログイン時のハイライトノートの画像がCWの有無を考慮せず表示される問題を修正
### Server
- Enhance: sinceId/untilIdが指定可能なエンドポイントにおいて、sinceDate/untilDateも指定可能に
diff --git a/packages/frontend/src/pages/welcome.timeline.note.vue b/packages/frontend/src/pages/welcome.timeline.note.vue
index 4dff76901f..c119f4cf05 100644
--- a/packages/frontend/src/pages/welcome.timeline.note.vue
+++ b/packages/frontend/src/pages/welcome.timeline.note.vue
@@ -20,7 +20,7 @@ SPDX-License-Identifier: AGPL-3.0-only
RN: ...
-
+
From 6d1018f42b13001f7d3fa3d52166dce570a68063 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
Date: Fri, 4 Jul 2025 09:52:01 +0000
Subject: [PATCH 2/3] Bump version to 2025.7.0-beta.0
---
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 0a9d1e0d86..8e4a28b2e3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "misskey",
- "version": "2025.7.0-alpha.0",
+ "version": "2025.7.0-beta.0",
"codename": "nasubi",
"repository": {
"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 7b2078837a..8042c7088c 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
{
"type": "module",
"name": "misskey-js",
- "version": "2025.7.0-alpha.0",
+ "version": "2025.7.0-beta.0",
"description": "Misskey SDK for JavaScript",
"license": "MIT",
"main": "./built/index.js",
From bf17092b41164e293ab8f2912a3a80a6d316bf0f Mon Sep 17 00:00:00 2001
From: tamaina
Date: Sat, 5 Jul 2025 08:18:15 +0900
Subject: [PATCH 3/3] =?UTF-8?q?test:=20VS=20Code=E4=B8=8A=E3=81=A7?=
=?UTF-8?q?=E8=A4=87=E6=95=B0=E3=81=AEjest=E3=83=86=E3=82=B9=E3=83=88?=
=?UTF-8?q?=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?=
=?UTF-8?q?=E3=81=86=E3=81=AB=20(#16251)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.vscode/settings.json | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0ceec23acd..5f36a32af4 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,8 +6,12 @@
"files.associations": {
"*.test.ts": "typescript"
},
- "jest.jestCommandLine": "pnpm run jest",
"jest.runMode": "on-demand",
+ "jest.virtualFolders": [
+ { "name": "backend unit", "jestCommandLine": "pnpm -F backend run test" },
+ { "name": "backend e2e", "jestCommandLine": "pnpm -F backend run test:e2e"},
+ { "name": "misskey-js", "jestCommandLine": "pnpm -F misskey-js run jest" }
+ ],
"editor.codeActionsOnSave": {
"source.fixAll": "explicit"
},