.config/cypress-devcontainer.yml

@@ -153,13 +153,6 @@ redis:
 
 id: 'aidx'
 
-#   ┌──────────┐
-#───┘ Metrics  └──────────────────────────────────────────
-
-#prometheusMetrics:
-# enable: false
-# scrapeToken: '' # Set non-empty to require a bearer token for scraping
-
 #   ┌────────────────┐
 #───┘ Error tracking └──────────────────────────────────────────
 
@@ -175,8 +168,8 @@ id: 'aidx'
 #  options:
 #    dsn: 'https://examplePublicKey@o0.ingest.sentry.io/0'
 
-#  ┌──────────────┐
+#   ┌─────────────────────┐
-#──┘ Web Security └──────────────────────────────────────
+#───┘ Other configuration └─────────────────────────────────────
 
 # Whether disable HSTS
 #disableHsts: true
@@ -187,24 +180,6 @@ id: 'aidx'
 #   - https://hstspreload.org/
 #hstsPreload: false
 
-# Enable additional security headers that reduce the risk of XSS attacks or privacy leaks.
-# browserSandboxing:
-#  # Do not send the Referrer header to other domains. The default when browserSandboxing is missing is true.
-#  strictOriginReferrer: true
-#  csp: 
-#    # Do not send a CSP header. The default is a strict CSP header that prevents any form of external fetching or execution.
-#    disable: false
-#    # Merge additional directives into the CSP header. The default is an empty object.
-#    # You may want to list your CDN or other trusted domains here.
-#    # Media proxies are automatically added to the CSP header. This is an exception, things like Sentry will not be automatically added.
-#    appendDirectives:
-#      'script-src':
-#        - "'unsafe-eval'" # do not use this ... just an example
-#        - 'https://example.com'
-
-#   ┌─────────────────────┐
-#───┘ Other configuration └─────────────────────────────────────
-
 # Number of worker processes
 #clusterLimit: 1
 

.config/docker_example.yml

@@ -147,13 +147,6 @@ redis:
 
 id: 'aidx'
 
-#   ┌──────────┐
-#───┘ Metrics  └──────────────────────────────────────────
-
-#prometheusMetrics:
-# enable: false
-# scrapeToken: '' # Set non-empty to require a bearer token for scraping
-
 #   ┌────────────────┐
 #───┘ Error tracking └──────────────────────────────────────────
 
@@ -169,8 +162,8 @@ id: 'aidx'
 #  options:
 #    dsn: 'https://examplePublicKey@o0.ingest.sentry.io/0'
 
-#  ┌──────────────┐
+#   ┌─────────────────────┐
-#──┘ Web Security └──────────────────────────────────────
+#───┘ Other configuration └─────────────────────────────────────
 
 # Whether disable HSTS
 #disableHsts: true
@@ -181,24 +174,6 @@ id: 'aidx'
 #   - https://hstspreload.org/
 #hstsPreload: false
 
-# Enable additional security headers that reduce the risk of XSS attacks or privacy leaks.
-# browserSandboxing:
-#  # Do not send the Referrer header to other domains. The default when browserSandboxing is missing is true.
-#  strictOriginReferrer: true
-#  csp: 
-#    # Do not send a CSP header. The default is a strict CSP header that prevents any form of external fetching or execution.
-#    disable: false
-#    # Merge additional directives into the CSP header. The default is an empty object.
-#    # You may want to list your CDN or other trusted domains here.
-#    # Media proxies are automatically added to the CSP header. This is an exception, things like Sentry will not be automatically added.
-#    appendDirectives:
-#      'script-src':
-#        - "'unsafe-eval'" # do not use this ... just an example
-#        - 'https://example.com'
-
-#   ┌─────────────────────┐
-#───┘ Other configuration └─────────────────────────────────────
-
 # Number of worker processes
 #clusterLimit: 1
 

.config/example.yml

@@ -229,13 +229,6 @@ redis:
 
 id: 'aidx'
 
-#   ┌──────────┐
-#───┘ Metrics  └──────────────────────────────────────────
-
-#prometheusMetrics:
-# enable: false
-# scrapeToken: '' # Set non-empty to require a bearer token for scraping
-
 #   ┌────────────────┐
 #───┘ Error tracking └──────────────────────────────────────────
 
@@ -251,8 +244,8 @@ id: 'aidx'
 #  options:
 #    dsn: 'https://examplePublicKey@o0.ingest.sentry.io/0'
 
-#  ┌──────────────┐
+#   ┌─────────────────────┐
-#──┘ Web Security └──────────────────────────────────────
+#───┘ Other configuration └─────────────────────────────────────
 
 # Whether disable HSTS
 #disableHsts: true
@@ -263,24 +256,6 @@ id: 'aidx'
 #   - https://hstspreload.org/
 #hstsPreload: false
 
-# Enable additional security headers that reduce the risk of XSS attacks or privacy leaks.
-# browserSandboxing:
-#  # Do not send the Referrer header to other domains. The default when browserSandboxing is missing is true.
-#  strictOriginReferrer: true
-#  csp: 
-#    # Do not send a CSP header. The default is a strict CSP header that prevents any form of external fetching or execution.
-#    disable: false
-#    # Merge additional directives into the CSP header. The default is an empty object.
-#    # You may want to list your CDN or other trusted domains here.
-#    # Media proxies are automatically added to the CSP header. This is an exception, things like Sentry will not be automatically added.
-#    appendDirectives:
-#      'script-src':
-#        - "'unsafe-eval'" # do not use this ... just an example
-#        - 'https://example.com'
-
-#   ┌─────────────────────┐
-#───┘ Other configuration └─────────────────────────────────────
-
 # Number of worker processes
 #clusterLimit: 1
 

.devcontainer/devcontainer.json

@@ -5,7 +5,7 @@
 	"workspaceFolder": "/workspace",
 	"features": {
 		"ghcr.io/devcontainers/features/node:1": {
-			"version": "22.11.0"
+			"version": "20.16.0"
 		},
 		"ghcr.io/devcontainers-contrib/features/corepack:1": {}
 	},

.dockerignore

@@ -1,10 +1,8 @@
 .autogen
 .github
-.forgejo
 .travis
 .vscode
 .config
-
 Dockerfile
 build/
 built/
@@ -30,5 +28,3 @@ fluent-emojis/
 .idea/
 packages/*/.vscode/
 packages/backend/test/compose.yml
-
-/yume-mods

.forgejo/workflows/test-backend.yml

@@ -24,7 +24,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [22.11.0]
+        node-version: [20.16.0]
 
     services:
       postgres:
@@ -59,40 +59,40 @@ jobs:
     - name: Test
       run: pnpm --filter backend test-and-coverage
 
-#   e2e:
+  e2e:
-#     runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
-# 
+
-#     strategy:
+    strategy:
-#       matrix:
+      matrix:
-#         node-version: [22.11.0]
+        node-version: [20.16.0]
-# 
+
-#     services:
+    services:
-#       postgres:
+      postgres:
-#         image: l1drm/postgres-pgroonga:alpine-15-znver4
+        image: l1drm/postgres-pgroonga:alpine-15-znver4
-#         env:
+        env:
-#           POSTGRES_DB: test-misskey
+          POSTGRES_DB: test-misskey
-#           POSTGRES_HOST_AUTH_METHOD: trust
+          POSTGRES_HOST_AUTH_METHOD: trust
-#       redis:
+      redis:
-#         image: redis:7
+        image: redis:7
-# 
+
-#     steps:
+    steps:
-#       - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.1.1
-#         with:
+        with:
-#           submodules: true
+          submodules: true
-#       - name: Install pnpm
+      - name: Install pnpm
-#         uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v4
-#       - name: Use Node.js ${{ matrix.node-version }}
+      - name: Use Node.js ${{ matrix.node-version }}
-#         uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.0.4
-#         with:
+        with:
-#           node-version: ${{ matrix.node-version }}
+          node-version: ${{ matrix.node-version }}
-#           cache: 'pnpm'
+          cache: 'pnpm'
-#       - run: corepack enable
+      - run: corepack enable
-#       - run: pnpm i --frozen-lockfile
+      - run: pnpm i --frozen-lockfile
-#       - name: Check pnpm-lock.yaml
+      - name: Check pnpm-lock.yaml
-#         run: git diff --exit-code pnpm-lock.yaml
+        run: git diff --exit-code pnpm-lock.yaml
-#       - name: Copy Configure
+      - name: Copy Configure
-#         run: cp .forgejo/misskey/test.yml .config
+        run: cp .forgejo/misskey/test.yml .config
-#       - name: Build
+      - name: Build
-#         run: pnpm build
+        run: pnpm build
-#       - name: Test
+      - name: Test
-#         run: pnpm --filter backend test-and-coverage:e2e
+        run: pnpm --filter backend test-and-coverage:e2e

.forgejo/workflows/test-production.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [22.11.0]
+        node-version: [20.16.0]
 
     steps:
     - uses: actions/checkout@v4.1.1

.github/ISSUE_TEMPLATE/01_bug-report.yml

@@ -0,0 +1,97 @@
+name: 🐛 Bug Report
+description: Create a report to help us improve
+labels: ["⚠️bug?"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for reporting!
+        First, in order to avoid duplicate Issues, please search to see if the problem you found has already been reported.
+        Also, If you are NOT owner/admin of server, PLEASE DONT REPORT SERVER SPECIFIC ISSUES TO HERE! (e.g. feature XXX is not working in misskey.example) Please try with another misskey servers, and if your issue is only reproducible with specific server, contact your server's owner/admin first.
+
+  - type: textarea
+    attributes:
+      label: 💡 Summary
+      description: Tell us what the bug is
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: 🥰 Expected Behavior
+      description: Tell us what should happen
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: 🤬 Actual Behavior
+      description: |
+        Tell us what happens instead of the expected behavior.
+        Please include errors from the developer console and/or server log files if you have access to them.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: 📝 Steps to Reproduce
+      placeholder: |
+        1.
+        2.
+        3.
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: 💻 Frontend Environment
+      description: |
+        Tell us where on the platform it happens
+        DO NOT WRITE "latest". Please provide the specific version.
+
+        Examples:
+          * Model and OS of the device(s): MacBook Pro (14inch, 2021), macOS Ventura 13.4
+          * Browser: Chrome 113.0.5672.126
+          * Server URL: misskey.example.com
+          * Misskey: 2024.x.x
+      value: |
+        * Model and OS of the device(s):
+        * Browser:
+        * Server URL:
+        * Misskey:
+      render: markdown
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: 🛰 Backend Environment (for server admin)
+      description: |
+        Tell us where on the platform it happens
+        DO NOT WRITE "latest". Please provide the specific version.
+        If you are using a managed service, put that after the version.
+
+        Examples:
+          * Installation Method or Hosting Service: docker compose, k8s/docker, systemd, "Misskey install shell script", development environment
+          * Misskey: 2024.x.x
+          * Node: 20.x.x
+          * PostgreSQL: 15.x.x
+          * Redis: 7.x.x
+          * OS and Architecture: Ubuntu 24.04.2 LTS aarch64
+      value: |
+        * Installation Method or Hosting Service:
+        * Misskey:
+        * Node:
+        * PostgreSQL:
+        * Redis:
+        * OS and Architecture:
+      render: markdown
+    validations:
+      required: false
+
+  - type: checkboxes
+    attributes:
+      label: Do you want to address this bug yourself?
+      options:
+        - label: Yes, I will patch the bug myself and send a pull request

.github/ISSUE_TEMPLATE/02_feature-request.yml

@@ -0,0 +1,22 @@
+name: ✨ Feature Request
+description: Suggest an idea for this project
+labels: ["✨Feature"]
+
+body:
+  - type: textarea
+    attributes:
+      label: Summary
+      description: Tell us what the suggestion is
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Purpose
+      description: Describe the specific problem or need you think this feature will solve, and who it will help.
+    validations:
+      required: true
+  - type: checkboxes
+    attributes:
+      label: Do you want to implement this feature yourself?
+      options:
+        - label: Yes, I will implement this by myself and send a pull request

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+contact_links:
+  - name: 💬 Misskey official Discord
+    url: https://discord.gg/Wp8gVStHW3
+    about: Chat freely about Misskey
+  # 仮
+  - name: 💬 Start discussion
+    url: https://github.com/misskey-dev/misskey/discussions
+    about: The official forum to join conversation and ask question

.github/PULL_REQUEST_TEMPLATE/01_bug.md

@@ -0,0 +1,23 @@
+<!-- ℹ お読みください / README
+PRありがとうございます！ PRを作成する前に、コントリビューションガイドをご確認ください:
+Thank you for your PR! Before creating a PR, please check the contribution guide:
+https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md
+-->
+
+## What
+<!-- このPRで何をしたのか？ どう変わるのか？ -->
+<!-- What did you do with this PR? How will it change things? -->
+
+## Why
+<!-- なぜそうするのか？ どういう意図なのか？ 何が困っているのか？ -->
+<!-- Why do you do it? What are your intentions? What is the problem? -->
+
+## Additional info (optional)
+<!-- テスト観点など -->
+<!-- Test perspective, etc -->
+
+## Checklist
+- [ ] Read the [contribution guide](https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md)
+- [ ] Test working in a local environment
+- [ ] (If needed) Update CHANGELOG.md
+- [ ] (If possible) Add tests

.github/PULL_REQUEST_TEMPLATE/02_enhance.md

@@ -0,0 +1,23 @@
+<!-- ℹ お読みください / README
+PRありがとうございます！ PRを作成する前に、コントリビューションガイドをご確認ください:
+Thank you for your PR! Before creating a PR, please check the contribution guide:
+https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md
+-->
+
+## What
+<!-- このPRで何をしたのか？ どう変わるのか？ -->
+<!-- What did you do with this PR? How will it change things? -->
+
+## Why
+<!-- なぜそうするのか？ どういう意図なのか？ 何が困っているのか？ -->
+<!-- Why do you do it? What are your intentions? What is the problem? -->
+
+## Additional info (optional)
+<!-- テスト観点など -->
+<!-- Test perspective, etc -->
+
+## Checklist
+- [ ] Read the [contribution guide](https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md)
+- [ ] Test working in a local environment
+- [ ] (If needed) Update CHANGELOG.md
+- [ ] (If possible) Add tests

.github/PULL_REQUEST_TEMPLATE/03_release.md

@@ -0,0 +1,20 @@
+## Summary
+This is a release PR.
+
+For more information on the release instructions, please see:
+https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md#release
+
+## For reviewers
+- CHANGELOGに抜け漏れは無いか
+- バージョンの上げ方は適切か
+- 他にこのリリースに含めなければならない変更は無いか
+- 全体的な変更内容を俯瞰し問題は無いか
+- レビューされていないコミットがある場合は、それが問題ないか
+- 最終的な動作確認を行い問題は無いか
+
+などを確認し、リリースする準備が整っていると思われる場合は approve してください。
+
+## Checklist
+- [ ] package.jsonのバージョンが正しく更新されている
+- [ ] CHANGELOGが過不足無く更新されている
+- [ ] CIが全て通っている

.github/pull_request_template.md

@@ -1,7 +1,7 @@
 <!-- ℹ お読みください / README
 PRありがとうございます！ PRを作成する前に、コントリビューションガイドをご確認ください:
 Thank you for your PR! Before creating a PR, please check the contribution guide:
-https://forge.yumechi.jp/yume/yumechi-no-kuni/src/branch/master/CONTRIBUTING.md
+https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md
 -->
 
 ## What
@@ -17,7 +17,7 @@ https://forge.yumechi.jp/yume/yumechi-no-kuni/src/branch/master/CONTRIBUTING.md
 <!-- Test perspective, etc -->
 
 ## Checklist
-- [ ] Read the [contribution guide](https://forge.yumechi.jp/yume/yumechi-no-kuni/src/branch/master/CONTRIBUTING.md)
+- [ ] Read the [contribution guide](https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md)
 - [ ] Test working in a local environment
 - [ ] (If needed) Add story of storybook
 - [ ] (If needed) Update CHANGELOG.md

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

@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [22.11.0]
+        node-version: [20.16.0]
         api-json-name: [api-base.json, api-head.json]
         include:
           - api-json-name: api-base.json

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

@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [22.11.0]
+        node-version: [20.16.0]
 
     steps:
       - uses: actions/checkout@v4.1.1

.github/workflows/test-backend.yml

@@ -22,7 +22,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [22.11.0]
+        node-version: [20.16.0]
 
     services:
       postgres:
@@ -61,7 +61,7 @@ jobs:
     - name: Test
       run: pnpm --filter backend test-and-coverage
     - name: Upload to Codecov
-      uses: codecov/codecov-action@v5
+      uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         files: ./packages/backend/coverage/coverage-final.json
@@ -71,7 +71,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [22.11.0]
+        node-version: [20.16.0]
 
     services:
       postgres:
@@ -108,7 +108,7 @@ jobs:
       - name: Test
         run: pnpm --filter backend test-and-coverage:e2e
       - name: Upload to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./packages/backend/coverage/coverage-final.json

.github/workflows/test-federation.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [22.11.0]
+        node-version: [20.16.0]
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/test-frontend.yml

@@ -26,7 +26,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [22.11.0]
+        node-version: [20.16.0]
 
     steps:
     - uses: actions/checkout@v4.1.1
@@ -50,7 +50,7 @@ jobs:
     - name: Test
       run: pnpm --filter frontend test-and-coverage
     - name: Upload Coverage
-      uses: codecov/codecov-action@v5
+      uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         files: ./packages/frontend/coverage/coverage-final.json
@@ -61,7 +61,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [22.11.0]
+        node-version: [20.16.0]
         browser: [chrome]
 
     services:

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

@@ -21,7 +21,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [22.11.0]
+        node-version: [20.16.0]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -51,7 +51,7 @@ jobs:
           CI: true
 
       - name: Upload Coverage
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./packages/misskey-js/coverage/coverage-final.json

.github/workflows/test-production.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [22.11.0]
+        node-version: [20.16.0]
 
     steps:
     - uses: actions/checkout@v4.1.1

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

@@ -18,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [22.11.0]
+        node-version: [20.16.0]
 
     steps:
     - uses: actions/checkout@v4.1.1

.gitignore

@@ -68,8 +68,6 @@ misskey-assets
 # Vite temporary files
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
-vite.config.local-dev.js.timestamp-*
-vite.config.local-dev.ts.timestamp-*
 
 # blender backups
 *.blend1

.node-version

@@ -1 +1 @@
-22.11.0
+20.16.0

.okteto/okteto-pipeline.yml

@@ -0,0 +1,6 @@
+build:
+  misskey:
+    args:
+      - NODE_ENV=development
+deploy:
+  - helm upgrade --install misskey chart --set image=${OKTETO_BUILD_MISSKEY_IMAGE} --set url="https://misskey-$(kubectl config view --minify -o jsonpath='{..namespace}').cloud.okteto.net" --set environment=development

CHANGELOG.md

@@ -1,64 +1,8 @@
-
+## 2024.10.2
-## 2024.11.0-yumechinokuni.8
-
-- Frontend: SSRでユーザープロフィールが表示されない問題を修正
-- Security: SSRプライバシー方面の改善
-- Security: AP Payloadの検証を強化
-
-## 2024.11.0-yumechinokuni.7
-
-- Misskey Trademark内容をWebUIから削除
-- Service Worker キャッシュが正しく動作しない問題を修正
-
-## 2024.11.0-yumechinokuni.6
-
-- Upstream: 2024.11.0-alpha.4 タッグをマージする
-- Performance: EmojiのリクエストをProxyでキャッシュするように
-- Performance: Service Workerのキャッシュを最適化
-- Security: AP Payloadの検証を強化
-- Security: Image/Video Processorはドライブ機能だけを使うように
-
-## 2024.11.0-yumechinokuni.5
-
-- Upstream: 2024.11.0-alpha.2 タッグをマージする
-- Reliability: Activitypub event deduplication
-- DevOps: Prometheus サーバーメトリクス
-- Enhance: ハッシュタグランギングを改善
-- Enhance: PgroongaのCWサーチ + パフォーマンス改善
-
-## 2024.11.0-yumechinokuni.4
-
-- Upstream: 2024.11.0-alpha.1 タッグをマージする
-- DevOps: 管理者アクセストークンがユーザー登録できるようになる (write:admin:create-account)
-- Frontend: Stream再接続ロジックdata raceを修正
-- Security: CSPにCDNなどの外部ホストはホワイトリストできるように
-
-### 2024.11.0-yumechinokuni.4p1
-
-PgroongaのCWサーチ (github.com/paricafe/misskey#d30db97b59d264450901c1dd86808dcb43875ea9)
-
-### 2024.11.0-yumechinokuni.4p2
-
-- fix(backend): アナウンスメントを作成ときにWebUIフォームの画像URLを後悔できないのを修正 (/admin/announcement/create)
-
-## 2024.11.0-yumechinokuni.3
-
-- Security: CSPの設定を強化
-- Fix: flaky testの修正
-
-## 2024.11.0
-
-### Note
-- Node.js 20.xは非推奨になりました。Node.js 22.x (LTS)の利用を推奨します。
-  - なお、Node.js 23.xは対応していません。
-- DockerのNode.jsが22.11.0に更新されました
 
 ### General
 - Feat: コンテンツの表示にログインを必須にできるように
 - Feat: 過去のノートを非公開化/フォロワーのみ表示可能にできるように
-- Fix: お知らせ作成時に画像URL入力欄を空欄に変更できないのを修正 ( #14976 )
-- Enhance: 依存関係の更新
-- Enhance: l10nの更新
 
 ### Client
 - Enhance: Bull DashboardでRelationship Queueの状態も確認できるように  
@@ -73,12 +17,6 @@ PgroongaのCWサーチ (github.com/paricafe/misskey#d30db97b59d264450901c1dd8680
 - Enhance: Self-XSS防止用の警告を追加
 - Enhance: カタルーニャ語 (ca-ES) に対応
 - Enhance: 個別お知らせページではMetaタグを出力するように
-- Enhance: ノート詳細画面にロールのバッジを表示
-- Enhance: 過去に送信したフォローリクエストを確認できるように  
-  (Based on https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/663)
-- Enhance: サイドバーを簡単に展開・折りたたみできるように ( #14981 )
-- Enhance: リノートメニューに「リノートの詳細」を追加
-- Enhance: 非ログイン状態でMisskeyを開いた際のパフォーマンスを向上
 - Fix: 通知の範囲指定の設定項目が必要ない通知設定でも範囲指定の設定がでている問題を修正
 - Fix: Turnstileが失敗・期限切れした際にも成功扱いとなってしまう問題を修正  
   (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/768)
@@ -87,21 +25,12 @@ PgroongaのCWサーチ (github.com/paricafe/misskey#d30db97b59d264450901c1dd8680
 - Fix: リンク切れを修正
 = Fix: ノート投稿ボタンにホバー時のスタイルが適用されていないのを修正  
   (Cherry-picked from https://github.com/taiyme/misskey/pull/305)
-- Fix: メールアドレス登録有効化時の「完了」ダイアログボックスの表示条件を修正
-- Fix: 画面幅が狭い環境でデザインが崩れる問題を修正  
-	(Cherry-picked from https://github.com/MisskeyIO/misskey/pull/815)
-- Fix: TypeScriptの型チェック対象ファイルを限定してビルドを高速化するように  
-	(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/725)
 
 ### Server
-- Enhance: DockerのNode.jsを22.11.0に更新
 - Enhance: 起動前の疎通チェックで、DBとメイン以外のRedisの疎通確認も行うように  
   (Based on https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/588)  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/715)
-- Enhance: リモートユーザーの照会をオリジナルにリダイレクトするように
+- fix(backend): フォロワーへのメッセージの絵文字をemojisに含めるように
-- Fix: sharedInboxが無いActorに紐づくリモートユーザーを照会できない
-- Fix: Aproving request from GtS appears with some delay
-- Fix: フォロワーへのメッセージの絵文字をemojisに含めるように
 - Fix: Nested proxy requestsを検出した際にブロックするように
   [ghsa-gq5q-c77c-v236](https://github.com/misskey-dev/misskey/security/advisories/ghsa-gq5q-c77c-v236)
 - Fix: 招待コードの発行可能な残り数算出に使用すべきロールポリシーの値が違う問題を修正  
@@ -112,8 +41,7 @@ PgroongaのCWサーチ (github.com/paricafe/misskey#d30db97b59d264450901c1dd8680
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/712)
 - Fix: FTT無効時にユーザーリストタイムラインが使用できない問題を修正  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/709)
-- Fix: User Webhookテスト機能のMock Payloadを修正  
+- Enhance: リモートユーザーの照会をオリジナルにリダイレクトするように
-- Fix: アカウント削除のモデレーションログが動作していないのを修正 (#14996)  
 
 ### Misskey.js
 - Fix: Stream初期化時、別途WebSocketを指定する場合の型定義を修正

CONTRIBUTING.md

@@ -85,7 +85,6 @@ Be willing to comment on the good points and not just the things you want fixed
 
 読んでおくといいやつ
 - https://blog.lacolaco.net/posts/1e2cf439b3c2/
-- https://konifar-zatsu.hatenadiary.jp/entry/2024/11/05/192421
 
 ### Review perspective
 - Scope
@@ -101,22 +100,6 @@ Be willing to comment on the good points and not just the things you want fixed
 	- Are there any omissions or gaps?
 	- Does it check for anomalies?
 
-## Security Advisory
-### For reporter
-Thank you for your reporting!
-
-If you can also create a patch to fix the vulnerability, please create a PR on the private fork.
-
-> [!note]
-> There is a GitHub bug that prevents merging if a PR not following the develop branch of upstream, so please keep follow the develop branch.
-
-### For misskey-dev member
-修正PRがdevelopに追従されていないとマージできないので、マージできなかったら
-
-> Could you merge or rebase onto upstream develop branch?
-
-などと伝える。
-
 ## Deploy
 The `/deploy` command by issue comment can be used to deploy the contents of a PR to the preview environment.
 ```

Dockerfile

@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.4
 
-ARG NODE_VERSION=22.11.0-bullseye
+ARG NODE_VERSION=20.16.0-bullseye
 
 # build assets & compile TypeScript
 

README.md

@@ -1,31 +1,49 @@
-# ゆめちのくに
+<div align="center">
+<a href="https://misskey-hub.net">
+	<img src="./assets/title_float.svg" alt="Misskey logo" style="border-radius:50%" width="300"/>
+</a>
 
-YumechiNoKuni is a fork of Misskey, with a focus on security, observability and reliability.
+**🌎 **Misskey** is an open source, federated social media platform that's free forever! 🚀**
 
-[mi.yumechi.jp](https://mi.yumechi.jp) is running this version.
+[Learn more](https://misskey-hub.net/)
 
-[Learn more about Misskey](https://misskey-hub.net/)
+---
 
-## Main differences
+<a href="https://misskey-hub.net/servers/">
+		<img src="https://custom-icon-badges.herokuapp.com/badge/find_an-instance-acea31?logoColor=acea31&style=for-the-badge&logo=misskey&labelColor=363B40" alt="find an instance"/></a>
 
-### Unique features
+<a href="https://misskey-hub.net/docs/for-admin/install/guides/">
+		<img src="https://custom-icon-badges.herokuapp.com/badge/create_an-instance-FBD53C?logoColor=FBD53C&style=for-the-badge&logo=server&labelColor=363B40" alt="create an instance"/></a>
 
-- Strict ActivityPub sanitization by whitelisting properties and normalizing all referential properties.
+<a href="./CONTRIBUTING.md">
-- Strict Content Security Policy.
+		<img src="https://custom-icon-badges.herokuapp.com/badge/become_a-contributor-A371F7?logoColor=A371F7&style=for-the-badge&logo=git-merge&labelColor=363B40" alt="become a contributor"/></a>
-- Require TLSv1.2+ over port 443 for all ActivityPub requests.
-- Strongly-typed inbox filtering in Rust.
-- Reduce needless retries by marking more errors as permanent.
-- Detailed prometheus metrics for slow requests, DB queries, AP processing, failed auths, etc.
-- Disable unauthenticated media processing and use custom AppArmored media proxy.
-- Enable active users in nodeinfo back.
-- Advertise Git information over nodeinfo for better observability and easy tracking of the actual code running.
-- Logical replication for the database over mTLS.
-- More atomic operations in API handlers.
 
-### Picked from github.com/paricafe/misskey
+<a href="https://discord.gg/Wp8gVStHW3">
+		<img src="https://custom-icon-badges.herokuapp.com/badge/join_the-community-5865F2?logoColor=5865F2&style=for-the-badge&logo=discord&labelColor=363B40" alt="join the community"/></a>
 
-- pgroonga full-text search (with modifications).
+<a href="https://www.patreon.com/syuilo">
-- Better Service Worker caching.
+		<img src="https://custom-icon-badges.herokuapp.com/badge/become_a-patron-F96854?logoColor=F96854&style=for-the-badge&logo=patreon&labelColor=363B40" alt="become a patron"/></a>
-- Better hashtag statistics.
-- Better handling of deep recursive AP objects.
 
+</div>
+
+## Thanks
+
+<a href="https://sentry.io/"><img src="https://github.com/misskey-dev/misskey/assets/4439005/98576556-222f-467a-94be-e98dbda1d852" height="30" alt="Sentry" /></a>
+
+Thanks to [Sentry](https://sentry.io/) for providing the error tracking platform that helps us catch unexpected errors.
+
+<a href="https://www.chromatic.com/"><img src="https://user-images.githubusercontent.com/321738/84662277-e3db4f80-af1b-11ea-88f5-91d67a5e59f6.png" height="30" alt="Chromatic" /></a>
+
+Thanks to [Chromatic](https://www.chromatic.com/) for providing the visual testing platform that helps us review UI changes and catch visual regressions.
+
+<a href="https://about.codecov.io/for/open-source/"><img src="https://about.codecov.io/wp-content/themes/codecov/assets/brand/sentry-cobranding/logos/codecov-by-sentry-logo.svg" height="30" alt="Codecov" /></a>
+
+Thanks to [Codecov](https://about.codecov.io/for/open-source/) for providing the code coverage platform that helps us improve our test coverage.
+
+<a href="https://crowdin.com/"><img src="https://user-images.githubusercontent.com/20679825/230709597-1299a011-171a-4294-a91e-355a9b37c672.svg" height="30" alt="Crowdin" /></a>
+
+Thanks to [Crowdin](https://crowdin.com/) for providing the localization platform that helps us translate Misskey into many languages.
+
+<a href="https://hub.docker.com/"><img src="https://user-images.githubusercontent.com/20679825/230148221-f8e73a32-a49b-47c3-9029-9a15c3824f92.png" height="30" alt="Docker" /></a>
+
+Thanks to [Docker](https://hub.docker.com/) for providing the container platform that helps us run Misskey in production.

SECURITY.md

@@ -1,12 +1,8 @@
 # Reporting Security Issues
 
-If you discover a security issue in this project, please use the `git blame` command to identify the source of the issue,
+If you discover a security issue in Misskey, please report it by **[this form](https://github.com/misskey-dev/misskey/security/advisories/new)**.
-if it was introduced by this fork please contact me at secity<at>yumechi.jp.
 
-For upstream issues please report by **[this form](https://github.com/misskey-dev/misskey/security/advisories/new)**.
+This will allow us to assess the risk, and make a fix available before we add a
+bug report to the GitHub repository.
 
-Thanks for helping make YumechiNoKuni safe for everyone.
+Thanks for helping make Misskey safe for everyone.
-
-## When create a patch
-
-If you can also create a patch to fix the vulnerability, please send a diff file with the report.

compose_example.yml

@@ -64,7 +64,6 @@ services:
     restart: always
     image: l1drm/postgres-pgroonga:alpine-15-znver4
     user: "${MISSKEY_UID}:${MISSKEY_GID}"
-    shm_size: 2gb
     networks:
       - internal_network
     env_file:

locales/ar-SA.yml

@@ -343,6 +343,7 @@ enableLocalTimeline: "تفعيل الخيط المحلي"
 enableGlobalTimeline: "تفعيل الخيط الزمني الشامل"
 disablingTimelinesInfo: "سيتمكن المديرون والمشرفون من الوصول إلى كل الخيوط الزمنية حتى وإن لم تفعّل."
 registration: "إنشاء حساب"
+enableRegistration: "تفعيل إنشاء الحسابات الجديدة"
 invite: "دعوة"
 driveCapacityPerLocalAccount: "حصة التخزين لكل مستخدم محلي"
 driveCapacityPerRemoteAccount: "حصة التخزين لكل مستخدم بعيد"

locales/bn-BD.yml

@@ -339,6 +339,7 @@ enableLocalTimeline: "স্থানীয় টাইমলাইন চাল
 enableGlobalTimeline: "গ্লোবাল টাইমলাইন চালু করুন"
 disablingTimelinesInfo: "আপনি এই টাইমলাইনগুলি বন্ধ করলেও প্রশাসক এবং মডারেটররা এই টাইমলাইনগুলি ব্যাবহার করতে পারবে"
 registration: "নিবন্ধন"
+enableRegistration: "নতুন ব্যাবহারকারী নিবন্ধন চালু করুন"
 invite: "আমন্ত্রণ"
 driveCapacityPerLocalAccount: "প্রত্যেক স্থানীয় ব্যাবহারকারীর জন্য ড্রাইভের জায়গা"
 driveCapacityPerRemoteAccount: "প্রত্যেক রিমোট ব্যাবহারকারীর জন্য ড্রাইভের জায়গা"

locales/ca-ES.yml

@@ -8,37 +8,37 @@ search: "Cercar"
 notifications: "Notificacions"
 username: "Nom d'usuari"
 password: "Contrasenya"
-initialPasswordForSetup: "Contrasenya inicial per fer la primera configuració "
+initialPasswordForSetup: "Contrasenya inicial per la configuració inicial"
 initialPasswordIsIncorrect: "La contrasenya no és correcta."
 initialPasswordForSetupDescription: "Fes servir la contrasenya que has fet servir al fitxer de configuració, si tu mateix has instal·lat Misskey.\nSi fas servir una empresa d'allotjament de Misskey, fes servir la contrasenya que t'han donat.\nSi no has posat cap contrasenya deixar l'espai en blanc."
-forgotPassword: "Restableix la contrasenya "
+forgotPassword: "Contrasenya oblidada"
-fetchingAsApObject: "Cercant al Fediverse..."
+fetchingAsApObject: "Cercant en el Fediverse..."
 ok: "OK"
-gotIt: "D'acord "
+gotIt: "Ho he entès!"
 cancel: "Cancel·lar"
 noThankYou: "No, gràcies"
 enterUsername: "Introdueix el teu nom d'usuari"
 renotedBy: "Impulsat per {user}"
 noNotes: "Cap nota"
 noNotifications: "Cap notificació"
-instance: "Instància "
+instance: "Servidor"
 settings: "Preferències"
-notificationSettings: "Configurar les notificacions"
+notificationSettings: "Paràmetres de notificacions"
 basicSettings: "Configuració bàsica"
-otherSettings: "Altres configuracions"
+otherSettings: "Configuració avançada"
-openInWindow: "Obrir en una finestra nova"
+openInWindow: "Obrir en una nova finestra"
 profile: "Perfil"
 timeline: "Línia de temps"
 noAccountDescription: "Aquest usuari encara no ha escrit la seva biografia."
 login: "Iniciar sessió"
-loggingIn: "Iniciar la sessió "
+loggingIn: "Identificant-se"
 logout: "Tancar la sessió"
 signup: "Registrar-se"
 uploading: "Pujant..."
 save: "Desa"
 users: "Usuaris"
 addUser: "Afegir un usuari"
-favorite: "Afegeix als preferits"
+favorite: "Afegir a preferits"
 favorites: "Favorits"
 unfavorite: "Eliminar dels preferits"
 favorited: "Afegit als preferits."
@@ -50,26 +50,26 @@ copyContent: "Copiar el contingut"
 copyLink: "Copiar l'enllaç"
 copyLinkRenote: "Copiar l'enllaç de la renota"
 delete: "Elimina"
-deleteAndEdit: "Eliminar i editar"
+deleteAndEdit: "Elimina i edita"
 deleteAndEditConfirm: "Segur que vols eliminar aquesta publicació i editar-la? Perdràs totes les reaccions, impulsos i respostes."
 addToList: "Afegir a una llista"
-addToAntenna: "Afegir a una antena"
+addToAntenna: "Afegir a l'antena"
 sendMessage: "Enviar un missatge"
 copyRSS: "Copiar RSS"
 copyUsername: "Copiar nom d'usuari"
 copyUserId: "Copiar ID d'usuari"
-copyNoteId: "Copiar ID de la nota"
+copyNoteId: "Copiar ID de nota"
-copyFileId: "Copiar ID de l'arxiu"
+copyFileId: "Copiar ID d'arxiu"
-copyFolderId: "Copiar ID de la carpeta"
+copyFolderId: "Copiar ID de carpeta"
-copyProfileUrl: "Copiar adreça URL del perfil"
+copyProfileUrl: "Copiar URL del perfil"
 searchUser: "Cercar un usuari"
-searchThisUsersNotes: "Cercar les publicacions de l'usuari"
+searchThisUsersNotes: "Cerca les publicacions de l'usuari"
-reply: "Respon"
+reply: "Respondre"
 loadMore: "Carregar més"
 showMore: "Veure més"
-showLess: "Mostrar menys"
+showLess: "Mostra menys"
 youGotNewFollower: "t'ha seguit"
-receiveFollowRequest: "Has rebut una sol·licitud de seguiment"
+receiveFollowRequest: "Sol·licitud de seguiment rebuda"
 followRequestAccepted: "Sol·licitud de seguiment acceptada"
 mention: "Menció"
 mentions: "Mencions"
@@ -78,25 +78,25 @@ importAndExport: "Importar / Exportar"
 import: "Importar"
 export: "Exporta"
 files: "Fitxers"
-download: "Descarregar"
+download: "Baixar"
-driveFileDeleteConfirm: "Estàs segur que vols suprimir el fitxer \"{name}\"? Les notes associades a aquest fitxer també seran esborrades."
+driveFileDeleteConfirm: "Estàs segur que vols suprimir el fitxer \"{name}\"? Les notes associades a aquest fitxer adjunt també se suprimiran."
-unfollowConfirm: "Segur que vols deixar de seguir a {name}?"
+unfollowConfirm: "Estàs segur que vols deixar de seguir {name}?"
-exportRequested: "Has sol·licitat una exportació de dades. Això pot trigar una estona. S'afegirà a la teva unitat de disc un cop estigui completada."
+exportRequested: "Has sol·licitat una exportació. Això pot trigar una estona. S'afegirà a la teva unitat un cop completat."
-importRequested: "Has sol·licitat una importació de dades. Això pot trigar una estona."
+importRequested: "Has sol·licitat una importació. Això pot trigar una estona."
 lists: "Llistes"
 noLists: "No tens cap llista"
 note: "Nota"
 notes: "Notes"
-following: "Segueixes "
+following: "Seguint"
 followers: "Seguidors"
 followsYou: "Et segueix"
 createList: "Crear llista"
 manageLists: "Gestionar les llistes"
 error: "Error"
 somethingHappened: "S'ha produït un error"
-retry: "Torna-ho a provar"
+retry: "Torna-ho a intentar"
 pageLoadError: "S'ha produït un error en carregar la pàgina"
-pageLoadErrorDescription: "Això normalment és a causa d'errors a la xarxa o a la memòria cau del navegador. Prova d'esborrar la memòria cau i torna-ho a provar després d'esperar un temps."
+pageLoadErrorDescription: "Això normalment es deu a errors de xarxa o a la memòria cau del navegador. Prova d'esborrar la memòria cau i torna-ho a provar després d'esperar una estona."
 serverIsDead: "Aquest servidor no respon. Espera una estona i torna-ho a provar."
 youShouldUpgradeClient: "Per veure aquesta pàgina, actualitzeu-la per actualitzar el vostre client."
 enterListName: "Introdueix un nom per a la llista"
@@ -104,52 +104,52 @@ privacy: "Privadesa"
 makeFollowManuallyApprove: "Les sol·licituds de seguiment requereixen aprovació"
 defaultNoteVisibility: "Visibilitat per defecte"
 follow: "Seguint"
-followRequest: "Enviar sol·licitud de seguiment"
+followRequest: "Enviar la sol·licitud de seguiment"
 followRequests: "Sol·licituds de seguiment"
 unfollow: "Deixar de seguir"
 followRequestPending: "Sol·licituds de seguiment pendents"
 enterEmoji: "Introduir un emoji"
-renote: "Impulsar "
+renote: "Impulsa"
 unrenote: "Anul·la l'impuls"
 renoted: "S'ha impulsat"
 renotedToX: "Impulsat per {name}."
 cantRenote: "No es pot impulsar aquesta publicació"
-cantReRenote: "No es pot impulsar un impuls."
+cantReRenote: "No es pot impulsar l'impuls."
 quote: "Cita"
-inChannelRenote: "Impulsar només a un canal"
+inChannelRenote: "Renotar només al Canal"
-inChannelQuote: "Citar només a un canal"
+inChannelQuote: "Citar només al Canal"
-renoteToChannel: "Impulsar a un canal"
+renoteToChannel: "Impulsa a un canal"
-renoteToOtherChannel: "Impulsar a un altre canal"
+renoteToOtherChannel: "Impulsa a un altre canal"
 pinnedNote: "Nota fixada"
 pinned: "Fixar al perfil"
 you: "Tu"
 clickToShow: "Fes clic per mostrar"
-sensitive: "Sensible"
+sensitive: "NSFW"
 add: "Afegir"
-reaction: "Reacció "
+reaction: "Reaccions"
 reactions: "Reaccions"
-emojiPicker: "Selector d'emojis"
+emojiPicker: "Selecció d'emojis"
-pinnedEmojisForReactionSettingDescription: "Selecciona l'emoji amb qui vols reaccionar"
+pinnedEmojisForReactionSettingDescription: "Selecciona l'emoji amb el qual reaccionar"
-pinnedEmojisSettingDescription: "Selecciona quins emojis vols deixar fixats i es mostrin en obrir el selector d'emojis"
+pinnedEmojisSettingDescription: "Selecciona l'emoji amb el qual reaccionar"
-emojiPickerDisplay: "Mostrar el selector d'emojis"
+emojiPickerDisplay: "Visualitza el selector d'emojis"
 overwriteFromPinnedEmojisForReaction: "Reemplaça els emojis de la reacció"
-overwriteFromPinnedEmojis: "Sobreescriu els emojis fixats al panel de reaccions"
+overwriteFromPinnedEmojis: "Sobreescriu des dels emojis fixats"
 reactionSettingDescription2: "Arrossega per reordenar, fes clic per suprimir, prem \"+\" per afegir."
 rememberNoteVisibility: "Recorda la configuració de visibilitat de les notes"
 attachCancel: "Eliminar el fitxer adjunt"
 deleteFile: "Esborrar l'arxiu "
-markAsSensitive: "Marcar com a sensible"
+markAsSensitive: "Marcar com a NSFW"
 unmarkAsSensitive: "Deixar de marcar com a sensible"
 enterFileName: "Defineix nom del fitxer"
 mute: "Silencia"
 unmute: "Deixa de silenciar"
-renoteMute: "Silenciar impulsos"
+renoteMute: "Silenciar Renotes"
-renoteUnmute: "Treure el silenci dels impulsos"
+renoteUnmute: "Treure el silenci de les renotes"
 block: "Bloqueja"
 unblock: "Desbloqueja"
 suspend: "Suspèn"
 unsuspend: "Deixa de suspendre"
-blockConfirm: "Vols bloquejar-lo?"
+blockConfirm: "Vols bloquejar?"
 unblockConfirm: "Vols desbloquejar-lo?"
 suspendConfirm: "Estàs segur que vols suspendre aquest compte?"
 unsuspendConfirm: "Estàs segur que vols treure la suspensió d'aquest compte?"
@@ -175,11 +175,11 @@ youCanCleanRemoteFilesCache: "Pots netejar la memòria cau fent clic al botó de
 cacheRemoteSensitiveFiles: "Posar a la memòria cau arxius remots sensibles"
 cacheRemoteSensitiveFilesDescription: "Quan aquesta opció és desactiva, els arxius remots sensibles es carregant directament del servidor d'origen sense que es guardin a la memòria cau."
 flagAsBot: "Marca aquest compte com a bot"
-flagAsBotDescription: "Activa aquesta opció si el compte el controla un programa. Si s'activa, actuarà com un senyal per altres desenvolupadors per prevenir cadenes d'interacció sense fi i ajustar els paràmetres interns de Misskey pe tractar el compte com un bot."
+flagAsBotDescription: "Marca aquest compte com a bot"
 flagAsCat: "Marca aquest compte com a gat"
 flagAsCatDescription: "Activeu aquesta opció per marcar aquest compte com a gat."
 flagShowTimelineReplies: "Mostra les respostes a la línia de temps"
-flagShowTimelineRepliesDescription: "Mostra les respostes dels usuaris a les notes d'altres usuaris a la línia de temps."
+flagShowTimelineRepliesDescription: "Mostra les respostes a la línia de temps"
 autoAcceptFollowed: "Aprova automàticament les sol·licituds de seguiment dels usuaris que segueixes"
 addAccount: "Afegeix un compte"
 reloadAccountsList: "Recarregar la llista de contactes"
@@ -204,7 +204,7 @@ selectUser: "Selecciona usuari/a"
 recipient: "Destinatari"
 annotation: "Comentaris"
 federation: "Federació"
-instances: "Instàncies "
+instances: "Servidors"
 registeredAt: "Registrat a"
 latestRequestReceivedAt: "Última petició rebuda"
 latestStatus: "Últim estat"
@@ -213,7 +213,7 @@ charts: "Gràfics"
 perHour: "Per hora"
 perDay: "Per dia"
 stopActivityDelivery: "Deixa d'enviar activitats"
-blockThisInstance: "Bloca aquesta instància "
+blockThisInstance: "Deixa d'enviar activitats"
 silenceThisInstance: "Silencia aquesta instància "
 mediaSilenceThisInstance: "Silenciar els arxius d'aquesta instància "
 operations: "Accions"
@@ -228,7 +228,7 @@ network: "Xarxa"
 disk: "Disc"
 instanceInfo: "Informació del fitxer d'instal·lació"
 statistics: "Estadístiques"
-clearQueue: "Esborra la cua de feina"
+clearQueue: "Esborrar la cua"
 clearQueueConfirmTitle: "Esteu segur que voleu esborrar la cua?"
 clearQueueConfirmText: "Les notes no lliurades que quedin a la cua no es federaran. Normalment aquesta operació no és necessària."
 clearCachedFiles: "Esborra la memòria cau"
@@ -254,7 +254,7 @@ processing: "S'està processant..."
 preview: "Vista prèvia"
 default: "Per defecte"
 defaultValueIs: "Per defecte: {value}"
-noCustomEmojis: "No hi ha emojis personalitzats"
+noCustomEmojis: "Cap emoji personalitzat"
 noJobs: "No hi ha feines"
 federating: "Federant"
 blocked: "Bloquejat"
@@ -268,11 +268,11 @@ instanceFollowers: "Seguidors del servidor"
 instanceUsers: "Usuaris del servidor"
 changePassword: "Canvia la contrasenya"
 security: "Seguretat"
-retypedNotMatch: "Les entrades no coincideix"
+retypedNotMatch: "L'entrada no coincideix"
 currentPassword: "Contrasenya actual"
 newPassword: "Contrasenya nova"
-newPasswordRetype: "Contrasenya nova (repeteix-la)"
+newPasswordRetype: "Contrasenya nou (repeteix-la)"
-attachFile: "Afegeix un arxiu"
+attachFile: "Adjunta fitxers"
 more: "Més"
 featured: "Destacat"
 usernameOrUserId: "Nom o ID d'usuari"
@@ -282,25 +282,25 @@ announcements: "Anuncis"
 imageUrl: "URL de la imatge"
 remove: "Eliminar"
 removed: "Eliminat"
-removeAreYouSure: "Segur que vols esborrar «{x}»?"
+removeAreYouSure: "Segur que voleu retirar «{x}»?"
-deleteAreYouSure: "Segur que vols esborrar «{x}»?"
+deleteAreYouSure: "Segur que voleu retirar «{x}»?"
-resetAreYouSure: "Segur que vols restablir-ho?"
+resetAreYouSure: "Segur que voleu restablir-ho?"
-areYouSure: "Estàs segur?"
+areYouSure: "Està segur?"
 saved: "S'ha desat"
 messaging: "Xat"
 upload: "Puja"
 keepOriginalUploading: "Guarda la imatge original"
-keepOriginalUploadingDescription: "Guarda la imatge pujada sense modificar. Si està desactivat, es generarà una versió per visualitzar a la web en pujar la imatge."
+keepOriginalUploadingDescription: "Guarda la imatge pujada com hi és. Si està apagat, una versió per a la visualització a la xarxa serà generada quan sigui pujada."
-fromDrive: "Des del Disc"
+fromDrive: "Des de la unitat"
 fromUrl: "Des d'un enllaç"
 uploadFromUrl: "Carrega des d'un enllaç"
 uploadFromUrlDescription: "Enllaç del fitxer que vols carregar"
 uploadFromUrlRequested: "Càrrega sol·licitada"
-uploadFromUrlMayTakeTime: "La càrrega des de l'enllaç pot trigar un temps"
+uploadFromUrlMayTakeTime: "La càrrega des de l'enllaç pot prendre un temps"
 explore: "Explora"
 messageRead: "Vist"
-noMoreHistory: "No hi ha res més per veure"
+noMoreHistory: "No hi resta més per veure"
-startMessaging: "Comença a xatejar"
+startMessaging: "Començar a xatejar"
 nUsersRead: "Vist per {n}"
 agreeTo: "Accepto que {0}"
 agree: "Hi estic d'acord"
@@ -312,7 +312,7 @@ home: "Inici"
 remoteUserCaution: "Ja que aquest usuari resideix a una instància remota, la informació mostrada es podria trobar incompleta."
 activity: "Activitat"
 images: "Imatges"
-image: "Imatge"
+image: "Imatges"
 birthday: "Aniversari"
 yearsOld: "{age} anys"
 registeredDate: "Data de registre"
@@ -327,10 +327,10 @@ darkThemes: "Temes foscos"
 syncDeviceDarkMode: "Sincronitza el mode fosc amb la configuració del dispositiu"
 drive: "Unitat"
 fileName: "Nom del Fitxer"
-selectFile: "Selecciona un fitxer"
+selectFile: "Selecciona fitxers"
 selectFiles: "Selecciona fitxers"
 selectFolder: "Selecció de carpeta"
-selectFolders: "Selecció de carpetes"
+selectFolders: "Selecció de carpeta"
 fileNotSelected: "Cap fitxer seleccionat"
 renameFile: "Canvia el nom del fitxer"
 folderName: "Nom de la carpeta"
@@ -359,9 +359,9 @@ reload: "Actualitza"
 doNothing: "Ignora"
 reloadConfirm: "Vols recarregar?"
 watch: "Veure"
-unwatch: "Deixa de veure"
+unwatch: "Deixar de veure"
 accept: "Acceptar"
-reject: "Denega"
+reject: "Denegar"
 normal: "Normal"
 instanceName: "Nom del servidor"
 instanceDescription: "Descripció del servidor"
@@ -382,6 +382,7 @@ enableLocalTimeline: "Activa la línia de temps local"
 enableGlobalTimeline: "Activa la línia de temps global"
 disablingTimelinesInfo: "Fins i tot si aquestes línies de temps són desactivades, els administradors i els moderadors poden continuar visualitzant per conveniència."
 registration: "Registre"
+enableRegistration: "Permet els registres d'usuaris"
 invite: "Convida"
 driveCapacityPerLocalAccount: "Capacitat del disc per usuaris locals"
 driveCapacityPerRemoteAccount: "Capacitat del disc per usuaris remots"
@@ -392,20 +393,20 @@ basicInfo: "Informació bàsica"
 pinnedUsers: "Usuaris fixats"
 pinnedUsersDescription: "Llista d'usuaris, separats per salts de línia, que seran fixats a la pestanya \"Explorar\"."
 pinnedPages: "Pàgines fixades"
-pinnedPagesDescription: "Escriu les adreces de les pàgines que vols fixar a la pàgina d'inici d'aquesta instància. Separades per salts de línia."
+pinnedPagesDescription: "Escriu els camins de les pàgines que vols fixar a la pàgina d'inici d'aquesta instància. Separades per salts de línia."
 pinnedClipId: "ID del retall fixat"
 pinnedNotes: "Nota fixada"
 hcaptcha: "hCaptcha"
-enableHcaptcha: "Activa hCaptcha"
+enableHcaptcha: "Activar hCaptcha"
 hcaptchaSiteKey: "Clau del lloc"
 hcaptchaSecretKey: "Clau secreta"
 mcaptcha: "mCaptcha"
-enableMcaptcha: "Activa mCaptcha"
+enableMcaptcha: "Activar mCaptcha"
 mcaptchaSiteKey: "Clau del lloc"
 mcaptchaSecretKey: "Clau secreta"
 mcaptchaInstanceUrl: "Adreça URL del servidor mCaptcha"
 recaptcha: "reCAPTCHA"
-enableRecaptcha: "Activa reCAPTCHA"
+enableRecaptcha: "Activar reCAPTCHA"
 recaptchaSiteKey: "Clau del lloc"
 recaptchaSecretKey: "Clau secreta"
 turnstile: "Turnstile"
@@ -447,14 +448,14 @@ aboutMisskey: "Quant a Misskey"
 administrator: "Administrador/a"
 token: "Codi de verificació"
 2fa: "Autenticació de doble factor"
-setupOf2fa: "Configura l'autenticació de doble factor"
+setupOf2fa: "Configurar l'autenticació de doble factor"
 totp: "Aplicació d'autenticació"
 totpDescription: "Escriu una contrasenya d'un sol us fent servir l'aplicació d'autenticació"
 moderator: "Moderador/a"
 moderation: "Moderació"
 moderationNote: "Nota de moderació "
 moderationNoteDescription: "Pots escriure notes que es compartiran entre els moderadors."
-addModerationNote: "Afegeix una nota de moderació "
+addModerationNote: "Afegir una nota de moderació "
 moderationLogs: "Registre de moderació "
 nUsersMentioned: "{n} usuaris mencionats"
 securityKeyAndPasskey: "Clau de seguretat / Clau de pas"
@@ -470,13 +471,13 @@ reduceUiAnimation: "Redueix les animacions de la interfície"
 share: "Comparteix"
 notFound: "No s'ha trobat"
 notFoundDescription: "No es troba cap pàgina que correspongui a aquesta adreça"
-uploadFolder: "Carpeta per defecte on desar els arxius pujats"
+uploadFolder: "Carpeta per defecte per pujades"
 markAsReadAllNotifications: "Marca totes les notificacions com a llegides"
 markAsReadAllUnreadNotes: "Marca-ho tot com a llegit"
 markAsReadAllTalkMessages: "Marcar tots els missatges com llegits"
 help: "Ajuda"
 inputMessageHere: "Escriu aquí el teu missatge "
-close: "Tanca"
+close: "Tancar"
 invites: "Convida"
 members: "Membres"
 transfer: "Transferir"
@@ -507,7 +508,7 @@ normalPassword: "Bona contrasenya"
 strongPassword: "Contrasenya segura"
 passwordMatched: "Correcte!"
 passwordNotMatched: "No coincideix"
-signinWith: "Inicia sessió amb {x}"
+signinWith: "Inicia sessió amb amb {x}"
 signinFailed: "Autenticació sense èxit. Intenta-ho un altre cop utilitzant la contrasenya i el nom correctes."
 or: "O"
 language: "Idioma"
@@ -586,12 +587,11 @@ masterVolume: "Volum principal"
 notUseSound: "Sense so"
 useSoundOnlyWhenActive: "Reproduir sons només quan Misskey estigui actiu"
 details: "Detalls"
-renoteDetails: "Més informació sobre l'impuls "
 chooseEmoji: "Tria un emoji"
 unableToProcess: "L'operació no pot ser completada "
 recentUsed: "Utilitzat recentment"
 install: "Instal·lació "
-uninstall: "Desinstal·la"
+uninstall: "Desinstal·lar "
 installedApps: "Aplicacions autoritzades "
 nothing: "No hi ha res per veure aquí "
 installedDate: "Data d'instal·lació"
@@ -608,13 +608,13 @@ output: "Sortida"
 script: "Script"
 disablePagesScript: "Desactivar AiScript a les pàgines "
 updateRemoteUser: "Actualitzar la informació de l'usuari remot"
-unsetUserAvatar: "Desactiva l'avatar "
+unsetUserAvatar: "Desactivar l'avatar "
 unsetUserAvatarConfirm: "Segur que vols desactivar l'avatar?"
-unsetUserBanner: "Desactiva el bàner "
+unsetUserBanner: "Desactivar el bàner "
 unsetUserBannerConfirm: "Segur que vols desactivar el bàner?"
-deleteAllFiles: "Esborra tots els arxius"
+deleteAllFiles: "Esborrar tots els arxius"
 deleteAllFilesConfirm: "Segur que vols esborrar tots els arxius?"
-removeAllFollowing: "Deixa de seguir tots els usuaris seguits"
+removeAllFollowing: "Deixar de seguir tots els usuaris seguits"
 removeAllFollowingDescription: "El fet d'executar això, et farà deixar de seguir a tots els usuaris de {host}. Si us plau, executa això si l'amfitrió, per exemple, ja no existeix."
 userSuspended: "Aquest usuari ha sigut suspès"
 userSilenced: "Aquest usuari està sent silenciat"
@@ -1183,8 +1183,8 @@ currentAnnouncements: "Informes actuals"
 pastAnnouncements: "Informes passats"
 youHaveUnreadAnnouncements: "Tens informes per llegir."
 useSecurityKey: "Segueix les instruccions del teu navegador O dispositiu per fer servir el teu passkey."
-replies: "Respon"
+replies: "Respondre"
-renotes: "Impulsar "
+renotes: "Impulsa"
 loadReplies: "Mostrar les respostes"
 loadConversation: "Mostrar la conversació "
 pinnedList: "Llista fixada"
@@ -1299,8 +1299,6 @@ yourNameContainsProhibitedWordsDescription: "Si de veritat vols fer servir aques
 thisContentsAreMarkedAsSigninRequiredByAuthor: "L'autor requereix l'inici de sessió per poder veure"
 lockdown: "Bloquejat"
 pleaseSelectAccount: "Seleccionar un compte"
-availableRoles: "Roles disponibles "
-acknowledgeNotesAndEnable: "Activa'l després de comprendre els possibles perills."
 _accountSettings:
   requireSigninToViewContents: "És obligatori l'inici de sessió per poder veure el contingut"
   requireSigninToViewContentsDescription1: "Es requereix l'inici de sessió per poder veure totes les notes i el contingut que has creat. Amb això esperem evitar que els rastrejadors recopilin informació."
@@ -1457,8 +1455,6 @@ _serverSettings:
   reactionsBufferingDescription: "Quan s'activa aquesta opció millora bastant el rendiment en recuperar les línies de temps reduint la càrrega de la base. Com a contrapunt, augmentarà  l'ús de memòria de Redís. Desactiva aquesta opció en cas de tenir un servidor amb poca memòria o si tens problemes d'inestabilitat."
   inquiryUrl: "URL de consulta "
   inquiryUrlDescription: "Escriu adreça URL per al formulari de consulta per al mantenidor del servidor o una pàgina web amb el contacte d'informació."
-  openRegistration: "Registres oberts"
-  openRegistrationWarning: "Obrir els registres és arriscat. Es recomana obrir-los només si el servidor és monitorat constantment i per respondre immediatament davant qualsevol problema."
   thisSettingWillAutomaticallyOffWhenModeratorsInactive: "Si no es detecta activitat per part del moderador durant un període de temps, aquesta opció es desactiva automàticament per evitar el correu brossa."
 _accountMigration:
   moveFrom: "Migrar un altre compte a aquest"
@@ -2741,6 +2737,3 @@ _selfXssPrevention:
   description1: "Si posa alguna cosa al seu compte, un usuari malintencionat podria segrestar-la o robar-li les dades."
   description2: "Si no entens que estàs fent %cpara ara mateix i tanca la finestra."
   description3: "Per obtenir més informació. {link}"
-_followRequest:
-  recieved: "Sol·licituds rebudes"
-  sent: "Sol·licituds enviades"

locales/cs-CZ.yml

@@ -348,6 +348,7 @@ enableLocalTimeline: "Povolit lokální čas"
 enableGlobalTimeline: "Povolit globální čas"
 disablingTimelinesInfo: "Administrátoři a Moderátoři budou mít stálý přístup ke všem časovým osám i přes to že nejsou zapnuté."
 registration: "Registrace"
+enableRegistration: "Povolit registraci novým uživatelům"
 invite: "Pozvat"
 driveCapacityPerLocalAccount: "Kapacita disku na lokálního uživatele"
 driveCapacityPerRemoteAccount: "Kapacita disku na vzdáleného uživatele"

locales/de-DE.yml

@@ -8,9 +8,6 @@ search: "Suchen"
 notifications: "Benachrichtigungen"
 username: "Benutzername"
 password: "Passwort"
-initialPasswordForSetup: "Initiales Passwort für die Einrichtung"
-initialPasswordIsIncorrect: "Das initiale Passwort für die Einrichtung ist falsch"
-initialPasswordForSetupDescription: "Verwende das in der Konfigurationsdatei angegebene Passwort, wenn du Misskey selbst installiert hast.\nWenn du einen Misskey-Hostingdienst o.ä. nutzt, verwende das dort angegebene Kennwort.\nWenn du kein Passwort festgelegt hast, lasse es leer, um fortzufahren."
 forgotPassword: "Passwort vergessen"
 fetchingAsApObject: "Wird aus dem Fediverse angefragt …"
 ok: "OK"
@@ -63,7 +60,6 @@ copyFileId: "Datei-ID kopieren"
 copyFolderId: "Ordner-ID kopieren"
 copyProfileUrl: "Profil-URL kopieren"
 searchUser: "Nach einem Benutzer suchen"
-searchThisUsersNotes: "Notizen dieses Benutzers suchen"
 reply: "Antworten"
 loadMore: "Mehr laden"
 showMore: "Mehr anzeigen"
@@ -112,14 +108,11 @@ enterEmoji: "Gib ein Emoji ein"
 renote: "Renote"
 unrenote: "Renote zurücknehmen"
 renoted: "Renote getätigt."
-renotedToX: "Renoted zu {name}."
 cantRenote: "Renote dieses Beitrags nicht möglich."
 cantReRenote: "Renote einer Renote nicht möglich."
 quote: "Zitieren"
 inChannelRenote: "Kanal-interner Renote"
 inChannelQuote: "Kanal-internes Zitat"
-renoteToChannel: "Renote zu Kanal"
-renoteToOtherChannel: "Renote zu anderem Kanal"
 pinnedNote: "Angeheftete Notiz"
 pinned: "Angeheftet"
 you: "Du"
@@ -131,13 +124,12 @@ reactions: "Reaktionen"
 emojiPicker: "Emoji auswählen"
 pinnedEmojisForReactionSettingDescription: "Lege Emojis fest, die angepinnt werden sollen, um sie beim Reagieren als Erstes anzuzeigen."
 pinnedEmojisSettingDescription: "Lege Emojis fest, die angepinnt werden sollen, um sie in der Emoji-Auswahl als Erstes anzuzeigen"
-emojiPickerDisplay: "Anzeige der Emoji-Auswahl"
 overwriteFromPinnedEmojisForReaction: "Überschreiben mit den Reaktions-Einstellungen"
 overwriteFromPinnedEmojis: "Überschreiben mit den allgemeinen Einstellungen"
 reactionSettingDescription2: "Ziehe um Anzuordnen, klicke um zu löschen, drücke „+“ um hinzuzufügen"
 rememberNoteVisibility: "Notizsichtbarkeit merken"
 attachCancel: "Anhang entfernen"
-deleteFile: "Datei löschen"
+deleteFile: "Datei gelöscht"
 markAsSensitive: "Als sensibel markieren"
 unmarkAsSensitive: "Als nicht sensibel markieren"
 enterFileName: "Dateinamen eingeben"
@@ -158,7 +150,6 @@ editList: "Liste bearbeiten"
 selectChannel: "Kanal auswählen"
 selectAntenna: "Antenne auswählen"
 editAntenna: "Antenne bearbeiten"
-createAntenna: "Erstelle eine Antenne"
 selectWidget: "Widget auswählen"
 editWidgets: "Widgets bearbeiten"
 editWidgetsExit: "Fertig"
@@ -185,8 +176,6 @@ addAccount: "Benutzerkonto hinzufügen"
 reloadAccountsList: "Benutzerkontoliste aktualisieren"
 loginFailed: "Anmeldung fehlgeschlagen"
 showOnRemote: "Auf Ursprungsinstanz ansehen"
-chooseServerOnMisskeyHub: "Wähle einen Server aus dem Misskey Hub"
-inputHostName: "Gib die Domain an"
 general: "Allgemein"
 wallpaper: "Hintergrund"
 setWallpaper: "Hintergrund festlegen"
@@ -197,7 +186,6 @@ followConfirm: "Möchtest du {name} wirklich folgen?"
 proxyAccount: "Proxy-Benutzerkonto"
 proxyAccountDescription: "Ein Proxy-Konto ist ein Benutzerkonto, das unter bestimmten Bedingungen als Follower für Benutzer fremder Instanzen fungiert. Wenn zum Beispiel ein Benutzer einen Benutzer einer fremden Instanz zu einer Liste hinzufügt, werden die Aktivitäten des entfernten Benutzers nicht an die Instanz übermittelt, wenn kein lokaler Benutzer diesem Benutzer folgt; stattdessen folgt das Proxy-Konto."
 host: "Hostname"
-selectSelf: "Mich auswählen"
 selectUser: "Benutzer auswählen"
 recipient: "Empfänger"
 annotation: "Anmerkung"
@@ -213,7 +201,6 @@ perDay: "Pro Tag"
 stopActivityDelivery: "Senden von Aktivitäten einstellen"
 blockThisInstance: "Diese Instanz blockieren"
 silenceThisInstance: "Instanz stummschalten"
-mediaSilenceThisInstance: "Medien dieses Servers stummschalten"
 operations: "Aktionen"
 software: "Software"
 version: "Version"
@@ -235,8 +222,6 @@ 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."
-mediaSilencedInstances: "Medien-stummgeschaltete Server"
-mediaSilencedInstancesDescription: "Gib pro Zeile die Hostnamen der Server ein, dessen Medien du stummschalten möchtest. Alle Benutzerkonten der aufgeführten Server werden als sensibel behandelt und können keine benutzerdefinierten Emojis verwenden. Gesperrte Server sind davon nicht betroffen."
 muteAndBlock: "Stummschaltungen und Blockierungen"
 mutedUsers: "Stummgeschaltete Benutzer"
 blockedUsers: "Blockierte Benutzer"
@@ -327,7 +312,6 @@ selectFile: "Datei auswählen"
 selectFiles: "Dateien auswählen"
 selectFolder: "Ordner auswählen"
 selectFolders: "Ordner auswählen"
-fileNotSelected: "Keine Datei ausgewählt"
 renameFile: "Datei umbenennen"
 folderName: "Ordnername"
 createFolder: "Ordner erstellen"
@@ -335,7 +319,6 @@ renameFolder: "Ordner umbenennen"
 deleteFolder: "Ordner löschen"
 folder: "Ordner"
 addFile: "Datei hinzufügen"
-showFile: "Datei anzeigen"
 emptyDrive: "Deine Drive ist leer"
 emptyFolder: "Dieser Ordner ist leer"
 unableToDelete: "Nicht löschbar"
@@ -378,6 +361,7 @@ enableLocalTimeline: "Lokale Chronik aktivieren"
 enableGlobalTimeline: "Globale Chronik aktivieren"
 disablingTimelinesInfo: "Administratoren und Moderatoren haben immer Zugriff auf alle Chroniken, auch wenn diese deaktiviert sind."
 registration: "Registrieren"
+enableRegistration: "Registrierung neuer Benutzer erlauben"
 invite: "Einladen"
 driveCapacityPerLocalAccount: "Drive-Kapazität pro lokalem Benutzerkonto"
 driveCapacityPerRemoteAccount: "Drive-Kapazität pro Benutzer fremder Instanzen"
@@ -415,7 +399,6 @@ name: "Name"
 antennaSource: "Antennenquelle"
 antennaKeywords: "Zu beobachtende Schlüsselwörter"
 antennaExcludeKeywords: "Zu ignorierende Schlüsselwörter"
-antennaExcludeBots: "Bot-Accounts ausschließen"
 antennaKeywordsDescription: "Zum Nutzen einer \"UND\"-Verknüpfung Einträge mit Leerzeichen trennen, zum Nutzen einer \"ODER\"-Verknüpfung Einträge mit einem Zeilenumbruch trennen"
 notifyAntenna: "Über neue Notizen benachrichtigen"
 withFileAntenna: "Nur Notizen mit Dateien"
@@ -483,7 +466,6 @@ retype: "Erneut eingeben"
 noteOf: "Notiz von {user}"
 quoteAttached: "Zitat"
 quoteQuestion: "Als Zitat anhängen?"
-attachAsFileQuestion: "Der Text in der Zwischenablage ist lang. Möchtest du ihn als Textdatei anhängen?"
 noMessagesYet: "Noch keine Nachrichten vorhanden"
 newMessageExists: "Du hast eine neue Nachricht"
 onlyOneFileCanBeAttached: "Es kann pro Nachricht nur eine Datei angehängt werden"
@@ -509,11 +491,7 @@ uiLanguage: "Sprache der Benutzeroberfläche"
 aboutX: "Über {x}"
 emojiStyle: "Emoji-Stil"
 native: "Nativ"
-menuStyle: "Menü Stil"
-style: "Stil"
-popup: "Pop-up"
 showNoteActionsOnlyHover: "Notizmenü nur bei Mouseover anzeigen"
-showReactionsCount: "Zeige die Anzahl der Reaktionen auf Notizen an"
 noHistory: "Kein Verlauf gefunden"
 signinHistory: "Anmeldungsverlauf"
 enableAdvancedMfm: "Erweitertes MFM aktivieren"
@@ -594,7 +572,6 @@ ascendingOrder: "Aufsteigende Reihenfolge"
 descendingOrder: "Absteigende Reihenfolge"
 scratchpad: "Testumgebung"
 scratchpadDescription: "Die Testumgebung bietet einen Bereich für AiScript-Experimente. Dort kannst du AiScript schreiben, ausführen sowie dessen Auswirkungen auf Misskey überprüfen."
-uiInspector: "UI-Inspektor"
 output: "Ausgabe"
 script: "Skript"
 disablePagesScript: "AiScript auf Seiten deaktivieren"
@@ -675,7 +652,6 @@ smtpSecure: "Für SMTP-Verbindungen implizit SSL/TLS verwenden"
 smtpSecureInfo: "Schalte dies aus, falls du STARTTLS verwendest."
 testEmail: "Emailversand testen"
 wordMute: "Wortstummschaltung"
-hardWordMute: "Harte Wort-Stummschaltung"
 regexpError: "Fehler in einem regulären Ausdruck"
 regexpErrorDescription: "Im regulären Ausdruck deiner in Zeile {line} von {tab}en Wortstummschaltungen ist ein Fehler aufgetreten:"
 instanceMute: "Instanzstummschaltungen"
@@ -697,7 +673,6 @@ useGlobalSettingDesc: "Ist diese Option aktiviert, werden die Benachrichtigungse
 other: "Anderes"
 regenerateLoginToken: "Anmeldetoken regenerieren"
 regenerateLoginTokenDescription: "Den zur Anmeldung intern verwendeten Token regenerieren. Normalerweise wird dies nicht benötigt. Bei Regeneration werden alle Geräte ausgeloggt."
-theKeywordWhenSearchingForCustomEmoji: "Das ist das Schlagwort beim Suchen von benutzerdefinierten Emojis."
 setMultipleBySeparatingWithSpace: "Trenne Elemente durch ein Leerzeichen um mehrere Einstellungen zu kofigurieren."
 fileIdOrUrl: "Datei-ID oder URL"
 behavior: "Verhalten"
@@ -907,12 +882,9 @@ makeReactionsPublicDescription: "Jeder wird die Liste deiner gesendeten Reaktion
 classic: "Classic"
 muteThread: "Thread stummschalten"
 unmuteThread: "Threadstummschaltung aufheben"
-followingVisibility: "Sichtbarkeit der Gefolgten"
-followersVisibility: "Sichtbarkeit der Folgenden"
 continueThread: "Weiteren Threadverlauf anzeigen"
 deleteAccountConfirm: "Dein Benutzerkonto wird unwiderruflich gelöscht. Trotzdem fortfahren?"
 incorrectPassword: "Falsches Passwort."
-incorrectTotp: "Das Einmalpasswort ist falsch oder abgelaufen."
 voteConfirm: "Wirklich für „{choice}“ abstimmen?"
 hide: "Inhalt verbergen"
 useDrawerReactionPickerForMobile: "Auf mobilen Geräten ausfahrbare Reaktionsauswahl anzeigen"
@@ -937,9 +909,6 @@ oneHour: "Eine Stunde"
 oneDay: "Einen Tag"
 oneWeek: "Eine Woche"
 oneMonth: "1 Monat"
-threeMonths: "3 Monate"
-oneYear: "1 Jahr"
-threeDays: "3 Tage"
 reflectMayTakeTime: "Es kann etwas dauern, bis sich dies widerspiegelt."
 failedToFetchAccountInformation: "Benutzerkontoinformationen konnten nicht abgefragt werden"
 rateLimitExceeded: "Versuchsanzahl überschritten"
@@ -1013,7 +982,6 @@ neverShow: "Nicht wieder anzeigen"
 remindMeLater: "Vielleicht später"
 didYouLikeMisskey: "Gefällt dir Misskey?"
 pleaseDonate: "Misskey ist die kostenlose Software, die von {host} verwendet wird. Wir würden uns über Spenden freuen, damit dessen Entwicklung weitergeführt werden kann!"
-correspondingSourceIsAvailable: "Der entsprechende Quellcode ist verfügbar unter {anchor}"
 roles: "Rollen"
 role: "Rolle"
 noRole: "Rolle nicht gefunden"
@@ -1041,7 +1009,6 @@ thisPostMayBeAnnoyingHome: "Zur Startseite schicken"
 thisPostMayBeAnnoyingCancel: "Abbrechen"
 thisPostMayBeAnnoyingIgnore: "Trotzdem schicken"
 collapseRenotes: "Bereits gesehene Renotes verkürzt anzeigen"
-collapseRenotesDescription: "Klappe Notizen ein, auf die du bereits reagiert oder die du renoted hast."
 internalServerError: "Serverinterner Fehler"
 internalServerErrorDescription: "Im Server ist ein unerwarteter Fehler aufgetreten."
 copyErrorInfo: "Fehlerdetails kopieren"
@@ -1065,8 +1032,6 @@ resetPasswordConfirm: "Wirklich Passwort zurücksetzen?"
 sensitiveWords: "Sensible Wörter"
 sensitiveWordsDescription: "Die Notizsichtbarkeit aller Notizen, die diese Wörter enthalten, wird automatisch auf \"Startseite\" gesetzt. Durch Zeilenumbrüche können mehrere konfiguriert werden."
 sensitiveWordsDescription2: "Durch die Verwendung von Leerzeichen können AND-Verknüpfungen angegeben werden und durch das Umgeben von Schrägstrichen können reguläre Ausdrücke verwendet werden."
-prohibitedWords: "Verbotene Wörter"
-prohibitedWordsDescription: "Aktiviert eine Fehlermeldung, wenn versucht wird, eine Notiz zu veröffentlichen, die das/die eingestellte(n) Wort(e) enthält. Mehrere Begriffe können durch Zeilenumbrüche getrennt festgelegt werden."
 prohibitedWordsDescription2: "Durch die Verwendung von Leerzeichen können AND-Verknüpfungen angegeben werden und durch das Umgeben von Schrägstrichen können reguläre Ausdrücke verwendet werden."
 hiddenTags: "Ausgeblendete Hashtags"
 hiddenTagsDescription: "Die hier eingestellten Tags werden nicht mehr in den Trends angezeigt. Mit der Umschalttaste können mehrere ausgewählt werden."
@@ -1113,8 +1078,6 @@ preservedUsernames: "Reservierte Benutzernamen"
 preservedUsernamesDescription: "Gib zu reservierende Benutzernamen durch Zeilenumbrüche getrennt an. Diese werden für die Registrierung gesperrt, können aber von Administratoren zur manuellen Erstellung von Konten verwendet werden. Existierende Konten, die diese Namen bereits verwenden, werden nicht beeinträchtigt."
 createNoteFromTheFile: "Notiz für diese Datei schreiben"
 archive: "Archivieren"
-archived: "Archiviert"
-unarchive: "Dearchivieren"
 channelArchiveConfirmTitle: "{name} wirklich archivieren?"
 channelArchiveConfirmDescription: "Ein archivierter Kanal taucht nicht mehr in der Kanalliste oder in Suchergebnissen auf. Zudem können ihm keine Beiträge mehr hinzugefügt werden."
 thisChannelArchived: "Dieser Kanal wurde archiviert."
@@ -1192,9 +1155,6 @@ confirmShowRepliesAll: "Dies ist eine unwiderrufliche Aktion. Wirklich Antworten
 confirmHideRepliesAll: "Dies ist eine unwiderrufliche Aktion. Wirklich Antworten von allen momentan gefolgten Benutzern nicht in der Chronik anzeigen?"
 externalServices: "Externe Dienste"
 sourceCode: "Quellcode"
-sourceCodeIsNotYetProvided: "Der Quellcode ist noch nicht verfügbar. Kontaktiere den Administrator, um das Problem zu lösen."
-repositoryUrl: "Repository URL"
-repositoryUrlOrTarballRequired: "Wenn du kein Repository veröffentlicht hast, musst du stattdessen einen Tarball bereitstellen. Siehe .config/example.yml für weitere Informationen."
 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."
@@ -1216,82 +1176,15 @@ signupPendingError: "Beim Überprüfen der Mailadresse ist etwas schiefgelaufen.
 cwNotationRequired: "Ist \"Inhaltswarnung verwenden\" aktiviert, muss eine Beschreibung gegeben werden."
 doReaction: "Reagieren"
 code: "Code"
-remainingN: "Verbleibend: {n}"
-overwriteContentConfirm: "Bist du sicher, dass du den aktuellen Inhalt überschreiben willst?"
-seasonalScreenEffect: "Saisonaler Bildschirmeffekt"
 decorate: "Dekorieren"
 addMfmFunction: "MFM hinzufügen"
-enableQuickAddMfmFunction: "Erweiterte MFM-Auswahl anzeigen"
 sfx: "Soundeffekte"
-soundWillBePlayed: "Es wird Ton wiedergegeben"
-showReplay: "Wiederholung anzeigen"
-ranking: "Rangliste"
 lastNDays: "Letzten {n} Tage"
-backToTitle: "Zurück zum Startbildschirm"
-enableHorizontalSwipe: "Wischen, um zwischen Tabs zu wechseln"
-loading: "Laden"
 surrender: "Abbrechen"
-gameRetry: "Erneut versuchen"
-notUsePleaseLeaveBlank: "Leer lassen, wenn nicht verwendet"
-useTotp: "Gib das Einmalpasswort ein"
-useBackupCode: "Verwende die Backup-Codes"
-launchApp: "Starte die App"
-useNativeUIForVideoAudioPlayer: "Browser-Benutzeroberfläche für die Video- und Audiowiedergabe verwenden"
-keepOriginalFilename: "Ursprünglichen Dateinamen beibehalten"
-keepOriginalFilenameDescription: "Wenn diese Einstellung deaktiviert ist, wird der Dateiname beim Hochladen automatisch durch eine zufällige Zeichenfolge ersetzt."
-noDescription: "Keine Beschreibung vorhanden"
-tryAgain: "Bitte später erneut versuchen"
-confirmWhenRevealingSensitiveMedia: "Das Anzeigen von sensiblen Medien bestätigen"
-sensitiveMediaRevealConfirm: "Es könnte sich um sensible Medien handeln. Möchtest du sie anzeigen?"
-createdLists: "Erstellte Listen"
-createdAntennas: "Erstellte Antennen"
-fromX: "Von {x}"
-genEmbedCode: "Einbettungscode generieren"
-noteOfThisUser: "Notizen dieses Benutzers"
-clipNoteLimitExceeded: "Zu diesem Clip können keine weiteren Notizen hinzugefügt werden."
-discard: "Verwerfen"
-thereAreNChanges: "Es gibt {n} Änderung(en)"
-signinWithPasskey: "Mit Passkey anmelden"
-passkeyVerificationFailed: "Die Passkey-Verifizierung ist fehlgeschlagen."
-passkeyVerificationSucceededButPasswordlessLoginDisabled: "Die Verifizierung des Passkeys war erfolgreich, aber die passwortlose Anmeldung ist deaktiviert."
-messageToFollower: "Nachricht an die Follower"
-testCaptchaWarning: "Diese Funktion ist für CAPTCHA-Testzwecke gedacht.\n<strong>Nicht in einer Produktivumgebung verwenden.</strong>"
-prohibitedWordsForNameOfUser: "Verbotene Begriffe für Benutzernamen"
-prohibitedWordsForNameOfUserDescription: "Wenn eine Zeichenfolge aus dieser Liste im Namen eines Benutzers enthalten ist, wird der Benutzername abgelehnt. Benutzer mit Moderatorenrechten sind von dieser Einschränkung nicht betroffen."
-yourNameContainsProhibitedWords: "Dein Name enthält einen verbotenen Begriff"
-yourNameContainsProhibitedWordsDescription: "Der Name enthält eine verbotene Zeichenfolge. Wende dich an deinen Serveradministrator, wenn du diesen Namen verwenden möchtest."
-pleaseSelectAccount: "Bitte Konto auswählen"
-availableRoles: "Verfügbare Rollen"
-_accountSettings:
-  requireSigninToViewContents: "Anmeldung erfordern, um Inhalte anzuzeigen"
-  requireSigninToViewContentsDescription1: "Erfordere eine Anmeldung, um alle Notizen und andere Inhalte anzuzeigen, die du erstellt hast. Dadurch wird verhindert, dass Crawler deine Informationen sammeln."
-  requireSigninToViewContentsDescription3: "Diese Einschränkungen gelten möglicherweise nicht für föderierte Inhalte von anderen Servern."
-  makeNotesFollowersOnlyBefore: "Macht frühere Notizen nur für Follower sichtbar"
-  makeNotesHiddenBefore: "Frühere Notizen privat machen"
-  mayNotEffectForFederatedNotes: "Dies hat möglicherweise keine Auswirkungen auf Notizen, die an andere Server föderiert werden."
-_abuseUserReport:
-  forward: "Weiterleiten"
-  forwardDescription: "Leite die Meldung an einen entfernten Server als anonymes Systemkonto weiter."
-  accept: "Akzeptieren"
-  reject: "Ablehnen"
 _delivery:
   stop: "Gesperrt"
   _type:
     none: "Wird veröffentlicht"
-    manuallySuspended: "Manuell gesperrt"
-_bubbleGame:
-  howToPlay: "Wie man spielt"
-  hold: "Halten"
-  _score:
-    score: "Spielstand"
-    scoreYen: "Verdienter Geldbetrag"
-    highScore: "Höchstpunktzahl"
-    maxChain: "Maximale Anzahl an Verkettungen"
-    yen: "{yen} Yen"
-  _howToPlay:
-    section1: "Passe die Position an und lasse das Objekt in das Spielfeld fallen."
-    section2: "Wenn sich zwei Objekte der gleichen Art berühren, verwandeln sie sich in ein anderes Objekt und du bekommst Punkte."
-    section3: "Das Spiel ist vorbei, wenn die Objekte aus dem Spielfeld herausragen. Versuche eine hohe Punktzahl zu erreichen, indem du die Objekte miteinander verschmelzt, ohne dass das Spielfeld überläuft!"
 _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."
@@ -1335,18 +1228,8 @@ _initialTutorial:
     reply: "Klicke auf diesen Button, um auf eine Nachricht zu antworten. Es ist auch möglich, auf Antworten zu antworten und die Unterhaltung wie einen Thread fortzusetzen."
   _reaction:
     title: "Was sind Reaktionen?"
-    description: "Auf Notizen kann mit verschiedenen Emojis reagiert werden. Reaktionen ermöglichen es dir, Nuancen auszudrücken, die mit einem einfachen „Gefällt mir“ vielleicht nicht ausgedrückt werden können."
-    letsTryReacting: "Reaktionen können durch Klicken auf die Schaltfläche „+“ in der Notiz hinzugefügt werden. Versuche, auf diese Beispielnotiz zu reagieren!"
     reactToContinue: "Füge eine Reaktion hinzu, um fortzufahren."
     reactNotification: "Du erhältst Echtzeit-Benachrichtigungen, wenn jemand auf deine Notiz reagiert."
-    reactDone: "Du kannst eine Reaktion zurücknehmen, indem du auf den '-' Button drückst."
-  _timeline:
-    title: "So funktionieren die Chroniken"
-    home: "Du kannst Beiträge von den Konten sehen, denen du folgst."
-    local: "Du kannst Beiträge aller Benutzer auf diesem Server sehen."
-    social: "Notizen von der Startseite und der lokalen Chronik werden angezeigt."
-    global: "Du kannst Notizen von allen föderierten Servern sehen."
-    description2: "Du kannst jederzeit am oberen Rand des Bildschirms zwischen den jeweiligen Chroniken wechseln."
   _postNote:
     _visibility:
       description: "Du kannst einschränken, wer deine Notiz sehen kann."
@@ -1354,16 +1237,8 @@ _initialTutorial:
       doNotSendConfidencialOnDirect1: "Sei vorsichtig, wenn du sensible Informationen verschickst!"
     _cw:
       title: "Inhaltswarnung"
-      _exampleNote:
-        note: "Ich hatte gerade einen Donut mit Schokoladenüberzug 🍩😋"
-  _howToMakeAttachmentsSensitive:
-    tryThisFile: "Versuche, das angehängte Bild als sensibel zu markieren!"
-    method: "Um einen Anhang als sensibel zu kennzeichnen, klicke auf das Vorschaubild der Datei, um das Menü zu öffnen, und klicke auf „Als sensibel markieren“."
-    sensitiveSucceeded: "Wenn du Dateien anhängst, stelle bitte die Sensibilität entsprechend der Serverrichtlinien ein."
-    doItToContinue: "Markiere die angehängte Datei als sensibel, um fortzufahren."
   _done:
     title: "Du hast das Tutorial abgeschlossen! 🎉"
-    description: "Die hier beschriebenen Funktionen sind nur ein kleiner Teil dessen, was Misskey zu bieten hat; um mehr darüber zu erfahren, wie du Misskey benutzen kannst, besuche bitte {link}."
 _timelineDescription:
   local: "In der lokalen Chronik siehst du Notizen von allen Benutzern auf diesem Server."
   global: "In der globalen Chronik siehst du Notizen von allen föderierten Servern."
@@ -1381,7 +1256,6 @@ _serverSettings:
   fanoutTimelineDescription: "Ist diese Option aktiviert, kann eine erhebliche Verbesserung im Abrufen von Chroniken und eine Reduzierung der Datenbankbelastung erzielt werden, im Gegenzug zu einer Steigerung in der Speichernutzung von Redis. Bei geringem Serverspeicher oder Serverinstabilität kann diese Option deaktiviert werden."
   fanoutTimelineDbFallback: "Auf die Datenbank zurückfallen"
   fanoutTimelineDbFallbackDescription: "Ist diese Option aktiviert, wird die Chronik auf zusätzliche Abfragen in der Datenbank zurückgreifen, wenn sich die Chronik nicht im Cache befindet. Eine Deaktivierung führt zu geringerer Serverlast, aber schränkt den Zeitraum der abrufbaren Chronik ein. "
-  thisSettingWillAutomaticallyOffWhenModeratorsInactive: "Wenn über einen bestimmten Zeitraum keine Moderatorenaktivität festgestellt wird, wird diese Einstellung automatisch deaktiviert, um Spam zu verhindern."
 _accountMigration:
   moveFrom: "Von einem anderen Konto zu diesem migrieren"
   moveFromSub: "Alias für ein anderes Konto erstellen"
@@ -1640,12 +1514,7 @@ _achievements:
       title: "Testüberfluss"
       description: "Betätige den Benachrichtigungstest mehrfach innerhalb einer extrem kurzen Zeitspanne"
     _tutorialCompleted:
-      title: "Misskey Grundkurs-Diplom"
       description: "Tutorial abgeschlossen"
-    _bubbleGameExplodingHead:
-      title: "🤯"
-    _bubbleGameDoubleExplodingHead:
-      title: "Doppel🤯"
 _role:
   new: "Rolle erstellen"
   edit: "Rolle bearbeiten"
@@ -1686,7 +1555,6 @@ _role:
     gtlAvailable: "Kann auf die globale Chronik zugreifen"
     ltlAvailable: "Kann auf die lokale Chronik zugreifen"
     canPublicNote: "Kann öffentliche Notizen erstellen"
-    mentionMax: "Maximale Anzahl von Erwähnungen in einer Notiz"
     canInvite: "Erstellung von Einladungscodes für diese Instanz"
     inviteLimit: "Maximalanzahl an Einladungen"
     inviteLimitCycle: "Zyklus des Einladungslimits"
@@ -1709,12 +1577,9 @@ _role:
     canSearchNotes: "Nutzung der Notizsuchfunktion"
     canUseTranslator: "Verwendung des Übersetzers"
     avatarDecorationLimit: "Maximale Anzahl an Profilbilddekorationen, die angebracht werden können"
-    canImportAntennas: "Importieren von Antennen erlauben"
   _condition:
     isLocal: "Lokaler Benutzer"
     isRemote: "Benutzer fremder Instanz"
-    isCat: "Katzen-Benutzer"
-    isBot: "Bot-Benutzer"
     createdLessThan: "Kontoerstellung liegt weniger als X zurück"
     createdMoreThan: "Kontoerstellung liegt mehr als X zurück"
     followersLessThanOrEq: "Hat X oder weniger Follower"
@@ -1930,12 +1795,6 @@ _sfx:
   note: "Notizen"
   noteMy: "Meine Notizen"
   notification: "Benachrichtigungen"
-_soundSettings:
-  driveFile: "Audiodatei aus dem Drive verwenden"
-  driveFileWarn: "Wähle eine Audiodatei aus dem Drive"
-  driveFileTypeWarn: "Diese Datei wird nicht unterstützt"
-  driveFileTypeWarnDescription: "Bitte wähle eine Audiodatei"
-  driveFileDurationWarn: "Audio zu lang."
 _ago:
   future: "Zukunft"
   justNow: "Gerade eben"
@@ -2017,23 +1876,6 @@ _permissions:
   "write:flash": "Deine Plays bearbeiten oder löschen"
   "read:flash-likes": "Liste der Plays, die mir gefallen, lesen"
   "write:flash-likes": "Liste der Plays, die mir gefallen, bearbeiten"
-  "write:admin:delete-account": "Benutzerkonto löschen"
-  "write:admin:delete-all-files-of-a-user": "Alle Dateien eines Benutzers löschen"
-  "read:admin:index-stats": "Statistiken zu Datenbankindizes einsehen"
-  "read:admin:table-stats": "Statistiken zu Datenbanktabellen einsehen"
-  "read:admin:user-ips": "IP-Adressen von Benutzern anzeigen"
-  "read:admin:meta": "Metadaten der Instanz einsehen"
-  "write:admin:reset-password": "Benutzerpasswort zurücksetzen"
-  "write:admin:send-email": "E-Mail versenden"
-  "read:admin:server-info": "Serverinformationen anzeigen"
-  "read:admin:show-moderation-log": "Moderationsprotokoll einsehen"
-  "read:admin:show-user": "Private Benutzerinformationen einsehen"
-  "write:admin:invite-codes": "Einladungscodes verwalten"
-  "read:admin:invite-codes": "Einladungscodes anzeigen"
-  "write:admin:announcements": "Ankündigungen verwalten"
-  "read:admin:announcements": "Ankündigungen einsehen"
-  "write:admin:avatar-decorations": "Kann Avatar-Dekorationen verwalten"
-  "read:admin:avatar-decorations": "Avatar-Dekorationen ansehen"
 _auth:
   shareAccessTitle: "Verteilung von App-Berechtigungen"
   shareAccess: "Möchtest du „{name}“ authorisieren, auf dieses Benutzerkonto zugreifen zu können?"
@@ -2273,7 +2115,6 @@ _notification:
   pollEnded: "Umfrageergebnisse sind verfügbar"
   newNote: "Neue Notiz"
   unreadAntennaNote: "Antenne {name}"
-  roleAssigned: "Rolle zugewiesen"
   emptyPushNotificationMessage: "Push-Benachrichtigungen wurden aktualisiert"
   achievementEarned: "Errungenschaft freigeschaltet"
   testNotification: "Testbenachrichtigung"
@@ -2448,31 +2289,3 @@ _reversi:
   black: "Schwarz"
   white: "Weiß"
   total: "Gesamt"
-_offlineScreen:
-  header: "Verbindung zum Server nicht möglich"
-_urlPreviewSetting:
-  title: "Einstellungen der URL-Vorschau"
-  enable: "URL-Vorschau aktivieren"
-  timeout: "Zeitüberschreitung beim Abrufen der Vorschau (ms)"
-  maximumContentLength: "Maximale Content-Length (Bytes)"
-_mediaControls:
-  playbackRate: "Wiedergabegeschwindigkeit"
-_contextMenu:
-  title: "Kontextmenü"
-  app: "Anwendung"
-_embedCodeGen:
-  title: "Einbettungscode anpassen"
-  header: "Kopfzeile anzeigen"
-  autoload: "Automatisch mehr laden (veraltet)"
-  maxHeight: "Maximale Höhe"
-  maxHeightDescription: "Der Wert 0 deaktiviert die Einstellung der maximalen Höhe. Gib einen Wert an, um zu verhindern, dass das Widget weiterhin vertikal vergrößert wird."
-  maxHeightWarn: "Die Begrenzung der maximalen Höhe ist deaktiviert (0). Wenn dies nicht beabsichtigt war, setze die maximale Höhe auf einen Wert fest."
-  applyToPreview: "Auf die Vorschau anwenden"
-  generateCode: "Einbettungscode generieren"
-  codeGenerated: "Der Code wurde generiert"
-  codeGeneratedDescription: "Füge den generierten Code in deine Website ein, um den Inhalt einzubetten."
-_selfXssPrevention:
-  warning: "WARNUNG"
-  title: "„Füge in diesen Bereich etwas ein“ ist eine Betrugsmasche."
-  description1: "Wenn du hier etwas einfügst, könnte ein böswilliger Benutzer dein Konto übernehmen oder deine persönlichen Daten stehlen."
-  description3: "Weitere Informationen findest du hier. {link}"

locales/en-US.yml

@@ -331,7 +331,6 @@ selectFile: "Select a file"
 selectFiles: "Select files"
 selectFolder: "Select a folder"
 selectFolders: "Select folders"
-fileNotSelected: "No file selected"
 renameFile: "Rename file"
 folderName: "Folder name"
 createFolder: "Create a folder"
@@ -382,6 +381,7 @@ enableLocalTimeline: "Enable local timeline"
 enableGlobalTimeline: "Enable global timeline"
 disablingTimelinesInfo: "Adminstrators and Moderators will always have access to all timelines, even if they are not enabled."
 registration: "Register"
+enableRegistration: "Enable new user registration"
 invite: "Invite"
 driveCapacityPerLocalAccount: "Drive capacity per local user"
 driveCapacityPerRemoteAccount: "Drive capacity per remote user"
@@ -586,7 +586,6 @@ masterVolume: "Master volume"
 notUseSound: "Disable sound"
 useSoundOnlyWhenActive: "Output sounds only if Misskey is active."
 details: "Details"
-renoteDetails: "Renote details"
 chooseEmoji: "Select an emoji"
 unableToProcess: "The operation could not be completed"
 recentUsed: "Recently used"
@@ -1299,7 +1298,6 @@ yourNameContainsProhibitedWordsDescription: "If you wish to use this name, pleas
 thisContentsAreMarkedAsSigninRequiredByAuthor: "Set by the author to require login to view"
 lockdown: "Lockdown"
 pleaseSelectAccount: "Select an account"
-availableRoles: "Available roles"
 _accountSettings:
   requireSigninToViewContents: "Require sign-in to view contents"
   requireSigninToViewContentsDescription1: "Require login to view all notes and other content you have created. This will have the effect of preventing crawlers from collecting your information."
@@ -1309,7 +1307,7 @@ _accountSettings:
   makeNotesFollowersOnlyBeforeDescription: "While this feature is enabled, only followers can see notes past the set date and time or have been visible for a set time. When it is deactivated, the note publication status will also be restored."
   makeNotesHiddenBefore: "Make past notes private"
   makeNotesHiddenBeforeDescription: "While this feature is enabled, notes that are past the set date and time or have been visible only to you. When it is deactivated, the note publication status will also be restored."
-  mayNotEffectForFederatedNotes: "Notes federated to a remote server may not be affected."
+  mayNotEffectForFederatedNotes: "Notes federated to a remote server may not be effective."
   notesHavePassedSpecifiedPeriod: "Note that the specified time has passed"
   notesOlderThanSpecifiedDateAndTime: "Notes before the specified date and time"
 _abuseUserReport:
@@ -2121,7 +2119,6 @@ _permissions:
   "read:flash-likes": "View list of liked Plays"
   "write:flash-likes": "Edit list of liked Plays"
   "read:admin:abuse-user-reports": "View user reports"
-  "write:admin:create-account": "Create user account"
   "write:admin:delete-account": "Delete user account"
   "write:admin:delete-all-files-of-a-user": "Delete all files of a user"
   "read:admin:index-stats": "View database index stats"
@@ -2226,7 +2223,7 @@ _widgets:
   _userList:
     chooseList: "Select a list"
   clicker: "Clicker"
-  birthdayFollowings: "Today's Birthdays"
+  birthdayFollowings: "Users who celebrate their birthday today"
 _cw:
   hide: "Hide"
   show: "Show content"
@@ -2733,9 +2730,3 @@ _embedCodeGen:
   generateCode: "Generate embed code"
   codeGenerated: "The code has been generated"
   codeGeneratedDescription: "Paste the generated code into your website to embed the content."
-_selfXssPrevention:
-  warning: "WARNING"
-  title: "\"Paste something on this screen\" is all a scam."
-  description1: "If you paste something here, a malicious user could hijack your account or steal your personal information."
-  description2: "If you do not understand exactly what you are trying to paste, %cstop working right now and close this window."
-  description3: "For more information, please refer to this. {link}"

locales/es-ES.yml

@@ -373,6 +373,7 @@ enableLocalTimeline: "Habilitar linea de tiempo local"
 enableGlobalTimeline: "Habilitar linea de tiempo global"
 disablingTimelinesInfo: "Aunque se desactiven estas lineas de tiempo, por conveniencia el administrador y los moderadores pueden seguir usándolos"
 registration: "Registro"
+enableRegistration: "Permitir nuevos registros"
 invite: "Invitar"
 driveCapacityPerLocalAccount: "Capacidad del drive por usuario local"
 driveCapacityPerRemoteAccount: "Capacidad del drive por usuario remoto"

locales/fr-FR.yml

@@ -8,9 +8,6 @@ search: "Rechercher"
 notifications: "Notifications"
 username: "Nom d’utilisateur·rice"
 password: "Mot de passe"
-initialPasswordForSetup: "Mot de passe initial pour la configuration"
-initialPasswordIsIncorrect: "Mot de passe initial pour la configuration est incorrecte"
-initialPasswordForSetupDescription: "Utilisez le mot de passe que vous avez entré pour le fichier de configuration si vous avez installé Misskey vous-même.\nSi vous utilisez un service d'hébergement Misskey, utilisez le mot de passe fourni.\nSi vous n'avez pas défini de mot de passe, laissez le champ vide pour continuer."
 forgotPassword: "Mot de passe oublié"
 fetchingAsApObject: "Récupération depuis le fédiverse …"
 ok: "OK"
@@ -63,7 +60,6 @@ copyFileId: "Copier l'identifiant du fichier"
 copyFolderId: "Copier l'identifiant du dossier"
 copyProfileUrl: "Copier l'URL du profil"
 searchUser: "Chercher un·e utilisateur·rice"
-searchThisUsersNotes: "Cherchez les notes de cet·te utilisateur·rice"
 reply: "Répondre"
 loadMore: "Afficher plus …"
 showMore: "Voir plus"
@@ -112,7 +108,6 @@ enterEmoji: "Insérer un émoji"
 renote: "Renoter"
 unrenote: "Annuler la Renote"
 renoted: "Renoté !"
-renotedToX: "Renoté en {name}"
 cantRenote: "Ce message ne peut pas être renoté."
 cantReRenote: "Impossible de renoter une Renote."
 quote: "Citer"
@@ -156,7 +151,6 @@ editList: "Modifier la liste"
 selectChannel: "Sélectionner un canal"
 selectAntenna: "Sélectionner une antenne"
 editAntenna: "Modifier l'antenne"
-createAntenna: "Créer une antenne"
 selectWidget: "Sélectionner un widget"
 editWidgets: "Modifier les widgets"
 editWidgetsExit: "Valider les modifications"
@@ -183,7 +177,6 @@ addAccount: "Ajouter un compte"
 reloadAccountsList: "Rafraichir la liste des comptes"
 loginFailed: "Échec de la connexion"
 showOnRemote: "Voir sur l’instance distante"
-continueOnRemote: "Continuer sur l'instance distante"
 general: "Général"
 wallpaper: "Fond d’écran"
 setWallpaper: "Définir le fond d’écran"
@@ -194,7 +187,6 @@ followConfirm: "Êtes-vous sûr·e de vouloir suivre {name} ?"
 proxyAccount: "Compte proxy"
 proxyAccountDescription: "Un compte proxy se comporte, dans certaines conditions, comme un·e abonné·e distant·e pour les utilisateurs d'autres instances. Par exemple, quand un·e utilisateur·rice ajoute un·e utilisateur·rice distant·e à une liste, ses notes ne seront pas visibles sur l'instance si personne ne suit cet·te utilisateur·rice. Le compte proxy va donc suivre cet·te utilisateur·rice pour que ses notes soient acheminées."
 host: "Serveur distant"
-selectSelf: "Sélectionner manuellement"
 selectUser: "Sélectionner un·e utilisateur·rice"
 recipient: "Destinataire"
 annotation: "Commentaires"
@@ -328,7 +320,6 @@ renameFolder: "Renommer le dossier"
 deleteFolder: "Supprimer le dossier"
 folder: "Dossier"
 addFile: "Ajouter un fichier"
-showFile: "Voir les fichiers"
 emptyDrive: "Le Disque est vide"
 emptyFolder: "Le dossier est vide"
 unableToDelete: "Suppression impossible"
@@ -371,6 +362,7 @@ enableLocalTimeline: "Activer le fil local"
 enableGlobalTimeline: "Activer le fil global"
 disablingTimelinesInfo: "Même si vous désactivez ces fils, les administrateur·rice·s et les modérateur·rice·s pourront toujours y accéder."
 registration: "S’inscrire"
+enableRegistration: "Autoriser les nouvelles inscriptions"
 invite: "Inviter"
 driveCapacityPerLocalAccount: "Capacité de stockage du Disque par utilisateur local"
 driveCapacityPerRemoteAccount: "Capacité de stockage du Disque par utilisateur distant"
@@ -438,11 +430,10 @@ token: "Jeton"
 2fa: "Authentification à deux facteurs"
 setupOf2fa: "Configuration de l’authentification à deux facteurs"
 totp: "Application d'authentification"
-totpDescription: "Entrer un mot de passe à usage unique à l'aide d'une application d'authentification"
+totpDescription: "Entrez un mot de passe à usage unique à l'aide d'une application d'authentification"
 moderator: "Modérateur·rice·s"
 moderation: "Modérations"
 moderationNote: "Note de modération"
-moderationNoteDescription: "Vous pouvez remplir des notes qui seront partagés seulement entre modérateurs."
 addModerationNote: "Ajouter une note de modération"
 moderationLogs: "Journal de modération"
 nUsersMentioned: "{n} utilisateur·rice·s mentionné·e·s"
@@ -502,10 +493,6 @@ uiLanguage: "Langue d’affichage de l’interface"
 aboutX: "À propos de {x}"
 emojiStyle: "Style des émojis"
 native: "Natif"
-menuStyle: "Style du menu"
-style: "Style"
-drawer: "Sélecteur"
-popup: "Pop-up"
 showNoteActionsOnlyHover: "Afficher les actions de note uniquement au survol"
 showReactionsCount: "Afficher le nombre de réactions des notes"
 noHistory: "Pas d'historique"
@@ -588,7 +575,6 @@ ascendingOrder: "Ascendant"
 descendingOrder: "Descendant"
 scratchpad: "ScratchPad"
 scratchpadDescription: "ScratchPad fournit un environnement expérimental pour AiScript. Vous pouvez vérifier la rédaction de votre code, sa bonne exécution et le résultat de son interaction avec Misskey."
-uiInspector: "Inspecteur UI"
 output: "Sortie"
 script: "Script"
 disablePagesScript: "Désactiver AiScript sur les Pages"
@@ -632,7 +618,7 @@ description: "Description"
 describeFile: "Ajouter une description d'image"
 enterFileDescription: "Saisissez une description"
 author: "Auteur·rice"
-leaveConfirm: "Vous avez des modifications non sauvegardées. Voulez-vous les ignorer ?"
+leaveConfirm: "Vous avez des modifications non-sauvegardées. Voulez-vous les ignorer ?"
 manage: "Gestion"
 plugins: "Extensions"
 preferencesBackups: "Sauvegarder les paramètres"
@@ -842,7 +828,6 @@ administration: "Gestion"
 accounts: "Comptes"
 switch: "Remplacer"
 noMaintainerInformationWarning: "Informations administrateur non configurées."
-noInquiryUrlWarning: "L'URL demandé n'est pas définie"
 noBotProtectionWarning: "La protection contre les bots n'est pas configurée."
 configure: "Configurer"
 postToGallery: "Publier dans la galerie"
@@ -907,7 +892,6 @@ followersVisibility: "Visibilité des abonnés"
 continueThread: "Afficher la suite du fil"
 deleteAccountConfirm: "Votre compte sera supprimé. Êtes vous certain ?"
 incorrectPassword: "Le mot de passe est incorrect."
-incorrectTotp: "Le mot de passe à usage unique est incorrect ou a expiré."
 voteConfirm: "Confirmez-vous votre vote pour « {choice} » ?"
 hide: "Masquer"
 useDrawerReactionPickerForMobile: "Afficher le sélecteur de réactions en tant que panneau sur mobile"
@@ -932,9 +916,6 @@ oneHour: "1 heure"
 oneDay: "1 jour"
 oneWeek: "1 semaine"
 oneMonth: "Un mois"
-threeMonths: "3 mois"
-oneYear: "1 an"
-threeDays: "3 jours"
 reflectMayTakeTime: "Cela peut prendre un certain temps avant que cela ne se termine."
 failedToFetchAccountInformation: "Impossible de récupérer les informations du compte."
 rateLimitExceeded: "Limite de taux dépassée"
@@ -942,7 +923,7 @@ cropImage: "Recadrer l'image"
 cropImageAsk: "Voulez-vous recadrer cette image ?"
 cropYes: "Rogner"
 cropNo: "Utiliser en l'état"
-file: "Fichier"
+file: "Fichiers"
 recentNHours: "Dernières {n} heures"
 recentNDays: "Derniers {n} jours"
 noEmailServerWarning: "Serveur de courrier non configuré."
@@ -1074,7 +1055,6 @@ retryAllQueuesConfirmTitle: "Vraiment réessayer ?"
 retryAllQueuesConfirmText: "Cela peut augmenter temporairement la charge du serveur."
 enableChartsForRemoteUser: "Générer les graphiques pour les utilisateurs distants"
 enableChartsForFederatedInstances: "Générer les graphiques pour les instances distantes"
-enableStatsForFederatedInstances: "Recevoir les statistiques des instances distantes"
 showClipButtonInNoteFooter: "Ajouter « Clip » au menu d'action de la note"
 reactionsDisplaySize: "Taille de l'affichage des réactions"
 limitWidthOfReaction: "Limiter la largeur maximale des réactions et les afficher en taille réduite"
@@ -1122,8 +1102,6 @@ preventAiLearning: "Refuser l'usage dans l'apprentissage automatique d'IA géné
 preventAiLearningDescription: "Demander aux robots d'indexation de ne pas utiliser le contenu publié, tel que les notes et les images, dans l'apprentissage automatique d'IA générative. Cela est réalisé en incluant le drapeau « noai » dans la réponse HTML. Une prévention complète n'est toutefois pas possible, car il est au robot d'indexation de respecter cette demande."
 options: "Options"
 specifyUser: "Spécifier l'utilisateur·rice"
-openTagPageConfirm: "Ouvrir une page d'hashtags ?"
-specifyHost: "Spécifier un serveur distant"
 failedToPreviewUrl: "Aperçu d'URL échoué"
 update: "Mettre à jour"
 rolesThatCanBeUsedThisEmojiAsReaction: "Rôles qui peuvent utiliser cet émoji comme réaction"
@@ -1244,55 +1222,13 @@ enableHorizontalSwipe: "Glisser pour changer d'onglet"
 loading: "Chargement en cours"
 surrender: "Annuler"
 gameRetry: "Réessayer"
-notUsePleaseLeaveBlank: "Laisser vide si non utilisé"
-useTotp: "Entrer un mot de passe à usage unique"
-useBackupCode: "Utiliser le codes de secours"
 launchApp: "Lancer l'app"
-useNativeUIForVideoAudioPlayer: "Lire les vidéos et audios en utilisant l'UI du navigateur"
-keepOriginalFilename: "Garder le nom original du fichier"
-keepOriginalFilenameDescription: "Si vous désactivez ce paramètre, les noms de fichiers seront automatiquement remplacés par des noms aléatoires lorsque vous téléchargerez des fichiers."
-noDescription: "Il n'y a pas de description"
-alwaysConfirmFollow: "Confirmer lors d'un abonnement"
 inquiry: "Contact"
-tryAgain: "Veuillez réessayer plus tard"
-confirmWhenRevealingSensitiveMedia: "Confirmer pour révéler du contenu sensible"
-sensitiveMediaRevealConfirm: "Ceci pourrait être du contenu sensible. Voulez-vous l'afficher ?"
-createdLists: "Listes créées"
-createdAntennas: "Antennes créées"
-fromX: "De {x}"
-genEmbedCode: "Générer le code d'intégration"
-noteOfThisUser: "Notes de cet·te utilisateur·rice"
-clipNoteLimitExceeded: "Aucune note supplémentaire ne peut être ajoutée à ce clip."
-performance: "Performance"
-modified: "Modifié"
-discard: "Annuler"
-thereAreNChanges: "Il y a {n} modification(s)"
-signinWithPasskey: "Se connecter avec une clé d'accès"
-unknownWebAuthnKey: "Clé d'accès inconnue."
-passkeyVerificationFailed: "La vérification de la clé d'accès a échoué."
-passkeyVerificationSucceededButPasswordlessLoginDisabled: "La vérification de la clé d'accès a réussi, mais la connexion sans mot de passe est désactivée."
-messageToFollower: "Message aux abonné·es"
-target: "Destinataire"
-prohibitedWordsForNameOfUser: "Mots interdits pour les noms d'utilisateur·rices"
-lockdown: "Verrouiller"
-pleaseSelectAccount: "Sélectionner un compte"
-availableRoles: "Rôles disponibles"
-_abuseUserReport:
-  forward: "Transférer"
-  forwardDescription: "Transférer le signalement vers une instance distante en tant qu'anonyme."
-  resolve: "Résoudre"
-  accept: "Accepter"
-  reject: "Rejeter"
-  resolveTutorial: "Si le signalement est légitime dans son contenu, sélectionnez « Accepter » pour marquer le cas comme résolu par l'affirmative.\nSi le contenu du rapport n'est pas légitime, sélectionnez « Rejeter » pour marquer le cas comme résolu par la négative."
 _delivery:
   status: "Statut de la diffusion"
   stop: "Suspendu·e"
-  resume: "Reprendre"
   _type:
     none: "Publié"
-    manuallySuspended: "Suspendre manuellement"
-    goneSuspended: "L'instance est suspendue en raison de la suppression de ce dernier"
-    autoSuspendedForNotResponding: "L'instance est suspendue car elle ne répond pas"
 _bubbleGame:
   howToPlay: "Comment jouer"
   hold: "Réserver"
@@ -1303,7 +1239,6 @@ _bubbleGame:
     maxChain: "Nombre maximum de chaînes"
     yen: "{yen} yens"
     estimatedQty: "{qty} pièces"
-    scoreSweets: "{onigiriQtyWithUnit} Onigiri(s)"
 _announcement:
   forExistingUsers: "Pour les utilisateurs existants seulement"
   needConfirmationToRead: "Exiger la confirmation de la lecture"
@@ -1323,7 +1258,6 @@ _initialAccountSetting:
   profileSetting: "Paramètres du profil"
   privacySetting: "Paramètres de confidentialité"
   initialAccountSettingCompleted: "Configuration du profil terminée avec succès !"
-  haveFun: "Profitez de {name} !"
   youCanContinueTutorial: "Vous pouvez procéder au tutoriel sur l'utilisation de {name}(Misskey) ou vous arrêter ici et commencer à l'utiliser immédiatement."
   startTutorial: "Démarrer le tutoriel"
   skipAreYouSure: "Désirez-vous ignorer la configuration du profil ?"
@@ -1417,60 +1351,18 @@ _achievements:
       flavor: "Passez un bon moment avec Misskey !"
     _notes10:
       title: "Quelques notes"
-      description: "Poster 10 notes"
     _notes100:
       title: "Beaucoup de notes"
-      description: "Poster 100 notes"
-    _notes500:
-      title: "Couvert de notes"
-      description: "Poster 500 notes"
-    _notes1000:
-      title: "Une montagne de notes"
-      description: "Poster 1000 notes"
-    _notes5000:
-      title: "Débordement de notes"
-      description: "Poster 5 000 notes"
-    _notes10000:
-      title: "Super note"
-      description: "Poster 10 000 notes"
-    _notes20000:
-      title: "Encore... plus... de... notes..."
-      description: "Poster 20 000 notes"
-    _notes30000:
-      title: "Notes notes notes !"
-      description: "Poster 30 000 notes"
-    _notes40000:
-      title: "Usine de notes"
-      description: "Poster 40 000 notes"
-    _notes50000:
-      title: "Planète des notes"
-      description: "Poster 50 000 notes"
-    _notes60000:
-      title: "Quasar de note"
-      description: "Poster 50 000 notes"
-    _notes70000:
-      title: "Trou noir de notes"
-      description: "Poster 70 000 notes"
-    _notes80000:
-      title: "Galaxie de notes"
-      description: "Poster 80 000 notes"
-    _notes90000:
-      title: "Univers de notes"
-      description: "Poster 90 000 notes"
     _notes100000:
       title: "ALL YOUR NOTE ARE BELONG TO US"
-      description: "Poster 100 000 notes"
-      flavor: "Avez-vous tant de choses à dire ?"
     _login3:
-      title: "Débutant I"
+      title: "Débutant Ⅰ"
       description: "Se connecter pour un total de 3 jours"
-      flavor: "Dès maintenant, appelez-moi Misskeynaute"
     _login7:
-      title: "Débutant II"
+      title: "Débutant Ⅱ"
       description: "Se connecter pour un total de 7 jours"
-      flavor: "On s'habitue ?"
     _login15:
-      title: "Débutant III"
+      title: "Débutant Ⅲ"
       description: "Se connecter pour un total de 15 jours"
     _login30:
       title: "Misskeynaute I"
@@ -1494,7 +1386,6 @@ _achievements:
     _login500:
       title: "Expert I"
       description: "Se connecter pour un total de 500 jours"
-      flavor: "Non, mes amis, j'aime les notes"
     _login600:
       title: "Expert II"
       description: "Se connecter pour un total de 600 jours"
@@ -1502,18 +1393,11 @@ _achievements:
       title: "Expert III"
       description: "Se connecter pour un total de 700 jours"
     _login800:
-      title: "Maître des notes I"
       description: "Se connecter pour un total de 800 jours"
     _login900:
-      title: "Maître des notes II"
       description: "Se connecter pour un total de 900 jours"
     _login1000:
-      title: "Maître des notes III"
-      description: "Se connecter pour un total de 1 000 jours"
       flavor: "Merci d'utiliser Misskey !"
-    _noteClipped1:
-      title: "Je... dois... clip..."
-      description: "Ajouter sa première note aux clips"
     _profileFilled:
       title: "Bien préparé"
       description: "Configuration de votre profil"
@@ -1572,31 +1456,21 @@ _achievements:
     _driveFolderCircularReference:
       title: "Référence circulaire"
     _setNameToSyuilo:
-      title: "Complexe de dieu"
       description: "Vous avez spécifié « syuilo » comme nom"
     _passedSinceAccountCreated1:
       title: "Premier anniversaire"
-      description: "Un an est passé depuis la création du compte"
     _passedSinceAccountCreated2:
       title: "Second anniversaire"
-      description: "Deux ans sont passés depuis la création du compte"
     _passedSinceAccountCreated3:
       title: "3ème anniversaire"
-      description: "Trois ans sont passés depuis la création du compte"
     _loggedInOnBirthday:
       title: "Joyeux Anniversaire !"
       description: "Vous vous êtes connecté à la date de votre anniversaire"
     _loggedInOnNewYearsDay:
       title: "Bonne année !"
-      description: "Vous vous êtes connecté le premier jour de l'année"
-      flavor: "Merci pour le soutient continue sur cette instance."
     _cookieClicked:
-      title: "Jeu de clic sur des cookies"
-      description: "Cliqué sur un cookie"
       flavor: "Attendez une minute, vous êtes sur le mauvais site web ?"
     _brainDiver:
-      title: "Brain Diver"
-      description: "Poster le lien sur Brain Diver"
       flavor: "Misskey-Misskey La-Tu-Ma"
     _smashTestNotificationButton:
       title: "Débordement de tests"
@@ -1604,11 +1478,6 @@ _achievements:
     _tutorialCompleted:
       title: "Diplôme de la course élémentaire de Misskey"
       description: "Terminer le tutoriel"
-    _bubbleGameExplodingHead:
-      title: "🤯"
-      description: "Le plus gros objet du jeu de bulles"
-    _bubbleGameDoubleExplodingHead:
-      title: "Double🤯"
 _role:
   new: "Nouveau rôle"
   edit: "Modifier le rôle"
@@ -1639,11 +1508,9 @@ _role:
     canManageCustomEmojis: "Gestion des émojis personnalisés"
     canManageAvatarDecorations: "Gestion des décorations d'avatar"
     driveCapacity: "Capacité de stockage du Disque"
-    antennaMax: "Nombre maximum d'antennes"
     wordMuteMax: "Nombre maximal de caractères dans le filtre de mots"
     canUseTranslator: "Usage de la fonctionnalité de traduction"
     avatarDecorationLimit: "Nombre maximal de décorations d'avatar"
-    canImportAntennas: "Autoriser l'importation d'antennes"
 _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"
@@ -1926,29 +1793,6 @@ _permissions:
   "write:gallery": "Éditer la galerie"
   "read:gallery-likes": "Voir les mentions « J'aime » dans la galerie"
   "write:gallery-likes": "Gérer les mentions « J'aime » dans la galerie"
-  "read:flash": "Voir le Play"
-  "write:flash": "Modifier le Play"
-  "read:flash-likes": "Lire vos mentions j'aime des Play"
-  "write:flash-likes": "Modifier vos mentions j'aime des Play"
-  "read:admin:abuse-user-reports": "Voir les utilisateurs signalés"
-  "write:admin:delete-account": "Supprimer le compte d'utilisateur"
-  "write:admin:delete-all-files-of-a-user": "Supprimer tous les fichiers d'un utilisateur"
-  "read:admin:index-stats": "Voir les statistiques sur les index de base de données"
-  "read:admin:table-stats": "Voir les statistiques sur les index de base de données"
-  "read:admin:user-ips": "Voir l'adresse IP de l'utilisateur"
-  "read:admin:meta": "Voir les métadonnées de l'instance"
-  "write:admin:reset-password": "Réinitialiser le mot de passe de l'utilisateur"
-  "write:admin:resolve-abuse-user-report": "Résoudre le signalement d'un utilisateur"
-  "write:admin:send-email": "Envoyer un mail"
-  "read:admin:server-info": "Voir les informations de l'instance"
-  "read:admin:show-moderation-log": "Voir les logs de modération"
-  "read:admin:show-user": "Voir les informations privées de l'utilisateur"
-  "write:admin:suspend-user": "Suspendre l'utilisateur"
-  "write:admin:unset-user-avatar": "Retirer l'avatar de l'utilisateur"
-  "write:admin:unset-user-banner": "Retirer la bannière de l'utilisateur"
-  "write:admin:unsuspend-user": "Lever la suspension d'un utilisateur"
-  "write:admin:meta": "Gérer les métadonnées de l'instance"
-  "write:admin:roles": "Gérer les rôles"
 _auth:
   shareAccess: "Autoriser \"{name}\" à accéder à votre compte ?"
   shareAccessAsk: "Voulez-vous vraiment autoriser cette application à accéder à votre compte?"
@@ -2100,16 +1944,7 @@ _timelines:
   social: "Social"
   global: "Global"
 _play:
-  new: "Créer un Play"
-  edit: "Modifier un Play"
-  created: "Play créé"
-  updated: "Play édité"
-  deleted: "Play supprimé"
-  pageSetting: "Configuration du Play"
-  editThisPage: "Modifier ce Play"
   viewSource: "Afficher la source"
-  my: "Mes Play"
-  liked: "Play aimés"
   featured: "Populaire"
   title: "Titre"
   script: "Script"
@@ -2183,13 +2018,10 @@ _notification:
   achievementEarned: "Accomplissement déverrouillé"
   testNotification: "Tester la notification"
   reactedBySomeUsers: "{n} utilisateur·rice·s ont réagi"
-  likedBySomeUsers: "{n} utilisateurs ont aimé votre note"
   renotedBySomeUsers: "{n} utilisateur·rice·s ont renoté"
   followedBySomeUsers: "{n} utilisateur·rice·s se sont abonné·e·s à vous"
-  login: "Quelqu'un s'est connecté"
   _types:
     all: "Toutes"
-    note: "Nouvelles notes"
     follow: "Nouvel·le abonné·e"
     mention: "Mentions"
     reply: "Réponses"
@@ -2239,14 +2071,11 @@ _drivecleaner:
   orderByCreatedAtAsc: "Date d'ajout ascendante"
 _webhookSettings:
   name: "Nom"
-  secret: "Secret"
-  trigger: "Activateur"
   active: "Activé"
 _abuseReport:
   _notificationRecipient:
     _recipientType:
       mail: "E-mail "
-    keywords: "Mots clés "
 _moderationLogTypes:
   createRole: "Rôle créé"
   deleteRole: "Rôle supprimé"
@@ -2283,7 +2112,6 @@ _moderationLogTypes:
   deleteAvatarDecoration: "Décoration d'avatar supprimée"
   unsetUserAvatar: "Supprimer l'avatar de l'utilisateur·rice"
   unsetUserBanner: "Supprimer la bannière de l'utilisateur·rice"
-  deleteFlash: "Supprimer le Play"
 _fileViewer:
   title: "Détails du fichier"
   type: "Type du fichier"
@@ -2347,20 +2175,5 @@ _dataSaver:
     title: "Mise en évidence du code"
     description: "Si la notation de mise en évidence du code est utilisée, par exemple dans la MFM, elle ne sera pas chargée tant qu'elle n'aura pas été tapée. La mise en évidence du code nécessite le chargement du fichier de définition de chaque langue à mettre en évidence, mais comme ces fichiers ne sont plus chargés automatiquement, on peut s'attendre à une réduction du trafic de données."
 _reversi:
-  reversi: "Reversi"
-  blackIs: "{name} joue les noirs"
-  rules: "Règles"
   waitingBoth: "Préparez-vous"
-  myTurn: "C’est votre tour"
-  turnOf: "C'est le tour de {name}"
-  pastTurnOf: "Tour de {name}"
-  surrender: "Se rendre"
-  surrendered: "Par abandon"
   total: "Total"
-  playing: "En cours"
-  lookingForPlayer: "Recherche d'adversaire"
-_mediaControls:
-  playbackRate: "Vitesse de lecture"
-_embedCodeGen:
-  title: "Personnaliser le code d'intégration"
-  generateCode: "Générer le code d'intégration"

locales/id-ID.yml

@@ -375,6 +375,7 @@ enableLocalTimeline: "Nyalakan lini masa lokal"
 enableGlobalTimeline: "Nyalakan lini masa global"
 disablingTimelinesInfo: "Admin dan Moderator akan selalu memiliki akses ke semua lini masa meskipun lini masa tersebut tidak diaktifkan."
 registration: "Pendaftaran"
+enableRegistration: "Nyalakan pendaftaran pengguna baru"
 invite: "Undang"
 driveCapacityPerLocalAccount: "Kapasitas drive per pengguna lokal"
 driveCapacityPerRemoteAccount: "Kapasitas drive per pengguna remote"

locales/index.d.ts

@@ -1546,6 +1546,10 @@ export interface Locale extends ILocale {
      * 登録
      */
     "registration": string;
+    /**
+     * 誰でも新規登録できるようにする
+     */
+    "enableRegistration": string;
     /**
      * 招待
      */
@@ -2362,10 +2366,6 @@ export interface Locale extends ILocale {
      * 詳細
      */
     "details": string;
-    /**
-     * リノートの詳細
-     */
-    "renoteDetails": string;
     /**
      * 絵文字を選択
      */
@@ -5218,10 +5218,6 @@ export interface Locale extends ILocale {
      * 利用可能なロール
      */
     "availableRoles": string;
-    /**
-     * 注意事項を理解した上でオンにします。
-     */
-    "acknowledgeNotesAndEnable": string;
     "_accountSettings": {
         /**
          * コンテンツの表示にログインを必須にする
@@ -5798,14 +5794,6 @@ export interface Locale extends ILocale {
          * サーバー運営者へのお問い合わせフォームのURLや、運営者の連絡先等が記載されたWebページのURLを指定します。
          */
         "inquiryUrlDescription": string;
-        /**
-         * アカウントの作成をオープンにする
-         */
-        "openRegistration": string;
-        /**
-         * 登録を開放することはリスクが伴います。サーバーを常に監視し、トラブルが発生した際にすぐに対応できる体制がある場合のみオンにすることを推奨します。
-         */
-        "openRegistrationWarning": string;
         /**
          * 一定期間モデレーターのアクティビティが検出されなかった場合、スパム防止のためこの設定は自動でオフになります。
          */
@@ -8250,10 +8238,6 @@ export interface Locale extends ILocale {
          * ユーザーからの通報を見る
          */
         "read:admin:abuse-user-reports": string;
-        /**
-         * ユーザーアカウントを作成する
-         */
-        "write:admin:create-account": string;
         /**
          * ユーザーアカウントを削除する
          */
@@ -10595,16 +10579,6 @@ export interface Locale extends ILocale {
          */
         "description3": ParameterizedString<"link">;
     };
-    "_followRequest": {
-        /**
-         * 受け取った申請
-         */
-        "recieved": string;
-        /**
-         * 送った申請
-         */
-        "sent": string;
-    };
 }
 declare const locales: {
     [lang: string]: Locale;

locales/it-IT.yml

@@ -382,6 +382,7 @@ enableLocalTimeline: "Abilita la timeline locale"
 enableGlobalTimeline: "Abilita la timeline federata"
 disablingTimelinesInfo: "Anche disabilitandole, gli Amministratori e i Moderatori potranno comunque accedervi."
 registration: "Iscriviti"
+enableRegistration: "Consenti a chiunque di registrarsi"
 invite: "Invita"
 driveCapacityPerLocalAccount: "Capienza del Drive per profilo locale"
 driveCapacityPerRemoteAccount: "Capienza del Drive per profilo remoto"

locales/ja-JP.yml

@@ -382,6 +382,7 @@ enableLocalTimeline: "ローカルタイムラインを有効にする"
 enableGlobalTimeline: "グローバルタイムラインを有効にする"
 disablingTimelinesInfo: "これらのタイムラインを無効化しても、利便性のため管理者およびモデレーターは引き続き利用することができます。"
 registration: "登録"
+enableRegistration: "誰でも新規登録できるようにする"
 invite: "招待"
 driveCapacityPerLocalAccount: "ローカルユーザーひとりあたりのドライブ容量"
 driveCapacityPerRemoteAccount: "リモートユーザーひとりあたりのドライブ容量"
@@ -586,7 +587,6 @@ masterVolume: "マスター音量"
 notUseSound: "サウンドを出力しない"
 useSoundOnlyWhenActive: "Misskeyがアクティブな時のみサウンドを出力する"
 details: "詳細"
-renoteDetails: "リノートの詳細"
 chooseEmoji: "絵文字を選択"
 unableToProcess: "操作を完了できません"
 recentUsed: "最近使用"
@@ -1300,7 +1300,6 @@ thisContentsAreMarkedAsSigninRequiredByAuthor: "投稿者により、表示に
 lockdown: "ロックダウン"
 pleaseSelectAccount: "アカウントを選択してください"
 availableRoles: "利用可能なロール"
-acknowledgeNotesAndEnable: "注意事項を理解した上でオンにします。"
 
 _accountSettings:
   requireSigninToViewContents: "コンテンツの表示にログインを必須にする"
@@ -1467,8 +1466,6 @@ _serverSettings:
   reactionsBufferingDescription: "有効にすると、リアクション作成時のパフォーマンスが大幅に向上し、データベースへの負荷を軽減することが可能です。ただし、Redisのメモリ使用量は増加します。"
   inquiryUrl: "問い合わせ先URL"
   inquiryUrlDescription: "サーバー運営者へのお問い合わせフォームのURLや、運営者の連絡先等が記載されたWebページのURLを指定します。"
-  openRegistration: "アカウントの作成をオープンにする"
-  openRegistrationWarning: "登録を開放することはリスクが伴います。サーバーを常に監視し、トラブルが発生した際にすぐに対応できる体制がある場合のみオンにすることを推奨します。"
   thisSettingWillAutomaticallyOffWhenModeratorsInactive: "一定期間モデレーターのアクティビティが検出されなかった場合、スパム防止のためこの設定は自動でオフになります。"
 
 _accountMigration:
@@ -2166,7 +2163,6 @@ _permissions:
   "read:flash-likes": "Playのいいねを見る"
   "write:flash-likes": "Playのいいねを操作する"
   "read:admin:abuse-user-reports": "ユーザーからの通報を見る"
-  "write:admin:create-account": "ユーザーアカウントを作成する"
   "write:admin:delete-account": "ユーザーアカウントを削除する"
   "write:admin:delete-all-files-of-a-user": "ユーザーのすべてのファイルを削除する"
   "read:admin:index-stats": "データベースインデックスに関する情報を見る"
@@ -2823,7 +2819,3 @@ _selfXssPrevention:
   description1: "ここに何かを貼り付けると、悪意のあるユーザーにアカウントを乗っ取られたり、個人情報を盗まれたりする可能性があります。"
   description2: "貼り付けようとしているものが何なのかを正確に理解していない場合は、%c今すぐ作業を中止してこのウィンドウを閉じてください。"
   description3: "詳しくはこちらをご確認ください。 {link}"
-
-_followRequest:
-  recieved: "受け取った申請"
-  sent: "送った申請"

locales/ja-KS.yml

@@ -382,6 +382,7 @@ enableLocalTimeline: "ローカルタイムラインを使えるようにする
 enableGlobalTimeline: "グローバルタイムラインを使えるようにするわ"
 disablingTimelinesInfo: "ここらへんのタイムラインを使えんようにしてしもても、管理者とモデレーターは使えるままになってるで、そうやなかったら不便やからな。"
 registration: "登録"
+enableRegistration: "一見さんでも誰でもいらっしゃ～い"
 invite: "来てや"
 driveCapacityPerLocalAccount: "ローカルユーザーはんひとりあたりのドライブ容量"
 driveCapacityPerRemoteAccount: "リモートユーザーはんひとりあたりのドライブ容量"

locales/ko-GS.yml

@@ -356,6 +356,7 @@ enableLocalTimeline: "로컬 타임라인 키기"
 enableGlobalTimeline: "글로벌 타임라인 키기"
 disablingTimelinesInfo: "요 타임라인얼 꺼도 간리자하고 중재자넌 고대로 설 수 잇십니다."
 registration: "맨걸기"
+enableRegistration: "누라도 새로 맨걸 수 잇거로 하기"
 invite: "초대하기"
 driveCapacityPerLocalAccount: "로컬 사용자 하나마중 드라이브 커기"
 driveCapacityPerRemoteAccount: "웬겍 사용자 하나마중 드라이브 커기"

locales/ko-KR.yml

@@ -42,7 +42,7 @@ favorite: "즐겨찾기"
 favorites: "즐겨찾기"
 unfavorite: "즐겨찾기에서 제거"
 favorited: "즐겨찾기에 등록했습니다."
-alreadyFavorited: "이미 즐겨찾기에 등록되어 있습니다."
+alreadyFavorited: "이미 즐겨찾기에 등록했습니다."
 cantFavorite: "즐겨찾기에 등록하지 못했습니다."
 pin: "프로필에 고정"
 unpin: "프로필에서 고정 해제"
@@ -382,6 +382,7 @@ enableLocalTimeline: "로컬 타임라인 활성화"
 enableGlobalTimeline: "글로벌 타임라인 활성화"
 disablingTimelinesInfo: "특정 타임라인을 비활성화하더라도 관리자 및 모더레이터는 계속 사용할 수 있습니다."
 registration: "등록"
+enableRegistration: "신규 회원가입을 활성화"
 invite: "초대"
 driveCapacityPerLocalAccount: "로컬 유저 한 명당 드라이브 용량"
 driveCapacityPerRemoteAccount: "원격 사용자별 드라이브 용량"
@@ -586,7 +587,6 @@ masterVolume: "마스터 볼륨"
 notUseSound: "음소거 하기"
 useSoundOnlyWhenActive: "Misskey를 활성화한 때에만 소리를 출력하기"
 details: "자세히"
-renoteDetails: "리노트 상세 내용"
 chooseEmoji: "이모지 선택"
 unableToProcess: "작업을 완료할 수 없습니다"
 recentUsed: "최근 사용"
@@ -947,9 +947,6 @@ oneHour: "1시간"
 oneDay: "1일"
 oneWeek: "일주일"
 oneMonth: "1개월"
-threeMonths: "3개월"
-oneYear: "1년"
-threeDays: "3일"
 reflectMayTakeTime: "반영되기까지 시간이 걸릴 수 있습니다."
 failedToFetchAccountInformation: "계정 정보를 가져오지 못했습니다"
 rateLimitExceeded: "요청 제한 횟수를 초과하였습니다"
@@ -1257,7 +1254,7 @@ lastNDays: "최근 {n}일"
 backToTitle: "타이틀로 가기"
 hemisphere: "거주 지역"
 withSensitive: "민감한 파일이 포함된 노트 보기"
-userSaysSomethingSensitive: "{name}의 민감한 파일이 포함된 게시물"
+userSaysSomethingSensitive: "{name} 같은 민감한 파일이 포함된 글"
 enableHorizontalSwipe: "스와이프하여 탭 전환"
 loading: "불러오는 중"
 surrender: "그만두기"
@@ -1289,30 +1286,13 @@ signinWithPasskey: "패스키로 로그인"
 unknownWebAuthnKey: "등록되지 않은 패스키입니다."
 passkeyVerificationFailed: "패스키 검증을 실패했습니다."
 passkeyVerificationSucceededButPasswordlessLoginDisabled: "패스키를 검증했으나, 비밀번호 없이 로그인하기가 꺼져 있습니다."
-messageToFollower: "팔로워에게 보낼 메시지"
+messageToFollower: "팔로워에 보낼 메시지"
 target: "대상"
 testCaptchaWarning: "CAPTCHA를 테스트하기 위한 기능입니다. <strong>실제 환경에서는 사용하지 마세요.</strong>"
 prohibitedWordsForNameOfUser: "금지 단어 (사용자 이름)"
 prohibitedWordsForNameOfUserDescription: "이 목록에 포함되는 키워드가 사용자 이름에 있는 경우, 일반 사용자는 이름을 바꿀 수 없습니다. 모더레이터 권한을 가진 사용자는 제한 대상에서 제외됩니다."
 yourNameContainsProhibitedWords: "바꾸려는 이름에 금지된 키워드가 포함되어 있습니다."
 yourNameContainsProhibitedWordsDescription: "이름에 금지된 키워드가 있습니다. 이름을 사용해야 하는 경우, 서버 관리자에 문의하세요."
-thisContentsAreMarkedAsSigninRequiredByAuthor: "게시자에 의해 로그인해야 볼 수 있도록 설정되어 있습니다."
-lockdown: "잠금"
-pleaseSelectAccount: "계정을 선택해주세요."
-availableRoles: "사용 가능한 역할"
-acknowledgeNotesAndEnable: "활성화 하기 전에 주의 사항을 확인했습니다."
-_accountSettings:
-  requireSigninToViewContents: "콘텐츠 열람을 위해 로그인으 필수로 설정하기"
-  requireSigninToViewContentsDescription1: "자신이 작성한 모든 노트 등의 콘텐츠를 보기 위해 로그인을 필수로 설정합니다. 크롤러가 정보 수집하는 것을 방지하는 효과를 기대할 수 있습니다."
-  requireSigninToViewContentsDescription2: "URL 미리보기(OGP), 웹페이지에 삽입, 노트 인용을 지원하지 않는 서버에서 볼 수 없게 됩니다."
-  requireSigninToViewContentsDescription3: "원격 서버에 연합된 콘텐츠에는 이러한 제한이 적용되지 않을 수 있습니다."
-  makeNotesFollowersOnlyBefore: "과거 노트는 팔로워만 볼 수 있도록 설정하기"
-  makeNotesFollowersOnlyBeforeDescription: "이 기능이 활성화되어 있는 동안, 설정된 날짜 및 시간보다 과거 또는 설정된 시간이 지난 노트는 팔로워만 볼 수 있게 됩니다.비활성화하면 노트의 공개 상태도 원래대로 돌아갑니다."
-  makeNotesHiddenBefore: "과거 노트 비공개로 전환하기"
-  makeNotesHiddenBeforeDescription: "이 기능이 활성화되어 있는 동안 설정한 날짜 및 시간보다 과거 또는 설정한 시간이 지난 노트는 본인만 볼 수 있게(비공개로 전환) 됩니다. 비활성화하면 노트의 공개 상태도 원래대로 돌아갑니다."
-  mayNotEffectForFederatedNotes: "원격 서버에 연합된 노트에는 효과가 없을 수도 있습니다."
-  notesHavePassedSpecifiedPeriod: "지정한 시간이 경과된 노트"
-  notesOlderThanSpecifiedDateAndTime: "지정된 날짜 및 시간 이전의 노트"
 _abuseUserReport:
   forward: "전달"
   forwardDescription: "익명 시스템 계정을 사용하여 리모트 서버에 신고 내용을 전달할 수 있습니다."
@@ -1457,8 +1437,6 @@ _serverSettings:
   reactionsBufferingDescription: "활성화 한 경우, 리액션 작성 퍼포먼스가 대폭 향상되어 DB의 부하를 줄일 수 있으나, Redis의 메모리 사용량이 많아집니다."
   inquiryUrl: "문의처 URL"
   inquiryUrlDescription: "서버 운영자에게 보내는 문의 양식의 URL이나 운영자의 연락처 등이 적힌 웹 페이지의 URL을 설정합니다."
-  openRegistration: "회원 가입을 활성화 하기"
-  openRegistrationWarning: "회원 가입을 개방하는 것은 리스크가 따릅니다. 서버를 항상 감시할 수 있고, 문제가 발생했을 때 바로 대응할 수 있는 상태에서만 활성화 하는 것을 권장합니다."
   thisSettingWillAutomaticallyOffWhenModeratorsInactive: "일정 기간동안 모더레이터의 활동이 감지되지 않는 경우, 스팸 방지를 위해 이 설정은 자동으로 꺼집니다."
 _accountMigration:
   moveFrom: "다른 계정에서 이 계정으로 이사"
@@ -2179,11 +2157,8 @@ _auth:
   permissionAsk: "이 앱은 다음의 권한을 요청합니다"
   pleaseGoBack: "앱으로 돌아가서 시도해 주세요"
   callback: "앱으로 돌아갑니다"
-  accepted: "접근 권한이 부여되었습니다."
   denied: "접근이 거부되었습니다"
-  scopeUser: "다음 사용자로 활동하고 있습니다."
   pleaseLogin: "어플리케이션의 접근을 허가하려면 로그인하십시오."
-  byClickingYouWillBeRedirectedToThisUrl: "접근을 허용하면 자동으로 다음 URL로 이동합니다."
 _antennaSources:
   all: "모든 노트"
   homeTimeline: "팔로우중인 유저의 노트"
@@ -2735,12 +2710,3 @@ _embedCodeGen:
   generateCode: "임베디드 코드를 만들기"
   codeGenerated: "코드를 만들었습니다."
   codeGeneratedDescription: "만들어진 코드를 웹 사이트에 붙여서 사용하세요."
-_selfXssPrevention:
-  warning: "경고"
-  title: "“이 화면에 뭔가를 붙여넣어라\"는 것은 모두 사기입니다."
-  description1: "여기에 무언가를 붙여넣으면 악의적인 사용자에게 계정을 탈취당하거나 개인정보를 도용당할 수 있습니다."
-  description2: "붙여 넣으려는 항목이 무엇인지 정확히 이해하지 못하는 경우, %c지금 바로 작업을 중단하고 이 창을 닫으십시오."
-  description3: "자세한 내용은 여기를 확인해 주세요.  {link}"
-_followRequest:
-  recieved: "받은 신청"
-  sent: "보낸 신청"

locales/lo-LA.yml

@@ -299,6 +299,7 @@ enableLocalTimeline: "ເປີດໃຊ້ທາມລາຍທ້ອງຖິ
 enableGlobalTimeline: "ເປີດໃຊ້ທາມລາຍທົ່ວໂລກ"
 disablingTimelinesInfo: "ຜູ້ດູແລລະບບແລະຜູ້ຄວບຄຸມຈະສາມາດເຂົ້າເຖີງໄທມ໌ໄລນ໌ທັ້ງເບີດ ເຖີງວ່າຈະບໍ່ໄດ້ເປີດໃຊ້ງານກໍ່ຕາມ"
 registration: "ລົງທະບຽນ"
+enableRegistration: "ເປີດໃຊ້ການລົງທະບຽນຜູ້ໃຊ້ໃໝ່"
 invite: "ເຊີນ"
 driveCapacityPerLocalAccount: "ຄວາມຈຸຂອງ drive ຕໍ່ຜູ້ໃຊ້ທ້ອງຖິ່ນ"
 driveCapacityPerRemoteAccount: "ຄວາມຈຸຂອງ drive ຕໍ່ຜູ້ໃຊ້ໄລຍະໄກ"

locales/nl-NL.yml

@@ -333,6 +333,7 @@ enableLocalTimeline: "Inschakelen lokale tijdlijn"
 enableGlobalTimeline: "Inschakelen globale tijdlijn "
 disablingTimelinesInfo: "Beheerders en moderators hebben altijd toegang tot alle tijdlijnen, ook als ze niet actief zijn."
 registration: "Registreren"
+enableRegistration: "Inschakelen registratie nieuwe gebruikers "
 invite: "Uitnodigen"
 driveCapacityPerLocalAccount: "Opslagruimte per lokale gebruiker"
 driveCapacityPerRemoteAccount: "Opslagruimte per externe gebruiker"

locales/no-NO.yml

@@ -260,6 +260,7 @@ enableLocalTimeline: "Aktiver lokal tidslinje"
 enableGlobalTimeline: "Aktiver global tidslinje"
 disablingTimelinesInfo: "Administratorer og Moderatorer vil alltid ha tilgang til alle tidslinjer, selv om de ikke er aktivert."
 registration: "Registrer"
+enableRegistration: "Aktiver registrering av nye brukere"
 invite: "Inviter"
 basicInfo: "Grunnleggende informasjon"
 pinnedUsers: "Festede brukrere"

locales/pl-PL.yml

@@ -362,6 +362,7 @@ enableLocalTimeline: "Włącz lokalną oś czasu"
 enableGlobalTimeline: "Włącz globalną oś czasu"
 disablingTimelinesInfo: "Administratorzy i moderatorzy będą zawsze mieć dostęp do wszystkich osi czasu, nawet gdy są one wyłączone."
 registration: "Zarejestruj się"
+enableRegistration: "Włącz rejestrację nowych użytkowników"
 invite: "Zaproś"
 driveCapacityPerLocalAccount: "Powierzchnia dyskowa na lokalnego użytkownika"
 driveCapacityPerRemoteAccount: "Powierzchnia dyskowa na zdalnego użytkownika"
@@ -491,10 +492,6 @@ uiLanguage: "Język wyświetlania UI"
 aboutX: "O {x}"
 emojiStyle: "Styl emoji"
 native: "Natywny"
-menuStyle: "Styl Menu"
-style: "Styl"
-drawer: "Schowek"
-popup: "Wyskakujące okienka"
 showNoteActionsOnlyHover: "Pokazuj akcje notatek tylko po najechaniu myszką"
 showReactionsCount: "Wyświetl liczbę reakcji na notatkę"
 noHistory: "Brak historii"
@@ -577,7 +574,6 @@ ascendingOrder: "Rosnąco"
 descendingOrder: "Malejąco"
 scratchpad: "Brudnopis"
 scratchpadDescription: "Brudnopis zawiera eksperymentalne środowisko dla AiScript. Możesz pisać, wykonywać i sprawdzać wyniki w interakcji z Misskey."
-uiInspector: "Inspektor UI"
 output: "Wyjście"
 script: "Skrypt"
 disablePagesScript: "Wyłącz AiScript na Stronach"
@@ -658,7 +654,6 @@ smtpSecure: "Użyj niejawnego SSL/TLS dla połączeń SMTP"
 smtpSecureInfo: "Wyłącz, jeżeli używasz STARTTLS"
 testEmail: "Przetestuj dostarczanie wiadomości e-mail"
 wordMute: "Wyciszenie słowa"
-hardWordMute: "Wyciszaj przekleństwa"
 regexpError: "Błąd wyrażenia regularnego"
 regexpErrorDescription: "Wystąpił błąd w wyrażeniu regularnym w linii {line} twoich {tab} wyciszeń:"
 instanceMute: "Wyciszone instancje"
@@ -831,7 +826,6 @@ administration: "Zarządzanie"
 accounts: "Konta"
 switch: "Przełącz"
 noMaintainerInformationWarning: "Informacje o administratorze nie są skonfigurowane."
-noInquiryUrlWarning: "Adres URL zapytania nie został ustawiony"
 noBotProtectionWarning: "Zabezpieczenie przed botami nie jest skonfigurowane."
 configure: "Skonfiguruj"
 postToGallery: "Opublikuj w galerii"
@@ -896,7 +890,6 @@ followersVisibility: "Widoczność obserwujących"
 continueThread: "Pokaż kontynuację wątku"
 deleteAccountConfirm: "Spowoduje to nieodwracalne usunięcie Twojego konta. Kontynuować?"
 incorrectPassword: "Nieprawidłowe hasło."
-incorrectTotp: "Hasło pojedynczego użytku jest nie poprawne, lub straciło ważność"
 voteConfirm: "Potwierdzić swój głos na \"{choice}\"?"
 hide: "Ukryj"
 useDrawerReactionPickerForMobile: "Wyświetlaj wybornik reakcji jako szufladę na urządzeniach mobilnych"
@@ -921,10 +914,6 @@ oneHour: "1 godzina"
 oneDay: "1 dzień"
 oneWeek: "1 tydzień"
 oneMonth: "jeden miesiąc"
-threeMonths: "3 miesiące"
-oneYear: "Rok"
-threeDays: "3 dni"
-reflectMayTakeTime: "Może minąć trochę czasu, zanim będzie to uwzględnione"
 failedToFetchAccountInformation: "Nie udało się uzyskać informacji o koncie"
 rateLimitExceeded: "Limit szybkości przekroczony"
 cropImage: "Przytnij obraz"
@@ -935,11 +924,9 @@ file: "Pliki"
 recentNHours: "W ciągu ostatnich {n} godzin"
 recentNDays: "W ciągu ostatnich {n} dni"
 noEmailServerWarning: "Serwer Email nie jest skonfigurowany"
-thereIsUnresolvedAbuseReportWarning: "Istnieją niewyjaśnione raporty"
 recommended: "Zalecane"
 check: "Zweryfikuj"
 driveCapOverrideLabel: "Zmień limit pojemności dysku użytkownika"
-driveCapOverrideCaption: "Resetuje pojemność do wartości domyślnej, przez wpisanie wartości 0 lub niższej"
 requireAdminForView: "Aby to zobaczyć, musisz być administratorem"
 isSystemAccount: "To jest konto stworzone i zarządzane przez system"
 typeToConfirm: "Wprowadź {x}, aby potwierdzić"
@@ -1008,29 +995,17 @@ unassign: "Cofnij przydzielenie"
 color: "Kolor"
 manageCustomEmojis: "Zarządzaj niestandardowymi Emoji"
 manageAvatarDecorations: "Zarządzaj dekoracjami awatara"
-youCannotCreateAnymore: "Limit kreacji został przekroczony"
-cannotPerformTemporary: "Opcja tymczasowo niedostępna"
-cannotPerformTemporaryDescription: "Ta akcja nie może zostać wykonana, z powodu przekroczenia limitu wykonań. Prosimy poczekać chwilę i spróbować ponownie"
 invalidParamError: "Błąd parametrów"
-invalidParamErrorDescription: "Wartości, które zostały podane są niepoprawne. Zwykle jest to spowodowane bugiem, lecz również może być to spowodowane przekroczeniem limitu wartości, lub podobnym problemem"
 permissionDeniedError: "Odrzucono operacje"
 permissionDeniedErrorDescription: "Konto nie posiada uprawnień"
 preset: "Konfiguracja"
 selectFromPresets: "Wybierz konfiguracje"
 achievements: "Osiągnięcia"
-gotInvalidResponseError: "Niepoprawna odpowiedź serwera"
-gotInvalidResponseErrorDescription: "Wystąpił problem z Twoim połączeniem z Internetem, lub z serwerem. {Spróbuj ponownie} wkrótce."
-thisPostMayBeAnnoying: "Ten wpis może obrażać pozostałych użytkowników"
-thisPostMayBeAnnoyingHome: "Opublikuj na domowej osi czasu"
 thisPostMayBeAnnoyingCancel: "Odrzuć"
-thisPostMayBeAnnoyingIgnore: "Zignoruj i wyślij"
-collapseRenotes: "Zwiń wpisy, które już zobaczyłeś"
-collapseRenotesDescription: "Zwiń wpisy, na które już zareagowałeś lub udostępniłeś"
 internalServerError: "Wewnętrzny błąd serwera"
 internalServerErrorDescription: "Niespodziewany błąd po stronie serwera"
 copyErrorInfo: "Kopiuj informacje o błędzie"
 joinThisServer: "Dołącz do chaty"
-exploreOtherServers: "Szukaj innej instancji"
 disableFederationOk: "Wyłącz federacje"
 invitationRequiredToRegister: "Ten serwer wymaga zaproszenia. Tylko osoby z zaproszeniem mogą się zarejestrować"
 emailNotSupported: "Wysyłanie wiadomości E-mail nie jest obsługiwane na tym serwerze"

locales/pt-PT.yml

@@ -376,6 +376,7 @@ enableLocalTimeline: "Ativar linha do tempo local"
 enableGlobalTimeline: "Ativar linha do tempo global"
 disablingTimelinesInfo: "Se você desabilitar essas linhas do tempo, administradores e moderadores ainda poderão usá-las por conveniência."
 registration: "Registar"
+enableRegistration: "Permitir que qualquer pessoa se registre"
 invite: "Convidar"
 driveCapacityPerLocalAccount: "Capacidade do drive por usuário local"
 driveCapacityPerRemoteAccount: "Capacidade do drive por usuário remoto"

locales/ro-RO.yml

@@ -341,6 +341,7 @@ enableLocalTimeline: "Activează cronologia locală"
 enableGlobalTimeline: "Activeaza cronologia globală"
 disablingTimelinesInfo: "Administratorii și Moderatorii vor avea mereu access la toate cronologiile, chiar dacă nu sunt activate."
 registration: "Inregistrare"
+enableRegistration: "Activează înregistrările pentru utilizatori noi"
 invite: "Invită"
 driveCapacityPerLocalAccount: "Capacitatea Drive-ului per utilizator local"
 driveCapacityPerRemoteAccount: "Capacitatea Drive-ului per utilizator extern"

locales/ru-RU.yml

@@ -377,6 +377,7 @@ enableLocalTimeline: "Включить локальную ленту"
 enableGlobalTimeline: "Включить глобальную ленту"
 disablingTimelinesInfo: "У администраторов и модераторов есть доступ ко всем лентам, даже если они отключены."
 registration: "Регистрация"
+enableRegistration: "Разрешить регистрацию"
 invite: "Пригласить"
 driveCapacityPerLocalAccount: "Объём Диска на одного локального пользователя"
 driveCapacityPerRemoteAccount: "Объём Диска на одного пользователя с другого экземпляра"

locales/sk-SK.yml

@@ -331,6 +331,7 @@ enableLocalTimeline: "Povoliť lokálnu časovú os"
 enableGlobalTimeline: "Povoliť globálnu časovú os"
 disablingTimelinesInfo: "Administrátori a moderátori majú vždy prístup ku všetkým časovým osiam, aj keď sú vypnuté."
 registration: "Registrácia"
+enableRegistration: "Povoliť registráciu nových používateľov"
 invite: "Pozvať"
 driveCapacityPerLocalAccount: "Kapacita disku pre používateľa"
 driveCapacityPerRemoteAccount: "Kapacita disku pre vzdialeného používateľa"

locales/sv-SE.yml

@@ -333,6 +333,7 @@ disconnectService: "Koppla från"
 enableLocalTimeline: "Aktivera lokal tidslinje"
 enableGlobalTimeline: "Aktivera global tidslinje"
 registration: "Registrera"
+enableRegistration: "Aktivera registrering av nya användare"
 invite: "Inbjudan"
 inMb: "I megabyte"
 bannerUrl: "URL till banner-bilden"
@@ -384,7 +385,6 @@ passwordLessLoginDescription: "Tillåter lösenordsfri inloggning med endast en
 resetPassword: "Återställ Lösenord"
 newPasswordIs: "Det nya lösenordet är \"{password}\""
 share: "Dela"
-markAsReadAllTalkMessages: "Markera alla meddelanden som lästa"
 help: "Hjälp"
 close: "Stäng"
 invites: "Inbjudan"
@@ -393,15 +393,12 @@ transfer: "Överför"
 text: "Text"
 enable: "Aktivera"
 next: "Nästa"
-retype: "Ange igen"
-noMessagesYet: "Inga meddelanden än"
 invitations: "Inbjudan"
 invitationCode: "Inbjudningskod"
 available: "Tillgängligt"
 weakPassword: "Svagt Lösenord"
 normalPassword: "Medel Lösenord"
 strongPassword: "Starkt Lösenord"
-signinWith: "Logga in med {x}"
 signinFailed: "Kan inte logga in. Det angivna användarnamnet eller lösenordet är felaktigt."
 or: "eller"
 language: "Språk"
@@ -413,124 +410,70 @@ existingAccount: "Existerande konto"
 regenerate: "Regenerera"
 fontSize: "Textstorlek"
 openImageInNewTab: "Öppna bild i ny flik"
-appearance: "Utseende"
 clientSettings: "Klientinställningar"
 accountSettings: "Kontoinställningar"
 numberOfDays: "Antal dagar"
-objectStorageUseSSL: "Använd SSL"
-serverLogs: "Serverloggar"
 deleteAll: "Radera alla"
 sounds: "Ljud"
 sound: "Ljud"
 listen: "Lyssna"
 none: "Ingen"
 volume: "Volym"
-notUseSound: "Inaktivera ljud"
 chooseEmoji: "Välj en emoji"
 recentUsed: "Senast använd"
 install: "Installera"
 uninstall: "Avinstallera"
-deleteAllFiles: "Radera alla filer"
-deleteAllFilesConfirm: "Är du säker på att du vill radera alla filer?"
 menu: "Meny"
-addItem: "Lägg till objekt"
 serviceworkerInfo: "Måste vara aktiverad för pushnotiser."
 enableInfiniteScroll: "Ladda mer automatiskt"
 enablePlayer: "Öppna videospelare"
-description: "Beskrivning"
 permission: "Behörigheter"
 enableAll: "Aktivera alla"
-disableAll: "Inaktivera alla"
 edit: "Ändra"
 enableEmail: "Aktivera epost-utskick"
 email: "E-post"
-emailAddress: "E-postadress"
 smtpHost: "Värd"
 smtpUser: "Användarnamn"
 smtpPass: "Lösenord"
 emptyToDisableSmtpAuth: "Lämna användarnamn och lösenord tomt för att avaktivera SMTP verifiering"
-makeActive: "Aktivera"
-copy: "Kopiera"
-overview: "Översikt"
 logs: "Logg"
-database: "Databas"
 channel: "kanal"
 create: "Skapa"
 other: "Mer"
-abuseReports: "Rapporter"
-reportAbuse: "Rapporter"
-reportAbuseOf: "Rapportera {name}"
-abuseReported: "Din rapport har skickats. Tack så mycket."
 send: "Skicka"
 openInNewTab: "Öppna i ny flik"
 createNew: "Skapa ny"
-private: "Privat"
 i18nInfo: "Misskey översätts till många olika språk av volontärer. Du kan hjälpa till med översättningen på {link}."
 accountInfo: "Kontoinformation"
-followersCount: "Antal följare"
-yes: "Ja"
-no: "Nej"
 clips: "Klipp"
 duplicate: "Duplicera"
 reloadToApplySetting: "Inställningen tillämpas efter sidan laddas om. Vill du göra det nu?"
 clearCache: "Rensa cache"
 onlineUsersCount: "{n} användare är online"
-nUsers: "{n} användare"
 nNotes: "{n} Noter"
 backgroundColor: "Bakgrundsbild"
 textColor: "Text"
-saveAs: "Spara som..."
-saveConfirm: "Spara ändringar?"
 youAreRunningUpToDateClient: "Klienten du använder är uppdaterat."
 newVersionOfClientAvailable: "Ny version av klienten är tillgänglig."
-editCode: "Redigera kod"
 publish: "Publicera"
 typingUsers: "{users} skriver"
-goBack: "Tillbaka"
-addDescription: "Lägg till beskrivning"
 info: "Om"
-online: "Online"
-active: "Aktiv"
-offline: "Offline"
 enabled: "Aktiverad"
-quickAction: "Snabbåtgärder"
 user: "Användare"
-gallery: "Galleri"
-popularPosts: "Populära inlägg"
 customCssWarn: "Den här inställningen borde bara ändrats av en som har rätta kunskaper. Om du ställer in det här fel så kan klienten sluta fungera rätt."
 global: "Global"
 squareAvatars: "Visa fyrkantiga profilbilder"
 sent: "Skicka"
-searchResult: "Sökresultat"
-learnMore: "Läs mer"
 misskeyUpdated: "Misskey har uppdaterats!"
-translate: "Översätt"
-controlPanel: "Kontrollpanel"
-manageAccounts: "Hantera konton"
 incorrectPassword: "Fel lösenord."
-hide: "Dölj"
 welcomeBackWithName: "Välkommen tillbaka, {name}"
 clickToFinishEmailVerification: "Tryck på [{ok}] för att slutföra bekräftelsen på e-postadressen."
-size: "Storlek"
 searchByGoogle: "Sök"
-indefinitely: "Aldrig"
-tenMinutes: "10 minuter"
-oneHour: "En timme"
-oneDay: "En dag"
-oneWeek: "En vecka"
-oneMonth: "En månad"
-threeMonths: "3 månader"
-oneYear: "1 år"
-threeDays: "3 dagar"
 file: "Filer"
-deleteAccount: "Radera konto"
-label: "Etikett"
 cannotUploadBecauseNoFreeSpace: "Kan inte ladda upp filen för att det finns inget lagringsutrymme kvar."
 cannotUploadBecauseExceedsFileSizeLimit: "Kan inte ladda upp filen för att den är större än filstorleksgränsen."
-beta: "Beta"
 enableAutoSensitive: "Automatisk NSFW markering"
 enableAutoSensitiveDescription: "Tillåter automatiskt detektering och marketing av NSFW media genom Maskininlärning när möjligt. Även om denna inställningen är avaktiverad, kan det vara aktiverat på hela instansen."
-move: "Flytta"
 pushNotification: "Pushnotiser"
 subscribePushNotification: "Aktivera pushnotiser"
 unsubscribePushNotification: "Avaktivera pushnotiser"
@@ -539,86 +482,38 @@ pushNotificationNotSupported: "Din webbläsare eller instans har inte stöd för
 windowMaximize: "Maximera"
 windowMinimize: "Minimera"
 windowRestore: "Återställ"
-tools: "Verktyg"
-like: "Gilla"
 pleaseDonate: "Misskey är en gratis programvara som används på {host}. Donera gärna för att göra utvecklingen ständigt, tack!"
-roles: "Roll"
-role: "Roll"
-color: "Färg"
 resetPasswordConfirm: "Återställ verkligen ditt lösenord?"
 dataSaver: "Databesparing"
 icon: "Profilbild"
-forYou: "För dig"
 replies: "Svara"
 renotes: "Omnotera"
-loadReplies: "Visa svar"
-loadConversation: "Visa konversation"
-authentication: "Autentisering"
-sourceCode: "Källkod"
-doReaction: "Lägg till reaktion"
-code: "Kod"
-gameRetry: "Försök igen"
-inquiry: "Kontakt"
-tryAgain: "Försök igen senare"
-signinWithPasskey: "Logga in med nyckel"
-unknownWebAuthnKey: "Okänd nyckel"
 _delivery:
   stop: "Suspenderad"
   _type:
     none: "Publiceras"
-_initialAccountSetting:
-  profileSetting: "Profilinställningar"
-_initialTutorial:
-  _reaction:
-    title: "Vad är reaktioner?"
 _achievements:
   _types:
     _open3windows:
       title: "Flera Fönster"
       description: "Ha minst 3 fönster öppna samtidigt"
-_role:
-  edit: "Redigera roll"
 _ffVisibility:
   public: "Publicera"
-  private: "Privat"
-_accountDelete:
-  accountDelete: "Radera konto"
-_ad:
-  back: "Tillbaka"
-_gallery:
-  like: "Gilla"
 _email:
   _follow:
     title: "följde dig"
-_aboutMisskey:
-  source: "Källkod"
-  projectMembers: "Projektmedlemmar"
 _channel:
   setBanner: "Välj banner"
   removeBanner: "Ta bort banner"
-  nameAndDescription: "Namn och beskrivning"
-_menuDisplay:
-  hide: "Dölj"
 _theme:
-  description: "Beskrivning"
-  color: "Färg"
   keys:
     mention: "Nämn"
     renote: "Omnotera"
 _sfx:
   note: "Noter"
   notification: "Notifikationer"
-_ago:
-  justNow: "Just nu"
 _2fa:
-  step3Title: "Ange en autentiseringskod"
   renewTOTPCancel: "Nej tack"
-_permissions:
-  "read:reactions": "Visa dina reaktioner"
-  "write:reactions": "Redigera dina reaktioner"
-  "write:admin:delete-account": "Radera användarkonto"
-  "write:admin:roles": "Hantera roller"
-  "read:admin:roles": "Visa roller"
 _antennaSources:
   all: "Alla noter"
   homeTimeline: "Noter från följda användare"
@@ -635,19 +530,13 @@ _widgets:
   _userList:
     chooseList: "Välj lista"
 _cw:
-  hide: "Dölj"
   show: "Ladda mer"
-  chars: "{count} tecken"
-  files: "{count} fil(er)"
-_poll:
-  infinite: "Aldrig"
 _visibility:
   home: "Hem"
   followers: "Följare"
 _profile:
   name: "Namn"
   username: "Användarnamn"
-  metadataLabel: "Etikett"
   changeAvatar: "Ändra profilbild"
   changeBanner: "Ändra banner"
 _exportOrImport:
@@ -658,12 +547,9 @@ _exportOrImport:
   userLists: "Listor"
 _charts:
   federation: "Federation"
-  activeUsers: "Aktiva användare"
 _timelines:
   home: "Hem"
   global: "Global"
-_play:
-  summary: "Beskrivning"
 _pages:
   blocks:
     image: "Bilder"
@@ -681,8 +567,6 @@ _notification:
     reply: "Svara"
     renote: "Omnotera"
 _deck:
-  addColumn: "Lägg till kolumn"
-  deleteProfile: "Radera profil"
   _columns:
     notifications: "Notifikationer"
     tl: "Tidslinje"
@@ -700,10 +584,3 @@ _abuseReport:
 _moderationLogTypes:
   suspend: "Suspendera"
   resetPassword: "Återställ Lösenord"
-_reversi:
-  blackOrWhite: "Svart/Vit"
-  rules: "Regler"
-  black: "Svart"
-  white: "Vit"
-_selfXssPrevention:
-  warning: "VARNING"

locales/th-TH.yml

@@ -382,6 +382,7 @@ enableLocalTimeline: "เปิดใช้งานไทม์ไลน์ท
 enableGlobalTimeline: "เปิดใช้งานไทม์ไลน์ทั่วโลก"
 disablingTimelinesInfo: "ผู้ดูแลระบบและผู้ควบคุมจะสามารถเข้าถึงไทม์ไลน์ทั้งหมด ถึงแม้ว่าจะไม่ได้เปิดใช้งานก็ตาม"
 registration: "ลงทะเบียน"
+enableRegistration: "เปิดใช้งานการลงทะเบียนผู้ใช้ใหม่"
 invite: "คำเชิญ"
 driveCapacityPerLocalAccount: "ความจุของไดรฟ์ต่อผู้ใช้ท้องถิ่น"
 driveCapacityPerRemoteAccount: "ความจุของไดรฟ์ต่อผู้ใช้ระยะไกล"

locales/tr-TR.yml

@@ -344,6 +344,7 @@ today: "Bugün"
 monthX: "{month} ay"
 pages: "Sayfalar"
 integration: "Entegrasyon"
+enableRegistration: "Kayıtlara izin ver"
 basicInfo: "Temel bilgiler"
 pinnedUsers: "Sabitlenmiş kullanıcılar"
 pinnedNotes: "Sabitlenen"

locales/uk-UA.yml

@@ -334,6 +334,7 @@ enableLocalTimeline: "Увімкнути локальну стрічку"
 enableGlobalTimeline: "Увімкнути глобальну стрічку"
 disablingTimelinesInfo: "Адміністратори та модератори завжди мають доступ до всіх стрічок, навіть якщо вони вимкнуті."
 registration: "Реєстрація"
+enableRegistration: "Дозволити реєстрацію"
 invite: "Запросити"
 driveCapacityPerLocalAccount: "Об'єм диска на одного локального користувача"
 driveCapacityPerRemoteAccount: "Об'єм диска на одного віддаленого користувача"

locales/uz-UZ.yml

@@ -349,6 +349,7 @@ enableLocalTimeline: "Mahalliy vaqt mintaqasini yoqing"
 enableGlobalTimeline: "Global vaqt mintaqasini yoqing"
 disablingTimelinesInfo: "Administratorlar va Moderatorlar har doim barcha vaqt jadvallariga kirish huquqiga ega bo'ladilar, hatto ular yoqilmagan bo'lsa ham."
 registration: "Ro'yxatdan o'tish"
+enableRegistration: "Ro'yxatdan o'tishni yoqing"
 invite: "Taklif qilish"
 driveCapacityPerLocalAccount: "Har bir mahalliy foydalanuvchi uchun disk maydoni"
 driveCapacityPerRemoteAccount: "Har bir masofaviy foydalanuvchi uchun disk maydoni"

locales/vi-VN.yml

@@ -8,9 +8,6 @@ search: "Tìm kiếm"
 notifications: "Thông báo"
 username: "Tên người dùng"
 password: "Mật khẩu"
-initialPasswordForSetup: "Mật khẩu ban đầu để thiết lập"
-initialPasswordIsIncorrect: "Mật khẩu ban đầu đã nhập sai"
-initialPasswordForSetupDescription: "Nếu bạn tự cài đặt Misskey, hãy sử dụng mật khẩu ban đầu của bạn đã nhập trong tệp cấu hình.\nNếu bạn đang sử dụng dịch vụ nào đó giống như dịch vụ lưu trữ của Misskey, hãy sử dụng mật khẩu ban đầu được cung cấp.\nNếu bạn chưa đặt mật khẩu ban đầu, vui lòng để trống và tiếp tục."
 forgotPassword: "Quên mật khẩu"
 fetchingAsApObject: "Đang nạp dữ liệu từ Fediverse..."
 ok: "Đồng ý"
@@ -357,6 +354,7 @@ enableLocalTimeline: "Bật bảng tin máy chủ"
 enableGlobalTimeline: "Bật bảng tin liên hợp"
 disablingTimelinesInfo: "Quản trị viên và Kiểm duyệt viên luôn có quyền truy cập mọi bảng tin, kể cả khi chúng không được bật."
 registration: "Đăng ký"
+enableRegistration: "Cho phép đăng ký mới"
 invite: "Mời"
 driveCapacityPerLocalAccount: "Dung lượng ổ đĩa tối đa cho mỗi người dùng"
 driveCapacityPerRemoteAccount: "Dung lượng ổ đĩa tối đa cho mỗi người dùng từ xa"

locales/zh-CN.yml

@@ -107,7 +107,7 @@ follow: "关注"
 followRequest: "关注申请"
 followRequests: "关注申请"
 unfollow: "取消关注"
-followRequestPending: "关注请求待批准"
+followRequestPending: "关注请求批准中"
 enterEmoji: "输入表情符号"
 renote: "转发"
 unrenote: "取消转发"
@@ -136,7 +136,7 @@ overwriteFromPinnedEmojisForReaction: "从「置顶（回应）」设置覆盖"
 overwriteFromPinnedEmojis: "从全局设置覆盖"
 reactionSettingDescription2: "拖动重新排序，单击删除，点击 + 添加。"
 rememberNoteVisibility: "保存上次设置的可见性"
-attachCancel: "取消添加附件"
+attachCancel: "删除附件"
 deleteFile: "删除文件"
 markAsSensitive: "标记为敏感内容"
 unmarkAsSensitive: "取消标记为敏感内容"
@@ -382,6 +382,7 @@ enableLocalTimeline: "启用本地时间线"
 enableGlobalTimeline: "启用全局时间线"
 disablingTimelinesInfo: "即使时间线功能被禁用，出于方便，管理员和监察员也可以继续使用。"
 registration: "注册"
+enableRegistration: "允许任何人注册"
 invite: "邀请"
 driveCapacityPerLocalAccount: "每个用户的网盘容量"
 driveCapacityPerRemoteAccount: "每个远程用户的网盘容量"
@@ -586,7 +587,6 @@ masterVolume: "主音量"
 notUseSound: "静音"
 useSoundOnlyWhenActive: "仅在 Misskey 活跃时输出声音"
 details: "详情"
-renoteDetails: "转帖详情"
 chooseEmoji: "选择表情符号"
 unableToProcess: "操作无法完成"
 recentUsed: "最近使用"
@@ -603,7 +603,7 @@ descendingOrder: "降序"
 scratchpad: "AiScript 控制台"
 scratchpadDescription: "AiScript 控制台为 AiScript 提供了实验环境。您可以编写代码与 Misskey 交互，运行并查看结果。"
 uiInspector: "UI 检查器"
-uiInspectorDescription: "查看内存中所有由 UI 组件生成出的实例。UI 组件由 UI:C 系列函数所生成。"
+uiInspectorDescription: "查看所有内存中由 UI 组件生成出的实例。UI 组件由 UI:C 系列函数所生成。"
 output: "输出"
 script: "脚本"
 disablePagesScript: "禁用页面脚本"
@@ -856,9 +856,9 @@ user: "用户"
 administration: "管理"
 accounts: "账户"
 switch: "切换"
-noMaintainerInformationWarning: "尚未设置管理员信息。"
+noMaintainerInformationWarning: "管理人员信息未设置。"
 noInquiryUrlWarning: "尚未设置联络地址。"
-noBotProtectionWarning: "尚未设置 Bot 防御。"
+noBotProtectionWarning: "Bot 防御未设置。"
 configure: "设置"
 postToGallery: "发送到图库"
 postToHashtag: "投稿到这个标签"
@@ -874,11 +874,11 @@ priority: "优先级"
 high: "高"
 middle: "中"
 low: "低"
-emailNotConfiguredWarning: "尚未设置电子邮件地址。"
+emailNotConfiguredWarning: "电子邮件地址未设置。"
 ratio: "比率"
 previewNoteText: "预览文本"
 customCss: "自定义 CSS"
-customCssWarn: "这些设置必须有相关的基础知识，不当的配置可能导致客户端无法正常使用。"
+customCssWarn: "这些设置必须有相关的基础知识，不当的配置可能导致客户端无法正常使用！"
 global: "全局"
 squareAvatars: "显示方形头像图标"
 sent: "发送"
@@ -1057,7 +1057,7 @@ internalServerErrorDescription: "内部服务器发生了预期外的错误"
 copyErrorInfo: "复制错误信息"
 joinThisServer: "在本服务器上注册"
 exploreOtherServers: "探索其他服务器"
-letsLookAtTimeline: "看看时间线"
+letsLookAtTimeline: "时间线"
 disableFederationConfirm: "确定要禁用联合？"
 disableFederationConfirmWarn: "禁用联合不会将帖子设为私有。在大多数情况下，不需要禁用联合。"
 disableFederationOk: "联合禁用"
@@ -1076,7 +1076,7 @@ sensitiveWords: "敏感词"
 sensitiveWordsDescription: "包含这些词的帖子将只在首页可见。可用换行来设定多个词。"
 sensitiveWordsDescription2: "AND 条件用空格分隔，正则表达式用斜线包裹。"
 prohibitedWords: "禁用词"
-prohibitedWordsDescription: "发布包含设定词汇的帖子时将出错。可用换行设定多个关键字。"
+prohibitedWordsDescription: "发布包含设定词汇的帖子时将出错。可用换行设定多个关键字"
 prohibitedWordsDescription2: "AND 条件用空格分隔，正则表达式用斜线包裹。"
 hiddenTags: "隐藏标签"
 hiddenTagsDescription: "设定的标签将不会在时间线上显示。可使用换行来设置多个标签。"
@@ -1119,7 +1119,7 @@ vertical: "纵向"
 horizontal: "横向"
 position: "位置"
 serverRules: "服务器规则"
-pleaseConfirmBelowBeforeSignup: "如果要在此服务器上注册，需要确认并同意以下内容。"
+pleaseConfirmBelowBeforeSignup: "在这个服务器上注册账号前，请确认以下信息。"
 pleaseAgreeAllToContinue: "必须全部勾选「同意」才能够继续。"
 continue: "继续"
 preservedUsernames: "保留的用户名"
@@ -1159,10 +1159,10 @@ turnOffToImprovePerformance: "关闭该选项可以提高性能。"
 createInviteCode: "生成邀请码"
 createWithOptions: "使用选项来创建"
 createCount: "发行数"
-inviteCodeCreated: "已生成邀请码"
+inviteCodeCreated: "已创建邀请码"
-inviteLimitExceeded: "可供生成的邀请码已达上限。"
+inviteLimitExceeded: "可供发行的邀请码已达上限。"
-createLimitRemaining: "可供生成的邀请码：剩余 {limit} 个"
+createLimitRemaining: "可供发行的邀请码：剩余{limit}个"
-inviteLimitResetCycle: "可以在 {time} 内生成最多 {limit} 个邀请码。"
+inviteLimitResetCycle: "可以在{time}内发行最多{limit}个邀请码。"
 expirationDate: "有效日期"
 noExpirationDate: "不设置有效日期"
 inviteCodeUsedAt: "邀请码被使用的日期和时间"
@@ -1299,8 +1299,6 @@ yourNameContainsProhibitedWordsDescription: "用户名内含有违禁词。若
 thisContentsAreMarkedAsSigninRequiredByAuthor: "根据发帖者的设定，需要登录才能显示"
 lockdown: "锁定"
 pleaseSelectAccount: "请选择帐户"
-availableRoles: "可用角色"
-acknowledgeNotesAndEnable: "理解注意事项后再开启。"
 _accountSettings:
   requireSigninToViewContents: "需要登录才能显示内容"
   requireSigninToViewContentsDescription1: "您发布的所有帖子将变成需要登入后才会显示。有望防止爬虫收集各种信息。"
@@ -1428,8 +1426,8 @@ _initialTutorial:
     description: "对于服务器方针所要求要求的，又或者不适合直接展示的附件，请添加「敏感」标记。\n"
     tryThisFile: "试试看，将附加到此窗口的图像标注为敏感！"
     _exampleNote:
-      note: "拆纳豆包装时失手了…"
+      note: "拆纳豆包装时出错了…"
-    method: "要标注附件为敏感内容，请单击该文件以打开菜单，然后单击「标记为敏感内容」。"
+    method: "要标注附件为敏感内容，请单击该文件以打开菜单，然后单击“标记为敏感内容”。"
     sensitiveSucceeded: "附加文件时，请遵循服务器的条款来设置正确敏感设定。\n"
     doItToContinue: "将图像标记为敏感后才能够继续"
   _done:
@@ -1457,8 +1455,6 @@ _serverSettings:
   reactionsBufferingDescription: "开启时可显著提高发送回应时的性能，及减轻数据库负荷。但 Redis 的内存用量会相应增加。"
   inquiryUrl: "联络地址"
   inquiryUrlDescription: "用来指定诸如向服务运营商咨询的论坛地址，或记载了运营商联系方式之类的网页地址。"
-  openRegistration: "开放注册"
-  openRegistrationWarning: "开放注册有风险。建议仅当能够持续监控服务器并在出现问题时能够立即响应时才打开它。"
   thisSettingWillAutomaticallyOffWhenModeratorsInactive: "若在一段时间内没有检测到管理活动，为防止垃圾信息，此设定将自动关闭。"
 _accountMigration:
   moveFrom: "从别的账号迁移到此账户"
@@ -1707,9 +1703,9 @@ _achievements:
       description: "在元旦登入"
       flavor: "今年也请对本服务器多多指教！"
     _cookieClicked:
-      title: "饼干点点乐"
+      title: "点击饼干小游戏"
       description: "点击了饼干"
-      flavor: "穿越了？"
+      flavor: "用错软件了？"
     _brainDiver:
       title: "Brain Diver"
       description: "发布了包含 Brain Diver 链接的帖子"
@@ -2741,6 +2737,3 @@ _selfXssPrevention:
   description1: "如果在此处粘贴了什么，恶意用户可能会接管账户或者盗取个人资料。"
   description2: "如果不能完全理解将要粘贴的内容，%c 请立即停止操作并关闭这个窗口。"
   description3: "详情请看这里。{link}"
-_followRequest:
-  recieved: "已收到申请"
-  sent: "已发送申请"

locales/zh-TW.yml

@@ -8,8 +8,8 @@ search: "搜尋"
 notifications: "通知"
 username: "使用者名稱"
 password: "密碼"
-initialPasswordForSetup: "啟動初始設定的密碼"
+initialPasswordForSetup: "初始設定用的密碼"
-initialPasswordIsIncorrect: "啟動初始設定的密碼錯誤。"
+initialPasswordIsIncorrect: "初始設定用的密碼錯誤。"
 initialPasswordForSetupDescription: "如果您自己安裝了 Misskey，請使用您在設定檔中輸入的密碼。\n如果您使用 Misskey 的託管服務之類的服務，請使用提供的密碼。\n如果您尚未設定密碼，請將其留空並繼續。"
 forgotPassword: "忘記密碼"
 fetchingAsApObject: "從聯邦宇宙取得中..."
@@ -382,6 +382,7 @@ enableLocalTimeline: "啟用本地時間軸"
 enableGlobalTimeline: "啟用全域時間軸"
 disablingTimelinesInfo: "為了方便，即使您關閉了時間軸功能，管理員和審查員仍可以繼續使用。"
 registration: "註冊"
+enableRegistration: "開放新使用者註冊"
 invite: "邀請"
 driveCapacityPerLocalAccount: "每個本地使用者的雲端硬碟容量"
 driveCapacityPerRemoteAccount: "每個非本地用戶的雲端空間大小"
@@ -586,7 +587,6 @@ masterVolume: "主音量"
 notUseSound: "關閉音效"
 useSoundOnlyWhenActive: "瀏覽器在前景運作時，Misskey 才會發出音效"
 details: "詳細資訊"
-renoteDetails: "轉發貼文的細節"
 chooseEmoji: "選擇您的表情符號"
 unableToProcess: "操作無法完成"
 recentUsed: "最近使用"
@@ -1119,7 +1119,7 @@ vertical: "直向"
 horizontal: "橫向"
 position: "位置"
 serverRules: "伺服器規則"
-pleaseConfirmBelowBeforeSignup: "在本伺服器註冊之前，必須確認並同意以下內容。"
+pleaseConfirmBelowBeforeSignup: "在本伺服器註冊之前，請確認下列事項。"
 pleaseAgreeAllToContinue: "必須全部勾選「同意」才能繼續。"
 continue: "繼續"
 preservedUsernames: "保留的使用者名稱"
@@ -1299,8 +1299,6 @@ yourNameContainsProhibitedWordsDescription: "名稱中包含禁止使用的字
 thisContentsAreMarkedAsSigninRequiredByAuthor: "作者將其設定為需要登入才能顯示。"
 lockdown: "鎖定"
 pleaseSelectAccount: "請選擇帳戶"
-availableRoles: "可用角色"
-acknowledgeNotesAndEnable: "了解注意事項後再開啟。"
 _accountSettings:
   requireSigninToViewContents: "須登入以顯示內容"
   requireSigninToViewContentsDescription1: "必須登入才會顯示您建立的貼文等內容。可望有效防止資訊被爬蟲蒐集。"
@@ -1457,8 +1455,6 @@ _serverSettings:
   reactionsBufferingDescription: "啟用時，可以顯著提高建立反應時的效能並減少資料庫的負載。 但是，Redis 記憶體使用量會增加。"
   inquiryUrl: "聯絡表單網址"
   inquiryUrlDescription: "指定伺服器運營者的聯絡表單網址，或包含運營者聯絡資訊網頁的網址。"
-  openRegistration: "允許建立帳戶"
-  openRegistrationWarning: "開放註冊伴隨著風險。 建議只有在伺服器受到持續監控，並準備好在出現問題時能立即處理的情況下才開放註冊。"
   thisSettingWillAutomaticallyOffWhenModeratorsInactive: "為了防止 spam，如果一段期間內沒有偵測到審查員的活動，此設定將自動關閉。"
 _accountMigration:
   moveFrom: "從其他帳戶遷移到這個帳戶"
@@ -2741,6 +2737,3 @@ _selfXssPrevention:
   description1: "如果您在此處貼上任何內容，惡意使用者可能會接管您的帳戶或竊取您的個人資訊。"
   description2: "如果您不確切知道要貼上的內容，%c 請立即停止工作並關閉此視窗。"
   description3: "細節請看這裡。{link}"
-_followRequest:
-  recieved: "收到的請求"
-  sent: "送出的請求"

package.json

@@ -1,10 +1,10 @@
 {
 	"name": "misskey",
-	"version": "2024.11.0-yumechinokuni.8",
+	"version": "2024.11.0-yumechinokuni.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
-		"url": "https://forge.yumechi.jp/yume.yumechi-no-kuni.git"
+		"url": "https://github.com/misskey-dev/misskey.git"
 	},
 	"packageManager": "pnpm@9.6.0",
 	"workspaces": [
@@ -24,15 +24,15 @@
 		"build": "pnpm build-pre && pnpm -r build && pnpm build-assets",
 		"build-storybook": "pnpm --filter frontend build-storybook",
 		"build-misskey-js-with-types": "pnpm build-pre && pnpm --filter backend... --filter=!misskey-js build && pnpm --filter backend generate-api-json --no-build && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && pnpm --filter misskey-js update-autogen-code && pnpm --filter misskey-js build && pnpm --filter misskey-js api",
-		"start": "pnpm check:connect && cd packages/backend && cross-env RUN_MODE=web node ./built/boot/entry.js",
+		"start": "pnpm check:connect && cd packages/backend && node ./built/boot/entry.js",
-		"start:test": "cd packages/backend && cross-env NODE_ENV=test RUN_MODE=test node ./built/boot/entry.js",
+		"start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/entry.js",
 		"init": "pnpm migrate",
 		"migrate": "cd packages/backend && pnpm migrate",
 		"revert": "cd packages/backend && pnpm revert",
 		"check:connect": "cd packages/backend && pnpm check:connect",
 		"migrateandstart": "pnpm migrate && pnpm start",
 		"watch": "pnpm dev",
-		"dev": "cross-env RUN_MODE=dev node scripts/dev.mjs",
+		"dev": "node scripts/dev.mjs",
 		"lint": "pnpm -r lint",
 		"cy:open": "pnpm cypress open --browser --e2e --config-file=cypress.config.ts",
 		"cy:run": "pnpm cypress run",
@@ -52,26 +52,26 @@
 	},
 	"dependencies": {
 		"cssnano": "6.1.2",
-		"execa": "9.5.1",
+		"execa": "8.0.1",
 		"fast-glob": "3.3.2",
 		"ignore-walk": "6.0.5",
 		"js-yaml": "4.1.0",
-		"postcss": "8.4.49",
+		"postcss": "8.4.47",
 		"tar": "6.2.1",
-		"terser": "5.36.0",
+		"terser": "5.33.0",
-		"typescript": "5.6.3",
+		"typescript": "5.6.2",
-		"esbuild": "0.24.0",
+		"esbuild": "0.23.1",
-		"glob": "11.0.0",
+		"glob": "11.0.0"
-		"cross-env": "7.0.3"
 	},
 	"devDependencies": {
 		"@misskey-dev/eslint-plugin": "2.0.3",
-		"@types/node": "22.9.0",
+		"@types/node": "20.14.12",
 		"@typescript-eslint/eslint-plugin": "7.17.0",
 		"@typescript-eslint/parser": "7.17.0",
-		"cypress": "13.15.2",
+		"cross-env": "7.0.3",
-		"eslint": "9.14.0",
+		"cypress": "13.14.2",
-		"globals": "15.12.0",
+		"eslint": "9.8.0",
+		"globals": "15.9.0",
 		"ncp": "2.0.0",
 		"start-server-and-test": "2.0.8"
 	},

packages/backend/migration/1731757142918-increase_character_limits.js

@@ -1,22 +0,0 @@
-/*
- * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class IncreaseCharacterLimits1731757142918 {
-	name = 'IncreaseCharacterLimits1731757142918'
-
-	async up(queryRunner) {
-		await queryRunner.query(`DROP INDEX IF EXISTS "IDX_7cc8d9b0ee7861b4e5dc86ad85"`);
-		await queryRunner.query(`ALTER TABLE "drive_file" ALTER COLUMN "comment" TYPE varchar(32768)`);
-		await queryRunner.query(`ALTER TABLE "note" ALTER COLUMN "cw" TYPE text`);
-		await queryRunner.query(`CREATE INDEX "IDX_7cc8d9b0ee7861b4e5dc86ad85" ON "note" USING "pgroonga" ("cw")`);
-	}
-
-	async down(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "note" ALTER COLUMN "cw" TYPE varchar(512)`);
-		await queryRunner.query(`ALTER TABLE "drive_file" ALTER COLUMN "comment" TYPE varchar(8192)`);
-		await queryRunner.query(`DROP INDEX "IDX_7cc8d9b0ee7861b4e5dc86ad85"`);
-		await queryRunner.query(`CREATE INDEX "IDX_7cc8d9b0ee7861b4e5dc86ad85" ON "note" USING "pgroonga" ("cw" pgroonga_varchar_full_text_search_ops)`);
-	}
-}

packages/backend/migration/1732071810971-IndexUserDeleted.js

@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project and yumechi
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class IndexUserDeleted1732071810971 {
-    name = 'IndexUserDeleted1732071810971'
-
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE INDEX IF NOT EXISTS "IDX_199b79e682bdc5ba946f491686" ON "user" ("isDeleted")`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`DROP INDEX IF EXISTS "IDX_199b79e682bdc5ba946f491686"`);
-    }
-}

packages/backend/package.json

@@ -69,32 +69,32 @@
 	"dependencies": {
 		"@aws-sdk/client-s3": "3.620.0",
 		"@aws-sdk/lib-storage": "3.620.0",
-		"@bull-board/api": "6.5.0",
+		"@bull-board/api": "6.0.0",
-		"@bull-board/fastify": "6.5.0",
+		"@bull-board/fastify": "6.0.0",
-		"@bull-board/ui": "6.5.0",
+		"@bull-board/ui": "6.0.0",
 		"@discordapp/twemoji": "15.1.0",
 		"@fastify/accepts": "5.0.1",
-		"@fastify/cookie": "11.0.1",
+		"@fastify/cookie": "10.0.1",
 		"@fastify/cors": "10.0.1",
 		"@fastify/express": "4.0.1",
-		"@fastify/http-proxy": "10.0.1",
+		"@fastify/http-proxy": "10.0.0",
 		"@fastify/multipart": "9.0.1",
-		"@fastify/static": "8.0.2",
+		"@fastify/static": "8.0.1",
 		"@fastify/view": "10.0.1",
 		"@misskey-dev/sharp-read-bmp": "1.2.0",
 		"@misskey-dev/summaly": "5.1.0",
 		"@napi-rs/canvas": "0.1.56",
-		"@nestjs/common": "10.4.7",
+		"@nestjs/common": "10.4.4",
-		"@nestjs/core": "10.4.7",
+		"@nestjs/core": "10.4.4",
-		"@nestjs/testing": "10.4.7",
+		"@nestjs/testing": "10.4.4",
 		"@peertube/http-signature": "1.7.0",
-		"@sentry/node": "8.38.0",
+		"@sentry/node": "8.20.0",
-		"@sentry/profiling-node": "8.38.0",
+		"@sentry/profiling-node": "8.20.0",
 		"@simplewebauthn/server": "10.0.1",
 		"@sinonjs/fake-timers": "11.2.2",
 		"@smithy/node-http-handler": "2.5.0",
 		"@swc/cli": "0.3.12",
-		"@swc/core": "1.9.2",
+		"@swc/core": "1.6.6",
 		"@twemoji/parser": "15.1.1",
 		"accepts": "1.3.8",
 		"ajv": "8.17.1",
@@ -103,7 +103,7 @@
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
 		"body-parser": "1.20.3",
-		"bullmq": "5.26.1",
+		"bullmq": "5.15.0",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.2",
 		"chalk": "5.3.0",
@@ -117,11 +117,11 @@
 		"fastify": "5.0.0",
 		"fastify-raw-body": "5.0.0",
 		"feed": "4.2.2",
-		"file-type": "19.6.0",
+		"file-type": "19.5.0",
 		"fluent-ffmpeg": "2.1.3",
-		"form-data": "4.0.1",
+		"form-data": "4.0.0",
-		"got": "14.4.4",
+		"got": "14.4.2",
-		"happy-dom": "15.11.4",
+		"happy-dom": "15.7.4",
 		"hpagent": "1.2.0",
 		"htmlescape": "1.1.1",
 		"http-link-header": "1.1.3",
@@ -134,29 +134,28 @@
 		"json5": "2.2.3",
 		"jsonld": "8.3.2",
 		"jsrsasign": "11.1.0",
+		"meilisearch": "0.42.0",
 		"juice": "11.0.0",
-		"meilisearch": "0.45.0",
 		"mfm-js": "0.24.0",
 		"microformats-parser": "2.0.2",
 		"mime-types": "2.1.35",
 		"misskey-js": "workspace:*",
 		"misskey-reversi": "workspace:*",
 		"ms": "3.0.0-canary.1",
-		"nanoid": "5.0.8",
+		"nanoid": "5.0.7",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
-		"nodemailer": "6.9.16",
+		"nodemailer": "6.9.15",
 		"nsfwjs": "2.4.2",
 		"oauth": "0.10.0",
 		"oauth2orize": "1.12.0",
 		"oauth2orize-pkce": "0.1.2",
 		"os-utils": "0.0.14",
 		"otpauth": "9.3.4",
-		"parse5": "7.2.1",
+		"parse5": "7.1.2",
-		"pg": "8.13.1",
+		"pg": "8.13.0",
 		"pkce-challenge": "4.1.0",
 		"probe-image-size": "7.2.3",
-		"prom-client": "^15.1.3",
 		"promise-limit": "2.7.0",
 		"pug": "3.0.3",
 		"punycode": "2.3.1",
@@ -181,7 +180,7 @@
 		"tsc-alias": "1.8.10",
 		"tsconfig-paths": "4.2.0",
 		"typeorm": "0.3.20",
-		"typescript": "5.6.3",
+		"typescript": "5.6.2",
 		"ulid": "2.3.0",
 		"vary": "1.1.2",
 		"web-push": "3.6.7",
@@ -190,28 +189,28 @@
 	},
 	"devDependencies": {
 		"@jest/globals": "29.7.0",
-		"@nestjs/platform-express": "10.4.7",
+		"@nestjs/platform-express": "10.4.4",
 		"@simplewebauthn/types": "10.0.0",
-		"@swc/jest": "0.2.37",
+		"@swc/jest": "0.2.36",
 		"@types/accepts": "1.3.7",
-		"@types/archiver": "6.0.3",
+		"@types/archiver": "6.0.2",
 		"@types/bcryptjs": "2.4.6",
 		"@types/body-parser": "1.19.5",
 		"@types/color-convert": "2.0.4",
 		"@types/content-disposition": "0.5.8",
-		"@types/fluent-ffmpeg": "2.1.27",
+		"@types/fluent-ffmpeg": "2.1.26",
 		"@types/htmlescape": "1.1.3",
 		"@types/http-link-header": "1.0.7",
-		"@types/jest": "29.5.14",
+		"@types/jest": "29.5.13",
 		"@types/js-yaml": "4.0.9",
 		"@types/jsdom": "21.1.7",
 		"@types/jsonld": "1.5.15",
 		"@types/jsrsasign": "10.5.14",
 		"@types/mime-types": "2.1.4",
 		"@types/ms": "0.7.34",
-		"@types/node": "22.9.0",
+		"@types/node": "20.14.12",
 		"@types/nodemailer": "6.4.16",
-		"@types/oauth": "0.9.6",
+		"@types/oauth": "0.9.5",
 		"@types/oauth2orize": "1.11.5",
 		"@types/oauth2orize-pkce": "0.1.2",
 		"@types/pg": "8.11.10",
@@ -228,14 +227,14 @@
 		"@types/tinycolor2": "1.4.6",
 		"@types/tmp": "0.2.6",
 		"@types/vary": "1.1.3",
-		"@types/web-push": "3.6.4",
+		"@types/web-push": "3.6.3",
-		"@types/ws": "8.5.13",
+		"@types/ws": "8.5.12",
 		"@typescript-eslint/eslint-plugin": "7.17.0",
 		"@typescript-eslint/parser": "7.17.0",
 		"aws-sdk-client-mock": "4.0.1",
 		"cross-env": "7.0.3",
 		"eslint-plugin-import": "2.30.0",
-		"execa": "9.5.1",
+		"execa": "9.4.0",
 		"fkill": "9.0.0",
 		"jest": "29.7.0",
 		"jest-mock": "29.7.0",

packages/backend/scripts/check_connect.js

@@ -22,7 +22,6 @@ async function connectToRedis(redisOptions) {
 			lazyConnect: true,
 			reconnectOnError: false,
 			showFriendlyErrorStack: true,
-			connectTimeout: 10000,
 		});
 		redis.on('error', e => reject(e));
 
@@ -51,9 +50,7 @@ const promises = Array
 	]))
 	.map(connectToRedis)
 	.concat([
-		connectToPostgres().then(() => { console.log('Connected to PostgreSQL.'); }),
+		connectToPostgres()
 	]);
 
 await Promise.allSettled(promises);
-
-process.exit(0);

packages/backend/src/GlobalModule.ts

@@ -24,7 +24,7 @@ const $config: Provider = {
 const $db: Provider = {
 	provide: DI.db,
 	useFactory: async (config) => {
-		const db = createPostgresDataSource(config, true);
+		const db = createPostgresDataSource(config);
 		return await db.initialize();
 	},
 	inject: [DI.config],

packages/backend/src/boot/common.ts

@@ -4,7 +4,6 @@
  */
 
 import { NestFactory } from '@nestjs/core';
-import * as prom from 'prom-client';
 import { ChartManagementService } from '@/core/chart/ChartManagementService.js';
 import { QueueProcessorService } from '@/queue/QueueProcessorService.js';
 import { NestLogger } from '@/NestLogger.js';
@@ -13,9 +12,8 @@ import { QueueStatsService } from '@/daemons/QueueStatsService.js';
 import { ServerStatsService } from '@/daemons/ServerStatsService.js';
 import { ServerService } from '@/server/ServerService.js';
 import { MainModule } from '@/MainModule.js';
-import { MetricsService } from '@/server/api/MetricsService.js';
 
-export async function server(workerRegistry?: prom.AggregatorRegistry<prom.PrometheusContentType>) {
+export async function server() {
 	const app = await NestFactory.createApplicationContext(MainModule, {
 		logger: new NestLogger(),
 	});
@@ -24,9 +22,6 @@ export async function server(workerRegistry?: prom.AggregatorRegistry<prom.Prome
 	await serverService.launch();
 
 	if (process.env.NODE_ENV !== 'test') {
-		if (workerRegistry) {
-			app.get(MetricsService).setWorkerRegistry(workerRegistry);
-		}
 		app.get(ChartManagementService).start();
 		app.get(QueueStatsService).start();
 		app.get(ServerStatsService).start();

packages/backend/src/boot/entry.ts

@@ -8,7 +8,6 @@
  */
 
 import cluster from 'node:cluster';
-import * as prom from 'prom-client';
 import { EventEmitter } from 'node:events';
 import chalk from 'chalk';
 import Xev from 'xev';
@@ -18,15 +17,6 @@ import { masterMain } from './master.js';
 import { workerMain } from './worker.js';
 import { readyRef } from './ready.js';
 
-const workerRegistry = new prom.AggregatorRegistry<prom.PrometheusContentType>();
-
-prom.collectDefaultMetrics({
-	labels: {
-		cluster_type: `${cluster.isPrimary ? 'master' : 'worker'}`,
-		worker_id: cluster.worker?.id.toString() || 'none'
-	}
-});
-
 import 'reflect-metadata';
 
 process.title = `Misskey (${cluster.isPrimary ? 'master' : 'worker'})`;
@@ -79,7 +69,7 @@ process.on('exit', code => {
 //#endregion
 
 if (cluster.isPrimary || envOption.disableClustering) {
-	await masterMain(workerRegistry);
+	await masterMain();
 
 	if (cluster.isPrimary) {
 		ev.mount();

packages/backend/src/boot/master.ts

@@ -7,7 +7,6 @@ import * as fs from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { dirname } from 'node:path';
 import * as os from 'node:os';
-import * as prom from 'prom-client';
 import cluster from 'node:cluster';
 import chalk from 'chalk';
 import chalkTemplate from 'chalk-template';
@@ -19,7 +18,6 @@ import type { Config } from '@/config.js';
 import { showMachineInfo } from '@/misc/show-machine-info.js';
 import { envOption } from '@/env.js';
 import { jobQueue, server } from './common.js';
-import { metricGauge } from '@/server/api/MetricsService.js';
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
@@ -31,24 +29,6 @@ const bootLogger = logger.createSubLogger('boot', 'magenta');
 
 const themeColor = chalk.hex('#86b300');
 
-const mBuildInfo = metricGauge({
-	name: 'misskey_build_info',
-	help: 'Misskey build information',
-	labelNames: ['gitCommit', 'gitDescribe', 'node_version']
-});
-
-mBuildInfo?.set({
-	gitCommit: meta.gitCommit || 'unknown',
-	gitDescribe: meta.gitDescribe || 'unknown',
-	node_version: process.version
-}, 1);
-
-const mStartupTime = metricGauge({
-	name: 'misskey_startup_time',
-	help: 'Misskey startup time',
-	labelNames: ['pid']
-});
-
 function greet() {
 	if (!envOption.quiet) {
 		//#region Misskey logo
@@ -74,7 +54,7 @@ function greet() {
 /**
  * Init master process
  */
-export async function masterMain(workerRegistry?: prom.AggregatorRegistry<prom.PrometheusContentType>) {
+export async function masterMain() {
 	let config!: Config;
 
 	// initialize app
@@ -84,7 +64,6 @@ export async function masterMain(workerRegistry?: prom.AggregatorRegistry<prom.P
 		await showMachineInfo(bootLogger);
 		showNodejsVersion();
 		config = loadConfigBoot();
-
 		//await connectDb();
 		if (config.pidFile) fs.writeFileSync(config.pidFile, process.pid.toString());
 	} catch (e) {
@@ -112,15 +91,13 @@ export async function masterMain(workerRegistry?: prom.AggregatorRegistry<prom.P
 		});
 	}
 
-	mStartupTime?.set({ pid: process.pid }, Date.now());
-
 	if (envOption.disableClustering) {
 		if (envOption.onlyServer) {
-			await server(workerRegistry);
+			await server();
 		} else if (envOption.onlyQueue) {
 			await jobQueue();
 		} else {
-			await server(workerRegistry);
+			await server();
 			await jobQueue();
 		}
 	} else {
@@ -129,7 +106,7 @@ export async function masterMain(workerRegistry?: prom.AggregatorRegistry<prom.P
 		} else if (envOption.onlyQueue) {
 			// nop
 		} else {
-			await server(workerRegistry);
+			await server();
 		}
 
 		await spawnWorkers(config.clusterLimit);

packages/backend/src/boot/worker.ts

@@ -4,7 +4,6 @@
  */
 
 import cluster from 'node:cluster';
-import { collectDefaultMetrics, AggregatorRegistry, RegistryContentType } from 'prom-client';
 import * as Sentry from '@sentry/node';
 import { nodeProfilingIntegration } from '@sentry/profiling-node';
 import { envOption } from '@/env.js';

packages/backend/src/config.ts

@@ -9,7 +9,6 @@ import { dirname, resolve } from 'node:path';
 import * as yaml from 'js-yaml';
 import * as Sentry from '@sentry/node';
 import type { RedisOptions } from 'ioredis';
-import { type CSPHashed, hashResource, hashSourceFile } from './server/csp.js';
 
 type RedisOptionsSource = Partial<RedisOptions> & {
 	host: string;
@@ -20,18 +19,6 @@ type RedisOptionsSource = Partial<RedisOptions> & {
 	prefix?: string;
 };
 
-type BrowserSandboxing = {
-	// send Referrer-Policy: strict-origin
-	strictOriginReferrer?: boolean;
-	csp?: {
-		disable?: boolean;
-
-		appendDirectives?: {
-			[directive: string]: string | string[];
-		}
-	};
-};
-
 /**
  * 設定ファイルの型
  */
@@ -72,16 +59,11 @@ type Source = {
 		index: string;
 		scope?: 'local' | 'global' | string[];
 	};
-	
-	prometheusMetrics?: { enable: boolean, scrapeToken?: string };
-
 	sentryForBackend?: { options: Partial<Sentry.NodeOptions>; enableNodeProfiling: boolean; };
 	sentryForFrontend?: { options: Partial<Sentry.NodeOptions> };
 
 	publishTarballInsteadOfProvideRepositoryUrl?: boolean;
 
-	browserSandboxing?: BrowserSandboxing;
-
 	setupPassword?: string;
 
 	proxy?: string;
@@ -172,10 +154,6 @@ export type Config = {
 	proxyRemoteFiles: boolean | undefined;
 	signToActivityPubGet: boolean | undefined;
 
-	browserSandboxing: BrowserSandboxing;
-
-	cspPrerenderedContent: Map<string, CSPHashed>;
-
 	version: string;
 	gitDescribe: string;
 	gitCommit: string;
@@ -202,12 +180,8 @@ export type Config = {
 	redisForJobQueue: RedisOptions & RedisOptionsSource;
 	redisForTimelines: RedisOptions & RedisOptionsSource;
 	redisForReactions: RedisOptions & RedisOptionsSource;
-
-	prometheusMetrics : { enable: boolean, scrapeToken?: string } | undefined;
-
 	sentryForBackend: { options: Partial<Sentry.NodeOptions>; enableNodeProfiling: boolean; } | undefined;
 	sentryForFrontend: { options: Partial<Sentry.NodeOptions> } | undefined;
-	
 	perChannelMaxNoteCacheCount: number;
 	perUserNotificationsMaxCount: number;
 	deactivateAntennaThreshold: number;
@@ -261,21 +235,11 @@ export function loadConfig(): Config {
 		: null;
 	const internalMediaProxy = `${scheme}://${host}/proxy`;
 	const redis = convertRedisOptions(config.redis, host);
-	const htmlScriptPrelude = `var VERSION = ${JSON.stringify(version)}; var CLIENT_ENTRY = ${JSON.stringify(frontendManifest['src/_boot_.ts'].file)};`;
-	const htmlEmbedScriptPrelude = `var VERSION = ${JSON.stringify(version)}; var CLIENT_ENTRY = ${JSON.stringify(frontendEmbedManifest['src/boot.ts'].file)};`;
-	const cspPrerenderedContent = new Map([
-		['.prelude.js', hashResource(htmlScriptPrelude)],
-		['.prelude.embed.js', hashResource(htmlEmbedScriptPrelude)],
-		...['boot.js', 'style.css', 'style.embed.css', 'boot.embed.js',
-			'bios.css', 'bios.js', 'cli.css', 'cli.js', 'error.css'
-		].map((file) => [file, hashSourceFile(`${_dirname}/server/web/${file}`)] as [string, CSPHashed]),
-	]);
 
 	return {
 		version,
 		gitCommit,
 		gitDescribe,
-		browserSandboxing: config.browserSandboxing ?? { strictOriginReferrer: true },
 		publishTarballInsteadOfProvideRepositoryUrl: !!config.publishTarballInsteadOfProvideRepositoryUrl,
 		setupPassword: config.setupPassword,
 		url: url.origin,
@@ -284,7 +248,6 @@ export function loadConfig(): Config {
 		chmodSocket: config.chmodSocket,
 		disableHsts: config.disableHsts,
 		hstsPreload: config.hstsPreload ?? false,
-		cspPrerenderedContent,
 		host,
 		hostname,
 		scheme,
@@ -302,7 +265,6 @@ export function loadConfig(): Config {
 		redisForJobQueue: config.redisForJobQueue ? convertRedisOptions(config.redisForJobQueue, host) : redis,
 		redisForTimelines: config.redisForTimelines ? convertRedisOptions(config.redisForTimelines, host) : redis,
 		redisForReactions: config.redisForReactions ? convertRedisOptions(config.redisForReactions, host) : redis,
-		prometheusMetrics: config.prometheusMetrics,
 		sentryForBackend: config.sentryForBackend,
 		sentryForFrontend: config.sentryForFrontend,
 		id: config.id,

packages/backend/src/core/AbuseReportNotificationService.ts

@@ -154,9 +154,9 @@ export class AbuseReportNotificationService implements OnApplicationShutdown {
 		const convertedReports = abuseReports.map(it => {
 			return {
 				...it,
-				reporter: usersMap.get(it.reporterId) ?? null,
+				reporter: usersMap.get(it.reporterId),
-				targetUser: usersMap.get(it.targetUserId) ?? null,
+				targetUser: usersMap.get(it.targetUserId),
-				assignee: it.assigneeId ? (usersMap.get(it.assigneeId) ?? null) : null,
+				assignee: it.assigneeId ? usersMap.get(it.assigneeId) : null,
 			};
 		});
 

packages/backend/src/core/AnnouncementService.ts

@@ -72,7 +72,7 @@ export class AnnouncementService {
 			updatedAt: null,
 			title: values.title,
 			text: values.text,
-			imageUrl: values.imageUrl || null,
+			imageUrl: values.imageUrl,
 			icon: values.icon,
 			display: values.display,
 			forExistingUsers: values.forExistingUsers,

packages/backend/src/core/CoreModule.ts

@@ -36,7 +36,7 @@ import { GlobalEventService } from './GlobalEventService.js';
 import { HashtagService } from './HashtagService.js';
 import { HttpRequestService } from './HttpRequestService.js';
 import { IdService } from './IdService.js';
-import { __YUME_PRIVATE_ImageProcessingService } from './ImageProcessingService.js';
+import { ImageProcessingService } from './ImageProcessingService.js';
 import { InstanceActorService } from './InstanceActorService.js';
 import { InternalStorageService } from './InternalStorageService.js';
 import { MetaService } from './MetaService.js';
@@ -67,7 +67,7 @@ import { UserMutingService } from './UserMutingService.js';
 import { UserRenoteMutingService } from './UserRenoteMutingService.js';
 import { UserSuspendService } from './UserSuspendService.js';
 import { UserAuthService } from './UserAuthService.js';
-import { __YUME_PRIVATE_VideoProcessingService } from './VideoProcessingService.js';
+import { VideoProcessingService } from './VideoProcessingService.js';
 import { UserWebhookService } from './UserWebhookService.js';
 import { ProxyAccountService } from './ProxyAccountService.js';
 import { UtilityService } from './UtilityService.js';
@@ -179,7 +179,7 @@ const $GlobalEventService: Provider = { provide: 'GlobalEventService', useExisti
 const $HashtagService: Provider = { provide: 'HashtagService', useExisting: HashtagService };
 const $HttpRequestService: Provider = { provide: 'HttpRequestService', useExisting: HttpRequestService };
 const $IdService: Provider = { provide: 'IdService', useExisting: IdService };
-const $ImageProcessingService: Provider = { provide: '__YUME_PRIVATE_ImageProcessingService', useExisting: __YUME_PRIVATE_ImageProcessingService };
+const $ImageProcessingService: Provider = { provide: 'ImageProcessingService', useExisting: ImageProcessingService };
 const $InstanceActorService: Provider = { provide: 'InstanceActorService', useExisting: InstanceActorService };
 const $InternalStorageService: Provider = { provide: 'InternalStorageService', useExisting: InternalStorageService };
 const $MetaService: Provider = { provide: 'MetaService', useExisting: MetaService };
@@ -212,7 +212,7 @@ const $UserRenoteMutingService: Provider = { provide: 'UserRenoteMutingService',
 const $UserSearchService: Provider = { provide: 'UserSearchService', useExisting: UserSearchService };
 const $UserSuspendService: Provider = { provide: 'UserSuspendService', useExisting: UserSuspendService };
 const $UserAuthService: Provider = { provide: 'UserAuthService', useExisting: UserAuthService };
-const $VideoProcessingService: Provider = { provide: '__YUME_PRIVATE_VideoProcessingService', useExisting: __YUME_PRIVATE_VideoProcessingService };
+const $VideoProcessingService: Provider = { provide: 'VideoProcessingService', useExisting: VideoProcessingService };
 const $UserWebhookService: Provider = { provide: 'UserWebhookService', useExisting: UserWebhookService };
 const $SystemWebhookService: Provider = { provide: 'SystemWebhookService', useExisting: SystemWebhookService };
 const $WebhookTestService: Provider = { provide: 'WebhookTestService', useExisting: WebhookTestService };
@@ -330,7 +330,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		HashtagService,
 		HttpRequestService,
 		IdService,
-		__YUME_PRIVATE_ImageProcessingService,
+		ImageProcessingService,
 		InstanceActorService,
 		InternalStorageService,
 		MetaService,
@@ -363,7 +363,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		UserSearchService,
 		UserSuspendService,
 		UserAuthService,
-		__YUME_PRIVATE_VideoProcessingService,
+		VideoProcessingService,
 		UserWebhookService,
 		SystemWebhookService,
 		WebhookTestService,
@@ -625,7 +625,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		HashtagService,
 		HttpRequestService,
 		IdService,
-		__YUME_PRIVATE_ImageProcessingService,
+		ImageProcessingService,
 		InstanceActorService,
 		InternalStorageService,
 		MetaService,
@@ -658,7 +658,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		UserSearchService,
 		UserSuspendService,
 		UserAuthService,
-		__YUME_PRIVATE_VideoProcessingService,
+		VideoProcessingService,
 		UserWebhookService,
 		SystemWebhookService,
 		WebhookTestService,

packages/backend/src/core/DeleteAccountService.ts

@@ -47,10 +47,6 @@ export class DeleteAccountService {
 			});
 		}
 
-		if (!(await this.usersRepository.update({ id: user.id, isDeleted: false }, { isDeleted: true })).affected) {
-			return;
-		}
-
 		// 物理削除する前にDelete activityを送信する
 		if (this.userEntityService.isLocalUser(user)) {
 			// 知り得る全SharedInboxにDelete配信

packages/backend/src/core/DownloadService.ts

@@ -6,6 +6,7 @@
 import * as fs from 'node:fs';
 import * as stream from 'node:stream/promises';
 import { Inject, Injectable } from '@nestjs/common';
+import ipaddr from 'ipaddr.js';
 import chalk from 'chalk';
 import got, * as Got from 'got';
 import { parse } from 'content-disposition';
@@ -44,14 +45,6 @@ export class DownloadService {
 		const maxSize = this.config.maxFileSize;
 
 		const urlObj = new URL(url);
-		if (urlObj.protocol && urlObj.protocol !== 'https:') {
-			throw new Error(`Unsupported protocol: ${urlObj.protocol}, only HTTPS is supported`);
-		}
-		urlObj.protocol = 'https:';
-		if (urlObj.port && urlObj.port !== '443') {
-			throw new Error(`Unsupported port: ${urlObj.port}, only 443 is supported`);
-		}
-
 		let filename = urlObj.pathname.split('/').pop() ?? 'untitled';
 
 		const req = got.stream(url, {
@@ -68,6 +61,7 @@ export class DownloadService {
 				request: operationTimeout,	// whole operation timeout
 			},
 			agent: {
+				http: this.httpRequestService.httpAgent,
 				https: this.httpRequestService.httpsAgent,
 			},
 			http2: false,	// default
@@ -76,6 +70,13 @@ export class DownloadService {
 			},
 			enableUnixSockets: false,
 		}).on('response', (res: Got.Response) => {
+			if ((process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'test') && !this.config.proxy && res.ip) {
+				if (this.isPrivateIp(res.ip)) {
+					this.logger.warn(`Blocked address: ${res.ip}`);
+					req.destroy();
+				}
+			}
+
 			const contentLength = res.headers['content-length'];
 			if (contentLength != null) {
 				const size = Number(contentLength);
@@ -138,4 +139,18 @@ export class DownloadService {
 			cleanup();
 		}
 	}
+
+	@bindThis
+	private isPrivateIp(ip: string): boolean {
+		const parsedIp = ipaddr.parse(ip);
+
+		for (const net of this.config.allowedPrivateNetworks ?? []) {
+			const cidr = ipaddr.parseCIDR(net);
+			if (cidr[0].kind() === parsedIp.kind() && parsedIp.match(ipaddr.parseCIDR(net))) {
+				return false;
+			}
+		}
+
+		return parsedIp.range() !== 'unicast';
+	}
 }

packages/backend/src/core/DriveService.ts

@@ -22,8 +22,8 @@ import { FILE_TYPE_BROWSERSAFE } from '@/const.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { contentDisposition } from '@/misc/content-disposition.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
-import { __YUME_PRIVATE_VideoProcessingService } from '@/core/VideoProcessingService.js';
+import { VideoProcessingService } from '@/core/VideoProcessingService.js';
-import { __YUME_PRIVATE_ImageProcessingService } from '@/core/ImageProcessingService.js';
+import { ImageProcessingService } from '@/core/ImageProcessingService.js';
 import type { IImage } from '@/core/ImageProcessingService.js';
 import { QueueService } from '@/core/QueueService.js';
 import type { MiDriveFolder } from '@/models/DriveFolder.js';
@@ -87,9 +87,9 @@ type UploadFromUrlArgs = {
 
 @Injectable()
 export class DriveService {
-	public static NoSuchFolderError = class extends Error { };
+	public static NoSuchFolderError = class extends Error {};
-	public static InvalidFileNameError = class extends Error { };
+	public static InvalidFileNameError = class extends Error {};
-	public static CannotUnmarkSensitiveError = class extends Error { };
+	public static CannotUnmarkSensitiveError = class extends Error {};
 	private registerLogger: Logger;
 	private downloaderLogger: Logger;
 	private deleteLogger: Logger;
@@ -120,8 +120,8 @@ export class DriveService {
 		private downloadService: DownloadService,
 		private internalStorageService: InternalStorageService,
 		private s3Service: S3Service,
-		private privateImageProcessingService: __YUME_PRIVATE_ImageProcessingService,
+		private imageProcessingService: ImageProcessingService,
-		private privateVideoProcessingService: __YUME_PRIVATE_VideoProcessingService,
+		private videoProcessingService: VideoProcessingService,
 		private globalEventService: GlobalEventService,
 		private queueService: QueueService,
 		private roleService: RoleService,
@@ -147,11 +147,11 @@ export class DriveService {
 	 */
 	@bindThis
 	private async save(file: MiDriveFile, path: string, name: string, type: string, hash: string, size: number): Promise<MiDriveFile> {
-		// thunbnail, webpublic を必要なら生成
+	// thunbnail, webpublic を必要なら生成
 		const alts = await this.generateAlts(path, type, !file.uri);
 
 		if (this.meta.useObjectStorage) {
-			//#region ObjectStorage params
+		//#region ObjectStorage params
 			let [ext] = (name.match(/\.([a-zA-Z0-9_-]+)$/) ?? ['']);
 
 			if (ext === '') {
@@ -170,11 +170,11 @@ export class DriveService {
 			}
 
 			const baseUrl = this.meta.objectStorageBaseUrl
-				?? `${this.meta.objectStorageUseSSL ? 'https' : 'http'}://${this.meta.objectStorageEndpoint}${this.meta.objectStoragePort ? `:${this.meta.objectStoragePort}` : ''}/${this.meta.objectStorageBucket}`;
+				?? `${ this.meta.objectStorageUseSSL ? 'https' : 'http' }://${ this.meta.objectStorageEndpoint }${ this.meta.objectStoragePort ? `:${this.meta.objectStoragePort}` : '' }/${ this.meta.objectStorageBucket }`;
 
 			// for original
 			const key = `${this.meta.objectStoragePrefix}/${randomUUID()}${ext}`;
-			const url = `${baseUrl}/${key}`;
+			const url = `${ baseUrl }/${ key }`;
 
 			// for alts
 			let webpublicKey: string | null = null;
@@ -191,7 +191,7 @@ export class DriveService {
 
 			if (alts.webpublic) {
 				webpublicKey = `${this.meta.objectStoragePrefix}/webpublic-${randomUUID()}.${alts.webpublic.ext}`;
-				webpublicUrl = `${baseUrl}/${webpublicKey}`;
+				webpublicUrl = `${ baseUrl }/${ webpublicKey }`;
 
 				this.registerLogger.info(`uploading webpublic: ${webpublicKey}`);
 				uploads.push(this.upload(webpublicKey, alts.webpublic.data, alts.webpublic.type, alts.webpublic.ext, name));
@@ -199,7 +199,7 @@ export class DriveService {
 
 			if (alts.thumbnail) {
 				thumbnailKey = `${this.meta.objectStoragePrefix}/thumbnail-${randomUUID()}.${alts.thumbnail.ext}`;
-				thumbnailUrl = `${baseUrl}/${thumbnailKey}`;
+				thumbnailUrl = `${ baseUrl }/${ thumbnailKey }`;
 
 				this.registerLogger.info(`uploading thumbnail: ${thumbnailKey}`);
 				uploads.push(this.upload(thumbnailKey, alts.thumbnail.data, alts.thumbnail.type, alts.thumbnail.ext, `${name}.thumbnail`));
@@ -277,7 +277,7 @@ export class DriveService {
 			}
 
 			try {
-				const thumbnail = await this.privateVideoProcessingService.generateVideoThumbnail(path);
+				const thumbnail = await this.videoProcessingService.generateVideoThumbnail(path);
 				return {
 					webpublic: null,
 					thumbnail,
@@ -311,9 +311,9 @@ export class DriveService {
 			satisfyWebpublic = !!(
 				type !== 'image/svg+xml' && // security reason
 				type !== 'image/avif' && // not supported by Mastodon and MS Edge
-				!(metadata.exif ?? metadata.iptc ?? metadata.xmp ?? metadata.tifftagPhotoshop) &&
+			!(metadata.exif ?? metadata.iptc ?? metadata.xmp ?? metadata.tifftagPhotoshop) &&
-				metadata.width && metadata.width <= 2048 &&
+			metadata.width && metadata.width <= 2048 &&
-				metadata.height && metadata.height <= 2048
+			metadata.height && metadata.height <= 2048
 			);
 		} catch (err) {
 			this.registerLogger.warn(`sharp failed: ${err}`);
@@ -331,9 +331,9 @@ export class DriveService {
 
 			try {
 				if (['image/jpeg', 'image/webp', 'image/avif'].includes(type)) {
-					webpublic = await this.privateImageProcessingService.convertSharpToWebp(img, 2048, 2048);
+					webpublic = await this.imageProcessingService.convertSharpToWebp(img, 2048, 2048);
 				} else if (['image/png', 'image/bmp', 'image/svg+xml'].includes(type)) {
-					webpublic = await this.privateImageProcessingService.convertSharpToPng(img, 2048, 2048);
+					webpublic = await this.imageProcessingService.convertSharpToPng(img, 2048, 2048);
 				} else {
 					this.registerLogger.debug('web image not created (not an required image)');
 				}
@@ -352,9 +352,9 @@ export class DriveService {
 
 		try {
 			if (isAnimated) {
-				thumbnail = await this.privateImageProcessingService.convertSharpToWebp(sharp(path, { animated: true }), 374, 317, { alphaQuality: 70 });
+				thumbnail = await this.imageProcessingService.convertSharpToWebp(sharp(path, { animated: true }), 374, 317, { alphaQuality: 70 });
 			} else {
-				thumbnail = await this.privateImageProcessingService.convertSharpToWebp(img, 498, 422);
+				thumbnail = await this.imageProcessingService.convertSharpToWebp(img, 498, 422);
 			}
 		} catch (err) {
 			this.registerLogger.warn('thumbnail not created (an error occurred)', err as Error);
@@ -470,11 +470,11 @@ export class DriveService {
 		const info = await this.fileInfoService.getFileInfo(path, {
 			skipSensitiveDetection: skipNsfwCheck,
 			sensitiveThreshold: // 感度が高いほどしきい値は低くすることになる
-				this.meta.sensitiveMediaDetectionSensitivity === 'veryHigh' ? 0.1 :
+			this.meta.sensitiveMediaDetectionSensitivity === 'veryHigh' ? 0.1 :
-					this.meta.sensitiveMediaDetectionSensitivity === 'high' ? 0.3 :
+			this.meta.sensitiveMediaDetectionSensitivity === 'high' ? 0.3 :
-						this.meta.sensitiveMediaDetectionSensitivity === 'low' ? 0.7 :
+			this.meta.sensitiveMediaDetectionSensitivity === 'low' ? 0.7 :
-							this.meta.sensitiveMediaDetectionSensitivity === 'veryLow' ? 0.9 :
+			this.meta.sensitiveMediaDetectionSensitivity === 'veryLow' ? 0.9 :
-								0.5,
+			0.5,
 			sensitiveThresholdForPorn: 0.75,
 			enableSensitiveMediaDetectionForVideos: this.meta.enableSensitiveMediaDetectionForVideos,
 		});
@@ -494,7 +494,7 @@ export class DriveService {
 		);
 
 		if (user && !force) {
-			// Check if there is a file with the same hash
+		// Check if there is a file with the same hash
 			const matched = await this.driveFilesRepository.findOneBy({
 				md5: info.md5,
 				userId: user.id,
@@ -582,7 +582,7 @@ export class DriveService {
 		file.maybePorn = info.porn;
 		file.isSensitive = user
 			? this.userEntityService.isLocalUser(user) && profile!.alwaysMarkNsfw ? true :
-				sensitive ?? false
+			sensitive ?? false
 			: false;
 
 		if (user && this.utilityService.isMediaSilencedHost(this.meta.mediaSilencedHosts, user.host)) file.isSensitive = true;
@@ -616,7 +616,7 @@ export class DriveService {
 
 				file = await this.driveFilesRepository.insertOne(file);
 			} catch (err) {
-				// duplicate key error (when already registered)
+			// duplicate key error (when already registered)
 				if (isDuplicateKeyValueError(err)) {
 					this.registerLogger.info(`already registered ${file.uri}`);
 

packages/backend/src/core/EmailService.ts

@@ -313,7 +313,6 @@ export class EmailService {
 					Accept: 'application/json',
 					Authorization: truemailAuthKey,
 				},
-				isLocalAddressAllowed: true,
 			});
 
 			const json = (await res.json()) as {

packages/backend/src/core/FeaturedService.ts

@@ -12,7 +12,7 @@ import { bindThis } from '@/decorators.js';
 const GLOBAL_NOTES_RANKING_WINDOW = 1000 * 60 * 60 * 24 * 3; // 3日ごと
 export const GALLERY_POSTS_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 * 48; // 48時間ごと
+const HASHTAG_RANKING_WINDOW = 1000 * 60 * 60; // 1時間ごと
 
 const featuredEpoc = new Date('2023-01-01T00:00:00Z').getTime();
 

packages/backend/src/core/HttpRequestService.ts

@@ -6,122 +6,41 @@
 import * as http from 'node:http';
 import * as https from 'node:https';
 import * as net from 'node:net';
-import ipaddr from 'ipaddr.js';
 import CacheableLookup from 'cacheable-lookup';
 import fetch from 'node-fetch';
-import { HttpsProxyAgent } from 'hpagent';
+import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { StatusError } from '@/misc/status-error.js';
 import { bindThis } from '@/decorators.js';
 import { validateContentTypeSetAsActivityPub } from '@/core/activitypub/misc/validator.js';
-import { assertActivityMatchesUrls } from '@/core/activitypub/misc/check-against-url.js';
 import type { IObject } from '@/core/activitypub/type.js';
 import type { Response } from 'node-fetch';
-import { URL } from 'node:url';
+import type { URL } from 'node:url';
 
 export type HttpRequestSendOptions = {
 	throwErrorWhenResponseNotOk: boolean;
 	validators?: ((res: Response) => void)[];
 };
 
-declare module 'node:http' {
-	interface Agent {
-		createConnection(options: net.NetConnectOpts, callback?: (err: unknown, stream: net.Socket) => void): net.Socket;
-	}
-}
-
-class HttpRequestServiceAgent extends http.Agent {
-	constructor(
-		private config: Config,
-		options?: http.AgentOptions,
-	) {
-		super(options);
-	}
-
-	@bindThis
-	public createConnection(options: net.NetConnectOpts, callback?: (err: unknown, stream: net.Socket) => void): net.Socket {
-		const socket = super.createConnection(options, callback)
-			.on('connect', () => {
-				const address = socket.remoteAddress;
-				if (process.env.NODE_ENV === 'production') {
-					if (address && ipaddr.isValid(address)) {
-						if (this.isPrivateIp(address)) {
-							socket.destroy(new Error(`Blocked address: ${address}`));
-						}
-					}
-				}
-			});
-		return socket;
-	};
-
-	@bindThis
-	private isPrivateIp(ip: string): boolean {
-		const parsedIp = ipaddr.parse(ip);
-	
-		for (const net of this.config.allowedPrivateNetworks ?? []) {
-			const cidr = ipaddr.parseCIDR(net);
-			if (cidr[0].kind() === parsedIp.kind() && parsedIp.match(ipaddr.parseCIDR(net))) {
-				return false;
-			}
-		}
-	
-		return parsedIp.range() !== 'unicast';
-	}
-}
-
-class HttpsRequestServiceAgent extends https.Agent {
-	constructor(
-		private config: Config,
-		options?: https.AgentOptions,
-	) {
-		super(options);
-	}
-
-	@bindThis
-	public createConnection(options: net.NetConnectOpts, callback?: (err: unknown, stream: net.Socket) => void): net.Socket {
-		const socket = super.createConnection(options, callback)
-			.on('connect', () => {
-				const address = socket.remoteAddress;
-				if (process.env.NODE_ENV === 'production') {
-					if (address && ipaddr.isValid(address)) {
-						if (this.isPrivateIp(address)) {
-							socket.destroy(new Error(`Blocked address: ${address}`));
-						}
-					}
-				}
-			});
-		return socket;
-	};
-
-	@bindThis
-	private isPrivateIp(ip: string): boolean {
-		const parsedIp = ipaddr.parse(ip);
-	
-		for (const net of this.config.allowedPrivateNetworks ?? []) {
-			const cidr = ipaddr.parseCIDR(net);
-			if (cidr[0].kind() === parsedIp.kind() && parsedIp.match(ipaddr.parseCIDR(net))) {
-				return false;
-			}
-		}
-	
-		return parsedIp.range() !== 'unicast';
-	}
-}
-
 @Injectable()
 export class HttpRequestService {
 	/**
-	 * Get https non-proxy agent (without local address filtering)
+	 * Get http non-proxy agent
 	 */
-	private httpsNative: https.Agent;
+	private http: http.Agent;
 
 	/**
 	 * Get https non-proxy agent
 	 */
 	private https: https.Agent;
 
+	/**
+	 * Get http proxy or non-proxy agent
+	 */
+	public httpAgent: http.Agent;
+
 	/**
 	 * Get https proxy or non-proxy agent
 	 */
@@ -137,20 +56,34 @@ export class HttpRequestService {
 			lookup: false,	// nativeのdns.lookupにfallbackしない
 		});
 
-		const agentOption = {
+		this.http = new http.Agent({
 			keepAlive: true,
 			keepAliveMsecs: 30 * 1000,
 			lookup: cache.lookup as unknown as net.LookupFunction,
 			localAddress: config.outgoingAddress,
-			minVersion: 'TLSv1.2' as const,
+		});
-		};
 
-		this.httpsNative = new https.Agent(agentOption);
+		this.https = new https.Agent({
-
+			keepAlive: true,
-		this.https = new HttpsRequestServiceAgent(config, agentOption);
+			keepAliveMsecs: 30 * 1000,
+			lookup: cache.lookup as unknown as net.LookupFunction,
+			localAddress: config.outgoingAddress,
+		});
 
 		const maxSockets = Math.max(256, config.deliverJobConcurrency ?? 128);
 
+		this.httpAgent = config.proxy
+			? new HttpProxyAgent({
+				keepAlive: true,
+				keepAliveMsecs: 30 * 1000,
+				maxSockets,
+				maxFreeSockets: 256,
+				scheduling: 'lifo',
+				proxy: config.proxy,
+				localAddress: config.outgoingAddress,
+			})
+			: this.http;
+
 		this.httpsAgent = config.proxy
 			? new HttpsProxyAgent({
 				keepAlive: true,
@@ -170,23 +103,16 @@ export class HttpRequestService {
 	 * @param bypassProxy Allways bypass proxy
 	 */
 	@bindThis
-	public getAgentByUrl(url: URL, bypassProxy = false): https.Agent {
+	public getAgentByUrl(url: URL, bypassProxy = false): http.Agent | https.Agent {
-		if (url.protocol && url.protocol !== 'https:') {
-			throw new Error('Invalid protocol');
-		}
-		url.protocol = 'https:';
-		if (url.port && url.port !== '443') {
-			throw new Error('Invalid port');
-		}
 		if (bypassProxy || (this.config.proxyBypassHosts ?? []).includes(url.hostname)) {
-			return this.https;
+			return url.protocol === 'http:' ? this.http : this.https;
 		} else {
-			return this.httpsAgent;
+			return url.protocol === 'http:' ? this.httpAgent : this.httpsAgent;
 		}
 	}
 
 	@bindThis
-	public async getActivityJson(url: string, isLocalAddressAllowed = false): Promise<IObject> {
+	public async getActivityJson(url: string): Promise<IObject> {
 		const res = await this.send(url, {
 			method: 'GET',
 			headers: {
@@ -194,22 +120,16 @@ export class HttpRequestService {
 			},
 			timeout: 5000,
 			size: 1024 * 256,
-			isLocalAddressAllowed: isLocalAddressAllowed,
 		}, {
 			throwErrorWhenResponseNotOk: true,
 			validators: [validateContentTypeSetAsActivityPub],
 		});
 
-		const finalUrl = res.url; // redirects may have been involved
+		return await res.json() as IObject;
-		const activity = await res.json() as IObject;
-
-		assertActivityMatchesUrls(activity, [finalUrl]);
-
-		return activity;
 	}
 
 	@bindThis
-	public async getJson<T = unknown>(url: string, accept = 'application/json, */*', headers?: Record<string, string>, isLocalAddressAllowed = false): Promise<T> {
+	public async getJson<T = unknown>(url: string, accept = 'application/json, */*', headers?: Record<string, string>): Promise<T> {
 		const res = await this.send(url, {
 			method: 'GET',
 			headers: Object.assign({
@@ -217,21 +137,19 @@ export class HttpRequestService {
 			}, headers ?? {}),
 			timeout: 5000,
 			size: 1024 * 256,
-			isLocalAddressAllowed: isLocalAddressAllowed,
 		});
 
 		return await res.json() as T;
 	}
 
 	@bindThis
-	public async getHtml(url: string, accept = 'text/html, */*', headers?: Record<string, string>, isLocalAddressAllowed = false): Promise<string> {
+	public async getHtml(url: string, accept = 'text/html, */*', headers?: Record<string, string>): Promise<string> {
 		const res = await this.send(url, {
 			method: 'GET',
 			headers: Object.assign({
 				Accept: accept,
 			}, headers ?? {}),
 			timeout: 5000,
-			isLocalAddressAllowed: isLocalAddressAllowed,
 		});
 
 		return await res.text();
@@ -246,7 +164,6 @@ export class HttpRequestService {
 			headers?: Record<string, string>,
 			timeout?: number,
 			size?: number,
-			isLocalAddressAllowed?: boolean,
 		} = {},
 		extra: HttpRequestSendOptions = {
 			throwErrorWhenResponseNotOk: true,
@@ -260,16 +177,6 @@ export class HttpRequestService {
 			controller.abort();
 		}, timeout);
 
-		const urlParsed = new URL(url);
-
-		if (urlParsed.protocol !== 'https:') {
-			throw new Error('Invalid protocol');
-		}
-
-		if (urlParsed.port && urlParsed.port !== '443') {
-			throw new Error('Invalid port');
-		}
-
 		const res = await fetch(url, {
 			method: args.method ?? 'GET',
 			headers: {
@@ -278,7 +185,7 @@ export class HttpRequestService {
 			},
 			body: args.body,
 			size: args.size ?? 10 * 1024 * 1024,
-			agent: (url) => this.getAgentByUrl(url, false),
+			agent: (url) => this.getAgentByUrl(url),
 			signal: controller.signal,
 		});
 

packages/backend/src/core/ImageProcessingService.ts

@@ -46,9 +46,7 @@ import { bindThis } from '@/decorators.js';
 import { Readable } from 'node:stream';
 
 @Injectable()
-// Prevent accidental import by upstream merge
+export class ImageProcessingService {
-// eslint-disable-next-line
-export class __YUME_PRIVATE_ImageProcessingService {
 	constructor(
 	) {
 	}

packages/backend/src/core/NoteCreateService.ts

@@ -7,7 +7,6 @@ import { setImmediate } from 'node:timers/promises';
 import * as mfm from 'mfm-js';
 import { In, DataSource, IsNull, LessThan } from 'typeorm';
 import * as Redis from 'ioredis';
-import * as Bull from 'bullmq';
 import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
 import { extractMentions } from '@/misc/extract-mentions.js';
 import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mfm.js';
@@ -57,7 +56,6 @@ import { isReply } from '@/misc/is-reply.js';
 import { trackPromise } from '@/misc/promise-tracker.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { CollapsedQueue } from '@/misc/collapsed-queue.js';
-import { CacheService } from '@/core/CacheService.js';
 
 type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
 
@@ -219,7 +217,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 		private instanceChart: InstanceChart,
 		private utilityService: UtilityService,
 		private userBlockingService: UserBlockingService,
-		private cacheService: CacheService,
 	) {
 		this.updateNotesCountQueue = new CollapsedQueue(process.env.NODE_ENV !== 'test' ? 60 * 1000 * 5 : 0, this.collapseNotesCount, this.performUpdateNotesCount);
 	}
@@ -294,7 +291,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 				case 'followers':
 					// 他人のfollowers noteはreject
 					if (data.renote.userId !== user.id) {
-						throw new Bull.UnrecoverableError('Renote target is not public or home');
+						throw new Error('Renote target is not public or home');
 					}
 
 					// Renote対象がfollowersならfollowersにする
@@ -302,7 +299,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 					break;
 				case 'specified':
 					// specified / direct noteはreject
-					throw new Bull.UnrecoverableError('Renote target is not public or home');
+					throw new Error('Renote target is not public or home');
 			}
 		}
 
@@ -546,21 +543,13 @@ export class NoteCreateService implements OnApplicationShutdown {
 			this.followingsRepository.findBy({
 				followeeId: user.id,
 				notify: 'normal',
-			}).then(async followings => {
+			}).then(followings => {
 				if (note.visibility !== 'specified') {
-					const isPureRenote = this.isRenote(data) && !this.isQuote(data) ? true : false;
 					for (const following of followings) {
 						// TODO: ワードミュート考慮
-						let isRenoteMuted = false;
+						this.notificationService.createNotification(following.followerId, 'note', {
-						if (isPureRenote) {
+							noteId: note.id,
-							const userIdsWhoMeMutingRenotes = await this.cacheService.renoteMutingsCache.fetch(following.followerId);
+						}, user.id);
-							isRenoteMuted = userIdsWhoMeMutingRenotes.has(user.id);
-						}
-						if (!isRenoteMuted) {
-							this.notificationService.createNotification(following.followerId, 'note', {
-								noteId: note.id,
-							}, user.id);
-						}
 					}
 				}
 			});

packages/backend/src/core/NotificationService.ts

@@ -21,13 +21,6 @@ import type { Config } from '@/config.js';
 import { UserListService } from '@/core/UserListService.js';
 import type { FilterUnionByProperty } from '@/types.js';
 import { trackPromise } from '@/misc/promise-tracker.js';
-import { metricCounter } from '@/server/api/MetricsService.js';
-
-const mNotificationsCreated = metricCounter({
-	name: 'misskey_notifications_created',
-	help: 'Notifications created',
-	labelNames: ['event_type'],
-});
 
 @Injectable()
 export class NotificationService implements OnApplicationShutdown {
@@ -172,8 +165,6 @@ export class NotificationService implements OnApplicationShutdown {
 
 		if (packed == null) return null;
 
-		mNotificationsCreated?.inc({ event_type: notification.type });
-
 		// Publish notification event
 		this.globalEventService.publishMainStream(notifieeId, 'notification', packed);
 

packages/backend/src/core/PushNotificationService.ts

@@ -13,19 +13,6 @@ import { getNoteSummary } from '@/misc/get-note-summary.js';
 import type { MiMeta, MiSwSubscription, SwSubscriptionsRepository } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
 import { RedisKVCache } from '@/misc/cache.js';
-import { metricCounter } from '@/server/api/MetricsService.js';
-
-const mWebPushCreated = metricCounter({
-	name: 'misskey_webpush_created',
-	help: 'WebPush event',
-	labelNames: ['event_type'],
-});
-
-const mWebPushError = metricCounter({
-	name: 'misskey_webpush_error',
-	help: 'WebPush error',
-	labelNames: ['event_type', 'status'],
-});
 
 // Defined also packages/sw/types.ts#L13
 type PushNotificationsTypes = {
@@ -108,8 +95,6 @@ export class PushNotificationService implements OnApplicationShutdown {
 				},
 			};
 
-			mWebPushCreated?.inc({ event_type: type });
-
 			push.sendNotification(pushSubscription, JSON.stringify({
 				type,
 				body: (type === 'notification' || type === 'unreadAntennaNote') ? truncateBody(type, body) : body,
@@ -131,8 +116,6 @@ export class PushNotificationService implements OnApplicationShutdown {
 					}).then(() => {
 						this.refreshCache(userId);
 					});
-				} else {
-					mWebPushError?.inc({ event_type: type, status: err.statusCode || 'unknown' });
 				}
 			});
 		}

packages/backend/src/core/QueueModule.ts

@@ -18,7 +18,6 @@ import {
 	SystemWebhookDeliverJobData,
 } from '../queue/types.js';
 import type { Provider } from '@nestjs/common';
-import { mActiveJobs, mDelayedJobs, mFailedJobs, mJobBlockedCounter, mWaitingJobs } from '@/queue/metrics.js';
 
 export type SystemQueue = Bull.Queue<Record<string, unknown>>;
 export type EndedPollNotificationQueue = Bull.Queue<EndedPollNotificationJobData>;
@@ -30,74 +29,57 @@ export type ObjectStorageQueue = Bull.Queue;
 export type UserWebhookDeliverQueue = Bull.Queue<UserWebhookDeliverJobData>;
 export type SystemWebhookDeliverQueue = Bull.Queue<SystemWebhookDeliverJobData>;
 
-function withMetrics<T>(queue: Bull.Queue<T>): Bull.Queue<T> {
-	if (process.env.NODE_ENV !== 'test') {
-		setInterval(async () => {
-			mActiveJobs?.set({ queue: queue.name }, await queue.getActiveCount());
-			mDelayedJobs?.set({ queue: queue.name }, await queue.getDelayedCount());
-			mWaitingJobs?.set({ queue: queue.name }, await queue.getWaitingCount());
-			mFailedJobs?.set({ queue: queue.name }, await queue.getFailedCount());
-		}, 2000);
-
-		queue.on('waiting', () => {
-			mJobBlockedCounter?.inc({ queue: queue.name });
-		});
-	}
-	
-	return queue;
-}
-
 const $system: Provider = {
 	provide: 'queue:system',
-	useFactory: (config: Config) => withMetrics(new Bull.Queue(QUEUE.SYSTEM, baseQueueOptions(config, QUEUE.SYSTEM))),
+	useFactory: (config: Config) => new Bull.Queue(QUEUE.SYSTEM, baseQueueOptions(config, QUEUE.SYSTEM)),
 	inject: [DI.config],
 };
 
 const $endedPollNotification: Provider = {
 	provide: 'queue:endedPollNotification',
-	useFactory: (config: Config) => withMetrics(new Bull.Queue(QUEUE.ENDED_POLL_NOTIFICATION, baseQueueOptions(config, QUEUE.ENDED_POLL_NOTIFICATION))),
+	useFactory: (config: Config) => new Bull.Queue(QUEUE.ENDED_POLL_NOTIFICATION, baseQueueOptions(config, QUEUE.ENDED_POLL_NOTIFICATION)),
 	inject: [DI.config],
 };
 
 const $deliver: Provider = {
 	provide: 'queue:deliver',
-	useFactory: (config: Config) => withMetrics(new Bull.Queue(QUEUE.DELIVER, baseQueueOptions(config, QUEUE.DELIVER))),
+	useFactory: (config: Config) => new Bull.Queue(QUEUE.DELIVER, baseQueueOptions(config, QUEUE.DELIVER)),
 	inject: [DI.config],
 };
 
 const $inbox: Provider = {
 	provide: 'queue:inbox',
-	useFactory: (config: Config) => withMetrics(new Bull.Queue(QUEUE.INBOX, baseQueueOptions(config, QUEUE.INBOX))),
+	useFactory: (config: Config) => new Bull.Queue(QUEUE.INBOX, baseQueueOptions(config, QUEUE.INBOX)),
 	inject: [DI.config],
 };
 
 const $db: Provider = {
 	provide: 'queue:db',
-	useFactory: (config: Config) => withMetrics(new Bull.Queue(QUEUE.DB, baseQueueOptions(config, QUEUE.DB))),
+	useFactory: (config: Config) => new Bull.Queue(QUEUE.DB, baseQueueOptions(config, QUEUE.DB)),
 	inject: [DI.config],
 };
 
 const $relationship: Provider = {
 	provide: 'queue:relationship',
-	useFactory: (config: Config) => withMetrics(new Bull.Queue(QUEUE.RELATIONSHIP, baseQueueOptions(config, QUEUE.RELATIONSHIP))),
+	useFactory: (config: Config) => new Bull.Queue(QUEUE.RELATIONSHIP, baseQueueOptions(config, QUEUE.RELATIONSHIP)),
 	inject: [DI.config],
 };
 
 const $objectStorage: Provider = {
 	provide: 'queue:objectStorage',
-	useFactory: (config: Config) => withMetrics(new Bull.Queue(QUEUE.OBJECT_STORAGE, baseQueueOptions(config, QUEUE.OBJECT_STORAGE))),
+	useFactory: (config: Config) => new Bull.Queue(QUEUE.OBJECT_STORAGE, baseQueueOptions(config, QUEUE.OBJECT_STORAGE)),
 	inject: [DI.config],
 };
 
 const $userWebhookDeliver: Provider = {
 	provide: 'queue:userWebhookDeliver',
-	useFactory: (config: Config) => withMetrics(new Bull.Queue(QUEUE.USER_WEBHOOK_DELIVER, baseQueueOptions(config, QUEUE.USER_WEBHOOK_DELIVER))),
+	useFactory: (config: Config) => new Bull.Queue(QUEUE.USER_WEBHOOK_DELIVER, baseQueueOptions(config, QUEUE.USER_WEBHOOK_DELIVER)),
 	inject: [DI.config],
 };
 
 const $systemWebhookDeliver: Provider = {
 	provide: 'queue:systemWebhookDeliver',
-	useFactory: (config: Config) => withMetrics(new Bull.Queue(QUEUE.SYSTEM_WEBHOOK_DELIVER, baseQueueOptions(config, QUEUE.SYSTEM_WEBHOOK_DELIVER))),
+	useFactory: (config: Config) => new Bull.Queue(QUEUE.SYSTEM_WEBHOOK_DELIVER, baseQueueOptions(config, QUEUE.SYSTEM_WEBHOOK_DELIVER)),
 	inject: [DI.config],
 };
 

packages/backend/src/core/QueueService.ts

@@ -7,15 +7,13 @@ import { randomUUID } from 'node:crypto';
 import { Inject, Injectable } from '@nestjs/common';
 import type { IActivity } from '@/core/activitypub/type.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
-import type { MiWebhook, WebhookEventTypes } from '@/models/Webhook.js';
+import type { MiWebhook, webhookEventTypes } from '@/models/Webhook.js';
 import type { MiSystemWebhook, SystemWebhookEventType } from '@/models/SystemWebhook.js';
 import type { Config } from '@/config.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import type { Antenna } from '@/server/api/endpoints/i/import-antennas.js';
 import { ApRequestCreator } from '@/core/activitypub/ApRequestService.js';
-import { type SystemWebhookPayload } from '@/core/SystemWebhookService.js';
-import { type UserWebhookPayload } from './UserWebhookService.js';
 import type {
 	DbJobData,
 	DeliverJobData,
@@ -32,11 +30,12 @@ import type {
 	ObjectStorageQueue,
 	RelationshipQueue,
 	SystemQueue,
-	SystemWebhookDeliverQueue,
 	UserWebhookDeliverQueue,
+	SystemWebhookDeliverQueue,
 } from './QueueModule.js';
 import type httpSignature from '@peertube/http-signature';
 import type * as Bull from 'bullmq';
+import type { Packed } from '@/misc/json-schema.js';
 
 @Injectable()
 export class QueueService {
@@ -470,10 +469,10 @@ export class QueueService {
 	 * @see UserWebhookDeliverProcessorService
 	 */
 	@bindThis
-	public userWebhookDeliver<T extends WebhookEventTypes>(
+	public userWebhookDeliver(
 		webhook: MiWebhook,
-		type: T,
+		type: typeof webhookEventTypes[number],
-		content: UserWebhookPayload<T>,
+		content: Packed<'UserWebhookBody'>,
 		opts?: { attempts?: number },
 	) {
 		const data: UserWebhookDeliverJobData = {
@@ -502,10 +501,10 @@ export class QueueService {
 	 * @see SystemWebhookDeliverProcessorService
 	 */
 	@bindThis
-	public systemWebhookDeliver<T extends SystemWebhookEventType>(
+	public systemWebhookDeliver(
 		webhook: MiSystemWebhook,
-		type: T,
+		type: SystemWebhookEventType,
-		content: SystemWebhookPayload<T>,
+		content: unknown,
 		opts?: { attempts?: number },
 	) {
 		const data: SystemWebhookDeliverJobData = {

packages/backend/src/core/ReactionService.ts

@@ -30,7 +30,7 @@ import { trackPromise } from '@/misc/promise-tracker.js';
 import { isQuote, isRenote } from '@/misc/is-renote.js';
 import { ReactionsBufferingService } from '@/core/ReactionsBufferingService.js';
 import { PER_NOTE_REACTION_USER_PAIR_CACHE_MAX } from '@/const.js';
-import { UserWebhookPayload, UserWebhookService } from './UserWebhookService.js';
+import { UserWebhookService } from './UserWebhookService.js';
 import { QueueService } from './QueueService.js';
 import { Packed } from '@/misc/json-schema.js';
 
@@ -273,7 +273,7 @@ export class ReactionService {
 				const noteObj = await this.noteEntityService.pack(note, null, { skipHide: true, withReactionAndUserPairCache: true });
 				const userObj = await this.userEntityService.pack(user.id, null, { schema: 'UserLite' });
 
-				const payload: UserWebhookPayload<'reaction'> = {
+				const payload: Packed<'UserWebhookReactionBody'> = {
 					note: noteObj,
 					reaction: {
 						id: record.id,

packages/backend/src/core/RemoteUserResolveService.ts

@@ -18,7 +18,6 @@ import { RemoteLoggerService } from '@/core/RemoteLoggerService.js';
 import { ApDbResolverService } from '@/core/activitypub/ApDbResolverService.js';
 import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
 import { bindThis } from '@/decorators.js';
-import { ApResolverService } from './activitypub/ApResolverService.js';
 
 @Injectable()
 export class RemoteUserResolveService {
@@ -36,7 +35,6 @@ export class RemoteUserResolveService {
 		private remoteLoggerService: RemoteLoggerService,
 		private apDbResolverService: ApDbResolverService,
 		private apPersonService: ApPersonService,
-		private apResolverService: ApResolverService,
 	) {
 		this.logger = this.remoteLoggerService.logger.createSubLogger('resolve-user');
 	}
@@ -93,7 +91,7 @@ export class RemoteUserResolveService {
 			}
 
 			this.logger.succ(`return new remote user: ${chalk.magenta(acctLower)}`);
-			return await this.apPersonService.createPerson(self.href, this.apResolverService.createResolver());
+			return await this.apPersonService.createPerson(self.href);
 		}
 
 		// ユーザー情報が古い場合は、WebFingerからやりなおして返す

packages/backend/src/core/RoleService.ts

@@ -488,7 +488,6 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 		return ids.length > 0
 			? await this.usersRepository.findBy({
 				id: In(ids),
-				isDeleted: false,
 			})
 			: [];
 	}

packages/backend/src/core/SearchService.ts

@@ -4,7 +4,7 @@
  */
 
 import { Inject, Injectable } from '@nestjs/common';
-import { Brackets, In } from 'typeorm';
+import { In } from 'typeorm';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { bindThis } from '@/decorators.js';
@@ -215,10 +215,7 @@ export class SearchService {
 			}
 
 			query
-				.andWhere(new Brackets((qb => {
+				.andWhere('note.text &@~ :q', { q: sqlLikeEscape(q) })
-					qb.where('note.text &@~ :q', { q: sqlLikeEscape(q) })
-						.orWhere('note.cw &@~ :q', { q: sqlLikeEscape(q) });
-				})))
 				.innerJoinAndSelect('note.user', 'user')
 				.leftJoinAndSelect('note.reply', 'reply')
 				.leftJoinAndSelect('note.renote', 'renote')

packages/backend/src/core/SystemWebhookService.ts

@@ -15,39 +15,8 @@ import { QueueService } from '@/core/QueueService.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import Logger from '@/logger.js';
-import { Packed } from '@/misc/json-schema.js';
-import { AbuseReportResolveType } from '@/models/AbuseUserReport.js';
-import { ModeratorInactivityRemainingTime } from '@/queue/processors/CheckModeratorsActivityProcessorService.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
-export type AbuseReportPayload = {
-	id: string;
-	targetUserId: string;
-	targetUser: Packed<'UserLite'> | null;
-	targetUserHost: string | null;
-	reporterId: string;
-	reporter: Packed<'UserLite'> | null;
-	reporterHost: string | null;
-	assigneeId: string | null;
-	assignee: Packed<'UserLite'> | null;
-	resolved: boolean;
-	forwarded: boolean;
-	comment: string;
-	moderationNote: string;
-	resolvedAs: AbuseReportResolveType | null;
-};
-
-export type InactiveModeratorsWarningPayload = {
-	remainingTime: ModeratorInactivityRemainingTime;
-};
-
-export type SystemWebhookPayload<T extends SystemWebhookEventType> =
-	T extends 'abuseReport' | 'abuseReportResolved' ? AbuseReportPayload :
-	T extends 'userCreated' ? Packed<'UserLite'> :
-	T extends 'inactiveModeratorsWarning' ? InactiveModeratorsWarningPayload :
-	T extends 'inactiveModeratorsInvitationOnlyChanged' ? Record<string, never> :
-		never;
-
 @Injectable()
 export class SystemWebhookService implements OnApplicationShutdown {
 	private logger: Logger;
@@ -199,7 +168,7 @@ export class SystemWebhookService implements OnApplicationShutdown {
 	public async enqueueSystemWebhook<T extends SystemWebhookEventType>(
 		webhook: MiSystemWebhook | MiSystemWebhook['id'],
 		type: T,
-		content: SystemWebhookPayload<T>,
+		content: unknown,
 	) {
 		const webhookEntity = typeof webhook === 'string'
 			? (await this.fetchActiveSystemWebhooks()).find(a => a.id === webhook)

packages/backend/src/core/UserWebhookService.ts

@@ -6,31 +6,11 @@
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
 import { type WebhooksRepository } from '@/models/_.js';
-import { MiWebhook, WebhookEventTypes } from '@/models/Webhook.js';
+import { MiWebhook } from '@/models/Webhook.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import { GlobalEvents } from '@/core/GlobalEventService.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
-import type { Packed } from '@/misc/json-schema.js';
-
-export type UserWebhookPayload<T extends WebhookEventTypes> =
-	T extends 'reaction' ? {
-		reaction: {
-			id: string,
-			user: Packed<'UserLite'>,
-			reaction: string,
-		}
-		note: Packed<'Note'>,
-}:
-	T extends 'note' | 'reply' | 'renote' |'mention' ? {
-		note: Packed<'Note'>,
-	} :
-	T extends 'follow' | 'unfollow' ? {
-		user: Packed<'UserDetailedNotMe'>,
-	} :
-	T extends 'followed' ? {
-		user: Packed<'UserLite'>,
-	} : never;
 
 @Injectable()
 export class UserWebhookService implements OnApplicationShutdown {

packages/backend/src/core/VideoProcessingService.ts

@@ -7,21 +7,19 @@ import { Inject, Injectable } from '@nestjs/common';
 import FFmpeg from 'fluent-ffmpeg';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
-import { __YUME_PRIVATE_ImageProcessingService } from '@/core/ImageProcessingService.js';
+import { ImageProcessingService } from '@/core/ImageProcessingService.js';
 import type { IImage } from '@/core/ImageProcessingService.js';
 import { createTempDir } from '@/misc/create-temp.js';
 import { bindThis } from '@/decorators.js';
 import { appendQuery, query } from '@/misc/prelude/url.js';
 
 @Injectable()
-// Prevent accidental import by upstream merge
+export class VideoProcessingService {
-// eslint-disable-next-line
-export class __YUME_PRIVATE_VideoProcessingService {
 	constructor(
 		@Inject(DI.config)
 		private config: Config,
 
-		private imageProcessingService: __YUME_PRIVATE_ImageProcessingService,
+		private imageProcessingService: ImageProcessingService,
 	) {
 	}
 

packages/backend/src/core/WebAuthnService.ts

@@ -83,11 +83,7 @@ export class WebAuthnService {
 	}
 
 	@bindThis
-	public async verifyRegistration(
+	public async verifyRegistration(userId: MiUser['id'], response: RegistrationResponseJSON): Promise<{
-		userId: MiUser['id'], 
-		response: RegistrationResponseJSON,
-		twoFactorOnly: boolean = false,
-	): Promise<{
 		credentialID: string;
 		credentialPublicKey: Uint8Array;
 		attestationObject: Uint8Array;
@@ -115,7 +111,7 @@ export class WebAuthnService {
 				expectedChallenge: challenge,
 				expectedOrigin: relyingParty.origin,
 				expectedRPID: relyingParty.rpId,
-				requireUserVerification: !twoFactorOnly,
+				requireUserVerification: true,
 			});
 		} catch (error) {
 			console.error(error);
@@ -249,11 +245,7 @@ export class WebAuthnService {
 	}
 
 	@bindThis
-	public async verifyAuthentication(
+	public async verifyAuthentication(userId: MiUser['id'], response: AuthenticationResponseJSON): Promise<boolean> {
-		userId: MiUser['id'], 
-		response: AuthenticationResponseJSON,
-		twoFactorOnly: boolean = false,
-	): Promise<boolean> {
 		const challenge = await this.redisClient.get(`webauthn:challenge:${userId}`);
 
 		if (!challenge) {
@@ -310,7 +302,7 @@ export class WebAuthnService {
 					counter: key.counter,
 					transports: key.transports ? key.transports as AuthenticatorTransportFuture[] : undefined,
 				},
-				requireUserVerification: !twoFactorOnly,
+				requireUserVerification: true,
 			});
 		} catch (error) {
 			console.error(error);

packages/backend/src/core/WebhookTestService.ts

@@ -7,16 +7,22 @@ import { Injectable } from '@nestjs/common';
 import { MiAbuseUserReport, MiNote, MiUser, MiWebhook } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
 import { MiSystemWebhook, type SystemWebhookEventType } from '@/models/SystemWebhook.js';
-import { AbuseReportPayload, SystemWebhookPayload, SystemWebhookService } from '@/core/SystemWebhookService.js';
+import { SystemWebhookService } from '@/core/SystemWebhookService.js';
 import { Packed } from '@/misc/json-schema.js';
 import { type WebhookEventTypes } from '@/models/Webhook.js';
-import { type UserWebhookPayload, UserWebhookService } from '@/core/UserWebhookService.js';
+import { UserWebhookService } from '@/core/UserWebhookService.js';
 import { QueueService } from '@/core/QueueService.js';
 import { ModeratorInactivityRemainingTime } from '@/queue/processors/CheckModeratorsActivityProcessorService.js';
 
 const oneDayMillis = 24 * 60 * 60 * 1000;
 
-function generateAbuseReport(override?: Partial<MiAbuseUserReport>): AbuseReportPayload {
+type AbuseUserReportDto = Omit<MiAbuseUserReport, 'targetUser' | 'reporter' | 'assignee'> & {
+	targetUser: Packed<'UserLite'> | null,
+	reporter: Packed<'UserLite'> | null,
+	assignee: Packed<'UserLite'> | null,
+};
+
+function generateAbuseReport(override?: Partial<MiAbuseUserReport>): AbuseUserReportDto {
 	const result: MiAbuseUserReport = {
 		id: 'dummy-abuse-report1',
 		targetUserId: 'dummy-target-user',
@@ -253,7 +259,7 @@ function toPackedUserDetailedNotMe(user: MiUser, override?: Packed<'UserDetailed
 	};
 }
 
-function generateDummyReactionPayload(note_override?: Partial<MiNote>): UserWebhookPayload<'reaction'> {
+function generateDummyReactionPayload(note_override?: Partial<MiNote>): Packed<'UserWebhookReactionBody'> {
 	const dummyNote = generateDummyNote(note_override);
 	const dummyReaction = {
 		id: 'dummy-reaction-1',
@@ -318,10 +324,10 @@ export class WebhookTestService {
 	 * - 送信対象イベント（on）に関する設定
 	 */
 	@bindThis
-	public async testUserWebhook<T extends WebhookEventTypes>(
+	public async testUserWebhook(
 		params: {
 			webhookId: MiWebhook['id'],
-			type: T,
+			type: WebhookEventTypes,
 			override?: Partial<Omit<MiWebhook, 'id'>>,
 		},
 		sender: MiUser | null,
@@ -333,7 +339,11 @@ export class WebhookTestService {
 		}
 
 		const webhook = webhooks[0];
-		const send = <U extends WebhookEventTypes>(type: U, contents: UserWebhookPayload<U>) => {
+		const send = (contents:
+			   Packed<'UserWebhookNoteBody'> |
+				 Packed<'UserWebhookUserBody'> |
+				 Packed<'UserWebhookReactionBody'>,
+		) => {
 			const merged = {
 				...webhook,
 				...params.override,
@@ -341,7 +351,7 @@ export class WebhookTestService {
 
 			// テスト目的なのでUserWebhookServiceの機能を経由せず直接キューに追加する（チェック処理などをスキップする意図）.
 			// また、Jobの試行回数も1回だけ.
-			this.queueService.userWebhookDeliver(merged, type, contents, { attempts: 1 });
+			this.queueService.userWebhookDeliver(merged, params.type, contents, { attempts: 1 });
 		};
 
 		const dummyNote1 = generateDummyNote({
@@ -373,36 +383,37 @@ export class WebhookTestService {
 
 		switch (params.type) {
 			case 'note': {
-				send('note', { note: toPackedNote(dummyNote1) });
+				send(wrapBodyEnum('note', toPackedNote(dummyNote1)));
 				break;
 			}
 			case 'reply': {
-				send('reply', { note: toPackedNote(dummyReply1) });
+				send(wrapBodyEnum('note', toPackedNote(dummyReply1)));
 				break;
 			}
 			case 'renote': {
-				send('renote', { note: toPackedNote(dummyRenote1) });
+				send(wrapBodyEnum('note', toPackedNote(dummyRenote1)));
 				break;
 			}
 			case 'mention': {
-				send('mention', { note: toPackedNote(dummyMention1) });
+				send(wrapBodyEnum('note', toPackedNote(dummyMention1)));
 				break;
 			}
 			case 'follow': {
-				send('follow', { user: toPackedUserDetailedNotMe(dummyUser1) });
+				send(wrapBodyEnum('user', toPackedUserDetailedNotMe(dummyUser1)));
 				break;
 			}
 			case 'followed': {
-				send('followed', { user: toPackedUserLite(dummyUser2) });
+				send(wrapBodyEnum('user', toPackedUserDetailedNotMe(dummyUser2)));
 				break;
 			}
 			case 'unfollow': {
-				send('unfollow', { user: toPackedUserDetailedNotMe(dummyUser3) });
+				send(wrapBodyEnum('user', toPackedUserDetailedNotMe(dummyUser3)));
+				break;
+			}
+			case 'reaction': {
+				send(generateDummyReactionPayload());
 				break;
 			}
-			// まだ実装されていない (#9485)
-			case 'reaction':
-				return;
 			default: {
 				// eslint-disable-next-line @typescript-eslint/no-unused-vars
 				const _exhaustiveAssertion: never = params.type;
@@ -420,10 +431,10 @@ export class WebhookTestService {
 	 * - 送信対象イベント（on）に関する設定
 	 */
 	@bindThis
-	public async testSystemWebhook<T extends SystemWebhookEventType>(
+	public async testSystemWebhook(
 		params: {
 			webhookId: MiSystemWebhook['id'],
-			type: T,
+			type: SystemWebhookEventType,
 			override?: Partial<Omit<MiSystemWebhook, 'id'>>,
 		},
 	) {
@@ -433,7 +444,7 @@ export class WebhookTestService {
 		}
 
 		const webhook = webhooks[0];
-		const send = <U extends SystemWebhookEventType>(type: U, contents: SystemWebhookPayload<U>) => {
+		const send = (contents: unknown) => {
 			const merged = {
 				...webhook,
 				...params.override,
@@ -441,12 +452,12 @@ export class WebhookTestService {
 
 			// テスト目的なのでSystemWebhookServiceの機能を経由せず直接キューに追加する（チェック処理などをスキップする意図）.
 			// また、Jobの試行回数も1回だけ.
-			this.queueService.systemWebhookDeliver(merged, type, contents, { attempts: 1 });
+			this.queueService.systemWebhookDeliver(merged, params.type, contents, { attempts: 1 });
 		};
 
 		switch (params.type) {
 			case 'abuseReport': {
-				send('abuseReport', generateAbuseReport({
+				send(generateAbuseReport({
 					targetUserId: dummyUser1.id,
 					targetUser: dummyUser1,
 					reporterId: dummyUser2.id,
@@ -455,7 +466,7 @@ export class WebhookTestService {
 				break;
 			}
 			case 'abuseReportResolved': {
-				send('abuseReportResolved', generateAbuseReport({
+				send(generateAbuseReport({
 					targetUserId: dummyUser1.id,
 					targetUser: dummyUser1,
 					reporterId: dummyUser2.id,
@@ -467,7 +478,7 @@ export class WebhookTestService {
 				break;
 			}
 			case 'userCreated': {
-				send('userCreated', toPackedUserLite(dummyUser1));
+				send(toPackedUserLite(dummyUser1));
 				break;
 			}
 			case 'inactiveModeratorsWarning': {
@@ -477,20 +488,15 @@ export class WebhookTestService {
 					asHours: 24,
 				};
 
-				send('inactiveModeratorsWarning', {
+				send({
 					remainingTime: dummyTime,
 				});
 				break;
 			}
 			case 'inactiveModeratorsInvitationOnlyChanged': {
-				send('inactiveModeratorsInvitationOnlyChanged', {});
+				send({});
 				break;
 			}
-			default: {
-				// eslint-disable-next-line @typescript-eslint/no-unused-vars
-				const _exhaustiveAssertion: never = params.type;
-				return;
-			}
 		}
 	}
 }

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

@@ -16,7 +16,6 @@ import { MiLocalUser, MiRemoteUser } from '@/models/User.js';
 import { getApId } from './type.js';
 import { ApPersonService } from './models/ApPersonService.js';
 import type { IObject } from './type.js';
-import { toASCII } from 'node:punycode';
 
 export type UriParseResult = {
 	/** wether the URI was generated by us */
@@ -64,9 +63,7 @@ export class ApDbResolverService implements OnApplicationShutdown {
 		const separator = '/';
 
 		const uri = new URL(getApId(value));
-		if (toASCII(uri.host) !== toASCII(this.config.host)) {
+		if (uri.origin !== this.config.url) return { local: false, uri: uri.href };
-			return { local: false, uri: uri.href };
-		}
 
 		const [, type, id, ...rest] = uri.pathname.split(separator);
 		return {

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

@@ -5,7 +5,6 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { In } from 'typeorm';
-import * as prom from 'prom-client';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { UserFollowingService } from '@/core/UserFollowingService.js';
@@ -29,7 +28,7 @@ import { bindThis } from '@/decorators.js';
 import type { MiRemoteUser } from '@/models/User.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { AbuseReportService } from '@/core/AbuseReportService.js';
-import { getApHrefNullable, getApId, getApIds, getApType, isActor, isCollection, isCollectionOrOrderedCollection, isPost, isTombstone, validActor, validPost, yumeDowncastAccept, yumeDowncastAdd, yumeDowncastAnnounce, yumeDowncastBlock, yumeDowncastCreate, yumeDowncastDelete, yumeDowncastFlag, yumeDowncastFollow, yumeDowncastLike, yumeDowncastMove, yumeDowncastReject, yumeDowncastRemove, yumeDowncastUndo, yumeDowncastUpdate } from './type.js';
+import { getApHrefNullable, getApId, getApIds, getApType, isAccept, isActor, isAdd, isAnnounce, isBlock, isCollection, isCollectionOrOrderedCollection, isCreate, isDelete, isFlag, isFollow, isLike, isMove, isPost, isReject, isRemove, isTombstone, isUndo, isUpdate, validActor, validPost } from './type.js';
 import { ApNoteService } from './models/ApNoteService.js';
 import { ApLoggerService } from './ApLoggerService.js';
 import { ApDbResolverService } from './ApDbResolverService.js';
@@ -39,13 +38,6 @@ import { ApPersonService } from './models/ApPersonService.js';
 import { ApQuestionService } from './models/ApQuestionService.js';
 import type { Resolver } from './ApResolverService.js';
 import type { IAccept, IAdd, IAnnounce, IBlock, ICreate, IDelete, IFlag, IFollow, ILike, IObject, IReject, IRemove, IUndo, IUpdate, IMove, IPost } from './type.js';
-import { metricCounter } from '@/server/api/MetricsService.js';
-
-const mInboxReceived = metricCounter({
-	name: 'misskey_ap_inbox_received_total',
-	help: 'Total number of activities received by AP inbox',
-	labelNames: ['host', 'type'],
-});
 
 @Injectable()
 export class ApInboxService {
@@ -138,92 +130,37 @@ export class ApInboxService {
 	public async performOneActivity(actor: MiRemoteUser, activity: IObject): Promise<string | void> {
 		if (actor.isSuspended) return;
 
-		const create = yumeDowncastCreate(activity);
+		if (isCreate(activity)) {
-		if (create) {
+			return await this.create(actor, activity);
-			mInboxReceived?.inc({ host: actor.host, type: 'create' });
+		} else if (isDelete(activity)) {
-			return await this.create(actor, create);
+			return await this.delete(actor, activity);
+		} else if (isUpdate(activity)) {
+			return await this.update(actor, activity);
+		} else if (isFollow(activity)) {
+			return await this.follow(actor, activity);
+		} else if (isAccept(activity)) {
+			return await this.accept(actor, activity);
+		} else if (isReject(activity)) {
+			return await this.reject(actor, activity);
+		} else if (isAdd(activity)) {
+			return await this.add(actor, activity);
+		} else if (isRemove(activity)) {
+			return await this.remove(actor, activity);
+		} else if (isAnnounce(activity)) {
+			return await this.announce(actor, activity);
+		} else if (isLike(activity)) {
+			return await this.like(actor, activity);
+		} else if (isUndo(activity)) {
+			return await this.undo(actor, activity);
+		} else if (isBlock(activity)) {
+			return await this.block(actor, activity);
+		} else if (isFlag(activity)) {
+			return await this.flag(actor, activity);
+		} else if (isMove(activity)) {
+			return await this.move(actor, activity);
+		} else {
+			return `unrecognized activity type: ${activity.type}`;
 		}
-
-		const update = yumeDowncastUpdate(activity);
-		if (update) {
-			mInboxReceived?.inc({ host: actor.host, type: 'update' });
-			return await this.update(actor, update);
-		}
-
-		const del = yumeDowncastDelete(activity);
-		if (del) {
-			mInboxReceived?.inc({ host: actor.host, type: 'delete' });
-			return await this.delete(actor, del);
-		}
-
-		const follow = yumeDowncastFollow(activity);
-		if (follow) {
-			mInboxReceived?.inc({ host: actor.host, type: 'follow' });
-			return await this.follow(actor, follow);
-		}
-
-		const accept = yumeDowncastAccept(activity);
-		if (accept) {
-			mInboxReceived?.inc({ host: actor.host, type: 'accept' });
-			return await this.accept(actor, accept);
-		}
-
-		const reject = yumeDowncastReject(activity);
-		if (reject) {
-			mInboxReceived?.inc({ host: actor.host, type: 'reject' });
-			return await this.reject(actor, reject);
-		}
-
-		const add = yumeDowncastAdd(activity);
-		if (add) {
-			mInboxReceived?.inc({ host: actor.host, type: 'add' });
-			return await this.add(actor, add);
-		}
-
-		const remove = yumeDowncastRemove(activity);
-		if (remove) {
-			mInboxReceived?.inc({ host: actor.host, type: 'remove' });
-			return await this.remove(actor, remove);
-		}
-
-		const announce = yumeDowncastAnnounce(activity);
-		if (announce) {
-			mInboxReceived?.inc({ host: actor.host, type: 'announce' });
-			return await this.announce(actor, announce);
-		}
-
-		const like = yumeDowncastLike(activity);
-		if (like) {
-			mInboxReceived?.inc({ host: actor.host, type: 'like' });
-			return await this.like(actor, like);
-		}
-
-		const move = yumeDowncastMove(activity);
-		if (move) {
-			mInboxReceived?.inc({ host: actor.host, type: 'move' });
-			return await this.move(actor, move);
-		}
-
-		const undo = yumeDowncastUndo(activity);
-		if (undo) {
-			mInboxReceived?.inc({ host: actor.host, type: 'undo' });
-			return await this.undo(actor, undo);
-		}
-
-		const block = yumeDowncastBlock(activity);
-		if (block) {
-			mInboxReceived?.inc({ host: actor.host, type: 'block' });
-			return await this.block(actor, block);
-		}
-
-		const flag = yumeDowncastFlag(activity);
-		if (flag) {
-			mInboxReceived?.inc({ host: actor.host, type: 'flag' });
-			return await this.flag(actor, flag);
-		}
-
-		mInboxReceived?.inc({ host: actor.host, type: 'unknown' });
-		return `unrecognized activity type: ${activity.type}`;
 	}
 
 	@bindThis
@@ -274,8 +211,7 @@ export class ApInboxService {
 			throw err;
 		});
 
-		const follow = yumeDowncastFollow(object);
+		if (isFollow(object)) return await this.acceptFollow(actor, object);
-		if (follow) return await this.acceptFollow(actor, follow);
 
 		return `skip: Unknown Accept type: ${getApType(object)}`;
 	}
@@ -487,7 +423,7 @@ export class ApInboxService {
 			const exist = await this.apNoteService.fetchNote(note);
 			if (exist) return 'skip: note exists';
 
-			await this.apNoteService.createNote(note, actor, resolver, silent);
+			await this.apNoteService.createNote(note, resolver, silent);
 			return 'ok';
 		} catch (err) {
 			if (err instanceof StatusError && !err.isRetryable) {
@@ -533,9 +469,9 @@ export class ApInboxService {
 			formerType = 'Note';
 		}
 
-		if (validPost?.includes(formerType)) {
+		if (validPost.includes(formerType)) {
 			return await this.deleteNote(actor, uri);
-		} else if (validActor?.includes(formerType)) {
+		} else if (validActor.includes(formerType)) {
 			return await this.deleteActor(actor, uri);
 		} else {
 			return `Unknown type ${formerType}`;
@@ -550,12 +486,19 @@ export class ApInboxService {
 			return `skip: delete actor ${actor.uri} !== ${uri}`;
 		}
 
-		if (!(await this.usersRepository.update({ id: actor.id, isDeleted: false }, { isDeleted: true })).affected) {
+		const user = await this.usersRepository.findOneBy({ id: actor.id });
+		if (user == null) {
+			return 'skip: actor not found';
+		} else if (user.isDeleted) {
 			return 'skip: already deleted';
 		}
 
 		const job = await this.queueService.createDeleteAccountJob(actor);
 
+		await this.usersRepository.update(actor.id, {
+			isDeleted: true,
+		});
+
 		this.globalEventService.publishInternalEvent('remoteUserUpdated', { id: actor.id });
 
 		return `ok: queued ${job.name} ${job.id}`;
@@ -624,8 +567,7 @@ export class ApInboxService {
 			throw e;
 		});
 
-		const follow = yumeDowncastFollow(object);
+		if (isFollow(object)) return await this.rejectFollow(actor, object);
-		if (follow) return await this.rejectFollow(actor, follow);
 
 		return `skip: Unknown Reject type: ${getApType(object)}`;
 	}
@@ -692,20 +634,11 @@ export class ApInboxService {
 		});
 
 		// don't queue because the sender may attempt again when timeout
-		const follow = yumeDowncastFollow(object);
+		if (isFollow(object)) return await this.undoFollow(actor, object);
-		if (follow) return await this.undoFollow(actor, follow);
+		if (isBlock(object)) return await this.undoBlock(actor, object);
-
+		if (isLike(object)) return await this.undoLike(actor, object);
-		const block = yumeDowncastBlock(object);
+		if (isAnnounce(object)) return await this.undoAnnounce(actor, object);
-		if (block) return await this.undoBlock(actor, block);
+		if (isAccept(object)) return await this.undoAccept(actor, object);
-
-		const like = yumeDowncastLike(object);
-		if (like) return await this.undoLike(actor, like);
-
-		const announce = yumeDowncastAnnounce(object);
-		if (announce) return await this.undoAnnounce(actor, announce);
-
-		const accept = yumeDowncastAccept(object);
-		if (accept) return await this.undoAccept(actor, accept);
 
 		return `skip: unknown object type ${getApType(object)}`;
 	}
@@ -835,7 +768,7 @@ export class ApInboxService {
 			await this.apPersonService.updatePerson(actor.uri, resolver, object);
 			return 'ok: Person updated';
 		} else if (getApType(object) === 'Question') {
-			await this.apQuestionService.updateQuestion(object, actor, resolver).catch(err => console.error(err));
+			await this.apQuestionService.updateQuestion(object, resolver).catch(err => console.error(err));
 			return 'ok: Question updated';
 		} else {
 			return `skip: Unknown type: ${getApType(object)}`;

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

@@ -30,7 +30,7 @@ import { IdService } from '@/core/IdService.js';
 import { JsonLdService } from './JsonLdService.js';
 import { ApMfmService } from './ApMfmService.js';
 import { CONTEXT } from './misc/contexts.js';
-import { markOutgoing, type IAccept, type IActivity, type IAdd, type IAnnounce, type IApDocument, type IApEmoji, type IApHashtag, type IApImage, type IApMention, type IBlock, type ICreate, type IDelete, type IFlag, type IFollow, type IKey, type ILike, type IMove, type IObject, type IPost, type IQuestion, type IReject, type IRemove, type ITombstone, type IUndo, type IUpdate } from './type.js';
+import type { IAccept, IActivity, IAdd, IAnnounce, IApDocument, IApEmoji, IApHashtag, IApImage, IApMention, IBlock, ICreate, IDelete, IFlag, IFollow, IKey, ILike, IMove, IObject, IPost, IQuestion, IReject, IRemove, ITombstone, IUndo, IUpdate } from './type.js';
 
 @Injectable()
 export class ApRendererService {
@@ -66,21 +66,21 @@ export class ApRendererService {
 
 	@bindThis
 	public renderAccept(object: string | IObject, user: { id: MiUser['id']; host: null }): IAccept {
-		return markOutgoing({
+		return {
 			type: 'Accept',
 			actor: this.userEntityService.genLocalUserUri(user.id),
 			object,
-		}, undefined);
+		};
 	}
 
 	@bindThis
 	public renderAdd(user: MiLocalUser, target: string | IObject | undefined, object: string | IObject): IAdd {
-		return markOutgoing({
+		return {
 			type: 'Add',
 			actor: this.userEntityService.genLocalUserUri(user.id),
 			target,
 			object,
-		}, undefined);
+		};
 	}
 
 	@bindThis
@@ -103,7 +103,7 @@ export class ApRendererService {
 			throw new Error('renderAnnounce: cannot render non-public note');
 		}
 
-		return markOutgoing({
+		return {
 			id: `${this.config.url}/notes/${note.id}/activity`,
 			actor: this.userEntityService.genLocalUserUri(note.userId),
 			type: 'Announce',
@@ -111,7 +111,7 @@ export class ApRendererService {
 			to,
 			cc,
 			object,
-		}, undefined);
+		};
 	}
 
 	/**
@@ -125,23 +125,23 @@ export class ApRendererService {
 			throw new Error('renderBlock: missing blockee uri');
 		}
 
-		return markOutgoing({
+		return {
 			type: 'Block',
 			id: `${this.config.url}/blocks/${block.id}`,
 			actor: this.userEntityService.genLocalUserUri(block.blockerId),
 			object: block.blockee.uri,
-		}, undefined);
+		};
 	}
 
 	@bindThis
 	public renderCreate(object: IObject, note: MiNote): ICreate {
-		const activity: ICreate = markOutgoing({
+		const activity: ICreate = {
 			id: `${this.config.url}/notes/${note.id}/activity`,
 			actor: this.userEntityService.genLocalUserUri(note.userId),
 			type: 'Create',
 			published: this.idService.parse(note.id).date.toISOString(),
 			object,
-		}, undefined);
+		};
 
 		if (object.to) activity.to = object.to;
 		if (object.cc) activity.cc = object.cc;
@@ -151,28 +151,28 @@ export class ApRendererService {
 
 	@bindThis
 	public renderDelete(object: IObject | string, user: { id: MiUser['id']; host: null }): IDelete {
-		return markOutgoing({
+		return {
 			type: 'Delete',
 			actor: this.userEntityService.genLocalUserUri(user.id),
 			object,
 			published: new Date().toISOString(),
-		}, undefined);
+		};
 	}
 
 	@bindThis
 	public renderDocument(file: MiDriveFile): IApDocument {
-		return markOutgoing({
+		return {
 			type: 'Document',
 			mediaType: file.webpublicType ?? file.type,
 			url: this.driveFileEntityService.getPublicUrl(file),
 			name: file.comment,
 			sensitive: file.isSensitive,
-		}, undefined);
+		};
 	}
 
 	@bindThis
 	public renderEmoji(emoji: MiEmoji): IApEmoji {
-		return markOutgoing( {
+		return {
 			id: `${this.config.url}/emojis/${emoji.name}`,
 			type: 'Emoji',
 			name: `:${emoji.name}:`,
@@ -183,28 +183,28 @@ export class ApRendererService {
 				// || emoji.originalUrl してるのは後方互換性のため（publicUrlはstringなので??はだめ）
 				url: emoji.publicUrl || emoji.originalUrl,
 			},
-		}, undefined);
+		};
 	}
 
 	// to anonymise reporters, the reporting actor must be a system user
 	@bindThis
 	public renderFlag(user: MiLocalUser, object: IObject | string, content: string): IFlag {
-		return markOutgoing({
+		return {
 			type: 'Flag',
 			actor: this.userEntityService.genLocalUserUri(user.id),
 			content,
 			object,
-		}, undefined);
+		};
 	}
 
 	@bindThis
 	public renderFollowRelay(relay: MiRelay, relayActor: MiLocalUser): IFollow {
-		return markOutgoing({
+		return {
 			id: `${this.config.url}/activities/follow-relay/${relay.id}`,
 			type: 'Follow',
 			actor: this.userEntityService.genLocalUserUri(relayActor.id),
 			object: 'https://www.w3.org/ns/activitystreams#Public',
-		}, undefined);
+		};
 	}
 
 	/**
@@ -223,36 +223,36 @@ export class ApRendererService {
 		followee: MiPartialLocalUser | MiPartialRemoteUser,
 		requestId?: string,
 	): IFollow {
-		return markOutgoing({
+		return {
 			id: requestId ?? `${this.config.url}/follows/${follower.id}/${followee.id}`,
 			type: 'Follow',
 			actor: this.userEntityService.getUserUri(follower),
 			object: this.userEntityService.getUserUri(followee),
-		}, undefined);
+		};
 	}
 
 	@bindThis
 	public renderHashtag(tag: string): IApHashtag {
-		return markOutgoing({
+		return {
 			type: 'Hashtag',
 			href: `${this.config.url}/tags/${encodeURIComponent(tag)}`,
 			name: `#${tag}`,
-		}, undefined);
+		};
 	}
 
 	@bindThis
 	public renderImage(file: MiDriveFile): IApImage {
-		return markOutgoing({
+		return {
 			type: 'Image',
 			url: this.driveFileEntityService.getPublicUrl(file),
 			sensitive: file.isSensitive,
 			name: file.comment,
-		}, undefined);
+		};
 	}
 
 	@bindThis
 	public renderKey(user: MiLocalUser, key: MiUserKeypair, postfix?: string): IKey {
-		return markOutgoing({
+		return {
 			id: `${this.config.url}/users/${user.id}${postfix ?? '/publickey'}`,
 			type: 'Key',
 			owner: this.userEntityService.genLocalUserUri(user.id),
@@ -260,21 +260,21 @@ export class ApRendererService {
 				type: 'spki',
 				format: 'pem',
 			}),
-		}, undefined);
+		};
 	}
 
 	@bindThis
 	public async renderLike(noteReaction: MiNoteReaction, note: { uri: string | null }): Promise<ILike> {
 		const reaction = noteReaction.reaction;
 
-		const object: ILike = markOutgoing({
+		const object: ILike = {
 			type: 'Like',
 			id: `${this.config.url}/likes/${noteReaction.id}`,
 			actor: `${this.config.url}/users/${noteReaction.userId}`,
 			object: note.uri ? note.uri : `${this.config.url}/notes/${noteReaction.noteId}`,
 			content: reaction,
 			_misskey_reaction: reaction,
-		}, undefined);
+		};
 
 		if (reaction.startsWith(':')) {
 			const name = reaction.replaceAll(':', '');
@@ -288,11 +288,11 @@ export class ApRendererService {
 
 	@bindThis
 	public renderMention(mention: MiPartialLocalUser | MiPartialRemoteUser): IApMention {
-		return markOutgoing({
+		return {
 			type: 'Mention',
 			href: this.userEntityService.getUserUri(mention),
 			name: this.userEntityService.isRemoteUser(mention) ? `@${mention.username}@${mention.host}` : `@${(mention as MiLocalUser).username}`,
-		}, undefined);
+		};
 	}
 
 	@bindThis
@@ -302,13 +302,13 @@ export class ApRendererService {
 	): IMove {
 		const actor = this.userEntityService.getUserUri(src);
 		const target = this.userEntityService.getUserUri(dst);
-		return markOutgoing({
+		return {
 			id: `${this.config.url}/moves/${src.id}/${dst.id}`,
 			actor,
 			type: 'Move',
 			object: actor,
 			target,
-		}, undefined);
+		};
 	}
 
 	@bindThis
@@ -422,7 +422,7 @@ export class ApRendererService {
 			})),
 		} as const : {};
 
-		return markOutgoing({
+		return {
 			id: `${this.config.url}/notes/${note.id}`,
 			type: 'Note',
 			attributedTo,
@@ -445,7 +445,7 @@ export class ApRendererService {
 			sensitive: note.cw != null || files.some(file => file.isSensitive),
 			tag,
 			...asPoll,
-		}, undefined);
+		};
 	}
 
 	@bindThis
@@ -529,7 +529,7 @@ export class ApRendererService {
 
 	@bindThis
 	public renderQuestion(user: { id: MiUser['id'] }, note: MiNote, poll: MiPoll): IQuestion {
-		return markOutgoing({
+		return {
 			type: 'Question',
 			id: `${this.config.url}/questions/${note.id}`,
 			actor: this.userEntityService.genLocalUserUri(user.id),
@@ -542,78 +542,78 @@ export class ApRendererService {
 					totalItems: poll.votes[i],
 				},
 			})),
-		}, 'question');
+		};
 	}
 
 	@bindThis
 	public renderReject(object: string | IObject, user: { id: MiUser['id'] }): IReject {
-		return markOutgoing({
+		return {
 			type: 'Reject',
 			actor: this.userEntityService.genLocalUserUri(user.id),
 			object,
-		}, undefined);
+		};
 	}
 
 	@bindThis
 	public renderRemove(user: { id: MiUser['id'] }, target: string | IObject | undefined, object: string | IObject): IRemove {
-		return markOutgoing({
+		return {
 			type: 'Remove',
 			actor: this.userEntityService.genLocalUserUri(user.id),
 			target,
 			object,
-		}, undefined);
+		};
 	}
 
 	@bindThis
 	public renderTombstone(id: string): ITombstone {
-		return markOutgoing({
+		return {
 			id,
 			type: 'Tombstone',
-		}, undefined);
+		};
 	}
 
 	@bindThis
 	public renderUndo(object: string | IObject, user: { id: MiUser['id'] }): IUndo {
 		const id = typeof object !== 'string' && typeof object.id === 'string' && object.id.startsWith(this.config.url) ? `${object.id}/undo` : undefined;
 
-		return markOutgoing({
+		return {
 			type: 'Undo',
 			...(id ? { id } : {}),
 			actor: this.userEntityService.genLocalUserUri(user.id),
 			object,
 			published: new Date().toISOString(),
-		}, undefined);
+		};
 	}
 
 	@bindThis
 	public renderUpdate(object: string | IObject, user: { id: MiUser['id'] }): IUpdate {
-		return markOutgoing( {
+		return {
 			id: `${this.config.url}/users/${user.id}#updates/${new Date().getTime()}`,
 			actor: this.userEntityService.genLocalUserUri(user.id),
 			type: 'Update',
 			to: ['https://www.w3.org/ns/activitystreams#Public'],
 			object,
 			published: new Date().toISOString(),
-		}, 	undefined);
+		};
 	}
 
 	@bindThis
 	public renderVote(user: { id: MiUser['id'] }, vote: MiPollVote, note: MiNote, poll: MiPoll, pollOwner: MiRemoteUser): ICreate {
-		return markOutgoing({
+		return {
 			id: `${this.config.url}/users/${user.id}#votes/${vote.id}/activity`,
 			actor: this.userEntityService.genLocalUserUri(user.id),
 			type: 'Create',
 			to: [pollOwner.uri],
 			published: new Date().toISOString(),
-			object: markOutgoing({
+			object: {
 				id: `${this.config.url}/users/${user.id}#votes/${vote.id}`,
 				type: 'Note',
 				attributedTo: this.userEntityService.genLocalUserUri(user.id),
 				to: [pollOwner.uri],
 				inReplyTo: note.uri,
 				name: poll.choices[vote.choice],
-			}, undefined),
+			},
-		}, undefined);
+		};
 	}
 
 	@bindThis