merge upstream for 2024.2.1
What does this PR do?
I've merged https://github.com/misskey-dev/misskey/pull/13447/ and made some minor adjustments (re-generated pnpm-lock.yaml
(maybe even correctly, by pnpm install --no-frozen-lockfile
), aligned NoteEditService
and notes/edit.ts
with their "create" counterparts, added missing English translations).
I expect the PR upstream to receive more commits before getting merged, I'll merge again when that happens.
This is my first big merge, so please pay extra attention! I may have broken things! (It builds, it seems to run, I can post and edit, notifications look fine, but still!)
Contribution Guidelines By submitting this merge request, you agree to follow our Contribution Guidelines
-
I agree to follow this project's Contribution Guidelines -
I have made sure to test this pull request
Merge request reports
Activity
added high priority upstream labels
added 7 commits
- 7362f2b7 - remove (unused) `node:vm` import
- 0c4df743 - fix activitypub test w.r.t. remote user collections
- ea2770a8 - remove failing notes/create param validation test
- 9fa46278 - remove references to undefined styles
- 096fedce - fix `notificationTypes` (was missing `edited`)
- e2f8c147 - whitespace linting
- 677b9cc5 - update some types
Toggle commit listadded 15 commits
- 677b9cc5...14a3af67 - 5 earlier commits
- 2f31606e - update deps
- 16440d6b - Update CHANGELOG.md
- 5befd66e - Update CHANGELOG.md
- ca639943 - format
- 5904d982 - Update packages/backend/test/e2e/mute.ts
- 6158ef13 - format
- 4c6fc158 - Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
- d1bf432e - add missing license headers
- ea60cc6f - Merge remote-tracking branch 'misskey/develop' into merge/2024-02-29
- d2b1748c - regenerate `pnpm-lock.yaml`
Toggle commit listunsure if this was due to this update or something to do with my merge/fork but the docker build seems to fail due to missing node-pre-gyp (https://github.com/ShittyKopper/Sharkey/actions/runs/8111481920/job/22170820699).
can be fixed by upgrading argon2 like so kopper/Sharkey@2935d7fb
added 4 commits
- eb60460d - enhance: 禁止ワードチェック強化 (#27 (closed))
- ba9d47fb - 2024.3.0
- fe5efd92 - New translations ja-jp.yml (Chinese Traditional) (#13480)
- da331036 - Merge remote-tracking branch 'misskey/develop' into merge/2024-02-29
Toggle commit listadded 2 commits
added 1 commit
- 687035c5 - fix emoji picker when custom emoji are deleted - fixes #434 (closed)
@all ^
@dakkar I don't really know how to review something like this. I can't go through all the upstream changes, but there doesn't seem to be a way to filter them out either.
we are reviewing upstream changes…
main things I look for:
- changes in areas that I remember having problems (we can check on test instances that things didn't break in that area)
- changes in areas that we have duplicated (e.g. changes in "create note" must be ported to "edit note", changes in
MkNote*
may need copying toSkNote*
) - code that looks weird / wrong (yes, upstream sometimes releases broken code, I've already pointed them at a fix I added here)
added 10 commits
- f7048919 - fix: emoji colorization
- 114d3319 - chore(client): 絵文字の画像読み込みに失敗した際はテキストではなくダミー画像を表示 (#13487)
- 32690f57 - fix(frontend): ピン留め or 履歴に表示されるカスタム絵文字がサーバから削除されるとリアクションが出来なくなる (#13486)
- ecc5deca - New Crowdin updates (#13489)
- 21e3a913 - Update CHANGELOG.md
- b83cbc6d - Update CHANGELOG.md
- 2744cbd3 - fix(frontend): MkCustomEmojiでフォールバックをテキストか画像か選べるように
- 3afdafed - 2024.3.1
- efda2e9b - Update README.md
- b7331fda - Merge remote-tracking branch 'misskey/develop' into merge/2024-02-29
Toggle commit list