From d176db517fd11b63e83daa7c1f45ecd25bd0750e 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: Sun, 24 Nov 2024 15:23:07 +0900
Subject: [PATCH 1/5] =?UTF-8?q?fix(backend/misskey-js):=20=E3=82=BF?=
=?UTF-8?q?=E3=82=A4=E3=83=9D=E4=BF=AE=E6=AD=A3=20(#15046)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/server/api/openapi/gen-spec.ts | 2 +-
packages/misskey-js/src/autogen/types.ts | 110 +++++++++---------
2 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/packages/backend/src/server/api/openapi/gen-spec.ts b/packages/backend/src/server/api/openapi/gen-spec.ts
index efa47a6986..3b20ec1321 100644
--- 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/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 280abba727..42ca05e057 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -10593,7 +10593,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -11112,7 +11112,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -11179,7 +11179,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -11573,7 +11573,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -11633,7 +11633,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -11756,7 +11756,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -13351,7 +13351,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -14184,7 +14184,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -14531,7 +14531,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -14656,7 +14656,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -15151,7 +15151,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -15624,7 +15624,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -15684,7 +15684,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -15747,7 +15747,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -15806,7 +15806,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -15866,7 +15866,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -16373,7 +16373,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -16648,7 +16648,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -17908,7 +17908,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -17969,7 +17969,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -18020,7 +18020,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -18071,7 +18071,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -18122,7 +18122,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -18173,7 +18173,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -18224,7 +18224,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -18275,7 +18275,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -18512,7 +18512,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -18572,7 +18572,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -18631,7 +18631,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -18690,7 +18690,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -18749,7 +18749,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -18817,7 +18817,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -18885,7 +18885,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -19877,7 +19877,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -20114,7 +20114,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -20174,7 +20174,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -20544,7 +20544,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -21023,7 +21023,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -21191,7 +21191,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -21688,7 +21688,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -21746,7 +21746,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -21804,7 +21804,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -22464,7 +22464,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -22898,7 +22898,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -23142,7 +23142,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -23278,7 +23278,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -23416,7 +23416,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -23550,7 +23550,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -23882,7 +23882,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -23949,7 +23949,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -24279,7 +24279,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -24829,7 +24829,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -26108,7 +26108,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -27398,7 +27398,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
@@ -27512,7 +27512,7 @@ export type operations = {
'application/json': components['schemas']['Error'];
};
};
- /** @description To many requests */
+ /** @description Too many requests */
429: {
content: {
'application/json': components['schemas']['Error'];
From eddf6a23197e1a14b20423c7da08206034d198aa 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: Sun, 24 Nov 2024 15:23:21 +0900
Subject: [PATCH 2/5] =?UTF-8?q?fix(frontend):=20=E3=82=B5=E3=83=BC?=
=?UTF-8?q?=E3=83=90=E3=83=BC=E3=83=89=E3=82=AD=E3=83=A5=E3=83=A1=E3=83=B3?=
=?UTF-8?q?=E3=83=88=E3=81=A8Misskey=E9=96=A2=E9=80=A3=E3=83=AA=E3=82=BD?=
=?UTF-8?q?=E3=83=BC=E3=82=B9=E3=81=A8=E3=81=AE=E9=96=93=E3=81=ABdivider?=
=?UTF-8?q?=E3=81=8C=E5=85=A5=E3=82=89=E3=81=AA=E3=81=84=E3=81=93=E3=81=A8?=
=?UTF-8?q?=E3=81=8C=E3=81=82=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?=
=?UTF-8?q?=E6=AD=A3=20(#15044)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix(frontend): サーバードキュメントとMisskey関連リソースとの間にdividerが入らないことがある問題を修正
* Update Changelog
---
CHANGELOG.md | 1 +
packages/frontend/src/ui/_common_/common.ts | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7896a42883..b8eca4c355 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
### Client
- Fix: 画面サイズが変わった際にナビゲーションバーが自動で折りたたまれない問題を修正
+- Fix: サーバー情報メニューに区切り線が不足していたのを修正
### Server
- Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )
diff --git a/packages/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts
index f908803f01..b31254196a 100644
--- 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' });
}
From a0e91b5882379b31b379ec366ed09e7253c788bc 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: Sun, 24 Nov 2024 20:43:47 +0900
Subject: [PATCH 3/5] =?UTF-8?q?fix(backend):=20=E8=B5=B7=E5=8B=95=E5=89=8D?=
=?UTF-8?q?=E3=81=AE=E7=96=8E=E9=80=9A=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?=
=?UTF-8?q?=E3=81=8C=E6=A9=9F=E8=83=BD=E3=81=97=E3=81=AA=E3=81=8F=E3=81=AA?=
=?UTF-8?q?=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E5=95=8F=E9=A1=8C=E3=82=92?=
=?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(#15043)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* check harder for connectibility
`allSettled` does not throw if a promise is rejected, so
`check_connect` never actually failed
* Update Changelog
---------
Co-authored-by: dakkar <dakkar@thenautilus.net>
---
CHANGELOG.md | 2 ++
packages/backend/scripts/check_connect.js | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8eca4c355..badcf1cebb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@
### Server
- Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )
+- Fix: 起動前の疎通チェックが機能しなくなっていた問題を修正
+ (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/737)
## 2024.11.0
diff --git a/packages/backend/scripts/check_connect.js b/packages/backend/scripts/check_connect.js
index bb149444b5..96c4549ccb 100644
--- 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);
From dd56623cded7cc7a355d1dc59e46e2d8f1ed3660 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Sun, 24 Nov 2024 20:44:59 +0900
Subject: [PATCH 4/5] fix: unable to upload to local object storage (#15040)
---
packages/backend/src/core/S3Service.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/backend/src/core/S3Service.ts b/packages/backend/src/core/S3Service.ts
index bb2a463354..37721d2bf1 100644
--- 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;
From 8076f78d06786dd60db121b588289be54731b13e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 22:18:00 +0000
Subject: [PATCH 5/5] Bump version to 2024.11.1-alpha.0
---
CHANGELOG.md | 2 +-
package.json | 2 +-
packages/misskey-js/package.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index badcf1cebb..8f2c36ffc3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Unreleased
+## 2024.11.1
### General
-
diff --git a/package.json b/package.json
index 60de6f4e15..b91f044ff7 100644
--- 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/misskey-js/package.json b/packages/misskey-js/package.json
index 7994dac1e4..6a2b45150d 100644
--- 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",