Skip to content

Merge Misskey 2026.3.2 and Xissmie spec follow-ups#28

Open
tempei-kishi wants to merge 585 commits intodevelopfrom
feature/v2026.3.2
Open

Merge Misskey 2026.3.2 and Xissmie spec follow-ups#28
tempei-kishi wants to merge 585 commits intodevelopfrom
feature/v2026.3.2

Conversation

@tempei-kishi
Copy link
Copy Markdown
Collaborator

概要

Misskey 2026.3.2 を取り込み、Xissmie 独自仕様(docs/xissmie-spec.md)に沿った差分を維持・再適用したブランチです。

主な内容

  • アップストリームマージ: 2026.3.2 相当の変更(コンフリクト解消・Xfolio / ストア連携の保持)
  • Web / メタ: TSX レイアウトで xfolio_api_host をフロントに渡す(frontend-shared 用)
  • フロント: 仕様 §3–4 に沿った UI 除外の再適用(ナビ・探索・検索・ミュート・ビジター / about 等)
  • ログイン誘導: please-login で「リモートで続行」オプションを出さない(閉じた会員向け)
  • settings/other: 非表示にした reportError の未使用モデル参照を削除

ビルド

ローカルで pnpm build は成功しています。

レビュー観点(任意)

  • Xfolio / ストアまわりの動作
  • 連合オフ前提の UI が意図どおりか
  • develop との差分が大きいため、コンフリクト解消方針(特にセキュリティ系マージとの関係)の確認

syuilo and others added 30 commits December 1, 2025 08:21
* enhance(backend): pugをやめ、JSXベースのテンプレートに変更 (to misskey-dev dev branch) (#16889)

* wip

* wip

* wip

* wip

* fix lint

* attempt to fix test

* fix

* fix

* fix: oauthページの描画がおかしい問題を修正

* typo [ci skip]

* fix

* fix

* fix

* fix

* fix

* refactor

* fix

* fix

* fix broken lockfile

* fix: expose supported languages as global variable

* remove i18n package from root as it is no longer required [ci skip]

* fix

* fix: add i18n package.json to Docker target-builder stage for federation tests (#16909)

* Initial plan

* fix: add i18n package.json to Docker target-builder stage for federation tests

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

* fix: followup-test-federation for enh-remove-pug (#16910)

* fix: followup-test-federation for enh-remove-pug

* Revert "fix: add i18n package.json to Docker target-builder stage for federation tests (#16909)"

This reverts commit 14313468d34f49c363eef4d0a932e9fc0d9a37fb.

* fix: CSSが読み込まれない場合がある問題を修正

* fix [ci skip]

* fix: propsのデフォルト値をnull合体演算子から論理和演算子に変更(空文字に対処するため)

* remove @types/pug

* enhance: bootloaderを埋め込むように

* fix possible race condition

* remove esbuild

---------

Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>
* enhance(backend): 起動前にconfigをjson化

* fix

* fix

* fix

* fix

* fix

* fix CHANGELOG.md

* fix

* Update CHANGELOG.md

* get original
* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Italian)
* Initial plan

* Add backend memory usage comparison action

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

* Fix deprecated serverProcess.killed usage

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

* Add explicit permissions to save-pr-number job

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

* Change PR comment text from Japanese to English

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

* Inline memory measurement script to fix base ref compatibility

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

* Revert "Inline memory measurement script to fix base ref compatibility"

This reverts commit 6f76a121efd450c257167cce6e298c59936f4e37.

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
* Change trustProxy default value to false

* Update trustProxy default value in example.yml

* Update trustProxy default description in example.yml
* wip

* Update config.ts

* wip

* convertは元ファイルを変更するようなニュアンスを若干感じるのでcompileに改名

* wip

* Update package.json

* Revert "Update package.json"

This reverts commit e5c28023168f4631dc6b36a14b35cfddbad1fac0.

* wip

* wip

* 謎

* clean up

* wip

* wip

* Revert "wip"

This reverts commit 3aa25ac7cf337d57412308e63d8f54e2536b0f7f.

* wip

* wip

* Update dummy.yml

* wip

* Update compile_config.js

* Update compile_config.js

* wip

* Revert "wip"

This reverts commit fd78e097c65f747962e7a411938a0e67538ed347.

* Update dummy.yml

* Update compile_config.js
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…skip] (#16860)

* fix(deps): update dependency @sentry/node to v10.27.0 [security]

* fix

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
…p] (#16919)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
…(#16940)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
github-actions bot and others added 25 commits March 9, 2026 09:32
* fix(backend): Acceptヘッダを署名の対象に含めないように

* Update Changelog
* fix(frontend): 絵文字パレットが空の状態でMisskeyについてのページが閲覧できない問題を修正

* Update Changelog

* extension

* add comment
* fix(backend): fix streaming note hiding logic

* Update Changelog

* refactor: avoid using generator function

---------

Co-authored-by: Acid Chicken <root@acid-chicken.com>
* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Turkish)

* 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 (Thai)

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

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Turkish)

* New translations ja-jp.yml (Turkish)

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

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Czech)
* fix(backend): チャンネルミュート使用時にユーザーのノート一覧読み込みに失敗する問題を修正

* more fix

* Update Changelog
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* fix: バックエンドのCSS読み込みの方法が悪いのを修正

* fix: 使用されないpreloadを削除

* Update Changelog

* add comments
* fix(frontend): ウィンドウのタイトルをクリックしても最前面に出ないのを修正

* Update Changelog
* enhance(frontend): ウィンドウの初期サイズを画面サイズから動的に決めるように

* Update Changelog

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
…folio, routes)

- Backend: upstream streaming/DI, fastify/@kitajs/html stack; merge NoteCreateService
  repos; ClientServerService store redirects; remove obsolete pug views
- Frontend: merge config (xfolio + prefersReducedMotion), mcaptcha core-glue,
  material-symbols; restore xissmie emoji UI, reactions, navbar, routes
- Regenerate pnpm-lock.yaml

Made-with: Cursor
- navbar: remove lookup, antennas, tools; drop openToolsMenu from common
- widgets: exclude serverMetric, onlineUsers, jobQueue, birthdayFollowings
  from picker (keep component registration for existing deck columns)
- get-user-menu: remove QR and add-to-antenna entries
- explore.users: local-only (no federation tab), tag hashtag uses local origin
- search.user/note: hide federation scope UI; note search local+user only
- settings/mute-block: remove instance mute section; fix MkFolder typo
- visitor dashboard: remove dead stats/chart imports and unused CSS
- about: drop charts achievement watch; overview: remove dead stats stub

Made-with: Cursor
Enforce Xissmie closed-network behavior by removing open-on-remote choices in the login prompt and clean up leftover unused preference state in settings/other.

Made-with: Cursor
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.