Merge d287d43c98 into d2154214ba

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.config/example.yml

@@ -107,14 +107,39 @@ port: 3000
 
 # Proxy trust settings
 #
-# Changes how the server interpret the origin IP of the request.
+# Specifies the IP addresses that Misskey will use as trusted
+# reverse proxies (e.g., nginx, Cloudflare). This affects how
+# Misskey determines the source IP for each request and is used
+# for important rate limiting and security features. If the value
+# is not set correctly, Misskey may use the IP address of the
+# reverse proxy instead of the actual source IP, which may lead to
+# unintended rate limiting or security vulnerabilities.
+# By default, the loopback network and private network address
+# ranges shown below are trusted.
+# If you are using a single reverse proxy and it is on the same
+# machine or the same private network as Misskey, it is unlikely you
+# need to change this setting, and the default setting is fine.
+# Also, if you are using multiple reverse proxy servers and they are
+# all on the same private network as Misskey, the default setting
+# is fine.
+# However, if you are using a reverse proxy server that accesses
+# Misskey web servers and streaming servers via public IP addresses
+# (for example, Cloudflare), you must set this variable.
+# When changing this setting, you can use one of the following values:
 #
-# Any format supported by Fastify is accepted.
+# - true: Trust all proxies
-# Default: trust all proxies (i.e. trustProxy: true)
+# - false: Do not trust any proxies
-# See: https://fastify.dev/docs/latest/reference/server/#trustproxy
+# - IP address, IP address range, or array of them: Trust hops that
-# To improve security, we recommend that you configure your settings appropriately.
+#   match the specified criteria.
-# Incorrect configuration can cause issues such as difficulty signing in,
+# - Integer: Trust the nth hop from the front-facing proxy server as
-# so please configure your settings carefully.
+#   the client.
+# For more information on how to configure this setting, please refer
+# to the Fastify documentation:
+# https://fastify.dev/docs/latest/Reference/Server/#trustproxy
+#
+# Note that if this variable is set, it overrides the default range,
+# so if you have both an external reverse proxy and a proxy on the
+# local host, you must include both IPs (or IP ranges).
 #
 #trustProxy:
 #  - '10.0.0.0/8'
@@ -123,6 +148,10 @@ port: 3000
 #  - '127.0.0.1/32'
 #  - '::1/128'
 #  - 'fc00::/7'
+#  # Example: If you are using some external reverse proxies like CDNs,
+#  # you may need to add the CDN IP ranges here.
+#  # If you're using Cloudflare, you can find IP Ranges at:
+#  # https://www.cloudflare.com/ips/
 
 #   ┌──────────────────────────┐
 #───┘ PostgreSQL configuration └────────────────────────────────
@@ -292,6 +321,10 @@ id: 'aidx'
 # Whether disable HSTS
 #disableHsts: true
 
+# Enable internal IP-based rate limiting (default: true)
+# To configure them in reverse proxy instead, set this to false.
+#enableIpRateLimit: true
+
 # Number of worker processes
 #clusterLimit: 1
 

.dockerignore

@@ -6,6 +6,7 @@
 Dockerfile
 build/
 built/
+src-js/
 db/
 .devcontainer/compose.yml
 node_modules/

.github/ISSUE_TEMPLATE/01_bug-report.yml

@@ -54,7 +54,7 @@ body:
           * Model and OS of the device(s): MacBook Pro (14inch, 2021), macOS Ventura 13.4
           * Browser: Chrome 113.0.5672.126
           * Server URL: misskey.example.com
-          * Misskey: 2025.x.x
+          * Misskey: 2026.x.x
       value: |
         * Model and OS of the device(s):
         * Browser:
@@ -74,7 +74,7 @@ body:
 
         Examples:
           * Installation Method or Hosting Service: docker compose, k8s/docker, systemd, "Misskey install shell script", development environment
-          * Misskey: 2025.x.x
+          * Misskey: 2026.x.x
           * Node: 20.x.x
           * PostgreSQL: 18.x.x
           * Redis: 7.x.x

.github/copilot-instructions.md

@@ -0,0 +1,3 @@
+# Copilot Instructions for Misskey
+
+- en-US.yml を編集しないでください。

.github/workflows/dockle.yml

@@ -11,6 +11,7 @@ on:
 jobs:
   dockle:
     runs-on: ubuntu-latest
+
     env:
       DOCKER_CONTENT_TRUST: 1
       DOCKLE_VERSION: 0.4.15
@@ -20,29 +21,33 @@ jobs:
 
       - name: Download and install dockle v${{ env.DOCKLE_VERSION }}
         run: |
+          set -eux
           curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v${DOCKLE_VERSION}/dockle_${DOCKLE_VERSION}_Linux-64bit.deb"
           sudo dpkg -i dockle.deb
 
-      - run: |
+      - name: Build web image (docker build)
-          cp .config/docker_example.env .config/docker.env
-          cp ./compose_example.yml ./compose.yml
-
-      - run: |
-          docker compose up -d web
-          IMAGE_ID=$(docker compose images --format json web | jq -r '.[0].ID')
-          docker tag "${IMAGE_ID}" misskey-web:latest
-
-      - name: Prune docker junk (optional but recommended)
         run: |
-          docker system prune -af
+          set -eux
-          docker volume prune -f
+          docker build -t "misskey-web:ci" .
+          docker image ls
 
-      - name: Save image for Dockle
+      - name: Mount tmpfs for Dockle tar
+        env:
+          TMPFS_SIZE: 8G
         run: |
-          docker save misskey-web:latest -o ./misskey-web.tar
+          set -eux
-          ls -lh ./misskey-web.tar
+          sudo mkdir -p /mnt/dockle-tmp
+          sudo mount -t tmpfs -o size=${{ env.TMPFS_SIZE }} tmpfs /mnt/dockle-tmp
+          free -h
+          df -h
 
-      - name: Run Dockle with tar input
+      - name: Save image tar into tmpfs
         run: |
-          dockle --exit-code 1 --input ./misskey-web.tar
+          set -eux
+          docker save misskey-web:ci -o /mnt/dockle-tmp/misskey-web.tar
+          ls -lh /mnt/dockle-tmp/misskey-web.tar
 
+      - name: Run Dockle Scan (tar input)
+        run: |
+          set -eux
+          dockle --exit-code 1 --input /mnt/dockle-tmp/misskey-web.tar

.github/workflows/report-backend-memory.yml

@@ -54,55 +54,110 @@ jobs:
           BASE_MEMORY=$(cat ./artifacts/memory-base.json)
           HEAD_MEMORY=$(cat ./artifacts/memory-head.json)
 
-          BASE_RSS=$(echo "$BASE_MEMORY" | jq -r '.memory.rss // 0')
+          variation() {
-          HEAD_RSS=$(echo "$HEAD_MEMORY" | jq -r '.memory.rss // 0')
+            calc() {
+              BASE=$(echo "$BASE_MEMORY" | jq -r ".${1}.${2} // 0")
+              HEAD=$(echo "$HEAD_MEMORY" | jq -r ".${1}.${2} // 0")
 
-          # Calculate difference
+              DIFF=$((HEAD - BASE))
-          if [ "$BASE_RSS" -gt 0 ] && [ "$HEAD_RSS" -gt 0 ]; then
+              if [ "$BASE" -gt 0 ]; then
-            DIFF=$((HEAD_RSS - BASE_RSS))
+                DIFF_PERCENT=$(echo "scale=2; ($DIFF * 100) / $BASE" | bc)
-            DIFF_PERCENT=$(echo "scale=2; ($DIFF * 100) / $BASE_RSS" | bc)
+              else
+                DIFF_PERCENT=0
+              fi
 
-            # Convert to MB for readability
+              # Convert KB to MB for readability
-            BASE_MB=$(echo "scale=2; $BASE_RSS / 1048576" | bc)
+              BASE_MB=$(echo "scale=2; $BASE / 1024" | bc)
-            HEAD_MB=$(echo "scale=2; $HEAD_RSS / 1048576" | bc)
+              HEAD_MB=$(echo "scale=2; $HEAD / 1024" | bc)
-            DIFF_MB=$(echo "scale=2; $DIFF / 1048576" | bc)
+              DIFF_MB=$(echo "scale=2; $DIFF / 1024" | bc)
 
-            echo "base_mb=$BASE_MB" >> "$GITHUB_OUTPUT"
+              JSON=$(jq -c -n \
-            echo "head_mb=$HEAD_MB" >> "$GITHUB_OUTPUT"
+                --argjson base "$BASE_MB" \
-            echo "diff_mb=$DIFF_MB" >> "$GITHUB_OUTPUT"
+                --argjson head "$HEAD_MB" \
-            echo "diff_percent=$DIFF_PERCENT" >> "$GITHUB_OUTPUT"
+                --argjson diff "$DIFF_MB" \
-            echo "has_data=true" >> "$GITHUB_OUTPUT"
+                --argjson diff_percent "$DIFF_PERCENT" \
+                '{base: $base, head: $head, diff: $diff, diff_percent: $diff_percent}')
 
-            # Determine if this is a significant change (more than 5% increase)
+              echo "$JSON"
-            if [ "$(echo "$DIFF_PERCENT > 5" | bc)" -eq 1 ]; then
+            }
-              echo "significant_increase=true" >> "$GITHUB_OUTPUT"
+
-            else
+            JSON=$(jq -c -n \
-              echo "significant_increase=false" >> "$GITHUB_OUTPUT"
+              --argjson VmRSS "$(calc $1 VmRSS)" \
-            fi
+              --argjson VmHWM "$(calc $1 VmHWM)" \
-          else
+              --argjson VmSize "$(calc $1 VmSize)" \
-            echo "has_data=false" >> "$GITHUB_OUTPUT"
+              --argjson VmData "$(calc $1 VmData)" \
-          fi
+              '{VmRSS: $VmRSS, VmHWM: $VmHWM, VmSize: $VmSize, VmData: $VmData}')
+
+            echo "$JSON"
+          }
+
+          JSON=$(jq -c -n \
+            --argjson beforeGc "$(variation beforeGc)" \
+            --argjson afterGc "$(variation afterGc)" \
+            --argjson afterRequest "$(variation afterRequest)" \
+            '{beforeGc: $beforeGc, afterGc: $afterGc, afterRequest: $afterRequest}')
+
+          echo "res=$JSON" >> "$GITHUB_OUTPUT"
       - id: build-comment
         name: Build memory comment
+        env:
+          RES: ${{ steps.compare.outputs.res }}
         run: |
-          HEADER="## Backend Memory Usage Comparison"
+          HEADER="## Backend memory usage comparison"
           FOOTER="[See workflow logs for details](https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID})"
 
           echo "$HEADER" > ./output.md
           echo >> ./output.md
 
-          if [ "${{ steps.compare.outputs.has_data }}" == "true" ]; then
+          table() {
-            echo "| Metric | base | head | Diff |" >> ./output.md
+            echo "| Metric | base (MB) | head (MB) | Diff (MB) | Diff (%) |" >> ./output.md
-            echo "|--------|------|------|------|" >> ./output.md
+            echo "|--------|------:|------:|------:|------:|" >> ./output.md
-            echo "| RSS | ${{ steps.compare.outputs.base_mb }} MB | ${{ steps.compare.outputs.head_mb }} MB | ${{ steps.compare.outputs.diff_mb }} MB (${{ steps.compare.outputs.diff_percent }}%) |" >> ./output.md
-            echo >> ./output.md
 
-            if [ "${{ steps.compare.outputs.significant_increase }}" == "true" ]; then
+            line() {
-              echo "⚠️ **Warning**: Memory usage has increased by more than 5%. Please verify this is not an unintended change." >> ./output.md
+              METRIC=$2
-              echo >> ./output.md
+              BASE=$(echo "$RES" | jq -r ".${1}.${2}.base")
-            fi
+              HEAD=$(echo "$RES" | jq -r ".${1}.${2}.head")
-          else
+              DIFF=$(echo "$RES" | jq -r ".${1}.${2}.diff")
-            echo "Could not retrieve memory usage data." >> ./output.md
+              DIFF_PERCENT=$(echo "$RES" | jq -r ".${1}.${2}.diff_percent")
+
+              if (( $(echo "$DIFF_PERCENT > 0" | bc -l) )); then
+                DIFF="+$DIFF"
+                DIFF_PERCENT="+$DIFF_PERCENT"
+              fi
+
+              # highlight VmRSS
+              if [ "$2" = "VmRSS" ]; then
+                METRIC="**${METRIC}**"
+                BASE="**${BASE}**"
+                HEAD="**${HEAD}**"
+                DIFF="**${DIFF}**"
+                DIFF_PERCENT="**${DIFF_PERCENT}**"
+              fi
+
+              echo "| ${METRIC} | ${BASE} MB | ${HEAD} MB | ${DIFF} MB | ${DIFF_PERCENT}% |" >> ./output.md
+            }
+
+            line $1 VmRSS
+            line $1 VmHWM
+            line $1 VmSize
+            line $1 VmData
+          }
+
+          echo "### Before GC" >> ./output.md
+          table beforeGc
+          echo >> ./output.md
+
+          echo "### After GC" >> ./output.md
+          table afterGc
+          echo >> ./output.md
+
+          echo "### After Request" >> ./output.md
+          table afterRequest
+          echo >> ./output.md
+
+          # Determine if this is a significant change (more than 5% increase)
+          if [ "$(echo "$RES" | jq -r '.afterGc.VmRSS.diff_percent | tonumber > 5')" = "true" ]; then
+            echo "⚠️ **Warning**: Memory usage has increased by more than 5%. Please verify this is not an unintended change." >> ./output.md
             echo >> ./output.md
           fi
 

.github/workflows/test-backend.yml

@@ -48,6 +48,13 @@ jobs:
         image: redis:7
         ports:
           - 56312:6379
+      meilisearch:
+        image: getmeili/meilisearch:v1.3.4
+        ports:
+          - 57712:7700
+        env:
+          MEILI_NO_ANALYTICS: true
+          MEILI_ENV: development
 
     steps:
     - uses: actions/checkout@v6.0.1

.gitignore

@@ -46,6 +46,7 @@ docker-compose.yml
 built
 built-test
 js-built
+src-js
 /data
 /.cache-loader
 /db

CHANGELOG.md

@@ -1,19 +1,64 @@
+## 2026.1.0
+
+### Note
+- `users/following` の `birthday` プロパティは非推奨になりました。代わりに `users/get-following-birthday-users` をご利用ください。
+
+### General
+- Enhance: 「もうすぐ誕生日のユーザー」ウィジェットで、誕生日が至近のユーザーも表示できるように  
+  (Cherry-picked from https://github.com/MisskeyIO/misskey)
+	- 「今日誕生日のユーザー」は「もうすぐ誕生日のユーザー」に名称変更されました
+- 依存関係の更新
+
+### Client
+- Enhance: ドライブのファイル一覧で自動でもっと見るを利用可能に
+- Enhance: ウィジェットの表示設定をプレビューを見ながら行えるように
+- Enhance: ウィジェットの設定項目のラベルの多言語対応
+- Enhance: 画面幅が広いときにメディアを横並びで表示できるようにするオプションを追加
+- Enhance: パフォーマンスの向上
+- Fix: ドライブクリーナーでファイルを削除しても画面に反映されない問題を修正 #16061
+- Fix: 非ログイン時にログインを求めるダイアログが表示された後にダイアログのぼかしが解除されず操作不能になることがある問題を修正
+- Fix: ドライブのソートが「登録日（昇順）」の場合に正しく動作しない問題を修正
+- Fix: 高度なMFMのピッカーを使用する際の挙動を改善
+- Fix: 管理画面でアーカイブ済のお知らせを表示した際にアクティブなお知らせが多い旨の警告が出る問題を修正
+- Fix: ファイルタブのセンシティブメディアを開く際に確認ダイアログを出す設定が適用されない問題を修正
+- Fix: 2月29日を誕生日に設定している場合、閏年以外は3月1日を誕生日として扱うように修正
+- Fix: `Mk:C:container` の `borderWidth` が正しく反映されない問題を修正
+- Fix: mCaptchaが正しく動作しない問題を修正
+- Fix: 非ログイン時にリバーシの対局が表示されない問題を修正
+
+### Server
+- Enhance: OAuthのクライアント情報取得（Client Information Discovery）において、IndieWeb Living Standard 11 July 2024で定義されているJSONドキュメント形式に対応しました
+  - JSONによるClient Information Discoveryを行うには、レスポンスの`Content-Type`ヘッダーが`application/json`である必要があります
+  - 従来の実装（12 February 2022版・HTML Microformat形式）も引き続きサポートされます
+- Enhance: メモリ使用量を削減
+
 ## 2025.12.2
 
 ### Note
-v2025.12.0で行われた「configの`trustProxy`のデフォルト値を`false`に変更」について、正しく環境に応じた設定を行わないとサインインが困難になるといった状態を緩和するために、以前のデフォルト値に戻す暫定対応を行いました。
+v2025.12.0で行われた「configの`trustProxy`のデフォルト値を`false`に変更」について、正しく環境に応じた設定を行わないとサインインが困難になるといった状態を緩和するために、以下の対応を行いました。
 
-**セキュリティを向上させるためには適切な設定を行うことを推奨しますが、間違った設定値を入れると上述のような不具合の原因となりますので、慎重に行ってください。**
+**正しく設定しないと、上記のような不具合の原因となったり、セキュリティリスクが高まったりする可能性があります。必ず現在のconfigをご確認の上、必要に応じて値を変更してください。**
+
+- `trustProxy`について、デフォルト（configに値が設定されていない状態）ではループバックアドレスとローカルIPアドレス空間を信頼するようにしました。
+- `trustProxy`の設定方法について、より詳細に記述しました。
+- リバースプロキシやCDNなどのより上流のレイヤでレートリミットを設定したい場合や、緊急時の一時的な緩和策として、Misskey内部でのIPアドレスペースでのレートリミットを無効化できるようにしました。
 
 ### General
 - 依存関係の更新
 
 ### Client
 - Enhance: デッキのUI説明を追加
+- Enhance: 設定がブラウザによって消去されないようにするオプションを追加
 - Fix: バージョン表記のないPlayが正しく動作しない問題を修正  
   バージョン表記のないものは v0.x 系として実行されます。v1.x 系で動作させたい場合は必ずバージョン表記を含めてください。
 - Fix: デッキUIでメニュー位置を下にしているとプロファイル削除ボタンが表示されないのを修正  
+- Fix: 一部のUnicode絵文字のリアクションがボタンにならない問題を修正
 
+### Server
+- Enhance: Misskey内部でのIPアドレスペースでのレートリミットを無効化できるように
+  - リバースプロキシやCDNなど別のレイヤで別途レートリミットを設定する場合や、ローカルでのテスト用途等として利用することを想定しています。
+  - デフォルトは `enableIpRateLimit: true`（Misskey内部でのIPアドレスペースでのレートリミットは有効）です。
+- Fix: コントロールパネルのジョブキューページで使用される一部APIの応答速度を改善
 
 ## 2025.12.1
 

COPYING

@@ -1,5 +1,5 @@
 Unless otherwise stated this repository is
-Copyright © 2014-2025 syuilo and contributors
+Copyright © 2014-2026 syuilo and contributors
 
 And is distributed under The GNU Affero General Public License Version 3, you should have received a copy of the license file as LICENSE.
 

Dockerfile

@@ -1,6 +1,6 @@
-# syntax = docker/dockerfile:1.4
+# syntax = docker/dockerfile:1.20
 
-ARG NODE_VERSION=22.15.0-bookworm
+ARG NODE_VERSION=22.21.1-bookworm
 
 # build assets & compile TypeScript
 
@@ -102,6 +102,7 @@ COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-js/
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-reversi/built ./packages/misskey-reversi/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-bubble-game/built ./packages/misskey-bubble-game/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/built ./packages/backend/built
+COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/src-js ./packages/backend/src-js
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/i18n/built ./packages/i18n/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/fluent-emojis /misskey/fluent-emojis
 COPY --chown=misskey:misskey . ./

README.md

@@ -26,6 +26,8 @@
 
 [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/misskey-dev/misskey)
 
+<a href="https://flatt.tech/oss/gmo/trampoline" target="_blank"><img src="https://flatt.tech/assets/images/badges/gmo-oss.svg" height="24px"/></a>
+
 </div>
 
 ## Thanks
@@ -49,3 +51,13 @@ Thanks to [Crowdin](https://crowdin.com/) for providing the localization platfor
 <a href="https://hub.docker.com/"><img src="https://user-images.githubusercontent.com/20679825/230148221-f8e73a32-a49b-47c3-9029-9a15c3824f92.png" height="30" alt="Docker" /></a>
 
 Thanks to [Docker](https://hub.docker.com/) for providing the container platform that helps us run Misskey in production.
+
+---
+
+<div align="center">
+	
+Support us with a ⭐ !
+
+[![Star History Chart](https://api.star-history.com/svg?repos=misskey-dev/misskey&type=Date)](https://star-history.com/#misskey-dev/misskey&Date)
+
+</div>

locales/ar-SA.yml

@@ -1365,6 +1365,14 @@ _widgets:
   userList: "قائمة المستخدمين"
   _userList:
     chooseList: "اختر قائمة"
+_widgetOptions:
+  height: "الإرتفاع"
+  _button:
+    colored: "ملوّن"
+  _clock:
+    size: "الحجم"
+  _birthdayFollowings:
+    period: "المدة"
 _cw:
   hide: "إخفاء"
   show: "عرض المزيد"

locales/bn-BD.yml

@@ -1137,6 +1137,14 @@ _widgets:
   aichan: "আই চান"
   _userList:
     chooseList: "লিস্ট নির্বাচন করুন"
+_widgetOptions:
+  height: "উচ্চতা"
+  _button:
+    colored: "রঙ্গিন"
+  _clock:
+    size: "আকার"
+  _birthdayFollowings:
+    period: "ব্যাপ্তিকাল"
 _cw:
   hide: "লুকান"
   show: "আরও দেখুন"

locales/ca-ES.yml

@@ -1406,6 +1406,7 @@ youAreAdmin: "Ets l'administrador "
 frame: "Marc"
 presets: "Predefinit"
 zeroPadding: "Sense omplir"
+nothingToConfigure: "No hi ha res a configurar"
 _imageEditing:
   _vars:
     caption: "Títol de l'arxiu"
@@ -1550,6 +1551,9 @@ _settings:
   showPageTabBarBottom: "Mostrar les pestanyes de les línies de temps a la part inferior"
   emojiPaletteBanner: "Pots registrar ajustos preestablerts com paletes perquè es mostrin permanentment al selector d'emojis, o personalitzar la configuració de visió del selector."
   enableAnimatedImages: "Activar imatges animades"
+  settingsPersistence_title: "Persistència de la configuració "
+  settingsPersistence_description1: "Habilitar la persistència de la configuració permet que no es perdi la informació de la configuració "
+  settingsPersistence_description2: "Depenent de l'entorn pot ser que no puguis habilitar aquesta opció."
   _chat:
     showSenderName: "Mostrar el nom del remitent"
     sendOnEnter: "Introdueix per enviar"
@@ -1609,8 +1613,8 @@ _bubbleGame:
     highScore: "Millor puntuació "
     maxChain: "Nombre màxim de combos"
     yen: "{yen}Ien"
-    estimatedQty: "{qty}peces"
+    estimatedQty: "{qty} Peces"
-    scoreSweets: "{onigiriQtyWithUnit}ongiris"
+    scoreSweets: "{onigiriQtyWithUnit} Boles d'arròs "
   _howToPlay:
     section1: "Ajusta la posició i deixa caure l'objecte dintre la caixa."
     section2: "Quan dos objectes del mateix tipus es toquen, canviaran en un objecte diferent i guanyares punts."
@@ -2541,6 +2545,44 @@ _widgets:
   clicker: "Clicker"
   birthdayFollowings: "Usuaris que fan l'aniversari avui"
   chat: "Xateja amb aquest usuari"
+_widgetOptions:
+  showHeader: "Mostrar la capçalera"
+  transparent: "Fons transparent"
+  height: "Alçada "
+  _button:
+    colored: "Colorit"
+  _clock:
+    size: "Mida"
+    thickness: "Amplada de l'agulla "
+    thicknessThin: "Esvelt "
+    thicknessMedium: "Normal"
+    thicknessThick: "Gruixut "
+    graduations: "Marques de l'esfera "
+    graduationDots: "Punt"
+    graduationArabic: "Nombres àrabs "
+    fadeGraduations: "Efecte gradient "
+    sAnimation: "Animació de la maneta dels segons"
+    sAnimationElastic: "Real"
+    sAnimationEaseOut: "Suau"
+    twentyFour: "Format 24 hores"
+    labelTime: "Temps"
+    labelTz: "Fus horari"
+    labelTimeAndTz: "Hora i fus horari"
+    timezone: "Fus horari"
+    showMs: "Mostrar mil·lisegons"
+    showLabel: "Mostrar etiqueta"
+  _jobQueue:
+    sound: "Reprodueix so"
+  _rss:
+    url: "URL del canal RSS"
+    refreshIntervalSec: "Interval d'actualitzacions (segons)"
+    maxEntries: "Nombre màxim d'entrades a mostrar"
+  _rssTicker:
+    shuffle: "Visualització aleatòria "
+    duration: "Velocitat desplaçament bàner informatiu "
+    reverse: "Desplaçament contrari"
+  _birthdayFollowings:
+    period: "Període"
 _cw:
   hide: "Amagar"
   show: "Carregar més"
@@ -2816,6 +2858,14 @@ _deck:
   usedAsMinWidthWhenFlexible: "L'amplada mínima es farà servir quan \"Ajust automàtic de l'amplada\" estigui activat"
   flexible: "Ajust automàtic de l'amplada"
   enableSyncBetweenDevicesForProfiles: "Activar la sincronització de la informació de perfils de dispositiu a dispositiu"
+  showHowToUse: "Veure la descripció de la interfície d'usuari "
+  _howToUse:
+    addColumn_title: "Afegir columna"
+    addColumn_description: "Pots seleccionar i afegir tipus de columnes."
+    settings_title: "Configuració de la interfície d'usuari "
+    settings_description: "Pots configurar la interfície d'usuari amb detall."
+    switchProfile_title: "Canviar perfil"
+    switchProfile_description: "Pots desar el disseny de la interfície d'usuari com un perfil i anar canviant entre ells quan vulguis."
   _columns:
     main: "Principal"
     widgets: "Ginys"
@@ -3299,7 +3349,6 @@ _imageEffector:
   title: "Efecte"
   addEffect: "Afegeix un efecte"
   discardChangesConfirm: "Vols descartar els canvis i sortir?"
-  nothingToConfigure: "No hi ha opcions de configuració disponibles"
   failedToLoadImage: "Error en carregar la imatge"
   _fxs:
     chromaticAberration: "Aberració cromàtica"

locales/cs-CZ.yml

@@ -1789,6 +1789,14 @@ _widgets:
   _userList:
     chooseList: "Vybrat seznam"
   clicker: "Clicker"
+_widgetOptions:
+  height: "Výška"
+  _button:
+    colored: "Barevné"
+  _clock:
+    size: "Velikost"
+  _birthdayFollowings:
+    period: "Trvání"
 _cw:
   hide: "Skrýt"
   show: "Zobrazit více"

locales/de-DE.yml

@@ -83,6 +83,7 @@ files: "Dateien"
 download: "Herunterladen"
 driveFileDeleteConfirm: "Möchtest du die Datei „{name}“ wirklich löschen? Einige Inhalte, die diese Datei verwenden, werden auch verschwinden."
 unfollowConfirm: "Möchtest du {name} wirklich nicht mehr folgen?"
+cancelFollowRequestConfirm: "Möchten Sie die Voll-Anfrage an {name} zurückziehen?"
 rejectFollowRequestConfirm: "Möchtest du die Follow-Anfrage von {name} ablehnen?"
 exportRequested: "Du hast einen Export angefragt. Dies kann etwas Zeit in Anspruch nehmen. Sobald der Export abgeschlossen ist, wird er deiner Drive hinzugefügt."
 importRequested: "Du hast einen Import angefragt. Dies kann etwas Zeit in Anspruch nehmen."
@@ -254,6 +255,7 @@ noteDeleteConfirm: "Möchtest du diese Notiz wirklich löschen?"
 pinLimitExceeded: "Du kannst nicht noch mehr Notizen anheften."
 done: "Fertig"
 processing: "In Bearbeitung …"
+preprocessing: "In Vorbereitung"
 preview: "Vorschau"
 default: "Standard"
 defaultValueIs: "Standardwert: {value}"
@@ -302,6 +304,7 @@ uploadFromUrlMayTakeTime: "Es kann eine Weile dauern, bis das Hochladen abgeschl
 uploadNFiles: "Lade {n} Dateien hoch"
 explore: "Erkunden"
 messageRead: "Gelesen"
+readAllChatMessages: "Alle Nachrichten als gelesen markieren"
 noMoreHistory: "Kein weiterer Verlauf vorhanden"
 startChat: "Chat starten"
 nUsersRead: "Von {n} Benutzern gelesen"
@@ -334,6 +337,7 @@ fileName: "Dateiname"
 selectFile: "Datei auswählen"
 selectFiles: "Dateien auswählen"
 selectFolder: "Ordner auswählen"
+unselectFolder: "Ordnerauswahl aufheben"
 selectFolders: "Ordner auswählen"
 fileNotSelected: "Keine Datei ausgewählt"
 renameFile: "Datei umbenennen"
@@ -346,6 +350,7 @@ addFile: "Datei hinzufügen"
 showFile: "Datei anzeigen"
 emptyDrive: "Deine Drive ist leer"
 emptyFolder: "Dieser Ordner ist leer"
+dropHereToUpload: "Dateien hier ablegen, um sie hochzuladen."
 unableToDelete: "Nicht löschbar"
 inputNewFileName: "Gib einen neuen Dateinamen ein"
 inputNewDescription: "Gib eine neue Beschreibung ein"
@@ -773,6 +778,7 @@ lockedAccountInfo: "Auch wenn du Follow-Anfragen auf manuelle Bestätigung setzt
 alwaysMarkSensitive: "Medien standardmäßig als sensibel markieren"
 loadRawImages: "Anstatt Vorschaubilder immer Originalbilder anzeigen"
 disableShowingAnimatedImages: "Animierte Bilder nicht abspielen"
+disableShowingAnimatedImages_caption: "Unabhängig von dieser Einstellung kann es vorkommen, dass animierte Bilder nicht abgespielt werden, wenn z. B. die Barrierefreiheits- oder Energiespareinstellungen des Browsers oder des Betriebssystems eingreifen."
 highlightSensitiveMedia: "Sensitive Medien markieren"
 verificationEmailSent: "Eine Bestätigungsmail wurde an deine Email-Adresse versendet. Besuche den dort enthaltenen Link, um die Verifizierung abzuschließen."
 notSet: "Nicht konfiguriert"
@@ -1020,6 +1026,8 @@ pushNotificationNotSupported: "Entweder dein Browser oder deine Instanz unterst
 sendPushNotificationReadMessage: "Push-Benachrichtigungen löschen, sobald sie gelesen wurden"
 sendPushNotificationReadMessageCaption: "Dies kann gegebenenfalls den Batterieverbrauch deines Gerätes erhöhen."
 pleaseAllowPushNotification: "Bitte erlauben Sie Benachrichtigungen in Ihrem Browser."
+browserPushNotificationDisabled: "Das Abrufen der Berechtigung zum Senden von Benachrichtigungen ist fehlgeschlagen."
+browserPushNotificationDisabledDescription: "Sie haben keine Berechtigung, Benachrichtigungen von {serverName} zu senden. Bitte erlauben Sie Benachrichtigungen in den Browser-Einstellungen und versuchen Sie es erneut."
 windowMaximize: "Maximieren"
 windowMinimize: "Minimieren"
 windowRestore: "Wiederherstellen"
@@ -1095,6 +1103,7 @@ prohibitedWordsDescription2: "Durch die Verwendung von Leerzeichen können AND-V
 hiddenTags: "Ausgeblendete Hashtags"
 hiddenTagsDescription: "Die hier eingestellten Tags werden nicht mehr in den Trends angezeigt. Mit der Umschalttaste können mehrere ausgewählt werden."
 notesSearchNotAvailable: "Die Notizsuche ist nicht verfügbar."
+usersSearchNotAvailable: "Die Benutzersuche ist nicht verfügbar."
 license: "Lizenz"
 unfavoriteConfirm: "Wirklich aus Favoriten entfernen?"
 myClips: "Meine Clips"
@@ -1169,6 +1178,7 @@ installed: "Installiert"
 branding: "Branding"
 enableServerMachineStats: "Hardwareinformationen des Servers veröffentlichen"
 enableIdenticonGeneration: "Generierung von Benutzer-Identicons aktivieren"
+showRoleBadgesOfRemoteUsers: "Rollensymbole anzeigen, die Remote-Benutzern zugewiesen wurden."
 turnOffToImprovePerformance: "Deaktivierung kann zu höherer Leistung führen."
 createInviteCode: "Einladung erstellen"
 createWithOptions: "Einladung mit Optionen erstellen"
@@ -1317,6 +1327,7 @@ acknowledgeNotesAndEnable: "Schalten Sie dies erst ein, wenn Sie die Vorsichtsma
 federationSpecified: "Dieser Server arbeitet mit Whitelist-Föderation. Er kann nicht mit anderen als den vom Administrator angegebenen Servern interagieren."
 federationDisabled: "Föderation ist auf diesem Server deaktiviert. Es ist nicht möglich, mit Benutzern auf anderen Servern zu interagieren."
 draft: "Entwurf"
+draftsAndScheduledNotes: "Entwürfe und geplante Beiträge"
 confirmOnReact: "Reagieren bestätigen"
 reactAreYouSure: "Willst du eine \"{emoji}\"-Reaktion hinzufügen?"
 markAsSensitiveConfirm: "Möchtest du dieses Medium als sensibel kennzeichnen?"
@@ -1345,6 +1356,7 @@ textCount: "Zeichenanzahl"
 information: "Über"
 chat: "Chat"
 directMessage: "Mit dem Benutzer chatten"
+directMessage_short: "Nachrichten"
 migrateOldSettings: "Alte Client-Einstellungen migrieren"
 migrateOldSettings_description: "Dies sollte normalerweise automatisch geschehen, aber wenn die Migration aus irgendeinem Grund nicht erfolgreich war, kannst du den Migrationsprozess selbst manuell auslösen. Die aktuellen Konfigurationsinformationen werden dabei überschrieben."
 compress: "Komprimieren"
@@ -1372,18 +1384,43 @@ redisplayAllTips: "Alle „Tipps und Tricks“ wieder anzeigen"
 hideAllTips: "Alle „Tipps und Tricks“ ausblenden"
 defaultImageCompressionLevel: "Standard-Bildkomprimierungsstufe"
 defaultImageCompressionLevel_description: "Ein niedrigerer Wert erhält die Bildqualität, erhöht aber die Dateigröße. <br>Höhere Werte reduzieren die Dateigröße, verringern aber die Bildqualität."
+defaultCompressionLevel: "Standard-Kompressionsgrad"
+defaultCompressionLevel_description: "Bei einem niedrigeren Wert bleibt die Qualität erhalten, aber die Dateigröße nimmt zu.<br> Bei einem höheren Wert lässt sich die Dateigröße verringern, aber die Qualität nimmt ab."
 inMinutes: "Minute(n)"
 inDays: "Tag(en)"
 safeModeEnabled: "Der abgesicherte Modus ist aktiviert."
+pluginsAreDisabledBecauseSafeMode: "Da der abgesicherte Modus aktiviert ist, sind alle Plugins deaktiviert."
+customCssIsDisabledBecauseSafeMode: "Da der abgesicherte Modus aktiviert ist, wird benutzerdefiniertes CSS nicht angewendet."
+themeIsDefaultBecauseSafeMode: "Solange der abgesicherte Modus aktiviert ist, wird das Standard-Theme verwendet. Wenn Sie den abgesicherten Modus deaktivieren, wird es wieder zurückgesetzt."
+thankYouForTestingBeta: "Vielen Dank für Ihre Unterstützung beim Testen der Beta-Version!"
+createUserSpecifiedNote: "Benutzerdefinierte Notiz erstellen"
+schedulePost: "Beitrag planen"
+scheduleToPostOnX: "Der Beitrag wird für {x} geplant.x"
+scheduledToPostOnX: "Der Beitrag ist für {x} geplant."
 schedule: "Planen"
 scheduled: "Geplant"
 widgets: "Widgets"
 deviceInfo: "Geräteinformation"
+deviceInfoDescription: "Bei technischen Anfragen kann es hilfreich sein, die folgenden Informationen anzugeben, da dies zur Lösung des Problems beitragen kann."
 youAreAdmin: "Sie sind ein Administrator"
+frame: "Rahmen"
 presets: "Vorlage"
+zeroPadding: "Nullauffüllung"
 _imageEditing:
   _vars:
+    caption: "Dateibeschriftung"
     filename: "Dateiname"
+    filename_without_ext: "Dateiname ohne Erweiterung"
+    year: "Jahr der Aufnahme"
+    month: "Monat der Aufnahme"
+    day: "Tag der Aufnahme"
+    hour: "Stunde der Aufnahmezeit"
+    minute: "Minute der Aufnahmezeit"
+    second: "Sekunde der Aufnahmezeit"
+    camera_model: "Kameraname"
+    camera_lens_model: "Objektivname"
+    camera_mm: "Brennweite"
+    camera_mm_35: "Brennweite (35-mm-Äquivalent)"
 _imageFrameEditor:
   header: "Kopfzeile"
   font: "Schriftart"
@@ -1394,6 +1431,7 @@ _order:
   newest: "Neueste zuerst"
   oldest: "Älteste zuerst"
 _chat:
+  messages: "Nachrichten"
   noMessagesYet: "Noch keine Nachrichten"
   newMessage: "Neue Nachricht"
   individualChat: "Privater Chat"
@@ -2455,6 +2493,15 @@ _widgets:
   clicker: "Klickzähler"
   birthdayFollowings: "Nutzer, die heute Geburtstag haben"
   chat: "Mit dem Benutzer chatten"
+_widgetOptions:
+  showHeader: "Kopfzeile anzeigen"
+  height: "Höhe"
+  _button:
+    colored: "Farbig"
+  _clock:
+    size: "Größe"
+  _birthdayFollowings:
+    period: "Dauer"
 _cw:
   hide: "Inhalt verbergen"
   show: "Inhalt anzeigen"

locales/en-US.yml

@@ -1406,6 +1406,7 @@ youAreAdmin: "You are admin"
 frame: "Frame"
 presets: "Preset"
 zeroPadding: "Zero padding"
+nothingToConfigure: "No configurable options available"
 _imageEditing:
   _vars:
     caption: "File caption"
@@ -1550,6 +1551,9 @@ _settings:
   showPageTabBarBottom: "Show page tab bar at the bottom"
   emojiPaletteBanner: "You can register presets as palettes to display prominently in the emoji picker or customize the appearance of the picker."
   enableAnimatedImages: "Enable animated images"
+  settingsPersistence_title: "Persistence of Settings"
+  settingsPersistence_description1: "Enabling setting persistence prevents configuration information from being lost."
+  settingsPersistence_description2: "It may not be possible to enable this depending on the environment."
   _chat:
     showSenderName: "Show sender's name"
     sendOnEnter: "Press Enter to send"
@@ -2541,6 +2545,44 @@ _widgets:
   clicker: "Clicker"
   birthdayFollowings: "Today's Birthdays"
   chat: "Chat with user"
+_widgetOptions:
+  showHeader: "Show header"
+  transparent: "Make background transparent"
+  height: "Height"
+  _button:
+    colored: "Colored"
+  _clock:
+    size: "Size"
+    thickness: "Needle thickness"
+    thicknessThin: "Thin"
+    thicknessMedium: "Normal"
+    thicknessThick: "Thick"
+    graduations: "Dial markings"
+    graduationDots: "Dot"
+    graduationArabic: "Arabic numbers"
+    fadeGraduations: "Fade the scale"
+    sAnimation: "Second hand animation"
+    sAnimationElastic: "Real"
+    sAnimationEaseOut: "Smooth"
+    twentyFour: "24 Hour Format"
+    labelTime: "Time"
+    labelTz: "Timezone"
+    labelTimeAndTz: "Time and time zone"
+    timezone: "Timezone"
+    showMs: "Show Miliseconds"
+    showLabel: "Show Label"
+  _jobQueue:
+    sound: "Play Sounds"
+  _rss:
+    url: "RSS Feed Url"
+    refreshIntervalSec: "Update interval (in seconds)"
+    maxEntries: "Maximum number of items to display"
+  _rssTicker:
+    shuffle: "Random display order"
+    duration: "Banner scroll speed (in seconds)"
+    reverse: "Scroll in the opposite direction"
+  _birthdayFollowings:
+    period: "Duration"
 _cw:
   hide: "Hide"
   show: "Show content"
@@ -2816,6 +2858,14 @@ _deck:
   usedAsMinWidthWhenFlexible: "Minimum width will be used for this when the \"Auto-adjust width\" option is enabled"
   flexible: "Auto-adjust width"
   enableSyncBetweenDevicesForProfiles: "Enable profile information sync between devices"
+  showHowToUse: ""
+  _howToUse:
+    addColumn_title: "Add column"
+    addColumn_description: "You can select and add column types."
+    settings_title: "UI Settings"
+    settings_description: "You can configure detailed settings for the deck UI."
+    switchProfile_title: "Profile Switching"
+    switchProfile_description: "You can save UI layouts as profiles and switch between them at any time."
   _columns:
     main: "Main"
     widgets: "Widgets"
@@ -3299,7 +3349,6 @@ _imageEffector:
   title: "Effects"
   addEffect: "Add Effects"
   discardChangesConfirm: "Are you sure you want to leave? You have unsaved changes."
-  nothingToConfigure: "No configurable options available"
   failedToLoadImage: "Failed to load image"
   _fxs:
     chromaticAberration: "Chromatic Aberration"

locales/es-ES.yml

@@ -1406,6 +1406,7 @@ youAreAdmin: "Eres administrador."
 frame: "Marco"
 presets: "Predefinido"
 zeroPadding: "Relleno cero"
+nothingToConfigure: "No hay nada que configurar"
 _imageEditing:
   _vars:
     caption: "Título del archivo"
@@ -1550,6 +1551,9 @@ _settings:
   showPageTabBarBottom: "Mostrar la barra de pestañas de la página en la parte inferior."
   emojiPaletteBanner: "Puedes registrar ajustes preestablecidos como paletas para que se muestren permanentemente en el selector de emojis, o personalizar el método de visualización del selector."
   enableAnimatedImages: "Habilitar imágenes animadas"
+  settingsPersistence_title: "Persistencia de la configuración"
+  settingsPersistence_description1: "Habilitar la persistencia de la configuración evita que se pierda la información de configuración."
+  settingsPersistence_description2: "Es posible que no se pueda habilitar esta función dependiendo del entorno."
   _chat:
     showSenderName: "Mostrar el nombre del remitente"
     sendOnEnter: "Intro para enviar"
@@ -1670,9 +1674,9 @@ _initialTutorial:
     title: "El concepto de Línea de tiempo"
     description1: "Misskey proporciona múltiples líneas de tiempo basadas en su uso (algunas pueden no estar disponibles dependiendo de las políticas de la instancia)."
     home: "Puedes ver los posts de las cuentas que sigues."
-    local: "Puedes ver los posts de todos los usuarios de este servidor."
+    local: "Puedes ver los posts de todos los usuarios de este servidor (también llamado instancia)."
     social: "Se ven los posts de la línea de tiempo de inicio junto con los de la línea de tiempo local."
-    global: "Puedes ver notas de todos los servidores conectados."
+    global: "Puedes ver notas de todos los servidores (instancias) conectados."
     description2: "Puedes cambiar la línea de tiempo en la parte superior de la pantalla cuando quieras."
     description3: "Además, hay listas de líneas de tiempo y listas de canales. Para más detalle, por favor visita este enlace: {link}"
   _postNote:
@@ -1682,14 +1686,14 @@ _initialTutorial:
       description: "Puedes limitar quién puede ver tu nota."
       public: "Tu nota será visible para todos los usuarios."
       home: "Publicar solo en la línea de tiempo de Inicio. La nota se verá en tu perfil, la verán tus seguidores y también cuando sea renotada."
-      followers: "Visible solo para seguidores. Sólo tus seguidores podrán ver la nota, y no podrá ser renotada por otras personas."
+      followers: "Visible solo para seguidores. Solo tus seguidores podrán ver la nota, y no podrá ser renotada por otras personas."
       direct: "Visible sólo para usuarios específicos, y el destinatario será notificado. Puede usarse como alternativa a la mensajería directa."
       doNotSendConfidencialOnDirect1: "¡Ten cuidado cuando vayas a enviar información sensible!"
       doNotSendConfidencialOnDirect2: "Los administradores del servidor, también llamado instancia, pueden leer lo que escribes. Ten cuidado cuando envíes información sensible en notas directas en servidores o instancias no confiables."
       localOnly: "Publicando con esta opción seleccionada, la nota no se federará hacia otros servidores. Los usuarios de otros servidores no podrán ver estas notas directamente, sin importar los ajustes seleccionados más arriba."
     _cw:
       title: "Alerta de contenido (CW)"
-      description: "En lugar de mostrarse el contenido de la nota, se mostrará lo que escribas en el campo \"comentarios\". Pulsando en \"leer más\" desplegará el contenido de la nota."
+      description: "En lugar de mostrarse el contenido de la nota, se mostrará lo que escribas en el campo \"comentarios\". Pulsando en \"Ver más\" desplegará el contenido de la nota."
       _exampleNote:
         cw: "¡Esto te hará tener hambre!"
         note: "Acabo de comerme un donut de chocolate glaseado 🍩😋"
@@ -2207,7 +2211,7 @@ _registry:
   key: "Clave"
   keys: "Clave"
   domain: "Dominio"
-  createKey: "Crear una llave"
+  createKey: "Crear una clave"
 _aboutMisskey:
   about: "Misskey es un software de código abierto, desarrollado por syuilo desde el 2014"
   contributors: "Principales colaboradores"
@@ -2541,6 +2545,44 @@ _widgets:
   clicker: "Cliqueador"
   birthdayFollowings: "Hoy cumplen años"
   chat: "Chatear"
+_widgetOptions:
+  showHeader: "Mostrar encabezados"
+  transparent: "Hacer fondo transparente"
+  height: "Altura"
+  _button:
+    colored: "Color"
+  _clock:
+    size: "Tamaño"
+    thickness: "Grosor de la aguja"
+    thicknessThin: "Delgada"
+    thicknessMedium: "Normal"
+    thicknessThick: "Gruesa"
+    graduations: "Marcas del dial"
+    graduationDots: "Puntos"
+    graduationArabic: "Números decimales"
+    fadeGraduations: "Desvanecer la escala"
+    sAnimation: "Animación de la manecilla de los segundos"
+    sAnimationElastic: "Real"
+    sAnimationEaseOut: "Suave"
+    twentyFour: "Formato 24 horas"
+    labelTime: "Hora"
+    labelTz: "Zona horaria"
+    labelTimeAndTz: "Hora y zona horaria"
+    timezone: "Zona horaria"
+    showMs: "Mostrar milisegundos"
+    showLabel: "Mostrar etiqueta"
+  _jobQueue:
+    sound: "Reproducir sonido"
+  _rss:
+    url: "URL del canal RSS"
+    refreshIntervalSec: "Intervalo de actualización (En segundos)"
+    maxEntries: "Número máximo de elementos a mostrar"
+  _rssTicker:
+    shuffle: "Orden de visualización aleatorio"
+    duration: "Velocidad de desplazamiento del baner (En segundos)"
+    reverse: "Desplázate en la dirección opuesta."
+  _birthdayFollowings:
+    period: "Duración"
 _cw:
   hide: "Ocultar"
   show: "Ver más"
@@ -2816,6 +2858,14 @@ _deck:
   usedAsMinWidthWhenFlexible: "Se usará el ancho mínimo cuando la opción \"Autoajustar ancho\" esté habilitada"
   flexible: "Autoajustar ancho"
   enableSyncBetweenDevicesForProfiles: "Activar la sincronización de la información de perfiles entre dispositivos."
+  showHowToUse: "Ver la descripción de la interfaz de usuario"
+  _howToUse:
+    addColumn_title: "Añadir columna"
+    addColumn_description: "Puede seleccionar y añadir tipos de columnas."
+    settings_title: "Configuración de la interfaz de usuario"
+    settings_description: "Puedes configurar la interfaz de usuario en detalle."
+    switchProfile_title: "Cambiar de perfil"
+    switchProfile_description: "Puedes guardar diseños de interfaz de usuario como perfiles y cambiar entre ellos en cualquier momento."
   _columns:
     main: "Principal"
     widgets: "Widgets"
@@ -3145,8 +3195,8 @@ _selfXssPrevention:
   description2: "Si no entiendes que estás pegando exactamente, %cdetente ahora mismo y cierra esta ventana"
   description3: "Para más información visita esto {link}"
 _followRequest:
-  recieved: "Petición de seguimiento recibida"
+  recieved: "Solicitud de seguimiento recibida"
-  sent: "Petición de seguimiento enviada"
+  sent: "Solicitud de seguimiento enviada"
 _remoteLookupErrors:
   _federationNotAllowed:
     title: "Incapaz de comunicarse con este servidor."
@@ -3299,7 +3349,6 @@ _imageEffector:
   title: "Efecto"
   addEffect: "Añadir Efecto"
   discardChangesConfirm: "¿Ignorar cambios y salir?"
-  nothingToConfigure: "No hay opciones configurables disponibles."
   failedToLoadImage: "Error al cargar la imagen"
   _fxs:
     chromaticAberration: "Aberración Cromática"

locales/fr-FR.yml

@@ -5,11 +5,12 @@ introMisskey: "Bienvenue ! Misskey est un service de microblogage décentralis
 poweredByMisskeyDescription: "{name} est l'un des services propulsés par la plateforme ouverte <b>Misskey</b> (appelée \"instance Misskey\")."
 monthAndDay: "{day}/{month}"
 search: "Rechercher"
+reset: "Réinitialiser"
 notifications: "Notifications"
 username: "Nom d’utilisateur·rice"
 password: "Mot de passe"
 initialPasswordForSetup: "Mot de passe initial pour la configuration"
-initialPasswordIsIncorrect: "Mot de passe initial pour la configuration est incorrecte"
+initialPasswordIsIncorrect: "Le mot de passe initial pour la configuration est incorrect"
 initialPasswordForSetupDescription: "Utilisez le mot de passe que vous avez entré pour le fichier de configuration si vous avez installé Misskey vous-même.\nSi vous utilisez un service d'hébergement Misskey, utilisez le mot de passe fourni.\nSi vous n'avez pas défini de mot de passe, laissez le champ vide pour continuer."
 forgotPassword: "Mot de passe oublié"
 fetchingAsApObject: "Récupération depuis le fédiverse …"
@@ -48,6 +49,7 @@ pin: "Épingler sur le profil"
 unpin: "Désépingler"
 copyContent: "Copier le contenu"
 copyLink: "Copier le lien"
+copyRemoteLink: "Copier le lien de la note"
 copyLinkRenote: "Copier le lien de la renote"
 delete: "Supprimer"
 deleteAndEdit: "Supprimer et réécrire"
@@ -62,8 +64,8 @@ copyNoteId: "Copier l'identifiant de la note"
 copyFileId: "Copier l'identifiant du fichier"
 copyFolderId: "Copier l'identifiant du dossier"
 copyProfileUrl: "Copier l'URL du profil"
-searchUser: "Chercher un·e utilisateur·rice"
+searchUser: "Chercher un utilisateur"
-searchThisUsersNotes: "Cherchez les notes de cet·te utilisateur·rice"
+searchThisUsersNotes: "Cherchez les notes de cet utilisateur"
 reply: "Répondre"
 loadMore: "Afficher plus …"
 showMore: "Voir plus"
@@ -81,6 +83,8 @@ files: "Fichiers"
 download: "Télécharger"
 driveFileDeleteConfirm: "Êtes-vous sûr·e de vouloir supprimer le fichier « {name} » ? Les notes avec ce fichier joint seront aussi supprimées."
 unfollowConfirm: "Désirez-vous vous désabonner de {name} ?"
+cancelFollowRequestConfirm: "Est-te vous sur de vouloir annuler la demande de suivi de {name} ?"
+rejectFollowRequestConfirm: "Refuser la demande de suivi de {name} ?"
 exportRequested: "Vous avez demandé une exportation. L’opération pourrait prendre un peu de temps. Une fois terminée, le fichier sera ajouté au Drive."
 importRequested: "Vous avez initié un import. Cela pourrait prendre un peu de temps."
 lists: "Listes"
@@ -118,6 +122,8 @@ cantReRenote: "Impossible de renoter une Renote."
 quote: "Citer"
 inChannelRenote: "Renoter dans le canal"
 inChannelQuote: "Citer dans le canal"
+renoteToChannel: "Renoter sur le canal"
+renoteToOtherChannel: "Renoter sur un autre canal"
 pinnedNote: "Note épinglée"
 pinned: "Épingler sur le profil"
 you: "Vous"
@@ -212,6 +218,7 @@ blockThisInstance: "Bloquer cette instance"
 silenceThisInstance: "Mettre cette instance en sourdine"
 operations: "Opérations"
 software: "Logiciel"
+softwareName: "Nom du logiciel"
 version: "Version"
 metadata: "Métadonnées"
 withNFiles: "{n} fichier(s)"
@@ -231,6 +238,9 @@ blockedInstances: "Instances bloquées"
 blockedInstancesDescription: "Listez les instances que vous désirez bloquer, une par ligne. Ces instances ne seront plus en capacité d'interagir avec votre instance."
 silencedInstances: "Instances mises en sourdine"
 silencedInstancesDescription: "Énumérer les noms d'hôte des instances à mettre en sourdine. Tous les comptes des instances énumérées seront traités comme mis en sourdine, ne peuvent faire que des demandes de suivi et ne peuvent pas mentionner les comptes locaux s'ils ne sont pas suivis. Cela n'affectera pas les instances bloquées."
+mediaSilencedInstances: "Médias silencieux sur ces instances"
+mediaSilencedInstancesDescription: "Liste des noms de serveurs où vous voulez que les médias soient silencieux, séparés par un retour à la ligne.\nTous les comptes des instances listées seront considérés comme sensibles, et ne peuvent pas utilisés d'émojis personnalisés. Ceci n'affectera pas les serveurs bloquées."
+federationAllowedHosts: "Serveurs qui autorisent la fédération"
 muteAndBlock: "Masqué·e·s / Bloqué·e·s"
 mutedUsers: "Utilisateur·rice·s en sourdine"
 blockedUsers: "Utilisateur·rice·s bloqué·e·s"
@@ -2005,6 +2015,14 @@ _widgets:
   _userList:
     chooseList: "Sélectionner une liste"
   birthdayFollowings: "Utilisateurs qui fêtent l'anniversaire aujourd'hui"
+_widgetOptions:
+  height: "Hauteur"
+  _button:
+    colored: "Coloré"
+  _clock:
+    size: "Taille"
+  _birthdayFollowings:
+    period: "Durée"
 _cw:
   hide: "Masquer"
   show: "Afficher le contenu"

locales/id-ID.yml

@@ -2209,6 +2209,14 @@ _widgets:
   clicker: "Pengeklik"
   birthdayFollowings: "Pengguna yang merayakan hari ulang tahunnya hari ini"
   chat: "Obrolan pengguna"
+_widgetOptions:
+  height: "Tinggi"
+  _button:
+    colored: "Diwarnai"
+  _clock:
+    size: "Ukuran"
+  _birthdayFollowings:
+    period: "Durasi"
 _cw:
   hide: "Sembunyikan"
   show: "Lihat konten"

locales/it-IT.yml

@@ -613,7 +613,7 @@ descendingOrder: "Diminuisce"
 scratchpad: "ScratchPad"
 scratchpadDescription: "Lo Scratchpad offre un ambiente per esperimenti di AiScript. È possibile scrivere, eseguire e confermare i risultati dell'interazione del codice con Misskey."
 uiInspector: "UI Inspector"
-uiInspectorDescription: "Puoi visualizzare un elenco di elementi UI presenti in memoria. I componenti dell'interfaccia utente vengono generati dalle funzioni Ui:C:."
+uiInspectorDescription: "Puoi visualizzare un elenco di elementi grafici presenti in memoria. I componenti dell'interfaccia grafica vengono generati dalle funzioni Ui:C:."
 output: "Output"
 script: "Script"
 disablePagesScript: "Disabilitare AiScript nelle pagine"
@@ -1406,6 +1406,7 @@ youAreAdmin: "Sei un amministratore"
 frame: "Cornice"
 presets: "Preimpostato"
 zeroPadding: "Al vivo"
+nothingToConfigure: "Niente da configurare"
 _imageEditing:
   _vars:
     caption: "Didascalia dell'immagine"
@@ -1550,6 +1551,9 @@ _settings:
   showPageTabBarBottom: "Visualizza le schede della pagina nella parte inferiore"
   emojiPaletteBanner: "Puoi salvare i le emoji predefinite da appuntare in alto nel raccoglitore emoji come tavolozza e personalizzare in che modo visualizzare il raccoglitore."
   enableAnimatedImages: "Attivare le immagini animate"
+  settingsPersistence_title: "Configurazione persistente"
+  settingsPersistence_description1: "Attivando le impostazioni persistenti si può evitare di riconfigurare il client successivamente."
+  settingsPersistence_description2: "Potrebbe non essere possibile attivare, dipende dall'ambiente."
   _chat:
     showSenderName: "Mostra il nome del mittente"
     sendOnEnter: "Invio spedisce"
@@ -1737,7 +1741,7 @@ _serverSettings:
   thisSettingWillAutomaticallyOffWhenModeratorsInactive: "Per prevenire SPAM, questa impostazione verrà disattivata automaticamente, se non si rileva alcuna attività di moderazione durante un certo periodo di tempo."
   deliverSuspendedSoftware: "Software fuori produzione"
   deliverSuspendedSoftwareDescription: "A causa di vulnerabilità o altri motivi, puoi interrompere la distribuzione di un software da un server specificandone il nome e la versione. Le informazioni sono fornite dall'altro server e l'autenticità non è garantita. Puoi indicare un intervallo di versione semantica, ma specificando >= 2024.3.1 non verranno incluse le versioni personalizzate come ad esempio 2024.3.1-custom.0, pertanto ti consigliamo di specificare una versione come >= 2024.3.1-0."
-  singleUserMode: "Modalità utente singolo"
+  singleUserMode: "Modalità utenza singola"
   singleUserMode_description: "Se sei l'unica persona a utilizzare questo server, l'abilitazione di questa modalità ottimizzerà le prestazioni."
   signToActivityPubGet: "Firma delle richieste GET"
   signToActivityPubGet_description: "Normalmente questa opzione dovrebbe essere abilitata. Se si verificano problemi con la comunicazione federata, disabilitarla potrebbe migliorare la situazione, ma d'altro canto potrebbe rendere impossibile la comunicazione, a seconda del server."
@@ -2541,6 +2545,44 @@ _widgets:
   clicker: "Cliccheria"
   birthdayFollowings: "Compleanni del giorno"
   chat: "Chatta con questa persona"
+_widgetOptions:
+  showHeader: "Mostra la testata"
+  transparent: "Sfondo trasparente"
+  height: "Altezza"
+  _button:
+    colored: "Colorato"
+  _clock:
+    size: "Dimensioni"
+    thickness: "Spessore lancette"
+    thicknessThin: "Sottili"
+    thicknessMedium: "Medie"
+    thicknessThick: "Larghe"
+    graduations: "Quadrante"
+    graduationDots: "Punti"
+    graduationArabic: "Numeri"
+    fadeGraduations: "Sfumatura"
+    sAnimation: "Animazione dei secondi"
+    sAnimationElastic: "Realistica"
+    sAnimationEaseOut: "Morbida"
+    twentyFour: "Formato 24 ore"
+    labelTime: "Orario"
+    labelTz: "Fuso orario"
+    labelTimeAndTz: "Orario e fuso orario"
+    timezone: "Fuso orario"
+    showMs: "Millisecondi visibili"
+    showLabel: "Etichetta visibile"
+  _jobQueue:
+    sound: "Emetti un suono"
+  _rss:
+    url: "URL del Feed RSS"
+    refreshIntervalSec: "Intervallo di aggiornamento (in secondi)"
+    maxEntries: "Quantità massima visualizzabile"
+  _rssTicker:
+    shuffle: "Ordine casuale"
+    duration: "Velocità di scorrimento del ticker (in secondi)"
+    reverse: "Direzione inversa"
+  _birthdayFollowings:
+    period: "Durata"
 _cw:
   hide: "Nascondere"
   show: "Continua la lettura..."
@@ -2816,6 +2858,14 @@ _deck:
   usedAsMinWidthWhenFlexible: "Se \"larghezza flessibile\" è abilitato, questa diventa la larghezza minima"
   flexible: "Larghezza flessibile"
   enableSyncBetweenDevicesForProfiles: "Abilita la sincronizzazione delle informazioni profilo tra dispositivi"
+  showHowToUse: "Guarda la spiegazione dell'interfaccia grafica"
+  _howToUse:
+    addColumn_title: "Aggiungere colonne"
+    addColumn_description: "Puoi selezionare un tipo di colonna e aggiungerlo."
+    settings_title: "Configurazione interfaccia grafica"
+    settings_description: "Puoi personalizzare i dettagli dell'interfaccia grafica."
+    switchProfile_title: "Selettore profilo"
+    switchProfile_description: "Puoi salvare la disposizione dell'interfaccia grafica nel tuo profilo, affinché cambi con comodità."
   _columns:
     main: "Principale"
     widgets: "Riquadri"
@@ -3067,7 +3117,7 @@ _contextMenu:
   title: "Menu contestuale"
   app: "Applicazione"
   appWithShift: "Applicazione Shift+Tasto"
-  native: "Interfaccia utente del browser"
+  native: "Interfaccia grafica del browser"
 _gridComponent:
   _error:
     requiredValue: "Campo obbligatorio"
@@ -3299,7 +3349,6 @@ _imageEffector:
   title: "Effetto"
   addEffect: "Aggiungi effetto"
   discardChangesConfirm: "Scarta le modifiche ed esci?"
-  nothingToConfigure: "Nessuna impostazione configurabile."
   failedToLoadImage: "Impossibile caricare l'immagine"
   _fxs:
     chromaticAberration: "Aberrazione cromatica"

locales/ja-JP.yml

@@ -543,6 +543,7 @@ regenerate: "再生成"
 fontSize: "フォントサイズ"
 mediaListWithOneImageAppearance: "画像が1枚のみのメディアリストの高さ"
 limitTo: "{x}を上限に"
+showMediaListByGridInWideArea: "画面幅が広いときはメディアリストを横並びで表示する"
 noFollowRequests: "フォロー申請はありません"
 openImageInNewTab: "画像を新しいタブで開く"
 dashboard: "ダッシュボード"
@@ -1406,6 +1407,7 @@ youAreAdmin: "あなたは管理者です"
 frame: "フレーム"
 presets: "プリセット"
 zeroPadding: "ゼロ埋め"
+nothingToConfigure: "設定項目はありません"
 
 _imageEditing:
   _vars:
@@ -1557,6 +1559,9 @@ _settings:
   showPageTabBarBottom: "ページのタブバーを下部に表示"
   emojiPaletteBanner: "絵文字ピッカーに固定表示するプリセットをパレットとして登録したり、ピッカーの表示方法をカスタマイズしたりできます。"
   enableAnimatedImages: "アニメーション画像を有効にする"
+  settingsPersistence_title: "設定の永続化"
+  settingsPersistence_description1: "設定の永続化を有効にすると、設定情報が失われるのを防止できます。"
+  settingsPersistence_description2: "環境によっては有効化できない場合があります。"
 
   _chat:
     showSenderName: "送信者の名前を表示"
@@ -2596,9 +2601,48 @@ _widgets:
   _userList:
     chooseList: "リストを選択"
   clicker: "クリッカー"
-  birthdayFollowings: "今日誕生日のユーザー"
+  birthdayFollowings: "もうすぐ誕生日のユーザー"
   chat: "ダイレクトメッセージ"
 
+_widgetOptions:
+  showHeader: "ヘッダーを表示"
+  transparent: "背景を透明にする"
+  height: "高さ"
+  _button:
+    colored: "色付き"
+  _clock:
+    size: "サイズ"
+    thickness: "針の太さ"
+    thicknessThin: "細い"
+    thicknessMedium: "普通"
+    thicknessThick: "太い"
+    graduations: "文字盤の目盛り"
+    graduationDots: "ドット"
+    graduationArabic: "アラビア数字"
+    fadeGraduations: "目盛りをフェード"
+    sAnimation: "秒針のアニメーション"
+    sAnimationElastic: "リアル"
+    sAnimationEaseOut: "滑らか"
+    twentyFour: "24時間表示"
+    labelTime: "時刻"
+    labelTz: "タイムゾーン"
+    labelTimeAndTz: "時刻とタイムゾーン"
+    timezone: "タイムゾーン"
+    showMs: "ミリ秒を表示"
+    showLabel: "ラベルを表示"
+  _jobQueue:
+    sound: "音を鳴らす"
+  _rss:
+    url: "RSSフィードのURL"
+    refreshIntervalSec: "更新間隔(秒)"
+    maxEntries: "最大表示件数"
+  _rssTicker:
+    shuffle: "表示順をシャッフル"
+    duration: "ティッカーのスクロール速度(秒)"
+    reverse: "逆方向にスクロール"
+  _birthdayFollowings:
+    period: "期間"
+
 _cw:
   hide: "隠す"
   show: "もっと見る"
@@ -3415,7 +3459,6 @@ _imageEffector:
   title: "エフェクト"
   addEffect: "エフェクトを追加"
   discardChangesConfirm: "変更を破棄して終了しますか？"
-  nothingToConfigure: "設定項目はありません"
   failedToLoadImage: "画像の読み込みに失敗しました"
 
   _fxs:

locales/ja-KS.yml

@@ -2378,6 +2378,15 @@ _widgets:
   clicker: "クリッカー"
   birthdayFollowings: "今日誕生日のツレ"
   chat: "チャットしよか"
+_widgetOptions:
+  showHeader: "ヘッダー出す"
+  height: "高さ"
+  _button:
+    colored: "色付き"
+  _clock:
+    size: "大きさ"
+  _birthdayFollowings:
+    period: "期間"
 _cw:
   hide: "隠す"
   show: "続き見して！"

locales/ko-KR.yml

@@ -1406,6 +1406,7 @@ youAreAdmin: "당신은 관리자입니다."
 frame: "프레임"
 presets: "프리셋"
 zeroPadding: "0으로 채우기"
+nothingToConfigure: "설정 항목이 없습니다."
 _imageEditing:
   _vars:
     caption: "파일 설명"
@@ -1550,6 +1551,9 @@ _settings:
   showPageTabBarBottom: "페이지의 탭 바를 아래쪽에 표시"
   emojiPaletteBanner: "이모티콘 선택기에 고정 표시되는 프리셋을 팔레트로 등록하거나 선택기의 표시 방법을 커스터마이징할 수 있습니다."
   enableAnimatedImages: "애니메이션 이미지 활성화"
+  settingsPersistence_title: "설정 영구화"
+  settingsPersistence_description1: "설정 영구화를 활성화하면 설정 정보를 잃어버리는 것을 방지할 수 있습니다."
+  settingsPersistence_description2: "환경에 따라 활성화되지 않을 수 있습니다."
   _chat:
     showSenderName: "발신자 이름 표시"
     sendOnEnter: "엔터로 보내기"
@@ -2541,6 +2545,44 @@ _widgets:
   clicker: "클리커"
   birthdayFollowings: "오늘이 생일인 유저"
   chat: "채팅하기"
+_widgetOptions:
+  showHeader: "해더를 표시"
+  transparent: "배경을 투명하게 설정"
+  height: "높이"
+  _button:
+    colored: "색 입히기"
+  _clock:
+    size: "크기"
+    thickness: "시곗바늘의 두께"
+    thicknessThin: "얇게"
+    thicknessMedium: "보통"
+    thicknessThick: "굵게"
+    graduations: "문자반의 눈금"
+    graduationDots: "도트"
+    graduationArabic: "아라비아 숫자"
+    fadeGraduations: "눈금 페이드"
+    sAnimation: "초침 애니메이션"
+    sAnimationElastic: "사실적으로"
+    sAnimationEaseOut: "매끄럽게"
+    twentyFour: "24시간 표시"
+    labelTime: "시각"
+    labelTz: "시간대"
+    labelTimeAndTz: "시각과 시간대"
+    timezone: "시간대"
+    showMs: "밀리초 표시"
+    showLabel: "레이블 표시"
+  _jobQueue:
+    sound: "소리 재생"
+  _rss:
+    url: "RSS 필드의 URL"
+    refreshIntervalSec: "갱신 간격(초)"
+    maxEntries: "최대 표시 건수"
+  _rssTicker:
+    shuffle: "표시 순서 셔플"
+    duration: "티커 스크롤 속도(초)"
+    reverse: "역방향으로 스크롤"
+  _birthdayFollowings:
+    period: "기간"
 _cw:
   hide: "숨기기"
   show: "더 보기"
@@ -2816,6 +2858,14 @@ _deck:
   usedAsMinWidthWhenFlexible: "'폭 자동 조정'이 활성화된 경우 최소 폭으로 사용됩니다"
   flexible: "폭 자동 조정"
   enableSyncBetweenDevicesForProfiles: "프로파일 정보의 디바이스 간 동기화를 활성화"
+  showHowToUse: "UI 설명 보기"
+  _howToUse:
+    addColumn_title: "칼럼 추가"
+    addColumn_description: "칼럼의 종류를 선택해 추가할 수 있습니다."
+    settings_title: "UI 설정"
+    settings_description: "덱 UI의 상세 설정을 할 수 있습니다."
+    switchProfile_title: "프로필 전환"
+    switchProfile_description: "UI의 레이아웃을 프로필로 저장하고, 언제나 전환할 수 있습니다."
   _columns:
     main: "메인"
     widgets: "위젯"
@@ -3299,7 +3349,6 @@ _imageEffector:
   title: "이펙트"
   addEffect: "이펙트를 추가"
   discardChangesConfirm: "변경을 취소하고 종료하시겠습니까?"
-  nothingToConfigure: "설정 항목이 없습니다."
   failedToLoadImage: "이미지 로딩에 실패했습니다."
   _fxs:
     chromaticAberration: "색수차"

locales/lo-LA.yml

@@ -431,6 +431,8 @@ _widgets:
   jobQueue: "ຄິວວຽກ"
   _userList:
     chooseList: "ເລືອກບັນຊີລາຍການ"
+_widgetOptions:
+  height: "ຄວາມສູງ"
 _cw:
   show: "ໂຫຼດເພີ່ມເຕີມ"
 _visibility:

locales/nl-NL.yml

@@ -1017,6 +1017,8 @@ _widgets:
   jobQueue: "Job Queue"
   _userList:
     chooseList: "Kies een lijst."
+_widgetOptions:
+  height: "Hoogte"
 _cw:
   show: "Laad meer"
 _visibility:

locales/no-NO.yml

@@ -639,6 +639,10 @@ _widgets:
   userList: "Brukerliste"
   _userList:
     chooseList: "Velg liste"
+_widgetOptions:
+  height: "Høyde"
+  _clock:
+    size: "Størrelse"
 _cw:
   hide: "Skjul"
   show: "Vis mer"

locales/pl-PL.yml

@@ -1361,6 +1361,14 @@ _widgets:
   _userList:
     chooseList: "Wybierz listę"
   clicker: "Clicker"
+_widgetOptions:
+  height: "Wysokość"
+  _button:
+    colored: "Kolorowe"
+  _clock:
+    size: "Rozmiar"
+  _birthdayFollowings:
+    period: "Czas trwania"
 _cw:
   hide: "Ukryj"
   show: "Załaduj więcej"

locales/pt-PT.yml

@@ -2489,6 +2489,15 @@ _widgets:
   clicker: "Clicker"
   birthdayFollowings: "Usuários de aniversário hoje"
   chat: "Conversar com usuário"
+_widgetOptions:
+  showHeader: "Exibir cabeçalho"
+  height: "Altura"
+  _button:
+    colored: "Colorido"
+  _clock:
+    size: "Tamanho"
+  _birthdayFollowings:
+    period: "Duração"
 _cw:
   hide: "Esconder"
   show: "Carregar mais"
@@ -3230,7 +3239,6 @@ _imageEffector:
   title: "Efeitos"
   addEffect: "Adicionar efeitos"
   discardChangesConfirm: "Tem certeza que deseja sair? Há mudanças não salvas."
-  nothingToConfigure: "Não há nada para configurar"
   _fxs:
     chromaticAberration: "Aberração cromática"
     glitch: "Glitch"

locales/ro-RO.yml

@@ -1301,6 +1301,12 @@ _widgets:
   jobQueue: "coada de job-uri"
   _userList:
     chooseList: "Selectează o listă"
+_widgetOptions:
+  height: "Înălţime"
+  _button:
+    colored: "Colorat"
+  _clock:
+    size: "Dimensiune"
 _cw:
   show: "Incarcă mai mult"
 _visibility:

locales/ru-RU.yml

@@ -83,6 +83,8 @@ files: "Файлы"
 download: "Скачать"
 driveFileDeleteConfirm: "Удалить файл «{name}»? Заметки с ним также будут удалены."
 unfollowConfirm: "Отписаться от {name} ?"
+cancelFollowRequestConfirm: "Вы уверены, что хотите отменить запрос на подписку пользователю {name}?"
+rejectFollowRequestConfirm: "Отклонить запрос на подписку от {name}?"
 exportRequested: "Вы запросили экспорт. Это может занять некоторое время. Результат будет добавлен на «Диск»."
 importRequested: "Вы запросили импорт. Это может занять некоторое время."
 lists: "Списки"
@@ -199,7 +201,7 @@ searchWith: "Найденное «{q}»"
 youHaveNoLists: "У вас нет ни одного списка"
 followConfirm: "Подписаться на {name}?"
 proxyAccount: "Учётная запись прокси"
-proxyAccountDescription: "Учетная запись прокси предназначена служить подписчиком на пользователей с других сайтов. Например, если пользователь добавит кого-то с другого сайта а список, деятельность того не отобразится, пока никто с этого же сайта не подписан на него. Чтобы это стало возможным, на него подписывается прокси."
+proxyAccountDescription: "Учетная запись прокси предназначена служить подписчиком на пользователей с других сайтов. Например: если пользователь добавит кого-то с другого сайта в список, то деятельность того не отобразится, пока никто с этого же сайта не подписан на него. Чтобы это стало возможным, на него подписывается прокси."
 host: "Хост"
 selectSelf: "Выбрать себя"
 selectUser: "Выберите пользователя"
@@ -302,6 +304,7 @@ uploadFromUrlMayTakeTime: "Загрузка может занять некото
 uploadNFiles: "Загрузить {n} файл"
 explore: "Обзор"
 messageRead: "Прочитали"
+readAllChatMessages: "Отметить прочитанным"
 noMoreHistory: "История закончилась"
 startChat: "Начать чат"
 nUsersRead: "Прочитали {n}"
@@ -328,11 +331,13 @@ dark: "Тёмный"
 lightThemes: "Светлые темы"
 darkThemes: "Тёмные темы"
 syncDeviceDarkMode: "Синхронизировать с тёмной темой системы"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "Включена функция \"{x}\". Отключить синхронизацию, чтобы переключать режим вручную?"
 drive: "Диск"
 fileName: "Имя файла"
 selectFile: "Выберите файл"
 selectFiles: "Выберите файлы"
 selectFolder: "Выберите папку"
+unselectFolder: "Снять выбор"
 selectFolders: "Выберите папки"
 fileNotSelected: "Файл не выбран"
 renameFile: "Переименовать файл"
@@ -345,6 +350,7 @@ addFile: "Добавить файл"
 showFile: "Посмотреть файл"
 emptyDrive: "Диск пуст"
 emptyFolder: "Папка пуста"
+dropHereToUpload: "Переместите файл сюда"
 unableToDelete: "Удаление невозможно"
 inputNewFileName: "Введите имя нового файла"
 inputNewDescription: "Введите новую подпись"
@@ -458,7 +464,7 @@ moderator: "Модератор"
 moderation: "Модерация"
 moderationNote: "Примечания модератора"
 moderationNoteDescription: "Вы можете заполнять заметки, которые будут доступны только модераторам."
-addModerationNote: ""
+addModerationNote: "Оставить заметку"
 moderationLogs: "Журнал модерации"
 nUsersMentioned: "Упомянуло пользователей: {n}"
 securityKeyAndPasskey: "Ключ безопасности и парольная фраза"
@@ -602,7 +608,7 @@ installedDate: "Дата установки"
 lastUsedDate: "Дата использования"
 state: "Состояние"
 sort: "Сортировать"
-ascendingOrder: "по возрастанию"
+ascendingOrder: "По возрастанию"
 descendingOrder: "По убыванию"
 scratchpad: "Когтеточка"
 scratchpadDescription: "«Когтеточка» — это место для опытов с AiScript. Здесь можно писать программы, взаимодействующие с Misskey, запускать и смотреть что из этого получается."
@@ -623,9 +629,9 @@ removeAllFollowingDescription: "Отменить все подписки с до
 userSuspended: "Эта учётная запись заморожена"
 userSilenced: "Этот пользователь был заглушен"
 yourAccountSuspendedTitle: "Эта учетная запись заблокирована"
-yourAccountSuspendedDescription: "Эта учетная запись была заблокирована из-за нарушения условий предоставления услуг сервера. Свяжитесь с администратором, если вы хотите узнать более подробную причину. Пожалуйста, не создавайте новую учетную запись."
+yourAccountSuspendedDescription: "Этот аккаунт нарушил ToS сервера, поэтому был заморожен. Свяжитесь с администратором, чтобы узнать подробности. Не пытайтесь создать новый аккаунт."
 tokenRevoked: "Токен недействителен"
-tokenRevokedDescription: "Срок действия вашего токена входа истек. Пожалуйста, войдите снова."
+tokenRevokedDescription: "Токен входа устарел. Пожалуйста, войдите снова."
 accountDeleted: "Учетная запись удалена"
 accountDeletedDescription: "Эта учетная запись удалена"
 menu: "Меню"
@@ -684,9 +690,9 @@ smtpPort: "Порт"
 smtpUser: "Имя пользователя"
 smtpPass: "Пароль"
 emptyToDisableSmtpAuth: "Не заполняйте имя пользователя и пароль, чтобы отключить аутентификацию в SMTP."
-smtpSecure: "Использовать SSL/TLS для SMTP-соединений"
+smtpSecure: "Использовать SSL/TLS"
 smtpSecureInfo: "Выключите при использовании STARTTLS."
-testEmail: "Проверка доставки электронной почты"
+testEmail: "Отправить тестовое письмо"
 wordMute: "Скрытие слов"
 wordMuteDescription: "Сведите к минимуму записи, содержащие указанное утверждение. Нажмите на свернутую запись, чтобы отобразить ее."
 hardWordMute: "Строгое скрытие слов"
@@ -772,6 +778,7 @@ lockedAccountInfo: "Даже если вы вручную подтверждае
 alwaysMarkSensitive: "Отмечать файлы как «содержимое не для всех» по умолчанию"
 loadRawImages: "Сразу показывать изображения в полном размере"
 disableShowingAnimatedImages: "Не проигрывать анимацию"
+disableShowingAnimatedImages_caption: "Если анимации всё равно не работают, проверьте настройки специальных возможностей и режимы экономии заряда в браузере или системе"
 highlightSensitiveMedia: "Выделять содержимое не для всех"
 verificationEmailSent: "Вам отправлено письмо для подтверждения. Пройдите, пожалуйста, по ссылке из письма, чтобы завершить проверку."
 notSet: "Не настроено"
@@ -779,7 +786,7 @@ emailVerified: "Адрес электронной почты подтвержд
 noteFavoritesCount: "Количество добавленного в избранное"
 pageLikesCount: "Количество понравившихся страниц"
 pageLikedCount: "Количество страниц, понравившихся другим"
-contact: "Как связаться"
+contact: "Почта для связи"
 useSystemFont: "Использовать шрифт, предлагаемый системой"
 clips: "Подборки"
 experimentalFeatures: "Экспериментальные функции"
@@ -838,7 +845,7 @@ showingPastTimeline: "Отображается старая лента"
 clear: "Очистить"
 markAllAsRead: "Отметить всё как прочитанное"
 goBack: "Выход"
-unlikeConfirm: "В самом деле отменить «нравится»?"
+unlikeConfirm: "В самом деле убрать «нравится»?"
 fullView: "Полный вид"
 quitFullView: "Закрыть полный вид"
 addDescription: "Добавить описание"
@@ -883,7 +890,7 @@ priority: "Приоритет"
 high: "Высокий"
 middle: "Средне"
 low: "Низкий"
-emailNotConfiguredWarning: "Не указан адрес электронной почты"
+emailNotConfiguredWarning: "Адрес почты пустует"
 ratio: "Соотношение"
 previewNoteText: "Предварительный просмотр"
 customCss: "Индивидуальный CSS"
@@ -963,13 +970,13 @@ reflectMayTakeTime: "Изменения могут занять время дл
 failedToFetchAccountInformation: "Не удалось получить информацию об аккаунте"
 rateLimitExceeded: "Ограничение скорости превышено"
 cropImage: "Кадрирование"
-cropImageAsk: "Нужно ли кадрировать изображение?"
+cropImageAsk: "Обрезать изображение?"
 cropYes: "Обрезать"
 cropNo: "Не обрезать"
 file: "Файлы"
 recentNHours: "Последние {n} ч"
 recentNDays: "Последние {n} сут"
-noEmailServerWarning: "Почтовый сервер не установлен "
+noEmailServerWarning: "Отправка писем выключена"
 thereIsUnresolvedAbuseReportWarning: "Остались нерешённые жалобы"
 recommended: "Рекомендуем"
 check: "Проверить"
@@ -983,7 +990,7 @@ document: "Документ"
 numberOfPageCache: "Количество сохранённых страниц в кэше"
 numberOfPageCacheDescription: "Описание количества страниц в кэше"
 logoutConfirm: "Вы хотите выйти из аккаунта?"
-logoutWillClearClientData: "Когда вы выйдете из системы, информация о конфигурации клиента будет удалена из браузера.Чтобы иметь возможность восстановить информацию о вашей конфигурации при повторном входе в систему, пожалуйста, включите опцию автоматического резервного копирования в настройках."
+logoutWillClearClientData: "Выход из аккаунта удалит настройки клиента из этого браузера. Включите автоматическое резервное копирование, чтобы иметь возможность восстановить настройки при повторном входе."
 lastActiveDate: "Последняя дата использования"
 statusbar: "Статусбар"
 pleaseSelect: "Пожалуйста, выберите"
@@ -1002,6 +1009,7 @@ failedToUpload: "Сбой выгрузки"
 cannotUploadBecauseInappropriate: "Файл не может быть загружен, так как было установлено, что он может содержать неприемлемое содержимое."
 cannotUploadBecauseNoFreeSpace: "Файл не может быть загружен, так как не осталось места на диске"
 cannotUploadBecauseExceedsFileSizeLimit: "Файл не может быть загружен, так как он превышает лимит размера файла."
+cannotUploadBecauseUnallowedFileType: "Формат файла не подходит"
 beta: "Бета"
 enableAutoSensitive: "Автоматическое определение содержимого не для всех"
 enableAutoSensitiveDescription: "Позволяет определять наличие содержимого не для всех при помощи искусственного интеллекта там, где это возможно. Даже если эту опцию отключить, она всё равно может быть включена на весь инстанс."
@@ -1017,6 +1025,9 @@ pushNotificationAlreadySubscribed: "Push-уведомления уже вклю
 pushNotificationNotSupported: "Push-уведмления не поддерживаются инстансом или браузером"
 sendPushNotificationReadMessage: "Удалять push-уведомления когда сообщение или прочитано"
 sendPushNotificationReadMessageCaption: "На мгновение появится уведомление \"{emptyPushNotificationMessage}\". Расход заряда батареи может увеличиться "
+pleaseAllowPushNotification: "Пожалуйста, разрешите уведомление в браузере от сайта"
+browserPushNotificationDisabled: "Вы не дали разрешение на уведомления сайту"
+browserPushNotificationDisabledDescription: "Разрешите уведомления в настройках браузера от {serverName}, чтобы включить PUSH уведомления"
 windowMaximize: "Развернуть"
 windowMinimize: "Свернуть"
 windowRestore: "Восстановить"
@@ -1038,7 +1049,7 @@ roles: "Роли"
 role: "Роль"
 noRole: "Нет роли"
 normalUser: "Обычный пользователь"
-undefined: "неопределён"
+undefined: "неопределённо"
 assign: "Назначить"
 unassign: "Отменить назначение"
 color: "Цвет"
@@ -1053,6 +1064,7 @@ permissionDeniedError: "Операция запрещена"
 permissionDeniedErrorDescription: "У этой учетной записи нет разрешения на выполнение этой операции."
 preset: "Шаблоны"
 selectFromPresets: "Выбрать из шаблонов"
+custom: "Пользовательские"
 achievements: "Достижения"
 gotInvalidResponseError: "Сервер ответил ошибкой"
 gotInvalidResponseErrorDescription: "Сервер временно не доступен. Возможно проводятся технические работы, или сервер отключен."
@@ -1091,6 +1103,7 @@ prohibitedWordsDescription2: "Разделение пробелом создаё
 hiddenTags: "Скрытые хештеги"
 hiddenTagsDescription: "Установленные теги не будут отображаться в тренде, можно установить несколько тегов."
 notesSearchNotAvailable: "Поиск заметок недоступен"
+usersSearchNotAvailable: "Функция \"поиска пользователей\" отключена"
 license: "Лицензия"
 unfavoriteConfirm: "Удалить избранное?"
 myClips: "Мои подборки"
@@ -1129,7 +1142,7 @@ vertical: "Вертикально"
 horizontal: "Горизонтально"
 position: "Позиция"
 serverRules: "Правила сервера"
-pleaseConfirmBelowBeforeSignup: "Для регистрации на данном сервере, необходимо согласится с нижеследующими положениями."
+pleaseConfirmBelowBeforeSignup: "Прочитайте и согласитесь с информацией ниже, чтобы продолжить"
 pleaseAgreeAllToContinue: "Чтобы продолжить, необходимо поставить отметки во всех полях \"согласен\"."
 continue: "Продолжить"
 preservedUsernames: "Зарезервированные имена пользователей"
@@ -1178,6 +1191,9 @@ expirationDate: "Дата истечения"
 noExpirationDate: "Бессрочно"
 inviteCodeUsedAt: "Дата и время, когда был использован пригласительный код"
 registeredUserUsingInviteCode: "Пользователи, которые использовали пригласительный код"
+waitingForMailAuth: "Подтвердите вашу электронную почту"
+inviteCodeCreator: "Создатель приглашения"
+usedAt: "Использовано"
 unused: "Неиспользованное"
 used: "Использован"
 expired: "Срок действия приглашения истёк"
@@ -1186,43 +1202,58 @@ beSureToReadThisAsItIsImportant: "Это важно, поэтому, пожал
 iHaveReadXCarefullyAndAgree: "Я прочитал(а) и согласен(сна) с условиями \"{x}"
 dialog: "Диалог"
 icon: "Аватар"
+forYou: "Для вас"
 currentAnnouncements: "Текущие новости"
 pastAnnouncements: "Предыдущие новости"
 youHaveUnreadAnnouncements: "У вас есть непрочитанные уведомления"
+useSecurityKey: "Используйте ключ безопасности или Passkey, следуя подсказкам браузера"
 replies: "Ответы"
 renotes: "Репост"
 loadReplies: "Показать ответы"
 loadConversation: "Загрузить беседу"
 pinnedList: "Закреплённый список"
 keepScreenOn: "Держать экран включённым"
+verifiedLink: "Эта ссылка принадлежит пользователю"
+notifyNotes: "Оповещать о публикациях"
 unnotifyNotes: "Отписаться от сообщений"
 authentication: "Аутентификация"
 authenticationRequiredToContinue: "Пожалуйста, пройдите аутентификацию, чтобы продолжить"
 dateAndTime: "Дата и время"
 showRenotes: "Показывать репосты"
 edited: "Изменено"
+notificationRecieveConfig: "Настроить оповещения"
 mutualFollow: "Взаимные подписки"
 followingOrFollower: "Подписки или подписчики"
 fileAttachedOnly: "Только заметки с файлами"
 showRepliesToOthersInTimeline: "Показывать ответы в ленте"
+hideRepliesToOthersInTimeline: "Скрыть чужие ответы в ленте"
 showRepliesToOthersInTimelineAll: "Показывать в ленте ответы пользователей, на которых вы подписаны"
 hideRepliesToOthersInTimelineAll: "Скрывать в ленте ответы пользователей, на которых вы подписаны"
+confirmShowRepliesAll: "Это нельзя будет отменить. Показать ответы от всех, на кого вы подписаны?"
+confirmHideRepliesAll: "Это нельзя будет отменить. Скрыть ответы от всех, на кого вы подписаны?"
 sourceCode: "Исходный код"
 sourceCodeIsNotYetProvided: "Исходный код пока не доступен. Свяжитесь с администратором, чтобы исправить эту проблему."
 repositoryUrl: "Ссылка на репозиторий"
 repositoryUrlDescription: "Если вы используете Misskey как есть (без изменений в исходном коде), введите https://github.com/misskey-dev/misskey"
+repositoryUrlOrTarballRequired: "Если репозиторий закрыт, необходимо предоставить ссылку на tarball. Подробности см. в файле \".config/example.yml\""
 feedback: "Обратная связь"
+feedbackUrl: "Ссылка для обратной связи"
+impressum: "О владельце"
 privacyPolicy: "Политика Конфиденциальности"
 privacyPolicyUrl: "Ссылка на Политику Конфиденциальности"
 tosAndPrivacyPolicy: "Условия использования и политика конфиденциальности"
 avatarDecorations: "Украшения для аватара"
 attach: "Прикрепить"
+detach: "Открепить"
 detachAll: "Убрать всё"
 angle: "Угол"
 flip: "Переворот"
 showAvatarDecorations: "Показать украшения для аватара"
+releaseToRefresh: "Отпустите, чтобы обновить"
+refreshing: "Обновление..."
 pullDownToRefresh: "Опустите что бы обновить"
 useGroupedNotifications: "Отображать уведомления сгруппировано"
+emailVerificationFailedError: "Не смогли подтвердить почту. Вероятно, истек срок письма"
 cwNotationRequired: "Если включена опция «Скрыть содержимое», необходимо написать аннотацию."
 doReaction: "Добавить реакцию"
 code: "Код"
@@ -1232,34 +1263,49 @@ overwriteContentConfirm: "Текущее содержимое будет пер
 seasonalScreenEffect: "Эффект времени года на экране"
 decorate: "Украсить"
 addMfmFunction: "Добавить MFM"
+enableQuickAddMfmFunction: "Показывать расширенный выбор MFM"
 bubbleGame: "BubbleGame"
 sfx: "Звуковые эффекты"
 soundWillBePlayed: "Будет воспроизведен звук"
 showReplay: "Показать повтор"
+replay: "Ответить"
 endReplay: "Конец повтора"
 lastNDays: "Последние {n} сут"
 hemisphere: "Место проживания"
 userSaysSomethingSensitive: "Сообщение, содержит конфиденциальные файлы от {name}"
 enableHorizontalSwipe: "Смахните в сторону, чтобы сменить вкладки"
+loading: "Загрузка"
 surrender: "Этот пост не может быть отменен."
 gameRetry: "Повторить попытку"
 notUsePleaseLeaveBlank: "Если не используется, оставьте пустым"
+useTotp: "Включить двухэтапную проверку"
+useBackupCode: "Использовать резервные коды"
+launchApp: "Запустить приложение"
 useNativeUIForVideoAudioPlayer: "Использовать интерфейс браузера при проигрывании видео и звука"
 keepOriginalFilename: "Сохранять исходное имя файла"
 keepOriginalFilenameDescription: "Если вы выключите данную настройку, имена файлов будут автоматически заменены случайной строкой при загрузке."
+noDescription: "Нет описания"
 alwaysConfirmFollow: "Всегда подтверждать подписку"
 inquiry: "Связаться"
+tryAgain: "Попробуйте еще раз позже"
+confirmWhenRevealingSensitiveMedia: "Спрашивать перед открытием NSFW контента"
+sensitiveMediaRevealConfirm: "Возможно, это NSFW контент. Показать?"
+createdLists: "Созданные списки"
+createdAntennas: "Созданные антенны"
 fromX: "Из {x}"
 genEmbedCode: "Сгенерировать код для "
 noteOfThisUser: "Список заметок этого пользователя"
 clipNoteLimitExceeded: "К этому клипу больше нельзя добавить заметки"
 performance: "Производительность"
 modified: "Изменено"
+discard: "Отменить"
+thereAreNChanges: "Изменено: {n}"
 signinWithPasskey: "Войдите в систему, используя свой пароль"
 unknownWebAuthnKey: "Неизвестный ключ"
 passkeyVerificationFailed: "Ошибка проверка ключа доступа "
+passkeyVerificationSucceededButPasswordlessLoginDisabled: "Проверка Passkey выполнена, но вход без пароля отключен"
 messageToFollower: "Сообщение подписчикам"
-testCaptchaWarning: "Эта функция предназначена для тестирования CAPTCHA. <strong>Не использовать это в рабочей среде</strong>"
+testCaptchaWarning: "Эта тестовая CAPTCHA. <strong>Не используйте её!</strong>"
 prohibitedWordsForNameOfUser: "Запрещенные слова (имя пользователя)"
 prohibitedWordsForNameOfUserDescription: "Если имя пользователя содержит строку из этого списка, изменение имени пользователя будет запрещено. На пользователей с правами модератора это ограничение не распространяется. Имена пользователей также проверяются путём замены всех букв в нижнем регистре"
 yourNameContainsProhibitedWords: "Имя, которое вы пытаетесь изменить, содержит запрещенную строку символов"
@@ -1268,24 +1314,65 @@ thisContentsAreMarkedAsSigninRequiredByAuthor: "Автор сообщения у
 lockdown: "Доступ ограничен"
 pleaseSelectAccount: "Выберите свой аккаунт"
 availableRoles: "Доступные роли"
+federationSpecified: "Сервер работает через белый список федерации. Связь с другими серверами ограничена"
 federationDisabled: "Федерация отключена для этого сервера. Вы не можете взаимодействовать с пользователями на других серверах."
 draft: "Черновик"
+draftsAndScheduledNotes: "Черновики и отложенные публикации"
+confirmOnReact: "Подтверждать добавление реакции"
+reactAreYouSure: "Добавить {emoji}?"
 markAsSensitiveConfirm: "Отметить контент как чувствительный?"
+unmarkAsSensitiveConfirm: "Снять пометку о NSFW контенте?"
 preferences: "Основное"
+accessibility: "Специальные возможности"
+preferencesProfile: "Настройки профиля"
+copyPreferenceId: "Копировать ID настройки"
 resetToDefaultValue: "Сбросить настройки до стандартных"
+overrideByAccount: "Переопределить этим аккаунтом"
+untitled: "Без названия"
+noName: "Имя не указано"
+skip: "Пропустить"
 syncBetweenDevices: "Синхронизировать между устройствами"
 postForm: "Форма отправки"
 textCount: "Количество символов"
 information: "Описание"
 inMinutes: "мин"
 inDays: "сут"
+schedule: "Отложить"
+scheduled: "Отложено"
 widgets: "Виджеты"
+deviceInfo: "Об устройстве"
+deviceInfoDescription: "Эта информация может быть полезна при обращении в поддержку"
+youAreAdmin: "Вы администратор"
+frame: "Рамки"
 presets: "Шаблоны"
+zeroPadding: "Без отступов"
+nothingToConfigure: "Нечего менять"
 _imageEditing:
   _vars:
+    caption: "Описание файла"
     filename: "Имя файла"
+    filename_without_ext: "Имя файла без расширения"
+    year: "Год создания"
+    month: "Месяц создания"
+    day: "День создания"
+    hour: "Час создания"
+    minute: "Минуты создания"
+    second: "Секунды создания"
+    camera_model: "Модель камеры"
+    camera_lens_model: "Модель линзы"
+    camera_mm: "Фокусное расстояние"
+    camera_mm_35: "Фокусное расстояние (экв. 35 мм)"
+    camera_f: "Диафрагма"
+    camera_s: "Выдержка"
+    camera_iso: "ISO"
+    gps_lat: "Широта"
+    gps_long: "Долгота"
 _imageFrameEditor:
+  title: "Редактировать рамку"
   header: "Заголовок"
+  footer: "Нижняя часть"
+  borderThickness: "Толщина рамки"
+  labelThickness: "Толщина границ"
   font: "Шрифт"
   fontSerif: "Антиква (с засечками)"
   fontSansSerif: "Гротеск (без засечек)"
@@ -1661,6 +1748,7 @@ _emailUnavailable:
   disposable: "Временный адрес электронной почты не принимается"
   mx: "Неверный почтовый сервер"
   smtp: "Почтовый сервер не отвечает"
+  banned: "Этот адрес почты недоступен"
 _ffVisibility:
   public: "Общедоступны"
   followers: "Показываются только подписчикам"
@@ -1921,6 +2009,7 @@ _permissions:
   "read:gallery-likes": "Просмотр списка понравившегося в галерее"
   "write:gallery-likes": "Изменение списка понравившегося в галерее"
   "write:admin:reset-password": "Сбросить пароль пользователю"
+  "write:admin:send-email": "Отправить письмо"
   "write:chat": "Писать и удалять сообщения"
 _auth:
   shareAccessTitle: "Разрешения для приложений"
@@ -1976,6 +2065,14 @@ _widgets:
     chooseList: "Выберите список"
   clicker: "Счётчик щелчков"
   birthdayFollowings: "Пользователи, у которых сегодня день рождения"
+_widgetOptions:
+  height: "Высота"
+  _button:
+    colored: "Выделена цветом"
+  _clock:
+    size: "Размер"
+  _birthdayFollowings:
+    period: "Длительность"
 _cw:
   hide: "Спрятать"
   show: "Показать"
@@ -2245,6 +2342,7 @@ _abuseReport:
       mail: "Электронная почта"
       webhook: "Вебхук"
       _captions:
+        mail: "Уведомлять модераторов по почте (только при поступлении жалоб)"
         webhook: "Отправить уведомление Системному Вебхуку при получении или разрешении жалоб."
     notifiedWebhook: "Используемый Вебхук"
 _moderationLogTypes:

locales/sk-SK.yml

@@ -1232,6 +1232,14 @@ _widgets:
   aichan: "Ai"
   _userList:
     chooseList: "Vyberte zoznam"
+_widgetOptions:
+  height: "Výška"
+  _button:
+    colored: "Farebné"
+  _clock:
+    size: "Veľkosť"
+  _birthdayFollowings:
+    period: "Trvanie"
 _cw:
   hide: "Skryť"
   show: "Zobraziť viac"

locales/sv-SE.yml

@@ -639,6 +639,9 @@ _widgets:
   jobQueue: "Jobbkö"
   _userList:
     chooseList: "Välj lista"
+_widgetOptions:
+  _clock:
+    size: "Storlek"
 _cw:
   hide: "Dölj"
   show: "Ladda mer"

locales/th-TH.yml

@@ -2489,6 +2489,15 @@ _widgets:
   clicker: "คลิกเกอร์"
   birthdayFollowings: "วันเกิดผู้ใช้ในวันนี้"
   chat: "แชตเลย"
+_widgetOptions:
+  showHeader: "แสดงส่วนหัว"
+  height: "ความสูง"
+  _button:
+    colored: "สี"
+  _clock:
+    size: "ขนาด"
+  _birthdayFollowings:
+    period: "ระยะเวลา"
 _cw:
   hide: "ซ่อน"
   show: "โหลดเพิ่มเติม"
@@ -3230,7 +3239,6 @@ _imageEffector:
   title: "เอฟเฟกต์"
   addEffect: "เพิ่มเอฟเฟกต์"
   discardChangesConfirm: "ต้องการทิ้งการเปลี่ยนแปลงแล้วออกหรือไม่?"
-  nothingToConfigure: "ไม่มีอะไรให้ตั้งค่า"
   _fxs:
     chromaticAberration: "ความคลาดสี"
     glitch: "กลิตช์"

locales/tr-TR.yml

@@ -2466,6 +2466,15 @@ _widgets:
   clicker: "Tıklayıcı"
   birthdayFollowings: "Bugünün Doğum Günleri"
   chat: "Sohbet"
+_widgetOptions:
+  showHeader: "Başlığı göster"
+  height: "Yükseklik"
+  _button:
+    colored: "Renkli"
+  _clock:
+    size: "Boyut"
+  _birthdayFollowings:
+    period: "Süre"
 _cw:
   hide: "Gizle"
   show: "İçeriği göster"
@@ -3202,7 +3211,6 @@ _imageEffector:
   title: "Effektler"
   addEffect: "Efektler Ekle"
   discardChangesConfirm: "Cidden çıkmak istiyor musun? Kaydedilmemiş değişikliklerin var."
-  nothingToConfigure: "Yapılandırılabilir seçenekler mevcut değildir."
   _fxs:
     chromaticAberration: "Renk Sapması"
     glitch: "Bozulma"

locales/uk-UA.yml

@@ -1430,6 +1430,14 @@ _widgets:
   userList: "Список користувачів"
   _userList:
     chooseList: "Виберіть список"
+_widgetOptions:
+  height: "Висота"
+  _button:
+    colored: "Кольоровий"
+  _clock:
+    size: "Розмір"
+  _birthdayFollowings:
+    period: "Тривалість"
 _cw:
   hide: "Сховати"
   show: "Показати більше"

locales/uz-UZ.yml

@@ -945,6 +945,12 @@ _widgets:
   jobQueue: "Vazifalar navbati"
   _userList:
     chooseList: "Ro'yxat tanlash"
+_widgetOptions:
+  height: "balandligi"
+  _button:
+    colored: "rangli"
+  _birthdayFollowings:
+    period: "Davomiylik"
 _cw:
   show: "Ko‘proq ko‘rish"
   chars: "{count} ta belgi(lar)"

locales/vi-VN.yml

@@ -1826,6 +1826,14 @@ _widgets:
   _userList:
     chooseList: "Chọn danh sách"
   clicker: "clicker"
+_widgetOptions:
+  height: "Chiều cao"
+  _button:
+    colored: "Với màu"
+  _clock:
+    size: "Kích thước"
+  _birthdayFollowings:
+    period: "Thời hạn"
 _cw:
   hide: "Ẩn"
   show: "Tải thêm"

locales/zh-CN.yml

@@ -10,7 +10,7 @@ notifications: "通知"
 username: "用户名"
 password: "密码"
 initialPasswordForSetup: "初始化密码"
-initialPasswordIsIncorrect: "初始化密码不正确"
+initialPasswordIsIncorrect: "初始化密码不正确。"
 initialPasswordForSetupDescription: "如果是自己安装的 Misskey，请输入配置文件里设好的密码。\n如果使用的是 Misskey 的托管服务等，请输入服务商提供的密码。\n如果没有设置密码，请留空并继续。"
 forgotPassword: "忘记密码"
 fetchingAsApObject: "在联邦宇宙查询中..."
@@ -146,11 +146,11 @@ markAsSensitive: "标记为敏感内容"
 unmarkAsSensitive: "取消标记为敏感内容"
 enterFileName: "输入文件名"
 mute: "屏蔽"
-unmute: "取消屏蔽"
+unmute: "取消隐藏"
-renoteMute: "屏蔽转帖"
+renoteMute: "隐藏转帖"
-renoteUnmute: "取消屏蔽转帖"
+renoteUnmute: "取消隐藏转帖"
-block: "拉黑"
+block: "屏蔽"
-unblock: "取消拉黑"
+unblock: "取消屏蔽"
 suspend: "冻结"
 unsuspend: "解除冻结"
 blockConfirm: "确定要屏蔽吗？"
@@ -241,13 +241,13 @@ clearCachedFilesConfirm: "确定要清除所有缓存的远程文件吗？"
 blockedInstances: "被屏蔽的服务器"
 blockedInstancesDescription: "设定要屏蔽的服务器，以换行分隔。被屏蔽的服务器将无法与本服务器进行交换通讯。子域名也同样会被屏蔽。"
 silencedInstances: "被静音的服务器"
-silencedInstancesDescription: "设置要静音的服务器，以换行分隔。被静音的服务器内所有的账户都被视为「静音」状态，且关注操作均需要被批准。被阻止的实例不受影响。"
+silencedInstancesDescription: "设置要静音的服务器，以换行分隔。被静音的服务器内所有的账户都被视为「静音」状态，且关注操作均需要被批准。已被屏蔽的实例不受影响。"
 mediaSilencedInstances: "已隐藏媒体文件的服务器"
-mediaSilencedInstancesDescription: "设置要隐藏媒体文件的服务器，以换行分隔。被设置的服务器内所有账号的文件均按照「敏感内容」处理，且将无法使用自定义表情符号。被阻止的实例不受影响。"
+mediaSilencedInstancesDescription: "设置要隐藏媒体文件的服务器，以换行分隔。被设置的服务器内所有账号的文件均按照「敏感内容」处理，且将无法使用自定义表情符号。已被屏蔽的实例不受影响。"
 federationAllowedHosts: "允许联合的服务器"
 federationAllowedHostsDescription: "设定允许联合的服务器，以换行分隔。"
-muteAndBlock: "屏蔽/拉黑"
+muteAndBlock: "隐藏/屏蔽"
-mutedUsers: "已静音的用户"
+mutedUsers: "已隐藏的用户"
 blockedUsers: "已屏蔽的用户"
 noUsers: "无用户"
 editProfile: "编辑资料"
@@ -262,7 +262,7 @@ defaultValueIs: "默认值: {value}"
 noCustomEmojis: "没有自定义表情符号"
 noJobs: "没有任务"
 federating: "联合中"
-blocked: "已拉黑"
+blocked: "已屏蔽"
 suspended: "停止投递"
 all: "全部"
 subscribing: "已订阅"
@@ -693,13 +693,13 @@ emptyToDisableSmtpAuth: "用户名和密码留空可以禁用 SMTP 验证"
 smtpSecure: "在 SMTP 连接中使用隐式 SSL / TLS"
 smtpSecureInfo: "使用 STARTTLS 时关闭。"
 testEmail: "邮件发送测试"
-wordMute: "屏蔽关键词"
+wordMute: "折叠关键词"
 wordMuteDescription: "折叠包含指定关键词的帖子。被折叠的帖子可单击展开。"
-hardWordMute: "强屏蔽关键词"
+hardWordMute: "屏蔽关键词"
-showMutedWord: "显示屏蔽关键词"
+showMutedWord: "显示已折叠的关键词"
-hardWordMuteDescription: "隐藏包含指定关键词的帖子。与隐藏关键词不同，帖子将完全不会显示。"
+hardWordMuteDescription: "屏蔽包含指定关键词的帖子。与折叠关键词不同，帖子将完全不会显示。"
 regexpError: "正则表达式错误"
-regexpErrorDescription: "{tab} 隐藏文字的第 {line} 行的正则表达式有错误："
+regexpErrorDescription: "{tab} 折叠关键词的第 {line} 行的正则表达式有错误："
 instanceMute: "已隐藏的服务器"
 userSaysSomething: "{name} 说了什么,但是被屏蔽词过滤了"
 userSaysSomethingAbout: "{name} 说了关于「{word}」的什么"
@@ -912,7 +912,7 @@ accountDeletionInProgress: "正在删除账户"
 usernameInfo: "在服务器上唯一标识您的帐户的名称。您可以使用字母 (a ~ z, A ~ Z)、数字 (0 ~ 9) 和下划线 (_)。用户名以后不能更改。"
 aiChanMode: "小蓝模式"
 devMode: "开发者模式"
-keepCw: "回复时维持隐藏内容"
+keepCw: "始终开启内容警告"
 pubSub: "Pub/Sub 账户"
 lastCommunication: "最近通信"
 resolved: "已解决"
@@ -931,8 +931,8 @@ manageAccounts: "管理账户"
 makeReactionsPublic: "将回应设置为公开"
 makeReactionsPublicDescription: "将您发表过的回应设置成公开可见。"
 classic: "经典"
-muteThread: "屏蔽帖文串"
+muteThread: "静音帖文串"
-unmuteThread: "取消屏蔽帖文串"
+unmuteThread: "取消帖文串静音"
 followingVisibility: "关注的人的公开范围"
 followersVisibility: "关注者的公开范围"
 continueThread: "查看更多帖子"
@@ -955,7 +955,7 @@ searchByGoogle: "Google"
 instanceDefaultLightTheme: "服务器默认浅色主题"
 instanceDefaultDarkTheme: "服务器默认深色主题"
 instanceDefaultThemeDescription: "以对象格式输入主题代码"
-mutePeriod: "屏蔽期限"
+mutePeriod: "隐藏时长"
 period: "截止时间"
 indefinitely: "永久"
 tenMinutes: "10分钟"
@@ -1293,7 +1293,7 @@ useNativeUIForVideoAudioPlayer: "使用浏览器的 UI 播放动画及音频"
 keepOriginalFilename: "保持原文件名"
 keepOriginalFilenameDescription: "若关闭此设置，上传文件时文件名将被替换为随机字符。"
 noDescription: "没有描述"
-alwaysConfirmFollow: "总是确认关注"
+alwaysConfirmFollow: "在关注时始终确认"
 inquiry: "联系我们"
 tryAgain: "请再试一次"
 confirmWhenRevealingSensitiveMedia: "显示敏感内容前需要确认"
@@ -1334,7 +1334,7 @@ markAsSensitiveConfirm: "要将此媒体标记为敏感吗？"
 unmarkAsSensitiveConfirm: "要将此媒体解除敏感标记吗？"
 preferences: "偏好设置"
 accessibility: "辅助功能"
-preferencesProfile: "设置的配置"
+preferencesProfile: "设置的配置文件"
 copyPreferenceId: "复制设置 ID"
 resetToDefaultValue: "重置为默认值"
 overrideByAccount: "覆盖账号"
@@ -1351,7 +1351,7 @@ preferenceSyncConflictChoiceDevice: "设备上的设定值"
 preferenceSyncConflictChoiceCancel: "取消同步"
 paste: "粘贴"
 emojiPalette: "表情符号调色板"
-postForm: "投稿窗口"
+postForm: "发帖窗口"
 textCount: "字数"
 information: "关于"
 chat: "聊天"
@@ -1374,10 +1374,10 @@ advice: "建议"
 realtimeMode: "实时模式"
 turnItOn: "开启"
 turnItOff: "关闭"
-emojiMute: "屏蔽表情符号"
+emojiMute: "打码表情符号"
-emojiUnmute: "取消屏蔽表情符号"
+emojiUnmute: "取消表情符号打码"
-muteX: "屏蔽{x}"
+muteX: "隐藏{x}"
-unmuteX: "取消屏蔽{x}"
+unmuteX: "取消对{x}的隐藏"
 abort: "中止"
 tip: "提示和技巧"
 redisplayAllTips: "重新显示所有的提示和技巧"
@@ -1406,6 +1406,7 @@ youAreAdmin: "你是管理员"
 frame: "边框"
 presets: "预设值"
 zeroPadding: "填充 0"
+nothingToConfigure: "没有项目"
 _imageEditing:
   _vars:
     caption: "文件标题"
@@ -1485,7 +1486,7 @@ _chat:
   home: "首页"
   send: "发送"
   newline: "换行"
-  muteThisRoom: "屏蔽该群聊"
+  muteThisRoom: "消息免打扰"
   deleteRoom: "删除群聊"
   chatNotAvailableForThisAccountOrServer: "此服务器或者账户还未开启聊天功能。"
   chatIsReadOnlyForThisAccountOrServer: "此服务器或者账户内的聊天为只读。无法发布新信息或创建及加入群聊。"
@@ -1548,13 +1549,16 @@ _settings:
   showUrlPreview: "显示 URL 预览"
   showAvailableReactionsFirstInNote: "在顶部显示可用的回应"
   showPageTabBarBottom: "在下方显示页面标签栏"
-  emojiPaletteBanner: "可以将固定显示表情符号选择器的预设注册至调色板，也可以自定义表情符号选择器的显示方式。"
+  emojiPaletteBanner: "可以将固定显示在表情符号选择器中的预设注册为调色板，也可以自定义表情符号选择器的显示方式。"
   enableAnimatedImages: "启用动画图像"
+  settingsPersistence_title: "设置持久化"
+  settingsPersistence_description1: "启用设置持久化可防止设置信息丢失。"
+  settingsPersistence_description2: "根据环境不同，有可能无法开启。"
   _chat:
     showSenderName: "显示发送者的名字"
     sendOnEnter: "回车键发送"
 _preferencesProfile:
-  profileName: "配置名"
+  profileName: "配置文件名"
   profileNameDescription: "请指定用于识别此设备的名称"
   profileNameDescription2: "如「PC」、「手机」等"
   manageProfiles: "管理配置文件"
@@ -2080,7 +2084,7 @@ _role:
     canUpdateBioMedia: "可以更新头像和横幅"
     pinMax: "帖子置顶数量限制"
     antennaMax: "可创建的最大天线数量"
-    wordMuteMax: "屏蔽词的字数限制"
+    wordMuteMax: "折叠词的字数限制"
     webhookMax: "Webhook 创建数量限制"
     clipMax: "便签创建数量限制"
     noteEachClipsMax: "便签内贴文的最大数量"
@@ -2251,14 +2255,14 @@ _menuDisplay:
   top: "顶部"
   hide: "隐藏"
 _wordMute:
-  muteWords: "要隐藏的词"
+  muteWords: "要屏蔽的词"
   muteWordsDescription: "AND 条件用空格分隔，OR 条件用换行符分隔。"
   muteWordsDescription2: "正则表达式用斜线包裹"
 _instanceMute:
-  instanceMuteDescription: "屏蔽服务器中所有的帖子和转帖，包括该服务器内用户的回复。"
+  instanceMuteDescription: "隐藏来自这些服务器的所有帖子和转贴，包括这些服务器上用户的回复。"
   instanceMuteDescription2: "通过换行符分隔进行设置"
   title: "下面实例中的帖子将被隐藏。"
-  heading: "已屏蔽的服务器"
+  heading: "已隐藏的服务器"
 _theme:
   explore: "寻找主题"
   install: "安装主题"
@@ -2397,8 +2401,8 @@ _2fa:
 _permissions:
   "read:account": "查看账户信息"
   "write:account": "更改帐户信息"
-  "read:blocks": "查看黑名单"
+  "read:blocks": "查看屏蔽列表"
-  "write:blocks": "编辑黑名单"
+  "write:blocks": "编辑屏蔽列表"
   "read:drive": "查看网盘"
   "write:drive": "管理网盘文件"
   "read:favorites": "查看收藏夹"
@@ -2407,8 +2411,8 @@ _permissions:
   "write:following": "关注/取消关注"
   "read:messaging": "查看私信"
   "write:messaging": "撰写或删除消息"
-  "read:mutes": "查看屏蔽列表"
+  "read:mutes": "查看已隐藏用户列表"
-  "write:mutes": "编辑屏蔽列表"
+  "write:mutes": "编辑已隐藏用户列表"
   "write:notes": "撰写或删除帖子"
   "read:notifications": "查看通知"
   "write:notifications": "管理通知"
@@ -2512,7 +2516,7 @@ _weekday:
 _widgets:
   profile: "个人资料"
   instanceInfo: "服务器信息"
-  memo: "便签"
+  memo: "便利贴"
   notifications: "通知"
   timeline: "时间线"
   calendar: "日历"
@@ -2525,11 +2529,11 @@ _widgets:
   digitalClock: "数字时钟"
   unixClock: "UNIX 时钟"
   federation: "联合"
-  instanceCloud: "服务器云"
+  instanceCloud: "服务器球状列表"
-  postForm: "投稿窗口"
+  postForm: "发帖窗口"
   slideshow: "幻灯片展示"
   button: "按钮"
-  onlineUsers: "在线用户"
+  onlineUsers: "在线用户数"
   jobQueue: "作业队列"
   serverMetric: "服务器指标"
   aiscript: "AiScript 控制台"
@@ -2541,6 +2545,44 @@ _widgets:
   clicker: "点击器"
   birthdayFollowings: "今天是他们的生日"
   chat: "私信"
+_widgetOptions:
+  showHeader: "显示标题"
+  transparent: "使背景透明"
+  height: "高度"
+  _button:
+    colored: "彩色"
+  _clock:
+    size: "大小"
+    thickness: "指针宽度"
+    thicknessThin: "细"
+    thicknessMedium: "普通"
+    thicknessThick: "粗"
+    graduations: "表盘刻度"
+    graduationDots: "点"
+    graduationArabic: "阿拉伯数字"
+    fadeGraduations: "淡化表盘"
+    sAnimation: "秒针动画"
+    sAnimationElastic: "跳动"
+    sAnimationEaseOut: "平滑"
+    twentyFour: "24 小时制"
+    labelTime: "时间"
+    labelTz: "时区"
+    labelTimeAndTz: "时间和时区"
+    timezone: "时区"
+    showMs: "显示毫秒"
+    showLabel: "显示标签"
+  _jobQueue:
+    sound: "播放音效"
+  _rss:
+    url: "RSS feed 的 URL"
+    refreshIntervalSec: "更新间隔（秒）"
+    maxEntries: "最大显示个数"
+  _rssTicker:
+    shuffle: "随机顺序"
+    duration: "滚动速度（秒）"
+    reverse: "反方向滚动"
+  _birthdayFollowings:
+    period: "期限"
 _cw:
   hide: "隐藏"
   show: "查看更多"
@@ -2628,10 +2670,10 @@ _exportOrImport:
   favoritedNotes: "收藏的帖子"
   clips: "便签"
   followingList: "关注中"
-  muteList: "屏蔽"
+  muteList: "隐藏"
-  blockingList: "拉黑"
+  blockingList: "屏蔽"
   userLists: "列表"
-  excludeMutingUsers: "排除屏蔽用户"
+  excludeMutingUsers: "排除已隐藏用户"
   excludeInactiveUsers: "排除不活跃用户"
   withReplies: "在时间线中包含导入用户的回复"
 _charts:
@@ -2812,10 +2854,18 @@ _deck:
   introduction: "将各列进行组合以创建您自己的界面！"
   introduction2: "可以随时通过屏幕右侧的 + 来添加列"
   widgetsIntroduction: "从列菜单中，选择“小工具编辑”来添加小工具"
-  useSimpleUiForNonRootPages: "用简易UI表示非根页面"
+  useSimpleUiForNonRootPages: "使用简易UI显示导航页面"
   usedAsMinWidthWhenFlexible: "「自适应宽度」被启用的时候，这就是最小的宽度"
   flexible: "自适应宽度"
-  enableSyncBetweenDevicesForProfiles: "启用个人资料信息跨设备同步"
+  enableSyncBetweenDevicesForProfiles: "启用配置文件跨设备同步"
+  showHowToUse: "查看用户界面说明"
+  _howToUse:
+    addColumn_title: "添加列"
+    addColumn_description: "可以选择要添加的列的类型。"
+    settings_title: "用户界面设置"
+    settings_description: "可以配置 Deck UI 的详细设置，"
+    switchProfile_title: "切换配置文件"
+    switchProfile_description: "将用户界面布局保存为配置文件，以便随时切换。"
   _columns:
     main: "主列"
     widgets: "小工具"
@@ -3064,10 +3114,10 @@ _mediaControls:
   playbackRate: "播放速度"
   loop: "循环播放"
 _contextMenu:
-  title: "上下文菜单"
+  title: "右键菜单"
-  app: "应用"
+  app: "使用"
-  appWithShift: "Shift 键应用"
+  appWithShift: "按住 Shift 键使用"
-  native: "浏览器的用户界面"
+  native: "浏览器的原生界面"
 _gridComponent:
   _error:
     requiredValue: "此值为必填项"
@@ -3299,7 +3349,6 @@ _imageEffector:
   title: "效果"
   addEffect: "添加效果"
   discardChangesConfirm: "丢弃当前设置并退出？"
-  nothingToConfigure: "还没有设置"
   failedToLoadImage: "图片加载失败"
   _fxs:
     chromaticAberration: "色差"

locales/zh-TW.yml

@@ -1089,9 +1089,9 @@ postToTheChannel: "發佈到頻道"
 cannotBeChangedLater: "之後不能變更。"
 reactionAcceptance: "接受表情反應"
 likeOnly: "僅限讚"
-likeOnlyForRemote: "遠端僅限讚"
+likeOnlyForRemote: "全部（遠端僅限讚）"
 nonSensitiveOnly: "僅限非敏感"
-nonSensitiveOnlyForLocalLikeOnlyForRemote: "僅限非敏感（遠端僅限按讚）"
+nonSensitiveOnlyForLocalLikeOnlyForRemote: "僅限非敏感（遠端僅限讚）"
 rolesAssignedToMe: "指派給自己的角色"
 resetPasswordConfirm: "重設密碼？"
 sensitiveWords: "敏感詞"
@@ -1366,7 +1366,7 @@ top: "上"
 embed: "嵌入"
 settingsMigrating: "正在移轉設定。請稍候……（之後也可以到「設定 → 其他 → 舊設定資訊移轉」中手動進行移轉）"
 readonly: "唯讀"
-goToDeck: "回去甲板"
+goToDeck: "回到多欄模式"
 federationJobs: "聯邦通訊作業"
 driveAboutTip: "在「雲端硬碟」中，會顯示過去上傳的檔案列表。<br>\n可以在附加到貼文時重新利用，或者事先上傳之後再用於發布。<br>\n<b>請注意，刪除檔案後，之前使用過該檔案的所有地方（貼文、頁面、大頭貼、橫幅等）也會一併無法顯示。</b><br>\n也可以建立資料夾來整理檔案。"
 scrollToClose: "用滾輪關閉"
@@ -1393,7 +1393,7 @@ pluginsAreDisabledBecauseSafeMode: "由於啟用安全模式，所有的外掛
 customCssIsDisabledBecauseSafeMode: "由於啟用安全模式，所有的客製 CSS 都被停用。"
 themeIsDefaultBecauseSafeMode: "在安全模式啟用期間將使用預設主題。關閉安全模式後會恢復原本的設定。"
 thankYouForTestingBeta: "感謝您協助驗證 beta 版！"
-createUserSpecifiedNote: "建立使用者指定的筆記"
+createUserSpecifiedNote: "建立指定使用者的貼文"
 schedulePost: "排定發布"
 scheduleToPostOnX: "排定在 {x} 發布"
 scheduledToPostOnX: "已排定在 {x} 發布貼文"
@@ -1406,6 +1406,7 @@ youAreAdmin: "您是管理員"
 frame: "邊框"
 presets: "預設值"
 zeroPadding: "補零"
+nothingToConfigure: "無可設定的項目"
 _imageEditing:
   _vars:
     caption: "檔案標題"
@@ -1550,6 +1551,9 @@ _settings:
   showPageTabBarBottom: "在底部顯示頁面的標籤列"
   emojiPaletteBanner: "可以將固定顯示在表情符號選擇器的預設項目註冊為調色盤，或者自訂選擇器的顯示方式。"
   enableAnimatedImages: "啟用動畫圖片"
+  settingsPersistence_title: "設定的持久化"
+  settingsPersistence_description1: "啟用「設定的持久化」後，可以防止設定資訊遺失。"
+  settingsPersistence_description2: "依環境不同，可能無法啟用。"
   _chat:
     showSenderName: "顯示發送者的名稱"
     sendOnEnter: "按下 Enter 發送訊息"
@@ -2541,6 +2545,44 @@ _widgets:
   clicker: "點擊器"
   birthdayFollowings: "今天生日的使用者"
   chat: "聊天"
+_widgetOptions:
+  showHeader: "檢視標頭 "
+  transparent: "使背景透明"
+  height: "高度"
+  _button:
+    colored: "彩色"
+  _clock:
+    size: "尺寸"
+    thickness: "指針粗細"
+    thicknessThin: "細"
+    thicknessMedium: "普通"
+    thicknessThick: "粗"
+    graduations: "刻度盤"
+    graduationDots: "圓點"
+    graduationArabic: "阿拉伯數字"
+    fadeGraduations: "刻度淡出"
+    sAnimation: "秒針的動畫效果"
+    sAnimationElastic: "真實的"
+    sAnimationEaseOut: "滑順"
+    twentyFour: "24 小時制"
+    labelTime: "時間"
+    labelTz: "時區"
+    labelTimeAndTz: "時間與時區"
+    timezone: "時區"
+    showMs: "顯示毫秒"
+    showLabel: "顯示標記"
+  _jobQueue:
+    sound: "播放音效"
+  _rss:
+    url: "RSS 訂閱網址"
+    refreshIntervalSec: "更新間隔（秒）"
+    maxEntries: "最大顯示數量"
+  _rssTicker:
+    shuffle: "顯示順序隨機排列"
+    duration: "RSS 跑馬燈的捲動速度（秒）"
+    reverse: "反方向滾動"
+  _birthdayFollowings:
+    period: "時長"
 _cw:
   hide: "隱藏"
   show: "顯示內容"
@@ -2816,6 +2858,14 @@ _deck:
   usedAsMinWidthWhenFlexible: "如果啟用「自動調整寬度」，此為最小寬度"
   flexible: "自動調整寬度"
   enableSyncBetweenDevicesForProfiles: "啟用裝置與裝置之間的設定檔資料同步化"
+  showHowToUse: "檢視使用者界面說明"
+  _howToUse:
+    addColumn_title: "新增欄位"
+    addColumn_description: "您可以選擇要新增的欄位類型。"
+    settings_title: "使用者界面設定"
+    settings_description: "您可以對多欄模式使用者界面做詳細設定。"
+    switchProfile_title: "切換設定檔"
+    switchProfile_description: "將使用者界面佈局儲存為設定檔，就可以隨時切換使用。"
   _columns:
     main: "主列"
     widgets: "小工具"
@@ -3299,7 +3349,6 @@ _imageEffector:
   title: "特效"
   addEffect: "新增特效"
   discardChangesConfirm: "捨棄更改並退出嗎？"
-  nothingToConfigure: "無可設定的項目"
   failedToLoadImage: "圖片載入失敗"
   _fxs:
     chromaticAberration: "色差"

package.json

@@ -1,12 +1,12 @@
 {
 	"name": "misskey",
-	"version": "2025.12.2-beta.2",
+	"version": "2026.1.0-beta.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/misskey-dev/misskey.git"
 	},
-	"packageManager": "pnpm@10.25.0",
+	"packageManager": "pnpm@10.28.2",
 	"workspaces": [
 		"packages/misskey-js",
 		"packages/i18n",
@@ -23,12 +23,12 @@
 	"private": true,
 	"scripts": {
 		"compile-config": "cd packages/backend && pnpm compile-config",
-		"build-pre": "node ./scripts/build-pre.js",
+		"build-pre": "node scripts/build-pre.mjs",
 		"build-assets": "node ./scripts/build-assets.mjs",
 		"build": "pnpm build-pre && pnpm -r build && pnpm build-assets",
 		"build-storybook": "pnpm --filter frontend build-storybook",
 		"build-misskey-js-with-types": "pnpm build-pre && pnpm --filter backend... --filter=!misskey-js build && pnpm --filter backend generate-api-json --no-build && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && pnpm --filter misskey-js update-autogen-code && pnpm --filter misskey-js build && pnpm --filter misskey-js api",
-		"start": "pnpm check:connect && cd packages/backend && pnpm compile-config && node ./built/boot/entry.js",
+		"start": "cd packages/backend && pnpm compile-config && node ./built/boot/entry.js",
 		"start:inspect": "cd packages/backend && pnpm compile-config && node --inspect ./built/boot/entry.js",
 		"start:test": "ncp ./.github/misskey/test.yml ./.config/test.yml && cd packages/backend && cross-env NODE_ENV=test pnpm compile-config && cross-env NODE_ENV=test node ./built/boot/entry.js",
 		"cli": "cd packages/backend && pnpm cli",
@@ -39,7 +39,7 @@
 		"migrateandstart": "pnpm migrate && pnpm start",
 		"watch": "pnpm dev",
 		"dev": "node scripts/dev.mjs",
-		"lint": "pnpm -r lint",
+		"lint": "pnpm --no-bail -r lint",
 		"cy:open": "pnpm cypress open --config-file=cypress.config.ts",
 		"cy:run": "pnpm cypress run",
 		"e2e": "pnpm start-server-and-test start:test http://localhost:61812 cy:run",
@@ -48,38 +48,35 @@
 		"jest-and-coverage": "cd packages/backend && pnpm jest-and-coverage",
 		"test": "pnpm -r test",
 		"test-and-coverage": "pnpm -r test-and-coverage",
-		"clean": "node ./scripts/clean.js",
+		"clean": "node scripts/clean.mjs",
-		"clean-all": "node ./scripts/clean-all.js",
+		"clean-all": "node scripts/clean-all.mjs",
 		"cleanall": "pnpm clean-all"
 	},
-	"resolutions": {
-		"chokidar": "5.0.0",
-		"lodash": "4.17.21"
-	},
 	"dependencies": {
 		"cssnano": "7.1.2",
-		"esbuild": "0.27.1",
+		"esbuild": "0.27.2",
 		"execa": "9.6.1",
 		"ignore-walk": "8.0.0",
 		"js-yaml": "4.1.1",
 		"postcss": "8.5.6",
-		"tar": "7.5.2",
+		"tar": "7.5.7",
-		"terser": "5.44.1",
+		"terser": "5.46.0"
-		"typescript": "5.9.3"
 	},
 	"devDependencies": {
-		"@eslint/js": "9.39.1",
+		"@eslint/js": "9.39.2",
 		"@misskey-dev/eslint-plugin": "2.2.0",
 		"@types/js-yaml": "4.0.9",
-		"@types/node": "24.10.2",
+		"@types/node": "24.10.9",
-		"@typescript-eslint/eslint-plugin": "8.49.0",
+		"@typescript-eslint/eslint-plugin": "8.53.0",
-		"@typescript-eslint/parser": "8.49.0",
+		"@typescript-eslint/parser": "8.53.0",
+		"@typescript/native-preview": "7.0.0-dev.20260116.1",
 		"cross-env": "10.1.0",
-		"cypress": "15.7.1",
+		"cypress": "15.9.0",
-		"eslint": "9.39.1",
+		"eslint": "9.39.2",
 		"globals": "16.5.0",
 		"ncp": "2.0.0",
-		"pnpm": "10.25.0",
+		"pnpm": "10.28.2",
+		"typescript": "5.9.3",
 		"start-server-and-test": "2.1.3"
 	},
 	"optionalDependencies": {
@@ -87,7 +84,9 @@
 	},
 	"pnpm": {
 		"overrides": {
-			"@aiscript-dev/aiscript-languageserver": "-"
+			"@aiscript-dev/aiscript-languageserver": "-",
+			"chokidar": "5.0.0",
+			"lodash": "4.17.23"
 		},
 		"ignoredBuiltDependencies": [
 			"@sentry-internal/node-cpu-profiler",

packages/backend/assets/misc/bios.js

@@ -9,7 +9,7 @@ window.onload = async () => {
 	const account = JSON.parse(localStorage.getItem('account'));
 	const i = account.token;
 
-	const api = (endpoint, data = {}) => {
+	const _api = (endpoint, data = {}) => {
 		const promise = new Promise((resolve, reject) => {
 			// Append a credential
 			if (i) data.i = i;

packages/backend/build.js

@@ -0,0 +1,121 @@
+import fs from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { dirname, join } from 'node:path';
+import { build } from 'esbuild';
+import { swcPlugin } from 'esbuild-plugin-swc';
+
+const _filename = fileURLToPath(import.meta.url);
+const _dirname = dirname(_filename);
+const _package = JSON.parse(fs.readFileSync(_dirname + '/package.json', 'utf-8'));
+
+const resolveTsPathsPlugin = {
+	name: 'resolve-ts-paths',
+	setup(build) {
+		build.onResolve({ filter: /^\.{1,2}\/.*\.js$/ }, (args) => {
+			if (args.importer) {
+				const absPath = join(args.resolveDir, args.path);
+				const tsPath = absPath.slice(0, -3) + '.ts';
+				if (fs.existsSync(tsPath)) return { path: tsPath };
+				const tsxPath = absPath.slice(0, -3) + '.tsx';
+				if (fs.existsSync(tsxPath)) return { path: tsxPath };
+			}
+		});
+	},
+};
+
+const externalIpaddrPlugin = {
+	name: 'external-ipaddr',
+	setup(build) {
+		build.onResolve({ filter: /^ipaddr\.js$/ }, (args) => {
+			return { path: args.path, external: true };
+		});
+	},
+};
+
+/** @type {import('esbuild').BuildOptions} */
+const options = {
+	entryPoints: ['./src/boot/entry.ts'],
+	minify: true,
+	keepNames: true,
+	bundle: true,
+	outdir: './built/boot',
+	target: 'node22',
+	platform: 'node',
+	format: 'esm',
+	sourcemap: 'linked',
+	packages: 'external',
+	banner: {
+		js: 'import { createRequire as topLevelCreateRequire } from "module";' +
+			'import ___url___ from "url";' +
+			'const require = topLevelCreateRequire(import.meta.url);' +
+			'const __filename = ___url___.fileURLToPath(import.meta.url);' +
+			'const __dirname = ___url___.fileURLToPath(new URL(".", import.meta.url));',
+	},
+	plugins: [
+		externalIpaddrPlugin,
+		resolveTsPathsPlugin,
+		swcPlugin({
+			jsc: {
+				parser: {
+					syntax: 'typescript',
+					decorators: true,
+					dynamicImport: true,
+				},
+				transform: {
+					legacyDecorator: true,
+					decoratorMetadata: true,
+				},
+				experimental: {
+					keepImportAssertions: true,
+				},
+				baseUrl: join(_dirname, 'src'),
+				paths: {
+					'@/*': ['*'],
+				},
+				target: 'esnext',
+				keepClassNames: true,
+			},
+		}),
+		externalIpaddrPlugin,
+	],
+	// external: [
+	// 	'slacc-*',
+	// 	'class-transformer',
+	// 	'class-validator',
+	// 	'@sentry/*',
+	// 	'@nestjs/websockets/socket-module',
+	// 	'@nestjs/microservices/microservices-module',
+	// 	'@nestjs/microservices',
+	// 	'@napi-rs/canvas-win32-x64-msvc',
+	// 	'mock-aws-s3',
+	// 	'aws-sdk',
+	// 	'nock',
+	// 	'sharp',
+	// 	'jsdom',
+	// 	're2',
+	// 	'@napi-rs/canvas',
+	// ],
+};
+
+const args = process.argv.slice(2).map(arg => arg.toLowerCase());
+
+if (!args.includes('--no-clean')) {
+	fs.rmSync('./built', { recursive: true, force: true });
+}
+
+await buildSrc();
+
+async function buildSrc() {
+	console.log(`[${_package.name}] start building...`);
+
+	await build(options)
+		.then(() => {
+			console.log(`[${_package.name}] build succeeded.`);
+		})
+		.catch((err) => {
+			process.stderr.write(err.stderr || err.message || err);
+			process.exit(1);
+		});
+
+	console.log(`[${_package.name}] finish building.`);
+}

packages/backend/eslint.config.js

@@ -25,7 +25,6 @@ export default [
 			},
 		},
 		rules: {
-			'@typescript-eslint/no-unused-vars': 'off',
 			'import/order': ['warn', {
 				groups: [
 					'builtin',

packages/backend/migration/1767169026317-birthday-index.js

@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class BirthdayIndex1767169026317 {
+    name = 'BirthdayIndex1767169026317'
+
+    async up(queryRunner) {
+        await queryRunner.query(`DROP INDEX "public"."IDX_de22cd2b445eee31ae51cdbe99"`);
+        await queryRunner.query(`CREATE OR REPLACE FUNCTION get_birthday_date(birthday TEXT) RETURNS SMALLINT AS $$ BEGIN RETURN CAST((SUBSTR(birthday, 6, 2) || SUBSTR(birthday, 9, 2)) AS SMALLINT); END; $$ LANGUAGE plpgsql IMMUTABLE;`);
+        await queryRunner.query(`CREATE INDEX "IDX_USERPROFILE_BIRTHDAY_DATE" ON "user_profile" (get_birthday_date("birthday"))`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`CREATE INDEX "IDX_de22cd2b445eee31ae51cdbe99" ON "user_profile" (substr("birthday", 6, 5))`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_USERPROFILE_BIRTHDAY_DATE"`);
+        await queryRunner.query(`DROP FUNCTION IF EXISTS get_birthday_date(birthday TEXT)`);
+    }
+}

packages/backend/ormconfig.js

@@ -1,6 +1,6 @@
 import { DataSource } from 'typeorm';
-import { loadConfig } from './built/config.js';
+import { loadConfig } from './src-js/config.js';
-import { entities } from './built/postgres.js';
+import { entities } from './src-js/postgres.js';
 
 const isConcurrentIndexMigrationEnabled = process.env.MISSKEY_MIGRATION_CREATE_INDEX_CONCURRENTLY === '1';
 

packages/backend/package.json

@@ -12,17 +12,17 @@
 		"start:test": "cross-env NODE_ENV=test pnpm compile-config && cross-env NODE_ENV=test node ./built/boot/entry.js",
 		"migrate": "pnpm compile-config && pnpm typeorm migration:run -d ormconfig.js",
 		"revert": "pnpm compile-config && pnpm typeorm migration:revert -d ormconfig.js",
-		"cli": "pnpm compile-config && node ./built/boot/cli.js",
+		"cli": "pnpm compile-config && node ./src-js/boot/cli.js",
 		"check:connect": "pnpm compile-config && node ./scripts/check_connect.js",
 		"compile-config": "node ./scripts/compile_config.js",
-		"build": "swc src -d built -D --strip-leading-paths",
+		"build": "swc src -d src-js -D --strip-leading-paths && node ./build.js",
 		"build:test": "swc test-server -d built-test -D --config-file test-server/.swcrc --strip-leading-paths",
 		"watch:swc": "swc src -d built -D -w --strip-leading-paths",
-		"build:tsc": "tsc -p tsconfig.json && tsc-alias -p tsconfig.json",
+		"build:tsc": "tsgo -p tsconfig.json && tsc-alias -p tsconfig.json",
 		"watch": "pnpm compile-config && node ./scripts/watch.mjs",
 		"restart": "pnpm build && pnpm start",
 		"dev": "pnpm compile-config && node ./scripts/dev.mjs",
-		"typecheck": "tsc --noEmit && tsc -p test --noEmit && tsc -p test-federation --noEmit",
+		"typecheck": "tsgo --noEmit && tsgo -p test --noEmit && tsgo -p test-federation --noEmit",
 		"eslint": "eslint --quiet \"{src,test-federation}/**/*.ts\"",
 		"lint": "pnpm typecheck && pnpm eslint",
 		"jest": "cross-env NODE_ENV=test pnpm compile-config && cross-env NODE_ENV=test node ./jest.js --forceExit --config jest.config.unit.cjs",
@@ -41,20 +41,20 @@
 	},
 	"optionalDependencies": {
 		"@swc/core-android-arm64": "1.3.11",
-		"@swc/core-darwin-arm64": "1.15.3",
+		"@swc/core-darwin-arm64": "1.15.8",
-		"@swc/core-darwin-x64": "1.15.3",
+		"@swc/core-darwin-x64": "1.15.8",
 		"@swc/core-freebsd-x64": "1.3.11",
-		"@swc/core-linux-arm-gnueabihf": "1.15.3",
+		"@swc/core-linux-arm-gnueabihf": "1.15.8",
-		"@swc/core-linux-arm64-gnu": "1.15.3",
+		"@swc/core-linux-arm64-gnu": "1.15.8",
-		"@swc/core-linux-arm64-musl": "1.15.3",
+		"@swc/core-linux-arm64-musl": "1.15.8",
-		"@swc/core-linux-x64-gnu": "1.15.3",
+		"@swc/core-linux-x64-gnu": "1.15.8",
-		"@swc/core-linux-x64-musl": "1.15.3",
+		"@swc/core-linux-x64-musl": "1.15.8",
-		"@swc/core-win32-arm64-msvc": "1.15.3",
+		"@swc/core-win32-arm64-msvc": "1.15.8",
-		"@swc/core-win32-ia32-msvc": "1.15.3",
+		"@swc/core-win32-ia32-msvc": "1.15.8",
-		"@swc/core-win32-x64-msvc": "1.15.3",
+		"@swc/core-win32-x64-msvc": "1.15.8",
 		"@tensorflow/tfjs": "4.22.0",
 		"@tensorflow/tfjs-node": "4.22.0",
-		"bufferutil": "4.0.9",
+		"bufferutil": "4.1.0",
 		"slacc-android-arm-eabi": "0.0.10",
 		"slacc-android-arm64": "0.0.10",
 		"slacc-darwin-arm64": "0.0.10",
@@ -68,43 +68,42 @@
 		"slacc-linux-x64-musl": "0.0.10",
 		"slacc-win32-arm64-msvc": "0.0.10",
 		"slacc-win32-x64-msvc": "0.0.10",
-		"utf-8-validate": "6.0.5"
+		"utf-8-validate": "6.0.6"
 	},
 	"dependencies": {
-		"@aws-sdk/client-s3": "3.948.0",
+		"@aws-sdk/client-s3": "3.970.0",
-		"@aws-sdk/lib-storage": "3.948.0",
+		"@aws-sdk/lib-storage": "3.970.0",
 		"@discordapp/twemoji": "16.0.1",
 		"@fastify/accepts": "5.0.4",
 		"@fastify/cors": "11.2.0",
-		"@fastify/express": "4.0.2",
+		"@fastify/express": "4.0.4",
 		"@fastify/http-proxy": "11.4.1",
 		"@fastify/multipart": "9.3.0",
 		"@fastify/static": "8.3.0",
 		"@kitajs/html": "4.2.11",
 		"@misskey-dev/sharp-read-bmp": "1.2.0",
 		"@misskey-dev/summaly": "5.2.5",
-		"@napi-rs/canvas": "0.1.84",
+		"@napi-rs/canvas": "0.1.88",
-		"@nestjs/common": "11.1.9",
+		"@nestjs/common": "11.1.12",
-		"@nestjs/core": "11.1.9",
+		"@nestjs/core": "11.1.12",
-		"@nestjs/testing": "11.1.9",
+		"@nestjs/testing": "11.1.12",
 		"@peertube/http-signature": "1.7.0",
-		"@sentry/node": "10.29.0",
+		"@sentry/node": "10.34.0",
-		"@sentry/profiling-node": "10.29.0",
+		"@sentry/profiling-node": "10.34.0",
 		"@simplewebauthn/server": "13.2.2",
-		"@sinonjs/fake-timers": "15.0.0",
+		"@sinonjs/fake-timers": "15.1.0",
-		"@smithy/node-http-handler": "4.4.5",
+		"@smithy/node-http-handler": "4.4.8",
-		"@swc/cli": "0.7.9",
+		"@swc/cli": "0.7.10",
-		"@swc/core": "1.15.3",
+		"@swc/core": "1.15.8",
 		"@twemoji/parser": "16.0.0",
-		"@types/redis-info": "3.0.3",
 		"accepts": "1.3.8",
 		"ajv": "8.17.1",
 		"archiver": "7.0.1",
 		"async-mutex": "0.5.0",
 		"bcryptjs": "3.0.3",
 		"blurhash": "2.0.5",
-		"body-parser": "2.2.1",
+		"body-parser": "2.2.2",
-		"bullmq": "5.65.1",
+		"bullmq": "5.66.5",
 		"cacheable-lookup": "7.0.0",
 		"chalk": "5.6.2",
 		"chalk-template": "1.1.2",
@@ -113,24 +112,24 @@
 		"content-disposition": "1.0.1",
 		"date-fns": "4.1.0",
 		"deep-email-validator": "0.1.21",
-		"fastify": "5.6.2",
+		"fastify": "5.7.1",
 		"fastify-raw-body": "5.0.0",
-		"feed": "5.1.0",
+		"feed": "5.2.0",
-		"file-type": "21.1.1",
+		"file-type": "21.3.0",
 		"fluent-ffmpeg": "2.1.3",
 		"form-data": "4.0.5",
-		"got": "14.6.5",
+		"got": "14.6.6",
 		"hpagent": "1.2.0",
 		"http-link-header": "1.1.3",
 		"i18n": "workspace:*",
-		"ioredis": "5.8.2",
+		"ioredis": "5.9.2",
 		"ip-cidr": "4.0.2",
 		"ipaddr.js": "2.3.0",
 		"is-svg": "6.1.0",
 		"json5": "2.2.3",
 		"jsonld": "9.0.0",
-		"juice": "11.0.3",
+		"juice": "11.1.0",
-		"meilisearch": "0.54.0",
+		"meilisearch": "0.55.0",
 		"mfm-js": "0.25.0",
 		"mime-types": "3.0.2",
 		"misskey-js": "workspace:*",
@@ -139,22 +138,21 @@
 		"nanoid": "5.1.6",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
-		"node-html-parser": "7.0.1",
+		"node-html-parser": "7.0.2",
-		"nodemailer": "7.0.11",
+		"nodemailer": "7.0.12",
 		"nsfwjs": "4.2.0",
 		"oauth2orize": "1.12.0",
 		"oauth2orize-pkce": "0.1.2",
 		"os-utils": "0.0.14",
 		"otpauth": "9.4.1",
-		"pg": "8.16.3",
+		"pg": "8.17.1",
 		"pkce-challenge": "5.0.1",
 		"probe-image-size": "7.2.3",
 		"promise-limit": "2.7.0",
 		"qrcode": "1.5.4",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
-		"re2": "1.22.3",
+		"re2": "1.23.0",
-		"redis-info": "3.1.0",
 		"reflect-metadata": "0.2.2",
 		"rename": "1.0.4",
 		"rss-parser": "3.13.0",
@@ -166,23 +164,22 @@
 		"slacc": "0.0.10",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
-		"systeminformation": "5.27.14",
+		"systeminformation": "5.30.5",
 		"tinycolor2": "1.6.0",
 		"tmp": "0.2.5",
 		"tsc-alias": "1.8.16",
 		"typeorm": "0.3.28",
-		"typescript": "5.9.3",
 		"ulid": "3.0.2",
 		"vary": "1.1.2",
 		"web-push": "3.6.7",
-		"ws": "8.18.3",
+		"ws": "8.19.0",
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
 		"@jest/globals": "29.7.0",
 		"@kitajs/ts-html-plugin": "4.1.3",
-		"@nestjs/platform-express": "11.1.9",
+		"@nestjs/platform-express": "11.1.12",
-		"@sentry/vue": "10.29.0",
+		"@sentry/vue": "10.34.0",
 		"@simplewebauthn/types": "12.0.0",
 		"@swc/jest": "0.2.39",
 		"@types/accepts": "1.3.7",
@@ -196,11 +193,11 @@
 		"@types/jsonld": "1.5.15",
 		"@types/mime-types": "3.0.1",
 		"@types/ms": "2.1.0",
-		"@types/node": "24.10.2",
+		"@types/node": "24.10.9",
-		"@types/nodemailer": "7.0.4",
+		"@types/nodemailer": "7.0.5",
 		"@types/oauth2orize": "1.11.5",
 		"@types/oauth2orize-pkce": "0.1.2",
-		"@types/pg": "8.15.6",
+		"@types/pg": "8.16.0",
 		"@types/qrcode": "1.5.6",
 		"@types/random-seed": "0.3.5",
 		"@types/ratelimiter": "3.4.6",
@@ -215,21 +212,22 @@
 		"@types/vary": "1.1.3",
 		"@types/web-push": "3.6.4",
 		"@types/ws": "8.18.1",
-		"@typescript-eslint/eslint-plugin": "8.49.0",
+		"@typescript-eslint/eslint-plugin": "8.53.0",
-		"@typescript-eslint/parser": "8.49.0",
+		"@typescript-eslint/parser": "8.53.0",
 		"aws-sdk-client-mock": "4.1.0",
 		"cbor": "10.0.11",
 		"cross-env": "10.1.0",
+		"esbuild-plugin-swc": "1.0.1",
 		"eslint-plugin-import": "2.32.0",
 		"execa": "9.6.1",
-		"fkill": "10.0.1",
+		"fkill": "10.0.3",
 		"jest": "29.7.0",
 		"jest-mock": "29.7.0",
 		"js-yaml": "4.1.1",
 		"nodemon": "3.1.11",
-		"pid-port": "2.0.0",
+		"pid-port": "2.0.1",
 		"simple-oauth2": "5.1.0",
-		"supertest": "7.1.4",
+		"supertest": "7.2.2",
-		"vite": "7.2.7"
+		"vite": "7.3.1"
 	}
 }

packages/backend/scripts/check_connect.js

@@ -4,8 +4,8 @@
  */
 
 import Redis from 'ioredis';
-import { loadConfig } from '../built/config.js';
+import { loadConfig } from '../src-js/config.js';
-import { createPostgresDataSource } from '../built/postgres.js';
+import { createPostgresDataSource } from '../src-js/postgres.js';
 
 const config = loadConfig();
 
@@ -16,26 +16,22 @@ async function connectToPostgres() {
 }
 
 async function connectToRedis(redisOptions) {
-	return await new Promise(async (resolve, reject) => {
+	let redis;
-		const redis = new Redis({
+	try {
+		redis = new Redis({
 			...redisOptions,
 			lazyConnect: true,
 			reconnectOnError: false,
 			showFriendlyErrorStack: true,
 		});
-		redis.on('error', e => reject(e));
 
-		try {
+		await Promise.race([
-			await redis.connect();
+			new Promise((_, reject) => redis.on('error', e => reject(e))),
-			resolve();
+			redis.connect(),
-
+		]);
-		} catch (e) {
+	} finally {
-			reject(e);
+		redis.disconnect(false);
-
+	}
-		} finally {
-			redis.disconnect(false);
-		}
-	});
 }
 
 // If not all of these are defined, the default one gets reused.
@@ -50,7 +46,7 @@ const promises = Array
 	]))
 	.map(connectToRedis)
 	.concat([
-		connectToPostgres()
+		connectToPostgres(),
 	]);
 
 await Promise.all(promises);

packages/backend/scripts/generate_api_json.js

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import { writeFileSync, existsSync } from 'node:fs';
 import { execa } from 'execa';
-import { writeFileSync, existsSync } from "node:fs";
 
 async function main() {
 	if (!process.argv.includes('--no-build')) {
@@ -19,10 +19,10 @@ async function main() {
 	}
 
 	/** @type {import('../src/config.js')} */
-	const { loadConfig } = await import('../built/config.js');
+	const { loadConfig } = await import('../src-js/config.js');
 
 	/** @type {import('../src/server/api/openapi/gen-spec.js')} */
-	const { genOpenapiSpec } = await import('../built/server/api/openapi/gen-spec.js');
+	const { genOpenapiSpec } = await import('../src-js/server/api/openapi/gen-spec.js');
 
 	const config = loadConfig();
 	const spec = genOpenapiSpec(config, true);

packages/backend/scripts/measure-memory.mjs

@@ -14,24 +14,56 @@ import { fork } from 'node:child_process';
 import { setTimeout } from 'node:timers/promises';
 import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'node:path';
+import * as http from 'node:http';
+import * as fs from 'node:fs/promises';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
+const SAMPLE_COUNT = 3; // Number of samples to measure
 const STARTUP_TIMEOUT = 120000; // 120 seconds timeout for server startup
 const MEMORY_SETTLE_TIME = 10000; // Wait 10 seconds after startup for memory to settle
 
-async function measureMemory() {
+const keys = {
-	const startTime = Date.now();
+	VmPeak: 0,
+	VmSize: 0,
+	VmHWM: 0,
+	VmRSS: 0,
+	VmData: 0,
+	VmStk: 0,
+	VmExe: 0,
+	VmLib: 0,
+	VmPTE: 0,
+	VmSwap: 0,
+};
 
+async function getMemoryUsage(pid) {
+	const status = await fs.readFile(`/proc/${pid}/status`, 'utf-8');
+
+	const result = {};
+	for (const key of Object.keys(keys)) {
+		const match = status.match(new RegExp(`${key}:\\s+(\\d+)\\s+kB`));
+		if (match) {
+			result[key] = parseInt(match[1], 10);
+		} else {
+			throw new Error(`Failed to parse ${key} from /proc/${pid}/status`);
+		}
+	}
+
+	return result;
+}
+
+async function measureMemory() {
 	// Start the Misskey backend server using fork to enable IPC
-	const serverProcess = fork(join(__dirname, '../built/boot/entry.js'), [], {
+	const serverProcess = fork(join(__dirname, '../built/boot/entry.js'), ['expose-gc'], {
 		cwd: join(__dirname, '..'),
 		env: {
 			...process.env,
-			NODE_ENV: 'test',
+			NODE_ENV: 'production',
+			MK_DISABLE_CLUSTERING: '1',
 		},
 		stdio: ['pipe', 'pipe', 'pipe', 'ipc'],
+		execArgv: [...process.execArgv, '--expose-gc'],
 	});
 
 	let serverReady = false;
@@ -57,6 +89,40 @@ async function measureMemory() {
 		process.stderr.write(`[server error] ${err}\n`);
 	});
 
+	async function triggerGc() {
+		const ok = new Promise((resolve) => {
+			serverProcess.once('message', (message) => {
+				if (message === 'gc ok') resolve();
+			});
+		});
+
+		serverProcess.send('gc');
+
+		await ok;
+
+		await setTimeout(1000);
+	}
+
+	function createRequest() {
+		return new Promise((resolve, reject) => {
+			const req = http.request({
+				host: 'localhost',
+				port: 61812,
+				path: '/api/meta',
+				method: 'POST',
+			}, (res) => {
+				res.on('data', () => { });
+				res.on('end', () => {
+					resolve();
+				});
+			});
+			req.on('error', (err) => {
+				reject(err);
+			});
+			req.end();
+		});
+	}
+
 	// Wait for server to be ready or timeout
 	const startupStartTime = Date.now();
 	while (!serverReady) {
@@ -73,46 +139,23 @@ async function measureMemory() {
 	// Wait for memory to settle
 	await setTimeout(MEMORY_SETTLE_TIME);
 
-	// Get memory usage from the server process via /proc
 	const pid = serverProcess.pid;
-	let memoryInfo;
 
-	try {
+	const beforeGc = await getMemoryUsage(pid);
-		const fs = await import('node:fs/promises');
 
-		// Read /proc/[pid]/status for detailed memory info
+	await triggerGc();
-		const status = await fs.readFile(`/proc/${pid}/status`, 'utf-8');
-		const vmRssMatch = status.match(/VmRSS:\s+(\d+)\s+kB/);
-		const vmDataMatch = status.match(/VmData:\s+(\d+)\s+kB/);
-		const vmSizeMatch = status.match(/VmSize:\s+(\d+)\s+kB/);
 
-		memoryInfo = {
+	const afterGc = await getMemoryUsage(pid);
-			rss: vmRssMatch ? parseInt(vmRssMatch[1], 10) * 1024 : null,
-			heapUsed: vmDataMatch ? parseInt(vmDataMatch[1], 10) * 1024 : null,
-			vmSize: vmSizeMatch ? parseInt(vmSizeMatch[1], 10) * 1024 : null,
-		};
-	} catch (err) {
-		// Fallback: use ps command
-		process.stderr.write(`Warning: Could not read /proc/${pid}/status: ${err}\n`);
 
-		const { execSync } = await import('node:child_process');
+	// create some http requests to simulate load
-		try {
+	const REQUEST_COUNT = 10;
-			const ps = execSync(`ps -o rss= -p ${pid}`, { encoding: 'utf-8' });
+	await Promise.all(
-			const rssKb = parseInt(ps.trim(), 10);
+		Array.from({ length: REQUEST_COUNT }).map(() => createRequest()),
-			memoryInfo = {
+	);
-				rss: rssKb * 1024,
+
-				heapUsed: null,
+	await triggerGc();
-				vmSize: null,
+
-			};
+	const afterRequest = await getMemoryUsage(pid);
-		} catch {
-			memoryInfo = {
-				rss: null,
-				heapUsed: null,
-				vmSize: null,
-				error: 'Could not measure memory',
-			};
-		}
-	}
 
 	// Stop the server
 	serverProcess.kill('SIGTERM');
@@ -135,15 +178,51 @@ async function measureMemory() {
 
 	const result = {
 		timestamp: new Date().toISOString(),
-		startupTimeMs: startupTime,
+		beforeGc,
-		memory: memoryInfo,
+		afterGc,
+		afterRequest,
+	};
+
+	return result;
+}
+
+async function main() {
+	// 直列の方が時間的に分散されて正確そうだから直列でやる
+	const results = [];
+	for (let i = 0; i < SAMPLE_COUNT; i++) {
+		const res = await measureMemory();
+		results.push(res);
+	}
+
+	// Calculate averages
+	const beforeGc = structuredClone(keys);
+	const afterGc = structuredClone(keys);
+	const afterRequest = structuredClone(keys);
+	for (const res of results) {
+		for (const key of Object.keys(keys)) {
+			beforeGc[key] += res.beforeGc[key];
+			afterGc[key] += res.afterGc[key];
+			afterRequest[key] += res.afterRequest[key];
+		}
+	}
+	for (const key of Object.keys(keys)) {
+		beforeGc[key] = Math.round(beforeGc[key] / SAMPLE_COUNT);
+		afterGc[key] = Math.round(afterGc[key] / SAMPLE_COUNT);
+		afterRequest[key] = Math.round(afterRequest[key] / SAMPLE_COUNT);
+	}
+
+	const result = {
+		timestamp: new Date().toISOString(),
+		beforeGc,
+		afterGc,
+		afterRequest,
 	};
 
 	// Output as JSON to stdout
 	console.log(JSON.stringify(result, null, 2));
 }
 
-measureMemory().catch((err) => {
+main().catch((err) => {
 	console.error(JSON.stringify({
 		error: err.message,
 		timestamp: new Date().toISOString(),

packages/backend/scripts/watch.mjs

@@ -21,7 +21,7 @@ import { execa } from 'execa';
 		});
 	}, 3000);
 
-	execa('tsc', ['-w', '-p', 'tsconfig.json'], {
+	execa('tsgo', ['-w', '-p', 'tsconfig.json'], {
 		stdout: process.stdout,
 		stderr: process.stderr,
 	});

packages/backend/src/boot/entry.ts

@@ -86,6 +86,18 @@ if (!envOption.disableClustering) {
 	ev.mount();
 }
 
+process.on('message', msg => {
+	if (msg === 'gc') {
+		if (global.gc != null) {
+			logger.info('Manual GC triggered');
+			global.gc();
+			if (process.send != null) process.send('gc ok');
+		} else {
+			logger.warn('Manual GC requested but gc is not available. Start the process with --expose-gc to enable this feature.');
+		}
+	}
+});
+
 readyRef.value = true;
 
 // ユニットテスト時にMisskeyが子プロセスで起動された時のため

packages/backend/src/boot/master.ts

@@ -4,8 +4,6 @@
  */
 
 import * as fs from 'node:fs';
-import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
 import * as os from 'node:os';
 import cluster from 'node:cluster';
 import chalk from 'chalk';
@@ -17,20 +15,15 @@ import { showMachineInfo } from '@/misc/show-machine-info.js';
 import { envOption } from '@/env.js';
 import { jobQueue, server } from './common.js';
 
-const _filename = fileURLToPath(import.meta.url);
-const _dirname = dirname(_filename);
-
-const meta = JSON.parse(fs.readFileSync(`${_dirname}/../../../../built/meta.json`, 'utf-8'));
-
 const logger = new Logger('core', 'cyan');
 const bootLogger = logger.createSubLogger('boot', 'magenta');
 
 const themeColor = chalk.hex('#86b300');
 
-function greet() {
+function greet(props: { version: string }) {
 	if (!envOption.quiet) {
 		//#region Misskey logo
-		const v = `v${meta.version}`;
+		const v = `v${props.version}`;
 		console.log(themeColor('  _____ _         _           '));
 		console.log(themeColor(' |     |_|___ ___| |_ ___ _ _ '));
 		console.log(themeColor(' | | | | |_ -|_ -| \'_| -_| | |'));
@@ -46,7 +39,7 @@ function greet() {
 	}
 
 	bootLogger.info('Welcome to Misskey!');
-	bootLogger.info(`Misskey v${meta.version}`, null, true);
+	bootLogger.info(`Misskey v${props.version}`, null, true);
 }
 
 /**
@@ -57,15 +50,15 @@ export async function masterMain() {
 
 	// initialize app
 	try {
-		greet();
+		config = loadConfigBoot();
+		greet({ version: config.version });
 		showEnvironment();
 		await showMachineInfo(bootLogger);
 		showNodejsVersion();
-		config = loadConfigBoot();
 		//await connectDb();
 		if (config.pidFile) fs.writeFileSync(config.pidFile, process.pid.toString());
 	} catch (e) {
-		bootLogger.error('Fatal error occurred during initialization', null, true);
+		bootLogger.error('Fatal error occurred during initialization: ' + e, null, true);
 		process.exit(1);
 	}
 

packages/backend/src/config.ts

@@ -30,6 +30,7 @@ type Source = {
 	socket?: string;
 	trustProxy?: FastifyServerOptions['trustProxy'];
 	chmodSocket?: string;
+	enableIpRateLimit?: boolean;
 	disableHsts?: boolean;
 	db: {
 		host: string;
@@ -120,8 +121,9 @@ export type Config = {
 	url: string;
 	port: number;
 	socket: string | undefined;
-	trustProxy: FastifyServerOptions['trustProxy'];
+	trustProxy: NonNullable<FastifyServerOptions['trustProxy']>;
 	chmodSocket: string | undefined;
+	enableIpRateLimit: boolean;
 	disableHsts: boolean | undefined;
 	db: {
 		host: string;
@@ -217,24 +219,42 @@ export type FulltextSearchProvider = 'sqlLike' | 'sqlPgroonga' | 'meilisearch';
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
 
-const compiledConfigFilePathForTest = resolve(_dirname, '../../../built/._config_.json');
+/** Path of repository root directory */
+let rootDir = _dirname;
+// 見つかるまで上に遡る
+while (!fs.existsSync(resolve(rootDir, 'packages'))) {
+	const parentDir = dirname(rootDir);
+	if (parentDir === rootDir) {
+		throw new Error('Cannot find root directory');
+	}
+	rootDir = parentDir;
+}
 
-export const compiledConfigFilePath = fs.existsSync(compiledConfigFilePathForTest) ? compiledConfigFilePathForTest : resolve(_dirname, '../../../built/.config.json');
+/** Path of configuration directory */
+const configDir = resolve(rootDir, '.config');
+/** Path of built directory */
+const projectBuiltDir = resolve(rootDir, 'built');
+
+const compiledConfigFilePathForTest = resolve(projectBuiltDir, '._config_.json');
+
+export const compiledConfigFilePath = fs.existsSync(compiledConfigFilePathForTest)
+	? compiledConfigFilePathForTest
+	: resolve(projectBuiltDir, '.config.json');
 
 export function loadConfig(): Config {
 	if (!fs.existsSync(compiledConfigFilePath)) {
 		throw new Error('Compiled configuration file not found. Try running \'pnpm compile-config\'.');
 	}
 
-	const meta = JSON.parse(fs.readFileSync(`${_dirname}/../../../built/meta.json`, 'utf-8'));
+	const meta = JSON.parse(fs.readFileSync(resolve(projectBuiltDir, 'meta.json'), 'utf-8'));
 
-	const frontendManifestExists = fs.existsSync(_dirname + '/../../../built/_frontend_vite_/manifest.json');
+	const frontendManifestExists = fs.existsSync(resolve(projectBuiltDir, '_frontend_vite_/manifest.json'));
-	const frontendEmbedManifestExists = fs.existsSync(_dirname + '/../../../built/_frontend_embed_vite_/manifest.json');
+	const frontendEmbedManifestExists = fs.existsSync(resolve(projectBuiltDir, '_frontend_embed_vite_/manifest.json'));
 	const frontendManifest = frontendManifestExists ?
-		JSON.parse(fs.readFileSync(`${_dirname}/../../../built/_frontend_vite_/manifest.json`, 'utf-8'))
+		JSON.parse(fs.readFileSync(resolve(projectBuiltDir, '_frontend_vite_/manifest.json'), 'utf-8'))
 		: { 'src/_boot_.ts': { file: null } };
 	const frontendEmbedManifest = frontendEmbedManifestExists ?
-		JSON.parse(fs.readFileSync(`${_dirname}/../../../built/_frontend_embed_vite_/manifest.json`, 'utf-8'))
+		JSON.parse(fs.readFileSync(resolve(projectBuiltDir, '_frontend_embed_vite_/manifest.json'), 'utf-8'))
 		: { 'src/boot.ts': { file: null } };
 
 	const config = JSON.parse(fs.readFileSync(compiledConfigFilePath, 'utf-8')) as Source;
@@ -263,9 +283,17 @@ export function loadConfig(): Config {
 		url: url.origin,
 		port: config.port ?? parseInt(process.env.PORT ?? '', 10),
 		socket: config.socket,
-		trustProxy: config.trustProxy,
+		trustProxy: config.trustProxy ?? [
+			'10.0.0.0/8',
+			'172.16.0.0/12',
+			'192.168.0.0/16',
+			'127.0.0.1/32',
+			'::1/128',
+			'fc00::/7',
+		],
 		chmodSocket: config.chmodSocket,
 		disableHsts: config.disableHsts,
+		enableIpRateLimit: config.enableIpRateLimit ?? true,
 		host,
 		hostname,
 		scheme,
@@ -324,7 +352,7 @@ export function loadConfig(): Config {
 function tryCreateUrl(url: string) {
 	try {
 		return new URL(url);
-	} catch (e) {
+	} catch (_) {
 		throw new Error(`url="${url}" is not a valid URL.`);
 	}
 }

packages/backend/src/core/AccountMoveService.ts

@@ -75,7 +75,7 @@ export class AccountMoveService {
 	 */
 	@bindThis
 	public async moveFromLocal(src: MiLocalUser, dst: MiLocalUser | MiRemoteUser): Promise<unknown> {
-		const srcUri = this.userEntityService.getUserUri(src);
+		const _srcUri = this.userEntityService.getUserUri(src);
 		const dstUri = this.userEntityService.getUserUri(dst);
 
 		// add movedToUri to indicate that the user has moved

packages/backend/src/core/AnnouncementService.ts

@@ -205,7 +205,7 @@ export class AnnouncementService {
 				announcementId: announcementId,
 				userId: user.id,
 			});
-		} catch (e) {
+		} catch (_) {
 			return;
 		}
 

packages/backend/src/core/AvatarDecorationService.ts

@@ -39,7 +39,7 @@ export class AvatarDecorationService implements OnApplicationShutdown {
 		const obj = JSON.parse(data);
 
 		if (obj.channel === 'internal') {
-			const { type, body } = obj.message as GlobalEvents['internal']['payload'];
+			const { type, body: _ } = obj.message as GlobalEvents['internal']['payload'];
 			switch (type) {
 				case 'avatarDecorationCreated':
 				case 'avatarDecorationUpdated':

packages/backend/src/core/ChatService.ts

@@ -28,6 +28,8 @@ import { CustomEmojiService } from '@/core/CustomEmojiService.js';
 import { emojiRegex } from '@/misc/emoji-regex.js';
 import { NotificationService } from '@/core/NotificationService.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { ApDeliverManagerService } from '@/core/activitypub/ApDeliverManagerService.js';
+import { trackPromise } from '@/misc/promise-tracker.js';
 
 const MAX_ROOM_MEMBERS = 50;
 const MAX_REACTIONS_PER_MESSAGE = 100;
@@ -81,6 +83,7 @@ export class ChatService {
 		private chatEntityService: ChatEntityService,
 		private idService: IdService,
 		private globalEventService: GlobalEventService,
+		private apDeliverManagerService: ApDeliverManagerService,
 		private apRendererService: ApRendererService,
 		private queueService: QueueService,
 		private pushNotificationService: PushNotificationService,
@@ -236,6 +239,19 @@ export class ChatService {
 			}, 3000);
 		}
 
+		//#region AP deliver
+		if (this.userEntityService.isLocalUser(fromUser) && this.userEntityService.isRemoteUser(toUser)) {
+			(async () => {
+				const content = await this.apRendererService.renderChatMessage(inserted, false);
+				const activity = this.apRendererService.addContext(content);
+
+				const dm = this.apDeliverManagerService.createDeliverManager(fromUser, activity);
+				dm.addDirectRecipe(toUser);
+				trackPromise(dm.execute());
+			})();
+		}
+		//#endregion
+
 		return packedMessage;
 	}
 

packages/backend/src/core/CoreModule.ts

@@ -141,7 +141,7 @@ import { ApLoggerService } from './activitypub/ApLoggerService.js';
 import { ApMfmService } from './activitypub/ApMfmService.js';
 import { ApRendererService } from './activitypub/ApRendererService.js';
 import { ApRequestService } from './activitypub/ApRequestService.js';
-import { ApResolverService } from './activitypub/ApResolverService.js';
+import { ApResolverService, Resolver } from './activitypub/ApResolverService.js';
 import { JsonLdService } from './activitypub/JsonLdService.js';
 import { RemoteLoggerService } from './RemoteLoggerService.js';
 import { RemoteUserResolveService } from './RemoteUserResolveService.js';
@@ -447,6 +447,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		ApRendererService,
 		ApRequestService,
 		ApResolverService,
+		Resolver,
 		JsonLdService,
 		RemoteLoggerService,
 		RemoteUserResolveService,
@@ -745,6 +746,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		ApRendererService,
 		ApRequestService,
 		ApResolverService,
+		Resolver,
 		JsonLdService,
 		RemoteLoggerService,
 		RemoteUserResolveService,

packages/backend/src/core/EmailService.ts

@@ -366,7 +366,7 @@ export class EmailService {
 				valid: true,
 				reason: null,
 			};
-		} catch (error) {
+		} catch (_) {
 			return {
 				valid: false,
 				reason: 'network',

packages/backend/src/core/FileInfoService.ts

@@ -484,25 +484,13 @@ export class FileInfoService {
 	 * Calculate blurhash string of image
 	 */
 	@bindThis
-	private getBlurhash(path: string, type: string): Promise<string> {
+	private async getBlurhash(path: string, type: string): Promise<string> {
-		return new Promise(async (resolve, reject) => {
+		const sharp = await sharpBmp(path, type);
-			(await sharpBmp(path, type))
+		const { data: buffer, info } = await sharp
-				.raw()
+			.raw()
-				.ensureAlpha()
+			.ensureAlpha()
-				.resize(64, 64, { fit: 'inside' })
+			.resize(64, 64, { fit: 'inside' })
-				.toBuffer((err, buffer, info) => {
+			.toBuffer({ resolveWithObject: true });
-					if (err) return reject(err);
+		return blurhash.encode(new Uint8ClampedArray(buffer), info.width, info.height, 5, 5);
-
-					let hash;
-
-					try {
-						hash = blurhash.encode(new Uint8ClampedArray(buffer), info.width, info.height, 5, 5);
-					} catch (e) {
-						return reject(e);
-					}
-
-					resolve(hash);
-				});
-		});
 	}
 }

packages/backend/src/core/GlobalEventService.ts

@@ -38,11 +38,7 @@ export interface BroadcastTypes {
 		emojis: Packed<'EmojiDetailed'>[];
 	};
 	emojiDeleted: {
-		emojis: {
+		emojis: Packed<'EmojiDetailed'>[];
-			id?: string;
-			name: string;
-			[other: string]: any;
-		}[];
 	};
 	announcementCreated: {
 		announcement: Packed<'Announcement'>;

packages/backend/src/core/MfmService.ts

@@ -308,7 +308,7 @@ export class MfmService {
 						try {
 							const date = new Date(parseInt(text, 10) * 1000);
 							return `<time datetime="${escapeHtml(date.toISOString())}">${escapeHtml(date.toISOString())}</time>`;
-						} catch (err) {
+						} catch (_) {
 							return fnDefault(node);
 						}
 					}
@@ -376,7 +376,7 @@ export class MfmService {
 				try {
 					const url = new URL(node.props.url);
 					return `<a href="${escapeHtml(url.href)}">${toHtml(node.children)}</a>`;
-				} catch (err) {
+				} catch (_) {
 					return `[${toHtml(node.children)}](${escapeHtml(node.props.url)})`;
 				}
 			},
@@ -390,7 +390,7 @@ export class MfmService {
 				try {
 					const url = new URL(href);
 					return `<a href="${escapeHtml(url.href)}" class="u-url mention">${escapeHtml(acct)}</a>`;
-				} catch (err) {
+				} catch (_) {
 					return escapeHtml(acct);
 				}
 			},
@@ -419,7 +419,7 @@ export class MfmService {
 				try {
 					const url = new URL(node.props.url);
 					return `<a href="${escapeHtml(url.href)}">${escapeHtml(node.props.url)}</a>`;
-				} catch (err) {
+				} catch (_) {
 					return escapeHtml(node.props.url);
 				}
 			},

packages/backend/src/core/NoteDraftService.ts

@@ -187,9 +187,9 @@ export class NoteDraftService {
 		}
 
 		//#region visibleUsers
-		let visibleUsers: MiUser[] = [];
+		let _visibleUsers: MiUser[] = [];
 		if (data.visibleUserIds != null && data.visibleUserIds.length > 0) {
-			visibleUsers = await this.usersRepository.findBy({
+			_visibleUsers = await this.usersRepository.findBy({
 				id: In(data.visibleUserIds),
 			});
 		}

packages/backend/src/core/QueueService.ts

@@ -6,7 +6,6 @@
 import { randomUUID } from 'node:crypto';
 import { Inject, Injectable } from '@nestjs/common';
 import { MetricsTime, type JobType } from 'bullmq';
-import { parse as parseRedisInfo } from 'redis-info';
 import type { IActivity } from '@/core/activitypub/type.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
 import type { MiWebhook, WebhookEventTypes } from '@/models/Webhook.js';
@@ -86,6 +85,19 @@ const REPEATABLE_SYSTEM_JOB_DEF = [{
 	pattern: '0 4 * * *',
 }];
 
+function parseRedisInfo(infoText: string): Record<string, string> {
+	const fields = infoText
+		.split('\n')
+		.filter(line => line.length > 0 && !line.startsWith('#'))
+		.map(line => line.trim().split(':'));
+
+	const result: Record<string, string> = {};
+	for (const [key, value] of fields) {
+		result[key] = value;
+	}
+	return result;
+}
+
 @Injectable()
 export class QueueService {
 	constructor(
@@ -890,7 +902,7 @@ export class QueueService {
 			},
 			db: {
 				version: db.redis_version,
-				mode: db.redis_mode,
+				mode: db.redis_mode as 'cluster' | 'standalone' | 'sentinel',
 				runId: db.run_id,
 				processId: db.process_id,
 				port: parseInt(db.tcp_port),

packages/backend/src/core/RoleService.ts

@@ -314,7 +314,7 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 				default:
 					return false;
 			}
-		} catch (err) {
+		} catch (_) {
 			// TODO: log error
 			return false;
 		}

packages/backend/src/core/SearchService.ts

@@ -190,8 +190,7 @@ export class SearchService {
 				return this.searchNoteByMeiliSearch(q, me, opts, pagination);
 			}
 			default: {
-				// eslint-disable-next-line @typescript-eslint/no-unused-vars
+				const _: never = this.provider;
-				const typeCheck: never = this.provider;
 				return [];
 			}
 		}

packages/backend/src/core/UserSuspendService.ts

@@ -49,8 +49,8 @@ export class UserSuspendService {
 		});
 
 		(async () => {
-			await this.postSuspend(user).catch(e => {});
+			await this.postSuspend(user).catch(_ => {});
-			await this.unFollowAll(user).catch(e => {});
+			await this.unFollowAll(user).catch(_ => {});
 		})();
 	}
 
@@ -67,7 +67,7 @@ export class UserSuspendService {
 		});
 
 		(async () => {
-			await this.postUnsuspend(user).catch(e => {});
+			await this.postUnsuspend(user).catch(_ => {});
 		})();
 	}
 

packages/backend/src/core/UtilityService.ts

@@ -98,7 +98,7 @@ export class UtilityService {
 			try {
 				// TODO: RE2インスタンスをキャッシュ
 				return new RE2(regexp[1], regexp[2]).test(text);
-			} catch (err) {
+			} catch (_) {
 				// This should never happen due to input sanitisation.
 				return false;
 			}

packages/backend/src/core/activitypub/ApInboxService.ts

@@ -95,7 +95,7 @@ export class ApInboxService {
 		if (isCollectionOrOrderedCollection(activity)) {
 			const results = [] as [string, string | void][];
 			// eslint-disable-next-line no-param-reassign
-			resolver ??= this.apResolverService.createResolver();
+			resolver ??= await this.apResolverService.createResolver();
 
 			const items = toArray(isCollection(activity) ? activity.items : activity.orderedItems);
 			if (items.length >= resolver.getRecursionLimit()) {
@@ -221,7 +221,7 @@ export class ApInboxService {
 		this.logger.info(`Accept: ${uri}`);
 
 		// eslint-disable-next-line no-param-reassign
-		resolver ??= this.apResolverService.createResolver();
+		resolver ??= await this.apResolverService.createResolver();
 
 		const object = await resolver.resolve(activity.object).catch(err => {
 			this.logger.error(`Resolution failed: ${err}`);
@@ -284,7 +284,7 @@ export class ApInboxService {
 		this.logger.info(`Announce: ${uri}`);
 
 		// eslint-disable-next-line no-param-reassign
-		resolver ??= this.apResolverService.createResolver();
+		resolver ??= await this.apResolverService.createResolver();
 
 		if (!activity.object) return 'skip: activity has no object property';
 		const targetUri = getApId(activity.object);
@@ -406,7 +406,7 @@ export class ApInboxService {
 		}
 
 		// eslint-disable-next-line no-param-reassign
-		resolver ??= this.apResolverService.createResolver();
+		resolver ??= await this.apResolverService.createResolver();
 
 		const object = await resolver.resolve(activity.object).catch(e => {
 			this.logger.error(`Resolution failed: ${e}`);
@@ -457,6 +457,36 @@ export class ApInboxService {
 		}
 	}
 
+	@bindThis
+	private async chatMessage(resolver: Resolver, actor: MiRemoteUser, message: IObject): Promise<string> {
+		const uri = getApId(message);
+
+		if (typeof message === 'object') {
+			if (actor.uri !== message.attributedTo) {
+				return 'skip: actor.uri !== message.attributedTo';
+			}
+
+			if (typeof message.id === 'string') {
+				if (this.utilityService.extractDbHost(actor.uri) !== this.utilityService.extractDbHost(message.id)) {
+					return 'skip: host in actor.uri !== message.id';
+				}
+			} else {
+				return 'skip: message.id is not a string';
+			}
+		}
+
+		try {
+			await this.chatService.createMessageViaAp(message, actor, resolver);
+			return 'ok';
+		} catch (err) {
+			if (err instanceof StatusError && !err.isRetryable) {
+				return `skip ${err.statusCode}`;
+			} else {
+				throw err;
+			}
+		}
+	}
+
 	@bindThis
 	private async delete(actor: MiRemoteUser, activity: IDelete): Promise<string> {
 		if (actor.uri !== activity.actor) {
@@ -575,7 +605,7 @@ export class ApInboxService {
 		this.logger.info(`Reject: ${uri}`);
 
 		// eslint-disable-next-line no-param-reassign
-		resolver ??= this.apResolverService.createResolver();
+		resolver ??= await this.apResolverService.createResolver();
 
 		const object = await resolver.resolve(activity.object).catch(e => {
 			this.logger.error(`Resolution failed: ${e}`);
@@ -642,7 +672,7 @@ export class ApInboxService {
 		this.logger.info(`Undo: ${uri}`);
 
 		// eslint-disable-next-line no-param-reassign
-		resolver ??= this.apResolverService.createResolver();
+		resolver ??= await this.apResolverService.createResolver();
 
 		const object = await resolver.resolve(activity.object).catch(e => {
 			this.logger.error(`Resolution failed: ${e}`);
@@ -774,7 +804,7 @@ export class ApInboxService {
 		this.logger.debug('Update');
 
 		// eslint-disable-next-line no-param-reassign
-		resolver ??= this.apResolverService.createResolver();
+		resolver ??= await this.apResolverService.createResolver();
 
 		const object = await resolver.resolve(activity.object).catch(e => {
 			this.logger.error(`Resolution failed: ${e}`);

packages/backend/src/core/activitypub/ApRendererService.ts

@@ -23,7 +23,7 @@ import { MfmService } from '@/core/MfmService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
 import type { MiUserKeypair } from '@/models/UserKeypair.js';
-import type { UsersRepository, UserProfilesRepository, NotesRepository, DriveFilesRepository, PollsRepository, MiMeta } from '@/models/_.js';
+import type { UsersRepository, UserProfilesRepository, NotesRepository, DriveFilesRepository, PollsRepository, MiMeta, MiChatMessage } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
 import { CustomEmojiService } from '@/core/CustomEmojiService.js';
 import { IdService } from '@/core/IdService.js';
@@ -492,6 +492,31 @@ export class ApRendererService {
 		};
 	}
 
+	@bindThis
+	public async renderChatMessage(message: MiChatMessage, dive = true): Promise<IPost> {
+		const attributedTo = this.userEntityService.genLocalUserUri(message.fromUserId);
+
+		const file = message.fileId ? await this.driveFilesRepository.findOneBy({ id: message.fileId }) : null;
+
+		const emojis = await this.getEmojis(message.emojis);
+		const apemojis = emojis.filter(emoji => !emoji.localOnly).map(emoji => this.renderEmoji(emoji));
+
+		const tag = [
+			...apemojis,
+		];
+
+		return {
+			id: `${this.config.url}/chat-messages/${message.id}`,
+			type: 'Misskey:ChatMessage',
+			attributedTo,
+			text: message.text,
+			published: this.idService.parse(message.id).date.toISOString(),
+			to: message.toUserId,
+			attachment: file ? [this.renderDocument(file)] : [],
+			tag,
+		};
+	}
+
 	@bindThis
 	public async renderPerson(user: MiLocalUser) {
 		const id = this.userEntityService.genLocalUserUri(user.id);
@@ -515,7 +540,7 @@ export class ApRendererService {
 				const restPart = maybeUrl.slice(match[0].length);
 
 				return `<a href="${urlPartParsed.href}" rel="me nofollow noopener" target="_blank">${urlPart}</a>${restPart}`;
-			} catch (e) {
+			} catch (_) {
 				return maybeUrl;
 			}
 		};

packages/backend/src/core/activitypub/ApRequestService.ts

@@ -226,7 +226,7 @@ export class ApRequestService {
 						return await this.signedGet(href, user, allowSoftfail, false);
 					}
 				}
-			} catch (e) {
+			} catch (_) {
 				// something went wrong parsing the HTML, ignore the whole thing
 			}
 		}

packages/backend/src/core/activitypub/ApResolverService.ts

@@ -3,10 +3,17 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { Inject, Injectable } from '@nestjs/common';
+import { Inject, Injectable, Scope } from '@nestjs/common';
 import { IsNull, Not } from 'typeorm';
 import type { MiLocalUser, MiRemoteUser } from '@/models/User.js';
-import type { NotesRepository, PollsRepository, NoteReactionsRepository, UsersRepository, FollowRequestsRepository, MiMeta } from '@/models/_.js';
+import type {
+	FollowRequestsRepository,
+	MiMeta,
+	NoteReactionsRepository,
+	NotesRepository,
+	PollsRepository,
+	UsersRepository
+} from '@/models/_.js';
 import type { Config } from '@/config.js';
 import { HttpRequestService } from '@/core/HttpRequestService.js';
 import { DI } from '@/di-symbols.js';
@@ -16,26 +23,43 @@ import { LoggerService } from '@/core/LoggerService.js';
 import type Logger from '@/logger.js';
 import { SystemAccountService } from '@/core/SystemAccountService.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
+import type { ICollection, IObject, IOrderedCollection } from './type.js';
 import { isCollectionOrOrderedCollection } from './type.js';
 import { ApDbResolverService } from './ApDbResolverService.js';
 import { ApRendererService } from './ApRendererService.js';
 import { ApRequestService } from './ApRequestService.js';
 import { FetchAllowSoftFailMask } from './misc/check-against-url.js';
-import type { IObject, ICollection, IOrderedCollection } from './type.js';
+import { ModuleRef } from '@nestjs/core';
 
+@Injectable({ scope: Scope.TRANSIENT })
 export class Resolver {
 	private history: Set<string>;
 	private user?: MiLocalUser;
 	private logger: Logger;
+	private recursionLimit = 256;
 
 	constructor(
+		@Inject(DI.config)
 		private config: Config,
+
+		@Inject(DI.meta)
 		private meta: MiMeta,
+
+		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
+
+		@Inject(DI.notesRepository)
 		private notesRepository: NotesRepository,
+
+		@Inject(DI.pollsRepository)
 		private pollsRepository: PollsRepository,
+
+		@Inject(DI.noteReactionsRepository)
 		private noteReactionsRepository: NoteReactionsRepository,
+
+		@Inject(DI.followRequestsRepository)
 		private followRequestsRepository: FollowRequestsRepository,
+
 		private utilityService: UtilityService,
 		private systemAccountService: SystemAccountService,
 		private apRequestService: ApRequestService,
@@ -43,7 +67,6 @@ export class Resolver {
 		private apRendererService: ApRendererService,
 		private apDbResolverService: ApDbResolverService,
 		private loggerService: LoggerService,
-		private recursionLimit = 256,
 	) {
 		this.history = new Set();
 		this.logger = this.loggerService.getLogger('ap-resolve');
@@ -180,54 +203,12 @@ export class Resolver {
 @Injectable()
 export class ApResolverService {
 	constructor(
-		@Inject(DI.config)
+		private moduleRef: ModuleRef,
-		private config: Config,
-
-		@Inject(DI.meta)
-		private meta: MiMeta,
-
-		@Inject(DI.usersRepository)
-		private usersRepository: UsersRepository,
-
-		@Inject(DI.notesRepository)
-		private notesRepository: NotesRepository,
-
-		@Inject(DI.pollsRepository)
-		private pollsRepository: PollsRepository,
-
-		@Inject(DI.noteReactionsRepository)
-		private noteReactionsRepository: NoteReactionsRepository,
-
-		@Inject(DI.followRequestsRepository)
-		private followRequestsRepository: FollowRequestsRepository,
-
-		private utilityService: UtilityService,
-		private systemAccountService: SystemAccountService,
-		private apRequestService: ApRequestService,
-		private httpRequestService: HttpRequestService,
-		private apRendererService: ApRendererService,
-		private apDbResolverService: ApDbResolverService,
-		private loggerService: LoggerService,
 	) {
 	}
 
 	@bindThis
-	public createResolver(): Resolver {
+	public async createResolver(): Promise<Resolver> {
-		return new Resolver(
+		return await this.moduleRef.create(Resolver);
-			this.config,
-			this.meta,
-			this.usersRepository,
-			this.notesRepository,
-			this.pollsRepository,
-			this.noteReactionsRepository,
-			this.followRequestsRepository,
-			this.utilityService,
-			this.systemAccountService,
-			this.apRequestService,
-			this.httpRequestService,
-			this.apRendererService,
-			this.apDbResolverService,
-			this.loggerService,
-		);
 	}
 }

packages/backend/src/core/activitypub/models/ApImageService.ts

@@ -46,7 +46,7 @@ export class ApImageService {
 			throw new Error('actor has been suspended');
 		}
 
-		const image = await this.apResolverService.createResolver().resolve(value);
+		const image = await (await this.apResolverService.createResolver()).resolve(value);
 
 		if (!isDocument(image)) return null;
 

packages/backend/src/core/activitypub/models/ApNoteService.ts

@@ -128,7 +128,7 @@ export class ApNoteService {
 	@bindThis
 	public async createNote(value: string | IObject, actor?: MiRemoteUser, resolver?: Resolver, silent = false): Promise<MiNote | null> {
 		// eslint-disable-next-line no-param-reassign
-		if (resolver == null) resolver = this.apResolverService.createResolver();
+		if (resolver == null) resolver = await this.apResolverService.createResolver();
 
 		const object = await resolver.resolve(value);
 

packages/backend/src/core/activitypub/models/ApPersonService.ts

@@ -310,7 +310,7 @@ export class ApPersonService implements OnModuleInit {
 		}
 
 		// eslint-disable-next-line no-param-reassign
-		if (resolver == null) resolver = this.apResolverService.createResolver();
+		if (resolver == null) resolver = await this.apResolverService.createResolver();
 
 		const object = await resolver.resolve(uri);
 		if (object.id == null) throw new Error('invalid object.id: ' + object.id);
@@ -500,7 +500,7 @@ export class ApPersonService implements OnModuleInit {
 		//#endregion
 
 		// eslint-disable-next-line no-param-reassign
-		if (resolver == null) resolver = this.apResolverService.createResolver();
+		if (resolver == null) resolver = await this.apResolverService.createResolver();
 
 		const object = hint ?? await resolver.resolve(uri);
 
@@ -678,7 +678,7 @@ export class ApPersonService implements OnModuleInit {
 
 		// リモートサーバーからフェッチしてきて登録
 		// eslint-disable-next-line no-param-reassign
-		if (resolver == null) resolver = this.apResolverService.createResolver();
+		if (resolver == null) resolver = await this.apResolverService.createResolver();
 		return await this.createPerson(uri, resolver);
 	}
 
@@ -707,7 +707,7 @@ export class ApPersonService implements OnModuleInit {
 
 		this.logger.info(`Updating the featured: ${user.uri}`);
 
-		const _resolver = resolver ?? this.apResolverService.createResolver();
+		const _resolver = resolver ?? await this.apResolverService.createResolver();
 
 		// Resolve to (Ordered)Collection Object
 		const collection = await _resolver.resolveCollection(user.featured);

packages/backend/src/core/activitypub/models/ApQuestionService.ts

@@ -45,7 +45,7 @@ export class ApQuestionService {
 	@bindThis
 	public async extractPollFromQuestion(source: string | IObject, resolver?: Resolver): Promise<IPoll> {
 		// eslint-disable-next-line no-param-reassign
-		if (resolver == null) resolver = this.apResolverService.createResolver();
+		if (resolver == null) resolver = await this.apResolverService.createResolver();
 
 		const question = await resolver.resolve(source);
 		if (!isQuestion(question)) throw new Error('invalid type');
@@ -91,7 +91,7 @@ export class ApQuestionService {
 
 		// resolve new Question object
 		// eslint-disable-next-line no-param-reassign
-		if (resolver == null) resolver = this.apResolverService.createResolver();
+		if (resolver == null) resolver = await this.apResolverService.createResolver();
 		const question = await resolver.resolve(value);
 		this.logger.debug(`fetched question: ${JSON.stringify(question, null, 2)}`);
 

packages/backend/src/core/entities/ChatEntityService.ts

@@ -138,7 +138,7 @@ export class ChatEntityService {
 		const reactions: { reaction: string; }[] = [];
 
 		for (const record of message.reactions) {
-			const [userId, reaction] = record.split('/');
+			const [, reaction] = record.split('/');
 			reactions.push({
 				reaction,
 			});

packages/backend/src/core/entities/DriveFileEntityService.ts

@@ -17,6 +17,7 @@ import { deepClone } from '@/misc/clone.js';
 import { bindThis } from '@/decorators.js';
 import { isMimeImage } from '@/misc/is-mime-image.js';
 import { IdService } from '@/core/IdService.js';
+import { uniqueByKey } from '@/misc/unique-by-key.js';
 import { UtilityService } from '../UtilityService.js';
 import { VideoProcessingService } from '../VideoProcessingService.js';
 import { UserEntityService } from './UserEntityService.js';
@@ -226,6 +227,7 @@ export class DriveFileEntityService {
 		options?: PackOptions,
 		hint?: {
 			packedUser?: Packed<'UserLite'>
+			packedFolder?: Packed<'DriveFolder'>
 		},
 	): Promise<Packed<'DriveFile'> | null> {
 		const opts = Object.assign({
@@ -250,9 +252,9 @@ export class DriveFileEntityService {
 			thumbnailUrl: this.getThumbnailUrl(file),
 			comment: file.comment,
 			folderId: file.folderId,
-			folder: opts.detail && file.folderId ? this.driveFolderEntityService.pack(file.folderId, {
+			folder: opts.detail && file.folderId ? (hint?.packedFolder ?? this.driveFolderEntityService.pack(file.folderId, {
 				detail: true,
-			}) : null,
+			})) : null,
 			userId: file.userId,
 			user: (opts.withUser && file.userId) ? hint?.packedUser ?? this.userEntityService.pack(file.userId) : null,
 		});
@@ -263,10 +265,41 @@ export class DriveFileEntityService {
 		files: MiDriveFile[],
 		options?: PackOptions,
 	): Promise<Packed<'DriveFile'>[]> {
-		const _user = files.map(({ user, userId }) => user ?? userId).filter(x => x != null);
+		// -- ユーザ情報の事前取得 --
-		const _userMap = await this.userEntityService.packMany(_user)
+
-			.then(users => new Map(users.map(user => [user.id, user])));
+		let userMap: Map<string, Packed<'UserLite'>> | null = null;
-		const items = await Promise.all(files.map(f => this.packNullable(f, options, f.userId ? { packedUser: _userMap.get(f.userId) } : {})));
+		if (options?.withUser) {
+			const users = files
+				.map(({ user, userId }) => user ?? userId)
+				.filter(x => x != null);
+
+			const uniqueUsers = uniqueByKey(users, (user) => typeof user === 'string' ? user : user.id);
+			const packedUsers = await this.userEntityService.packMany(uniqueUsers);
+			userMap = new Map(packedUsers.map(user => [user.id, user]));
+		}
+
+		// -- フォルダ情報の事前取得 --
+
+		let folderMap: Map<string, Packed<'DriveFolder'>> | null = null;
+		if (options?.detail) {
+			const folders = files
+				.map(({ folder, folderId }) => folder ?? folderId)
+				.filter(x => x != null);
+
+			const uniqueFolders = uniqueByKey(folders, (folder) => typeof folder === 'string' ? folder : folder.id);
+			const packedFolders = await this.driveFolderEntityService.packMany(uniqueFolders, { detail: true });
+			folderMap = new Map(packedFolders.map(folder => [folder.id, folder]));
+		}
+
+		const items = await Promise.all(files.map(f => this.packNullable(
+			f,
+			options,
+			{
+				packedUser: f.userId ? userMap?.get(f.userId) : undefined,
+				packedFolder: f.folderId ? folderMap?.get(f.folderId) : undefined,
+			},
+		)));
+
 		return items.filter(x => x != null);
 	}
 

packages/backend/src/core/entities/DriveFolderEntityService.ts

@@ -12,6 +12,9 @@ import type { } from '@/models/Blocking.js';
 import type { MiDriveFolder } from '@/models/DriveFolder.js';
 import { bindThis } from '@/decorators.js';
 import { IdService } from '@/core/IdService.js';
+import { In } from 'typeorm';
+import { uniqueByKey } from '@/misc/unique-by-key.js';
+import { splitIdAndObjects } from '@/misc/split-id-and-objects.js';
 
 @Injectable()
 export class DriveFolderEntityService {
@@ -32,12 +35,20 @@ export class DriveFolderEntityService {
 		options?: {
 			detail: boolean
 		},
+		hint?: {
+			folderMap?: Map<string, MiDriveFolder>;
+			foldersCountMap?: Map<string, number> | null;
+			filesCountMap?: Map<string, number> | null;
+			parentPacker?: (id: string) => Promise<Packed<'DriveFolder'>>;
+		},
 	): Promise<Packed<'DriveFolder'>> {
 		const opts = Object.assign({
 			detail: false,
 		}, options);
 
-		const folder = typeof src === 'object' ? src : await this.driveFoldersRepository.findOneByOrFail({ id: src });
+		const folder = typeof src === 'object'
+			? src
+			: hint?.folderMap?.get(src) ?? await this.driveFoldersRepository.findOneByOrFail({ id: src });
 
 		return await awaitAll({
 			id: folder.id,
@@ -46,20 +57,141 @@ export class DriveFolderEntityService {
 			parentId: folder.parentId,
 
 			...(opts.detail ? {
-				foldersCount: this.driveFoldersRepository.countBy({
+				foldersCount: hint?.foldersCountMap?.get(folder.id)
-					parentId: folder.id,
+					?? this.driveFoldersRepository.countBy({
-				}),
+						parentId: folder.id,
-				filesCount: this.driveFilesRepository.countBy({
+					}),
-					folderId: folder.id,
+				filesCount: hint?.filesCountMap?.get(folder.id)
-				}),
+					?? this.driveFilesRepository.countBy({
+						folderId: folder.id,
+					}),
 
 				...(folder.parentId ? {
-					parent: this.pack(folder.parentId, {
+					parent: hint?.parentPacker
-						detail: true,
+						? hint.parentPacker(folder.parentId)
-					}),
+						: this.pack(folder.parentId, { detail: true }, hint),
 				} : {}),
 			} : {}),
 		});
 	}
-}
 
+	public async packMany(
+		src: Array<MiDriveFolder['id'] | MiDriveFolder>,
+		options?: {
+			detail: boolean
+		},
+	): Promise<Array<Packed<'DriveFolder'>>> {
+		/**
+		 * 重複を除去しつつ、必要なDriveFolderオブジェクトをすべて取得する
+		 */
+		const collectUniqueObjects = async (src: Array<MiDriveFolder['id'] | MiDriveFolder>) => {
+			const uniqueSrc = uniqueByKey(
+				src,
+				(s) => typeof s === 'string' ? s : s.id,
+			);
+			const { ids, objects } = splitIdAndObjects(uniqueSrc);
+
+			const uniqueObjects = new Map<string, MiDriveFolder>(objects.map(s => [s.id, s]));
+			const needsFetchIds = ids.filter(id => !uniqueObjects.has(id));
+
+			if (needsFetchIds.length > 0) {
+				const fetchedObjects = await this.driveFoldersRepository.find({
+					where: {
+						id: In(needsFetchIds),
+					},
+				});
+				for (const obj of fetchedObjects) {
+					uniqueObjects.set(obj.id, obj);
+				}
+			}
+
+			return uniqueObjects;
+		};
+
+		/**
+		 * 親フォルダーを再帰的に収集する
+		 */
+		const collectAncestors = async (folderMap: Map<string, MiDriveFolder>) => {
+			for (;;) {
+				const parentIds = new Set<string>();
+				for (const folder of folderMap.values()) {
+					if (folder.parentId != null && !folderMap.has(folder.parentId)) {
+						parentIds.add(folder.parentId);
+					}
+				}
+
+				if (parentIds.size === 0) break;
+
+				const fetchedParents = await this.driveFoldersRepository.find({
+					where: {
+						id: In([...parentIds]),
+					},
+				});
+
+				if (fetchedParents.length === 0) break;
+
+				for (const parent of fetchedParents) {
+					folderMap.set(parent.id, parent);
+				}
+			}
+		};
+
+		const opts = Object.assign({
+			detail: false,
+		}, options);
+
+		const folderMap = await collectUniqueObjects(src);
+
+		let foldersCountMap: Map<string, number> | null = null;
+		let filesCountMap: Map<string, number> | null = null;
+		if (opts.detail) {
+			await collectAncestors(folderMap);
+
+			const ids = [...folderMap.keys()];
+			if (ids.length > 0) {
+				const folderCounts = await this.driveFoldersRepository.createQueryBuilder('folder')
+					.select('folder.parentId', 'parentId')
+					.addSelect('COUNT(*)', 'count')
+					.where('folder.parentId IN (:...ids)', { ids })
+					.groupBy('folder.parentId')
+					.getRawMany<{ parentId: string; count: string }>();
+
+				const fileCounts = await this.driveFilesRepository.createQueryBuilder('file')
+					.select('file.folderId', 'folderId')
+					.addSelect('COUNT(*)', 'count')
+					.where('file.folderId IN (:...ids)', { ids })
+					.groupBy('file.folderId')
+					.getRawMany<{ folderId: string; count: string }>();
+
+				foldersCountMap = new Map(folderCounts.map(row => [row.parentId, Number(row.count)]));
+				filesCountMap = new Map(fileCounts.map(row => [row.folderId, Number(row.count)]));
+			} else {
+				foldersCountMap = new Map();
+				filesCountMap = new Map();
+			}
+		}
+
+		const packedMap = new Map<string, Promise<Packed<'DriveFolder'>>>();
+		const packFromId = (id: string): Promise<Packed<'DriveFolder'>> => {
+			const cached = packedMap.get(id);
+			if (cached) return cached;
+
+			const folder = folderMap.get(id);
+			if (!folder) {
+				throw new Error(`DriveFolder not found: ${id}`);
+			}
+
+			const packedPromise = this.pack(folder, options, {
+				folderMap,
+				foldersCountMap,
+				filesCountMap,
+				parentPacker: packFromId,
+			});
+			packedMap.set(id, packedPromise);
+
+			return packedPromise;
+		};
+
+		return Promise.all(src.map(s => packFromId(typeof s === 'string' ? s : s.id)));
+	}
+}

packages/backend/src/core/entities/EmojiEntityService.ts

@@ -41,7 +41,7 @@ export class EmojiEntityService {
 
 	@bindThis
 	public packSimpleMany(
-		emojis: any[],
+		emojis: (MiEmoji['id'] | MiEmoji)[],
 	) {
 		return Promise.all(emojis.map(x => this.packSimple(x)));
 	}
@@ -69,7 +69,7 @@ export class EmojiEntityService {
 
 	@bindThis
 	public packDetailedMany(
-		emojis: any[],
+		emojis: (MiEmoji['id'] | MiEmoji)[],
 	): Promise<Packed<'EmojiDetailed'>[]> {
 		return Promise.all(emojis.map(x => this.packDetailed(x)));
 	}

packages/backend/src/core/entities/MetaEntityService.ts

@@ -55,13 +55,13 @@ export class MetaEntityService {
 		if (instance.defaultLightTheme) {
 			try {
 				defaultLightTheme = JSON.stringify(JSON5.parse(instance.defaultLightTheme));
-			} catch (e) {
+			} catch (_) {
 			}
 		}
 		if (instance.defaultDarkTheme) {
 			try {
 				defaultDarkTheme = JSON.stringify(JSON5.parse(instance.defaultDarkTheme));
-			} catch (e) {
+			} catch (_) {
 			}
 		}
 

packages/backend/src/core/entities/NoteReactionEntityService.ts

@@ -54,7 +54,7 @@ export class NoteReactionEntityService implements OnModuleInit {
 			packedUser?: Packed<'UserLite'>
 		},
 	): Promise<Packed<'NoteReaction'>> {
-		const opts = Object.assign({
+		const _opts = Object.assign({
 		}, options);
 
 		const reaction = typeof src === 'object' ? src : await this.noteReactionsRepository.findOneByOrFail({ id: src });
@@ -90,7 +90,7 @@ export class NoteReactionEntityService implements OnModuleInit {
 			packedUser?: Packed<'UserLite'>
 		},
 	): Promise<Packed<'NoteReactionWithNote'>> {
-		const opts = Object.assign({
+		const _opts = Object.assign({
 		}, options);
 
 		const reaction = typeof src === 'object' ? src : await this.noteReactionsRepository.findOneByOrFail({ id: src });

packages/backend/src/core/entities/ReversiGameEntityService.ts

@@ -14,6 +14,10 @@ import { bindThis } from '@/decorators.js';
 import { IdService } from '@/core/IdService.js';
 import { UserEntityService } from './UserEntityService.js';
 
+function assertBw(bw: string): bw is Packed<'ReversiGameDetailed'>['bw'] {
+	return ['random', '1', '2'].includes(bw);
+}
+
 @Injectable()
 export class ReversiGameEntityService {
 	constructor(
@@ -58,7 +62,7 @@ export class ReversiGameEntityService {
 			surrenderedUserId: game.surrenderedUserId,
 			timeoutUserId: game.timeoutUserId,
 			black: game.black,
-			bw: game.bw,
+			bw: assertBw(game.bw) ? game.bw : 'random',
 			isLlotheo: game.isLlotheo,
 			canPutEverywhere: game.canPutEverywhere,
 			loopedBoard: game.loopedBoard,
@@ -116,7 +120,7 @@ export class ReversiGameEntityService {
 			surrenderedUserId: game.surrenderedUserId,
 			timeoutUserId: game.timeoutUserId,
 			black: game.black,
-			bw: game.bw,
+			bw: assertBw(game.bw) ? game.bw : 'random',
 			isLlotheo: game.isLlotheo,
 			canPutEverywhere: game.canPutEverywhere,
 			loopedBoard: game.loopedBoard,

packages/backend/src/core/entities/UserEntityService.ts

@@ -720,7 +720,7 @@ export class UserEntityService implements OnModuleInit {
 				me,
 				{
 					...options,
-					userProfile: profilesMap.get(u.id),
+					userProfile: profilesMap?.get(u.id),
 					userRelations: userRelations,
 					userMemos: userMemos,
 					pinNotes: pinNotes,

packages/backend/src/misc/check-word-mute.ts

@@ -56,7 +56,7 @@ export async function checkWordMute(note: NoteLike, me: UserLike | null | undefi
 
 				try {
 					return new RE2(regexp[1], regexp[2]).test(text);
-				} catch (err) {
+				} catch (_) {
 					// This should never happen due to input sanitisation.
 					return false;
 				}

packages/backend/src/misc/get-ip-hash.ts

@@ -12,7 +12,7 @@ export function getIpHash(ip: string): string {
 		// (this means for IPv4 the entire address is used)
 		const prefix = IPCIDR.createAddress(ip).mask(64);
 		return 'ip-' + BigInt('0b' + prefix).toString(36);
-	} catch (e) {
+	} catch (_) {
 		const prefix = IPCIDR.createAddress(ip.replace(/:[0-9]+$/, '')).mask(64);
 		return 'ip-' + BigInt('0b' + prefix).toString(36);
 	}

packages/backend/src/misc/i18n.ts

@@ -26,7 +26,7 @@ export class I18n<T extends Record<string, any>> {
 				}
 			}
 			return str;
-		} catch (e) {
+		} catch (_) {
 			console.warn(`missing localization '${key}'`);
 			return key;
 		}

packages/backend/src/misc/json-schema.ts

@@ -64,6 +64,7 @@ import {
 	packedMetaDetailedOnlySchema,
 	packedMetaDetailedSchema,
 	packedMetaLiteSchema,
+	packedMetaClientOptionsSchema,
 } from '@/models/json-schema/meta.js';
 import { packedUserWebhookSchema } from '@/models/json-schema/user-webhook.js';
 import { packedSystemWebhookSchema } from '@/models/json-schema/system-webhook.js';
@@ -135,6 +136,7 @@ export const refs = {
 	MetaLite: packedMetaLiteSchema,
 	MetaDetailedOnly: packedMetaDetailedOnlySchema,
 	MetaDetailed: packedMetaDetailedSchema,
+	MetaClientOptions: packedMetaClientOptionsSchema,
 	UserWebhook: packedUserWebhookSchema,
 	SystemWebhook: packedSystemWebhookSchema,
 	AbuseReportNotificationRecipient: packedAbuseReportNotificationRecipientSchema,
@@ -262,8 +264,6 @@ type ObjectSchemaTypeDef<p extends Schema> =
 				never :
 			any;
 
-type ObjectSchemaType<p extends Schema> = NullOrUndefined<p, ObjectSchemaTypeDef<p>>;
-
 export type SchemaTypeDef<p extends Schema> =
 	p['type'] extends 'null' ? null :
 	p['type'] extends 'integer' ? number :

packages/backend/src/misc/split-id-and-objects.ts

@@ -0,0 +1,27 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+/**
+ * idとオブジェクトを分離する
+ * @param input idまたはオブジェクトの配列
+ * @returns idの配列とオブジェクトの配列
+ */
+export function splitIdAndObjects<T extends { id: string }>(input: (T | string)[]): { ids: string[]; objects: T[] } {
+	const ids: string[] = [];
+	const objects : T[] = [];
+
+	for (const item of input) {
+		if (typeof item === 'string') {
+			ids.push(item);
+		} else {
+			objects.push(item);
+		}
+	}
+
+	return {
+		ids,
+		objects,
+	};
+}

packages/backend/src/misc/unique-by-key.ts

@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+/**
+ * itemsの中でkey関数が返す値が重複しないようにした配列を返す
+ * @param items 重複を除去したい配列
+ * @param key 重複判定に使うキーを返す関数
+ * @returns 重複を除去した配列
+ */
+export function uniqueByKey<TItem, TKey = string>(items: Iterable<TItem>, key: (item: TItem) => TKey): TItem[] {
+	const map = new Map<TKey, TItem>();
+	for (const item of items) {
+		const k = key(item);
+		if (!map.has(k)) {
+			map.set(k, item);
+		}
+	}
+	return [...map.values()];
+}

packages/backend/src/models/AbuseReportNotificationRecipient.ts

@@ -67,7 +67,7 @@ export class MiAbuseReportNotificationRecipient {
 	/**
 	 * 通知先のユーザ.
 	 */
-	@ManyToOne(type => MiUser, {
+	@ManyToOne(() => MiUser, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn({ name: 'userId', referencedColumnName: 'id', foreignKeyConstraintName: 'FK_abuse_report_notification_recipient_userId1' })
@@ -76,7 +76,7 @@ export class MiAbuseReportNotificationRecipient {
 	/**
 	 * 通知先のユーザプロフィール.
 	 */
-	@ManyToOne(type => MiUserProfile, {
+	@ManyToOne(() => MiUserProfile, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn({ name: 'userId', referencedColumnName: 'userId', foreignKeyConstraintName: 'FK_abuse_report_notification_recipient_userId2' })
@@ -96,7 +96,7 @@ export class MiAbuseReportNotificationRecipient {
 	/**
 	 * 通知先のシステムWebhook.
 	 */
-	@ManyToOne(type => MiSystemWebhook, {
+	@ManyToOne(() => MiSystemWebhook, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn({ name: 'systemWebhookId', referencedColumnName: 'id', foreignKeyConstraintName: 'FK_abuse_report_notification_recipient_systemWebhookId' })

packages/backend/src/models/AbuseUserReport.ts

@@ -18,7 +18,7 @@ export class MiAbuseUserReport {
 	@Column(id())
 	public targetUserId: MiUser['id'];
 
-	@ManyToOne(type => MiUser, {
+	@ManyToOne(() => MiUser, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -28,7 +28,7 @@ export class MiAbuseUserReport {
 	@Column(id())
 	public reporterId: MiUser['id'];
 
-	@ManyToOne(type => MiUser, {
+	@ManyToOne(() => MiUser, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -40,7 +40,7 @@ export class MiAbuseUserReport {
 	})
 	public assigneeId: MiUser['id'] | null;
 
-	@ManyToOne(type => MiUser, {
+	@ManyToOne(() => MiUser, {
 		onDelete: 'SET NULL',
 	})
 	@JoinColumn()

packages/backend/src/models/AccessToken.ts

@@ -41,7 +41,7 @@ export class MiAccessToken {
 	@Column(id())
 	public userId: MiUser['id'];
 
-	@ManyToOne(type => MiUser, {
+	@ManyToOne(() => MiUser, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -53,7 +53,7 @@ export class MiAccessToken {
 	})
 	public appId: MiApp['id'] | null;
 
-	@ManyToOne(type => MiApp, {
+	@ManyToOne(() => MiApp, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/Announcement.ts

@@ -79,7 +79,7 @@ export class MiAnnouncement {
 	})
 	public userId: MiUser['id'] | null;
 
-	@ManyToOne(type => MiUser, {
+	@ManyToOne(() => MiUser, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/AnnouncementRead.ts

@@ -18,7 +18,7 @@ export class MiAnnouncementRead {
 	@Column(id())
 	public userId: MiUser['id'];
 
-	@ManyToOne(type => MiUser, {
+	@ManyToOne(() => MiUser, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -28,7 +28,7 @@ export class MiAnnouncementRead {
 	@Column(id())
 	public announcementId: MiAnnouncement['id'];
 
-	@ManyToOne(type => MiAnnouncement, {
+	@ManyToOne(() => MiAnnouncement, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/Antenna.ts

@@ -24,7 +24,7 @@ export class MiAntenna {
 	})
 	public userId: MiUser['id'];
 
-	@ManyToOne(type => MiUser, {
+	@ManyToOne(() => MiUser, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()
@@ -45,7 +45,7 @@ export class MiAntenna {
 	})
 	public userListId: MiUserList['id'] | null;
 
-	@ManyToOne(type => MiUserList, {
+	@ManyToOne(() => MiUserList, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()

packages/backend/src/models/App.ts

@@ -20,7 +20,7 @@ export class MiApp {
 	})
 	public userId: MiUser['id'] | null;
 
-	@ManyToOne(type => MiUser, {
+	@ManyToOne(() => MiUser, {
 		onDelete: 'SET NULL',
 		nullable: true,
 	})

packages/backend/src/models/AuthSession.ts

@@ -25,7 +25,7 @@ export class MiAuthSession {
 	})
 	public userId: MiUser['id'] | null;
 
-	@ManyToOne(type => MiUser, {
+	@ManyToOne(() => MiUser, {
 		onDelete: 'CASCADE',
 		nullable: true,
 	})
@@ -35,7 +35,7 @@ export class MiAuthSession {
 	@Column(id())
 	public appId: MiApp['id'];
 
-	@ManyToOne(type => MiApp, {
+	@ManyToOne(() => MiApp, {
 		onDelete: 'CASCADE',
 	})
 	@JoinColumn()