Merge branch 'develop' of https://github.com/misskey-dev/misskey into…

… develop
MattyaDaihuku · Nov 30, 2024 · dac3b1f · dac3b1f
2 parents fa271cf + 8076f78
commit dac3b1f
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 62 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,16 @@
-## Unreleased
+## 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

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.11.0",
+	"version": "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
@@ -53,4 +53,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
@@ -28,7 +28,7 @@ export class S3Service {
 			? `${meta.objectStorageUseSSL ? 'https' : 'http'}://${meta.objectStorageEndpoint}`
 			: `${meta.objectStorageUseSSL ? 'https' : 'http'}://example.net`; // dummy url to select http(s) agent
 
-		const agent = this.httpRequestService.getAgentByUrl(new URL(u), !meta.objectStorageUseProxy);
+		const agent = this.httpRequestService.getAgentByUrl(new URL(u), !meta.objectStorageUseProxy, true);
 		const handlerOption: NodeHttpHandlerOptions = {};
 		if (meta.objectStorageUseSSL) {
 			handlerOption.httpsAgent = agent as https.Agent;

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/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts
@@ -124,7 +124,7 @@ export function openInstanceMenu(ev: MouseEvent) {
 		});
 	}
 
-	if (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl) {
+	if (instance.impressumUrl != null || instance.tosUrl != null || instance.privacyPolicyUrl != null) {
 		menuItems.push({ type: 'divider' });
 	}
 

diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.11.0",
+	"version": "2024.11.1-alpha.0",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",
-Original file line number
+Diff line change
@@ Expand Up / @@ -124,7 +124,7 @@ export function openInstanceMenu(ev: MouseEvent) { @@
     		});
     	}
-    	if (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl) {
+    	if (instance.impressumUrl != null || instance.tosUrl != null || instance.privacyPolicyUrl != null) {
     		menuItems.push({ type: 'divider' });
     	}
@@ Expand Down @@