From 37cca3b7f19553a8fa52816a2dceb500f7f5c17b Mon Sep 17 00:00:00 2001 From: NoriDev Date: Fri, 9 Jun 2023 22:55:20 +0900 Subject: [PATCH] =?UTF-8?q?CherryPick=F0=9F=8D=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devcontainer/docker-compose.yml | 2 +- CONTRIBUTING.md | 4 ++-- packages/backend/README.md | 2 +- packages/backend/src/config.ts | 6 +++--- packages/backend/src/core/WebfingerService.ts | 2 +- packages/backend/src/misc/prelude/README.md | 2 +- packages/frontend/src/boot/common.ts | 2 +- packages/misskey-js/test-d/streaming.ts | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 8f8c5a13ab..bba569a3bb 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -35,7 +35,7 @@ services: environment: POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres - POSTGRES_DB: misskey + POSTGRES_DB: cherrypick volumes: - postgres-data:/var/lib/postgresql/data healthcheck: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f1c5c8a557..ef9c39740d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -167,8 +167,8 @@ TODO ## Environment Variable -- `MISSKEY_CONFIG_YML`: Specify the file path of config.yml instead of default.yml (e.g. `2nd.yml`). -- `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. +- `CHERRYPICK_CONFIG_YML`: Specify the file path of config.yml instead of default.yml (e.g. `2nd.yml`). +- `CHERRYPICK_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 CherryPick uses GitHub Actions for executing automated tests. diff --git a/packages/backend/README.md b/packages/backend/README.md index 82f3429f42..f1e55ecbe6 100644 --- a/packages/backend/README.md +++ b/packages/backend/README.md @@ -1,2 +1,2 @@ -# Misskey Backend +# CherryPick Backend ![](../../assets/backend.png) diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts index 5b1754a2a7..c5cd9563d6 100644 --- a/packages/backend/src/config.ts +++ b/packages/backend/src/config.ts @@ -98,7 +98,7 @@ export type Source = { }; /** - * Misskeyが自動的に(ユーザーが設定した情報から推論して)設定する情報 + * CherryPickが自動的に(ユーザーが設定した情報から推論して)設定する情報 */ export type Mixin = { version: string; @@ -133,8 +133,8 @@ const dir = `${_dirname}/../../../.config`; /** * Path of configuration file */ -const path = process.env.MISSKEY_CONFIG_YML - ? resolve(dir, process.env.MISSKEY_CONFIG_YML) +const path = process.env.CHERRYPICK_CONFIG_YML + ? resolve(dir, process.env.CHERRYPICK_CONFIG_YML) : process.env.NODE_ENV === 'test' ? resolve(dir, 'test.yml') : resolve(dir, 'default.yml'); diff --git a/packages/backend/src/core/WebfingerService.ts b/packages/backend/src/core/WebfingerService.ts index f58a6a10fc..ac9a6f5bd8 100644 --- a/packages/backend/src/core/WebfingerService.ts +++ b/packages/backend/src/core/WebfingerService.ts @@ -46,7 +46,7 @@ export class WebfingerService { const m = query.match(mRegex); if (m) { const hostname = m[2]; - const useHttp = process.env.MISSKEY_WEBFINGER_USE_HTTP && process.env.MISSKEY_WEBFINGER_USE_HTTP.toLowerCase() === 'true'; + const useHttp = process.env.CHERRYPICK_WEBFINGER_USE_HTTP && process.env.CHERRYPICK_WEBFINGER_USE_HTTP.toLowerCase() === 'true'; return `http${useHttp ? '' : 's'}://${hostname}/.well-known/webfinger?${urlQuery({ resource: `acct:${query}` })}`; } diff --git a/packages/backend/src/misc/prelude/README.md b/packages/backend/src/misc/prelude/README.md index bb728cfb1b..7e232ddd43 100644 --- a/packages/backend/src/misc/prelude/README.md +++ b/packages/backend/src/misc/prelude/README.md @@ -1,3 +1,3 @@ # Prelude このディレクトリのコードはJavaScriptの表現能力を補うためのコードです。 -Misskey固有の処理とは独立したコードの集まりですが、Misskeyのコードを読みやすくすることを目的としています。 +CherryPick固有の処理とは独立したコードの集まりですが、CherryPickのコードを読みやすくすることを目的としています。 diff --git a/packages/frontend/src/boot/common.ts b/packages/frontend/src/boot/common.ts index cb12d7d9e7..ee4cfc5c83 100644 --- a/packages/frontend/src/boot/common.ts +++ b/packages/frontend/src/boot/common.ts @@ -141,7 +141,7 @@ export async function common(createVue: () => App) { } } - history.replaceState({ misskey: 'loginId' }, '', target); + history.replaceState({ cherrypick: 'loginId' }, '', target); } //#endregion diff --git a/packages/misskey-js/test-d/streaming.ts b/packages/misskey-js/test-d/streaming.ts index 7ff7f95999..df0c886338 100644 --- a/packages/misskey-js/test-d/streaming.ts +++ b/packages/misskey-js/test-d/streaming.ts @@ -3,7 +3,7 @@ import * as Misskey from '../src'; describe('Streaming', () => { test('emit type', async () => { - const stream = new Misskey.Stream('https://misskey.test', { token: 'TOKEN' }); + const stream = new Misskey.Stream('https://cherrypick.test', { token: 'TOKEN' }); const mainChannel = stream.useChannel('main'); mainChannel.on('notification', notification => { expectType(notification); @@ -11,7 +11,7 @@ describe('Streaming', () => { }); test('params type', async () => { - const stream = new Misskey.Stream('https://misskey.test', { token: 'TOKEN' }); + const stream = new Misskey.Stream('https://cherrypick.test', { token: 'TOKEN' }); // TODO: 「stream.useChannel の第二引数として受け入れる型が // { // otherparty?: User['id'] | null;