Merge pull request #11874 from misskey-dev/develop

Release: 2023.9.0

.config/docker_example.yml

@@ -95,14 +95,6 @@ redis:
 #  #prefix: example-prefix
 #  #db: 1
 
-#redisForTimelines:
-#  host: redis
-#  port: 6379
-#  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
-#  #pass: example-pass
-#  #prefix: example-prefix
-#  #db: 1
-
 #   ┌───────────────────────────┐
 #───┘ MeiliSearch configuration └─────────────────────────────
 

.config/example.yml

@@ -30,7 +30,7 @@ url: https://example.tld/
 # The port that your Misskey server should listen on.
 port: 3000
 
-# You can also use UNIX domain socket.
+# You can also use UNIX domain socket. 
 # socket: /path/to/misskey.sock
 # chmodSocket: '777'
 
@@ -60,17 +60,17 @@ dbReplications: false
 # You can configure any number of replicas here
 #dbSlaves:
 #  -
-#    host:
-#    port:
-#    db:
-#    user:
-#    pass:
+#    host: 
+#    port: 
+#    db: 
+#    user: 
+#    pass: 
 #  -
-#    host:
-#    port:
-#    db:
-#    user:
-#    pass:
+#    host: 
+#    port: 
+#    db: 
+#    user: 
+#    pass: 
 
 #   ┌─────────────────────┐
 #───┘ Redis configuration └─────────────────────────────────────
@@ -105,16 +105,6 @@ redis:
 #  # You can specify more ioredis options...
 #  #username: example-username
 
-#redisForTimelines:
-#  host: localhost
-#  port: 6379
-#  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
-#  #pass: example-pass
-#  #prefix: example-prefix
-#  #db: 1
-#  # You can specify more ioredis options...
-#  #username: example-username
-
 #   ┌───────────────────────────┐
 #───┘ MeiliSearch configuration └─────────────────────────────
 
@@ -216,6 +206,3 @@ signToActivityPubGet: true
 
 # Upload or download file size limits (bytes)
 #maxFileSize: 262144000
-
-# PID File of master process
-#pidFile: /tmp/misskey.pid

.devcontainer/devcontainer.json

@@ -4,9 +4,7 @@
 	"service": "app",
 	"workspaceFolder": "/workspace",
 	"features": {
-		"ghcr.io/devcontainers-contrib/features/pnpm:2": {
-			"version": "8.9.2"
-		},
+		"ghcr.io/devcontainers-contrib/features/pnpm:2": {},
 		"ghcr.io/devcontainers/features/node:1": {
 			"version": "20.5.1"
 		}

.devcontainer/devcontainer.yml

@@ -95,14 +95,6 @@ redis:
 #  #prefix: example-prefix
 #  #db: 1
 
-#redisForTimelines:
-#  host: redis
-#  port: 6379
-#  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
-#  #pass: example-pass
-#  #prefix: example-prefix
-#  #db: 1
-
 #   ┌───────────────────────────┐
 #───┘ MeiliSearch configuration └─────────────────────────────
 

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

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.0.0
 
       - run: corepack enable
 

.github/workflows/check_copyright_year.yml

@@ -10,7 +10,7 @@ jobs:
   check_copyright_year:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.0.0
     - run: |
         if [ "$(grep Copyright COPYING | sed -e 's/.*2014-\([0-9]*\) .*/\1/g')" -ne "$(date +%Y)" ]; then
           echo "Please change copyright year!"

.github/workflows/docker-develop.yml

@@ -13,7 +13,7 @@ jobs:
     if: github.repository == 'misskey-dev/misskey'
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.0.0
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v3.0.0

.github/workflows/docker.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.0.0
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v3.0.0

.github/workflows/dockle.yml

@@ -14,7 +14,7 @@ jobs:
     env:
       DOCKER_CONTENT_TRUST: 1
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.0.0
       - run: |
           curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v0.4.10/dockle_0.4.10_Linux-64bit.deb"
           sudo dpkg -i dockle.deb

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

@@ -1,225 +0,0 @@
-name: Report API Diff
-
-on:
-  pull_request:
-    branches:
-      - master
-      - develop
-
-jobs:
-  get-base:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
-    strategy:
-      matrix:
-        node-version: [20.5.1]
-
-    services:
-      db:
-        image: postgres:13
-        ports:
-          - 5432:5432
-        env:
-          POSTGRES_DB: misskey
-          POSTGRES_HOST_AUTH_METHOD: trust
-          POSTGRES_USER: example-misskey-user
-          POSTGRESS_PASS: example-misskey-pass
-      redis:
-        image: redis:7
-        ports:
-          - 6379:6379
-
-    steps:
-    - uses: actions/checkout@v4.1.1
-      with:
-        repository: ${{ github.event.pull_request.base.repo.full_name }}
-        ref: ${{ github.base_ref }}
-        submodules: true
-    - name: Install pnpm
-      uses: pnpm/action-setup@v2
-      with:
-        version: 8
-        run_install: false
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3.8.1
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'pnpm'
-    - run: corepack enable
-    - run: pnpm i --frozen-lockfile
-    - name: Check pnpm-lock.yaml
-      run: git diff --exit-code pnpm-lock.yaml
-    - name: Copy Configure
-      run: cp .config/example.yml .config/default.yml
-    - name: Build
-      run: pnpm build
-    - name : Migrate
-      run: pnpm migrate
-    - name: Launch misskey
-      run: |
-        screen -S misskey -dm pnpm run dev
-        sleep 30s
-    - name: Wait for Misskey to be ready
-      run: |
-        MAX_RETRIES=12
-        RETRY_DELAY=5
-        count=0
-        until $(curl --output /dev/null --silent --head --fail http://localhost:3000) || [[ $count -eq $MAX_RETRIES ]]; do
-          printf '.'
-          sleep $RETRY_DELAY
-          count=$((count + 1))
-        done
-
-        if [[ $count -eq $MAX_RETRIES ]]; then
-          echo "Failed to connect to Misskey after $MAX_RETRIES attempts."
-          exit 1
-        fi
-    - id: fetch
-      name: Get api.json from Misskey
-      run: |
-        RESULT=$(curl --retry 5 --retry-delay 5 --retry-max-time 60 http://localhost:3000/api.json)
-        echo $RESULT > api-base.json
-    - name: Upload Artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: api-artifact
-        path: api-base.json
-    - name: Kill Misskey Job
-      run: screen -S misskey -X quit
-
-  get-head:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
-    strategy:
-      matrix:
-        node-version: [20.5.1]
-
-    services:
-      db:
-        image: postgres:13
-        ports:
-          - 5432:5432
-        env:
-          POSTGRES_DB: misskey
-          POSTGRES_HOST_AUTH_METHOD: trust
-          POSTGRES_USER: example-misskey-user
-          POSTGRESS_PASS: example-misskey-pass
-      redis:
-        image: redis:7
-        ports:
-          - 6379:6379
-
-    steps:
-    - uses: actions/checkout@v4.1.1
-      with:
-        repository: ${{ github.event.pull_request.head.repo.full_name }}
-        ref: ${{ github.head_ref }}
-        submodules: true
-    - name: Install pnpm
-      uses: pnpm/action-setup@v2
-      with:
-        version: 8
-        run_install: false
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3.8.1
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'pnpm'
-    - run: corepack enable
-    - run: pnpm i --frozen-lockfile
-    - name: Check pnpm-lock.yaml
-      run: git diff --exit-code pnpm-lock.yaml
-    - name: Copy Configure
-      run: cp .config/example.yml .config/default.yml
-    - name: Build
-      run: pnpm build
-    - name : Migrate
-      run: pnpm migrate
-    - name: Launch misskey
-      run: |
-        screen -S misskey -dm pnpm run dev
-        sleep 30s
-    - name: Wait for Misskey to be ready
-      run: |
-        MAX_RETRIES=12
-        RETRY_DELAY=5
-        count=0
-        until $(curl --output /dev/null --silent --head --fail http://localhost:3000) || [[ $count -eq $MAX_RETRIES ]]; do
-          printf '.'
-          sleep $RETRY_DELAY
-          count=$((count + 1))
-        done
-
-        if [[ $count -eq $MAX_RETRIES ]]; then
-          echo "Failed to connect to Misskey after $MAX_RETRIES attempts."
-          exit 1
-        fi
-    - id: fetch
-      name: Get api.json from Misskey
-      run: |
-        RESULT=$(curl --retry 5 --retry-delay 5 --retry-max-time 60 http://localhost:3000/api.json)
-        echo $RESULT > api-head.json
-    - name: Upload Artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: api-artifact
-        path: api-head.json
-    - name: Kill Misskey Job
-      run: screen -S misskey -X quit
-
-  compare-diff:
-    runs-on: ubuntu-latest
-    if: success()
-    needs: [get-base, get-head]
-    permissions:
-      pull-requests: write
-
-    steps:
-      - name: Download Artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: api-artifact
-          path: ./artifacts
-      - name: Output base
-        run: cat ./artifacts/api-base.json
-      - name: Output head
-        run: cat ./artifacts/api-head.json
-      - name: Arrange json files
-        run: |
-          jq '.' ./artifacts/api-base.json > ./api-base.json
-          jq '.' ./artifacts/api-head.json > ./api-head.json
-      - name: Get diff of 2 files
-        run: diff -u --label=base --label=head ./api-base.json ./api-head.json | cat > api.json.diff
-      - name: Get full diff
-        run: diff --label=base --label=head --new-line-format='+%L' --old-line-format='-%L' --unchanged-line-format=' %L' ./api-base.json ./api-head.json | cat > api-full.json.diff
-      - name: Echo full diff
-        run: cat ./api-full.json.diff
-      - name: Upload full diff to Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: api-artifact
-          path: api-full.json.diff
-      - id: out-diff
-        name: Build diff Comment
-        run: |
-          cat <<- EOF > ./output.md
-          このPRによるapi.jsonの差分
-          <details>
-          <summary>差分はこちら</summary>
-
-          \`\`\`diff
-          $(cat ./api.json.diff)
-          \`\`\`
-          </details>
-
-          [Get diff files from Workflow Page](https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID})
-          EOF
-      - name: Write diff comment
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          comment_tag: show_diff
-          filePath: ./output.md

.github/workflows/lint.yml

@@ -11,7 +11,7 @@ jobs:
   pnpm_install:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.0.0
       with:
         fetch-depth: 0
         submodules: true
@@ -38,7 +38,7 @@ jobs:
         - sw
         - misskey-js
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.0.0
       with:
         fetch-depth: 0
         submodules: true
@@ -64,7 +64,7 @@ jobs:
         - backend
         - misskey-js
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.0.0
       with:
         fetch-depth: 0
         submodules: true

.github/workflows/pr-preview-deploy.yml

@@ -53,7 +53,7 @@ jobs:
 
     # Check out merge commit
     - name: Fork based /deploy checkout
-      uses: actions/checkout@v4.1.1
+      uses: actions/checkout@v4.0.0
       with:
         ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
 

.github/workflows/test-backend.yml

@@ -29,7 +29,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.0.0
       with:
         submodules: true
     - name: Install pnpm

.github/workflows/test-frontend.yml

@@ -16,7 +16,7 @@ jobs:
         node-version: [20.5.1]
 
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.0.0
       with:
         submodules: true
     - name: Install pnpm
@@ -68,7 +68,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.0.0
       with:
         submodules: true
     # https://github.com/cypress-io/cypress-docker-images/issues/150

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

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.0.0
 
       - run: corepack enable
 

.github/workflows/test-production.yml

@@ -19,7 +19,7 @@ jobs:
         node-version: [20.5.1]
 
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.0.0
       with:
         submodules: true
     - name: Install pnpm

CHANGELOG.md

@@ -12,154 +12,7 @@
 
 -->
 
-## 2023.11.0 (unreleased)
-
-### General
-- Feat: アイコンデコレーション機能
-- Enhance: すでにフォローしたすべての人の返信をTLに追加できるように
-
-## Client
-- Feat: プラグイン・テーマを外部サイトから直接インストールできるようになりました
-	- 外部サイトでの実装が必要です。詳細は Misskey Hub をご覧ください
-	  https://misskey-hub.net/docs/advanced/publish-on-your-website.html
-- Fix: 投稿フォームでのユーザー変更がプレビューに反映されない問題を修正
-
-### Server
-- Fix: リストTLに自分のフォロワー限定投稿が含まれない問題を修正
-- Fix: ローカルタイムラインに投稿者自身の投稿への返信が含まれない問題を修正
-
-## 2023.10.2
-
-### General
-- Feat: アンテナでローカルの投稿のみ収集できるようになりました
-- Feat: サーバーサイレンス機能が追加されました
-- Enhance: 新規にフォローした人の返信をデフォルトでTLに追加できるオプションを追加
-- Enhance: HTL/LTL/STLを2023.10.0アップデート以前まで遡れるように
-- Enhance: フォロー/フォロー解除したときに過去分のHTLにも含まれる投稿が反映されるように
-- Enhance: ローカリゼーションの更新
-- Enhance: 依存関係の更新
-
-### Client
-- Enhance: TLの返信表示オプションを記憶するように
-- Enhance: 投稿されてから時間が経過しているノートであることを視覚的に分かりやすく
-
-### Server
-- Enhance: タイムライン取得時のパフォーマンスを向上
-- Enhance: ストリーミングAPIのパフォーマンスを向上
-- Fix: users/notesでDBから参照した際にチャンネル投稿のみ取得される問題を修正
-- Fix: コントロールパネルの設定項目が正しく保存できない問題を修正
-- Fix: 管理者権限のロールを持っていても一部のAPIが使用できないことがある問題を修正
-- Change: ユーザーのisCatがtrueでも、サーバーではnyaizeが行われなくなりました
-  - isCatな場合、クライアントでnyaize処理を行うことを推奨します
-
-## 2023.10.1
-### General
-- Enhance: ローカルタイムライン、ソーシャルタイムラインで返信を含むかどうか設定可能に
-
-### Client
-- Fix: 絵文字ピッカーで横に長いカスタム絵文字が見切れる問題を修正
-
-### Server
-- Fix: フォローしているユーザーからの自分の投稿への返信がタイムラインに含まれない問題を修正
-- Fix: users/notesでセンシティブチャンネルの投稿が含まれる場合がある問題を修正
-
-## 2023.10.0
-### NOTE
-- 2023.9.2で導入されたノート編集機能はクオリティの高い実装が困難であることが判明したため撤回されました
-- アップデートを行うと、タイムラインが一時的にリセットされます
-	- アンテナ内のノートも含む
-- ソフトミュート設定はクライアントではなくサーバー側に保存されるようになったため、アップデートを行うとソフトミュートの設定がリセットされます
-
-### Changes
-- API: users/notes, notes/local-timeline で fileType 指定はできなくなりました
-- API: notes/featured でページネーションは他APIと同様 untilId を使って行うようになりました
-
-### General
-- Feat: ユーザーごとに他ユーザーへの返信をタイムラインに含めるか設定可能になりました
-- Feat: ユーザーリスト内のメンバーごとに他ユーザーへの返信をユーザーリストタイムラインに含めるか設定可能になりました
-- Feat: ユーザーごとのハイライト
-- Feat: プライバシーポリシー・運営者情報（Impressum）の指定が可能になりました
-	- プライバシーポリシーはサーバー登録時に同意確認が入ります
-- Feat: タイムラインがリアルタイム更新中に広告を挿入できるようになりました
-	- デフォルトは無効
-	- 頻度はコントロールパネルから設定できます。運営中のサーバーのTLの流速を見て、最適な値を指定してください。
-- Enhance: ソフトワードミュートとハードワードミュートは統合されました
-- Enhance: モデレーションログ機能の強化
-- Enhance: ローカリゼーションの更新
-- Enhance: 依存関係の更新
-- Fix: ダイレクト投稿をリノートできてしまう問題を修正
-- Fix: ユーザーリストTLにチャンネル投稿が含まれる問題を修正
-
-### Client
-- Feat: 「ファイルの詳細」ページを追加
-	- ドライブのファイルの拡大プレビューができるように
-	- ファイルが添付されたノートの一覧が表示できるように
-- Enhance: 二要素認証のバックアップコード一覧をテキストファイルでダウンロード可能に
-- Enhance: 動画再生時のデフォルトボリュームを30%に
-- Fix: リアクションしたユーザ一覧のUIが稀に左上に残ってしまう不具合を修正
-
-### Server
-- Enhance: drive/files/attached-notes がページネーションに対応しました
-- Enhance: タイムライン取得時のパフォーマンスを大幅に向上
-- Enhance: ハイライト取得時のパフォーマンスを大幅に向上
-- Enhance: トレンドハッシュタグ取得時のパフォーマンスを大幅に向上
-- Enhance: WebSocket接続が多い場合のパフォーマンスを向上
-- Enhance: 不要なPostgreSQLのインデックスを削除しパフォーマンスを向上
-- Fix: 連合なしアンケートに投票をするとUpdateがリモートに配信されてしまうのを修正
-- Fix: nodeinfoにおいてCORS用のヘッダーが設定されていないのを修正
-- Fix: 同じ種類のTLのストリーミングを複数接続できない問題を修正
-- Fix: アンテナTLを途中までしかページネーションできなくなることがある問題を修正
-- Fix: 「ファイル付きのみ」のTLでファイル無しの新着ノートが流れる問題を修正
-- Fix: プロセスが終了しない、あるいは非常に時間がかかる問題を修正
-
-## 2023.9.3
-### General
-- Enhance: ノートの翻訳機能の利用可否をロールで設定可能に
-
-### Client
-- Enhance: AiScriptでホストのアドレスを参照する定数`SERVER_URL`を追加
-- Enhance: モデレーションログ機能の強化
-- Enhance: ローカリゼーションの更新
-
-### Server
-- Fix: Redisに古いバージョンのキャッシュが残っている場合、キャッシュが消えるまでの間通知が届かなくなる問題を修正
-- Fix: 後方互換性の修正
-
-## 2023.9.2
-
-### General
-- Feat: ノートの編集をできるように
-	- ロールで編集可否を設定可能
-- Feat: 通知を種類ごとに 全員から受け取る/フォロー中のユーザーのみ受け取る/フォロワーのみ受け取る/相互のみ受け取る/指定したリストのメンバーのみ受け取る/受け取らない から選べるように
-- Enhance: タイムラインからRenoteを除外するオプションを追加
-- Enhance: ユーザーページのノート一覧でRenoteを除外できるように
-- Enhance: タイムラインでファイルが添付されたノートのみ表示するオプションを追加
-- Enhance: モデレーションログ機能の強化
-- Enhance: 依存関係の更新
-- Enhance: ローカリゼーションの更新
-
-### Client
-- Enhance: Plugin:register_post_form_actionを用いてCWを取得・変更できるように
-- Enhance: admin/ad/listにて掲載中の広告が絞り込めるように
-- Enhance: AiScriptにリモートサーバーのAPIを叩く用の関数を追加（`Mk:apiExternal`）
-
-### Server
-- Enhance: MasterプロセスのPIDを書き出せるように
-- Enhance: admin/ad/createにてレスポンス200、設定した広告情報を返すように
-
-## 2023.9.1
-
-### General
-- Enhance: モデレーションログ機能の強化
-
-### Client
-- Fix: ノートのメニューにある「詳細」ボタンの表示がログイン/ログアウト状態で統一されていない問題を修正
-
-### Server
-- Fix: お知らせのページネーションが機能しない
-- Fix: 「ユーザーの新規投稿」の通知設定を切り替えるとサーバー内部エラーが出る
-
-## 2023.9.0
+## 2023.9.0 (unreleased)
 
 ### Note
 - meilisearchを使用する場合、v1.2以上が必要です
@@ -245,7 +98,6 @@
 - Enhance: 自分へのメンション一覧を取得する際のパフォーマンスを向上
 - Enhance: Docker環境でjemallocを使用することでメモリ使用量を削減
 - Enhance: ID生成方式としてaidxを追加、かつデフォルトに
-- Enhance: Add address bind config option (outgoingAddress)
 - Fix: MK_ONLY_SERVERオプションを指定した際にクラッシュする問題を修正
 - Fix: notes/reactionsのページネーションが機能しない問題を修正
 - Fix: ノート検索 `notes/search` にてhostを指定した際に検索結果に反映されるように
@@ -268,6 +120,7 @@
 ### Server
 - Fix: APIのオフセットが壊れていたせいで「もっと見る」でもっと見れない問題を修正
 - Fix: 外部サーバーの投稿がタイムラインに表示されないことがある問題を修正
+- Enhance: Add address bind config option (outgoingAddress)
 
 ## 13.14.1
 

chart/files/default.yml

@@ -116,14 +116,6 @@ redis:
 #  #prefix: example-prefix
 #  #db: 1
 
-#redisForTimelines:
-#  host: redis
-#  port: 6379
-#  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
-#  #pass: example-pass
-#  #prefix: example-prefix
-#  #db: 1
-
 #   ┌───────────────────────────┐
 #───┘ MeiliSearch configuration └─────────────────────────────
 

cypress/e2e/widgets.cy.js

@@ -1,4 +1,3 @@
-/* flaky
 describe('After user signed in', () => {
 	beforeEach(() => {
 		cy.resetState();
@@ -68,4 +67,3 @@ describe('After user signed in', () => {
 	buildWidgetTest('aiscript');
 	buildWidgetTest('aichan');
 });
-*/

locales/ar-SA.yml

@@ -1184,6 +1184,11 @@ _wordMute:
   muteWords: "الكلمات المحظورة"
   muteWordsDescription: "افصل بينهم بمسافة لاستخدام معامل \"و\" أو بسطر لاستخدام معامل \"أو\"."
   muteWordsDescription2: "احصر الكلمات المفتاحية بين بين شرطتين مائلتين لاستخدامها كتعابير نمطية"
+  softDescription: "اخف الملاحظات التي تستوف الشروط من الخيط الزمني."
+  hardDescription: "اخف الملاحظات التي تستوف الشروط من الخيط الزمني.بالإضافة إلى أن هذه الملاحظات ستبقى مخفية حتى وإن تغيرت الشروط."
+  soft: "لينة"
+  hard: "قاسية"
+  mutedNotes: "الملاحظات المكتومة"
 _instanceMute:
   instanceMuteDescription: "هذه سيحجب كل ملاحظات الخوادم المحجوبة ومشاركاتها والردود على تلك الملاحظات حتى وإن كانت من خادم غير محجوب."
   instanceMuteDescription2: "مدخلة لكل سطر"
@@ -1243,6 +1248,8 @@ _sfx:
   note: "الملاحظات"
   noteMy: "ملاحظتي"
   notification: "الإشعارات"
+  chat: "المحادثة"
+  chatBg: "المحادثة (الخلفية)"
   antenna: "الهوائيات"
   channel: "إشعارات القنات"
 _ago:

locales/bn-BD.yml

@@ -932,6 +932,11 @@ _wordMute:
   muteWords: "নিঃশব্দ করা শব্দগুলি"
   muteWordsDescription: "স্পেস দিয়ে আলাদা করলে AND শর্ত তৈরি হবে এবং আলাদা লাইনে লিখলে OR শর্ত তৈরি হবে।"
   muteWordsDescription2: "রেগুলার এক্সপ্রেশন ব্যবহার করতে স্ল্যাশ দিয়ে কীওয়ার্ডকে ঘিরে রাখুন।"
+  softDescription: "টাইমলাইন থেকে নির্দিষ্ট শর্তানুযায়ী নোট লুকিয়ে রাখে।"
+  hardDescription: "নির্দিষ্ট শর্তানুযায়ী নোটগুলিকে টাইমলাইন থেকে বাদ দেয়। আপনি শর্ত পরিবর্তন করলেও যে নোটগুলি যোগ করা হয়নি সেগুলি বাদ দেওয়া হবে।"
+  soft: "নমনীয়"
+  hard: "কঠোর"
+  mutedNotes: "মিউট করা নোটগুলি"
 _instanceMute:
   instanceMuteDescription: "কনফিগার করা ইন্সট্যান্সের সব নোট এবং রিনোট মিউট করুন, মিউট করা ইন্সট্যান্সের ব্যবহারকারীদের উত্তর সহ।"
   instanceMuteDescription2: "প্রতিটিকে আলাদা লাইনে লিখুন"
@@ -995,6 +1000,9 @@ _theme:
     infoFg: "তথ্যের পাঠ্য"
     infoWarnBg: "ওয়ার্নিং এর পটভূমি"
     infoWarnFg: "ওয়ার্নিং এর পাঠ্য"
+    cwBg: "CW বাটনের পটভূমি"
+    cwFg: "CW বাটনের পাঠ্য"
+    cwHoverBg: "CW বাটনের পটভূমি (হভার)"
     toastBg: "বিজ্ঞপ্তির পটভূমি"
     toastFg: "বিজ্ঞপ্তির পাঠ্য"
     buttonBg: "বাটনের পটভূমি"
@@ -1012,6 +1020,8 @@ _sfx:
   note: "নোটগুলি"
   noteMy: "নোট (আপনার)"
   notification: "বিজ্ঞপ্তি"
+  chat: "চ্যাট"
+  chatBg: "চ্যাট (ব্যাকগ্রাউন্ড)"
   antenna: "অ্যান্টেনাগুলি"
   channel: "চ্যানেলের বিজ্ঞপ্তি"
 _ago:

locales/ca-ES.yml

@@ -398,6 +398,7 @@ _theme:
 _sfx:
   note: "Notes"
   notification: "Notificacions"
+  chat: "Xat"
   antenna: "Antenes"
 _2fa:
   renewTOTPCancel: "No, gràcies"

locales/cs-CZ.yml

@@ -1559,6 +1559,11 @@ _wordMute:
   muteWords: "Ztlumená slova"
   muteWordsDescription: "Podmínku AND oddělujte mezerami, podmínku OR oddělujte řádkovými zlomy."
   muteWordsDescription2: "Chcete-li použít regulární výrazy, obklopte klíčová slova lomítky."
+  softDescription: "Skrýt poznámky, které splňují nastavené podmínky, z časové osy."
+  hardDescription: "Zabrání přidání poznámek splňujících nastavené podmínky na časovou osu. Kromě toho nebudou tyto poznámky přidány na časovou osu, ani když se podmínky změní."
+  soft: "Měkký"
+  hard: "Tvrdý"
+  mutedNotes: "Ztlumené poznámky"
 _instanceMute:
   instanceMuteDescription: "Tímhle se ztlumí všechny poznámky/poznámky z uvedených instancí, včetně poznámek uživatelů, kteří odpovídají uživateli ze ztlumené instance."
   instanceMuteDescription2: "Oddělte novými řádky"
@@ -1622,6 +1627,9 @@ _theme:
     infoFg: "Text informací"
     infoWarnBg: "Pozadí varování"
     infoWarnFg: "Text varování"
+    cwBg: "Pozadí CW tlačítka"
+    cwFg: "Text CW tlačítka"
+    cwHoverBg: "Pozadí CW tlačítka (Hover)"
     toastBg: "Pozadí oznámení"
     toastFg: "Text oznámení"
     buttonBg: "Pozadí tlačítka"
@@ -1639,6 +1647,8 @@ _sfx:
   note: "Poznámky"
   noteMy: "Moje poznámka"
   notification: "Oznámení"
+  chat: "Zprávy"
+  chatBg: "Chat (Pozadí)"
   antenna: "Antény"
   channel: "Oznámení kanálu"
 _ago:
@@ -2029,4 +2039,3 @@ _webhookSettings:
 _moderationLogTypes:
   suspend: "Zmrazit"
   resetPassword: "Resetovat heslo"
-  createInvitation: "Vygenerovat pozvánku"

locales/de-DE.yml

@@ -195,7 +195,6 @@ perHour: "Pro Stunde"
 perDay: "Pro Tag"
 stopActivityDelivery: "Senden von Aktivitäten einstellen"
 blockThisInstance: "Diese Instanz blockieren"
-silenceThisInstance: "Instanz stummschalten"
 operations: "Aktionen"
 software: "Software"
 version: "Version"
@@ -215,8 +214,6 @@ clearCachedFiles: "Cache leeren"
 clearCachedFilesConfirm: "Sollen alle im Cache gespeicherten Dateien von anderen Instanzen wirklich gelöscht werden?"
 blockedInstances: "Blockierte Instanzen"
 blockedInstancesDescription: "Gib die Hostnamen der Instanzen, welche blockiert werden sollen, durch Zeilenumbrüche getrennt an. Blockierte Instanzen können mit dieser instanz nicht mehr kommunizieren."
-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."
 muteAndBlock: "Stummschaltungen und Blockierungen"
 mutedUsers: "Stummgeschaltete Benutzer"
 blockedUsers: "Blockierte Benutzer"
@@ -534,7 +531,6 @@ serverLogs: "Serverprotokolle"
 deleteAll: "Alle löschen"
 showFixedPostForm: "Bereich zum Schreiben neuer Notizen am Anfang der Chronik anzeigen"
 showFixedPostFormInChannel: "Bereich zum Schreiben neuer Notizen am Anfang der Chronik anzeigen (Kanäle)"
-withRepliesByDefaultForNewlyFollowed: "Standardmäßig Antworten von neu gefolgten Benutzern in der Chronik anzeigen"
 newNoteRecived: "Es gibt neue Notizen"
 sounds: "Töne"
 sound: "Töne"
@@ -798,7 +794,7 @@ active: "Aktiv"
 offline: "Offline"
 notRecommended: "Nicht empfohlen"
 botProtection: "Schutz vor Bots"
-instanceBlocking: "Blockierte/Stummgeschaltete Instanzen"
+instanceBlocking: "Blockierte Instanzen"
 selectAccount: "Benutzerkonto auswählen"
 switchAccount: "Konto wechseln"
 enabled: "Aktiviert"
@@ -1124,21 +1120,6 @@ notifyNotes: "Über neue Notizen benachrichtigen"
 unnotifyNotes: "Nicht über neue Notizen benachrichtigen"
 authentication: "Authentifikation"
 authenticationRequiredToContinue: "Bitte authentifiziere dich, um fortzufahren"
-dateAndTime: "Zeit"
-showRenotes: "Renotes anzeigen"
-edited: "Bearbeitet"
-notificationRecieveConfig: "Benachrichtigungseinstellungen"
-mutualFollow: "Gegenseitig gefolgt"
-fileAttachedOnly: "Nur Notizen mit Dateien"
-showRepliesToOthersInTimeline: "Antworten in Chronik anzeigen"
-hideRepliesToOthersInTimeline: "Antworten nicht in Chronik anzeigen"
-externalServices: "Externe Dienste"
-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."
-privacyPolicy: "Datenschutzerklärung"
-privacyPolicyUrl: "Datenschutzerklärungs-URL"
-tosAndPrivacyPolicy: "Nutzungsbedingungen und Datenschutzerklärung"
 _announcement:
   forExistingUsers: "Nur für existierende Nutzer"
   forExistingUsersDescription: "Ist diese Option aktiviert, wird diese Ankündigung nur Nutzern angezeigt, die zum Zeitpunkt der Ankündigung bereits registriert sind. Ist sie deaktiviert, wird sie auch Nutzern, die sich nach dessen Veröffentlichung registrieren, angezeigt."
@@ -1488,7 +1469,6 @@ _role:
     descriptionOfRateLimitFactor: "Je niedriger desto weniger restriktiv, je höher destro restriktiver."
     canHideAds: "Kann Werbung ausblenden"
     canSearchNotes: "Nutzung der Notizsuchfunktion"
-    canUseTranslator: "Verwendung des Übersetzers"
   _condition:
     isLocal: "Lokaler Benutzer"
     isRemote: "Benutzer fremder Instanz"
@@ -1537,10 +1517,6 @@ _ad:
   reduceFrequencyOfThisAd: "Diese Werbung weniger anzeigen"
   hide: "Ausblenden"
   timezoneinfo: "Der Wochentag wird durch die Serverzeitzone bestimmt."
-  adsSettings: "Werbeeinstellungen"
-  notesPerOneAd: "Werbeintervall während Echtzeitaktualisierung (Notizen pro Werbung)"
-  setZeroToDisable: "Setze dies auf 0, um Werbung während Echtzeitaktualisierung zu deaktivieren"
-  adsTooClose: "Durch den momentan sehr niedrigen Werbeintervall kann es zu einer starken Verschlechterung der Benutzererfahrung kommen."
 _forgotPassword:
   enterEmail: "Gib die Email-Adresse ein, mit der du dich registriert hast. An diese wird ein Link gesendet, mit dem du dein Passwort zurücksetzen kannst."
   ifNoEmail: "Solltest du bei der Registrierung keine Email-Adresse angegeben haben, wende dich bitte an den Administrator."
@@ -1626,6 +1602,11 @@ _wordMute:
   muteWords: "Stummgeschaltete Wörter"
   muteWordsDescription: "Zum Nutzen einer \"UND\"-Verknüpfung Einträge mit Leerzeichen trennen, zum Nutzen einer \"ODER\"-Verknüpfung Einträge mit einem Zeilenumbruch trennen."
   muteWordsDescription2: "Umgib Schlüsselworter mit Schrägstrichen, um Reguläre Ausdrücke zu verwenden."
+  softDescription: "Notizen, die die angegebenen Konditionen erfüllen, in der Chronik ausblenden."
+  hardDescription: "Verhindern, dass Notizen, die die angegebenen Konditionen erfüllen, der Chronik hinzugefügt werden. Zudem werden diese Notizen auch nicht der Chronik hinzugefügt, falls die Konditionen geändert werden."
+  soft: "Leicht"
+  hard: "Schwer"
+  mutedNotes: "Stummgeschaltete Notizen"
 _instanceMute:
   instanceMuteDescription: "Schaltet alle Notizen/Renotes stumm, die von den gelisteten Instanzen stammen, inklusive Antworten von Benutzern an einen Benutzer einer stummgeschalteten Instanz."
   instanceMuteDescription2: "Instanzen getrennt durch Zeilenumbrüchen angeben"
@@ -1689,6 +1670,9 @@ _theme:
     infoFg: "Text von Informationen"
     infoWarnBg: "Hintergrund von Warnungen"
     infoWarnFg: "Text von Warnungen"
+    cwBg: "Hintergrund des Inhaltswarnungsknopfs"
+    cwFg: "Text des Inhaltswarnungsknopfs"
+    cwHoverBg: "Hintergrund des Inhaltswarnungsknopfs (Mouseover)"
     toastBg: "Hintergrund von Benachrichtigungen"
     toastFg: "Text von Benachrichtigungen"
     buttonBg: "Hintergrund von Schaltflächen"
@@ -1706,6 +1690,8 @@ _sfx:
   note: "Notizen"
   noteMy: "Meine Notizen"
   notification: "Benachrichtigungen"
+  chat: "Chat"
+  chatBg: "Chat (Hintergrund)"
   antenna: "Antennen"
   channel: "Kanalbenachrichtigung"
 _ago:
@@ -1925,7 +1911,6 @@ _exportOrImport:
   userLists: "Listen"
   excludeMutingUsers: "Stummgeschaltete Benutzer aussortieren"
   excludeInactiveUsers: "Inaktive Benutzer aussortieren"
-  withReplies: "Antworten von importierten Benutzern in der Chronik beinhalten"
 _charts:
   federation: "Föderation"
   apRequest: "Anfragen"
@@ -2116,11 +2101,9 @@ _webhookSettings:
     reaction: "Wenn du eine Reaktion erhältst"
     mention: "Wenn du erwähnt wirst"
 _moderationLogTypes:
-  createRole: "Rolle erstellt"
-  deleteRole: "Rolle gelöscht"
-  updateRole: "Rolle aktualisiert"
   assignRole: "Zu Rolle zugewiesen"
   unassignRole: "Aus Rolle entfernt"
+  updateRole: "Rolle aktualisiert"
   suspend: "Gesperrt"
   unsuspend: "Entsperrt"
   addCustomEmoji: "Benutzerdefiniertes Emoji hinzugefügt"
@@ -2141,16 +2124,3 @@ _moderationLogTypes:
   unsuspendRemoteInstance: "Fremde Instanz entsperrt"
   markSensitiveDriveFile: "Datei als sensitiv markiert"
   unmarkSensitiveDriveFile: "Datei als nicht sensitiv markiert"
-  resolveAbuseReport: "Meldung bearbeitet"
-  createInvitation: "Einladung erstellt"
-  createAd: "Werbung erstellt"
-  deleteAd: "Werbung gelöscht"
-  updateAd: "Werbung aktualisiert"
-_fileViewer:
-  title: "Dateiinformationen"
-  type: "Dateityp"
-  size: "Dateigröße"
-  url: "URL"
-  uploadedAt: "Hochgeladen am"
-  attachedNotes: "Zugehörige Notizen"
-  thisPageCanBeSeenFromTheAuthor: "Nur der Benutzer, der diese Datei hochgeladen hat, kann diese Seite sehen."

locales/el-GR.yml

@@ -303,6 +303,8 @@ _theme:
 _sfx:
   note: "Σημειώματα"
   notification: "Ειδοποιήσεις"
+  chat: "Συνομιλία"
+  chatBg: "Συνομιλία (Παρασκήνιο)"
   antenna: "Αντένες"
   channel: "Ειδοποιήσεις καναλιών"
 _ago:

locales/en-US.yml

@@ -195,7 +195,6 @@ perHour: "Per Hour"
 perDay: "Per Day"
 stopActivityDelivery: "Stop sending activities"
 blockThisInstance: "Block this instance"
-silenceThisInstance: "Silence this instance"
 operations: "Operations"
 software: "Software"
 version: "Version"
@@ -214,9 +213,7 @@ clearQueueConfirmText: "Any undelivered notes remaining in the queue will not be
 clearCachedFiles: "Clear cache"
 clearCachedFilesConfirm: "Are you sure that you want to delete all cached remote files?"
 blockedInstances: "Blocked Instances"
-blockedInstancesDescription: "List the hostnames of the instances you want to block separated by linebreaks. Listed instances will no longer be able to communicate with this instance."
-silencedInstances: "Silenced instances"
-silencedInstancesDescription: "List the hostnames of the instances that you want to silence. All accounts of the listed instances will be treated as silenced, can only make follow requests, and cannot mention local accounts if not followed. This will not affect blocked instances."
+blockedInstancesDescription: "List the hostnames of the instances that you want to block separated by linebreaks. Listed instances will no longer be able to communicate with this instance."
 muteAndBlock: "Mutes and Blocks"
 mutedUsers: "Muted users"
 blockedUsers: "Blocked users"
@@ -534,7 +531,6 @@ serverLogs: "Server logs"
 deleteAll: "Delete all"
 showFixedPostForm: "Display the posting form at the top of the timeline"
 showFixedPostFormInChannel: "Display the posting form at the top of the timeline (Channels)"
-withRepliesByDefaultForNewlyFollowed: "Include replies by newly followed users in the timeline by default"
 newNoteRecived: "There are new notes"
 sounds: "Sounds"
 sound: "Sounds"
@@ -593,7 +589,7 @@ poll: "Poll"
 useCw: "Hide content"
 enablePlayer: "Open video player"
 disablePlayer: "Close video player"
-expandTweet: "Expand post"
+expandTweet: "Expand tweet"
 themeEditor: "Theme editor"
 description: "Description"
 describeFile: "Add caption"
@@ -798,7 +794,7 @@ active: "Active"
 offline: "Offline"
 notRecommended: "Not recommended"
 botProtection: "Bot Protection"
-instanceBlocking: "Blocked/Silenced Instances"
+instanceBlocking: "Blocked Instances"
 selectAccount: "Select account"
 switchAccount: "Switch account"
 enabled: "Enabled"
@@ -1124,21 +1120,6 @@ notifyNotes: "Notify about new notes"
 unnotifyNotes: "Stop notifying about new notes"
 authentication: "Authentication"
 authenticationRequiredToContinue: "Please authenticate to continue"
-dateAndTime: "Timestamp"
-showRenotes: "Show renotes"
-edited: "Edited"
-notificationRecieveConfig: "Notification Settings"
-mutualFollow: "Mutual follow"
-fileAttachedOnly: "Only notes with files"
-showRepliesToOthersInTimeline: "Show replies to others in timeline"
-hideRepliesToOthersInTimeline: "Hide replies to others from timeline"
-externalServices: "External Services"
-impressum: "Impressum"
-impressumUrl: "Impressum URL"
-impressumDescription: "In some countries, like germany, the inclusion of operator contact information (an Impressum) is legally required for commercial websites."
-privacyPolicy: "Privacy Policy"
-privacyPolicyUrl: "Privacy Policy URL"
-tosAndPrivacyPolicy: "Terms of Service and Privacy Policy"
 _announcement:
   forExistingUsers: "Existing users only"
   forExistingUsersDescription: "This announcement will only be shown to users existing at the point of publishment if enabled. If disabled, those newly signing up after it has been posted will also see it."
@@ -1488,7 +1469,6 @@ _role:
     descriptionOfRateLimitFactor: "Lower rate limits are less restrictive, higher ones more restrictive. "
     canHideAds: "Can hide ads"
     canSearchNotes: "Usage of note search"
-    canUseTranslator: "Translator usage"
   _condition:
     isLocal: "Local user"
     isRemote: "Remote user"
@@ -1537,10 +1517,6 @@ _ad:
   reduceFrequencyOfThisAd: "Show this ad less"
   hide: "Hide"
   timezoneinfo: "The day of the week is determined from the server's timezone."
-  adsSettings: "Ad settings"
-  notesPerOneAd: "Real-time update ad placement interval (Notes per ad)"
-  setZeroToDisable: "Set this value to 0 to disable real-time update ads"
-  adsTooClose: "The current ad interval may significantly worsen the user experience due to being too low."
 _forgotPassword:
   enterEmail: "Enter the email address you used to register. A link with which you can reset your password will then be sent to it."
   ifNoEmail: "If you did not use an email during registration, please contact the instance administrator instead."
@@ -1626,6 +1602,11 @@ _wordMute:
   muteWords: "Muted words"
   muteWordsDescription: "Separate with spaces for an AND condition or with line breaks for an OR condition."
   muteWordsDescription2: "Surround keywords with slashes to use regular expressions."
+  softDescription: "Hide notes that fulfil the set conditions from the timeline."
+  hardDescription: "Prevents notes fulfilling the set conditions from being added to the timeline. In addition, these notes will not be added to the timeline even if the conditions are changed."
+  soft: "Soft"
+  hard: "Hard"
+  mutedNotes: "Muted notes"
 _instanceMute:
   instanceMuteDescription: "This will mute any notes/renotes from the listed instances, including those of users replying to a user from a muted instance."
   instanceMuteDescription2: "Separate with newlines"
@@ -1689,6 +1670,9 @@ _theme:
     infoFg: "Information text"
     infoWarnBg: "Warning background"
     infoWarnFg: "Warning text"
+    cwBg: "CW button background"
+    cwFg: "CW button text"
+    cwHoverBg: "CW button background (Hover)"
     toastBg: "Notification background"
     toastFg: "Notification text"
     buttonBg: "Button background"
@@ -1706,6 +1690,8 @@ _sfx:
   note: "New note"
   noteMy: "Own note"
   notification: "Notifications"
+  chat: "Chat"
+  chatBg: "Chat (Background)"
   antenna: "Antennas"
   channel: "Channel notifications"
 _ago:
@@ -1742,7 +1728,7 @@ _2fa:
   step2Click: "Clicking on this QR code will allow you to register 2FA to your security key or phone authenticator app."
   step2Uri: "Enter the following URI if you are using a desktop program"
   step3Title: "Enter an authentication code"
-  step3: "Enter the authentication code (token) provided by your app to finish setup."
+  step3: "Enter the token provided by your app to finish setup."
   setupCompleted: "Setup complete"
   step4: "From now on, any future login attempts will ask for such a login token."
   securityKeyNotSupported: "Your browser does not support security keys."
@@ -1925,7 +1911,6 @@ _exportOrImport:
   userLists: "User lists"
   excludeMutingUsers: "Exclude muted users"
   excludeInactiveUsers: "Exclude inactive users"
-  withReplies: "Include replies from imported users in the timeline"
 _charts:
   federation: "Federation"
   apRequest: "Requests"
@@ -2078,7 +2063,7 @@ _deck:
   introduction: "Create the perfect interface for you by arranging columns freely!"
   introduction2: "Click on the + on the right of the screen to add new colums whenever you want."
   widgetsIntroduction: "Please select \"Edit widgets\" in the column menu and add a widget."
-  useSimpleUiForNonRootPages: "Use simple UI for navigated pages"
+  useSimpleUiForNonRootPages: "Use simplified UI to navigated pages"
   usedAsMinWidthWhenFlexible: "Minimum width will be used for this when the \"Auto-adjust width\" option is enabled"
   flexible: "Auto-adjust width"
   _columns:
@@ -2116,11 +2101,9 @@ _webhookSettings:
     reaction: "When receiving a reaction"
     mention: "When being mentioned"
 _moderationLogTypes:
-  createRole: "Role created"
-  deleteRole: "Role deleted"
-  updateRole: "Role updated"
   assignRole: "Assigned to role"
   unassignRole: "Removed from role"
+  updateRole: "Role updated"
   suspend: "Suspended"
   unsuspend: "Unsuspended"
   addCustomEmoji: "Custom emoji added"
@@ -2141,16 +2124,3 @@ _moderationLogTypes:
   unsuspendRemoteInstance: "Remote instance unsuspended"
   markSensitiveDriveFile: "File marked as sensitive"
   unmarkSensitiveDriveFile: "File unmarked as sensitive"
-  resolveAbuseReport: "Report resolved"
-  createInvitation: "Invite generated"
-  createAd: "Ad created"
-  deleteAd: "Ad deleted"
-  updateAd: "Ad updated"
-_fileViewer:
-  title: "File details"
-  type: "File type"
-  size: "Filesize"
-  url: "URL"
-  uploadedAt: "Uploaded at"
-  attachedNotes: "Attached notes"
-  thisPageCanBeSeenFromTheAuthor: "This page can only be seen by the user who uploaded this file."

locales/es-ES.yml

@@ -195,7 +195,6 @@ perHour: "por hora"
 perDay: "por día"
 stopActivityDelivery: "Dejar de enviar actividades"
 blockThisInstance: "Bloquear instancia"
-silenceThisInstance: "Silenciar esta instancia"
 operations: "Operaciones"
 software: "Software"
 version: "Versión"
@@ -215,8 +214,6 @@ clearCachedFiles: "Limpiar caché"
 clearCachedFilesConfirm: "¿Desea borrar todos los archivos remotos cacheados?"
 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."
 muteAndBlock: "Silenciar y bloquear"
 mutedUsers: "Usuarios silenciados"
 blockedUsers: "Usuarios bloqueados"
@@ -421,7 +418,6 @@ moderator: "Moderador"
 moderation: "Moderación"
 moderationNote: "Nota de moderación"
 addModerationNote: "Añadir nota de moderación"
-moderationLogs: "Log de moderación"
 nUsersMentioned: "{n} usuarios mencionados"
 securityKeyAndPasskey: "Clave de seguridad / clave de paso"
 securityKey: "Clave de seguridad"
@@ -534,7 +530,6 @@ serverLogs: "Registros del servidor"
 deleteAll: "Eliminar todos"
 showFixedPostForm: "Mostrar el formulario de las entradas encima de la línea de tiempo"
 showFixedPostFormInChannel: "Mostrar el formulario de publicación por encima de la cronología (Canales)"
-withRepliesByDefaultForNewlyFollowed: "Incluir por defecto respuestas de usuarios recién seguidos en la línea de tiempo"
 newNoteRecived: "Tienes una nota nueva"
 sounds: "Sonidos"
 sound: "Sonidos"
@@ -715,7 +710,6 @@ lockedAccountInfo: "A menos que configures la visibilidad de tus notas como \"S
 alwaysMarkSensitive: "Marcar los medios de comunicación como contenido sensible por defecto"
 loadRawImages: "Cargar las imágenes originales en lugar de mostrar las miniaturas"
 disableShowingAnimatedImages: "No reproducir imágenes animadas"
-highlightSensitiveMedia: "Resaltar medios marcados como sensibles"
 verificationEmailSent: "Se le ha enviado un correo electrónico de confirmación. Por favor, acceda al enlace proporcionado en el correo electrónico para completar la configuración."
 notSet: "Sin especificar"
 emailVerified: "Su dirección de correo electrónico ha sido verificada."
@@ -1115,30 +1109,6 @@ youHaveUnreadAnnouncements: "Hay anuncios sin leer"
 useSecurityKey: "Por favor, sigue las instrucciones de tu dispositivo o navegador para usar tu clave de seguridad o tu clave de paso."
 replies: "Responder"
 renotes: "Renotar"
-loadReplies: "Ver respuestas"
-loadConversation: "Ver conversación"
-pinnedList: "Lista fijada"
-keepScreenOn: "Mantener pantalla encendida"
-verifiedLink: "Propiedad del enlace verificada"
-notifyNotes: "Notificar nuevas notas"
-unnotifyNotes: "Dejar de notificar nuevas notas"
-authentication: "Autenticación"
-authenticationRequiredToContinue: "Por favor, autentifícate para continuar"
-dateAndTime: "Fecha y hora"
-showRenotes: "Mostrar renotas"
-edited: "Editado"
-notificationRecieveConfig: "Ajustes de Notificaciones"
-mutualFollow: "Os seguís mutuamente"
-fileAttachedOnly: "Solo notas con archivos"
-showRepliesToOthersInTimeline: "Mostrar respuestas a otros en la línea de tiempo"
-hideRepliesToOthersInTimeline: "Ocultar respuestas a otros en la línea de tiempo"
-externalServices: "Servicios Externos"
-impressum: "Impressum"
-impressumUrl: "Impressum URL"
-impressumDescription: "En algunos países, como Alemania, la inclusión del operador de datos (el Impressum) es requerido legalmente para sitios web comerciales."
-privacyPolicy: "Política de Privacidad"
-privacyPolicyUrl: "URL de la Política de Privacidad"
-tosAndPrivacyPolicy: "Condiciones de Uso y Política de Privacidad"
 _announcement:
   forExistingUsers: "Solo para usuarios registrados"
   forExistingUsersDescription: "Este anuncio solo se mostrará a aquellos usuarios registrados en el momento de su publicación. Si se deshabilita esta opción, aquellos usuarios que se registren tras su publicación también lo verán."
@@ -1167,13 +1137,7 @@ _serverRules:
   description: "Un conjunto de reglas que serán mostradas antes del registro. Configurar un sumario de términos de servicio es recomendado."
 _serverSettings:
   iconUrl: "URL del ícono"
-  appIconDescription: "Indica el icono que se va a usar cuando {host} se muestre como una app."
-  appIconUsageExample: "Por ejemplo, como PWA o cuando se muestre como un marcador en la pantalla inicial del dispositivo"
-  appIconStyleRecommendation: "Como el icono puede ser recortado como un cuadrado o un círculo, se recomienda un icono con un margen coloreado alrededor del contenido."
-  appIconResolutionMustBe: "La resolución mínima es {resolution}."
   manifestJsonOverride: "Sobreescribir manifest.json"
-  shortName: "Nombre corto"
-  shortNameDescription: "Forma corta del nombre de la instancia que puede mostrarse si el nombre completo es demasiado largo."
 _accountMigration:
   moveFrom: "Trasladar de otra cuenta a ésta"
   moveFromSub: "Crear un alias para otra cuenta."
@@ -1488,7 +1452,6 @@ _role:
     descriptionOfRateLimitFactor: "Límites más bajos son menos restrictivos, más altos menos restrictivos"
     canHideAds: "Puede ocultar anuncios"
     canSearchNotes: "Uso de la búsqueda de notas"
-    canUseTranslator: "Uso de traductor"
   _condition:
     isLocal: "Usuario local"
     isRemote: "Usuario remoto"
@@ -1537,10 +1500,6 @@ _ad:
   reduceFrequencyOfThisAd: "Mostrar menos este anuncio."
   hide: "No mostrar"
   timezoneinfo: "El día de la semana está determidado por la zona horaria del servidor."
-  adsSettings: "Ajustes de anuncios"
-  notesPerOneAd: "Intervalo de actualización de anuncios en tiempo real (Notas por cada anuncio)"
-  setZeroToDisable: "Establece este valor a 0 para deshabilitar la actualización de anuncios en tiempo real"
-  adsTooClose: "El intervalo de anuncios actual puede empeorar la experiencia del usuario por ser demasiado bajo."
 _forgotPassword:
   enterEmail: "Ingrese el correo usado para registrar la cuenta. Se enviará un link para resetear la contraseña."
   ifNoEmail: "Si no utilizó un correo para crear la cuenta, contáctese con el administrador."
@@ -1626,6 +1585,11 @@ _wordMute:
   muteWords: "Palabras que silenciar"
   muteWordsDescription: "Separar con espacios indica una declaracion And, separar con lineas nuevas indica una declaracion Or。"
   muteWordsDescription2: "Encerrar las palabras clave entre numerales para usar expresiones regulares"
+  softDescription: "Ocultar en la linea de tiempo las notas que cumplen las condiciones"
+  hardDescription: "Evitar que se agreguen a la linea de tiempo las notas que cumplen las condiciones. Las notas no agregadas seguirán quitadas aunque cambien las condiciones."
+  soft: "Suave"
+  hard: "Duro"
+  mutedNotes: "Notas silenciadas"
 _instanceMute:
   instanceMuteDescription: "Silencia todas las notas y reposts de la instancias seleccionadas, incluyendo respuestas a los usuarios de las mismas"
   instanceMuteDescription2: "Separar por líneas"
@@ -1689,6 +1653,9 @@ _theme:
     infoFg: "Texto de información"
     infoWarnBg: "Fondo de advertencias"
     infoWarnFg: "Texto de advertencias"
+    cwBg: "Fondo del botón CW"
+    cwFg: "Texto del botón CW"
+    cwHoverBg: "Fondo del botón CW (hover)"
     toastBg: "Fondo de notificaciones"
     toastFg: "Texto de notificaciones"
     buttonBg: "Fondo de botón"
@@ -1706,6 +1673,8 @@ _sfx:
   note: "Notas"
   noteMy: "Nota (a mí mismo)"
   notification: "Notificaciones"
+  chat: "Chat"
+  chatBg: "Chat (Fondo)"
   antenna: "Antena receptora"
   channel: "Notificaciones del canal"
 _ago:
@@ -1815,7 +1784,6 @@ _antennaSources:
   homeTimeline: "Notas de los usuarios que sigues"
   users: "Notas de un usuario o varios"
   userList: "Notas de los usuarios de una lista"
-  userBlacklist: "Todas las notas excepto aquellas de uno o más usuarios especificados"
 _weekday:
   sunday: "Domingo"
   monday: "Lunes"
@@ -1915,7 +1883,6 @@ _profile:
   metadataContent: "Contenido"
   changeAvatar: "Cambiar avatar"
   changeBanner: "Cambiar banner"
-  verifiedLinkDescription: "Introduciendo una URL que contiene un enlace a tu perfil, se puede mostrar un icono de verificación de propiedad al lado del campo."
 _exportOrImport:
   allNotes: "Todas las notas"
   favoritedNotes: "Notas favoritas"
@@ -1925,7 +1892,6 @@ _exportOrImport:
   userLists: "Listas"
   excludeMutingUsers: "Excluir usuarios silenciados"
   excludeInactiveUsers: "Excluir usuarios inactivos"
-  withReplies: "Incluir respuestas de los usuarios importados en la línea de tiempo"
 _charts:
   federation: "Federación"
   apRequest: "Pedidos"
@@ -2035,7 +2001,6 @@ _notification:
   youReceivedFollowRequest: "Has mandado una solicitud de seguimiento"
   yourFollowRequestAccepted: "Tu solicitud de seguimiento fue aceptada"
   pollEnded: "Estan disponibles los resultados de la encuesta"
-  newNote: "Nueva nota"
   unreadAntennaNote: "Antena {name}"
   emptyPushNotificationMessage: "Se han actualizado las notificaciones push"
   achievementEarned: "Logro desbloqueado"
@@ -2045,7 +2010,6 @@ _notification:
   notificationWillBeDisplayedLikeThis: "Las notificaciones tendrán este aspecto"
   _types:
     all: "Todo"
-    note: "Nuevas notas"
     follow: "Siguiendo"
     mention: "Menciones"
     reply: "Respuestas"
@@ -2116,41 +2080,5 @@ _webhookSettings:
     reaction: "Cuando se recibe una reacción"
     mention: "Cuando hay una mención"
 _moderationLogTypes:
-  createRole: "Rol creado"
-  deleteRole: "Rol eliminado"
-  updateRole: "Rol actualizado"
-  assignRole: "Rol asignado"
-  unassignRole: "Rol retirado"
   suspend: "Suspender"
-  unsuspend: "Suspensión retirada"
-  addCustomEmoji: "Añadido emoji personalizado"
-  updateCustomEmoji: "Emoji personalizado actualizado"
-  deleteCustomEmoji: "Emoji personalizado eliminado"
-  updateServerSettings: "Ajustes de servidor actualizados"
-  updateUserNote: "Nota de moderación actualizada"
-  deleteDriveFile: "Archivo eliminado"
-  deleteNote: "Nota eliminada"
-  createGlobalAnnouncement: "Anuncio global creado"
-  createUserAnnouncement: "Anuncio de usuario creado"
-  updateGlobalAnnouncement: "Anuncio global actualizado"
-  updateUserAnnouncement: "Anuncio de usuario actualizado"
-  deleteGlobalAnnouncement: "Anuncio global eliminado"
-  deleteUserAnnouncement: "Anuncio de usuario eliminado"
   resetPassword: "Resetear contraseña"
-  suspendRemoteInstance: "Instancia remota suspendida"
-  unsuspendRemoteInstance: "Suspensión de instancia remota retirada"
-  markSensitiveDriveFile: "Archivo marcado como sensible"
-  unmarkSensitiveDriveFile: "Archivo marcado como no sensible"
-  resolveAbuseReport: "Reporte resuelto"
-  createInvitation: "Generar invitación"
-  createAd: "Anuncio creado"
-  deleteAd: "Anuncio eliminado"
-  updateAd: "Anuncio actualizado"
-_fileViewer:
-  title: "Detalles del archivo"
-  type: "Tipo de archivo"
-  size: "Tamaño del archivo"
-  url: "URL"
-  uploadedAt: "Subido el"
-  attachedNotes: "Notas adjuntas"
-  thisPageCanBeSeenFromTheAuthor: "Esta página solo puede ser vista por el autor."

locales/fr-FR.yml

@@ -45,7 +45,6 @@ pin: "Épingler sur le profil"
 unpin: "Désépingler"
 copyContent: "Copier le contenu"
 copyLink: "Copier le lien"
-copyLinkRenote: "Copier le lien de la renote"
 delete: "Supprimer"
 deleteAndEdit: "Supprimer et réécrire"
 deleteAndEditConfirm: "Êtes-vous sûr de vouloir effacer cette note et la modifier ? Vous perdrez toutes les réactions, renotes et réponses."
@@ -130,8 +129,6 @@ unmarkAsSensitive: "Supprimer le marquage comme sensible"
 enterFileName: "Entrer le nom du fichier"
 mute: "Masquer"
 unmute: "Ne plus masquer"
-renoteMute: "Masquer les renotes"
-renoteUnmute: "Ne plus masquer les renotes"
 block: "Bloquer"
 unblock: "Débloquer"
 suspend: "Suspendre"
@@ -184,7 +181,7 @@ selectUser: "Sélectionner un·e utilisateur·rice"
 recipient: "Destinataire"
 annotation: "Commentaires"
 federation: "Fédération"
-instances: "Instances"
+instances: "Instance"
 registeredAt: "Premier contact le"
 latestRequestReceivedAt: "Dernière requête reçue"
 latestStatus: "Dernier statut"
@@ -194,7 +191,6 @@ perHour: "par heure"
 perDay: "par jour"
 stopActivityDelivery: "Arrêter l’envoi de l’activité"
 blockThisInstance: "Bloquer cette instance"
-silenceThisInstance: "Mettre cette instance en sourdine"
 operations: "Opérations"
 software: "Logiciel"
 version: "Version"
@@ -214,8 +210,6 @@ clearCachedFiles: "Vider le cache"
 clearCachedFilesConfirm: "Êtes-vous sûr·e de vouloir vider tout le cache de fichiers distants ?"
 blockedInstances: "Instances bloquées"
 blockedInstancesDescription: "Listez les instances que vous désirez bloquer, une par ligne. Ces instances ne seront plus en capacité d'interagir avec votre instance."
-silencedInstances: "Instances mises en sourdine"
-silencedInstancesDescription: "Énumérer les noms d'hôte des instances à mettre en sourdine. Tous les comptes des instances énumérées seront traités comme mis en sourdine, ne peuvent faire que des demandes de suivi et ne peuvent pas mentionner les comptes locaux s'ils ne sont pas suivis. Cela n'affectera pas les instances bloquées."
 muteAndBlock: "Masqué·e·s / Bloqué·e·s"
 mutedUsers: "Utilisateur·rice·s en sourdine"
 blockedUsers: "Utilisateur·rice·s bloqué·e·s"
@@ -387,7 +381,7 @@ antennaSource: "Source de l’antenne"
 antennaKeywords: "Mots clés à recevoir"
 antennaExcludeKeywords: "Mots clés à exclure"
 antennaKeywordsDescription: "Séparer avec des espaces pour la condition AND. Séparer avec un saut de ligne pour une condition OR."
-notifyAntenna: "Me notifier pour les nouvelles notes"
+notifyAntenna: "Je souhaite recevoir les notifications des nouvelles notes"
 withFileAntenna: "Notes ayant des attachements uniquement"
 enableServiceworker: "Activer ServiceWorker"
 antennaUsersDescription: "Saisissez un seul nom d’utilisateur·rice par ligne"
@@ -420,7 +414,6 @@ moderator: "Modérateur·rice·s"
 moderation: "Modérations"
 moderationNote: "Note de modération"
 addModerationNote: "Ajouter une note de modération"
-moderationLogs: "Journal de modération"
 nUsersMentioned: "{n} utilisateur·rice·s mentionné·e·s"
 securityKeyAndPasskey: "Sécurité et clés de sécurité"
 securityKey: "Clé de sécurité"
@@ -479,7 +472,6 @@ aboutX: "À propos de {x}"
 emojiStyle: "Style des émojis"
 native: "Natif"
 disableDrawer: "Les menus ne s'affichent pas dans le tiroir"
-showNoteActionsOnlyHover: "Afficher les actions de note uniquement au survol"
 noHistory: "Pas d'historique"
 signinHistory: "Historique de connexion"
 enableAdvancedMfm: "Activer la MFM avancée"
@@ -655,7 +647,6 @@ behavior: "Comportement"
 sample: "Exemple"
 abuseReports: "Signalements"
 reportAbuse: "Signaler"
-reportAbuseRenote: "Signaler la renote"
 reportAbuseOf: "Signaler {name}"
 fillAbuseReportDescription: "Veuillez expliquer les raisons du signalement. S'il s'agit d'une note précise, veuillez en donner le lien."
 abuseReported: "Le rapport est envoyé. Merci."
@@ -680,8 +671,6 @@ clip: "Clip"
 createNew: "Créer nouveau"
 optional: "Facultatif"
 createNewClip: "Créer un nouveau clip"
-unclip: "Supprimer le clip"
-confirmToUnclipAlreadyClippedNote: "Cette note fait déjà partie du clip « {name} ». Souhaitez-vous la supprimer de ce clip ?"
 public: "Public"
 private: "Privé"
 i18nInfo: "Misskey est traduit dans différentes langues par des bénévoles. Vous pouvez contribuer à {link}."
@@ -930,7 +919,6 @@ remoteOnly: "Distant uniquement"
 failedToUpload: "Échec du transfert"
 cannotUploadBecauseInappropriate: "Impossible de télécharger le document car il a été déterminé qu'il pouvait contenir un contenu inapproprié."
 cannotUploadBecauseNoFreeSpace: "Impossible de télécharger en raison d'un manque d'espace libre sur le disque.\n"
-cannotUploadBecauseExceedsFileSizeLimit: "Ce fichier ne peut pas être téléchargé parce qu'il dépasse la taille maximale."
 beta: "Bêta"
 enableAutoSensitive: "Détermination automatique de NSFW"
 enableAutoSensitiveDescription: "S'il est disponible, le drapeau NSFW est automatiquement défini sur le média en utilisant l'apprentissage automatique. Même si cette fonction est désactivée, elle peut être réglée automatiquement dans certains cas."
@@ -945,55 +933,37 @@ unsubscribePushNotification: "Désactiver les notifications push"
 pushNotificationAlreadySubscribed: "Les notifications push sont déjà activées"
 pushNotificationNotSupported: "Votre navigateur ou votre instance ne prend pas en charge les notifications push"
 sendPushNotificationReadMessage: "Supprimer les notifications push une fois que les notifications ou messages pertinents ont été lus."
-windowMaximize: "Maximiser"
-windowMinimize: "Minimaliser"
 windowRestore: "Restaurer"
 caption: "Libellé"
 loggedInAsBot: "Connecté actuellement en tant que bot"
 tools: "Outils"
 cannotLoad: "Chargement impossible"
-numberOfProfileView: "Nombre de vues du profil"
 like: "J'aime"
-unlike: "Ne plus aimer"
 numberOfLikes: "Favoris"
 show: "Affichage"
 neverShow: "Ne plus afficher"
 remindMeLater: "Peut-être plus tard"
-didYouLikeMisskey: "Avez-vous aimé Misskey ?"
 roles: "Rôles"
 role: "Rôles"
 noRole: "Aucun rôle"
 normalUser: "Simple utilisateur·rice"
 undefined: "Non défini"
 assign: "Attribuer"
-unassign: "Retirer"
 color: "Couleur"
 manageCustomEmojis: "Gestion des émojis personnalisés"
-youCannotCreateAnymore: "Vous avez atteint la limite de création."
-cannotPerformTemporary: "Temporairement indisponible"
-invalidParamError: "Paramètres invalides"
 preset: "Préréglage"
 selectFromPresets: "Sélectionner à partir des préréglages"
 achievements: "Accomplissements"
-gotInvalidResponseError: "Réponse du serveur invalide"
 thisPostMayBeAnnoying: "Cette note peut gêner d'autres personnes."
 thisPostMayBeAnnoyingHome: "Publier vers le fil principal"
 thisPostMayBeAnnoyingCancel: "Annuler"
 thisPostMayBeAnnoyingIgnore: "Publier quand-même"
-collapseRenotes: "Réduire les renotes déjà vues"
 internalServerError: "Erreur interne du serveur"
 copyErrorInfo: "Copier les détails de l’erreur"
 exploreOtherServers: "Trouver une autre instance"
 disableFederationOk: "Désactiver"
-postToTheChannel: "Publier au canal"
 likeOnly: "Les favoris uniquement"
-sensitiveWords: "Mots sensibles"
-notesSearchNotAvailable: "La recherche de notes n'est pas disponible."
 license: "Licence"
-myClips: "Mes clips"
-retryAllQueuesConfirmText: "Cela peut augmenter temporairement la charge du serveur."
-showClipButtonInNoteFooter: "Ajouter « Clip » au menu d'action de la note"
-noteIdOrUrl: "Identifiant de la note ou URL"
 video: "Vidéo"
 videos: "Vidéos"
 dataSaver: "Économiseur de données"
@@ -1001,44 +971,29 @@ accountMigration: "Migration de compte"
 accountMoved: "Cet·te utilisateur·rice a migré son compte vers :"
 accountMovedShort: "Ce compte a migré"
 operationForbidden: "Opération non autorisée"
-forceShowAds: "Toujours afficher les publicités"
 addMemo: "Ajouter un mémo"
 reactionsList: "Réactions"
-renotesList: "Liste de renotes"
 notificationDisplay: "Style des notifications"
 leftTop: "En haut à gauche"
 rightTop: "En haut à droite"
 leftBottom: "En bas à gauche"
 rightBottom: "En bas à droite"
-stackAxis: "Direction d'empilement"
 vertical: "Vertical"
 horizontal: "Latéral"
-position: "Position"
 serverRules: "Règles du serveur"
-pleaseAgreeAllToContinue: "Pour continuer, veuillez accepter tous les champs ci-dessus."
-continue: "Continuer"
-preservedUsernames: "Noms d'utilisateur·rice réservés"
 archive: "Archive"
-displayOfNote: "Affichage de la note"
-initialAccountSetting: "Réglage initial du profil"
 youFollowing: "Abonné·e"
-preventAiLearning: "Refuser l'usage dans l'apprentissage automatique d'IA générative"
 options: "Options"
 later: "Plus tard"
 goToMisskey: "Retour vers Misskey"
 expirationDate: "Date d’expiration"
-waitingForMailAuth: "En attente de la vérification de l'adresse courriel"
 usedAt: "Utilisé le"
 unused: "Non-utilisé"
 used: "Utilisé"
 expired: "Expiré"
 doYouAgree: "Êtes-vous d’accord ?"
-beSureToReadThisAsItIsImportant: "Assurez-vous de le lire ; c'est important."
-dialog: "Dialogue"
 icon: "Avatar"
 forYou: "Pour vous"
-currentAnnouncements: "Annonces actuelles"
-pastAnnouncements: "Annonces passées"
 replies: "Répondre"
 renotes: "Renoter"
 loadReplies: "Inclure les réponses"
@@ -1046,7 +1001,6 @@ pinnedList: "Liste épinglée"
 notifyNotes: "Notifier à propos des nouvelles notes"
 authentication: "Authentification"
 authenticationRequiredToContinue: "Veuillez vous authentifier pour continuer"
-showRenotes: "Afficher les renotes"
 _announcement:
   readConfirmTitle: "Marquer comme lu ?"
 _initialAccountSetting:
@@ -1128,20 +1082,12 @@ _achievements:
       title: "Beaucoup d'amis"
     _followers10:
       title: "Abonnez-moi !"
-      description: "Obtenir plus de 10 abonné·e·s"
-    _followers50:
-      description: "Obtenir plus de 50 abonné·e·s"
     _followers100:
       title: "Populaire"
-      description: "Obtenir plus de 100 abonné·e·s"
-    _followers300:
-      description: "Obtenir plus de 300 abonné·e·s"
     _followers500:
       title: "Tour radio"
-      description: "Obtenir plus de 500 abonné·e·s"
     _followers1000:
       title: "Influenceur·euse"
-      description: "Obtenir plus de 1000 abonné·e·s"
     _iLoveMisskey:
       title: "J’adore Misskey"
       description: "Publication « J’❤ #Misskey »"
@@ -1205,7 +1151,6 @@ _role:
     high: "Haute"
   _options:
     canManageCustomEmojis: "Gestion des émojis personnalisés"
-    wordMuteMax: "Nombre maximal de caractères dans le filtre de mots"
 _sensitiveMediaDetection:
   description: "L'apprentissage automatique peut être utilisé pour détecter automatiquement les médias sensibles à modérer. La sollicitation des serveurs augmente légèrement."
   sensitivity: "Sensibilité de la détection"
@@ -1322,6 +1267,11 @@ _wordMute:
   muteWords: "Mots à filtrer"
   muteWordsDescription: "Séparer avec des espaces pour la condition AND. Séparer avec un saut de ligne pour une condition OR."
   muteWordsDescription2: "Pour utiliser des expressions régulières (regex), mettez les mots-clés entre barres obliques."
+  softDescription: "Masquez les notes de votre fil selon les paramètres que vous définissez."
+  hardDescription: "Empêchez votre fil de charger les notes selon les paramètres que vous définissez. Cette action est irréversible : si vous modifiez ces paramètres plus tard, les notes précédemment filtrées ne seront pas récupérées."
+  soft: "Doux"
+  hard: "Strict"
+  mutedNotes: "Notes filtrées"
 _instanceMute:
   instanceMuteDescription: "Met en sourdine toutes les notes et renotes de l'instance configurée, y compris les réponses aux utilisateurs de l'instance muette."
   instanceMuteDescription2: "Séparer avec de nouvelles lignes"
@@ -1385,6 +1335,9 @@ _theme:
     infoFg: "Texte d'information"
     infoWarnBg: "Arrière-plan des avertissements"
     infoWarnFg: "Texte d’avertissement"
+    cwBg: "Arrière-plan du CW"
+    cwFg: "Texte du bouton CW"
+    cwHoverBg: "Arrière-plan du bouton CW (survolé)"
     toastBg: "Arrière-plan de la bulle de notification"
     toastFg: "Texte de la bulle de notification"
     buttonBg: "Arrière-plan du bouton"
@@ -1402,6 +1355,8 @@ _sfx:
   note: "Nouvelle note"
   noteMy: "Ma note"
   notification: "Notifications"
+  chat: "Discuter"
+  chatBg: "Discussion (arrière-plan)"
   antenna: "Réception de l’antenne"
   channel: "Notifications de canal"
 _ago:
@@ -1558,7 +1513,7 @@ _visibility:
 _postForm:
   replyPlaceholder: "Répondre à cette note ..."
   quotePlaceholder: "Citez cette note ..."
-  channelPlaceholder: "Publier au canal…"
+  channelPlaceholder: "Publier vers le canal"
   _placeholders:
     a: "Quoi de neuf ?"
     b: "Il s'est passé quelque chose ?"

locales/hr-HR.yml

@@ -1,5 +1 @@
 ---
-_lang_: "japanski"
-ok: "OK"
-gotIt: "Razumijem"
-cancel: "otkazati"

locales/ht-HT.yml

@@ -1,18 +1 @@
 ---
-_lang_: "Japonè"
-password: "modpas"
-ok: "OK"
-gotIt: "Konprann"
-cancel: "anile"
-noThankYou: "Sispann"
-instance: "sèvè"
-profile: "pwofil"
-save: "kenbe"
-delete: "efase"
-instances: "sèvè"
-remove: "efase"
-smtpPass: "modpas"
-_2fa:
-  renewTOTPCancel: "Sispann"
-_widgets:
-  profile: "pwofil"

locales/id-ID.yml

@@ -1100,7 +1100,6 @@ currentAnnouncements: "Pengumuman Saat Ini"
 pastAnnouncements: "Pengumuman Terdahulu"
 replies: "Balas"
 renotes: "Renote"
-dateAndTime: "Tanggal dan Waktu"
 _initialAccountSetting:
   accountCreated: "Akun kamu telah sukses dibuat!"
   letsStartAccountSetup: "Untuk pemula, ayo atur profilmu dulu."
@@ -1564,6 +1563,11 @@ _wordMute:
   muteWords: "Kata yang dibisukan"
   muteWordsDescription: "Pisahkan dengan spasi untuk kondisi AND. Pisahkan dengan baris baru untuk kondisi OR."
   muteWordsDescription2: "Kurung kata kunci dengan garis miring untuk menggunakan ekspresi reguler."
+  softDescription: "Sembunyikan catatan yang memenuhi aturan kondisi dari lini masa."
+  hardDescription: "Cegah catatan memenuhi aturan kondisi dari ditambahkan ke lini masa. Dengan tambahan, catatan berikut tidak akan ditambahkan ke lini masa meskipun jika kondisi tersebut diubah."
+  soft: "Lembut"
+  hard: "Keras"
+  mutedNotes: "Catatan yang dibisukan"
 _instanceMute:
   instanceMuteDescription: "Pengaturan ini akan membisukan note/renote apa saja dari instansi yang terdaftar, termasuk pengguna yang membalas pengguna lain dalam instansi yang dibisukan."
   instanceMuteDescription2: "Pisah dengan baris baru"
@@ -1627,6 +1631,9 @@ _theme:
     infoFg: "Teks informasi"
     infoWarnBg: "Latar belakang peringatan"
     infoWarnFg: "Teks peringatan"
+    cwBg: "Latar belakang tombol Sembunyikan Konten"
+    cwFg: "Teks tombol Sembunyikan Konten"
+    cwHoverBg: "Latar belakang tombol Sembunyikan Konten (Mengambang)"
     toastBg: "Latar belakang notifikasi"
     toastFg: "Teks notifikasi"
     buttonBg: "Latar belakang tombol"
@@ -1644,6 +1651,8 @@ _sfx:
   note: "Catatan"
   noteMy: "Catatan (Saya)"
   notification: "Notifikasi"
+  chat: "Pesan"
+  chatBg: "Obrolan (Latar Belakang)"
   antenna: "Penerimaan Antenna"
   channel: "Notifikasi Kanal"
 _ago:
@@ -2035,4 +2044,3 @@ _webhookSettings:
 _moderationLogTypes:
   suspend: "Tangguhkan"
   resetPassword: "Atur ulang kata sandi"
-  createInvitation: "Buat kode undangan"

locales/index.d.ts

@@ -198,7 +198,6 @@ export interface Locale {
     "perDay": string;
     "stopActivityDelivery": string;
     "blockThisInstance": string;
-    "silenceThisInstance": string;
     "operations": string;
     "software": string;
     "version": string;
@@ -218,8 +217,6 @@ export interface Locale {
     "clearCachedFilesConfirm": string;
     "blockedInstances": string;
     "blockedInstancesDescription": string;
-    "silencedInstances": string;
-    "silencedInstancesDescription": string;
     "muteAndBlock": string;
     "mutedUsers": string;
     "blockedUsers": string;
@@ -537,7 +534,6 @@ export interface Locale {
     "deleteAll": string;
     "showFixedPostForm": string;
     "showFixedPostFormInChannel": string;
-    "withRepliesByDefaultForNewlyFollowed": string;
     "newNoteRecived": string;
     "sounds": string;
     "sound": string;
@@ -1127,31 +1123,6 @@ export interface Locale {
     "unnotifyNotes": string;
     "authentication": string;
     "authenticationRequiredToContinue": string;
-    "dateAndTime": string;
-    "showRenotes": string;
-    "edited": string;
-    "notificationRecieveConfig": string;
-    "mutualFollow": string;
-    "fileAttachedOnly": string;
-    "showRepliesToOthersInTimeline": string;
-    "hideRepliesToOthersInTimeline": string;
-    "showRepliesToOthersInTimelineAll": string;
-    "hideRepliesToOthersInTimelineAll": string;
-    "confirmShowRepliesAll": string;
-    "confirmHideRepliesAll": string;
-    "externalServices": string;
-    "impressum": string;
-    "impressumUrl": string;
-    "impressumDescription": string;
-    "privacyPolicy": string;
-    "privacyPolicyUrl": string;
-    "tosAndPrivacyPolicy": string;
-    "avatarDecorations": string;
-    "attach": string;
-    "detach": string;
-    "angle": string;
-    "flip": string;
-    "showAvatarDecorations": string;
     "_announcement": {
         "forExistingUsers": string;
         "forExistingUsersDescription": string;
@@ -1584,7 +1555,6 @@ export interface Locale {
             "descriptionOfRateLimitFactor": string;
             "canHideAds": string;
             "canSearchNotes": string;
-            "canUseTranslator": string;
         };
         "_condition": {
             "isLocal": string;
@@ -1641,10 +1611,6 @@ export interface Locale {
         "reduceFrequencyOfThisAd": string;
         "hide": string;
         "timezoneinfo": string;
-        "adsSettings": string;
-        "notesPerOneAd": string;
-        "setZeroToDisable": string;
-        "adsTooClose": string;
     };
     "_forgotPassword": {
         "enterEmail": string;
@@ -1745,6 +1711,11 @@ export interface Locale {
         "muteWords": string;
         "muteWordsDescription": string;
         "muteWordsDescription2": string;
+        "softDescription": string;
+        "hardDescription": string;
+        "soft": string;
+        "hard": string;
+        "mutedNotes": string;
     };
     "_instanceMute": {
         "instanceMuteDescription": string;
@@ -1810,6 +1781,9 @@ export interface Locale {
             "infoFg": string;
             "infoWarnBg": string;
             "infoWarnFg": string;
+            "cwBg": string;
+            "cwFg": string;
+            "cwHoverBg": string;
             "toastBg": string;
             "toastFg": string;
             "buttonBg": string;
@@ -1829,6 +1803,8 @@ export interface Locale {
         "note": string;
         "noteMy": string;
         "notification": string;
+        "chat": string;
+        "chatBg": string;
         "antenna": string;
         "channel": string;
     };
@@ -2065,7 +2041,6 @@ export interface Locale {
         "userLists": string;
         "excludeMutingUsers": string;
         "excludeInactiveUsers": string;
-        "withReplies": string;
     };
     "_charts": {
         "federation": string;
@@ -2275,11 +2250,9 @@ export interface Locale {
         };
     };
     "_moderationLogTypes": {
-        "createRole": string;
-        "deleteRole": string;
-        "updateRole": string;
         "assignRole": string;
         "unassignRole": string;
+        "updateRole": string;
         "suspend": string;
         "unsuspend": string;
         "addCustomEmoji": string;
@@ -2300,78 +2273,6 @@ export interface Locale {
         "unsuspendRemoteInstance": string;
         "markSensitiveDriveFile": string;
         "unmarkSensitiveDriveFile": string;
-        "resolveAbuseReport": string;
-        "createInvitation": string;
-        "createAd": string;
-        "deleteAd": string;
-        "updateAd": string;
-        "createAvatarDecoration": string;
-        "updateAvatarDecoration": string;
-        "deleteAvatarDecoration": string;
-    };
-    "_fileViewer": {
-        "title": string;
-        "type": string;
-        "size": string;
-        "url": string;
-        "uploadedAt": string;
-        "attachedNotes": string;
-        "thisPageCanBeSeenFromTheAuthor": string;
-    };
-    "_externalResourceInstaller": {
-        "title": string;
-        "checkVendorBeforeInstall": string;
-        "_plugin": {
-            "title": string;
-            "metaTitle": string;
-        };
-        "_theme": {
-            "title": string;
-            "metaTitle": string;
-        };
-        "_meta": {
-            "base": string;
-        };
-        "_vendorInfo": {
-            "title": string;
-            "endpoint": string;
-            "hashVerify": string;
-        };
-        "_errors": {
-            "_invalidParams": {
-                "title": string;
-                "description": string;
-            };
-            "_resourceTypeNotSupported": {
-                "title": string;
-                "description": string;
-            };
-            "_failedToFetch": {
-                "title": string;
-                "fetchErrorDescription": string;
-                "parseErrorDescription": string;
-            };
-            "_hashUnmatched": {
-                "title": string;
-                "description": string;
-            };
-            "_pluginParseFailed": {
-                "title": string;
-                "description": string;
-            };
-            "_pluginInstallFailed": {
-                "title": string;
-                "description": string;
-            };
-            "_themeParseFailed": {
-                "title": string;
-                "description": string;
-            };
-            "_themeInstallFailed": {
-                "title": string;
-                "description": string;
-            };
-        };
     };
 }
 declare const locales: {

locales/it-IT.yml

@@ -64,7 +64,7 @@ reply: "Rispondi"
 loadMore: "Mostra di più"
 showMore: "Espandi"
 showLess: "Comprimi"
-youGotNewFollower: "Adesso ti segue"
+youGotNewFollower: "Ti sta seguendo"
 receiveFollowRequest: "Hai ricevuto una richiesta di follow"
 followRequestAccepted: "Ha accettato la tua richiesta di follow"
 mention: "Menzioni"
@@ -78,7 +78,7 @@ download: "Scarica"
 driveFileDeleteConfirm: "Vuoi davvero eliminare il file \"{name}\", e le Note a cui è stato allegato?"
 unfollowConfirm: "Vuoi davvero smettere di seguire {name}?"
 exportRequested: "Hai richiesto un'esportazione, e potrebbe volerci tempo. Quando sarà compiuta, il file verrà aggiunto direttamente al Drive."
-importRequested: "Hai richiesto un'importazione. Potrebbe richiedere un po' di tempo."
+importRequested: "Hai richiesto un'importazione. Può volerci tempo. "
 lists: "Liste"
 noLists: "Nessuna lista"
 note: "Nota"
@@ -110,14 +110,14 @@ unrenote: "Elimina la Rinota"
 renoted: "Rinotato!"
 cantRenote: "È impossibile rinotare questa nota."
 cantReRenote: "È impossibile rinotare una Rinota."
-quote: "Citazione"
+quote: "Cita"
 inChannelRenote: "Rinota nel canale"
 inChannelQuote: "Cita nel canale"
-pinnedNote: "Nota in primo piano"
+pinnedNote: "Nota fissata"
 pinned: "Fissa sul profilo"
 you: "Tu"
-clickToShow: "Contenuto occultato, cliccare solo se si intende vedere"
-sensitive: "Allegato esplicito"
+clickToShow: "Clicca per visualizzare"
+sensitive: "Esplicito"
 add: "Aggiungi"
 reaction: "Reazioni"
 reactions: "Reazioni"
@@ -130,8 +130,8 @@ unmarkAsSensitive: "Non segnare come esplicito "
 enterFileName: "Nome del file"
 mute: "Silenzia"
 unmute: "Riattiva l'audio"
-renoteMute: "Silenzia le Rinota"
-renoteUnmute: "Non silenziare le Rinota"
+renoteMute: "Silenzia i Rinota"
+renoteUnmute: "Non silenziare i Rinota"
 block: "Blocca"
 unblock: "Sblocca"
 suspend: "Sospensione"
@@ -186,7 +186,7 @@ recipient: "Destinatario"
 annotation: "Annotazione preventiva"
 federation: "Federazione"
 instances: "Istanza"
-registeredAt: "Prima federazione"
+registeredAt: "Registrato presso"
 latestRequestReceivedAt: "Ultima richiesta ricevuta"
 latestStatus: "Ultimo stato"
 storageUsage: "Capienza dei dischi"
@@ -195,7 +195,6 @@ perHour: "orario"
 perDay: "giornaliero"
 stopActivityDelivery: "Interrompi la distribuzione di attività"
 blockThisInstance: "Blocca questa istanza"
-silenceThisInstance: "Silenzia l'istanza"
 operations: "Operazioni"
 software: "Software"
 version: "Versione"
@@ -215,8 +214,6 @@ clearCachedFiles: "Svuota cache"
 clearCachedFilesConfirm: "Vuoi davvero svuotare la cache da tutti i file remoti?"
 blockedInstances: "Istanze bloccate"
 blockedInstancesDescription: "Elenca le istanze che vuoi bloccare, una per riga. Esse non potranno più interagire con la tua istanza."
-silencedInstances: "Istanze silenziate"
-silencedInstancesDescription: "Elenca i nomi host delle istanze che vuoi silenziare. Tutti i profili nelle istanze silenziate vengono trattati come tali. Possono solo inviare richieste di follow e menzionare soltanto i profili locali che seguono. Le istanze bloccate non sono interessate."
 muteAndBlock: "Silenziati / Bloccati"
 mutedUsers: "Profili silenziati"
 blockedUsers: "Profili bloccati"
@@ -281,7 +278,7 @@ agreeTo: "Sono d'accordo con {0}"
 agree: "Accetto"
 agreeBelow: "Accetto quanto riportato sotto"
 basicNotesBeforeCreateAccount: "Note importanti"
-termsOfService: "Condizioni d'uso del servizio"
+termsOfService: "Informativa ai sensi degli artt. 13 e 14 del Regolamento UE 2016/679 per la protezione dei dati personali (GDPR)"
 start: "Inizia!"
 home: "Home"
 remoteUserCaution: "Le informazioni potrebbero essere incomplete poiché questo profilo remoto potrebbe non essere completamente federato."
@@ -339,7 +336,7 @@ instanceName: "Nome dell'istanza"
 instanceDescription: "Descrizione dell'istanza"
 maintainerName: "Nome dell'amministratore"
 maintainerEmail: "Indirizzo e-mail dell'amministratore"
-tosUrl: "URL delle condizioni d'uso"
+tosUrl: "URL dei termini del servizio e della privacy"
 thisYear: "Anno"
 thisMonth: "Mese"
 today: "Oggi"
@@ -367,7 +364,7 @@ pinnedUsersDescription: "Elenca gli/le utenti che vuoi fissare in cima alla pagi
 pinnedPages: "Pagine in evidenza"
 pinnedPagesDescription: "Specifica il percorso delle pagine che vuoi fissare in cima alla pagina dell'istanza. Una pagina per riga."
 pinnedClipId: "ID della Clip in evidenza"
-pinnedNotes: "Note in primo piano"
+pinnedNotes: "Nota fissata"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "Abilita hCaptcha"
 hcaptchaSiteKey: "Chiave del sito"
@@ -387,7 +384,7 @@ name: "Nome"
 antennaSource: "Fonte dell'antenna"
 antennaKeywords: "Parole chiavi da ricevere"
 antennaExcludeKeywords: "Parole chiavi da escludere"
-antennaKeywordsDescription: "Sparando con uno spazio indichi la condizione E (and). Separando con un a capo, indichi la condizione O (or)."
+antennaKeywordsDescription: "Separare con uno spazio indica la condizione \"E\". Separare con un'interruzzione riga indica la condizione \"O\"."
 notifyAntenna: "Invia notifiche delle nuove note"
 withFileAntenna: "Solo note con file in allegato"
 enableServiceworker: "Abilita ServiceWorker"
@@ -396,7 +393,7 @@ caseSensitive: "Sensibile alla distinzione tra maiuscole e minuscole"
 withReplies: "Includere le risposte"
 connectedTo: "Connessione ai seguenti profili:"
 notesAndReplies: "Note e risposte"
-withFiles: "Con allegati"
+withFiles: "Con file in allegato"
 silence: "Silenzia"
 silenceConfirm: "Vuoi davvero silenziare questo profilo?"
 unsilence: "Riattiva"
@@ -464,7 +461,7 @@ invitationCode: "Codice di invito"
 checking: "Confermando"
 available: "Disponibile"
 unavailable: "Il nome utente è già in uso"
-usernameInvalidFormat: "Il nome utente deve avere solo caratteri alfanumerici e trattino basso '_'"
+usernameInvalidFormat: "Il nome utente può contenere solo lettere, numeri e '_'"
 tooShort: "Troppo breve"
 tooLong: "Troppo lungo"
 weakPassword: "Password debole"
@@ -534,7 +531,6 @@ serverLogs: "Log del server"
 deleteAll: "Cancella cronologia"
 showFixedPostForm: "Visualizzare la finestra di pubblicazione in cima alla timeline"
 showFixedPostFormInChannel: "Per i canali, mostra il modulo di pubblicazione in cima alla timeline"
-withRepliesByDefaultForNewlyFollowed: "Quando segui nuovi profili, includi le risposte in TL come impostazione predefinita"
 newNoteRecived: "Nuove note da leggere"
 sounds: "Impostazioni suoni"
 sound: "Suono"
@@ -995,7 +991,7 @@ thisPostMayBeAnnoying: "Questa nota potrebbe essere offensiva"
 thisPostMayBeAnnoyingHome: "Pubblica sulla timeline principale"
 thisPostMayBeAnnoyingCancel: "Annulla"
 thisPostMayBeAnnoyingIgnore: "Pubblica lo stesso"
-collapseRenotes: "Comprimi le Rinota già viste"
+collapseRenotes: "Comprimi i Rinota già letti"
 internalServerError: "Errore interno del server"
 internalServerErrorDescription: "Si è verificato un errore imprevisto all'interno del server"
 copyErrorInfo: "Copia le informazioni sull'errore"
@@ -1124,21 +1120,6 @@ notifyNotes: "Notifica nuove Note"
 unnotifyNotes: "Interrompi le notifiche di nuove Note"
 authentication: "Autenticazione"
 authenticationRequiredToContinue: "Per procedere, è richiesta l'autenticazione"
-dateAndTime: "Data e Ora"
-showRenotes: "Includi le Rinota"
-edited: "Modificato"
-notificationRecieveConfig: "Preferenze di notifica"
-mutualFollow: "Follow reciproco"
-fileAttachedOnly: "Solo con allegati"
-showRepliesToOthersInTimeline: "Risposte altrui nella TL"
-hideRepliesToOthersInTimeline: "Nascondi Riposte altrui nella TL"
-externalServices: "Servizi esterni"
-impressum: "Dichiarazione di proprietà"
-impressumUrl: "URL della dichiarazione di proprietà"
-impressumDescription: "La dichiarazione di proprietà, è obbligatoria in alcuni paesi come la Germania (Impressum)."
-privacyPolicy: "Informativa privacy ai sensi del Regolamento UE 2016/679 (GDPR)"
-privacyPolicyUrl: "URL della informativa privacy"
-tosAndPrivacyPolicy: "Condizioni d'uso e informativa privacy"
 _announcement:
   forExistingUsers: "Solo ai profili attuali"
   forExistingUsersDescription: "L'annuncio sarà visibile solo ai profili esistenti in questo momento. Se disabilitato, sarà visibile anche ai profili che verranno creati dopo la pubblicazione di questo annuncio."
@@ -1468,14 +1449,14 @@ _role:
   _options:
     gtlAvailable: "Disponibilità della Timeline Federata"
     ltlAvailable: "Disponibilità della Timeline Locale"
-    canPublicNote: "Scrivere Note con Visibilità Pubblica"
-    canInvite: "Generare codici di invito all'istanza"
+    canPublicNote: "Può scrivere Note con Visibilità Pubblica"
+    canInvite: "Genera codici di invito all'istanza"
     inviteLimit: "Limite di codici invito"
     inviteLimitCycle: "Intervallo di emissione del codice di invito"
     inviteExpirationTime: "Scadenza del codice di invito"
     canManageCustomEmojis: "Gestire le emoji personalizzate"
     driveCapacity: "Capienza del Drive"
-    alwaysMarkNsfw: "Impostare sempre come esplicito (NSFW)"
+    alwaysMarkNsfw: "Imposta sempre come NSFW"
     pinMax: "Quantità massima di Note in primo piano"
     antennaMax: "Quantità massima di Antenne"
     wordMuteMax: "Lunghezza massima del filtro parole"
@@ -1486,9 +1467,8 @@ _role:
     userEachUserListsMax: "Quantità massima di profili per lista"
     rateLimitFactor: "Limite del rapporto"
     descriptionOfRateLimitFactor: "I rapporti più bassi sono meno restrittivi, quelli più alti lo sono di più."
-    canHideAds: "Nascondere i banner"
+    canHideAds: "Può nascondere i banner"
     canSearchNotes: "Ricercare nelle Note"
-    canUseTranslator: "Tradurre le Note"
   _condition:
     isLocal: "Profilo locale"
     isRemote: "Profilo remoto"
@@ -1537,10 +1517,6 @@ _ad:
   reduceFrequencyOfThisAd: "Visualizza questa pubblicità meno spesso"
   hide: "Nascondi"
   timezoneinfo: "Il giorno della settimana è determinato in base al fuso orario del server."
-  adsSettings: "Impostazioni banner"
-  notesPerOneAd: "Quantità di Note tra i banner"
-  setZeroToDisable: "Imposta 0 (zero) per disattivare la distribuzione dei banner durante gli aggiornamenti in tempo reale"
-  adsTooClose: "Attenzione, l'intervallo di pubblicazione dei banner è molto breve, potrebbe infastidire significativamente la fruizione"
 _forgotPassword:
   enterEmail: "Inserisci l'indirizzo di posta elettronica che hai registrato nel tuo profilo. Il collegamento necessario per ripristinare la password verrà inviato a questo indirizzo."
   ifNoEmail: "Se il tuo indirizzo email non risulta registrato, contatta l'amministrazione dell'istanza."
@@ -1552,7 +1528,7 @@ _gallery:
   unlike: "Non mi piace più"
 _email:
   _follow:
-    title: "Adesso ti segue"
+    title: "Ha iniziato a seguirti"
   _receiveFollowRequest:
     title: "Hai ricevuto una richiesta di follow"
 _plugin:
@@ -1624,8 +1600,13 @@ _menuDisplay:
   hide: "Nascondere"
 _wordMute:
   muteWords: "Parole da filtrare"
-  muteWordsDescription: "Sparando con uno spazio indichi la condizione E (and). Separando con un a capo, indichi la condizione O (or)."
+  muteWordsDescription: "Separare con uno spazio indica la condizione \"E\". Separare con una interruzione di riga, indica la condizione \"O\""
   muteWordsDescription2: "Se vuoi indicare delle Espressioni Regolari (regexp), metti la condizione all'interno di due slash (/)"
+  softDescription: "Verranno nascoste da tutte le Timeline quelle Note che soddisfano le seguenti condizioni"
+  hardDescription: "Impedisci alla istanza di caricare Note che soddisfano le seguenti condizioni. Le Note già filtrate sono già scomparse in modo irreversibile, fino al cambiamento delle condizioni. Dopo di che scompariranno quelle che soddisfano le nuove condizioni."
+  soft: "Leggero"
+  hard: "Pesante"
+  mutedNotes: "Note filtrate"
 _instanceMute:
   instanceMuteDescription: "Disattiva tutte le note, le note di rinvio (condivisione) dell'istanza configurata, comprese le risposte agli utenti dell'istanza."
   instanceMuteDescription2: "Impostazione separata da una nuova riga"
@@ -1634,7 +1615,7 @@ _instanceMute:
 _theme:
   explore: "Esplora temi"
   install: "Installa un tema"
-  manage: "Gestione temi"
+  manage: "Gerisci temi"
   code: "Codice tema"
   description: "Descrizione"
   installed: "{name} è installato"
@@ -1689,6 +1670,9 @@ _theme:
     infoFg: "Testo di informazioni"
     infoWarnBg: "Sfondo degli avvisi"
     infoWarnFg: "Testo di avviso"
+    cwBg: "Sfondo del CW"
+    cwFg: "Testo del pulsante CW"
+    cwHoverBg: "Sfondo del pulsante CW (sorvolato)"
     toastBg: "Sfondo di notifica a comparsa"
     toastFg: "Testo di notifica a comparsa"
     buttonBg: "Sfondo del pulsante"
@@ -1706,6 +1690,8 @@ _sfx:
   note: "Nota"
   noteMy: "Mia nota"
   notification: "Notifiche"
+  chat: "Messaggi"
+  chatBg: "Chat (sfondo)"
   antenna: "Ricezione dell'antenna"
   channel: "Notifiche di canale"
 _ago:
@@ -1883,14 +1869,14 @@ _poll:
   remainingSeconds: "Rimangono {s} secondi"
 _visibility:
   public: "Pubblica"
-  publicDescription: "Visibilità pubblica"
+  publicDescription: "Visibile per tutti sul Fediverso"
   home: "Home"
-  homeDescription: "Visibile solo nella Home"
+  homeDescription: "Visibile solo sulla timeline locale"
   followers: "Follower"
   followersDescription: "Visibile solo ai tuoi follower"
   specified: "Nota diretta"
   specifiedDescription: "Visibile solo ai profili menzionati"
-  disableFederation: "Senza federazione"
+  disableFederation: "Non federare"
   disableFederationDescription: "Non spedire attività alle altre istanze remote"
 _postForm:
   replyPlaceholder: "Rispondi a questa nota..."
@@ -1925,7 +1911,6 @@ _exportOrImport:
   userLists: "Liste"
   excludeMutingUsers: "Escludere gli utenti silenziati"
   excludeInactiveUsers: "Escludere i profili inutilizzati"
-  withReplies: "Includere le risposte da profili importati nella Timeline"
 _charts:
   federation: "Federazione"
   apRequest: "Richieste"
@@ -2031,7 +2016,7 @@ _notification:
   youGotReply: "{name} ti ha risposto"
   youGotQuote: "{name} ha citato la tua Nota e ha detto"
   youRenoted: "{name} ha rinotato"
-  youWereFollowed: "Adesso ti segue"
+  youWereFollowed: "Ha iniziato a seguirti"
   youReceivedFollowRequest: "Hai ricevuto una richiesta di follow"
   yourFollowRequestAccepted: "La tua richiesta di follow è stata accettata"
   pollEnded: "Risultati del sondaggio."
@@ -2046,7 +2031,7 @@ _notification:
   _types:
     all: "Tutto"
     note: "Nuove Note"
-    follow: "Nuovi profili follower"
+    follow: "Novità follower"
     mention: "Menzioni"
     reply: "Risposte"
     renote: "Rinota"
@@ -2090,7 +2075,7 @@ _deck:
     list: "Liste"
     channel: "Canale"
     mentions: "Menzioni"
-    direct: "Note Dirette"
+    direct: "Diretta"
     roleTimeline: "Timeline Ruolo"
 _dialog:
   charactersExceeded: "Hai superato il limite di {max} caratteri! ({corrente})"
@@ -2116,41 +2101,18 @@ _webhookSettings:
     reaction: "Quando ricevo una reazione"
     mention: "Quando mi menzionano"
 _moderationLogTypes:
-  createRole: "Ruolo creato"
-  deleteRole: "Ruolo eliminato"
-  updateRole: "Ruolo aggiornato"
-  assignRole: "Ruolo assegnato"
-  unassignRole: "Ruolo disassegnato"
+  assignRole: "Assegna un ruolo"
+  unassignRole: "Disassegna un ruolo"
+  updateRole: "Aggiorna un ruolo"
   suspend: "Sospensione"
-  unsuspend: "Sospensione rimossa"
-  addCustomEmoji: "Emoji personalizzata aggiunta"
-  updateCustomEmoji: "Emoji personalizzata aggiornata"
-  deleteCustomEmoji: "Emoji personalizzata eliminata"
-  updateServerSettings: "Impostazioni del server aggiornate"
-  updateUserNote: "Promemoria di moderazione aggiornato"
-  deleteDriveFile: "File da Drive eliminato"
-  deleteNote: "Nota eliminata"
-  createGlobalAnnouncement: "Annuncio globale creato"
-  createUserAnnouncement: "Annuncio ai profili iscritti creato"
-  updateGlobalAnnouncement: "Annuncio globale aggiornato"
-  updateUserAnnouncement: "Annuncio ai profili iscritti aggiornato"
-  deleteGlobalAnnouncement: "Annuncio globale eliminato"
-  deleteUserAnnouncement: "Annuncio ai profili iscritti eliminato"
-  resetPassword: "Password azzerata"
-  suspendRemoteInstance: "Istanza remota sospesa"
-  unsuspendRemoteInstance: "Istanza remota riattivata"
-  markSensitiveDriveFile: "File nel Drive segnato come esplicito"
-  unmarkSensitiveDriveFile: "File nel Drive segnato come non esplicito"
-  resolveAbuseReport: "Segnalazione risolta"
-  createInvitation: "Genera codice di invito"
-  createAd: "Banner creato"
-  deleteAd: "Banner eliminato"
-  updateAd: "Banner aggiornato"
-_fileViewer:
-  title: "Dettagli del file"
-  type: "Tipo di file"
-  size: "Dimensioni file"
-  url: "URL"
-  uploadedAt: "Caricato il"
-  attachedNotes: "Note a cui è allegato"
-  thisPageCanBeSeenFromTheAuthor: "Questa pagina può essere vista solo da chi ha caricato il file."
+  unsuspend: "Toglie la sospensione"
+  addCustomEmoji: "Aggiunge una emoji personalizzata"
+  updateServerSettings: "Aggiorna le impostazioni del server"
+  updateUserNote: "Aggiorna il promemoria di moderazione"
+  deleteDriveFile: "Elimina file da Drive"
+  deleteNote: "Elimina la Nota"
+  createGlobalAnnouncement: "Crea un annuncio globale"
+  createUserAnnouncement: "Crea un annuncio ai profili iscritti"
+  resetPassword: "Ripristina la password"
+  suspendRemoteInstance: "Sospendi istanza remota"
+  unsuspendRemoteInstance: "Riattiva istanza remota"

locales/ja-JP.yml

@@ -195,7 +195,6 @@ perHour: "1時間ごと"
 perDay: "1日ごと"
 stopActivityDelivery: "アクティビティの配送を停止"
 blockThisInstance: "このサーバーをブロック"
-silenceThisInstance: "サーバーをサイレンス"
 operations: "操作"
 software: "ソフトウェア"
 version: "バージョン"
@@ -214,9 +213,7 @@ clearQueueConfirmText: "未配達の投稿は配送されなくなります。
 clearCachedFiles: "キャッシュをクリア"
 clearCachedFilesConfirm: "キャッシュされたリモートファイルをすべて削除しますか？"
 blockedInstances: "ブロックしたサーバー"
-blockedInstancesDescription: "ブロックしたいサーバーのホストを改行で区切って設定します。ブロックされたサーバーは、このインスタンスとやり取りできなくなります。"
-silencedInstances: "サイレンスしたサーバー"
-silencedInstancesDescription: "サイレンスしたいサーバーのホストを改行で区切って設定します。サイレンスされたサーバーに所属するアカウントはすべて「サイレンス」として扱われ、フォローがすべてリクエストになり、フォロワーでないローカルアカウントにはメンションできなくなります。ブロックしたインスタンスには影響しません。"
+blockedInstancesDescription: "ブロックしたいサーバーのホストを改行で区切って設定します。ブロックされたサーバーは、このサーバーとやり取りできなくなります。サブドメインもブロックされます。"
 muteAndBlock: "ミュートとブロック"
 mutedUsers: "ミュートしたユーザー"
 blockedUsers: "ブロックしたユーザー"
@@ -534,7 +531,6 @@ serverLogs: "サーバーログ"
 deleteAll: "全て削除"
 showFixedPostForm: "タイムライン上部に投稿フォームを表示する"
 showFixedPostFormInChannel: "タイムライン上部に投稿フォームを表示する(チャンネル)"
-withRepliesByDefaultForNewlyFollowed: "フォローする際、デフォルトで返信をTLに含むようにする"
 newNoteRecived: "新しいノートがあります"
 sounds: "サウンド"
 sound: "サウンド"
@@ -593,7 +589,7 @@ poll: "アンケート"
 useCw: "内容を隠す"
 enablePlayer: "プレイヤーを開く"
 disablePlayer: "プレイヤーを閉じる"
-expandTweet: "ポストを展開する"
+expandTweet: "ツイートを展開する"
 themeEditor: "テーマエディター"
 description: "説明"
 describeFile: "キャプションを付ける"
@@ -798,7 +794,7 @@ active: "アクティブ"
 offline: "オフライン"
 notRecommended: "非推奨"
 botProtection: "Botプロテクション"
-instanceBlocking: "サーバーブロック・サイレンス"
+instanceBlocking: "サーバーブロック"
 selectAccount: "アカウントを選択"
 switchAccount: "アカウントを切り替え"
 enabled: "有効"
@@ -1124,31 +1120,6 @@ notifyNotes: "投稿を通知"
 unnotifyNotes: "投稿の通知を解除"
 authentication: "認証"
 authenticationRequiredToContinue: "続けるには認証を行ってください"
-dateAndTime: "日時"
-showRenotes: "リノートを表示"
-edited: "編集済み"
-notificationRecieveConfig: "通知の受信設定"
-mutualFollow: "相互フォロー"
-fileAttachedOnly: "ファイル付きのみ"
-showRepliesToOthersInTimeline: "TLに他の人への返信を含める"
-hideRepliesToOthersInTimeline: "TLに他の人への返信を含めない"
-showRepliesToOthersInTimelineAll: "TLに現在フォロー中の人全員の返信を含めるようにする"
-hideRepliesToOthersInTimelineAll: "TLに現在フォロー中の人全員の返信を含めないようにする"
-confirmShowRepliesAll: "この操作は元の戻せません。本当にTLに現在フォロー中の人全員の返信を含めるようにしますか"
-confirmHideRepliesAll: "この操作は元の戻せません。本当にTLに現在フォロー中の人全員の返信を含めないようにしますか"
-externalServices: "外部サービス"
-impressum: "運営者情報"
-impressumUrl: "運営者情報URL"
-impressumDescription: "ドイツなどの一部の国と地域では表示が義務付けられています(Impressum)。"
-privacyPolicy: "プライバシーポリシー"
-privacyPolicyUrl: "プライバシーポリシーURL"
-tosAndPrivacyPolicy: "利用規約・プライバシーポリシー"
-avatarDecorations: "アイコンデコレーション"
-attach: "付ける"
-detach: "外す"
-angle: "角度"
-flip: "反転"
-showAvatarDecorations: "アイコンのデコレーションを表示"
 
 _announcement:
   forExistingUsers: "既存ユーザーのみ"
@@ -1504,8 +1475,7 @@ _role:
     rateLimitFactor: "レートリミット"
     descriptionOfRateLimitFactor: "小さいほど制限が緩和され、大きいほど制限が強化されます。"
     canHideAds: "広告の非表示"
-    canSearchNotes: "ノート検索の利用"
-    canUseTranslator: "翻訳機能の利用"
+    canSearchNotes: "ノート検索の利用可否"
   _condition:
     isLocal: "ローカルユーザー"
     isRemote: "リモートユーザー"
@@ -1560,10 +1530,6 @@ _ad:
   reduceFrequencyOfThisAd: "この広告の表示頻度を下げる"
   hide: "表示しない"
   timezoneinfo: "曜日はサーバーのタイムゾーンを元に指定されます。"
-  adsSettings: "広告配信設定"
-  notesPerOneAd: "リアルタイム更新中に広告を配信する間隔（ノートの個数）"
-  setZeroToDisable: "0でリアルタイム更新時の広告配信を無効"
-  adsTooClose: "広告の配信間隔が極めて短いため、ユーザー体験が著しく損われる可能性があります。"
 
 _forgotPassword:
   enterEmail: "アカウントに登録したメールアドレスを入力してください。そのアドレス宛てに、パスワードリセット用のリンクが送信されます。"
@@ -1662,6 +1628,11 @@ _wordMute:
   muteWords: "ミュートするワード"
   muteWordsDescription: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります。"
   muteWordsDescription2: "キーワードをスラッシュで囲むと正規表現になります。"
+  softDescription: "指定した条件のノートをタイムラインから隠します。"
+  hardDescription: "指定した条件のノートをタイムラインに追加しないようにします。追加されなかったノートは、条件を変更しても除外されたままになります。"
+  soft: "ソフト"
+  hard: "ハード"
+  mutedNotes: "ミュートされたノート"
 
 _instanceMute:
   instanceMuteDescription: "ミュートしたサーバーのユーザーへの返信を含めて、設定したサーバーの全てのノートとRenoteをミュートします。"
@@ -1728,6 +1699,9 @@ _theme:
     infoFg: "情報の文字"
     infoWarnBg: "警告の背景"
     infoWarnFg: "警告の文字"
+    cwBg: "CW ボタンの背景"
+    cwFg: "CW ボタンの文字"
+    cwHoverBg: "CW ボタンの背景 (ホバー)"
     toastBg: "通知トーストの背景"
     toastFg: "通知トーストの文字"
     buttonBg: "ボタンの背景"
@@ -1746,6 +1720,8 @@ _sfx:
   note: "ノート"
   noteMy: "ノート(自分)"
   notification: "通知"
+  chat: "チャット"
+  chatBg: "チャット(バックグラウンド)"
   antenna: "アンテナ受信"
   channel: "チャンネル通知"
 
@@ -1980,7 +1956,6 @@ _exportOrImport:
   userLists: "リスト"
   excludeMutingUsers: "ミュートしているユーザーを除外"
   excludeInactiveUsers: "使われていないアカウントを除外"
-  withReplies: "インポートした人による返信をTLに含むようにする"
 
 _charts:
   federation: "連合"
@@ -2188,11 +2163,9 @@ _webhookSettings:
     mention: "メンションされたとき"
 
 _moderationLogTypes:
-  createRole: "ロールを作成"
-  deleteRole: "ロールを削除"
-  updateRole: "ロールを更新"
   assignRole: "ロールへアサイン"
   unassignRole: "ロールのアサイン解除"
+  updateRole: "ロール設定更新"
   suspend: "凍結"
   unsuspend: "凍結解除"
   addCustomEmoji: "カスタム絵文字追加"
@@ -2213,62 +2186,3 @@ _moderationLogTypes:
   unsuspendRemoteInstance: "リモートサーバーを再開"
   markSensitiveDriveFile: "ファイルをセンシティブ付与"
   unmarkSensitiveDriveFile: "ファイルをセンシティブ解除"
-  resolveAbuseReport: "通報を解決"
-  createInvitation: "招待コードを作成"
-  createAd: "広告を作成"
-  deleteAd: "広告を削除"
-  updateAd: "広告を更新"
-  createAvatarDecoration: "アイコンデコレーションを作成"
-  updateAvatarDecoration: "アイコンデコレーションを更新"
-  deleteAvatarDecoration: "アイコンデコレーションを削除"
-
-_fileViewer:
-  title: "ファイルの詳細"
-  type: "ファイルタイプ"
-  size: "ファイルサイズ"
-  url: "URL"
-  uploadedAt: "追加日"
-  attachedNotes: "添付されているノート"
-  thisPageCanBeSeenFromTheAuthor: "このページは、このファイルをアップロードしたユーザーしか閲覧できません。"
-
-_externalResourceInstaller:
-  title: "外部サイトからインストール"
-  checkVendorBeforeInstall: "配布元が信頼できるかを確認した上でインストールしてください。"
-  _plugin:
-    title: "このプラグインをインストールしますか？"
-    metaTitle: "プラグイン情報"
-  _theme:
-    title: "このテーマをインストールしますか？"
-    metaTitle: "テーマ情報"
-  _meta:
-    base: "基本のカラースキーム"
-  _vendorInfo:
-    title: "配布元情報"
-    endpoint: "参照したエンドポイント"
-    hashVerify: "ファイル整合性の確認"
-  _errors:
-    _invalidParams:
-      title: "パラメータが不足しています"
-      description: "外部サイトからデータを取得するために必要な情報が不足しています。URLをお確かめください。"
-    _resourceTypeNotSupported:
-      title: "この外部リソースには対応していません"
-      description: "この外部サイトから取得したリソースの種別には対応していません。サイト管理者にお問い合わせください。"
-    _failedToFetch:
-      title: "データの取得に失敗しました"
-      fetchErrorDescription: "外部サイトとの通信に失敗しました。もう一度試しても改善しない場合、サイト管理者にお問い合わせください。"
-      parseErrorDescription: "外部サイトから取得したデータが読み取れませんでした。サイト管理者にお問い合わせください。"
-    _hashUnmatched:
-      title: "正しいデータが取得できませんでした"
-      description: "提供されたデータの整合性の確認に失敗しました。セキュリティ上、インストールは続行できません。サイト管理者にお問い合わせください。"
-    _pluginParseFailed:
-      title: "AiScript エラー"
-      description: "データは取得できたものの、AiScriptの解析時にエラーがあったため読み込めませんでした。プラグインの作者にお問い合わせください。エラーの詳細はJavascriptコンソールをご確認ください。"
-    _pluginInstallFailed:
-      title: "プラグインのインストールに失敗しました"
-      description: "プラグインのインストール中に問題が発生しました。もう一度お試しください。エラーの詳細はJavascriptコンソールをご覧ください。"
-    _themeParseFailed:
-      title: "テーマ解析エラー"
-      description: "データは取得できたものの、テーマファイルの解析時にエラーがあったため読み込めませんでした。テーマの作者にお問い合わせください。エラーの詳細はJavascriptコンソールをご確認ください。"
-    _themeInstallFailed:
-      title: "テーマのインストールに失敗しました"
-      description: "テーマのインストール中に問題が発生しました。もう一度お試しください。エラーの詳細はJavascriptコンソールをご覧ください。"

locales/ja-KS.yml

@@ -45,7 +45,6 @@ pin: "ピン留めしとく"
 unpin: "やっぱピン留めせん"
 copyContent: "内容をコピー"
 copyLink: "リンクをコピー"
-copyLinkRenote: "リノートのリンクをコピーするで？"
 delete: "ほかす"
 deleteAndEdit: "ほかして直す"
 deleteAndEditConfirm: "このノートをほかしてもっかい直す？このノートへのツッコミ、Renote、返信も全部消えるんやけどそれでもええん？"
@@ -195,7 +194,6 @@ perHour: "1時間ごと"
 perDay: "1日ごと"
 stopActivityDelivery: "アクティビティの配送をやめる"
 blockThisInstance: "このサーバーをブロックすんで"
-silenceThisInstance: "サーバーサイレンスすんで？"
 operations: "操作"
 software: "ソフトウェア"
 version: "バージョン"
@@ -215,8 +213,6 @@ clearCachedFiles: "キャッシュをほかす"
 clearCachedFilesConfirm: "キャッシュされとるリモートファイルをみんなほかしてええか？"
 blockedInstances: "ブロックしたサーバー"
 blockedInstancesDescription: "ブロックしたいサーバーのホストを改行で区切って設定してな。ブロックされてもうたサーバーとはもう金輪際やり取りできひんくなるで。ついでにそのサブドメインもブロックするで。"
-silencedInstances: "サーバーサイレンスされてんねん"
-silencedInstancesDescription: "サイレンスしたいサーバーのホストを改行で区切って設定すんで。サイレンスされたサーバーに所属するアカウントはすべて「サイレンス」として扱われ、フォローがすべてリクエストになり、フォロワーでないローカルアカウントにはメンションできなくなんねん。ブロックしたインスタンスには影響せーへんで。"
 muteAndBlock: "ミュートとブロック"
 mutedUsers: "ミュートしたユーザー"
 blockedUsers: "ブロックしたユーザー"
@@ -414,14 +410,12 @@ aboutMisskey: "Misskeyってなんや？"
 administrator: "管理者"
 token: "トークン"
 2fa: "二要素認証"
-setupOf2fa: "二要素認証のセットアップ"
 totp: "認証アプリ"
 totpDescription: "認証アプリ使うてワンタイムパスワードを入れる"
 moderator: "モデレーター"
 moderation: "モデレーション"
 moderationNote: "モデレーションノート"
 addModerationNote: "モデレーションノートを追加するで"
-moderationLogs: "モデログ"
 nUsersMentioned: "{n}人が投稿"
 securityKeyAndPasskey: "セキュリティキー・パスキー"
 securityKey: "セキュリティキー"
@@ -534,7 +528,6 @@ serverLogs: "サーバーログ"
 deleteAll: "全部ほかす"
 showFixedPostForm: "タイムラインの上の方で投稿できるようにやってくれへん？"
 showFixedPostFormInChannel: "タイムラインの上の方で投稿できるようにするわ(チャンネル)"
-withRepliesByDefaultForNewlyFollowed: "フォローする時、デフォルトで返信をタイムラインに含むようにしよか"
 newNoteRecived: "新しいノートがあるで"
 sounds: "サウンド"
 sound: "サウンド"
@@ -593,7 +586,7 @@ poll: "アンケート"
 useCw: "内容を隠す"
 enablePlayer: "プレイヤーを開く"
 disablePlayer: "プレイヤーを閉じる"
-expandTweet: "ポストを展開する"
+expandTweet: "ツイートを展開する"
 themeEditor: "テーマエディター"
 description: "説明"
 describeFile: "キャプションを付ける"
@@ -662,7 +655,6 @@ behavior: "動作"
 sample: "サンプル"
 abuseReports: "通報"
 reportAbuse: "通報"
-reportAbuseRenote: "リノート苦情だすで？"
 reportAbuseOf: "{name}を通報する"
 fillAbuseReportDescription: "細かい通報理由を書いてなー。対象ノートがある時はそのURLも書いといてなー。"
 abuseReported: "無事内容が送信されたみたいやで。おおきに〜。"
@@ -715,7 +707,6 @@ lockedAccountInfo: "フォローを承認制にしとっても、ノートの公
 alwaysMarkSensitive: "デフォルトでメディアを閲覧注意にするで"
 loadRawImages: "添付画像のサムネイルをオリジナル画質にするで"
 disableShowingAnimatedImages: "アニメーション画像を再生せんとくで"
-highlightSensitiveMedia: "メディアがセンシティブなことをめっっちゃわかりやすく表紙"
 verificationEmailSent: "無事確認のメールを送れたで。メールに書いてあるリンクにアクセスして、設定を完了してなー。"
 notSet: "未設定"
 emailVerified: "メールアドレスは確認されたで"
@@ -1030,7 +1021,6 @@ retryAllQueuesConfirmText: "一時的にサーバー重なるかもしれへん
 enableChartsForRemoteUser: "リモートユーザーのチャートを作る"
 enableChartsForFederatedInstances: "リモートサーバーのチャートを作る"
 showClipButtonInNoteFooter: "ノートのアクションにクリップを追加"
-reactionsDisplaySize: "リアクションの表示のでかさ"
 noteIdOrUrl: "ノートIDかURL"
 video: "動画"
 videos: "動画"
@@ -1115,30 +1105,6 @@ youHaveUnreadAnnouncements: "あんたまだこのお知らせ読んどらんや
 useSecurityKey: "ブラウザまたはデバイスの言う通りに、セキュリティキーまたはパスキーを使ってや。"
 replies: "返事"
 renotes: "Renote"
-loadReplies: "返信を見るで"
-loadConversation: "会話を見るで"
-pinnedList: "ピン留めしはったリスト"
-keepScreenOn: "デバイスの画面を常にオンにすんで"
-verifiedLink: "このリンク先の所有者であることが確認されたで。"
-notifyNotes: "投稿を通知"
-unnotifyNotes: "投稿の通知を解除すんで"
-authentication: "認証"
-authenticationRequiredToContinue: "続けるには認証をやってや。"
-dateAndTime: "日時"
-showRenotes: "リノートを表示"
-edited: "編集し終わってる"
-notificationRecieveConfig: "通知を受け取るかの設定"
-mutualFollow: "お互いフォローしてんで"
-fileAttachedOnly: "ファイル付きのみ"
-showRepliesToOthersInTimeline: "タイムラインに他の人への返信とかも含めんで"
-hideRepliesToOthersInTimeline: "タイムラインに他の人への返信とかは見ーへんで"
-externalServices: "他のサイトのサービス"
-impressum: "運営者の情報"
-impressumUrl: "運営者の情報URL"
-impressumDescription: "ドイツなどのほんま1部の国と地域ではな、表示が義務付けられててん。(Impressum)"
-privacyPolicy: "プライバシーポリシー"
-privacyPolicyUrl: "プライバシーポリシーURL"
-tosAndPrivacyPolicy: "利用規約・プライバシーポリシー"
 _announcement:
   forExistingUsers: "もうおるユーザーのみ"
   forExistingUsersDescription: "有効にすると、このお知らせ作成時点でおるユーザーにのみお知らせが表示されます。無効にすると、このお知らせ作成後にアカウントを作成したユーザーにもお知らせが表示されます。"
@@ -1167,13 +1133,6 @@ _serverRules:
   description: "新規登録前に見せる、サーバーの簡潔なルールを設定すんで。内容は使うための決め事の要約とすることを推奨するわ。"
 _serverSettings:
   iconUrl: "アイコン画像のURL"
-  appIconDescription: "{host}がアプリとして表示してるんやつをアイコンを指定すんで。"
-  appIconUsageExample: "PWAや、スマートフォンのホーム画面にブックマークとして追加された時など"
-  appIconStyleRecommendation: "円形もしくは角丸にクロップされる場合があるさかいに、塗り潰された余白のある背景があるものが推奨されるで。"
-  appIconResolutionMustBe: "解像度は必ず{resolution}である必要があるで。"
-  manifestJsonOverride: "manifest.jsonのオーバーライド"
-  shortName: "略称"
-  shortNameDescription: "サーバーの名前が長い時に、代わりに表示することのできるあだ名。"
 _accountMigration:
   moveFrom: "別のアカウントからこのアカウントに引っ越す"
   moveFromSub: "別のアカウントへエイリアスを作る"
@@ -1428,9 +1387,6 @@ _achievements:
       title: "Brain Diver"
       description: "Brain Diverへのリンクを投稿したった"
       flavor: "Misskey-Misskey La-Tu-Ma"
-    _smashTestNotificationButton:
-      title: "テスト過剰"
-      description: "通知テストをごく短時間のうちに連続して行ったねん"
 _role:
   new: "ロールの作成"
   edit: "ロールの編集"
@@ -1488,7 +1444,6 @@ _role:
     descriptionOfRateLimitFactor: "ちっちゃいほど制限が緩なって、大きいほど制限されるで。"
     canHideAds: "広告を表示させへん"
     canSearchNotes: "ノート検索を使わすかどうか"
-    canUseTranslator: "翻訳機能の利用"
   _condition:
     isLocal: "ローカルユーザー"
     isRemote: "リモートユーザー"
@@ -1537,10 +1492,6 @@ _ad:
   reduceFrequencyOfThisAd: "この広告の表示頻度を下げるで"
   hide: "表示せん"
   timezoneinfo: "曜日はサーバーのタイムゾーンを元に指定されるで。"
-  adsSettings: "広告配信設定"
-  notesPerOneAd: "リアタイ更新中に広告を出す間隔（ノートの個数な）"
-  setZeroToDisable: "0でリアタイ更新時の広告配信を無効にすんで"
-  adsTooClose: "広告を出す間隔がめっちゃ短いから、ユーザー体験が著しく損なわれる可能性があんで。"
 _forgotPassword:
   enterEmail: "アカウントに登録したメールアドレスをここに入力してや。そのアドレス宛に、パスワードリセット用のリンクが送られるから待っててな～。"
   ifNoEmail: "メールアドレスを登録してへんのやったら、管理者まで教えてな～。"
@@ -1626,6 +1577,11 @@ _wordMute:
   muteWords: "ミュートするワード"
   muteWordsDescription: "スペースで区切るとAND指定になって、改行で区切るとOR指定になるで。"
   muteWordsDescription2: "キーワードをスラッシュで囲むと正規表現になるで。"
+  softDescription: "指定した条件のノートをタイムラインから隠すで。"
+  hardDescription: "指定した条件のノートをタイムラインに追加しないようにするで。追加せーへんかったかったノートは、条件を変えても除外されたままになるで。"
+  soft: "ソフト"
+  hard: "ハード"
+  mutedNotes: "ミュートされたノート"
 _instanceMute:
   instanceMuteDescription: "ミュートしたサーバーのユーザーへの返信を含めて、設定したインスタンスの全てのノートとRenoteをミュートにするで。"
   instanceMuteDescription2: "改行で区切って設定するんやで"
@@ -1689,6 +1645,9 @@ _theme:
     infoFg: "情報の文字"
     infoWarnBg: "警告の背景"
     infoWarnFg: "警告の文字"
+    cwBg: "CW ボタンの背景"
+    cwFg: "CW ボタンの文字"
+    cwHoverBg: "CW ボタンの背景 (ホバー)"
     toastBg: "通知トーストの背景"
     toastFg: "通知トーストの文字"
     buttonBg: "ボタンの背景"
@@ -1706,6 +1665,8 @@ _sfx:
   note: "ノート"
   noteMy: "ノート(自分)"
   notification: "通知"
+  chat: "チャット"
+  chatBg: "チャット(バックグラウンド)"
   antenna: "アンテナ受信"
   channel: "チャンネル通知"
 _ago:
@@ -1740,10 +1701,8 @@ _2fa:
   step1: "ほんなら、{a}や{b}とかの認証アプリを使っとるデバイスにインストールしてな。"
   step2: "次に、ここにあるQRコードをアプリでスキャンしてな～。"
   step2Click: "QRコードをクリックすると、今使とる端末に入っとる認証アプリとかキーリングに登録できるで。"
-  step2Uri: "デスクトップアプリを使う時は次のURIを入れるで"
   step3Title: "確認コードを入れてーや"
   step3: "アプリに表示されているトークンを入力して終わりや。"
-  setupCompleted: "設定が完了したで。"
   step4: "これからログインするときも、同じようにトークンを入力するんやで"
   securityKeyNotSupported: "今使とるブラウザはセキュリティキーに対応してへんのやってさ。"
   registerTOTPBeforeKey: "セキュリティキー・パスキーを登録するんやったら、まず認証アプリを設定してーな。"
@@ -1758,11 +1717,6 @@ _2fa:
   renewTOTPConfirm: "今までの認証アプリの確認コードは使えんくなるけどええか？"
   renewTOTPOk: "もっかい設定する"
   renewTOTPCancel: "やめとく"
-  checkBackupCodesBeforeCloseThisWizard: "このウィザードを閉じる前に、したのバックアップコードを確認しいや。"
-  backupCodes: "バックアップコード"
-  backupCodesDescription: "認証アプリが使用できんなった場合、以下のバックアップコードを使ってアカウントにアクセスできるで。これらのコードは必ず安全な場所に置いときや。各コードは一回だけ使用できるで。"
-  backupCodeUsedWarning: "バックアップコードが使用されたで。認証アプリが使えなくなってるん場合、なるべく早く認証アプリを再設定しや。"
-  backupCodesExhaustedWarning: "バックアップコードが全て使用されたで。認証アプリを利用できん場合、これ以上アカウントにアクセスできなくなるで。認証アプリを再登録しや。"
 _permissions:
   "read:account": "アカウントの情報を見るで"
   "write:account": "アカウントの情報を変更するで"
@@ -1815,7 +1769,6 @@ _antennaSources:
   homeTimeline: "フォローしとるユーザーのノート"
   users: "選らんだ一人か複数のユーザーのノート"
   userList: "選んだリストのユーザーのノート"
-  userBlacklist: "選んだ１人か複数のユーザーのノート"
 _weekday:
   sunday: "日曜日"
   monday: "月曜日"
@@ -1915,7 +1868,6 @@ _profile:
   metadataContent: "内容"
   changeAvatar: "アバター画像を変更するで"
   changeBanner: "バナー画像を変更するで"
-  verifiedLinkDescription: "内容をURLに設定すると、リンク先のwebサイトに自分のプロフのリンクが含まれてる場合に所有者確認済みアイコンを表示させることができるで。"
 _exportOrImport:
   allNotes: "全てのノート"
   favoritedNotes: "お気に入りにしたノート"
@@ -1925,7 +1877,6 @@ _exportOrImport:
   userLists: "リスト"
   excludeMutingUsers: "ミュートしてるユーザーは入れんとくわ"
   excludeInactiveUsers: "使われてなさそうなアカウントは入れんとくわ"
-  withReplies: "インポートした人による返信をTLに含むようにすんで。"
 _charts:
   federation: "連合"
   apRequest: "リクエスト"
@@ -2035,17 +1986,11 @@ _notification:
   youReceivedFollowRequest: "フォロー許可してほしいみたいやな"
   yourFollowRequestAccepted: "フォローさせてもろたで"
   pollEnded: "アンケートの結果が出たみたいや"
-  newNote: "さらの投稿"
   unreadAntennaNote: "アンテナ {name}"
   emptyPushNotificationMessage: "プッシュ通知の更新をしといたで"
   achievementEarned: "実績を獲得しとるで"
-  testNotification: "通知テスト"
-  checkNotificationBehavior: "通知の表示を確かめるで"
-  sendTestNotification: "テスト通知を送信するで"
-  notificationWillBeDisplayedLikeThis: "通知はこのように表示されるで"
   _types:
     all: "すべて"
-    note: "あんたらの新規投稿"
     follow: "フォロー"
     mention: "メンション"
     reply: "リプライ"
@@ -2079,8 +2024,6 @@ _deck:
   introduction2: "画面の右にある + を押して、いつでもカラムを追加できるで。"
   widgetsIntroduction: "カラムのメニューから、「ウィジェットの編集」を選んでウィジェットを追加してなー"
   useSimpleUiForNonRootPages: "非ルートページは簡易UIで表示"
-  usedAsMinWidthWhenFlexible: "「幅を自動調整」が有効の場合、これが幅の最小値となるで"
-  flexible: "幅を自動調整"
   _columns:
     main: "メイン"
     widgets: "ウィジェット"
@@ -2116,41 +2059,5 @@ _webhookSettings:
     reaction: "ツッコミがあるとき～！"
     mention: "メンションがあるとき～！"
 _moderationLogTypes:
-  createRole: "ロールを追加すんで"
-  deleteRole: "ロールほかす"
-  updateRole: "ロールの更新すんで"
-  assignRole: "ロールへアサイン"
-  unassignRole: "ロールのアサインほかす"
   suspend: "凍結"
-  unsuspend: "凍結解除"
-  addCustomEmoji: "自由な絵文字追加されたで"
-  updateCustomEmoji: "自由な絵文字更新されたで"
-  deleteCustomEmoji: "自由な絵文字消されたで"
-  updateServerSettings: "サーバー設定更新すんねん"
-  updateUserNote: "モデレーションノート更新"
-  deleteDriveFile: "ファイルをほかす"
-  deleteNote: "ノートを削除"
-  createGlobalAnnouncement: "みんなへの通告を作成したで"
-  createUserAnnouncement: "あんたらへの通告を作成したで"
-  updateGlobalAnnouncement: "みんなへの通告更新したったで"
-  updateUserAnnouncement: "あんたらへの通告更新したったで"
-  deleteGlobalAnnouncement: "みんなへの通告消したったで"
-  deleteUserAnnouncement: "あんたらへのお知らせを削除"
   resetPassword: "パスワードをリセット"
-  suspendRemoteInstance: "リモートサーバーを止めんで"
-  unsuspendRemoteInstance: "リモートサーバーを再開すんで"
-  markSensitiveDriveFile: "ファイルをセンシティブ付与"
-  unmarkSensitiveDriveFile: "ファイルをセンシティブ解除"
-  resolveAbuseReport: "苦情を解決"
-  createInvitation: "招待コードを作成"
-  createAd: "広告を作んで"
-  deleteAd: "広告ほかす"
-  updateAd: "広告を更新"
-_fileViewer:
-  title: "ファイルの詳しい情報"
-  type: "ファイルの種類"
-  size: "ファイルのでかさ"
-  url: "URL"
-  uploadedAt: "追加した日"
-  attachedNotes: "ファイルがついてきてるノート"
-  thisPageCanBeSeenFromTheAuthor: "このページはこのファイルをアップした人しか見れへんねん。"

locales/ko-KR.yml

@@ -416,9 +416,6 @@ totp: "인증 앱"
 totpDescription: "인증 앱을 사용하여 일회성 비밀번호 입력"
 moderator: "모더레이터"
 moderation: "모더레이션"
-moderationNote: "모더레이션 노트"
-addModerationNote: "모더레이션 노트 추가하기"
-moderationLogs: "모더레이션 로그"
 nUsersMentioned: "{n}명이 언급함"
 securityKeyAndPasskey: "보안 키 또는 패스 키"
 securityKey: "보안 키"
@@ -589,7 +586,7 @@ poll: "투표"
 useCw: "내용 숨기기"
 enablePlayer: "플레이어 열기"
 disablePlayer: "플레이어 닫기"
-expandTweet: "게시물 확장하기"
+expandTweet: "트윗 확장하기"
 themeEditor: "테마 에디터"
 description: "설명"
 describeFile: "캡션 추가"
@@ -1110,18 +1107,6 @@ youHaveUnreadAnnouncements: "읽지 않은 공지사항이 있습니다."
 useSecurityKey: "브라우저 또는 기기의 안내에 따라 보안 키 또는 패스키를 사용해 주십시오."
 replies: "답글"
 renotes: "리노트"
-loadReplies: "답글 보기"
-loadConversation: "대화 보기"
-pinnedList: "고정해놓은 리스트"
-keepScreenOn: "기기 화면을 항상 켜기"
-verifiedLink: "이 링크의 소유자임이 확인되었습니다."
-notifyNotes: "새 노트 알림 켜기"
-unnotifyNotes: "새 노트 알림 끄기"
-authentication: "인증"
-showRenotes: "리노트 표시"
-edited: "수정됨"
-notificationRecieveConfig: "알림 설정"
-mutualFollow: "맞팔로우"
 _announcement:
   forExistingUsers: "기존 유저에게만 알림"
   forExistingUsersDescription: "활성화하면 이 공지사항을 게시한 시점에서 이미 가입한 유저에게만 표시합니다. 비활성화하면 게시 후에 가입한 유저에게도 표시합니다."
@@ -1150,12 +1135,6 @@ _serverRules:
   description: "회원 가입 이전에 간단하게 표시할 서버 규칙입니다. 이용 약관의 요약으로 구성하는 것을 추천합니다."
 _serverSettings:
   iconUrl: "아이콘 URL"
-  appIconUsageExample: "예를 들어, PWA나 스마트폰 홈 화면에 북마크로 추가되었을 때 등"
-  appIconStyleRecommendation: "아이콘이 원형 또는 둥근 사각형으로 잘리는 경우가 있으므로, 가장자리 여백이 충분한 사진을 사용하는 것을 추천합니다."
-  appIconResolutionMustBe: "해상도는 반드시 {resolution} 이어야 합니다."
-  manifestJsonOverride: "manifest.json 오버라이드"
-  shortName: "약칭"
-  shortNameDescription: "서버의 정식 명칭이 긴 경우에, 대신에 표시할 수 있는 약칭이나 통칭."
 _accountMigration:
   moveFrom: "다른 계정에서 이 계정으로 이사"
   moveFromSub: "다른 계정에 대한 별칭을 생성"
@@ -1600,6 +1579,11 @@ _wordMute:
   muteWords: "뮤트할 단어"
   muteWordsDescription: "공백으로 구분하는 경우 AND, 줄바꿈으로 구분하는 경우 OR로 지정됩니다."
   muteWordsDescription2: "정규 표현식을 사용하려면 키워드를 빗금표(/)로 감싸 주세요."
+  softDescription: "지정한 조건의 노트를 타임라인에서 숨깁니다."
+  hardDescription: "지정한 조건의 노트를 타임라인에 추가하지 않습니다. 타임라인에 추가되지 않은 노트는 조건을 변경해도 표시되지 않습니다."
+  soft: "보통"
+  hard: "보다 높은 수준"
+  mutedNotes: "뮤트된 노트"
 _instanceMute:
   instanceMuteDescription: "뮤트한 서버에서 오는 답글을 포함한 모든 노트와 Renote를 뮤트합니다."
   instanceMuteDescription2: "한 줄에 하나씩 입력해 주세요"
@@ -1663,6 +1647,9 @@ _theme:
     infoFg: "정보창 텍스트"
     infoWarnBg: "경고창 배경"
     infoWarnFg: "경고창 텍스트"
+    cwBg: "CW 버튼 배경"
+    cwFg: "CW 버튼 텍스트"
+    cwHoverBg: "CW 버튼 배경 (호버)"
     toastBg: "알림창 배경"
     toastFg: "알림창 텍스트"
     buttonBg: "버튼 배경"
@@ -1680,6 +1667,8 @@ _sfx:
   note: "새 노트"
   noteMy: "내 노트"
   notification: "알림"
+  chat: "대화"
+  chatBg: "대화 (백그라운드)"
   antenna: "안테나 수신"
   channel: "채널 알림"
 _ago:
@@ -2087,4 +2076,3 @@ _webhookSettings:
 _moderationLogTypes:
   suspend: "정지"
   resetPassword: "비밀번호 재설정"
-  createInvitation: "초대 코드 생성"

locales/lo-LA.yml

@@ -407,6 +407,7 @@ _theme:
 _sfx:
   note: "ບັນທຶກ"
   notification: "ການແຈ້ງເຕືອນ"
+  chat: "ແຊ໋ດ"
 _2fa:
   renewTOTPCancel: "ບໍ່​ແມ່ນ​ຕອນ​ນີ້"
 _widgets:

locales/nl-NL.yml

@@ -438,6 +438,7 @@ _theme:
 _sfx:
   note: "Notities"
   notification: "Meldingen"
+  chat: "Chat"
 _2fa:
   renewTOTPCancel: "Nee, bedankt"
 _widgets:

locales/no-NO.yml

@@ -575,6 +575,9 @@ _channel:
   nameAndDescription: "Navn og beskrivelse"
 _menuDisplay:
   hide: "Skjul"
+_wordMute:
+  soft: "Myk"
+  hard: "Hard"
 _theme:
   description: "Beskrivelse"
   color: "Farge"

locales/pl-PL.yml

@@ -982,6 +982,9 @@ _menuDisplay:
 _wordMute:
   muteWords: "Słowo do wyciszenia"
   muteWordsDescription2: "Otocz słowa kluczowe ukośnikami, aby używać wyrażeń regularnych."
+  soft: "Łagodny"
+  hard: "Twardy"
+  mutedNotes: "Wyciszone wpisy"
 _instanceMute:
   title: "Ukrywa wpisy z wymienionych instancji."
   heading: "Lista instancji do wyciszenia"
@@ -1043,6 +1046,9 @@ _theme:
     infoFg: "Tekst informacji"
     infoWarnBg: "Tło ostrzeżenia"
     infoWarnFg: "Tekst ostrzeżenia"
+    cwBg: "Tło CW"
+    cwFg: "Tekst CW"
+    cwHoverBg: "Tło CW (po najechaniu)"
     toastBg: "Tło powiadomień"
     toastFg: "Tekst powiadomień"
     buttonBg: "Tło przycisku"
@@ -1060,6 +1066,8 @@ _sfx:
   note: "Wpisy"
   noteMy: "Mój wpis"
   notification: "Powiadomienia"
+  chat: "Wiadomości"
+  chatBg: "Rozmowy (tło)"
   antenna: "Anteny"
   channel: "Powiadomienia kanału"
 _ago:

locales/pt-PT.yml

@@ -1320,6 +1320,7 @@ _theme:
 _sfx:
   note: "Posts"
   notification: "Notificações"
+  chat: "Chat"
 _ago:
   invalid: "Não há nada aqui"
 _timelineTutorial:

locales/ro-RO.yml

@@ -647,6 +647,7 @@ _theme:
 _sfx:
   note: "Note"
   notification: "Notificări"
+  chat: "Chat"
 _ago:
   invalid: "Nu e nimic de văzut aici"
 _widgets:

locales/ru-RU.yml

@@ -1488,6 +1488,11 @@ _wordMute:
   muteWords: "Скрыть слово"
   muteWordsDescription: "Пишите слова через пробел в одной строке, чтобы фильтровать их появление вместе; а если хотите фильтровать любое из них, пишите в отдельных строках."
   muteWordsDescription2: "Здесь можно использовать регулярные выражения — просто заключите их между двумя дробными чертами (/)."
+  softDescription: "Соответствующие условиям заметки будут спрятаны из вашей ленты."
+  hardDescription: "Соответстующие условиям заметки вообще не будут попадать в вашу ленту. Даже если вы поменяете условия, отсеенные таким образом заметки уже не появятся."
+  soft: "Мягко"
+  hard: "Жёстко"
+  mutedNotes: "Скрытые заметки"
 _instanceMute:
   instanceMuteDescription: "Заметки и репосты с указанных здесь инстансов, а также ответы пользователям оттуда же не будут отображаться."
   instanceMuteDescription2: "Пишите каждый инстанс на отдельной строке"
@@ -1551,6 +1556,9 @@ _theme:
     infoFg: "Текст сообщения"
     infoWarnBg: "Фон предупреждения"
     infoWarnFg: "Текст предупреждения"
+    cwBg: "Фон предупреждения о содержимом"
+    cwFg: "Текст предупреждения о содержимом"
+    cwHoverBg: "Фон предупреждения о содержимом (под указателем)"
     toastBg: "Фон оповещения"
     toastFg: "Текст оповещения"
     buttonBg: "Фон кнопки"
@@ -1568,6 +1576,8 @@ _sfx:
   note: "Заметки"
   noteMy: "Собственные заметки"
   notification: "Уведомления"
+  chat: "Сообщения"
+  chatBg: "Сообщения (фон)"
   antenna: "Антенна"
   channel: "Канал"
 _ago:

locales/sk-SK.yml

@@ -1039,6 +1039,11 @@ _wordMute:
   muteWords: "Umlčané slová"
   muteWordsDescription: "Medzerami oddeľte pre podmienku AND a novými riadkami pre podmienku OR."
   muteWordsDescription2: "Regulárne výrazy sa použijú keď použijete okolo lomítka."
+  softDescription: "Skryje poznámky z časovej osi, ktoré spĺňajú podmienky."
+  hardDescription: "Zabráni poznámky spĺňajúce množinu podmienok, aby boli pridané do časovej osi. Navyše tieto poznámky nepribudnú v časovej osi ani keď sa podmienky zmenia."
+  soft: "Mäkké"
+  hard: "Tvrdé"
+  mutedNotes: "Umlčané poznámky"
 _instanceMute:
   instanceMuteDescription: "Toto umlčí všetky poznámky/preposlania zo zoznamu serverov, vrátane tých, na ktoré používatelia odpovedajú z umlčaného servera."
   instanceMuteDescription2: "Oddeľte novými riadkami"
@@ -1102,6 +1107,9 @@ _theme:
     infoFg: "Informačný text"
     infoWarnBg: "Pozadie varovania"
     infoWarnFg: "Text varovania"
+    cwBg: "CW pozadie tlačidla"
+    cwFg: "CW text tlačidla"
+    cwHoverBg: "CW pozadie tlačidla (pod kurzorom)"
     toastBg: "Pozadie upozornenia"
     toastFg: "Text upozornenia"
     buttonBg: "Pozadie tlačidla"
@@ -1119,6 +1127,8 @@ _sfx:
   note: "Poznámky"
   noteMy: "Vlastná poznámka"
   notification: "Oznámenia"
+  chat: "Chat"
+  chatBg: "Chat (pozadie)"
   antenna: "Antény"
   channel: "Upozornenia kanála"
 _ago:

locales/sv-SE.yml

@@ -507,6 +507,7 @@ _theme:
 _sfx:
   note: "Noter"
   notification: "Notifikationer"
+  chat: "Chatt"
   antenna: "Antenner"
 _2fa:
   renewTOTPCancel: "Nej tack"

locales/th-TH.yml

@@ -416,9 +416,6 @@ totp: "แอป Authenticator"
 totpDescription: "ใช้แอปยืนยันตัวตนเพื่อป้อนรหัสผ่านแบบใช้ครั้งเดียว"
 moderator: "ผู้ควบคุม"
 moderation: "การกลั่นกรอง"
-moderationNote: "โน้ตการกลั่นกรอง"
-addModerationNote: "เพิ่มโน้ตการกลั่นกรอง"
-moderationLogs: "บันทึกการกลั่นกรอง"
 nUsersMentioned: "กล่าวถึงโดยผู้ใช้ {n} รายนี้"
 securityKeyAndPasskey: "ความปลอดภัยและรหัสผ่าน"
 securityKey: "กุญแจความปลอดภัย"
@@ -711,7 +708,6 @@ lockedAccountInfo: "เว้นแต่ว่าคุณจะต้องต
 alwaysMarkSensitive: "ทำเครื่องหมายเป็น NSFW เป็นค่าเริ่มต้น"
 loadRawImages: "โหลดภาพต้นฉบับแทนการแสดงภาพขนาดย่อ"
 disableShowingAnimatedImages: "ไม่ต้องเล่นภาพเคลื่อนไหว"
-highlightSensitiveMedia: "ไฮไลท์สื่อที่ละเอียดอ่อน"
 verificationEmailSent: "ส่งอีเมลยืนยันแล้วนะ ได้โปรดกรุณาไปที่ลิงก์ที่รวมไว้เพื่อทำการตรวจสอบให้เสร็จสิ้น"
 notSet: "ไม่ได้ตั้งค่า"
 emailVerified: "อีเมลได้รับการยืนยันแล้ว"
@@ -1026,7 +1022,6 @@ retryAllQueuesConfirmText: "สิ่งนี้จะเพิ่มการ
 enableChartsForRemoteUser: "สร้างแผนภูมิข้อมูลผู้ใช้ระยะไกล"
 enableChartsForFederatedInstances: "สร้างแผนภูมิข้อมูลอินสแตนซ์ระยะไกล"
 showClipButtonInNoteFooter: "เพิ่ม \"คลิป\" เพื่อบันทึกเมนูการทำงาน"
-reactionsDisplaySize: "รีแอคชั่นแสดงผลขนาด"
 noteIdOrUrl: "โน้ต ID หรือ URL"
 video: "วีดีโอ"
 videos: "วีดีโอ"
@@ -1105,37 +1100,12 @@ iHaveReadXCarefullyAndAgree: "ฉันได้อ่านข้อควา
 dialog: "ไดอะล็อก"
 icon: "ไอคอน"
 forYou: "สำหรับคุณ"
-currentAnnouncements: "ประกาศในปัจจุบัน"
-pastAnnouncements: "ประกาศที่ผ่านมา"
-youHaveUnreadAnnouncements: "มีการประกาศที่ยังไม่ได้อ่าน"
 replies: "ตอบกลับ"
 renotes: "รีโน้ต"
 loadReplies: "แสดงการตอบกลับ"
 loadConversation: "แสดงบทสนทนา"
-pinnedList: "รายการที่ปักหมุดไว้แล้ว"
-keepScreenOn: "เปิดหน้าจอไว้"
-notifyNotes: "แจ้งเตือนเกี่ยวกับโพสต์ใหม่"
-unnotifyNotes: "หยุดการแจ้งเตือนเกี่ยวกับโน้ตใหม่"
-authentication: "การตรวจสอบสิทธิ์"
-authenticationRequiredToContinue: "กรุณาตรวจสอบการรับรองความถูกต้องเพื่อดำเนินการต่อ"
-dateAndTime: "เวลาประทับ"
-showRenotes: "แสดงรีโน้ต"
-edited: "แก้ไขแล้ว"
-notificationRecieveConfig: "การตั้งค่าการแจ้งเตือน"
-mutualFollow: "ติดตามซึ่งกันและกัน"
-fileAttachedOnly: "เฉพาะโน้ตที่มีไฟล์เท่านั้น"
-showRepliesToOthersInTimeline: "แสดงการตอบกลับไปยังอื่นๆในไทม์ไลน์"
-hideRepliesToOthersInTimeline: "ซ่อนการตอบกลับไปยังอื่นๆจากไทม์ไลน์"
-externalServices: "บริการภายนอก"
-impressum: "อิมเพรสชั่น"
-impressumUrl: "URL อิมเพรสชั่น"
-privacyPolicy: "นโยบายความเป็นส่วนตัว"
-privacyPolicyUrl: "URL นโยบายความเป็นส่วนตัว"
-tosAndPrivacyPolicy: "เงื่อนไขในการให้บริการและนโยบายความเป็นส่วนตัว"
 _announcement:
-  forExistingUsers: "ผู้ใช้งานที่มีอยู่เท่านั้น"
   forExistingUsersDescription: "การประกาศนี้จะแสดงต่อผู้ใช้ที่มีอยู่ ณ จุดที่เผยแพร่นั้นๆถ้าหากเปิดใช้งาน ถ้าหากปิดใช้งานผู้ที่กำลังสมัครใหม่หลังจากโพสต์แล้วนั้นก็จะเห็นเช่นกัน"
-  needConfirmationToRead: "จำเป็นต้องยืนยันเพื่อทำเครื่องหมายบอกว่าอ่านแล้ว"
   needConfirmationToReadDescription: "ข้อความแจ้งแยก ถ้าหากต้องการเพื่อยืนยันว่ากำลังทำเครื่องหมายประกาศนี้ว่าอ่านแล้วจะแสดงขึ้นถ้าหากเปิดใช้งาน การประกาศนั้นจะไม่รวมอยู่ในฟังก์ชั่นว่า \"ทำเครื่องหมายทั้งหมดว่าอ่านแล้ว\""
   end: "ประกาศเก็บถาวร"
   tooManyActiveAnnouncementDescription: "การมีประกาศที่ใช้งานมากเกินไปนั้นอาจจะทำให้ประสบการณ์ของผู้ใช้งานนั้นดูแย่ลง โปรดกรุณาพิจารณาการเก็บประกาศที่ล้าสมัยด้วยนะค่ะ"
@@ -1160,10 +1130,6 @@ _serverRules:
   description: "ชุดของกฎที่จะแสดงก่อนการลงทะเบียนเราขอแนะนำให้ตั้งค่าสรุปข้อกำหนดในการให้บริการ"
 _serverSettings:
   iconUrl: "ไอคอน URL"
-  appIconUsageExample: "E.g. เป็น PWA หรือเมื่อแสดงผลเป็นบุ๊กมาร์กหน้าจอหลักบนโทรศัพท์"
-  appIconResolutionMustBe: "ความละเอียดขั้นต่ำไว้คือ {resolution}."
-  manifestJsonOverride: "manifest.json โอเวอร์ลาย"
-  shortName: "ชื่อย่อ"
 _accountMigration:
   moveFrom: "ย้ายข้อมูลบัญชีอื่นไปยังอีกบัญชีนี้หนึ่ง"
   moveFromSub: "สร้างนามแฝงไปยังบัญชีอื่น"
@@ -1420,7 +1386,6 @@ _achievements:
       flavor: "Misskey-Misskey La-Tu-Ma"
     _smashTestNotificationButton:
       title: "ทดสอบโอเวอร์โฟลว์"
-      description: "ทดสอบการแจ้งเตือนทริกเกอร์ซ้ำๆ ภายในระยะเวลาอันสั้นๆ"
 _role:
   new: "บทบาทใหม่"
   edit: "แก้ไขบทบาท"
@@ -1478,7 +1443,6 @@ _role:
     descriptionOfRateLimitFactor: "ขีดจํากัดอัตราที่ต่ำกว่ามีข้อจํากัดน้อยกว่าข้อจํากัดที่สูงกว่า"
     canHideAds: "ซ่อนโฆษณา"
     canSearchNotes: "การใช้การค้นหาโน้ต"
-    canUseTranslator: "การใช้งานแปล"
   _condition:
     isLocal: "ผู้ใช้ภายใน"
     isRemote: "ผู้ใช้ระยะไกล"
@@ -1527,8 +1491,6 @@ _ad:
   reduceFrequencyOfThisAd: "แสดงโฆษณานี้ให้น้อยลง"
   hide: "ไม่ต้องแสดง"
   timezoneinfo: "วันในสัปดาห์นี้จะถูกกำหนดจากโซนเวลาของเซิร์ฟเวอร์"
-  adsSettings: "ตั้งค่าการโฆษณา"
-  setZeroToDisable: "ตั้งค่านี้ให้เป็น 0 เพื่อปิดใช้งานโฆษณาอัปเดตแบบเรียลไทม์"
 _forgotPassword:
   enterEmail: "ป้อนที่อยู่อีเมลที่คุณเคยใช้ในการลงทะเบียนไว้ ลิงก์ที่คุณสามารถรีเซ็ตรหัสผ่านได้นั้นจะถูกส่งไปนะ"
   ifNoEmail: "ถ้าหากคุณไม่ได้ใช้อีเมลระหว่างการลงทะเบียน กรุณาติดต่อผู้ดูแลระบบอินสแตนซ์แทนนะ"
@@ -1614,6 +1576,11 @@ _wordMute:
   muteWords: "ปิดเสียงคำ"
   muteWordsDescription: "คั่นด้วยช่องว่างสำหรับเงื่อนไข AND หรือด้วยการขึ้นบรรทัดใหม่สำหรับเงื่อนไข OR นะ"
   muteWordsDescription2: "ล้อมรอบคีย์เวิร์ดด้วยเครื่องหมายทับเพื่อใช้นิพจน์ทั่วไป"
+  softDescription: "ซ่อนโน้ตให้ตรงตามเงื่อนไขที่ตั้งไว้จากไทม์ไลน์"
+  hardDescription: "ป้องกันไม่ให้โน้ตย่อที่ตรงตามเงื่อนไขที่ตั้งไว้ไม่ให้ถูกเพิ่มลงในไทม์ไลน์ นอกจากนี้ โน้ตเหล่านี้จะไม่ถูกเพิ่มลงในไทม์ไลน์แม้ว่าจะมีการเปลี่ยนแปลงเงื่อนไขยังไงก็ตาม"
+  soft: "ซอฟ"
+  hard: "ยาก"
+  mutedNotes: "ปิดเสียงโน้ต"
 _instanceMute:
   instanceMuteDescription: "การดำเนินการนี้จะปิดเสียง\"โน้ต/รีโน้ต\"จากอินสแตนซ์ที่อยู่ในรายการ รวมถึงบันทึกของผู้ใช้ที่ตอบกลับผู้ใช้จากอินสแตนซ์ที่ปิดเสียง"
   instanceMuteDescription2: "คั่นด้วยการขึ้นบรรทัดใหม่"
@@ -1677,6 +1644,9 @@ _theme:
     infoFg: "ข้อความข้อมูล"
     infoWarnBg: "คำเตือนพื้นหลัง"
     infoWarnFg: "คำเตือนข้อความ"
+    cwBg: "ปุ่ม CW พื้นหลัง"
+    cwFg: "ปุ่ม CW ข้อความ"
+    cwHoverBg: "ปุ่ม CW พื้นหลัง (โฮเวอร์)"
     toastBg: "ประวัติการแจ้งเตือน"
     toastFg: "ข้อความแจ้งเตือน"
     buttonBg: "ปุ่มพื้นหลัง"
@@ -1694,6 +1664,8 @@ _sfx:
   note: "หมายเหตุ"
   noteMy: "โน้ตของตัวเอง"
   notification: "การเเจ้งเตือน"
+  chat: "แชท"
+  chatBg: "แชท (พื้นหลัง)"
   antenna: "เสาอากาศ"
   channel: "การแจ้งเตือนช่อง"
 _ago:
@@ -1728,7 +1700,6 @@ _2fa:
   step1: "ขั้นตอนแรก ติดตั้งแอปยืนยันตัวตน (เช่น {a} หรือ {b}) บนอุปกรณ์ของคุณ"
   step2: "จากนั้นสแกนรหัส QR ที่แสดงบนหน้าจอนี้"
   step2Click: "การคลิกที่รหัส QR นี้จะช่วยให้คุณนั้นสามารถลงทะเบียน 2FA กับคีย์ความปลอดภัยหรือแอปตรวจสอบความถูกต้องของโทรศัพท์ได้"
-  step2Uri: "ป้อนใส่ URL ดังต่อไปนี้ถ้าหากคุณใช้โปรแกรมเดสก์ท็อป"
   step3Title: "ป้อนรหัสยืนยัน"
   step3: "ป้อนโทเค็นที่แอปของคุณให้มาเพื่อเสร็จสิ้นการตั้งค่า"
   setupCompleted: "ตั้งค่าสำเร็จแล้ว"
@@ -1747,8 +1718,6 @@ _2fa:
   renewTOTPOk: "ตั้งค่าคอนฟิกใหม่"
   renewTOTPCancel: "ไม่เป็นไร"
   backupCodes: "รหัสสำรองข้อมูล"
-  backupCodeUsedWarning: "มีการใช้รหัสสำรองแล้ว โปรดกรุณากำหนดค่าการตรวจสอบสิทธิ์แบบสองปัจจัยโดยเร็วที่สุดถ้าหากคุณยังไม่สามารถใช้งานได้อีก"
-  backupCodesExhaustedWarning: "รหัสสำรองทั้งหมดถูกใช้แล้ว ถ้าหากคุณยังสูญเสียการเข้าถึงแอปการตรวจสอบสิทธิ์แบบสองปัจจัยคุณจะยังไม่สามารถเข้าถึงบัญชีนี้ได้ กรุณากำหนดค่าการรับรองความถูกต้องด้วยการยืนยันสองชั้น"
 _permissions:
   "read:account": "ดูข้อมูลบัญชีของคุณ"
   "write:account": "แก้ไขข้อมูลบัญชีของคุณ"
@@ -1801,7 +1770,6 @@ _antennaSources:
   homeTimeline: "โน้ตจากผู้ใช้ที่ติดตาม"
   users: "โน้ตจากผู้ใช้ที่เฉพาะเจาะจง"
   userList: "โน้ตจากรายชื่อผู้ใช้ที่ระบุ"
-  userBlacklist: "โน้ตทั้งหมดยกเว้นโน้ตของผู้ใช้ที่ต้องระบุเจาะจงตั้งแต่หนึ่งรายขึ้นไป"
 _weekday:
   sunday: "วันอาทิตย์"
   monday: "วันจันทร์"
@@ -1901,7 +1869,6 @@ _profile:
   metadataContent: "เนื้อหา"
   changeAvatar: "เปลี่ยนอวาตาร์"
   changeBanner: "เปลี่ยนแบนเนอร์"
-  verifiedLinkDescription: "โดยการป้อน URL ที่มีลิงก์ไปยังโปรไฟล์ของคุณตรงนี้ ส่วนไอคอนการยืนยันความเป็นเจ้าของนั้นก็สามารถแสดงถัดจากฟิลด์ได้นะ"
 _exportOrImport:
   allNotes: "โน้ตทั้งหมด"
   favoritedNotes: "บันทึกที่ชื่นชอบ"
@@ -1911,7 +1878,6 @@ _exportOrImport:
   userLists: "รายการ"
   excludeMutingUsers: "ยกเว้นผู้ใช้ที่ปิดเสียง"
   excludeInactiveUsers: "ยกเว้นผู้ใช้ที่ไม่ได้ใช้งาน"
-  withReplies: "รวมการตอบกลับจากผู้ใช้ที่นำเข้าไว้ในไทม์ไลน์"
 _charts:
   federation: "สหพันธ์"
   apRequest: "คำขอ"
@@ -2021,7 +1987,6 @@ _notification:
   youReceivedFollowRequest: "คุณมีคำขอติดตามใหม่น่ะ"
   yourFollowRequestAccepted: "คำขอติดตามของคุณได้รับการยอมรับแล้วน่ะ"
   pollEnded: "โพลสำรวจความคิดเห็นผลลัพธ์มีพร้อมใช้งาน"
-  newNote: "โพสต์ใหม่"
   unreadAntennaNote: "เสาอากาศ {name}"
   emptyPushNotificationMessage: "การแจ้งเตือนแบบพุชได้รับการอัพเดทแล้ว"
   achievementEarned: "รับความสำเร็จ"
@@ -2031,7 +1996,6 @@ _notification:
   notificationWillBeDisplayedLikeThis: "การแจ้งเตือนมีลักษณะแบบนี้"
   _types:
     all: "ทั้งหมด"
-    note: "โน้ตใหม่"
     follow: "กำลังติดตาม"
     mention: "กล่าวถึง"
     reply: "ตอบกลับ"
@@ -2102,41 +2066,5 @@ _webhookSettings:
     reaction: "เมื่อได้รับรีแอคชั่น"
     mention: "เมื่อกำลังถูกกล่าวถึง"
 _moderationLogTypes:
-  createRole: "สร้างบทบาทแล้ว"
-  deleteRole: "ลบบทบาทแล้ว"
-  updateRole: "อัปเดตบทบาทแล้ว"
-  assignRole: "ได้รับมอบหมายบทบาท"
-  unassignRole: "ถอดออกจากบทบาทแล้ว"
   suspend: "ถูกระงับ"
-  unsuspend: "เลิกถูกระงับ"
-  addCustomEmoji: "เพิ่มอีโมจิที่กำหนดเองแล้ว"
-  updateCustomEmoji: "อัปเดตอีโมจิที่กำหนดเองแล้ว"
-  deleteCustomEmoji: "ลบอีโมจิที่กำหนดเองออกแล้ว"
-  updateServerSettings: "อัปเดตการตั้งค่าเซิร์ฟเวอร์แล้ว"
-  updateUserNote: "อัปเดตโน้ตการกลั่นกรองแล้ว"
-  deleteDriveFile: "ลบไฟล์ออกแล้ว"
-  deleteNote: "ลบโน้ตออกแล้ว"
-  createGlobalAnnouncement: "สร้างประกาศทั่วโลกแล้ว"
-  createUserAnnouncement: "สร้างประกาศผู้ใช้แล้ว"
-  updateGlobalAnnouncement: "อัปเดตประกาศทั่วโลกแล้ว"
-  updateUserAnnouncement: "อัปเดตประกาศผู้ใช้แล้ว"
-  deleteGlobalAnnouncement: "ลบประกาศทั่วโลกออกแล้ว"
-  deleteUserAnnouncement: "ลบประกาศผู้ใช้ออกแล้ว"
   resetPassword: "รีเซ็ตรหัสผ่าน"
-  suspendRemoteInstance: "อินสแตนซ์ระยะไกลถูกระงับ"
-  unsuspendRemoteInstance: "อินสแตนซ์ระยะไกลเลิกการระงับ"
-  markSensitiveDriveFile: "ทำเครื่องหมายไฟล์บอกว่าละเอียดอ่อน"
-  unmarkSensitiveDriveFile: "ยกเลิกทำเครื่องหมายไฟล์ว่าละเอียดอ่อน"
-  resolveAbuseReport: "รายงานได้รับการแก้ไขแล้ว"
-  createInvitation: "สร้างคำเชิญ"
-  createAd: "สร้างโฆษณาแล้ว"
-  deleteAd: "ลบโฆษณาออกแล้ว"
-  updateAd: "อัปเดตโฆษณาแล้ว"
-_fileViewer:
-  title: "รายละเอียดไฟล์"
-  type: "ประเภทไฟล์"
-  size: "ขนาดไฟล์"
-  url: "URL"
-  uploadedAt: "วันที่เข้าร่วม"
-  attachedNotes: "โน้ตที่แนบมาด้วย"
-  thisPageCanBeSeenFromTheAuthor: "หน้าเพจนี้จะสามารถปรากฏได้โดยผู้ใช้ที่อัปโหลดไฟล์นี้เท่านั้น"

locales/tr-TR.yml

@@ -386,6 +386,7 @@ _theme:
 _sfx:
   note: "notlar"
   notification: "Bildirim"
+  chat: "Mesajlar"
 _2fa:
   renewTOTPCancel: "Hayır, teşekkürler"
 _permissions:

locales/ug-CN.yml

@@ -1,19 +1,4 @@
 ---
 _lang_: "ياپونچە"
-headlineMisskey: "خاتىرە ئارقىلىق ئۇلانغان تور"
-monthAndDay: "{day}-{month}"
 search: "ئىزدەش"
-ok: "ماقۇل"
-noThankYou: "ئۇنى توختىتىڭ"
-profile: "profile"
-login: "كىرىش"
-loggingIn: "كىرىش"
-pin: "pinned"
-delete: "ئۆچۈرۈش"
-pinned: "pinned"
-remove: "ئۆچۈرۈش"
 searchByGoogle: "ئىزدەش"
-_2fa:
-  renewTOTPCancel: "ئۇنى توختىتىڭ"
-_widgets:
-  profile: "profile"

locales/uk-UA.yml

@@ -1233,6 +1233,11 @@ _wordMute:
   muteWords: "Заглушені слова"
   muteWordsDescription: "Розділення ключових слів пробілами для \"І\" або з нової лінійки для \"АБО\""
   muteWordsDescription2: "Для використання RegEx, ключові слова потрібно вписати поміж слешів \"/\"."
+  softDescription: "Приховати записи які відповідають критеріям зі стрічки подій."
+  hardDescription: "Приховати записи які відповідають критеріям зі стрічки подій. Також приховані записи не будуть додані до стрічки подій навіть якщо критерії буде змінено."
+  soft: "М'яко"
+  hard: "Жорстко"
+  mutedNotes: "Заблоковані нотатки"
 _instanceMute:
   instanceMuteDescription2: "Розділяйте новими рядками"
   title: "Приховує нотатки з перелічених інстансів."
@@ -1290,6 +1295,9 @@ _theme:
     infoFg: "Текст інформації"
     infoWarnBg: "Фон попередження"
     infoWarnFg: "Текст попередження"
+    cwBg: "Фон чутливого змісту"
+    cwFg: "Текст чутливого змісту"
+    cwHoverBg: "Фон чутливого змісту (при наведенні)"
     toastBg: "Фон повідомлення"
     toastFg: "Текст повідомлення"
     buttonBg: "Фон кнопки"
@@ -1307,6 +1315,8 @@ _sfx:
   note: "Нотатки"
   noteMy: "Мої нотатки"
   notification: "Сповіщення"
+  chat: "Чати"
+  chatBg: "Чати (фон)"
   antenna: "Прийом антени"
   channel: "Повідомлення каналу"
 _ago:

locales/uz-UZ.yml

@@ -910,6 +910,7 @@ _theme:
 _sfx:
   note: "Qaydlar"
   notification: "Xabarnomalar"
+  chat: "Suhbat"
 _ago:
   minutesAgo: "{n} daqiqa oldin"
   hoursAgo: "{n} soat oldin"

locales/vi-VN.yml

@@ -1404,6 +1404,11 @@ _wordMute:
   muteWords: "Ẩn từ ngữ"
   muteWordsDescription: "Separate with spaces for an AND condition or with line breaks for an OR condition."
   muteWordsDescription2: "Bao quanh các từ khóa bằng dấu gạch chéo để sử dụng cụm từ thông dụng."
+  softDescription: "Ẩn các tút phù hợp điều kiện đã đặt khỏi bảng tin."
+  hardDescription: "Ngăn các tút đáp ứng các điều kiện đã đặt xuất hiện trên bảng tin. Lưu ý, những tút này sẽ không được thêm vào bảng tin ngay cả khi các điều kiện được thay đổi."
+  soft: "Yếu"
+  hard: "Mạnh"
+  mutedNotes: "Những tút đã ẩn"
 _instanceMute:
   instanceMuteDescription: "Thao tác này sẽ ẩn mọi tút/lượt đăng lại từ các máy chủ được liệt kê, bao gồm cả những tút  dạng trả lời từ máy chủ bị ẩn."
   instanceMuteDescription2: "Tách bằng cách xuống dòng"
@@ -1467,6 +1472,9 @@ _theme:
     infoFg: "Chữ thông tin"
     infoWarnBg: "Nền cảnh báo"
     infoWarnFg: "Chữ cảnh báo"
+    cwBg: "Nền nút nội dung ẩn"
+    cwFg: "Chữ nút nội dung ẩn"
+    cwHoverBg: "Nền nút nội dung ẩn (Chạm)"
     toastBg: "Nền thông báo"
     toastFg: "Chữ thông báo"
     buttonBg: "Nền nút"
@@ -1484,6 +1492,8 @@ _sfx:
   note: "Tút"
   noteMy: "Tút của tôi"
   notification: "Thông báo"
+  chat: "Trò chuyện"
+  chatBg: "Chat (Nền)"
   antenna: "Trạm phát sóng"
   channel: "Kênh"
 _ago:

locales/zh-CN.yml

@@ -195,7 +195,6 @@ perHour: "每小时"
 perDay: "每天"
 stopActivityDelivery: "停止发送活动"
 blockThisInstance: "阻止此服务器向本服务器推流"
-silenceThisInstance: "使服务器静音"
 operations: "操作"
 software: "软件"
 version: "版本"
@@ -215,8 +214,6 @@ clearCachedFiles: "清除缓存"
 clearCachedFilesConfirm: "确定要清除缓存文件？"
 blockedInstances: "被封锁的服务器"
 blockedInstancesDescription: "设定要封锁的服务器，以换行来进行分割。被封锁的服务器将无法与本服务器进行交换通讯。子域名也同样会被封锁。"
-silencedInstances: "沉默的服务器"
-silencedInstancesDescription: "设置要静音的服务器的主机，以换行符分隔。属于静默服务器的所有帐户都将被视为“静默”，所有关注都将成为请求，并且您将无法提及非关注者的本地帐户。被阻止的实例不受影响。"
 muteAndBlock: "屏蔽/拉黑"
 mutedUsers: "已屏蔽用户"
 blockedUsers: "已拉黑的用户"
@@ -1123,14 +1120,6 @@ notifyNotes: "打开发帖通知"
 unnotifyNotes: "关闭发帖通知"
 authentication: "验证"
 authenticationRequiredToContinue: "要继续，请先进行验证"
-dateAndTime: "日期和时间"
-showRenotes: "显示转帖"
-edited: "已编辑"
-notificationRecieveConfig: "通知接收设置"
-mutualFollow: "互相关注"
-fileAttachedOnly: "仅限媒体"
-showRepliesToOthersInTimeline: "在时间线上显示给其他人的回复"
-hideRepliesToOthersInTimeline: "在时间线上隐藏给其他人的回复"
 _announcement:
   forExistingUsers: "仅限现有用户"
   forExistingUsersDescription: "若启用，该公告将仅对创建此公告时存在的用户可见。 如果禁用，则在创建此公告后注册的用户也可以看到该公告。"
@@ -1613,6 +1602,11 @@ _wordMute:
   muteWords: "禁用词"
   muteWordsDescription: "AND 条件用空格分隔，OR 条件用换行符分隔。"
   muteWordsDescription2: "正则表达式用斜线包裹"
+  softDescription: "隐藏时间线中指定条件的帖子。"
+  hardDescription: "防止将具有指定条件的帖子添加到时间线。 即使您更改条件，未添加的帖文也会被排除在外。"
+  soft: "软屏蔽"
+  hard: "硬屏蔽"
+  mutedNotes: "被屏蔽的帖子"
 _instanceMute:
   instanceMuteDescription: "屏蔽服务器中的所有帖子和转帖，包括这些服务器上的用户回复。"
   instanceMuteDescription2: "一行一个"
@@ -1676,6 +1670,9 @@ _theme:
     infoFg: "信息文本"
     infoWarnBg: "警告背景"
     infoWarnFg: "警告文本"
+    cwBg: "隐藏内容按钮背景"
+    cwFg: "隐藏内容按钮文本"
+    cwHoverBg: "隐藏内容按钮背景（悬停）"
     toastBg: "Toast 通知背景"
     toastFg: "Toast 通知文本"
     buttonBg: "按钮背景"
@@ -1693,6 +1690,8 @@ _sfx:
   note: "帖子"
   noteMy: "我的帖子"
   notification: "通知"
+  chat: "聊天"
+  chatBg: "聊天背景"
   antenna: "天线接收"
   channel: "频道通知"
 _ago:
@@ -2102,11 +2101,9 @@ _webhookSettings:
     reaction: "被回应时"
     mention: "被提及时"
 _moderationLogTypes:
-  createRole: "创建角色"
-  deleteRole: "删除角色"
-  updateRole: "更新角色"
   assignRole: "分配角色"
   unassignRole: "取消分配角色"
+  updateRole: "更新角色"
   suspend: "冻结"
   unsuspend: "解除冻结"
   addCustomEmoji: "添加自定义表情符号"
@@ -2125,11 +2122,3 @@ _moderationLogTypes:
   resetPassword: "重置密码"
   markSensitiveDriveFile: "标记网盘文件为敏感媒体"
   unmarkSensitiveDriveFile: "取消标记网盘文件为敏感媒体"
-  resolveAbuseReport: "处理举报"
-  createInvitation: "发行邀请码"
-  createAd: "创建了广告"
-  deleteAd: "删除了广告"
-  updateAd: "更新了广告"
-_fileViewer:
-  url: "URL"
-  uploadedAt: "添加日期"

locales/zh-TW.yml

@@ -1,6 +1,6 @@
 ---
-_lang_: "繁體中文（台灣）"
-headlineMisskey: "貼文連繫網路"
+_lang_: "繁體中文"
+headlineMisskey: "貼文連繫網絡"
 introMisskey: "歡迎！Misskey 是一個開放原始碼且去中心化的社群網路服務。\n發布「貼文」向身邊的人分享您的想法！📡\n利用「反應」表達您對貼文的感覺！👍\n讓我們一起探索新的世界吧！🚀"
 poweredByMisskeyDescription: "{name}是開放原始碼平臺 <b>Misskey</b> 的伺服器之一。"
 monthAndDay: "{month} 月 {day} 日"
@@ -15,7 +15,7 @@ gotIt: "知道了"
 cancel: "取消"
 noThankYou: "現在不要"
 enterUsername: "輸入使用者名稱"
-renotedBy: "{user} 轉發了"
+renotedBy: "{user} 轉發"
 noNotes: "無貼文"
 noNotifications: "沒有通知"
 instance: "伺服器"
@@ -45,7 +45,7 @@ pin: "置頂"
 unpin: "取消置頂"
 copyContent: "複製內容"
 copyLink: "複製連結"
-copyLinkRenote: "複製轉發的連結"
+copyLinkRenote: "複製轉貼連結"
 delete: "刪除"
 deleteAndEdit: "刪除並編輯"
 deleteAndEditConfirm: "要刪除並再次編輯嗎？此貼文的所有反應、轉發和回覆也將會消失。"
@@ -56,7 +56,7 @@ copyRSS: "複製RSS"
 copyUsername: "複製使用者名稱"
 copyUserId: "複製使用者 ID"
 copyNoteId: "複製貼文 ID"
-copyFileId: "複製檔案 ID"
+copyFileId: "複製檔案ID"
 copyFolderId: "複製資料夾ID"
 copyProfileUrl: "複製個人資料網址"
 searchUser: "搜尋使用者"
@@ -75,9 +75,9 @@ import: "匯入"
 export: "匯出"
 files: "檔案"
 download: "下載"
-driveFileDeleteConfirm: "確定要刪除檔案「{name}」嗎？使用此檔案的貼文也會跟著被刪除。"
+driveFileDeleteConfirm: "確定要刪除檔案「{name}」嗎？使用此附件的貼文也會跟著消失。\n"
 unfollowConfirm: "確定要取消追隨{name}嗎？"
-exportRequested: "已請求匯出。這可能會花一點時間。匯出的檔案將會被放到雲端硬碟裡。"
+exportRequested: "已請求匯出。這可能會花一點時間。匯出的檔案將會被放到雲端裡。"
 importRequested: "已請求匯入。這可能會花一點時間。"
 lists: "清單"
 noLists: "你沒有任何清單"
@@ -107,7 +107,7 @@ followRequestPending: "追隨許可待批准"
 enterEmoji: "輸入表情符號"
 renote: "轉發"
 unrenote: "取消轉發"
-renoted: "轉發成功。"
+renoted: "轉發成功"
 cantRenote: "無法轉發此貼文。"
 cantReRenote: "無法轉發之前已經轉發過的內容。"
 quote: "引用"
@@ -138,8 +138,8 @@ suspend: "凍結"
 unsuspend: "解除凍結"
 blockConfirm: "確定要封鎖此使用者嗎？"
 unblockConfirm: "確定要解除封鎖此使用者嗎？"
-suspendConfirm: "確定凍結此使用者？"
-unsuspendConfirm: "確定解凍此使用者？"
+suspendConfirm: "確定凍結此帳戶？"
+unsuspendConfirm: "確定解凍此帳戶？"
 selectList: "選擇清單"
 editList: "編輯清單"
 selectChannel: "選擇頻道"
@@ -152,20 +152,20 @@ customEmojis: "自訂表情符號"
 emoji: "表情符號"
 emojis: "表情符號"
 emojiName: "表情符號名稱"
-emojiUrl: "表情符號 URL"
+emojiUrl: "表情符號URL"
 addEmoji: "新增表情符號"
 settingGuide: "推薦設定"
 cacheRemoteFiles: "快取遠端檔案"
-cacheRemoteFilesDescription: "啟用此設定後，遠端檔案會被快取在本伺服器的儲存空間中。雖然顯示圖片會變快，但會消耗較多伺服器的儲存空間。至於要快取遠端使用者到什麼程度，是依照角色的雲端硬碟容量而定。當超過這個限制時，從較舊的檔案開始自快取中刪除並改為連結。關閉這個設定時，遠端檔案從一開始就維持連結的方式，但建議將 default.yml 的 proxyRemoteFiles 設為 true，以便產生圖片的縮圖並保護使用者的隱私。"
-youCanCleanRemoteFilesCache: "按檔案管理的🗑️按鈕，可將快取全部刪除。"
+cacheRemoteFilesDescription: "禁用此設定會停止建立遠端檔案快取，從而節省伺服器儲存空間，但會因從遠端讀取資料而增加網路數據用量。"
+youCanCleanRemoteFilesCache: "按檔案管理的🗑️按鈕，將快取全部刪除。"
 cacheRemoteSensitiveFiles: "快取遠端的敏感檔案"
 cacheRemoteSensitiveFilesDescription: "若停用這個設定，則不會快取遠端的敏感檔案，而是直接連結。"
 flagAsBot: "此使用者是機器人"
-flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整Misskey內部系統將本帳戶識別為機器人"
+flagAsBotDescription: "標記本帳戶由程式控制，防止其他程式與本帳戶產生無限互動的行為。"
 flagAsCat: "此帳戶是一隻貓，喵～～～！！！"
 flagAsCatDescription: "如果想將本帳戶標示為一隻貓，請開啟此標示"
 flagShowTimelineReplies: "在時間軸上顯示貼文的回覆"
-flagShowTimelineRepliesDescription: "啟用後，時間軸除了顯示使用者的貼文以外，還會顯示使用者對其他貼文的回覆。"
+flagShowTimelineRepliesDescription: "啟用時，時間軸除了顯示使用者的貼文以外，還會顯示使用者對其他貼文的回覆。"
 autoAcceptFollowed: "自動允許來自追隨中使用者的追隨請求"
 addAccount: "新增帳戶"
 reloadAccountsList: "更新帳戶清單的資訊"
@@ -184,7 +184,7 @@ host: "主機"
 selectUser: "選取使用者"
 recipient: "收件人"
 annotation: "註解"
-federation: "站台聯邦"
+federation: "聯邦宇宙"
 instances: "伺服器"
 registeredAt: "初次觀測"
 latestRequestReceivedAt: "上次收到的請求"
@@ -195,7 +195,6 @@ perHour: "每小時"
 perDay: "每日"
 stopActivityDelivery: "停止發送活動"
 blockThisInstance: "封鎖此伺服器"
-silenceThisInstance: "禁言此伺服器"
 operations: "操作"
 software: "軟體"
 version: "版本"
@@ -215,8 +214,6 @@ clearCachedFiles: "清除快取資料"
 clearCachedFilesConfirm: "確定要清除所有遠端暫存資料嗎？"
 blockedInstances: "已封鎖的伺服器"
 blockedInstancesDescription: "請逐行輸入需要封鎖的伺服器。已封鎖的伺服器將無法與本伺服器進行通訊。"
-silencedInstances: "被禁言的伺服器"
-silencedInstancesDescription: "設定要禁言的伺服器主機名稱，以換行分隔。隸屬於禁言伺服器的所有帳戶都將被視為「禁言帳戶」，只能發出「追隨請求」，而且無法提及未追隨的本地帳戶。這不會影響已封鎖的實例。"
 muteAndBlock: "靜音和封鎖"
 mutedUsers: "被靜音的使用者"
 blockedUsers: "被封鎖的使用者"
@@ -427,7 +424,7 @@ securityKeyAndPasskey: "安全金鑰、Passkey"
 securityKey: "安全金鑰"
 lastUsed: "上次使用"
 lastUsedAt: "上次使用：{t}"
-unregister: "註銷"
+unregister: "註銷帳戶"
 passwordLessLogin: "設置無密碼登入"
 passwordLessLoginDescription: "不使用密碼，以安全金鑰或 Passkey 登入"
 resetPassword: "重設密碼"
@@ -512,8 +509,8 @@ promote: "推廣"
 numberOfDays: "有效天數"
 hideThisNote: "隱藏此貼文"
 showFeaturedNotesInTimeline: "在時間軸上顯示熱門推薦"
-objectStorage: "物件儲存"
-useObjectStorage: "使用物件儲存"
+objectStorage: "對象存儲"
+useObjectStorage: "使用對象存儲"
 objectStorageBaseUrl: "Base URL"
 objectStorageBaseUrlDesc: "用於引用的 URL。如果您使用的是 CDN 或反向代理，請指定其 URL，例如 S3（https://<bucket>.s3.amazonaws.com）、GCS（https://storage.googleapis.com/<bucket>）。"
 objectStorageBucket: "儲存空間（Bucket）"
@@ -534,7 +531,6 @@ serverLogs: "伺服器日誌"
 deleteAll: "刪除所有記錄"
 showFixedPostForm: "於時間軸頁頂顯示「發送貼文」方框"
 showFixedPostFormInChannel: "於時間軸頁頂顯示「發送貼文」方框（頻道）"
-withRepliesByDefaultForNewlyFollowed: "在追隨其他人後，預設在時間軸納入回覆的貼文"
 newNoteRecived: "發現新貼文"
 sounds: "音效"
 sound: "音效"
@@ -577,7 +573,7 @@ tokenRevokedDescription: "登入權杖失效，請重新登入。"
 accountDeleted: "帳戶已被刪除"
 accountDeletedDescription: "這個帳戶已被刪除。"
 menu: "選單"
-divider: "分隔線"
+divider: "分割線"
 addItem: "新增項目"
 rearrange: "排序方式"
 relays: "中繼"
@@ -586,7 +582,7 @@ inboxUrl: "收件夾URL"
 addedRelays: "已加入的中繼"
 serviceworkerInfo: "您需要啟用推送通知。"
 deletedNote: "已刪除的貼文"
-invisibleNote: "私密的貼文"
+invisibleNote: "隱藏的貼文"
 enableInfiniteScroll: "啟用自動滾動頁面模式"
 visibility: "可見性"
 poll: "投票"
@@ -1124,21 +1120,6 @@ notifyNotes: "開啟貼文通知"
 unnotifyNotes: "關閉貼文通知"
 authentication: "驗證"
 authenticationRequiredToContinue: "請於繼續前完成驗證"
-dateAndTime: "日期與時間"
-showRenotes: "顯示轉發貼文"
-edited: "已編輯"
-notificationRecieveConfig: "接受通知的設定"
-mutualFollow: "互相追隨"
-fileAttachedOnly: "顯示包含附件的貼文"
-showRepliesToOthersInTimeline: "顯示給其他人的回覆"
-hideRepliesToOthersInTimeline: "在時間軸上隱藏給其他人的回覆"
-externalServices: "外部服務"
-impressum: "營運者資訊"
-impressumUrl: "營運者資訊網址"
-impressumDescription: "在德國與部份地區必須要明確顯示營運者資訊。"
-privacyPolicy: "隱私政策"
-privacyPolicyUrl: "隱私政策網址"
-tosAndPrivacyPolicy: "服務條款和隱私政策"
 _announcement:
   forExistingUsers: "僅限既有的使用者"
   forExistingUsersDescription: "啟用代表僅向現存使用者顯示；停用代表張貼後註冊的新使用者也會看到。"
@@ -1488,7 +1469,6 @@ _role:
     descriptionOfRateLimitFactor: "值越小限制越少，值越大限制越多。"
     canHideAds: "不顯示廣告"
     canSearchNotes: "可否搜尋貼文"
-    canUseTranslator: "使用翻譯功能"
   _condition:
     isLocal: "本地使用者"
     isRemote: "遠端使用者"
@@ -1537,10 +1517,6 @@ _ad:
   reduceFrequencyOfThisAd: "降低此廣告的頻率 "
   hide: "隱藏"
   timezoneinfo: "星期幾是由伺服器的時區指定的。"
-  adsSettings: "廣告投放設定"
-  notesPerOneAd: "即時更新中投放廣告的間隔（貼文數）"
-  setZeroToDisable: "設為 0 則在即時更新時不投放廣告"
-  adsTooClose: "由於廣告投放的間隔極短，可能會嚴重影響使用者體驗。"
 _forgotPassword:
   enterEmail: "請輸入您的帳戶註冊的電子郵件地址。 密碼重置連結將被發送到該電子郵件地址。"
   ifNoEmail: "如果您還沒有註冊您的電子郵件地址，請聯繫管理員。 "
@@ -1599,8 +1575,8 @@ _displayOfSensitiveMedia:
   force: "隱藏所有檔案"
 _instanceTicker:
   none: "隱藏"
-  remote: "只顯示遠端使用者"
-  always: "一律顯示"
+  remote: "向遠端使用者顯示"
+  always: "總是顯示"
 _serverDisconnectedBehavior:
   reload: "自動重載"
   dialog: "彈出式警告"
@@ -1626,9 +1602,14 @@ _wordMute:
   muteWords: "加入靜音文字"
   muteWordsDescription: "空格代表「以及」（AND），換行代表「或者」（OR）。"
   muteWordsDescription2: "用斜線包圍關鍵字代表正規表達式。"
+  softDescription: "隱藏時間軸中符合特定條件的貼文。"
+  hardDescription: "符合特定條件的貼文將不會新增至時間軸。 即使您更改條件，未被新增的貼文也會被排除在外。"
+  soft: "軟性靜音"
+  hard: "硬性靜音"
+  mutedNotes: "已靜音的貼文"
 _instanceMute:
   instanceMuteDescription: "包括對被靜音實例上的使用者的回覆，被設定的實例上所有貼文及轉發都會被靜音。"
-  instanceMuteDescription2: "設定時以換行進行分隔"
+  instanceMuteDescription2: "換行以分隔"
   title: "將隱藏被設定的實例貼文。"
   heading: "將實例靜音"
 _theme:
@@ -1681,7 +1662,7 @@ _theme:
     mentionMe: "提到了我"
     renote: "轉發貼文"
     modalBg: "對話框背景"
-    divider: "分隔線"
+    divider: "分割線"
     scrollbarHandle: "捲動條"
     scrollbarHandleHover: "捲動條（懸浮）"
     dateLabelFg: "日期標籤文字"
@@ -1689,6 +1670,9 @@ _theme:
     infoFg: "資訊內容"
     infoWarnBg: "警告背景"
     infoWarnFg: "警告文字"
+    cwBg: "隱藏內容按鈕背景"
+    cwFg: "隱藏內容按鈕文字"
+    cwHoverBg: "隱藏內容按鈕背景（懸浮）"
     toastBg: "通知背景"
     toastFg: "通知文本"
     buttonBg: "按鈕背景"
@@ -1706,6 +1690,8 @@ _sfx:
   note: "貼文"
   noteMy: "我的貼文"
   notification: "通知"
+  chat: "聊天"
+  chatBg: "聊天背景"
   antenna: "天線接收"
   channel: "頻道通知"
 _ago:
@@ -1925,7 +1911,6 @@ _exportOrImport:
   userLists: "清單"
   excludeMutingUsers: "排除被靜音的使用者"
   excludeInactiveUsers: "排除不活躍帳戶"
-  withReplies: "將被匯入的追隨中清單的貼文回覆包含在時間軸"
 _charts:
   federation: "聯邦宇宙"
   apRequest: "請求"
@@ -2116,11 +2101,9 @@ _webhookSettings:
     reaction: "當獲得反應時"
     mention: "當被提到時"
 _moderationLogTypes:
-  createRole: "新增角色"
-  deleteRole: "刪除角色 "
-  updateRole: "更新角色設定"
   assignRole: "指派角色"
   unassignRole: "撤銷角色"
+  updateRole: "更新角色設定"
   suspend: "凍結"
   unsuspend: "解除凍結"
   addCustomEmoji: "新增自訂表情符號"
@@ -2139,18 +2122,3 @@ _moderationLogTypes:
   resetPassword: "重設密碼"
   suspendRemoteInstance: "封鎖遠端伺服器"
   unsuspendRemoteInstance: "解除封鎖遠端伺服器"
-  markSensitiveDriveFile: "標記為敏感檔案"
-  unmarkSensitiveDriveFile: "撤銷標記為敏感檔案"
-  resolveAbuseReport: "解決檢舉"
-  createInvitation: "建立邀請碼"
-  createAd: "建立廣告"
-  deleteAd: "刪除廣告"
-  updateAd: "更新廣告"
-_fileViewer:
-  title: "檔案詳細資訊"
-  type: "檔案類型 "
-  size: "檔案大小"
-  url: "URL"
-  uploadedAt: "加入日期"
-  attachedNotes: "含有附件的貼文"
-  thisPageCanBeSeenFromTheAuthor: "本頁面僅限上傳了這個檔案的使用者可以檢視。"

package.json

@@ -1,12 +1,12 @@
 {
 	"name": "misskey",
-	"version": "2023.11.0-beta.2",
+	"version": "2023.9.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/misskey-dev/misskey.git"
 	},
-	"packageManager": "pnpm@8.9.2",
+	"packageManager": "pnpm@8.7.6",
 	"workspaces": [
 		"packages/frontend",
 		"packages/backend",
@@ -46,16 +46,16 @@
 		"execa": "8.0.1",
 		"cssnano": "6.0.1",
 		"js-yaml": "4.1.0",
-		"postcss": "8.4.31",
-		"terser": "5.22.0",
+		"postcss": "8.4.30",
+		"terser": "5.20.0",
 		"typescript": "5.2.2"
 	},
 	"devDependencies": {
-		"@typescript-eslint/eslint-plugin": "6.8.0",
-		"@typescript-eslint/parser": "6.8.0",
+		"@typescript-eslint/eslint-plugin": "6.7.2",
+		"@typescript-eslint/parser": "6.7.2",
 		"cross-env": "7.0.3",
-		"cypress": "13.3.2",
-		"eslint": "8.51.0",
+		"cypress": "13.2.0",
+		"eslint": "8.50.0",
 		"start-server-and-test": "2.0.1"
 	},
 	"optionalDependencies": {

packages/backend/jest.config.cjs

@@ -216,6 +216,4 @@ module.exports = {
 	maxWorkers: 1, // Make it use worker (that can be killed and restarted)
 	logHeapUsage: true, // To debug when out-of-memory happens on CI
 	workerIdleMemoryLimit: '1GiB', // Limit the worker to 1GB (GitHub Workflows dies at 2GB)
-
-	maxConcurrency: 32,
 };

packages/backend/migration/1695605508898-mutingNotificationTypes.js

@@ -1,21 +0,0 @@
-export class MutingNotificationTypes1695605508898 {
-    name = 'MutingNotificationTypes1695605508898'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TYPE "public"."user_profile_mutingnotificationtypes_enum" RENAME TO "user_profile_mutingnotificationtypes_enum_old"`);
-        await queryRunner.query(`CREATE TYPE "public"."user_profile_mutingnotificationtypes_enum" AS ENUM('note', 'follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'achievementEarned', 'app', 'test', 'pollVote', 'groupInvited')`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" TYPE "public"."user_profile_mutingnotificationtypes_enum"[] USING "mutingNotificationTypes"::"text"::"public"."user_profile_mutingnotificationtypes_enum"[]`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" SET DEFAULT '{}'`);
-        await queryRunner.query(`DROP TYPE "public"."user_profile_mutingnotificationtypes_enum_old"`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`CREATE TYPE "public"."user_profile_mutingnotificationtypes_enum_old" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'pollEnded', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'achievementEarned', 'app')`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" TYPE "public"."user_profile_mutingnotificationtypes_enum_old"[] USING "mutingNotificationTypes"::"text"::"public"."user_profile_mutingnotificationtypes_enum_old"[]`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ALTER COLUMN "mutingNotificationTypes" SET DEFAULT '{}'`);
-        await queryRunner.query(`DROP TYPE "public"."user_profile_mutingnotificationtypes_enum"`);
-        await queryRunner.query(`ALTER TYPE "public"."user_profile_mutingnotificationtypes_enum_old" RENAME TO "user_profile_mutingnotificationtypes_enum"`);
-    }
-}

packages/backend/migration/1695901659683-note-updated-at.js

@@ -1,11 +0,0 @@
-export class NoteUpdatedAt1695901659683 {
-    name = 'NoteUpdatedAt1695901659683'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" ADD "updatedAt" TIMESTAMP WITH TIME ZONE`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "updatedAt"`);
-    }
-}

packages/backend/migration/1695944637565-notificationRecieveConfig.js

@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class NotificationRecieveConfig1695944637565 {
-    name = 'NotificationRecieveConfig1695944637565'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "mutingNotificationTypes"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "notificationRecieveConfig" jsonb NOT NULL DEFAULT '{}'`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "notificationRecieveConfig"`);
-        await queryRunner.query(`ALTER TABLE "user_profile" ADD "mutingNotificationTypes" "public"."user_profile_notificationrecieveconfig_enum" array NOT NULL DEFAULT '{}'`);
-    }
-}

packages/backend/migration/1696003580220-AddSomeUrls.js

@@ -1,17 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class AddSomeUrls1696003580220 {
-    name = 'AddSomeUrls1696003580220'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "impressumUrl" character varying(1024)`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "privacyPolicyUrl" character varying(1024)`);
-    }
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "impressumUrl"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "privacyPolicyUrl"`);
-    }
-}

packages/backend/migration/1696222183852-withReplies.js

@@ -1,20 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class WithReplies1696222183852 {
-    name = 'WithReplies1696222183852'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "following" ADD "withReplies" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "user_list_joining" ADD "withReplies" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`CREATE INDEX "IDX_d74d8ab5efa7e3bb82825c0fa2" ON "following" ("followeeId", "followerHost") `);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "public"."IDX_d74d8ab5efa7e3bb82825c0fa2"`);
-        await queryRunner.query(`ALTER TABLE "user_list_joining" DROP COLUMN "withReplies"`);
-        await queryRunner.query(`ALTER TABLE "following" DROP COLUMN "withReplies"`);
-    }
-}

packages/backend/migration/1696323464251-user-list-membership.js

@@ -1,11 +0,0 @@
-export class UserListMembership1696323464251 {
-    name = 'UserListMembership1696323464251'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_list_joining" RENAME TO "user_list_membership"`);
-    }
-
-    async down(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "user_list_membership" RENAME TO "user_list_joining"`);
-    }
-}

packages/backend/migration/1696331570827-hibernation.js

@@ -1,17 +0,0 @@
-export class Hibernation1696331570827 {
-    name = 'Hibernation1696331570827'
-
-    async up(queryRunner) {
-				await queryRunner.query(`DROP INDEX "public"."IDX_d74d8ab5efa7e3bb82825c0fa2"`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "isHibernated" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`ALTER TABLE "following" ADD "isFollowerHibernated" boolean NOT NULL DEFAULT false`);
-        await queryRunner.query(`CREATE INDEX "IDX_ce62b50d882d4e9dee10ad0d2f" ON "following" ("followeeId", "followerHost", "isFollowerHibernated") `);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX "public"."IDX_ce62b50d882d4e9dee10ad0d2f"`);
-        await queryRunner.query(`ALTER TABLE "following" DROP COLUMN "isFollowerHibernated"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "isHibernated"`);
-        await queryRunner.query(`CREATE INDEX "IDX_d74d8ab5efa7e3bb82825c0fa2" ON "following" ("followeeId", "followerHost") `);
-    }
-}

packages/backend/migration/1696332072038-clean.js

@@ -1,33 +0,0 @@
-export class Clean1696332072038 {
-    name = 'Clean1696332072038'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_list_membership" DROP CONSTRAINT "FK_d844bfc6f3f523a05189076efaa"`);
-        await queryRunner.query(`ALTER TABLE "user_list_membership" DROP CONSTRAINT "FK_605472305f26818cc93d1baaa74"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_d844bfc6f3f523a05189076efa"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_605472305f26818cc93d1baaa7"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_90f7da835e4c10aca6853621e1"`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "preservedUsernames" SET DEFAULT '{ "admin", "administrator", "root", "system", "maintainer", "host", "mod", "moderator", "owner", "superuser", "staff", "auth", "i", "me", "everyone", "all", "mention", "mentions", "example", "user", "users", "account", "accounts", "official", "help", "helps", "support", "supports", "info", "information", "informations", "announce", "announces", "announcement", "announcements", "notice", "notification", "notifications", "dev", "developer", "developers", "tech", "misskey" }'`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_list_membership"."createdAt" IS 'The created date of the UserListMembership.'`);
-        await queryRunner.query(`CREATE INDEX "IDX_021015e6683570ae9f6b0c62be" ON "user_list_membership" ("userId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_cddcaf418dc4d392ecfcca842a" ON "user_list_membership" ("userListId") `);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_e4f3094c43f2d665e6030b0337" ON "user_list_membership" ("userId", "userListId") `);
-        await queryRunner.query(`ALTER TABLE "user_list_membership" ADD CONSTRAINT "FK_021015e6683570ae9f6b0c62bee" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_list_membership" ADD CONSTRAINT "FK_cddcaf418dc4d392ecfcca842a7" FOREIGN KEY ("userListId") REFERENCES "user_list"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_list_membership" DROP CONSTRAINT "FK_cddcaf418dc4d392ecfcca842a7"`);
-        await queryRunner.query(`ALTER TABLE "user_list_membership" DROP CONSTRAINT "FK_021015e6683570ae9f6b0c62bee"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_e4f3094c43f2d665e6030b0337"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_cddcaf418dc4d392ecfcca842a"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_021015e6683570ae9f6b0c62be"`);
-        await queryRunner.query(`COMMENT ON COLUMN "user_list_membership"."createdAt" IS 'The created date of the UserListJoining.'`);
-        await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "preservedUsernames" SET DEFAULT '{admin,administrator,root,system,maintainer,host,mod,moderator,owner,superuser,staff,auth,i,me,everyone,all,mention,mentions,example,user,users,account,accounts,official,help,helps,support,supports,info,information,informations,announce,announces,announcement,announcements,notice,notification,notifications,dev,developer,developers,tech,misskey}'`);
-        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_90f7da835e4c10aca6853621e1" ON "user_list_membership" ("userId", "userListId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_605472305f26818cc93d1baaa7" ON "user_list_membership" ("userListId") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d844bfc6f3f523a05189076efa" ON "user_list_membership" ("userId") `);
-        await queryRunner.query(`ALTER TABLE "user_list_membership" ADD CONSTRAINT "FK_605472305f26818cc93d1baaa74" FOREIGN KEY ("userListId") REFERENCES "user_list"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "user_list_membership" ADD CONSTRAINT "FK_d844bfc6f3f523a05189076efaa" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-}

packages/backend/migration/1696373953614-meta-cache-settings.js

@@ -1,22 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class MetaCacheSettings1696373953614 {
-    name = 'MetaCacheSettings1696373953614'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "perLocalUserUserTimelineCacheMax" integer NOT NULL DEFAULT '300'`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "perRemoteUserUserTimelineCacheMax" integer NOT NULL DEFAULT '100'`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "perUserHomeTimelineCacheMax" integer NOT NULL DEFAULT '300'`);
-        await queryRunner.query(`ALTER TABLE "meta" ADD "perUserListTimelineCacheMax" integer NOT NULL DEFAULT '300'`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "perUserListTimelineCacheMax"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "perUserHomeTimelineCacheMax"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "perRemoteUserUserTimelineCacheMax"`);
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "perLocalUserUserTimelineCacheMax"`);
-    }
-}

packages/backend/migration/1696388600237-revert-note-edit.js

@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class RevertNoteEdit1696388600237 {
-    name = 'RevertNoteEdit1696388600237'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "updatedAt"`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" ADD "updatedAt" TIMESTAMP WITH TIME ZONE`);
-    }
-}

packages/backend/migration/1696405744672-clean-up.js

@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class CleanUp1696405744672 {
-    name = 'CleanUp1696405744672'
-
-    async up(queryRunner) {
-        await queryRunner.query(`DROP INDEX "public"."IDX_e7c0567f5261063592f022e9b5"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_25dfc71b0369b003a4cd434d0b"`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`CREATE INDEX "IDX_25dfc71b0369b003a4cd434d0b" ON "note" ("attachedFileTypes") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e7c0567f5261063592f022e9b5" ON "note" ("createdAt") `);
-    }
-}

packages/backend/migration/1696569742153-clean-up.js

@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class CleanUp1696569742153 {
-    name = 'CleanUp1696569742153'
-
-    async up(queryRunner) {
-        await queryRunner.query(`DROP INDEX "public"."IDX_01f4581f114e0ebd2bbb876f0b"`);
-        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "score"`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" ADD "score" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`CREATE INDEX "IDX_01f4581f114e0ebd2bbb876f0b" ON "note_reaction" ("createdAt") `);
-    }
-}

packages/backend/migration/1696581429196-clean-up.js

@@ -1,15 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class CleanUp1696581429196 {
-    name = 'CleanUp1696581429196'
-
-    async up(queryRunner) {
-        await queryRunner.query(`DROP TABLE IF EXISTS "muted_note"`);
-    }
-
-    async down(queryRunner) {
-    }
-}

packages/backend/migration/1696743032098-AdsOnStream.js

@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class AdsOnStream1696743032098 {
-    name = 'AdsOnStream1696743032098'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "notesPerOneAd" integer NOT NULL DEFAULT '0'`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "notesPerOneAd"`);
-    }
-}

packages/backend/migration/1696807733453-userListUserId.js

@@ -1,21 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class UserListUserId1696807733453 {
-    name = 'UserListUserId1696807733453'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_list_membership" ADD "userListUserId" character varying(32) NOT NULL DEFAULT ''`);
-				const memberships = await queryRunner.query(`SELECT "id", "userListId" FROM "user_list_membership"`);
-				for(let i = 0; i < memberships.length; i++) {
-					const userList = await queryRunner.query(`SELECT "userId" FROM "user_list" WHERE "id" = $1`, [memberships[i].userListId]);
-					await queryRunner.query(`UPDATE "user_list_membership" SET "userListUserId" = $1 WHERE "id" = $2`, [userList[0].userId, memberships[i].id]);
-				}
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_list_membership" DROP COLUMN "userListUserId"`);
-    }
-}

packages/backend/migration/1696808725134-userListUserId-2.js

@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class UserListUserId21696808725134 {
-    name = 'UserListUserId21696808725134'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_list_membership" ALTER COLUMN "userListUserId" DROP DEFAULT`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user_list_membership" ALTER COLUMN "userListUserId" SET DEFAULT ''`);
-    }
-}

packages/backend/migration/1697247230117-InstanceSilence.js

@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class InstanceSilence1697247230117 {
-    name = 'InstanceSilence1697247230117'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "silencedHosts" character varying(1024) array NOT NULL DEFAULT '{}'`);
-    }
-
-		async down(queryRunner) {
-				await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "silencedHosts"`);
-		}
-}

packages/backend/migration/1697420555911-deleteCreatedAt.js

@@ -1,144 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class DeleteCreatedAt1697420555911 {
-    name = 'DeleteCreatedAt1697420555911'
-
-    async up(queryRunner) {
-        await queryRunner.query(`DROP INDEX "public"."IDX_02878d441ceae15ce060b73daf"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_c8dfad3b72196dd1d6b5db168a"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_e11e649824a45d8ed01d597fd9"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_db2098070b2b5a523c58181f74"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_048a757923ed8b157e9895da53"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_1129c2ef687fc272df040bafaa"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_118ec703e596086fc4515acb39"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_b9a354f7941c1e779f3b33aea6"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_71cb7b435b7c0d4843317e7e16"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_11e71f2511589dcc8a4d3214f9"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_735a5544f9249d412255f47f95"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_582f8fab771a9040a12961f3e7"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_8f1a239bd077c8864a20c62c2c"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_f86d57fbca33c7a4e6897490cc"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_d1259a2c2b7bb413ff449e8711"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_fbb4297c927a9b85e9cefa2eb1"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_0fb627e1c2f753262a74f0562d"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_149d2e44785707548c82999b01"`);
-        await queryRunner.query(`ALTER TABLE "drive_folder" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "app" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "access_token" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "ad" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "announcement" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "announcement_read" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "user_list" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "auth_session" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "blocking" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "channel" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "channel_following" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "channel_favorite" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "clip" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "clip_favorite" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "following" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "follow_request" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "gallery_post" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "gallery_like" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "moderation_log" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "muting" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "renote_muting" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "note_favorite" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "note_reaction" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "note_thread_muting" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "page" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "page_like" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "password_reset_request" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "poll_vote" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "promo_read" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "registration_ticket" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "registry_item" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "signin" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "sw_subscription" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "user_list_favorite" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "user_list_membership" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "user_note_pining" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "user_pending" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "webhook" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "role" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "role_assignment" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "flash" DROP COLUMN "createdAt"`);
-        await queryRunner.query(`ALTER TABLE "flash_like" DROP COLUMN "createdAt"`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "flash_like" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "flash" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "role_assignment" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "role" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "webhook" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "user_pending" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "user_note_pining" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "user_list_membership" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "user_list_favorite" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "sw_subscription" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "signin" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "registry_item" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "registration_ticket" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "promo_read" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "poll_vote" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "password_reset_request" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "page_like" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "page" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "note_thread_muting" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "note_reaction" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "note_favorite" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "renote_muting" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "muting" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "moderation_log" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "gallery_like" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "gallery_post" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "follow_request" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "following" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "clip_favorite" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "note" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "clip" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "channel_favorite" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "channel_following" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "channel" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "blocking" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "auth_session" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "antenna" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "user_list" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "announcement_read" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "announcement" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "ad" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "access_token" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "app" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "drive_file" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "drive_folder" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
-        await queryRunner.query(`CREATE INDEX "IDX_149d2e44785707548c82999b01" ON "flash" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_0fb627e1c2f753262a74f0562d" ON "poll_vote" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_fbb4297c927a9b85e9cefa2eb1" ON "page" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_d1259a2c2b7bb413ff449e8711" ON "renote_muting" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f86d57fbca33c7a4e6897490cc" ON "muting" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_8f1a239bd077c8864a20c62c2c" ON "gallery_post" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_582f8fab771a9040a12961f3e7" ON "following" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_735a5544f9249d412255f47f95" ON "channel_favorite" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_11e71f2511589dcc8a4d3214f9" ON "channel_following" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_71cb7b435b7c0d4843317e7e16" ON "channel" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_b9a354f7941c1e779f3b33aea6" ON "blocking" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_118ec703e596086fc4515acb39" ON "announcement" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_1129c2ef687fc272df040bafaa" ON "ad" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_048a757923ed8b157e9895da53" ON "app" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_db2098070b2b5a523c58181f74" ON "abuse_user_report" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_e11e649824a45d8ed01d597fd9" ON "user" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_c8dfad3b72196dd1d6b5db168a" ON "drive_file" ("createdAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_02878d441ceae15ce060b73daf" ON "drive_folder" ("createdAt") `);
-    }
-}

packages/backend/migration/1697436246389-antenna-localOnly.js

@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class AntennaLocalOnly1697436246389 {
-    name = 'AntennaLocalOnly1697436246389'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "antenna" ADD "localOnly" boolean NOT NULL DEFAULT false`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "localOnly"`);
-    }
-}

packages/backend/migration/1697441463087-FollowRequestWithReplies.js

@@ -1,17 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-
-export class FollowRequestWithReplies1697441463087 {
-    name = 'FollowRequestWithReplies1697441463087'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "follow_request" ADD "withReplies" boolean NOT NULL DEFAULT false`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "follow_request" DROP COLUMN "withReplies"`);
-    }
-}

packages/backend/migration/1697673894459-note-reactionAndUserPairCache.js

@@ -1,17 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-
-export class NoteReactionAndUserPairCache1697673894459 {
-    name = 'NoteReactionAndUserPairCache1697673894459'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" ADD "reactionAndUserPairCache" character varying(1024) array NOT NULL DEFAULT '{}'`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "reactionAndUserPairCache"`);
-    }
-}

packages/backend/migration/1697847397844-avatar-decoration.js

@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class AvatarDecoration1697847397844 {
-    name = 'AvatarDecoration1697847397844'
-
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "avatar_decoration" ("id" character varying(32) NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE, "url" character varying(1024) NOT NULL, "name" character varying(256) NOT NULL, "description" character varying(2048) NOT NULL, "roleIdsThatCanBeUsedThisDecoration" character varying(128) array NOT NULL DEFAULT '{}', CONSTRAINT "PK_b6de9296f6097078e1dc53f7603" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "avatarDecorations" character varying(512) array NOT NULL DEFAULT '{}'`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarDecorations"`);
-        await queryRunner.query(`DROP TABLE "avatar_decoration"`);
-    }
-}

packages/backend/migration/1697941908548-avatar-decoration2.js

@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class AvatarDecoration21697941908548 {
-    name = 'AvatarDecoration21697941908548'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarDecorations"`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "avatarDecorations" jsonb NOT NULL DEFAULT '[]'`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarDecorations"`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "avatarDecorations" character varying(512) array NOT NULL DEFAULT '{}'`);
-    }
-}

packages/backend/package.json

@@ -39,7 +39,7 @@
 		"@swc/core-win32-x64-msvc": "1.3.56",
 		"@tensorflow/tfjs": "4.4.0",
 		"@tensorflow/tfjs-node": "4.4.0",
-		"bufferutil": "4.0.7",
+		"bufferutil": "^4.0.7",
 		"slacc-android-arm-eabi": "0.0.10",
 		"slacc-android-arm64": "0.0.10",
 		"slacc-darwin-arm64": "0.0.10",
@@ -53,32 +53,32 @@
 		"slacc-linux-x64-musl": "0.0.10",
 		"slacc-win32-arm64-msvc": "0.0.10",
 		"slacc-win32-x64-msvc": "0.0.10",
-		"utf-8-validate": "6.0.3"
+		"utf-8-validate": "^6.0.3"
 	},
 	"dependencies": {
 		"@aws-sdk/client-s3": "3.412.0",
 		"@aws-sdk/lib-storage": "3.412.0",
 		"@smithy/node-http-handler": "2.1.5",
-		"@bull-board/api": "5.9.1",
-		"@bull-board/fastify": "5.9.1",
-		"@bull-board/ui": "5.9.1",
+		"@bull-board/api": "5.8.4",
+		"@bull-board/fastify": "5.8.4",
+		"@bull-board/ui": "5.8.4",
 		"@discordapp/twemoji": "14.1.2",
 		"@fastify/accepts": "4.2.0",
 		"@fastify/cookie": "9.1.0",
 		"@fastify/cors": "8.4.0",
 		"@fastify/express": "2.3.0",
 		"@fastify/http-proxy": "9.2.1",
-		"@fastify/multipart": "8.0.0",
+		"@fastify/multipart": "7.7.3",
 		"@fastify/static": "6.11.2",
 		"@fastify/view": "8.2.0",
-		"@nestjs/common": "10.2.7",
-		"@nestjs/core": "10.2.7",
-		"@nestjs/testing": "10.2.7",
+		"@nestjs/common": "10.2.6",
+		"@nestjs/core": "10.2.6",
+		"@nestjs/testing": "10.2.6",
 		"@peertube/http-signature": "1.7.0",
-		"@simplewebauthn/server": "8.3.2",
-		"@sinonjs/fake-timers": "11.2.1",
+		"@simplewebauthn/server": "8.1.1",
+		"@sinonjs/fake-timers": "11.1.0",
 		"@swc/cli": "0.1.62",
-		"@swc/core": "1.3.93",
+		"@swc/core": "1.3.87",
 		"accepts": "1.3.8",
 		"ajv": "8.12.0",
 		"archiver": "6.0.1",
@@ -86,7 +86,7 @@
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
 		"body-parser": "1.20.2",
-		"bullmq": "4.12.5",
+		"bullmq": "4.11.4",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.1",
 		"chalk": "5.3.0",
@@ -97,7 +97,7 @@
 		"content-disposition": "0.5.4",
 		"date-fns": "2.30.0",
 		"deep-email-validator": "0.1.21",
-		"fastify": "4.24.3",
+		"fastify": "4.23.2",
 		"feed": "4.2.2",
 		"file-type": "18.5.0",
 		"fluent-ffmpeg": "2.1.2",
@@ -115,22 +115,22 @@
 		"json5": "2.2.3",
 		"jsonld": "8.3.1",
 		"jsrsasign": "10.8.6",
-		"meilisearch": "0.35.0",
+		"meilisearch": "0.34.2",
 		"mfm-js": "0.23.3",
 		"microformats-parser": "1.5.2",
 		"mime-types": "2.1.35",
 		"misskey-js": "workspace:*",
 		"ms": "3.0.0-canary.1",
-		"nanoid": "5.0.2",
+		"nanoid": "5.0.1",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
-		"nodemailer": "6.9.6",
+		"nodemailer": "6.9.5",
 		"nsfwjs": "2.4.2",
 		"oauth": "0.10.0",
-		"oauth2orize": "1.12.0",
+		"oauth2orize": "1.11.1",
 		"oauth2orize-pkce": "0.1.2",
 		"os-utils": "0.0.14",
-		"otpauth": "9.1.5",
+		"otpauth": "9.1.4",
 		"parse5": "7.1.2",
 		"pg": "8.11.3",
 		"pkce-challenge": "4.0.1",
@@ -155,7 +155,7 @@
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
 		"summaly": "github:misskey-dev/summaly",
-		"systeminformation": "5.21.12",
+		"systeminformation": "5.21.8",
 		"tinycolor2": "1.6.0",
 		"tmp": "0.2.1",
 		"tsc-alias": "1.8.8",
@@ -173,50 +173,50 @@
 		"@jest/globals": "29.7.0",
 		"@simplewebauthn/typescript-types": "8.0.0",
 		"@swc/jest": "0.2.29",
-		"@types/accepts": "1.3.6",
-		"@types/archiver": "5.3.4",
-		"@types/bcryptjs": "2.4.5",
-		"@types/body-parser": "1.19.4",
+		"@types/accepts": "1.3.5",
+		"@types/archiver": "5.3.3",
+		"@types/bcryptjs": "2.4.4",
+		"@types/body-parser": "1.19.3",
 		"@types/cbor": "6.0.0",
-		"@types/color-convert": "2.0.2",
-		"@types/content-disposition": "0.5.7",
-		"@types/fluent-ffmpeg": "2.1.23",
-		"@types/http-link-header": "1.0.4",
-		"@types/jest": "29.5.6",
-		"@types/js-yaml": "4.0.8",
-		"@types/jsdom": "21.1.4",
-		"@types/jsonld": "1.5.11",
-		"@types/jsrsasign": "10.5.11",
-		"@types/mime-types": "2.1.3",
-		"@types/ms": "0.7.33",
-		"@types/node": "20.8.7",
+		"@types/color-convert": "2.0.1",
+		"@types/content-disposition": "0.5.6",
+		"@types/fluent-ffmpeg": "2.1.22",
+		"@types/http-link-header": "1.0.3",
+		"@types/jest": "29.5.5",
+		"@types/js-yaml": "4.0.6",
+		"@types/jsdom": "21.1.3",
+		"@types/jsonld": "1.5.10",
+		"@types/jsrsasign": "10.5.9",
+		"@types/mime-types": "2.1.1",
+		"@types/ms": "0.7.31",
+		"@types/node": "20.6.4",
 		"@types/node-fetch": "3.0.3",
-		"@types/nodemailer": "6.4.13",
-		"@types/oauth": "0.9.3",
-		"@types/oauth2orize": "1.11.2",
-		"@types/oauth2orize-pkce": "0.1.1",
-		"@types/pg": "8.10.7",
-		"@types/pug": "2.0.8",
-		"@types/punycode": "2.1.1",
-		"@types/qrcode": "1.5.4",
-		"@types/random-seed": "0.3.4",
-		"@types/ratelimiter": "3.4.5",
-		"@types/rename": "1.0.6",
-		"@types/sanitize-html": "2.9.3",
-		"@types/semver": "7.5.4",
+		"@types/nodemailer": "6.4.11",
+		"@types/oauth": "0.9.2",
+		"@types/oauth2orize": "1.11.1",
+		"@types/oauth2orize-pkce": "0.1.0",
+		"@types/pg": "8.10.2",
+		"@types/pug": "2.0.6",
+		"@types/punycode": "2.1.0",
+		"@types/qrcode": "1.5.2",
+		"@types/random-seed": "0.3.3",
+		"@types/ratelimiter": "3.4.4",
+		"@types/rename": "1.0.4",
+		"@types/sanitize-html": "2.9.0",
+		"@types/semver": "7.5.2",
 		"@types/sharp": "0.32.0",
-		"@types/simple-oauth2": "5.0.6",
-		"@types/sinonjs__fake-timers": "8.1.4",
-		"@types/tinycolor2": "1.4.5",
-		"@types/tmp": "0.2.5",
-		"@types/vary": "1.1.2",
-		"@types/web-push": "3.6.2",
-		"@types/ws": "8.5.8",
-		"@typescript-eslint/eslint-plugin": "6.8.0",
-		"@typescript-eslint/parser": "6.8.0",
+		"@types/simple-oauth2": "5.0.4",
+		"@types/sinonjs__fake-timers": "8.1.2",
+		"@types/tinycolor2": "1.4.4",
+		"@types/tmp": "0.2.4",
+		"@types/vary": "1.1.0",
+		"@types/web-push": "3.6.0",
+		"@types/ws": "8.5.5",
+		"@typescript-eslint/eslint-plugin": "6.7.2",
+		"@typescript-eslint/parser": "6.7.2",
 		"aws-sdk-client-mock": "3.0.0",
 		"cross-env": "7.0.3",
-		"eslint": "8.51.0",
+		"eslint": "8.50.0",
 		"eslint-plugin-import": "2.28.1",
 		"execa": "8.0.1",
 		"jest": "29.7.0",

packages/backend/src/GlobalModule.ts

@@ -70,19 +70,11 @@ const $redisForSub: Provider = {
 	inject: [DI.config],
 };
 
-const $redisForTimelines: Provider = {
-	provide: DI.redisForTimelines,
-	useFactory: (config: Config) => {
-		return new Redis.Redis(config.redisForTimelines);
-	},
-	inject: [DI.config],
-};
-
 @Global()
 @Module({
 	imports: [RepositoryModule],
-	providers: [$config, $db, $meilisearch, $redis, $redisForPub, $redisForSub, $redisForTimelines],
-	exports: [$config, $db, $meilisearch, $redis, $redisForPub, $redisForSub, $redisForTimelines, RepositoryModule],
+	providers: [$config, $db, $meilisearch, $redis, $redisForPub, $redisForSub],
+	exports: [$config, $db, $meilisearch, $redis, $redisForPub, $redisForSub, RepositoryModule],
 })
 export class GlobalModule implements OnApplicationShutdown {
 	constructor(
@@ -90,7 +82,6 @@ export class GlobalModule implements OnApplicationShutdown {
 		@Inject(DI.redis) private redisClient: Redis.Redis,
 		@Inject(DI.redisForPub) private redisForPub: Redis.Redis,
 		@Inject(DI.redisForSub) private redisForSub: Redis.Redis,
-		@Inject(DI.redisForTimelines) private redisForTimelines: Redis.Redis,
 	) {}
 
 	public async dispose(): Promise<void> {
@@ -107,7 +98,6 @@ export class GlobalModule implements OnApplicationShutdown {
 			this.redisClient.disconnect(),
 			this.redisForPub.disconnect(),
 			this.redisForSub.disconnect(),
-			this.redisForTimelines.disconnect(),
 		]);
 	}
 

packages/backend/src/boot/common.ts

@@ -17,6 +17,7 @@ export async function server() {
 	const app = await NestFactory.createApplicationContext(MainModule, {
 		logger: new NestLogger(),
 	});
+	app.enableShutdownHooks();
 
 	const serverService = app.get(ServerService);
 	await serverService.launch();
@@ -34,6 +35,7 @@ export async function jobQueue() {
 	const jobQueue = await NestFactory.createApplicationContext(QueueProcessorModule, {
 		logger: new NestLogger(),
 	});
+	jobQueue.enableShutdownHooks();
 
 	jobQueue.get(QueueProcessorService).start();
 	jobQueue.get(ChartManagementService).start();

packages/backend/src/boot/master.ts

@@ -63,7 +63,6 @@ export async function masterMain() {
 		showNodejsVersion();
 		config = loadConfigBoot();
 		//await connectDb();
-		if (config.pidFile) fs.writeFileSync(config.pidFile, process.pid.toString());
 	} catch (e) {
 		bootLogger.error('Fatal error occurred during initialization', null, true);
 		process.exit(1);

packages/backend/src/config.ts

@@ -47,7 +47,6 @@ type Source = {
 	redis: RedisOptionsSource;
 	redisForPubsub?: RedisOptionsSource;
 	redisForJobQueue?: RedisOptionsSource;
-	redisForTimelines?: RedisOptionsSource;
 	meilisearch?: {
 		host: string;
 		port: string;
@@ -90,7 +89,6 @@ type Source = {
 	perChannelMaxNoteCacheCount?: number;
 	perUserNotificationsMaxCount?: number;
 	deactivateAntennaThreshold?: number;
-	pidFile: string;
 };
 
 export type Config = {
@@ -162,11 +160,9 @@ export type Config = {
 	redis: RedisOptions & RedisOptionsSource;
 	redisForPubsub: RedisOptions & RedisOptionsSource;
 	redisForJobQueue: RedisOptions & RedisOptionsSource;
-	redisForTimelines: RedisOptions & RedisOptionsSource;
 	perChannelMaxNoteCacheCount: number;
 	perUserNotificationsMaxCount: number;
 	deactivateAntennaThreshold: number;
-	pidFile: string;
 };
 
 const _filename = fileURLToPath(import.meta.url);
@@ -229,7 +225,6 @@ export function loadConfig(): Config {
 		redis,
 		redisForPubsub: config.redisForPubsub ? convertRedisOptions(config.redisForPubsub, host) : redis,
 		redisForJobQueue: config.redisForJobQueue ? convertRedisOptions(config.redisForJobQueue, host) : redis,
-		redisForTimelines: config.redisForTimelines ? convertRedisOptions(config.redisForTimelines, host) : redis,
 		id: config.id,
 		proxy: config.proxy,
 		proxySmtp: config.proxySmtp,
@@ -260,7 +255,6 @@ export function loadConfig(): Config {
 		perChannelMaxNoteCacheCount: config.perChannelMaxNoteCacheCount ?? 1000,
 		perUserNotificationsMaxCount: config.perUserNotificationsMaxCount ?? 300,
 		deactivateAntennaThreshold: config.deactivateAntennaThreshold ?? (1000 * 60 * 60 * 24 * 7),
-		pidFile: config.pidFile,
 	};
 }
 

packages/backend/src/core/AccountMoveService.ts

@@ -9,7 +9,7 @@ import { IsNull, In, MoreThan, Not } from 'typeorm';
 import { bindThis } from '@/decorators.js';
 import { DI } from '@/di-symbols.js';
 import type { MiLocalUser, MiRemoteUser, MiUser } from '@/models/User.js';
-import type { BlockingsRepository, FollowingsRepository, InstancesRepository, MutingsRepository, UserListMembershipsRepository, UsersRepository } from '@/models/_.js';
+import type { BlockingsRepository, FollowingsRepository, InstancesRepository, MutingsRepository, UserListJoiningsRepository, UsersRepository } from '@/models/_.js';
 import type { RelationshipJobData, ThinUser } from '@/queue/types.js';
 
 import { IdService } from '@/core/IdService.js';
@@ -42,8 +42,8 @@ export class AccountMoveService {
 		@Inject(DI.mutingsRepository)
 		private mutingsRepository: MutingsRepository,
 
-		@Inject(DI.userListMembershipsRepository)
-		private userListMembershipsRepository: UserListMembershipsRepository,
+		@Inject(DI.userListJoiningsRepository)
+		private userListJoiningsRepository: UserListJoiningsRepository,
 
 		@Inject(DI.instancesRepository)
 		private instancesRepository: InstancesRepository,
@@ -180,13 +180,13 @@ export class AccountMoveService {
 			{ muteeId: dst.id, expiresAt: IsNull() },
 		).then(mutings => mutings.map(muting => muting.muterId));
 
-		const newMutings: Map<string, { muterId: string; muteeId: string; expiresAt: Date | null; }> = new Map();
+		const newMutings: Map<string, { muterId: string; muteeId: string; createdAt: Date; expiresAt: Date | null; }> = new Map();
 
 		// 重複しないようにIDを生成
 		const genId = (): string => {
 			let id: string;
 			do {
-				id = this.idService.gen();
+				id = this.idService.genId();
 			} while (newMutings.has(id));
 			return id;
 		};
@@ -194,6 +194,7 @@ export class AccountMoveService {
 			if (existingMutingsMuterUserIds.includes(muting.muterId)) continue; // skip if already muted indefinitely
 			newMutings.set(genId(), {
 				...muting,
+				createdAt: new Date(),
 				muteeId: dst.id,
 			});
 		}
@@ -214,40 +215,40 @@ export class AccountMoveService {
 	@bindThis
 	public async updateLists(src: ThinUser, dst: MiUser): Promise<void> {
 		// Return if there is no list to be updated.
-		const oldMemberships = await this.userListMembershipsRepository.find({
+		const oldJoinings = await this.userListJoiningsRepository.find({
 			where: {
 				userId: src.id,
 			},
 		});
-		if (oldMemberships.length === 0) return;
+		if (oldJoinings.length === 0) return;
 
-		const existingUserListIds = await this.userListMembershipsRepository.find({
+		const existingUserListIds = await this.userListJoiningsRepository.find({
 			where: {
 				userId: dst.id,
 			},
-		}).then(memberships => memberships.map(membership => membership.userListId));
+		}).then(joinings => joinings.map(joining => joining.userListId));
 
-		const newMemberships: Map<string, { userId: string; userListId: string; userListUserId: string; }> = new Map();
+		const newJoinings: Map<string, { createdAt: Date; userId: string; userListId: string; }> = new Map();
 
 		// 重複しないようにIDを生成
 		const genId = (): string => {
 			let id: string;
 			do {
-				id = this.idService.gen();
-			} while (newMemberships.has(id));
+				id = this.idService.genId();
+			} while (newJoinings.has(id));
 			return id;
 		};
-		for (const membership of oldMemberships) {
-			if (existingUserListIds.includes(membership.userListId)) continue; // skip if dst exists in this user's list
-			newMemberships.set(genId(), {
+		for (const joining of oldJoinings) {
+			if (existingUserListIds.includes(joining.userListId)) continue; // skip if dst exists in this user's list
+			newJoinings.set(genId(), {
+				createdAt: new Date(),
 				userId: dst.id,
-				userListId: membership.userListId,
-				userListUserId: membership.userListUserId,
+				userListId: joining.userListId,
 			});
 		}
 
-		const arrayToInsert = Array.from(newMemberships.entries()).map(entry => ({ ...entry[1], id: entry[0] }));
-		await this.userListMembershipsRepository.insert(arrayToInsert);
+		const arrayToInsert = Array.from(newJoinings.entries()).map(entry => ({ ...entry[1], id: entry[0] }));
+		await this.userListJoiningsRepository.insert(arrayToInsert);
 
 		// Have the proxy account follow the new account in the same way as UserListService.push
 		if (this.userEntityService.isRemoteUser(dst)) {

packages/backend/src/core/AnnouncementService.ts

@@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common';
 import { Brackets } from 'typeorm';
 import { DI } from '@/di-symbols.js';
 import type { MiUser } from '@/models/User.js';
-import type { AnnouncementReadsRepository, AnnouncementsRepository, MiAnnouncement, MiAnnouncementRead, UsersRepository } from '@/models/_.js';
+import type { AnnouncementReadsRepository, AnnouncementsRepository, MiAnnouncement, MiAnnouncementRead } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
 import { Packed } from '@/misc/json-schema.js';
 import { IdService } from '@/core/IdService.js';
@@ -23,9 +23,6 @@ export class AnnouncementService {
 		@Inject(DI.announcementReadsRepository)
 		private announcementReadsRepository: AnnouncementReadsRepository,
 
-		@Inject(DI.usersRepository)
-		private usersRepository: UsersRepository,
-
 		private idService: IdService,
 		private globalEventService: GlobalEventService,
 		private moderationLogService: ModerationLogService,
@@ -53,7 +50,7 @@ export class AnnouncementService {
 			}))
 			.andWhere(new Brackets(qb => {
 				qb.orWhere('announcement.forExistingUsers = false');
-				qb.orWhere('announcement.id > :userId', { userId: user.id });
+				qb.orWhere('announcement.createdAt > :createdAt', { createdAt: user.createdAt });
 			}))
 			.andWhere(`announcement.id NOT IN (${ readsQuery.getQuery() })`);
 
@@ -65,7 +62,8 @@ export class AnnouncementService {
 	@bindThis
 	public async create(values: Partial<MiAnnouncement>, moderator?: MiUser): Promise<{ raw: MiAnnouncement; packed: Packed<'Announcement'> }> {
 		const announcement = await this.announcementsRepository.insert({
-			id: this.idService.gen(),
+			id: this.idService.genId(),
+			createdAt: new Date(),
 			updatedAt: null,
 			title: values.title,
 			text: values.text,
@@ -85,13 +83,10 @@ export class AnnouncementService {
 			});
 
 			if (moderator) {
-				const user = await this.usersRepository.findOneByOrFail({ id: values.userId });
 				this.moderationLogService.log(moderator, 'createUserAnnouncement', {
 					announcementId: announcement.id,
 					announcement: announcement,
 					userId: values.userId,
-					userUsername: user.username,
-					userHost: user.host,
 				});
 			}
 		} else {
@@ -132,14 +127,10 @@ export class AnnouncementService {
 
 		if (moderator) {
 			if (announcement.userId) {
-				const user = await this.usersRepository.findOneByOrFail({ id: announcement.userId });
 				this.moderationLogService.log(moderator, 'updateUserAnnouncement', {
 					announcementId: announcement.id,
 					before: announcement,
 					after: after,
-					userId: announcement.userId,
-					userUsername: user.username,
-					userHost: user.host,
 				});
 			} else {
 				this.moderationLogService.log(moderator, 'updateGlobalAnnouncement', {
@@ -157,13 +148,9 @@ export class AnnouncementService {
 
 		if (moderator) {
 			if (announcement.userId) {
-				const user = await this.usersRepository.findOneByOrFail({ id: announcement.userId });
 				this.moderationLogService.log(moderator, 'deleteUserAnnouncement', {
 					announcementId: announcement.id,
 					announcement: announcement,
-					userId: announcement.userId,
-					userUsername: user.username,
-					userHost: user.host,
 				});
 			} else {
 				this.moderationLogService.log(moderator, 'deleteGlobalAnnouncement', {
@@ -178,7 +165,8 @@ export class AnnouncementService {
 	public async read(user: MiUser, announcementId: MiAnnouncement['id']): Promise<void> {
 		try {
 			await this.announcementReadsRepository.insert({
-				id: this.idService.gen(),
+				id: this.idService.genId(),
+				createdAt: new Date(),
 				announcementId: announcementId,
 				userId: user.id,
 			});
@@ -202,7 +190,7 @@ export class AnnouncementService {
 		const reads = me ? (options?.reads ?? await this.getReads(me.id)) : [];
 		return announcements.map(announcement => ({
 			id: announcement.id,
-			createdAt: this.idService.parse(announcement.id).date.toISOString(),
+			createdAt: announcement.createdAt.toISOString(),
 			updatedAt: announcement.updatedAt?.toISOString() ?? null,
 			text: announcement.text,
 			title: announcement.title,

packages/backend/src/core/AntennaService.ts

@@ -12,11 +12,10 @@ import { GlobalEventService } from '@/core/GlobalEventService.js';
 import * as Acct from '@/misc/acct.js';
 import type { Packed } from '@/misc/json-schema.js';
 import { DI } from '@/di-symbols.js';
-import type { AntennasRepository, UserListMembershipsRepository } from '@/models/_.js';
+import type { AntennasRepository, UserListJoiningsRepository } from '@/models/_.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
-import type { GlobalEvents } from '@/core/GlobalEventService.js';
-import { FunoutTimelineService } from '@/core/FunoutTimelineService.js';
+import { StreamMessages } from '@/server/api/stream/types.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
 @Injectable()
@@ -25,8 +24,8 @@ export class AntennaService implements OnApplicationShutdown {
 	private antennas: MiAntenna[];
 
 	constructor(
-		@Inject(DI.redisForTimelines)
-		private redisForTimelines: Redis.Redis,
+		@Inject(DI.redis)
+		private redisClient: Redis.Redis,
 
 		@Inject(DI.redisForSub)
 		private redisForSub: Redis.Redis,
@@ -34,12 +33,11 @@ export class AntennaService implements OnApplicationShutdown {
 		@Inject(DI.antennasRepository)
 		private antennasRepository: AntennasRepository,
 
-		@Inject(DI.userListMembershipsRepository)
-		private userListMembershipsRepository: UserListMembershipsRepository,
+		@Inject(DI.userListJoiningsRepository)
+		private userListJoiningsRepository: UserListJoiningsRepository,
 
 		private utilityService: UtilityService,
 		private globalEventService: GlobalEventService,
-		private funoutTimelineService: FunoutTimelineService,
 	) {
 		this.antennasFetched = false;
 		this.antennas = [];
@@ -52,17 +50,19 @@ export class AntennaService implements OnApplicationShutdown {
 		const obj = JSON.parse(data);
 
 		if (obj.channel === 'internal') {
-			const { type, body } = obj.message as GlobalEvents['internal']['payload'];
+			const { type, body } = obj.message as StreamMessages['internal']['payload'];
 			switch (type) {
 				case 'antennaCreated':
 					this.antennas.push({
 						...body,
+						createdAt: new Date(body.createdAt),
 						lastUsedAt: new Date(body.lastUsedAt),
 					});
 					break;
 				case 'antennaUpdated':
 					this.antennas[this.antennas.findIndex(a => a.id === body.id)] = {
 						...body,
+						createdAt: new Date(body.createdAt),
 						lastUsedAt: new Date(body.lastUsedAt),
 					};
 					break;
@@ -81,10 +81,15 @@ export class AntennaService implements OnApplicationShutdown {
 		const antennasWithMatchResult = await Promise.all(antennas.map(antenna => this.checkHitAntenna(antenna, note, noteUser).then(hit => [antenna, hit] as const)));
 		const matchedAntennas = antennasWithMatchResult.filter(([, hit]) => hit).map(([antenna]) => antenna);
 
-		const redisPipeline = this.redisForTimelines.pipeline();
+		const redisPipeline = this.redisClient.pipeline();
 
 		for (const antenna of matchedAntennas) {
-			this.funoutTimelineService.push(`antennaTimeline:${antenna.id}`, note.id, 200, redisPipeline);
+			redisPipeline.xadd(
+				`antennaTimeline:${antenna.id}`,
+				'MAXLEN', '~', '200',
+				'*',
+				'note', note.id);
+
 			this.globalEventService.publishAntennaStream(antenna.id, 'note', note);
 		}
 
@@ -98,14 +103,12 @@ export class AntennaService implements OnApplicationShutdown {
 		if (note.visibility === 'specified') return false;
 		if (note.visibility === 'followers') return false;
 
-		if (antenna.localOnly && noteUser.host != null) return false;
-
 		if (!antenna.withReplies && note.replyId != null) return false;
 
 		if (antenna.src === 'home') {
 			// TODO
 		} else if (antenna.src === 'list') {
-			const listUsers = (await this.userListMembershipsRepository.findBy({
+			const listUsers = (await this.userListJoiningsRepository.findBy({
 				userListId: antenna.userListId!,
 			})).map(x => x.userId);
 

packages/backend/src/core/AvatarDecorationService.ts

@@ -1,129 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
-import * as Redis from 'ioredis';
-import type { AvatarDecorationsRepository, MiAvatarDecoration, MiUser } from '@/models/_.js';
-import { IdService } from '@/core/IdService.js';
-import { GlobalEventService } from '@/core/GlobalEventService.js';
-import { DI } from '@/di-symbols.js';
-import { bindThis } from '@/decorators.js';
-import { MemorySingleCache } from '@/misc/cache.js';
-import type { GlobalEvents } from '@/core/GlobalEventService.js';
-import { ModerationLogService } from '@/core/ModerationLogService.js';
-
-@Injectable()
-export class AvatarDecorationService implements OnApplicationShutdown {
-	public cache: MemorySingleCache<MiAvatarDecoration[]>;
-
-	constructor(
-		@Inject(DI.redisForSub)
-		private redisForSub: Redis.Redis,
-
-		@Inject(DI.avatarDecorationsRepository)
-		private avatarDecorationsRepository: AvatarDecorationsRepository,
-
-		private idService: IdService,
-		private moderationLogService: ModerationLogService,
-		private globalEventService: GlobalEventService,
-	) {
-		this.cache = new MemorySingleCache<MiAvatarDecoration[]>(1000 * 60 * 30);
-
-		this.redisForSub.on('message', this.onMessage);
-	}
-
-	@bindThis
-	private async onMessage(_: string, data: string): Promise<void> {
-		const obj = JSON.parse(data);
-
-		if (obj.channel === 'internal') {
-			const { type, body } = obj.message as GlobalEvents['internal']['payload'];
-			switch (type) {
-				case 'avatarDecorationCreated':
-				case 'avatarDecorationUpdated':
-				case 'avatarDecorationDeleted': {
-					this.cache.delete();
-					break;
-				}
-				default:
-					break;
-			}
-		}
-	}
-
-	@bindThis
-	public async create(options: Partial<MiAvatarDecoration>, moderator?: MiUser): Promise<MiAvatarDecoration> {
-		const created = await this.avatarDecorationsRepository.insert({
-			id: this.idService.gen(),
-			...options,
-		}).then(x => this.avatarDecorationsRepository.findOneByOrFail(x.identifiers[0]));
-
-		this.globalEventService.publishInternalEvent('avatarDecorationCreated', created);
-
-		if (moderator) {
-			this.moderationLogService.log(moderator, 'createAvatarDecoration', {
-				avatarDecorationId: created.id,
-				avatarDecoration: created,
-			});
-		}
-
-		return created;
-	}
-
-	@bindThis
-	public async update(id: MiAvatarDecoration['id'], params: Partial<MiAvatarDecoration>, moderator?: MiUser): Promise<void> {
-		const avatarDecoration = await this.avatarDecorationsRepository.findOneByOrFail({ id });
-
-		const date = new Date();
-		await this.avatarDecorationsRepository.update(avatarDecoration.id, {
-			updatedAt: date,
-			...params,
-		});
-
-		const updated = await this.avatarDecorationsRepository.findOneByOrFail({ id: avatarDecoration.id });
-		this.globalEventService.publishInternalEvent('avatarDecorationUpdated', updated);
-
-		if (moderator) {
-			this.moderationLogService.log(moderator, 'updateAvatarDecoration', {
-				avatarDecorationId: avatarDecoration.id,
-				before: avatarDecoration,
-				after: updated,
-			});
-		}
-	}
-
-	@bindThis
-	public async delete(id: MiAvatarDecoration['id'], moderator?: MiUser): Promise<void> {
-		const avatarDecoration = await this.avatarDecorationsRepository.findOneByOrFail({ id });
-
-		await this.avatarDecorationsRepository.delete({ id: avatarDecoration.id });
-		this.globalEventService.publishInternalEvent('avatarDecorationDeleted', avatarDecoration);
-
-		if (moderator) {
-			this.moderationLogService.log(moderator, 'deleteAvatarDecoration', {
-				avatarDecorationId: avatarDecoration.id,
-				avatarDecoration: avatarDecoration,
-			});
-		}
-	}
-
-	@bindThis
-	public async getAll(noCache = false): Promise<MiAvatarDecoration[]> {
-		if (noCache) {
-			this.cache.delete();
-		}
-		return this.cache.fetch(() => this.avatarDecorationsRepository.find());
-	}
-
-	@bindThis
-	public dispose(): void {
-		this.redisForSub.off('message', this.onMessage);
-	}
-
-	@bindThis
-	public onApplicationShutdown(signal?: string | undefined): void {
-		this.dispose();
-	}
-}

packages/backend/src/core/CacheService.ts

@@ -5,13 +5,13 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
-import type { BlockingsRepository, ChannelFollowingsRepository, FollowingsRepository, MutingsRepository, RenoteMutingsRepository, MiUserProfile, UserProfilesRepository, UsersRepository, MiFollowing } from '@/models/_.js';
+import type { BlockingsRepository, ChannelFollowingsRepository, FollowingsRepository, MutingsRepository, RenoteMutingsRepository, MiUserProfile, UserProfilesRepository, UsersRepository } from '@/models/_.js';
 import { MemoryKVCache, RedisKVCache } from '@/misc/cache.js';
 import type { MiLocalUser, MiUser } from '@/models/User.js';
 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 { StreamMessages } from '@/server/api/stream/types.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
 @Injectable()
@@ -25,7 +25,7 @@ export class CacheService implements OnApplicationShutdown {
 	public userBlockingCache: RedisKVCache<Set<string>>;
 	public userBlockedCache: RedisKVCache<Set<string>>; // NOTE: 「被」Blockキャッシュ
 	public renoteMutingsCache: RedisKVCache<Set<string>>;
-	public userFollowingsCache: RedisKVCache<Record<string, Pick<MiFollowing, 'withReplies'> | undefined>>;
+	public userFollowingsCache: RedisKVCache<Set<string>>;
 	public userFollowingChannelsCache: RedisKVCache<Set<string>>;
 
 	constructor(
@@ -136,18 +136,12 @@ export class CacheService implements OnApplicationShutdown {
 			fromRedisConverter: (value) => new Set(JSON.parse(value)),
 		});
 
-		this.userFollowingsCache = new RedisKVCache<Record<string, Pick<MiFollowing, 'withReplies'> | undefined>>(this.redisClient, 'userFollowings', {
+		this.userFollowingsCache = new RedisKVCache<Set<string>>(this.redisClient, 'userFollowings', {
 			lifetime: 1000 * 60 * 30, // 30m
 			memoryCacheLifetime: 1000 * 60, // 1m
-			fetcher: (key) => this.followingsRepository.find({ where: { followerId: key }, select: ['followeeId', 'withReplies'] }).then(xs => {
-				const obj: Record<string, Pick<MiFollowing, 'withReplies'> | undefined> = {};
-				for (const x of xs) {
-					obj[x.followeeId] = { withReplies: x.withReplies };
-				}
-				return obj;
-			}),
-			toRedisConverter: (value) => JSON.stringify(value),
-			fromRedisConverter: (value) => JSON.parse(value),
+			fetcher: (key) => this.followingsRepository.find({ where: { followerId: key }, select: ['followeeId'] }).then(xs => new Set(xs.map(x => x.followeeId))),
+			toRedisConverter: (value) => JSON.stringify(Array.from(value)),
+			fromRedisConverter: (value) => new Set(JSON.parse(value)),
 		});
 
 		this.userFollowingChannelsCache = new RedisKVCache<Set<string>>(this.redisClient, 'userFollowingChannels', {
@@ -166,7 +160,7 @@ export class CacheService implements OnApplicationShutdown {
 		const obj = JSON.parse(data);
 
 		if (obj.channel === 'internal') {
-			const { type, body } = obj.message as GlobalEvents['internal']['payload'];
+			const { type, body } = obj.message as StreamMessages['internal']['payload'];
 			switch (type) {
 				case 'userChangeSuspendedState':
 				case 'remoteUserUpdated': {
@@ -194,7 +188,6 @@ export class CacheService implements OnApplicationShutdown {
 					if (follower) follower.followingCount++;
 					const followee = this.userByIdCache.get(body.followeeId);
 					if (followee) followee.followersCount++;
-					this.userFollowingsCache.delete(body.followerId);
 					break;
 				}
 				default:

packages/backend/src/core/ClipService.ts

@@ -46,7 +46,8 @@ export class ClipService {
 		}
 
 		const clip = await this.clipsRepository.insert({
-			id: this.idService.gen(),
+			id: this.idService.genId(),
+			createdAt: new Date(),
 			userId: me.id,
 			name: name,
 			isPublic: isPublic,
@@ -108,7 +109,7 @@ export class ClipService {
 
 		try {
 			await this.clipNotesRepository.insert({
-				id: this.idService.gen(),
+				id: this.idService.genId(),
 				noteId: noteId,
 				clipId: clip.id,
 			});

packages/backend/src/core/CoreModule.ts

@@ -11,7 +11,6 @@ import { AnnouncementService } from './AnnouncementService.js';
 import { AntennaService } from './AntennaService.js';
 import { AppLockService } from './AppLockService.js';
 import { AchievementService } from './AchievementService.js';
-import { AvatarDecorationService } from './AvatarDecorationService.js';
 import { CaptchaService } from './CaptchaService.js';
 import { CreateSystemUserService } from './CreateSystemUserService.js';
 import { CustomEmojiService } from './CustomEmojiService.js';
@@ -47,7 +46,6 @@ import { SignupService } from './SignupService.js';
 import { WebAuthnService } from './WebAuthnService.js';
 import { UserBlockingService } from './UserBlockingService.js';
 import { CacheService } from './CacheService.js';
-import { UserService } from './UserService.js';
 import { UserFollowingService } from './UserFollowingService.js';
 import { UserKeypairService } from './UserKeypairService.js';
 import { UserListService } from './UserListService.js';
@@ -61,8 +59,6 @@ import { UtilityService } from './UtilityService.js';
 import { FileInfoService } from './FileInfoService.js';
 import { SearchService } from './SearchService.js';
 import { ClipService } from './ClipService.js';
-import { FeaturedService } from './FeaturedService.js';
-import { FunoutTimelineService } from './FunoutTimelineService.js';
 import { ChartLoggerService } from './chart/ChartLoggerService.js';
 import FederationChart from './chart/charts/federation.js';
 import NotesChart from './chart/charts/notes.js';
@@ -141,7 +137,6 @@ const $AnnouncementService: Provider = { provide: 'AnnouncementService', useExis
 const $AntennaService: Provider = { provide: 'AntennaService', useExisting: AntennaService };
 const $AppLockService: Provider = { provide: 'AppLockService', useExisting: AppLockService };
 const $AchievementService: Provider = { provide: 'AchievementService', useExisting: AchievementService };
-const $AvatarDecorationService: Provider = { provide: 'AvatarDecorationService', useExisting: AvatarDecorationService };
 const $CaptchaService: Provider = { provide: 'CaptchaService', useExisting: CaptchaService };
 const $CreateSystemUserService: Provider = { provide: 'CreateSystemUserService', useExisting: CreateSystemUserService };
 const $CustomEmojiService: Provider = { provide: 'CustomEmojiService', useExisting: CustomEmojiService };
@@ -178,7 +173,6 @@ const $SignupService: Provider = { provide: 'SignupService', useExisting: Signup
 const $WebAuthnService: Provider = { provide: 'WebAuthnService', useExisting: WebAuthnService };
 const $UserBlockingService: Provider = { provide: 'UserBlockingService', useExisting: UserBlockingService };
 const $CacheService: Provider = { provide: 'CacheService', useExisting: CacheService };
-const $UserService: Provider = { provide: 'UserService', useExisting: UserService };
 const $UserFollowingService: Provider = { provide: 'UserFollowingService', useExisting: UserFollowingService };
 const $UserKeypairService: Provider = { provide: 'UserKeypairService', useExisting: UserKeypairService };
 const $UserListService: Provider = { provide: 'UserListService', useExisting: UserListService };
@@ -191,8 +185,6 @@ const $UtilityService: Provider = { provide: 'UtilityService', useExisting: Util
 const $FileInfoService: Provider = { provide: 'FileInfoService', useExisting: FileInfoService };
 const $SearchService: Provider = { provide: 'SearchService', useExisting: SearchService };
 const $ClipService: Provider = { provide: 'ClipService', useExisting: ClipService };
-const $FeaturedService: Provider = { provide: 'FeaturedService', useExisting: FeaturedService };
-const $FunoutTimelineService: Provider = { provide: 'FunoutTimelineService', useExisting: FunoutTimelineService };
 
 const $ChartLoggerService: Provider = { provide: 'ChartLoggerService', useExisting: ChartLoggerService };
 const $FederationChart: Provider = { provide: 'FederationChart', useExisting: FederationChart };
@@ -275,7 +267,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		AntennaService,
 		AppLockService,
 		AchievementService,
-		AvatarDecorationService,
 		CaptchaService,
 		CreateSystemUserService,
 		CustomEmojiService,
@@ -312,7 +303,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		WebAuthnService,
 		UserBlockingService,
 		CacheService,
-		UserService,
 		UserFollowingService,
 		UserKeypairService,
 		UserListService,
@@ -325,8 +315,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		FileInfoService,
 		SearchService,
 		ClipService,
-		FeaturedService,
-		FunoutTimelineService,
 		ChartLoggerService,
 		FederationChart,
 		NotesChart,
@@ -402,7 +390,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$AntennaService,
 		$AppLockService,
 		$AchievementService,
-		$AvatarDecorationService,
 		$CaptchaService,
 		$CreateSystemUserService,
 		$CustomEmojiService,
@@ -439,7 +426,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$WebAuthnService,
 		$UserBlockingService,
 		$CacheService,
-		$UserService,
 		$UserFollowingService,
 		$UserKeypairService,
 		$UserListService,
@@ -452,8 +438,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$FileInfoService,
 		$SearchService,
 		$ClipService,
-		$FeaturedService,
-		$FunoutTimelineService,
 		$ChartLoggerService,
 		$FederationChart,
 		$NotesChart,
@@ -530,7 +514,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		AntennaService,
 		AppLockService,
 		AchievementService,
-		AvatarDecorationService,
 		CaptchaService,
 		CreateSystemUserService,
 		CustomEmojiService,
@@ -567,7 +550,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		WebAuthnService,
 		UserBlockingService,
 		CacheService,
-		UserService,
 		UserFollowingService,
 		UserKeypairService,
 		UserListService,
@@ -580,8 +562,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		FileInfoService,
 		SearchService,
 		ClipService,
-		FeaturedService,
-		FunoutTimelineService,
 		FederationChart,
 		NotesChart,
 		UsersChart,
@@ -656,7 +636,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$AntennaService,
 		$AppLockService,
 		$AchievementService,
-		$AvatarDecorationService,
 		$CaptchaService,
 		$CreateSystemUserService,
 		$CustomEmojiService,
@@ -693,7 +672,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$WebAuthnService,
 		$UserBlockingService,
 		$CacheService,
-		$UserService,
 		$UserFollowingService,
 		$UserKeypairService,
 		$UserListService,
@@ -706,8 +684,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$FileInfoService,
 		$SearchService,
 		$ClipService,
-		$FeaturedService,
-		$FunoutTimelineService,
 		$FederationChart,
 		$NotesChart,
 		$UsersChart,

packages/backend/src/core/CreateSystemUserService.ts

@@ -52,7 +52,8 @@ export class CreateSystemUserService {
 			if (exist) throw new Error('the user is already exists');
 
 			account = await transactionalEntityManager.insert(MiUser, {
-				id: this.idService.gen(),
+				id: this.idService.genId(),
+				createdAt: new Date(),
 				username: username,
 				usernameLower: username.toLowerCase(),
 				host: null,

packages/backend/src/core/CustomEmojiService.ts

@@ -17,7 +17,7 @@ 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 type { Serialized } from '@/server/api/stream/types.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
 
 const parseEmojiStrRegexp = /^(\w+)(?:@([\w.-]+))?$/;
@@ -48,6 +48,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 			fetcher: () => this.emojisRepository.find({ where: { host: IsNull() } }).then(emojis => new Map(emojis.map(emoji => [emoji.name, emoji]))),
 			toRedisConverter: (value) => JSON.stringify(Array.from(value.values())),
 			fromRedisConverter: (value) => {
+				if (!Array.isArray(JSON.parse(value))) return undefined; // 古いバージョンの壊れたキャッシュが残っていることがある(そのうち消す)
 				return new Map(JSON.parse(value).map((x: Serialized<MiEmoji>) => [x.name, {
 					...x,
 					updatedAt: x.updatedAt ? new Date(x.updatedAt) : null,
@@ -69,7 +70,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		roleIdsThatCanBeUsedThisEmojiAsReaction: MiRole['id'][];
 	}, moderator?: MiUser): Promise<MiEmoji> {
 		const emoji = await this.emojisRepository.insert({
-			id: this.idService.gen(),
+			id: this.idService.genId(),
 			updatedAt: new Date(),
 			name: data.name,
 			category: data.category,
@@ -133,11 +134,11 @@ export class CustomEmojiService implements OnApplicationShutdown {
 
 		this.localEmojisCache.refresh();
 
-		const packed = await this.emojiEntityService.packDetailed(emoji.id);
+		const updated = await this.emojiEntityService.packDetailed(emoji.id);
 
 		if (emoji.name === data.name) {
 			this.globalEventService.publishBroadcastStream('emojiUpdated', {
-				emojis: [packed],
+				emojis: [updated],
 			});
 		} else {
 			this.globalEventService.publishBroadcastStream('emojiDeleted', {
@@ -145,12 +146,11 @@ export class CustomEmojiService implements OnApplicationShutdown {
 			});
 
 			this.globalEventService.publishBroadcastStream('emojiAdded', {
-				emoji: packed,
+				emoji: updated,
 			});
 		}
 
 		if (moderator) {
-			const updated = await this.emojisRepository.findOneByOrFail({ id: id });
 			this.moderationLogService.log(moderator, 'updateCustomEmoji', {
 				emojiId: emoji.id,
 				before: emoji,
@@ -331,7 +331,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 
 		const queryOrNull = async () => (await this.emojisRepository.findOneBy({
 			name,
-			host,
+			host: host ?? IsNull(),
 		})) ?? null;
 
 		const emoji = await this.cache.fetch(`${name} ${host}`, queryOrNull);
@@ -379,20 +379,6 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		}
 	}
 
-	/**
-	 * ローカル内の絵文字に重複がないかチェックします
-	 * @param name 絵文字名
-	 */
-	@bindThis
-	public checkDuplicate(name: string): Promise<boolean> {
-		return this.emojisRepository.exist({ where: { name, host: IsNull() } });
-	}
-
-	@bindThis
-	public getEmojiById(id: string): Promise<MiEmoji | null> {
-		return this.emojisRepository.findOneBy({ id });
-	}
-
 	@bindThis
 	public dispose(): void {
 		this.cache.dispose();

packages/backend/src/core/DriveService.ts

@@ -564,7 +564,8 @@ export class DriveService {
 		const folder = await fetchFolder();
 
 		let file = new MiDriveFile();
-		file.id = this.idService.gen();
+		file.id = this.idService.genId();
+		file.createdAt = new Date();
 		file.userId = user ? user.id : null;
 		file.userHost = user ? user.host : null;
 		file.folderId = folder !== null ? folder.id : null;
@@ -685,20 +686,15 @@ export class DriveService {
 
 		if (await this.roleService.isModerator(updater) && (file.userId !== updater.id)) {
 			if (values.isSensitive !== undefined && values.isSensitive !== file.isSensitive) {
-				const user = file.userId ? await this.usersRepository.findOneByOrFail({ id: file.userId }) : null;
 				if (values.isSensitive) {
 					this.moderationLogService.log(updater, 'markSensitiveDriveFile', {
 						fileId: file.id,
 						fileUserId: file.userId,
-						fileUserUsername: user?.username ?? null,
-						fileUserHost: user?.host ?? null,
 					});
 				} else {
 					this.moderationLogService.log(updater, 'unmarkSensitiveDriveFile', {
 						fileId: file.id,
 						fileUserId: file.userId,
-						fileUserUsername: user?.username ?? null,
-						fileUserHost: user?.host ?? null,
 					});
 				}
 			}
@@ -799,12 +795,9 @@ export class DriveService {
 		}
 
 		if (deleter && await this.roleService.isModerator(deleter) && (file.userId !== deleter.id)) {
-			const user = file.userId ? await this.usersRepository.findOneByOrFail({ id: file.userId }) : null;
 			this.moderationLogService.log(deleter, 'deleteDriveFile', {
 				fileId: file.id,
 				fileUserId: file.userId,
-				fileUserUsername: user?.username ?? null,
-				fileUserHost: user?.host ?? null,
 			});
 		}
 	}

packages/backend/src/core/FeaturedService.ts

@@ -1,116 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import * as Redis from 'ioredis';
-import type { MiNote, MiUser } from '@/models/_.js';
-import { DI } from '@/di-symbols.js';
-import { bindThis } from '@/decorators.js';
-
-const GLOBAL_NOTES_RANKING_WINDOW = 1000 * 60 * 60 * 24 * 3; // 3日ごと
-const PER_USER_NOTES_RANKING_WINDOW = 1000 * 60 * 60 * 24 * 7; // 1週間ごと
-const HASHTAG_RANKING_WINDOW = 1000 * 60 * 60; // 1時間ごと
-
-@Injectable()
-export class FeaturedService {
-	constructor(
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis, // TODO: 専用のRedisサーバーを設定できるようにする
-	) {
-	}
-
-	@bindThis
-	private getCurrentWindow(windowRange: number): number {
-		const passed = new Date().getTime() - new Date(new Date().getFullYear(), 0, 1).getTime();
-		return Math.floor(passed / windowRange);
-	}
-
-	@bindThis
-	private async updateRankingOf(name: string, windowRange: number, element: string, score = 1): Promise<void> {
-		const currentWindow = this.getCurrentWindow(windowRange);
-		const redisTransaction = this.redisClient.multi();
-		redisTransaction.zincrby(
-			`${name}:${currentWindow}`,
-			score,
-			element);
-		redisTransaction.expire(
-			`${name}:${currentWindow}`,
-			(windowRange * 3) / 1000,
-			'NX'); // "NX -- Set expiry only when the key has no expiry" = 有効期限がないときだけ設定
-		await redisTransaction.exec();
-	}
-
-	@bindThis
-	private async getRankingOf(name: string, windowRange: number, threshold: number): Promise<string[]> {
-		const currentWindow = this.getCurrentWindow(windowRange);
-		const previousWindow = currentWindow - 1;
-
-		const redisPipeline = this.redisClient.pipeline();
-		redisPipeline.zrange(
-			`${name}:${currentWindow}`, 0, threshold, 'REV', 'WITHSCORES');
-		redisPipeline.zrange(
-			`${name}:${previousWindow}`, 0, threshold, 'REV', 'WITHSCORES');
-		const [currentRankingResult, previousRankingResult] = await redisPipeline.exec().then(result => result ? result.map(r => r[1] as string[]) : [[], []]);
-
-		const ranking = new Map<string, number>();
-		for (let i = 0; i < currentRankingResult.length; i += 2) {
-			const noteId = currentRankingResult[i];
-			const score = parseInt(currentRankingResult[i + 1], 10);
-			ranking.set(noteId, score);
-		}
-		for (let i = 0; i < previousRankingResult.length; i += 2) {
-			const noteId = previousRankingResult[i];
-			const score = parseInt(previousRankingResult[i + 1], 10);
-			const exist = ranking.get(noteId);
-			if (exist != null) {
-				ranking.set(noteId, (exist + score) / 2);
-			} else {
-				ranking.set(noteId, score);
-			}
-		}
-
-		return Array.from(ranking.keys());
-	}
-
-	@bindThis
-	public updateGlobalNotesRanking(noteId: MiNote['id'], score = 1): Promise<void> {
-		return this.updateRankingOf('featuredGlobalNotesRanking', GLOBAL_NOTES_RANKING_WINDOW, noteId, score);
-	}
-
-	@bindThis
-	public updateInChannelNotesRanking(channelId: MiNote['channelId'], noteId: MiNote['id'], score = 1): Promise<void> {
-		return this.updateRankingOf(`featuredInChannelNotesRanking:${channelId}`, GLOBAL_NOTES_RANKING_WINDOW, noteId, score);
-	}
-
-	@bindThis
-	public updatePerUserNotesRanking(userId: MiUser['id'], noteId: MiNote['id'], score = 1): Promise<void> {
-		return this.updateRankingOf(`featuredPerUserNotesRanking:${userId}`, PER_USER_NOTES_RANKING_WINDOW, noteId, score);
-	}
-
-	@bindThis
-	public updateHashtagsRanking(hashtag: string, score = 1): Promise<void> {
-		return this.updateRankingOf('featuredHashtagsRanking', HASHTAG_RANKING_WINDOW, hashtag, score);
-	}
-
-	@bindThis
-	public getGlobalNotesRanking(threshold: number): Promise<MiNote['id'][]> {
-		return this.getRankingOf('featuredGlobalNotesRanking', GLOBAL_NOTES_RANKING_WINDOW, threshold);
-	}
-
-	@bindThis
-	public getInChannelNotesRanking(channelId: MiNote['channelId'], threshold: number): Promise<MiNote['id'][]> {
-		return this.getRankingOf(`featuredInChannelNotesRanking:${channelId}`, GLOBAL_NOTES_RANKING_WINDOW, threshold);
-	}
-
-	@bindThis
-	public getPerUserNotesRanking(userId: MiUser['id'], threshold: number): Promise<MiNote['id'][]> {
-		return this.getRankingOf(`featuredPerUserNotesRanking:${userId}`, PER_USER_NOTES_RANKING_WINDOW, threshold);
-	}
-
-	@bindThis
-	public getHashtagsRanking(threshold: number): Promise<string[]> {
-		return this.getRankingOf('featuredHashtagsRanking', HASHTAG_RANKING_WINDOW, threshold);
-	}
-}

packages/backend/src/core/FederatedInstanceService.ts

@@ -56,7 +56,7 @@ export class FederatedInstanceService implements OnApplicationShutdown {
 
 		if (index == null) {
 			const i = await this.instancesRepository.insert({
-				id: this.idService.gen(),
+				id: this.idService.genId(),
 				host,
 				firstRetrievedAt: new Date(),
 			}).then(x => this.instancesRepository.findOneByOrFail(x.identifiers[0]));

packages/backend/src/core/FunoutTimelineService.ts

@@ -1,85 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import * as Redis from 'ioredis';
-import { DI } from '@/di-symbols.js';
-import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
-
-@Injectable()
-export class FunoutTimelineService {
-	constructor(
-		@Inject(DI.redisForTimelines)
-		private redisForTimelines: Redis.Redis,
-
-		private idService: IdService,
-	) {
-	}
-
-	@bindThis
-	public push(tl: string, id: string, maxlen: number, pipeline: Redis.ChainableCommander) {
-		// リモートから遅れて届いた(もしくは後から追加された)投稿日時が古い投稿が追加されるとページネーション時に問題を引き起こすため、
-		// 3分以内に投稿されたものでない場合、Redisにある最古のIDより新しい場合のみ追加する
-		if (this.idService.parse(id).date.getTime() > Date.now() - 1000 * 60 * 3) {
-			pipeline.lpush('list:' + tl, id);
-			if (Math.random() < 0.1) { // 10%の確率でトリム
-				pipeline.ltrim('list:' + tl, 0, maxlen - 1);
-			}
-		} else {
-			// 末尾のIDを取得
-			this.redisForTimelines.lindex('list:' + tl, -1).then(lastId => {
-				if (lastId == null || (this.idService.parse(id).date.getTime() > this.idService.parse(lastId).date.getTime())) {
-					this.redisForTimelines.lpush('list:' + tl, id);
-				} else {
-					Promise.resolve();
-				}
-			});
-		}
-	}
-
-	@bindThis
-	public get(name: string, untilId?: string | null, sinceId?: string | null) {
-		if (untilId && sinceId) {
-			return this.redisForTimelines.lrange('list:' + name, 0, -1)
-				.then(ids => ids.filter(id => id < untilId && id > sinceId).sort((a, b) => a > b ? -1 : 1));
-		} else if (untilId) {
-			return this.redisForTimelines.lrange('list:' + name, 0, -1)
-				.then(ids => ids.filter(id => id < untilId).sort((a, b) => a > b ? -1 : 1));
-		} else if (sinceId) {
-			return this.redisForTimelines.lrange('list:' + name, 0, -1)
-				.then(ids => ids.filter(id => id > sinceId).sort((a, b) => a < b ? -1 : 1));
-		} else {
-			return this.redisForTimelines.lrange('list:' + name, 0, -1)
-				.then(ids => ids.sort((a, b) => a > b ? -1 : 1));
-		}
-	}
-
-	@bindThis
-	public getMulti(name: string[], untilId?: string | null, sinceId?: string | null): Promise<string[][]> {
-		const pipeline = this.redisForTimelines.pipeline();
-		for (const n of name) {
-			pipeline.lrange('list:' + n, 0, -1);
-		}
-		return pipeline.exec().then(res => {
-			if (res == null) return [];
-			const tls = res.map(r => r[1] as string[]);
-			return tls.map(ids =>
-				(untilId && sinceId)
-					? ids.filter(id => id < untilId && id > sinceId).sort((a, b) => a > b ? -1 : 1)
-					: untilId
-						? ids.filter(id => id < untilId).sort((a, b) => a > b ? -1 : 1)
-						: sinceId
-							? ids.filter(id => id > sinceId).sort((a, b) => a < b ? -1 : 1)
-							: ids.sort((a, b) => a > b ? -1 : 1),
-			);
-		});
-	}
-
-	@bindThis
-	public purge(name: string) {
-		return this.redisForTimelines.del('list:' + name);
-	}
-}

packages/backend/src/core/GlobalEventService.ts

@@ -5,257 +5,27 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
-import type { MiChannel } from '@/models/Channel.js';
 import type { MiUser } from '@/models/User.js';
-import type { MiUserProfile } from '@/models/UserProfile.js';
 import type { MiNote } from '@/models/Note.js';
-import type { MiAntenna } from '@/models/Antenna.js';
-import type { MiDriveFile } from '@/models/DriveFile.js';
-import type { MiDriveFolder } from '@/models/DriveFolder.js';
 import type { MiUserList } from '@/models/UserList.js';
-import type { MiAbuseUserReport } from '@/models/AbuseUserReport.js';
-import type { MiSignin } from '@/models/Signin.js';
-import type { MiPage } from '@/models/Page.js';
-import type { MiWebhook } from '@/models/Webhook.js';
-import type { MiMeta } from '@/models/Meta.js';
-import { MiAvatarDecoration, MiRole, MiRoleAssignment } from '@/models/_.js';
+import type { MiAntenna } from '@/models/Antenna.js';
+import type {
+	StreamChannels,
+	AdminStreamTypes,
+	AntennaStreamTypes,
+	BroadcastTypes,
+	DriveStreamTypes,
+	InternalStreamTypes,
+	MainStreamTypes,
+	NoteStreamTypes,
+	UserListStreamTypes,
+	RoleTimelineStreamTypes,
+} from '@/server/api/stream/types.js';
 import type { Packed } from '@/misc/json-schema.js';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { bindThis } from '@/decorators.js';
-import { Serialized } from '@/types.js';
-import type Emitter from 'strict-event-emitter-types';
-import type { EventEmitter } from 'events';
-
-//#region Stream type-body definitions
-export interface BroadcastTypes {
-	emojiAdded: {
-		emoji: Packed<'EmojiDetailed'>;
-	};
-	emojiUpdated: {
-		emojis: Packed<'EmojiDetailed'>[];
-	};
-	emojiDeleted: {
-		emojis: {
-			id?: string;
-			name: string;
-			[other: string]: any;
-		}[];
-	};
-	announcementCreated: {
-		announcement: Packed<'Announcement'>;
-	};
-}
-
-export interface MainEventTypes {
-	notification: Packed<'Notification'>;
-	mention: Packed<'Note'>;
-	reply: Packed<'Note'>;
-	renote: Packed<'Note'>;
-	follow: Packed<'UserDetailedNotMe'>;
-	followed: Packed<'User'>;
-	unfollow: Packed<'User'>;
-	meUpdated: Packed<'User'>;
-	pageEvent: {
-		pageId: MiPage['id'];
-		event: string;
-		var: any;
-		userId: MiUser['id'];
-		user: Packed<'User'>;
-	};
-	urlUploadFinished: {
-		marker?: string | null;
-		file: Packed<'DriveFile'>;
-	};
-	readAllNotifications: undefined;
-	unreadNotification: Packed<'Notification'>;
-	unreadMention: MiNote['id'];
-	readAllUnreadMentions: undefined;
-	unreadSpecifiedNote: MiNote['id'];
-	readAllUnreadSpecifiedNotes: undefined;
-	readAllAntennas: undefined;
-	unreadAntenna: MiAntenna;
-	readAllAnnouncements: undefined;
-	myTokenRegenerated: undefined;
-	signin: MiSignin;
-	registryUpdated: {
-		scope?: string[];
-		key: string;
-		value: any | null;
-	};
-	driveFileCreated: Packed<'DriveFile'>;
-	readAntenna: MiAntenna;
-	receiveFollowRequest: Packed<'User'>;
-	announcementCreated: {
-		announcement: Packed<'Announcement'>;
-	};
-}
-
-export interface DriveEventTypes {
-	fileCreated: Packed<'DriveFile'>;
-	fileDeleted: MiDriveFile['id'];
-	fileUpdated: Packed<'DriveFile'>;
-	folderCreated: Packed<'DriveFolder'>;
-	folderDeleted: MiDriveFolder['id'];
-	folderUpdated: Packed<'DriveFolder'>;
-}
-
-export interface NoteEventTypes {
-	pollVoted: {
-		choice: number;
-		userId: MiUser['id'];
-	};
-	deleted: {
-		deletedAt: Date;
-	};
-	updated: {
-		cw: string | null;
-		text: string;
-	};
-	reacted: {
-		reaction: string;
-		emoji?: {
-			name: string;
-			url: string;
-		} | null;
-		userId: MiUser['id'];
-	};
-	unreacted: {
-		reaction: string;
-		userId: MiUser['id'];
-	};
-}
-type NoteStreamEventTypes = {
-	[key in keyof NoteEventTypes]: {
-		id: MiNote['id'];
-		body: NoteEventTypes[key];
-	};
-};
-
-export interface UserListEventTypes {
-	userAdded: Packed<'User'>;
-	userRemoved: Packed<'User'>;
-}
-
-export interface AntennaEventTypes {
-	note: MiNote;
-}
-
-export interface RoleTimelineEventTypes {
-	note: Packed<'Note'>;
-}
-
-export interface AdminEventTypes {
-	newAbuseUserReport: {
-		id: MiAbuseUserReport['id'];
-		targetUserId: MiUser['id'],
-		reporterId: MiUser['id'],
-		comment: string;
-	};
-}
-//#endregion
-
-// 辞書(interface or type)から{ type, body }ユニオンを定義
-// https://stackoverflow.com/questions/49311989/can-i-infer-the-type-of-a-value-using-extends-keyof-type
-// VS Codeの展開を防止するためにEvents型を定義
-type Events<T extends object> = { [K in keyof T]: { type: K; body: T[K]; } };
-type EventUnionFromDictionary<
-	T extends object,
-	U = Events<T>
-> = U[keyof U];
-
-type SerializedAll<T> = {
-	[K in keyof T]: Serialized<T[K]>;
-};
-
-export interface InternalEventTypes {
-	userChangeSuspendedState: { id: MiUser['id']; isSuspended: MiUser['isSuspended']; };
-	userTokenRegenerated: { id: MiUser['id']; oldToken: string; newToken: string; };
-	remoteUserUpdated: { id: MiUser['id']; };
-	follow: { followerId: MiUser['id']; followeeId: MiUser['id']; };
-	unfollow: { followerId: MiUser['id']; followeeId: MiUser['id']; };
-	blockingCreated: { blockerId: MiUser['id']; blockeeId: MiUser['id']; };
-	blockingDeleted: { blockerId: MiUser['id']; blockeeId: MiUser['id']; };
-	policiesUpdated: MiRole['policies'];
-	roleCreated: MiRole;
-	roleDeleted: MiRole;
-	roleUpdated: MiRole;
-	userRoleAssigned: MiRoleAssignment;
-	userRoleUnassigned: MiRoleAssignment;
-	webhookCreated: MiWebhook;
-	webhookDeleted: MiWebhook;
-	webhookUpdated: MiWebhook;
-	antennaCreated: MiAntenna;
-	antennaDeleted: MiAntenna;
-	antennaUpdated: MiAntenna;
-	avatarDecorationCreated: MiAvatarDecoration;
-	avatarDecorationDeleted: MiAvatarDecoration;
-	avatarDecorationUpdated: MiAvatarDecoration;
-	metaUpdated: MiMeta;
-	followChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
-	unfollowChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
-	updateUserProfile: MiUserProfile;
-	mute: { muterId: MiUser['id']; muteeId: MiUser['id']; };
-	unmute: { muterId: MiUser['id']; muteeId: MiUser['id']; };
-	userListMemberAdded: { userListId: MiUserList['id']; memberId: MiUser['id']; };
-	userListMemberRemoved: { userListId: MiUserList['id']; memberId: MiUser['id']; };
-}
-
-// name/messages(spec) pairs dictionary
-export type GlobalEvents = {
-	internal: {
-		name: 'internal';
-		payload: EventUnionFromDictionary<SerializedAll<InternalEventTypes>>;
-	};
-	broadcast: {
-		name: 'broadcast';
-		payload: EventUnionFromDictionary<SerializedAll<BroadcastTypes>>;
-	};
-	main: {
-		name: `mainStream:${MiUser['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<MainEventTypes>>;
-	};
-	drive: {
-		name: `driveStream:${MiUser['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<DriveEventTypes>>;
-	};
-	note: {
-		name: `noteStream:${MiNote['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<NoteStreamEventTypes>>;
-	};
-	userList: {
-		name: `userListStream:${MiUserList['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<UserListEventTypes>>;
-	};
-	roleTimeline: {
-		name: `roleTimelineStream:${MiRole['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<RoleTimelineEventTypes>>;
-	};
-	antenna: {
-		name: `antennaStream:${MiAntenna['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<AntennaEventTypes>>;
-	};
-	admin: {
-		name: `adminStream:${MiUser['id']}`;
-		payload: EventUnionFromDictionary<SerializedAll<AdminEventTypes>>;
-	};
-	notes: {
-		name: 'notesStream';
-		payload: Serialized<Packed<'Note'>>;
-	};
-};
-
-// API event definitions
-// ストリームごとのEmitterの辞書を用意
-type EventEmitterDictionary = { [x in keyof GlobalEvents]: Emitter.default<EventEmitter, { [y in GlobalEvents[x]['name']]: (e: GlobalEvents[x]['payload']) => void }> };
-// 共用体型を交差型にする型 https://stackoverflow.com/questions/54938141/typescript-convert-union-to-intersection
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
-// Emitter辞書から共用体型を作り、UnionToIntersectionで交差型にする
-export type StreamEventEmitter = UnionToIntersection<EventEmitterDictionary[keyof GlobalEvents]>;
-// { [y in name]: (e: spec) => void }をまとめてその交差型をEmitterにかけるとts(2590)にひっかかる
-
-// provide stream channels union
-export type StreamChannels = GlobalEvents[keyof GlobalEvents]['name'];
+import { MiRole } from '@/models/_.js';
 
 @Injectable()
 export class GlobalEventService {
@@ -281,7 +51,7 @@ export class GlobalEventService {
 	}
 
 	@bindThis
-	public publishInternalEvent<K extends keyof InternalEventTypes>(type: K, value?: InternalEventTypes[K]): void {
+	public publishInternalEvent<K extends keyof InternalStreamTypes>(type: K, value?: InternalStreamTypes[K]): void {
 		this.publish('internal', type, typeof value === 'undefined' ? null : value);
 	}
 
@@ -291,17 +61,17 @@ export class GlobalEventService {
 	}
 
 	@bindThis
-	public publishMainStream<K extends keyof MainEventTypes>(userId: MiUser['id'], type: K, value?: MainEventTypes[K]): void {
+	public publishMainStream<K extends keyof MainStreamTypes>(userId: MiUser['id'], type: K, value?: MainStreamTypes[K]): void {
 		this.publish(`mainStream:${userId}`, type, typeof value === 'undefined' ? null : value);
 	}
 
 	@bindThis
-	public publishDriveStream<K extends keyof DriveEventTypes>(userId: MiUser['id'], type: K, value?: DriveEventTypes[K]): void {
+	public publishDriveStream<K extends keyof DriveStreamTypes>(userId: MiUser['id'], type: K, value?: DriveStreamTypes[K]): void {
 		this.publish(`driveStream:${userId}`, type, typeof value === 'undefined' ? null : value);
 	}
 
 	@bindThis
-	public publishNoteStream<K extends keyof NoteEventTypes>(noteId: MiNote['id'], type: K, value?: NoteEventTypes[K]): void {
+	public publishNoteStream<K extends keyof NoteStreamTypes>(noteId: MiNote['id'], type: K, value?: NoteStreamTypes[K]): void {
 		this.publish(`noteStream:${noteId}`, type, {
 			id: noteId,
 			body: value,
@@ -309,17 +79,17 @@ export class GlobalEventService {
 	}
 
 	@bindThis
-	public publishUserListStream<K extends keyof UserListEventTypes>(listId: MiUserList['id'], type: K, value?: UserListEventTypes[K]): void {
+	public publishUserListStream<K extends keyof UserListStreamTypes>(listId: MiUserList['id'], type: K, value?: UserListStreamTypes[K]): void {
 		this.publish(`userListStream:${listId}`, type, typeof value === 'undefined' ? null : value);
 	}
 
 	@bindThis
-	public publishAntennaStream<K extends keyof AntennaEventTypes>(antennaId: MiAntenna['id'], type: K, value?: AntennaEventTypes[K]): void {
+	public publishAntennaStream<K extends keyof AntennaStreamTypes>(antennaId: MiAntenna['id'], type: K, value?: AntennaStreamTypes[K]): void {
 		this.publish(`antennaStream:${antennaId}`, type, typeof value === 'undefined' ? null : value);
 	}
 
 	@bindThis
-	public publishRoleTimelineStream<K extends keyof RoleTimelineEventTypes>(roleId: MiRole['id'], type: K, value?: RoleTimelineEventTypes[K]): void {
+	public publishRoleTimelineStream<K extends keyof RoleTimelineStreamTypes>(roleId: MiRole['id'], type: K, value?: RoleTimelineStreamTypes[K]): void {
 		this.publish(`roleTimelineStream:${roleId}`, type, typeof value === 'undefined' ? null : value);
 	}
 
@@ -329,7 +99,7 @@ export class GlobalEventService {
 	}
 
 	@bindThis
-	public publishAdminStream<K extends keyof AdminEventTypes>(userId: MiUser['id'], type: K, value?: AdminEventTypes[K]): void {
+	public publishAdminStream<K extends keyof AdminStreamTypes>(userId: MiUser['id'], type: K, value?: AdminStreamTypes[K]): void {
 		this.publish(`adminStream:${userId}`, type, typeof value === 'undefined' ? null : value);
 	}
 }

packages/backend/src/core/HashtagService.ts

@@ -4,7 +4,6 @@
  */
 
 import { Inject, Injectable } from '@nestjs/common';
-import * as Redis from 'ioredis';
 import { DI } from '@/di-symbols.js';
 import type { MiUser } from '@/models/User.js';
 import { normalizeForSearch } from '@/misc/normalize-for-search.js';
@@ -13,22 +12,15 @@ import type { MiHashtag } from '@/models/Hashtag.js';
 import type { HashtagsRepository } from '@/models/_.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
-import { FeaturedService } from '@/core/FeaturedService.js';
-import { MetaService } from '@/core/MetaService.js';
 
 @Injectable()
 export class HashtagService {
 	constructor(
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis, // TODO: 専用のRedisサーバーを設定できるようにする
-
 		@Inject(DI.hashtagsRepository)
 		private hashtagsRepository: HashtagsRepository,
 
 		private userEntityService: UserEntityService,
-		private featuredService: FeaturedService,
 		private idService: IdService,
-		private metaService: MetaService,
 	) {
 	}
 
@@ -45,7 +37,7 @@ export class HashtagService {
 			await this.updateHashtag(user, tag, true, true);
 		}
 
-		for (const tag of user.tags.filter(x => !tags.includes(x))) {
+		for (const tag of (user.tags ?? []).filter(x => !tags.includes(x))) {
 			await this.updateHashtag(user, tag, true, false);
 		}
 	}
@@ -54,9 +46,6 @@ export class HashtagService {
 	public async updateHashtag(user: { id: MiUser['id']; host: MiUser['host']; }, tag: string, isUserAttached = false, inc = true) {
 		tag = normalizeForSearch(tag);
 
-		// TODO: サンプリング
-		this.updateHashtagsRanking(tag, user.id);
-
 		const index = await this.hashtagsRepository.findOneBy({ name: tag });
 
 		if (index == null && !inc) return;
@@ -96,7 +85,7 @@ export class HashtagService {
 					}
 				}
 			} else {
-				// 自分が初めてこのタグを使ったなら
+			// 自分が初めてこのタグを使ったなら
 				if (!index.mentionedUserIds.some(id => id === user.id)) {
 					set.mentionedUserIds = () => `array_append("mentionedUserIds", '${user.id}')`;
 					set.mentionedUsersCount = () => '"mentionedUsersCount" + 1';
@@ -120,7 +109,7 @@ export class HashtagService {
 		} else {
 			if (isUserAttached) {
 				this.hashtagsRepository.insert({
-					id: this.idService.gen(),
+					id: this.idService.genId(),
 					name: tag,
 					mentionedUserIds: [],
 					mentionedUsersCount: 0,
@@ -137,7 +126,7 @@ export class HashtagService {
 				} as MiHashtag);
 			} else {
 				this.hashtagsRepository.insert({
-					id: this.idService.gen(),
+					id: this.idService.genId(),
 					name: tag,
 					mentionedUserIds: [user.id],
 					mentionedUsersCount: 1,
@@ -155,94 +144,4 @@ export class HashtagService {
 			}
 		}
 	}
-
-	@bindThis
-	public async updateHashtagsRanking(hashtag: string, userId: MiUser['id']): Promise<void> {
-		const instance = await this.metaService.fetch();
-		const hiddenTags = instance.hiddenTags.map(t => normalizeForSearch(t));
-		if (hiddenTags.includes(hashtag)) return;
-
-		// YYYYMMDDHHmm (10分間隔)
-		const now = new Date();
-		now.setMinutes(Math.floor(now.getMinutes() / 10) * 10, 0, 0);
-		const window = `${now.getUTCFullYear()}${(now.getUTCMonth() + 1).toString().padStart(2, '0')}${now.getUTCDate().toString().padStart(2, '0')}${now.getUTCHours().toString().padStart(2, '0')}${now.getUTCMinutes().toString().padStart(2, '0')}`;
-
-		const exist = await this.redisClient.sismember(`hashtagUsers:${hashtag}`, userId);
-		if (exist === 1) return;
-
-		this.featuredService.updateHashtagsRanking(hashtag, 1);
-
-		const redisPipeline = this.redisClient.pipeline();
-
-		// チャート用
-		redisPipeline.pfadd(`hashtagUsers:${hashtag}:${window}`, userId);
-		redisPipeline.expire(`hashtagUsers:${hashtag}:${window}`,
-			60 * 60 * 24 * 3, // 3日間
-			'NX', // "NX -- Set expiry only when the key has no expiry" = 有効期限がないときだけ設定
-		);
-
-		// ユニークカウント用
-		// TODO: Bloom Filter を使うようにしても良さそう
-		redisPipeline.sadd(`hashtagUsers:${hashtag}`, userId);
-		redisPipeline.expire(`hashtagUsers:${hashtag}`,
-			60 * 60, // 1時間
-			'NX', // "NX -- Set expiry only when the key has no expiry" = 有効期限がないときだけ設定
-		);
-
-		redisPipeline.exec();
-	}
-
-	@bindThis
-	public async getChart(hashtag: string, range: number): Promise<number[]> {
-		const now = new Date();
-		now.setMinutes(Math.floor(now.getMinutes() / 10) * 10, 0, 0);
-
-		const redisPipeline = this.redisClient.pipeline();
-
-		for (let i = 0; i < range; i++) {
-			const window = `${now.getUTCFullYear()}${(now.getUTCMonth() + 1).toString().padStart(2, '0')}${now.getUTCDate().toString().padStart(2, '0')}${now.getUTCHours().toString().padStart(2, '0')}${now.getUTCMinutes().toString().padStart(2, '0')}`;
-			redisPipeline.pfcount(`hashtagUsers:${hashtag}:${window}`);
-			now.setMinutes(now.getMinutes() - (i * 10), 0, 0);
-		}
-
-		const result = await redisPipeline.exec();
-
-		if (result == null) return [];
-
-		return result.map(x => x[1]) as number[];
-	}
-
-	@bindThis
-	public async getCharts(hashtags: string[], range: number): Promise<Record<string, number[]>> {
-		const now = new Date();
-		now.setMinutes(Math.floor(now.getMinutes() / 10) * 10, 0, 0);
-
-		const redisPipeline = this.redisClient.pipeline();
-
-		for (let i = 0; i < range; i++) {
-			const window = `${now.getUTCFullYear()}${(now.getUTCMonth() + 1).toString().padStart(2, '0')}${now.getUTCDate().toString().padStart(2, '0')}${now.getUTCHours().toString().padStart(2, '0')}${now.getUTCMinutes().toString().padStart(2, '0')}`;
-			for (const hashtag of hashtags) {
-				redisPipeline.pfcount(`hashtagUsers:${hashtag}:${window}`);
-			}
-			now.setMinutes(now.getMinutes() - (i * 10), 0, 0);
-		}
-
-		const result = await redisPipeline.exec();
-
-		if (result == null) return {};
-
-		// key is hashtag
-		const charts = {} as Record<string, number[]>;
-		for (const hashtag of hashtags) {
-			charts[hashtag] = [];
-		}
-
-		for (let i = 0; i < range; i++) {
-			for (let j = 0; j < hashtags.length; j++) {
-				charts[hashtags[j]].push(result[(i * hashtags.length) + j][1] as number);
-			}
-		}
-
-		return charts;
-	}
 }

packages/backend/src/core/IdService.ts

@@ -26,21 +26,17 @@ export class IdService {
 		this.method = config.id.toLowerCase();
 	}
 
-	/**
-	 * 時間を元にIDを生成します(省略時は現在日時)
-	 * @param time 日時
-	 */
 	@bindThis
-	public gen(time?: number): string {
-		const t = (!time || (time > Date.now())) ? Date.now() : time;
+	public genId(date?: Date): string {
+		if (!date || (date > new Date())) date = new Date();
 
 		switch (this.method) {
-			case 'aid': return genAid(t);
-			case 'aidx': return genAidx(t);
-			case 'meid': return genMeid(t);
-			case 'meidg': return genMeidg(t);
-			case 'ulid': return ulid(t);
-			case 'objectid': return genObjectId(t);
+			case 'aid': return genAid(date);
+			case 'aidx': return genAidx(date);
+			case 'meid': return genMeid(date);
+			case 'meidg': return genMeidg(date);
+			case 'ulid': return ulid(date.getTime());
+			case 'objectid': return genObjectId(date);
 			default: throw new Error('unrecognized id generation method');
 		}
 	}

packages/backend/src/core/MetaService.ts

@@ -10,7 +10,7 @@ import { DI } from '@/di-symbols.js';
 import { MiMeta } from '@/models/Meta.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { bindThis } from '@/decorators.js';
-import type { GlobalEvents } from '@/core/GlobalEventService.js';
+import { StreamMessages } from '@/server/api/stream/types.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
 @Injectable()
@@ -46,7 +46,7 @@ export class MetaService implements OnApplicationShutdown {
 		const obj = JSON.parse(data);
 
 		if (obj.channel === 'internal') {
-			const { type, body } = obj.message as GlobalEvents['internal']['payload'];
+			const { type, body } = obj.message as StreamMessages['internal']['payload'];
 			switch (type) {
 				case 'metaUpdated': {
 					this.cache = body;