From 8beb8406746ea748c82989c212a0ddbdcb3de88d Mon Sep 17 00:00:00 2001 From: NoriDev Date: Thu, 14 Dec 2023 19:53:16 +0900 Subject: [PATCH] chore --- .github/PULL_REQUEST_TEMPLATE/01_bug.md | 2 +- .github/PULL_REQUEST_TEMPLATE/02_enhance.md | 2 +- .github/pull_request_template.md | 2 +- packages/backend/src/server/api/endpoints/admin/meta.ts | 4 ++++ packages/cherrypick-js/src/autogen/apiClientJSDoc.ts | 4 ++-- packages/cherrypick-js/src/autogen/endpoint.ts | 4 ++-- packages/cherrypick-js/src/autogen/entities.ts | 4 ++-- packages/cherrypick-js/src/autogen/models.ts | 4 ++-- packages/cherrypick-js/src/autogen/types.ts | 5 +++-- packages/frontend/src/components/MkPostFormSimple.vue | 2 +- packages/frontend/src/pages/about-misskey.vue | 2 +- packages/frontend/src/pages/admin/object-storage.vue | 3 +++ 12 files changed, 23 insertions(+), 15 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/01_bug.md b/.github/PULL_REQUEST_TEMPLATE/01_bug.md index 8c688b5e3c..b367e4a39f 100644 --- a/.github/PULL_REQUEST_TEMPLATE/01_bug.md +++ b/.github/PULL_REQUEST_TEMPLATE/01_bug.md @@ -23,5 +23,5 @@ https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md ## Checklist - [ ] Read the [contribution guide](https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md) - [ ] Test working in a local environment -- [ ] (If needed) Update CHANGELOG.md +- [ ] (If needed) Update CHANGELOG_CHERRYPICK.md - [ ] (If possible) Add tests diff --git a/.github/PULL_REQUEST_TEMPLATE/02_enhance.md b/.github/PULL_REQUEST_TEMPLATE/02_enhance.md index 8c688b5e3c..b367e4a39f 100644 --- a/.github/PULL_REQUEST_TEMPLATE/02_enhance.md +++ b/.github/PULL_REQUEST_TEMPLATE/02_enhance.md @@ -23,5 +23,5 @@ https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md ## Checklist - [ ] Read the [contribution guide](https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md) - [ ] Test working in a local environment -- [ ] (If needed) Update CHANGELOG.md +- [ ] (If needed) Update CHANGELOG_CHERRYPICK.md - [ ] (If possible) Add tests diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 8c688b5e3c..b367e4a39f 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -23,5 +23,5 @@ https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md ## Checklist - [ ] Read the [contribution guide](https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md) - [ ] Test working in a local environment -- [ ] (If needed) Update CHANGELOG.md +- [ ] (If needed) Update CHANGELOG_CHERRYPICK.md - [ ] (If possible) Add tests diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts index 9e98cd1af1..2178e6e9e0 100644 --- a/packages/backend/src/server/api/endpoints/admin/meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/meta.ts @@ -435,6 +435,10 @@ export const meta = { type: 'boolean', optional: false, nullable: false, }, + objectStorageRemoteS3ForcePathStyle: { + type: 'boolean', + optional: false, nullable: false, + }, privacyPolicyUrl: { type: 'string', optional: false, nullable: true, diff --git a/packages/cherrypick-js/src/autogen/apiClientJSDoc.ts b/packages/cherrypick-js/src/autogen/apiClientJSDoc.ts index d6426cf9eb..b6d7dd0a6c 100644 --- a/packages/cherrypick-js/src/autogen/apiClientJSDoc.ts +++ b/packages/cherrypick-js/src/autogen/apiClientJSDoc.ts @@ -1,7 +1,7 @@ /* * version: 4.6.0-beta.3 - * basedMisskeyVersion: 2023.12.0-beta.3 - * generatedAt: 2023-12-13T12:46:52.814Z + * basedMisskeyVersion: 2023.12.0-beta.4 + * generatedAt: 2023-12-14T10:52:14.896Z */ import type { SwitchCaseResponseType } from '../api.js'; diff --git a/packages/cherrypick-js/src/autogen/endpoint.ts b/packages/cherrypick-js/src/autogen/endpoint.ts index f54de70e16..e93c2b7570 100644 --- a/packages/cherrypick-js/src/autogen/endpoint.ts +++ b/packages/cherrypick-js/src/autogen/endpoint.ts @@ -1,7 +1,7 @@ /* * version: 4.6.0-beta.3 - * basedMisskeyVersion: 2023.12.0-beta.3 - * generatedAt: 2023-12-13T12:46:52.812Z + * basedMisskeyVersion: 2023.12.0-beta.4 + * generatedAt: 2023-12-14T10:52:14.894Z */ import type { diff --git a/packages/cherrypick-js/src/autogen/entities.ts b/packages/cherrypick-js/src/autogen/entities.ts index f4f00d19a7..f8080642d3 100644 --- a/packages/cherrypick-js/src/autogen/entities.ts +++ b/packages/cherrypick-js/src/autogen/entities.ts @@ -1,7 +1,7 @@ /* * version: 4.6.0-beta.3 - * basedMisskeyVersion: 2023.12.0-beta.3 - * generatedAt: 2023-12-13T12:46:52.811Z + * basedMisskeyVersion: 2023.12.0-beta.4 + * generatedAt: 2023-12-14T10:52:14.893Z */ import { operations } from './types.js'; diff --git a/packages/cherrypick-js/src/autogen/models.ts b/packages/cherrypick-js/src/autogen/models.ts index c7ea808ea1..e7b97cb7b1 100644 --- a/packages/cherrypick-js/src/autogen/models.ts +++ b/packages/cherrypick-js/src/autogen/models.ts @@ -1,7 +1,7 @@ /* * version: 4.6.0-beta.3 - * basedMisskeyVersion: 2023.12.0-beta.3 - * generatedAt: 2023-12-13T12:46:52.810Z + * basedMisskeyVersion: 2023.12.0-beta.4 + * generatedAt: 2023-12-14T10:52:14.891Z */ import { components } from './types.js'; diff --git a/packages/cherrypick-js/src/autogen/types.ts b/packages/cherrypick-js/src/autogen/types.ts index 8f1d6028e5..1d7b864021 100644 --- a/packages/cherrypick-js/src/autogen/types.ts +++ b/packages/cherrypick-js/src/autogen/types.ts @@ -3,8 +3,8 @@ /* * version: 4.6.0-beta.3 - * basedMisskeyVersion: 2023.12.0-beta.3 - * generatedAt: 2023-12-13T12:46:52.733Z + * basedMisskeyVersion: 2023.12.0-beta.4 + * generatedAt: 2023-12-14T10:52:14.813Z */ /** @@ -4810,6 +4810,7 @@ export type operations = { maintainerName: string | null; name: string | null; objectStorageS3ForcePathStyle: boolean; + objectStorageRemoteS3ForcePathStyle: boolean; privacyPolicyUrl: string | null; repositoryUrl: string; summalyProxy: string | null; diff --git a/packages/frontend/src/components/MkPostFormSimple.vue b/packages/frontend/src/components/MkPostFormSimple.vue index aae3567d8b..774c04f8b5 100644 --- a/packages/frontend/src/components/MkPostFormSimple.vue +++ b/packages/frontend/src/components/MkPostFormSimple.vue @@ -944,7 +944,7 @@ async function insertEmoji(ev: MouseEvent) { }, () => { textAreaReadOnly.value = false; - focus(); + nextTick(() => focus()); }, ); } diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue index 33a3af7217..d0255c8af6 100644 --- a/packages/frontend/src/pages/about-misskey.vue +++ b/packages/frontend/src/pages/about-misskey.vue @@ -430,7 +430,7 @@ const whatIsNewCherryPick = () => { }; const whatIsNewMisskey = () => { - window.open(`https://github.com/kokonect-link/cherrypick/blob/develop/CHANGELOG.md#${basedMisskeyVersion.replace(/\./g, '')}`, '_blank'); + window.open(`https://github.com/misskey-dev/misskey/blob/develop/CHANGELOG.md#${basedMisskeyVersion.replace(/\./g, '')}`, '_blank'); }; function iconLoaded() { diff --git a/packages/frontend/src/pages/admin/object-storage.vue b/packages/frontend/src/pages/admin/object-storage.vue index 6fdca746dd..6a39151b2e 100644 --- a/packages/frontend/src/pages/admin/object-storage.vue +++ b/packages/frontend/src/pages/admin/object-storage.vue @@ -182,6 +182,7 @@ const objectStorageUseSSL = ref(false); const objectStorageUseProxy = ref(false); const objectStorageSetPublicRead = ref(false); const objectStorageS3ForcePathStyle = ref(true); + const useObjectStorageRemote = ref(false); const objectStorageRemoteBaseUrl = ref(null); const objectStorageRemoteBucket = ref(null); @@ -211,6 +212,7 @@ async function init() { objectStorageUseProxy.value = meta.objectStorageUseProxy; objectStorageSetPublicRead.value = meta.objectStorageSetPublicRead; objectStorageS3ForcePathStyle.value = meta.objectStorageS3ForcePathStyle; + useObjectStorageRemote.value = meta.useObjectStorageRemote; objectStorageRemoteBaseUrl.value = meta.objectStorageRemoteBaseUrl; objectStorageRemoteBucket.value = meta.objectStorageRemoteBucket; @@ -241,6 +243,7 @@ function save() { objectStorageUseProxy: objectStorageUseProxy.value, objectStorageSetPublicRead: objectStorageSetPublicRead.value, objectStorageS3ForcePathStyle: objectStorageS3ForcePathStyle.value, + useObjectStorageRemote: useObjectStorageRemote.value, objectStorageRemoteBaseUrl: objectStorageRemoteBaseUrl.value, objectStorageRemoteBucket: objectStorageRemoteBucket.value,