github action

Release: 2024.11.0

.config/docker_example.yml

@@ -114,27 +114,9 @@ redis:
 #  #prefix: example-prefix
 #  #db: 1
 
-#   ┌───────────────────────────────┐
-#───┘ Fulltext search configuration └─────────────────────────────
+#   ┌───────────────────────────┐
+#───┘ MeiliSearch configuration └─────────────────────────────
 
-# These are the setting items for the full-text search provider.
-fulltextSearch:
-  # You can select the ID generation method.
-  # - sqlLike (default)
-  #   Use SQL-like search.
-  #   This is a standard feature of PostgreSQL, so no special extensions are required.
-  # - sqlPgroonga
-  #   Use pgroonga.
-  #   You need to install pgroonga and configure it as a PostgreSQL extension.
-  #   In addition to the above, you need to create a pgroonga index on the text column of the note table.
-  #   see: https://pgroonga.github.io/tutorial/
-  # - meilisearch
-  #   Use Meilisearch.
-  #   You need to install Meilisearch and configure.
-  provider: sqlLike
-
-# For Meilisearch settings.
-# If you select "meilisearch" for "fulltextSearch.provider", it must be set.
 # You can set scope to local (default value) or global
 # (include notes from remote).
 
@@ -237,13 +219,3 @@ signToActivityPubGet: true
 
 # Upload or download file size limits (bytes)
 #maxFileSize: 262144000
-
-# Log settings
-# logging:
-#   sql:
-#     # Outputs query parameters during SQL execution to the log.
-#     # default: false
-#     enableQueryParamLogging: false
-#     # Disable query truncation. If set to true, the full text of the query will be output to the log.
-#     # default: false
-#     disableQueryTruncation: false

.config/example.yml

@@ -196,27 +196,9 @@ redis:
 #  # You can specify more ioredis options...
 #  #username: example-username
 
-#   ┌───────────────────────────────┐
-#───┘ Fulltext search configuration └─────────────────────────────
+#   ┌───────────────────────────┐
+#───┘ MeiliSearch configuration └─────────────────────────────
 
-# These are the setting items for the full-text search provider.
-fulltextSearch:
-  # You can select the ID generation method.
-  # - sqlLike (default)
-  #   Use SQL-like search.
-  #   This is a standard feature of PostgreSQL, so no special extensions are required.
-  # - sqlPgroonga
-  #   Use pgroonga.
-  #   You need to install pgroonga and configure it as a PostgreSQL extension.
-  #   In addition to the above, you need to create a pgroonga index on the text column of the note table.
-  #   see: https://pgroonga.github.io/tutorial/
-  # - meilisearch
-  #   Use Meilisearch.
-  #   You need to install Meilisearch and configure.
-  provider: sqlLike
-
-# For Meilisearch settings.
-# If you select "meilisearch" for "fulltextSearch.provider", it must be set.
 # You can set scope to local (default value) or global
 # (include notes from remote).
 
@@ -339,13 +321,3 @@ signToActivityPubGet: true
 
 # PID File of master process
 #pidFile: /tmp/misskey.pid
-
-# Log settings
-# logging:
-#   sql:
-#     # Outputs query parameters during SQL execution to the log.
-#     # default: false
-#     enableQueryParamLogging: false
-#     # Disable query truncation. If set to true, the full text of the query will be output to the log.
-#     # default: false
-#     disableQueryTruncation: false

.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: 2024.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: 2024.x.x
           * Node: 20.x.x
           * PostgreSQL: 15.x.x
           * Redis: 7.x.x

.github/workflows/api-misskey-js.yml

@@ -21,7 +21,7 @@ jobs:
       - run: corepack enable
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.0.4
         with:
           node-version-file: '.node-version'
           cache: 'pnpm'

.github/workflows/changelog-check.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Checkout head
         uses: actions/checkout@v4.1.1
       - name: Setup Node.js
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.0.4
         with:
           node-version-file: '.node-version'
 

.github/workflows/check-misskey-js-autogen.yml

@@ -29,7 +29,7 @@ jobs:
 
       - name: setup node
         id: setup-node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.0.4
         with:
           node-version-file: '.node-version'
           cache: pnpm

.github/workflows/docker-develop.yml

@@ -19,7 +19,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          - linux/arm64
+          #- linux/arm64
     if: github.repository == 'laoxong/misskey'
     steps:
       - name: Prepare
@@ -53,7 +53,7 @@ jobs:
           digest="${{ steps.build.outputs.digest }}"
           touch "/tmp/digests/${digest#sha256:}"
       - name: Upload digest
-        uses: actions/upload-artifact@v4
+        uses: christopherhx/gitea-upload-artifact@v4
         with:
           name: digests-${{ env.PLATFORM_PAIR }}
           path: /tmp/digests/*
@@ -66,7 +66,7 @@ jobs:
       - build
     steps:
       - name: Download digests
-        uses: actions/download-artifact@v4
+        uses: christopherhx/gitea-download-artifact@v4
         with:
           path: /tmp/digests
           pattern: digests-*

.github/workflows/docker.yml

@@ -64,7 +64,7 @@ jobs:
           digest="${{ steps.build.outputs.digest }}"
           touch "/tmp/digests/${digest#sha256:}"
       - name: Upload digest
-        uses: actions/upload-artifact@v4
+        uses: christopherhx/gitea-upload-artifact@v4
         with:
           name: digests-${{ env.PLATFORM_PAIR }}
           path: /tmp/digests/*
@@ -77,7 +77,7 @@ jobs:
       - build
     steps:
       - name: Download digests
-        uses: actions/download-artifact@v4
+        uses: christopherhx/gitea-download-artifact@v4
         with:
           path: /tmp/digests
           pattern: digests-*

.github/workflows/get-api-diff.yml

@@ -33,7 +33,7 @@ jobs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.1.0
+      uses: actions/setup-node@v4.0.4
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

.github/workflows/lint.yml

@@ -37,7 +37,7 @@ jobs:
         fetch-depth: 0
         submodules: true
     - uses: pnpm/action-setup@v4
-    - uses: actions/setup-node@v4.1.0
+    - uses: actions/setup-node@v4.0.4
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'
@@ -68,14 +68,14 @@ jobs:
         fetch-depth: 0
         submodules: true
     - uses: pnpm/action-setup@v4
-    - uses: actions/setup-node@v4.1.0
+    - uses: actions/setup-node@v4.0.4
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'
     - run: corepack enable
     - run: pnpm i --frozen-lockfile
     - name: Restore eslint cache
-      uses: actions/cache@v4.2.0
+      uses: actions/cache@v4.1.0
       with:
         path: ${{ env.eslint-cache-path }}
         key: eslint-${{ env.eslint-cache-version }}-${{ matrix.workspace }}-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ github.ref_name }}-${{ github.sha }}
@@ -98,7 +98,7 @@ jobs:
         fetch-depth: 0
         submodules: true
     - uses: pnpm/action-setup@v4
-    - uses: actions/setup-node@v4.1.0
+    - uses: actions/setup-node@v4.0.4
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'

.github/workflows/locale.yml

@@ -19,7 +19,7 @@ jobs:
         fetch-depth: 0
         submodules: true
     - uses: pnpm/action-setup@v4
-    - uses: actions/setup-node@v4.1.0
+    - uses: actions/setup-node@v4.0.4
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'

.github/workflows/on-release-created.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.0.4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'

.github/workflows/release-with-ready.yml

@@ -0,0 +1,47 @@
+name: "Release Manager: release RC when ready for review"
+
+on:
+  pull_request:
+    types: [ready_for_review]
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    outputs:
+      head: ${{ steps.get_pr.outputs.head }}
+      base: ${{ steps.get_pr.outputs.base }}
+    steps:
+      - uses: actions/checkout@v4
+      # PR情報を取得
+      - name: Get PR
+        run: |
+          pr_json=$(gh pr view "$PR_NUMBER" --json isDraft,headRefName,baseRefName)
+          echo "head=$(echo $pr_json | jq -r '.headRefName')" >> $GITHUB_OUTPUT
+          echo "base=$(echo $pr_json | jq -r '.baseRefName')" >> $GITHUB_OUTPUT
+        id: get_pr
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+  release:
+    uses: misskey-dev/release-manager-actions/.github/workflows/create-prerelease.yml@v2
+    needs: check
+    if: needs.check.outputs.head == github.event.repository.default_branch && needs.check.outputs.base == vars.STABLE_BRANCH
+    with:
+      pr_number: ${{ github.event.pull_request.number }}
+      user: 'github-actions[bot]'
+      package_jsons_to_rewrite: ${{ vars.PACKAGE_JSONS_TO_REWRITE }}
+      use_external_app_to_release: ${{ vars.USE_RELEASE_APP == 'true' }}
+      indent: ${{ vars.INDENT }}
+      draft_prerelease_channel: alpha
+      ready_start_prerelease_channel: beta
+      reset_number_on_channel_change: true
+    secrets:
+      RELEASE_APP_ID: ${{ secrets.RELEASE_APP_ID }}
+      RELEASE_APP_PRIVATE_KEY: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}

.github/workflows/storybook.yml

@@ -15,8 +15,6 @@ on:
 
 jobs:
   build:
-    # chromatic is not likely to be available for fork repositories, so we disable for fork repositories.
-    if: github.repository == 'misskey-dev/misskey'
     runs-on: ubuntu-latest
 
     env:
@@ -43,7 +41,7 @@ jobs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js 20.x
-      uses: actions/setup-node@v4.1.0
+      uses: actions/setup-node@v4.0.4
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'

.github/workflows/test-backend.yml

@@ -10,17 +10,14 @@ on:
       # for permissions
       - packages/misskey-js/**
       - .github/workflows/test-backend.yml
-      - .github/misskey/test.yml
   pull_request:
     paths:
       - packages/backend/**
       # for permissions
       - packages/misskey-js/**
       - .github/workflows/test-backend.yml
-      - .github/misskey/test.yml
 jobs:
   unit:
-    name: Unit tests (backend)
     runs-on: ubuntu-latest
 
     strategy:
@@ -47,22 +44,9 @@ jobs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
     - name: Install FFmpeg
-      run: |
-        for i in {1..3}; do
-          echo "Attempt $i: Installing FFmpeg..."
-          curl -s -L https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz -o ffmpeg.tar.xz && \
-          tar -xf ffmpeg.tar.xz && \
-          mv ffmpeg-*-static/ffmpeg /usr/local/bin/ && \
-          mv ffmpeg-*-static/ffprobe /usr/local/bin/ && \
-          rm -rf ffmpeg.tar.xz ffmpeg-*-static/ && \
-          break || sleep 10
-          if [ $i -eq 3 ]; then
-            echo "Failed to install FFmpeg after 3 attempts"
-            exit 1
-          fi
-        done
+      uses: FedericoCarboni/setup-ffmpeg@v3
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.1.0
+      uses: actions/setup-node@v4.0.4
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'
@@ -83,7 +67,6 @@ jobs:
         files: ./packages/backend/coverage/coverage-final.json
 
   e2e:
-    name: E2E tests (backend)
     runs-on: ubuntu-latest
 
     strategy:
@@ -110,7 +93,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.0.4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'

.github/workflows/test-federation.yml

@@ -17,7 +17,6 @@ on:
 
 jobs:
   test:
-    name: Federation test
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -29,22 +28,9 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
       - name: Install FFmpeg
-        run: |
-          for i in {1..3}; do
-            echo "Attempt $i: Installing FFmpeg..."
-            curl -s -L https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz -o ffmpeg.tar.xz && \
-            tar -xf ffmpeg.tar.xz && \
-            mv ffmpeg-*-static/ffmpeg /usr/local/bin/ && \
-            mv ffmpeg-*-static/ffprobe /usr/local/bin/ && \
-            rm -rf ffmpeg.tar.xz ffmpeg-*-static/ && \
-            break || sleep 10
-            if [ $i -eq 3 ]; then
-              echo "Failed to install FFmpeg after 3 attempts"
-              exit 1
-            fi
-          done
+        uses: FedericoCarboni/setup-ffmpeg@v3
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'

.github/workflows/test-frontend.yml

@@ -12,7 +12,6 @@ on:
       # for e2e
       - packages/backend/**
       - .github/workflows/test-frontend.yml
-      - .github/misskey/test.yml
   pull_request:
     paths:
       - packages/frontend/**
@@ -21,10 +20,8 @@ on:
       # for e2e
       - packages/backend/**
       - .github/workflows/test-frontend.yml
-      - .github/misskey/test.yml
 jobs:
   vitest:
-    name: Unit tests (frontend)
     runs-on: ubuntu-latest
 
     strategy:
@@ -38,7 +35,7 @@ jobs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.1.0
+      uses: actions/setup-node@v4.0.4
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'
@@ -59,7 +56,6 @@ jobs:
         files: ./packages/frontend/coverage/coverage-final.json
 
   e2e:
-    name: E2E tests (frontend)
     runs-on: ubuntu-latest
 
     strategy:
@@ -94,7 +90,7 @@ jobs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.1.0
+      uses: actions/setup-node@v4.0.4
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

.github/workflows/test-misskey-js.yml

@@ -16,7 +16,6 @@ on:
       - .github/workflows/test-misskey-js.yml
 jobs:
   test:
-    name: Unit tests (misskey.js)
 
     runs-on: ubuntu-latest
 
@@ -32,7 +31,7 @@ jobs:
       - run: corepack enable
 
       - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.0.4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'

.github/workflows/test-production.yml

@@ -12,7 +12,6 @@ env:
 
 jobs:
   production:
-    name: Production build
     runs-on: ubuntu-latest
 
     strategy:
@@ -26,7 +25,7 @@ jobs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.1.0
+      uses: actions/setup-node@v4.0.4
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

.github/workflows/validate-api-json.yml

@@ -1,4 +1,4 @@
-name: api.json validation
+name: Test (backend)
 
 on:
   push:
@@ -27,7 +27,7 @@ jobs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.1.0
+      uses: actions/setup-node@v4.0.4
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

CHANGELOG.md

@@ -1,82 +1,3 @@
-## 2025.1.0
-
-### Note
-- [重要] ノート検索プロバイダの追加に伴い、configファイル（default.ymlなど）の構成が少し変わります.
-  - 新しい設定項目"fulltextSearch.provider"が追加されました. sqlLike, sqlPgroonga, meilisearchのいずれかを設定出来ます.
-  - すでにMeilisearchをお使いの場合、 **"fulltextSearch.provider"を"meilisearch"に設定する必要** があります.
-  - 詳細は #14730 および `.config/example.yml` または `.config/docker_example.yml`の'Fulltext search configuration'をご参照願います.
-- 【開発者向け】従来の開発モードでHMRが機能しない問題が修正されたため、バックエンド・フロントエンド分離型の開発モードが削除されました。開発環境においてconfigの変更が必要となる可能性があります。
-
-### General
-- Feat: カスタム絵文字管理画面をリニューアル #10996
-	* β版として公開のため、旧画面も引き続き利用可能です
-
-### Client
-- Enhance: PC画面でチャンネルが複数列で表示されるように  
-  (Cherry-picked from https://github.com/Otaku-Social/maniakey/pull/13)
-- Enhance: 照会に失敗した場合、その理由を表示するように
-- Enhance: ワードミュートで検知されたワードを表示できるように
-- Enhance: リモートのノートのリンクをコピーできるように
-- Enhance: 連合がホワイトリスト化・無効化されているサーバー向けのデザイン修正
-- Enhance: AiScriptのセーブデータを明示的に削除する関数`Mk:remove`を追加
-- Enhance: ノートの添付ファイルを一覧で遡れる「ファイル」タブを追加  
-  (Based on https://github.com/Otaku-Social/maniakey/pull/14)
-- Enhance: AiScriptの拡張API関数において引数の型チェックをより厳格に
-- Enhance: クエリパラメータでuiを一時的に変更できるように #15240
-- Enhance: リモート絵文字のインポート時に詳細を確認できるように #15336
-- Fix: 画面サイズが変わった際にナビゲーションバーが自動で折りたたまれない問題を修正
-- Fix: サーバー情報メニューに区切り線が不足していたのを修正
-- Fix: ノートがログインしているユーザーしか見れない場合にログインダイアログを閉じるとその後の動線がなくなる問題を修正
-- Fix: 公開範囲がホームのノートの埋め込みウィジェットが読み込まれない問題を修正  
-  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/803)
-- Fix: 絵文字管理画面で一部の絵文字が表示されない問題を修正
-- Fix: プラグイン `register_note_view_interruptor` でノートのサーバー情報の書き換えができない問題を修正
-- Fix: Botプロテクションの設定変更時は実際に検証を通過しないと保存できないように( #15137 )
-- Fix: ノート検索が使用できない場合でもチャンネルのノート検索欄がでていた問題を修正
-- Fix: `Ui:C:select`で値の変更が画面に反映されない問題を修正
-- Fix: MiAuth認可画面で、認可処理に失敗した場合でもコールバックURLに遷移してしまう問題を修正  
-  (Cherry-picked from https://github.com/TeamNijimiss/misskey/commit/800359623e41a662551d774de15b0437b6849bb4)
-- Fix: ノート作成画面でファイルの添付可能個数を超えてもノートボタンが押せていた問題を修正
-- Fix: 「アカウントを管理」画面で、ユーザー情報の取得に失敗したアカウント（削除されたアカウントなど）が表示されない問題を修正
-- Fix: MacOSでChrome系ブラウザを使用している場合に、Misskeyを閉じた際に他のタブのオーディオ機能と干渉する問題を修正
-- Fix: 言語データのキャッシュ状況によっては、埋め込みウィジェットが正しく起動しない問題を修正
-- Fix: 「削除して編集」でノートの引用を解除出来なかった問題を修正( #14476 )
-- Fix: RSSウィジェットが正しく表示されない問題を修正  
-  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/857)
-- Fix: ワードミュートの保存失敗時にAPIエラーが握りつぶされる事があるのを修正
-- Fix: アンケートでリモートの絵文字が正しく描画できない問題の修正
-  (Cherry-picked from https://github.com/yojo-art/cherrypick/pull/153)
-- Fix: 非ログイン時のサーバー概要画面のメニューボタンが押せないことがあるのを修正  
-  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/656)
-- Fix: URLにはじめから`#pswp`が含まれている場合に画像ビューワーがブラウザの戻るボタンで閉じられない問題を修正
-- Fix: ロール作成画面で設定できるアイコンデコレーションの最大取付個数を16に制限
-- Fix: Firefox Nightlyなどでアイコンが読み込めない問題を修正
-
-### Server
-- Enhance: pg_bigmが利用できるよう、ノートの検索をILIKE演算子でなくLIKE演算子でLOWER()をかけたテキストに対して行うように
-- Enhance: ノート検索の選択肢としてpgroongaに対応 ( #14730 )
-- Enhance: チャート更新時にDBに同時接続しないように  
-  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/830)
-- Enhance: config(default.yml)からSQLログ全文を出力するか否かを設定可能に ( #15266 )
-- Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )
-- Fix: 起動前の疎通チェックが機能しなくなっていた問題を修正  
-  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/737)
-- Fix: ノートの閲覧にログイン必須にしてもFeedでノートが表示されてしまう問題を修正
-- Fix: 絵文字の連合でライセンス欄を相互にやり取りするように ( #10859, #14109 )
-- Fix: ロックダウンされた期間指定のノートがStreaming経由でLTLに出現するのを修正 ( #15200 )
-- Fix: disableClustering設定時の初期化ロジックを調整( #15223 )
-- Fix: URLとURIが異なるエンティティの照会に失敗する問題を修正( #15039 )
-- Fix: ActivityPubリクエストかどうかの判定が正しくない問題を修正  
-  (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/869)
-- Fix: `/api/pages/update`にて`name`を指定せずにリクエストするとエラーが発生する問題を修正
-- Fix: AIセンシティブ判定が arm64 環境で動作しない問題を修正
-- Fix: 非Misskey系のソフトウェアからHTML`<ruby>`タグを含むノートを受信した場合、MFMの読み仮名（ルビ）文法に変換して表示
-- Fix: 連合OFFで投稿されたノートに対する冗長な処理を抑止 ( #15018 )
-- Fix: `/api.json`のレスポンスが2回目のリクエスト以降おかしくなる問題を修正
-
-### Misskey.js
-- Feat: allow setting `binaryType` of WebSocket connection
-
 ## 2024.11.0
 
 ### Note
@@ -116,7 +37,7 @@
 - Fix: デッキのタイムラインカラムで「センシティブなファイルを含むノートを表示」設定が使用できなかった問題を修正
 - Fix: Encode RSS urls with escape sequences before fetching allowing query parameters to be used
 - Fix: リンク切れを修正
-- Fix: ノート投稿ボタンにホバー時のスタイルが適用されていないのを修正  
+= Fix: ノート投稿ボタンにホバー時のスタイルが適用されていないのを修正  
   (Cherry-picked from https://github.com/taiyme/misskey/pull/305)
 - Fix: メールアドレス登録有効化時の「完了」ダイアログボックスの表示条件を修正
 - Fix: 画面幅が狭い環境でデザインが崩れる問題を修正  

CONTRIBUTING.md

@@ -197,10 +197,25 @@ pnpm dev
 command.
 
 - Server-side source files and automatically builds them if they are modified. Automatically start the server process(es).
-- Service Worker is watched by esbuild.
 - Vite HMR (just the `vite` command) is available. The behavior may be different from production.
-- Vite runs behind the backend (the backend will proxy Vite at /vite and /embed_vite except for websocket used for HMR).
+- Service Worker is watched by esbuild.
+- The front end can be viewed by accessing `http://localhost:5173`.
+- The backend listens on the port configured with `port` in .config/default.yml.
+If you have not changed it from the default, it will be "http://localhost:3000".
+If "port" in .config/default.yml is set to something other than 3000, you need to change the proxy settings in packages/frontend/vite.config.local-dev.ts.
+
+### `MK_DEV_PREFER=backend pnpm dev`
+pnpm dev has another mode with `MK_DEV_PREFER=backend`.
+
+```
+MK_DEV_PREFER=backend pnpm dev
+```
+
+- This mode is closer to the production environment than the default mode.
+- Vite runs behind the backend (the backend will proxy Vite at /vite).
 - You can see Misskey by accessing `http://localhost:3000` (Replace `3000` with the port configured with `port` in .config/default.yml).
+- To change the port of Vite, specify with `VITE_PORT` environment variable.
+- HMR may not work in some environments such as Windows.
 
 ## Testing
 You can run non-backend tests by executing following commands:
@@ -476,11 +491,6 @@ describe('test', () => {
 コード上でMisskeyのドメイン固有の概念には`Mi`をprefixすることで、他のドメインの同様の概念と区別できるほか、名前の衝突を防ぐ。
 ただし、文脈上Misskeyのものを指すことが明らかであり、名前の衝突の恐れがない場合は、一時的なローカル変数に限って`Mi`を省略してもよい。
 
-### Misskey.jsの型生成
-```bash
-pnpm build-misskey-js-with-types
-```
-
 ### How to resolve conflictions occurred at pnpm-lock.yaml?
 
 Just execute `pnpm` to fix it.

COPYING

@@ -1,5 +1,5 @@
 Unless otherwise stated this repository is
-Copyright © 2014-2025 syuilo and contributors
+Copyright © 2014-2024 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
 
-ARG NODE_VERSION=22.11.0-bookworm
+ARG NODE_VERSION=22.11.0-bullseye
 
 # build assets & compile TypeScript
 

locales/ar-SA.yml

@@ -1584,6 +1584,3 @@ _reversi:
 _offlineScreen:
   title: "غير متصل - يتعذر الاتصال بالخادم"
   header: "يتعذر الاتصال بالخادم"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "غير موجود"

locales/bn-BD.yml

@@ -1348,6 +1348,3 @@ _moderationLogTypes:
   resetPassword: "পাসওয়ার্ড রিসেট করুন"
 _reversi:
   total: "মোট"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "পাওয়া যায়নি"

locales/ca-ES.yml

@@ -5,7 +5,6 @@ introMisskey: "Benvingut! Misskey és un servei de microblogging descentralitzat
 poweredByMisskeyDescription: "{name} És un dels serveis (anomenats instàncies de Misskey) que utilitzen la plataforma de codi obert <b>Misskey</b>."
 monthAndDay: "{day}/{month}"
 search: "Cercar"
-reset: "Reiniciar"
 notifications: "Notificacions"
 username: "Nom d'usuari"
 password: "Contrasenya"
@@ -44,12 +43,11 @@ favorites: "Favorits"
 unfavorite: "Eliminar dels preferits"
 favorited: "Afegit als preferits."
 alreadyFavorited: "Ja s'ha afegit als preferits."
-cantFavorite: "No es pot afegir als preferits."
-pin: "Fixa al perfil"
+cantFavorite: "No s'ha pogut afegir als preferits."
+pin: "Fixar al perfil"
 unpin: "Para de fixar del perfil"
-copyContent: "Copia el contingut"
-copyLink: "Copia l'enllaç"
-copyRemoteLink: "Copiar l'enllaç remot"
+copyContent: "Copiar el contingut"
+copyLink: "Copiar l'enllaç"
 copyLinkRenote: "Copiar l'enllaç de la renota"
 delete: "Elimina"
 deleteAndEdit: "Eliminar i editar"
@@ -105,9 +103,9 @@ enterListName: "Introdueix un nom per a la llista"
 privacy: "Privadesa"
 makeFollowManuallyApprove: "Les sol·licituds de seguiment requereixen aprovació"
 defaultNoteVisibility: "Visibilitat per defecte"
-follow: "Segueix"
+follow: "Seguint"
 followRequest: "Enviar sol·licitud de seguiment"
-followRequests: "Peticions de seguiment"
+followRequests: "Sol·licituds de seguiment"
 unfollow: "Deixar de seguir"
 followRequestPending: "Sol·licituds de seguiment pendents"
 enterEmoji: "Introduir un emoji"
@@ -197,7 +195,7 @@ setWallpaper: "Defineix el fons de pantalla"
 removeWallpaper: "Elimina el fons de pantalla"
 searchWith: "Cerca: {q}"
 youHaveNoLists: "No tens cap llista"
-followConfirm: "Segur que vols seguir a {name}?"
+followConfirm: "Estàs segur que vols deixar de seguir {name}?"
 proxyAccount: "Compte de proxy"
 proxyAccountDescription: "Un compte proxy és un compte que actua com a seguidor remot per als usuaris en determinades condicions. Per exemple, quan un usuari afegeix un usuari remot a la llista, l'activitat de l'usuari remot no es lliurarà al servidor si cap usuari local segueix aquest usuari, de manera que el compte proxy el seguirà."
 host: "Amfitrió"
@@ -224,7 +222,7 @@ version: "Versió"
 metadata: "Metadades"
 withNFiles: "{n} fitxer(s)"
 monitor: "Monitor"
-jobQueue: "Cua de feines"
+jobQueue: "Cua de tasques"
 cpuAndMemory: "CPU i memòria"
 network: "Xarxa"
 disk: "Disc"
@@ -327,7 +325,7 @@ dark: "Fosc"
 lightThemes: "Temes clars"
 darkThemes: "Temes foscos"
 syncDeviceDarkMode: "Sincronitza el mode fosc amb la configuració del dispositiu"
-drive: "Disc"
+drive: "Unitat"
 fileName: "Nom del Fitxer"
 selectFile: "Selecciona un fitxer"
 selectFiles: "Selecciona fitxers"
@@ -342,11 +340,11 @@ deleteFolder: "Elimina la carpeta"
 folder: "Carpeta "
 addFile: "Afegeix un fitxer"
 showFile: "Mostrar fitxer"
-emptyDrive: "El teu Disc és buit"
+emptyDrive: "La teva unitat és buida"
 emptyFolder: "La carpeta està buida"
 unableToDelete: "No es pot eliminar"
 inputNewFileName: "Introduïu el nom de fitxer nou"
-inputNewDescription: "Escriu el peu de foto."
+inputNewDescription: "Inserta una nova llegenda"
 inputNewFolderName: "Introduïu el nom de la carpeta nova"
 circularReferenceFolder: "La carpeta destinatària és una subcarpeta de la carpeta a la qual la desitges moure"
 hasChildFilesOrFolders: "No és possible esborrar aquesta carpeta ja que no és buida"
@@ -539,7 +537,7 @@ mediaListWithOneImageAppearance: "Altura de la llista de fitxers amb una única
 limitTo: "Limita a {x}"
 noFollowRequests: "No tens sol·licituds de seguiment"
 openImageInNewTab: "Obre imatges a una nova pestanya"
-dashboard: "Taulell de control"
+dashboard: "Panell de control"
 local: "Local"
 remote: "Remot"
 total: "Total"
@@ -575,7 +573,7 @@ serverLogs: "Registres del servidor"
 deleteAll: "Elimina-ho tot"
 showFixedPostForm: "Mostrar el formulari per escriure a l'inici de la línia de temps"
 showFixedPostFormInChannel: "Mostrar el formulari d'escriptura al principi de la línia de temps (Canals)"
-withRepliesByDefaultForNewlyFollowed: "Inclou les respostes d'usuaris nous que segueixes a la línia de temps per defecte."
+withRepliesByDefaultForNewlyFollowed: "Inclou les respostes d'usuaris nous seguits a la línia de temps per defecte."
 newNoteRecived: "Hi ha publicacions noves"
 sounds: "Sons"
 sound: "So"
@@ -616,7 +614,7 @@ unsetUserBanner: "Desactiva el bàner "
 unsetUserBannerConfirm: "Segur que vols desactivar el bàner?"
 deleteAllFiles: "Esborra tots els arxius"
 deleteAllFilesConfirm: "Segur que vols esborrar tots els arxius?"
-removeAllFollowing: "Deixa de seguir tots els usuaris que segueixes"
+removeAllFollowing: "Deixa de seguir tots els usuaris seguits"
 removeAllFollowingDescription: "El fet d'executar això, et farà deixar de seguir a tots els usuaris de {host}. Si us plau, executa això si l'amfitrió, per exemple, ja no existeix."
 userSuspended: "Aquest usuari ha sigut suspès"
 userSilenced: "Aquest usuari està sent silenciat"
@@ -647,7 +645,7 @@ expandTweet: "Expandir post"
 themeEditor: "Editor de temes"
 description: "Descripció"
 describeFile: "Afegir subtitulació"
-enterFileDescription: "Escriu un peu de foto"
+enterFileDescription: "Afegeix un títol"
 author: "Autor"
 leaveConfirm: "Hi ha canvis sense guardar. Els vols descartar?"
 manage: "Administració"
@@ -686,15 +684,11 @@ smtpSecure: "Fes servir SSL/TLS per connexions SMTP"
 smtpSecureInfo: "Desactiva això quan facis servir connexions STARTTLS"
 testEmail: "Prova l'enviament de correu "
 wordMute: "Silenciar paraules "
-wordMuteDescription: "Minimitza les notes que contenen la paraula o frase especificada. Les notes minimitzades poden visualitzar-se fent clic sobre elles."
 hardWordMute: "Silenciar paraules fortes"
-showMutedWord: "Mostrar paraules silenciades"
-hardWordMuteDescription: "Oculta les notes que contenen la paraula o frase especificada. A diferència de Silenciar paraula, la nota quedarà completament oculta a la vista."
 regexpError: "Error de l'expressió regular "
 regexpErrorDescription: "S'ha produït un error a l'expressió regular a la línia {line} de les paraules silenciades {tab}:"
 instanceMute: "Silenciar servidor"
 userSaysSomething: "{name} n'ha dit alguna cosa"
-userSaysSomethingAbout: "{name} està parlant sobre \"{word}\""
 makeActive: "Activar"
 display: "Veure"
 copy: "Copiar"
@@ -735,7 +729,7 @@ instanceTicker: "Informació de notes de la instància "
 waitingFor: "Esperant {x}"
 random: "Aleatori "
 system: "Sistema"
-switchUi: "Canviar la interfície"
+switchUi: "Canviar interfície d'usuari "
 desktop: "Escriptori"
 clip: "Retalls"
 createNew: "Crear"
@@ -753,7 +747,7 @@ repliesCount: "Nombre de respostes"
 renotesCount: "Impulsos fets"
 repliedCount: "Nombre de respostes rebudes"
 renotedCount: "Impulsos rebuts"
-followingCount: "Nombre de comptes que segueixes"
+followingCount: "Nombre de comptes seguits"
 followersCount: "Nombre de seguidors"
 sentReactionsCount: "Nombre de reaccions enviades"
 receivedReactionsCount: "Nombre de reaccions rebudes"
@@ -785,7 +779,7 @@ thisIsExperimentalFeature: "Aquesta és una característica experimental. La sev
 developer: "Programador"
 makeExplorable: "Fes que el compte sigui visible a la secció \"Explorar\""
 makeExplorableDescription: "Si desactives aquesta opció, el teu compte no sortirà a la secció \"Explorar\""
-showGapBetweenNotesInTimeline: "Notes separades a la línia de temps"
+showGapBetweenNotesInTimeline: "Mostra una separació entre els articles a la línia de temps"
 duplicate: "Duplicat"
 left: "Esquerra"
 center: "Centre"
@@ -916,7 +910,7 @@ off: "Desactivar"
 emailRequiredForSignup: "Demanar correu electrònic per registrar-se "
 unread: "Sense llegir"
 filter: "Filtrar"
-controlPanel: "Taulell de control"
+controlPanel: "Panel de control"
 manageAccounts: "Gestionar comptes"
 makeReactionsPublic: "Reaccions públiques "
 makeReactionsPublicDescription: "Això fa que totes les teves reaccions siguin visibles públicament "
@@ -935,7 +929,7 @@ useDrawerReactionPickerForMobile: "Mostrar el selector de reaccions com un calai
 welcomeBackWithName: "Benvingut de nou, {name}"
 clickToFinishEmailVerification: "Si us plau, fes clic a [{ok}] per completar la verificació per correu electrònic "
 overridedDeviceKind: "Tipus de dispositiu"
-smartphone: "Mòbil "
+smartphone: "Telèfon intel·ligent"
 tablet: "Tauleta"
 auto: "Automàtic "
 themeColor: "Color del tema"
@@ -1016,7 +1010,7 @@ sendPushNotificationReadMessageCaption: "Això pot fer que el teu dispositiu con
 windowMaximize: "Maximitzar "
 windowMinimize: "Minimitzar"
 windowRestore: "Restaurar"
-caption: "Peu de foto"
+caption: "Llegenda"
 loggedInAsBot: "Identificat com a bot"
 tools: "Eines"
 cannotLoad: "No es pot carregar"
@@ -1139,7 +1133,7 @@ channelArchiveConfirmDescription: "Un Canal arxivat no apareixerà a la llista d
 thisChannelArchived: "Aquest Canal ha sigut arxivat."
 displayOfNote: "Mostrar notes"
 initialAccountSetting: "Configuració del perfil"
-youFollowing: "Seguint"
+youFollowing: "Seguit"
 preventAiLearning: "Descartar l'ús d'aprenentatge automàtic (IA Generativa)"
 preventAiLearningDescription: "Demanar els indexadors no fer servir els texts, imatges, etc. en cap conjunt de dades per alimentar l'aprenentatge automàtic (IA Predictiva/ Generativa). Això s'aconsegueix afegint la etiqueta \"noai\" com a resposta HTML al contingut corresponent. Prevenir aquest ús totalment pot ser que no sigui aconseguit, ja que molts indexadors poden obviar aquesta etiqueta."
 options: "Opcions"
@@ -1205,7 +1199,7 @@ showRenotes: "Mostrar impulsos"
 edited: "Editat"
 notificationRecieveConfig: "Paràmetres de notificacions"
 mutualFollow: "Seguidor mutu"
-followingOrFollower: "Seguint o seguidor"
+followingOrFollower: "Seguit o seguidor"
 fileAttachedOnly: "Només notes amb adjunts"
 showRepliesToOthersInTimeline: "Mostrar les respostes a altres a la línia de temps"
 hideRepliesToOthersInTimeline: "Amagar les respostes a altres a la línia de temps"
@@ -1307,8 +1301,6 @@ lockdown: "Bloquejat"
 pleaseSelectAccount: "Seleccionar un compte"
 availableRoles: "Roles disponibles "
 acknowledgeNotesAndEnable: "Activa'l després de comprendre els possibles perills."
-federationSpecified: "Aquest servidor treballa amb una federació de llistes blanques. No pot interactuar amb altres servidors que no siguin els especificats per l'administrador."
-federationDisabled: "La unió es troba deshabilitada en aquest servidor. No es pot interactuar amb usuaris d'altres servidors."
 _accountSettings:
   requireSigninToViewContents: "És obligatori l'inici de sessió per poder veure el contingut"
   requireSigninToViewContentsDescription1: "Es requereix l'inici de sessió per poder veure totes les notes i el contingut que has creat. Amb això esperem evitar que els rastrejadors recopilin informació."
@@ -1481,7 +1473,7 @@ _accountMigration:
   startMigration: "Migrar"
   migrationConfirm: "Vols migrar aquest compte a {account}? Una vegada comenci la migració no es podrà parar O fer marxa enrere i no podràs tornar a fer servir aquest compte mai més."
   movedAndCannotBeUndone: "Aquest compte ha migrat.\nLes migracions no es poden desfer."
-  postMigrationNote: "Aquest compte deixarà de seguir tots els comptes que segueix 24 hores després de terminar la migració.\nEl nombre de seguidors i seguits passarà a ser de zero. Per evitar que els teus seguidors no puguin veure les publicacions marcades com a només seguidors continuaren seguint aquest compte."
+  postMigrationNote: "Aquest compte deixarà de seguir tots els comptes que segueix 24 hores després de germinar la migració.\nEl nombre de seguidors i seguits passarà a ser de zero. Per evitar que els teus seguidors no puguin veure les publicacions marcades com a només seguidors continuaren seguint aquest compte."
   movedTo: "Nou compte:"
 _achievements:
   earnedAt: "Desbloquejat el"
@@ -1840,7 +1832,7 @@ _emailUnavailable:
   smtp: "Aquest servidor de correu electrònic no respon"
   banned: "No pots registrar-te amb aquesta adreça de correu electrònic "
 _ffVisibility:
-  public: "Públic "
+  public: "Publicar"
   followers: "Visible només per a seguidors "
   private: "Privat"
 _signup:
@@ -1874,7 +1866,7 @@ _gallery:
   unlike: "Ja no m'agrada"
 _email:
   _follow:
-    title: "Tens un nou seguidor"
+    title: "t'ha seguit"
   _receiveFollowRequest:
     title: "Has rebut una sol·licitud  de seguiment"
 _plugin:
@@ -1908,7 +1900,7 @@ _registry:
   domain: "Domini"
   createKey: "Crear una clau"
 _aboutMisskey:
-  about: "Misskey és un programa de codi obert desenvolupat des del 2014 per syuilo"
+  about: "Misskey és un programa de codi obert desenvolupar per syuilo des de 2014"
   contributors: "Col·laboradors principals"
   allContributors: "Tots els col·laboradors "
   source: "Codi font"
@@ -2227,7 +2219,7 @@ _widgets:
   slideshow: "Presentació"
   button: "Botó "
   onlineUsers: "Usuaris actius"
-  jobQueue: "Cua de feines"
+  jobQueue: "Cua de tasques"
   serverMetric: "Mètriques del servidor"
   aiscript: "Consola AiScript"
   aiscriptApp: "Aplicació AiScript"
@@ -2307,7 +2299,7 @@ _exportOrImport:
   allNotes: "Totes les publicacions"
   favoritedNotes: "Notes preferides"
   clips: "Retalls"
-  followingList: "Seguint "
+  followingList: "Seguint"
   muteList: "Silencia"
   blockingList: "Bloqueja"
   userLists: "Llistes"
@@ -2446,7 +2438,7 @@ _notification:
   _types:
     all: "Tots"
     note: "Notes noves"
-    follow: "Segueix-me"
+    follow: "Seguint"
     mention: "Menció"
     reply: "Respostes"
     renote: "Renotar"
@@ -2462,7 +2454,7 @@ _notification:
     test: "Prova la notificació"
     app: "Notificacions d'aplicacions"
   _actions:
-    followBack: "També et segueix"
+    followBack: "t'ha seguit també"
     reply: "Respondre"
     renote: "Renotar"
 _deck:
@@ -2729,66 +2721,6 @@ _contextMenu:
   app: "Aplicació "
   appWithShift: "Aplicació amb la tecla shift"
   native: "Interfície del navegador"
-_gridComponent:
-  _error:
-    requiredValue: "Aquest camp és obligatori"
-    columnTypeNotSupport: "La validació d'expressions regulars només s'admet per columnes de tipus text."
-    patternNotMatch: "Aquest valor no coincideix amb {pattern}"
-    notUnique: "Aquest valor ha de ser únic "
-_roleSelectDialog:
-  notSelected: "No seleccionat"
-_customEmojisManager:
-  _gridCommon:
-    copySelectionRows: "Copiar línies seleccionades "
-    copySelectionRanges: "Copiar selecció "
-    deleteSelectionRows: "Esborrar línies seleccionades"
-    deleteSelectionRanges: "Esborrar files de la selecció "
-    searchSettings: "Configuració del cercador"
-    searchSettingCaption: "Defineix criteris de cerca detallats."
-    searchLimit: "Nombre de pantalles"
-    sortOrder: "Ordenar"
-    registrationLogs: "Registres d'inscripcions "
-    registrationLogsCaption: "Quan s'actualitzin o s'esborrin emojis es mostrarà un registre. Desapareixeran quan s'actualitzin, s'esborrin, visitis una nova pàgina o la recarreguis."
-    alertEmojisRegisterFailedDescription: "No s'ha pogut actualitzar o esborrar l'emoji. Si us plau, dona una ullada al registre per més detalls."
-  _logs:
-    showSuccessLogSwitch: "Mostrar el registre d'èxit "
-    failureLogNothing: "No hi ha registres de fallades."
-    logNothing: "No hi ha registres."
-  _remote:
-    selectionRowDetail: "Detall de la línia seleccionada"
-    importSelectionRows: "Importar les files seleccionades"
-    importSelectionRangesRows: "Importar les files de la selecció "
-    importEmojisButton: "Importar els Emojis marcats"
-    confirmImportEmojisTitle: "Importar Emojis"
-    confirmImportEmojisDescription: "Importar {count} Emojis d'una adreça remota. Tingues cura de les llicències dels Emojis. Vols importar-los?"
-  _local:
-    tabTitleList: "Llistar els Emojis registrats"
-    tabTitleRegister: "Registre d'Emojis"
-    _list:
-      emojisNothing: "No hi ha Emojis registrats"
-      markAsDeleteTargetRows: "Files seleccionades que s'han d'esborrar "
-      markAsDeleteTargetRanges: "Selecció de files per la seva eliminació "
-      alertUpdateEmojisNothingDescription: "No hi ha Emojis actualitzats."
-      alertDeleteEmojisNothingDescription: "No hi ha Emoji per esborrar."
-      confirmMovePage: "Vols canviar de pàgina?"
-      confirmChangeView: "Vols canviar la pantalla?"
-      confirmUpdateEmojisDescription: "Actualitzar {count} Emojis. Vols executar-ho?"
-      confirmDeleteEmojisDescription: "Esborrar {count} Emojis marcats. Vols continuar?"
-      confirmResetDescription: "Es restabliran tots els canvis fets fins ara."
-      confirmMovePageDesciption: "S'han fet canvis als Emojis d'aquesta pàgina. Si continues navegant sense guardar els canvis, es perdran tots els canvis fets en aquesta pàgina."
-      dialogSelectRoleTitle: "Buscar Emojis per rol"
-    _register:
-      uploadSettingTitle: "Actualitza la configuració "
-      uploadSettingDescription: "En aquesta pantalla pots configurar el que s'ha de fer quan es puja un Emoji."
-      directoryToCategoryLabel: "Escriu el nom del directori al camp de \"categoria\""
-      directoryToCategoryCaption: "Quan arrossegues un directori, escriu el nom del directori al camp categoria."
-      emojiInputAreaCaption: "Selecciona els Emojis que vols registrar gent servir un dels mètodes."
-      emojiInputAreaList1: "Arrossega i deixar anar fitxers o directoris dintre del quadrat."
-      emojiInputAreaList2: "Clica l'enllaç per seleccionar un fitxer des del teu ordinador."
-      emojiInputAreaList3: "Clica aquest enllaç per seleccionar del Disc"
-      confirmRegisterEmojisDescription: "Registrar els Emojis de la llista com a nous Emojis personalitzats. Vols continuar? (Per evitar una sobrecàrrega només {count} Emojis es poden registrar d'una sola vegada)"
-      confirmClearEmojisDescription: "Descartar els canvis i esborrar els Emojis de la llista. Vols continuar?"
-      confirmUploadEmojisDescription: "Pujar els {count} fitxers que has arrossegat al disc. Vols continuar?"
 _embedCodeGen:
   title: "Personalitza el codi per incrustar"
   header: "Mostrar la capçalera"
@@ -2812,34 +2744,3 @@ _selfXssPrevention:
 _followRequest:
   recieved: "Sol·licituds rebudes"
   sent: "Sol·licituds enviades"
-_remoteLookupErrors:
-  _federationNotAllowed:
-    title: "No es pot establir connexió amb aquest servidor"
-    description: "És possible que s'hagi desactivat la comunicació amb aquest servidor o que hagi estat bloquejat.\nPosa't en contacte amb l'administrador del servidor."
-  _uriInvalid:
-    title: "L'adreça és incorrecte"
-    description: "Hi ha un problema amb l'adreça introduïda; comprova que no hagis escrit caràcters que no es puguin fer servir."
-  _requestFailed:
-    title: "La sol·licitud a fallat"
-    description: "La comunicació amb aquest servidor a fallat. És possible que l'altre servidor no funcioni. Comprova també que no has posat una adreça no vàlida o inexistent."
-  _responseInvalid:
-    title: "La resposta no és correcta "
-    description: "Hem pogut comunicar-nos amb aquest servidor, però les dades rebudes no són correctes."
-  _responseInvalidIdHostNotMatch:
-    description: "El domini de l'adreça introduïda no és el mateix que el domini de l'adreça final obtinguda. Si estàs consultant continguts remots mitjançant servidors tercers, torna a fer la consulta fent servir l'adreça que es pot obtenir en el servidor origen."
-  _noSuchObject:
-    title: "No s'ha trobat"
-    description: "No es pot trobar el recurs sol·licitat, si us plau comprova l'adreça una altra vegada."
-_captcha:
-  verify: "Passar pel CAPTCHA"
-  testSiteKeyMessage: "Pots comprovar una vista prèvia introduïnt valors de prova per la clau del lloc i la clau secreta. Si vols més informació consulteu la següent pàgina."
-  _error:
-    _requestFailed:
-      title: "Ha fallat la sol·licitud del CAPTCHA"
-      text: "Si us plau, torna a intentar-ho d'aquí una estona o comprova els ajustos de nou."
-    _verificationFailed:
-      title: "Ha fallat la validació CAPTCHA"
-      text: "Comprova que els ajustos són els correctes."
-    _unknown:
-      title: "Error CAPTCHA"
-      text: "S'ha produït un error inesperat."

locales/cs-CZ.yml

@@ -2024,6 +2024,3 @@ _moderationLogTypes:
   createInvitation: "Vygenerovat pozvánku"
 _reversi:
   total: "Celkem"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "Nenalezeno"

locales/de-DE.yml

@@ -185,9 +185,7 @@ addAccount: "Benutzerkonto hinzufügen"
 reloadAccountsList: "Benutzerkontoliste aktualisieren"
 loginFailed: "Anmeldung fehlgeschlagen"
 showOnRemote: "Auf Ursprungsinstanz ansehen"
-continueOnRemote: "Weiter auf Remote-Server"
 chooseServerOnMisskeyHub: "Wähle einen Server aus dem Misskey Hub"
-specifyServerHost: "Server-Host auswählen"
 inputHostName: "Gib die Domain an"
 general: "Allgemein"
 wallpaper: "Hintergrund"
@@ -239,8 +237,6 @@ silencedInstances: "Stummgeschaltete Instanzen"
 silencedInstancesDescription: "Gib die Hostnamen der Instanzen, welche stummgeschaltet werden sollen, durch Zeilenumbrüche getrennt an. Alle Konten dieser Instanzen werden als stummgeschaltet behandelt, können nur noch Follow-Anfragen stellen und wenn nicht gefolgt keine lokalen Konten erwähnen. Blockierte Instanzen sind davon nicht betroffen."
 mediaSilencedInstances: "Medien-stummgeschaltete Server"
 mediaSilencedInstancesDescription: "Gib pro Zeile die Hostnamen der Server ein, dessen Medien du stummschalten möchtest. Alle Benutzerkonten der aufgeführten Server werden als sensibel behandelt und können keine benutzerdefinierten Emojis verwenden. Gesperrte Server sind davon nicht betroffen."
-federationAllowedHosts: "Föderierte Instanzen"
-federationAllowedHostsDescription: "Trage die Hostnamen ein mit den du eine Föderation eingehen möchtest. Trenne mit Zeilenumbruch."
 muteAndBlock: "Stummschaltungen und Blockierungen"
 mutedUsers: "Stummgeschaltete Benutzer"
 blockedUsers: "Blockierte Benutzer"
@@ -453,7 +449,6 @@ totpDescription: "Logge dich via Authentifizierungs-App mit Einmalpasswort ein"
 moderator: "Moderator"
 moderation: "Moderation"
 moderationNote: "Moderationsnotiz"
-moderationNoteDescription: "Trage hier Notizen ein. Diese sind nur für die Moderatoren sichtbar."
 addModerationNote: "Moderationsnotiz hinzufügen"
 moderationLogs: "Moderationsprotokolle"
 nUsersMentioned: "Von {n} Benutzern erwähnt"
@@ -493,7 +488,6 @@ noMessagesYet: "Noch keine Nachrichten vorhanden"
 newMessageExists: "Du hast eine neue Nachricht"
 onlyOneFileCanBeAttached: "Es kann pro Nachricht nur eine Datei angehängt werden"
 signinRequired: "Bitte registriere oder melde dich an, um fortzufahren"
-signinOrContinueOnRemote: "Um fortzufahren, gehe zu deiner Instanz oder registriere bzw. melde dich an dieser Instanz an. "
 invitations: "Einladungen"
 invitationCode: "Einladungscode"
 checking: "Wird überprüft …"
@@ -585,7 +579,6 @@ masterVolume: "Gesamtlautstärke"
 notUseSound: "Gebe kein Ton aus"
 useSoundOnlyWhenActive: "Gebe nur Ton aus, wenn Misskey aktiv ist"
 details: "Details"
-renoteDetails: "Renote Details"
 chooseEmoji: "Emoji auswählen"
 unableToProcess: "Der Vorgang konnte nicht abgeschlossen werden"
 recentUsed: "Vor kurzem verwendet"
@@ -602,7 +595,6 @@ descendingOrder: "Absteigende Reihenfolge"
 scratchpad: "Testumgebung"
 scratchpadDescription: "Die Testumgebung bietet einen Bereich für AiScript-Experimente. Dort kannst du AiScript schreiben, ausführen sowie dessen Auswirkungen auf Misskey überprüfen."
 uiInspector: "UI-Inspektor"
-uiInspectorDescription: "Die Liste der UI-Komponenten-Server können im Zwischenspeicher angesehen werden. Die UI-Komponente wird von der Funktion Ui:C: generiert."
 output: "Ausgabe"
 script: "Skript"
 disablePagesScript: "AiScript auf Seiten deaktivieren"
@@ -683,10 +675,7 @@ smtpSecure: "Für SMTP-Verbindungen implizit SSL/TLS verwenden"
 smtpSecureInfo: "Schalte dies aus, falls du STARTTLS verwendest."
 testEmail: "Emailversand testen"
 wordMute: "Wortstummschaltung"
-wordMuteDescription: "Minimiert Notizen, die das angegebene Wort oder den angegebenen Ausdruck enthalten. Minimierte Notizen können angezeigt werden, indem du auf sie klickst."
-hardWordMute: "Harte Wortstummschaltung"
-showMutedWord: "Stummgeschaltete Wörter anzeigen"
-hardWordMuteDescription: "Blendet Notizen aus, die das angegebene Wort oder die angegebene Phrase enthalten. Im Gegensatz zur Wortstummschaltung wird die Notiz vollständig ausgeblendet."
+hardWordMute: "Harte Wort-Stummschaltung"
 regexpError: "Fehler in einem regulären Ausdruck"
 regexpErrorDescription: "Im regulären Ausdruck deiner in Zeile {line} von {tab}en Wortstummschaltungen ist ein Fehler aufgetreten:"
 instanceMute: "Instanzstummschaltungen"
@@ -1097,8 +1086,6 @@ limitWidthOfReaction: "Begrenze die Breite der Reaktion und zeige sie verkleiner
 noteIdOrUrl: "Notiz-ID oder URL"
 video: "Video"
 videos: "Videos"
-audio: "Audio"
-audioFiles: "Audio"
 dataSaver: "Datensparmodus"
 accountMigration: "Kontomigration"
 accountMoved: "Dieser Benutzer ist zu einem neuen Konto migriert:"
@@ -1138,7 +1125,6 @@ preventAiLearning: "Verwendung in machinellem Lernen (Generative bzw. Prediktive
 preventAiLearningDescription: "Fordert Crawler auf, gepostetes Text- oder Bildmaterial usw. nicht in Datensätzen für maschinelles Lernen (Generative bzw. Prediktive AI/KI) zu verwenden. Dies wird durch das Hinzufügen einer \"noai\"-Flag in der HTML-Antwort des jeweiligen Inhalts erreicht. Da diese Flag jedoch ignoriert werden kann, ist eine vollständige Verhinderung hierdurch nicht möglich."
 options: "Optionen"
 specifyUser: "Spezifischer Benutzer"
-lookupConfirm: "Zustimmen?"
 failedToPreviewUrl: "Vorschau nicht anzeigbar"
 update: "Aktualisieren"
 rolesThatCanBeUsedThisEmojiAsReaction: "Rollen, die dieses Emoji als Reaktion verwenden können"
@@ -1208,10 +1194,7 @@ externalServices: "Externe Dienste"
 sourceCode: "Quellcode"
 sourceCodeIsNotYetProvided: "Der Quellcode ist noch nicht verfügbar. Kontaktiere den Administrator, um das Problem zu lösen."
 repositoryUrl: "Repository URL"
-repositoryUrlDescription: "Solltest du Misskey so wie es ist verwenden (im unveränderten Quellcode), gebe Folgendes an:\nhttps://github.com/misskey-dev/misskey"
 repositoryUrlOrTarballRequired: "Wenn du kein Repository veröffentlicht hast, musst du stattdessen einen Tarball bereitstellen. Siehe .config/example.yml für weitere Informationen."
-feedback: "Feedback"
-feedbackUrl: "Feedback-Website"
 impressum: "Impressum"
 impressumUrl: "Impressums-URL"
 impressumDescription: "In manchen Ländern, wie Deutschland und dessen Umgebung, ist die Angabe von Betreiberinformationen (ein Impressum) bei kommerziellem Betrieb zwingend."
@@ -1221,7 +1204,6 @@ tosAndPrivacyPolicy: "Nutzungsbedingungen und Datenschutzerklärung"
 avatarDecorations: "Profilbilddekoration"
 attach: "Anbringen"
 detach: "Entfernen"
-detachAll: "Alles Entfernen"
 angle: "Winkel"
 flip: "Umdrehen"
 showAvatarDecorations: "Profilbilddekoration anzeigen"
@@ -1234,27 +1216,18 @@ signupPendingError: "Beim Überprüfen der Mailadresse ist etwas schiefgelaufen.
 cwNotationRequired: "Ist \"Inhaltswarnung verwenden\" aktiviert, muss eine Beschreibung gegeben werden."
 doReaction: "Reagieren"
 code: "Code"
-reloadRequiredToApplySettings: "Eine Aktualisierung ist erforderlich, um die Einstellungen zu übernehmen."
 remainingN: "Verbleibend: {n}"
 overwriteContentConfirm: "Bist du sicher, dass du den aktuellen Inhalt überschreiben willst?"
 seasonalScreenEffect: "Saisonaler Bildschirmeffekt"
 decorate: "Dekorieren"
 addMfmFunction: "MFM hinzufügen"
 enableQuickAddMfmFunction: "Erweiterte MFM-Auswahl anzeigen"
-bubbleGame: "Bubble Game"
 sfx: "Soundeffekte"
 soundWillBePlayed: "Es wird Ton wiedergegeben"
 showReplay: "Wiederholung anzeigen"
-replay: "Aufzeichnen"
-replaying: "Aufzeichnung"
-endReplay: "Aufzeichnung verlassen"
-copyReplayData: "Aufzeichnung kopieren"
 ranking: "Rangliste"
 lastNDays: "Letzten {n} Tage"
 backToTitle: "Zurück zum Startbildschirm"
-hemisphere: "Hemisphäre"
-withSensitive: "Zeige \"sensitive Inhalte\" an"
-userSaysSomethingSensitive: "{name} sagt etwas mit sensiblem Inhalt."
 enableHorizontalSwipe: "Wischen, um zwischen Tabs zu wechseln"
 loading: "Laden"
 surrender: "Abbrechen"
@@ -1267,8 +1240,6 @@ useNativeUIForVideoAudioPlayer: "Browser-Benutzeroberfläche für die Video- und
 keepOriginalFilename: "Ursprünglichen Dateinamen beibehalten"
 keepOriginalFilenameDescription: "Wenn diese Einstellung deaktiviert ist, wird der Dateiname beim Hochladen automatisch durch eine zufällige Zeichenfolge ersetzt."
 noDescription: "Keine Beschreibung vorhanden"
-alwaysConfirmFollow: "Folgen immer bestätigen"
-inquiry: "Kontakt"
 tryAgain: "Bitte später erneut versuchen"
 confirmWhenRevealingSensitiveMedia: "Das Anzeigen von sensiblen Medien bestätigen"
 sensitiveMediaRevealConfirm: "Es könnte sich um sensible Medien handeln. Möchtest du sie anzeigen?"
@@ -1278,41 +1249,29 @@ fromX: "Von {x}"
 genEmbedCode: "Einbettungscode generieren"
 noteOfThisUser: "Notizen dieses Benutzers"
 clipNoteLimitExceeded: "Zu diesem Clip können keine weiteren Notizen hinzugefügt werden."
-performance: "Leistung"
-modified: "Bearbeitet"
 discard: "Verwerfen"
 thereAreNChanges: "Es gibt {n} Änderung(en)"
 signinWithPasskey: "Mit Passkey anmelden"
-unknownWebAuthnKey: "Unbekannter Passkey"
 passkeyVerificationFailed: "Die Passkey-Verifizierung ist fehlgeschlagen."
 passkeyVerificationSucceededButPasswordlessLoginDisabled: "Die Verifizierung des Passkeys war erfolgreich, aber die passwortlose Anmeldung ist deaktiviert."
 messageToFollower: "Nachricht an die Follower"
-target: "Speicherort"
 testCaptchaWarning: "Diese Funktion ist für CAPTCHA-Testzwecke gedacht.\n<strong>Nicht in einer Produktivumgebung verwenden.</strong>"
 prohibitedWordsForNameOfUser: "Verbotene Begriffe für Benutzernamen"
 prohibitedWordsForNameOfUserDescription: "Wenn eine Zeichenfolge aus dieser Liste im Namen eines Benutzers enthalten ist, wird der Benutzername abgelehnt. Benutzer mit Moderatorenrechten sind von dieser Einschränkung nicht betroffen."
 yourNameContainsProhibitedWords: "Dein Name enthält einen verbotenen Begriff"
 yourNameContainsProhibitedWordsDescription: "Der Name enthält eine verbotene Zeichenfolge. Wende dich an deinen Serveradministrator, wenn du diesen Namen verwenden möchtest."
-thisContentsAreMarkedAsSigninRequiredByAuthor: "Logge dich ein, um weitere Inhalte von diesem Nutzer zu sehen."
-lockdown: "Sperren"
 pleaseSelectAccount: "Bitte Konto auswählen"
 availableRoles: "Verfügbare Rollen"
-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."
 _accountSettings:
   requireSigninToViewContents: "Anmeldung erfordern, um Inhalte anzuzeigen"
   requireSigninToViewContentsDescription1: "Erfordere eine Anmeldung, um alle Notizen und andere Inhalte anzuzeigen, die du erstellt hast. Dadurch wird verhindert, dass Crawler deine Informationen sammeln."
-  requireSigninToViewContentsDescription2: "Der Inhalt wird nicht in URL-Vorschauen (OGP), eingebettet in Webseiten oder auf Servern, die keine Zitate unterstützen, angezeigt."
   requireSigninToViewContentsDescription3: "Diese Einschränkungen gelten möglicherweise nicht für föderierte Inhalte von anderen Servern."
   makeNotesFollowersOnlyBefore: "Macht frühere Notizen nur für Follower sichtbar"
   makeNotesHiddenBefore: "Frühere Notizen privat machen"
-  makeNotesHiddenBeforeDescription: ""
   mayNotEffectForFederatedNotes: "Dies hat möglicherweise keine Auswirkungen auf Notizen, die an andere Server föderiert werden."
-  notesOlderThanSpecifiedDateAndTime: "Notizen vor einem bestimmtem Datum und Uhrzeit"
 _abuseUserReport:
   forward: "Weiterleiten"
   forwardDescription: "Leite die Meldung an einen entfernten Server als anonymes Systemkonto weiter."
-  resolve: "lösen"
   accept: "Akzeptieren"
   reject: "Ablehnen"
 _delivery:
@@ -1422,7 +1381,6 @@ _serverSettings:
   fanoutTimelineDescription: "Ist diese Option aktiviert, kann eine erhebliche Verbesserung im Abrufen von Chroniken und eine Reduzierung der Datenbankbelastung erzielt werden, im Gegenzug zu einer Steigerung in der Speichernutzung von Redis. Bei geringem Serverspeicher oder Serverinstabilität kann diese Option deaktiviert werden."
   fanoutTimelineDbFallback: "Auf die Datenbank zurückfallen"
   fanoutTimelineDbFallbackDescription: "Ist diese Option aktiviert, wird die Chronik auf zusätzliche Abfragen in der Datenbank zurückgreifen, wenn sich die Chronik nicht im Cache befindet. Eine Deaktivierung führt zu geringerer Serverlast, aber schränkt den Zeitraum der abrufbaren Chronik ein. "
-  openRegistrationWarning: "Das Aktivieren von Registrierungen ist riskant. Es wird empfohlen, sie nur dann zu aktivieren, wenn der Server ständig überwacht wird und im Falle eines Problems sofort reagiert werden kann."
   thisSettingWillAutomaticallyOffWhenModeratorsInactive: "Wenn über einen bestimmten Zeitraum keine Moderatorenaktivität festgestellt wird, wird diese Einstellung automatisch deaktiviert, um Spam zu verhindern."
 _accountMigration:
   moveFrom: "Von einem anderen Konto zu diesem migrieren"
@@ -1884,7 +1842,6 @@ _channel:
   notesCount: "{n} Notizen"
   nameAndDescription: "Name und Beschreibung"
   nameOnly: "Nur Name"
-  allowRenoteToExternal: "Renotes und Zitierungen außerhalb des Kanals erlauben"
 _menuDisplay:
   sideFull: "Seitlich"
   sideIcon: "Seitlich (Icons)"
@@ -1973,7 +1930,6 @@ _sfx:
   note: "Notizen"
   noteMy: "Meine Notizen"
   notification: "Benachrichtigungen"
-  reaction: "Auswählen einer Reaktion"
 _soundSettings:
   driveFile: "Audiodatei aus dem Drive verwenden"
   driveFileWarn: "Wähle eine Audiodatei aus dem Drive"
@@ -2072,22 +2028,12 @@ _permissions:
   "read:admin:server-info": "Serverinformationen anzeigen"
   "read:admin:show-moderation-log": "Moderationsprotokoll einsehen"
   "read:admin:show-user": "Private Benutzerinformationen einsehen"
-  "write:admin:roles": "Rollen verwalten"
-  "read:admin:roles": "Rollen anzeigen"
-  "write:admin:relays": "Relays verwalten"
-  "read:admin:relays": "Relays anzeigen"
   "write:admin:invite-codes": "Einladungscodes verwalten"
   "read:admin:invite-codes": "Einladungscodes anzeigen"
   "write:admin:announcements": "Ankündigungen verwalten"
   "read:admin:announcements": "Ankündigungen einsehen"
   "write:admin:avatar-decorations": "Kann Avatar-Dekorationen verwalten"
   "read:admin:avatar-decorations": "Avatar-Dekorationen ansehen"
-  "write:admin:account": "Benutzerkonten verwalten"
-  "read:admin:account": "Benutzerkonten anzeigen"
-  "write:admin:emoji": "Emojis verwalten"
-  "read:admin:emoji": "Emojis anzeigen"
-  "write:admin:queue": "Job-Warteschlange verwalten"
-  "read:admin:queue": "Job-Warteschlange anzeigen"
 _auth:
   shareAccessTitle: "Verteilung von App-Berechtigungen"
   shareAccess: "Möchtest du „{name}“ authorisieren, auf dieses Benutzerkonto zugreifen zu können?"
@@ -2205,8 +2151,6 @@ _profile:
   changeAvatar: "Profilbild ändern"
   changeBanner: "Banner ändern"
   verifiedLinkDescription: "Gibst du hier eine URL ein, die einen Link zu deinem Profile enthält, wird neben diesem Feld ein Icon zur Besitzbestätigung angezeigt."
-  avatarDecorationMax: "Du kannst bis zu {max} Dekorationen hinzufügen."
-  followedMessageDescription: "Du kannst eine kurze Nachricht festlegen, die dem Empfänger angezeigt wird, wenn er dir folgt."
 _exportOrImport:
   allNotes: "Alle Notizen"
   favoritedNotes: "Als Favorit markierte Notizen"
@@ -2339,7 +2283,6 @@ _notification:
   reactedBySomeUsers: "{n} Benutzer haben eine Reaktion geschickt"
   renotedBySomeUsers: "Renote von {n} Benutzern"
   followedBySomeUsers: "Von {n} Benutzern gefolgt"
-  login: "Neue Anmeldung erfolgt"
   _types:
     all: "Alle"
     note: "Neue Notizen"
@@ -2352,7 +2295,6 @@ _notification:
     pollEnded: "Ende von Umfragen"
     receiveFollowRequest: "Erhaltene Follow-Anfragen"
     followRequestAccepted: "Akzeptierte Follow-Anfragen"
-    roleAssigned: "Rolle zugewiesen"
     achievementEarned: "Errungenschaft freigeschaltet"
     login: "Anmelden"
     app: "Benachrichtigungen von Apps"
@@ -2404,7 +2346,6 @@ _webhookSettings:
   createWebhook: "Webhook erstellen"
   name: "Name"
   secret: "Secret"
-  trigger: "Auslöser"
   active: "Aktiviert"
   _events:
     follow: "Wenn du jemandem folgst"
@@ -2416,10 +2357,8 @@ _webhookSettings:
     mention: "Wenn du erwähnt wirst"
 _abuseReport:
   _notificationRecipient:
-    createRecipient: "Meldungsempfänger hinzufügen"
     _recipientType:
       mail: "Email"
-    keywords: "Schlüsselwort"
 _moderationLogTypes:
   createRole: "Rolle erstellt"
   deleteRole: "Rolle gelöscht"
@@ -2454,13 +2393,6 @@ _moderationLogTypes:
   createAvatarDecoration: "Profilbilddekoration erstellt"
   updateAvatarDecoration: "Profilbilddekoration aktualisiert"
   deleteAvatarDecoration: "Profilbilddekoration gelöscht"
-  unsetUserAvatar: "Profilbild zurückgesetzt"
-  unsetUserBanner: "Profilbanner zurückgesetzt"
-  createSystemWebhook: "System-Webhook erstellt"
-  updateSystemWebhook: "System-Webhook aktualisiert"
-  deleteSystemWebhook: "System-Webhook gelöscht"
-  deletePage: "Seite gelöscht"
-  deleteGalleryPost: "Galeriebeitrag gelöscht"
 _fileViewer:
   title: "Dateiinformationen"
   type: "Dateityp"
@@ -2510,10 +2442,6 @@ _externalResourceInstaller:
     _themeInstallFailed:
       title: "Das Farbschema konnte nicht installiert werden"
       description: "Während der Installation des Farbschemas ist ein Problem aufgetreten. Bitte versuche es erneut. Detaillierte Fehlerinformationen können über die Javascript-Konsole abgerufen werden."
-_hemisphere:
-  N: "Nördliche Erdhalbkugel"
-  S: "Südliche Erdhalbkugel"
-  caption: "Wird in einigen Client-Einstellungen zur Bestimmung der Jahreszeit verwendet."
 _reversi:
   blackOrWhite: "Schwarz/Weiß"
   rules: "Regeln"
@@ -2521,26 +2449,17 @@ _reversi:
   white: "Weiß"
   total: "Gesamt"
 _offlineScreen:
-  title: "Offline - keine Verbindung zum Server möglich"
   header: "Verbindung zum Server nicht möglich"
 _urlPreviewSetting:
   title: "Einstellungen der URL-Vorschau"
   enable: "URL-Vorschau aktivieren"
   timeout: "Zeitüberschreitung beim Abrufen der Vorschau (ms)"
-  timeoutDescription: "Übersteigt die für die Vorschau benötigte Zeit diesen Wert, wird keine Vorschau generiert."
   maximumContentLength: "Maximale Content-Length (Bytes)"
-  maximumContentLengthDescription: "Wenn die Content-Length diesen Wert überschreitet, wird keine Vorschau erzeugt."
-  requireContentLength: "Vorschau nur generieren, wenn Content-Length verfügbar ist"
-  requireContentLengthDescription: "Wenn der Server keine Content-Length zurückgibt, wird keine Vorschau erzeugt."
-  userAgent: "User-Agent"
 _mediaControls:
   playbackRate: "Wiedergabegeschwindigkeit"
 _contextMenu:
   title: "Kontextmenü"
   app: "Anwendung"
-_gridComponent:
-  _error:
-    requiredValue: "Dieser Wert ist ein Pflichtfeld"
 _embedCodeGen:
   title: "Einbettungscode anpassen"
   header: "Kopfzeile anzeigen"
@@ -2557,13 +2476,3 @@ _selfXssPrevention:
   title: "„Füge in diesen Bereich etwas ein“ ist eine Betrugsmasche."
   description1: "Wenn du hier etwas einfügst, könnte ein böswilliger Benutzer dein Konto übernehmen oder deine persönlichen Daten stehlen."
   description3: "Weitere Informationen findest du hier. {link}"
-_remoteLookupErrors:
-  _federationNotAllowed:
-    title: "Kommunikation mit diesem Server nicht möglich"
-    description: "Möglicherweise wurde die Kommunikation mit diesem Server deaktiviert oder dieser Server ist blockiert.\nWende dich bitte an den Serveradministrator."
-  _uriInvalid:
-    title: "URI ist fehlerhaft"
-    description: "Es gibt ein Problem mit der von dir eingegebenen URI. Bitte prüfe, ob du Zeichen eingegeben hast, die in der URI nicht verwendet werden können."
-  _noSuchObject:
-    title: "Nicht gefunden"
-    description: "Die angeforderte Ressource konnte nicht gefunden werden, bitte überprüfe die URI erneut."

locales/en-US.yml

@@ -5,7 +5,6 @@ introMisskey: "Welcome! Misskey is an open source, decentralized microblogging s
 poweredByMisskeyDescription: "{name} is one of the services powered by the open source platform <b>Misskey</b> (referred to as a \"Misskey instance\")."
 monthAndDay: "{month}/{day}"
 search: "Search"
-reset: "Reset"
 notifications: "Notifications"
 username: "Username"
 password: "Password"
@@ -49,7 +48,6 @@ pin: "Pin to profile"
 unpin: "Unpin from profile"
 copyContent: "Copy contents"
 copyLink: "Copy link"
-copyRemoteLink: "Copy remote link"
 copyLinkRenote: "Copy renote link"
 delete: "Delete"
 deleteAndEdit: "Delete and edit"
@@ -686,15 +684,11 @@ smtpSecure: "Use implicit SSL/TLS for SMTP connections"
 smtpSecureInfo: "Turn this off when using STARTTLS"
 testEmail: "Test email delivery"
 wordMute: "Word mute"
-wordMuteDescription: "Minimize notes that contain the specified word or phrase. Minimized notes can be displayed by clicking on them."
 hardWordMute: "Hard word mute"
-showMutedWord: "Show muted words"
-hardWordMuteDescription: "Hide notes that contain the specified word or phrase. Unlike word mute, the note will be completely hidden from view."
 regexpError: "Regular Expression error"
 regexpErrorDescription: "An error occurred in the regular expression on line {line} of your {tab} word mutes:"
 instanceMute: "Instance Mutes"
 userSaysSomething: "{name} said something"
-userSaysSomethingAbout: "{name} said something about \"{word}\""
 makeActive: "Activate"
 display: "Display"
 copy: "Copy"
@@ -1306,9 +1300,6 @@ thisContentsAreMarkedAsSigninRequiredByAuthor: "Set by the author to require log
 lockdown: "Lockdown"
 pleaseSelectAccount: "Select an account"
 availableRoles: "Available roles"
-acknowledgeNotesAndEnable: "Turn on after understanding the precautions."
-federationSpecified: "This server is operated in a whitelist federation. Interacting with servers other than those designated by the administrator is not allowed."
-federationDisabled: "Federation is disabled on this server. You cannot interact with users on other servers."
 _accountSettings:
   requireSigninToViewContents: "Require sign-in to view contents"
   requireSigninToViewContentsDescription1: "Require login to view all notes and other content you have created. This will have the effect of preventing crawlers from collecting your information."
@@ -1328,6 +1319,13 @@ _abuseUserReport:
   accept: "Accept"
   reject: "Reject"
   resolveTutorial: "If the report is legitimate in content, select \"Accept\" to mark the case as resolved in the affirmative.\nIf the content of the report is not legitimate, select \"Reject\" to mark the case as resolved in the negative."
+stpvAntennaPatch: |
+  Sharkey Stelpolva Edition adds additional keyword syntax to the antenna settings.
+  That means, the special keyword `domain:example.com` will match all posts from `example.com`. This keyword can also be used in OR syntax.
+  Specifically, you must use `domain:here` to match posts in this instance.
+stpvPgroongaSearchInstru: Use the `A OR B` syntax to search for notes containing either A or B. `A B` (with a space in between) means posts containing both keywords A and B.
+timeTravel: Time Travel
+timeTravelDescription: Show posts before this date
 _delivery:
   status: "Delivery status"
   stop: "Suspended"
@@ -1465,8 +1463,6 @@ _serverSettings:
   reactionsBufferingDescription: "When enabled, performance during reaction creation will be greatly improved, reducing the load on the database. However, Redis memory usage will increase."
   inquiryUrl: "Inquiry URL"
   inquiryUrlDescription: "Specify a URL for the inquiry form to the server maintainer or a web page for the contact information."
-  openRegistration: "Make the account creation open"
-  openRegistrationWarning: "Opening registration carries risks. It is recommended to only enable it if you have a system in place to continuously monitor the server and respond immediately in case of any issues."
   thisSettingWillAutomaticallyOffWhenModeratorsInactive: "If no moderator activity is detected for a while, this setting will be automatically turned off to prevent spam."
 _accountMigration:
   moveFrom: "Migrate another account to this one"
@@ -2729,61 +2725,6 @@ _contextMenu:
   app: "Application"
   appWithShift: "Application with shift key"
   native: "Native"
-_gridComponent:
-  _error:
-    requiredValue: "This value is required"
-    columnTypeNotSupport: "Validation with regular expression is supported only for type:text columns."
-    patternNotMatch: "This value doesn't match the pattern in {pattern}"
-    notUnique: "This value must be unique"
-_roleSelectDialog:
-  notSelected: "Not selected"
-_customEmojisManager:
-  _gridCommon:
-    copySelectionRows: "Copy selected rows"
-    copySelectionRanges: "Copy selected ranges"
-    deleteSelectionRows: "Delete selected rows"
-    deleteSelectionRanges: "Delete rows in the selection"
-    searchSettings: "Search settings"
-    searchSettingCaption: "Set detailed search criteria."
-    sortOrder: "Sort order"
-    registrationLogs: "Registration log"
-    registrationLogsCaption: "Logs will be displayed when updating or deleting Emojis. They will disappear after updating or deleting them, moving to a new page, or reloading."
-    alertEmojisRegisterFailedDescription: "Failed to update or delete Emojis. Please check the registration log for details."
-  _logs:
-    showSuccessLogSwitch: "Show success log"
-    failureLogNothing: "There is no failure log."
-    logNothing: "There is no log."
-  _remote:
-    selectionRowDetail: "Selected row's detail"
-    importSelectionRows: "Import selected rows"
-    importSelectionRangesRows: "Import rows in the selection"
-    importEmojisButton: "Import checked Emojis"
-    confirmImportEmojisTitle: "Import Emojis"
-    confirmImportEmojisDescription: "Import {count} Emoji(s) received from the remote server. Please pay close attention to the license of the Emoji. Are you sure to continue?"
-  _local:
-    tabTitleList: "List of registered Emojis"
-    tabTitleRegister: "Emoji registration"
-    _list:
-      emojisNothing: "There are no registered Emojis."
-      markAsDeleteTargetRows: "Mark selected rows as a target to delete"
-      markAsDeleteTargetRanges: "Mark rows in the selection as a target to delete"
-      alertUpdateEmojisNothingDescription: "There are no updated Emojis."
-      alertDeleteEmojisNothingDescription: "There are no Emojis to be deleted."
-      confirmUpdateEmojisDescription: "Update {count} Emoji(s). Are you sure to continue?"
-      confirmDeleteEmojisDescription: "Delete checked {count} Emoji(s). Are you sure to continue?"
-      dialogSelectRoleTitle: "Search by roll set in Emojis"
-    _register:
-      uploadSettingTitle: "Upload settings"
-      uploadSettingDescription: "On this screen, you can configure the behavior when uploading Emojis."
-      directoryToCategoryLabel: "Enter the directory name in the \"category\" field"
-      directoryToCategoryCaption: "When you drag and drop a directory, enter the directory name in the \"category\" field."
-      emojiInputAreaCaption: "Select the Emojis you wish to register using one of the methods."
-      emojiInputAreaList1: "Drag and drop image files or a directory into this frame"
-      emojiInputAreaList2: "Click this link to select from your computer"
-      emojiInputAreaList3: "Click this link to select from the drive"
-      confirmRegisterEmojisDescription: "Register the Emojis from the list as new custom Emojis. Are you sure to continue? (To avoid overload, only {count} Emoji(s) can be registered in a single operation)"
-      confirmClearEmojisDescription: "Discard the edits and clear the Emojis from the list. Are you sure to continue?"
-      confirmUploadEmojisDescription: "Upload the dragged and dropped {count} file(s) to the drive. Are you sure to continue?"
 _embedCodeGen:
   title: "Customize embed code"
   header: "Show header"
@@ -2804,37 +2745,3 @@ _selfXssPrevention:
   description1: "If you paste something here, a malicious user could hijack your account or steal your personal information."
   description2: "If you do not understand exactly what you are trying to paste, %cstop working right now and close this window."
   description3: "For more information, please refer to this. {link}"
-_followRequest:
-  recieved: "Received application"
-  sent: "Sent application"
-_remoteLookupErrors:
-  _federationNotAllowed:
-    title: "Unable to communicate with this server"
-    description: "Communication with this server may have been disabled or this server may be blocked.\nPlease contact the server administrator."
-  _uriInvalid:
-    title: "URI is invalid"
-    description: "There is a problem with the URI you entered. Please check if you entered characters that cannot be used in the URI."
-  _requestFailed:
-    title: "Request failed"
-    description: "Communication with this server failed. The server may be down. Also, please make sure that you have not entered an invalid or nonexistent URI."
-  _responseInvalid:
-    title: "Response is invalid"
-    description: "It could communicate with this server, but the data obtained was incorrect."
-  _responseInvalidIdHostNotMatch:
-    description: "The domain of the entered URI differs from the domain of the final obtained URI. If you are looking up remote content through a third-party server, please look up again using a URI that can be obtained from the origin server."
-  _noSuchObject:
-    title: "Not found"
-    description: "The requested resource was not found, please recheck the URI."
-_captcha:
-  verify: "Please verify the CAPTCHA"
-  testSiteKeyMessage: "You can check the preview by entering the test values for the site and secret keys.\nPlease see the following page for details."
-  _error:
-    _requestFailed:
-      title: "Failed to request CAPTCHA"
-      text: "Please run it after a while or check the settings again."
-    _verificationFailed:
-      title: "Failed to validate CAPTCHA"
-      text: "Please check again if the settings are correct."
-    _unknown:
-      title: "CAPTCHA error"
-      text: "An unexpected error occurred."

locales/es-ES.yml

@@ -10,7 +10,6 @@ username: "Nombre de usuario"
 password: "Contraseña"
 initialPasswordForSetup: "Contraseña para iniciar la inicialización"
 initialPasswordIsIncorrect: "La contraseña para iniciar la configuración inicial es incorrecta."
-initialPasswordForSetupDescription: "Si ha instalado Misskey usted mismo, utilice la contraseña introducida en el archivo de configuración.\nSi utiliza un servicio de alojamiento de Misskey o similar, utilice la contraseña proporcionada.\nSi no ha establecido una contraseña, déjela en blanco para continuar."
 forgotPassword: "Olvidé mi contraseña"
 fetchingAsApObject: "Buscando en el fediverso"
 ok: "OK"
@@ -48,7 +47,6 @@ pin: "Fijar al perfil"
 unpin: "Desfijar"
 copyContent: "Copiar contenido"
 copyLink: "Copiar enlace"
-copyRemoteLink: "Copiar enlace remoto"
 copyLinkRenote: "Copiar enlace de renota"
 delete: "Borrar"
 deleteAndEdit: "Borrar y editar"
@@ -200,7 +198,6 @@ followConfirm: "¿Desea seguir a {name}?"
 proxyAccount: "Cuenta proxy"
 proxyAccountDescription: "Una cuenta proxy es una cuenta que actúa como un seguidor remoto de un usuario bajo ciertas condiciones. Por ejemplo, cuando un usuario añade un usuario remoto a una lista, si ningún usuario local sigue al usuario agregado a la lista, la instancia no puede obtener su actividad. Así que la cuenta proxy sigue al usuario añadido a la lista"
 host: "Host"
-selectSelf: "Elígete a ti mismo"
 selectUser: "Elegir usuario"
 recipient: "Recipiente"
 annotation: "Anotación"
@@ -216,7 +213,6 @@ perDay: "por día"
 stopActivityDelivery: "Dejar de enviar actividades"
 blockThisInstance: "Bloquear instancia"
 silenceThisInstance: "Silenciar esta instancia"
-mediaSilenceThisInstance: "Silencia la Multimedia(Imágenes,videos...) para este servidor"
 operations: "Operaciones"
 software: "Software"
 version: "Versión"
@@ -238,10 +234,6 @@ blockedInstances: "Instancias bloqueadas"
 blockedInstancesDescription: "Seleccione los hosts de las instancias que desea bloquear, separadas por una linea nueva. Las instancias bloqueadas no podrán comunicarse con esta instancia."
 silencedInstances: "Instancias silenciadas"
 silencedInstancesDescription: "Listar los hostname de las instancias que quieres silenciar. Todas las cuentas de las instancias listadas serán tratadas como silenciadas, solo podrán hacer peticiones de seguimiento, y no podrán mencionar cuentas locales si no las siguen. Esto no afecta a las instancias bloqueadas."
-mediaSilencedInstances: "Servidores silenciados (Multimedia)"
-mediaSilencedInstancesDescription: "Listar las instancias que quieres silenciar. Todas las cuentas de las instancias listadas serán tratadas como silenciadas, solo podrán hacer peticiones de seguimiento, y no podrán mencionar cuentas locales si no las siguen. Esto no afecta a las instancias bloqueadas."
-federationAllowedHosts: "Servidores federados"
-federationAllowedHostsDescription: "Establezca los nombres  de los servidores que pueden federarse, separados por una nueva línea."
 muteAndBlock: "Silenciar y bloquear"
 mutedUsers: "Usuarios silenciados"
 blockedUsers: "Usuarios bloqueados"
@@ -332,7 +324,6 @@ selectFile: "Elegir archivo"
 selectFiles: "Elegir archivos"
 selectFolder: "Seleccione una carpeta"
 selectFolders: "Seleccione carpetas"
-fileNotSelected: "Archivo no seleccionado."
 renameFile: "Renombrar archivo"
 folderName: "Nombre de la carpeta"
 createFolder: "Crear carpeta"
@@ -340,7 +331,6 @@ renameFolder: "Renombrar carpeta"
 deleteFolder: "Borrar carpeta"
 folder: "Carpeta"
 addFile: "Agregar archivo"
-showFile: "Examinar archivos"
 emptyDrive: "El drive está vacío"
 emptyFolder: "La carpeta está vacía"
 unableToDelete: "No se puede borrar"
@@ -454,7 +444,6 @@ totpDescription: "Ingresa una contaseña de un sólo uso usando la aplicación a
 moderator: "Moderador"
 moderation: "Moderación"
 moderationNote: "Nota de moderación"
-moderationNoteDescription: "Puedes rellenar notas que solo se comparten entre moderadores."
 addModerationNote: "Añadir nota de moderación"
 moderationLogs: "Log de moderación"
 nUsersMentioned: "{n} usuarios mencionados"
@@ -489,12 +478,10 @@ retype: "Ingrese de nuevo"
 noteOf: "Notas de {user}"
 quoteAttached: "Cita añadida"
 quoteQuestion: "¿Quiere añadir una cita?"
-attachAsFileQuestion: "El texto del portapapeles es demasiado grande ¿Desea adjuntarlo como archivo de texto?"
 noMessagesYet: "Aún no hay chat"
 newMessageExists: "Tienes un mensaje nuevo"
 onlyOneFileCanBeAttached: "Solo se puede añadir un archivo al mensaje"
 signinRequired: "Iniciar sesión"
-signinOrContinueOnRemote: "Para continuar, tendrá que ir a su servidor o registrarse e iniciar sesión en este servidor"
 invitations: "Invitar"
 invitationCode: "Código de invitación"
 checking: "Comprobando"
@@ -518,7 +505,6 @@ emojiStyle: "Estilo de emoji"
 native: "Nativo"
 menuStyle: "Diseño del menú"
 style: "Diseño"
-popup: "Ventana emergente"
 showNoteActionsOnlyHover: "Mostrar acciones de la nota sólo al pasar el cursor"
 showReactionsCount: "Mostrar el número de reacciones en las notas"
 noHistory: "No hay datos en el historial"
@@ -586,7 +572,6 @@ masterVolume: "Volumen principal"
 notUseSound: "Sin sonido"
 useSoundOnlyWhenActive: "Sonar solo cuando Misskey esté activo"
 details: "Detalles"
-renoteDetails: "Detalles(Renota)"
 chooseEmoji: "Elije un emoji"
 unableToProcess: "La operación no se puede llevar a cabo"
 recentUsed: "Usado recientemente"
@@ -602,7 +587,6 @@ ascendingOrder: "Ascendente"
 descendingOrder: "Descendente"
 scratchpad: "Scratch pad"
 scratchpadDescription: "Scratchpad proporciona un entorno experimental para AiScript. Puede escribir, ejecutar y verificar los resultados que interactúan con Misskey."
-uiInspector: "Inspector de UI"
 output: "Salida"
 script: "Script"
 disablePagesScript: "Deshabilitar AiScript en Páginas"
@@ -1133,7 +1117,6 @@ preventAiLearning: "Rechazar el uso en el Aprendizaje de Máquinas. (IA Generati
 preventAiLearningDescription: "Pedirle a las arañas (crawlers) no usar los textos publicados o imágenes en el aprendizaje automático (IA Predictiva / Generativa). Ésto se logra añadiendo una marca respuesta HTML con la cadena \"noai\" al cantenido. Una prevención total no podría lograrse sólo usando ésta marca, ya que puede ser simplemente ignorada."
 options: "Opción"
 specifyUser: "Especificar usuario"
-lookupConfirm: "¿Quiere informarse?"
 failedToPreviewUrl: "No se pudo generar la vista previa"
 update: "Actualizar"
 rolesThatCanBeUsedThisEmojiAsReaction: "Roles que pueden usar este emoji como reacción"
@@ -1268,11 +1251,6 @@ tryAgain: "Por favor , inténtalo de nuevo"
 performance: "Rendimiento"
 unknownWebAuthnKey: "Esto no se ha registrado llave maestra."
 messageToFollower: "Mensaje a seguidores"
-federationSpecified: "Este servidor opera en una federación de listas blancas. No puede interactuar con otros servidores que no sean los especificados por el administrador."
-federationDisabled: "La federación está desactivada en este servidor. No puede interactuar con usuarios de otros servidores"
-_accountSettings:
-  requireSigninToViewContents: "Se requiere iniciar sesión para ver el contenido"
-  requireSigninToViewContentsDescription1: "Requiere iniciar sesión para ver todas las notas y otros contenidos que hayas creado. Se espera que esto evite que los rastreadores recopilen información."
 _abuseUserReport:
   accept: "Acepte"
   reject: "repudio"
@@ -2557,6 +2535,3 @@ _mediaControls:
   pip: "Picture in Picture"
   playbackRate: "Velocidad de reproducción"
   loop: "Reproducción en bucle"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "No se encuentra"

locales/fr-FR.yml

@@ -2364,6 +2364,3 @@ _mediaControls:
 _embedCodeGen:
   title: "Personnaliser le code d'intégration"
   generateCode: "Générer le code d'intégration"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "Non trouvé"

locales/id-ID.yml

@@ -2610,6 +2610,3 @@ _mediaControls:
   pip: "Gambar dalam Gambar"
   playbackRate: "Kecepatan Pemutaran"
   loop: "Ulangi Pemutaran"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "Tidak dapat ditemukan"

locales/index.d.ts

@@ -36,10 +36,6 @@ export interface Locale extends ILocale {
      * 検索
      */
     "search": string;
-    /**
-     * リセット
-     */
-    "reset": string;
     /**
      * 通知
      */
@@ -214,10 +210,6 @@ export interface Locale extends ILocale {
      * リンクをコピー
      */
     "copyLink": string;
-    /**
-     * リモートのリンクをコピー
-     */
-    "copyRemoteLink": string;
     /**
      * リノートのリンクをコピー
      */
@@ -2762,22 +2754,10 @@ export interface Locale extends ILocale {
      * ワードミュート
      */
     "wordMute": string;
-    /**
-     * 指定した語句を含むノートを最小化します。最小化されたノートをクリックすることで表示することができます。
-     */
-    "wordMuteDescription": string;
     /**
      * ハードワードミュート
      */
     "hardWordMute": string;
-    /**
-     * ミュートされたワードを表示
-     */
-    "showMutedWord": string;
-    /**
-     * 指定した語句を含むノートを隠します。ワードミュートとは異なり、ノートは完全に表示されなくなります。
-     */
-    "hardWordMuteDescription": string;
     /**
      * 正規表現エラー
      */
@@ -2794,10 +2774,6 @@ export interface Locale extends ILocale {
      * {name}が何かを言いました
      */
     "userSaysSomething": ParameterizedString<"name">;
-    /**
-     * {name}が「{word}」について何かを言いました
-     */
-    "userSaysSomethingAbout": ParameterizedString<"name" | "word">;
     /**
      * アクティブにする
      */
@@ -5246,14 +5222,6 @@ export interface Locale extends ILocale {
      * 注意事項を理解した上でオンにします。
      */
     "acknowledgeNotesAndEnable": string;
-    /**
-     * このサーバーはホワイトリスト連合で運用されています。管理者が指定したサーバー以外とやり取りすることはできません。
-     */
-    "federationSpecified": string;
-    /**
-     * このサーバーは連合が無効化されています。他のサーバーのユーザーとやり取りすることはできません。
-     */
-    "federationDisabled": string;
     "_accountSettings": {
         /**
          * コンテンツの表示にログインを必須にする
@@ -10547,227 +10515,6 @@ export interface Locale extends ILocale {
          */
         "native": string;
     };
-    "_gridComponent": {
-        "_error": {
-            /**
-             * この値は必須項目です
-             */
-            "requiredValue": string;
-            /**
-             * 正規表現によるバリデーションはtype:textのカラムのみサポートします。
-             */
-            "columnTypeNotSupport": string;
-            /**
-             * この値は{pattern}のパターンに一致しません
-             */
-            "patternNotMatch": ParameterizedString<"pattern">;
-            /**
-             * この値は一意である必要があります
-             */
-            "notUnique": string;
-        };
-    };
-    "_roleSelectDialog": {
-        /**
-         * 選択されていません
-         */
-        "notSelected": string;
-    };
-    "_customEmojisManager": {
-        "_gridCommon": {
-            /**
-             * 選択行をコピー
-             */
-            "copySelectionRows": string;
-            /**
-             * 選択範囲をコピー
-             */
-            "copySelectionRanges": string;
-            /**
-             * 選択行を削除
-             */
-            "deleteSelectionRows": string;
-            /**
-             * 選択範囲の値をクリア
-             */
-            "deleteSelectionRanges": string;
-            /**
-             * 検索設定
-             */
-            "searchSettings": string;
-            /**
-             * 検索条件を詳細に設定します。
-             */
-            "searchSettingCaption": string;
-            /**
-             * 表示件数
-             */
-            "searchLimit": string;
-            /**
-             * 並び順
-             */
-            "sortOrder": string;
-            /**
-             * 登録ログ
-             */
-            "registrationLogs": string;
-            /**
-             * 絵文字更新・削除時のログが表示されます。更新・削除操作を行ったり、ページを遷移・リロードすると消えます。
-             */
-            "registrationLogsCaption": string;
-            /**
-             * 絵文字の更新・削除に失敗しました。詳細は登録ログをご確認ください。
-             */
-            "alertEmojisRegisterFailedDescription": string;
-        };
-        "_logs": {
-            /**
-             * 成功ログを表示
-             */
-            "showSuccessLogSwitch": string;
-            /**
-             * 失敗ログはありません。
-             */
-            "failureLogNothing": string;
-            /**
-             * ログはありません。
-             */
-            "logNothing": string;
-        };
-        "_remote": {
-            /**
-             * 選択行の詳細
-             */
-            "selectionRowDetail": string;
-            /**
-             * 選択行をインポート
-             */
-            "importSelectionRows": string;
-            /**
-             * 選択範囲の行をインポート
-             */
-            "importSelectionRangesRows": string;
-            /**
-             * チェックされた絵文字をインポート
-             */
-            "importEmojisButton": string;
-            /**
-             * 絵文字のインポート
-             */
-            "confirmImportEmojisTitle": string;
-            /**
-             * リモートから受信した{count}個の絵文字のインポートを行います。絵文字のライセンスに十分な注意を払ってください。実行しますか？
-             */
-            "confirmImportEmojisDescription": ParameterizedString<"count">;
-        };
-        "_local": {
-            /**
-             * 登録済み絵文字一覧
-             */
-            "tabTitleList": string;
-            /**
-             * 絵文字の登録
-             */
-            "tabTitleRegister": string;
-            "_list": {
-                /**
-                 * 登録された絵文字はありません。
-                 */
-                "emojisNothing": string;
-                /**
-                 * 選択行を削除対象にする
-                 */
-                "markAsDeleteTargetRows": string;
-                /**
-                 * 選択範囲の行を削除対象にする
-                 */
-                "markAsDeleteTargetRanges": string;
-                /**
-                 * 変更された絵文字はありません。
-                 */
-                "alertUpdateEmojisNothingDescription": string;
-                /**
-                 * 削除対象の絵文字はありません。
-                 */
-                "alertDeleteEmojisNothingDescription": string;
-                /**
-                 * ページを移動しますか？
-                 */
-                "confirmMovePage": string;
-                /**
-                 * 表示を変更しますか？
-                 */
-                "confirmChangeView": string;
-                /**
-                 * {count}個の絵文字を更新します。実行しますか？
-                 */
-                "confirmUpdateEmojisDescription": ParameterizedString<"count">;
-                /**
-                 * チェックがつけられた{count}個の絵文字を削除します。実行しますか？
-                 */
-                "confirmDeleteEmojisDescription": ParameterizedString<"count">;
-                /**
-                 * 今までに加えた変更がすべてリセットされます。
-                 */
-                "confirmResetDescription": string;
-                /**
-                 * このページの絵文字に変更が加えられています。
-                 * 保存せずにこのままページを移動すると、このページで加えた変更はすべて破棄されます。
-                 */
-                "confirmMovePageDesciption": string;
-                /**
-                 * 絵文字に設定されたロールで検索
-                 */
-                "dialogSelectRoleTitle": string;
-            };
-            "_register": {
-                /**
-                 * アップロード設定
-                 */
-                "uploadSettingTitle": string;
-                /**
-                 * この画面で絵文字アップロードを行う際の動作を設定できます。
-                 */
-                "uploadSettingDescription": string;
-                /**
-                 * ディレクトリ名を"category"に入力する
-                 */
-                "directoryToCategoryLabel": string;
-                /**
-                 * ディレクトリをドラッグ・ドロップした時に、ディレクトリ名を"category"に入力します。
-                 */
-                "directoryToCategoryCaption": string;
-                /**
-                 * いずれかの方法で登録する絵文字を選択してください。
-                 */
-                "emojiInputAreaCaption": string;
-                /**
-                 * この枠に画像ファイルまたはディレクトリをドラッグ＆ドロップ
-                 */
-                "emojiInputAreaList1": string;
-                /**
-                 * このリンクをクリックしてPCから選択する
-                 */
-                "emojiInputAreaList2": string;
-                /**
-                 * このリンクをクリックしてドライブから選択する
-                 */
-                "emojiInputAreaList3": string;
-                /**
-                 * リストに表示されている絵文字を新たなカスタム絵文字として登録します。よろしいですか？（負荷を避けるため、一度の操作で登録可能な絵文字は{count}件までです）
-                 */
-                "confirmRegisterEmojisDescription": ParameterizedString<"count">;
-                /**
-                 * 編集内容を破棄し、リストに表示されている絵文字をクリアします。よろしいですか？
-                 */
-                "confirmClearEmojisDescription": string;
-                /**
-                 * ドラッグ＆ドロップされた{count}個のファイルをドライブにアップロードします。実行しますか？
-                 */
-                "confirmUploadEmojisDescription": ParameterizedString<"count">;
-            };
-        };
-    };
     "_embedCodeGen": {
         /**
          * 埋め込みコードをカスタマイズ
@@ -10854,108 +10601,6 @@ export interface Locale extends ILocale {
          */
         "sent": string;
     };
-    "_remoteLookupErrors": {
-        "_federationNotAllowed": {
-            /**
-             * このサーバーとは通信できません
-             */
-            "title": string;
-            /**
-             * このサーバーとの通信が無効化されているか、このサーバーをブロックしている・ブロックされている可能性があります。
-             * サーバー管理者にお問い合わせください。
-             */
-            "description": string;
-        };
-        "_uriInvalid": {
-            /**
-             * URIが不正です
-             */
-            "title": string;
-            /**
-             * 入力されたURIに問題があります。URIに使用できない文字を入力していないか確認してください。
-             */
-            "description": string;
-        };
-        "_requestFailed": {
-            /**
-             * リクエストに失敗しました
-             */
-            "title": string;
-            /**
-             * このサーバーとの通信に失敗しました。相手サーバーがダウンしている可能性があります。また、不正なURIや存在しないURIを入力していないか確認してください。
-             */
-            "description": string;
-        };
-        "_responseInvalid": {
-            /**
-             * レスポンスが不正です
-             */
-            "title": string;
-            /**
-             * このサーバーと通信することはできましたが、得られたデータが不正なものでした。
-             */
-            "description": string;
-        };
-        "_responseInvalidIdHostNotMatch": {
-            /**
-             * 入力されたURIのドメインと最終的に得られたURIのドメインとが異なります。第三者のサーバーを介してリモートのコンテンツを照会している場合は、発信元のサーバーで取得できるURIを使用して照会し直してください。
-             */
-            "description": string;
-        };
-        "_noSuchObject": {
-            /**
-             * 見つかりません
-             */
-            "title": string;
-            /**
-             * 要求されたリソースは見つかりませんでした。URIをもう一度お確かめください。
-             */
-            "description": string;
-        };
-    };
-    "_captcha": {
-        /**
-         * CAPTCHAを通過してください
-         */
-        "verify": string;
-        /**
-         * サイトキーとシークレットキーにテスト用の値を入力することでプレビューを確認できます。
-         * 詳細は下記ページをご確認ください。
-         */
-        "testSiteKeyMessage": string;
-        "_error": {
-            "_requestFailed": {
-                /**
-                 * CAPTCHAのリクエストに失敗しました
-                 */
-                "title": string;
-                /**
-                 * しばらく後に実行するか、設定をもう一度ご確認ください。
-                 */
-                "text": string;
-            };
-            "_verificationFailed": {
-                /**
-                 * CAPTCHAの検証に失敗しました
-                 */
-                "title": string;
-                /**
-                 * 設定が正しいかどうかもう一度確認ください。
-                 */
-                "text": string;
-            };
-            "_unknown": {
-                /**
-                 * CAPTCHAエラー
-                 */
-                "title": string;
-                /**
-                 * 想定外のエラーが発生しました。
-                 */
-                "text": string;
-            };
-        };
-    };
 }
 declare const locales: {
     [lang: string]: Locale;

locales/it-IT.yml

@@ -5,7 +5,6 @@ introMisskey: "Eccoci! Misskey è un servizio di microblogging decentralizzato,
 poweredByMisskeyDescription: "{name} è uno dei servizi (chiamati istanze) che utilizzano la piattaforma open source <b>Misskey</b>."
 monthAndDay: "{day}/{month}"
 search: "Cerca"
-reset: "Ripristinare"
 notifications: "Notifiche"
 username: "Nome utente"
 password: "Password"
@@ -49,7 +48,6 @@ pin: "Fissa sul profilo"
 unpin: "Non fissare sul profilo"
 copyContent: "Copia il contenuto"
 copyLink: "Copia il link"
-copyRemoteLink: "Copia link remoto"
 copyLinkRenote: "Copia collegamento alla Rinota"
 delete: "Elimina"
 deleteAndEdit: "Elimina e modifica"
@@ -58,7 +56,7 @@ addToList: "Aggiungi alla lista"
 addToAntenna: "Aggiungi all'antenna"
 sendMessage: "Invia messaggio"
 copyRSS: "Copia RSS"
-copyUsername: "Copia indirizzo del profilo"
+copyUsername: "Copia nome utente"
 copyUserId: "Copia ID del profilo"
 copyNoteId: "Copia ID della Nota"
 copyFileId: "Copia ID del file"
@@ -442,7 +440,7 @@ recentlyRegisteredUsers: "Profili iscritti di recente"
 recentlyDiscoveredUsers: "Profili scoperti di recente"
 exploreUsersCount: "Ci sono {count} profili"
 exploreFediverse: "Esplora il Fediverso"
-popularTags: "Hashtag popolari"
+popularTags: "Tag di tendenza"
 userList: "Liste"
 about: "Informazioni"
 aboutMisskey: "Informazioni di Misskey"
@@ -553,8 +551,8 @@ promote: "Pubblicizza"
 numberOfDays: "Numero di giorni"
 hideThisNote: "Nasconda la nota"
 showFeaturedNotesInTimeline: "Mostrare le note di tendenza nella tua timeline"
-objectStorage: "Storage S3"
-useObjectStorage: "Utilizza lo storage S3 in cloud"
+objectStorage: "Stoccaggio oggetti"
+useObjectStorage: "Utilizza stoccaggio oggetti"
 objectStorageBaseUrl: "Base URL"
 objectStorageBaseUrlDesc: "URL di riferimento. In caso di utilizzo di proxy o CDN l'URL è 'https://<bucket>.s3.amazonaws.com' per S3, 'https://storage.googleapis.com/<bucket>' per GCS eccetera. "
 objectStorageBucket: "Bucket"
@@ -588,7 +586,6 @@ masterVolume: "Volume principale"
 notUseSound: "Non emettere suoni"
 useSoundOnlyWhenActive: "Emetti suoni solo quando Misskey è in attività"
 details: "Dettagli"
-renoteDetails: "Dettagli della Rinota"
 chooseEmoji: "Scegli emoji"
 unableToProcess: "Impossibile compiere l'operazione"
 recentUsed: "Usato di recente"
@@ -686,15 +683,11 @@ smtpSecure: "Usare SSL/TLS implicito per le connessioni SMTP"
 smtpSecureInfo: "Disabilitare quando è attivo STARTTLS."
 testEmail: "Verifica il funzionamento"
 wordMute: "Filtri parole"
-wordMuteDescription: "Contrae le Note con la parola o la frase specificata. Permette di espandere le Note, cliccandole."
 hardWordMute: "Filtro parole forte"
-showMutedWord: "Elenca le parole silenziate"
-hardWordMuteDescription: "Nasconde le Note con la parola o la frase specificata. A differenza delle parole silenziate, la Nota non verrà federata."
 regexpError: "errore regex"
 regexpErrorDescription: "Si è verificato un errore nell'espressione regolare alla riga {line} della parola muta {tab}:"
 instanceMute: "Silenziare l'istanza"
 userSaysSomething: "{name} ha detto qualcosa"
-userSaysSomethingAbout: "{name} ha Notato a riguardo di \"{word}\""
 makeActive: "Attiva"
 display: "Visualizza"
 copy: "Copia"
@@ -706,7 +699,7 @@ database: "Base dati"
 channel: "Canale"
 create: "Crea"
 notificationSetting: "Impostazioni notifiche"
-notificationSettingDesc: "Scegli quali notifiche mostrare."
+notificationSettingDesc: "Seleziona il tipo di notifiche da visualizzare."
 useGlobalSetting: "Usa impostazioni generali"
 useGlobalSettingDesc: "Quando attiva, verranno utilizzate le impostazioni notifiche del profilo. Altrimenti si possono segliere impostazioni personalizzate."
 other: "Eccetera"
@@ -913,7 +906,7 @@ itsOn: "Abilitato"
 itsOff: "Disabilitato"
 on: "Acceso"
 off: "Spento"
-emailRequiredForSignup: "L'indirizzo e-mail è obbligatorio per registrarsi"
+emailRequiredForSignup: "L'ndirizzo e-mail è obbligatorio per registrarsi"
 unread: "Non lette"
 filter: "Filtri"
 controlPanel: "Pannello di controllo"
@@ -976,7 +969,7 @@ requireAdminForView: "Per visualizzarli, è necessario aver effettuato l'accesso
 isSystemAccount: "Questi profili vengono creati e gestiti automaticamente dal sistema"
 typeToConfirm: "Digita {x} per continuare"
 deleteAccount: "Eliminazione profilo"
-document: "Documentazione"
+document: "Documento"
 numberOfPageCache: "Numero di pagine cache"
 numberOfPageCacheDescription: "Aumenta l'usabilità, ma aumenta anche il carico e l'utilizzo della memoria."
 logoutConfirm: "Vuoi davvero uscire da Misskey? "
@@ -1112,7 +1105,7 @@ accountMovedShort: "Questo profilo è stato migrato"
 operationForbidden: "Operazione non consentita"
 forceShowAds: "Mostra sempre i banner"
 addMemo: "Aggiungi Memo"
-editMemo: "Modifica il promemoria"
+editMemo: "Modifica Memo"
 reactionsList: "Chi ha reagito?"
 renotesList: "Chi ha Rinotato?"
 notificationDisplay: "Stile delle notifiche"
@@ -1146,7 +1139,7 @@ options: "Opzioni del ruolo"
 specifyUser: "Profilo specifico"
 lookupConfirm: "Vuoi davvero richiedere informazioni?"
 openTagPageConfirm: "Vuoi davvero aprire la pagina dell'hashtag?"
-specifyHost: "Host specifici"
+specifyHost: "Specifica l'host"
 failedToPreviewUrl: "Anteprima non disponibile"
 update: "Aggiorna"
 rolesThatCanBeUsedThisEmojiAsReaction: "Ruoli che possono usare questa emoji come reazione"
@@ -1246,7 +1239,7 @@ code: "Codice"
 reloadRequiredToApplySettings: "Per applicare le impostazioni, occorre ricaricare."
 remainingN: "Rimangono: {n}"
 overwriteContentConfirm: "Vuoi davvero sostituire l'attuale contenuto?"
-seasonalScreenEffect: "Abilita gli effetti speciali stagionali"
+seasonalScreenEffect: "Schermate in base alla stagione"
 decorate: "Decora"
 addMfmFunction: "Aggiungi decorazioni"
 enableQuickAddMfmFunction: "Attiva il selettore di funzioni MFM"
@@ -1305,10 +1298,6 @@ yourNameContainsProhibitedWordsDescription: "Se desideri comunque utilizzare que
 thisContentsAreMarkedAsSigninRequiredByAuthor: "L'autore richiede di iscriversi per vedere il contenuto"
 lockdown: "Isolamento"
 pleaseSelectAccount: "Per favore, seleziona un profilo"
-availableRoles: "Ruoli disponibili"
-acknowledgeNotesAndEnable: "Attivare dopo averne compreso il comportamento."
-federationSpecified: "Questo server è federato solo con istanze specifiche del Fediverso. Puoi interagire solo con quelle scelte dall'amministrazione."
-federationDisabled: "Questo server ha la federazione disabilitata. Non puoi interagire con profili provenienti da altri server."
 _accountSettings:
   requireSigninToViewContents: "Per vedere il contenuto, è necessaria l'iscrizione"
   requireSigninToViewContentsDescription1: "Richiedere l'iscrizione per visualizzare tutte le Note e gli altri contenuti che hai creato. Probabilmente l'effetto è impedire la raccolta di informazioni da parte dei bot crawler."
@@ -1465,8 +1454,6 @@ _serverSettings:
   reactionsBufferingDescription: "Attivando questa opzione, puoi migliorare significativamente le prestazioni durante la creazione delle reazioni e ridurre il carico sul database. Tuttavia, aumenterà l'impiego di memoria Redis."
   inquiryUrl: "URL di contatto"
   inquiryUrlDescription: "Specificare l'URL al modulo di contatto, oppure le informazioni con i dati di contatto dell'amministrazione."
-  openRegistration: "Registrazioni aperte"
-  openRegistrationWarning: "L’apertura della registrazione comporta dei rischi. Ti consigliamo di attivarla solo se hai predisposto il monitoraggio continuo del tuo server e puoi rispondere immediatamente se si verifica un problema."
   thisSettingWillAutomaticallyOffWhenModeratorsInactive: "Per prevenire SPAM, questa impostazione verrà disattivata automaticamente, se non si rileva alcuna attività di moderazione durante un certo periodo di tempo."
 _accountMigration:
   moveFrom: "Migra un altro profilo dentro a questo"
@@ -1936,7 +1923,7 @@ _channel:
   edit: "Gerisci canale"
   setBanner: "Scegli intestazione"
   removeBanner: "Rimuovi intestazione"
-  featured: "Popolari nel canale"
+  featured: "Di tendenza"
   owned: "I miei canali"
   following: "Following"
   usersCount: "{n} partecipanti"
@@ -2213,7 +2200,7 @@ _widgets:
   notifications: "Notifiche"
   timeline: "Timeline"
   calendar: "Calendario"
-  trends: "Hashtag popolari"
+  trends: "Di tendenza"
   clock: "Orologio"
   rss: "Lettura RSS"
   rssTicker: "Nastro RSS"
@@ -2453,13 +2440,13 @@ _notification:
     quote: "Cita"
     reaction: "Reazioni"
     pollEnded: "Sondaggio chiuso."
-    receiveFollowRequest: "Richieste di follow in arrivo"
-    followRequestAccepted: "Richieste di follow accettate"
+    receiveFollowRequest: "Richiesta di follow ricevuta"
+    followRequestAccepted: "Richiesta di follow accettata"
     roleAssigned: "Ruolo concesso"
     achievementEarned: "Risultato raggiunto"
     exportCompleted: "Esportazione completata"
-    login: "Accessi"
-    test: "Notifiche di test"
+    login: "Accedi"
+    test: "Prova la notifica"
     app: "Notifiche da applicazioni"
   _actions:
     followBack: "Following ricambiato"
@@ -2729,66 +2716,6 @@ _contextMenu:
   app: "Applicazione"
   appWithShift: "Applicazione Shift+Tasto"
   native: "Interfaccia utente del browser"
-_gridComponent:
-  _error:
-    requiredValue: "Campo obbligatorio"
-    columnTypeNotSupport: "Solo le colonne type:text permettono la convalida delle Espresioni Regolari"
-    patternNotMatch: "Il valore non coincide con {pattern}"
-    notUnique: "Il valore deve essere univoco"
-_roleSelectDialog:
-  notSelected: "Niente selezioato"
-_customEmojisManager:
-  _gridCommon:
-    copySelectionRows: "Copia le righe selezionate"
-    copySelectionRanges: "Copia l'intervallo selezionato"
-    deleteSelectionRows: "Elimina le righe selezionate"
-    deleteSelectionRanges: "Elimina le righe nell'intervallo selezionato"
-    searchSettings: "Impostazioni di ricerca"
-    searchSettingCaption: "Imposta condizioni di ricerca dettagliate."
-    searchLimit: "Risultati visualizzati"
-    sortOrder: "Ordine"
-    registrationLogs: "Storico della registrazione"
-    registrationLogsCaption: "Lo storico verrà visualizzato in base alla attività sulle emoji. Scompare quando si esegue un'operazione di aggiornamento/eliminazione o si modifica/ricarica la pagina."
-    alertEmojisRegisterFailedDescription: "Attenzione, è impossibile modificare la emoji. Si prega di controllare lo storico per ulteriori dettagli."
-  _logs:
-    showSuccessLogSwitch: "Mostra le azioni a buon fine"
-    failureLogNothing: "Non ci sono errori nello storico delle emoji"
-    logNothing: "Lo storico è vuoto."
-  _remote:
-    selectionRowDetail: "Dettagli della riga selezionata"
-    importSelectionRows: "Importa le righe selezionate"
-    importSelectionRangesRows: "Importa le righe nell'intervallo selezionato"
-    importEmojisButton: "Importa le emoji selezionate"
-    confirmImportEmojisTitle: "Importazione emoji"
-    confirmImportEmojisDescription: "Importazione di {count} emoji ricevute da remoto. Si prega di prestare molta attenzione al tipo di licenza delle emoji. Vuoi confermare?"
-  _local:
-    tabTitleList: "Elenco delle emoji registrate"
-    tabTitleRegister: "Registrazione emoji"
-    _list:
-      emojisNothing: "Non ci sono emoji registrate."
-      markAsDeleteTargetRows: "Selezionare le righe come eliminabili"
-      markAsDeleteTargetRanges: "Selezionare le righe nell'intervallo come eliminabili"
-      alertUpdateEmojisNothingDescription: "Non ci sono emoji aggiornate."
-      alertDeleteEmojisNothingDescription: "Non ci sono emoji da eliminare."
-      confirmMovePage: "Vuoi davvero spostare la pagina?"
-      confirmChangeView: "Vuoi davvero cambiare la vista?"
-      confirmUpdateEmojisDescription: "Aggiornamento di {count} emoji. Vuoi davvero continuare?"
-      confirmDeleteEmojisDescription: "Eliminazione delle {count} emoji selezionate. Vuoi davvero continuare?"
-      confirmResetDescription: "Verranno ripristinate tutte le modifiche apportate finora."
-      confirmMovePageDesciption: "Sono state modificate le emoji in questa pagina.\nUscendo senza salvare, tutte le modifiche verranno ignorate."
-      dialogSelectRoleTitle: "Cerca emoji per ruolo"
-    _register:
-      uploadSettingTitle: "Caricamento impostazioni"
-      uploadSettingDescription: "Questa schermata ti permette di scegliere il comportamento durante il caricamento delle emoji."
-      directoryToCategoryLabel: "Inseriscile in una cartella omonima alla categoria"
-      directoryToCategoryCaption: "Crea il campo categoria in base alla cartella."
-      emojiInputAreaCaption: "Seleziona l'emoji da registrare utilizzando uno dei metodi."
-      emojiInputAreaList1: "Trascina una immagine o una cartella in quest'area"
-      emojiInputAreaList2: "Clicca per scegliere file dal tuo dispositivo"
-      emojiInputAreaList3: "Clicca per selezionare dal Drive"
-      confirmRegisterEmojisDescription: "Registrazione delle emoji elencate come nuove emoji personalizzate. Vuoi davvero procedere? (Per evitare sovraccarichi, puoi registrare al massimo {count} emoji per volta)"
-      confirmClearEmojisDescription: "Annullare le modifiche e cancella le emoji nell'elenco. Confermi?"
-      confirmUploadEmojisDescription: "Caricamento sul Drive di {count} file locali. Vuoi davvero procedere?"
 _embedCodeGen:
   title: "Personalizza il codice di incorporamento"
   header: "Mostra la testata"
@@ -2809,37 +2736,3 @@ _selfXssPrevention:
   description1: "Incollando qualcosa qui, malintenzionati potrebbero prendere il controllo del tuo profilo o rubare i tuoi dati personali."
   description2: "Se non sai esattamente cosa stai facendo, %c smetti subito e chiudi questa finestra."
   description3: "Per favore, controlla questo collegamento per avere maggiori dettagli. {link}"
-_followRequest:
-  recieved: "Ricezione richiesta di Follow"
-  sent: "Richiesta di Follow, inviata"
-_remoteLookupErrors:
-  _federationNotAllowed:
-    title: "Server irraggiungibile"
-    description: "La comunicazione con questo server potrebbe essere disattivata. Hai bloccato il server? Oppure potrebbero averlo bloccato gli amministratori. Contattali per ulteriori informazioni."
-  _uriInvalid:
-    title: "URL non valido"
-    description: "Controlla che l'indirizzo sia valido e sia privo di caratteri non validi."
-  _requestFailed:
-    title: "Richiesta fallita"
-    description: "La comunicazione col server non è riuscita. Potrebbe essere inattivo. Assicurati anche che la URL sia valida."
-  _responseInvalid:
-    title: "Risposta non valida"
-    description: "La comunicazione col server è andata a buon fine, ma abbiamo ricevuto dati non validi."
-  _responseInvalidIdHostNotMatch:
-    description: "L'indirizzo immesso non coincide con la URL finale. Interrogando i server per un contenuto remoto, assicurarsi di utilizzare la URL finale e non quella di un server intermedio."
-  _noSuchObject:
-    title: "Non trovato"
-    description: "La risorsa richiesta non è stata trovata. Verificare nuovamente la URL."
-_captcha:
-  verify: "Per favore, controlla la verifica CAPTCHA"
-  testSiteKeyMessage: "Puoi provare l'anteprima inserendo valori di test, sia per la chiave del sito che per la chiave segreta.\nSi prega di controllare la pagina qui sotto per i dettagli."
-  _error:
-    _requestFailed:
-      title: "Errore durante la richiesta del CAPTCHA"
-      text: "Riprova più tardi o controlla nuovamente le impostazioni."
-    _verificationFailed:
-      title: "Convalida CAPTCHA non riuscita"
-      text: "Si prega di verificare nuovamente se le impostazioni sono corrette."
-    _unknown:
-      title: "Errore CAPTCHA"
-      text: "Si è verificato un errore imprevisto."

locales/ja-JP.yml

@@ -5,7 +5,6 @@ introMisskey: "ようこそ！Misskeyは、オープンソースの分散型マ
 poweredByMisskeyDescription: "{name}は、オープンソースのプラットフォーム<b>Misskey</b>のサーバーのひとつです。"
 monthAndDay: "{month}月 {day}日"
 search: "検索"
-reset: "リセット"
 notifications: "通知"
 username: "ユーザー名"
 password: "パスワード"
@@ -49,7 +48,6 @@ pin: "ピン留め"
 unpin: "ピン留め解除"
 copyContent: "内容をコピー"
 copyLink: "リンクをコピー"
-copyRemoteLink: "リモートのリンクをコピー"
 copyLinkRenote: "リノートのリンクをコピー"
 delete: "削除"
 deleteAndEdit: "削除して編集"
@@ -686,15 +684,11 @@ smtpSecure: "SMTP 接続に暗黙的なSSL/TLSを使用する"
 smtpSecureInfo: "STARTTLS使用時はオフにします。"
 testEmail: "配信テスト"
 wordMute: "ワードミュート"
-wordMuteDescription: "指定した語句を含むノートを最小化します。最小化されたノートをクリックすることで表示することができます。"
 hardWordMute: "ハードワードミュート"
-showMutedWord: "ミュートされたワードを表示"
-hardWordMuteDescription: "指定した語句を含むノートを隠します。ワードミュートとは異なり、ノートは完全に表示されなくなります。"
 regexpError: "正規表現エラー"
 regexpErrorDescription: "{tab}ワードミュートの{line}行目の正規表現にエラーが発生しました:"
 instanceMute: "サーバーミュート"
 userSaysSomething: "{name}が何かを言いました"
-userSaysSomethingAbout: "{name}が「{word}」について何かを言いました"
 makeActive: "アクティブにする"
 display: "表示"
 copy: "コピー"
@@ -1307,8 +1301,6 @@ lockdown: "ロックダウン"
 pleaseSelectAccount: "アカウントを選択してください"
 availableRoles: "利用可能なロール"
 acknowledgeNotesAndEnable: "注意事項を理解した上でオンにします。"
-federationSpecified: "このサーバーはホワイトリスト連合で運用されています。管理者が指定したサーバー以外とやり取りすることはできません。"
-federationDisabled: "このサーバーは連合が無効化されています。他のサーバーのユーザーとやり取りすることはできません。"
 
 _accountSettings:
   requireSigninToViewContents: "コンテンツの表示にログインを必須にする"
@@ -2809,69 +2801,6 @@ _contextMenu:
   appWithShift: "Shiftキーでアプリケーション"
   native: "ブラウザのUI"
 
-_gridComponent:
-  _error:
-    requiredValue: "この値は必須項目です"
-    columnTypeNotSupport: "正規表現によるバリデーションはtype:textのカラムのみサポートします。"
-    patternNotMatch: "この値は{pattern}のパターンに一致しません"
-    notUnique: "この値は一意である必要があります"
-
-_roleSelectDialog:
-  notSelected: "選択されていません"
-
-_customEmojisManager:
-  _gridCommon:
-    copySelectionRows: "選択行をコピー"
-    copySelectionRanges: "選択範囲をコピー"
-    deleteSelectionRows: "選択行を削除"
-    deleteSelectionRanges: "選択範囲の値をクリア"
-    searchSettings: "検索設定"
-    searchSettingCaption: "検索条件を詳細に設定します。"
-    searchLimit: "表示件数"
-    sortOrder: "並び順"
-    registrationLogs: "登録ログ"
-    registrationLogsCaption: "絵文字更新・削除時のログが表示されます。更新・削除操作を行ったり、ページを遷移・リロードすると消えます。"
-    alertEmojisRegisterFailedDescription: "絵文字の更新・削除に失敗しました。詳細は登録ログをご確認ください。"
-  _logs:
-    showSuccessLogSwitch: "成功ログを表示"
-    failureLogNothing: "失敗ログはありません。"
-    logNothing: "ログはありません。"
-  _remote:
-    selectionRowDetail: "選択行の詳細"
-    importSelectionRows: "選択行をインポート"
-    importSelectionRangesRows: "選択範囲の行をインポート"
-    importEmojisButton: "チェックされた絵文字をインポート"
-    confirmImportEmojisTitle: "絵文字のインポート"
-    confirmImportEmojisDescription: "リモートから受信した{count}個の絵文字のインポートを行います。絵文字のライセンスに十分な注意を払ってください。実行しますか？"
-  _local:
-    tabTitleList: "登録済み絵文字一覧"
-    tabTitleRegister: "絵文字の登録"
-    _list:
-      emojisNothing: "登録された絵文字はありません。"
-      markAsDeleteTargetRows: "選択行を削除対象にする"
-      markAsDeleteTargetRanges: "選択範囲の行を削除対象にする"
-      alertUpdateEmojisNothingDescription: "変更された絵文字はありません。"
-      alertDeleteEmojisNothingDescription: "削除対象の絵文字はありません。"
-      confirmMovePage: "ページを移動しますか？"
-      confirmChangeView: "表示を変更しますか？"
-      confirmUpdateEmojisDescription: "{count}個の絵文字を更新します。実行しますか？"
-      confirmDeleteEmojisDescription: "チェックがつけられた{count}個の絵文字を削除します。実行しますか？"
-      confirmResetDescription: "今までに加えた変更がすべてリセットされます。"
-      confirmMovePageDesciption: "このページの絵文字に変更が加えられています。\n保存せずにこのままページを移動すると、このページで加えた変更はすべて破棄されます。"
-      dialogSelectRoleTitle: "絵文字に設定されたロールで検索"
-    _register:
-      uploadSettingTitle: "アップロード設定"
-      uploadSettingDescription: "この画面で絵文字アップロードを行う際の動作を設定できます。"
-      directoryToCategoryLabel: "ディレクトリ名を\"category\"に入力する"
-      directoryToCategoryCaption: "ディレクトリをドラッグ・ドロップした時に、ディレクトリ名を\"category\"に入力します。"
-      emojiInputAreaCaption: "いずれかの方法で登録する絵文字を選択してください。"
-      emojiInputAreaList1: "この枠に画像ファイルまたはディレクトリをドラッグ＆ドロップ"
-      emojiInputAreaList2: "このリンクをクリックしてPCから選択する"
-      emojiInputAreaList3: "このリンクをクリックしてドライブから選択する"
-      confirmRegisterEmojisDescription: "リストに表示されている絵文字を新たなカスタム絵文字として登録します。よろしいですか？（負荷を避けるため、一度の操作で登録可能な絵文字は{count}件までです）"
-      confirmClearEmojisDescription: "編集内容を破棄し、リストに表示されている絵文字をクリアします。よろしいですか？"
-      confirmUploadEmojisDescription: "ドラッグ＆ドロップされた{count}個のファイルをドライブにアップロードします。実行しますか？"
-
 _embedCodeGen:
   title: "埋め込みコードをカスタマイズ"
   header: "ヘッダーを表示"
@@ -2897,36 +2826,3 @@ _selfXssPrevention:
 _followRequest:
   recieved: "受け取った申請"
   sent: "送った申請"
-
-_remoteLookupErrors:
-  _federationNotAllowed:
-    title: "このサーバーとは通信できません"
-    description: "このサーバーとの通信が無効化されているか、このサーバーをブロックしている・ブロックされている可能性があります。\nサーバー管理者にお問い合わせください。"
-  _uriInvalid:
-    title: "URIが不正です"
-    description: "入力されたURIに問題があります。URIに使用できない文字を入力していないか確認してください。"
-  _requestFailed:
-    title: "リクエストに失敗しました"
-    description: "このサーバーとの通信に失敗しました。相手サーバーがダウンしている可能性があります。また、不正なURIや存在しないURIを入力していないか確認してください。"
-  _responseInvalid:
-    title: "レスポンスが不正です"
-    description: "このサーバーと通信することはできましたが、得られたデータが不正なものでした。"
-  _responseInvalidIdHostNotMatch:
-    description: "入力されたURIのドメインと最終的に得られたURIのドメインとが異なります。第三者のサーバーを介してリモートのコンテンツを照会している場合は、発信元のサーバーで取得できるURIを使用して照会し直してください。"
-  _noSuchObject:
-    title: "見つかりません"
-    description: "要求されたリソースは見つかりませんでした。URIをもう一度お確かめください。"
-
-_captcha:
-  verify: "CAPTCHAを通過してください"
-  testSiteKeyMessage: "サイトキーとシークレットキーにテスト用の値を入力することでプレビューを確認できます。\n詳細は下記ページをご確認ください。"
-  _error:
-    _requestFailed:
-      title: "CAPTCHAのリクエストに失敗しました"
-      text: "しばらく後に実行するか、設定をもう一度ご確認ください。"
-    _verificationFailed:
-      title: "CAPTCHAの検証に失敗しました"
-      text: "設定が正しいかどうかもう一度確認ください。"
-    _unknown:
-      title: "CAPTCHAエラー"
-      text: "想定外のエラーが発生しました。"

locales/ja-KS.yml

@@ -15,7 +15,7 @@ forgotPassword: "パスワード忘れたん？"
 fetchingAsApObject: "今ちと連合に照会しとるで"
 ok: "ええで"
 gotIt: "ほい"
-cancel: "やめる"
+cancel: "やめとく"
 noThankYou: "やめとく"
 enterUsername: "ユーザー名を入れてや"
 renotedBy: "{user}がリノートしたで"
@@ -26,7 +26,7 @@ settings: "設定"
 notificationSettings: "通知の設定"
 basicSettings: "基本設定"
 otherSettings: "ほかの設定"
-openInWindow: "ウィンドウで開く"
+openInWindow: "ウィンドウで開くで"
 profile: "プロフィール"
 timeline: "タイムライン"
 noAccountDescription: "自己紹介食ってもた"
@@ -45,7 +45,7 @@ favorited: "お気に入りに入れたで。"
 alreadyFavorited: "もうお気に入りに入れとるがな。"
 cantFavorite: "アカン、お気に入りに入れれんかったわ。"
 pin: "ピン留めしとく"
-unpin: "ピン留めやめる"
+unpin: "やっぱピン留めせん"
 copyContent: "内容をコピー"
 copyLink: "リンクをコピー"
 copyLinkRenote: "リノートのリンクをコピーするで？"
@@ -63,7 +63,7 @@ copyFileId: "ファイルIDをコピー"
 copyFolderId: "フォルダーIDをコピー"
 copyProfileUrl: "プロフィールURLをコピー"
 searchUser: "ユーザーを探す"
-searchThisUsersNotes: "ユーザーのノートを探す"
+searchThisUsersNotes: "ユーザーのノートを検索"
 reply: "返事"
 loadMore: "まだまだあるで！"
 showMore: "まだまだあるで！"
@@ -138,8 +138,8 @@ reactionSettingDescription2: "ドラッグで並び替え、クリックで削
 rememberNoteVisibility: "公開範囲覚えといて"
 attachCancel: "のっけるのやめる"
 deleteFile: "ファイルをほかす"
-markAsSensitive: "ちょっと見せられへんわ"
-unmarkAsSensitive: "別にええんじゃね？"
+markAsSensitive: "ちょっとこれはアカン"
+unmarkAsSensitive: "そこまでアカンことないやろ"
 enterFileName: "ファイル名を入れてや"
 mute: "ミュート"
 unmute: "ミュートやめたる"
@@ -152,13 +152,13 @@ unsuspend: "溶かす"
 blockConfirm: "ブロックしてもええんか？"
 unblockConfirm: "ブロックやめたるってほんまか？"
 suspendConfirm: "凍結してしもうてええか？"
-unsuspendConfirm: "溶かしたるけどええか？"
+unsuspendConfirm: "解凍するけどええか？"
 selectList: "リストを選ぶ"
 editList: "リストいじる"
 selectChannel: "チャンネルを選ぶ"
 selectAntenna: "アンテナを選ぶ"
 editAntenna: "アンテナいじる"
-createAntenna: "アンテナを作る"
+createAntenna: "アンテナを作成"
 selectWidget: "ウィジェットを選ぶ"
 editWidgets: "ウィジェットをいじる"
 editWidgetsExit: "いじるのをやめる"
@@ -172,12 +172,12 @@ settingGuide: "ええ感じの設定"
 cacheRemoteFiles: "リモートのファイルをキャッシュする"
 cacheRemoteFilesDescription: "この設定を入れとったら、リモートのファイルを端から端までこのサーバーのキャッシュん中突っ込むようになるで。画像映し出すんがめっちゃ速うなるけど、サーバーの容量をやたらと食うようになるで。リモートの人がどんだけ長くキャッシュを持っとくかはドライブ容量の制限で決めとくで。制限を超えたら古いのから順々に消してって、かわりにリンクになるで。この設定を切ったら、リモートのファイルは最初っからリンクとして扱うことにするけど、画像のサムネ作るのとかみんなのプライバシー守るために、default.ymlのproxyRemoteFilesをtrueにしといたほうがええよ。"
 youCanCleanRemoteFilesCache: "ファイル管理にある🗑️ボタンでキャッシュ全部ほかすで。"
-cacheRemoteSensitiveFiles: "リモートのきわどいファイルをキャッシュする"
+cacheRemoteSensitiveFiles: "リモートのきわどいファイルをキャッシュに突っ込む"
 cacheRemoteSensitiveFilesDescription: "この設定を切ると、リモートのきわどいファイルはキャッシュせず直でリンクするようになるで。"
 flagAsBot: "Botにするで"
 flagAsBotDescription: "もしこのアカウントをプログラム使うて運用するんやったら、このフラグをオンにしてや。オンにすれば、反応がバーッて連鎖せんように開発者が使うたり、Misskeyのシステム上での扱いがBotに合ったもんになるからな。"
 flagAsCat: "猫や。かわええな。"
-flagAsCatDescription: "猫になりたいんならこれつけとき。"
+flagAsCatDescription: "ネコになりたいんならこれつけとき。"
 flagShowTimelineReplies: "タイムラインにノートへの返信を表示するで"
 flagShowTimelineRepliesDescription: "オンにしたら、タイムラインにユーザーのノートの他にもそのユーザーの他のノートへの返信を表示するで。"
 autoAcceptFollowed: "フォローしとるユーザーからのフォローリクエストを勝手に許可しとく"
@@ -186,9 +186,9 @@ reloadAccountsList: "アカウントリストの情報を更新"
 loginFailed: "ログインに失敗してもうた…"
 showOnRemote: "リモートで見る"
 continueOnRemote: "リモートで続行"
-chooseServerOnMisskeyHub: "Misskey Hubからサーバーを選ぶ"
+chooseServerOnMisskeyHub: "Misskey Hubからサーバーを選択"
 specifyServerHost: "サーバーのドメインを直接指定"
-inputHostName: "ドメインを入力してや"
+inputHostName: "ドメインを入力せえや"
 general: "全般"
 wallpaper: "壁紙"
 setWallpaper: "壁紙を設定"
@@ -586,7 +586,6 @@ masterVolume: "全体のやかましさ"
 notUseSound: "音出さへん"
 useSoundOnlyWhenActive: "Misskeyがアクティブなときだけ音出す"
 details: "もっと"
-renoteDetails: "リノートの詳細"
 chooseEmoji: "絵文字を選ぶ"
 unableToProcess: "なんか奥の方で詰まってもうた"
 recentUsed: "最近使ったやつ"
@@ -947,9 +946,6 @@ oneHour: "1時間"
 oneDay: "1日"
 oneWeek: "1週間"
 oneMonth: "1ヶ月"
-threeMonths: "3ヶ月"
-oneYear: "1年"
-threeDays: "3日"
 reflectMayTakeTime: "反映されるまで時間がかかることがあるで"
 failedToFetchAccountInformation: "アカウントの取得に失敗したみたいや…"
 rateLimitExceeded: "レート制限が超えたみたいやで"
@@ -1296,23 +1292,6 @@ prohibitedWordsForNameOfUser: "禁止ワード（ユーザー名）"
 prohibitedWordsForNameOfUserDescription: "このリストの中にある文字列がユーザー名に入っとったら、その名前に変更できひんようになるで。モデレーター権限があるユーザーは除外や。"
 yourNameContainsProhibitedWords: "その名前は禁止した文字列が含まれとるで"
 yourNameContainsProhibitedWordsDescription: "その名前は禁止した文字列が含まれとるわ。どうしてもって言うなら、サーバー管理者に言うしかないで。"
-thisContentsAreMarkedAsSigninRequiredByAuthor: "投稿者が、表示にログインが要るって設定してるで"
-lockdown: "ロックダウン"
-pleaseSelectAccount: "アカウント選んでや"
-availableRoles: "使えるロール"
-acknowledgeNotesAndEnable: "注意事項をわかった上でオンにする。"
-_accountSettings:
-  requireSigninToViewContents: "ログインしてもらってからコンテンツ見てもらう"
-  requireSigninToViewContentsDescription1: "あなたが作成した全部のノートとかのコンテンツを見れるようにするのにログインがいるようにするで。クローラーにいろいろ収集されるんを防げるかもしれん。"
-  requireSigninToViewContentsDescription2: "URLプレビュー(OGP)、Webページへの埋め込み、ノートの引用に対応してないサーバーからの表示ができんくなるで。"
-  requireSigninToViewContentsDescription3: "リモートサーバーに連合されたコンテンツは、これらの制限が適用されんかもしれんで。"
-  makeNotesFollowersOnlyBefore: "昔のノートをフォロワーだけに見てもらう"
-  makeNotesFollowersOnlyBeforeDescription: "この機能が有効になってる間は、設定された日時より前、それか設定された時間が経ったノートがフォロワーのみ見れるようになるで。無効に戻すと、ノートの公開状態も戻るで。"
-  makeNotesHiddenBefore: "昔のノートを見れんようにする"
-  makeNotesHiddenBeforeDescription: "この機能が有効になってる間は、設定された日時より前、それか設定された時間が経ったノートがフォロワーのみ見れるようになるで。無効に戻すと、ノートの公開状態も戻るで。"
-  mayNotEffectForFederatedNotes: "リモートサーバーに連合されたノートには効果が及ばんかもしれん。"
-  notesHavePassedSpecifiedPeriod: "決めた時間が経ったノート"
-  notesOlderThanSpecifiedDateAndTime: "決めた日時より前のノート"
 _abuseUserReport:
   forward: "転送"
   forwardDescription: "匿名のシステムアカウントってことにして、リモートサーバーに通報を転送するで。"
@@ -1457,8 +1436,6 @@ _serverSettings:
   reactionsBufferingDescription: "有効にしたら、リアクション作るときのパフォーマンスがすっごい上がって、データベースへの負荷が減るで。代わりに、Redisのメモリ使用は増えるで。"
   inquiryUrl: "問い合わせ先URL"
   inquiryUrlDescription: "サーバー運営者へのお問い合わせフォームのURLや、運営者の連絡先等が記載されたWebページのURLを指定するで。"
-  openRegistration: "アカウントの作成をオープンにする"
-  openRegistrationWarning: "登録を解放するのはリスクが伴うで。サーバーをいっつも監視して、なんか起きたらすぐに対応できるんやったら、オンにしてもええと思う。"
   thisSettingWillAutomaticallyOffWhenModeratorsInactive: "一定期間モデレーターがおらんかったら、スパムを防ぐためにこの設定は勝手に切られるで。"
 _accountMigration:
   moveFrom: "別のアカウントからこのアカウントに引っ越す"
@@ -2179,11 +2156,8 @@ _auth:
   permissionAsk: "このアプリは次の権限を要求しとるで"
   pleaseGoBack: "アプリケーションに戻ってええよ"
   callback: "アプリケーションに戻っとるで"
-  accepted: "アクセスを許可したで"
   denied: "アクセスを拒否ったで"
-  scopeUser: "以下のユーザーとしていじってるで"
   pleaseLogin: "アプリにアクセスさせるんやったら、ログインしてや。"
-  byClickingYouWillBeRedirectedToThisUrl: "アクセスを許したら、自動で下のURLに遷移するで"
 _antennaSources:
   all: "みんなのノート"
   homeTimeline: "フォローしとるユーザーのノート"
@@ -2735,30 +2709,3 @@ _embedCodeGen:
   generateCode: "埋め込みコード作る"
   codeGenerated: "コード作ったで"
   codeGeneratedDescription: "作ったコードはウェブサイトに貼っつけて使ってや。"
-_selfXssPrevention:
-  warning: "警告"
-  title: "「この画面になんか貼り付けろ」は全部詐欺やで。"
-  description1: "ここになんかはつっつけると、悪いユーザーにアカウント乗っ取られたり、個人情報盗まれたりするかもやで"
-  description2: "はっつけようとしてるものがなんなんかわからんのやったら、%c今すぐ作業やめてウィンドウを閉じて。"
-  description3: "詳しくはこれを見て。{link}"
-_followRequest:
-  recieved: "もらった申請"
-  sent: "送った申請"
-_remoteLookupErrors:
-  _federationNotAllowed:
-    title: "このサーバーと通信できん"
-    description: "このサーバーとの通信は無効化されてるか、このサーバーをブロックしてるんか、ブロックされてるかもしれん。\nサーバー管理者に問い合わせてや。"
-  _uriInvalid:
-    title: "URIがおかしいで"
-    description: "入力されたURIに問題があるで。URIに使えん文字を入れてないから確かめて。"
-  _requestFailed:
-    title: "リクエスト失敗してもうたで"
-    description: "このサーバーとの通信に失敗してもうたわ。相手サーバーがダウンしてるかもしれん。あと、おかしいURIとか、ありえんURIを入れてないか確かめて。"
-  _responseInvalid:
-    title: "レスポンスがおかしいで"
-    description: "このサーバーと通信することはできたけど、もらったデータがおかしかったで。"
-  _responseInvalidIdHostNotMatch:
-    description: "入力されたURIのドメインと最終的に得られたURIのドメインとが違うで。第三者のサーバーを介してリモートのコンテンツを照会してるんやったら、発信元のサーバーで取得できるURIを使って照会し直して。"
-  _noSuchObject:
-    title: "見つからへんね"
-    description: "求められたリソースが見つからんかったで。URIをもっかい確かめてや。"

locales/ko-GS.yml

@@ -840,6 +840,3 @@ _reversi:
   black: "꺼멍"
   white: "허영"
   total: "합게"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "몬 찾앗십니다"

locales/ko-KR.yml

@@ -5,7 +5,6 @@ introMisskey: "환영합니다! Misskey는 오픈 소스 분산형 마이크로
 poweredByMisskeyDescription: "{name} 서버는 오픈소스 플랫폼 <b>Misskey</b>의 서버 가운데 하나입니다."
 monthAndDay: "{month}월 {day}일"
 search: "검색"
-reset: "초기화"
 notifications: "알림"
 username: "유저명"
 password: "비밀번호"
@@ -49,7 +48,6 @@ pin: "프로필에 고정"
 unpin: "프로필에서 고정 해제"
 copyContent: "내용 복사"
 copyLink: "링크 복사"
-copyRemoteLink: "리모트 서버의 링크로 복사하기"
 copyLinkRenote: "리노트 링크 복사"
 delete: "삭제"
 deleteAndEdit: "삭제 후 편집"
@@ -686,15 +684,11 @@ smtpSecure: "SMTP 연결에 Implicit SSL/TTS 사용"
 smtpSecureInfo: "STARTTLS 사용 시에는 해제합니다."
 testEmail: "이메일 전송 테스트"
 wordMute: "단어 뮤트"
-wordMuteDescription: "정해진 단어가 포함된 노트를 최소화 한 상태로 표시합니다. 최소화 된 노트는 클릭해서 표시할 수 있습니다."
 hardWordMute: "하드 단어 뮤트"
-showMutedWord: "뮤트한 단어를 표시하기"
-hardWordMuteDescription: "정한 단어가 들어간 노트를 숨깁니다. 단어 뮤트와 차이점은 노트가 아예 보이지 않습니다."
 regexpError: "정규 표현식 오류"
 regexpErrorDescription: "{tab}단어 뮤트 {line}행의 정규 표현식에 오류가 발생했습니다:"
 instanceMute: "서버 뮤트"
 userSaysSomething: "{name}님이 무언가를 말했습니다"
-userSaysSomethingAbout: "{name}님이 \"{word}\"를 언급했습니다."
 makeActive: "활성화"
 display: "보기"
 copy: "복사"
@@ -1307,15 +1301,13 @@ lockdown: "잠금"
 pleaseSelectAccount: "계정을 선택해주세요."
 availableRoles: "사용 가능한 역할"
 acknowledgeNotesAndEnable: "활성화 하기 전에 주의 사항을 확인했습니다."
-federationSpecified: "이 서버는 화이트 리스트 제도로 운영 중 입니다. 정해진 리모트 서버가 아닌 경우 연합되지 않습니다."
-federationDisabled: "이 서버는 연합을 하지 않고 있습니다. 리모트 서버 유저와 통신을 할 수 없습니다."
 _accountSettings:
-  requireSigninToViewContents: "콘텐츠 열람을 위해 로그인을 필수로 설정하기"
+  requireSigninToViewContents: "콘텐츠 열람을 위해 로그인으 필수로 설정하기"
   requireSigninToViewContentsDescription1: "자신이 작성한 모든 노트 등의 콘텐츠를 보기 위해 로그인을 필수로 설정합니다. 크롤러가 정보 수집하는 것을 방지하는 효과를 기대할 수 있습니다."
   requireSigninToViewContentsDescription2: "URL 미리보기(OGP), 웹페이지에 삽입, 노트 인용을 지원하지 않는 서버에서 볼 수 없게 됩니다."
   requireSigninToViewContentsDescription3: "원격 서버에 연합된 콘텐츠에는 이러한 제한이 적용되지 않을 수 있습니다."
   makeNotesFollowersOnlyBefore: "과거 노트는 팔로워만 볼 수 있도록 설정하기"
-  makeNotesFollowersOnlyBeforeDescription: "이 기능이 활성화되어 있는 동안, 설정된 날짜 및 시간보다 과거 또는 설정된 시간이 지난 노트는 팔로워만 볼 수 있게 됩니다. 비활성화하면 노트의 공개 상태도 원래대로 돌아갑니다."
+  makeNotesFollowersOnlyBeforeDescription: "이 기능이 활성화되어 있는 동안, 설정된 날짜 및 시간보다 과거 또는 설정된 시간이 지난 노트는 팔로워만 볼 수 있게 됩니다.비활성화하면 노트의 공개 상태도 원래대로 돌아갑니다."
   makeNotesHiddenBefore: "과거 노트 비공개로 전환하기"
   makeNotesHiddenBeforeDescription: "이 기능이 활성화되어 있는 동안 설정한 날짜 및 시간보다 과거 또는 설정한 시간이 지난 노트는 본인만 볼 수 있게(비공개로 전환) 됩니다. 비활성화하면 노트의 공개 상태도 원래대로 돌아갑니다."
   mayNotEffectForFederatedNotes: "원격 서버에 연합된 노트에는 효과가 없을 수도 있습니다."
@@ -2522,7 +2514,7 @@ _webhookSettings:
     reaction: "누군가 내 노트에 리액션했을 때"
     mention: "누군가 나를 멘션했을 때"
   _systemEvents:
-    abuseReport: "유저로부터 신고를 받았을 때"
+    abuseReport: "유저롭"
     abuseReportResolved: "받은 신고를 처리했을 때"
     userCreated: "유저가 생성되었을 때"
     inactiveModeratorsWarning: "모더레이터가 일정 기간동안 활동하지 않은 경우"
@@ -2729,66 +2721,6 @@ _contextMenu:
   app: "애플리케이션"
   appWithShift: "Shift 키로 애플리케이션"
   native: "브라우저의 UI"
-_gridComponent:
-  _error:
-    requiredValue: "이 값은 필수 항목입니다."
-    columnTypeNotSupport: "정규표현 규칙이 type:text인 칼럼만 지원합니다."
-    patternNotMatch: "이 값은 {pattern} 패턴과 일치하지 않습니다."
-    notUnique: "이 값은 다른 값과 중복되지 않아야 합니다."
-_roleSelectDialog:
-  notSelected: "선택하지 않았습니다."
-_customEmojisManager:
-  _gridCommon:
-    copySelectionRows: "선택한 행을 복사하기"
-    copySelectionRanges: "선택범위를 복사하기"
-    deleteSelectionRows: "선택한 행을 삭제"
-    deleteSelectionRanges: "선택한 행을 삭제"
-    searchSettings: "검색 설정"
-    searchSettingCaption: "고급 검색을 설정합니다."
-    searchLimit: "표시 건수"
-    sortOrder: "정렬 순서"
-    registrationLogs: "등록 로그"
-    registrationLogsCaption: "이모지를 갱신하거나 삭제할 때 로그가 표시됩니다. 갱신 또는 삭제하거나, 페이지 이동, 새로 고침하면 삭제됩니다."
-    alertEmojisRegisterFailedDescription: "이모지를 갱신 또는 삭제하지 못했습니다. 자세한 내용은 등록 로그를 확인해주세요."
-  _logs:
-    showSuccessLogSwitch: "성공 로그를 표시"
-    failureLogNothing: "실패 로그가 없습니다."
-    logNothing: "로그가 없습니다."
-  _remote:
-    selectionRowDetail: "선택 행 (상세)"
-    importSelectionRows: "선택 행을 가져오기"
-    importSelectionRangesRows: "선택한 범위 안의 행을 가져오기"
-    importEmojisButton: "선택한 이모지를 가져오기"
-    confirmImportEmojisTitle: "이모지 가져오기"
-    confirmImportEmojisDescription: "리모트 서버에서 받아온 이모지 {count}개를 이 서버로 가져옵니다. 이모지의 저작권, 라이선스를 확실히 확인하셨다면 실행해주세요."
-  _local:
-    tabTitleList: "등록한 이모지 리스트"
-    tabTitleRegister: "이모지 등록"
-    _list:
-      emojisNothing: "등록한 이모지가 없습니다."
-      markAsDeleteTargetRows: "선택한 행을 삭제할 대상으로 하기"
-      markAsDeleteTargetRanges: "선택한 범위의 행을 삭제 대상으로 하기"
-      alertUpdateEmojisNothingDescription: "변경할 이모지가 없습니다."
-      alertDeleteEmojisNothingDescription: "삭제 대상의 이모지는 없습니다."
-      confirmMovePage: "페이지를 이동할까요?"
-      confirmChangeView: "표시를 바꿀까요?"
-      confirmUpdateEmojisDescription: "{count}개의 이모지를 갱신합니다. 실행할까요?"
-      confirmDeleteEmojisDescription: "선택한 이모지 {count}개를 삭제합니다. 실행할까요?"
-      confirmResetDescription: "지금까지 했던 변경 내용이 모두 초기화됩니다."
-      confirmMovePageDesciption: "이 페이지의 이모지에 변경이 있습니다.\n저장하지 않은 상태로 페이지를 이동하면, 이 페이지에서 바꾼 변경 내용이 모두 지워집니다."
-      dialogSelectRoleTitle: "이모지에 설정된 역할을 검색"
-    _register:
-      uploadSettingTitle: "업로드 설정"
-      uploadSettingDescription: "여기서 이모지를 업로드 할 때의 동작을 설정할 수 있습니다."
-      directoryToCategoryLabel: "디렉토리 이름을 \"category\"로 입력하기"
-      directoryToCategoryCaption: "디렉토리를 드래그 앤 드롭한 경우, 디렉토리 이름을 \"category\"로 입력합니다."
-      emojiInputAreaCaption: "이모지를 등록할 방법을 선택해주세요."
-      emojiInputAreaList1: "이 틀 안에 이미지 파일 또는 디렉토리를 끌어서 가져오기"
-      emojiInputAreaList2: "이 링크를 클릭해서 PC에서 선택하기"
-      emojiInputAreaList3: "이 링크를 클릭해서 드라이브에서 선택하기"
-      confirmRegisterEmojisDescription: "리스트에 표시되어진 이모지를 새로운 커스텀 이모지로 등록합니다. 실행할까요? (부하를 피하기 위해, 한 번에 등록할 수 있는 이모지는 {count}건까지 입니다.)"
-      confirmClearEmojisDescription: "편집 내용을 지우고, 목록에 표시되어진 이모지를 지웁니다. 실행할까요?"
-      confirmUploadEmojisDescription: "드래그 앤 드롭한 {count}개의 파일을 드라이브에 업로드 합니다. 실행할까요?"
 _embedCodeGen:
   title: "임베디드 코드를 커스터마이즈"
   header: "해더를 표시"
@@ -2812,34 +2744,3 @@ _selfXssPrevention:
 _followRequest:
   recieved: "받은 신청"
   sent: "보낸 신청"
-_remoteLookupErrors:
-  _federationNotAllowed:
-    title: "이 서버와 통신할 수 없음"
-    description: "이 서버와의 통신이 비활성화 되었거나, 이 서버를 차단 중이거나 서버에게 차단되었을 수 있습니다.\n서버 관리자에게 문의하세요."
-  _uriInvalid:
-    title: "URI가 잘못되었습니다."
-    description: "입력한 URI에 문제가 있습니다. URI에 쓸 수 없는 문자를 넣었는지 확인해보세요."
-  _requestFailed:
-    title: "요청을 실패했습니다."
-    description: "해당 서버와 통신을 실패했습니다. 상대방 서버에 접속 불가능한 상태일 수도 있습니다. 또는 잘못된 URI 또는 없는 URI를 입력했는지 확인해보세요."
-  _responseInvalid:
-    title: "유효하지 않은 반응입니다."
-    description: "이 서버와 통신할 수 있지만, 데이터가 올바르지 않습니다."
-  _responseInvalidIdHostNotMatch:
-    description: "입력된 URI과 실제 URI가 다릅니다. 제 3자 서버를 통한 리모트 컨텐츠를 조회하는 경우, 원래 서버 측에서 받아올 수 있는 URI를 사용하여 조회하시길 바랍니다."
-  _noSuchObject:
-    title: "찾을 수 없습니다"
-    description: "요구된 리소스를 찾을 수 없습니다. URI를 다시 한 번 확인해보세요."
-_captcha:
-  verify: "CAPTCHA를 먼저 해결하세요."
-  testSiteKeyMessage: "사이트 키와 비밀 키에 테스트용 값을 입력하여 미리보기를 확인할 수 있습니다.\n자세한 내용은 아래 페이지를 확인해보세요."
-  _error:
-    _requestFailed:
-      title: "CAPTCHA 요구에 실패했습니다."
-      text: "잠시 후에 다시 실행하거나, 설정을 다시 한 번 확인해보세요."
-    _verificationFailed:
-      title: "CAPTCHA 검증을 실패했습니다."
-      text: "설정이 올바른지 다시 한 번 확인해보세요."
-    _unknown:
-      title: "CAPTCHA 에러"
-      text: "알 수 없는 에러가 발생했습니다."

locales/lo-LA.yml

@@ -474,6 +474,3 @@ _abuseReport:
       mail: "ອີເມວ"
 _moderationLogTypes:
   suspend: "ລະງັບ"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "ບໍ່ພົບ"

locales/nl-NL.yml

@@ -8,9 +8,6 @@ search: "Zoeken"
 notifications: "Meldingen"
 username: "Gebruikersnaam"
 password: "Wachtwoord"
-initialPasswordForSetup: "Initiële wachtwoord voor configuratie"
-initialPasswordIsIncorrect: "Initiële wachtwoord voor configuratie is onjuist"
-initialPasswordForSetupDescription: "Gebruik het initiële wachtwoord uit de configuratie, als je Misskey zelf hebt geïnstalleerd.\nAls je een Misskey hosting provider gebruikt, gebruik dan het gegeven wachtwoord.\nAls je geen wachtwoord hebt gezet, laat het dan leeg om verder te gaan."
 forgotPassword: "Wachtwoord vergeten"
 fetchingAsApObject: "Ophalen vanuit de Fediverse"
 ok: "Ok"
@@ -111,12 +108,9 @@ enterEmoji: "Voer een emoji in"
 renote: "Herdelen"
 unrenote: "Stop herdelen"
 renoted: "Herdeeld"
-renotedToX: "Renoted naar {name}"
 cantRenote: "Dit bericht kan niet worden herdeeld"
 cantReRenote: "Een herdeling kan niet worden herdeeld"
 quote: "Quote"
-renoteToChannel: "Renote naar kanaal"
-renoteToOtherChannel: "Renote naar ander kanaal"
 pinnedNote: "Vastgemaakte notitie"
 pinned: "Vastmaken aan profielpagina"
 you: "Jij"
@@ -125,10 +119,6 @@ sensitive: "NSFW"
 add: "Toevoegen"
 reaction: "Reacties"
 reactions: "Reacties"
-emojiPicker: "Emoji kiezer"
-pinnedEmojisForReactionSettingDescription: "Kies de emojis die als eerste getoond worden tijdens het reageren"
-pinnedEmojisSettingDescription: "Kies de emojis die als eerste getoond worden tijdens het reageren"
-emojiPickerDisplay: "Emoji kiezer weergave"
 reactionSettingDescription2: "Sleep om opnieuw te ordenen, Klik om te verwijderen, Druk op \"+\" om toe te voegen"
 rememberNoteVisibility: "Vergeet niet de notitie zichtbaarheidsinstellingen"
 attachCancel: "Verwijder bijlage"
@@ -150,7 +140,7 @@ selectAntenna: "Kies een antenne"
 selectWidget: "Kies een widget"
 editWidgets: "Bewerk widgets"
 editWidgetsExit: "Klaar"
-customEmojis: "Eigen emoji"
+customEmojis: "Maatwerk emoji"
 emoji: "Emoji"
 emojis: "Emoji"
 emojiName: "Naam emoji"
@@ -413,31 +403,7 @@ help: "Help"
 inputMessageHere: "Voer hier je bericht in"
 close: "Sluiten"
 invites: "Uitnodigen"
-members: "Leden"
-transfer: "Overdracht"
-title: "Titel"
-text: "Tekst"
-enable: "Inschakelen"
-next: "Volgende"
-retype: "Opnieuw invoeren"
-noteOf: "Notitie van {user}"
-quoteAttached: "Citaat"
-quoteQuestion: "Toevoegen als citaat?"
 invitations: "Uitnodigen"
-dashboard: "Overzicht"
-local: "Lokaal"
-remote: "Remote"
-total: "Totaal"
-weekOverWeekChanges: "Wijzigingen sinds vorige week"
-dayOverDayChanges: "Dagelijkse wijzigingen"
-appearance: "Weergave"
-clientSettings: "Clientinstellingen"
-accountSettings: "Accountinstellingen"
-promotion: "Promotie"
-promote: "Promoot"
-numberOfDays: "Aantal dagen"
-hideThisNote: "Verberg deze notitie"
-showFeaturedNotesInTimeline: "Laat featured notities in tijdlijn zien"
 sound: "Geluid"
 smtpHost: "Server"
 smtpUser: "Gebruikersnaam"
@@ -535,8 +501,3 @@ _webhookSettings:
 _moderationLogTypes:
   suspend: "Opschorten"
   resetPassword: "Wachtwoord terugzetten"
-_reversi:
-  total: "Totaal"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "Niet gevonden"

locales/no-NO.yml

@@ -727,6 +727,3 @@ _abuseReport:
       mail: "E-post"
 _moderationLogTypes:
   suspend: "Suspender"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "Ikke funnet"

locales/pl-PL.yml

@@ -1583,6 +1583,3 @@ _moderationLogTypes:
   resetPassword: "Zresetuj hasło"
 _reversi:
   total: "Łącznie"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "Nie znaleziono"

locales/pt-PT.yml

@@ -8,9 +8,6 @@ search: "Pesquisar"
 notifications: "Notificações"
 username: "Nome de usuário"
 password: "Senha"
-initialPasswordForSetup: "Senha para a configuração inicial"
-initialPasswordIsIncorrect: "Senha para configuração inicial está incorreta"
-initialPasswordForSetupDescription: "Use a senha configurada no arquivo de configuração se você instalou o Misskey manualmente.\nSe você estiver utilizando um serviço de hospedagem, utilize a senha fornecida.\nSe uma senha não foi configurada, deixe em branco e continue."
 forgotPassword: "Esqueci-me da senha"
 fetchingAsApObject: "Buscando no Fediverso..."
 ok: "OK"
@@ -199,7 +196,7 @@ followConfirm: "Tem certeza que quer seguir {name}?"
 proxyAccount: "Conta proxy"
 proxyAccountDescription: "Uma conta de proxy é uma conta que assume o acompanhamento remoto de um usuário sob certas condições específicas. Por exemplo, quando um usuário inclui um usuário remoto em uma lista, mas ninguém na lista está seguindo o usuário remoto, a atividade não é entregue ao servidor. Nesse caso, a conta de proxy entra em ação para seguir o usuário remoto em vez disso."
 host: "Host"
-selectSelf: "Selecionar a mim"
+selectSelf: "Escolher manualmente"
 selectUser: "Selecionar usuário"
 recipient: "Destinatário"
 annotation: "Anotação"
@@ -239,8 +236,6 @@ silencedInstances: "Instâncias silenciadas"
 silencedInstancesDescription: "Liste o nome de hospedagem dos servidores que você deseja silenciar, separados por linha. Todas as contas desses servidores serão silenciada e poderão enviar solicitações para seguir, mas não poderão mencionar usuários locais sem segui-los. Isso não afetará servidores bloqueados."
 mediaSilencedInstances: "Instâncias com mídia silenciadas"
 mediaSilencedInstancesDescription: "Liste o nome de hospedagem dos servidores cuja mídia você deseja silenciar, separados por linha. Todas as contas desses servidores serão consideradas sensíveis e não poderão utilizar emojis personalizados. Isso não afetará servidores bloqueados."
-federationAllowedHosts: "Servidores com federação permitida"
-federationAllowedHostsDescription: "Especifique o endereço dos servidores em que deseja permitir a federação separados por linha."
 muteAndBlock: "Silenciar e bloquear"
 mutedUsers: "Usuários silenciados"
 blockedUsers: "Usuários bloqueados"
@@ -339,7 +334,6 @@ renameFolder: "Renomear Pasta"
 deleteFolder: "Excluir pasta"
 folder: "Pasta"
 addFile: "Adicionar arquivo"
-showFile: "Mostrar arquivos"
 emptyDrive: "O drive está vazio"
 emptyFolder: "A pasta está vazia"
 unableToDelete: "Não é possível excluir"
@@ -453,7 +447,6 @@ totpDescription: "Digite a senha de uso único informado pelo aplicativo autenti
 moderator: "Moderador"
 moderation: "Moderação"
 moderationNote: "Nota de moderação"
-moderationNoteDescription: "Você pode preencher notas que serão compartilhadas apenas com moderadores."
 addModerationNote: "Adicionar nota de moderação"
 moderationLogs: "Logs de moderação"
 nUsersMentioned: "Postado por {n} pessoas"
@@ -515,10 +508,6 @@ uiLanguage: "Idioma de exibição da interface "
 aboutX: "Sobre {x}"
 emojiStyle: "Estilo de emojis"
 native: "Nativo"
-menuStyle: "Estilo do menu"
-style: "Estilo"
-drawer: "Gaveta"
-popup: "Pop-up"
 showNoteActionsOnlyHover: "Exibir as ações da nota somente ao passar o cursor sobre ela"
 showReactionsCount: "Ver o número de reações nas notas"
 noHistory: "Ainda não há histórico"
@@ -586,7 +575,6 @@ masterVolume: "volume principal"
 notUseSound: "Desabilitar som"
 useSoundOnlyWhenActive: "Apenas reproduzir sons quando Misskey estiver aberto."
 details: "Detalhes"
-renoteDetails: "Detalhes da repostagem"
 chooseEmoji: "Selecione um emoji"
 unableToProcess: "Não é possível concluir a operação"
 recentUsed: "Usado recentemente"
@@ -602,8 +590,6 @@ ascendingOrder: "Ascendente"
 descendingOrder: "Descendente"
 scratchpad: "Bloco de rascunho"
 scratchpadDescription: "O Bloco de rascunho fornece um ambiente experimental para AiScript. Permite escrever, executar e verificar os resultados do código para interagir com o Misskey."
-uiInspector: "Inspecionador de interface"
-uiInspectorDescription: "Você pode ver a lista de servidores de componentes de interface na memória. Componentes da interface serão gerados pela função Ui:C:."
 output: "Resultado"
 script: "Script"
 disablePagesScript: "Desabilitar scripts nas páginas"
@@ -684,7 +670,7 @@ smtpSecure: "Use SSL/TLS implícito para conexões SMTP"
 smtpSecureInfo: "Desative esta opção ao utilizar STARTTLS."
 testEmail: "Testar envio de e-mail"
 wordMute: "Silenciar palavras"
-hardWordMute: "Silenciar palavras (esconder posts)"
+hardWordMute: "SIlenciamento pesado de palavra"
 regexpError: "Erro na expressão regular"
 regexpErrorDescription: "Ocorreu um erro na expressão regular na linha {line} da palavra mutada {tab}:"
 instanceMute: "Instâncias silenciadas"
@@ -922,7 +908,6 @@ followersVisibility: "Visibilidade dos seguidores"
 continueThread: "Ver mais desta conversa"
 deleteAccountConfirm: "Deseja realmente excluir a conta?"
 incorrectPassword: "Senha inválida."
-incorrectTotp: "A senha de uso único está incorreta ou expirou."
 voteConfirm: "Deseja confirmar o seu voto em \"{choice}\"?"
 hide: "Ocultar"
 useDrawerReactionPickerForMobile: "Mostrar em formato de gaveta"
@@ -947,9 +932,6 @@ oneHour: "1 hora"
 oneDay: "1 dia"
 oneWeek: "1 semana"
 oneMonth: "1 mês"
-threeMonths: "3 meses"
-oneYear: "1 ano"
-threeDays: "3 dias"
 reflectMayTakeTime: "As mudanças podem demorar a aparecer."
 failedToFetchAccountInformation: "Não foi possível obter informações da conta"
 rateLimitExceeded: "Taxa limite excedido"
@@ -1090,7 +1072,6 @@ retryAllQueuesConfirmTitle: "Gostaria de tentar novamente agora?"
 retryAllQueuesConfirmText: "Isso irá temporariamente aumentar a carga do servidor."
 enableChartsForRemoteUser: "Gerar gráficos estatísticos de usuários remotos"
 enableChartsForFederatedInstances: "Gerar gráficos estatísticos de instâncias remotas"
-enableStatsForFederatedInstances: "Receber estatísticas de servidores remotos"
 showClipButtonInNoteFooter: "Adicionar \"Clip\" ao menu de ação de notas"
 reactionsDisplaySize: "Tamanho de exibição das reações"
 limitWidthOfReaction: "Limita o comprimento máximo de reações e as exibe em tamanho reduzido"
@@ -1277,49 +1258,7 @@ confirmWhenRevealingSensitiveMedia: "Confirmar ao revelar mídia sensível"
 sensitiveMediaRevealConfirm: "Essa mídia pode ser sensível. Deseja revelá-la?"
 createdLists: "Listas criadas"
 createdAntennas: "Antenas criadas"
-fromX: "De {x}"
-genEmbedCode: "Gerar código de embed"
-noteOfThisUser: "Notas por este usuário"
 clipNoteLimitExceeded: "Não é possível adicionar mais notas ao clipe."
-performance: "Desempenho"
-modified: "Modificado"
-discard: "Descartar"
-thereAreNChanges: "Há {n} mudança(s)"
-signinWithPasskey: "Entrar com Passkey"
-unknownWebAuthnKey: "Passkey desconhecida"
-passkeyVerificationFailed: "A verificação com Passkey falhou."
-passkeyVerificationSucceededButPasswordlessLoginDisabled: "A verificação com Passkey teve êxito, mas a entrada sem senha está desabilitada."
-messageToFollower: "Mensagem aos seguidores"
-target: "Alvo"
-testCaptchaWarning: "Essa função é utilizada apenas para testar CAPTCHA. <strong>Não a use num ambiente de produção.</strong>"
-prohibitedWordsForNameOfUser: "Palavras proibidas para nomes de usuário"
-prohibitedWordsForNameOfUserDescription: "Se quaisquer palavras dessa lista forem incluídas no nome de usuário, seu uso será negado. Usuários com privilégios de moderador não serão afetados pela restrição."
-yourNameContainsProhibitedWords: "O seu nome possui palavras proibidas"
-yourNameContainsProhibitedWordsDescription: "Se você deseja utilizar esse nome, entre em contato com o administrador do servidor."
-thisContentsAreMarkedAsSigninRequiredByAuthor: "O autor exige que você esteja cadastrado para ver"
-lockdown: "Lockdown"
-pleaseSelectAccount: "Selecione uma conta"
-availableRoles: "Cargos disponíveis"
-acknowledgeNotesAndEnable: "Ative após compreender as precauções."
-_accountSettings:
-  requireSigninToViewContents: "Exigir cadastro para ver o conteúdo"
-  requireSigninToViewContentsDescription1: "Exigir cadastro para ver todas as notas e outro conteúdo que você criou. Isso previne 'crawlers' de coletar os seus dados."
-  requireSigninToViewContentsDescription2: "Conteúdo não será exibido nas prévias de URL (OGP), incorporado em outras páginas web ou em servidores que não têm suporte a citações."
-  requireSigninToViewContentsDescription3: "Essas restrições podem não ser aplicadas a conteúdo federado de outros servidores."
-  makeNotesFollowersOnlyBefore: "Tornar notas passadas visíveis apenas para seguidores."
-  makeNotesFollowersOnlyBeforeDescription: "Com essa função ativada, apenas seguidores podem ver as notas anteriores à data e hora marcadas. Se isso for desativado, o status de publicação da nota será reestabelecido."
-  makeNotesHiddenBefore: "Tornar notas passadas privadas"
-  makeNotesHiddenBeforeDescription: "Com essa função ativada, apenas você poderá ver as notas anteriores à data e hora marcadas. Se isso for desativado, o status de publicação da nota será reestabelecido."
-  mayNotEffectForFederatedNotes: "Notas federadas a servidores remotos podem não ser afetadas."
-  notesHavePassedSpecifiedPeriod: "Notas que duraram um tempo específico."
-  notesOlderThanSpecifiedDateAndTime: "Notas antes do tempo específico."
-_abuseUserReport:
-  forward: "Encaminhar"
-  forwardDescription: "Encaminhar a denúncia ao servidor remoto como uma conta anônima do sistema."
-  resolve: "Resolver"
-  accept: "Aceitar"
-  reject: "Rejeitar"
-  resolveTutorial: "Se a denúncia for legítima em conteúdo, selecione \"Aceitar\" para marcar o caso como resolvido afirmativamente.\nSe a denúncia for ilegítima em conteúdo, selecione \"Rejeitar\" para marcar o caso como resolvido negativamente."
 _delivery:
   status: "Estado de entrega"
   stop: "Suspenso"
@@ -1454,12 +1393,8 @@ _serverSettings:
   fanoutTimelineDescription: "Melhora significativamente a performance do retorno da linha do tempo e reduz o impacto no banco de dados quando habilitado. Em contrapartida, o uso de memória do Redis aumentará. Considere desabilitar em casos de baixa disponibilidade de memória ou instabilidade do servidor."
   fanoutTimelineDbFallback: "\"Fallback\" ao banco de dados"
   fanoutTimelineDbFallbackDescription: "Quando habilitado, a linha do tempo irá recuar ao banco de dados caso consultas adicionais sejam feitas e ela não estiver em cache. Quando desabilitado, o impacto no servidor será reduzido ao eliminar o recuo, mas limita a quantidade de linhas do tempo que podem ser recebidas."
-  reactionsBufferingDescription: "Quando ativado, o desempenho durante a criação de uma reação será melhorado substancialmente, reduzindo a carga do banco de dados. Porém, a o uso de memória do Redis irá aumentar."
   inquiryUrl: "URL de inquérito"
   inquiryUrlDescription: "Especifique um URL para um formulário de inquérito para a administração ou uma página web com informações de contato."
-  openRegistration: "Abrir a criação de contas"
-  openRegistrationWarning: "Abrir cadastros contém riscos. É recomendado apenas habilitá-los se houver um sistema de monitoramento contínuo e resolução imediata de problemas."
-  thisSettingWillAutomaticallyOffWhenModeratorsInactive: "Se nenhuma atividade da moderação for detectada por um tempo, essa configuração será desativada para prevenir spam."
 _accountMigration:
   moveFrom: "Migrar outra conta para essa"
   moveFromSub: "Criar um 'alias' a outra conta"
@@ -1791,11 +1726,6 @@ _role:
     canSearchNotes: "Permitir a busca de notas"
     canUseTranslator: "Uso do tradutor"
     avatarDecorationLimit: "Número máximo de decorações de avatar que podem ser aplicadas"
-    canImportAntennas: "Permitir importação de antenas"
-    canImportBlocking: "Permitir importação de bloqueios"
-    canImportFollowing: "Permitir importação de usuários seguidos"
-    canImportMuting: "Permitir importação de silenciamentos"
-    canImportUserLists: "Permitir importação de listas"
   _condition:
     roleAssignedTo: "Atribuído a cargos manuais"
     isLocal: "Usuário local"
@@ -2179,11 +2109,8 @@ _auth:
   permissionAsk: "O aplicativo solicita as seguintes permissões"
   pleaseGoBack: "Por favor, volte ao aplicativo"
   callback: "Retornando ao aplicativo"
-  accepted: "Acesso permitido"
   denied: "Acesso negado"
-  scopeUser: "Operar como o usuário a seguir"
   pleaseLogin: "Por favor, entre para autorizar aplicativos."
-  byClickingYouWillBeRedirectedToThisUrl: "Quando o acesso for permitido, você será redirecionado para o seguinte endereço"
 _antennaSources:
   all: "Todas as notas"
   homeTimeline: "Notas de usuários seguidos"
@@ -2292,9 +2219,6 @@ _profile:
   changeBanner: "Mudar banner"
   verifiedLinkDescription: "Ao inserir um URL que contém um link para essa conta, um ícone de verificação será exibido ao lado do campo"
   avatarDecorationMax: "Você pode adicionar até {max} decorações."
-  followedMessage: "Mensagem exibida quando alguém segue você"
-  followedMessageDescription: "Você pode definir uma curta mensagem que será exibida aos usuários que seguirem você."
-  followedMessageDescriptionForLockedAccount: "Se você aceita pedidos de seguidor manualmente, isso será exibido quando você aceitá-los."
 _exportOrImport:
   allNotes: "Todas as notas"
   favoritedNotes: "Notas nos favoritos"
@@ -2433,8 +2357,6 @@ _notification:
   renotedBySomeUsers: "{n} usuários repostaram a nota"
   followedBySomeUsers: "{n} usuários te seguiram"
   flushNotification: "Limpar notificações"
-  exportOfXCompleted: "Exportação de {x} foi concluída"
-  login: "Alguém entrou na conta"
   _types:
     all: "Todas"
     note: "Novas notas"
@@ -2449,9 +2371,7 @@ _notification:
     followRequestAccepted: "Aceitou pedidos de seguidor"
     roleAssigned: "Cargo dado"
     achievementEarned: "Conquista desbloqueada"
-    exportCompleted: "A exportação foi concluída"
     login: "Iniciar sessão"
-    test: "Notificação teste"
     app: "Notificações de aplicativos conectados"
   _actions:
     followBack: "te seguiu de volta"
@@ -2517,10 +2437,7 @@ _webhookSettings:
     abuseReport: "Quando receber um relatório de abuso"
     abuseReportResolved: "Quando relatórios de abuso forem resolvidos "
     userCreated: "Quando um usuário é criado"
-    inactiveModeratorsWarning: "Quando moderadores estiverem inativos por um tempo"
-    inactiveModeratorsInvitationOnlyChanged: "Quando um moderador está inativo por um tempo e os cadastros passam a exigir convites"
   deleteConfirm: "Você tem certeza de que deseja excluir o Webhook?"
-  testRemarks: "Clique no botão à direita do interruptor para enviar um Webhook de teste com dados fictícios."
 _abuseReport:
   _notificationRecipient:
     createRecipient: "Adicionar destinatário para relatórios de abuso"
@@ -2564,8 +2481,6 @@ _moderationLogTypes:
   markSensitiveDriveFile: "Arquivo marcado como sensível"
   unmarkSensitiveDriveFile: "Arquivo desmarcado como sensível"
   resolveAbuseReport: "Relatório resolvido"
-  forwardAbuseReport: "Denúncia encaminhada"
-  updateAbuseReportNote: "Nota de moderação da denúncia atualizada"
   createInvitation: "Convite gerado"
   createAd: "Propaganda criada"
   deleteAd: "Propaganda excluída"
@@ -2721,44 +2636,3 @@ _contextMenu:
   app: "Aplicativo"
   appWithShift: "Aplicativo com a tecla shift"
   native: "Nativo"
-_embedCodeGen:
-  title: "Personalizar código do embed"
-  header: "Exibir cabeçalho"
-  autoload: "Carregar mais automaticamente (obsoleto)"
-  maxHeight: "Altura máxima"
-  maxHeightDescription: "Colocar em 0 desabilita a altura máxima. Especifique um valor para prevenir uma expansão vertical contínua."
-  maxHeightWarn: "O limite de altura máxima está desabilitado (0). Se isso não for intencional, insira um valor para a altura máxima."
-  previewIsNotActual: "A exibição difere do embed original porque ela excede o tamanho da tela de prévia."
-  rounded: "Tornar arredondado"
-  border: "Adicionar uma borda ao quadro externo"
-  applyToPreview: "Aplicar para a prévia"
-  generateCode: "Gerar código de embed"
-  codeGenerated: "O código foi gerado"
-  codeGeneratedDescription: "Coloque o código no seu website para incorporar o conteúdo."
-_selfXssPrevention:
-  warning: "AVISO"
-  title: "\"Cole algo nessa tela\" é uma fraude"
-  description1: "Se você colar algo aqui, um usuário malicioso pode sabotar a sua conta ou roubar informações pessoais."
-  description2: "Se você não entender exatamente o que está colando, %cpare agora e feche essa janela."
-  description3: "Para mais informação, clique no link. {link}"
-_followRequest:
-  recieved: "Aplicação recebida"
-  sent: "Aplicação enviada"
-_remoteLookupErrors:
-  _federationNotAllowed:
-    title: "Não foi possível se comunicar com o servidor"
-    description: "Comunicação com esse servidor pode ter sido desabilitada ou o servidor pode ter sido bloqueado.\nPor favor, entre em contato com o administrador do servidor."
-  _uriInvalid:
-    title: "Endereço inválido"
-    description: "Há um problema com o endereço inserido. Por favor, confira se você não inseriu caracteres inválidos."
-  _requestFailed:
-    title: "Solicitação falhou"
-    description: "Comunicação com esse servidor falhou. O servidor pode estar inativo. Além disso, confira se você não inseriu um endereço inválido ou inexistente."
-  _responseInvalid:
-    title: "Resposta inválida"
-    description: "Foi possível comunicar com o servidor, porém os dados obtidos foram incorretos."
-  _responseInvalidIdHostNotMatch:
-    description: "O domínio do endereço inserido difere do domínio do endereço final. Se você estiver pesquisando por um servidor de terceiros, tente buscar novamente com um endereço que pode ser obtido através do servidor original."
-  _noSuchObject:
-    title: "Não encontrado"
-    description: "O recurso solicitado não foi encontrado, confira o endereço."

locales/ro-RO.yml

@@ -733,6 +733,3 @@ _moderationLogTypes:
   resetPassword: "Resetează parola"
 _reversi:
   total: "Total"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "Nu a fost găsit"

locales/ru-RU.yml

@@ -18,7 +18,7 @@ gotIt: "Ясно!"
 cancel: "Отмена"
 noThankYou: "Нет, спасибо"
 enterUsername: "Введите имя пользователя"
-renotedBy: "{user} делает репост"
+renotedBy: "{user} репостнул(а)"
 noNotes: "Нет ни одной заметки"
 noNotifications: "Нет уведомлений"
 instance: "Экземпляр"
@@ -1063,7 +1063,7 @@ hiddenTags: "Скрытые хештеги"
 notesSearchNotAvailable: "Поиск заметок недоступен"
 license: "Лицензия"
 unfavoriteConfirm: "Удалить избранное?"
-myClips: "Мои подборки"
+myClips: "Мои клипы"
 drivecleaner: "Очиститель дисков"
 retryAllQueuesNow: "Повторить все очереди сейчас"
 retryAllQueuesConfirmTitle: "Хотите попробовать ещё раз?"
@@ -1105,18 +1105,16 @@ preservedUsernames: "Зарезервированные имена пользо
 preservedUsernamesDescription: "Перечислите зарезервированные имена пользователей, отделяя их строками. Они станут недоступны при создании учётной записи. Это ограничение не применяется при создании учётной записи администраторами. Также, уже существующие учётные записи останутся без изменений."
 createNoteFromTheFile: "Создать заметку из этого файла"
 archive: "Архив"
-unarchive: "Разархивировать"
 channelArchiveConfirmTitle: "Переместить {name} в архив?"
 channelArchiveConfirmDescription: "Архивированные каналы перестанут отображаться в списке каналов или результатах поиска. В них также нельзя будет добавлять новые записи."
 thisChannelArchived: "Этот канал находится в архиве."
 displayOfNote: "Отображение заметок"
 initialAccountSetting: "Настройка профиля"
-youFollowing: "Вы подписаны"
+youFollowing: "Подписки"
 preventAiLearning: "Отказаться от использования в машинном обучении (Генеративный ИИ)"
 preventAiLearningDescription: "Запросить краулеров не использовать опубликованный текст или изображения и т.д. для машинного обучения (Прогнозирующий / Генеративный ИИ) датасетов. Это достигается путём добавления \"noai\" HTTP-заголовка в ответ на соответствующий контент. Полного предотвращения через этот заголовок не избежать, так как он может быть просто проигнорирован."
 options: "Настройки ролей"
 specifyUser: "Указанный пользователь"
-lookupConfirm: "Хотите узнать?"
 openTagPageConfirm: "Открыть страницу этого хештега?"
 specifyHost: "Указать сайт"
 failedToPreviewUrl: "Предварительный просмотр недоступен"
@@ -1180,7 +1178,6 @@ keepOriginalFilename: "Сохранять исходное имя файла"
 keepOriginalFilenameDescription: "Если вы выключите данную настройку, имена файлов будут автоматически заменены случайной строкой при загрузке."
 alwaysConfirmFollow: "Всегда подтверждать подписку"
 inquiry: "Связаться"
-messageToFollower: "Сообщение подписчикам"
 _delivery:
   stop: "Заморожено"
   _type:
@@ -1507,7 +1504,6 @@ _role:
     rateLimitFactor: "Ограничение активности"
     descriptionOfRateLimitFactor: "Меньшее значение — слабые ограничения, большее — сильные"
     canHideAds: "Может скрыть рекламу"
-    canImportFollowing: "Можно импортировать подписчиков"
   _condition:
     isLocal: "Местный"
     isRemote: "Неместный"
@@ -2147,6 +2143,3 @@ _hemisphere:
   caption: "Используется для некоторых настроек клиента для определения сезона."
 _reversi:
   total: "Всего"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "Не найдено"

locales/sk-SK.yml

@@ -1449,6 +1449,3 @@ _moderationLogTypes:
   resetPassword: "Resetovať heslo"
 _reversi:
   total: "Celkom"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "Nenájdené"

locales/th-TH.yml

@@ -2709,6 +2709,3 @@ _embedCodeGen:
   generateCode: "สร้างโค้ดสำหรับการฝัง"
   codeGenerated: "รหัสถูกสร้างขึ้นแล้ว"
   codeGeneratedDescription: "นำโค้ดที่สร้างแล้วไปวางในเว็บไซต์ของคุณเพื่อฝังเนื้อหา"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "ไม่พบหน้าที่ต้องการ"

locales/tr-TR.yml

@@ -8,7 +8,6 @@ search: "Arama"
 notifications: "Bildirim"
 username: "Kullanıcı Adı"
 password: "Şifre"
-initialPasswordForSetup: ""
 forgotPassword: "şifremi unuttum"
 fetchingAsApObject: "從聯邦宇宙取得中..."
 ok: "TAMAM"

locales/uk-UA.yml

@@ -1624,6 +1624,3 @@ _moderationLogTypes:
   resetPassword: "Скинути пароль"
 _reversi:
   total: "Всього"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "Не знайдено"

locales/uz-UZ.yml

@@ -1094,6 +1094,3 @@ _moderationLogTypes:
   resetPassword: "Parolni tiklash"
 _reversi:
   total: "Jami"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "Topilmadi"

locales/vi-VN.yml

@@ -1930,6 +1930,3 @@ _moderationLogTypes:
   createInvitation: "Tạo lời mời"
 _reversi:
   total: "Tổng cộng"
-_remoteLookupErrors:
-  _noSuchObject:
-    title: "Không tìm thấy"

locales/zh-CN.yml

@@ -5,7 +5,6 @@ introMisskey: "欢迎！Misskey是一个开源的、去中心化的“微博客
 poweredByMisskeyDescription: "{name} 是开源平台 <b>Misskey</b> 的服务器之一。"
 monthAndDay: "{month}月 {day}日"
 search: "搜索"
-reset: "重置"
 notifications: "通知"
 username: "用户名"
 password: "密码"
@@ -49,7 +48,6 @@ pin: "置顶"
 unpin: "取消置顶"
 copyContent: "复制内容"
 copyLink: "复制链接"
-copyRemoteLink: "复制远程连接"
 copyLinkRenote: "复制转帖链接"
 delete: "删除"
 deleteAndEdit: "删除并编辑"
@@ -144,15 +142,15 @@ markAsSensitive: "标记为敏感内容"
 unmarkAsSensitive: "取消标记为敏感内容"
 enterFileName: "输入文件名"
 mute: "屏蔽"
-unmute: "取消隐藏"
+unmute: "解除静音"
 renoteMute: "隐藏转帖"
 renoteUnmute: "解除隐藏转帖"
-block: "屏蔽"
-unblock: "取消屏蔽"
+block: "拉黑"
+unblock: "取消拉黑"
 suspend: "冻结"
 unsuspend: "解除冻结"
-blockConfirm: "确定要屏蔽吗？"
-unblockConfirm: "确定要取消屏蔽吗？"
+blockConfirm: "确定要拉黑吗？"
+unblockConfirm: "确定要解除拉黑吗？"
 suspendConfirm: "要冻结吗？"
 unsuspendConfirm: "要解除冻结吗？"
 selectList: "选择列表"
@@ -197,7 +195,7 @@ setWallpaper: "设置壁纸"
 removeWallpaper: "移除壁纸"
 searchWith: "搜索:{q}"
 youHaveNoLists: "列表为空"
-followConfirm: "确定要关注 {name} 吗？"
+followConfirm: "你确定要关注 {name} 吗？"
 proxyAccount: "代理账户"
 proxyAccountDescription: "代理账户是在某些情况下替代用户进行远程关注用的账户。 例如说，当用户将一位远程用户放入一个列表中时，如果本地服务器上没有任何人关注这位远程用户，则这位远程用户的账户活动将不会被送到本地服务器上。作为替代，此时将使用代理账户进行关注。"
 host: "主机名"
@@ -231,10 +229,10 @@ disk: "存储"
 instanceInfo: "服务器信息"
 statistics: "统计"
 clearQueue: "清除队列"
-clearQueueConfirmTitle: "确定要清除队列吗？"
+clearQueueConfirmTitle: "确定清除队列？"
 clearQueueConfirmText: "未送达的帖子将不会被投递。 通常无需执行此操作。"
 clearCachedFiles: "清除缓存"
-clearCachedFilesConfirm: "确定要清除所有缓存的远程文件吗？"
+clearCachedFilesConfirm: "确定要清除所有缓存的远程文件？"
 blockedInstances: "被屏蔽的服务器"
 blockedInstancesDescription: "设定要屏蔽的服务器，以换行分隔。被屏蔽的服务器将无法与本服务器进行交换通讯。子域名也同样会被屏蔽。"
 silencedInstances: "被静音的服务器"
@@ -248,7 +246,7 @@ mutedUsers: "已隐藏用户"
 blockedUsers: "已屏蔽的用户"
 noUsers: "无用户"
 editProfile: "编辑资料"
-noteDeleteConfirm: "确定要删除该帖子吗？"
+noteDeleteConfirm: "要删除该帖子吗？"
 pinLimitExceeded: "无法置顶更多了"
 intro: "Misskey 的部署结束啦！创建管理员账号吧！"
 done: "完成"
@@ -259,7 +257,7 @@ defaultValueIs: "默认值: {value}"
 noCustomEmojis: "没有自定义表情符号"
 noJobs: "没有任务"
 federating: "联合中"
-blocked: "已屏蔽"
+blocked: "已拉黑"
 suspended: "停止投递"
 all: "全部"
 subscribing: "已订阅"
@@ -568,7 +566,7 @@ objectStorageRegionDesc: "指定一个可用区，例如“xx-east-1”。 如
 objectStorageUseSSL: "使用 SSL"
 objectStorageUseSSLDesc: "如果不使用 https 进行 API 连接，请关闭。"
 objectStorageUseProxy: "使用代理"
-objectStorageUseProxyDesc: "如果不使用代理进行 API 连接，请关闭。"
+objectStorageUseProxyDesc: "如果您不使用代理进行 API 连接，请将其关闭。"
 objectStorageSetPublicRead: "上传时设置为 public-read"
 s3ForcePathStyleDesc: "启用 s3ForcePathStyle 会强制将存储桶名称指定为 URL 中路径的一部分，而不是主机名。使用自托管 Minio 等时可能需要启用。"
 serverLogs: "服务器日志"
@@ -685,16 +683,12 @@ emptyToDisableSmtpAuth: "用户名和密码留空可以禁用 SMTP 验证"
 smtpSecure: "在 SMTP 连接中使用隐式 SSL / TLS"
 smtpSecureInfo: "使用 STARTTLS 时关闭。"
 testEmail: "邮件发送测试"
-wordMute: "隐藏关键词"
-wordMuteDescription: "折叠包含指定关键词的帖子。被折叠的帖子可单击展开。"
-hardWordMute: "隐藏硬关键词"
-showMutedWord: "显示已隐藏的关键词"
-hardWordMuteDescription: "隐藏包含指定关键词的帖子。与隐藏关键词不同，帖子将完全不会显示。"
+wordMute: "隐藏文字"
+hardWordMute: "屏蔽关键词"
 regexpError: "正则表达式错误"
-regexpErrorDescription: "{tab} 隐藏文字的第 {line} 行的正则表达式有错误："
+regexpErrorDescription: "{tab} 屏蔽文字的第 {line} 行的正则表达式有错误："
 instanceMute: "已隐藏的服务器"
 userSaysSomething: "{name} 说了什么,但是被屏蔽词过滤了"
-userSaysSomethingAbout: "{name} 说了关于「{word}」的什么"
 makeActive: "启用"
 display: "显示"
 copy: "复制"
@@ -765,7 +759,7 @@ driveFilesCount: "网盘的文件数"
 driveUsage: "网盘的空间用量"
 noCrawle: "要求搜索引擎不索引该用户"
 noCrawleDescription: "要求搜索引擎不要收录（索引）您的用户页面，帖子，页面等。"
-lockedAccountInfo: "即使启用该功能，只要帖子可见范围不是「仅关注者」，任何人都可以看到您的帖子。"
+lockedAccountInfo: "即使启用该功能，只要您不将帖子可见范围设置为“仅关注者”，任何人都还是可以看到您的帖子。"
 alwaysMarkSensitive: "默认将媒体文件标记为敏感内容"
 loadRawImages: "添加附件图像的缩略图时使用原始图像质量"
 disableShowingAnimatedImages: "不播放动画"
@@ -852,7 +846,7 @@ active: "活动"
 offline: "离线"
 notRecommended: "不推荐"
 botProtection: "Bot防御"
-instanceBlocking: "屏蔽/静音的服务器"
+instanceBlocking: "被阻拦的服务器"
 selectAccount: "选择账户"
 switchAccount: "切换账户"
 enabled: "已启用"
@@ -1307,8 +1301,6 @@ lockdown: "锁定"
 pleaseSelectAccount: "请选择帐户"
 availableRoles: "可用角色"
 acknowledgeNotesAndEnable: "理解注意事项后再开启。"
-federationSpecified: "此服务器已开启联合白名单。只能与管理员指定的服务器通信。"
-federationDisabled: "此服务器已禁用联合。无法与其它服务器上的用户通信。"
 _accountSettings:
   requireSigninToViewContents: "需要登录才能显示内容"
   requireSigninToViewContentsDescription1: "您发布的所有帖子将变成需要登入后才会显示。有望防止爬虫收集各种信息。"
@@ -1327,7 +1319,14 @@ _abuseUserReport:
   resolve: "解决"
   accept: "确认"
   reject: "拒绝"
-  resolveTutorial: "如果认可举报并已解决，选择「确认」将案件以肯定的态度标记为已解决。\n如果不认可举报，选择「拒绝」将案件以否定的态度标记为已解决。"
+  resolveTutorial: "如果举报内容有理且已解决，选择「确认」将案件以肯定的态度标记为已解决。\n如果举报内容站不住脚，选择「拒绝」将案件以否定的态度标记为已解决。"
+stpvAntennaPatch: |
+  Sharkey Stelpolva Edition 为天线的设置添加了额外的关键词语法。
+  具体而言， `domain:example.com` 这个特殊关键词会匹配所有来自 `example.com` 的帖子。这个关键词同样能使用在 OR 语法中。
+  特别地，你必须用 `domain:here` 来匹配本实例的帖子。
+stpvPgroongaSearchInstru: 可以使用 `A OR B` 的词法来搜索包含 A 或者 B 的帖子。`A B`（中间有空格）代表同时包含关键词 A 和 B 的帖子。
+timeTravel: 时光机
+timeTravelDescription: 显示该日期以前的帖子
 _delivery:
   status: "投递状态"
   stop: "停止投递"
@@ -1476,7 +1475,7 @@ _accountMigration:
   moveTo: "把这个账户迁移到新的账户"
   moveToLabel: "迁移后的账户"
   moveCannotBeUndone: "一旦迁移账户，就无法撤销。"
-  moveAccountDescription: "\n迁移到新帐户。\n　・现有的关注者自动关注新帐户\n　・此帐户的所有关注者都将被删除\n　・您将无法再使用此帐户发帖。\n关注者迁移是自动的，但关注中迁移必须手动完成。请在迁移前在此帐户上导出关注列表，并在迁移后立即在目标帐户上执行导入。\n列表、隐藏、屏蔽也是如此，因此您必须手动迁移它。\n（此描述适用于该服务器（Misskey v13.12.0 或更高版本）。其他 ActivityPub 软件（例如 Mastodon）的行为可能有所不同。）"
+  moveAccountDescription: "\n迁移到新帐户。\n　・现有的关注者自动关注新帐户\n　・此帐户的所有关注者都将被删除\n　・您将无法再使用此帐户发帖。\n关注者迁移是自动的，但关注中迁移必须手动完成。请在迁移前在此帐户上导出关注列表，并在迁移后立即在目标帐户上执行导入。\n屏蔽列表也是如此，因此您必须手动迁移它。\n（此描述适用于该服务器（Misskey v13.12.0 或更高版本）。其他 ActivityPub 软件（例如 Mastodon）的行为可能有所不同。）"
   moveAccountHowTo: "要进行账户迁移，请现在目标账户中为此账户建立一个别名。\n建立别名后，请像这样输入目标账户：@username@server.example.com"
   startMigration: "迁移"
   migrationConfirm: "确定要把此账户迁移到 {account} 吗？一旦确定后，此操作无法取消，此账户也无法以原来的状态使用。\n同时，请确认迁移后的账户，已创造别名。"
@@ -1696,7 +1695,7 @@ _achievements:
       title: "超高校级的幸运"
       description: "每 10 秒有 0.005% 的概率自动获得"
     _setNameToSyuilo:
-      title: "上帝情结"
+      title: "像神一样呐"
       description: "将名称设定为 syuilo"
     _passedSinceAccountCreated1:
       title: "一周年"
@@ -1802,7 +1801,7 @@ _role:
     canImportAntennas: "允许导入天线"
     canImportBlocking: "允许导入屏蔽列表"
     canImportFollowing: "允许导入关注列表"
-    canImportMuting: "允许导入隐藏列表"
+    canImportMuting: "允许导入屏蔽列表"
     canImportUserLists: "允许导入用户列表"
   _condition:
     roleAssignedTo: "已分配给手动角色"
@@ -1956,7 +1955,7 @@ _wordMute:
 _instanceMute:
   instanceMuteDescription: "隐藏服务器中的所有帖子和转帖，包括这些服务器上的用户回复。"
   instanceMuteDescription2: "一行一个"
-  title: "下面实例中的帖子将被隐藏。"
+  title: "隐藏服务器已设置的帖子。"
   heading: "已隐藏的服务器"
 _theme:
   explore: "寻找主题"
@@ -2077,12 +2076,12 @@ _2fa:
   step4: "从现在开始，任何登录操作都将要求您提供动态口令。"
   securityKeyNotSupported: "您的浏览器不支持安全密钥。"
   registerTOTPBeforeKey: "要注册安全密钥或 Passkey，请先设置验证器。"
-  securityKeyInfo: "注册兼容 WebAuthn 的密钥，例如支持 FIDO2 的硬件安全密钥、设备上的生物识别功能、PIN 以及 Passkey 等。"
+  securityKeyInfo: "注册兼容 WebAuthn 的密钥，例如支持 FIDO2 的硬件安全密钥、设备上的生物识别功能、PIN 码以及 Passkey 等。"
   registerSecurityKey: "注册安全密钥或 Passkey"
   securityKeyName: "输入密钥名称"
   tapSecurityKey: "请按照浏览器说明操作来注册安全密钥或 Passkey。"
   removeKey: "删除安全密钥"
-  removeKeyConfirm: "确定要删除 {name} 吗？"
+  removeKeyConfirm: "您确定要删除 {name} 吗？"
   whyTOTPOnlyRenew: "当注册了安全密钥时，无法取消使用验证器。"
   renewTOTP: "重置验证器"
   renewTOTPConfirm: "当前验证器的验证码及备用代码已失效"
@@ -2290,7 +2289,7 @@ _profile:
   name: "昵称"
   username: "用户名"
   description: "个人简介"
-  youCanIncludeHashtags: "可以在个人简介中包含 #标签。"
+  youCanIncludeHashtags: "你可以在个人简介中包含一些#标签。"
   metadata: "附加信息"
   metadataEdit: "附加信息编辑"
   metadataDescription: "最多可以在个人资料中以表格形式显示四条其他信息。"
@@ -2394,7 +2393,7 @@ _pages:
   fontSansSerif: "无衬线字体"
   eyeCatchingImageSet: "设置封面图片"
   eyeCatchingImageRemove: "删除封面图片"
-  chooseBlock: "添加内容块"
+  chooseBlock: "添加块"
   enterSectionTitle: "输入会话标题"
   selectType: "选择类型"
   contentBlocks: "内容"
@@ -2406,8 +2405,8 @@ _pages:
     section: "章节"
     image: "图片"
     button: "按钮"
-    dynamic: "动态内容块"
-    dynamicDescription: "这个内容块已经废弃。以后请使用{play}。"
+    dynamic: "动态区块"
+    dynamicDescription: "这个区块已经废弃。以后请使用{play}。"
     note: "嵌入的帖子"
     _note:
       id: "帖子 ID"
@@ -2441,7 +2440,7 @@ _notification:
   renotedBySomeUsers: "{n} 人转发了"
   followedBySomeUsers: "被 {n} 人关注"
   flushNotification: "重置通知历史"
-  exportOfXCompleted: "已完成 {x} 的导出"
+  exportOfXCompleted: "已完成 {x} 个导出"
   login: "有新的登录"
   _types:
     all: "全部"
@@ -2729,66 +2728,6 @@ _contextMenu:
   app: "应用"
   appWithShift: "Shift 键应用"
   native: "浏览器的用户界面"
-_gridComponent:
-  _error:
-    requiredValue: "此值为必填项"
-    columnTypeNotSupport: "正则表达式验证仅支持 type:text 列。"
-    patternNotMatch: "此值与 {pattern} 的模式不一致"
-    notUnique: "此值必须唯一"
-_roleSelectDialog:
-  notSelected: "未选中"
-_customEmojisManager:
-  _gridCommon:
-    copySelectionRows: "复制所选行"
-    copySelectionRanges: "复制所选范围"
-    deleteSelectionRows: "删除所选行"
-    deleteSelectionRanges: "删除所选范围的行"
-    searchSettings: "搜索设置"
-    searchSettingCaption: "设置详细的搜索条件。"
-    searchLimit: "显示项目数"
-    sortOrder: "排序方式"
-    registrationLogs: "注册日志"
-    registrationLogsCaption: "将显示更新和删除表情符号的日志。执行更新或删除操作，又或者更改或重新加载页面时会消失。"
-    alertEmojisRegisterFailedDescription: "更新或删除表情符号失败。详情请确认注册日志。"
-  _logs:
-    showSuccessLogSwitch: "显示成功日志"
-    failureLogNothing: "没有失败日志。"
-    logNothing: "没有日志"
-  _remote:
-    selectionRowDetail: "所选行的详细信息"
-    importSelectionRows: "导入所选行"
-    importSelectionRangesRows: "导入所选范围的行"
-    importEmojisButton: "导入已选择的表情符号"
-    confirmImportEmojisTitle: "导入表情符号"
-    confirmImportEmojisDescription: "是否导入从远程服务器接收的 {count} 个表情符号？请密切关注表情符号的许可协议。"
-  _local:
-    tabTitleList: "已注册的表情符号列表"
-    tabTitleRegister: "注册表情符号"
-    _list:
-      emojisNothing: "没有已注册的表情符号。"
-      markAsDeleteTargetRows: "将所选行标记为删除对象"
-      markAsDeleteTargetRanges: "将所选范围的行标记为删除对象"
-      alertUpdateEmojisNothingDescription: "没有已更改的表情符号。"
-      alertDeleteEmojisNothingDescription: "没有被标记为删除对象的表情符号。"
-      confirmMovePage: "要离开此页吗？"
-      confirmChangeView: "要更改显示吗？"
-      confirmUpdateEmojisDescription: "要更新 {count} 个表情符号吗？"
-      confirmDeleteEmojisDescription: "要删除已选择的 {count} 个表情符号吗？"
-      confirmResetDescription: "至今为止所做的所有修改都将被重置。"
-      confirmMovePageDesciption: "此页面上的表情符号已更改。\n若不保存就离开此页，此页面上所有的更改都将丢失。"
-      dialogSelectRoleTitle: "按角色搜索表情符号"
-    _register:
-      uploadSettingTitle: "上传设置"
-      uploadSettingDescription: "可以在此页面设置上传表情符号时的行为。"
-      directoryToCategoryLabel: "目录名请输入「category」"
-      directoryToCategoryCaption: "拖放目录时，目录名请输入「category」"
-      emojiInputAreaCaption: "请使用其中一种方法选择要注册的表情符号。"
-      emojiInputAreaList1: "在此区域内拖放图像文件或者目录"
-      emojiInputAreaList2: "单击此链接以从电脑中选择"
-      emojiInputAreaList3: "单击此链接以从网盘中选择"
-      confirmRegisterEmojisDescription: "要将列表内显示的表情符号替换为新的自定义表情符号吗？（为降低服务器负载，一次操作最多只能注册 {count} 个表情符号）"
-      confirmClearEmojisDescription: "要放弃编辑并将列表内表示的表情符号清空吗？"
-      confirmUploadEmojisDescription: "要将拖放的 {count} 个文件上传到网盘上吗？"
 _embedCodeGen:
   title: "自定义嵌入代码"
   header: "显示标题"
@@ -2812,34 +2751,3 @@ _selfXssPrevention:
 _followRequest:
   recieved: "已收到申请"
   sent: "已发送申请"
-_remoteLookupErrors:
-  _federationNotAllowed:
-    title: "无法与此服务器通信"
-    description: "与此服务器的通信可能被禁用，又或者是屏蔽了此服务器或被此服务器屏蔽了。\n请联系服务器的管理者。"
-  _uriInvalid:
-    title: "URI 有误"
-    description: "输入的 URI 有问题。请确认是否输入了 URI 中无法使用的字符。"
-  _requestFailed:
-    title: "请求失败"
-    description: "与该服务器的通信失败。对面服务器可能不可用。另外，请确认是否输入了无效或不存在的 URI。"
-  _responseInvalid:
-    title: "响应无效"
-    description: "成功与此服务器通信，但返回的数据无效。"
-  _responseInvalidIdHostNotMatch:
-    description: "输入 URI 的域名和最终取得的 URI 的域名不同。如果是通过第三方服务器获取远程内容，请使用可以从原始服务器获取内容的 URI 再试一次。"
-  _noSuchObject:
-    title: "未找到"
-    description: "未找到请求的资源。请再次检查 URI。"
-_captcha:
-  verify: "请通过 CAPTCHA 验证"
-  testSiteKeyMessage: "输入测试用的网站密钥及私密密钥后可以生成预览并检查，\n详情请看以下页面。"
-  _error:
-    _requestFailed:
-      title: "请求 CAPTCHA 失败"
-      text: "请稍后再试，又或者再检查一次设置。"
-    _verificationFailed:
-      title: "验证 CAPTCHA 失败"
-      text: "请再次确认设置是否正确。"
-    _unknown:
-      title: "CAPTCHA 错误"
-      text: "发生意外错误。"

locales/zh-TW.yml

@@ -5,7 +5,6 @@ introMisskey: "歡迎！Misskey 是一個開放原始碼且去中心化的社群
 poweredByMisskeyDescription: "{name}是開放原始碼平臺 <b>Misskey</b> 的伺服器之一。"
 monthAndDay: "{month} 月 {day} 日"
 search: "搜尋"
-reset: "重設"
 notifications: "通知"
 username: "使用者名稱"
 password: "密碼"
@@ -49,7 +48,6 @@ pin: "置頂"
 unpin: "取消置頂"
 copyContent: "複製內容"
 copyLink: "複製連結"
-copyRemoteLink: "複製遠端的連結"
 copyLinkRenote: "複製轉發的連結"
 delete: "刪除"
 deleteAndEdit: "刪除並編輯"
@@ -232,7 +230,7 @@ instanceInfo: "伺服器資訊"
 statistics: "統計"
 clearQueue: "清除佇列"
 clearQueueConfirmTitle: "確定要清除佇列嗎？"
-clearQueueConfirmText: "未成功發佈的貼文將不會再嘗試發佈。通常不需要進行這項操作。"
+clearQueueConfirmText: "未發佈的貼文將不會發佈。您通常不需要確認。"
 clearCachedFiles: "清除快取資料"
 clearCachedFilesConfirm: "確定要清除所有遠端暫存資料嗎？"
 blockedInstances: "已封鎖的伺服器"
@@ -293,8 +291,8 @@ messaging: "聊天"
 upload: "上傳"
 keepOriginalUploading: "保留原圖"
 keepOriginalUploadingDescription: "上傳圖片時保留原始圖片。關閉時，瀏覽器會在上傳時生成適用於網路傳送的版本。"
-fromDrive: "從雲端空間中選擇"
-fromUrl: "從 URL 上傳"
+fromDrive: "從雲端空間"
+fromUrl: "從 URL"
 uploadFromUrl: "從網址上傳"
 uploadFromUrlDescription: "您要上傳的檔案網址"
 uploadFromUrlRequested: "已請求上傳"
@@ -326,7 +324,7 @@ light: "淺色"
 dark: "深色"
 lightThemes: "淺色佈景主題"
 darkThemes: "深色佈景主題"
-syncDeviceDarkMode: "與裝置的深色模式同步"
+syncDeviceDarkMode: "與設備的深色模式同步"
 drive: "雲端硬碟"
 fileName: "檔案名稱"
 selectFile: "選擇檔案"
@@ -686,15 +684,11 @@ smtpSecure: "在 SMTP 連接中使用隱式 SSL/TLS"
 smtpSecureInfo: "使用 STARTTLS 時關閉。"
 testEmail: "測試郵件發送"
 wordMute: "被靜音的文字"
-wordMuteDescription: "將包含指定語句的貼文最小化。 點擊最小化的貼文即可顯示。"
 hardWordMute: "硬文字靜音"
-showMutedWord: "顯示靜音字"
-hardWordMuteDescription: "隱藏含有指定語句的貼文。 與詞彙靜音不同的是，貼文將完全隱藏不見。"
 regexpError: "正規表達式錯誤"
 regexpErrorDescription: "{tab} 靜音文字的第 {line} 行的正規表達式有錯誤："
 instanceMute: "被靜音的實例"
 userSaysSomething: "{name}說了什麼"
-userSaysSomethingAbout: "{name} 說了一些關於「{word}」的話"
 makeActive: "啟用"
 display: "檢視"
 copy: "複製"
@@ -770,7 +764,7 @@ alwaysMarkSensitive: "預設標記檔案為敏感內容"
 loadRawImages: "以原始圖檔顯示附件圖檔的縮圖"
 disableShowingAnimatedImages: "不播放動態圖檔"
 highlightSensitiveMedia: "強調敏感標記"
-verificationEmailSent: "已發送驗證電子郵件。請點擊進入電子郵件中的連結以完成驗證。"
+verificationEmailSent: "已發送驗證電子郵件。請點擊進入電子郵件中的鏈接完成驗證。"
 notSet: "未設定"
 emailVerified: "已成功驗證您的電子郵件地址"
 noteFavoritesCount: "我的最愛貼文的數目"
@@ -827,7 +821,7 @@ apply: "套用"
 receiveAnnouncementFromInstance: "接收來自伺服器的通知"
 emailNotification: "郵件通知"
 publish: "發布"
-inChannelSearch: "頻道內搜尋"
+inChannelSearch: "頻道内搜尋"
 useReactionPickerForContextMenu: "點擊右鍵開啟反應選擇器"
 typingUsers: "{users}輸入中"
 jumpToSpecifiedDate: "跳轉到特定日期"
@@ -931,7 +925,7 @@ incorrectPassword: "密碼錯誤。"
 incorrectTotp: "一次性密碼錯誤，或者已過期。"
 voteConfirm: "確定投給「{choice}」？"
 hide: "隱藏"
-useDrawerReactionPickerForMobile: "在行動裝置上使用抽屜顯示"
+useDrawerReactionPickerForMobile: "在移動設備上使用抽屜顯示"
 welcomeBackWithName: "歡迎回來，{name}"
 clickToFinishEmailVerification: "點擊 [{ok}] 完成電子郵件地址認證。"
 overridedDeviceKind: "裝置類型"
@@ -1012,7 +1006,7 @@ unsubscribePushNotification: "停用推播通知"
 pushNotificationAlreadySubscribed: "推播通知啟用中"
 pushNotificationNotSupported: "瀏覽器或伺服器不支援推播通知"
 sendPushNotificationReadMessage: "如果已閱讀通知與訊息，就刪除推播通知"
-sendPushNotificationReadMessageCaption: "可能會導致裝置的電池消耗量增加。"
+sendPushNotificationReadMessageCaption: "「{emptyPushNotificationMessage}」通知將立刻顯示。可能會更消耗裝置電池。"
 windowMaximize: "最大化"
 windowMinimize: "最小化"
 windowRestore: "復原"
@@ -1181,20 +1175,20 @@ used: "已使用"
 expired: "過期"
 doYouAgree: "你同意嗎？"
 beSureToReadThisAsItIsImportant: "重要，請務必閱讀。"
-iHaveReadXCarefullyAndAgree: "我已仔細閱讀並同意「{x}」的內容。"
+iHaveReadXCarefullyAndAgree: "我已仔細閱讀並同意「{x}」的内容。"
 dialog: "對話方塊"
 icon: "圖示"
 forYou: "給您"
 currentAnnouncements: "最新公告"
 pastAnnouncements: "歷史公告"
 youHaveUnreadAnnouncements: "有未讀的公告。"
-useSecurityKey: "請按照瀏覽器或裝置上的說明來使用安全金鑰或 Passkey。"
+useSecurityKey: "請按照瀏覽器或設備上的說明使用安全金鑰或 Passkey。"
 replies: "回覆"
 renotes: "轉發"
 loadReplies: "閱覽回覆"
 loadConversation: "閱覽對話"
 pinnedList: "已置頂的清單"
-keepScreenOn: "保持裝置螢幕開啟"
+keepScreenOn: "保持設備螢幕開啟"
 verifiedLink: "已驗證連結"
 notifyNotes: "開啟貼文通知"
 unnotifyNotes: "關閉貼文通知"
@@ -1249,7 +1243,7 @@ overwriteContentConfirm: "確定要覆蓋目前的內容嗎？"
 seasonalScreenEffect: "隨季節變換畫面的呈現"
 decorate: "設置頭像裝飾"
 addMfmFunction: "插入 MFM 功能語法"
-enableQuickAddMfmFunction: "顯示進階 MFM 選擇器"
+enableQuickAddMfmFunction: "顯示高級 MFM 選擇器"
 bubbleGame: "氣泡遊戲"
 sfx: "音效"
 soundWillBePlayed: "將播放音效"
@@ -1276,7 +1270,7 @@ useNativeUIForVideoAudioPlayer: "使用瀏覽器的 UI 播放影片與音訊"
 keepOriginalFilename: "保留原始檔名"
 keepOriginalFilenameDescription: "如果關閉此設置，上傳時檔案名稱會自動替換為隨機字串。"
 noDescription: "沒有說明文字"
-alwaysConfirmFollow: "追隨時總是確認"
+alwaysConfirmFollow: "跟隨時總是確認"
 inquiry: "聯絡我們"
 tryAgain: "請再試一次。"
 confirmWhenRevealingSensitiveMedia: "要顯示敏感媒體時需確認"
@@ -1307,8 +1301,6 @@ lockdown: "鎖定"
 pleaseSelectAccount: "請選擇帳戶"
 availableRoles: "可用角色"
 acknowledgeNotesAndEnable: "了解注意事項後再開啟。"
-federationSpecified: "此伺服器以白名單聯邦的方式運作。除了管理員指定的伺服器外，它無法與其他伺服器互動。"
-federationDisabled: "此伺服器未開啟站台聯邦。無法與其他伺服器上的使用者互動。"
 _accountSettings:
   requireSigninToViewContents: "須登入以顯示內容"
   requireSigninToViewContentsDescription1: "必須登入才會顯示您建立的貼文等內容。可望有效防止資訊被爬蟲蒐集。"
@@ -1374,7 +1366,7 @@ _initialAccountSetting:
   theseSettingsCanEditLater: "這裡的設定可以在之後變更。"
   youCanEditMoreSettingsInSettingsPageLater: "除此之外，還可以在「設定」頁面進行各種設定。之後請確認看看。"
   followUsers: "為了構築時間軸，試著追隨您感興趣的使用者吧。"
-  pushNotificationDescription: "啟用推送通知後，就可以在裝置上接收來自{name}的通知了。"
+  pushNotificationDescription: "啟用推送通知，就可以在設備上接收{name}的通知。"
   initialAccountSettingCompleted: "初始設定完成了！"
   haveFun: "盡情享受{name}吧！"
   youCanContinueTutorial: "您可以繼續學習如何使用{name}(Misskey)，也可以就此打住，立即開始使用。"
@@ -1394,12 +1386,12 @@ _initialTutorial:
     description: "在Misskey上發布的內容稱為「貼文」。貼文在時間軸上按時間順序排列，並即時更新。"
     reply: "您可以回覆貼文，並像討論串一樣繼續對話。"
     renote: "您可以將此貼文分享到自己的時間軸。您也可以在引用時添加文字。"
-    reaction: "您可以加入反應。詳細資訊將在下一頁進行說明。"
+    reaction: "您可以添加反應。詳細資訊將在下一頁進行說明。"
     menu: "可執行各種操作，如查看貼文詳細資訊和複製連結。"
   _reaction:
     title: "什麼是反應？"
-    description: "您可以在貼文中加上「反應」。有些用「最愛/大心」無法傳達的感想，可以用反應輕鬆地表達出來。"
-    letsTryReacting: "按一下貼文上的「+」按鈕即可加入反應。試著對此範例貼文加上反應！"
+    description: "您可以在貼文中添加「反應」。您可以使用反應輕鬆隨意地表達「最愛/大心」所無法傳達的細微差別。"
+    letsTryReacting: "可以透過點擊貼文上的「+」按鈕來添加反應。請嘗試在此範例貼文添加反應！"
     reactToContinue: "添加反應以繼續教學課程。"
     reactNotification: "當有人對您的貼文做出反應時會即時接收到通知。"
     reactDone: "按下「-」按鈕可以取消反應。"
@@ -1481,7 +1473,7 @@ _accountMigration:
   startMigration: "遷移"
   migrationConfirm: "確定要將這個帳戶遷移至 {account} 嗎？一旦遷移就無法撤銷，也就無法以原來的狀態使用這個帳戶。\n另外，請確認在要遷移到的帳戶已經建立了一個別名。"
   movedAndCannotBeUndone: "帳戶已遷移。\n遷移無法撤消。"
-  postMigrationNote: "將在完成遷移後的 24 小時取消追隨所有帳號。\n此帳戶的追隨中/追隨者人數將歸零。由於不會解除粉絲對您的追隨，因此他們仍然可以繼續閱覽此帳戶僅對追隨者公開的貼文。"
+  postMigrationNote: "取消追蹤此帳戶將在遷移操作後 24 小時執行。\n 此帳戶有 0 個關注者/關注者。 您的關注者仍然可以看到此帳戶的關注者帖子，因為您不會被取消關注。"
   movedTo: "要遷移到的帳戶："
 _achievements:
   earnedAt: "獲得日期"
@@ -1801,7 +1793,7 @@ _role:
     avatarDecorationLimit: "頭像裝飾的最大設置量"
     canImportAntennas: "允許匯入天線"
     canImportBlocking: "允許匯入封鎖名單"
-    canImportFollowing: "允許匯入追隨名單"
+    canImportFollowing: "允許匯入跟隨名單"
     canImportMuting: "允許匯入靜音名單"
     canImportUserLists: "允許匯入清單"
   _condition:
@@ -2077,7 +2069,7 @@ _2fa:
   step4: "從現在開始，任何登入操作都將要求您提供權杖。"
   securityKeyNotSupported: "您的瀏覽器不支援安全金鑰。"
   registerTOTPBeforeKey: "如要註冊安全金鑰或 Passkey，請先設定驗證應用程式。"
-  securityKeyInfo: "您可以設定使用支援 FIDO2 的硬體安全金鑰，以及裝置上的生物辨識、PIN 碼和密碼等來登入。"
+  securityKeyInfo: "您可以設定使用支援 FIDO2 的硬體安全鎖、終端設備的指紋認證，或者 PIN 碼來登入。"
   registerSecurityKey: "註冊安全金鑰或 Passkey"
   securityKeyName: "輸入金鑰名稱"
   tapSecurityKey: "按照瀏覽器的說明註冊安全金鑰或 Passkey。"
@@ -2295,7 +2287,7 @@ _profile:
   metadataEdit: "編輯附加資訊"
   metadataDescription: "可以在個人資料中以表格形式顯示其他資訊。"
   metadataLabel: "標籤"
-  metadataContent: "內容"
+  metadataContent: "内容"
   changeAvatar: "更換大頭貼"
   changeBanner: "變更橫幅圖像"
   verifiedLinkDescription: "如果輸入包含您個人資料的網站 URL，欄位旁邊將出現驗證圖示。"
@@ -2635,7 +2627,7 @@ _externalResourceInstaller:
       description: "已取得資料但解析 AiScript 時發生錯誤，導致無法載入。請聯絡外掛作者。請檢查 Javascript 控制台以取得錯誤詳細資訊。"
     _pluginInstallFailed:
       title: "外掛安裝失敗"
-      description: "安裝外掛時出現問題。請再試一次。可參閱 Javascript 控制台以取得錯誤詳細資訊。"
+      description: "安裝插件時出現問題。請再試一次。請參閱 Javascript 控制台以取得錯誤詳細資訊。"
     _themeParseFailed:
       title: "佈景主題解析錯誤"
       description: "已取得資料但解析佈景主題時發生錯誤，導致無法載入。請聯絡佈景主題的作者。請檢查 Javascript 控制台以取得錯誤詳細資訊。"
@@ -2654,7 +2646,7 @@ _dataSaver:
     description: "將不再自動載入網址預覽縮圖。"
   _code:
     title: "程式碼突出顯示"
-    description: "如果使用了程式碼突顯語法（如 MFM），則在點擊之前不會被載入。由於需要為對應的程式語言下載突顯定義檔案，因此關閉自動載入有助於減少資料流量。"
+    description: "如果使用了 MFM 的程式碼突顯標記，則在點擊之前不會載入。程式碼突顯要求加載每種程式語言的突顯定義檔案，但由於這些檔案不再自動載入，因此有望減少資料流量。"
 _hemisphere:
   N: "北半球"
   S: "南半球"
@@ -2729,66 +2721,6 @@ _contextMenu:
   app: "應用程式"
   appWithShift: "Shift 鍵應用程式"
   native: "瀏覽器的使用者介面"
-_gridComponent:
-  _error:
-    requiredValue: "此值為必填欄位"
-    columnTypeNotSupport: "正規表達式驗證僅支援 type:text 的欄位。"
-    patternNotMatch: "此值不符合 {pattern} 中的樣式。"
-    notUnique: "此值必須是唯一的"
-_roleSelectDialog:
-  notSelected: "未選擇"
-_customEmojisManager:
-  _gridCommon:
-    copySelectionRows: "複製選取的行"
-    copySelectionRanges: "複製選取的範圍"
-    deleteSelectionRows: "刪除所選的行"
-    deleteSelectionRanges: "刪除選取範圍的行"
-    searchSettings: "搜尋設定"
-    searchSettingCaption: "詳細設定搜尋條件。"
-    searchLimit: "顯示的數量"
-    sortOrder: "排序"
-    registrationLogs: "登錄日誌"
-    registrationLogsCaption: "會顯示更新或刪除表情符號時的日誌。進行更新或刪除操作，或切換頁面、重新載入後，日誌將會消失。"
-    alertEmojisRegisterFailedDescription: "更新或刪除表情符號失敗。詳情請查看登錄日誌。"
-  _logs:
-    showSuccessLogSwitch: "顯示成功日誌"
-    failureLogNothing: "沒有失敗的日誌。"
-    logNothing: "沒有日誌。"
-  _remote:
-    selectionRowDetail: "選取行的詳細資訊"
-    importSelectionRows: "匯入選取的行"
-    importSelectionRangesRows: "匯入選取範圍的行"
-    importEmojisButton: "匯入勾選的表情符號"
-    confirmImportEmojisTitle: "匯入表情符號"
-    confirmImportEmojisDescription: "將從遠端接收的{count}個表情符號進行匯入。請務必注意表情符號的授權。是否執行此操作？"
-  _local:
-    tabTitleList: "已登錄的表情符號列表"
-    tabTitleRegister: "登錄表情符號"
-    _list:
-      emojisNothing: "沒有登錄的表情符號。"
-      markAsDeleteTargetRows: "將選取的行設為刪除對象"
-      markAsDeleteTargetRanges: "將選取範圍的行設為刪除對象\n"
-      alertUpdateEmojisNothingDescription: "沒有選取需要變更的表情符號。"
-      alertDeleteEmojisNothingDescription: "沒有選取需要刪除的表情符號。"
-      confirmMovePage: "要移動到其他頁面嗎？"
-      confirmChangeView: "要更改顯示方式嗎？"
-      confirmUpdateEmojisDescription: "將更新{count}個表情符號。是否執行此操作？"
-      confirmDeleteEmojisDescription: "將刪除勾選的{count}個表情符號。是否執行此操作？"
-      confirmResetDescription: "目前所做的所有變更都會重設。"
-      confirmMovePageDesciption: "此頁面的表情符號已被更改。  \n若未儲存就直接離開此頁面，則在此頁面進行的所有更改將會被捨棄。"
-      dialogSelectRoleTitle: "根據表情符號設定的角色進行搜尋"
-    _register:
-      uploadSettingTitle: "上傳設定"
-      uploadSettingDescription: "您可以在此畫面設定表情符號上傳時的操作。"
-      directoryToCategoryLabel: "在「類別」欄位中輸入目錄名稱"
-      directoryToCategoryCaption: "拖放目錄時，請在「類別」欄位中輸入目錄名稱。"
-      emojiInputAreaCaption: "以下列其中一種方式選擇您想要註冊的表情符號"
-      emojiInputAreaList1: "將圖片檔案或目錄拖放到此框中"
-      emojiInputAreaList2: "點擊此連結從電腦中選擇"
-      emojiInputAreaList3: "點擊此連結從雲端硬碟中選擇"
-      confirmRegisterEmojisDescription: "將列表中顯示的表情符號登錄為新的自定表情符號。是否確定？（為避免過高負荷，每次操作最多可登錄{count}個表情符號）"
-      confirmClearEmojisDescription: "放棄編輯內容並清除列表中顯示的表情符號。是否確定？"
-      confirmUploadEmojisDescription: "將拖放的{count}個檔案上傳到雲端硬碟。是否執行此操作？"
 _embedCodeGen:
   title: "自訂嵌入程式碼"
   header: "檢視標頭 "
@@ -2812,34 +2744,3 @@ _selfXssPrevention:
 _followRequest:
   recieved: "收到的請求"
   sent: "送出的請求"
-_remoteLookupErrors:
-  _federationNotAllowed:
-    title: "無法與這個伺服器通訊"
-    description: "與此伺服器的通訊可能被停用、或封鎖了該伺服器，或被該伺服器封鎖。\n請聯繫您的伺服器管理員。"
-  _uriInvalid:
-    title: "URI 不正確"
-    description: "輸入的 URI 有問題。請檢查是否輸入了 URI 中不能使用的字元。"
-  _requestFailed:
-    title: "請求失敗"
-    description: "與此伺服器的通訊失敗。可能是對方伺服器斷線。 此外，請檢查是否輸入了不正確或不存在的 URI。"
-  _responseInvalid:
-    title: "回應不正確"
-    description: "雖然能夠與這個伺服器通訊，但是取得的資料不正確。"
-  _responseInvalidIdHostNotMatch:
-    description: "輸入的 URI 的網域與最終取得的 URI 的網域不同。 如果您是透過第三方伺服器查詢遠端內容，請使用可在原始伺服器上取得的 URI 再次查詢。"
-  _noSuchObject:
-    title: "查無項目"
-    description: "無法找到所要求的資源，請再次檢查 URI。"
-_captcha:
-  verify: "請通過 CAPTCHA 驗證"
-  testSiteKeyMessage: "可以輸入網站金鑰和秘密金鑰的測試值來檢查預覽。\n詳細資訊請參閱以下頁面。"
-  _error:
-    _requestFailed:
-      title: "CAPTCHA 請求失敗"
-      text: "請過一段時間後再執行，或再次檢查設定。"
-    _verificationFailed:
-      title: "CAPTCHA 驗證失敗"
-      text: "請再次檢查設定是否正確。"
-    _unknown:
-      title: "CAPTCHA 錯誤"
-      text: "發生了意外的錯誤。"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.1.0",
+	"version": "2024.11.0-gift-01",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/migration/1709126576000-optimize-emoji-index.js

@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class OptimizeEmojiIndex1709126576000 {
-	name = 'OptimizeEmojiIndex1709126576000'
-
-	async up(queryRunner) {
-		await queryRunner.query(`CREATE INDEX "IDX_EMOJI_ROLE_IDS" ON "emoji" using gin ("roleIdsThatCanBeUsedThisEmojiAsReaction")`)
-		await queryRunner.query(`CREATE INDEX "IDX_EMOJI_CATEGORY" ON "emoji" ("category")`)
-	}
-
-	async down(queryRunner) {
-		await queryRunner.query(`DROP INDEX "IDX_EMOJI_CATEGORY"`)
-		await queryRunner.query(`DROP INDEX "IDX_EMOJI_ROLE_IDS"`)
-	}
-}

packages/backend/package.json

@@ -134,8 +134,8 @@
 		"json5": "2.2.3",
 		"jsonld": "8.3.2",
 		"jsrsasign": "11.1.0",
-		"juice": "11.0.0",
 		"meilisearch": "0.45.0",
+		"juice": "11.0.0",
 		"mfm-js": "0.24.0",
 		"microformats-parser": "2.0.2",
 		"mime-types": "2.1.35",
@@ -146,7 +146,7 @@
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
 		"nodemailer": "6.9.16",
-		"nsfwjs": "4.2.0",
+		"nsfwjs": "2.4.2",
 		"oauth": "0.10.0",
 		"oauth2orize": "1.12.0",
 		"oauth2orize-pkce": "0.1.2",
@@ -158,6 +158,7 @@
 		"probe-image-size": "7.2.3",
 		"promise-limit": "2.7.0",
 		"pug": "3.0.3",
+		"punycode": "2.3.1",
 		"qrcode": "1.5.4",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
@@ -214,6 +215,7 @@
 		"@types/oauth2orize-pkce": "0.1.2",
 		"@types/pg": "8.11.10",
 		"@types/pug": "2.0.10",
+		"@types/punycode": "2.1.4",
 		"@types/qrcode": "1.5.5",
 		"@types/random-seed": "0.3.5",
 		"@types/ratelimiter": "3.4.6",

packages/backend/scripts/check_connect.js

@@ -53,4 +53,4 @@ const promises = Array
 		connectToPostgres()
 	]);
 
-await Promise.all(promises);
+await Promise.allSettled(promises);

packages/backend/src/GlobalModule.ts

@@ -7,14 +7,14 @@ import { Global, Inject, Module } from '@nestjs/common';
 import * as Redis from 'ioredis';
 import { DataSource } from 'typeorm';
 import { MeiliSearch } from 'meilisearch';
-import { MiMeta } from '@/models/Meta.js';
 import { DI } from './di-symbols.js';
 import { Config, loadConfig } from './config.js';
 import { createPostgresDataSource } from './postgres.js';
 import { RepositoryModule } from './models/RepositoryModule.js';
 import { allSettled } from './misc/promise-tracker.js';
-import { GlobalEvents } from './core/GlobalEventService.js';
 import type { Provider, OnApplicationShutdown } from '@nestjs/common';
+import { MiMeta } from '@/models/Meta.js';
+import { GlobalEvents } from './core/GlobalEventService.js';
 
 const $config: Provider = {
 	provide: DI.config,
@@ -33,11 +33,7 @@ const $db: Provider = {
 const $meilisearch: Provider = {
 	provide: DI.meilisearch,
 	useFactory: (config: Config) => {
-		if (config.fulltextSearch?.provider === 'meilisearch') {
-			if (!config.meilisearch) {
-				throw new Error('MeiliSearch is enabled but no configuration is provided');
-			}
-
+		if (config.meilisearch) {
 			return new MeiliSearch({
 				host: `${config.meilisearch.ssl ? 'https' : 'http'}://${config.meilisearch.host}:${config.meilisearch.port}`,
 				apiKey: config.meilisearch.apiKey,

packages/backend/src/boot/entry.ts

@@ -68,22 +68,16 @@ process.on('exit', code => {
 
 //#endregion
 
-if (!envOption.disableClustering) {
-	if (cluster.isPrimary) {
-		logger.info(`Start main process... pid: ${process.pid}`);
-		await masterMain();
-		ev.mount();
-	} else if (cluster.isWorker) {
-		logger.info(`Start worker process... pid: ${process.pid}`);
-		await workerMain();
-	} else {
-		throw new Error('Unknown process type');
-	}
-} else {
-	// 非clusterの場合はMasterのみが起動するため、Workerの処理は行わない(cluster.isWorker === trueの状態でこのブロックに来ることはない)
-	logger.info(`Start main process... pid: ${process.pid}`);
+if (cluster.isPrimary || envOption.disableClustering) {
 	await masterMain();
-	ev.mount();
+
+	if (cluster.isPrimary) {
+		ev.mount();
+	}
+}
+
+if (cluster.isWorker || envOption.disableClustering) {
+	await workerMain();
 }
 
 readyRef.value = true;

packages/backend/src/boot/master.ts

@@ -91,36 +91,25 @@ export async function masterMain() {
 		});
 	}
 
-	bootLogger.info(
-		`mode: [disableClustering: ${envOption.disableClustering}, onlyServer: ${envOption.onlyServer}, onlyQueue: ${envOption.onlyQueue}]`,
-	);
-
-	if (!envOption.disableClustering) {
-		// clusterモジュール有効時
-
+	if (envOption.disableClustering) {
 		if (envOption.onlyServer) {
-			// onlyServer かつ enableCluster な場合、メインプロセスはforkのみに制限する(listenしない)。
-			// ワーカープロセス側でlistenすると、メインプロセスでポートへの着信を受け入れてワーカープロセスへの分配を行う動作をする。
-			// そのため、メインプロセスでも直接listenするとポートの競合が発生して起動に失敗してしまう。
-			// see: https://nodejs.org/api/cluster.html#cluster
+			await server();
 		} else if (envOption.onlyQueue) {
 			await jobQueue();
+		} else {
+			await server();
+			await jobQueue();
+		}
+	} else {
+		if (envOption.onlyServer) {
+			// nop
+		} else if (envOption.onlyQueue) {
+			// nop
 		} else {
 			await server();
 		}
 
 		await spawnWorkers(config.clusterLimit);
-	} else {
-		// clusterモジュール無効時
-
-		if (envOption.onlyServer) {
-			await server();
-		} else if (envOption.onlyQueue) {
-			await jobQueue();
-		} else {
-			await server();
-			await jobQueue();
-		}
 	}
 
 	if (envOption.onlyQueue) {

packages/backend/src/config.ts

@@ -50,9 +50,6 @@ type Source = {
 	redisForJobQueue?: RedisOptionsSource;
 	redisForTimelines?: RedisOptionsSource;
 	redisForReactions?: RedisOptionsSource;
-	fulltextSearch?: {
-		provider?: FulltextSearchProvider;
-	};
 	meilisearch?: {
 		host: string;
 		port: string;
@@ -103,12 +100,7 @@ type Source = {
 	deactivateAntennaThreshold?: number;
 	pidFile: string;
 
-	logging?: {
-		sql?: {
-			disableQueryTruncation? : boolean,
-			enableQueryParamLogging? : boolean,
-		}
-	}
+	avatarDecorationAllowedHosts: string[] | undefined;
 };
 
 export type Config = {
@@ -134,9 +126,6 @@ export type Config = {
 		user: string;
 		pass: string;
 	}[] | undefined;
-	fulltextSearch?: {
-		provider?: FulltextSearchProvider;
-	};
 	meilisearch: {
 		host: string;
 		port: string;
@@ -164,12 +153,6 @@ export type Config = {
 	inboxJobMaxAttempts: number | undefined;
 	proxyRemoteFiles: boolean | undefined;
 	signToActivityPubGet: boolean | undefined;
-	logging?: {
-		sql?: {
-			disableQueryTruncation? : boolean,
-			enableQueryParamLogging? : boolean,
-		}
-	}
 
 	version: string;
 	publishTarballInsteadOfProvideRepositoryUrl: boolean;
@@ -201,10 +184,9 @@ export type Config = {
 	perUserNotificationsMaxCount: number;
 	deactivateAntennaThreshold: number;
 	pidFile: string;
+	avatarDecorationAllowedHosts: string[] | undefined;
 };
 
-export type FulltextSearchProvider = 'sqlLike' | 'sqlPgroonga' | 'meilisearch';
-
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
 
@@ -273,7 +255,6 @@ export function loadConfig(): Config {
 		db: { ...config.db, db: dbDb, user: dbUser, pass: dbPass },
 		dbReplications: config.dbReplications,
 		dbSlaves: config.dbSlaves,
-		fulltextSearch: config.fulltextSearch,
 		meilisearch: config.meilisearch,
 		redis,
 		redisForPubsub: config.redisForPubsub ? convertRedisOptions(config.redisForPubsub, host) : redis,
@@ -315,7 +296,7 @@ export function loadConfig(): Config {
 		perUserNotificationsMaxCount: config.perUserNotificationsMaxCount ?? 500,
 		deactivateAntennaThreshold: config.deactivateAntennaThreshold ?? (1000 * 60 * 60 * 24 * 7),
 		pidFile: config.pidFile,
-		logging: config.logging,
+		avatarDecorationAllowedHosts: config.avatarDecorationAllowedHosts,
 	};
 }
 

packages/backend/src/const.ts

@@ -26,18 +26,6 @@ export const DB_MAX_NOTE_TEXT_LENGTH = 8192;
 export const DB_MAX_IMAGE_COMMENT_LENGTH = 512;
 //#endregion
 
-export const FILE_TYPE_IMAGE = [
-	'image/png',
-	'image/gif',
-	'image/jpeg',
-	'image/webp',
-	'image/avif',
-	'image/apng',
-	'image/bmp',
-	'image/tiff',
-	'image/x-icon',
-];
-
 // ブラウザで直接表示することを許可するファイルの種類のリスト
 // ここに含まれないものは application/octet-stream としてレスポンスされる
 // SVGはXSSを生むので許可しない

packages/backend/src/core/AbuseReportNotificationService.ts

@@ -160,22 +160,22 @@ export class AbuseReportNotificationService implements OnApplicationShutdown {
 			};
 		});
 
-		const inactiveRecipients = await this.fetchWebhookRecipients()
-			.then(it => it.filter(it => !it.isActive));
-		const withoutWebhookIds = inactiveRecipients
-			.map(it => it.systemWebhookId)
-			.filter(x => x != null);
-		return Promise.all(
-			convertedReports.map(it => {
-				return this.systemWebhookService.enqueueSystemWebhook(
-					type,
-					it,
-					{
-						excludes: withoutWebhookIds,
-					},
-				);
-			}),
-		);
+		const recipientWebhookIds = await this.fetchWebhookRecipients()
+			.then(it => it
+				.filter(it => it.isActive && it.systemWebhookId && it.method === 'webhook')
+				.map(it => it.systemWebhookId)
+				.filter(x => x != null));
+		for (const webhookId of recipientWebhookIds) {
+			await Promise.all(
+				convertedReports.map(it => {
+					return this.systemWebhookService.enqueueSystemWebhook(
+						webhookId,
+						type,
+						it,
+					);
+				}),
+			);
+		}
 	}
 
 	/**

packages/backend/src/core/AiService.ts

@@ -10,13 +10,12 @@ import { Injectable } from '@nestjs/common';
 import * as nsfw from 'nsfwjs';
 import si from 'systeminformation';
 import { Mutex } from 'async-mutex';
-import fetch from 'node-fetch';
 import { bindThis } from '@/decorators.js';
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
 
-const REQUIRED_CPU_FLAGS_X64 = ['avx2', 'fma'];
+const REQUIRED_CPU_FLAGS = ['avx2', 'fma'];
 let isSupportedCpu: undefined | boolean = undefined;
 
 @Injectable()
@@ -29,10 +28,11 @@ export class AiService {
 	}
 
 	@bindThis
-	public async detectSensitive(path: string): Promise<nsfw.PredictionType[] | null> {
+	public async detectSensitive(path: string): Promise<nsfw.predictionType[] | null> {
 		try {
 			if (isSupportedCpu === undefined) {
-				isSupportedCpu = await this.computeIsSupportedCpu();
+				const cpuFlags = await this.getCpuFlags();
+				isSupportedCpu = REQUIRED_CPU_FLAGS.every(required => cpuFlags.includes(required));
 			}
 
 			if (!isSupportedCpu) {
@@ -41,7 +41,6 @@ export class AiService {
 			}
 
 			const tf = await import('@tensorflow/tfjs-node');
-			tf.env().global.fetch = fetch;
 
 			if (this.model == null) {
 				await this.modelLoadMutex.runExclusive(async () => {
@@ -65,22 +64,6 @@ export class AiService {
 		}
 	}
 
-	private async computeIsSupportedCpu(): Promise<boolean> {
-		switch (process.arch) {
-			case 'x64': {
-				const cpuFlags = await this.getCpuFlags();
-				return REQUIRED_CPU_FLAGS_X64.every(required => cpuFlags.includes(required));
-			}
-			case 'arm64': {
-				// As far as I know, no required CPU flags for ARM64.
-				return true;
-			}
-			default: {
-				return false;
-			}
-		}
-	}
-
 	@bindThis
 	private async getCpuFlags(): Promise<string[]> {
 		const str = await si.cpuFlags();

packages/backend/src/core/CacheService.ts

@@ -12,8 +12,19 @@ import { DI } from '@/di-symbols.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
 import type { GlobalEvents } from '@/core/GlobalEventService.js';
+import { HttpRequestService } from '@/core/HttpRequestService.js';
+import type { Config } from '@/config.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
+type StpvRemoteUserDecorationsCacheType = {
+	id: string;
+	angle?: number;
+	flipH?: boolean;
+	offsetX?: number;
+	offsetY?: number;
+	url?: string;
+}[];
+
 @Injectable()
 export class CacheService implements OnApplicationShutdown {
 	public userByIdCache: MemoryKVCache<MiUser>;
@@ -26,6 +37,7 @@ export class CacheService implements OnApplicationShutdown {
 	public userBlockedCache: RedisKVCache<Set<string>>; // NOTE: 「被」Blockキャッシュ
 	public renoteMutingsCache: RedisKVCache<Set<string>>;
 	public userFollowingsCache: RedisKVCache<Record<string, Pick<MiFollowing, 'withReplies'> | undefined>>;
+	public stpvRemoteUserDecorationsCache: RedisKVCache<StpvRemoteUserDecorationsCacheType>;
 
 	constructor(
 		@Inject(DI.redis)
@@ -52,7 +64,12 @@ export class CacheService implements OnApplicationShutdown {
 		@Inject(DI.followingsRepository)
 		private followingsRepository: FollowingsRepository,
 
+		@Inject(DI.config)
+		private config: Config,
+
 		private userEntityService: UserEntityService,
+
+		private httpRequestService: HttpRequestService,
 	) {
 		//this.onMessage = this.onMessage.bind(this);
 
@@ -115,6 +132,43 @@ export class CacheService implements OnApplicationShutdown {
 			fromRedisConverter: (value) => JSON.parse(value),
 		});
 
+		this.stpvRemoteUserDecorationsCache = new RedisKVCache<StpvRemoteUserDecorationsCacheType>(this.redisClient, 'stpvRemoteUserDecorationsCache', {
+			lifetime: 1000 * 60 * 30, // 30m
+			memoryCacheLifetime: 1000 * 60, // 1m
+			fetcher: (key) => this.userByIdCache.fetch(key, () => this.usersRepository.findOneBy({
+				id: key,
+			}) as Promise<MiLocalUser>).then(user => {
+				if (user.host == null) return [];
+				if (!(config.avatarDecorationAllowedHosts?.includes(user.host))) return [];
+				return this.httpRequestService.send(`https://${user.host}/api/users/show`, {
+					method: 'POST',
+					headers: {
+						'Content-Type': 'application/json',
+					},
+					body: JSON.stringify({
+						host: null,
+						username: user.username,
+					}),
+				}).then(res => res.json() as { avatarDecorations?: StpvRemoteUserDecorationsCacheType })
+					.then((res) =>
+						res.avatarDecorations?.filter(ad => ad.url).map((ad) => ({
+							id: `${ad.id}:${user.host}`,
+							angle: ad.angle ? Number(ad.angle) : undefined,
+							offsetX: ad.offsetX ? Number(ad.offsetX) : undefined,
+							offsetY: ad.offsetY ? Number(ad.offsetY) : undefined,
+							flipH: ad.flipH ? Boolean(ad.flipH) : undefined,
+							url: ad.url,
+						})) ?? [],
+					)
+					.catch((err) => {
+						console.error(err);
+						return [];
+					});
+			}),
+			toRedisConverter: (value) => JSON.stringify(value),
+			fromRedisConverter: (value) => JSON.parse(value),
+		});
+
 		// NOTE: チャンネルのフォロー状況キャッシュはChannelFollowingServiceで行っている
 
 		this.redisForSub.on('message', this.onMessage);

packages/backend/src/core/CaptchaService.ts

@@ -6,65 +6,6 @@
 import { Injectable } from '@nestjs/common';
 import { HttpRequestService } from '@/core/HttpRequestService.js';
 import { bindThis } from '@/decorators.js';
-import { MetaService } from '@/core/MetaService.js';
-import { MiMeta } from '@/models/Meta.js';
-import Logger from '@/logger.js';
-import { LoggerService } from './LoggerService.js';
-
-export const supportedCaptchaProviders = ['none', 'hcaptcha', 'mcaptcha', 'recaptcha', 'turnstile', 'testcaptcha'] as const;
-export type CaptchaProvider = typeof supportedCaptchaProviders[number];
-
-export const captchaErrorCodes = {
-	invalidProvider: Symbol('invalidProvider'),
-	invalidParameters: Symbol('invalidParameters'),
-	noResponseProvided: Symbol('noResponseProvided'),
-	requestFailed: Symbol('requestFailed'),
-	verificationFailed: Symbol('verificationFailed'),
-	unknown: Symbol('unknown'),
-} as const;
-export type CaptchaErrorCode = typeof captchaErrorCodes[keyof typeof captchaErrorCodes];
-
-export type CaptchaSetting = {
-	provider: CaptchaProvider;
-	hcaptcha: {
-		siteKey: string | null;
-		secretKey: string | null;
-	}
-	mcaptcha: {
-		siteKey: string | null;
-		secretKey: string | null;
-		instanceUrl: string | null;
-	}
-	recaptcha: {
-		siteKey: string | null;
-		secretKey: string | null;
-	}
-	turnstile: {
-		siteKey: string | null;
-		secretKey: string | null;
-	}
-}
-
-export class CaptchaError extends Error {
-	public readonly code: CaptchaErrorCode;
-	public readonly cause?: unknown;
-
-	constructor(code: CaptchaErrorCode, message: string, cause?: unknown) {
-		super(message);
-		this.code = code;
-		this.cause = cause;
-		this.name = 'CaptchaError';
-	}
-}
-
-export type CaptchaSaveSuccess = {
-	success: true;
-}
-export type CaptchaSaveFailure = {
-	success: false;
-	error: CaptchaError;
-}
-export type CaptchaSaveResult = CaptchaSaveSuccess | CaptchaSaveFailure;
 
 type CaptchaResponse = {
 	success: boolean;
@@ -73,14 +14,9 @@ type CaptchaResponse = {
 
 @Injectable()
 export class CaptchaService {
-	private readonly logger: Logger;
-
 	constructor(
 		private httpRequestService: HttpRequestService,
-		private metaService: MetaService,
-		loggerService: LoggerService,
 	) {
-		this.logger = loggerService.getLogger('captcha');
 	}
 
 	@bindThis
@@ -108,32 +44,32 @@ export class CaptchaService {
 	@bindThis
 	public async verifyRecaptcha(secret: string, response: string | null | undefined): Promise<void> {
 		if (response == null) {
-			throw new CaptchaError(captchaErrorCodes.noResponseProvided, 'recaptcha-failed: no response provided');
+			throw new Error('recaptcha-failed: no response provided');
 		}
 
 		const result = await this.getCaptchaResponse('https://www.recaptcha.net/recaptcha/api/siteverify', secret, response).catch(err => {
-			throw new CaptchaError(captchaErrorCodes.requestFailed, `recaptcha-request-failed: ${err}`);
+			throw new Error(`recaptcha-request-failed: ${err}`);
 		});
 
 		if (result.success !== true) {
 			const errorCodes = result['error-codes'] ? result['error-codes'].join(', ') : '';
-			throw new CaptchaError(captchaErrorCodes.verificationFailed, `recaptcha-failed: ${errorCodes}`);
+			throw new Error(`recaptcha-failed: ${errorCodes}`);
 		}
 	}
 
 	@bindThis
 	public async verifyHcaptcha(secret: string, response: string | null | undefined): Promise<void> {
 		if (response == null) {
-			throw new CaptchaError(captchaErrorCodes.noResponseProvided, 'hcaptcha-failed: no response provided');
+			throw new Error('hcaptcha-failed: no response provided');
 		}
 
 		const result = await this.getCaptchaResponse('https://hcaptcha.com/siteverify', secret, response).catch(err => {
-			throw new CaptchaError(captchaErrorCodes.requestFailed, `hcaptcha-request-failed: ${err}`);
+			throw new Error(`hcaptcha-request-failed: ${err}`);
 		});
 
 		if (result.success !== true) {
 			const errorCodes = result['error-codes'] ? result['error-codes'].join(', ') : '';
-			throw new CaptchaError(captchaErrorCodes.verificationFailed, `hcaptcha-failed: ${errorCodes}`);
+			throw new Error(`hcaptcha-failed: ${errorCodes}`);
 		}
 	}
 
@@ -141,7 +77,7 @@ export class CaptchaService {
 	@bindThis
 	public async verifyMcaptcha(secret: string, siteKey: string, instanceHost: string, response: string | null | undefined): Promise<void> {
 		if (response == null) {
-			throw new CaptchaError(captchaErrorCodes.noResponseProvided, 'mcaptcha-failed: no response provided');
+			throw new Error('mcaptcha-failed: no response provided');
 		}
 
 		const endpointUrl = new URL('/api/v1/pow/siteverify', instanceHost);
@@ -155,251 +91,46 @@ export class CaptchaService {
 			headers: {
 				'Content-Type': 'application/json',
 			},
-		}, { throwErrorWhenResponseNotOk: false });
+		});
 
 		if (result.status !== 200) {
-			throw new CaptchaError(captchaErrorCodes.requestFailed, 'mcaptcha-failed: mcaptcha didn\'t return 200 OK');
+			throw new Error('mcaptcha-failed: mcaptcha didn\'t return 200 OK');
 		}
 
 		const resp = (await result.json()) as { valid: boolean };
 
 		if (!resp.valid) {
-			throw new CaptchaError(captchaErrorCodes.verificationFailed, 'mcaptcha-request-failed');
+			throw new Error('mcaptcha-request-failed');
 		}
 	}
 
 	@bindThis
 	public async verifyTurnstile(secret: string, response: string | null | undefined): Promise<void> {
 		if (response == null) {
-			throw new CaptchaError(captchaErrorCodes.noResponseProvided, 'turnstile-failed: no response provided');
+			throw new Error('turnstile-failed: no response provided');
 		}
 
 		const result = await this.getCaptchaResponse('https://challenges.cloudflare.com/turnstile/v0/siteverify', secret, response).catch(err => {
-			throw new CaptchaError(captchaErrorCodes.requestFailed, `turnstile-request-failed: ${err}`);
+			throw new Error(`turnstile-request-failed: ${err}`);
 		});
 
 		if (result.success !== true) {
 			const errorCodes = result['error-codes'] ? result['error-codes'].join(', ') : '';
-			throw new CaptchaError(captchaErrorCodes.verificationFailed, `turnstile-failed: ${errorCodes}`);
+			throw new Error(`turnstile-failed: ${errorCodes}`);
 		}
 	}
 
 	@bindThis
 	public async verifyTestcaptcha(response: string | null | undefined): Promise<void> {
 		if (response == null) {
-			throw new CaptchaError(captchaErrorCodes.noResponseProvided, 'testcaptcha-failed: no response provided');
+			throw new Error('testcaptcha-failed: no response provided');
 		}
 
 		const success = response === 'testcaptcha-passed';
 
 		if (!success) {
-			throw new CaptchaError(captchaErrorCodes.verificationFailed, 'testcaptcha-failed');
+			throw new Error('testcaptcha-failed');
 		}
 	}
-
-	@bindThis
-	public async get(): Promise<CaptchaSetting> {
-		const meta = await this.metaService.fetch(true);
-
-		let provider: CaptchaProvider;
-		switch (true) {
-			case meta.enableHcaptcha: {
-				provider = 'hcaptcha';
-				break;
-			}
-			case meta.enableMcaptcha: {
-				provider = 'mcaptcha';
-				break;
-			}
-			case meta.enableRecaptcha: {
-				provider = 'recaptcha';
-				break;
-			}
-			case meta.enableTurnstile: {
-				provider = 'turnstile';
-				break;
-			}
-			case meta.enableTestcaptcha: {
-				provider = 'testcaptcha';
-				break;
-			}
-			default: {
-				provider = 'none';
-				break;
-			}
-		}
-
-		return {
-			provider: provider,
-			hcaptcha: {
-				siteKey: meta.hcaptchaSiteKey,
-				secretKey: meta.hcaptchaSecretKey,
-			},
-			mcaptcha: {
-				siteKey: meta.mcaptchaSitekey,
-				secretKey: meta.mcaptchaSecretKey,
-				instanceUrl: meta.mcaptchaInstanceUrl,
-			},
-			recaptcha: {
-				siteKey: meta.recaptchaSiteKey,
-				secretKey: meta.recaptchaSecretKey,
-			},
-			turnstile: {
-				siteKey: meta.turnstileSiteKey,
-				secretKey: meta.turnstileSecretKey,
-			},
-		};
-	}
-
-	/**
-	 * captchaの設定を更新します. その際、フロントエンド側で受け取ったcaptchaからの戻り値を検証し、passした場合のみ設定を更新します.
-	 * 実際の検証処理はサービス内で定義されている各captchaプロバイダの検証関数に委譲します.
-	 *
-	 * @param provider 検証するcaptchaのプロバイダ
-	 * @param params
-	 * @param params.sitekey hcaptcha, recaptcha, turnstile, mcaptchaの場合に指定するsitekey. それ以外のプロバイダでは無視されます
-	 * @param params.secret hcaptcha, recaptcha, turnstile, mcaptchaの場合に指定するsecret. それ以外のプロバイダでは無視されます
-	 * @param params.instanceUrl mcaptchaの場合に指定するインスタンスのURL. それ以外のプロバイダでは無視されます
-	 * @param params.captchaResult フロントエンド側で受け取ったcaptchaプロバイダからの戻り値. この値を使ってサーバサイドでの検証を行います
-	 * @see verifyHcaptcha
-	 * @see verifyMcaptcha
-	 * @see verifyRecaptcha
-	 * @see verifyTurnstile
-	 * @see verifyTestcaptcha
-	 */
-	@bindThis
-	public async save(
-		provider: CaptchaProvider,
-		params?: {
-			sitekey?: string | null;
-			secret?: string | null;
-			instanceUrl?: string | null;
-			captchaResult?: string | null;
-		},
-	): Promise<CaptchaSaveResult> {
-		if (!supportedCaptchaProviders.includes(provider)) {
-			return {
-				success: false,
-				error: new CaptchaError(captchaErrorCodes.invalidProvider, `Invalid captcha provider: ${provider}`),
-			};
-		}
-
-		const operation = {
-			none: async () => {
-				await this.updateMeta(provider, params);
-			},
-			hcaptcha: async () => {
-				if (!params?.secret || !params.captchaResult) {
-					throw new CaptchaError(captchaErrorCodes.invalidParameters, 'hcaptcha-failed: secret and captureResult are required');
-				}
-
-				await this.verifyHcaptcha(params.secret, params.captchaResult);
-				await this.updateMeta(provider, params);
-			},
-			mcaptcha: async () => {
-				if (!params?.secret || !params.sitekey || !params.instanceUrl || !params.captchaResult) {
-					throw new CaptchaError(captchaErrorCodes.invalidParameters, 'mcaptcha-failed: secret, sitekey, instanceUrl and captureResult are required');
-				}
-
-				await this.verifyMcaptcha(params.secret, params.sitekey, params.instanceUrl, params.captchaResult);
-				await this.updateMeta(provider, params);
-			},
-			recaptcha: async () => {
-				if (!params?.secret || !params.captchaResult) {
-					throw new CaptchaError(captchaErrorCodes.invalidParameters, 'recaptcha-failed: secret and captureResult are required');
-				}
-
-				await this.verifyRecaptcha(params.secret, params.captchaResult);
-				await this.updateMeta(provider, params);
-			},
-			turnstile: async () => {
-				if (!params?.secret || !params.captchaResult) {
-					throw new CaptchaError(captchaErrorCodes.invalidParameters, 'turnstile-failed: secret and captureResult are required');
-				}
-
-				await this.verifyTurnstile(params.secret, params.captchaResult);
-				await this.updateMeta(provider, params);
-			},
-			testcaptcha: async () => {
-				if (!params?.captchaResult) {
-					throw new CaptchaError(captchaErrorCodes.invalidParameters, 'turnstile-failed: captureResult are required');
-				}
-
-				await this.verifyTestcaptcha(params.captchaResult);
-				await this.updateMeta(provider, params);
-			},
-		}[provider];
-
-		return operation()
-			.then(() => ({ success: true }) as CaptchaSaveSuccess)
-			.catch(err => {
-				this.logger.info(err);
-				const error = err instanceof CaptchaError
-					? err
-					: new CaptchaError(captchaErrorCodes.unknown, `unknown error: ${err}`);
-				return {
-					success: false,
-					error,
-				};
-			});
-	}
-
-	@bindThis
-	private async updateMeta(
-		provider: CaptchaProvider,
-		params?: {
-			sitekey?: string | null;
-			secret?: string | null;
-			instanceUrl?: string | null;
-		},
-	) {
-		const metaPartial: Partial<
-			Pick<
-				MiMeta,
-				('enableHcaptcha' | 'hcaptchaSiteKey' | 'hcaptchaSecretKey') |
-				('enableMcaptcha' | 'mcaptchaSitekey' | 'mcaptchaSecretKey' | 'mcaptchaInstanceUrl') |
-				('enableRecaptcha' | 'recaptchaSiteKey' | 'recaptchaSecretKey') |
-				('enableTurnstile' | 'turnstileSiteKey' | 'turnstileSecretKey') |
-				('enableTestcaptcha')
-			>
-		> = {
-			enableHcaptcha: provider === 'hcaptcha',
-			enableMcaptcha: provider === 'mcaptcha',
-			enableRecaptcha: provider === 'recaptcha',
-			enableTurnstile: provider === 'turnstile',
-			enableTestcaptcha: provider === 'testcaptcha',
-		};
-
-		const updateIfNotUndefined = <K extends keyof typeof metaPartial>(key: K, value: typeof metaPartial[K]) => {
-			if (value !== undefined) {
-				metaPartial[key] = value;
-			}
-		};
-		switch (provider) {
-			case 'hcaptcha': {
-				updateIfNotUndefined('hcaptchaSiteKey', params?.sitekey);
-				updateIfNotUndefined('hcaptchaSecretKey', params?.secret);
-				break;
-			}
-			case 'mcaptcha': {
-				updateIfNotUndefined('mcaptchaSitekey', params?.sitekey);
-				updateIfNotUndefined('mcaptchaSecretKey', params?.secret);
-				updateIfNotUndefined('mcaptchaInstanceUrl', params?.instanceUrl);
-				break;
-			}
-			case 'recaptcha': {
-				updateIfNotUndefined('recaptchaSiteKey', params?.sitekey);
-				updateIfNotUndefined('recaptchaSecretKey', params?.secret);
-				break;
-			}
-			case 'turnstile': {
-				updateIfNotUndefined('turnstileSiteKey', params?.sitekey);
-				updateIfNotUndefined('turnstileSecretKey', params?.secret);
-				break;
-			}
-		}
-
-		await this.metaService.update(metaPartial);
-	}
 }
 

packages/backend/src/core/CustomEmojiService.ts

@@ -4,59 +4,24 @@
  */
 
 import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
-import * as Redis from 'ioredis';
 import { In, IsNull } from 'typeorm';
+import * as Redis from 'ioredis';
+import { DI } from '@/di-symbols.js';
+import { IdService } from '@/core/IdService.js';
 import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
-import { IdService } from '@/core/IdService.js';
-import { ModerationLogService } from '@/core/ModerationLogService.js';
-import { UtilityService } from '@/core/UtilityService.js';
-import { bindThis } from '@/decorators.js';
-import { DI } from '@/di-symbols.js';
-import { MemoryKVCache, RedisSingleCache } from '@/misc/cache.js';
-import { sqlLikeEscape } from '@/misc/sql-like-escape.js';
-import type { EmojisRepository, MiRole, MiUser } from '@/models/_.js';
+import type { MiDriveFile } from '@/models/DriveFile.js';
 import type { MiEmoji } from '@/models/Emoji.js';
+import type { EmojisRepository, MiRole, MiUser } from '@/models/_.js';
+import { bindThis } from '@/decorators.js';
+import { MemoryKVCache, RedisSingleCache } from '@/misc/cache.js';
+import { UtilityService } from '@/core/UtilityService.js';
+import { query } from '@/misc/prelude/url.js';
 import type { Serialized } from '@/types.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
 
 const parseEmojiStrRegexp = /^([-\w]+)(?:@([\w.-]+))?$/;
 
-export const fetchEmojisHostTypes = [
-	'local',
-	'remote',
-	'all',
-] as const;
-export type FetchEmojisHostTypes = typeof fetchEmojisHostTypes[number];
-export const fetchEmojisSortKeys = [
-	'+id',
-	'-id',
-	'+updatedAt',
-	'-updatedAt',
-	'+name',
-	'-name',
-	'+host',
-	'-host',
-	'+uri',
-	'-uri',
-	'+publicUrl',
-	'-publicUrl',
-	'+type',
-	'-type',
-	'+aliases',
-	'-aliases',
-	'+category',
-	'-category',
-	'+license',
-	'-license',
-	'+isSensitive',
-	'-isSensitive',
-	'+localOnly',
-	'-localOnly',
-	'+roleIdsThatCanBeUsedThisEmojiAsReaction',
-	'-roleIdsThatCanBeUsedThisEmojiAsReaction',
-] as const;
-export type FetchEmojisSortKeys = typeof fetchEmojisSortKeys[number];
-
 @Injectable()
 export class CustomEmojiService implements OnApplicationShutdown {
 	private emojisCache: MemoryKVCache<MiEmoji | null>;
@@ -65,8 +30,10 @@ export class CustomEmojiService implements OnApplicationShutdown {
 	constructor(
 		@Inject(DI.redis)
 		private redisClient: Redis.Redis,
+
 		@Inject(DI.emojisRepository)
 		private emojisRepository: EmojisRepository,
+
 		private utilityService: UtilityService,
 		private idService: IdService,
 		private emojiEntityService: EmojiEntityService,
@@ -91,9 +58,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 
 	@bindThis
 	public async add(data: {
-		originalUrl: string;
-		publicUrl: string;
-		fileType: string;
+		driveFile: MiDriveFile;
 		name: string;
 		category: string | null;
 		aliases: string[];
@@ -110,9 +75,9 @@ export class CustomEmojiService implements OnApplicationShutdown {
 			category: data.category,
 			host: data.host,
 			aliases: data.aliases,
-			originalUrl: data.originalUrl,
-			publicUrl: data.publicUrl,
-			type: data.fileType,
+			originalUrl: data.driveFile.url,
+			publicUrl: data.driveFile.webpublicUrl ?? data.driveFile.url,
+			type: data.driveFile.webpublicType ?? data.driveFile.type,
 			license: data.license,
 			isSensitive: data.isSensitive,
 			localOnly: data.localOnly,
@@ -140,10 +105,8 @@ export class CustomEmojiService implements OnApplicationShutdown {
 	@bindThis
 	public async update(data: (
 		{ id: MiEmoji['id'], name?: string; } | { name: string; id?: MiEmoji['id'], }
-		) & {
-		originalUrl?: string;
-		publicUrl?: string;
-		fileType?: string;
+	) & {
+		driveFile?: MiDriveFile;
 		category?: string | null;
 		aliases?: string[];
 		license?: string | null;
@@ -176,9 +139,9 @@ export class CustomEmojiService implements OnApplicationShutdown {
 			license: data.license,
 			isSensitive: data.isSensitive,
 			localOnly: data.localOnly,
-			originalUrl: data.originalUrl,
-			publicUrl: data.publicUrl,
-			type: data.fileType,
+			originalUrl: data.driveFile != null ? data.driveFile.url : undefined,
+			publicUrl: data.driveFile != null ? (data.driveFile.webpublicUrl ?? data.driveFile.url) : undefined,
+			type: data.driveFile != null ? (data.driveFile.webpublicType ?? data.driveFile.type) : undefined,
 			roleIdsThatCanBeUsedThisEmojiAsReaction: data.roleIdsThatCanBeUsedThisEmojiAsReaction ?? undefined,
 		});
 
@@ -345,7 +308,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 
 	@bindThis
 	private normalizeHost(src: string | undefined, noteUserHost: string | null): string | null {
-		// クエリに使うホスト
+	// クエリに使うホスト
 		let host = src === '.' ? null	// .はローカルホスト (ここがマッチするのはリアクションのみ)
 			: src === undefined ? noteUserHost	// ノートなどでホスト省略表記の場合はローカルホスト (ここがリアクションにマッチすることはない)
 			: this.utilityService.isSelfHost(src) ? null	// 自ホスト指定
@@ -451,151 +414,6 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		return this.emojisRepository.findOneBy({ name, host: IsNull() });
 	}
 
-	@bindThis
-	public async fetchEmojis(
-		params?: {
-			query?: {
-				updatedAtFrom?: string;
-				updatedAtTo?: string;
-				name?: string;
-				host?: string;
-				uri?: string;
-				publicUrl?: string;
-				type?: string;
-				aliases?: string;
-				category?: string;
-				license?: string;
-				isSensitive?: boolean;
-				localOnly?: boolean;
-				hostType?: FetchEmojisHostTypes;
-				roleIds?: string[];
-			},
-			sinceId?: string;
-			untilId?: string;
-		},
-		opts?: {
-			limit?: number;
-			page?: number;
-			sortKeys?: FetchEmojisSortKeys[]
-		},
-	) {
-		function multipleWordsToQuery(words: string) {
-			return words.split(/\s/).filter(x => x.length > 0).map(x => `%${sqlLikeEscape(x)}%`);
-		}
-
-		const builder = this.emojisRepository.createQueryBuilder('emoji');
-		if (params?.query) {
-			const q = params.query;
-			if (q.updatedAtFrom) {
-				// noIndexScan
-				builder.andWhere('CAST(emoji.updatedAt AS DATE) >= :updateAtFrom', { updateAtFrom: q.updatedAtFrom });
-			}
-			if (q.updatedAtTo) {
-				// noIndexScan
-				builder.andWhere('CAST(emoji.updatedAt AS DATE) <= :updateAtTo', { updateAtTo: q.updatedAtTo });
-			}
-			if (q.name) {
-				builder.andWhere('emoji.name ~~ ANY(ARRAY[:...name])', { name: multipleWordsToQuery(q.name) });
-			}
-
-			switch (true) {
-				case q.hostType === 'local': {
-					builder.andWhere('emoji.host IS NULL');
-					break;
-				}
-				case q.hostType === 'remote': {
-					if (q.host) {
-						// noIndexScan
-						builder.andWhere('emoji.host ~~ ANY(ARRAY[:...host])', { host: multipleWordsToQuery(q.host) });
-					} else {
-						builder.andWhere('emoji.host IS NOT NULL');
-					}
-					break;
-				}
-			}
-
-			if (q.uri) {
-				// noIndexScan
-				builder.andWhere('emoji.uri ~~ ANY(ARRAY[:...uri])', { uri: multipleWordsToQuery(q.uri) });
-			}
-			if (q.publicUrl) {
-				// noIndexScan
-				builder.andWhere('emoji.publicUrl ~~ ANY(ARRAY[:...publicUrl])', { publicUrl: multipleWordsToQuery(q.publicUrl) });
-			}
-			if (q.type) {
-				// noIndexScan
-				builder.andWhere('emoji.type ~~ ANY(ARRAY[:...type])', { type: multipleWordsToQuery(q.type) });
-			}
-			if (q.aliases) {
-				// noIndexScan
-				const subQueryBuilder = builder.subQuery()
-					.select('COUNT(0)', 'count')
-					.from(
-						sq2 => sq2
-							.select('unnest(subEmoji.aliases)', 'alias')
-							.addSelect('subEmoji.id', 'id')
-							.from('emoji', 'subEmoji'),
-						'aliasTable',
-					)
-					.where('"emoji"."id" = "aliasTable"."id"')
-					.andWhere('"aliasTable"."alias" ~~ ANY(ARRAY[:...aliases])', { aliases: multipleWordsToQuery(q.aliases) });
-
-				builder.andWhere(`(${subQueryBuilder.getQuery()}) > 0`);
-			}
-			if (q.category) {
-				builder.andWhere('emoji.category ~~ ANY(ARRAY[:...category])', { category: multipleWordsToQuery(q.category) });
-			}
-			if (q.license) {
-				// noIndexScan
-				builder.andWhere('emoji.license ~~ ANY(ARRAY[:...license])', { license: multipleWordsToQuery(q.license) });
-			}
-			if (q.isSensitive != null) {
-				// noIndexScan
-				builder.andWhere('emoji.isSensitive = :isSensitive', { isSensitive: q.isSensitive });
-			}
-			if (q.localOnly != null) {
-				// noIndexScan
-				builder.andWhere('emoji.localOnly = :localOnly', { localOnly: q.localOnly });
-			}
-			if (q.roleIds && q.roleIds.length > 0) {
-				builder.andWhere('emoji.roleIdsThatCanBeUsedThisEmojiAsReaction && ARRAY[:...roleIds]::VARCHAR[]', { roleIds: q.roleIds });
-			}
-		}
-
-		if (params?.sinceId) {
-			builder.andWhere('emoji.id > :sinceId', { sinceId: params.sinceId });
-		}
-		if (params?.untilId) {
-			builder.andWhere('emoji.id < :untilId', { untilId: params.untilId });
-		}
-
-		if (opts?.sortKeys && opts.sortKeys.length > 0) {
-			for (const sortKey of opts.sortKeys) {
-				const direction = sortKey.startsWith('-') ? 'DESC' : 'ASC';
-				const key = sortKey.replace(/^[+-]/, '');
-				builder.addOrderBy(`emoji.${key}`, direction);
-			}
-		} else {
-			builder.addOrderBy('emoji.id', 'DESC');
-		}
-
-		const limit = opts?.limit ?? 10;
-		if (opts?.page) {
-			builder.skip((opts.page - 1) * limit);
-		}
-
-		builder.take(limit);
-
-		const [emojis, count] = await builder.getManyAndCount();
-
-		return {
-			emojis,
-			count: (count > limit ? emojis.length : count),
-			allCount: count,
-			allPages: Math.ceil(count / limit),
-		};
-	}
-
 	@bindThis
 	public dispose(): void {
 		this.emojisCache.dispose();

packages/backend/src/core/FetchInstanceMetadataService.ts

@@ -181,7 +181,7 @@ export class FetchInstanceMetadataService {
 	}
 
 	@bindThis
-	private async fetchDom(instance: MiInstance): Promise<Document> {
+	private async fetchDom(instance: MiInstance): Promise<DOMWindow['document']> {
 		this.logger.info(`Fetching HTML of ${instance.host} ...`);
 
 		const url = 'https://' + instance.host;
@@ -206,7 +206,7 @@ export class FetchInstanceMetadataService {
 	}
 
 	@bindThis
-	private async fetchFaviconUrl(instance: MiInstance, doc: Document | null): Promise<string | null> {
+	private async fetchFaviconUrl(instance: MiInstance, doc: DOMWindow['document'] | null): Promise<string | null> {
 		const url = 'https://' + instance.host;
 
 		if (doc) {
@@ -232,7 +232,7 @@ export class FetchInstanceMetadataService {
 	}
 
 	@bindThis
-	private async fetchIconUrl(instance: MiInstance, doc: Document | null, manifest: Record<string, any> | null): Promise<string | null> {
+	private async fetchIconUrl(instance: MiInstance, doc: DOMWindow['document'] | null, manifest: Record<string, any> | null): Promise<string | null> {
 		if (manifest && manifest.icons && manifest.icons.length > 0 && manifest.icons[0].src) {
 			const url = 'https://' + instance.host;
 			return (new URL(manifest.icons[0].src, url)).href;
@@ -261,7 +261,7 @@ export class FetchInstanceMetadataService {
 	}
 
 	@bindThis
-	private async getThemeColor(info: NodeInfo | null, doc: Document | null, manifest: Record<string, any> | null): Promise<string | null> {
+	private async getThemeColor(info: NodeInfo | null, doc: DOMWindow['document'] | null, manifest: Record<string, any> | null): Promise<string | null> {
 		const themeColor = info?.metadata?.themeColor ?? doc?.querySelector('meta[name="theme-color"]')?.getAttribute('content') ?? manifest?.theme_color;
 
 		if (themeColor) {
@@ -273,7 +273,7 @@ export class FetchInstanceMetadataService {
 	}
 
 	@bindThis
-	private async getSiteName(info: NodeInfo | null, doc: Document | null, manifest: Record<string, any> | null): Promise<string | null> {
+	private async getSiteName(info: NodeInfo | null, doc: DOMWindow['document'] | null, manifest: Record<string, any> | null): Promise<string | null> {
 		if (info && info.metadata) {
 			if (typeof info.metadata.nodeName === 'string') {
 				return info.metadata.nodeName;
@@ -298,7 +298,7 @@ export class FetchInstanceMetadataService {
 	}
 
 	@bindThis
-	private async getDescription(info: NodeInfo | null, doc: Document | null, manifest: Record<string, any> | null): Promise<string | null> {
+	private async getDescription(info: NodeInfo | null, doc: DOMWindow['document'] | null, manifest: Record<string, any> | null): Promise<string | null> {
 		if (info && info.metadata) {
 			if (typeof info.metadata.nodeDescription === 'string') {
 				return info.metadata.nodeDescription;

packages/backend/src/core/FileInfoService.ts

@@ -13,6 +13,7 @@ import * as fileType from 'file-type';
 import FFmpeg from 'fluent-ffmpeg';
 import isSvg from 'is-svg';
 import probeImageSize from 'probe-image-size';
+import { type predictionType } from 'nsfwjs';
 import { sharpBmp } from '@misskey-dev/sharp-read-bmp';
 import * as blurhash from 'blurhash';
 import { createTempDir } from '@/misc/create-temp.js';
@@ -20,7 +21,6 @@ import { AiService } from '@/core/AiService.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import type Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
-import type { PredictionType } from 'nsfwjs';
 
 export type FileInfo = {
 	size: number;
@@ -170,7 +170,7 @@ export class FileInfoService {
 		let sensitive = false;
 		let porn = false;
 
-		function judgePrediction(result: readonly PredictionType[]): [sensitive: boolean, porn: boolean] {
+		function judgePrediction(result: readonly predictionType[]): [sensitive: boolean, porn: boolean] {
 			let sensitive = false;
 			let porn = false;
 

packages/backend/src/core/MfmService.ts

@@ -171,39 +171,6 @@ export class MfmService {
 					break;
 				}
 
-				case 'ruby': {
-					let ruby: [string, string][] = [];
-					for (const child of node.childNodes) {
-						if (child.nodeName === 'rp') {
-							continue;
-						}
-						if (treeAdapter.isTextNode(child) && !/\s|\[|\]/.test(child.value)) {
-							ruby.push([child.value, '']);
-							continue;
-						}
-						if (child.nodeName === 'rt' && ruby.length > 0) {
-							const rt = getText(child);
-							if (/\s|\[|\]/.test(rt)) {
-								// If any space is included in rt, it is treated as a normal text
-								ruby = [];
-								appendChildren(node.childNodes);
-								break;
-							} else {
-								ruby.at(-1)![1] = rt;
-								continue;
-							}
-						}
-						// If any other element is included in ruby, it is treated as a normal text
-						ruby = [];
-						appendChildren(node.childNodes);
-						break;
-					}
-					for (const [base, rt] of ruby) {
-						text += `$[ruby ${base} ${rt}]`;
-					}
-					break;
-				}
-
 				// block code (<pre><code>)
 				case 'pre': {
 					if (node.childNodes.length === 1 && node.childNodes[0].nodeName === 'code') {
@@ -233,6 +200,21 @@ export class MfmService {
 					break;
 				}
 
+				case 'ruby': {
+					const rtText = node.childNodes
+						.filter((n) => n.nodeName === 'rt')
+						.map((n) => getText(n)).join(' ');
+					const rubyText = node.childNodes
+						.filter((n) => treeAdapter.isTextNode(n))
+						.map((n) => getText(n)).join(' ');
+					if (rubyText && rtText) {
+						text += `$[ruby ${rubyText}|${rtText} ]`;
+					} else {
+						appendChildren(node.childNodes);
+					}
+					break;
+				}
+
 				case 'p':
 				case 'h2':
 				case 'h3':
@@ -343,8 +325,14 @@ export class MfmService {
 							const rpEndEl = doc.createElement('rp');
 							rpEndEl.appendChild(doc.createTextNode(')'));
 
-							rubyEl.appendChild(doc.createTextNode(text.split(' ')[0]));
-							rtEl.appendChild(doc.createTextNode(text.split(' ')[1]));
+							// Optimization for Latin users
+							if (text.includes('|')) {
+								rubyEl.appendChild(doc.createTextNode(text.split('|')[0]));
+								rtEl.appendChild(doc.createTextNode(text.split('|')[1]));
+							} else {
+								rubyEl.appendChild(doc.createTextNode(text.split(' ')[0]));
+								rtEl.appendChild(doc.createTextNode(text.split(' ')[1]));
+							}
 							rubyEl.appendChild(rpStartEl);
 							rubyEl.appendChild(rtEl);
 							rubyEl.appendChild(rpEndEl);

packages/backend/src/core/NoteCreateService.ts

@@ -614,7 +614,14 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 			this.roleService.addNoteToRoleTimeline(noteObj);
 
-			this.webhookService.enqueueUserWebhook(user.id, 'note', { note: noteObj });
+			this.webhookService.getActiveWebhooks().then(webhooks => {
+				webhooks = webhooks.filter(x => x.userId === user.id && x.on.includes('note'));
+				for (const webhook of webhooks) {
+					this.queueService.userWebhookDeliver(webhook, 'note', {
+						note: noteObj,
+					});
+				}
+			});
 
 			const nm = new NotificationManager(this.mutingsRepository, this.notificationService, user, note);
 
@@ -634,7 +641,13 @@ export class NoteCreateService implements OnApplicationShutdown {
 					if (!isThreadMuted) {
 						nm.push(data.reply.userId, 'reply');
 						this.globalEventService.publishMainStream(data.reply.userId, 'reply', noteObj);
-						this.webhookService.enqueueUserWebhook(data.reply.userId, 'reply', { note: noteObj });
+
+						const webhooks = (await this.webhookService.getActiveWebhooks()).filter(x => x.userId === data.reply!.userId && x.on.includes('reply'));
+						for (const webhook of webhooks) {
+							this.queueService.userWebhookDeliver(webhook, 'reply', {
+								note: noteObj,
+							});
+						}
 					}
 				}
 			}
@@ -651,14 +664,20 @@ export class NoteCreateService implements OnApplicationShutdown {
 				// Publish event
 				if ((user.id !== data.renote.userId) && data.renote.userHost === null) {
 					this.globalEventService.publishMainStream(data.renote.userId, 'renote', noteObj);
-					this.webhookService.enqueueUserWebhook(data.renote.userId, 'renote', { note: noteObj });
+
+					const webhooks = (await this.webhookService.getActiveWebhooks()).filter(x => x.userId === data.renote!.userId && x.on.includes('renote'));
+					for (const webhook of webhooks) {
+						this.queueService.userWebhookDeliver(webhook, 'renote', {
+							note: noteObj,
+						});
+					}
 				}
 			}
 
 			nm.notify();
 
 			//#region AP deliver
-			if (!data.localOnly && this.userEntityService.isLocalUser(user)) {
+			if (this.userEntityService.isLocalUser(user)) {
 				(async () => {
 					const noteActivity = await this.renderNoteOrRenoteActivity(data, note);
 					const dm = this.apDeliverManagerService.createDeliverManager(user, noteActivity);
@@ -777,7 +796,13 @@ export class NoteCreateService implements OnApplicationShutdown {
 			});
 
 			this.globalEventService.publishMainStream(u.id, 'mention', detailPackedNote);
-			this.webhookService.enqueueUserWebhook(u.id, 'mention', { note: detailPackedNote });
+
+			const webhooks = (await this.webhookService.getActiveWebhooks()).filter(x => x.userId === u.id && x.on.includes('mention'));
+			for (const webhook of webhooks) {
+				this.queueService.userWebhookDeliver(webhook, 'mention', {
+					note: detailPackedNote,
+				});
+			}
 
 			// Create notification
 			nm.push(u.id, 'mention');

packages/backend/src/core/S3Service.ts

@@ -28,7 +28,7 @@ export class S3Service {
 			? `${meta.objectStorageUseSSL ? 'https' : 'http'}://${meta.objectStorageEndpoint}`
 			: `${meta.objectStorageUseSSL ? 'https' : 'http'}://example.net`; // dummy url to select http(s) agent
 
-		const agent = this.httpRequestService.getAgentByUrl(new URL(u), !meta.objectStorageUseProxy, true);
+		const agent = this.httpRequestService.getAgentByUrl(new URL(u), !meta.objectStorageUseProxy);
 		const handlerOption: NodeHttpHandlerOptions = {};
 		if (meta.objectStorageUseSSL) {
 			handlerOption.httpsAgent = agent as https.Agent;

packages/backend/src/core/SearchService.ts

@@ -6,17 +6,16 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { In } from 'typeorm';
 import { DI } from '@/di-symbols.js';
-import { type Config, FulltextSearchProvider } from '@/config.js';
+import type { Config } from '@/config.js';
 import { bindThis } from '@/decorators.js';
 import { MiNote } from '@/models/Note.js';
-import type { NotesRepository } from '@/models/_.js';
 import { MiUser } from '@/models/_.js';
+import type { NotesRepository } from '@/models/_.js';
 import { sqlLikeEscape } from '@/misc/sql-like-escape.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
 import { CacheService } from '@/core/CacheService.js';
 import { QueryService } from '@/core/QueryService.js';
 import { IdService } from '@/core/IdService.js';
-import { LoggerService } from '@/core/LoggerService.js';
 import type { Index, MeiliSearch } from 'meilisearch';
 
 type K = string;
@@ -28,24 +27,12 @@ type Q =
 	{ op: '<', k: K, v: number } |
 	{ op: '>=', k: K, v: number } |
 	{ op: '<=', k: K, v: number } |
-	{ op: 'is null', k: K } |
-	{ op: 'is not null', k: K } |
+	{ op: 'is null', k: K} |
+	{ op: 'is not null', k: K} |
 	{ op: 'and', qs: Q[] } |
 	{ op: 'or', qs: Q[] } |
 	{ op: 'not', q: Q };
 
-export type SearchOpts = {
-	userId?: MiNote['userId'] | null;
-	channelId?: MiNote['channelId'] | null;
-	host?: string | null;
-};
-
-export type SearchPagination = {
-	untilId?: MiNote['id'];
-	sinceId?: MiNote['id'];
-	limit: number;
-};
-
 function compileValue(value: V): string {
 	if (typeof value === 'string') {
 		return `'${value}'`; // TODO: escape
@@ -77,8 +64,7 @@ function compileQuery(q: Q): string {
 @Injectable()
 export class SearchService {
 	private readonly meilisearchIndexScope: 'local' | 'global' | string[] = 'local';
-	private readonly meilisearchNoteIndex: Index | null = null;
-	private readonly provider: FulltextSearchProvider;
+	private meilisearchNoteIndex: Index | null = null;
 
 	constructor(
 		@Inject(DI.config)
@@ -93,7 +79,6 @@ export class SearchService {
 		private cacheService: CacheService,
 		private queryService: QueryService,
 		private idService: IdService,
-		private loggerService: LoggerService,
 	) {
 		if (meilisearch) {
 			this.meilisearchNoteIndex = meilisearch.index(`${config.meilisearch!.index}---notes`);
@@ -124,185 +109,132 @@ export class SearchService {
 		if (config.meilisearch?.scope) {
 			this.meilisearchIndexScope = config.meilisearch.scope;
 		}
-
-		this.provider = config.fulltextSearch?.provider ?? 'sqlLike';
-		this.loggerService.getLogger('SearchService').info(`-- Provider: ${this.provider}`);
 	}
 
 	@bindThis
 	public async indexNote(note: MiNote): Promise<void> {
-		if (!this.meilisearch) return;
 		if (note.text == null && note.cw == null) return;
 		if (!['home', 'public'].includes(note.visibility)) return;
 
-		switch (this.meilisearchIndexScope) {
-			case 'global':
-				break;
+		if (this.meilisearch) {
+			switch (this.meilisearchIndexScope) {
+				case 'global':
+					break;
 
-			case 'local':
-				if (note.userHost == null) break;
-				return;
+				case 'local':
+					if (note.userHost == null) break;
+					return;
 
-			default: {
-				if (note.userHost == null) break;
-				if (this.meilisearchIndexScope.includes(note.userHost)) break;
-				return;
+				default: {
+					if (note.userHost == null) break;
+					if (this.meilisearchIndexScope.includes(note.userHost)) break;
+					return;
+				}
 			}
-		}
 
-		await this.meilisearchNoteIndex?.addDocuments([{
-			id: note.id,
-			createdAt: this.idService.parse(note.id).date.getTime(),
-			userId: note.userId,
-			userHost: note.userHost,
-			channelId: note.channelId,
-			cw: note.cw,
-			text: note.text,
-			tags: note.tags,
-		}], {
-			primaryKey: 'id',
-		});
+			await this.meilisearchNoteIndex?.addDocuments([{
+				id: note.id,
+				createdAt: this.idService.parse(note.id).date.getTime(),
+				userId: note.userId,
+				userHost: note.userHost,
+				channelId: note.channelId,
+				cw: note.cw,
+				text: note.text,
+				tags: note.tags,
+			}], {
+				primaryKey: 'id',
+			});
+		}
 	}
 
 	@bindThis
 	public async unindexNote(note: MiNote): Promise<void> {
-		if (!this.meilisearch) return;
 		if (!['home', 'public'].includes(note.visibility)) return;
 
-		await this.meilisearchNoteIndex?.deleteDocument(note.id);
-	}
-
-	@bindThis
-	public async searchNote(
-		q: string,
-		me: MiUser | null,
-		opts: SearchOpts,
-		pagination: SearchPagination,
-	): Promise<MiNote[]> {
-		switch (this.provider) {
-			case 'sqlLike':
-			case 'sqlPgroonga': {
-				// ほとんど内容に差がないのでsqlLikeとsqlPgroongaを同じ処理にしている.
-				// 今後の拡張で差が出る用であれば関数を分ける.
-				return this.searchNoteByLike(q, me, opts, pagination);
-			}
-			case 'meilisearch': {
-				return this.searchNoteByMeiliSearch(q, me, opts, pagination);
-			}
-			default: {
-				// eslint-disable-next-line @typescript-eslint/no-unused-vars
-				const typeCheck: never = this.provider;
-				return [];
-			}
+		if (this.meilisearch) {
+			this.meilisearchNoteIndex!.deleteDocument(note.id);
 		}
 	}
 
 	@bindThis
-	private async searchNoteByLike(
-		q: string,
-		me: MiUser | null,
-		opts: SearchOpts,
-		pagination: SearchPagination,
-	): Promise<MiNote[]> {
-		const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), pagination.sinceId, pagination.untilId);
-
-		if (opts.userId) {
-			query.andWhere('note.userId = :userId', { userId: opts.userId });
-		} else if (opts.channelId) {
-			query.andWhere('note.channelId = :channelId', { channelId: opts.channelId });
-		}
-
-		query
-			.innerJoinAndSelect('note.user', 'user')
-			.leftJoinAndSelect('note.reply', 'reply')
-			.leftJoinAndSelect('note.renote', 'renote')
-			.leftJoinAndSelect('reply.user', 'replyUser')
-			.leftJoinAndSelect('renote.user', 'renoteUser');
-
-		if (this.config.fulltextSearch?.provider === 'sqlPgroonga') {
-			query.andWhere('note.text &@ :q', { q });
-		} else {
-			query.andWhere('LOWER(note.text) LIKE :q', { q: `%${ sqlLikeEscape(q.toLowerCase()) }%` });
-		}
-
-		if (opts.host) {
-			if (opts.host === '.') {
-				query.andWhere('user.host IS NULL');
-			} else {
-				query.andWhere('user.host = :host', { host: opts.host });
+	public async searchNote(q: string, me: MiUser | null, opts: {
+		userId?: MiNote['userId'] | null;
+		channelId?: MiNote['channelId'] | null;
+		host?: string | null;
+	}, pagination: {
+		untilId?: MiNote['id'];
+		sinceId?: MiNote['id'];
+		limit?: number;
+	}): Promise<MiNote[]> {
+		if (this.meilisearch) {
+			const filter: Q = {
+				op: 'and',
+				qs: [],
+			};
+			if (pagination.untilId) filter.qs.push({ op: '<', k: 'createdAt', v: this.idService.parse(pagination.untilId).date.getTime() });
+			if (pagination.sinceId) filter.qs.push({ op: '>', k: 'createdAt', v: this.idService.parse(pagination.sinceId).date.getTime() });
+			if (opts.userId) filter.qs.push({ op: '=', k: 'userId', v: opts.userId });
+			if (opts.channelId) filter.qs.push({ op: '=', k: 'channelId', v: opts.channelId });
+			if (opts.host) {
+				if (opts.host === '.') {
+					filter.qs.push({ op: 'is null', k: 'userHost' });
+				} else {
+					filter.qs.push({ op: '=', k: 'userHost', v: opts.host });
+				}
 			}
-		}
-
-		this.queryService.generateVisibilityQuery(query, me);
-		if (me) this.queryService.generateMutedUserQuery(query, me);
-		if (me) this.queryService.generateBlockedUserQuery(query, me);
-
-		return query.limit(pagination.limit).getMany();
-	}
-
-	@bindThis
-	private async searchNoteByMeiliSearch(
-		q: string,
-		me: MiUser | null,
-		opts: SearchOpts,
-		pagination: SearchPagination,
-	): Promise<MiNote[]> {
-		if (!this.meilisearch || !this.meilisearchNoteIndex) {
-			throw new Error('MeiliSearch is not available');
-		}
-
-		const filter: Q = {
-			op: 'and',
-			qs: [],
-		};
-		if (pagination.untilId) filter.qs.push({
-			op: '<',
-			k: 'createdAt',
-			v: this.idService.parse(pagination.untilId).date.getTime(),
-		});
-		if (pagination.sinceId) filter.qs.push({
-			op: '>',
-			k: 'createdAt',
-			v: this.idService.parse(pagination.sinceId).date.getTime(),
-		});
-		if (opts.userId) filter.qs.push({ op: '=', k: 'userId', v: opts.userId });
-		if (opts.channelId) filter.qs.push({ op: '=', k: 'channelId', v: opts.channelId });
-		if (opts.host) {
-			if (opts.host === '.') {
-				filter.qs.push({ op: 'is null', k: 'userHost' });
-			} else {
-				filter.qs.push({ op: '=', k: 'userHost', v: opts.host });
-			}
-		}
-
-		const res = await this.meilisearchNoteIndex.search(q, {
-			sort: ['createdAt:desc'],
-			matchingStrategy: 'all',
-			attributesToRetrieve: ['id', 'createdAt'],
-			filter: compileQuery(filter),
-			limit: pagination.limit,
-		});
-		if (res.hits.length === 0) {
-			return [];
-		}
-
-		const [
-			userIdsWhoMeMuting,
-			userIdsWhoBlockingMe,
-		] = me
-			? await Promise.all([
+			const res = await this.meilisearchNoteIndex!.search(q, {
+				sort: ['createdAt:desc'],
+				matchingStrategy: 'all',
+				attributesToRetrieve: ['id', 'createdAt'],
+				filter: compileQuery(filter),
+				limit: pagination.limit,
+			});
+			if (res.hits.length === 0) return [];
+			const [
+				userIdsWhoMeMuting,
+				userIdsWhoBlockingMe,
+			] = me ? await Promise.all([
 				this.cacheService.userMutingsCache.fetch(me.id),
 				this.cacheService.userBlockedCache.fetch(me.id),
-			])
-			: [new Set<string>(), new Set<string>()];
-		const notes = (await this.notesRepository.findBy({
-			id: In(res.hits.map(x => x.id)),
-		})).filter(note => {
-			if (me && isUserRelated(note, userIdsWhoBlockingMe)) return false;
-			if (me && isUserRelated(note, userIdsWhoMeMuting)) return false;
-			return true;
-		});
+			]) : [new Set<string>(), new Set<string>()];
+			const notes = (await this.notesRepository.findBy({
+				id: In(res.hits.map(x => x.id)),
+			})).filter(note => {
+				if (me && isUserRelated(note, userIdsWhoBlockingMe)) return false;
+				if (me && isUserRelated(note, userIdsWhoMeMuting)) return false;
+				return true;
+			});
+			return notes.sort((a, b) => a.id > b.id ? -1 : 1);
+		} else {
+			const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), pagination.sinceId, pagination.untilId);
 
-		return notes.sort((a, b) => a.id > b.id ? -1 : 1);
+			if (opts.userId) {
+				query.andWhere('note.userId = :userId', { userId: opts.userId });
+			} else if (opts.channelId) {
+				query.andWhere('note.channelId = :channelId', { channelId: opts.channelId });
+			}
+
+			query
+				.andWhere('note.text &@~ :q', { q: sqlLikeEscape(q) })
+				.innerJoinAndSelect('note.user', 'user')
+				.leftJoinAndSelect('note.reply', 'reply')
+				.leftJoinAndSelect('note.renote', 'renote')
+				.leftJoinAndSelect('reply.user', 'replyUser')
+				.leftJoinAndSelect('renote.user', 'renoteUser');
+
+			if (opts.host) {
+				if (opts.host === '.') {
+					query.andWhere('user.host IS NULL');
+				} else {
+					query.andWhere('user.host = :host', { host: opts.host });
+				}
+			}
+
+			this.queryService.generateVisibilityQuery(query, me);
+			if (me) this.queryService.generateMutedUserQuery(query, me);
+			if (me) this.queryService.generateBlockedUserQuery(query, me);
+
+			return await query.limit(pagination.limit).getMany();
+		}
 	}
 }

packages/backend/src/core/SystemWebhookService.ts

@@ -50,6 +50,7 @@ export type SystemWebhookPayload<T extends SystemWebhookEventType> =
 
 @Injectable()
 export class SystemWebhookService implements OnApplicationShutdown {
+	private logger: Logger;
 	private activeSystemWebhooksFetched = false;
 	private activeSystemWebhooks: MiSystemWebhook[] = [];
 
@@ -61,9 +62,11 @@ export class SystemWebhookService implements OnApplicationShutdown {
 		private idService: IdService,
 		private queueService: QueueService,
 		private moderationLogService: ModerationLogService,
+		private loggerService: LoggerService,
 		private globalEventService: GlobalEventService,
 	) {
 		this.redisForSub.on('message', this.onMessage);
+		this.logger = this.loggerService.getLogger('webhook');
 	}
 
 	@bindThis
@@ -190,24 +193,28 @@ export class SystemWebhookService implements OnApplicationShutdown {
 	/**
 	 * SystemWebhook をWebhook配送キューに追加する
 	 * @see QueueService.systemWebhookDeliver
+	 * // TODO: contentの型を厳格化する
 	 */
 	@bindThis
 	public async enqueueSystemWebhook<T extends SystemWebhookEventType>(
+		webhook: MiSystemWebhook | MiSystemWebhook['id'],
 		type: T,
 		content: SystemWebhookPayload<T>,
-		opts?: {
-			excludes?: MiSystemWebhook['id'][];
-		},
 	) {
-		const webhooks = await this.fetchActiveSystemWebhooks()
-			.then(webhooks => {
-				return webhooks.filter(webhook => !opts?.excludes?.includes(webhook.id) && webhook.on.includes(type));
-			});
-		return Promise.all(
-			webhooks.map(webhook => {
-				return this.queueService.systemWebhookDeliver(webhook, type, content);
-			}),
-		);
+		const webhookEntity = typeof webhook === 'string'
+			? (await this.fetchActiveSystemWebhooks()).find(a => a.id === webhook)
+			: webhook;
+		if (!webhookEntity || !webhookEntity.isActive) {
+			this.logger.info(`SystemWebhook is not active or not found : ${webhook}`);
+			return;
+		}
+
+		if (!webhookEntity.on.includes(type)) {
+			this.logger.info(`SystemWebhook ${webhookEntity.id} is not listening to ${type}`);
+			return;
+		}
+
+		return this.queueService.systemWebhookDeliver(webhookEntity, type, content);
 	}
 
 	@bindThis

packages/backend/src/core/UserBlockingService.ts

@@ -118,7 +118,13 @@ export class UserBlockingService implements OnModuleInit {
 				schema: 'UserDetailedNotMe',
 			}).then(async packed => {
 				this.globalEventService.publishMainStream(follower.id, 'unfollow', packed);
-				this.webhookService.enqueueUserWebhook(follower.id, 'unfollow', { user: packed });
+
+				const webhooks = (await this.webhookService.getActiveWebhooks()).filter(x => x.userId === follower.id && x.on.includes('unfollow'));
+				for (const webhook of webhooks) {
+					this.queueService.userWebhookDeliver(webhook, 'unfollow', {
+						user: packed,
+					});
+				}
 			});
 		}
 

packages/backend/src/core/UserFollowingService.ts

@@ -333,7 +333,13 @@ export class UserFollowingService implements OnModuleInit {
 				schema: 'UserDetailedNotMe',
 			}).then(async packed => {
 				this.globalEventService.publishMainStream(follower.id, 'follow', packed);
-				this.webhookService.enqueueUserWebhook(follower.id, 'follow', { user: packed });
+
+				const webhooks = (await this.webhookService.getActiveWebhooks()).filter(x => x.userId === follower.id && x.on.includes('follow'));
+				for (const webhook of webhooks) {
+					this.queueService.userWebhookDeliver(webhook, 'follow', {
+						user: packed,
+					});
+				}
 			});
 		}
 
@@ -341,7 +347,13 @@ export class UserFollowingService implements OnModuleInit {
 		if (this.userEntityService.isLocalUser(followee)) {
 			this.userEntityService.pack(follower.id, followee).then(async packed => {
 				this.globalEventService.publishMainStream(followee.id, 'followed', packed);
-				this.webhookService.enqueueUserWebhook(followee.id, 'followed', { user: packed });
+
+				const webhooks = (await this.webhookService.getActiveWebhooks()).filter(x => x.userId === followee.id && x.on.includes('followed'));
+				for (const webhook of webhooks) {
+					this.queueService.userWebhookDeliver(webhook, 'followed', {
+						user: packed,
+					});
+				}
 			});
 
 			// 通知を作成
@@ -388,7 +400,13 @@ export class UserFollowingService implements OnModuleInit {
 				schema: 'UserDetailedNotMe',
 			}).then(async packed => {
 				this.globalEventService.publishMainStream(follower.id, 'unfollow', packed);
-				this.webhookService.enqueueUserWebhook(follower.id, 'unfollow', { user: packed });
+
+				const webhooks = (await this.webhookService.getActiveWebhooks()).filter(x => x.userId === follower.id && x.on.includes('unfollow'));
+				for (const webhook of webhooks) {
+					this.queueService.userWebhookDeliver(webhook, 'unfollow', {
+						user: packed,
+					});
+				}
 			});
 		}
 
@@ -726,7 +744,13 @@ export class UserFollowingService implements OnModuleInit {
 		});
 
 		this.globalEventService.publishMainStream(follower.id, 'unfollow', packedFollowee);
-		this.webhookService.enqueueUserWebhook(follower.id, 'unfollow', { user: packedFollowee });
+
+		const webhooks = (await this.webhookService.getActiveWebhooks()).filter(x => x.userId === follower.id && x.on.includes('unfollow'));
+		for (const webhook of webhooks) {
+			this.queueService.userWebhookDeliver(webhook, 'unfollow', {
+				user: packedFollowee,
+			});
+		}
 	}
 
 	@bindThis

packages/backend/src/core/UserListService.ts

@@ -6,7 +6,7 @@
 import { Inject, Injectable, OnApplicationShutdown, OnModuleInit } from '@nestjs/common';
 import * as Redis from 'ioredis';
 import { ModuleRef } from '@nestjs/core';
-import type { UserListMembershipsRepository } from '@/models/_.js';
+import type { FollowingsRepository, UserListMembershipsRepository } from '@/models/_.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiUserList } from '@/models/UserList.js';
 import type { MiUserListMembership } from '@/models/UserListMembership.js';
@@ -40,6 +40,9 @@ export class UserListService implements OnApplicationShutdown, OnModuleInit {
 		@Inject(DI.userListMembershipsRepository)
 		private userListMembershipsRepository: UserListMembershipsRepository,
 
+		@Inject(DI.followingsRepository)
+		private followingsRepository: FollowingsRepository,
+
 		private userEntityService: UserEntityService,
 		private idService: IdService,
 		private globalEventService: GlobalEventService,
@@ -113,7 +116,11 @@ export class UserListService implements OnApplicationShutdown, OnModuleInit {
 		if (this.userEntityService.isRemoteUser(target)) {
 			const proxy = await this.proxyAccountService.fetch();
 			if (proxy) {
-				this.queueService.createFollowJob([{ from: { id: proxy.id }, to: { id: target.id } }]);
+				const hasFollow = await this.followingsRepository.createQueryBuilder('f')
+					.where('f.followeeId = :userId', { userId: target.id })
+					.andWhere('f.followerHost IS NULL')
+					.getExists();
+				if (!hasFollow) this.queueService.createFollowJob([{ from: { id: proxy.id }, to: { id: target.id } }]);
 			}
 		}
 	}

packages/backend/src/core/UserService.ts

@@ -63,6 +63,13 @@ export class UserService {
 	@bindThis
 	public async notifySystemWebhook(user: MiUser, type: 'userCreated') {
 		const packedUser = await this.userEntityService.pack(user, null, { schema: 'UserLite' });
-		return this.systemWebhookService.enqueueSystemWebhook(type, packedUser);
+		const recipientWebhookIds = await this.systemWebhookService.fetchSystemWebhooks({ isActive: true, on: [type] });
+		for (const webhookId of recipientWebhookIds) {
+			await this.systemWebhookService.enqueueSystemWebhook(
+				webhookId,
+				type,
+				packedUser,
+			);
+		}
 	}
 }

packages/backend/src/core/UserWebhookService.ts

@@ -5,14 +5,13 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
-import { MiUser, type WebhooksRepository } from '@/models/_.js';
+import { type WebhooksRepository } from '@/models/_.js';
 import { MiWebhook, WebhookEventTypes } from '@/models/Webhook.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import { GlobalEvents } from '@/core/GlobalEventService.js';
-import type { Packed } from '@/misc/json-schema.js';
-import { QueueService } from '@/core/QueueService.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
+import type { Packed } from '@/misc/json-schema.js';
 
 export type UserWebhookPayload<T extends WebhookEventTypes> =
 	T extends 'note' | 'reply' | 'renote' |'mention' ? {
@@ -35,7 +34,6 @@ export class UserWebhookService implements OnApplicationShutdown {
 		private redisForSub: Redis.Redis,
 		@Inject(DI.webhooksRepository)
 		private webhooksRepository: WebhooksRepository,
-		private queueService: QueueService,
 	) {
 		this.redisForSub.on('message', this.onMessage);
 	}
@@ -77,25 +75,6 @@ export class UserWebhookService implements OnApplicationShutdown {
 		return query.getMany();
 	}
 
-	/**
-	 * UserWebhook をWebhook配送キューに追加する
-	 * @see QueueService.userWebhookDeliver
-	 */
-	@bindThis
-	public async enqueueUserWebhook<T extends WebhookEventTypes>(
-		userId: MiUser['id'],
-		type: T,
-		content: UserWebhookPayload<T>,
-	) {
-		const webhooks = await this.getActiveWebhooks()
-			.then(webhooks => webhooks.filter(webhook => webhook.userId === userId && webhook.on.includes(type)));
-		return Promise.all(
-			webhooks.map(webhook => {
-				return this.queueService.userWebhookDeliver(webhook, type, content);
-			}),
-		);
-	}
-
 	@bindThis
 	private async onMessage(_: string, data: string): Promise<void> {
 		const obj = JSON.parse(data);

packages/backend/src/core/UtilityService.ts

@@ -3,7 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { URL, domainToASCII } from 'node:url';
+import { URL } from 'node:url';
+import { toASCII } from 'punycode';
 import { Inject, Injectable } from '@nestjs/common';
 import RE2 from 're2';
 import { DI } from '@/di-symbols.js';
@@ -105,13 +106,13 @@ export class UtilityService {
 
 	@bindThis
 	public toPuny(host: string): string {
-		return domainToASCII(host.toLowerCase());
+		return toASCII(host.toLowerCase());
 	}
 
 	@bindThis
 	public toPunyNullable(host: string | null | undefined): string | null {
 		if (host == null) return null;
-		return domainToASCII(host.toLowerCase());
+		return toASCII(host.toLowerCase());
 	}
 
 	@bindThis

packages/backend/src/core/WebAuthnService.ts

@@ -189,12 +189,14 @@ export class WebAuthnService {
 	 */
 	@bindThis
 	public async verifySignInWithPasskeyAuthentication(context: string, response: AuthenticationResponseJSON): Promise<MiUser['id'] | null> {
-		const challenge = await this.redisClient.getdel(`webauthn:challenge:${context}`);
+		const challenge = await this.redisClient.get(`webauthn:challenge:${context}`);
 
 		if (!challenge) {
 			throw new IdentifiableError('2d16e51c-007b-4edd-afd2-f7dd02c947f6', `challenge '${context}' not found`);
 		}
 
+		await this.redisClient.del(`webauthn:challenge:${context}`);
+
 		const key = await this.userSecurityKeysRepository.findOneBy({
 			id: response.id,
 		});

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

@@ -183,9 +183,6 @@ export class ApRendererService {
 				// || emoji.originalUrl してるのは後方互換性のため（publicUrlはstringなので??はだめ）
 				url: emoji.publicUrl || emoji.originalUrl,
 			},
-			_misskey_license: {
-				freeText: emoji.license
-			},
 		};
 	}
 

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

@@ -20,7 +20,6 @@ import { ApDbResolverService } from './ApDbResolverService.js';
 import { ApRendererService } from './ApRendererService.js';
 import { ApRequestService } from './ApRequestService.js';
 import type { IObject, ICollection, IOrderedCollection } from './type.js';
-import { IdentifiableError } from '@/misc/identifiable-error.js';
 
 export class Resolver {
 	private history: Set<string>;
@@ -67,7 +66,7 @@ export class Resolver {
 		if (isCollectionOrOrderedCollection(collection)) {
 			return collection;
 		} else {
-			throw new IdentifiableError('f100eccf-f347-43fb-9b45-96a0831fb635', `unrecognized collection type: ${collection.type}`);
+			throw new Error(`unrecognized collection type: ${collection.type}`);
 		}
 	}
 
@@ -81,15 +80,15 @@ export class Resolver {
 			// URLs with fragment parts cannot be resolved correctly because
 			// the fragment part does not get transmitted over HTTP(S).
 			// Avoid strange behaviour by not trying to resolve these at all.
-			throw new IdentifiableError('b94fd5b1-0e3b-4678-9df2-dad4cd515ab2', `cannot resolve URL with fragment: ${value}`);
+			throw new Error(`cannot resolve URL with fragment: ${value}`);
 		}
 
 		if (this.history.has(value)) {
-			throw new IdentifiableError('0dc86cf6-7cd6-4e56-b1e6-5903d62d7ea5', 'cannot resolve already resolved one');
+			throw new Error('cannot resolve already resolved one');
 		}
 
 		if (this.history.size > this.recursionLimit) {
-			throw new IdentifiableError('d592da9f-822f-4d91-83d7-4ceefabcf3d2', `hit recursion limit: ${this.utilityService.extractDbHost(value)}`);
+			throw new Error(`hit recursion limit: ${this.utilityService.extractDbHost(value)}`);
 		}
 
 		this.history.add(value);
@@ -100,7 +99,7 @@ export class Resolver {
 		}
 
 		if (!this.utilityService.isFederationAllowedHost(host)) {
-			throw new IdentifiableError('09d79f9e-64f1-4316-9cfa-e75c4d091574', 'Instance is blocked');
+			throw new Error('Instance is blocked');
 		}
 
 		if (this.config.signToActivityPubGet && !this.user) {
@@ -116,7 +115,7 @@ export class Resolver {
 				!(object['@context'] as unknown[]).includes('https://www.w3.org/ns/activitystreams') :
 				object['@context'] !== 'https://www.w3.org/ns/activitystreams'
 		) {
-			throw new IdentifiableError('72180409-793c-4973-868e-5a118eb5519b', 'invalid response');
+			throw new Error('invalid response');
 		}
 
 		// HttpRequestService / ApRequestService have already checked that
@@ -124,11 +123,11 @@ export class Resolver {
 		// object after redirects; here we double-check that no redirects
 		// bounced between hosts
 		if (object.id == null) {
-			throw new IdentifiableError('ad2dc287-75c1-44c4-839d-3d2e64576675', 'invalid AP object: missing id');
+			throw new Error('invalid AP object: missing id');
 		}
 
 		if (this.utilityService.punyHost(object.id) !== this.utilityService.punyHost(value)) {
-			throw new IdentifiableError('fd93c2fa-69a8-440f-880b-bf178e0ec877', `invalid AP object ${value}: id ${object.id} has different host`);
+			throw new Error(`invalid AP object ${value}: id ${object.id} has different host`);
 		}
 
 		return object;
@@ -137,7 +136,7 @@ export class Resolver {
 	@bindThis
 	private resolveLocal(url: string): Promise<IObject> {
 		const parsed = this.apDbResolverService.parseUri(url);
-		if (!parsed.local) throw new IdentifiableError('02b40cd0-fa92-4b0c-acc9-fb2ada952ab8', 'resolveLocal: not local');
+		if (!parsed.local) throw new Error('resolveLocal: not local');
 
 		switch (parsed.type) {
 			case 'notes':
@@ -166,7 +165,7 @@ export class Resolver {
 			case 'follows':
 				return this.followRequestsRepository.findOneBy({ id: parsed.id })
 					.then(async followRequest => {
-						if (followRequest == null) throw new IdentifiableError('a9d946e5-d276-47f8-95fb-f04230289bb0', 'resolveLocal: invalid follow request ID');
+						if (followRequest == null) throw new Error('resolveLocal: invalid follow request ID');
 						const [follower, followee] = await Promise.all([
 							this.usersRepository.findOneBy({
 								id: followRequest.followerId,
@@ -178,12 +177,12 @@ export class Resolver {
 							}),
 						]);
 						if (follower == null || followee == null) {
-							throw new IdentifiableError('06ae3170-1796-4d93-a697-2611ea6d83b6', 'resolveLocal: follower or followee does not exist');
+							throw new Error('resolveLocal: follower or followee does not exist');
 						}
 						return this.apRendererService.addContext(this.apRendererService.renderFollow(follower as MiLocalUser | MiRemoteUser, followee as MiLocalUser | MiRemoteUser, url));
 					});
 			default:
-				throw new IdentifiableError('7a5d2fc0-94bc-4db6-b8b8-1bf24a2e23d0', `resolveLocal: type ${parsed.type} unhandled`);
+				throw new Error(`resolveLocal: type ${parsed.type} unhandled`);
 		}
 	}
 }

packages/backend/src/core/activitypub/misc/check-against-url.ts

@@ -5,15 +5,13 @@
 import type { IObject } from '../type.js';
 
 export function assertActivityMatchesUrls(activity: IObject, urls: string[]) {
-	const hosts = urls.map(it => new URL(it).host);
-
-	const idOk = activity.id !== undefined && hosts.includes(new URL(activity.id).host);
+	const idOk = activity.id !== undefined && urls.includes(activity.id);
 
 	// technically `activity.url` could be an `ApObject = IObject |
 	// string | (IObject | string)[]`, but if it's a complicated thing
 	// and the `activity.id` doesn't match, I think we're fine
 	// rejecting the activity
-	const urlOk = typeof(activity.url) === 'string' && hosts.includes(new URL(activity.url).host);
+	const urlOk = typeof(activity.url) === 'string' && urls.includes(activity.url);
 
 	if (!idOk && !urlOk) {
 		throw new Error(`bad Activity: neither id(${activity?.id}) nor url(${activity?.url}) match location(${urls})`);

packages/backend/src/core/activitypub/misc/contexts.ts

@@ -558,11 +558,6 @@ const extension_context_definition = {
 	'_misskey_requireSigninToViewContents': 'misskey:_misskey_requireSigninToViewContents',
 	'_misskey_makeNotesFollowersOnlyBefore': 'misskey:_misskey_makeNotesFollowersOnlyBefore',
 	'_misskey_makeNotesHiddenBefore': 'misskey:_misskey_makeNotesHiddenBefore',
-	'_misskey_license': 'misskey:_misskey_license',
-	'freeText': {
-		'@id': 'misskey:freeText',
-		'@type': 'schema:text',
-	},
 	'isCat': 'misskey:isCat',
 	// vcard
 	vcard: 'http://www.w3.org/2006/vcard/ns#',

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

@@ -154,8 +154,14 @@ export class ApNoteService {
 
 		const url = getOneApHrefNullable(note.url);
 
-		if (url && !checkHttps(url)) {
-			throw new Error('unexpected schema of note url: ' + url);
+		if (url != null) {
+			if (!checkHttps(url)) {
+				throw new Error('unexpected schema of note url: ' + url);
+			}
+
+			if (this.utilityService.punyHost(url) !== this.utilityService.punyHost(note.id)) {
+				throw new Error(`note url & uri host mismatch: note url: ${url}, note uri: ${note.id}`);
+			}
 		}
 
 		this.logger.info(`Creating the Note: ${note.id}`);
@@ -408,8 +414,6 @@ export class ApNoteService {
 						originalUrl: tag.icon.url,
 						publicUrl: tag.icon.url,
 						updatedAt: new Date(),
-						// _misskey_license が存在しなければ `null`
-						license: (tag._misskey_license?.freeText ?? null)
 					});
 
 					const emoji = await this.emojisRepository.findOneBy({ host, name });
@@ -431,8 +435,6 @@ export class ApNoteService {
 				publicUrl: tag.icon.url,
 				updatedAt: new Date(),
 				aliases: [],
-				// _misskey_license が存在しなければ `null`
-				license: (tag._misskey_license?.freeText ?? null)
 			});
 		}));
 	}

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

@@ -157,12 +157,8 @@ export class ApPersonService implements OnModuleInit {
 		const sharedInboxObject = x.sharedInbox ?? (x.endpoints ? x.endpoints.sharedInbox : undefined);
 		if (sharedInboxObject != null) {
 			const sharedInbox = getApId(sharedInboxObject);
-			if (!(typeof sharedInbox === 'string' && sharedInbox.length > 0 && new URL(sharedInbox).host === expectHost)) {
-				this.logger.warn(`invalid Actor: skipping wrong shared inbox, expected host: ${expectHost}, actual URL: ${sharedInbox}`);
-				x.sharedInbox = undefined;
-				if (x.endpoints?.sharedInbox) {
-					x.endpoints.sharedInbox = undefined;
-				}
+			if (!(typeof sharedInbox === 'string' && sharedInbox.length > 0 && this.utilityService.punyHost(sharedInbox) === expectHost)) {
+				throw new Error('invalid Actor: wrong shared inbox');
 			}
 		}
 
@@ -261,7 +257,7 @@ export class ApPersonService implements OnModuleInit {
 			if (Array.isArray(img)) {
 				img = img.find(item => item && item.url) ?? null;
 			}
-
+			
 			// if we have an explicitly missing image, return an
 			// explicitly-null set of values
 			if ((img == null) || (typeof img === 'object' && img.url == null)) {
@@ -348,8 +344,14 @@ export class ApPersonService implements OnModuleInit {
 			throw new Error('Refusing to create person without id');
 		}
 
-		if (url && !checkHttps(url)) {
-			throw new Error('unexpected schema of person url: ' + url);
+		if (url != null) {
+			if (!checkHttps(url)) {
+				throw new Error('unexpected schema of person url: ' + url);
+			}
+
+			if (this.utilityService.punyHost(url) !== this.utilityService.punyHost(person.id)) {
+				throw new Error(`person url <> uri host mismatch: ${url} <> ${person.id}`);
+			}
 		}
 
 		// Create user

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

@@ -242,11 +242,6 @@ export interface IApEmoji extends IObject {
 	type: 'Emoji';
 	name: string;
 	updated: string;
-	// Misskey拡張。後方互換性のためにoptional。
-	// 将来の拡張性を考慮してobjectにしている
-	_misskey_license?: {
-		freeText: string | null;
-	};
 }
 
 export const isEmoji = (object: IObject): object is IApEmoji =>

packages/backend/src/core/chart/ChartManagementService.ts

@@ -58,9 +58,9 @@ export class ChartManagementService implements OnApplicationShutdown {
 	@bindThis
 	public async start() {
 		// 20分おきにメモリ情報をDBに書き込み
-		this.saveIntervalId = setInterval(async () => {
+		this.saveIntervalId = setInterval(() => {
 			for (const chart of this.charts) {
-				await chart.save();
+				chart.save();
 			}
 		}, 1000 * 60 * 20);
 	}
@@ -69,9 +69,9 @@ export class ChartManagementService implements OnApplicationShutdown {
 	public async dispose(): Promise<void> {
 		clearInterval(this.saveIntervalId);
 		if (process.env.NODE_ENV !== 'test') {
-			for (const chart of this.charts) {
-				await chart.save();
-			}
+			await Promise.all(
+				this.charts.map(chart => chart.save()),
+			);
 		}
 	}
 

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

@@ -4,10 +4,10 @@
  */
 
 import { Inject, Injectable } from '@nestjs/common';
-import { In } from 'typeorm';
 import { DI } from '@/di-symbols.js';
-import type { EmojisRepository, MiRole, RolesRepository } from '@/models/_.js';
+import type { EmojisRepository } from '@/models/_.js';
 import type { Packed } from '@/misc/json-schema.js';
+import type { } from '@/models/Blocking.js';
 import type { MiEmoji } from '@/models/Emoji.js';
 import { bindThis } from '@/decorators.js';
 
@@ -16,8 +16,6 @@ export class EmojiEntityService {
 	constructor(
 		@Inject(DI.emojisRepository)
 		private emojisRepository: EmojisRepository,
-		@Inject(DI.rolesRepository)
-		private rolesRepository: RolesRepository,
 	) {
 	}
 
@@ -70,90 +68,8 @@ export class EmojiEntityService {
 	@bindThis
 	public packDetailedMany(
 		emojis: any[],
-	): Promise<Packed<'EmojiDetailed'>[]> {
+	) {
 		return Promise.all(emojis.map(x => this.packDetailed(x)));
 	}
-
-	@bindThis
-	public async packDetailedAdmin(
-		src: MiEmoji['id'] | MiEmoji,
-		hint?: {
-			roles?: Map<MiRole['id'], MiRole>
-		},
-	): Promise<Packed<'EmojiDetailedAdmin'>> {
-		const emoji = typeof src === 'object' ? src : await this.emojisRepository.findOneByOrFail({ id: src });
-
-		const roles = Array.of<MiRole>();
-		if (emoji.roleIdsThatCanBeUsedThisEmojiAsReaction.length > 0) {
-			if (hint?.roles) {
-				const hintRoles = hint.roles;
-				roles.push(
-					...emoji.roleIdsThatCanBeUsedThisEmojiAsReaction
-						.filter(x => hintRoles.has(x))
-						.map(x => hintRoles.get(x)!),
-				);
-			} else {
-				roles.push(
-					...await this.rolesRepository.findBy({ id: In(emoji.roleIdsThatCanBeUsedThisEmojiAsReaction) }),
-				);
-			}
-
-			roles.sort((a, b) => {
-				if (a.displayOrder !== b.displayOrder) {
-					return b.displayOrder - a.displayOrder;
-				}
-
-				return a.id.localeCompare(b.id);
-			});
-		}
-
-		return {
-			id: emoji.id,
-			updatedAt: emoji.updatedAt?.toISOString() ?? null,
-			name: emoji.name,
-			host: emoji.host,
-			uri: emoji.uri,
-			type: emoji.type,
-			aliases: emoji.aliases,
-			category: emoji.category,
-			publicUrl: emoji.publicUrl,
-			originalUrl: emoji.originalUrl,
-			license: emoji.license,
-			localOnly: emoji.localOnly,
-			isSensitive: emoji.isSensitive,
-			roleIdsThatCanBeUsedThisEmojiAsReaction: roles.map(it => ({ id: it.id, name: it.name })),
-		};
-	}
-
-	@bindThis
-	public async packDetailedAdminMany(
-		emojis: MiEmoji['id'][] | MiEmoji[],
-		hint?: {
-			roles?: Map<MiRole['id'], MiRole>
-		},
-	): Promise<Packed<'EmojiDetailedAdmin'>[]> {
-		// IDのみの要素をピックアップし、DBからレコードを取り出して他の値を補完する
-		const emojiEntities = emojis.filter(x => typeof x === 'object') as MiEmoji[];
-		const emojiIdOnlyList = emojis.filter(x => typeof x === 'string') as string[];
-		if (emojiIdOnlyList.length > 0) {
-			emojiEntities.push(...await this.emojisRepository.findBy({ id: In(emojiIdOnlyList) }));
-		}
-
-		// 特定ロール専用の絵文字である場合、そのロール情報をあらかじめまとめて取得しておく（pack側で都度取得も出来るが負荷が高いので）
-		let hintRoles: Map<MiRole['id'], MiRole>;
-		if (hint?.roles) {
-			hintRoles = hint.roles;
-		} else {
-			const roles = Array.of<MiRole>();
-			const roleIds = [...new Set(emojiEntities.flatMap(x => x.roleIdsThatCanBeUsedThisEmojiAsReaction))];
-			if (roleIds.length > 0) {
-				roles.push(...await this.rolesRepository.findBy({ id: In(roleIds) }));
-			}
-
-			hintRoles = new Map(roles.map(x => [x.id, x]));
-		}
-
-		return Promise.all(emojis.map(x => this.packDetailedAdmin(x, { roles: hintRoles })));
-	}
 }
 

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

@@ -132,7 +132,6 @@ export class MetaEntityService {
 			enableUrlPreview: instance.urlPreviewEnabled,
 			noteSearchableScope: (this.config.meilisearch == null || this.config.meilisearch.scope !== 'local') ? 'global' : 'local',
 			maxFileSize: this.config.maxFileSize,
-			federation: this.meta.federation,
 		};
 
 		return packed;

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

@@ -102,7 +102,8 @@ export class NoteEntityService implements OnModuleInit {
 	}
 
 	@bindThis
-	private treatVisibility(packedNote: Packed<'Note'>): Packed<'Note'>['visibility'] {
+	private async hideNote(packedNote: Packed<'Note'>, meId: MiUser['id'] | null): Promise<void> {
+		// FIXME: このvisibility変更処理が当関数にあるのは若干不自然かもしれない(関数名を treatVisibility とかに変える手もある)
 		if (packedNote.visibility === 'public' || packedNote.visibility === 'home') {
 			const followersOnlyBefore = packedNote.user.makeNotesFollowersOnlyBefore;
 			if ((followersOnlyBefore != null)
@@ -114,11 +115,7 @@ export class NoteEntityService implements OnModuleInit {
 				packedNote.visibility = 'followers';
 			}
 		}
-		return packedNote.visibility;
-	}
 
-	@bindThis
-	private async hideNote(packedNote: Packed<'Note'>, meId: MiUser['id'] | null): Promise<void> {
 		if (meId === packedNote.userId) return;
 
 		// TODO: isVisibleForMe を使うようにしても良さそう(型違うけど)
@@ -461,8 +458,6 @@ export class NoteEntityService implements OnModuleInit {
 			} : {}),
 		});
 
-		this.treatVisibility(packed);
-
 		if (!opts.skipHide) {
 			await this.hideNote(packed, meId);
 		}

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

@@ -47,6 +47,7 @@ import { IdService } from '@/core/IdService.js';
 import type { AnnouncementService } from '@/core/AnnouncementService.js';
 import type { CustomEmojiService } from '@/core/CustomEmojiService.js';
 import { AvatarDecorationService } from '@/core/AvatarDecorationService.js';
+import { CacheService } from '@/core/CacheService.js';
 import type { OnModuleInit } from '@nestjs/common';
 import type { NoteEntityService } from './NoteEntityService.js';
 import type { DriveFileEntityService } from './DriveFileEntityService.js';
@@ -91,6 +92,7 @@ export class UserEntityService implements OnModuleInit {
 	private federatedInstanceService: FederatedInstanceService;
 	private idService: IdService;
 	private avatarDecorationService: AvatarDecorationService;
+	private cacheService: CacheService;
 
 	constructor(
 		private moduleRef: ModuleRef,
@@ -146,6 +148,7 @@ export class UserEntityService implements OnModuleInit {
 		this.federatedInstanceService = this.moduleRef.get('FederatedInstanceService');
 		this.idService = this.moduleRef.get('IdService');
 		this.avatarDecorationService = this.moduleRef.get('AvatarDecorationService');
+		this.cacheService = this.moduleRef.get('CacheService');
 	}
 
 	//#region Validators
@@ -473,6 +476,24 @@ export class UserEntityService implements OnModuleInit {
 
 		const notificationsInfo = isMe && isDetailed ? await this.getNotificationsInfo(user.id) : null;
 
+		const getLocalUserDecorations = () =>
+			user.avatarDecorations.length > 0
+				? this.avatarDecorationService.getAll().then(
+					decorations => user.avatarDecorations.filter(
+						ud => decorations.some(d => d.id === ud.id))
+						.map(ud => ({
+							id: ud.id,
+							angle: ud.angle || undefined,
+							flipH: ud.flipH || undefined,
+							offsetX: ud.offsetX || undefined,
+							offsetY: ud.offsetY || undefined,
+							url: decorations.find(d => d.id === ud.id)!.url,
+						})))
+				: [];
+		const avatarDecorations = user.host == null
+			? getLocalUserDecorations()
+			: this.cacheService.stpvRemoteUserDecorationsCache.fetch(user.id);
+
 		const packed = {
 			id: user.id,
 			name: user.name,
@@ -480,14 +501,8 @@ export class UserEntityService implements OnModuleInit {
 			host: user.host,
 			avatarUrl: user.avatarUrl ?? this.getIdenticonUrl(user),
 			avatarBlurhash: user.avatarBlurhash,
-			avatarDecorations: user.avatarDecorations.length > 0 ? this.avatarDecorationService.getAll().then(decorations => user.avatarDecorations.filter(ud => decorations.some(d => d.id === ud.id)).map(ud => ({
-				id: ud.id,
-				angle: ud.angle || undefined,
-				flipH: ud.flipH || undefined,
-				offsetX: ud.offsetX || undefined,
-				offsetY: ud.offsetY || undefined,
-				url: decorations.find(d => d.id === ud.id)!.url,
-			}))) : [],
+			createdAt: this.idService.parse(user.id).date.toISOString(),
+			avatarDecorations,
 			isBot: user.isBot,
 			isCat: user.isCat,
 			requireSigninToViewContents: user.requireSigninToViewContents === false ? undefined : true,

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

@@ -33,11 +33,7 @@ import { packedClipSchema } from '@/models/json-schema/clip.js';
 import { packedFederationInstanceSchema } from '@/models/json-schema/federation-instance.js';
 import { packedQueueCountSchema } from '@/models/json-schema/queue.js';
 import { packedGalleryPostSchema } from '@/models/json-schema/gallery-post.js';
-import {
-	packedEmojiDetailedAdminSchema,
-	packedEmojiDetailedSchema,
-	packedEmojiSimpleSchema,
-} from '@/models/json-schema/emoji.js';
+import { packedEmojiDetailedSchema, packedEmojiSimpleSchema } from '@/models/json-schema/emoji.js';
 import { packedFlashSchema } from '@/models/json-schema/flash.js';
 import { packedAnnouncementSchema } from '@/models/json-schema/announcement.js';
 import { packedSigninSchema } from '@/models/json-schema/signin.js';
@@ -99,7 +95,6 @@ export const refs = {
 	GalleryPost: packedGalleryPostSchema,
 	EmojiSimple: packedEmojiSimpleSchema,
 	EmojiDetailed: packedEmojiDetailedSchema,
-	EmojiDetailedAdmin: packedEmojiDetailedAdminSchema,
 	Flash: packedFlashSchema,
 	Signin: packedSigninSchema,
 	RoleCondFormulaLogics: packedRoleCondFormulaLogicsSchema,

packages/backend/src/models/json-schema/emoji.ts

@@ -104,86 +104,3 @@ export const packedEmojiDetailedSchema = {
 		},
 	},
 } as const;
-
-export const packedEmojiDetailedAdminSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			format: 'id',
-			optional: false, nullable: false,
-		},
-		updatedAt: {
-			type: 'string',
-			format: 'date-time',
-			optional: false, nullable: true,
-		},
-		name: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		host: {
-			type: 'string',
-			optional: false, nullable: true,
-			description: 'The local host is represented with `null`.',
-		},
-		publicUrl: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		originalUrl: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		uri: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		type: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		aliases: {
-			type: 'array',
-			optional: false, nullable: false,
-			items: {
-				type: 'string',
-				format: 'id',
-				optional: false, nullable: false,
-			},
-		},
-		category: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		license: {
-			type: 'string',
-			optional: false, nullable: true,
-		},
-		localOnly: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		isSensitive: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-		roleIdsThatCanBeUsedThisEmojiAsReaction: {
-			type: 'array',
-			items: {
-				type: 'object',
-				properties: {
-					id: {
-						type: 'string',
-						format: 'misskey:id',
-						optional: false, nullable: false,
-					},
-					name: {
-						type: 'string',
-						optional: false, nullable: false,
-					},
-				},
-			},
-		},
-	},
-} as const;

packages/backend/src/models/json-schema/meta.ts

@@ -261,11 +261,6 @@ export const packedMetaLiteSchema = {
 			type: 'number',
 			optional: false, nullable: false,
 		},
-		federation: {
-			type: 'string',
-			enum: ['all', 'specified', 'none'],
-			optional: false, nullable: false,
-		},
 	},
 } as const;
 

packages/backend/src/postgres.ts

@@ -89,65 +89,27 @@ export const dbLogger = new MisskeyLogger('db');
 
 const sqlLogger = dbLogger.createSubLogger('sql', 'gray');
 
-export type LoggerProps = {
-	disableQueryTruncation?: boolean;
-	enableQueryParamLogging?: boolean;
-}
-
-function highlightSql(sql: string) {
-	return highlight.highlight(sql, {
-		language: 'sql', ignoreIllegals: true,
-	});
-}
-
-function truncateSql(sql: string) {
-	return sql.length > 100 ? `${sql.substring(0, 100)}...` : sql;
-}
-
-function stringifyParameter(param: any) {
-	if (param instanceof Date) {
-		return param.toISOString();
-	} else {
-		return param;
-	}
-}
-
 class MyCustomLogger implements Logger {
-	constructor(private props: LoggerProps = {}) {
-	}
-
 	@bindThis
-	private transformQueryLog(sql: string) {
-		let modded = sql;
-		if (!this.props.disableQueryTruncation) {
-			modded = truncateSql(modded);
-		}
-
-		return highlightSql(modded);
-	}
-
-	@bindThis
-	private transformParameters(parameters?: any[]) {
-		if (this.props.enableQueryParamLogging && parameters && parameters.length > 0) {
-			return parameters.map(stringifyParameter);
-		}
-
-		return undefined;
+	private highlight(sql: string) {
+		return highlight.highlight(sql, {
+			language: 'sql', ignoreIllegals: true,
+		});
 	}
 
 	@bindThis
 	public logQuery(query: string, parameters?: any[]) {
-		sqlLogger.info(this.transformQueryLog(query), this.transformParameters(parameters));
+		sqlLogger.info(this.highlight(query).substring(0, 100));
 	}
 
 	@bindThis
 	public logQueryError(error: string, query: string, parameters?: any[]) {
-		sqlLogger.error(this.transformQueryLog(query), this.transformParameters(parameters));
+		sqlLogger.error(this.highlight(query));
 	}
 
 	@bindThis
 	public logQuerySlow(time: number, query: string, parameters?: any[]) {
-		sqlLogger.warn(this.transformQueryLog(query), this.transformParameters(parameters));
+		sqlLogger.warn(this.highlight(query));
 	}
 
 	@bindThis
@@ -285,12 +247,7 @@ export function createPostgresDataSource(config: Config) {
 			},
 		} : false,
 		logging: log,
-		logger: log
-			? new MyCustomLogger({
-				disableQueryTruncation: config.logging?.sql?.disableQueryTruncation,
-				enableQueryParamLogging: config.logging?.sql?.enableQueryParamLogging,
-			})
-			: undefined,
+		logger: log ? new MyCustomLogger() : undefined,
 		maxQueryExecutionTime: 300,
 		entities: entities,
 		migrations: ['../../migration/*.js'],

packages/backend/src/queue/processors/CheckModeratorsActivityProcessorService.ts

@@ -231,10 +231,15 @@ export class CheckModeratorsActivityProcessorService {
 
 		// -- SystemWebhook
 
-		return this.systemWebhookService.enqueueSystemWebhook(
-			'inactiveModeratorsWarning',
-			{ remainingTime: remainingTime },
-		);
+		const systemWebhooks = await this.systemWebhookService.fetchActiveSystemWebhooks()
+			.then(it => it.filter(it => it.on.includes('inactiveModeratorsWarning')));
+		for (const systemWebhook of systemWebhooks) {
+			this.systemWebhookService.enqueueSystemWebhook(
+				systemWebhook,
+				'inactiveModeratorsWarning',
+				{ remainingTime: remainingTime },
+			);
+		}
 	}
 
 	@bindThis
@@ -264,10 +269,15 @@ export class CheckModeratorsActivityProcessorService {
 
 		// -- SystemWebhook
 
-		return this.systemWebhookService.enqueueSystemWebhook(
-			'inactiveModeratorsInvitationOnlyChanged',
-			{},
-		);
+		const systemWebhooks = await this.systemWebhookService.fetchActiveSystemWebhooks()
+			.then(it => it.filter(it => it.on.includes('inactiveModeratorsInvitationOnlyChanged')));
+		for (const systemWebhook of systemWebhooks) {
+			this.systemWebhookService.enqueueSystemWebhook(
+				systemWebhook,
+				'inactiveModeratorsInvitationOnlyChanged',
+				{},
+			);
+		}
 	}
 
 	@bindThis

packages/backend/src/queue/processors/CleanChartsProcessorService.ts

@@ -48,19 +48,20 @@ export class CleanChartsProcessorService {
 	public async process(): Promise<void> {
 		this.logger.info('Clean charts...');
 
-		// DBへの同時接続を避けるためにPromise.allを使わずひとつずつ実行する
-		await this.federationChart.clean();
-		await this.notesChart.clean();
-		await this.usersChart.clean();
-		await this.activeUsersChart.clean();
-		await this.instanceChart.clean();
-		await this.perUserNotesChart.clean();
-		await this.perUserPvChart.clean();
-		await this.driveChart.clean();
-		await this.perUserReactionsChart.clean();
-		await this.perUserFollowingChart.clean();
-		await this.perUserDriveChart.clean();
-		await this.apRequestChart.clean();
+		await Promise.all([
+			this.federationChart.clean(),
+			this.notesChart.clean(),
+			this.usersChart.clean(),
+			this.activeUsersChart.clean(),
+			this.instanceChart.clean(),
+			this.perUserNotesChart.clean(),
+			this.perUserPvChart.clean(),
+			this.driveChart.clean(),
+			this.perUserReactionsChart.clean(),
+			this.perUserFollowingChart.clean(),
+			this.perUserDriveChart.clean(),
+			this.apRequestChart.clean(),
+		]);
 
 		this.logger.succ('All charts successfully cleaned.');
 	}