Merge remote-branch 'misskey/develop'

kokonect-link · Nov 26, 2024 · 40d6613 · 40d6613
2 parents fb1c5cf + 8076f78
commit 40d6613
Show file tree

Hide file tree

Showing 13 changed files with 108 additions and 86 deletions.
diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
@@ -15,6 +15,8 @@ on:
 
 jobs:
   build:
+    # chromatic is not likely to be available for fork repositories, so we disable for fork repositories.
+    if: github.repository == 'kokonect-link/cherrypick'
     runs-on: ubuntu-latest
 
     env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## 2024.11.1
+
+### General
+-
+
+### Client
+- Fix: 画面サイズが変わった際にナビゲーションバーが自動で折りたたまれない問題を修正
+- Fix: サーバー情報メニューに区切り線が不足していたのを修正
+
+### Server
+- Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )
+- Fix: 起動前の疎通チェックが機能しなくなっていた問題を修正  
+  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/737)
+
+
 ## 2024.11.0
 
 ### Note
@@ -37,7 +52,7 @@
 - Fix: デッキのタイムラインカラムで「センシティブなファイルを含むノートを表示」設定が使用できなかった問題を修正
 - Fix: Encode RSS urls with escape sequences before fetching allowing query parameters to be used
 - Fix: リンク切れを修正
-= Fix: ノート投稿ボタンにホバー時のスタイルが適用されていないのを修正  
+- Fix: ノート投稿ボタンにホバー時のスタイルが適用されていないのを修正  
   (Cherry-picked from https://github.com/taiyme/misskey/pull/305)
 - Fix: メールアドレス登録有効化時の「完了」ダイアログボックスの表示条件を修正
 - Fix: 画面幅が狭い環境でデザインが崩れる問題を修正  

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "cherrypick",
 	"version": "4.14.0",
-	"basedMisskeyVersion": "2024.11.0",
+	"basedMisskeyVersion": "2024.11.1-alpha.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

diff --git a/packages/backend/scripts/check_connect.js b/packages/backend/scripts/check_connect.js
@@ -51,4 +51,4 @@ const promises = Array
 		connectToPostgres(),
 	]);
 
-await Promise.allSettled(promises);
+await Promise.all(promises);
diff --git a/packages/backend/src/core/S3Service.ts b/packages/backend/src/core/S3Service.ts
@@ -53,7 +53,7 @@ export class S3Service {
 			? `${ objectStorageUseSSL ? 'https' : 'http' }://${ objectStorageEndpoint }`
 			: `${ objectStorageUseSSL ? 'https' : 'http' }://example.com`; // dummy url to select http(s) agent
 
-		const agent = this.httpRequestService.getAgentByUrl(new URL(u), !objectStorageUseSSL);
+		const agent = this.httpRequestService.getAgentByUrl(new URL(u), !objectStorageUseSSL, true);
 		const handlerOption: NodeHttpHandlerOptions = {};
 		if (objectStorageUseSSL) {
 			handlerOption.httpsAgent = agent as https.Agent;

diff --git a/packages/backend/src/core/WebAuthnService.ts b/packages/backend/src/core/WebAuthnService.ts
@@ -189,14 +189,12 @@ export class WebAuthnService {
 	 */
 	@bindThis
 	public async verifySignInWithPasskeyAuthentication(context: string, response: AuthenticationResponseJSON): Promise<MiUser['id'] | null> {
-		const challenge = await this.redisClient.get(`webauthn:challenge:${context}`);
+		const challenge = await this.redisClient.getdel(`webauthn:challenge:${context}`);
 
 		if (!challenge) {
 			throw new IdentifiableError('2d16e51c-007b-4edd-afd2-f7dd02c947f6', `challenge '${context}' not found`);
 		}
 
-		await this.redisClient.del(`webauthn:challenge:${context}`);
-
 		const key = await this.userSecurityKeysRepository.findOneBy({
 			id: response.id,
 		});

diff --git a/packages/backend/src/server/api/openapi/gen-spec.ts b/packages/backend/src/server/api/openapi/gen-spec.ts
@@ -183,7 +183,7 @@ export function genOpenapiSpec(config: Config, includeSelfRef = false) {
 				},
 				...(endpoint.meta.limit ? {
 					'429': {
-						description: 'To many requests',
+						description: 'Too many requests',
 						content: {
 							'application/json': {
 								schema: {

diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts
@@ -594,7 +594,10 @@ export class ClientServerService {
 					reply.header('X-Robots-Tag', 'noai');
 				}
 
-				const _user = await this.userEntityService.pack(user);
+				const _user = await this.userEntityService.pack(user, null, {
+					schema: 'UserDetailed',
+					userProfile: profile,
+				});
 
 				return await reply.view('user', {
 					user, profile, me,

diff --git a/packages/cherrypick-js/package.json b/packages/cherrypick-js/package.json
@@ -2,7 +2,7 @@
 	"type": "module",
 	"name": "cherrypick-js",
 	"version": "4.14.0",
-	"basedMisskeyVersion": "2024.11.0",
+	"basedMisskeyVersion": "2024.11.1-alpha.0",
 	"description": "CherryPick SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,8 @@ on: @@
     jobs:
       build:
+        # chromatic is not likely to be available for fork repositories, so we disable for fork repositories.
+        if: github.repository == 'kokonect-link/cherrypick'
         runs-on: ubuntu-latest
         env:
@@ Expand Down @@