Skip to content

Commit

Permalink
Feat: Type4ny Project Initialize
Browse files Browse the repository at this point in the history
* localOnly

* localOnly

* ui fix

* いろいろかえた

* いろいろかえた

* いろいろかえた

* いろいろかえた

* fix: expanded

* fix: expanded

* fix: expanded

* fix: expanded

* fix: expanded

* emoji

* ui:fix

* ui:fix

* ui:fix

* 2024.2.0-beta.9-PrisMisskey.2

* ui:fix

* ui:fix

* ui:fix

* ui:fix

* 色々

* 色々

* 色々

* feat(backend): Federated note update (#1)

(cherry picked from commit 6af23d4e28893b0ab253182153973bcad1210ac0)

* fix

* ノートの編集履歴を見れるように(新規ノートのみ)

(cherry picked from commit 25763ee)

* fix

* update README.md

* update README.md

* update README.md

* a

* a

* a

* a

* a

* a

* a

* a

* a

* a

* a

* spec(backend/NoteCreateService): ローカルユーザーがまだ誰もフォローしていないリモートユーザーによる通知を引き起こす可能性のある投稿を拒否できるように (MisskeyIO#462)

Cherry-picked from 738b4d6, 1b3adcc, 33cb507, a27af00, 5c6236b

Co-authored-by: Ebise Lutica <[email protected]>

* a

* a

* a

* a

* fix: channel timeline post form

* fix: channel timeline post form

* are

* are

* are

* are

* are

* are

* are

* are

* are

* are

* are

* Revert "fix: 古いキャッシュを使うのを修正 (misskey-dev#13453)"

This reverts commit 2c6f25b.

* Revert "Revert "fix: 古いキャッシュを使うのを修正 (misskey-dev#13453)""

This reverts commit d64feb7.

* Revert "refactor(backend): UserEntityService.packMany()の高速化 (misskey-dev#13550)"

This reverts commit 5c1d86b.

* enhance(backend): inbox queue error in update note

(cherry picked from commit 1312c4f944b235d77275a51047275f84e4904de8)

* aaa

* aaa

* aaa

* aaa

* aaa

* aaa

* aaa

* aaa

* aaa

* aaa

* aaa

* outsideprismisskey

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* Revert "update"

This reverts commit 55c80db.

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* add: 下書きに関する関数等の切り離し

* feat: 下書きピッカーを実装

* refactor: indexedDbに移行

* change: uniqueIdの指定を必須に

* fix: マイグレーションが正常に行えない問題を修正

* enhance: 下書きピッカーを改善

* feat: 投稿フォームに下書きを適用できるように

* feat: 下書きを自動保存するかどうかを設定できるように

* feat: 「下書きとして保存」ボタンを実装

* enhance: 既に入力されている内容がある場合に上書き警告を出すように

* add: 翻訳を追加

* update

* update

* update

* update

* update

* update

* Update docker.yml

* update

* update

* update

* feat: メインタイムラインのタブをカスタマイズ可能に(misskey-dev#8759)

* feat: リストをピン留めできるように

* fix: console.log消し忘れ

* Update CHANGELOG.md

* fix: spdx-license-id

* Update CHANGELOG.md

* Fix: 命名規則など

* Fix

* 2024.5.0-mattyatea2

* emoji more

* emoji more

* 2024.5.0-mattyatea3

* fix

* fix

* fix

* fix

* fix

* fix

* 2024.5.0-mattyatea4

* Type4ny Project Initialize

* fix(storybook): prevent infinite remount of component (misskey-dev#14101)

* fix(storybook): prevent infinite remount of component

* fix: disable flaky `.toMatch()` test

* update deps (misskey-dev#14057)

* wip

* locales/index.jsのymlファイル取得ロジックを調節

* regenerate pnpm-lock.yaml

* fix(backend): typecheck fails

* chore(deps): bump ip-cidr from 4.0.0 to 4.0.1 in /packages/backend

* chore: migrate ESLint configs to flat config (misskey-dev#14094)

* chore: migrate ESLint configs to flat config

* fix: update paths

* fix: frontend lint fails

* refactor(misskey-js): lint build.js

* update deps

---------

Co-authored-by: samunohito <[email protected]>
Co-authored-by: zyoshoka <[email protected]>
Co-authored-by: zyoshoka <[email protected]>

* test(backend): goodbye, Lenna (misskey-dev#14111)

* Use built-in API (misskey-dev#14095)

* dev: fix pnpm dev is broken (misskey-dev#14123)

* dev: pnpm dev is broken

* dev: fix crash pnpm dev because of unhandled promise

* fix(storybook): build skipping even after updating impl story files (misskey-dev#14124)

* refactor(frontend): refactor popup api and make sure call dispose callback

Close misskey-dev#14122

* fix(dev): devサーバーで`/notes/`に直でアクセスしたらサーバー側のレスポンスが返ってくる問題を修正 (misskey-dev#14137)

* fix import path

* fix changelog

* fix(backend): parse5関係の型のimport方法を変更 (misskey-dev#14146)

* fix(frontend): サーバーサイドbootでエラー画面の描画時にDOMが初期化できていないことがあるのを修正 (misskey-dev#14139)

* feat(misskey-js): multipart/form-dataのリクエストに対応 (misskey-dev#14147)

* feat(misskey-js): multipart/form-dataのリクエストに対応

* lint

* add test

* Update Changelog

* テストを厳しくする

* lint

* multipart/form-dataではnullのプロパティを弾くように

* fix(backend): 名前を空白文字列だけにできる問題を修正 (misskey-dev#14119)

* fix(backend): 名前を空白文字列だけにできる問題を修正

* Update Changelog

* fix test

* Unicodeを含める

* fix

* ユーザー名がUnicode制御文字とスペースのみで構成される場合はnullに

* Revert "ユーザー名がUnicode制御文字とスペースのみで構成される場合はnullに"

This reverts commit 6c752a6.

* [ci skip] changelog typo

* Fix compose file name (misskey-dev#14153)

* Bump release actions to v2 (develop-stable(master) branches system) (misskey-dev#13941)

* fix/refactor(frontend): hotkeyの改修 (misskey-dev#14157)

* improve(frontend): hotkeyの改修 (misskey-dev#234)

(cherry picked from commit 678be14)

* Change path, add missing script

Co-authored-by: taiy <[email protected]>

* fix

* fix

* add missing keycodes

* fix

* update changelog

---------

Co-authored-by: taiy <[email protected]>

* fix(backend): api-docをScalarに変更 (misskey-dev#14152)

* fix(backend): api-docをScalarに変更

* Update Changelog

* fix(frontend): remove unused statement

fix misskey-dev#14162

* feat(misskey-js): `POST admin/roles/create`の型を具象化 (misskey-dev#14167)

* feat(misskey-js): `POST admin/roles/create`の型を具象化

* fix

* docs: CHANGELOG.md

* test(misskey-js): admin/roles/createの型が合うことを表明

* test(misskey-js): single quote

* test(misskey-js): 無を読もうとして爆発するのを修正

* test(misskey-js): fix comment

* Improve background color specification (misskey-dev#14176)

* リリースPRがないときにrelease-edit-with-push.ymlがfailして見栄えが悪いのを修正 (misskey-dev#14160)

* enhance(frontend): ウェルカムタイムラインのデザインを調整 (misskey-dev#14156)

* enhance(frontend): 非ログイン時のハイライトTLのデザイン調整

* Update Changelog

* fix cw handling

* ホバーしてたらスクロールを止めるように

* fix

* lint

* enhance(frontend): 未使用のサウンド設定を削除 (misskey-dev#14116)

* enhance(frontend): 未使用のサウンド設定を削除

* Update Changelog

* Update CHANGELOG.md

* fix(frontend): フォーカスの挙動を修正 (misskey-dev#14158)

* fix(frontend): 直前のパターンを記録するように

* fix(frontend): フォーカス/タブ移動に関する挙動を調整 (misskey-dev#226)

Cherry-pick commit e8c0306

Co-authored-by: taiyme <[email protected]>

* focusのデザイン修正

* move scripts

* Modalにfocus trapを追加

* 記録するホットキーはレートリミット式にする

* escキーのハンドリングをMkModalに統一

* fix

* enterで子メニューを開けるように

* lint

* fix focus trap

* improve switch accessibility

* 一部のmodalのフォーカストラップが外れない問題を修正

* fix

* fix

* Revert "記録するホットキーはレートリミット式にする"

This reverts commit 40a7509.

* Revert "fix(frontend): 直前のパターンを記録するように"

This reverts commit 5372b25.

* Revert "Revert "fix(frontend): 直前のパターンを記録するように""

This reverts commit a9bb52e.

* Revert "Revert "記録するホットキーはレートリミット式にする""

This reverts commit bdac342.

* 試験的にCypressでのFocustrapを無効化

* fix

* fix focus-trap

* Update Changelog

* ✌️

* fix focustrap invocation logic

* スクロールがsticky headerを考慮するように

* 🎨

* スタイルの微調整

* 🎨

* remove deprecated key aliases

* focusElementが足りなかったので修正

* preview系にfocus時スタイルが足りなかったので修正

* `returnFocusElement` -> `returnFocusTo`

* lint

* Update packages/frontend/src/components/MkModalWindow.vue

* Apply suggestions from code review

Co-authored-by: taiy <[email protected]>

* keydownイベントをまとめる

* use correct pesudo-element selector

* fix

* rename

---------

Co-authored-by: taiyme <[email protected]>
Co-authored-by: syuilo <[email protected]>

* fix(frontend): use proper import path

* fix: サジェストされるユーザのリストアップ方法を見直し (misskey-dev#14180)

* fix: サジェストされるユーザのリストアップ方法を見直し

* fix comment

* fix CHANGELOG.md

* ノートの無いユーザ(updatedAtが無いユーザ)は含めないらしい

* fix test

* fix(backend): デフォルトテーマに無効なテーマコードを入力するとUIが使用できなくなる問題を修正

Fix misskey-dev#13955

* fix(frontend): すでにfocus trap対象の要素にinertがかかっている場合は解除するように (misskey-dev#14189)

* fix(frontend): すでにfocus trap対象の要素にinertがかかっている場合は解除するように

* 他のfocus-trapped要素とのインタラクションがある場合の動作を変更

* typo

* fix(frontend): ホットキーのレートリミットがallowRepeatを考慮しない問題を修正 (misskey-dev#14192)

* refactor(sw): enable noImplicitAny (misskey-dev#14191)

* parse `notRespondingSince` from redis instance cache (misskey-dev#14079)

if we don't do this, we'll get a string, and `DeliverProcessorService`
will error out `i.notRespondingSince.getTime is not a function`

* deps(frontend): AiScript VSCodeのバージョンを上げる (misskey-dev#14199)

* fix(backend): 一般ユーザーから見たユーザーのバッジの一覧に公開されていないものが含まれることがある問題を修正 (misskey-dev#14195)

* enhance(backend): 公開バッジのみをpackするように (MisskeyIO#652)

(cherry picked from commit b8a9065)

* Update Changelog

* fix

* Update UserEntityService.ts

---------

Co-authored-by: CyberRex <[email protected]>

* Feat: ユーザーのアイコン/バナーの変更可否をロールで設定可能に (misskey-dev#14078)

* feat: implement role policy "canUpdateBioMedia"

* docs(changelog): update changelog

* docs(changelog): update changelog

* chore: regenerate misskey-js type definitions

* chore: Apply suggestion from code review

Co-authored-by: anatawa12 <[email protected]>

* chore: fix unnecessarily strict inequality check

* chore: policies should be gotten only once

---------

Co-authored-by: anatawa12 <[email protected]>

* test(backend): kill many `any` in backend test (partial) (misskey-dev#14054)

* kill any on utils:api

* kill any on timeline test

* use optional chain to kill TS2532 on timeline test
変更前: 該当ノートが見つからなければundefinedに対するプロパティアクセスとしてテストがクラッシュ
変更後: 該当ノートが見つからなければoptional chainがundefinedとして評価されるが、strictEqualの右辺がnon-nullableなためアサーションに失敗しテストがクラッシュ

* kill `as any` for ApMfmService

* kill argument any for api-visibility

* kill argument any across a few tests

* do not return value that has yielded from `await`-ing `Promise<void>`

* force cast

* runtime non-null assertion to coerce

* rewrite `assert.notEqual(expr, null)` to `assert.ok(expr)`
こうすることでassertion type扱いになり、non-nullableになる

* change return type of `failedApiCall` to `void`
戻り値がどこにも使われていない

* split bindings for exports.ts
型が合わなくて文句を言ってくるので適切に分割

* runtime non-null assertion

* runtime non-null assertion

* 何故かうまく行かないので、とりあえずXORしてみる

* Revert "何故かうまく行かないので、とりあえずXORしてみる"

This reverts commit 48cf32c.

* castAsErrorで安全ではないキャストを隠蔽

* 型アサーションの追加

* 型アサーションの追加

* 型アサーションの追加

* voidで値を返さない

* castAsError

* assert.ok => kill nullability

* もはや明示的な型の指定は必要ない

* castAsError

* castAsError

* 型アサーションの追加

* nullableを一旦抑止

* 変数を分離して型エラーを排除

* 不要なプロパティを削除する処理を隠蔽してanyを排除

* Repository type

* simple type

* assert.ok => kill nullability

* revert `as any` drop
reverts fe95c05 partialy

* test: fix invalid assertion
partially revert b99b7b5

* test: 52d8a54 により型が合うようになった部分の`as any`を除去

* format

* test: apply misskey-dev#14054 (comment) (part 1)

* test: use non-null assertion to suppress too many error

* Update packages/backend/test/utils.ts

Co-authored-by: anatawa12 <[email protected]>

---------

Co-authored-by: anatawa12 <[email protected]>

* enhance(frontend): サーバー情報・お問い合わせページを改修 (misskey-dev#14198)

* improve(frontend): サーバー情報・お問い合わせページを改修 (misskey-dev#238)

* Revert "Revert "enhance(frontend): add contact page" (misskey-dev#208)" (This reverts commit 5a329a0.)

* improve(frontend): サーバー情報・お問い合わせページを改修

(cherry picked from commit e72758d)

* fix

* Update Changelog

* tweak

* lint

* 既存の翻訳を使用するように

---------

Co-authored-by: taiy <[email protected]>

* enhance: 非ログイン時には別サーバーに遷移できるように (misskey-dev#13089)

* enhance: 非ログイン時にはMisskey Hub経由で別サーバーに遷移できるように

* fix

* サーバーサイド照会を削除

* クライアント側の照会動作

* hubを経由せずにリモートで続行できるように

* fix と pleaseLogin誘導箇所の追加

* fix

* fix

* Update CHANGELOG.md

---------

Co-authored-by: syuilo <[email protected]>

* refactor(misskey-js): enable exactOptionalPropertyTypes (misskey-dev#14203)

* refactor(misskey-js): enable exactOptionalPropertyTypes

* refactor(misskey-js): fix error where is appeared by enabling

* fix(frontend): Nested RouteのときにRouterViewに当たるキーがルートのpathとぶち当たる可能性があるのを修正 (misskey-dev#14202)

Co-authored-by: syuilo <[email protected]>

* ci: ワークフローが更新されたときにもワークフローが起動するようにする (misskey-dev#14207)

* ci: include themselves in `on.push.paths`
command: find .github/workflows -type f \( -name '*.yaml' -or -name '*.yml' \) | xargs -I {} yq_4.44.2-linux_x86-64 'select(.on.push.paths != null) | .[0] | map("{}")[0]' {} | xargs -I {} ~/.local/bin/yq_4.44.2-linux_x86-64 -i '.on.push.paths += ["{}"]' {}

* ci: include themselves in `on.pull_request.paths`
command: find .github/workflows -type f \( -name '*.yaml' -or -name '*.yml' \) | xargs -I {} yq_4.44.2-linux_x86-64 'select(.on.pull_request.paths != null) | .[0] | map("{}")[0]' {} | xargs -I {} ~/.local/bin/yq_4.44.2-linux_x86-64 -i '.on.pull_request.paths += ["{}"]' {}

* fix(frontend): follow-up of misskey-dev#13089 (misskey-dev#14206)

* fix(frontend): misskey-dev#13089 を修正

* fix

* 正規表現を強化

* fix

* enhance(backend): configにsignToActivityPubGetの指定が無い場合trueと見做すように

trueの方が望ましいため

* fix(backend): ユーザーのリアクション一覧でミュート/ブロックが機能していなかった問題を修正 (misskey-dev#14100)

* fix: mute/block was not considered on users/reactions

* docs(changelog): update changelog

* chore: Apply suggestion from code review

Co-authored-by: zyoshoka <[email protected]>

---------

Co-authored-by: zyoshoka <[email protected]>

* fix: error with trying to handle SIGKILL (misskey-dev#14208)

* chore(deps): bump actions/setup-node from 4.0.2 to 4.0.3 (misskey-dev#14165)

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v4.0.2...v4.0.3)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* ci: cache eslint (misskey-dev#14204)

* ci: cache eslint

* dummy commit to trigger

* fix syntax error

* Enhance(frontend): Allow negative delay in MFM (misskey-dev#14200)

Co-authored-by: easrng <[email protected]>

* enhance(backend): Load settings via environment variables (misskey-dev#14179)

* feat(backend): Load settings via environment variables

If they're not loaded from the config file.

* chore(docker): Add hints for environment variables

It supports users to know about them.

* docs(changelog): Add the description about this change

Users can notice what's changed by this PR.

* style(backend): Fix code syntax

To pass the linter.

* chore(backend): registed -> registered (misskey-dev#14213)

* chore(backend): registed -> registered

* Update CHANGELOG.md

* mattyatea Fork とマージ

* Fix: マージミス

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Caipira <[email protected]>
Co-authored-by: GrapeApple0 <[email protected]>
Co-authored-by: NoriDev <[email protected]>
Co-authored-by: まっちゃとーにゅ <[email protected]>
Co-authored-by: Ebise Lutica <[email protected]>
Co-authored-by: yukineko <[email protected]>
Co-authored-by: zyoshoka <[email protected]>
Co-authored-by: syuilo <[email protected]>
Co-authored-by: samunohito <[email protected]>
Co-authored-by: zyoshoka <[email protected]>
Co-authored-by: Kisaragi <[email protected]>
Co-authored-by: woxtu <[email protected]>
Co-authored-by: anatawa12 <[email protected]>
Co-authored-by: かっこかり <[email protected]>
Co-authored-by: tamaina <[email protected]>
Co-authored-by: taiy <[email protected]>
Co-authored-by: Gianni Ceccarelli <[email protected]>
Co-authored-by: CyberRex <[email protected]>
Co-authored-by: Sayamame-beans <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: easrng <[email protected]>
Co-authored-by: easrng <[email protected]>
Co-authored-by: Souma <[email protected]>
  • Loading branch information
1 parent a6edd50 commit 01ea99b
Show file tree
Hide file tree
Showing 2,154 changed files with 73,179 additions and 13,932 deletions.
13 changes: 10 additions & 3 deletions .config/docker_example.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# type4ny settings
# TYPE4NY_URL=https://example.tld/

# db settings
POSTGRES_PASSWORD=example-misskey-pass
POSTGRES_USER=example-misskey-user
POSTGRES_DB=misskey
POSTGRES_PASSWORD=example-type4ny-pass
# DATABASE_PASSWORD=${POSTGRES_PASSWORD}
POSTGRES_USER=example-type4ny-user
# DATABASE_USER=${POSTGRES_USER}
POSTGRES_DB=type4ny
# DATABASE_DB=${POSTGRES_DB}

DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}"
17 changes: 10 additions & 7 deletions .config/docker_example.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
# Misskey configuration
# Type4ny configuration
#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

# ┌─────┐
#───┘ URL └─────────────────────────────────────────────────────

# Final accessible URL seen by a user.
# You can set url from an environment variable instead.
url: https://example.tld/

# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
Expand All @@ -15,19 +16,19 @@ url: https://example.tld/
#───┘ Port and TLS settings └───────────────────────────────────

#
# Misskey requires a reverse proxy to support HTTPS connections.
# Type4ny requires a reverse proxy to support HTTPS connections.
#
# +----- https://example.tld/ ------------+
# +------+ |+-------------+ +----------------+|
# | User | ---> || Proxy (443) | ---> | Misskey (3000) ||
# | User | ---> || Proxy (443) | ---> | Type4ny (3000) ||
# +------+ |+-------------+ +----------------+|
# +---------------------------------------+
#
# You need to set up a reverse proxy. (e.g. nginx)
# An encrypted connection with HTTPS is highly recommended
# because tokens may be transferred in GET requests.

# The port that your Misskey server should listen on.
# The port that your Type4ny server should listen on.
port: 3000

# ┌──────────────────────────┐
Expand All @@ -38,11 +39,13 @@ db:
port: 5432

# Database name
db: misskey
# You can set db from an environment variable instead.
db: type4ny

# Auth
user: example-misskey-user
pass: example-misskey-pass
# You can set user and pass from environment variables instead.
user: example-type4ny-user
pass: example-type4ny-pass

# Whether disable Caching queries
#disableCache: true
Expand Down
36 changes: 19 additions & 17 deletions .config/example.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
# Misskey configuration
# Type4ny configuration
#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

# ┌──────────────────────────────┐
Expand All @@ -9,14 +9,14 @@
# First of all, let me tell you a story that may possibly be
# boring to you and possibly important to you.
#
# Misskey is licensed under the AGPLv3 license. This license is
# Type4ny is licensed under the AGPLv3 license. This license is
# known to be often misunderstood. Please read the following
# instructions carefully and select the appropriate option so
# that you do not negligently cause a license violation.
#

# --------
# Option 1: If you host Misskey AS-IS (without any changes to
# Option 1: If you host Type4ny AS-IS (without any changes to
# the source code. forks are not included).
#
# Step 1: Congratulations! You don't need to do anything.
Expand All @@ -28,16 +28,16 @@
# this repository. Strictly speaking, it doesn't have
# to be a Git repository, but you'll probably use Git!
#
# Step 1: Build and run the Misskey server first.
# Step 2: Open <https://your.misskey.example/admin/settings> in
# Step 1: Build and run the Type4ny server first.
# Step 2: Open <https://your.Type4ny.example/admin/settings> in
# your browser with the administrator account.
# Step 3: Enter the URL of your Git repository in the
# "Repository URL" field.

# --------
# Option 3: If neither of the above applies to you.
# (In this case, the source code should be published
# on the Misskey interface. IT IS NOT ENOUGH TO
# on the Type4ny interface. IT IS NOT ENOUGH TO
# DISCLOSE THE SOURCE CODE WHEN A USER REQUESTS IT BY
# E-MAIL OR OTHER MEANS. If you are not satisfied
# with this, it is recommended that you read the
Expand Down Expand Up @@ -72,38 +72,38 @@ url: https://example.tld/
#───┘ Port and TLS settings └───────────────────────────────────

#
# Misskey requires a reverse proxy to support HTTPS connections.
# Type4ny requires a reverse proxy to support HTTPS connections.
#
# +----- https://example.tld/ ------------+
# +------+ |+-------------+ +----------------+|
# | User | ---> || Proxy (443) | ---> | Misskey (3000) ||
# | User | ---> || Proxy (443) | ---> | Type4ny (3000) ||
# +------+ |+-------------+ +----------------+|
# +---------------------------------------+
#
# You need to set up a reverse proxy. (e.g. nginx)
# An encrypted connection with HTTPS is highly recommended
# because tokens may be transferred in GET requests.

# The port that your Misskey server should listen on.
# The port that your Type4ny server should listen on.
port: 3000

# You can also use UNIX domain socket.
# socket: /path/to/misskey.sock
# socket: /path/to/type4ny.sock
# chmodSocket: '777'

# ┌──────────────────────────┐
#───┘ PostgreSQL configuration └────────────────────────────────

db:
host: localhost
host: db
port: 5432

# Database name
db: misskey
db: type4ny

# Auth
user: example-misskey-user
pass: example-misskey-pass
user: example-type4ny-user
pass: example-type4ny-pass

# Whether disable Caching queries
#disableCache: true
Expand Down Expand Up @@ -133,7 +133,7 @@ dbReplications: false
#───┘ Redis configuration └─────────────────────────────────────

redis:
host: localhost
host: redis
port: 6379
#family: 0 # 0=Both, 4=IPv4, 6=IPv6
#pass: example-pass
Expand Down Expand Up @@ -252,7 +252,9 @@ id: 'aidx'
#outgoingAddressFamily: ipv4

# Proxy for HTTP/HTTPS
#proxy: http://127.0.0.1:3128
#



proxyBypassHosts:
- api.deepl.com
Expand Down Expand Up @@ -296,4 +298,4 @@ signToActivityPubGet: true
#maxFileSize: 262144000

# PID File of master process
#pidFile: /tmp/misskey.pid
#pidFile: /tmp/type4ny.pid
2 changes: 1 addition & 1 deletion .devcontainer/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ services:
environment:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: misskey
POSTGRES_DB: type4ny
volumes:
- postgres-data:/var/lib/postgresql/data
healthcheck:
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "Misskey",
"name": "Type4ny",
"dockerComposeFile": "compose.yml",
"service": "app",
"workspaceFolder": "/workspace",
Expand Down
10 changes: 5 additions & 5 deletions .devcontainer/devcontainer.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
# Misskey configuration
# Type4ny configuration
#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

# ┌─────┐
Expand All @@ -15,19 +15,19 @@ url: http://127.0.0.1:3000/
#───┘ Port and TLS settings └───────────────────────────────────

#
# Misskey requires a reverse proxy to support HTTPS connections.
# Type4ny requires a reverse proxy to support HTTPS connections.
#
# +----- https://example.tld/ ------------+
# +------+ |+-------------+ +----------------+|
# | User | ---> || Proxy (443) | ---> | Misskey (3000) ||
# | User | ---> || Proxy (443) | ---> | Type4ny (3000) ||
# +------+ |+-------------+ +----------------+|
# +---------------------------------------+
#
# You need to set up a reverse proxy. (e.g. nginx)
# An encrypted connection with HTTPS is highly recommended
# because tokens may be transferred in GET requests.

# The port that your Misskey server should listen on.
# The port that your Type4ny server should listen on.
port: 3000

# ┌──────────────────────────┐
Expand All @@ -38,7 +38,7 @@ db:
port: 5432

# Database name
db: misskey
db: type4ny

# Auth
user: postgres
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/api-misskey-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ on:
push:
paths:
- packages/misskey-js/**
- .github/workflows/api-misskey-js.yml
pull_request:
paths:
- packages/misskey-js/**

- .github/workflows/api-misskey-js.yml
jobs:
report:

Expand All @@ -20,7 +21,7 @@ jobs:
- run: corepack enable

- name: Setup Node.js
uses: actions/[email protected].2
uses: actions/[email protected].3
with:
node-version-file: '.node-version'
cache: 'pnpm'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Checkout head
uses: actions/[email protected]
- name: Setup Node.js
uses: actions/[email protected].2
uses: actions/[email protected].3
with:
node-version-file: '.node-version'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-misskey-js-autogen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

- name: setup node
id: setup-node
uses: actions/[email protected].2
uses: actions/[email protected].3
with:
node-version-file: '.node-version'
cache: pnpm
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/check-misskey-js-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ on:
paths:
- packages/misskey-js/package.json
- package.json
- .github/workflows/check-misskey-js-version.yml
pull_request:
branches: [ develop ]
paths:
- packages/misskey-js/package.json
- package.json

- .github/workflows/check-misskey-js-version.yml
jobs:
check-version:
# ルートの package.json と packages/misskey-js/package.json のバージョンが一致しているかを確認する
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
workflow_dispatch:

env:
REGISTRY_IMAGE: misskey/misskey
REGISTRY_IMAGE: mattyacocacora/prsmsk-msk
TAGS: |
type=edge
type=ref,event=pr
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/get-api-diff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
paths:
- packages/backend/**
- .github/workflows/get-api-diff.yml

- .github/workflows/get-api-diff.yml
jobs:
get-from-misskey:
runs-on: ubuntu-latest
Expand All @@ -34,7 +34,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/[email protected].2
uses: actions/[email protected].3
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
Expand Down
24 changes: 17 additions & 7 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ on:
- packages/frontend/**
- packages/sw/**
- packages/misskey-js/**
- packages/shared/.eslintrc.js
- packages/shared/eslint.config.js
- .github/workflows/lint.yml
pull_request:
paths:
- packages/backend/**
- packages/frontend/**
- packages/sw/**
- packages/misskey-js/**
- packages/shared/.eslintrc.js

- packages/shared/eslint.config.js
- .github/workflows/lint.yml
jobs:
pnpm_install:
runs-on: ubuntu-latest
Expand All @@ -28,7 +29,7 @@ jobs:
fetch-depth: 0
submodules: true
- uses: pnpm/action-setup@v4
- uses: actions/[email protected].2
- uses: actions/[email protected].3
with:
node-version-file: '.node-version'
cache: 'pnpm'
Expand All @@ -39,6 +40,8 @@ jobs:
needs: [pnpm_install]
runs-on: ubuntu-latest
continue-on-error: true
env:
eslint-cache-version: v1
strategy:
matrix:
workspace:
Expand All @@ -52,13 +55,20 @@ jobs:
fetch-depth: 0
submodules: true
- uses: pnpm/action-setup@v4
- uses: actions/[email protected].2
- uses: actions/[email protected].3
with:
node-version-file: '.node-version'
cache: 'pnpm'
- run: corepack enable
- run: pnpm i --frozen-lockfile
- run: pnpm --filter ${{ matrix.workspace }} run eslint
- name: Restore eslint cache
uses: actions/[email protected]
with:
path: node_modules/.cache/eslint
key: eslint-${{ env.eslint-cache-version }}-${{ hashFiles('/pnpm-lock.yaml') }}-${{ github.ref_name }}-${{ github.sha }}
restore-keys: |
eslint-${{ env.eslint-cache-version }}-${{ hashFiles('/pnpm-lock.yaml') }}-
- run: pnpm --filter ${{ matrix.workspace }} run eslint --cache --cache-location node_modules/.cache/eslint --cache-strategy content

typecheck:
needs: [pnpm_install]
Expand All @@ -75,7 +85,7 @@ jobs:
fetch-depth: 0
submodules: true
- uses: pnpm/action-setup@v4
- uses: actions/[email protected].2
- uses: actions/[email protected].3
with:
node-version-file: '.node-version'
cache: 'pnpm'
Expand Down
Loading

0 comments on commit 01ea99b

Please sign in to comment.