Merge branch 'develop' into pari-dev

2025-01-17 19:10:49 -06:00 · 2024-11-24 23:18:27 +08:00 · 2024-11-24 23:18:27 +08:00 · 4f3c458de8
commit 4f3c458de8
parent 5bc98ce733 dd56623cde
6 changed files with 62 additions and 59 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,9 +5,12 @@

 ### Client
 - Fix: 画面サイズが変わった際にナビゲーションバーが自動で折りたたまれない問題を修正
+- Fix: サーバー情報メニューに区切り線が不足していたのを修正

 ### Server
 - Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )
+- Fix: 起動前の疎通チェックが機能しなくなっていた問題を修正  
+  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/737)


 ## 2024.11.0
--- 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);
--- 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;
--- 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: {
--- 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' });
 	}

--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@ -10631,7 +10631,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -11150,7 +11150,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -11217,7 +11217,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -11611,7 +11611,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -11671,7 +11671,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -11794,7 +11794,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -13389,7 +13389,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -14222,7 +14222,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -14569,7 +14569,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -14694,7 +14694,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -15189,7 +15189,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -15662,7 +15662,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -15722,7 +15722,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -15785,7 +15785,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -15844,7 +15844,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -15904,7 +15904,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -16411,7 +16411,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -16686,7 +16686,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -18003,7 +18003,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -18064,7 +18064,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -18115,7 +18115,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -18166,7 +18166,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -18217,7 +18217,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -18268,7 +18268,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -18319,7 +18319,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -18370,7 +18370,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -18607,7 +18607,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -18667,7 +18667,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -18786,7 +18786,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -18845,7 +18845,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -18904,7 +18904,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -18972,7 +18972,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -19040,7 +19040,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -20032,7 +20032,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -20269,7 +20269,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -20329,7 +20329,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -20699,7 +20699,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -21178,7 +21178,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -21346,7 +21346,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -21843,7 +21843,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -21901,7 +21901,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -22021,7 +22021,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -22681,7 +22681,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -23117,7 +23117,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -23361,7 +23361,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -23497,7 +23497,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -23635,7 +23635,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -23769,7 +23769,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -24101,7 +24101,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -24168,7 +24168,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -24498,7 +24498,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -25048,7 +25048,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -26327,7 +26327,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -27617,7 +27617,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];
@ -27731,7 +27731,7 @@ export type operations = {
          'application/json': components['schemas']['Error'];
        };
      };
-      /** @description To many requests */
+      /** @description Too many requests */
      429: {
        content: {
          'application/json': components['schemas']['Error'];