summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorsyuilo <4439005+syuilo@users.noreply.github.com>2024-11-30 13:20:51 +0900
committersyuilo <4439005+syuilo@users.noreply.github.com>2024-11-30 13:20:51 +0900
commitdac3b1f40591cb697cf650bff7e4cb99cc964f89 (patch)
treeda1b6a899e16fa36941ec7a6b3e73ff9d7a7b0fb /packages
parentUpdate about-misskey.vue (diff)
parentBump version to 2024.11.1-alpha.0 (diff)
downloadsharkey-dac3b1f40591cb697cf650bff7e4cb99cc964f89.tar.gz
sharkey-dac3b1f40591cb697cf650bff7e4cb99cc964f89.tar.bz2
sharkey-dac3b1f40591cb697cf650bff7e4cb99cc964f89.zip
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages')
-rw-r--r--packages/backend/scripts/check_connect.js2
-rw-r--r--packages/backend/src/core/S3Service.ts2
-rw-r--r--packages/backend/src/server/api/openapi/gen-spec.ts2
-rw-r--r--packages/frontend/src/ui/_common_/common.ts2
-rw-r--r--packages/misskey-js/package.json2
-rw-r--r--packages/misskey-js/src/autogen/types.ts110
6 files changed, 60 insertions, 60 deletions
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);
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;
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/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' });
}
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",
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'];