mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-11-23 22:56:53 +09:00
Code

chore

Browse Source
This commit is contained in:
NoriDev 2023-12-14 19:53:16 +09:00
parent e5423228b8
commit 8beb840674
12 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/PULL_REQUEST_TEMPLATE/01_bug.md vendored
View File

@ -23,5 +23,5 @@ https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md
## Checklist ## Checklist
- [ ] Read the [contribution guide](https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md) - [ ] Read the [contribution guide](https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md)
- [ ] Test working in a local environment - [ ] Test working in a local environment
- [ ] (If needed) Update CHANGELOG.md - [ ] (If needed) Update CHANGELOG_CHERRYPICK.md
- [ ] (If possible) Add tests - [ ] (If possible) Add tests

2
.github/PULL_REQUEST_TEMPLATE/02_enhance.md vendored
View File

@ -23,5 +23,5 @@ https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md
## Checklist ## Checklist
- [ ] Read the [contribution guide](https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md) - [ ] Read the [contribution guide](https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md)
- [ ] Test working in a local environment - [ ] Test working in a local environment
- [ ] (If needed) Update CHANGELOG.md - [ ] (If needed) Update CHANGELOG_CHERRYPICK.md
- [ ] (If possible) Add tests - [ ] (If possible) Add tests

2
.github/pull_request_template.md vendored
View File

@ -23,5 +23,5 @@ https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md
## Checklist ## Checklist
- [ ] Read the [contribution guide](https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md) - [ ] Read the [contribution guide](https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md)
- [ ] Test working in a local environment - [ ] Test working in a local environment
- [ ] (If needed) Update CHANGELOG.md - [ ] (If needed) Update CHANGELOG_CHERRYPICK.md
- [ ] (If possible) Add tests - [ ] (If possible) Add tests

4
packages/backend/src/server/api/endpoints/admin/meta.ts
View File

@ -435,6 +435,10 @@ export const meta = {
type: 'boolean', type: 'boolean',
optional: false, nullable: false, optional: false, nullable: false,
}, },
objectStorageRemoteS3ForcePathStyle: {
type: 'boolean',
optional: false, nullable: false,
},
privacyPolicyUrl: { privacyPolicyUrl: {
type: 'string', type: 'string',
optional: false, nullable: true, optional: false, nullable: true,

4
packages/cherrypick-js/src/autogen/apiClientJSDoc.ts
View File

@ -1,7 +1,7 @@
/* /*
* version: 4.6.0-beta.3 * version: 4.6.0-beta.3
* basedMisskeyVersion: 2023.12.0-beta.3 * basedMisskeyVersion: 2023.12.0-beta.4
* generatedAt: 2023-12-13T12:46:52.814Z * generatedAt: 2023-12-14T10:52:14.896Z
*/ */
import type { SwitchCaseResponseType } from '../api.js'; import type { SwitchCaseResponseType } from '../api.js';

4
packages/cherrypick-js/src/autogen/endpoint.ts
View File

@ -1,7 +1,7 @@
/* /*
* version: 4.6.0-beta.3 * version: 4.6.0-beta.3
* basedMisskeyVersion: 2023.12.0-beta.3 * basedMisskeyVersion: 2023.12.0-beta.4
* generatedAt: 2023-12-13T12:46:52.812Z * generatedAt: 2023-12-14T10:52:14.894Z
*/ */
import type { import type {

4
packages/cherrypick-js/src/autogen/entities.ts
View File

@ -1,7 +1,7 @@
/* /*
* version: 4.6.0-beta.3 * version: 4.6.0-beta.3
* basedMisskeyVersion: 2023.12.0-beta.3 * basedMisskeyVersion: 2023.12.0-beta.4
* generatedAt: 2023-12-13T12:46:52.811Z * generatedAt: 2023-12-14T10:52:14.893Z
*/ */
import { operations } from './types.js'; import { operations } from './types.js';

4
packages/cherrypick-js/src/autogen/models.ts
View File

@ -1,7 +1,7 @@
/* /*
* version: 4.6.0-beta.3 * version: 4.6.0-beta.3
* basedMisskeyVersion: 2023.12.0-beta.3 * basedMisskeyVersion: 2023.12.0-beta.4
* generatedAt: 2023-12-13T12:46:52.810Z * generatedAt: 2023-12-14T10:52:14.891Z
*/ */
import { components } from './types.js'; import { components } from './types.js';

5
packages/cherrypick-js/src/autogen/types.ts
View File

@ -3,8 +3,8 @@
/* /*
* version: 4.6.0-beta.3 * version: 4.6.0-beta.3
* basedMisskeyVersion: 2023.12.0-beta.3 * basedMisskeyVersion: 2023.12.0-beta.4
* generatedAt: 2023-12-13T12:46:52.733Z * generatedAt: 2023-12-14T10:52:14.813Z
*/ */
/** /**
@ -4810,6 +4810,7 @@ export type operations = {
maintainerName: string | null; maintainerName: string | null;
name: string | null; name: string | null;
objectStorageS3ForcePathStyle: boolean; objectStorageS3ForcePathStyle: boolean;
objectStorageRemoteS3ForcePathStyle: boolean;
privacyPolicyUrl: string | null; privacyPolicyUrl: string | null;
repositoryUrl: string; repositoryUrl: string;
summalyProxy: string | null; summalyProxy: string | null;

2
packages/frontend/src/components/MkPostFormSimple.vue
View File

@ -944,7 +944,7 @@ async function insertEmoji(ev: MouseEvent) {
}, },
() => { () => {
textAreaReadOnly.value = false; textAreaReadOnly.value = false;
focus(); nextTick(() => focus());
}, },
); );
} }

2
packages/frontend/src/pages/about-misskey.vue
View File

@ -430,7 +430,7 @@ const whatIsNewCherryPick = () => {
}; };
const whatIsNewMisskey = () => { 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() { function iconLoaded() {

3
packages/frontend/src/pages/admin/object-storage.vue
View File

@ -182,6 +182,7 @@ const objectStorageUseSSL = ref<boolean>(false);
const objectStorageUseProxy = ref<boolean>(false); const objectStorageUseProxy = ref<boolean>(false);
const objectStorageSetPublicRead = ref<boolean>(false); const objectStorageSetPublicRead = ref<boolean>(false);
const objectStorageS3ForcePathStyle = ref<boolean>(true); const objectStorageS3ForcePathStyle = ref<boolean>(true);
const useObjectStorageRemote = ref<boolean>(false); const useObjectStorageRemote = ref<boolean>(false);
const objectStorageRemoteBaseUrl = ref<string | null>(null); const objectStorageRemoteBaseUrl = ref<string | null>(null);
const objectStorageRemoteBucket = ref<string | null>(null); const objectStorageRemoteBucket = ref<string | null>(null);
@ -211,6 +212,7 @@ async function init() {
objectStorageUseProxy.value = meta.objectStorageUseProxy; objectStorageUseProxy.value = meta.objectStorageUseProxy;
objectStorageSetPublicRead.value = meta.objectStorageSetPublicRead; objectStorageSetPublicRead.value = meta.objectStorageSetPublicRead;
objectStorageS3ForcePathStyle.value = meta.objectStorageS3ForcePathStyle; objectStorageS3ForcePathStyle.value = meta.objectStorageS3ForcePathStyle;
useObjectStorageRemote.value = meta.useObjectStorageRemote; useObjectStorageRemote.value = meta.useObjectStorageRemote;
objectStorageRemoteBaseUrl.value = meta.objectStorageRemoteBaseUrl; objectStorageRemoteBaseUrl.value = meta.objectStorageRemoteBaseUrl;
objectStorageRemoteBucket.value = meta.objectStorageRemoteBucket; objectStorageRemoteBucket.value = meta.objectStorageRemoteBucket;
@ -241,6 +243,7 @@ function save() {
objectStorageUseProxy: objectStorageUseProxy.value, objectStorageUseProxy: objectStorageUseProxy.value,
objectStorageSetPublicRead: objectStorageSetPublicRead.value, objectStorageSetPublicRead: objectStorageSetPublicRead.value,
objectStorageS3ForcePathStyle: objectStorageS3ForcePathStyle.value, objectStorageS3ForcePathStyle: objectStorageS3ForcePathStyle.value,
useObjectStorageRemote: useObjectStorageRemote.value, useObjectStorageRemote: useObjectStorageRemote.value,
objectStorageRemoteBaseUrl: objectStorageRemoteBaseUrl.value, objectStorageRemoteBaseUrl: objectStorageRemoteBaseUrl.value,
objectStorageRemoteBucket: objectStorageRemoteBucket.value, objectStorageRemoteBucket: objectStorageRemoteBucket.value,