From e13f0f10c5a9ebc9cff690b18bc5fdcef096c050 Mon Sep 17 00:00:00 2001 From: NoriDev Date: Sun, 14 May 2023 17:49:32 +0900 Subject: [PATCH] cherrypick --- .github/PULL_REQUEST_TEMPLATE/01_bug.md | 4 ++-- .github/PULL_REQUEST_TEMPLATE/02_enhance.md | 4 ++-- .github/PULL_REQUEST_TEMPLATE/03_release.md | 2 +- .github/pull_request_template.md | 4 ++-- .github/workflows/docker-develop.yml | 2 +- CONTRIBUTING.md | 18 +++++++++--------- .../backend/src/server/api/openapi/gen-spec.ts | 4 ++-- .../backend/src/server/web/views/error.pug | 8 ++++---- packages/backend/test/e2e/note.ts | 4 ++-- packages/frontend/.storybook/fakes.ts | 8 ++++---- packages/frontend/.storybook/preview-head.html | 4 ++-- .../src/components/global/MkAd.stories.impl.ts | 6 +++--- .../global/MkCustomEmoji.stories.impl.ts | 2 +- packages/frontend/src/pages/about-misskey.vue | 2 +- packages/frontend/src/ui/visitor.vue | 2 +- packages/misskey-js/README.md | 2 +- 16 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/01_bug.md b/.github/PULL_REQUEST_TEMPLATE/01_bug.md index 0739fee709..3c9f532720 100644 --- a/.github/PULL_REQUEST_TEMPLATE/01_bug.md +++ b/.github/PULL_REQUEST_TEMPLATE/01_bug.md @@ -1,7 +1,7 @@ ## What @@ -17,7 +17,7 @@ https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md ## Checklist -- [ ] Read the [contribution guide](https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md) +- [ ] 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 possible) Add tests diff --git a/.github/PULL_REQUEST_TEMPLATE/02_enhance.md b/.github/PULL_REQUEST_TEMPLATE/02_enhance.md index 0739fee709..3c9f532720 100644 --- a/.github/PULL_REQUEST_TEMPLATE/02_enhance.md +++ b/.github/PULL_REQUEST_TEMPLATE/02_enhance.md @@ -1,7 +1,7 @@ ## What @@ -17,7 +17,7 @@ https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md ## Checklist -- [ ] Read the [contribution guide](https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md) +- [ ] 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 possible) Add tests diff --git a/.github/PULL_REQUEST_TEMPLATE/03_release.md b/.github/PULL_REQUEST_TEMPLATE/03_release.md index b5b832e1dc..574bf43ca0 100644 --- a/.github/PULL_REQUEST_TEMPLATE/03_release.md +++ b/.github/PULL_REQUEST_TEMPLATE/03_release.md @@ -2,7 +2,7 @@ This is a release PR. For more information on the release instructions, please see: -https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md#release +https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md#release ## For reviewers - CHANGELOGに抜け漏れは無いか diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index e78b82c47c..d72f27f245 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,7 +1,7 @@ ## What @@ -17,7 +17,7 @@ https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md ## Checklist -- [ ] Read the [contribution guide](https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md) +- [ ] Read the [contribution guide](https://github.com/kokonect-link/cherrypick/blob/develop/CONTRIBUTING.md) - [ ] Test working in a local environment - [ ] (If needed) Add story of storybook - [ ] (If needed) Update CHANGELOG.md diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml index 250e93b25d..7e1b8b928f 100644 --- a/.github/workflows/docker-develop.yml +++ b/.github/workflows/docker-develop.yml @@ -10,7 +10,7 @@ jobs: push_to_registry: name: Push Docker image to Docker Hub runs-on: ubuntu-latest - if: github.repository == 'misskey-dev/misskey' + if: github.repository == 'kokonect-link/cherrypick' steps: - name: Check out the repo uses: actions/checkout@v3.3.0 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f6b3804f84..f1c5c8a557 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,5 @@ # Contribution guide -We're glad you're interested in contributing Misskey! In this document you will find the information you need to contribute to the project. +We're glad you're interested in contributing CherryPick! In this document you will find the information you need to contribute to the project. > **Note** > This project uses Japanese as its major language, **but you do not need to translate and write the Issues/PRs in Japanese.** @@ -15,7 +15,7 @@ Before creating an issue, please check the following: - To avoid duplication, please search for similar issues before creating a new issue. - Do not use Issues to ask questions or troubleshooting. - Issues should only be used to feature requests, suggestions, and bug tracking. - - Please ask questions or troubleshooting in ~~the [Misskey Forum](https://forum.misskey.io/)~~ [GitHub Discussions](https://github.com/misskey-dev/misskey/discussions) or [Discord](https://discord.gg/Wp8gVStHW3). + - Please ask questions or troubleshooting in ~~the [Misskey Forum](https://forum.misskey.io/)~~ [GitHub Discussions](https://github.com/kokonect-link/cherrypick/discussions) or [Discord](https://discord.gg/V8qghB28Aj). > **Warning** > Do not close issues that are about to be resolved. It should remain open until a commit that actually resolves it is merged. @@ -77,14 +77,14 @@ An actual domain will be assigned so you can test the federation. ## Release ### Release Instructions -1. Commit version changes in the `develop` branch ([package.json](https://github.com/misskey-dev/misskey/blob/develop/package.json)) +1. Commit version changes in the `develop` branch ([package.json](https://github.com/kokonect-link/cherrypick/blob/develop/package.json)) 2. Create a release PR. - Into `master` from `develop` branch. - The title must be in the format `Release: x.y.z`. - `x.y.z` is the new version you are trying to release. 3. Deploy and perform a simple QA check. Also verify that the tests passed. 4. Merge it. (Do not squash commit) -5. Create a [release of GitHub](https://github.com/misskey-dev/misskey/releases) +5. Create a [release of GitHub](https://github.com/kokonect-link/cherrypick/releases) - The target branch must be `master` - The tag name must be the version @@ -144,7 +144,7 @@ pnpm dev ### Run test Create a config file. ``` -cp .github/misskey/test.yml .config/ +cp .github/cherrypick/test.yml .config/ ``` Prepare DB/Redis for testing. ``` @@ -171,17 +171,17 @@ TODO - `MISSKEY_WEBFINGER_USE_HTTP`: If it's set true, WebFinger requests will be http instead of https, useful for testing federation between servers in localhost. NEVER USE IN PRODUCTION. ## Continuous integration -Misskey uses GitHub Actions for executing automated tests. +CherryPick uses GitHub Actions for executing automated tests. Configuration files are located in [`/.github/workflows`](/.github/workflows). ## Vue -Misskey uses Vue(v3) as its front-end framework. +CherryPick uses Vue(v3) as its front-end framework. - Use TypeScript. - **When creating a new component, please use the Composition API (with [setup sugar](https://v3.vuejs.org/api/sfc-script-setup.html) and [ref sugar](https://github.com/vuejs/rfcs/discussions/369)) instead of the Options API.** - Some of the existing components are implemented in the Options API, but it is an old implementation. Refactors that migrate those components to the Composition API are also welcome. ## nirax -niraxは、Misskeyで使用しているオリジナルのフロントエンドルーティングシステムです。 +niraxは、CherryPickで使用しているオリジナルのフロントエンドルーティングシステムです。 **vue-routerから影響を多大に受けているので、まずはvue-routerについて学ぶことをお勧めします。** ### ルート定義 @@ -210,7 +210,7 @@ vue-routerとの最大の違いは、niraxは複数のルーターが存在す ## Storybook -Misskey uses [Storybook](https://storybook.js.org/) for UI development. +CherryPick uses [Storybook](https://storybook.js.org/) for UI development. ### Setup & Run diff --git a/packages/backend/src/server/api/openapi/gen-spec.ts b/packages/backend/src/server/api/openapi/gen-spec.ts index fa62480c02..39e0922b00 100644 --- a/packages/backend/src/server/api/openapi/gen-spec.ts +++ b/packages/backend/src/server/api/openapi/gen-spec.ts @@ -15,7 +15,7 @@ export function genOpenapiSpec(config: Config) { externalDocs: { description: 'Repository', - url: 'https://github.com/misskey-dev/misskey', + url: 'https://github.com/kokonect-link/cherrypick', }, servers: [{ @@ -80,7 +80,7 @@ export function genOpenapiSpec(config: Config) { description: desc, externalDocs: { description: 'Source code', - url: `https://github.com/misskey-dev/misskey/blob/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`, + url: `https://github.com/kokonect-link/cherrypick/blob/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`, }, ...(endpoint.meta.tags ? { tags: [endpoint.meta.tags[0]], diff --git a/packages/backend/src/server/web/views/error.pug b/packages/backend/src/server/web/views/error.pug index b177ae4110..3270bcbac9 100644 --- a/packages/backend/src/server/web/views/error.pug +++ b/packages/backend/src/server/web/views/error.pug @@ -7,9 +7,9 @@ doctype html | | | | |_ -|_ -| '_| -_| | | |_|_|_|_|___|___|_,_|___|_ | |___| - Thank you for using Misskey! + Thank you for using CherryPick! If you are reading this message... how about joining the development? - https://github.com/misskey-dev/misskey + https://github.com/kokonect-link/cherrypick html @@ -17,12 +17,12 @@ html head meta(charset='utf-8') meta(name='viewport' content='width=device-width, initial-scale=1') - meta(name='application-name' content='Misskey') + meta(name='application-name' content='CherryPick') meta(name='referrer' content='origin') title block title - = 'An error has occurred... | Misskey' + = 'An error has occurred... | CherryPick' style include ../error.css diff --git a/packages/backend/test/e2e/note.ts b/packages/backend/test/e2e/note.ts index d2eb8f01d7..b8d8ec64fa 100644 --- a/packages/backend/test/e2e/note.ts +++ b/packages/backend/test/e2e/note.ts @@ -37,7 +37,7 @@ describe('Note', () => { }); test('ファイルを添付できる', async () => { - const file = await uploadUrl(alice, 'https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/Lenna.jpg'); + const file = await uploadUrl(alice, 'https://raw.githubusercontent.com/kokonect-link/cherrypick/develop/packages/backend/test/resources/Lenna.jpg'); const res = await api('/notes/create', { fileIds: [file.id], @@ -49,7 +49,7 @@ describe('Note', () => { }, 1000 * 10); test('他人のファイルで怒られる', async () => { - const file = await uploadUrl(bob, 'https://raw.githubusercontent.com/misskey-dev/misskey/develop/packages/backend/test/resources/Lenna.jpg'); + const file = await uploadUrl(bob, 'https://raw.githubusercontent.com/kokonect-link/cherrypick/develop/packages/backend/test/resources/Lenna.jpg'); const res = await api('/notes/create', { text: 'test', diff --git a/packages/frontend/.storybook/fakes.ts b/packages/frontend/.storybook/fakes.ts index 5fd21cdf0a..4075d98640 100644 --- a/packages/frontend/.storybook/fakes.ts +++ b/packages/frontend/.storybook/fakes.ts @@ -50,8 +50,8 @@ export function file(isSensitive = false) { width: 1024, height: 270 }, - url: 'https://github.com/misskey-dev/misskey/blob/master/packages/frontend/assets/fedi.jpg?raw=true', - thumbnailUrl: 'https://github.com/misskey-dev/misskey/blob/master/packages/frontend/assets/fedi.jpg?raw=true', + url: 'https://github.com/kokonect-link/cherrypick/blob/master/packages/frontend/assets/fedi.jpg?raw=true', + thumbnailUrl: 'https://github.com/kokonect-link/cherrypick/blob/master/packages/frontend/assets/fedi.jpg?raw=true', comment: null, folderId: null, folder: null, @@ -67,12 +67,12 @@ export function userDetailed(id = 'someuserid', username = 'miskist', host = 'mi host, name, onlineStatus: 'unknown', - avatarUrl: 'https://github.com/misskey-dev/misskey/blob/master/packages/frontend/assets/about-icon.png?raw=true', + avatarUrl: 'https://github.com/kokonect-link/cherrypick/blob/master/packages/frontend/assets/about-icon.png?raw=true', avatarBlurhash: 'eQFRshof5NWBRi},juayfPju53WB?0ofs;s*a{ofjuay^SoMEJR%ay', emojis: [], bannerBlurhash: 'eQA^IW^-MH8w9tE8I=S^o{$*R4RikXtSxutRozjEnNR.RQadoyozog', bannerColor: '#000000', - bannerUrl: 'https://github.com/misskey-dev/misskey/blob/master/packages/frontend/assets/fedi.jpg?raw=true', + bannerUrl: 'https://github.com/kokonect-link/cherrypick/blob/master/packages/frontend/assets/fedi.jpg?raw=true', birthday: '2014-06-20', createdAt: '2016-12-28T22:49:51.000Z', description: 'I am a cool user!', diff --git a/packages/frontend/.storybook/preview-head.html b/packages/frontend/.storybook/preview-head.html index ab694f64fb..239e6ffe76 100644 --- a/packages/frontend/.storybook/preview-head.html +++ b/packages/frontend/.storybook/preview-head.html @@ -1,5 +1,5 @@ - - + +