1
1
mirror of https://github.com/kokonect-link/cherrypick synced 2024-11-30 15:58:19 +09:00
Commit Graph

146 Commits

Author SHA1 Message Date
NoriDev
2d618a186d Merge remote-branch 'misskey/develop' 2024-03-20 21:42:37 +09:00
FineArchs
e4eaf1220e
Update example.yml (#13551) 2024-03-09 17:55:41 +09:00
NoriDev
5e2168dbdd Merge remote-branch 'misskey/develop' 2024-02-21 15:34:24 +09:00
Acid Chicken (硫酸鶏)
acba96c1d3
feat: license violation protection (#13285)
* spec(frontend): aboutページにリポジトリ・フィードバックのURLを表示させる

Cherry-picked from MisskeyIO#441
Cherry-picked from MisskeyIO#438

* feat: license violation protection

* build: fix typo

* build: fix typo

* fix: farewell to the static type land

* fix: key typo

* fix: import typo

* fix: properly interpret `prominently`

* docs: add disclaimer

* docs: update CHANGELOG

* chore: add gap

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-02-17 13:34:50 +09:00
NoriDev
c927d648a0 Merge remote-branch 'misskey/develop' 2024-02-01 17:19:38 +09:00
woxtu
cdac3988b5
fix(backend): Fix typos in job configurations (#13086)
* Fix typos

* Update CHANGELOG
2024-01-28 15:08:45 +09:00
NoriDev
d6e8ed0197 Merge remote-branch 'misskey/develop' 2024-01-10 17:30:21 +09:00
Chocolate Pie
072f67d6e7
feat: Add support for mCaptcha (#12905)
* feat: Add support for mCaptcha

* fix: Fix docker compose configuration

* chore(frontend/docs): update changelog & fix eslint errors

* `@mcaptcha/vanilla-glue`をダイナミックインポートするように

* chore: Add missing prefix to CHANGELOG

* refactor(backend): 適当につけた変数の名前を変更
2024-01-06 20:14:33 +09:00
NoriDev
06ab376a46 Merge remote-branch 'misskey/develop' 2023-12-13 17:01:31 +09:00
Camilla Ett
06ca63f9c2
Fix(backend): inboxJobPerSecのデフォルト値を16から32に (#12631) 2023-12-13 08:14:34 +09:00
Ryan He
e926411812
chore: Add descriptions for "MeiliSearch" and "allowedPrivateNetworks" to example.yml (#12594)
* Update example.yml, add descriptions for some items

Add descriptions for "MeiliSearch" and "allowedPrivateNetworks"

* Update docker_example.yml

Add descriptions for "MeiliSearch" and "allowedPrivateNetworks"
2023-12-07 17:00:34 +09:00
NoriDev
dd57560de6 Merge commit 'refs/pull/12594/head' of https://github.com/misskey-dev/misskey into develop 2023-12-07 13:39:38 +09:00
Ryan He
fe87ae3c5b
Update docker_example.yml
Add descriptions for "MeiliSearch" and "allowedPrivateNetworks"
2023-12-07 10:10:01 +08:00
Ryan He
c3970368ff
Update example.yml, add descriptions for some items
Add descriptions for "MeiliSearch" and "allowedPrivateNetworks"
2023-12-07 09:41:23 +08:00
NoriDev
81dc594742 Merge remote-branch 'misskey/develop' 2023-10-05 14:37:54 +09:00
syuilo
6277a5545c
feat: improve tl performance (#11946)
* wip

* wip

* wip

* wip

* wip

* wip

* Update NoteCreateService.ts

* wip

* wip

* wip

* wip

* Update NoteCreateService.ts

* wip

* Update NoteCreateService.ts

* wip

* Update user-notes.ts

* wip

* wip

* wip

* Update NoteCreateService.ts

* wip

* Update timeline.ts

* Update timeline.ts

* Update timeline.ts

* Update timeline.ts

* Update timeline.ts

* wip

* Update timelines.ts

* Update timelines.ts

* Update timelines.ts

* wip

* wip

* wip

* Update timelines.ts

* Update misskey-js.api.md

* Update timelines.ts

* Update timelines.ts

* wip

* wip

* wip

* Update timelines.ts

* wip

* Update timelines.ts

* wip

* test

* Update activitypub.ts

* refactor: UserListJoining -> UserListMembership

* Update NoteCreateService.ts

* wip
2023-10-03 20:26:11 +09:00
NoriDev
59950a019b cherrypick 2023-10-03 15:14:15 +09:00
NoriDev
7d5b3c1bdb Merge remote-branch 'misskey/develop' 2023-09-29 21:32:03 +09:00
CyberRex
5ad0906c89
feat(backend): MasterプロセスのPIDを書き出せるように (#11909) 2023-09-27 09:32:36 +09:00
NoriDev
59ad05a702 Merge branch 'develop' of https://github.com/kokonect-link/cherrypick into develop 2023-09-22 11:42:10 +09:00
Caipira
1959194cd6
Merge pull request #371
* feat(backend): Override the file URL rendering in AP
2023-09-22 11:34:50 +09:00
NoriDev
4eee67647d Merge remote-branch 'misskey/develop' 2023-09-07 17:57:17 +09:00
syuilo
ca00a08e6e feat: introduce aidx and make it default
Co-Authored-By: MeiMei <30769358+mei23@users.noreply.github.com>
2023-09-06 18:33:51 +09:00
NoriDev
1a608cfcdb Merge remote-branch 'misskey/develop' 2023-08-21 16:58:14 +09:00
Essem
3eacbe6b6d
enhance(backend): Add address bind config option (#11725)
* Add address bind config option

* Edit changelog

* forgot to add to types
2023-08-20 13:20:01 +09:00
NoriDev
8ccf966ef8 Merge remote-branch 'misskey/develop' 2023-08-08 16:03:36 +09:00
tamaina
2217a3c549
chore: cacheRemoteFilesのデフォルト値をfalseに (#11398)
* chore: cacheRemoteFilesのデフォルト値をfalseに

* proxyRemoteFiles to default

* update ja-JP.yml

* update ja-JP.yml

* youCanCleanRemoteFilesCache

* changelog

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-08-05 14:03:01 +09:00
NoriDev
ae130d5040 CherryPick 🍒 2023-07-29 20:29:03 +09:00
NoriDev
f5db28199c Merge remote-branch 'misskey/develop' 2023-07-21 16:46:23 +09:00
tamaina
0a06eb27da
enhance(backend): 設定ファイルでioredisの全てのオプションを指定可能に (#11329)
* enhance(backend): 設定ファイルでioredisの全てのオプションを指定可能に

* yappa kousuru

* fix

* fix?

* fix

* Revert "fix"

This reverts commit 227f19ff3afcbbd560b831493975206263a1a5a3.

* fix
2023-07-20 19:50:31 +09:00
NoriDev
26a2604134 Merge remote-branch 'misskey/develop' 2023-07-17 17:28:23 +09:00
dogcraft
5dab918999
enhance(backend): add unix socket support (#11275)
* unix socket support

* add changelog

* lint

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-07-17 14:12:02 +09:00
まっちゃとーにゅ
9e330c9e38
feat: MeilisearchにIndexするノートの範囲を設定できるように (#11282) 2023-07-15 09:59:19 +09:00
NoriDev
81fa487b42 tweak d04df47f 2023-06-18 19:16:19 +09:00
caipira113
d04df47f7d Add Cloud Logging Support 2023-06-18 19:11:42 +09:00
NoriDev
d0339758af CherryPick🍒 2023-05-28 18:35:56 +09:00
NoriDev
c11aa0f336 Merge remote-branch 'misskey/master' 2023-05-13 19:50:38 +09:00
NoriDev
a3ea3bba41 Merge remote-branch 'ltlapy/develop-v13' 2023-05-12 20:25:08 +09:00
syuilo
1cc106b8de fix(backend): ひとつのMeilisearchサーバーを複数のMisskeyサーバーで使えない問題を修正 2023-05-11 21:09:29 +09:00
NoriDev
97c4782014 Merge remote-branch 'upstream/develop' 2023-05-11 20:55:13 +09:00
Caipira
ae21b75687
fix(backend): Use SSL option for Meilisearch (#10772) 2023-05-06 04:02:34 +09:00
syuilo
5c08f2b93b
feat: Introduce Meilisearch (#10755)
* wip

* wip

* Update SearchService.ts

* Update SearchService.ts

* wip

* wip

* Update SearchService.ts

* Update CHANGELOG.md

* wip

* Update SearchService.ts

* Update docker-compose.yml.example
2023-05-05 08:52:14 +09:00
Namekuji
d28866f71a
enhance: account migration (#10592)
* copy block and mute then create follow and unfollow jobs

* copy block and mute and update lists when detecting an account has moved

* no need to care promise orders

* refactor updating actor and target

* automatically accept if a locked account had accepted an old account

* fix exception format

* prevent the old account from calling some endpoints

* do not unfollow when moving

* adjust following and follower counts

* check movedToUri when receiving a follow request

* skip if no need to adjust

* Revert "disable account migration"

This reverts commit 2321214c98.

* fix translation specifier

* fix checking alsoKnownAs and uri

* fix updating account

* fix refollowing locked account

* decrease followersCount if followed by the old account

* adjust following and followers counts when unfollowing

* fix copying mutings

* prohibit moved account from moving again

* fix move service

* allow app creation after moving

* fix lint

* remove unnecessary field

* fix cache update

* add e2e test

* add e2e test of accepting the new account automatically

* force follow if any error happens

* remove unnecessary joins

* use Array.map instead of for const of

* ユーザーリストの移行は追加のみを行う

* nanka iroiro

* fix misskey-js?

* ✌️

* 移行を行ったアカウントからのフォローリクエストの自動許可を調整

* newUriを外に出す

* newUriを外に出す2

* clean up

* fix newUri

* prevent moving if the destination account has already moved

* set alsoKnownAs via /i/update

* fix database initialization

* add return type

* prohibit updating alsoKnownAs after moving

* skip to add to alsoKnownAs if toUrl is known

* skip adding to the list if it already has

* use Acct.parse instead

* rename error code

* 🎨

* 制限を5から10に緩和

* movedTo(Uri), alsoKnownAsはユーザーidを返すように

* test api res

* fix

* 元アカウントはミュートし続ける

* 🎨

* unfollow

* fix

* getUserUriをUserEntityServiceに

* ?

* job!

* 🎨

* instance => server

* accountMovedShort, forbiddenBecauseYouAreMigrated

* accountMovedShort

* fix test

* import, pin禁止

* 実績を凍結する

* clean up

* ✌️

* change message

* ブロック, フォロー, ミュート, リストのインポートファイルの制限を32MiBに

* Revert "ブロック, フォロー, ミュート, リストのインポートファイルの制限を32MiBに"

This reverts commit 3bd7be35d8aa455cb01ae58f8172a71a50485db1.

* validateAlsoKnownAs

* 移行後2時間以内はインポート可能なファイルサイズを拡大

* clean up

* どうせactorをupdatePersonで更新するならupdatePersonしか移行処理を発行しないことにする

* handle error?

* リモートからの移行処理の条件を是正

* log, port

* fix

* fix

* enhance(dev): non-production環境でhttpサーバー間でもユーザー、ノートの連合が可能なように

* refactor (use checkHttps)

* MISSKEY_WEBFINGER_USE_HTTP

* Environment Variable readme

* NEVER USE IN PRODUCTION

* fix punyHost

* fix indent

* fix

* experimental

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-04-30 00:09:29 +09:00
syuilo
9114c8cb8e feat(backend): support replication of postgresql
Resolve #10205
2023-04-08 15:53:36 +09:00
syuilo
239d3f2dbf feat(backend): ジョブキュー用Redisを別サーバーに分離できるように 2023-04-07 11:27:01 +09:00
syuilo
ff6d9d2860 feat(backend): イベント用Redisを別サーバーに分離できるように 2023-04-07 11:20:14 +09:00
syuilo
5b3a07ee9e Revert "Allow configuring the listen host (#9924)"
This reverts commit 3dfe3aa9a4.
2023-02-22 18:00:35 +09:00
ledlamp
3dfe3aa9a4
Allow configuring the listen host (#9924) 2023-02-22 17:51:40 +09:00
tamaina
ee03ab8d2c
enhance(server): videoThumbnailGenerator config (#9845)
* enhance(server): videoThumbnailGenerator config

* ✌️

* fix

* 相対url

* サムネイルのproxyRemoteFilesは直接プロキシを指定する

* メディアプロキシ
2023-02-12 09:13:47 +09:00
NoriDev
9b97f229ee Merge remote-branch 'upstream/master' 2023-02-05 20:25:27 +09:00