Skip to content

Commit

Permalink
Merge pull request #378 from kokonect-link/develop
Browse files Browse the repository at this point in the history
* Update misskey-js.api.md

* Update CHANGELOG.md

* enhance(frontend): improve note detail page

* enhance: 各ノートが被クリップ数を保持するようにし、無意味にnotes/clipsを叩かないように

* fix

* fix test

* fix(backend): MK_ONLY_SERVERオプションを指定した際にクラッシュする問題を修正

Fix: #11811

* New Crowdin updates (#11836)

* New translations ja-JP.yml (Romanian)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Arabic)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Dutch)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (Portuguese)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Slovak)

* New translations ja-JP.yml (Swedish)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Vietnamese)

* New translations ja-JP.yml (Indonesian)

* New translations ja-JP.yml (Bengali)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Uzbek)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Romanian)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Arabic)

* New translations ja-JP.yml (Catalan)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Greek)

* New translations ja-JP.yml (Hungarian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Dutch)

* New translations ja-JP.yml (Norwegian)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (Portuguese)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Slovak)

* New translations ja-JP.yml (Swedish)

* New translations ja-JP.yml (Turkish)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Vietnamese)

* New translations ja-JP.yml (Indonesian)

* New translations ja-JP.yml (Bengali)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Uzbek)

* New translations ja-JP.yml (Kannada)

* New translations ja-JP.yml (Lao)

* New translations ja-JP.yml (Kabyle)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Chinese Traditional)

* update aiscript to 0.16.0

* 2023.9.0-beta.7

* fix(frontend): 返信ではないノートの詳細ページが見れない(2023.9.0-beta.6)

* 2023.9.0-beta.8

* fix(frontend): prevent layout-shift of reactions viewer

Fix #11842

* tab

* Update .eslintrc.js

* feat: Mk:apiが失敗時エラー型の値を返すように (#2) (#11843)

* Mk:apiが失敗時エラー型の値を返すように (#2)

* Update CHANGELOG.md

* opts.callをtopCallに置換

* AiScriptのエラーコールバックをscratchpadに導入

* lint

* enhance(dev): 関数呼び出しの前にスペースを入れることを許可しない

* Update .eslintrc.js

* feat(frontend): 任意のユーザーリストをタイムラインページにピン留めできるように

* Update Dockerfile

* tweak 907d519

* 🎨

* Fix OffscreenCanvas undefined (MisskeyIO#165)

* Update CHANGELOG_CHERRYPICK.md

* Update CHANGELOG.md

* update sharp to 0.32.6 (MisskeyIO#166)

* Update pnpm-lock.yaml

* refactor(frontend): use ESM

* fix store.ts

* Revert "Update CHANGELOG.md"

This reverts commit 04c4089.

* Update CHANGELOG_CHERRYPICK.md

* Revert "デフォルトのダークテーマを「Rosé Pine Moon」に変更"

This reverts commit 3586627

* 2023.9.0-beta.8-cp-4.3.0-beta.6

* Scratchpadに非同期のエラーを処理する機能を追加 (#11850)

* opts.callをtopCallに置換

* AiScriptのエラーコールバックをscratchpadに導入

* lint

* Update CHANGELOG.md

* cjs

* fix(frontend): 環境によってはMisskey Webが開けない問題を修正

Fix #11846

* (add) highlight sensitive image

* Update Changelog

* (change) 設定の位置

* (add) apply mediaHighlight to video

* (change) image -> media

* Update CHANGELOG

* やっぱもうちょっと太い方がいい

* refactor(backend): extract clip-related logics to ClipService

* feat(frontend): スリープ無効化機能

Resolve #11853

* fix

* refactor(backend): update directory structure for models

* Update ClipService.ts

* fix import

* fix: provide NoSuchNoteError error

* Update Dockerfile (#11848)

* (fix) style

* update deps (#11849)

* update deps

* wip

* wip

* refactor

* New Crowdin updates (#11840)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Thai)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Vietnamese)

* 2023.9.0-beta.9

* update deps

* 🎨

* feat: プロフィールでのリンク検証

Resolve #11099

* enhance(frontend): tweak ui

* update deps

* 2023.9.0-beta.10

* feat: 指定したユーザーの投稿通知

Resolve #11499

* fix test

* tweak ui

* キューに予期しないデータが入っている場合、エンドポイントURLのパースもエラーログの作成も失敗する問題を修正 (MisskeyIO#168)

* Update CHANGELOG_CHERRYPICK.md

* Merge pull request #371

* feat(backend): Override the file URL rendering in AP

* Merge pull request #370

* enhance(frontend): Include fonts in vite build

* Update CHANGELOG_CHERRYPICK.md

* revert

* fix lang

* lint

* tweak fb75a2d

* enhance: 二要素認証設定時のセキュリティを強化 (#11863)

* enhance: 二要素認証設定時のセキュリティを強化

パスワード入力が必要な操作を行う際、二要素認証が有効であれば確認コードの入力も必要にする

* Update CoreModule.ts

* Update 2fa.ts

* wip

* wip

* Update 2fa.ts

* tweak

* Update CHANGELOG_CHERRYPICK.md

* feat: 通知で返信があるノートの親ノートを表示しないようにする設定を追加

* feat: リノートと引用ボタンの表示方法を選択できる

* feat(frontend): センシティブなメディアを目立たせる設定を追加 (#11851)

* (add) highlight sensitive image

* Update Changelog

* (change) 設定の位置

* (add) apply mediaHighlight to video

* (change) image -> media

* Update CHANGELOG

* やっぱもうちょっと太い方がいい

* (fix) style

* Update ja-JP.yml

---------

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

* fix locale

* lint

* fix(frontend/friendly): 特定の条件でページを更新すると、以前のページが表示される問題

* fix(backend): mostr.pub, Mitraのユーザーをフォローできない問題を修正 (#11791)

* fix(backend): mostr.pub, Mitraのユーザーをフォローできない問題を修正

* Revert "fix(backend): mostr.pub, Mitraのユーザーをフォローできない問題を修正"

This reverts commit 9685715e6470caffc2b0c7b991d55c5edf7fa0f1.

* fix ApResolverService

* Update CHANGELOG.md

* fix test

---------

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

* New Crowdin updates (#11856)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Swedish)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Japanese, Kansai)

* update deps

* feat: ユーザを除外できるアンテナ (#11277)

* feat: ユーザを除外できるアンテナ

* feat(backend/api): ユーザを除外できるアンテナの作成・更新

* feat(frontend): ユーザを除外できるアンテナの作成・更新

* docs(changelog): add アンテナで一部のユーザを除外したすべてのノートから受信できるようになりました

* fix: d.ts生成時にexport defaultを生成するように

* fix CHANGELOG.md

---------

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

* 2023.9.0-beta.11

* feat: 通知ウィジェットにフィルター、全て既読にするボタンを追加

* fix missing locale

* Update CHANGELOG_CHERRYPICK.md

* fix(frontend): リアクション一覧が種別ごとにフィルタできない

Fix #11865

* 🎨

Resolve #11867

* feat: 返信に投稿フォームを表示する機能を追加

* enhance(frontend): 一部の設定配置を変更

* fix v-if

* 🎨

* change fonts

* 2023.9.0-beta.11-cp-4.3.0-beta.7

* lint

* fix(frontend): 返信に投稿フォームが自動的にメンションを追加しないように

* fix(frontend): 返信に投稿フォームのautofocusを無効にする

* tweak f56c006

* enhance(frontend): プラグインのソースコードを確認・コピーできるように (#11873)

* (add) plugin: view and copy source code

* (fix) plugin permission ui

* Update Changelog

* Update ja-JP.yml

Fix #11870

* Update index.d.ts

* 🎨

* fix(backend): notes/reactionsのページネーションが機能しない

* 🎨

* enhance: PWAのshort_nameを設定可能に

* fix behavior of MkMenu.vue

* update deps

* 2023.9.0-rc.1

* コミット忘れ

* Merge pull request #375

* fix(backend): Troubleshoot Messaging Not Working

* cleanup imports

* fix lint

* fix lint

* add `@ + acct`

* fix: endpointを最初一度だけ呼び出すように

* any

* Merge pull request #377

* fix(backend): #375

* enhance(backend): refine moderation log (#10939)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update DriveService.ts

* fix

* New Crowdin updates (#11866)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Arabic)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Slovak)

* New translations ja-jp.yml (Ukrainian)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Bengali)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (English)

* 2023.9.0-rc.2

* chore

* lint

* fix: チャットの削除が正しく動作しない

* Update CHANGELOG_CHERRYPICK.md

* fix(frontend): ユーザーメニューで「チャットを開始」をクリックすると、間違ったページが呼び出される

* .js

* fix(frontend): 子メニューの表示位置がおかしい

* Update CHANGELOG.md

* tweak 5cb72b7

* 2023.9.0-rc.2-cp-4.3.0-beta.8

* improve moderation log

* .js

* update

* fix: ノート通知で絵文字が使われている名前が絵文字で表示されない #11877 (#11878)

* improve moderation log

* improve moderation log

* improve moderation log

* fix(frontend): アクセストークン発行の画面の権限が表示されない

Fix #11880

* Update CHANGELOG.md

* 🎨

* update deps

* New Crowdin updates (#11875)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Arabic)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Greek)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Dutch)

* New translations ja-jp.yml (Norwegian)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Slovak)

* New translations ja-jp.yml (Swedish)

* New translations ja-jp.yml (Turkish)

* New translations ja-jp.yml (Ukrainian)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Bengali)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Uzbek)

* New translations ja-jp.yml (Lao)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Arabic)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Dutch)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Slovak)

* New translations ja-jp.yml (Swedish)

* New translations ja-jp.yml (Turkish)

* New translations ja-jp.yml (Ukrainian)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Bengali)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Uzbek)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Romanian)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Italian)

* 2023.9.0-rc.3

* Update CHANGELOG.md

* tweak ui

* Mk:apiで外部サーバーとの接続を禁止 (#11883)

* Mk:url(): no automatic token attaching when ep is url

* Limit requests to external servers by Mk:api

* remove unused import

* Update CHANGELOG.md

* Update packages/frontend/src/scripts/aiscript/api.ts

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

---------

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

* improve moderation log

* improve moderation log

* Update index.d.ts

* fix(backend): Playを非公開にできない

Fix #11884

* Update update.ts

* 2023.9.0-rc.4

* fix

* Update DriveService.ts

* Update CHANGELOG.md

* New Crowdin updates (#11885)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (English)

* 2023.9.0

* fix(backend): お知らせのページネーションが機能しない #11800 (#11890)

* fix(backend): お知らせのページネーションが機能しない #11800

* Update CHANGELOG

* Add address bind config option (outgoingAddress) is feature of 2023.9 (#11894)

* enhance: improve moderation log

* fix(frontend): ログアウト状態でのノートメニュー内の詳細ボタンの表示をログイン状態と同じに (#11896)

* fix(frontend): ログアウト状態でのノートの詳細ボタンの表示をログイン状態と同じに

* Update CHANGELOG.md

* fix(backend): 「ユーザーの新規投稿」の通知設定を切り替えるとサーバー内部エラーが出る

Fix #11892

* 2023.9.1

* [skip ci] New Crowdin updates (#11891)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Traditional)

* enhance: improve moderation log

* build(deps): bump actions/checkout from 4.0.0 to 4.1.0 (#11900)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4.0.0...v4.1.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* lint

* lint

* 2023.9.0-cp-4.3.0-beta.9

* fix PostForm UI

* enhance(frontend): 「タイムライン上部に投稿フォームを表示する」オプションが有効になったときにautofocusを使用しないように

* fix: delete play add button

* chore

* fix index.vue

* enhance(frontend): ローカルユーザーのみグループに招待できるように

* chore

* .js

* feat: モバイルでユーザーページのヘッダーデザインを変更することができる

* 2023.9.0-cp-4.3.0-beta.10

* Update index.d.ts

* chore

* enhance(frontend): ノートを引用するときにautofocusを使用するように

* 2023.9.1-cp-4.3.0-beta.11

* Revert "fix(frontend): モーダルダイアログがsafe areaを侵犯しないように"

This reverts commit d1a1995

* enhance(frontend): ノートを投稿した方法によって、トースト通知のアイコンと内容が異なって表示されるように

* Update CHANGELOG_CHERRYPICK.md

* 2023.9.1-cp-4.3.0-beta.12

* test

* test

* chore

* fix(frontend): dynamic subsetsフォントを読み込む過程で読み込みに時間がかかりすぎる問題

test

test

* 2023.9.1-cp-4.3.0-rc.1

* feat: 振動機能をサポート

* feat(friendly): 長押しでアカウントメニューを表示するオプションを無効にすることができる

* feat(friendly): 通知領域とウィジェット領域の表示設定を「設定 - CherryPick」で変更することができる

* feat: ビルドベースのMisskeyバージョンを確認できる

* 2023.9.1-cp-4.3.0-rc.2

* tweak f13b479

* change: バージョン管理方式の変更

* change(frontend): 「常に広告を表示する」オプションのデフォルトを有効化に変更する

* Update pnpm-lock.yaml

* fonts

* 4.3.0-rc.3

* tweak f18e1e2

* enhance(frontend): 「Enterキーを押して送信」オプションに関係なく、チャットでEnterキーを押して送信するように強制する。

* Update CHANGELOG_CHERRYPICK.md

* enhance(frontend): 相手がチャットを読む前なら「送信済み」と表示するように

* fix(frontend): チャットページのスクロールが意図しない方向に動作することがある

* 4.3.0-rc.4

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: syuilo <[email protected]>
Co-authored-by: FineArchs <[email protected]>
Co-authored-by: typeling1578 <[email protected]>
Co-authored-by: まっちゃとーにゅ <[email protected]>
Co-authored-by: kakkokari-gtyih <[email protected]>
Co-authored-by: かっこかり <[email protected]>
Co-authored-by: Caipira <[email protected]>
Co-authored-by: anatawa12 <[email protected]>
Co-authored-by: taichan <[email protected]>
Co-authored-by: zyoshoka <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
12 people authored Sep 29, 2023
2 parents 0e281f5 + 7203e22 commit 4a177c6
Show file tree
Hide file tree
Showing 1,922 changed files with 38,842 additions and 20,116 deletions.
30 changes: 17 additions & 13 deletions .config/docker_example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@ dbReplications: false
# You can configure any number of replicas here
#dbSlaves:
# -
# host:
# port:
# db:
# user:
# pass:
# host: localhost
# port: 5433
# db: cherrypick
# user: example-cherrypick-user
# pass: example-cherrypick-pass
# -
# host:
# port:
# db:
# user:
# pass:
# host: localhost
# port: 5434
# db: cherrypick
# user: example-cherrypick-user
# pass: example-cherrypick-pass

# ┌─────────────────────┐
#───┘ Redis configuration └─────────────────────────────────────
Expand Down Expand Up @@ -114,14 +114,15 @@ redis:

# Available methods:
# aid ... Short, Millisecond accuracy
# aidx ... Millisecond accuracy
# meid ... Similar to ObjectID, Millisecond accuracy
# ulid ... Millisecond accuracy
# objectid ... This is left for backward compatibility

# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
# ID SETTINGS AFTER THAT!

id: 'aid'
id: 'aidx'

# ┌─────────────────────┐
#───┘ Other configuration └─────────────────────────────────────
Expand Down Expand Up @@ -153,6 +154,9 @@ id: 'aid'
# saKeyPath: /path/to/service-account-key.json
# logName: cherrypick

# Override the file URL rendering in ActivityPub (Object Storage file only)
#apFileBaseUrl: https://example.tld/

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

Expand All @@ -171,8 +175,8 @@ proxyBypassHosts:
# Media Proxy
#mediaProxy: https://example.com/proxy

# Proxy remote files (default: false)
#proxyRemoteFiles: true
# Proxy remote files (default: true)
proxyRemoteFiles: true

# Sign to ActivityPub GET request (default: true)
signToActivityPubGet: true
Expand Down
37 changes: 22 additions & 15 deletions .config/example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ url: https://example.tld/
# The port that your CherryPick server should listen on.
port: 3000

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

# ┌──────────────────────────┐
Expand Down Expand Up @@ -60,17 +60,17 @@ dbReplications: false
# You can configure any number of replicas here
#dbSlaves:
# -
# host:
# port:
# db:
# user:
# pass:
# host: localhost
# port: 5433
# db: cherrypick
# user: example-cherrypick-user
# pass: example-cherrypick-pass
# -
# host:
# port:
# db:
# user:
# pass:
# host: localhost
# port: 5434
# db: cherrypick
# user: example-cherrypick-user
# pass: example-cherrypick-pass

# ┌─────────────────────┐
#───┘ Redis configuration └─────────────────────────────────────
Expand Down Expand Up @@ -125,14 +125,15 @@ redis:

# Available methods:
# aid ... Short, Millisecond accuracy
# aidx ... Millisecond accuracy
# meid ... Similar to ObjectID, Millisecond accuracy
# ulid ... Millisecond accuracy
# objectid ... This is left for backward compatibility

# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
# ID SETTINGS AFTER THAT!

id: 'aid'
id: 'aidx'

# ┌─────────────────────┐
#───┘ Other configuration └─────────────────────────────────────
Expand All @@ -159,6 +160,9 @@ id: 'aid'
#deliverJobMaxAttempts: 12
#inboxJobMaxAttempts: 8

# Local address used for outgoing requests
#outgoingAddress: 127.0.0.1

# IP address family used for outgoing request (ipv4, ipv6 or dual)
#outgoingAddressFamily: ipv4

Expand All @@ -168,6 +172,9 @@ id: 'aid'
# saKeyPath: /path/to/service-account-key.json
# logName: cherrypick

# Override the file URL rendering in ActivityPub (Object Storage file only)
#apFileBaseUrl: https://example.tld/

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

Expand All @@ -189,9 +196,9 @@ proxyBypassHosts:
# * Perform image compression (on a different server resource than the main process)
#mediaProxy: https://example.com/proxy

# Proxy remote files (default: false)
# Proxy remote files (default: true)
# Proxy remote files by this instance or mediaProxy to prevent remote files from running in remote domains.
#proxyRemoteFiles: true
proxyRemoteFiles: true

# Movie Thumbnail Generation URL
# There is no reference implementation.
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"features": {
"ghcr.io/devcontainers-contrib/features/pnpm:2": {},
"ghcr.io/devcontainers/features/node:1": {
"version": "20.3.1"
"version": "20.5.1"
}
},
"forwardPorts": [3000],
Expand Down
30 changes: 17 additions & 13 deletions .devcontainer/devcontainer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@ dbReplications: false
# You can configure any number of replicas here
#dbSlaves:
# -
# host:
# port:
# db:
# user:
# pass:
# host: localhost
# port: 5433
# db: cherrypick
# user: example-cherrypick-user
# pass: example-cherrypick-pass
# -
# host:
# port:
# db:
# user:
# pass:
# host: localhost
# port: 5434
# db: cherrypick
# user: example-cherrypick-user
# pass: example-cherrypick-pass

# ┌─────────────────────┐
#───┘ Redis configuration └─────────────────────────────────────
Expand Down Expand Up @@ -114,14 +114,15 @@ redis:

# Available methods:
# aid ... Short, Millisecond accuracy
# aidx ... Millisecond accuracy
# meid ... Similar to ObjectID, Millisecond accuracy
# ulid ... Millisecond accuracy
# objectid ... This is left for backward compatibility

# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
# ID SETTINGS AFTER THAT!

id: 'aid'
id: 'aidx'

# ┌─────────────────────┐
#───┘ Other configuration └─────────────────────────────────────
Expand Down Expand Up @@ -153,6 +154,9 @@ id: 'aid'
# saKeyPath: /path/to/service-account-key.json
# logName: cherrypick

# Override the file URL rendering in ActivityPub (Object Storage file only)
#apFileBaseUrl: https://example.tld/

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

Expand All @@ -171,8 +175,8 @@ proxyBypassHosts:
# Media Proxy
#mediaProxy: https://example.com/proxy

# Proxy remote files (default: false)
#proxyRemoteFiles: true
# Proxy remote files (default: true)
proxyRemoteFiles: true

# Sign to ActivityPub GET request (default: true)
signToActivityPubGet: true
Expand Down
3 changes: 0 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
contact_links:
- name: 👪 Misskey Forum
url: https://forum.misskey.io/
about: Ask questions and share knowledge
- name: 💬 Misskey official Discord
url: https://discord.gg/Wp8gVStHW3
about: Chat freely about Misskey
Expand Down
2 changes: 1 addition & 1 deletion .github/cherrypick/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ db:
redis:
host: 127.0.0.1
port: 56312
id: aid
id: aidx
32 changes: 16 additions & 16 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@ updates:
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 0
open-pull-requests-limit: 100

# Add only the root, not each workspace item
# https://github.com/dependabot/dependabot-core/issues/4993#issuecomment-1289133027
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
# PNPM has an issue with dependabot. See:
# https://github.com/dependabot/dependabot-core/issues/7258
# https://github.com/pnpm/pnpm/issues/6530
# TODO: Restore this when the issue is solved
open-pull-requests-limit: 0
- package-ecosystem: npm
directory: "/packages/backend"
schedule:
interval: daily
open-pull-requests-limit: 0
- package-ecosystem: npm
directory: "/packages/frontend"
schedule:
interval: daily
open-pull-requests-limit: 0
- package-ecosystem: npm
directory: "/packages/sw"
schedule:
interval: daily
open-pull-requests-limit: 0
groups:
swc:
patterns:
- "@swc/*"
storybook:
patterns:
- "storybook*"
- "@storybook/*"
6 changes: 0 additions & 6 deletions .github/reviewer-lottery.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/api-cherrypick-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3.3.0
uses: actions/checkout@v4.1.0

- run: corepack enable

- name: Setup Node.js
uses: actions/setup-node@v3.6.0
uses: actions/setup-node@v3.8.1
with:
node-version-file: '.node-version'
cache: 'pnpm'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_copyright_year.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
check_copyright_year:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.2.0
- uses: actions/checkout@v4.1.0
- run: |
if [ "$(grep Copyright COPYING | sed -e 's/.*2014-\([0-9]*\) .*/\1/g')" -ne "$(date +%Y)" ]; then
echo "Please change copyright year!"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docker-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@ jobs:
if: github.repository == 'kokonect-link/cherrypick'
steps:
- name: Check out the repo
uses: actions/checkout@v3.3.0
uses: actions/checkout@v4.1.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2.3.0
uses: docker/setup-buildx-action@v3.0.0
with:
platforms: linux/amd64,linux/arm64
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: noridev/cherrypick
- name: Log in to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and Push to Docker Hub
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
builder: ${{ steps.buildx.outputs.name }}
context: .
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ jobs:

steps:
- name: Check out the repo
uses: actions/checkout@v3.3.0
uses: actions/checkout@v4.1.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2.3.0
uses: docker/setup-buildx-action@v3.0.0
with:
platforms: linux/amd64,linux/arm64
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: noridev/cherrypick
tags: |
Expand All @@ -31,12 +31,12 @@ jobs:
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
- name: Log in to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and Push to Docker Hub
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
builder: ${{ steps.buildx.outputs.name }}
context: .
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
env:
DOCKER_CONTENT_TRUST: 1
steps:
- uses: actions/checkout@v3.2.0
- uses: actions/checkout@v4.1.0
- run: |
curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v0.4.10/dockle_0.4.10_Linux-64bit.deb"
sudo dpkg -i dockle.deb
Expand Down
Loading

0 comments on commit 4a177c6

Please sign in to comment.