Merge pull request #15615 from misskey-dev/develop

Release: 2025.3.1
2025-03-09 03:29:58 +00:00 · 2025-03-09 03:29:54 +00:00 · 2025-03-09 00:33:40 +00:00 · 2025-03-09 00:11:34 +00:00 · 2025-03-08 10:15:42 +00:00 · 2025-03-08 19:11:09 +09:00
10 changed files with 66 additions and 5 deletions
--- a/.npmrc
+++ b/.npmrc
@@ -1,2 +1,3 @@
 engine-strict = true
 save-exact = true
+shell-emulator = true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@

 ### Server
 - Fix: DBマイグレーション際にシステムアカウントのユーザーID判定が正しくない問題を修正
+- Fix: user.featured列が状況によってJSON文字列になっていたのを修正


 ## 2025.3.0
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.3.1-beta.1",
+	"version": "2025.3.1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
@@ -82,6 +82,9 @@
 	"pnpm": {
 		"overrides": {
 			"@aiscript-dev/aiscript-languageserver": "-"
+		},
+		"patchedDependencies": {
+			"re2": "scripts/dependency-patches/re2.patch"
 		}
 	}
 }
--- a/packages/backend/migration/1741424411879-user-featured-fixup.js
+++ b/packages/backend/migration/1741424411879-user-featured-fixup.js
@@ -0,0 +1,26 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class UserFeaturedFixup1741424411879 {
+    name = 'UserFeaturedFixup1741424411879'
+
+    async up(queryRunner) {
+        await queryRunner.query(`CREATE OR REPLACE FUNCTION pg_temp.extract_ap_id(text) RETURNS text AS $$
+            SELECT
+                CASE
+                    WHEN $1 ~ '^https?://' THEN $1
+                    WHEN $1 LIKE '{%' THEN COALESCE(jsonb_extract_path_text($1::jsonb, 'id'), null)
+                    ELSE null
+                END;
+        $$ LANGUAGE sql IMMUTABLE;`);
+
+        // "host" is NOT NULL is not needed but just in case add it to prevent overwriting irreplaceable data
+        await queryRunner.query(`UPDATE "user" SET "featured" = pg_temp.extract_ap_id("featured") WHERE "host" IS NOT NULL`);
+    }
+
+    async down(queryRunner) {
+        // fixup migration, no down migration
+    }
+}
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -560,7 +560,7 @@ export class ApPersonService implements OnModuleInit {
 			inbox: person.inbox,
 			sharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox ?? null,
 			followersUri: person.followers ? getApId(person.followers) : undefined,
-			featured: person.featured,
+			featured: person.featured ? getApId(person.featured) : undefined,
 			emojis: emojiNames,
 			name: truncate(person.name, nameLength),
 			tags,
--- a/packages/backend/test-federation/compose.tpl.yml
+++ b/packages/backend/test-federation/compose.tpl.yml
@@ -74,6 +74,10 @@ services:
        source: ../../../pnpm-workspace.yaml
        target: /misskey/pnpm-workspace.yaml
        read_only: true
+      - type: bind
+        source: ../../../scripts/dependency-patches
+        target: /misskey/scripts/dependency-patches
+        read_only: true
      - type: bind
        source: ./certificates/rootCA.crt
        target: /usr/local/share/ca-certificates/rootCA.crt
--- a/packages/backend/test-federation/compose.yml
+++ b/packages/backend/test-federation/compose.yml
@@ -70,6 +70,10 @@ services:
        source: ../../../pnpm-workspace.yaml
        target: /misskey/pnpm-workspace.yaml
        read_only: true
+      - type: bind
+        source: ../../../scripts/dependency-patches
+        target: /misskey/scripts/dependency-patches
+        read_only: true
      - type: bind
        source: ./certificates/rootCA.crt
        target: /usr/local/share/ca-certificates/rootCA.crt
@@ -114,6 +118,10 @@ services:
        source: ../../../pnpm-workspace.yaml
        target: /misskey/pnpm-workspace.yaml
        read_only: true
+      - type: bind
+        source: ../../../scripts/dependency-patches
+        target: /misskey/scripts/dependency-patches
+        read_only: true
    working_dir: /misskey
    command: >
      bash -c "
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.3.1-beta.1",
+	"version": "2025.3.1",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,6 +9,11 @@ overrides:
  lodash: 4.17.21
  '@aiscript-dev/aiscript-languageserver': '-'

+patchedDependencies:
+  re2:
+    hash: 018babd22b7ce951bcd10d6246f1e541a7ac7ba212f7fa8985e774ece67d08e1
+    path: scripts/dependency-patches/re2.patch
+
 importers:

  .:
@@ -371,7 +376,7 @@ importers:
        version: 3.4.1
      re2:
        specifier: 1.21.4
-        version: 1.21.4
+        version: 1.21.4(patch_hash=018babd22b7ce951bcd10d6246f1e541a7ac7ba212f7fa8985e774ece67d08e1)
      redis-lock:
        specifier: 0.1.4
        version: 0.1.4
@@ -20379,7 +20384,7 @@ snapshots:
    dependencies:
      setimmediate: 1.0.5

-  re2@1.21.4:
+  re2@1.21.4(patch_hash=018babd22b7ce951bcd10d6246f1e541a7ac7ba212f7fa8985e774ece67d08e1):
    dependencies:
      install-artifact-from-github: 1.3.5
      nan: 2.20.0
--- a/scripts/dependency-patches/re2.patch
+++ b/scripts/dependency-patches/re2.patch
@@ -0,0 +1,13 @@
+diff --git a/package.json b/package.json
+index a56ab59ef647288ee6028abd2b1780eaa92ebc9d..ec2c43e63f3134b6d54d616b2ef715447f873bbe 100644
+--- a/package.json
+++ b/package.json
+@@ -28,7 +28,7 @@
+     "test": "node tests/tests.js",
+     "ts-test": "tsc",
+     "save-to-github": "save-to-github-cache --artifact build/Release/re2.node",
+-    "install": "install-from-cache --artifact build/Release/re2.node --host-var RE2_DOWNLOAD_MIRROR --skip-path-var RE2_DOWNLOAD_SKIP_PATH --skip-ver-var RE2_DOWNLOAD_SKIP_VER || node-gyp -j max rebuild",
+    "install": "npm_package_github=https://github.com/uhop/node-re2 npm_package_scripts_verify_build=true install-from-cache --artifact build/Release/re2.node --host-var RE2_DOWNLOAD_MIRROR --skip-path-var RE2_DOWNLOAD_SKIP_PATH --skip-ver-var RE2_DOWNLOAD_SKIP_VER || node-gyp -j max rebuild",
+     "verify-build": "node scripts/verify-build.js",
+     "build:dev": "node-gyp -j max build --debug",
+     "build": "node-gyp -j max build",
Author	SHA1	Message	Date
misskey-release-bot[bot]	bef73ff530	Merge pull request #15615 from misskey-dev/develop Release: 2025.3.1	2025-03-09 03:29:58 +00:00
github-actions[bot]	7c1dc3d632	Release: 2025.3.1	2025-03-09 03:29:54 +00:00
github-actions[bot]	c53349c3b4	Bump version to 2025.3.1-beta.3	2025-03-09 00:33:40 +00:00
饺子w (Yumechi)	a710af54ed	fix(backend): fix ApPersonService unsound type cast (#15629 ) Signed-off-by: eternal-flame-AD <yume@yumechi.jp>	2025-03-09 00:11:34 +00:00
github-actions[bot]	ac07bb8d92	Bump version to 2025.3.1-beta.2	2025-03-08 10:15:42 +00:00
かっこかり	698505030e	fix(test): fix federation test (#15630 )	2025-03-08 19:11:09 +09:00
かっこかり	e16a14dcef	fix(deps): pnpm v10でre2のインストールに失敗することがある問題を修正 (#15627 ) * fix(deps): pnpm v10でre2のインストールに失敗することがある問題を修正 * fix * fix docker build * fix build failure on Windows	2025-03-08 18:56:53 +09:00
misskey-release-bot[bot]	4d31c0b1de	Merge pull request #15585 from misskey-dev/develop Release: 2025.3.0	2025-03-06 10:31:34 +00:00
misskey-release-bot[bot]	a5f28c21e4	Merge pull request #15507 from misskey-dev/develop Release: 2025.2.1	2025-02-27 08:58:43 +00:00
misskey-release-bot[bot]	c93ead7474	Merge pull request #15378 from misskey-dev/develop Release: 2025.2.0	2025-02-05 08:58:45 +00:00
misskey-release-bot[bot]	36880493cb	Merge pull request #15279 from misskey-dev/develop Release: 2025.1.0	2025-01-28 12:29:14 +00:00
misskey-release-bot[bot]	e8518de054	Merge pull request #14924 from misskey-dev/develop Release: 2024.11.0	2024-11-22 09:15:34 +00:00
misskey-release-bot[bot]	b99e13e667	Merge pull request #14741 from misskey-dev/develop Release: 2024.10.1	2024-10-15 04:53:46 +00:00
misskey-release-bot[bot]	2518cf36d0	Merge pull request #14675 from misskey-dev/develop Release: 2024.10.0	2024-10-09 05:17:29 +00:00