mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-11-27 06:18:46 +09:00
Code

CherryPick🍒

Browse Source
This commit is contained in:
NoriDev 2023-06-09 22:55:20 +09:00
parent 563a952e38
commit 37cca3b7f1
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.devcontainer/docker-compose.yml
View File

@ -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:

4
CONTRIBUTING.md
View File

@ -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.

2
packages/backend/README.md
View File

@ -1,2 +1,2 @@
# Misskey Backend
# CherryPick Backend
![](../../assets/backend.png)

6
packages/backend/src/config.ts
View File

@ -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');

2
packages/backend/src/core/WebfingerService.ts
View File

@ -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}` })}`;
}

2
packages/backend/src/misc/prelude/README.md
View File

@ -1,3 +1,3 @@
# Prelude
このディレクトリのコードはJavaScriptの表現能力を補うためのコードです。
Misskey固有の処理とは独立したコードの集まりですが、Misskeyのコードを読みやすくすることを目的としています。
CherryPick固有の処理とは独立したコードの集まりですが、CherryPickのコードを読みやすくすることを目的としています。

2
packages/frontend/src/boot/common.ts
View File

@ -141,7 +141,7 @@ export async function common(createVue: () => App<Element>) {
}
}
history.replaceState({ misskey: 'loginId' }, '', target);
history.replaceState({ cherrypick: 'loginId' }, '', target);
}
//#endregion

4
packages/misskey-js/test-d/streaming.ts
View File

@ -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<Misskey.entities.Notification>(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;