diff --git a/.config/docker_example.yml b/.config/docker_example.yml
index 2921746295..acd169bf43 100644
--- a/.config/docker_example.yml
+++ b/.config/docker_example.yml
@@ -56,17 +56,17 @@ dbReplications: false
# You can configure any number of replicas here
#dbSlaves:
# -
-# host:
-# port:
-# db:
-# user:
-# pass:
+# host:
+# port:
+# db:
+# user:
+# pass:
# -
-# host:
-# port:
-# db:
-# user:
-# pass:
+# host:
+# port:
+# db:
+# user:
+# pass:
# ┌─────────────────────┐
#───┘ Redis configuration └─────────────────────────────────────
@@ -106,12 +106,16 @@ redis:
# ┌───────────────────────────┐
#───┘ MeiliSearch configuration └─────────────────────────────
+# You can set scope to local (default value) or global
+# (include notes from remote).
+
#meilisearch:
# host: meilisearch
# port: 7700
# apiKey: ''
# ssl: true
# index: ''
+# scope: local
# ┌───────────────┐
#───┘ ID generation └───────────────────────────────────────────
@@ -147,7 +151,7 @@ id: 'aidx'
# Job rate limiter
# deliverJobPerSec: 128
-# inboxJobPerSec: 16
+# inboxJobPerSec: 32
# Job attempts
# deliverJobMaxAttempts: 12
@@ -180,6 +184,9 @@ proxyRemoteFiles: true
# Sign to ActivityPub GET request (default: true)
signToActivityPubGet: true
+# For security reasons, uploading attachments from the intranet is prohibited,
+# but exceptions can be made from the following settings. Default value is "undefined".
+# Read changelog to learn more (Improvements of 12.90.0 (2021/09/04)).
#allowedPrivateNetworks: [
# '127.0.0.1/32'
#]
diff --git a/.config/example.yml b/.config/example.yml
index 0e4f2f5a15..df423c2c83 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -118,6 +118,9 @@ redis:
# ┌───────────────────────────┐
#───┘ MeiliSearch configuration └─────────────────────────────
+# You can set scope to local (default value) or global
+# (include notes from remote).
+
#meilisearch:
# host: localhost
# port: 7700
@@ -163,7 +166,7 @@ id: 'aidx'
# Job rate limiter
#deliverJobPerSec: 128
-#inboxJobPerSec: 16
+#inboxJobPerSec: 32
#relashionshipJobPerSec: 64
# Job attempts
@@ -210,6 +213,9 @@ proxyRemoteFiles: true
# Sign to ActivityPub GET request (default: true)
signToActivityPubGet: true
+# For security reasons, uploading attachments from the intranet is prohibited,
+# but exceptions can be made from the following settings. Default value is "undefined".
+# Read changelog to learn more (Improvements of 12.90.0 (2021/09/04)).
#allowedPrivateNetworks: [
# '127.0.0.1/32'
#]
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a78d91900b..e409adf644 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,10 +5,10 @@
"workspaceFolder": "/workspace",
"features": {
"ghcr.io/devcontainers-contrib/features/pnpm:2": {
- "version": "8.8.0"
+ "version": "8.9.2"
},
"ghcr.io/devcontainers/features/node:1": {
- "version": "20.5.1"
+ "version": "20.10.0"
}
},
"forwardPorts": [3000],
diff --git a/.devcontainer/devcontainer.yml b/.devcontainer/devcontainer.yml
index 3d57d1245d..7ea0929469 100644
--- a/.devcontainer/devcontainer.yml
+++ b/.devcontainer/devcontainer.yml
@@ -56,17 +56,17 @@ dbReplications: false
# You can configure any number of replicas here
#dbSlaves:
# -
-# host:
-# port:
-# db:
-# user:
-# pass:
+# host:
+# port:
+# db:
+# user:
+# pass:
# -
-# host:
-# port:
-# db:
-# user:
-# pass:
+# host:
+# port:
+# db:
+# user:
+# pass:
# ┌─────────────────────┐
#───┘ Redis configuration └─────────────────────────────────────
@@ -147,7 +147,7 @@ id: 'aidx'
# Job rate limiter
# deliverJobPerSec: 128
-# inboxJobPerSec: 16
+# inboxJobPerSec: 32
# Job attempts
# deliverJobMaxAttempts: 12
diff --git a/.github/ISSUE_TEMPLATE/01_bug-report.md b/.github/ISSUE_TEMPLATE/01_bug-report.md
deleted file mode 100644
index b889d96eb3..0000000000
--- a/.github/ISSUE_TEMPLATE/01_bug-report.md
+++ /dev/null
@@ -1,60 +0,0 @@
----
-name: 🐛 Bug Report
-about: Create a report to help us improve
-title: ''
-labels: ⚠️bug?
-assignees: ''
-
----
-
-
-
-## 💡 Summary
-
-
-
-## 🥰 Expected Behavior
-
-
-
-## 🤬 Actual Behavior
-
-
-
-## 📝 Steps to Reproduce
-
-1.
-2.
-3.
-
-## 📌 Environment
-
-
-
-
-### 💻 Frontend
-* Model and OS of the device(s):
-
-* Browser:
-
-* Server URL:
-
-* Misskey:
- 13.x.x
-
-### 🛰 Backend (for server admin)
-
-
-* Installation Method or Hosting Service:
-* Misskey: 13.x.x
-* Node: 20.x.x
-* PostgreSQL: 15.x.x
-* Redis: 7.x.x
-* OS and Architecture:
diff --git a/.github/ISSUE_TEMPLATE/01_bug-report.yml b/.github/ISSUE_TEMPLATE/01_bug-report.yml
new file mode 100644
index 0000000000..f74719989f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/01_bug-report.yml
@@ -0,0 +1,91 @@
+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.io
+ * Misskey: 13.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: 13.x.x
+ * Node: 20.x.x
+ * PostgreSQL: 15.x.x
+ * Redis: 7.x.x
+ * OS and Architecture: Ubuntu 22.04.2 LTS aarch64
+ value: |
+ * Installation Method or Hosting Service:
+ * Misskey:
+ * Node:
+ * PostgreSQL:
+ * Redis:
+ * OS and Architecture:
+ render: markdown
+ validations:
+ required: false
diff --git a/.github/ISSUE_TEMPLATE/02_feature-request.md b/.github/ISSUE_TEMPLATE/02_feature-request.md
deleted file mode 100644
index 5045b17712..0000000000
--- a/.github/ISSUE_TEMPLATE/02_feature-request.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-name: ✨ Feature Request
-about: Suggest an idea for this project
-title: ''
-labels: ✨Feature
-assignees: ''
-
----
-
-## Summary
-
-
diff --git a/.github/ISSUE_TEMPLATE/02_feature-request.yml b/.github/ISSUE_TEMPLATE/02_feature-request.yml
new file mode 100644
index 0000000000..8420475b3e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/02_feature-request.yml
@@ -0,0 +1,17 @@
+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
\ No newline at end of file
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 137be487c0..a77f73706b 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,21 +1,34 @@
'packages/backend':
-- packages/backend/**/*
+- any:
+ - changed-files:
+ - any-glob-to-any-file: ['packages/backend/**/*']
'packages/backend:test':
-- packages/backend/test/**/*
+- any:
+ - changed-files:
+ - any-glob-to-any-file: ['packages/backend/test/**/*']
'packages/frontend':
-- packages/frontend/**/*
+- any:
+ - changed-files:
+ - any-glob-to-any-file: ['packages/frontend/**/*']
'packages/frontend:test':
-- cypress/**/*
+- any:
+ - changed-files:
+ - any-glob-to-any-file: ['cypress/**/*']
'packages/sw':
-- packages/sw/**/*
+- any:
+ - changed-files:
+ - any-glob-to-any-file: ['packages/sw/**/*']
'packages/misskey-js':
-- packages/misskey-js/**/*
+- any:
+ - changed-files:
+ - any-glob-to-any-file: ['packages/misskey-js/**/*']
'packages/misskey-js:test':
-- packages/misskey-js/test/**/*
-- packages/misskey-js/test-d/**/*
+- any:
+ - changed-files:
+ - any-glob-to-any-file: ['packages/misskey-js/test/**/*', 'packages/misskey-js/test-d/**/*']
diff --git a/.github/workflows/api-misskey-js.yml b/.github/workflows/api-misskey-js.yml
index 39f29bf773..5cffbd81bc 100644
--- a/.github/workflows/api-misskey-js.yml
+++ b/.github/workflows/api-misskey-js.yml
@@ -9,12 +9,12 @@ jobs:
steps:
- name: Checkout
- uses: actions/checkout@v4.1.0
+ uses: actions/checkout@v4.1.1
- run: corepack enable
- name: Setup Node.js
- uses: actions/setup-node@v3.8.1
+ uses: actions/setup-node@v4.0.1
with:
node-version-file: '.node-version'
cache: 'pnpm'
diff --git a/.github/workflows/check_copyright_year.yml b/.github/workflows/check_copyright_year.yml
index fb04cf1b00..03dfcd0a0b 100644
--- a/.github/workflows/check_copyright_year.yml
+++ b/.github/workflows/check_copyright_year.yml
@@ -10,7 +10,7 @@ jobs:
check_copyright_year:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v4.1.0
+ - uses: actions/checkout@v4.1.1
- run: |
if [ "$(grep Copyright COPYING | sed -e 's/.*2014-\([0-9]*\) .*/\1/g')" -ne "$(date +%Y)" ]; then
echo "Please change copyright year!"
diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index 3e5bb17902..a43789b754 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -13,7 +13,7 @@ jobs:
if: github.repository == 'misskey-dev/misskey'
steps:
- name: Check out the repo
- uses: actions/checkout@v4.1.0
+ uses: actions/checkout@v4.1.1
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.0.0
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 33c85cbaf4..08cb91c2d0 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -12,7 +12,7 @@ jobs:
steps:
- name: Check out the repo
- uses: actions/checkout@v4.1.0
+ uses: actions/checkout@v4.1.1
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.0.0
diff --git a/.github/workflows/dockle.yml b/.github/workflows/dockle.yml
index 2a1ac3a16c..eee7a78fed 100644
--- a/.github/workflows/dockle.yml
+++ b/.github/workflows/dockle.yml
@@ -14,13 +14,13 @@ jobs:
env:
DOCKER_CONTENT_TRUST: 1
steps:
- - uses: actions/checkout@v4.1.0
+ - uses: actions/checkout@v4.1.1
- run: |
curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v0.4.10/dockle_0.4.10_Linux-64bit.deb"
sudo dpkg -i dockle.deb
- run: |
cp .config/docker_example.env .config/docker.env
- cp ./docker-compose.yml.example ./docker-compose.yml
+ cp ./docker-compose_example.yml ./docker-compose.yml
- run: |
docker compose up -d web
docker tag "$(docker compose images web | awk 'OFS=":" {print $4}' | tail -n +2)" misskey-web:latest
diff --git a/.github/workflows/get-api-diff.yml b/.github/workflows/get-api-diff.yml
new file mode 100644
index 0000000000..d604f9b16d
--- /dev/null
+++ b/.github/workflows/get-api-diff.yml
@@ -0,0 +1,73 @@
+# this name is used in report-api-diff.yml so be careful when change name
+name: Get api.json from Misskey
+
+on:
+ pull_request:
+ branches:
+ - master
+ - develop
+ paths:
+ - packages/backend/**
+ - .github/workflows/get-api-diff.yml
+
+jobs:
+ get-from-misskey:
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+
+ strategy:
+ matrix:
+ node-version: [20.10.0]
+ api-json-name: [api-base.json, api-head.json]
+ include:
+ - api-json-name: api-base.json
+ ref: ${{ github.base_ref }}
+ - api-json-name: api-head.json
+ ref: refs/pull/${{ github.event.number }}/merge
+
+ steps:
+ - uses: actions/checkout@v4.1.1
+ with:
+ ref: ${{ matrix.ref }}
+ submodules: true
+ - name: Install pnpm
+ uses: pnpm/action-setup@v2
+ with:
+ version: 8
+ run_install: false
+ - name: Use Node.js ${{ matrix.node-version }}
+ uses: actions/setup-node@v4.0.1
+ with:
+ node-version: ${{ matrix.node-version }}
+ cache: 'pnpm'
+ - run: corepack enable
+ - run: pnpm i --frozen-lockfile
+ - name: Check pnpm-lock.yaml
+ run: git diff --exit-code pnpm-lock.yaml
+ - name: Copy Configure
+ run: cp .config/example.yml .config/default.yml
+ - name: Build
+ run: pnpm build
+ - name: Generate API JSON
+ run: pnpm --filter backend generate-api-json
+ - name: Copy API.json
+ run: cp packages/backend/built/api.json ${{ matrix.api-json-name }}
+ - name: Upload Artifact
+ uses: actions/upload-artifact@v4
+ with:
+ name: api-artifact
+ path: ${{ matrix.api-json-name }}
+
+ save-pr-number:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Save PR number
+ env:
+ PR_NUMBER: ${{ github.event.number }}
+ run: |
+ echo "$PR_NUMBER" > ./pr_number
+ - uses: actions/upload-artifact@v4
+ with:
+ name: api-artifact
+ path: pr_number
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index fa4a58c3a9..88e2aceaed 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -11,6 +11,6 @@ jobs:
pull-requests: write
runs-on: ubuntu-latest
steps:
- - uses: actions/labeler@v4
+ - uses: actions/labeler@v5
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 798e6f49a3..d6832278e8 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -11,7 +11,7 @@ jobs:
pnpm_install:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v4.1.0
+ - uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
submodules: true
@@ -19,7 +19,7 @@ jobs:
with:
version: 8
run_install: false
- - uses: actions/setup-node@v3.8.1
+ - uses: actions/setup-node@v4.0.1
with:
node-version-file: '.node-version'
cache: 'pnpm'
@@ -38,7 +38,7 @@ jobs:
- sw
- misskey-js
steps:
- - uses: actions/checkout@v4.1.0
+ - uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
submodules: true
@@ -46,7 +46,7 @@ jobs:
with:
version: 7
run_install: false
- - uses: actions/setup-node@v3.8.1
+ - uses: actions/setup-node@v4.0.1
with:
node-version-file: '.node-version'
cache: 'pnpm'
@@ -64,7 +64,7 @@ jobs:
- backend
- misskey-js
steps:
- - uses: actions/checkout@v4.1.0
+ - uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
submodules: true
@@ -72,7 +72,7 @@ jobs:
with:
version: 7
run_install: false
- - uses: actions/setup-node@v3.8.1
+ - uses: actions/setup-node@v4.0.1
with:
node-version-file: '.node-version'
cache: 'pnpm'
diff --git a/.github/workflows/pr-preview-deploy.yml b/.github/workflows/pr-preview-deploy.yml
index 44f97645d0..cb9a4ebfc8 100644
--- a/.github/workflows/pr-preview-deploy.yml
+++ b/.github/workflows/pr-preview-deploy.yml
@@ -13,7 +13,7 @@ jobs:
github.event.client_payload.slash_command.sha != '' &&
contains(github.event.client_payload.pull_request.head.sha, github.event.client_payload.slash_command.sha)
steps:
- - uses: actions/github-script@v6.3.3
+ - uses: actions/github-script@v7
id: check-id
env:
number: ${{ github.event.client_payload.pull_request.number }}
@@ -37,7 +37,7 @@ jobs:
return check[0].id;
- - uses: actions/github-script@v6.3.3
+ - uses: actions/github-script@v7
env:
check_id: ${{ steps.check-id.outputs.result }}
details_url: ${{ github.server_url }}/${{ github.repository }}/runs/${{ github.run_id }}
@@ -53,7 +53,7 @@ jobs:
# Check out merge commit
- name: Fork based /deploy checkout
- uses: actions/checkout@v4.1.0
+ uses: actions/checkout@v4.1.1
with:
ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
@@ -72,7 +72,7 @@ jobs:
timeout: 15m
# Update check run called "integration-fork"
- - uses: actions/github-script@v6.3.3
+ - uses: actions/github-script@v7
id: update-check-run
if: ${{ always() }}
env:
diff --git a/.github/workflows/pr-preview-destroy.yml b/.github/workflows/pr-preview-destroy.yml
index 8adfad9dab..47d9eb313a 100644
--- a/.github/workflows/pr-preview-destroy.yml
+++ b/.github/workflows/pr-preview-destroy.yml
@@ -10,7 +10,7 @@ jobs:
destroy-preview-environment:
runs-on: ubuntu-latest
steps:
- - uses: actions/github-script@v6.3.3
+ - uses: actions/github-script@v7
id: check-conclusion
env:
number: ${{ github.event.number }}
diff --git a/.github/workflows/report-api-diff.yml b/.github/workflows/report-api-diff.yml
new file mode 100644
index 0000000000..309516772f
--- /dev/null
+++ b/.github/workflows/report-api-diff.yml
@@ -0,0 +1,85 @@
+name: Report API Diff
+
+on:
+ workflow_run:
+ types: [completed]
+ workflows:
+ - Get api.json from Misskey # get-api-diff.yml
+
+jobs:
+ compare-diff:
+ runs-on: ubuntu-latest
+ if: ${{ github.event.workflow_run.conclusion == 'success' }}
+ permissions:
+ pull-requests: write
+
+# api-artifact
+ steps:
+ - name: Download artifact
+ uses: actions/github-script@v7
+ with:
+ script: |
+ let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ run_id: context.payload.workflow_run.id,
+ });
+ let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
+ return artifact.name == "api-artifact"
+ })[0];
+ let download = await github.rest.actions.downloadArtifact({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ artifact_id: matchArtifact.id,
+ archive_format: 'zip',
+ });
+ let fs = require('fs');
+ fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/api-artifact.zip`, Buffer.from(download.data));
+ - name: Extract artifact
+ run: unzip api-artifact.zip -d artifacts
+ - name: Load PR Number
+ id: load-pr-num
+ run: echo "pr-number=$(cat artifacts/pr_number)" >> "$GITHUB_OUTPUT"
+
+ - name: Output base
+ run: cat ./artifacts/api-base.json
+ - name: Output head
+ run: cat ./artifacts/api-head.json
+ - name: Arrange json files
+ run: |
+ jq '.' ./artifacts/api-base.json > ./api-base.json
+ jq '.' ./artifacts/api-head.json > ./api-head.json
+ - name: Get diff of 2 files
+ run: diff -u --label=base --label=head ./api-base.json ./api-head.json | cat > api.json.diff
+ - name: Get full diff
+ run: diff --label=base --label=head --new-line-format='+%L' --old-line-format='-%L' --unchanged-line-format=' %L' ./api-base.json ./api-head.json | cat > api-full.json.diff
+ - name: Echo full diff
+ run: cat ./api-full.json.diff
+ - name: Upload full diff to Artifact
+ uses: actions/upload-artifact@v4
+ with:
+ name: api-artifact
+ path: |
+ api-full.json.diff
+ api-base.json
+ api-head.json
+ - id: out-diff
+ name: Build diff Comment
+ run: |
+ cat <<- EOF > ./output.md
+ このPRによるapi.jsonの差分
+
+ 差分はこちら
+
+ \`\`\`diff
+ $(cat ./api.json.diff)
+ \`\`\`
+
+
+ [Get diff files from Workflow Page](https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID})
+ EOF
+ - uses: thollander/actions-comment-pull-request@v2
+ with:
+ pr_number: ${{ steps.load-pr-num.outputs.pr-number }}
+ comment_tag: show_diff
+ filePath: ./output.md
diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index ac7d1afda1..9681cbec59 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -13,11 +13,11 @@ jobs:
strategy:
matrix:
- node-version: [20.5.1]
+ node-version: [20.10.0]
services:
postgres:
- image: postgres:13
+ image: postgres:15
ports:
- 54312:5432
env:
@@ -29,7 +29,7 @@ jobs:
- 56312:6379
steps:
- - uses: actions/checkout@v4.1.0
+ - uses: actions/checkout@v4.1.1
with:
submodules: true
- name: Install pnpm
@@ -38,7 +38,7 @@ jobs:
version: 8
run_install: false
- name: Use Node.js ${{ matrix.node-version }}
- uses: actions/setup-node@v3.8.1
+ uses: actions/setup-node@v4.0.1
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml
index e67b516546..83740bf156 100644
--- a/.github/workflows/test-frontend.yml
+++ b/.github/workflows/test-frontend.yml
@@ -13,10 +13,10 @@ jobs:
strategy:
matrix:
- node-version: [20.5.1]
+ node-version: [20.10.0]
steps:
- - uses: actions/checkout@v4.1.0
+ - uses: actions/checkout@v4.1.1
with:
submodules: true
- name: Install pnpm
@@ -25,7 +25,7 @@ jobs:
version: 8
run_install: false
- name: Use Node.js ${{ matrix.node-version }}
- uses: actions/setup-node@v3.8.1
+ uses: actions/setup-node@v4.0.1
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
@@ -51,12 +51,12 @@ jobs:
strategy:
fail-fast: false
matrix:
- node-version: [20.5.1]
+ node-version: [20.10.0]
browser: [chrome]
services:
postgres:
- image: postgres:13
+ image: postgres:15
ports:
- 54312:5432
env:
@@ -68,7 +68,7 @@ jobs:
- 56312:6379
steps:
- - uses: actions/checkout@v4.1.0
+ - uses: actions/checkout@v4.1.1
with:
submodules: true
# https://github.com/cypress-io/cypress-docker-images/issues/150
@@ -83,7 +83,7 @@ jobs:
version: 7
run_install: false
- name: Use Node.js ${{ matrix.node-version }}
- uses: actions/setup-node@v3.8.1
+ uses: actions/setup-node@v4.0.1
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
@@ -108,12 +108,12 @@ jobs:
wait-on: 'http://localhost:61812'
headed: true
browser: ${{ matrix.browser }}
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v4
if: failure()
with:
name: ${{ matrix.browser }}-cypress-screenshots
path: cypress/screenshots
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v4
if: always()
with:
name: ${{ matrix.browser }}-cypress-videos
diff --git a/.github/workflows/test-misskey-js.yml b/.github/workflows/test-misskey-js.yml
index 1846b628d3..055152f321 100644
--- a/.github/workflows/test-misskey-js.yml
+++ b/.github/workflows/test-misskey-js.yml
@@ -16,17 +16,17 @@ jobs:
strategy:
matrix:
- node-version: [20.5.1]
+ node-version: [20.10.0]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- name: Checkout
- uses: actions/checkout@v4.1.0
+ uses: actions/checkout@v4.1.1
- run: corepack enable
- name: Setup Node.js ${{ matrix.node-version }}
- uses: actions/setup-node@v3.8.1
+ uses: actions/setup-node@v4.0.1
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
diff --git a/.github/workflows/test-production.yml b/.github/workflows/test-production.yml
index c570018962..9e02c0d8f8 100644
--- a/.github/workflows/test-production.yml
+++ b/.github/workflows/test-production.yml
@@ -16,10 +16,10 @@ jobs:
strategy:
matrix:
- node-version: [20.5.1]
+ node-version: [20.10.0]
steps:
- - uses: actions/checkout@v4.1.0
+ - uses: actions/checkout@v4.1.1
with:
submodules: true
- name: Install pnpm
@@ -28,7 +28,7 @@ jobs:
version: 8
run_install: false
- name: Use Node.js ${{ matrix.node-version }}
- uses: actions/setup-node@v3.8.1
+ uses: actions/setup-node@v4.0.1
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
diff --git a/.node-version b/.node-version
index 7cc2069986..d5a159609d 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-20.5.1
+20.10.0
diff --git a/.npmrc b/.npmrc
new file mode 100644
index 0000000000..c42da845b4
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1 @@
+engine-strict = true
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 71fb02a59d..e2a82b1ffe 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,11 +1,15 @@
{
- "search.exclude": {
- "**/node_modules": true
- },
- "typescript.tsdk": "node_modules/typescript/lib",
- "files.associations": {
- "*.test.ts": "typescript"
- },
- "jest.jestCommandLine": "pnpm run jest",
- "jest.autoRun": "off"
-}
\ No newline at end of file
+ "search.exclude": {
+ "**/node_modules": true
+ },
+ "typescript.tsdk": "node_modules/typescript/lib",
+ "files.associations": {
+ "*.test.ts": "typescript"
+ },
+ "jest.jestCommandLine": "pnpm run jest",
+ "jest.autoRun": "off",
+ "editor.codeActionsOnSave": {
+ "source.fixAll": "explicit"
+ },
+ "editor.formatOnSave": false
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f2b8ac44d..c7afb101db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,18 +5,272 @@
-
### Client
--
+-
### Server
-
-->
+## 2023.12.0
+
+### Note
+- 依存関係の更新に伴い、Node.js 20.10.0が最小要件になりました
+- 絵文字の追加辞書を既にインストールしている場合は、お手数ですが再インストールのほどお願いします
+- 絵文字ピッカーにピン留め表示する絵文字設定が「リアクション用」と「絵文字入力用」に分かれました。以前の設定は「リアクション用」として使用されます。
+
+ **影響：**
+ それにより、投稿フォームから表示される絵文字ピッカーのピン留め絵文字がリセットされたように感じるかもしれません（新設された"ピン留め（全般）"の設定が使われるため）。
+ 投稿用のピン留め絵文字をアップデート前の状態にするには、以下の手順で操作します。
+
+ 1. 「設定」メニューに移動し、「絵文字ピッカー」タブを選択します。
+ 2. 「ピン留 (全般)」のタブを選択します。
+ 3. 「リアクション設定から上書きする」ボタンを押すことで、アップデート前の状態に戻すことができます。
+
+### General
+- Feat: メールアドレスの認証にverifymail.ioを使えるように (cherry-pick from https://github.com/TeamNijimiss/misskey/commit/971ba07a44550f68d2ba31c62066db2d43a0caed)
+- Feat: モデレーターがユーザーのアイコンもしくはバナー画像を未設定状態にできる機能を追加 (cherry-pick from https://github.com/TeamNijimiss/misskey/commit/e0eb5a752f6e5616d6312bb7c9790302f9dbff83)
+- Feat: TL上からノートが見えなくなるワードミュートであるハードミュートを追加
+- Enhance: 指定したドメインのメールアドレスの登録を弾くことができるように
+- Enhance: 公開ロールにアサインされたときに通知が作成されるように
+- Enhance: アイコンデコレーションを複数設定できるように
+- Enhance: アイコンデコレーションの位置を微調整できるように
+- Enhance: つながりの公開範囲をフォロー/フォロワーで個別に設定可能に #12072
+- Enhance: ローカリゼーションの更新
+- Enhance: 依存関係の更新
+- Fix: MFM `$[unixtime ]` に不正な値を入力した際に発生する各種エラーを修正
+
+### Client
+- Feat: 今日誕生日のフォロー中のユーザーを一覧表示できるウィジェットを追加
+- Feat: 画面に雪を降らせられるように
+- Enhance: MFMのアニメーション要素（`tada`, `jelly`, `twitch`, `shake`, `spin`, `jump`, `bounce`, `rainbow`）に `delay` オプションを追加
+- Enhance: センシティブと判断されたウェブサイトのサムネイルを非表示に
+ - ウェブサイトをセンシティブと判断する仕組みが動いていないため、summalyProxyを使用しないと機能しません。
+- Enhance: 投稿フォームの絵文字ピッカーをリアクション時に使用するものと同じのを使用するように #12336 #12560
+- Enhance: リアクション用ピン留め絵文字と投稿時の絵文字入力用ピン留め絵文字を分けて設定できるように #12560
+- Enhance: 絵文字のオートコンプリート機能強化 #12364
+- Enhance: ユーザーのRawデータを表示するページが復活
+- Enhance: リアクション選択時に音を鳴らせるように
+- Enhance: サウンドにドライブのファイルを使用できるように
+- Enhance: ナビゲーションバーに項目「キャッシュを削除」を追加
+- Enhance: Shareページで投稿を完了すると、親ウィンドウ（親フレーム）にpostMessageするように
+- Enhance: チャンネル、クリップ、ページ、Play、ギャラリーにURLのコピーボタンを設置 #11305
+- Enhance: ノートプレビューに「内容を隠す」が反映されるように
+- Enhance: データセーバーでコードハイライトの読み込みを削減できるように
+- Enhance: データセーバーの適用範囲を個別で設定できるように
+ - 従来のデータセーバーの設定はリセットされます
+- Enhance: タイムライン上のタブからリスト、アンテナ、チャンネルの管理ページにジャンプできるように
+- Enhance: ユーザー名、プロフィール、お知らせ、ページの編集画面でMFMや絵文字のオートコンプリートが使用できるように
+- Enhance: プロフィール、お知らせの編集画面でMFMのプレビューを表示できるように
+- Enhance: 絵文字の詳細ページに記載される情報を追加
+- Enhance: リアクションの表示幅制限を設定可能に
+- Enhance: Unicode 15.0のサポート
+- Enhance: コードブロックのハイライト機能を利用するには言語を明示的に指定させるように
+ - MFMでコードブロックを利用する際に意図しないハイライトが起こらないようになりました
+ - 逆に、MFMでコードハイライトを利用したい際は言語を明示的に指定する必要があります
+ （例: ` ```js ` → Javascript, ` ```ais ` → AiScript）
+- Enhance: 絵文字などのオートコンプリートでShift+Tabを押すと前の候補を選択できるように
+- Enhance: チャンネルに新規の投稿がある場合にバッジを表示させる
+- Enhance: サウンド設定に「サウンドを出力しない」と「Misskeyがアクティブな時のみサウンドを出力する」を追加
+- Enhance: 設定したタグをトレンドに表示させないようにする項目を管理画面で設定できるように
+- Fix: 「設定のバックアップ」で一部の項目がバックアップに含まれていなかった問題を修正
+- Fix: ウィジェットのジョブキューにて音声の発音方法変更に追従できていなかったのを修正 #12367
+- Fix: コードエディタが正しく表示されない問題を修正
+- Fix: プロフィールの「ファイル」にセンシティブな画像がある際のデザインを修正
+- Fix: 一度に大量の通知が入った際に通知音が音割れする問題を修正
+- Fix: 共有機能をサポートしていないブラウザの場合は共有ボタンを非表示にする #11305
+- Fix: 通知のグルーピング設定を変更してもリロードされるまで表示が変わらない問題を修正 #12470
+- Fix: 長い名前のチャンネルにおける投稿フォームの表示が崩れる問題を修正
+- Fix: セキュリティ向上のためAiScriptの`Mk:apiExternal`を無効化
+- Fix: ノート中の絵文字をタップして「リアクションする」からリアクションした際にリアクションサウンドが鳴らない不具合を修正
+- Fix: ノート中のリアクションの表示を微調整 #12650
+- Fix: AiScriptの`readline`が不正な値を返すことがある問題を修正
+- Fix: 投票のみ/画像のみの引用RNが、通知欄でただのRNとして判定されるバグを修正
+- Fix: CWをつけて引用RNしても、普通のRNとして扱われてしまうバグを修正しました。
+- Fix: 「画像が1枚のみのメディアリストの高さ」を「デフォルト」以外に設定していると、CWの中などに添付された画像が見られないバグを修正
+- Fix: DeepL TranslationのPro accountトグルスイッチが表示されていなかったのを修正
+- Fix: twitterの埋め込みカード内リンクからリンク先を開けない問題を修正
+- Fix: WebKitブラウザー上でも「デバイスの画面を常にオンにする」機能が効くように
+- Fix: ページ一覧ページの表示がモバイル環境において崩れているのを修正
+- Fix: MFMでルビの中のテキストがnyaizeされない問題を修正
+
+### Server
+- Enhance: MFM `$[ruby ]` が他ソフトウェアと連合されるように
+- Enhance: Meilisearchを有効にした検索で、ユーザーのミュートやブロックを考慮するように
+- Enhance: カスタム絵文字のインポート時の動作を改善
+- Fix: 時間経過により無効化されたアンテナを再有効化したとき、サーバ再起動までその状況が反映されないのを修正 #12303
+- Fix: ロールタイムラインが保存されない問題を修正
+- Fix: api.jsonの生成ロジックを改善 #12402
+- Fix: 招待コードが使い回せる問題を修正
+- Fix: 特定の条件下でチャンネルやユーザーのノート一覧に最新のノートが表示されなくなる問題を修正
+- Fix: 何もノートしていないユーザーのフィードにアクセスするとエラーになる問題を修正
+- Fix: リストタイムラインにてミュートが機能しないケースがある問題と、チャンネル投稿がストリーミングで流れてきてしまう問題を修正 #10443
+- Fix: 「みつける」のなかにミュートしたユーザが現れてしまう問題を修正 #12383
+- Fix: Social/Local/Home Timelineにてインスタンスミュートが効かない問題
+- Fix: ユーザのノート一覧にてインスタンスミュートが効かない問題
+- Fix: チャンネルのノート一覧にてインスタンスミュートが効かない問題
+- Fix: 「みつける」が年越し時に壊れる問題を修正
+- Fix: アカウントをブロックした際に、自身のユーザーのページでノートが相手に表示される問題を修正
+- Fix: モデレーションログがモデレーターは閲覧できないように修正
+- Fix: ハッシュタグのトレンド除外設定が即時に効果を持つように修正
+- Fix: HTTP Digestヘッダのアルゴリズム部分に大文字の"SHA-256"しか使えない
+- Fix: 管理者用APIのアクセス権限が適切に設定されていない問題を修正
+
+## 2023.11.1
+
+### Note
+- 悪意のある第三者がリモートユーザーになりすました任意のアクティビティを受け取れてしまう問題を修正しました。詳しくは[GitHub security advisory](https://github.com/misskey-dev/misskey/security/advisories/GHSA-3f39-6537-3cgc)をご覧ください。
+
+### General
+- Feat: 管理者がコントロールパネルからメールアドレスの照会を行えるようになりました
+- Enhance: ローカリゼーションの更新
+- Enhance: 依存関係の更新
+- Enhance: json-schema(OpenAPIの戻り値として使用されるスキーマ定義)を出来る限り最新化 #12311
+
+### Client
+- Enhance: MFMでルビを振れるように
+ - 例: `$[ruby 三須木 みすき]`
+- Enhance: MFMでUNIX時間を指定して日時を表示できるように
+ - 例: `$[unixtime 1701356400]`
+- Enhance: プラグインでエラーが発生した場合のハンドリングを強化
+- Enhance: 細かなUIのブラッシュアップ
+- Fix: 効果音が再生されるとデバイスで再生している動画や音声が停止する問題を修正 #12339
+- Fix: デッキに表示されたチャンネルの表示先チャンネルを切り替えた際、即座に反映されない問題を修正 #12236
+- Fix: プラグインでノートの表示を書き換えられない問題を修正
+- Fix: アイコンデコレーションが見切れる場合がある問題を修正
+- Fix: 「フォロー中の人全員の返信を含める/含めないようにする」のボタンを押下した際の確認が機能していない問題を修正
+- Fix: 非ログイン時に「メモを追加」を表示しないように変更 #12309
+- Fix: 絵文字ピッカーでの検索が更新されない問題を修正
+- Fix: 特定の条件下でノートがnyaizeされない問題を修正
+
+### Server
+- Enhance: FTTのデータベースへのフォールバック処理を行うかどうかを設定可能に
+- Fix: トークンのないプラグインをアンインストールするときにエラーが出ないように
+- Fix: 投稿通知がオンでもダイレクト投稿はユーザーに通知されないようにされました
+- Fix: ユーザタイムラインの「ノート」選択時にリノートが混ざり込んでしまうことがある問題の修正 #12306
+- Fix: LTLに特定条件下にてチャンネルへの投稿が混ざり込む現象を修正
+- Fix: ActivityPub: 追加情報のカスタム絵文字がユーザー情報のtagに含まれない問題を修正
+- Fix: ActivityPubに関するセキュリティの向上
+- Fix: 非公開の投稿に対して返信できないように
+
+## 2023.11.0
+
+### Note
+- iOS 16.4未満を使用している場合はiOS 16.4以上にアップデートをお願いします
+
+### General
+- Feat: アイコンデコレーション機能
+ - サーバーで用意された画像をアイコンに重ねることができます
+ - 画像のテンプレートはこちらです: https://misskey-hub.net/brand-assets/
+ - 最大でも黄色いエリア内にデコレーションを収めることを推奨します。
+ - 画像は512x512pxを推奨します。
+- Feat: チャンネル設定にリノート／引用リノートの可否を設定できる項目を追加
+- Enhance: アカウント登録時のメールアドレス認証に30分の有効期限を設定
+ - 有効期限が切れた後であれば、登録時に使用した招待コードを再度利用できるように変更しました。
+ - ユーザーが誤ったメールアドレスを入力した場合に招待コードが失効してしまう問題が解消されます。
+- Enhance: すでにフォローしたすべての人の返信をTLに追加できるように
+- Enhance: 未読の通知数を表示できるように
+- Enhance: 通知されず、確認の必要もないお知らせ(silence)を作成可能になりました
+- Enhance: ローカリゼーションの更新
+- Enhance: 依存関係の更新
+- Change: CWを使用する場合、注釈を空にすることは許可されなくなりました
+
+### Client
+- Feat: プラグイン・テーマを外部サイトから直接インストールできるようになりました
+ - 外部サイトでの実装が必要です。詳細は Misskey Hub をご覧ください
+ https://misskey-hub.net/docs/for-developers/publish-on-your-website/
+- Feat: 通知をグルーピングして表示するオプション(オプトアウト)
+- Feat: Misskeyの基本的なチュートリアルを実装
+- Feat: スワイプしてタイムラインを再読込できるように
+ - PCの場合は右上のボタンからでも再読込できます
+- Enhance: タイムラインの自動更新を無効にできるように
+- Enhance: コードのシンタックスハイライトエンジンをShikiに変更
+ - AiScriptのシンタックスハイライトに対応
+ - MFMでAiScriptをハイライトする場合、コードブロックの開始部分を ` ```is ` もしくは ` ```aiscript ` としてください
+- Enhance: データセーバー有効時はアニメーション付きのアバター画像が停止するように
+- Enhance: プラグインを削除した際には、使用されていたアクセストークンも同時に削除されるようになりました
+- Enhance: プラグインで`Plugin:register_note_view_interruptor`を用いてnoteの代わりにnullを返却することでノートを非表示にできるようになりました
+- Enhance: AiScript関数`Mk:nyaize()`が追加されました
+- Enhance: 情報→ツール はナビゲーションバーにツールとして独立した項目になりました
+- Enhance: ノート内の絵文字をクリックすることで、コピーおよびリアクションができるように
+- Enhance: その他細かなブラッシュアップ
+- Fix: 投稿フォームでのユーザー変更がプレビューに反映されない問題を修正
+- Fix: ユーザーページの ノート > ファイル付き タブにリプライが表示されてしまう
+- Fix: 「検索」MFMにおいて一部の検索キーワードが正しく認識されない問題を修正
+- Fix: 一部の言語でMisskey Webがクラッシュする問題を修正
+- Fix: チャンネルの作成・更新時に失敗した場合何も表示されない問題を修正 #11983
+- Fix: 個人カードのemojiがバッテリーになっている問題を修正
+- Fix: 標準テーマと同じIDを使用してインストールできてしまう問題を修正
+- Fix: 絵文字ピッカーでバッテリーの絵文字が複数表示される問題を修正 #12197
+- Fix: 11以上されているリアクションにおいてツールチップで示されるリアクション数が本来よりも1多い問題を修正 #12174
+- Fix: サイレンス状態で公開範囲のパブリックを選択できてしまう問題を修正 #12224
+- Fix: In deck layout, replies option is not saved after refresh
+- Fix: アーカイブしたお知らせがコントロールパネルに表示される問題を修正
+- Note: アップデート後、サウンドに関する設定が初期化されます
+
+### Server
+- Feat: Registry APIがサードパーティから利用可能になりました
+- Enhance: RedisへのTLのキャッシュ(FTT)をオフにできるように
+- Enhance: フォローしているチャンネルをフォロー解除した時（またはその逆）、タイムラインに反映される間隔を改善
+- Enhance: プロフィールの自己紹介欄のMFMが連合するようになりました
+ - 相手がMisskey v2023.11.0以降である必要があります
+- Enhance: チャンネル取得時のパフォーマンスを向上
+- Enhance: AP: ApplicationタイプのアカウントをisBotとして扱うように
+- Fix: リストTLに自分のフォロワー限定投稿が含まれない問題を修正
+- Fix: ローカルタイムラインに投稿者自身の投稿への返信が含まれない問題を修正
+- Fix: 自分のフォローしているユーザーの自分のフォローしていないユーザーの visibility: followers な投稿への返信がストリーミングで流れてくる問題を修正
+- Fix: RedisへのTLキャッシュが有効の場合にHTL/LTL/STLが空になることがある問題を修正
+- Fix: STLでフォローしていないチャンネルが取得される問題を修正
+- Fix: `hashtags/trend`にてRedisからトレンドの情報が取得できない際にInternal Server Errorになる問題を修正
+- Fix: HTLをリロードまたは遡行したとき、フォローしているチャンネルのノートが含まれない問題を修正 #11765 #12181
+- Fix: リノートをリノートできるのを修正
+- Fix: アクセストークンを削除すると、通知が取得できなくなる場合がある問題を修正
+- Fix: 自身の宛先なしダイレクト投稿がストリーミングで流れてこない問題を修正
+- Fix: サーバーサイドからのテスト通知を正しく行えるように修正
+- Fix: GTLの「リノートを表示」オプションが機能しないのを修正 #12233
+
+## 2023.10.2
+
+### General
+- Feat: アンテナでローカルの投稿のみ収集できるようになりました
+- Feat: サーバーサイレンス機能が追加されました
+- Enhance: 新規にフォローした人の返信をデフォルトでTLに追加できるオプションを追加
+- Enhance: HTL/LTL/STLを2023.10.0アップデート以前まで遡れるように
+- Enhance: フォロー/フォロー解除したときに過去分のHTLにも含まれる投稿が反映されるように
+- Enhance: ローカリゼーションの更新
+- Enhance: 依存関係の更新
+
+### Client
+- Enhance: TLの返信表示オプションを記憶するように
+- Enhance: 投稿されてから時間が経過しているノートであることを視覚的に分かりやすく
+- Feat: 絵文字ピッカーのカテゴリに「/」を入れることでフォルダ分け表示できるように
+
+### Server
+- Enhance: タイムライン取得時のパフォーマンスを向上
+- Enhance: ストリーミングAPIのパフォーマンスを向上
+- Fix: users/notesでDBから参照した際にチャンネル投稿のみ取得される問題を修正
+- Fix: コントロールパネルの設定項目が正しく保存できない問題を修正
+- Fix: 管理者権限のロールを持っていても一部のAPIが使用できないことがある問題を修正
+- Change: ユーザーのisCatがtrueでも、サーバーではnyaizeが行われなくなりました
+ - isCatな場合、クライアントでnyaize処理を行うことを推奨します
+
+## 2023.10.1
+### General
+- Enhance: ローカルタイムライン、ソーシャルタイムラインで返信を含むかどうか設定可能に
+
+### Client
+- Fix: 絵文字ピッカーで横に長いカスタム絵文字が見切れる問題を修正
+
+### Server
+- Fix: フォローしているユーザーからの自分の投稿への返信がタイムラインに含まれない問題を修正
+- Fix: users/notesでセンシティブチャンネルの投稿が含まれる場合がある問題を修正
+
## 2023.10.0
### NOTE
- 2023.9.2で導入されたノート編集機能はクオリティの高い実装が困難であることが判明したため撤回されました
-- アップデート後、アップデートより前の時点にTLを遡ることはできません
- - アップデート後であっても、今後のアップデートで2023.10.0以前のTLに遡れるようになる可能性はあります
+- アップデートを行うと、タイムラインが一時的にリセットされます
+ - アンテナ内のノートも含む
+- ソフトミュート設定はクライアントではなくサーバー側に保存されるようになったため、アップデートを行うとソフトミュートの設定がリセットされます
### Changes
- API: users/notes, notes/local-timeline で fileType 指定はできなくなりました
@@ -28,6 +282,9 @@
- Feat: ユーザーごとのハイライト
- Feat: プライバシーポリシー・運営者情報（Impressum）の指定が可能になりました
- プライバシーポリシーはサーバー登録時に同意確認が入ります
+- Feat: タイムラインがリアルタイム更新中に広告を挿入できるようになりました
+ - デフォルトは無効
+ - 頻度はコントロールパネルから設定できます。運営中のサーバーのTLの流速を見て、最適な値を指定してください。
- Enhance: ソフトワードミュートとハードワードミュートは統合されました
- Enhance: モデレーションログ機能の強化
- Enhance: ローカリゼーションの更新
@@ -36,15 +293,26 @@
- Fix: ユーザーリストTLにチャンネル投稿が含まれる問題を修正
### Client
+- Feat: 「ファイルの詳細」ページを追加
+ - ドライブのファイルの拡大プレビューができるように
+ - ファイルが添付されたノートの一覧が表示できるように
- Enhance: 二要素認証のバックアップコード一覧をテキストファイルでダウンロード可能に
+- Enhance: 動画再生時のデフォルトボリュームを30%に
- Fix: リアクションしたユーザ一覧のUIが稀に左上に残ってしまう不具合を修正
### Server
+- Enhance: drive/files/attached-notes がページネーションに対応しました
- Enhance: タイムライン取得時のパフォーマンスを大幅に向上
- Enhance: ハイライト取得時のパフォーマンスを大幅に向上
- Enhance: トレンドハッシュタグ取得時のパフォーマンスを大幅に向上
+- Enhance: WebSocket接続が多い場合のパフォーマンスを向上
- Enhance: 不要なPostgreSQLのインデックスを削除しパフォーマンスを向上
- Fix: 連合なしアンケートに投票をするとUpdateがリモートに配信されてしまうのを修正
+- Fix: nodeinfoにおいてCORS用のヘッダーが設定されていないのを修正
+- Fix: 同じ種類のTLのストリーミングを複数接続できない問題を修正
+- Fix: アンテナTLを途中までしかページネーションできなくなることがある問題を修正
+- Fix: 「ファイル付きのみ」のTLでファイル無しの新着ノートが流れる問題を修正
+- Fix: プロセスが終了しない、あるいは非常に時間がかかる問題を修正
## 2023.9.3
### General
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index cd9cf8302a..1bbfb082af 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -2,45 +2,131 @@
## Our Pledge
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
## Our Standards
-Examples of behavior that contributes to creating a positive environment include:
+Examples of behavior that contributes to a positive environment for our
+community include:
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+ and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+ community
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or advances of
+ any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+* Publishing others' private information, such as a physical or email address,
+ without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
-## Our Responsibilities
+## Enforcement Responsibilities
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
## Scope
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
## Enforcement
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at syuilotan@yahoo.co.jp. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+.
+All complaints will be reviewed and investigated promptly and fairly.
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
## Attribution
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 484fd99413..7f6c1f4f82 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,7 +15,7 @@ Before creating an issue, please check the following:
- To avoid duplication, please search for similar issues before creating a new issue.
- Do not use Issues to ask questions or troubleshooting.
- Issues should only be used to feature requests, suggestions, and bug tracking.
- - Please ask questions or troubleshooting in ~~the [Misskey Forum](https://forum.misskey.io/)~~ [GitHub Discussions](https://github.com/misskey-dev/misskey/discussions) or [Discord](https://discord.gg/Wp8gVStHW3).
+ - Please ask questions or troubleshooting in [GitHub Discussions](https://github.com/misskey-dev/misskey/discussions) or [Discord](https://discord.gg/Wp8gVStHW3).
> **Warning**
> Do not close issues that are about to be resolved. It should remain open until a commit that actually resolves it is merged.
@@ -117,6 +117,10 @@ command.
- Server-side source files and automatically builds them if they are modified. Automatically start the server process(es).
- Vite HMR (just the `vite` command) is available. The behavior may be different from production.
- Service Worker is watched by esbuild.
+- The front end can be viewed by accessing `http://localhost:5173`.
+- The backend listens on the port configured with `port` in .config/default.yml.
+If you have not changed it from the default, it will be "http://localhost:3000".
+If "port" in .config/default.yml is set to something other than 3000, you need to change the proxy settings in packages/frontend/vite.config.local-dev.ts.
### Dev Container
Instead of running `pnpm` locally, you can use Dev Container to set up your development environment.
diff --git a/Dockerfile b/Dockerfile
index d397fe01cd..38aa5bc7b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1.4
-ARG NODE_VERSION=20.5.1-bullseye
+ARG NODE_VERSION=20.10.0-bullseye
# build assets & compile TypeScript
@@ -67,8 +67,8 @@ RUN apt-get update \
&& corepack enable \
&& groupadd -g "${GID}" misskey \
&& useradd -l -u "${UID}" -g "${GID}" -m -d /misskey misskey \
- && find / -type d -path /proc -prune -o -type f -perm /u+s -ignore_readdir_race -exec chmod u-s {} \; \
- && find / -type d -path /proc -prune -o -type f -perm /g+s -ignore_readdir_race -exec chmod g-s {} \; \
+ && find / -type d -path /sys -prune -o -type d -path /proc -prune -o -type f -perm /u+s -ignore_readdir_race -exec chmod u-s {} \; \
+ && find / -type d -path /sys -prune -o -type d -path /proc -prune -o -type f -perm /g+s -ignore_readdir_race -exec chmod g-s {} \; \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists
diff --git a/README.md b/README.md
index ab4388c2eb..6fa804f1fa 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,10 @@
---
-
+
-
+
@@ -51,7 +51,7 @@ With Misskey's built in drive, you get cloud storage right in your social media,
## Documentation
-Misskey Documentation can be found at [Misskey Hub](https://misskey-hub.net/), some of the links and graphics above also lead to specific portions of it.
+Misskey Documentation can be found at [Misskey Hub](https://misskey-hub.net/docs/), some of the links and graphics above also lead to specific portions of it.
## Sponsors
diff --git a/chart/files/default.yml b/chart/files/default.yml
index 87b2f677eb..4cc291e80a 100644
--- a/chart/files/default.yml
+++ b/chart/files/default.yml
@@ -77,17 +77,17 @@ dbReplications: false
# You can configure any number of replicas here
#dbSlaves:
# -
-# host:
-# port:
-# db:
-# user:
-# pass:
+# host:
+# port:
+# db:
+# user:
+# pass:
# -
-# host:
-# port:
-# db:
-# user:
-# pass:
+# host:
+# port:
+# db:
+# user:
+# pass:
# ┌─────────────────────┐
#───┘ Redis configuration └─────────────────────────────────────
@@ -167,7 +167,7 @@ id: "aidx"
# Job rate limiter
# deliverJobPerSec: 128
-# inboxJobPerSec: 16
+# inboxJobPerSec: 32
# Job attempts
# deliverJobMaxAttempts: 12
diff --git a/chart/templates/Deployment.yml b/chart/templates/Deployment.yml
index d5dd14f59e..3c73837801 100644
--- a/chart/templates/Deployment.yml
+++ b/chart/templates/Deployment.yml
@@ -27,7 +27,7 @@ spec:
ports:
- containerPort: 3000
- name: postgres
- image: postgres:14-alpine
+ image: postgres:15-alpine
env:
- name: POSTGRES_USER
value: "example-misskey-user"
@@ -38,7 +38,7 @@ spec:
ports:
- containerPort: 5432
- name: redis
- image: redis:alpine
+ image: redis:7-alpine
ports:
- containerPort: 6379
volumes:
diff --git a/cypress/e2e/widgets.cy.js b/cypress/e2e/widgets.cy.js
index f5a982eb0a..df6ec8357d 100644
--- a/cypress/e2e/widgets.cy.js
+++ b/cypress/e2e/widgets.cy.js
@@ -1,3 +1,4 @@
+/* flaky
describe('After user signed in', () => {
beforeEach(() => {
cy.resetState();
@@ -67,3 +68,4 @@ describe('After user signed in', () => {
buildWidgetTest('aiscript');
buildWidgetTest('aichan');
});
+*/
diff --git a/docker-compose.local-db.yml b/docker-compose.local-db.yml
new file mode 100644
index 0000000000..16ba4b49e1
--- /dev/null
+++ b/docker-compose.local-db.yml
@@ -0,0 +1,42 @@
+version: "3"
+
+# このconfigは、 dockerでMisskey本体を起動せず、 redisとpostgresql などだけを起動します
+
+services:
+ redis:
+ restart: always
+ image: redis:7-alpine
+ ports:
+ - "6379:6379"
+ volumes:
+ - ./redis:/data
+ healthcheck:
+ test: "redis-cli ping"
+ interval: 5s
+ retries: 20
+
+ db:
+ restart: always
+ image: postgres:15-alpine
+ ports:
+ - "5432:5432"
+ env_file:
+ - .config/docker.env
+ volumes:
+ - ./db:/var/lib/postgresql/data
+ healthcheck:
+ test: "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"
+ interval: 5s
+ retries: 20
+
+# meilisearch:
+# restart: always
+# image: getmeili/meilisearch:v1.3.4
+# environment:
+# - MEILI_NO_ANALYTICS=true
+# - MEILI_ENV=production
+# env_file:
+# - .config/meilisearch.env
+# volumes:
+# - ./meili_data:/meili_data
+
diff --git a/docker-compose.yml.example b/docker-compose_example.yml
similarity index 100%
rename from docker-compose.yml.example
rename to docker-compose_example.yml
diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index e835c4aeee..0a7d86cc89 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -120,7 +120,6 @@ sensitive: "محتوى حساس"
add: "إضافة"
reaction: "التفاعلات"
reactions: "التفاعلات"
-reactionSetting: "التفاعلات المراد عرضها في منتقي التفاعلات."
reactionSettingDescription2: "اسحب لترتيب ، انقر للحذف ، استخدم \"+\" للإضافة."
rememberNoteVisibility: "تذكر إعدادت مدى رؤية الملاحظات"
attachCancel: "أزل المرفق"
@@ -418,7 +417,6 @@ share: "شارِك"
notFound: "غير موجود"
notFoundDescription: "تعذر العثور على صفحة يقود إليها هذا الرابط."
uploadFolder: "المجلد الافتراضي للرفع"
-cacheClear: "مسح ذاكرة التخزين المؤقت"
markAsReadAllNotifications: "وضع جميع الإشعارات كأنها مقروءة"
markAsReadAllUnreadNotes: "علّم جميع الملاحظات كمقروءة"
markAsReadAllTalkMessages: "علّم جميع الرسائل كمقروءة"
@@ -818,8 +816,6 @@ makeReactionsPublicDescription: "هذا سيجعل قائمة تفاعلاتك
classic: "تقليدي"
muteThread: "اكتم النقاش"
unmuteThread: "ارفع الكتم عن النقاش"
-ffVisibility: "مرئية المتابِعين/المتابَعين"
-ffVisibilityDescription: "يسمح لك بتحديد من يمكنهم رؤية متابِعيك ومتابَعيك."
continueThread: "اعرض بقية النقاش"
deleteAccountConfirm: "سيحذف حسابك نهائيًا، أتريد المتابعة؟"
incorrectPassword: "كلمة السر خاطئة."
@@ -948,9 +944,12 @@ rolesAssignedToMe: "الأدوار المسندة إلي"
resetPasswordConfirm: "هل تريد إعادة تعيين كلمة السر؟"
license: "الرخصة"
unfavoriteConfirm: "أتريد إزالتها من المفضلة؟"
+reactionsDisplaySize: "حجم التفاعلات"
+limitWidthOfReaction: "تصغير حجم التفاعلات"
noteIdOrUrl: "معرف الملاحظة أو رابطها"
video: "فيديو"
videos: "فيديوهات"
+dataSaver: "موفر البيانات"
accountMigration: "ترحيل الحساب"
accountMoved: "نقل هذا المستخدم حسابه:"
accountMovedShort: "رُحل هذا الحساب."
@@ -958,6 +957,7 @@ operationForbidden: "عملية ممنوعة"
forceShowAds: "أظهر الإعلانات التجارية دائما"
reactionsList: "التفاعلات"
renotesList: "إعادات النشر"
+notificationDisplay: "إشعارات"
leftTop: "أعلى اليسار"
rightTop: "أعلى اليمين"
leftBottom: "أسفل اليسار"
@@ -980,6 +980,7 @@ thisChannelArchived: "أُرشفت هذه القناة."
displayOfNote: "عرض الملاحظة"
initialAccountSetting: "إعداد الملف الشخصي"
youFollowing: "متابَع"
+preventAiLearning: "منع استخدام البيانات في تعليم الآلة"
options: "خيارات"
specifyUser: "مستخدم محدد"
failedToPreviewUrl: "تتعذر المعاينة"
@@ -993,12 +994,22 @@ later: "لاحقاً"
goToMisskey: "لميسكي"
additionalEmojiDictionary: "قواميس إيموجي إضافية"
installed: "مُثبت"
+enableServerMachineStats: "نشر إحصائيات عتاد الخادم"
+turnOffToImprovePerformance: "تفعيله قد يزيد الأداء."
+createInviteCode: "ولِّد دعوة"
+inviteCodeCreated: "ولِّدت دعوة"
+inviteLimitExceeded: "وصلتَ لحد عدد الدعوات المسموح لك توليدها."
+createLimitRemaining: "حد عدد الدعوات: {limit} دعوة"
expirationDate: "تاريخ انتهاء الصلاحية"
+noExpirationDate: "لا نهاية لصلاحيتها"
+inviteCodeUsedAt: "اُستخدم رمز الدعوة في"
+registeredUserUsingInviteCode: "اِستخدم رمز الدعوة"
unused: "غير مستعمَل"
expired: "منتهية صلاحيته"
icon: "الصورة الرمزية"
replies: "رد"
renotes: "أعد النشر"
+flip: "اقلب"
_initialAccountSetting:
accountCreated: "نجح إنشاء حسابك!"
letsStartAccountSetup: "إذا كنت جديدًا لنعدّ حسابك الشخصي."
@@ -1261,9 +1272,6 @@ _time:
minute: "د"
hour: "سا"
day: "ي"
-_timelineTutorial:
- title: "كيف تستخدم Misskey"
- step3_1: "هل نشرت ملاحظتك الأولى؟"
_2fa:
alreadyRegistered: "سجلت سلفًا جهازًا للاستيثاق بعاملين."
step1: "أولًا ثبّت تطبيق استيثاق على جهازك (مثل {a} و{b})."
@@ -1552,3 +1560,4 @@ _webhookSettings:
_moderationLogTypes:
suspend: "علِق"
resetPassword: "أعد تعيين كلمتك السرية"
+ createInvitation: "ولِّد دعوة"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index 6d6771ac0f..c659e13250 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -108,7 +108,6 @@ sensitive: "সংবেদনশীল বিষয়বস্তু"
add: "যুক্ত করুন"
reaction: "প্রতিক্রিয়া"
reactions: "প্রতিক্রিয়া"
-reactionSetting: "রিঅ্যাকশন পিকারে যেসকল প্রতিক্রিয়া দেখানো হবে"
reactionSettingDescription2: "পুনরায় সাজাতে টেনে আনুন, মুছতে ক্লিক করুন, যোগ করতে + টিপুন।"
rememberNoteVisibility: "নোটের দৃশ্যমান্যতার সেটিংস মনে রাখুন"
attachCancel: "অ্যাটাচমেন্ট সরান "
@@ -393,7 +392,6 @@ share: "শেয়ার"
notFound: "পাওয়া যায়নি"
notFoundDescription: "এই URL-এর সাথে সম্পর্কিত কোনো পৃষ্ঠা নেই।"
uploadFolder: "আপলোডের জন্য ডিফল্ট ফোল্ডার"
-cacheClear: "ক্যাশ পরিষ্কার করুন"
markAsReadAllNotifications: "সমস্ত বিজ্ঞপ্তিগুলি পঠিত হিসাবে চিহ্নিত করুন"
markAsReadAllUnreadNotes: "সমস্ত নোটগুলি পঠিত হিসাবে চিহ্নিত করুন"
markAsReadAllTalkMessages: "সমস্ত মেসেজ পঠিত হিসাবে চিহ্নিত করুন"
@@ -795,8 +793,6 @@ makeReactionsPublicDescription: "আপনার পূর্ববর্তী
classic: "ক্লাসিক"
muteThread: "থ্রেড মিউট করুন"
unmuteThread: "থ্রেড আনমিউট করুন"
-ffVisibility: "অনুসরণ/অনুসরণকারীদের দৃশ্যমান্যতা"
-ffVisibilityDescription: "আপনি কাকে অনুসরণ করেন এবং কে আপনাকে অনুসরণ করে, সেটা কারা দেখতে পাবে তা নির্ধারণ করে।"
continueThread: "আরো থ্রেড দেখুন"
deleteAccountConfirm: "আপনার অ্যাকাউন্ট মুছে ফেলা হবে। ঠিক আছে?"
incorrectPassword: "আপনার দেওয়া পাসওয়ার্ডটি ভুল।"
@@ -840,6 +836,7 @@ youFollowing: "অনুসরণ করা হচ্ছে"
icon: "প্রোফাইল ছবি"
replies: "জবাব"
renotes: "রিনোট"
+flip: "উল্টান"
_role:
priority: "অগ্রাধিকার"
_priority:
@@ -995,9 +992,6 @@ _theme:
infoFg: "তথ্যের পাঠ্য"
infoWarnBg: "ওয়ার্নিং এর পটভূমি"
infoWarnFg: "ওয়ার্নিং এর পাঠ্য"
- cwBg: "CW বাটনের পটভূমি"
- cwFg: "CW বাটনের পাঠ্য"
- cwHoverBg: "CW বাটনের পটভূমি (হভার)"
toastBg: "বিজ্ঞপ্তির পটভূমি"
toastFg: "বিজ্ঞপ্তির পাঠ্য"
buttonBg: "বাটনের পটভূমি"
diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index 915388006f..727e473cf3 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -45,6 +45,7 @@ pin: "Fixar al perfil"
unpin: "Para de fixar del perfil"
copyContent: "Copiar el contingut"
copyLink: "Copiar l'enllaç"
+copyLinkRenote: "Copiar l'enllaç de la renota"
delete: "Elimina"
deleteAndEdit: "Elimina i edita"
deleteAndEditConfirm: "Segur que vols eliminar aquesta publicació i editar-la? Perdràs totes les reaccions, impulsos i respostes."
@@ -110,6 +111,8 @@ renoted: "S'ha impulsat"
cantRenote: "No es pot impulsar aquesta publicació"
cantReRenote: "No es pot impulsar l'impuls."
quote: "Cita"
+inChannelRenote: "Renotar només al Canal"
+inChannelQuote: "Citar només al Canal"
pinnedNote: "Nota fixada"
pinned: "Fixar al perfil"
you: "Tu"
@@ -118,7 +121,12 @@ sensitive: "NSFW"
add: "Afegir"
reaction: "Reaccions"
reactions: "Reaccions"
-reactionSetting: "Reaccions a mostrar al selector de reaccions"
+emojiPicker: "Selecció d'emojis"
+pinnedEmojisForReactionSettingDescription: "Selecciona l'emoji amb el qual reaccionar"
+pinnedEmojisSettingDescription: "Selecciona l'emoji amb el qual reaccionar"
+emojiPickerDisplay: "Visualitza el selector d'emojis"
+overwriteFromPinnedEmojisForReaction: "Reemplaça els emojis de la reacció"
+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"
@@ -127,6 +135,8 @@ unmarkAsSensitive: "Deixar de marcar com a sensible"
enterFileName: "Defineix nom del fitxer"
mute: "Silencia"
unmute: "Deixa de silenciar"
+renoteMute: "Silenciar Renotes"
+renoteUnmute: "Treure el silenci de les renotes"
block: "Bloqueja"
unblock: "Desbloqueja"
suspend: "Suspèn"
@@ -136,6 +146,8 @@ 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?"
selectList: "Tria una llista"
+editList: "Editar llista"
+selectChannel: "Selecciona un canal"
selectAntenna: "Tria una antena"
editAntenna: "Modificar antena"
selectWidget: "Triar un giny"
@@ -150,6 +162,9 @@ addEmoji: "Afegeix un emoji"
settingGuide: "Configuració recomanada"
cacheRemoteFiles: "Emmagatzemar fitxers remots"
cacheRemoteFilesDescription: "Quan aquesta opció està desactivada, els fitxers remots es carreguen directament des del servidor remot. Si desactiveu això, es reduirà l'ús d'emmagatzematge, però augmentarà el trànsit, ja que no es generaran miniatures."
+youCanCleanRemoteFilesCache: "Pots netejar la memòria cau fent clic al botó de la paperera🗑️ a l'administrador d'arxius."
+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: "Marca aquest compte com a bot"
flagAsCat: "Marca aquest compte com a gat"
@@ -158,6 +173,7 @@ flagShowTimelineReplies: "Mostra les respostes 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"
loginFailed: "S'ha produït un error al accedir."
showOnRemote: "Navega més en el perfil original"
general: "General"
@@ -184,6 +200,7 @@ perHour: "Per hora"
perDay: "Per dia"
stopActivityDelivery: "Deixa d'enviar activitats"
blockThisInstance: "Deixa d'enviar activitats"
+silenceThisInstance: "Silencia aquesta instància "
operations: "Accions"
software: "Programari"
version: "Versió"
@@ -202,6 +219,9 @@ clearQueueConfirmText: "Les notes no lliurades que quedin a la cua no es federar
clearCachedFiles: "Esborra la memòria cau"
clearCachedFilesConfirm: "Segur que voleu eliminar tots els fitxers de la memòria cau?"
blockedInstances: "Instàncies bloquejades"
+blockedInstancesDescription: "Llista els enllaços d'amfitrió de les instàncies que vols bloquejar separades per un salt de pàgina. Les instàncies llistades no podran comunicar-se amb aquesta instància."
+silencedInstances: "Instàncies silenciades"
+silencedInstancesDescription: "Llista els enllaços d'amfitrió de les instàncies que vols silenciar. Tots els comptes de les instàncies llistades s'establiran com silenciades i només podran fer sol·licitacions de seguiment, i no podran mencionar als comptes locals si no els segueixen. Això no afectarà les instàncies bloquejades."
muteAndBlock: "Silencia i bloca"
mutedUsers: "Usuaris silenciats"
blockedUsers: "Usuaris bloquejats"
@@ -216,9 +236,12 @@ preview: "Vista prèvia"
default: "Per defecte"
defaultValueIs: "Per defecte: {value}"
noCustomEmojis: "Cap emoji personalitzat"
+noJobs: "No hi ha feines"
federating: "Federant"
blocked: "Bloquejat"
suspended: "Suspés"
+all: "tot"
+subscribing: "Subscrit a"
publishing: "S'està publicant"
notResponding: "Sense resposta"
instanceFollowing: "Seguits del servidor"
@@ -243,11 +266,31 @@ removed: "Eliminat"
removeAreYouSure: "Segur que voleu retirar «{x}»?"
deleteAreYouSure: "Segur que voleu retirar «{x}»?"
resetAreYouSure: "Segur que voleu restablir-ho?"
+areYouSure: "Està segur?"
saved: "S'ha desat"
messaging: "Xat"
upload: "Puja"
+keepOriginalUploading: "Guarda la imatge original"
+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 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 prendre un temps"
+explore: "Explora"
+messageRead: "Vist"
+noMoreHistory: "No hi resta més per veure"
+startMessaging: "Començar a xatejar"
+nUsersRead: "Vist per {n}"
+agreeTo: "Accepto que {0}"
+agree: "Hi estic d'acord"
+agreeBelow: "Hi estic d'acord amb el següent"
+basicNotesBeforeCreateAccount: "Notes importants"
+termsOfService: "Condicions d'ús"
start: "Comença"
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: "Imatges"
@@ -263,16 +306,34 @@ dark: "Fosc"
lightThemes: "Temes clars"
darkThemes: "Temes foscos"
syncDeviceDarkMode: "Sincronitza el mode fosc amb la configuració del dispositiu"
+drive: "Unitat"
+fileName: "Nom del Fitxer"
+selectFile: "Selecciona fitxers"
+selectFiles: "Selecciona fitxers"
+selectFolder: "Selecció de carpeta"
+selectFolders: "Selecció de carpeta"
renameFile: "Canvia el nom del fitxer"
folderName: "Nom de la carpeta"
createFolder: "Crea una carpeta"
renameFolder: "Canvia el nom de la carpeta"
deleteFolder: "Elimina la carpeta"
+folder: "Carpeta "
addFile: "Afegeix un fitxer"
+emptyDrive: "La teva unitat és buida"
emptyFolder: "La carpeta està buida"
unableToDelete: "No es pot eliminar"
+inputNewFileName: "Introduïu el nom de fitxer nou"
+inputNewDescription: "Inserta una nova llegenda"
+inputNewFolderName: "Introduïu el nom de la carpeta nova"
+circularReferenceFolder: "La carpeta destinatària és una subcarpeta de la carpeta a la qual la desitges moure"
+hasChildFilesOrFolders: "No és possible esborrar aquesta carpeta ja que no és buida"
copyUrl: "Copia l'URL"
rename: "Canvia el nom"
+avatar: "Icona"
+banner: "Bàner"
+displayOfSensitiveMedia: "Visualització de contingut sensible"
+whenServerDisconnected: "Quan es perdi la connexió al servidor"
+disconnectedFromServer: "Desconnectat pel servidor"
reload: "Actualitza"
doNothing: "Ignora"
accept: "Accepta"
@@ -342,33 +403,132 @@ notFound: "No s'ha trobat"
markAsReadAllUnreadNotes: "Marca-ho tot com a llegit"
help: "Ajuda"
invites: "Convida"
+title: "Títol"
+text: "Text"
+enable: "Habilita"
next: "Següent"
+retype: "Torneu a introduir-la"
noteOf: "Publicació de: {user}"
+quoteAttached: "Frase adjunta"
+quoteQuestion: "Vols annexar-la com a cita?"
+noMessagesYet: "Encara no hi ha missatges"
+newMessageExists: "Has rebut un nou missatge"
+onlyOneFileCanBeAttached: "Només pots adjuntar un fitxer a un missatge"
+signinRequired: "Si us plau, Registra't o inicia la sessió abans de continuar"
invitations: "Convida"
+invitationCode: "Codi d'invitació"
+checking: "Comprovació en curs..."
+available: "Disponible"
+unavailable: "No és disponible"
+usernameInvalidFormat: "Pots fer servir lletres (majúscules i minúscules), números i barres baixes (\"_\")"
+tooShort: "Massa curt"
+tooLong: "Massa llarg"
+weakPassword: "Contrasenya insegura"
+normalPassword: "Bona contrasenya"
+strongPassword: "Contrasenya segura"
+passwordMatched: "Correcte!"
+passwordNotMatched: "No coincideix"
+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"
+uiLanguage: "Idioma de l'interfície"
+aboutX: "Respecte a {x}"
+emojiStyle: "Estil d'emoji"
+native: "Nadiu"
+disableDrawer: "No mostrar els menús en calaixos"
+showNoteActionsOnlyHover: "Només mostra accions de la nota en passar amb el cursor"
+noHistory: "No hi ha un registre previ"
+signinHistory: "Historial d'autenticacions"
+enableAdvancedMfm: "Habilitar l'MFM avançat"
+enableAnimatedMfm: "Habilitar l'MFM amb moviment"
+doing: "Processant..."
+category: "Categoria"
tags: "Etiquetes"
docSource: "Font del document"
createAccount: "Crea un compte"
existingAccount: "Compte existent"
regenerate: "Regenera"
fontSize: "Mida del text"
+mediaListWithOneImageAppearance: "Altura de la llista de fitxers amb una única imatge"
+limitTo: "Limita a {x}"
noFollowRequests: "No tens sol·licituds de seguiment"
+openImageInNewTab: "Obre imatges a una nova pestanya"
dashboard: "Panell de control"
local: "Local"
remote: "Remot"
total: "Total"
+weekOverWeekChanges: "Canvis l'última setmana"
+dayOverDayChanges: "Canvis ahir"
appearance: "Aparença"
clientSettings: "Configuració del client"
accountSettings: "Configuració del compte"
+promotion: "Promocionat"
+promote: "Promoure"
+numberOfDays: "Nombre de dies"
hideThisNote: "Amaga la publicació"
showFeaturedNotesInTimeline: "Mostra publicacions destacades en la línia de temps"
+objectStorage: "Emmagatzematge d'objectes\n"
+useObjectStorage: "Utilitzar l'emmagatzematge d'objectes"
+objectStorageBaseUrl: "Base d'enllaç"
+objectStorageBaseUrlDesc: "Prefix d'enllaç utilitzat per a fer referencia als fitxers. Especifica l'enllaç del teu CDN o Proxy si n'estàs utilitzant qualsevol, en cas contrari, especifica l'enllaç al que es pot accedir públicament segons la guia de servei que vosté utilitza.\nPer l'ús d'S3 utilitza 'https://.s3.amazonaws.com' I per a GCS o serveis equivalents utilitza 'https://storage.googleapis.com/'."
newNoteRecived: "Hi ha publicacions noves"
installedDate: "Data d'instal·lació"
state: "Estat"
sort: "Ordena"
ascendingOrder: "Ascendent"
descendingOrder: "Descendent"
+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"
+yourAccountSuspendedTitle: "Aquest compte és suspès"
+yourAccountSuspendedDescription: "Aquest compte ha sigut suspès a causa de la violació de les condicions d'ús o similars. Contacta l'administrador si en vol saber més. Si us plau, no en faci un altre compte."
+tokenRevoked: "Codi de seguretat no vàlid"
+tokenRevokedDescription: "La petició més recent ha estat denegada perquè contenia un codi de seguretat no vàlid. Actualitza la pàgina i torna-ho a provar."
+accountDeleted: "Compte eliminat amb èxit"
+accountDeletedDescription: "Aquest compte ha sigut eliminat"
+menu: "Menú"
+divider: "Divisor"
+addItem: "Afegir element"
+rearrange: "Torna a ordenar"
+relays: "Relés"
+addRelay: "Afegeix relés"
+inboxUrl: "Enllaç de la safata d'entrada"
+addedRelays: "Relés afegits"
+serviceworkerInfo: "És obligatòria l'activació per a obtenir notificacions push"
deletedNote: "Publicacions eliminades"
invisibleNote: "Publicacions amagades"
+enableInfiniteScroll: "Carrega més automàticament\n"
+visibility: "Visibilitat"
+poll: "Enquesta"
+useCw: "Amaga el contingut"
+enablePlayer: "Obre el reproductor de vídeo"
+disablePlayer: "Tanca el reproductor de vídeo"
+expandTweet: "Expandir post"
+themeEditor: "Editor de temes"
+description: "Descripció"
+describeFile: "Afegir subtitulació"
+enterFileDescription: "Afegeix un títol"
+author: "Autor"
+leaveConfirm: "Hi ha canvis sense guardar. Els vols descartar?"
+manage: "Administració"
+plugins: "Extensions"
+preferencesBackups: "Configuracions de les Còpies de seguretat"
+deck: "Escriptori"
+undeck: "Tanca l'escriptori"
+useBlurEffectForModal: "Utilitzar l'efecte de difuminació a modals"
+useFullReactionPicker: "Utilitza el cercador de reaccions d'escala sencera"
+width: "Amplada"
+height: "Alçària"
+large: "Gran"
+medium: "Mitjà"
+small: "Petit"
+generateAccessToken: "Genera codi d'accés"
+permission: "Permisos"
+enableAll: "Habilita tot"
+disableAll: "Deshabilita tot"
+tokenRequested: "Donar accés al compte"
smtpHost: "Amfitrió"
smtpUser: "Nom d'usuari"
smtpPass: "Contrasenya"
@@ -378,12 +538,17 @@ clearCache: "Esborra la memòria cau"
showingPastTimeline: "Estàs veient una línia de temps antiga"
info: "Informació"
user: "Usuaris"
+administration: "Administració"
+middle: "Mitjà"
global: "Global"
searchByGoogle: "Cercar"
file: "Fitxers"
+icon: "Icona"
replies: "Respondre"
renotes: "Impulsa"
_role:
+ _priority:
+ middle: "Mitjà"
_options:
antennaMax: "Nombre màxim d'antenes"
_email:
@@ -392,9 +557,11 @@ _email:
_instanceMute:
instanceMuteDescription: "Silencia tots els impulsos dels servidors seleccionats, també els usuaris que responen a altres d'un servidor silenciat."
_theme:
+ description: "Descripció"
keys:
mention: "Menció"
renote: "Renotar"
+ divider: "Divisor"
_sfx:
note: "Notes"
notification: "Notificacions"
@@ -436,6 +603,8 @@ _timelines:
local: "Local"
social: "Social"
global: "Global"
+_play:
+ summary: "Descripció"
_pages:
contents: "Contingut"
blocks:
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index db9105a13a..1e064c4911 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -120,7 +120,6 @@ sensitive: "NSFW"
add: "Přidat"
reaction: "Reakce"
reactions: "Reakce"
-reactionSetting: "Reakce zobrazené ve výběru reakcí"
reactionSettingDescription2: "Přetažením změníte pořadí, kliknutím smažete, zmáčkněte \"+\" k přidání"
rememberNoteVisibility: "Zapamatovat nastavení zobrazení poznámky"
attachCancel: "Odstranit přílohu"
@@ -428,7 +427,6 @@ share: "Sdílet"
notFound: "Nenalezeno"
notFoundDescription: "Nebyla nalezená žádná stránka korespondující se zadanou URL."
uploadFolder: "Výchozí lokace pro upload"
-cacheClear: "Vymazat cache"
markAsReadAllNotifications: "Označit všechna oznámení za přečtená"
markAsReadAllUnreadNotes: "Označit všechny příspěvky za přečtené"
markAsReadAllTalkMessages: "Označit všechny zprávy za přečtené"
@@ -856,8 +854,6 @@ makeReactionsPublicDescription: "Tohle zviditelný seznam vašich předchozích
classic: "Klasický"
muteThread: "Ztlumit vlákno"
unmuteThread: "Zrušit ztlumení vlákna"
-ffVisibility: "Viditelnost Sledovaných/Sledujících"
-ffVisibilityDescription: "Umožní vám nastavit kdo uvidí koho sledujete a kdo vás sleduje."
continueThread: "Zobrazit pokračování vlákna"
deleteAccountConfirm: "Tohle nenávratně smaže váš účet, chcete pokračovat?"
incorrectPassword: "Nesprávné heslo."
@@ -1096,6 +1092,7 @@ iHaveReadXCarefullyAndAgree: "Přečetl jsem si text \"{x}\" a souhlasím s ním
icon: "Avatar"
replies: "Odpovědět"
renotes: "Přeposlat"
+flip: "Otočit"
_initialAccountSetting:
accountCreated: "Váš účet byl úspěšně vytvořen!"
letsStartAccountSetup: "Pro začátek si nastavte svůj profil."
@@ -1108,7 +1105,6 @@ _initialAccountSetting:
pushNotificationDescription: "Povolení push oznámení vám umožní přijímat oznámení od {name} přímo ve vašem zařízení."
initialAccountSettingCompleted: "Nastavení profilu dokončeno!"
haveFun: "Užívejte {name}!"
- ifYouNeedLearnMore: "Pokud se chcete dozvědět více o tom, jak používat {name} (Misskey), navštivte {link}."
skipAreYouSure: "Opravdu chcete přeskočit nastavení profilu?"
laterAreYouSure: "Opravdu chcete provést nastavení profilu později?"
_serverRules:
@@ -1622,9 +1618,6 @@ _theme:
infoFg: "Text informací"
infoWarnBg: "Pozadí varování"
infoWarnFg: "Text varování"
- cwBg: "Pozadí CW tlačítka"
- cwFg: "Text CW tlačítka"
- cwHoverBg: "Pozadí CW tlačítka (Hover)"
toastBg: "Pozadí oznámení"
toastFg: "Text oznámení"
buttonBg: "Pozadí tlačítka"
@@ -1660,16 +1653,6 @@ _time:
minute: "Minut"
hour: "Hodin"
day: "Dnů"
-_timelineTutorial:
- title: "Jak používat Misskey"
- step1_1: "Toto je \"časová osa\". Zde se chronologicky zobrazují všechny \"poznámky\" odeslané na {name}."
- step1_2: "Existuje několik různých časových plánů. Například \"Domácí časová osa\" bude obsahovat poznámky uživatelů, které sledujete, a \"Místní časová osa\" bude obsahovat poznámky všech uživatelů {name}."
- step2_1: "Zkusme zveřejnit poznámku. Můžete tak učinit stisknutím tlačítka s ikonou tužky."
- step2_2: "Co takhle napsat sebepředstavení, nebo jen \"Ahoj {name}!\", pokud se vám nechce?"
- step3_1: "Dokončil jsi svou první poznámku?"
- step3_2: "Na časové ose by se nyní měla zobrazit vaše první poznámka."
- step4_1: "K poznámkám můžete také připojit \"Reakce\"."
- step4_2: "Chcete-li připojit reakci, stiskněte na poznámce znaménko \"+\" a vyberte emoji, kterým chcete reagovat."
_2fa:
alreadyRegistered: "Již jste zaregistrovali dvoufaktorové ověřovací zařízení."
registerTOTP: "Registrovat aplikaci autentizátoru"
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index e8a1da4821..4c32b3dda4 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -121,7 +121,6 @@ sensitive: "Sensibel"
add: "Hinzufügen"
reaction: "Reaktionen"
reactions: "Reaktionen"
-reactionSetting: "In der Reaktionsauswahl anzuzeigende Reaktionen"
reactionSettingDescription2: "Ziehe um Anzuordnen, klicke um zu löschen, drücke „+“ um hinzuzufügen"
rememberNoteVisibility: "Notizsichtbarkeit merken"
attachCancel: "Anhang entfernen"
@@ -195,6 +194,7 @@ perHour: "Pro Stunde"
perDay: "Pro Tag"
stopActivityDelivery: "Senden von Aktivitäten einstellen"
blockThisInstance: "Diese Instanz blockieren"
+silenceThisInstance: "Instanz stummschalten"
operations: "Aktionen"
software: "Software"
version: "Version"
@@ -214,6 +214,8 @@ clearCachedFiles: "Cache leeren"
clearCachedFilesConfirm: "Sollen alle im Cache gespeicherten Dateien von anderen Instanzen wirklich gelöscht werden?"
blockedInstances: "Blockierte Instanzen"
blockedInstancesDescription: "Gib die Hostnamen der Instanzen, welche blockiert werden sollen, durch Zeilenumbrüche getrennt an. Blockierte Instanzen können mit dieser instanz nicht mehr kommunizieren."
+silencedInstances: "Stummgeschaltete Instanzen"
+silencedInstancesDescription: "Gib die Hostnamen der Instanzen, welche stummgeschaltet werden sollen, durch Zeilenumbrüche getrennt an. Alle Konten dieser Instanzen werden als stummgeschaltet behandelt, können nur noch Follow-Anfragen stellen und wenn nicht gefolgt keine lokalen Konten erwähnen. Blockierte Instanzen sind davon nicht betroffen."
muteAndBlock: "Stummschaltungen und Blockierungen"
mutedUsers: "Stummgeschaltete Benutzer"
blockedUsers: "Blockierte Benutzer"
@@ -308,6 +310,7 @@ folderName: "Ordnername"
createFolder: "Ordner erstellen"
renameFolder: "Ordner umbenennen"
deleteFolder: "Ordner löschen"
+folder: "Ordner"
addFile: "Datei hinzufügen"
emptyDrive: "Deine Drive ist leer"
emptyFolder: "Dieser Ordner ist leer"
@@ -434,7 +437,6 @@ share: "Teilen"
notFound: "Nicht gefunden"
notFoundDescription: "Es konnte keine Seite unter dieser URL gefunden werden."
uploadFolder: "Standardordner für Uploads"
-cacheClear: "Cache leeren"
markAsReadAllNotifications: "Alle Benachrichtigungen als gelesen markieren"
markAsReadAllUnreadNotes: "Alle Notizen als gelesen markieren"
markAsReadAllTalkMessages: "Alle Chats als gelesen markieren"
@@ -531,6 +533,7 @@ serverLogs: "Serverprotokolle"
deleteAll: "Alle löschen"
showFixedPostForm: "Bereich zum Schreiben neuer Notizen am Anfang der Chronik anzeigen"
showFixedPostFormInChannel: "Bereich zum Schreiben neuer Notizen am Anfang der Chronik anzeigen (Kanäle)"
+withRepliesByDefaultForNewlyFollowed: "Standardmäßig Antworten von neu gefolgten Benutzern in der Chronik anzeigen"
newNoteRecived: "Es gibt neue Notizen"
sounds: "Töne"
sound: "Töne"
@@ -540,6 +543,8 @@ showInPage: "In einer Seite anzeigen"
popout: "Pop-Up"
volume: "Lautstärke"
masterVolume: "Gesamtlautstärke"
+notUseSound: "Gebe kein Ton aus"
+useSoundOnlyWhenActive: "Gebe nur Ton aus, wenn Misskey aktiv ist"
details: "Details"
chooseEmoji: "Emoji auswählen"
unableToProcess: "Der Vorgang konnte nicht abgeschlossen werden"
@@ -560,6 +565,10 @@ output: "Ausgabe"
script: "Skript"
disablePagesScript: "AiScript auf Seiten deaktivieren"
updateRemoteUser: "Benutzerinformationen aktualisieren"
+unsetUserAvatar: "Entferne Profilbild"
+unsetUserAvatarConfirm: "Möchtest du dein Profilbild entfernen?"
+unsetUserBanner: "Entferne Profilbanner"
+unsetUserBannerConfirm: "Möchtest du dein Profilbanner entfernen?"
deleteAllFiles: "Alle Dateien löschen"
deleteAllFilesConfirm: "Möchtest du wirklich alle Dateien löschen?"
removeAllFollowing: "Allen gefolgten Benutzern entfolgen"
@@ -794,7 +803,7 @@ active: "Aktiv"
offline: "Offline"
notRecommended: "Nicht empfohlen"
botProtection: "Schutz vor Bots"
-instanceBlocking: "Blockierte Instanzen"
+instanceBlocking: "Blockierte/Stummgeschaltete Instanzen"
selectAccount: "Benutzerkonto auswählen"
switchAccount: "Konto wechseln"
enabled: "Aktiviert"
@@ -864,8 +873,6 @@ makeReactionsPublicDescription: "Jeder wird die Liste deiner gesendeten Reaktion
classic: "Classic"
muteThread: "Thread stummschalten"
unmuteThread: "Threadstummschaltung aufheben"
-ffVisibility: "Sichtbarkeit von Gefolgten/Followern"
-ffVisibilityDescription: "Konfiguriere wer sehen kann, wem du folgst sowie wer dir folgt."
continueThread: "Weiteren Threadverlauf anzeigen"
deleteAccountConfirm: "Dein Benutzerkonto wird unwiderruflich gelöscht. Trotzdem fortfahren?"
incorrectPassword: "Falsches Passwort."
@@ -975,6 +982,7 @@ assign: "Zuweisen"
unassign: "Entfernen"
color: "Farbe"
manageCustomEmojis: "Kann benutzerdefinierte Emojis verwalten"
+manageAvatarDecorations: "Profilbilddekorationen verwalten"
youCannotCreateAnymore: "Du hast das Erstellungslimit erreicht."
cannotPerformTemporary: "Vorübergehend nicht verfügbar"
cannotPerformTemporaryDescription: "Diese Aktion ist wegen des Überschreitenes des Ausführungslimits temporär nicht verfügbar. Bitte versuche es nach einiger Zeit erneut."
@@ -1015,6 +1023,8 @@ 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."
+hiddenTags: "Ausgeblendete Hashtags"
+hiddenTagsDescription: "Die hier eingestellten Tags werden nicht mehr in den Trends angezeigt. Mit der Umschalttaste können mehrere ausgewählt werden."
notesSearchNotAvailable: "Die Notizsuche ist nicht verfügbar."
license: "Lizenz"
unfavoriteConfirm: "Wirklich aus Favoriten entfernen?"
@@ -1027,6 +1037,7 @@ enableChartsForRemoteUser: "Diagramme für Nutzer fremder Instanzen erstellen"
enableChartsForFederatedInstances: "Diagramme für fremde Instanzen erstellen"
showClipButtonInNoteFooter: "\"Clip\" zum Notizmenu hinzufügen"
reactionsDisplaySize: "Reaktionsanzeigegröße"
+limitWidthOfReaction: "Begrenze die Breite der Reaktion und zeige sie verkleinert an"
noteIdOrUrl: "Notiz-ID oder URL"
video: "Video"
videos: "Videos"
@@ -1128,7 +1139,32 @@ mutualFollow: "Gegenseitig gefolgt"
fileAttachedOnly: "Nur Notizen mit Dateien"
showRepliesToOthersInTimeline: "Antworten in Chronik anzeigen"
hideRepliesToOthersInTimeline: "Antworten nicht in Chronik anzeigen"
+showRepliesToOthersInTimelineAll: "Antworten von allen momentan gefolgten Benutzern in Chronik anzeigen"
+hideRepliesToOthersInTimelineAll: "Antworten von allen momentan gefolgten Benutzern nicht in Chronik anzeigen"
+confirmShowRepliesAll: "Dies ist eine unwiderrufliche Aktion. Wirklich Antworten von allen momentan gefolgten Benutzern in der Chronik anzeigen?"
+confirmHideRepliesAll: "Dies ist eine unwiderrufliche Aktion. Wirklich Antworten von allen momentan gefolgten Benutzern nicht in der Chronik anzeigen?"
externalServices: "Externe Dienste"
+impressum: "Impressum"
+impressumUrl: "Impressums-URL"
+impressumDescription: "In manchen Ländern, wie Deutschland und dessen Umgebung, ist die Angabe von Betreiberinformationen (ein Impressum) bei kommerziellem Betrieb zwingend."
+privacyPolicy: "Datenschutzerklärung"
+privacyPolicyUrl: "Datenschutzerklärungs-URL"
+tosAndPrivacyPolicy: "Nutzungsbedingungen und Datenschutzerklärung"
+avatarDecorations: "Profilbilddekoration"
+attach: "Anbringen"
+detach: "Entfernen"
+angle: "Winkel"
+flip: "Umdrehen"
+showAvatarDecorations: "Profilbilddekoration anzeigen"
+releaseToRefresh: "Zum Aktualisieren loslassen"
+refreshing: "Wird aktualisiert..."
+pullDownToRefresh: "Zum Aktualisieren ziehen"
+disableStreamingTimeline: "Echtzeitaktualisierung der Chronik deaktivieren"
+useGroupedNotifications: "Benachrichtigungen gruppieren"
+signupPendingError: "Beim Überprüfen der Mailadresse ist etwas schiefgelaufen. Der Link könnte abgelaufen sein."
+cwNotationRequired: "Ist \"Inhaltswarnung verwenden\" aktiviert, muss eine Beschreibung gegeben werden."
+doReaction: "Reagieren"
+code: "Code"
_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."
@@ -1138,6 +1174,9 @@ _announcement:
tooManyActiveAnnouncementDescription: "Zu viele aktive Ankündigungen können die Benutzerfreundlichkeit verschlechtern. Es wird empfohlen, veraltete Ankündigungen zu archivieren."
readConfirmTitle: "Als gelesen markieren?"
readConfirmText: "Dies markiert den Inhalt von \"{title}\" als gelesen."
+ dialogAnnouncementUxWarn: "Bei der Verwendung von mehr als zwei Meldungen im Dialog-Format wird um Vorsicht geboten, da dies negative Auswirkungen auf die UX haben kann."
+ silence: "Keine Benachrichtigung"
+ silenceDescription: "Wenn aktiviert, gibt diese Meldung keine Nachricht aus und muss nicht als \"gelesen\" markiert werden."
_initialAccountSetting:
accountCreated: "Dein Konto wurde erfolgreich erstellt!"
letsStartAccountSetup: "Lass uns nun dein Konto einrichten."
@@ -1150,9 +1189,20 @@ _initialAccountSetting:
pushNotificationDescription: "Durch die Aktivierung von Push-Benachrichtigungen kannst du von {name} Benachrichtigungen direkt auf dein Gerät erhalten."
initialAccountSettingCompleted: "Kontoeinrichtung abgeschlossen!"
haveFun: "Viel Spaß mit {name}!"
- ifYouNeedLearnMore: "Besuche {link}, falls du mehr über {name} (Misskey) lernen möchtest."
+ youCanContinueTutorial: "Du kannst mit dem Tutorial von {name}(Misskey) fortfahren, oder auch abbrechen und gleich anfangen Misskey zu benutzen."
+ startTutorial: "Fange mit dem Tutorial an"
skipAreYouSure: "Die Kontoeinrichtung wirklich überspringen?"
laterAreYouSure: "Die Kontoeinrichtung wirklich später erledigen?"
+_initialTutorial:
+ launchTutorial: "Tutorial ansehen"
+ title: "Tutorial"
+ wellDone: "Gut gemacht!"
+ skipAreYouSure: "Möchtest du das Tutorial verlassen?"
+ _landing:
+ title: "Willkommen zum Tutorial"
+ description: "Hier kannst du sehen, wie Misskey funktioniert"
+ _note:
+ title: "Was sind Notizen?"
_serverRules:
description: "Eine Reihe von Regeln, die vor der Registrierung angezeigt werden. Eine Zusammenfassung der Nutzungsbedingungen anzuzeigen ist empfohlen."
_serverSettings:
@@ -1164,6 +1214,7 @@ _serverSettings:
manifestJsonOverride: "Überschreiben von manifest.json"
shortName: "Abkürzung"
shortNameDescription: "Ein Kürzel für den Namen der Instanz, der angezeigt werden kann, falls der volle Instanzname lang ist."
+ 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."
_accountMigration:
moveFrom: "Von einem anderen Konto zu diesem migrieren"
moveFromSub: "Alias für ein anderes Konto erstellen"
@@ -1464,6 +1515,7 @@ _role:
inviteLimitCycle: "Zyklus des Einladungslimits"
inviteExpirationTime: "Gültigkeitsdauer von Einladungen"
canManageCustomEmojis: "Benutzerdefinierte Emojis verwalten"
+ canManageAvatarDecorations: "Profilbilddekorationen verwalten"
driveCapacity: "Drive-Kapazität"
alwaysMarkNsfw: "Dateien immer als NSFW markieren"
pinMax: "Maximale Anzahl an angehefteten Notizen"
@@ -1527,6 +1579,10 @@ _ad:
reduceFrequencyOfThisAd: "Diese Werbung weniger anzeigen"
hide: "Ausblenden"
timezoneinfo: "Der Wochentag wird durch die Serverzeitzone bestimmt."
+ adsSettings: "Werbeeinstellungen"
+ notesPerOneAd: "Werbeintervall während Echtzeitaktualisierung (Notizen pro Werbung)"
+ setZeroToDisable: "Setze dies auf 0, um Werbung während Echtzeitaktualisierung zu deaktivieren"
+ adsTooClose: "Durch den momentan sehr niedrigen Werbeintervall kann es zu einer starken Verschlechterung der Benutzererfahrung kommen."
_forgotPassword:
enterEmail: "Gib die Email-Adresse ein, mit der du dich registriert hast. An diese wird ein Link gesendet, mit dem du dein Passwort zurücksetzen kannst."
ifNoEmail: "Solltest du bei der Registrierung keine Email-Adresse angegeben haben, wende dich bitte an den Administrator."
@@ -1579,6 +1635,7 @@ _aboutMisskey:
donate: "An Misskey spenden"
morePatrons: "Wir schätzen ebenso die Unterstützung vieler anderer hier nicht gelisteter Personen sehr. Danke! 🥰"
patrons: "UnterstützerInnen"
+ projectMembers: "Projektmitglieder"
_displayOfSensitiveMedia:
respect: "Sensible Medien verbergen"
ignore: "Sensible Medien anzeigen"
@@ -1675,9 +1732,6 @@ _theme:
infoFg: "Text von Informationen"
infoWarnBg: "Hintergrund von Warnungen"
infoWarnFg: "Text von Warnungen"
- cwBg: "Hintergrund des Inhaltswarnungsknopfs"
- cwFg: "Text des Inhaltswarnungsknopfs"
- cwHoverBg: "Hintergrund des Inhaltswarnungsknopfs (Mouseover)"
toastBg: "Hintergrund von Benachrichtigungen"
toastFg: "Text von Benachrichtigungen"
buttonBg: "Hintergrund von Schaltflächen"
@@ -1713,16 +1767,6 @@ _time:
minute: "Minute(n)"
hour: "Stunde(n)"
day: "Tag(en)"
-_timelineTutorial:
- title: "Wie du Misskey verwendest"
- step1_1: "Dieser Bildschirm ist die \"Chronik\". Hier werden alle \"Notizen\" von {name} angezeigt."
- step1_2: "Es gibt einige verschiedene Chroniken. Beispielsweise werden in der \"Startseite\" alle Notizen von Nutzern, denen du folgst, angezeigt, und in der \"Lokalen Chronik\" werden Notizen aller Nutzer auf {name} angezeigt."
- step2_1: "Lass uns als nächstes versuchen, eine Notiz zu schreiben. Dies kannst du tun, indem du auf den Knopf mit dem Stift-Icon drückst."
- step2_2: "Stell dich den anderen vor oder schreibe einfach \"Hallo {name}!\", wenn du darauf keine Lust hast oder dir nichts einfällt."
- step3_1: "Fertig mit dem Senden deiner ersten Notiz?"
- step3_2: "Falls deine Notiz nun in deiner Chronik auftaucht, hast du alles richtig gemacht."
- step4_1: "Notizen können zusätzlich mit \"Reaktionen\" ausgestattet werden."
- step4_2: "Um eine Reaktion anzufügen, klicke auf das „+“-Symbol einer Notiz und wähle ein Emoji aus, mit dem du reagieren möchtest."
_2fa:
alreadyRegistered: "Du hast bereits ein Gerät für Zwei-Faktor-Authentifizierung registriert."
registerTOTP: "Authentifizierungs-App registrieren"
@@ -1914,6 +1958,7 @@ _exportOrImport:
userLists: "Listen"
excludeMutingUsers: "Stummgeschaltete Benutzer aussortieren"
excludeInactiveUsers: "Inaktive Benutzer aussortieren"
+ withReplies: "Antworten von importierten Benutzern in der Chronik beinhalten"
_charts:
federation: "Föderation"
apRequest: "Anfragen"
@@ -2031,6 +2076,9 @@ _notification:
checkNotificationBehavior: "Aussehen von Benachrichtigungen überprüfen"
sendTestNotification: "Testbenachrichtigung senden"
notificationWillBeDisplayedLikeThis: "Benachrichtigungen sehen so aus"
+ reactedBySomeUsers: "{n} Benutzer haben eine Reaktion geschickt"
+ renotedBySomeUsers: "Renote von {n} Benutzern"
+ followedBySomeUsers: "Von {n} Benutzern gefolgt"
_types:
all: "Alle"
note: "Neue Notizen"
@@ -2134,3 +2182,55 @@ _moderationLogTypes:
createAd: "Werbung erstellt"
deleteAd: "Werbung gelöscht"
updateAd: "Werbung aktualisiert"
+ createAvatarDecoration: "Profilbilddekoration erstellt"
+ updateAvatarDecoration: "Profilbilddekoration aktualisiert"
+ deleteAvatarDecoration: "Profilbilddekoration gelöscht"
+_fileViewer:
+ title: "Dateiinformationen"
+ type: "Dateityp"
+ size: "Dateigröße"
+ url: "URL"
+ uploadedAt: "Hochgeladen am"
+ attachedNotes: "Zugehörige Notizen"
+ thisPageCanBeSeenFromTheAuthor: "Nur der Benutzer, der diese Datei hochgeladen hat, kann diese Seite sehen."
+_externalResourceInstaller:
+ title: "Von externer Seite installieren"
+ checkVendorBeforeInstall: "Überprüfe vor Installation die Vertrauenswürdigkeit des Vertreibers."
+ _plugin:
+ title: "Möchtest du dieses Plugin installieren?"
+ metaTitle: "Plugininformation"
+ _theme:
+ title: "Möchten du dieses Farbschema installieren?"
+ metaTitle: "Farbschemainfo"
+ _meta:
+ base: "Farbschemavorlage"
+ _vendorInfo:
+ title: "Vertreiber"
+ endpoint: "Referenzierter Endpunkt"
+ hashVerify: "Hash-Verifikation"
+ _errors:
+ _invalidParams:
+ title: "Ungültige Parameter"
+ description: "Es fehlen Informationen zum Laden der externen Ressource. Überprüfe die übergebene URL."
+ _resourceTypeNotSupported:
+ title: "Diese Ressource wird nicht unterstützt"
+ description: "Dieser Ressourcentyp wird nicht unterstützt. Bitte kontaktiere den Seitenbesitzer."
+ _failedToFetch:
+ title: "Fehler beim Abrufen der Daten"
+ fetchErrorDescription: "Während der Kommunikation mit der externen Seite ist ein Fehler aufgetreten. Kontaktiere den Seitenbesitzer, falls ein erneutes Probieren dieses Problem nicht löst."
+ parseErrorDescription: "Während dem Auslesen der externen Daten ist ein Fehler aufgetreten. Kontaktiere den Seitenbesitzer."
+ _hashUnmatched:
+ title: "Datenverifizierung fehlgeschlagen"
+ description: "Die Integritätsprüfung der geladenen Daten ist fehlgeschlagen. Aus Sicherheitsgründen kann die Installation nicht fortgesetzt werden. Kontaktiere den Seitenbesitzer."
+ _pluginParseFailed:
+ title: "AiScript-Fehler"
+ description: "Die angeforderten Daten wurden erfolgreich abgerufen, jedoch trat während des AiScript-Parsings ein Fehler auf. Kontaktiere den Autor des Plugins. Detaillierte Fehlerinformationen können über die Javascript-Konsole abgerufen werden."
+ _pluginInstallFailed:
+ title: "Das Plugin konnte nicht installiert werden"
+ description: "Während der Installation des Plugin ist ein Problem aufgetreten. Bitte versuche es erneut. Detaillierte Fehlerinformationen können über die Javascript-Konsole abgerufen werden."
+ _themeParseFailed:
+ title: "Parsing des Farbschemas fehlgeschlagen"
+ description: "Die angeforderten Daten wurden erfolgreich abgerufen, jedoch trat während des Farbschema-Parsings ein Fehler auf. Kontaktiere den Autor des Farbschemas. Detaillierte Fehlerinformationen können über die Javascript-Konsole abgerufen werden."
+ _themeInstallFailed:
+ title: "Das Farbschema konnte nicht installiert werden"
+ description: "Während der Installation des Farbschemas ist ein Problem aufgetreten. Bitte versuche es erneut. Detaillierte Fehlerinformationen können über die Javascript-Konsole abgerufen werden."
diff --git a/locales/el-GR.yml b/locales/el-GR.yml
index 9392fd12fe..30a52b726e 100644
--- a/locales/el-GR.yml
+++ b/locales/el-GR.yml
@@ -104,7 +104,6 @@ clickToShow: "Κάντε κλικ για εμφάνιση"
add: "Προσθέστε"
reaction: "Αντιδράσεις"
reactions: "Αντιδράσεις"
-reactionSetting: "Αντιδράσεις για εμφάνιση στην επιλογή αντίδρασης"
reactionSettingDescription2: "Σύρετε για να αλλάξετε τη σειρά, κάντε κλικ για να διαγράψετε, πατήστε \"+\" για να προσθέσετε."
rememberNoteVisibility: "Θυμήσου τις ρυθμίσεις ορατότητας σημειώματος"
attachCancel: "Διαγραφή αρχείου"
@@ -228,7 +227,6 @@ userList: "Λίστες"
about: "Πληροφορίες"
moderator: "Συντονιστής"
moderation: "Συντονισμός"
-cacheClear: "Εκκαθάριση προσωρινής μνήμης"
markAsReadAllNotifications: "Όλες οι ειδοποιήσεις διαβάστηκαν"
members: "Μέλη"
transfer: "Μεταφορά"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 827c04bd34..0701bc3710 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -121,7 +121,6 @@ sensitive: "Sensitive"
add: "Add"
reaction: "Reactions"
reactions: "Reactions"
-reactionSetting: "Reactions to show in the reaction picker"
reactionSettingDescription2: "Drag to reorder, click to delete, press \"+\" to add."
rememberNoteVisibility: "Remember note visibility settings"
attachCancel: "Remove attachment"
@@ -195,6 +194,7 @@ perHour: "Per Hour"
perDay: "Per Day"
stopActivityDelivery: "Stop sending activities"
blockThisInstance: "Block this instance"
+silenceThisInstance: "Silence this instance"
operations: "Operations"
software: "Software"
version: "Version"
@@ -213,7 +213,9 @@ clearQueueConfirmText: "Any undelivered notes remaining in the queue will not be
clearCachedFiles: "Clear cache"
clearCachedFilesConfirm: "Are you sure that you want to delete all cached remote files?"
blockedInstances: "Blocked Instances"
-blockedInstancesDescription: "List the hostnames of the instances that you want to block separated by linebreaks. Listed instances will no longer be able to communicate with this instance."
+blockedInstancesDescription: "List the hostnames of the instances you want to block separated by linebreaks. Listed instances will no longer be able to communicate with this instance."
+silencedInstances: "Silenced instances"
+silencedInstancesDescription: "List the hostnames of the instances that you want to silence. All accounts of the listed instances will be treated as silenced, can only make follow requests, and cannot mention local accounts if not followed. This will not affect blocked instances."
muteAndBlock: "Mutes and Blocks"
mutedUsers: "Muted users"
blockedUsers: "Blocked users"
@@ -308,6 +310,7 @@ folderName: "Folder name"
createFolder: "Create a folder"
renameFolder: "Rename this folder"
deleteFolder: "Delete this folder"
+folder: "Folder"
addFile: "Add a file"
emptyDrive: "Your Drive is empty"
emptyFolder: "This folder is empty"
@@ -434,7 +437,6 @@ share: "Share"
notFound: "Not found"
notFoundDescription: "No page corresponding to this URL could be found."
uploadFolder: "Default folder for uploads"
-cacheClear: "Clear cache"
markAsReadAllNotifications: "Mark all notifications as read"
markAsReadAllUnreadNotes: "Mark all notes as read"
markAsReadAllTalkMessages: "Mark all messages as read"
@@ -531,6 +533,7 @@ serverLogs: "Server logs"
deleteAll: "Delete all"
showFixedPostForm: "Display the posting form at the top of the timeline"
showFixedPostFormInChannel: "Display the posting form at the top of the timeline (Channels)"
+withRepliesByDefaultForNewlyFollowed: "Include replies by newly followed users in the timeline by default"
newNoteRecived: "There are new notes"
sounds: "Sounds"
sound: "Sounds"
@@ -540,6 +543,8 @@ showInPage: "Show in page"
popout: "Pop-out"
volume: "Volume"
masterVolume: "Master volume"
+notUseSound: "Disable sound"
+useSoundOnlyWhenActive: "Output sounds only if Misskey is active."
details: "Details"
chooseEmoji: "Select an emoji"
unableToProcess: "The operation could not be completed"
@@ -560,6 +565,10 @@ output: "Output"
script: "Script"
disablePagesScript: "Disable AiScript on Pages"
updateRemoteUser: "Update remote user information"
+unsetUserAvatar: "Unset avatar"
+unsetUserAvatarConfirm: "Are you sure you want to unset the avatar?"
+unsetUserBanner: "Unset banner"
+unsetUserBannerConfirm: "Are you sure you want to unset the banner?"
deleteAllFiles: "Delete all files"
deleteAllFilesConfirm: "Are you sure that you want to delete all files?"
removeAllFollowing: "Unfollow all followed users"
@@ -589,7 +598,7 @@ poll: "Poll"
useCw: "Hide content"
enablePlayer: "Open video player"
disablePlayer: "Close video player"
-expandTweet: "Expand tweet"
+expandTweet: "Expand post"
themeEditor: "Theme editor"
description: "Description"
describeFile: "Add caption"
@@ -631,6 +640,7 @@ smtpSecure: "Use implicit SSL/TLS for SMTP connections"
smtpSecureInfo: "Turn this off when using STARTTLS"
testEmail: "Test email delivery"
wordMute: "Word mute"
+hardWordMute: "Hard word mute"
regexpError: "Regular Expression error"
regexpErrorDescription: "An error occurred in the regular expression on line {line} of your {tab} word mutes:"
instanceMute: "Instance Mutes"
@@ -794,7 +804,7 @@ active: "Active"
offline: "Offline"
notRecommended: "Not recommended"
botProtection: "Bot Protection"
-instanceBlocking: "Blocked Instances"
+instanceBlocking: "Blocked/Silenced Instances"
selectAccount: "Select account"
switchAccount: "Switch account"
enabled: "Enabled"
@@ -864,8 +874,6 @@ makeReactionsPublicDescription: "This will make the list of all your past reacti
classic: "Classic"
muteThread: "Mute thread"
unmuteThread: "Unmute thread"
-ffVisibility: "Follows/Followers Visibility"
-ffVisibilityDescription: "Allows you to configure who can see who you follow and who follows you."
continueThread: "View thread continuation"
deleteAccountConfirm: "This will irreversibly delete your account. Proceed?"
incorrectPassword: "Incorrect password."
@@ -975,6 +983,7 @@ assign: "Assign"
unassign: "Unassign"
color: "Color"
manageCustomEmojis: "Manage Custom Emojis"
+manageAvatarDecorations: "Manage avatar decorations"
youCannotCreateAnymore: "You've hit the creation limit."
cannotPerformTemporary: "Temporarily unavailable"
cannotPerformTemporaryDescription: "This action cannot be performed temporarily due to exceeding the execution limit. Please wait for a while and then try again."
@@ -1015,6 +1024,8 @@ resetPasswordConfirm: "Really reset your password?"
sensitiveWords: "Sensitive words"
sensitiveWordsDescription: "The visibility of all notes containing any of the configured words will be set to \"Home\" automatically. You can list multiple by separating them via line breaks."
sensitiveWordsDescription2: "Using spaces will create AND expressions and surrounding keywords with slashes will turn them into a regular expression."
+hiddenTags: "Hidden hashtags"
+hiddenTagsDescription: "Select tags which will not shown on trend list.\nMultiple tags could be registered by lines."
notesSearchNotAvailable: "Note search is unavailable."
license: "License"
unfavoriteConfirm: "Really remove from favorites?"
@@ -1027,6 +1038,7 @@ enableChartsForRemoteUser: "Generate remote user data charts"
enableChartsForFederatedInstances: "Generate remote instance data charts"
showClipButtonInNoteFooter: "Add \"Clip\" to note action menu"
reactionsDisplaySize: "Reaction display size"
+limitWidthOfReaction: "Limits the maximum width of reactions and display them in reduced size."
noteIdOrUrl: "Note ID or URL"
video: "Video"
videos: "Videos"
@@ -1126,9 +1138,36 @@ edited: "Edited"
notificationRecieveConfig: "Notification Settings"
mutualFollow: "Mutual follow"
fileAttachedOnly: "Only notes with files"
-showRepliesToOthersInTimeline: "Show replies to others in TL"
-hideRepliesToOthersInTimeline: "Hide replies to others from TL"
+showRepliesToOthersInTimeline: "Show replies to others in timeline"
+hideRepliesToOthersInTimeline: "Hide replies to others from timeline"
+showRepliesToOthersInTimelineAll: "Show replies to others from everyone you follow in timeline"
+hideRepliesToOthersInTimelineAll: "Hide replies to others from everyone you follow in timeline"
+confirmShowRepliesAll: "This operation is irreversible. Would you really like to show replies to others from everyone you follow in your timeline?"
+confirmHideRepliesAll: "This operation is irreversible. Would you really like to hide replies to others from everyone you follow in your timeline?"
externalServices: "External Services"
+impressum: "Impressum"
+impressumUrl: "Impressum URL"
+impressumDescription: "In some countries, like germany, the inclusion of operator contact information (an Impressum) is legally required for commercial websites."
+privacyPolicy: "Privacy Policy"
+privacyPolicyUrl: "Privacy Policy URL"
+tosAndPrivacyPolicy: "Terms of Service and Privacy Policy"
+avatarDecorations: "Avatar decorations"
+attach: "Attach"
+detach: "Remove"
+angle: "Angle"
+flip: "Flip"
+showAvatarDecorations: "Show avatar decorations"
+releaseToRefresh: "Release to refresh"
+refreshing: "Refreshing..."
+pullDownToRefresh: "Pull down to refresh"
+disableStreamingTimeline: "Disable real-time timeline updates"
+useGroupedNotifications: "Display grouped notifications"
+signupPendingError: "There was a problem verifying the email address. The link may have expired."
+cwNotationRequired: "If \"Hide content\" is enabled, a description must be provided."
+doReaction: "Add reaction"
+code: "Code"
+reloadRequiredToApplySettings: "Reloading is required to apply the settings."
+decorate: "Decorate"
_announcement:
forExistingUsers: "Existing users only"
forExistingUsersDescription: "This announcement will only be shown to users existing at the point of publishment if enabled. If disabled, those newly signing up after it has been posted will also see it."
@@ -1138,6 +1177,10 @@ _announcement:
tooManyActiveAnnouncementDescription: "Having too many active announcements may worsen the user experience. Please consider archiving announcements that have become obsolete."
readConfirmTitle: "Mark as read?"
readConfirmText: "This will mark the contents of \"{title}\" as read."
+ shouldNotBeUsedToPresentPermanentInfo: "As it may significantly impact the user experience for new users, it is recommended to use notifications in the flow information rather than stock information."
+ dialogAnnouncementUxWarn: "Having two or more dialog-style notifications simultaneously can significantly impact the user experience, so please use them carefully."
+ silence: "No notification"
+ silenceDescription: "Turning this on will skip the notification of this announcement and the user won't need to read it."
_initialAccountSetting:
accountCreated: "Your account was successfully created!"
letsStartAccountSetup: "For starters, let's set up your profile."
@@ -1150,9 +1193,77 @@ _initialAccountSetting:
pushNotificationDescription: "Enabling push notifications will allow you to receive notifications from {name} directly on your device."
initialAccountSettingCompleted: "Profile setup complete!"
haveFun: "Enjoy {name}!"
- ifYouNeedLearnMore: "If you'd like to learn more about how to use {name} (Misskey), please visit {link}."
+ youCanContinueTutorial: "You can proceed to a tutorial on how to use {name} (Misskey) or you can exit the setup here and start using it immediately."
+ startTutorial: "Start Tutorial"
skipAreYouSure: "Really skip profile setup?"
laterAreYouSure: "Really do profile setup later?"
+_initialTutorial:
+ launchTutorial: "Start Tutorial"
+ title: "Tutorial"
+ wellDone: "Well done!"
+ skipAreYouSure: "Quit Tutorial?"
+ _landing:
+ title: "Welcome to the Tutorial"
+ description: "Here, you can learn the basics of using Misskey and its features."
+ _note:
+ title: "What is a Note?"
+ description: "Posts on Misskey are called 'Notes.' Notes are arranged chronologically on the timeline and are updated in real-time."
+ reply: "Click on this button to reply to a message. It's also possible to reply to replies, continuing the conversation like a thread."
+ renote: "You can share that note to your own timeline. You can also quote them with your comments."
+ reaction: "You can add reactions to the Note. More details will be explained on the next page."
+ menu: "You can view Note details, copy links, and perform various other actions."
+ _reaction:
+ title: "What are Reactions?"
+ description: "Notes can be reacted to with various emojis. Reactions allow you to express nuances that may not be conveyed with just a 'like.'"
+ letsTryReacting: "Reactions can be added by clicking the '+' button on the note. Try reacting to this sample note!"
+ reactToContinue: "Add a reaction to proceed."
+ reactNotification: "You'll receive real-time notifications when someone reacts to your note."
+ reactDone: "You can undo a reaction by pressing the '-' button."
+ _timeline:
+ title: "The Concept of Timelines"
+ description1: "Misskey provides multiple timelines based on usage (some may not be available depending on the server's policies)."
+ home: "You can view notes from accounts you follow."
+ local: "You can view notes from all users on this server."
+ social: "Notes from the Home and Local timelines will be displayed."
+ global: "You can view notes from all connected servers."
+ description2: "You can switch between timelines at the top of the screen at any time."
+ description3: "Additionally, there are list timelines and channel timelines. For more details, please refer to {link}."
+ _postNote:
+ title: "Note Posting Settings"
+ description1: "When posting a note on Misskey, various options are available. The posting form looks like this."
+ _visibility:
+ description: "You can limit who can view your note."
+ public: "Your note will be visible for all users."
+ home: "Public only on the Home timeline. People visiting your profile, via followers, and through renotes can see it."
+ followers: "Visible to followers only. Only followers can see it and no one else, and it cannot be renoted by others."
+ direct: "Visible only to specified users, and the recipient will be notified. It can be used as an alternative to direct messaging."
+ doNotSendConfidencialOnDirect1: "Be careful when sending sensitive information!"
+ doNotSendConfidencialOnDirect2: "Administrators of the server can see what you write. Be careful with sensitive information when sending direct notes to users on untrusted servers."
+ localOnly: "Posting with this flag will not federate the note to other servers. Users on other servers will not be able to view these notes directly, regardless of the display settings above."
+ _cw:
+ title: "Content Warning"
+ description: "Instead of the body, the content written in 'comments' field will be displayed. Pressing \"read more\" will reveal the body."
+ _exampleNote:
+ cw: "This will surely make you hungry!"
+ note: "Just had a chocolate-glazed donut 🍩😋"
+ useCases: "This is used when following the server guidelines for necessary notes or for self-restriction of spoiler or sensitive text."
+ _howToMakeAttachmentsSensitive:
+ title: "How to Mark Attachments as Sensitive?"
+ description: "For attachments that are required by server guidelines or that should not be left intact, add a \"sensitive\" flag."
+ tryThisFile: "Try marking the image attached in this form as sensitive!"
+ _exampleNote:
+ note: "Oops, messed up opening the natto lid..."
+ method: "To mark an attachment as sensitive, click the file thumbnail, open the menu, and click \"Mark as Sensitive.\""
+ sensitiveSucceeded: "When attaching files, please set sensitivities in accordance with the server guidelines."
+ doItToContinue: "Mark the attachment file as sensitive to proceed."
+ _done:
+ title: "You've completed the tutorial! 🎉"
+ description: "The functions introduced here are just a small part. For a more detailed understanding of using Misskey, please refer to {link}."
+_timelineDescription:
+ home: "In the Home timeline, you can see notes from accounts you follow."
+ local: "In the Local timeline, you can see notes from all users on this server."
+ social: "The Social timeline displays notes from both the Home and Local timelines."
+ global: "In the Global timeline, you can see notes from all connected servers."
_serverRules:
description: "A set of rules to be displayed before registration. Setting a summary of the Terms of Service is recommended."
_serverSettings:
@@ -1164,6 +1275,9 @@ _serverSettings:
manifestJsonOverride: "manifest.json Override"
shortName: "Short name"
shortNameDescription: "A shorthand for the instance's name that can be displayed if the full official name is long."
+ fanoutTimelineDescription: "Greatly increases performance of timeline retrieval and reduces load on the database when enabled. In exchange, memory usage of Redis will increase. Consider disabling this in case of low server memory or server instability."
+ fanoutTimelineDbFallback: "Fallback to database"
+ fanoutTimelineDbFallbackDescription: "When enabled, the timeline will fall back to the database for additional queries if the timeline is not cached. Disabling it further reduces the server load by eliminating the fallback process, but limits the range of timelines that can be retrieved."
_accountMigration:
moveFrom: "Migrate another account to this one"
moveFromSub: "Create alias to another account"
@@ -1421,6 +1535,9 @@ _achievements:
_smashTestNotificationButton:
title: "Test overflow"
description: "Trigger the notification test repeatedly within an extremely short time"
+ _tutorialCompleted:
+ title: "Misskey Elementary Course Diploma"
+ description: "Tutorial completed"
_role:
new: "New role"
edit: "Edit role"
@@ -1431,7 +1548,9 @@ _role:
assignTarget: "Assignment type"
descriptionOfAssignTarget: "Manual to manually change who is part of this role and who is not.\nConditional to have users be automatically assigned and removed from this role based on a condition."
manual: "Manual"
+ manualRoles: "Manual roles"
conditional: "Conditional"
+ conditionalRoles: "Conditional roles"
condition: "Condition"
isConditionalRole: "This is a conditional role."
isPublic: "Public role"
@@ -1464,6 +1583,7 @@ _role:
inviteLimitCycle: "Invite limit cooldown"
inviteExpirationTime: "Invite expiration interval"
canManageCustomEmojis: "Can manage custom emojis"
+ canManageAvatarDecorations: "Manage avatar decorations"
driveCapacity: "Drive capacity"
alwaysMarkNsfw: "Always mark files as NSFW"
pinMax: "Maximum number of pinned notes"
@@ -1527,6 +1647,10 @@ _ad:
reduceFrequencyOfThisAd: "Show this ad less"
hide: "Hide"
timezoneinfo: "The day of the week is determined from the server's timezone."
+ adsSettings: "Ad settings"
+ notesPerOneAd: "Real-time update ad placement interval (Notes per ad)"
+ setZeroToDisable: "Set this value to 0 to disable real-time update ads"
+ adsTooClose: "The current ad interval may significantly worsen the user experience due to being too low."
_forgotPassword:
enterEmail: "Enter the email address you used to register. A link with which you can reset your password will then be sent to it."
ifNoEmail: "If you did not use an email during registration, please contact the instance administrator instead."
@@ -1579,6 +1703,7 @@ _aboutMisskey:
donate: "Donate to Misskey"
morePatrons: "We also appreciate the support of many other helpers not listed here. Thank you! 🥰"
patrons: "Patrons"
+ projectMembers: "Project members"
_displayOfSensitiveMedia:
respect: "Hide media marked as sensitive"
ignore: "Display media marked as sensitive"
@@ -1603,6 +1728,7 @@ _channel:
notesCount: "{n} Notes"
nameAndDescription: "Name and description"
nameOnly: "Name only"
+ allowRenoteToExternal: "Allow renote and quote outside the channel"
_menuDisplay:
sideFull: "Side"
sideIcon: "Side (Icons)"
@@ -1675,9 +1801,6 @@ _theme:
infoFg: "Information text"
infoWarnBg: "Warning background"
infoWarnFg: "Warning text"
- cwBg: "CW button background"
- cwFg: "CW button text"
- cwHoverBg: "CW button background (Hover)"
toastBg: "Notification background"
toastFg: "Notification text"
buttonBg: "Button background"
@@ -1697,6 +1820,14 @@ _sfx:
notification: "Notifications"
antenna: "Antennas"
channel: "Channel notifications"
+ reaction: "On choosing a reaction"
+_soundSettings:
+ driveFile: "Use an audio file in Drive."
+ driveFileWarn: "Select an audio file from Drive."
+ driveFileTypeWarn: "This file is not supported"
+ driveFileTypeWarnDescription: "Select an audio file"
+ driveFileDurationWarn: "The audio is too long."
+ driveFileDurationWarnDescription: "Long audio may disrupt using Misskey. Still continue?"
_ago:
future: "Future"
justNow: "Just now"
@@ -1708,21 +1839,19 @@ _ago:
monthsAgo: "{n}mo ago"
yearsAgo: "{n}y ago"
invalid: "None"
+_timeIn:
+ seconds: "In {n}s"
+ minutes: "In {n}m"
+ hours: "In {n}h"
+ days: "In {n}d"
+ weeks: "In {n}w"
+ months: "In {n}mo"
+ years: "In {n}y"
_time:
second: "Second(s)"
minute: "Minute(s)"
hour: "Hour(s)"
day: "Day(s)"
-_timelineTutorial:
- title: "How to use Misskey"
- step1_1: "This is the \"timeline\". All \"notes\" submitted on {name} will be chronologically displayed here."
- step1_2: "There are a few different timelines. For example, the \"Home timeline\" will contain notes of users you follow, and the \"Local timeline\" will contain notes from all users of {name}."
- step2_1: "Let's try posting a note next. You can do so by pressing the button with a pencil icon."
- step2_2: "How about writing a self-introduction, or just \"Hello {name}!\" if you don't feel like it?"
- step3_1: "Finished posting your first note?"
- step3_2: "Your first note should now be displayed on your timeline."
- step4_1: "You can also attach \"Reactions\" to notes."
- step4_2: "To attach a reaction, press the \"+\" mark on a note and choose an emoji you'd like to react with."
_2fa:
alreadyRegistered: "You have already registered a 2-factor authentication device."
registerTOTP: "Register authenticator app"
@@ -1731,7 +1860,7 @@ _2fa:
step2Click: "Clicking on this QR code will allow you to register 2FA to your security key or phone authenticator app."
step2Uri: "Enter the following URI if you are using a desktop program"
step3Title: "Enter an authentication code"
- step3: "Enter the token provided by your app to finish setup."
+ step3: "Enter the authentication code (token) provided by your app to finish setup."
setupCompleted: "Setup complete"
step4: "From now on, any future login attempts will ask for such a login token."
securityKeyNotSupported: "Your browser does not support security keys."
@@ -1914,6 +2043,7 @@ _exportOrImport:
userLists: "User lists"
excludeMutingUsers: "Exclude muted users"
excludeInactiveUsers: "Exclude inactive users"
+ withReplies: "Include replies from imported users in the timeline"
_charts:
federation: "Federation"
apRequest: "Requests"
@@ -2025,12 +2155,16 @@ _notification:
pollEnded: "Poll results have become available"
newNote: "New note"
unreadAntennaNote: "Antenna {name}"
+ roleAssigned: "Role given"
emptyPushNotificationMessage: "Push notifications have been updated"
achievementEarned: "Achievement unlocked"
testNotification: "Test notification"
checkNotificationBehavior: "Check notification appearance"
sendTestNotification: "Send test notification"
notificationWillBeDisplayedLikeThis: "Notifications look like this"
+ reactedBySomeUsers: "{n} users reacted"
+ renotedBySomeUsers: "Renote from {n} users"
+ followedBySomeUsers: "Followed by {n} users"
_types:
all: "All"
note: "New notes"
@@ -2043,6 +2177,7 @@ _notification:
pollEnded: "Polls ending"
receiveFollowRequest: "Received follow requests"
followRequestAccepted: "Accepted follow requests"
+ roleAssigned: "Role given"
achievementEarned: "Achievement unlocked"
app: "Notifications from linked apps"
_actions:
@@ -2066,7 +2201,7 @@ _deck:
introduction: "Create the perfect interface for you by arranging columns freely!"
introduction2: "Click on the + on the right of the screen to add new colums whenever you want."
widgetsIntroduction: "Please select \"Edit widgets\" in the column menu and add a widget."
- useSimpleUiForNonRootPages: "Use simplified UI to navigated pages"
+ useSimpleUiForNonRootPages: "Use simple UI for navigated pages"
usedAsMinWidthWhenFlexible: "Minimum width will be used for this when the \"Auto-adjust width\" option is enabled"
flexible: "Auto-adjust width"
_columns:
@@ -2134,3 +2269,66 @@ _moderationLogTypes:
createAd: "Ad created"
deleteAd: "Ad deleted"
updateAd: "Ad updated"
+ createAvatarDecoration: "Avatar decoration created"
+ updateAvatarDecoration: "Avatar decoration updated"
+ deleteAvatarDecoration: "Avatar decoration deleted"
+ unsetUserAvatar: "Unset this user's avatar"
+ unsetUserBanner: "Unset this user's banner"
+_fileViewer:
+ title: "File details"
+ type: "File type"
+ size: "Filesize"
+ url: "URL"
+ uploadedAt: "Uploaded at"
+ attachedNotes: "Attached notes"
+ thisPageCanBeSeenFromTheAuthor: "This page can only be seen by the user who uploaded this file."
+_externalResourceInstaller:
+ title: "Install from external site"
+ checkVendorBeforeInstall: "Make sure the distributor of this resource is trustworthy before installation."
+ _plugin:
+ title: "Do you want to install this plugin?"
+ metaTitle: "Plugin information"
+ _theme:
+ title: "Do you want to install this theme?"
+ metaTitle: "Theme information"
+ _meta:
+ base: "Base color scheme"
+ _vendorInfo:
+ title: "Distributor information"
+ endpoint: "Referenced endpoint"
+ hashVerify: "Hash verification"
+ _errors:
+ _invalidParams:
+ title: "Invalid parameters"
+ description: "There is not enough information to load data from an external site. Please confirm the entered URL."
+ _resourceTypeNotSupported:
+ title: "This external resource is not supported"
+ description: "The type of this external resource is not supported. Please contact the site administrator."
+ _failedToFetch:
+ title: "Failed to fetch data"
+ fetchErrorDescription: "An error occurred communicating with the external site. If trying again does not fix this issue, please contact the site administrator."
+ parseErrorDescription: "An error occurred processing the data loaded from the external site. Please contact the site administrator."
+ _hashUnmatched:
+ title: "Data verification failed"
+ description: "An error occurred verifying the integrity of the fetched data. As a security measure, installation cannot continue. Please contact the site administrator."
+ _pluginParseFailed:
+ title: "AiScript Error"
+ description: "The requested data was fetched successfully, but an error occurred during AiScript parsing. Please contact the plugin author. Error details can be viewed in the Javascript console."
+ _pluginInstallFailed:
+ title: "Plugin installation failed"
+ description: "A problem occurred during plugin installation. Please try again. Error details can be viewed in the Javascript console."
+ _themeParseFailed:
+ title: "Theme parsing failed"
+ description: "The requested data was fetched successfully, but an error occurred during theme parsing. Please contact the theme author. Error details can be viewed in the Javascript console."
+ _themeInstallFailed:
+ title: "Failed to install theme"
+ description: "A problem occurred during theme installation. Please try again. Error details can be viewed in the Javascript console."
+_dataSaver:
+ _media:
+ title: "Loading Media"
+ _avatar:
+ title: "Avatar image"
+ description: "Stop avatar image animation. Animated images can be larger in file size than normal images, potentially leading to further reductions in data traffic."
+ _code:
+ title: "Code highlighting"
+ description: "If code highlighting notations are used in MFM, etc., they will not load until tapped. Syntax highlighting requires downloading the highlight definition files for each programming language. Therefore, disabling the automatic loading of these files is expected to reduce the amount of communication data."
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index f3e4bd7c75..a079cf01f9 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -121,7 +121,6 @@ sensitive: "Marcado como sensible"
add: "Agregar"
reaction: "Reacción"
reactions: "Reacción"
-reactionSetting: "Reacciones para mostrar en el menú de reacciones"
reactionSettingDescription2: "Arrastre para reordenar, click para borrar, apriete la tecla + para añadir."
rememberNoteVisibility: "Recordar visibilidad"
attachCancel: "Quitar adjunto"
@@ -195,6 +194,7 @@ perHour: "por hora"
perDay: "por día"
stopActivityDelivery: "Dejar de enviar actividades"
blockThisInstance: "Bloquear instancia"
+silenceThisInstance: "Silenciar esta instancia"
operations: "Operaciones"
software: "Software"
version: "Versión"
@@ -214,6 +214,8 @@ clearCachedFiles: "Limpiar caché"
clearCachedFilesConfirm: "¿Desea borrar todos los archivos remotos cacheados?"
blockedInstances: "Instancias bloqueadas"
blockedInstancesDescription: "Seleccione los hosts de las instancias que desea bloquear, separadas por una linea nueva. Las instancias bloqueadas no podrán comunicarse con esta instancia."
+silencedInstances: "Instancias silenciadas"
+silencedInstancesDescription: "Listar los hostname de las instancias que quieres silenciar. Todas las cuentas de las instancias listadas serán tratadas como silenciadas, solo podrán hacer peticiones de seguimiento, y no podrán mencionar cuentas locales si no las siguen. Esto no afecta a las instancias bloqueadas."
muteAndBlock: "Silenciar y bloquear"
mutedUsers: "Usuarios silenciados"
blockedUsers: "Usuarios bloqueados"
@@ -308,6 +310,7 @@ folderName: "Nombre de la carpeta"
createFolder: "Crear carpeta"
renameFolder: "Renombrar carpeta"
deleteFolder: "Borrar carpeta"
+folder: "Carpeta"
addFile: "Agregar archivo"
emptyDrive: "El drive está vacío"
emptyFolder: "La carpeta está vacía"
@@ -434,7 +437,6 @@ share: "Compartir"
notFound: "No se encuentra"
notFoundDescription: "No se encontró la página correspondiente a la URL elegida"
uploadFolder: "Carpeta de subidas por defecto"
-cacheClear: "Borrar caché"
markAsReadAllNotifications: "Marcar todas las notificaciones como leídas"
markAsReadAllUnreadNotes: "Marcar todas las notas como leídas"
markAsReadAllTalkMessages: "Marcar todos los chats como leídos"
@@ -531,6 +533,7 @@ serverLogs: "Registros del servidor"
deleteAll: "Eliminar todos"
showFixedPostForm: "Mostrar el formulario de las entradas encima de la línea de tiempo"
showFixedPostFormInChannel: "Mostrar el formulario de publicación por encima de la cronología (Canales)"
+withRepliesByDefaultForNewlyFollowed: "Incluir por defecto respuestas de usuarios recién seguidos en la línea de tiempo"
newNoteRecived: "Tienes una nota nueva"
sounds: "Sonidos"
sound: "Sonidos"
@@ -540,6 +543,8 @@ showInPage: "Mostrar en la página"
popout: "Popout"
volume: "Volumen"
masterVolume: "Volumen principal"
+notUseSound: "Sin sonido"
+useSoundOnlyWhenActive: "Sonar solo cuando Misskey esté activo"
details: "Detalles"
chooseEmoji: "Elije un emoji"
unableToProcess: "La operación no se puede llevar a cabo"
@@ -560,6 +565,10 @@ output: "Salida"
script: "Script"
disablePagesScript: "Deshabilitar AiScript en Páginas"
updateRemoteUser: "Actualizar información de usuario remoto"
+unsetUserAvatar: "Quitar avatar"
+unsetUserAvatarConfirm: "¿Confirmas que quieres quitar tu avatar?"
+unsetUserBanner: "Quitar banner"
+unsetUserBannerConfirm: "¿Confirmas que quieres quitar tu banner?"
deleteAllFiles: "Borrar todos los archivos"
deleteAllFilesConfirm: "¿Desea borrar todos los archivos?"
removeAllFollowing: "Retener todos los siguientes"
@@ -864,8 +873,6 @@ makeReactionsPublicDescription: "Todas las reacciones que hayas hecho serán pú
classic: "Clásico"
muteThread: "Silenciar hilo"
unmuteThread: "Mostrar hilo"
-ffVisibility: "Visibilidad de seguidores y seguidos"
-ffVisibilityDescription: "Puedes configurar quien puede ver a quienes sigues y quienes te siguen"
continueThread: "Ver la continuación del hilo"
deleteAccountConfirm: "La cuenta será borrada. ¿Está seguro?"
incorrectPassword: "La contraseña es incorrecta"
@@ -975,6 +982,7 @@ assign: "Asignar"
unassign: "Quitar"
color: "Color"
manageCustomEmojis: "Administrar emojis personalizados"
+manageAvatarDecorations: "Administrar decoraciones de avatar"
youCannotCreateAnymore: "Has llegado al límite de creaciones."
cannotPerformTemporary: "Temporalmente no disponible"
cannotPerformTemporaryDescription: "Esta acción no se puede realizar porque se excedió el límite de ejecución. Espera un poco y prueba de nuevo."
@@ -1015,6 +1023,7 @@ resetPasswordConfirm: "¿Realmente quieres cambiar la contraseña?"
sensitiveWords: "Palabras sensibles"
sensitiveWordsDescription: "La visibilidad de todas las notas que contienen cualquiera de las palabras configuradas serán puestas en \"Inicio\" automáticamente. Puedes enumerás varias separándolas con saltos de línea"
sensitiveWordsDescription2: "Si se usan espacios se crearán expresiones AND y las palabras subsecuentes con barras inclinadas se convertirán en expresiones regulares."
+hiddenTags: "Hashtags ocultos"
notesSearchNotAvailable: "No se puede buscar una nota"
license: "Licencia"
unfavoriteConfirm: "¿Desea quitar de favoritos?"
@@ -1027,6 +1036,7 @@ enableChartsForRemoteUser: "Generar gráficas de usuarios remotos."
enableChartsForFederatedInstances: "Generar gráficos de servidores remotos"
showClipButtonInNoteFooter: "Añadir \"Clip\" al menú de notas"
reactionsDisplaySize: "Tamaño de las reacciones"
+limitWidthOfReaction: "Limitar ancho de las reacciones"
noteIdOrUrl: "ID o URL de la nota"
video: "Video"
videos: "Video"
@@ -1121,6 +1131,40 @@ unnotifyNotes: "Dejar de notificar nuevas notas"
authentication: "Autenticación"
authenticationRequiredToContinue: "Por favor, autentifícate para continuar"
dateAndTime: "Fecha y hora"
+showRenotes: "Mostrar renotas"
+edited: "Editado"
+notificationRecieveConfig: "Ajustes de Notificaciones"
+mutualFollow: "Os seguís mutuamente"
+fileAttachedOnly: "Solo notas con archivos"
+showRepliesToOthersInTimeline: "Mostrar respuestas a otros en la línea de tiempo"
+hideRepliesToOthersInTimeline: "Ocultar respuestas a otros en la línea de tiempo"
+showRepliesToOthersInTimelineAll: "Muestra tus respuestas a otros usuarios que sigues en la línea de tiempo"
+hideRepliesToOthersInTimelineAll: "Ocultar tus respuestas a otros usuarios que sigues en la línea de tiempo"
+confirmShowRepliesAll: "Esta operación es irreversible. ¿Confirmas que quieres mostrar tus respuestas a otros usuarios que sigues en tu línea de tiempo?"
+confirmHideRepliesAll: "Esta operación es irreversible. ¿Confirmas que quieres ocultar tus respuestas a otros usuarios que sigues en tu línea de tiempo?"
+externalServices: "Servicios Externos"
+impressum: "Impressum"
+impressumUrl: "Impressum URL"
+impressumDescription: "En algunos países, como Alemania, la inclusión del operador de datos (el Impressum) es requerido legalmente para sitios web comerciales."
+privacyPolicy: "Política de Privacidad"
+privacyPolicyUrl: "URL de la Política de Privacidad"
+tosAndPrivacyPolicy: "Condiciones de Uso y Política de Privacidad"
+avatarDecorations: "Decoraciones de avatar"
+attach: "Acoplar"
+detach: "Quitar"
+angle: "Ángulo"
+flip: "Echar de un capirotazo"
+showAvatarDecorations: "Mostrar decoraciones de avatar"
+releaseToRefresh: "Soltar para recargar"
+refreshing: "Recargando..."
+pullDownToRefresh: "Tira hacia abajo para recargar"
+disableStreamingTimeline: "Desactivar actualizaciones en tiempo real de la línea de tiempo"
+useGroupedNotifications: "Mostrar notificaciones agrupadas"
+signupPendingError: "Ha habido un problema al verificar tu dirección de correo electrónico. Es posible que el enlace haya caducado."
+cwNotationRequired: "Si se ha activado \"ocultar contenido\", es necesario proporcionar una descripción."
+doReaction: "Añadir reacción"
+code: "Código"
+reloadRequiredToApplySettings: "Es necesario recargar para que se aplique la configuración."
_announcement:
forExistingUsers: "Solo para usuarios registrados"
forExistingUsersDescription: "Este anuncio solo se mostrará a aquellos usuarios registrados en el momento de su publicación. Si se deshabilita esta opción, aquellos usuarios que se registren tras su publicación también lo verán."
@@ -1130,6 +1174,10 @@ _announcement:
tooManyActiveAnnouncementDescription: "Tener demasiados anuncios activos empeora la experiencia de usuario. Por favor, considera archivar aquellos anuncios que hayan quedado obsoletos."
readConfirmTitle: "¿Marcar como leído?"
readConfirmText: "Esto marcará el contenido de \"{title}\" como leído."
+ shouldNotBeUsedToPresentPermanentInfo: "Dado que puede impactar en la experiencia de usuario de forma significativa, es recomendable usar notificaciones en el flujo de información en vez de información persistente."
+ dialogAnnouncementUxWarn: "Mostrar dos o más notificaciones en formato diálogo a la vez puede impactar en la experiencia de usuario de forma significativa, úsalos con cuidado."
+ silence: "Silenciar notificaciones"
+ silenceDescription: "Si lo activas, no enviarás notificación sobre este anuncio y el usuario no tendrá que leerlo."
_initialAccountSetting:
accountCreated: "¡La cuenta ha sido creada!"
letsStartAccountSetup: "Para empezar, creemos tu perfil."
@@ -1142,9 +1190,38 @@ _initialAccountSetting:
pushNotificationDescription: "Habilitar las notificaciones push te permitirá recibir notificaciones de {name} directamente en tu dispositivo."
initialAccountSettingCompleted: "¡Configuración del perfil completada!"
haveFun: "¡Disfruta de {name}!"
- ifYouNeedLearnMore: "Si quieres aprender cómo usar {name} (Misskey), por favor, visita {link}."
+ youCanContinueTutorial: "Puedes proceder a un tutorial sobre cómo usar {name} (Misskey) o puedes terminar la instalación aquí y empezar a usarlo ya mismo."
+ startTutorial: "Comenzar tutorial"
skipAreYouSure: "¿Realmente quieres saltarte la configuración del perfil?"
laterAreYouSure: "¿Realmente quieres configurar tu perfil después?"
+_initialTutorial:
+ launchTutorial: "Comenzar tutorial"
+ title: "Tutorial"
+ wellDone: "¡Bien hecho!"
+ skipAreYouSure: "¿Salir del tutorial?"
+ _landing:
+ title: "Bienvenid@ al tutorial"
+ description: "Aquí podrás aprender las nociones básicas sobre cómo usar Misskey y sus funciones."
+ _note:
+ title: "¿Qué es una nota?"
+ description: "Las publicaciones en Misskey se llaman 'Notas'. Las notas se ordenan de forma cronológica en la línea de tiempo y se actualizan en tiempo real."
+ reply: "Pulsa en este botón para contestar a un mensaje. También es posible contestar a otras contestaciones, continuando así la conversación como un hilo."
+ renote: "Puedes compartir esa nota en tu propia línea de tiempo. También puedes añadir una cita con tus comentarios."
+ reaction: "Puedes añadir reacciones a la Nota. Se explicarán más detalles en la siguiente página."
+ menu: "Puedes ver los detalles de la Nota, copiar enlaces, y realizar otras acciones."
+ _reaction:
+ title: "¿Qué son las reacciones?"
+ description: "Se puede reaccionar a las Notas con diferentes emojis. Las reacciones te permiten expresar matices que no se pueden transmitir con un simple 'me gusta'."
+ letsTryReacting: "Puedes añadir reacciones pulsando en el botón '+' de la nota. ¡Intenta reaccionar a esta nota de ejemplo!"
+ reactToContinue: "Añade una reacción para continuar."
+ reactNotification: "Recibirás notificaciones en tiempo real cuando alguien reaccione a tu nota."
+ reactDone: "Puedes deshacer una reacción pulsando en el botón '-'."
+ _timeline:
+ title: "El concepto de Línea de tiempo"
+ description1: "Misskey proporciona múltiples líneas de tiempo basadas en su uso (algunas pueden no estar disponibles dependiendo de las políticas de la instancia)."
+ home: "Puedes ver los posts de las cuentas que sigues."
+ local: "Puedes ver los posts de todos los usuarios de este servidor."
+ social: "Se ven los posts de la línea de tiempo de inicio junto con los de la línea de tiempo local."
_serverRules:
description: "Un conjunto de reglas que serán mostradas antes del registro. Configurar un sumario de términos de servicio es recomendado."
_serverSettings:
@@ -1456,6 +1533,7 @@ _role:
inviteLimitCycle: "Enfriamiento del límite de invitaciones"
inviteExpirationTime: "Intervalo de caducidad de invitaciones"
canManageCustomEmojis: "Administrar emojis personalizados"
+ canManageAvatarDecorations: "Administrar decoraciones de avatar"
driveCapacity: "Capacidad del drive"
alwaysMarkNsfw: "Siempre marcar archivos como NSFW"
pinMax: "Máximo de notas fijadas"
@@ -1470,6 +1548,7 @@ _role:
descriptionOfRateLimitFactor: "Límites más bajos son menos restrictivos, más altos menos restrictivos"
canHideAds: "Puede ocultar anuncios"
canSearchNotes: "Uso de la búsqueda de notas"
+ canUseTranslator: "Uso de traductor"
_condition:
isLocal: "Usuario local"
isRemote: "Usuario remoto"
@@ -1518,6 +1597,10 @@ _ad:
reduceFrequencyOfThisAd: "Mostrar menos este anuncio."
hide: "No mostrar"
timezoneinfo: "El día de la semana está determidado por la zona horaria del servidor."
+ adsSettings: "Ajustes de anuncios"
+ notesPerOneAd: "Intervalo de actualización de anuncios en tiempo real (Notas por cada anuncio)"
+ setZeroToDisable: "Establece este valor a 0 para deshabilitar la actualización de anuncios en tiempo real"
+ adsTooClose: "El intervalo de anuncios actual puede empeorar la experiencia del usuario por ser demasiado bajo."
_forgotPassword:
enterEmail: "Ingrese el correo usado para registrar la cuenta. Se enviará un link para resetear la contraseña."
ifNoEmail: "Si no utilizó un correo para crear la cuenta, contáctese con el administrador."
@@ -1666,9 +1749,6 @@ _theme:
infoFg: "Texto de información"
infoWarnBg: "Fondo de advertencias"
infoWarnFg: "Texto de advertencias"
- cwBg: "Fondo del botón CW"
- cwFg: "Texto del botón CW"
- cwHoverBg: "Fondo del botón CW (hover)"
toastBg: "Fondo de notificaciones"
toastFg: "Texto de notificaciones"
buttonBg: "Fondo de botón"
@@ -1699,21 +1779,13 @@ _ago:
monthsAgo: "Hace {n} meses"
yearsAgo: "Hace {n} años"
invalid: "No hay nada que ver aqui"
+_timeIn:
+ years: "En {n} años"
_time:
second: "Segundos"
minute: "Minutos"
hour: "Horas"
day: "Días"
-_timelineTutorial:
- title: "Cómo usar Misskey"
- step1_1: "Ésta es la \"línea de tiempo\". Todas las \"notas\" que sean publicadas en {name} serán mostradas cronológicamente aquí."
- step1_2: "Hay varias líneas de tiempo. Por ejemplo, la línea temporal \"Inicio\" contiene las notas de otros usuarios que sigues, y la línea \"Local\" contandrá las notas de todos los usuarios de {name}."
- step2_1: "Ahora probemos publicar una nota. Puedes hacerlo presionando el botón que tiene un ícono de lápiz."
- step2_2: "¿Qué tal si escribimos una introducción? o sólo un \"¡Hola {name}!\" ¿No te apetece?"
- step3_1: "¿Terminaste de publicar tu primera nota?"
- step3_2: "Tu primera nota ahora se mostrará en tu línea de tiempo."
- step4_1: "También puedes añadir \"Reacciones\" a notas."
- step4_2: "Para añadir una reacción selecciona el botón \"+\" en la nota y escoge el emoji que quieras para reaccionar."
_2fa:
alreadyRegistered: "Ya has completado la configuración."
registerTOTP: "Registrar aplicación autenticadora"
@@ -1905,6 +1977,7 @@ _exportOrImport:
userLists: "Listas"
excludeMutingUsers: "Excluir usuarios silenciados"
excludeInactiveUsers: "Excluir usuarios inactivos"
+ withReplies: "Incluir respuestas de los usuarios importados en la línea de tiempo"
_charts:
federation: "Federación"
apRequest: "Pedidos"
@@ -2022,6 +2095,9 @@ _notification:
checkNotificationBehavior: "Comprobar comportamiento de la notificación"
sendTestNotification: "Enviar notificación de prueba"
notificationWillBeDisplayedLikeThis: "Las notificaciones tendrán este aspecto"
+ reactedBySomeUsers: "{n} usuarios han reaccionado"
+ renotedBySomeUsers: "{n} usuarios han renotado"
+ followedBySomeUsers: "Seguido por {n} usuarios"
_types:
all: "Todo"
note: "Nuevas notas"
@@ -2122,3 +2198,60 @@ _moderationLogTypes:
unmarkSensitiveDriveFile: "Archivo marcado como no sensible"
resolveAbuseReport: "Reporte resuelto"
createInvitation: "Generar invitación"
+ createAd: "Anuncio creado"
+ deleteAd: "Anuncio eliminado"
+ updateAd: "Anuncio actualizado"
+ createAvatarDecoration: "Decoración de avatar creada"
+ updateAvatarDecoration: "Decoración de avatar actualizada"
+ deleteAvatarDecoration: "Decoración de avatar eliminada"
+ unsetUserAvatar: "Quitar decoración de avatar de este usuario"
+ unsetUserBanner: "Quitar banner de este usuario"
+_fileViewer:
+ title: "Detalles del archivo"
+ type: "Tipo de archivo"
+ size: "Tamaño del archivo"
+ url: "URL"
+ uploadedAt: "Subido el"
+ attachedNotes: "Notas adjuntas"
+ thisPageCanBeSeenFromTheAuthor: "Esta página solo puede ser vista por el autor."
+_externalResourceInstaller:
+ title: "Instalar desde sitio externo"
+ checkVendorBeforeInstall: "Asegúrate de que el distribuidor de este recurso es de confianza antes de proceder a la instalación."
+ _plugin:
+ title: "¿Quieres instalar este plugin?"
+ metaTitle: "Información del plugin"
+ _theme:
+ title: "¿Quieres instalar este tema?"
+ metaTitle: "Información del tema"
+ _meta:
+ base: "Esquema de color base"
+ _vendorInfo:
+ title: "Información del distribuidor"
+ endpoint: "Terminal referenciada"
+ hashVerify: "Verificación de hash"
+ _errors:
+ _invalidParams:
+ title: "Parámetros inválidos"
+ description: "No hay información suficiente para cargar datos de un sitio externo. Por favor, confirma la URL introducida."
+ _resourceTypeNotSupported:
+ title: "Este recurso externo no es compatible"
+ description: "El tipo de este recurso externo no es compatible. Por favor, contacta con el administrador del sitio."
+ _failedToFetch:
+ title: "No se pudo obtener los datos"
+ fetchErrorDescription: "Ha ocurrido un error al comunicarse con el sitio externo. Si no se soluciona tras intentarlo otra vez, por favor, contacta con el administrador del sitio."
+ parseErrorDescription: "Ha ocurrido un error al procesar los datos obtenidos del sitio externo. Por favor, contacta con el administrador del sitio."
+ _hashUnmatched:
+ title: "Verificación de datos fallida"
+ description: "Ha ocurrido un error al verificar la integridad de los datos obtenidos. Por seguridad, la instalación no se puede realizar. Por favor, contacta con el administrador del sitio."
+ _pluginParseFailed:
+ title: "Error de AiScript"
+ description: "Los datos se han obtenido correctamente, pero ha ocurrido un error de AiScript al procesarlos. Por favor, contacta con el autor del plugin. Se pueden ver más detalles del error en la consola de Javascript."
+ _pluginInstallFailed:
+ title: "Instalación del plugin fallida."
+ description: "Ha ocurrido un problema al instalar el plugin. Por favor, inténtalo de nuevo. Se pueden ver más detalles del error en la consola de Javascript."
+ _themeParseFailed:
+ title: "Análisis del tema fallido"
+ description: "Los datos se han obtenido correctamente, pero ha ocurrido un error al analizar el tema. Por favor, contacta con el autor. Se pueden ver más detalles del error en la consola de Javascript."
+ _themeInstallFailed:
+ title: "Instalación de tema fallida"
+ description: "Ha ocurrido un problema al instalar el tema. Por favor, inténtalo de nuevo. Se pueden ver más detalles del error en la consola de Javascript."
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index cd88084ced..43cc1d45b6 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -45,6 +45,7 @@ pin: "Épingler sur le profil"
unpin: "Désépingler"
copyContent: "Copier le contenu"
copyLink: "Copier le lien"
+copyLinkRenote: "Copier le lien de la renote"
delete: "Supprimer"
deleteAndEdit: "Supprimer et réécrire"
deleteAndEditConfirm: "Êtes-vous sûr de vouloir effacer cette note et la modifier ? Vous perdrez toutes les réactions, renotes et réponses."
@@ -74,7 +75,7 @@ import: "Importer"
export: "Exporter"
files: "Fichiers"
download: "Télécharger"
-driveFileDeleteConfirm: "Êtes-vous sûr de vouloir supprimer le fichier \"{name}\" ? Les notes liées à ce fichier seront aussi supprimées."
+driveFileDeleteConfirm: "Êtes-vous sûr·e de vouloir supprimer le fichier « {name} » ? Les notes avec ce fichier joint seront aussi supprimées."
unfollowConfirm: "Désirez-vous vous désabonner de {name} ?"
exportRequested: "Vous avez demandé une exportation. L’opération pourrait prendre un peu de temps. Une fois terminée, le fichier sera ajouté au Drive."
importRequested: "Vous avez initié un import. Cela pourrait prendre un peu de temps."
@@ -120,7 +121,12 @@ sensitive: "Contenu sensible"
add: "Ajouter"
reaction: "Réactions"
reactions: "Réactions"
-reactionSetting: "Réactions à afficher dans le sélecteur de réactions"
+emojiPicker: "Sélecteur d’émojis"
+pinnedEmojisForReactionSettingDescription: "Vous pouvez définir les émojis épinglés lors de la réaction"
+pinnedEmojisSettingDescription: "Vous pouvez définir les émojis épinglés lors de la saisie de l'émoji"
+emojiPickerDisplay: "Affichage du sélecteur d'émojis"
+overwriteFromPinnedEmojisForReaction: "Remplacer par les émojis épinglés pour la réaction"
+overwriteFromPinnedEmojis: "Remplacer par les émojis épinglés globalement"
reactionSettingDescription2: "Déplacer pour réorganiser, cliquer pour effacer, utiliser « + » pour ajouter."
rememberNoteVisibility: "Se souvenir de la visibilité des notes"
attachCancel: "Supprimer le fichier attaché"
@@ -129,6 +135,8 @@ unmarkAsSensitive: "Supprimer le marquage comme sensible"
enterFileName: "Entrer le nom du fichier"
mute: "Masquer"
unmute: "Ne plus masquer"
+renoteMute: "Masquer les renotes"
+renoteUnmute: "Ne plus masquer les renotes"
block: "Bloquer"
unblock: "Débloquer"
suspend: "Suspendre"
@@ -181,7 +189,7 @@ selectUser: "Sélectionner un·e utilisateur·rice"
recipient: "Destinataire"
annotation: "Commentaires"
federation: "Fédération"
-instances: "Instance"
+instances: "Instances"
registeredAt: "Premier contact le"
latestRequestReceivedAt: "Dernière requête reçue"
latestStatus: "Dernier statut"
@@ -191,6 +199,7 @@ perHour: "par heure"
perDay: "par jour"
stopActivityDelivery: "Arrêter l’envoi de l’activité"
blockThisInstance: "Bloquer cette instance"
+silenceThisInstance: "Mettre cette instance en sourdine"
operations: "Opérations"
software: "Logiciel"
version: "Version"
@@ -210,6 +219,8 @@ clearCachedFiles: "Vider le cache"
clearCachedFilesConfirm: "Êtes-vous sûr·e de vouloir vider tout le cache de fichiers distants ?"
blockedInstances: "Instances bloquées"
blockedInstancesDescription: "Listez les instances que vous désirez bloquer, une par ligne. Ces instances ne seront plus en capacité d'interagir avec votre instance."
+silencedInstances: "Instances mises en sourdine"
+silencedInstancesDescription: "Énumérer les noms d'hôte des instances à mettre en sourdine. Tous les comptes des instances énumérées seront traités comme mis en sourdine, ne peuvent faire que des demandes de suivi et ne peuvent pas mentionner les comptes locaux s'ils ne sont pas suivis. Cela n'affectera pas les instances bloquées."
muteAndBlock: "Masqué·e·s / Bloqué·e·s"
mutedUsers: "Utilisateur·rice·s en sourdine"
blockedUsers: "Utilisateur·rice·s bloqué·e·s"
@@ -252,14 +263,15 @@ imageUrl: "URL de l’image"
remove: "Supprimer"
removed: "Supprimé"
removeAreYouSure: "Êtes-vous sûr·e de vouloir supprimer « {x} » ?"
-deleteAreYouSure: "Êtes-vous sûr·e de vouloir supprimer「{x}」?"
+deleteAreYouSure: "Êtes-vous sûr·e de vouloir supprimer « {x} » ?"
resetAreYouSure: "Voulez-vous réinitialiser ?"
+areYouSure: "Êtes-vous sûr·e ?"
saved: "Enregistré"
messaging: "Discuter"
upload: "Téléverser"
keepOriginalUploading: "Garder l’image d’origine"
keepOriginalUploadingDescription: "Conserve la version originale lors du téléchargement d'images. S'il est désactivé, le navigateur génère l'image pour la publication web lors du téléchargement."
-fromDrive: "Depuis le Drive"
+fromDrive: "Depuis le Disque"
fromUrl: "Depuis une URL"
uploadFromUrl: "Téléverser via une URL"
uploadFromUrlDescription: "URL du fichier que vous souhaitez téléverser"
@@ -293,7 +305,7 @@ dark: "Sombre"
lightThemes: "Thèmes clairs"
darkThemes: "Thèmes sombres"
syncDeviceDarkMode: "Utiliser le mode sombre de votre appareil"
-drive: "Drive"
+drive: "Disque"
fileName: "Nom du fichier"
selectFile: "Choisir le fichier"
selectFiles: "Choisir les fichiers"
@@ -304,8 +316,9 @@ folderName: "Nom du dossier"
createFolder: "Créer un dossier"
renameFolder: "Renommer le dossier"
deleteFolder: "Supprimer le dossier"
+folder: "Dossier"
addFile: "Ajouter un fichier"
-emptyDrive: "Le Drive est vide"
+emptyDrive: "Le Disque est vide"
emptyFolder: "Le dossier est vide"
unableToDelete: "Suppression impossible"
inputNewFileName: "Entrez un nouveau nom de fichier"
@@ -349,8 +362,8 @@ disablingTimelinesInfo: "Même si vous désactivez ces fils, les administrateur
registration: "S’inscrire"
enableRegistration: "Autoriser les nouvelles inscriptions"
invite: "Inviter"
-driveCapacityPerLocalAccount: "Volume du Drive par utilisateur local"
-driveCapacityPerRemoteAccount: "Volume du Drive par utilisateur distant"
+driveCapacityPerLocalAccount: "Capacité de stockage du Disque par utilisateur local"
+driveCapacityPerRemoteAccount: "Capacité de stockage du Disque par utilisateur distant"
inMb: "en mégaoctets"
bannerUrl: "URL de l’image de la bannière"
backgroundImageUrl: "URL de l'image d'arrière-plan"
@@ -381,7 +394,7 @@ antennaSource: "Source de l’antenne"
antennaKeywords: "Mots clés à recevoir"
antennaExcludeKeywords: "Mots clés à exclure"
antennaKeywordsDescription: "Séparer avec des espaces pour la condition AND. Séparer avec un saut de ligne pour une condition OR."
-notifyAntenna: "Je souhaite recevoir les notifications des nouvelles notes"
+notifyAntenna: "Me notifier pour les nouvelles notes"
withFileAntenna: "Notes ayant des attachements uniquement"
enableServiceworker: "Activer ServiceWorker"
antennaUsersDescription: "Saisissez un seul nom d’utilisateur·rice par ligne"
@@ -414,6 +427,7 @@ moderator: "Modérateur·rice·s"
moderation: "Modérations"
moderationNote: "Note de modération"
addModerationNote: "Ajouter une note de modération"
+moderationLogs: "Journal de modération"
nUsersMentioned: "{n} utilisateur·rice·s mentionné·e·s"
securityKeyAndPasskey: "Sécurité et clés de sécurité"
securityKey: "Clé de sécurité"
@@ -421,6 +435,7 @@ lastUsed: "Dernier utilisé"
lastUsedAt: "Dernière utilisation : {t}"
unregister: "Se désinscrire"
passwordLessLogin: "Se connecter sans mot de passe"
+passwordLessLoginDescription: "Se connecter uniquement avec une clé de sécurité ou une clé d'accès sans utiliser de mot de passe"
resetPassword: "Réinitialiser le mot de passe"
newPasswordIs: "Votre nouveau mot de passe est \"{password}\""
reduceUiAnimation: "Réduire les animations dans l’interface"
@@ -428,7 +443,6 @@ share: "Partager"
notFound: "Non trouvé"
notFoundDescription: "Aucune page ne correspond à l’URL spécifiée."
uploadFolder: "Emplacement de téléversement par défaut"
-cacheClear: "Vider le cache"
markAsReadAllNotifications: "Marquer toutes les notifications comme lues"
markAsReadAllUnreadNotes: "Marquer toutes les notes comme lues"
markAsReadAllTalkMessages: "Marquer toutes les discussions comme lues"
@@ -472,9 +486,11 @@ aboutX: "À propos de {x}"
emojiStyle: "Style des émojis"
native: "Natif"
disableDrawer: "Les menus ne s'affichent pas dans le tiroir"
+showNoteActionsOnlyHover: "Afficher les actions de note uniquement au survol"
noHistory: "Pas d'historique"
signinHistory: "Historique de connexion"
enableAdvancedMfm: "Activer la MFM avancée"
+enableAnimatedMfm: "Activer le MFM animé"
doing: "En cours..."
category: "Catégorie"
tags: "Étiquettes"
@@ -483,6 +499,7 @@ createAccount: "Créer un compte"
existingAccount: "Compte existant"
regenerate: "Générer à nouveau"
fontSize: "Taille de la police"
+mediaListWithOneImageAppearance: "Hauteur des listes de médias n'ayant qu'une image "
limitTo: "Limiter à {x}"
noFollowRequests: "Vous n’avez aucune demande d’abonnement en attente"
openImageInNewTab: "Ouvrir les images dans un nouvel onglet"
@@ -520,6 +537,8 @@ objectStorageSetPublicRead: "Régler sur « public » lors de l'envoi"
serverLogs: "Journal du serveur"
deleteAll: "Supprimer tout"
showFixedPostForm: "Afficher le formulaire de publication en haut du fil d'actualité"
+showFixedPostFormInChannel: "Afficher le formulaire de publication en haut du fil (canaux)"
+withRepliesByDefaultForNewlyFollowed: "Afficher les réponses des nouvelles personnes que vous suivez dans le fil par défaut"
newNoteRecived: "Voir les nouvelles notes"
sounds: "Sons"
sound: "Sons"
@@ -529,6 +548,8 @@ showInPage: "Afficher dans la page"
popout: "Fenêtre contextuelle"
volume: "Volume"
masterVolume: "Volume principal"
+notUseSound: "Ne pas émettre de son"
+useSoundOnlyWhenActive: "Émettre des sons uniquement quand Misskey est active"
details: "Détails"
chooseEmoji: "Choisissez un émoji"
unableToProcess: "L’opération n’a pas pu être complétée."
@@ -549,9 +570,13 @@ output: "Sortie"
script: "Script"
disablePagesScript: "Désactiver AiScript sur les Pages"
updateRemoteUser: "Mettre à jour les informations de l’utilisateur·rice distant·e"
+unsetUserAvatar: "Supprimer l’avatar"
+unsetUserAvatarConfirm: "Êtes-vous sûr·e de vouloir supprimer l'avatar ?"
+unsetUserBanner: "Supprimer la bannière"
+unsetUserBannerConfirm: "Êtes-vous sûr·e de vouloir supprimer la bannière ?"
deleteAllFiles: "Supprimer tous les fichiers"
deleteAllFilesConfirm: "Êtes-vous sûr·e de vouloir supprimer tous les fichiers ?"
-removeAllFollowing: "Retenir tous les abonnements"
+removeAllFollowing: "Se désabonner de tous les utilisateurs auxquels vous êtes abonné·e"
removeAllFollowingDescription: "Se désabonner de tous les comptes de {host}. Veuillez lancer cette action dans les cas où l’instance n’existe plus, etc."
userSuspended: "Cet·te utilisateur·rice a été suspendu·e."
userSilenced: "Cette utilisateur·trice a été mis·e en sourdine."
@@ -602,14 +627,14 @@ permission: "Autorisations "
enableAll: "Tout activer"
disableAll: "Tout désactiver"
tokenRequested: "Autoriser l'accès au compte"
-pluginTokenRequestedDescription: "Ce plugin pourra utiliser les autorisations définies ici."
+pluginTokenRequestedDescription: "Cette extension pourra utiliser les autorisations définies ici."
notificationType: "Type de notifications"
edit: "Editer"
emailServer: "Serveur de messagerie"
enableEmail: "Activer la distribution de courriel"
-emailConfigInfo: "Utilisé pour confirmer votre adresse de courriel et la réinitialisation de votre mot de passe en cas d’oubli."
+emailConfigInfo: "Utilisé pour confirmer votre adresse e-mail et réinitialiser votre mot de passe en cas d’oubli"
email: "E-mail "
-emailAddress: "Adresses e-mail"
+emailAddress: "Adresse e-mail"
smtpConfig: "Paramètres du serveur SMTP"
smtpHost: "Serveur distant"
smtpPort: "Port"
@@ -620,6 +645,7 @@ smtpSecure: "Utiliser SSL/TLS implicitement dans les connexions SMTP"
smtpSecureInfo: "Désactiver cette option lorsque STARTTLS est utilisé"
testEmail: "Tester la distribution de courriel"
wordMute: "Filtre de mots"
+hardWordMute: "Filtre de mots dur"
regexpError: "Erreur d’expression régulière"
regexpErrorDescription: "Une erreur s'est produite dans l'expression régulière sur la ligne {ligne} de votre mot muet {tab} :"
instanceMute: "Instance en sourdine"
@@ -647,6 +673,7 @@ behavior: "Comportement"
sample: "Exemple"
abuseReports: "Signalements"
reportAbuse: "Signaler"
+reportAbuseRenote: "Signaler la renote"
reportAbuseOf: "Signaler {name}"
fillAbuseReportDescription: "Veuillez expliquer les raisons du signalement. S'il s'agit d'une note précise, veuillez en donner le lien."
abuseReported: "Le rapport est envoyé. Merci."
@@ -671,6 +698,8 @@ clip: "Clip"
createNew: "Créer nouveau"
optional: "Facultatif"
createNewClip: "Créer un nouveau clip"
+unclip: "Supprimer le clip"
+confirmToUnclipAlreadyClippedNote: "Cette note fait déjà partie du clip « {name} ». Souhaitez-vous la supprimer de ce clip ?"
public: "Public"
private: "Privé"
i18nInfo: "Misskey est traduit dans différentes langues par des bénévoles. Vous pouvez contribuer à {link}."
@@ -681,7 +710,7 @@ repliesCount: "Nombre de réponses envoyées"
renotesCount: "Nombre de notes que vous avez renotées"
repliedCount: "Nombre de réponses reçues"
renotedCount: "Nombre de vos notes renotées"
-followingCount: "Nombre de comptes suivis"
+followingCount: "Nombre d'abonnements"
followersCount: "Nombre d'abonnés"
sentReactionsCount: "Nombre de réactions envoyées"
receivedReactionsCount: "Nombre de réactions reçues"
@@ -689,8 +718,8 @@ pollVotesCount: "Nombre de votes envoyés"
pollVotedCount: "Nombre de votes reçus"
yes: "Oui"
no: "Non"
-driveFilesCount: "Nombre de fichiers dans le Drive"
-driveUsage: "Utilisation du Drive"
+driveFilesCount: "Nombre de fichiers sur le Disque"
+driveUsage: "Utilisation du Disque"
noCrawle: "Refuser l'indexation par les robots"
noCrawleDescription: "Demandez aux moteurs de recherche de ne pas indexer votre page de profil, vos notes, vos pages, etc."
lockedAccountInfo: "À moins que vous ne définissiez la visibilité de votre note sur \"Abonné-e-s\", vos notes sont visibles par tous, même si vous exigez que les demandes d'abonnement soient approuvées manuellement."
@@ -752,7 +781,7 @@ inUse: "utilisé"
editCode: "Modifier le code"
apply: "Appliquer"
receiveAnnouncementFromInstance: "Recevoir les messages d'information de l'instance"
-emailNotification: "Notifications par mail"
+emailNotification: "Notifications par courriel"
publish: "Public"
inChannelSearch: "Chercher dans le canal"
useReactionPickerForContextMenu: "Clic-droit pour ouvrir le panneau de réactions"
@@ -769,7 +798,7 @@ addDescription: "Ajouter une description"
userPagePinTip: "Vous pouvez afficher des notes ici en sélectionnant l'option « Épingler au profil » dans le menu de chaque note."
notSpecifiedMentionWarning: "Vous avez mentionné des utilisateur·rice·s qui ne font pas partie de la liste des destinataires"
info: "Informations"
-userInfo: "Informations sur l'utilisateur"
+userInfo: "Informations sur l'utilisateur·rice"
unknown: "Inconnu"
onlineStatus: "Statut"
hideOnlineStatus: "Se rendre invisible"
@@ -833,7 +862,7 @@ pubSub: "Comptes Pub/Sub"
lastCommunication: "Dernière communication"
resolved: "Résolu"
unresolved: "En attente"
-breakFollow: "Ne plus suivre"
+breakFollow: "Supprimer l'abonné·e"
breakFollowConfirm: "Êtes-vous sûr de vouloir vous désabonner ?"
itsOn: "Activé"
itsOff: "Désactivé"
@@ -849,8 +878,8 @@ makeReactionsPublicDescription: "Ceci rendra la liste de toutes vos réactions d
classic: "Classique"
muteThread: "Masquer cette discussion"
unmuteThread: "Ne plus masquer le fil"
-ffVisibility: "Visibilité des abonnés/abonnements"
-ffVisibilityDescription: "Permet de configurer qui peut voir les personnes que tu suis et les personnes qui te suivent."
+followingVisibility: "Visibilité des abonnements"
+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."
@@ -892,7 +921,7 @@ noEmailServerWarning: "Serveur de courrier non configuré."
thereIsUnresolvedAbuseReportWarning: "Il n’y a aucun rapport non résolu."
recommended: "Recommandé"
check: "Vérifier"
-driveCapOverrideLabel: "Modifier la capacité de stockage du drive de cet·te utilisateur·rice"
+driveCapOverrideLabel: "Modifier la capacité de stockage du Disque de cet·te utilisateur·rice"
driveCapOverrideCaption: "Si une valeur inférieure à 0 est spécifiée, elle est annulée."
requireAdminForView: "Vous devez être connecté avec un compte administrateur pour les visualiser."
isSystemAccount: "Ces comptes sont automatiquement créés et gérés par le système."
@@ -919,6 +948,7 @@ remoteOnly: "Distant uniquement"
failedToUpload: "Échec du transfert"
cannotUploadBecauseInappropriate: "Impossible de télécharger le document car il a été déterminé qu'il pouvait contenir un contenu inapproprié."
cannotUploadBecauseNoFreeSpace: "Impossible de télécharger en raison d'un manque d'espace libre sur le disque.\n"
+cannotUploadBecauseExceedsFileSizeLimit: "Ce fichier ne peut pas être téléchargé parce qu'il dépasse la taille maximale."
beta: "Bêta"
enableAutoSensitive: "Détermination automatique de NSFW"
enableAutoSensitiveDescription: "S'il est disponible, le drapeau NSFW est automatiquement défini sur le média en utilisant l'apprentissage automatique. Même si cette fonction est désactivée, elle peut être réglée automatiquement dans certains cas."
@@ -933,37 +963,78 @@ unsubscribePushNotification: "Désactiver les notifications push"
pushNotificationAlreadySubscribed: "Les notifications push sont déjà activées"
pushNotificationNotSupported: "Votre navigateur ou votre instance ne prend pas en charge les notifications push"
sendPushNotificationReadMessage: "Supprimer les notifications push une fois que les notifications ou messages pertinents ont été lus."
+sendPushNotificationReadMessageCaption: "Cela peut augmenter la consommation de batterie de votre appareil."
+windowMaximize: "Maximiser"
+windowMinimize: "Minimaliser"
windowRestore: "Restaurer"
caption: "Libellé"
loggedInAsBot: "Connecté actuellement en tant que bot"
tools: "Outils"
cannotLoad: "Chargement impossible"
+numberOfProfileView: "Nombre de vues du profil"
like: "J'aime"
+unlike: "Ne plus aimer"
numberOfLikes: "Favoris"
show: "Affichage"
neverShow: "Ne plus afficher"
remindMeLater: "Peut-être plus tard"
+didYouLikeMisskey: "Avez-vous aimé Misskey ?"
roles: "Rôles"
role: "Rôles"
noRole: "Aucun rôle"
normalUser: "Simple utilisateur·rice"
undefined: "Non défini"
assign: "Attribuer"
+unassign: "Retirer"
color: "Couleur"
manageCustomEmojis: "Gestion des émojis personnalisés"
+manageAvatarDecorations: "Gérer les décorations d'avatar"
+youCannotCreateAnymore: "Vous avez atteint la limite de création."
+cannotPerformTemporary: "Temporairement indisponible"
+invalidParamError: "Paramètres invalides"
+permissionDeniedError: "Opération refusée"
preset: "Préréglage"
selectFromPresets: "Sélectionner à partir des préréglages"
achievements: "Accomplissements"
+gotInvalidResponseError: "Réponse du serveur invalide"
+gotInvalidResponseErrorDescription: "Il se peut que le serveur soit hors ligne ou en maintenance. Veuillez réessayer plus tard."
thisPostMayBeAnnoying: "Cette note peut gêner d'autres personnes."
thisPostMayBeAnnoyingHome: "Publier vers le fil principal"
thisPostMayBeAnnoyingCancel: "Annuler"
thisPostMayBeAnnoyingIgnore: "Publier quand-même"
+collapseRenotes: "Réduire les renotes déjà vues"
internalServerError: "Erreur interne du serveur"
copyErrorInfo: "Copier les détails de l’erreur"
+joinThisServer: "S'inscrire à cette instance"
exploreOtherServers: "Trouver une autre instance"
+letsLookAtTimeline: "Jetez un coup d'œil au fil"
+disableFederationConfirm: "Voulez-vous vraiment désactiver la fédération ?"
+disableFederationConfirmWarn: "Même sans fédération, la note ne sera pas privée. Dans la plupart des cas, ce n'est pas nécessaire de désactiver la fédération."
disableFederationOk: "Désactiver"
+invitationRequiredToRegister: "Actuellement, cette instance est uniquement sur invitation. Seuls ceux qui ont un code d'invitation peuvent s'inscrire."
+emailNotSupported: "Cette instance ne prend pas en charge l'envoi de courriels"
+postToTheChannel: "Publier au canal"
+cannotBeChangedLater: "Cela ne peut pas être modifié plus tard."
+reactionAcceptance: "Acceptation des réactions"
likeOnly: "Les favoris uniquement"
+likeOnlyForRemote: "Toutes (mentions j'aime seulement pour les instances distantes)"
+nonSensitiveOnly: "Non sensibles seulement"
+nonSensitiveOnlyForLocalLikeOnlyForRemote: "Non sensibles seulement (mentions j'aime seulement pour les instances distantes)"
+rolesAssignedToMe: "Rôles attribués à moi"
+sensitiveWords: "Mots sensibles"
+hiddenTags: "Hashtags cachés"
+hiddenTagsDescription: "Les hashtags définis ne s'afficheront pas dans les tendances. Vous pouvez définir plusieurs hashtags en faisant un saut de ligne."
+notesSearchNotAvailable: "La recherche de notes n'est pas disponible."
license: "Licence"
+myClips: "Mes clips"
+drivecleaner: "Nettoyeur du Disque"
+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"
+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"
+noteIdOrUrl: "Identifiant de la note ou URL"
video: "Vidéo"
videos: "Vidéos"
dataSaver: "Économiseur de données"
@@ -971,46 +1042,192 @@ accountMigration: "Migration de compte"
accountMoved: "Cet·te utilisateur·rice a migré son compte vers :"
accountMovedShort: "Ce compte a migré"
operationForbidden: "Opération non autorisée"
+forceShowAds: "Toujours afficher les publicités"
addMemo: "Ajouter un mémo"
+editMemo: "Éditer le mémo"
reactionsList: "Réactions"
+renotesList: "Liste de renotes"
notificationDisplay: "Style des notifications"
leftTop: "En haut à gauche"
rightTop: "En haut à droite"
leftBottom: "En bas à gauche"
rightBottom: "En bas à droite"
+stackAxis: "Direction d'empilement"
vertical: "Vertical"
horizontal: "Latéral"
+position: "Position"
serverRules: "Règles du serveur"
+pleaseConfirmBelowBeforeSignup: "Pour vous inscrire sur cette instance, vous devez confirmer et accepter le contenu suivant."
+pleaseAgreeAllToContinue: "Pour continuer, veuillez accepter tous les champs ci-dessus."
+continue: "Continuer"
+preservedUsernames: "Noms d'utilisateur·rice réservés"
+createNoteFromTheFile: "Rédiger une note de ce fichier"
archive: "Archive"
+channelArchiveConfirmTitle: "Voulez-vous vraiment archiver {name} ?"
+thisChannelArchived: "Ce canal a été archivé."
+displayOfNote: "Affichage de la note"
+initialAccountSetting: "Configuration initiale du profil"
youFollowing: "Abonné·e"
+preventAiLearning: "Refuser l'usage dans l'apprentissage automatique d'IA générative"
+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"
+failedToPreviewUrl: "Aperçu d'URL échoué"
+update: "Mettre à jour"
+rolesThatCanBeUsedThisEmojiAsReaction: "Rôles qui peuvent utiliser cet émoji comme réaction"
later: "Plus tard"
goToMisskey: "Retour vers Misskey"
+additionalEmojiDictionary: "Dictionnaires d'émojis additionnels"
+installed: "Installé"
+branding: "Image de marque"
expirationDate: "Date d’expiration"
+waitingForMailAuth: "En attente de la vérification de l'adresse courriel"
usedAt: "Utilisé le"
unused: "Non-utilisé"
used: "Utilisé"
expired: "Expiré"
doYouAgree: "Êtes-vous d’accord ?"
+beSureToReadThisAsItIsImportant: "Assurez-vous de le lire ; c'est important."
+dialog: "Dialogue"
icon: "Avatar"
forYou: "Pour vous"
+currentAnnouncements: "Annonces actuelles"
+pastAnnouncements: "Annonces passées"
replies: "Répondre"
renotes: "Renoter"
loadReplies: "Inclure les réponses"
+loadConversation: "Afficher la conversation"
pinnedList: "Liste épinglée"
notifyNotes: "Notifier à propos des nouvelles notes"
authentication: "Authentification"
authenticationRequiredToContinue: "Veuillez vous authentifier pour continuer"
+dateAndTime: "Date et heure"
+showRenotes: "Afficher les renotes"
+edited: "Modifié"
+notificationRecieveConfig: "Paramètres des notifications"
+mutualFollow: "Abonnement mutuel"
+showRepliesToOthersInTimeline: "Afficher les réponses aux autres dans le fil"
+hideRepliesToOthersInTimeline: "Masquer les réponses aux autres dans le fil"
+showRepliesToOthersInTimelineAll: "Afficher les réponses de toutes les personnes que vous suivez dans le fil"
+hideRepliesToOthersInTimelineAll: "Masquer les réponses de toutes les personnes que vous suivez dans le fil"
+confirmShowRepliesAll: "Cette opération est irréversible. Voulez-vous vraiment afficher les réponses de toutes les personnes que vous suivez dans le fil ?"
+confirmHideRepliesAll: "Cette opération est irréversible. Voulez-vous vraiment masquer les réponses de toutes les personnes que vous suivez dans le fil ?"
+externalServices: "Services externes"
+impressum: "Impressum"
+impressumUrl: "URL de l'impressum"
+impressumDescription: "Dans certains pays comme l'Allemagne, il est obligatoire d'afficher les informations sur l'opérateur d'un site (un impressum)."
+privacyPolicy: "Politique de confidentialité"
+privacyPolicyUrl: "URL de la politique de confidentialité"
+tosAndPrivacyPolicy: "Conditions d'utilisation et politique de confidentialité"
+avatarDecorations: "Décorations d'avatar"
+attach: "Mettre"
+detach: "Enlever"
+detachAll: "Tout enlever"
+angle: "Angle"
+flip: "Inverser"
+showAvatarDecorations: "Afficher les décorations d'avatar"
+releaseToRefresh: "Relâcher pour rafraîchir"
+refreshing: "Rafraîchissement..."
+pullDownToRefresh: "Tirer vers le bas pour rafraîchir"
+disableStreamingTimeline: "Désactiver les mises à jour en temps réel de la ligne du temps"
+useGroupedNotifications: "Grouper les notifications"
+signupPendingError: "Un problème est survenu lors de la vérification de votre adresse e-mail. Le lien a peut-être expiré."
+cwNotationRequired: "Si « Masquer le contenu » est activé, une description doit être fournie."
+doReaction: "Réagir"
+code: "Code"
+reloadRequiredToApplySettings: "Le rafraîchissement est nécessaire pour que les paramètres prennent effet."
+remainingN: "Restants : {n}"
+overwriteContentConfirm: "Voulez-vous remplacer le contenu actuel ?"
+seasonalScreenEffect: "Effet d'écran saisonnier"
+decorate: "Décorer"
_announcement:
readConfirmTitle: "Marquer comme lu ?"
+ shouldNotBeUsedToPresentPermanentInfo: "Puisque cela pourrait nuire considérablement à l'expérience utilisateur pour les nouveaux utilisateurs, il est recommandé d'utiliser les annonces pour afficher des informations temporaires plutôt que des informations persistantes."
+ dialogAnnouncementUxWarn: "Avoir deux ou plus annonces de style dialogue en même temps pourrait nuire considérablement à l'expérience utilisateur. Veuillez les utiliser avec caution."
+ silence: "Ne pas me notifier"
+ silenceDescription: "Si activée, vous ne recevrez pas de notifications sur les annonces et n'aurez pas besoin de les marquer comme lues."
_initialAccountSetting:
profileSetting: "Paramètres du profil"
privacySetting: "Paramètres de confidentialité"
initialAccountSettingCompleted: "Configuration du profil terminée avec succès !"
- ifYouNeedLearnMore: "Si vous voulez en savoir plus comment utiliser {name}(Misskey), veuillez visiter {link}."
- skipAreYouSure: "Désirez-vous ignorer la configuration du profile ?"
+ youCanContinueTutorial: "Vous pouvez procéder au tutoriel sur l'utilisation de {nom}(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 ?"
+_initialTutorial:
+ launchTutorial: "Visionner le tutoriel"
+ title: "Tutoriel"
+ wellDone: "Bien joué !"
+ skipAreYouSure: "Quitter le tutoriel ?"
+ _landing:
+ title: "Bienvenue dans le tutoriel"
+ description: "Ici, vous pouvez apprendre l'utilisation de base de Misskey et ses fonctionnalités."
+ _note:
+ title: "Qu'est-ce que les notes ?"
+ description: "Les messages sur Misskey sont appelés des « notes » . Les notes sont classées par ordre chronologique sur le fil et sont mises à jour en temps réel."
+ reply: "Vous pouvez répondre aux messages. Vous pouvez également répondre aux réponses et poursuivre la conversation comme un fil de discussion."
+ renote: "Vous pouvez partager cette note sur votre propre fil. Vous pouvez aussi ajouter du texte en citant."
+ reaction: "Vous pouvez ajouter des réactions. Les détails sont expliqués à la page suivante."
+ menu: "Vous pouvez afficher les détails de la note, copier le lien et effectuer d'autres actions."
+ _reaction:
+ title: "Qu'est-ce que les réactions ?"
+ description: "Vous pouvez ajouter des « réactions » aux notes. Les réactions vous permettent d'exprimer à l'aise des nuances qui ne peuvent pas être exprimées par des mentions j'aime."
+ letsTryReacting: "Des réactions peuvent être ajoutées en cliquant sur le bouton « + » de la note. Essayez d'ajouter une réaction à cet exemple de note !"
+ reactToContinue: "Ajoutez une réaction pour procéder."
+ reactNotification: "Vous recevez des notifications en temps réel lorsque quelqu'un réagit à votre note."
+ reactDone: "Vous pouvez annuler la réaction en cliquant sur le bouton « - » ."
+ _timeline:
+ title: "Fonctionnement des fils"
+ description1: "Misskey offre plusieurs fils selon l'usage (certains peuvent être désactivés par le serveur)."
+ home: "Vous pouvez voir les notes des utilisateurs auxquels vous êtes abonné·e."
+ local: "Vous pouvez voir les notes de tous les utilisateurs sur cette instance."
+ social: "Les notes des fils principal et local sont affichées."
+ global: "Vous pouvez voir les notes de toutes les instances connectées."
+ description2: "Vous pouvez passer d'un fil à l'autre en haut de l'écran à tout moment."
+ description3: "De plus, il y a les fils des listes et des canaux. Pour plus de détails, consultez {link}."
+ _postNote:
+ title: "Paramètres de la publication de note"
+ description1: "Lorsque vous publiez des notes sur Misskey, diverses options sont disponibles. Voici le formulaire de publication."
+ _visibility:
+ description: "Vous pouvez choisir qui peut voir vos notes."
+ public: "Visible à tous les utilisateurs."
+ home: "Uniquement visible sur le fil principal. Les utilisateurs pourront la voir en visitant ton profil, en s'abonnant à vous et par les renotes."
+ followers: "Uniquement visible à vos abonnés. Elle ne pourra être renotée que par vous-même."
+ direct: "Uniquement visible aux utilisateurs de votre choix. Les récipients seront notifiés. Cette option peut être utilisée comme alternative aux messages directs."
+ doNotSendConfidencialOnDirect1: "Faites attention quand vous envoyez vos informations sensibles !"
+ doNotSendConfidencialOnDirect2: "Les administrateurs de l'instance destinataire peuvent voir toutes les notes publiées. Soyez prudent·e avec vos informations sensibles quand vous envoyez des notes directes aux utilisateurs dont vous ne vous fiez pas aux instances."
+ localOnly: "Désactiver la fédération de la note aux autres instances. Les utilisateurs des autres instances ne pourront pas voir directement la note quelle que soit l'étendue de la publication mentionnée ci-dessus."
+ _cw:
+ title: "Masquer le contenu (CW)"
+ description: "Au lieu du corps du texte, le contenu du champ « commentaires » s'affichera. Appuyez sur « afficher le contenu » pour voir le corps du texte."
+ _exampleNote:
+ cw: "Attention : cela vous donnera faim !"
+ note: "J'ai mangé un beignet enrobé de chocolat 🍩😋"
+ useCases: "Utilisé pour désigner certaines notes selon les règles du serveur ou pour cacher des spoilers ou des textes sensibles."
+ _howToMakeAttachmentsSensitive:
+ title: "Comment marquer un fichier joint comme sensible ?"
+ description: "Attachez un drapeau « sensible » aux fichiers joints selon les règles du serveur ou si vous ne voulez pas que le fichier soit vu directement."
+ tryThisFile: "Essayez de marquer l'image jointe à ce formulaire de publication comme sensible !"
+ _exampleNote:
+ note: "Oups, j'ai échoué à ouvrir le couvercle du natto..."
+ method: "Pour marquer un fichier joint comme sensible, cliquez sur la vignette du fichier pour ouvrir le menu et cliquez sur « marquer comme sensible » ."
+ sensitiveSucceeded: "Quand vous joignez des fichiers, veuillez indiquer la sensibilité selon les règles du serveur."
+ doItToContinue: "Marquez le fichier joint comme sensible pour procéder."
+ _done:
+ title: "Le tutoriel est terminé ! 🎉"
+ description: "Les fonctionnalités introduites ici ne sont que quelques-unes. Pour savoir plus sur l'utilisation de Misskey, veuillez consulter {lien}."
+_timelineDescription:
+ home: "Sur le fil principal, vous pouvez voir les notes des utilisateurs auxquels vous êtes abonné·e."
+ local: "Sur le fil local, vous pouvez voir les notes de tous les utilisateurs sur cette instance."
+ social: "Sur le fil social, les notes des fils principal et local sont affichées."
+ global: "Sur le fil global, vous pouvez voir les notes de toutes les instances connectées."
_serverSettings:
iconUrl: "URL de l’icône"
+ appIconResolutionMustBe: "La résolution doit être au moins {resolution}."
+ shortName: "Nom court"
+ shortNameDescription: "Si le nom officiel de l'instance est long, cette abréviation peut être affichée à la place."
+ fanoutTimelineDescription: "Si activée, la performance de la récupération de la chronologie augmentera considérablement et la charge sur la base de données sera réduite. En revanche, l'utilisation de la mémoire de Redis augmentera. Considérez désactiver cette option si le serveur est bas en mémoire ou instable."
+ fanoutTimelineDbFallback: "Recours à la base de données"
+ fanoutTimelineDbFallbackDescription: "Si activée, une demande supplémentaire à la base de données est effectuée comme solution de rechange quand le fil n'est pas mis en cache. Si désactivée, la demande à la base de données n'est pas effectuée, ce qui réduit davantage la charge du serveur mais limite l'étendue du fil récupérable."
_accountMigration:
moveFrom: "Migrer un autre compte vers le présent compte"
moveFromSub: "Créer un alias vers un autre compte"
@@ -1077,17 +1294,32 @@ _achievements:
description: "Rendre votre compte comme un chat"
flavor: "Je n'ai pas encore de nom"
_following1:
- title: "Vous suivez votre premier utilisateur·rice"
+ title: "Vous suivez votre premier·ère utilisateur·rice"
+ _following10:
+ description: "S'abonner à plus de 10 utilisateur·rice·s"
_following50:
title: "Beaucoup d'amis"
+ description: "S'abonner à plus de 50 utilisateur·rice·s"
+ _following100:
+ description: "S'abonner à plus de 100 utilisateur·rice·s"
+ _following300:
+ description: "S'abonner à plus de 300 utilisateur·rice·s"
_followers10:
title: "Abonnez-moi !"
+ description: "Obtenir plus de 10 abonné·e·s"
+ _followers50:
+ description: "Obtenir plus de 50 abonné·e·s"
_followers100:
title: "Populaire"
+ description: "Obtenir plus de 100 abonné·e·s"
+ _followers300:
+ description: "Obtenir plus de 300 abonné·e·s"
_followers500:
title: "Tour radio"
+ description: "Obtenir plus de 500 abonné·e·s"
_followers1000:
title: "Influenceur·euse"
+ description: "Obtenir plus de 1000 abonné·e·s"
_iLoveMisskey:
title: "J’adore Misskey"
description: "Publication « J’❤ #Misskey »"
@@ -1106,7 +1338,7 @@ _achievements:
_viewInstanceChart:
title: "Analyste"
_outputHelloWorldOnScratchpad:
- title: "Bonjour tout le monde !"
+ title: "Hello, world!"
_open3windows:
title: "Multi-fenêtres"
_driveFolderCircularReference:
@@ -1128,6 +1360,12 @@ _achievements:
flavor: "Attendez une minute, vous êtes sur le mauvais site web ?"
_brainDiver:
flavor: "Misskey-Misskey La-Tu-Ma"
+ _smashTestNotificationButton:
+ title: "Débordement de tests"
+ description: "Détruire le bouton de test de notifications dans un intervalle extrêmement court"
+ _tutorialCompleted:
+ title: "Diplôme de la course élémentaire de Misskey"
+ description: "Terminer le tutoriel"
_role:
new: "Nouveau rôle"
edit: "Modifier le rôle"
@@ -1135,6 +1373,8 @@ _role:
description: "Description du rôle"
permission: "Rôle et autorisations"
assignTarget: "Attribuer"
+ manualRoles: "Rôles manuels"
+ conditionalRoles: "Rôles conditionnels"
condition: "Condition"
isPublic: "Rôle public"
options: "Options"
@@ -1151,6 +1391,11 @@ _role:
high: "Haute"
_options:
canManageCustomEmojis: "Gestion des émojis personnalisés"
+ canManageAvatarDecorations: "Gestion des décorations d'avatar"
+ driveCapacity: "Capacité de stockage du Disque"
+ 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"
_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"
@@ -1184,6 +1429,10 @@ _ad:
back: "Retour"
reduceFrequencyOfThisAd: "Voir cette publicité moins souvent"
hide: "Cacher "
+ adsSettings: "Paramètres des publicités"
+ notesPerOneAd: "Intervalle de diffusion de publicités lors de la mise à jour en temps réel (nombre de notes par publicité)"
+ setZeroToDisable: "Mettre cette valeur à 0 pour désactiver la diffusion de publicités lors de la mise à jour en temps réel"
+ adsTooClose: "L'expérience utilisateur peut être gravement compromise par un intervalle de diffusion de publicités extrêmement court."
_forgotPassword:
enterEmail: "Entrez ici l'adresse e-mail que vous avez enregistrée pour votre compte. Un lien vous permettant de réinitialiser votre mot de passe sera envoyé à cette adresse."
ifNoEmail: "Si vous n'avez pas enregistré d'adresse e-mail, merci de contacter l'administrateur·rice de votre instance."
@@ -1199,9 +1448,9 @@ _email:
_receiveFollowRequest:
title: "Vous avez reçu une demande de suivi"
_plugin:
- install: "Installation de plugin"
+ install: "Installation d'extensions"
installWarn: "N’installez que des extensions provenant de sources de confiance."
- manage: "Gestion des plugins"
+ manage: "Gestion des extensions"
viewSource: "Afficher la source"
_preferencesBackups:
list: "Sauvegardes créées"
@@ -1214,7 +1463,7 @@ _preferencesBackups:
nameAlreadyExists: "Le nom de sauvegarde \"{name}\" existe déjà. Veuillez spécifier un autre nom."
applyConfirm: "Voulez-vous appliquer la sauvegarde '{name}' au dispositif actuel ? La configuration actuelle de l'appareil sera perdue."
saveConfirm: "Voulez-vous écraser {name} ?"
- deleteConfirm: "Voulez-vous supprimer {name} ?"
+ deleteConfirm: "Êtes-vous sûr·e de vouloir supprimer {name} ?"
renameConfirm: "Voulez-vous remplacer \"{old}\" par \"{new}\" ?"
noBackups: "Aucune sauvegarde n'est disponible. L'option \"Nouvelle sauvegarde\" vous permet de sauvegarder la configuration actuelle du client sur le serveur."
createdAt: "Créé : {date} {time}"
@@ -1236,6 +1485,7 @@ _aboutMisskey:
donate: "Soutenir Misskey"
morePatrons: "Nous apprécions vraiment le soutien de nombreuses autres personnes non mentionnées ici. Merci à toutes et à tous ! 🥰"
patrons: "Contributeurs"
+ projectMembers: "Membres du projet"
_displayOfSensitiveMedia:
force: "Masquer tous les médias"
_instanceTicker:
@@ -1258,6 +1508,7 @@ _channel:
notesCount: "{n} Notes"
nameAndDescription: "Nom et description"
nameOnly: "Nom seulement"
+ allowRenoteToExternal: "Permettre la renote et la citation hors du canal"
_menuDisplay:
sideFull: "Latéral"
sideIcon: "Latéral (icônes)"
@@ -1330,9 +1581,6 @@ _theme:
infoFg: "Texte d'information"
infoWarnBg: "Arrière-plan des avertissements"
infoWarnFg: "Texte d’avertissement"
- cwBg: "Arrière-plan du CW"
- cwFg: "Texte du bouton CW"
- cwHoverBg: "Arrière-plan du bouton CW (survolé)"
toastBg: "Arrière-plan de la bulle de notification"
toastFg: "Texte de la bulle de notification"
buttonBg: "Arrière-plan du bouton"
@@ -1352,6 +1600,14 @@ _sfx:
notification: "Notifications"
antenna: "Réception de l’antenne"
channel: "Notifications de canal"
+ reaction: "Lors de la sélection de la réaction"
+_soundSettings:
+ driveFile: "Utiliser un effet sonore sur le Disque"
+ driveFileWarn: "Veuillez sélectionner le fichier sur le Disque"
+ driveFileTypeWarn: "Ce fichier n'est pas pris en charge"
+ driveFileTypeWarnDescription: "Veuillez sélectionner un fichier audio"
+ driveFileDurationWarn: "L'effet sonore est trop long"
+ driveFileDurationWarnDescription: "Utiliser un effet sonore long peut affecter l'utilisation de Misskey. Voulez-vous encore continuer ?"
_ago:
future: "Futur"
justNow: "à l’instant"
@@ -1363,14 +1619,19 @@ _ago:
monthsAgo: "Il y a {n} mois"
yearsAgo: "Il y a {n} ans"
invalid: "Il n'y a rien à voir ici"
+_timeIn:
+ seconds: "Dans {n}s"
+ minutes: "Dans {n}min"
+ hours: "Dans {n}h"
+ days: "Dans {n}j"
+ weeks: "Dans {n} sem."
+ months: "Dans {n} mois"
+ years: "Dans {n}a"
_time:
second: "s"
minute: "min"
hour: "h"
day: "j"
-_timelineTutorial:
- title: "Comment utiliser Misskey"
- step3_1: "Avez-vous publié votre première note ?"
_2fa:
alreadyRegistered: "Configuration déjà achevée."
step1: "Tout d'abord, installez une application d'authentification, telle que {a} ou {b}, sur votre appareil."
@@ -1383,7 +1644,7 @@ _2fa:
securityKeyInfo: "Vous pouvez configurer l'authentification WebAuthN pour sécuriser davantage le processus de connexion grâce à une clé de sécurité matérielle qui prend en charge FIDO2, ou bien en configurant l'authentification par empreinte digitale ou par code PIN sur votre appareil."
securityKeyName: "Nom de la clé"
removeKey: "Supprimer la clé de sécurité"
- removeKeyConfirm: "Voulez-vous supprimer {name} ?"
+ removeKeyConfirm: "Êtes-vous sûr·e de vouloir supprimer {name} ?"
renewTOTPOk: "Reconfigurer"
renewTOTPCancel: "Pas maintenant"
backupCodes: "Codes de Secours"
@@ -1392,8 +1653,8 @@ _permissions:
"write:account": "Mettre à jour les informations de votre compte"
"read:blocks": "Voir les comptes bloqués"
"write:blocks": "Gérer les comptes bloqués"
- "read:drive": "Parcourir le Drive"
- "write:drive": "Écrire sur le Drive"
+ "read:drive": "Parcourir le Disque"
+ "write:drive": "Modifier le Disque"
"read:favorites": "Afficher les favoris"
"write:favorites": "Gérer les favoris"
"read:following": "Voir les informations de vos abonnements"
@@ -1413,7 +1674,7 @@ _permissions:
"read:page-likes": "Voir les mentions « J'aime » des pages"
"write:page-likes": "Gérer les mentions « J'aime » sur les pages"
"read:user-groups": "Voir les groupes d'utilisateur·rice·s"
- "write:user-groups": "Éditer les groupes des utilisateur·rice·s"
+ "write:user-groups": "Éditer les groupes d'utilisateur·rice·s"
"read:channels": "Lire les canaux"
"write:channels": "Gérer les canaux"
"read:gallery": "Voir la galerie"
@@ -1467,9 +1728,10 @@ _widgets:
userList: "Liste utilisateur"
_userList:
chooseList: "Sélectionner une liste"
+ birthdayFollowings: "Utilisateurs qui fêtent l'anniversaire aujourd'hui"
_cw:
hide: "Masquer"
- show: "Afficher plus …"
+ show: "Afficher le contenu"
chars: "{count} caractères"
files: "{count} fichiers"
_poll:
@@ -1506,7 +1768,7 @@ _visibility:
_postForm:
replyPlaceholder: "Répondre à cette note ..."
quotePlaceholder: "Citez cette note ..."
- channelPlaceholder: "Publier vers le canal"
+ channelPlaceholder: "Publier au canal…"
_placeholders:
a: "Quoi de neuf ?"
b: "Il s'est passé quelque chose ?"
@@ -1524,8 +1786,9 @@ _profile:
metadataDescription: "Vous pouvez afficher jusqu'à quatre informations supplémentaires dans votre profil."
metadataLabel: "Étiquette"
metadataContent: "Contenu"
- changeAvatar: "Changer l'image de profil"
+ changeAvatar: "Changer l'avatar"
changeBanner: "Changer de bannière"
+ avatarDecorationMax: "Vous pouvez mettre au plus {max} décorations d'avatar."
_exportOrImport:
allNotes: "Toutes les notes"
followingList: "Abonnements"
@@ -1534,6 +1797,7 @@ _exportOrImport:
userLists: "Listes"
excludeMutingUsers: "Exclure les utilisateur·rice·s mis en sourdine"
excludeInactiveUsers: "Exclure les utilisateur·rice·s inactifs"
+ withReplies: "Inclure les réponses des utilisateur·rice·s importé·e·s dans le fil"
_charts:
federation: "Fédération"
apRequest: "Requêtes"
@@ -1630,13 +1894,18 @@ _notification:
youGotReply: "Réponse de {name}"
youGotQuote: "Cité·e par {name}"
youRenoted: "{name} vous a Renoté"
- youWereFollowed: "Vous suit"
+ youWereFollowed: "s'est abonné·e à vous"
youReceivedFollowRequest: "Vous avez reçu une demande d’abonnement"
yourFollowRequestAccepted: "Votre demande d’abonnement a été accepté"
pollEnded: "Les résultats du sondage sont disponibles"
unreadAntennaNote: "Antenne {name}"
+ roleAssigned: "Rôle attribué"
emptyPushNotificationMessage: "Les notifications push ont été mises à jour"
achievementEarned: "Accomplissement"
+ testNotification: "Tester la notification"
+ reactedBySomeUsers: "{n} utilisateur·rice·s ont réagi"
+ renotedBySomeUsers: "{n} utilisateur·rice·s ont renoté"
+ followedBySomeUsers: "{n} utilisateur·rice·s se sont abonné·e·s à vous"
_types:
all: "Toutes"
follow: "Nouvel·le abonné·e"
@@ -1648,6 +1917,7 @@ _notification:
pollEnded: "Sondages se cloturant"
receiveFollowRequest: "Demande d'abonnement reçue"
followRequestAccepted: "Demande d'abonnement acceptée"
+ roleAssigned: "Rôle reçu"
achievementEarned: "Accomplissement"
app: "Notifications provenant des apps"
_actions:
@@ -1678,12 +1948,110 @@ _deck:
tl: "Fil"
antenna: "Antennes"
list: "Listes"
- channel: "Canaux"
+ channel: "Canal"
mentions: "Mentions"
direct: "Direct"
+_drivecleaner:
+ orderBySizeDesc: "Taille descendante"
+ orderByCreatedAtAsc: "Date d'ajout ascendante"
_webhookSettings:
name: "Nom"
active: "Activé"
_moderationLogTypes:
- suspend: "Suspendre"
- resetPassword: "Réinitialiser le mot de passe"
+ createRole: "Rôle créé"
+ deleteRole: "Rôle supprimé"
+ updateRole: "Rôle mis à jour"
+ assignRole: "Rôle attribué"
+ unassignRole: "Rôle enlevé"
+ suspend: "Utilisateur suspendu"
+ unsuspend: "Suspension d'un utilisateur levée"
+ addCustomEmoji: "Émoji personnalisé ajouté"
+ updateCustomEmoji: "Émoji personnalisé mis à jour"
+ deleteCustomEmoji: "Émoji personnalisé supprimé"
+ updateServerSettings: "Paramètres du serveur mis à jour"
+ updateUserNote: "Note de modération mise à jour"
+ deleteDriveFile: "Fichier supprimé"
+ deleteNote: "Note supprimée"
+ createGlobalAnnouncement: "Annonce globale créée"
+ createUserAnnouncement: "Annonce individuelle créée"
+ updateGlobalAnnouncement: "Annonce globale mise à jour"
+ updateUserAnnouncement: "Annonce individuelle mise à jour"
+ deleteGlobalAnnouncement: "Annonce globale supprimée"
+ deleteUserAnnouncement: "Annonce individuelle supprimée"
+ resetPassword: "Mot de passe réinitialisé"
+ suspendRemoteInstance: "Instance distante suspendue"
+ unsuspendRemoteInstance: "Suspension d'une instance distante levée"
+ markSensitiveDriveFile: "Fichier marqué comme sensible"
+ unmarkSensitiveDriveFile: "Marquage du fichier comme sensible enlevé"
+ resolveAbuseReport: "Signalement résolu"
+ createInvitation: "Code d'invitation créé"
+ createAd: "Publicité créée"
+ deleteAd: "Publicité supprimée"
+ updateAd: "Publicité mise à jour"
+ createAvatarDecoration: "Décoration d'avatar créée"
+ updateAvatarDecoration: "Décoration d'avatar mise à jour"
+ deleteAvatarDecoration: "Décoration d'avatar supprimée"
+ unsetUserAvatar: "Supprimer l'avatar de l'utilisateur·rice"
+ unsetUserBanner: "Supprimer la bannière de l'utilisateur·rice"
+_fileViewer:
+ title: "Détails du fichier"
+ type: "Type du fichier"
+ size: "Taille du fichier"
+ url: "URL"
+ uploadedAt: "Date de téléversement"
+ attachedNotes: "Notes avec ce fichier"
+ thisPageCanBeSeenFromTheAuthor: "Cette page ne peut être vue que par l'utilisateur qui a téléversé ce fichier."
+_externalResourceInstaller:
+ title: "Installer depuis un site externe"
+ checkVendorBeforeInstall: "Veuillez confirmer que le distributeur est fiable avant l'installation."
+ _plugin:
+ title: "Voulez-vous installer cette extension ?"
+ metaTitle: "Informations sur l'extension"
+ _theme:
+ title: "Voulez-vous installer ce thème ?"
+ metaTitle: "Informations sur le thème"
+ _meta:
+ base: "Palette de couleurs de base"
+ _vendorInfo:
+ title: "Informations sur le distributeur"
+ endpoint: "Point de terminaison référencé"
+ hashVerify: "Vérification de l'intégrité du fichier"
+ _errors:
+ _invalidParams:
+ title: "Paramètres invalides"
+ description: "Il y a un manque d'informations nécessaires pour obtenir des données à partir de sites externes. Veuillez vérifier l'URL."
+ _resourceTypeNotSupported:
+ title: "Cette ressource externe n'est pas prise en charge."
+ description: "Le type de ressource obtenue à partir de ce site externe n'est pas pris en charge. Veuillez contacter l'administrateur du site."
+ _failedToFetch:
+ title: "Échec de récupération des données"
+ fetchErrorDescription: "La communication avec le site externe a échoué. Si vous réessayez et que cela ne s'améliore pas, veuillez contacter l'administrateur du site."
+ parseErrorDescription: "Les données obtenues à partir du site externe n'ont pas pu être parsées. Veuillez contacter l'administrateur du site."
+ _hashUnmatched:
+ title: "Échec de vérification des données"
+ description: "La vérification de l'intégrité des données fournies a échoué. Pour des raisons de sécurité, l'installation ne peut pas continuer. Veuillez contacter l'administrateur du site."
+ _pluginParseFailed:
+ title: "Erreur d'AiScript"
+ description: "Bien que les données aient été obtenues, elles n'ont pas pu être lues, car il y a eu une erreur lors du parsage d'AiScript. Veuillez contacter l'auteur de l'extension. Pour plus de détails sur l'erreur, veuillez consulter la console JavaScript."
+ _pluginInstallFailed:
+ title: "Échec d'installation de l'extension"
+ description: "Il y a eu un problème lors de l'installation de l'extension. Veuillez réessayer. Pour plus de détails sur l'erreur, veuillez consulter la console JavaScript."
+ _themeParseFailed:
+ title: "Erreur de parsage du thème"
+ description: "Bien que les données aient été obtenues, elles n'ont pas pu être lues, car il y a eu une erreur lors du parsage du fichier du thème. Veuillez contacter l'auteur du thème. Pour plus de détails sur l'erreur, veuillez consulter la console JavaScript."
+ _themeInstallFailed:
+ title: "Échec d'installation du thème"
+ description: "Il y a eu un problème lors de l'installation du thème. Veuillez réessayer. Pour plus de détails sur l'erreur, veuillez consulter la console JavaScript."
+_dataSaver:
+ _media:
+ title: "Chargement des médias"
+ description: "Empêche le chargement automatique des images et des vidéos. Appuyez sur les images et les vidéos cachées pour les charger."
+ _avatar:
+ title: "Animation d'avatars"
+ description: "Arrête l'animation d'avatars. Comme les images animées peuvent être plus volumineuses que les images normales, cela permet de réduire davantage le trafic de données."
+ _urlPreview:
+ title: "Vignettes d'aperçu des URL"
+ description: "Les vignettes d'aperçu des URL ne seront plus chargées."
+ _code:
+ 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."
diff --git a/locales/generateDTS.js b/locales/generateDTS.js
index 7af773f3b1..d3afdd6e15 100644
--- a/locales/generateDTS.js
+++ b/locales/generateDTS.js
@@ -56,6 +56,18 @@ export default function generateDTS() {
ts.NodeFlags.Const | ts.NodeFlags.Ambient | ts.NodeFlags.ContextFlags,
),
),
+ ts.factory.createFunctionDeclaration(
+ [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+ undefined,
+ ts.factory.createIdentifier('build'),
+ undefined,
+ [],
+ ts.factory.createTypeReferenceNode(
+ ts.factory.createIdentifier('Locale'),
+ undefined,
+ ),
+ undefined,
+ ),
ts.factory.createExportDefault(ts.factory.createIdentifier('locales')),
];
const printed = ts.createPrinter({
diff --git a/locales/hr-HR.yml b/locales/hr-HR.yml
index ed97d539c0..9cfebdd01a 100644
--- a/locales/hr-HR.yml
+++ b/locales/hr-HR.yml
@@ -1 +1,5 @@
---
+_lang_: "japanski"
+ok: "OK"
+gotIt: "Razumijem"
+cancel: "otkazati"
diff --git a/locales/ht-HT.yml b/locales/ht-HT.yml
index ed97d539c0..e3595c79b6 100644
--- a/locales/ht-HT.yml
+++ b/locales/ht-HT.yml
@@ -1 +1,18 @@
---
+_lang_: "Japonè"
+password: "modpas"
+ok: "OK"
+gotIt: "Konprann"
+cancel: "anile"
+noThankYou: "Sispann"
+instance: "sèvè"
+profile: "pwofil"
+save: "kenbe"
+delete: "efase"
+instances: "sèvè"
+remove: "efase"
+smtpPass: "modpas"
+_2fa:
+ renewTOTPCancel: "Sispann"
+_widgets:
+ profile: "pwofil"
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index 109dfb7603..dc5600151a 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -45,6 +45,7 @@ pin: "Sematkan ke profil"
unpin: "Lepas sematan dari profil"
copyContent: "Salin konten"
copyLink: "Salin tautan"
+copyLinkRenote: "Salin tautan renote"
delete: "Hapus"
deleteAndEdit: "Hapus dan sunting"
deleteAndEditConfirm: "Apakah kamu yakin ingin menghapus note ini dan menyuntingnya? Kamu akan kehilangan semua reaksi, renote dan balasan di note ini."
@@ -120,7 +121,6 @@ sensitive: "Konten sensitif"
add: "Tambahkan"
reaction: "Reaksi"
reactions: "Reaksi"
-reactionSetting: "Reaksi untuk dimunculkan di bilah reaksi"
reactionSettingDescription2: "Geser untuk memindah urutan emoji, klik untuk menghapus, tekan \"+\" untuk menambahkan"
rememberNoteVisibility: "Ingat pengaturan visibilitas catatan"
attachCancel: "Hapus lampiran"
@@ -156,6 +156,7 @@ addEmoji: "Tambahkan emoji"
settingGuide: "Pengaturan rekomendasi"
cacheRemoteFiles: "Tembolokkan berkas dari instansi luar"
cacheRemoteFilesDescription: "Ketika pengaturan ini dinonaktifkan, berkas dari instansi luar akan dimuat langsung. Menonaktifkan ini akan mengurangi penggunaan penyimpanan peladen, namun dapat menyebabkan peningkatan lalu lintas bandwidth, karena keluku tidak dihasilkan."
+youCanCleanRemoteFilesCache: "Kamu dapat mengosongkan tembolok dengan mengeklik tombol 🗑️ pada layar manajemen berkas."
cacheRemoteSensitiveFiles: "Tembolokkan berkas dari instansi luar"
cacheRemoteSensitiveFilesDescription: "Menonaktifkan pengaturan ini menyebabkan berkas sensitif dari instansi luar ditautkan secara langsung, bukan ditembolok."
flagAsBot: "Atur akun ini sebagai Bot"
@@ -193,6 +194,7 @@ perHour: "per Jam"
perDay: "per Hari"
stopActivityDelivery: "Berhenti mengirim aktivitas"
blockThisInstance: "Blokir instansi ini"
+silenceThisInstance: "Senyapkan instansi ini"
operations: "Tindakan"
software: "Perangkat lunak"
version: "Versi"
@@ -212,6 +214,8 @@ clearCachedFiles: "Hapus tembolok"
clearCachedFilesConfirm: "Apakah kamu yakin ingin menghapus seluruh tembolok berkas instansi luar?"
blockedInstances: "Instansi terblokir"
blockedInstancesDescription: "Daftar nama host dari instansi yang diperlukan untuk diblokir. Instansi yang didaftarkan tidak akan dapat berkomunikasi dengan instansi ini."
+silencedInstances: "Instansi yang disenyapkan"
+silencedInstancesDescription: "Daftar nama host dari instansi yang ingin kamu senyapkan. Semua akun dari instansi yang terdaftar akan diperlakukan sebagai disenyapkan. Hal ini membuat akun hanya dapat membuat permintaan mengikuti, dan tidak dapat menyebutkan akun lokal apabila tidak mengikuti. Hal ini tidak akan mempengaruhi instansi yang diblokir."
muteAndBlock: "Bisukan / Blokir"
mutedUsers: "Pengguna yang dibisukan"
blockedUsers: "Pengguna yang diblokir"
@@ -256,6 +260,7 @@ removed: "Telah dihapus"
removeAreYouSure: "Apakah kamu yakin ingin menghapus \"{x}\"?"
deleteAreYouSure: "Apakah kamu yakin ingin menghapus \"{x}\"?"
resetAreYouSure: "Yakin mau atur ulang?"
+areYouSure: "Apakah kamu yakin?"
saved: "Telah disimpan"
messaging: "Pesan"
upload: "Unggah"
@@ -306,6 +311,7 @@ folderName: "Nama folder"
createFolder: "Buat folder"
renameFolder: "Ubah nama folder"
deleteFolder: "Hapus folder"
+folder: "Folder"
addFile: "Tambahkan berkas"
emptyDrive: "Drive kosong"
emptyFolder: "Folder kosong"
@@ -409,10 +415,14 @@ aboutMisskey: "Tentang Misskey"
administrator: "Admin"
token: "Token"
2fa: "Autentikasi 2-faktor"
+setupOf2fa: "Atur autentikasi 2-faktor"
totp: "Aplikasi autentikator"
totpDescription: "Gunakan aplikasi autentikator untuk mendapatkan kata sandi sekali pakai"
moderator: "Moderator"
moderation: "Moderasi"
+moderationNote: "Catatan moderasi"
+addModerationNote: "Tambahkan catatan moderasi"
+moderationLogs: "Log moderasi"
nUsersMentioned: "{n} pengguna disebut"
securityKeyAndPasskey: "Security key dan passkey"
securityKey: "Kunci keamanan"
@@ -428,14 +438,13 @@ share: "Bagikan"
notFound: "Tidak dapat ditemukan"
notFoundDescription: "Tidak ada halaman sesuai dengan URL yang ditentukan."
uploadFolder: "Lokasi unggah folder bawaan"
-cacheClear: "Bersihkan tembolok"
markAsReadAllNotifications: "Tandai semua notifikasi telah dibaca"
markAsReadAllUnreadNotes: "Tandai semua catatan telah dibaca"
markAsReadAllTalkMessages: "Tandai semua pesan telah dibaca"
help: "Bantuan"
inputMessageHere: "Ketik pesan disini"
close: "Tutup"
-invites: "Undang"
+invites: "Undangan"
members: "Anggota"
transfer: "Transfer"
title: "Judul"
@@ -450,7 +459,7 @@ noMessagesYet: "Tidak ada pesan"
newMessageExists: "Kamu mendapatkan pesan baru"
onlyOneFileCanBeAttached: "Kamu hanya dapat melampirkan satu berkas ke dalam pesan"
signinRequired: "Silahkan login"
-invitations: "Undang"
+invitations: "Undangan"
invitationCode: "Kode undangan"
checking: "Memeriksa"
available: "Tersedia"
@@ -506,7 +515,7 @@ showFeaturedNotesInTimeline: "Tampilkan catatan yang diunggulkan di lini masa"
objectStorage: "Object Storage"
useObjectStorage: "Gunakan object storage"
objectStorageBaseUrl: "Base URL"
-objectStorageBaseUrlDesc: "Prefix URL digunakan untuk mengkonstruksi URL ke object (media) referencing. Tentukan URL jika kamu menggunakan CDN atau Proxy, jika tidak tentukan alamat yang dapat diakses secara publik sesuai dengan panduan dari layanan yang akan kamu gunakan, contohnya. 'https://.s3.amazonaws.com' untuk AWS S3, dan 'https://storage.googleapis.com/' untuk GCS."
+objectStorageBaseUrlDesc: "Prefix URL digunakan untuk mengonstruksi URL ke object (media) referencing. Tentukan URL jika kamu menggunakan CDN atau Proxy. Jika tidak, tentukan alamat yang dapat diakses secara publik sesuai dengan panduan dari layanan yang akan kamu gunakan. Contohnya: 'https://.s3.amazonaws.com' untuk AWS S3, dan 'https://storage.googleapis.com/' untuk GCS."
objectStorageBucket: "Bucket"
objectStorageBucketDesc: "Mohon tentukan nama bucket yang digunakan pada layanan yang telah dikonfigurasi."
objectStoragePrefix: "Prefix"
@@ -523,8 +532,9 @@ objectStorageSetPublicRead: "Setel \"public-read\" disaat mengunggah"
s3ForcePathStyleDesc: "Jika s3ForcePathStyle dinyalakan, nama bucket harus dimasukkan dalam path URL dan bukan URL nama host tersebut. Kamu perlu menyalakan pengaturan ini jika menggunakan layanan seperti instansi Minio yang self-hosted."
serverLogs: "Log Peladen"
deleteAll: "Hapus semua"
-showFixedPostForm: "Tampilkan form posting di atas lini masa."
+showFixedPostForm: "Tampilkan form posting di atas lini masa"
showFixedPostFormInChannel: "Tampilkan form posting di atas lini masa (Kanal)"
+withRepliesByDefaultForNewlyFollowed: "Termasuk balasan dari pengguna baru yang diikuti pada lini masa secara bawaan"
newNoteRecived: "Kamu mendapat catatan baru"
sounds: "Bunyi"
sound: "Bunyi"
@@ -534,6 +544,8 @@ showInPage: "Tampilkan di halaman"
popout: "Pop-out"
volume: "Volume"
masterVolume: "Master volume"
+notUseSound: "Tidak ada keluaran suara"
+useSoundOnlyWhenActive: "Hanya keluarkan suara jika Misskey sedang aktif"
details: "Selengkapnya"
chooseEmoji: "Pilih emoji"
unableToProcess: "Operasi tersebut tidak dapat diselesaikan."
@@ -554,6 +566,10 @@ output: "Keluaran"
script: "Script"
disablePagesScript: "Nonaktifkan script pada halaman"
updateRemoteUser: "Perbaharui informasi pengguna instansi luar"
+unsetUserAvatar: "Hapus avatar"
+unsetUserAvatarConfirm: "Apakah kamu yakin ingin menghapus avatar?"
+unsetUserBanner: "Hapus banner"
+unsetUserBannerConfirm: "Apakah kamu yakin ingin menghapus banner?"
deleteAllFiles: "Hapus semua berkas"
deleteAllFilesConfirm: "Apakah kamu yakin ingin menghapus semua berkas?"
removeAllFollowing: "Batalkan mengikuti semua pengguna"
@@ -627,7 +643,7 @@ testEmail: "Tes pengiriman surel"
wordMute: "Bisukan kata"
regexpError: "Kesalahan ekspresi reguler"
regexpErrorDescription: "Galat terjadi pada baris {line} ekspresi reguler dari {tab} kata yang dibisukan:"
-instanceMute: "Bisuka instansi"
+instanceMute: "Bisukan instansi"
userSaysSomething: "{name} mengatakan sesuatu"
makeActive: "Aktifkan"
display: "Tampilkan"
@@ -652,6 +668,7 @@ behavior: "Perilaku"
sample: "Contoh"
abuseReports: "Laporkan"
reportAbuse: "Laporkan"
+reportAbuseRenote: "Laporkan renote"
reportAbuseOf: "Laporkan {name}"
fillAbuseReportDescription: "Mohon isi rincian laporan. Jika laporan ini mengenai catatan yang spesifik, mohon lampirkan serta URL catatan tersebut."
abuseReported: "Laporan kamu telah dikirimkan. Terima kasih."
@@ -704,6 +721,7 @@ lockedAccountInfo: "Kecuali kamu menyetel visibilitas catatan milikmu ke \"Hanya
alwaysMarkSensitive: "Tandai media dalam catatan sebagai media sensitif"
loadRawImages: "Tampilkan lampiran gambar secara penuh daripada thumbnail"
disableShowingAnimatedImages: "Jangan mainkan gambar bergerak"
+highlightSensitiveMedia: "Sorot media sensitif"
verificationEmailSent: "Surel verifikasi telah dikirimkan. Mohon akses tautan yang telah disertakan untuk menyelesaikan verifikasi."
notSet: "Tidak disetel"
emailVerified: "Surel telah diverifikasi"
@@ -856,8 +874,6 @@ makeReactionsPublicDescription: "Pengaturan ini akan membuat daftar dari semua r
classic: "Klasik"
muteThread: "Bisukan thread"
unmuteThread: "Suarakan thread"
-ffVisibility: "Visibilitas Mengikuti/Pengikut"
-ffVisibilityDescription: "Mengatur siapa yang dapat melihat pengikutmu dan yang kamu ikuti."
continueThread: "Lihat lanjutan thread"
deleteAccountConfirm: "Akun akan dihapus. Apakah kamu yakin?"
incorrectPassword: "Kata sandi salah."
@@ -967,6 +983,7 @@ assign: "Tetapkan\n"
unassign: "Batalkan penetapan"
color: "Warna"
manageCustomEmojis: "Kelola Emoji Kustom"
+manageAvatarDecorations: "Kelola dekorasi avatar"
youCannotCreateAnymore: "Kamu melewati batas pembuatan."
cannotPerformTemporary: "Sementara Tidak Tersedia"
cannotPerformTemporaryDescription: "Aksi ini tidak dapat dilakukan sementara karena melewati batas eksekusi. Mohon tunggu sejenak dan coba lagi."
@@ -1007,6 +1024,8 @@ resetPasswordConfirm: "Yakin untuk mereset kata sandimu?"
sensitiveWords: "Kata sensitif"
sensitiveWordsDescription: "Visibilitas dari semua catatan mengandung kata yang telah diatur akan dijadikan \"Beranda\" secara otomatis. Kamu dapat mendaftarkan kata tersebut lebih dari satu dengan menuliskannya di baris baru."
sensitiveWordsDescription2: "Menggunakan spasi akan membuat ekspresi AND dan kata kunci disekitarnya dengan garis miring akan mengubahnya menjadi ekspresi reguler."
+hiddenTags: "Tagar tersembunyi"
+hiddenTagsDescription: "Pilih tanda yang mana akan tidak diperlihatkan dalam daftar tren.\nTanda lebih dari satu dapat didaftarkan dengan tiap baris."
notesSearchNotAvailable: "Pencarian catatan tidak tersedia."
license: "Lisensi"
unfavoriteConfirm: "Yakin ingin menghapusnya dari favorit?"
@@ -1018,6 +1037,8 @@ retryAllQueuesConfirmText: "Hal ini akan meningkatkan beban sementara ke peladen
enableChartsForRemoteUser: "Buat bagan data pengguna instansi luar"
enableChartsForFederatedInstances: "Buat bagan data peladen instansi luar"
showClipButtonInNoteFooter: "Tambahkan \"Klip\" ke menu aksi catatan"
+reactionsDisplaySize: "Ukuran tampilan reaksi"
+limitWidthOfReaction: "Batasi lebar maksimum reaksi dan tampilkan dalam ukuran terbatasi."
noteIdOrUrl: "ID catatan atau URL"
video: "Video"
videos: "Video"
@@ -1098,9 +1119,65 @@ icon: "Avatar"
forYou: "Untuk Anda"
currentAnnouncements: "Pengumuman Saat Ini"
pastAnnouncements: "Pengumuman Terdahulu"
+youHaveUnreadAnnouncements: "Terdapat pengumuman yang belum dibaca"
+useSecurityKey: "Mohon ikuti instruksi peramban atau perangkat kamu untuk menggunakan kunci pengaman atau passkey."
replies: "Balas"
renotes: "Renote"
+loadReplies: "Tampilkan balasan"
+loadConversation: "Tampilkan percakapan"
+pinnedList: "Daftar yang dipin"
+keepScreenOn: "Biarkan layar tetap menyala"
+verifiedLink: "Tautan kepemilikan telah diverifikasi"
+notifyNotes: "Beritahu mengenai catatan baru"
+unnotifyNotes: "Berhenti memberitahu mengenai catatan baru"
+authentication: "Autentikasi"
+authenticationRequiredToContinue: "Mohon autentikasikan terlebih dahulu sebelum melanjutkan"
dateAndTime: "Tanggal dan Waktu"
+showRenotes: "Tampilkan renote"
+edited: "Telah disunting"
+notificationRecieveConfig: "Pengaturan notifikasi"
+mutualFollow: "Saling mengikuti"
+fileAttachedOnly: "Hanya catatan dengan berkas"
+showRepliesToOthersInTimeline: "Tampilkan balasan ke pengguna lain dalam lini masa"
+hideRepliesToOthersInTimeline: "Sembunyikan balasan ke orang lain dari lini masa"
+showRepliesToOthersInTimelineAll: "Tampilkan balasan ke lainnya dari semua orang yang kamu ikuti di lini masa"
+hideRepliesToOthersInTimelineAll: "Sembuyikan balasan ke lainnya dari semua orang yang kamu ikuti di lini masa"
+confirmShowRepliesAll: "Operasi ini tidak dapat diubah. Apakah kamu yakin untuk menampilkan balasan ke lainnya dari semua orang yang kamu ikuti di lini masa?"
+confirmHideRepliesAll: "Operasi ini tidak dapat diubah. Apakah kamu yakin untuk menyembunyikan balasan ke lainnya dari semua orang yang kamu ikuti di lini masa?"
+externalServices: "Layanan eksternal"
+impressum: "Impressum"
+impressumUrl: "Tautan Impressum"
+impressumDescription: "Pada beberapa negara seperti Jerman, inklusi dari informasi kontak operator (sebuah Impressum) diperlukan secara legal untuk situs web komersil."
+privacyPolicy: "Kebijakan Privasi"
+privacyPolicyUrl: "Tautan Kebijakan Privasi"
+tosAndPrivacyPolicy: "Syarat dan Ketentuan serta Kebijakan Privasi"
+avatarDecorations: "Dekorasi avatar"
+attach: "Lampirkan"
+detach: "Hapus"
+angle: "Sudut"
+flip: "Balik"
+showAvatarDecorations: "Tampilkan dekorasi avatar"
+releaseToRefresh: "Lepaskan untuk memuat ulang"
+refreshing: "Sedang memuat ulang..."
+pullDownToRefresh: "Tarik ke bawah untuk memuat ulang"
+disableStreamingTimeline: "Nonaktifkan pembaharuan lini masa real-time"
+useGroupedNotifications: "Tampilkan notifikasi secara dikelompokkan"
+signupPendingError: "Terdapat masalah ketika memverifikasi alamat surel. Tautan kemungkinan telah kedaluwarsa."
+cwNotationRequired: "Jika \"Sembunyikan konten\" diaktifkan, deskripsi harus disediakan."
+doReaction: "Tambahkan reaksi"
+code: "Kode"
+reloadRequiredToApplySettings: "Muat ulang diperlukan untuk menerapkan pengaturan."
+remainingN: "Sisa : {n}"
+_announcement:
+ forExistingUsers: "Hanya pengguna yang telah ada"
+ forExistingUsersDescription: "Pengumuman ini akan dimunculkan ke pengguna yang sudah ada dari titik waktu publikasi jika dinyalakan. Apabila dimatikan, mereka yang baru mendaftar setelah publikasi ini akan juga melihatnya."
+ needConfirmationToRead: "Membutuhkan konfirmasi terpisah bahwa telah dibaca"
+ needConfirmationToReadDescription: "Permintaan terpisah untuk mengonfirmasi menandai pengumuman ini telah dibaca akan ditampilkan apabila fitur ini dinyalakan. Pengumuman ini juga akan dikecualikan dari fungsi \"Tandai semua telah dibaca\"."
+ end: "Arsipkan pengumuman"
+ tooManyActiveAnnouncementDescription: "Terlalu banyak pengumuman dapat memperburuk pengalaman pengguna. Mohon pertimbangkan untuk mengarsipkan pengumuman yang sudah usang/tidak relevan."
+ readConfirmTitle: "Tandai telah dibaca?"
+ readConfirmText: "Aksi ini akan menandai konten dari \"{title}\" telah dibaca."
+ silence: "Tiada notifikasi"
_initialAccountSetting:
accountCreated: "Akun kamu telah sukses dibuat!"
letsStartAccountSetup: "Untuk pemula, ayo atur profilmu dulu."
@@ -1113,13 +1190,47 @@ _initialAccountSetting:
pushNotificationDescription: "Menyalakan notifikasi dorong akan membuatmu menerima notifikasi dari {name} secara langsung ke perangkatmu."
initialAccountSettingCompleted: "Pengaturan profil selesai!"
haveFun: "Selamat menikmati, {name}!"
- ifYouNeedLearnMore: "Kalau kamu ingin mempelajari lebih lanjut bagaimana cara menggunakan {name} (Misskey), silahkan kunjungi {link}."
+ startTutorial: "Mulai Tutorial"
skipAreYouSure: "Yakin melewati atur profil?"
laterAreYouSure: "Yakin banget untuk atur profil nanti?"
+_initialTutorial:
+ launchTutorial: "Lihat Tutorial"
+ title: "Tutorial"
+ wellDone: "Kerja bagus!"
+ skipAreYouSure: "Berhenti dari Tutorial?"
+ _landing:
+ title: "Selamat datang di Tutorial"
+ description: "Di sini kamu dapat mempelajari dasar-dasar dari penggunaan Misskey dan fitur-fiturnya."
+ _note:
+ title: "Apa itu Catatan?"
+ _reaction:
+ title: "Apa itu Reaksi?"
+ _timeline:
+ title: "Konsep Lini Masa"
+ _postNote:
+ title: "Pengaturan posting Catatan"
+ _visibility:
+ public: "Perlihatkan catatan ke semua pengguna."
+ home: "Hanya publik ke lini masa Beranda. Pengguna yang mengunjungi profilmu melalui pengikut dan renote dapat melihatnya."
+ followers: "Perlihatkan ke pengikut saja. Hanya pengikut yang dapat melihat postinganmu dan tidak dapat direnote oleh siapapun."
+ direct: "Hanya perlihatkan ke pengguna spesifik dan penerima akan diberi tahu. Dapat juga digunakan sebagai alternatif dari pesan langsung."
+ _cw:
+ _exampleNote:
+ cw: "Peringatan: Bikin Lapar!"
+ note: "Baru aja makan donat berlapis coklat 🍩😋"
+ _howToMakeAttachmentsSensitive:
+ title: "Bagaimana menandai lampiran sebagai sensitif?"
_serverRules:
description: "Daftar peraturan akan ditampilkan sebelum pendaftaran. Mengatur ringkasan dari Syarat dan Ketentuan sangat direkomendasikan."
_serverSettings:
iconUrl: "URL ikon"
+ appIconDescription: "Tentukan ikon yang digunakan ketika {host} ditampilkan sebagai aplikasi."
+ appIconUsageExample: "Contoh: Sebagai PWA, atau ketika ditampilkan sebagai markah layar beranda pada ponsel"
+ appIconStyleRecommendation: "Karena ikon berkemungkinan dipotong menjadi persegi atau lingkaran, ikon dengan margin terwanai di sekeliling konten sangat direkomendasikan."
+ appIconResolutionMustBe: "Minimum resolusi adalah {resolution}."
+ manifestJsonOverride: "Ambil alih manifest.json"
+ shortName: "Nama pendek"
+ shortNameDescription: "Inisial untuk nama instansi yang dapat ditampilkan apabila nama lengkap resmi terlalu panjang."
_accountMigration:
moveFrom: "Pindahkan akun lain ke akun ini"
moveFromSub: "Buat alias ke akun lain"
@@ -1374,6 +1485,9 @@ _achievements:
title: "Brain Diver"
description: "Posting tautan mengenai Brain Diver"
flavor: "Misskey-Misskey La-Tu-Ma"
+ _smashTestNotificationButton:
+ title: "Tes overflow"
+ description: "Picu tes notifikasi secara berulang dalam waktu yang sangat pendek"
_role:
new: "Buat peran"
edit: "Sunting peran"
@@ -1417,6 +1531,7 @@ _role:
inviteLimitCycle: "Interval Penerbitan Kode Undangan"
inviteExpirationTime: "Interval kedaluwarsa undangan"
canManageCustomEmojis: "Dapat mengelola Emoji kustom"
+ canManageAvatarDecorations: "Kelola dekorasi avatar"
driveCapacity: "Kapasitas Drive"
alwaysMarkNsfw: "Selalu tandai berkas sebagai NSFW"
pinMax: "Jumlah maksimal catatan yang disematkan"
@@ -1431,6 +1546,7 @@ _role:
descriptionOfRateLimitFactor: "Batas kecepatan yang rendah tidak begitu membatasi, batas kecepatan tinggi lebih membatasi. "
canHideAds: "Dapat menyembunyikan iklan"
canSearchNotes: "Penggunaan pencarian catatan"
+ canUseTranslator: "Penggunaan penerjemah"
_condition:
isLocal: "Pengguna lokal"
isRemote: "Pengguna remote"
@@ -1479,6 +1595,10 @@ _ad:
reduceFrequencyOfThisAd: "Tampilkan iklan ini lebih sedikit"
hide: "Jangan tampilkan"
timezoneinfo: "Hari dalam satu minggu ditentukan dari zona waktu peladen."
+ adsSettings: "Pengaturan iklan"
+ notesPerOneAd: "Interval penempatan pemutakhiran iklan secara real-time (catatan per iklan)"
+ setZeroToDisable: "Atur nilai ini ke 0 untuk menonaktifkan pemutakhiran iklan secara real-time"
+ adsTooClose: "Interval iklan saat ini kemungkinan memperburuk pengalaman pengguna secara signifikan karena diatur pada nilai yang terlalu rendah."
_forgotPassword:
enterEmail: "Masukkan alamat surel yang kamu gunakan pada saat mendaftar. Sebuah tautan untuk mengatur ulang kata sandi kamu akan dikirimkan ke alamat surel tersebut."
ifNoEmail: "Apabila kamu tidak menggunakan surel pada saat pendaftaran, mohon hubungi admin segera."
@@ -1627,9 +1747,6 @@ _theme:
infoFg: "Teks informasi"
infoWarnBg: "Latar belakang peringatan"
infoWarnFg: "Teks peringatan"
- cwBg: "Latar belakang tombol Sembunyikan Konten"
- cwFg: "Teks tombol Sembunyikan Konten"
- cwHoverBg: "Latar belakang tombol Sembunyikan Konten (Mengambang)"
toastBg: "Latar belakang notifikasi"
toastFg: "Teks notifikasi"
buttonBg: "Latar belakang tombol"
@@ -1665,28 +1782,20 @@ _time:
minute: "menit"
hour: "jam"
day: "hari"
-_timelineTutorial:
- title: "Bagaimana cara menggunakan Misskey"
- step1_1: "Ini adalah \"lini masa\". Semua \"catatan\" yang dikirimkan oleh {name} akan dimunculkan secara kronologis di sini."
- step1_2: "Ada beberapa lini masa yang berbeda. Seperti contoh, \"Lini masa Beranda\" berisi catatan dari pengguna yang kamu ikuti, dan \"Lini masa lokal\" berisi catatan dari semua pengguna dari {name}."
- step2_1: "Selanjutnya, mari kita coba memposting sebuah catatan. Kamu dapat melakukanya dengan menekan tombol dengan ikon pensil."
- step2_2: "Bagaimana dengan menuliskan sedikit perkenalan diri, atau hanya \"Hello {name}\" kalau kamu lagi ngga feeling?"
- step3_1: "Udah selesai memposting catatan pertamamu?"
- step3_2: "Catatan pertamamu seharusnya sekarang sudah tampil di lini masa kamu."
- step4_1: "Kamu dapat menyisipkan \"Reaksi\" ke dalam catatan."
- step4_2: "Untuk menyisipkan reaksi, tekan tanda \"+\" dalam catatan dan pilih emoji yang kamu suka untuk mereaksi catatan tersebut."
_2fa:
- alreadyRegistered: "Kamu telah mendaftarkan perangkat otentikasi dua faktor."
+ alreadyRegistered: "Kamu telah mendaftarkan perangkat autentikasi 2-faktor."
registerTOTP: "Daftarkan aplikasi autentikator"
- step1: "Pertama, pasang aplikasi otentikasi (seperti {a} atau {b}) di perangkat kamu."
+ step1: "Pertama, pasang aplikasi autentikasi (seperti {a} atau {b}) di perangkat kamu."
step2: "Lalu, pindai kode QR yang ada di layar."
step2Click: "Mengeklik kode QR ini akan membolehkanmu untuk mendaftarkan 2FA ke security-key atau aplikasi autentikator ponsel."
+ step2Uri: "Masukkan URI berikut jika kamu menggunakan program desktop"
step3Title: "Masukkan kode autentikasi"
step3: "Masukkan token yang telah disediakan oleh aplikasimu untuk menyelesaikan pemasangan."
- step4: "Mulai sekarang, upaya login apapun akan meminta token login dari aplikasi otentikasi kamu."
+ setupCompleted: "Penyetelan autentikasi 2-faktor selesai"
+ step4: "Mulai sekarang, upaya login apapun akan meminta token login dari aplikasi autentikasi kamu."
securityKeyNotSupported: "Peramban kamu tidak mendukung security key."
registerTOTPBeforeKey: "Mohon atur aplikasi autentikator untuk mendaftarkan security key atau passkey."
- securityKeyInfo: "Kamu dapat memasang otentikasi WebAuthN untuk mengamankan proses login lebih lanjut dengan tidak hanya perangkat keras kunci keamanan yang mendukung FIDO2, namun juga sidik jari atau otentikasi PIN pada perangkatmu."
+ securityKeyInfo: "Kamu dapat memasang autentikasi WebAuthN untuk mengamankan proses login lebih lanjut dengan tidak hanya perangkat keras kunci keamanan yang mendukung FIDO2, namun juga sidik jari atau autentikasi PIN pada perangkatmu."
registerSecurityKey: "Daftarkan security key atau passkey."
securityKeyName: "Masukkan nama key."
tapSecurityKey: "Mohon ikuti peramban kamu untuk mendaftarkan security key atau passkey"
@@ -1697,7 +1806,11 @@ _2fa:
renewTOTPConfirm: "Hal ini akan menyebabkan kode verifikasi dari aplikasi autentikator sebelumnya berhenti bekerja"
renewTOTPOk: "Atur ulang"
renewTOTPCancel: "Tidak sekarang."
+ checkBackupCodesBeforeCloseThisWizard: "Sebelum kamu menutup jendela ini, pastikan untuk memperhatikan dan mencadangkan kode cadangan berikut."
backupCodes: "Kode Pencadangan"
+ backupCodesDescription: "Kamu dapat menggunakan kode ini untuk mendapatkan akses ke akun kamu apabila berada dalam situasi tidak dapat menggunakan aplikasi autentikasi 2-faktor yang kamu miliki. Setiap kode hanya dapat digunakan satu kali. Mohon simpan kode ini di tempat yang aman."
+ backupCodeUsedWarning: "Kode cadangan telah digunakan. Mohon mengatur ulang autentikasi 2-faktor secepatnya apabila kamu sudah tidak dapat menggunakannya lagi."
+ backupCodesExhaustedWarning: "Semua kode cadangan telah digunakan. Apabila kamu kehilangan akses pada aplikasi autentikasi 2-faktor milikmu, kamu tidak dapat mengakses akun ini lagi. Mohon atur ulang autentikasi 2-faktor kamu."
_permissions:
"read:account": "Lihat informasi akun"
"write:account": "Sunting informasi akun"
@@ -1731,6 +1844,10 @@ _permissions:
"write:gallery": "Sunting galeri"
"read:gallery-likes": "Lihat daftar postingan galeri yang disukai"
"write:gallery-likes": "Sunting daftar postingan galeri yang disukai"
+ "read:flash": "Lihat Play"
+ "write:flash": "Sunting Play"
+ "read:flash-likes": "Lihat daftar Play yang disukai"
+ "write:flash-likes": "Sunting daftar Play yang disukai"
_auth:
shareAccessTitle: "Mendapatkan ijin akses aplikasi"
shareAccess: "Apakah kamu ingin mengijinkan \"{name}\" untuk mengakses akun ini?"
@@ -1746,6 +1863,7 @@ _antennaSources:
homeTimeline: "Catatan dari pengguna yang diikuti"
users: "Catatan dari pengguna tertentu"
userList: "Catatan dari daftar tertentu"
+ userBlacklist: "Semua catatan kecuali untuk satu pengguna atau lebih yang telah ditentukan"
_weekday:
sunday: "Minggu"
monday: "Senin"
@@ -1845,6 +1963,7 @@ _profile:
metadataContent: "Isi"
changeAvatar: "Ubah avatar"
changeBanner: "Ubah header"
+ verifiedLinkDescription: "Dengan memasukkan URL yang mengandung tautan ke profil kamu di sini, ikon verifikasi kepemilikan dapat ditampilkan di sebelah kolom ini."
_exportOrImport:
allNotes: "Semua catatan"
favoritedNotes: "Catatan favorit"
@@ -1854,6 +1973,7 @@ _exportOrImport:
userLists: "Daftar"
excludeMutingUsers: "Kecualikan pengguna yang dibisukan"
excludeInactiveUsers: "Kecualikan pengguna tidak aktif"
+ withReplies: "Termasuk balasan dari pengguna yang diimpor ke dalam lini masa"
_charts:
federation: "Federasi"
apRequest: "Permintaan"
@@ -1963,11 +2083,17 @@ _notification:
youReceivedFollowRequest: "Kamu menerima permintaan mengikuti"
yourFollowRequestAccepted: "Permintaan mengikuti kamu telah diterima"
pollEnded: "Hasil Kuesioner telah keluar"
+ newNote: "Catatan baru"
unreadAntennaNote: "Antena {name}"
emptyPushNotificationMessage: "Pembaruan notifikasi dorong"
achievementEarned: "Pencapaian didapatkan"
+ testNotification: "Tes notifikasi"
+ checkNotificationBehavior: "Cek tampilan notifikasi"
+ sendTestNotification: "Kirim tes notifikasi"
+ notificationWillBeDisplayedLikeThis: "Notifikasi akan terlihat seperti ini"
_types:
all: "Semua"
+ note: "Catatan baru"
follow: "Ikuti"
mention: "Sebut"
reply: "Balasan"
@@ -2001,6 +2127,8 @@ _deck:
introduction2: "Klik \"+\" pada kanan layar untuk menambahkan kolom baru kapanpun yang kamu mau."
widgetsIntroduction: "Mohon pilih \"Sunting gawit\" pada menu kolom dan tambahkan gawit."
useSimpleUiForNonRootPages: "Gunakan antarmuka sederhana ke halaman yang dituju"
+ usedAsMinWidthWhenFlexible: "Lebar minimum akan digunakan untuk ini ketika opsi \"Atur-otomatis lebar\" dinyalakan"
+ flexible: "Atur-otomatis lebar"
_columns:
main: "Utama"
widgets: "Widget"
@@ -2036,6 +2164,41 @@ _webhookSettings:
reaction: "Ketika menerima reaksi"
mention: "Ketika sedang disebut"
_moderationLogTypes:
+ createRole: "Peran telah dibuat"
+ deleteRole: "Peran telah dihapus"
+ updateRole: "Peran telah diperbaharui"
+ assignRole: "Yang ditugaskan dalam peran"
+ unassignRole: "Dihapus dari peran"
suspend: "Tangguhkan"
+ unsuspend: "Batal ditangguhkan"
+ addCustomEmoji: "Emoji kustom ditambahkan"
+ updateCustomEmoji: "Emoji kustom diperbaharui"
+ deleteCustomEmoji: "Emoji kustom dihapus"
+ updateServerSettings: "Pengaturan peladen diperbaharui"
+ updateUserNote: "Catatan moderasi diperbaharui"
+ deleteDriveFile: "Berkas dihapus"
+ deleteNote: "Catatan dihapus"
+ createGlobalAnnouncement: "Pengumuman global dibuat"
+ createUserAnnouncement: "Pengumuman pengguna dibuat"
+ updateGlobalAnnouncement: "Pengumuman global diperbaharui"
+ updateUserAnnouncement: "Pengumuman pengguna diperbaharui"
+ deleteGlobalAnnouncement: "Pengumuman global telah dihapus"
+ deleteUserAnnouncement: "Pengumuman pengguna telah dihapus."
resetPassword: "Atur ulang kata sandi"
+ suspendRemoteInstance: "Instansi luar telah ditangguhkan"
+ unsuspendRemoteInstance: "Instansi luar batal ditangguhkan"
+ markSensitiveDriveFile: "Berkas ditandai sensitif"
+ unmarkSensitiveDriveFile: "Berkas batal ditandai sensitif"
+ resolveAbuseReport: "Laporan terselesaikan"
createInvitation: "Buat kode undangan"
+ createAd: "Iklan telah dibuat"
+ deleteAd: "Iklan telah dihapus"
+ updateAd: "Iklan telah diperbaharui"
+_fileViewer:
+ title: "Rincian berkas"
+ type: "Jenis berkas"
+ size: "Ukuran berkas"
+ url: "URL"
+ uploadedAt: "Diunggah pada"
+ attachedNotes: "Catatan yang dilampirkan"
+ thisPageCanBeSeenFromTheAuthor: "Halaman ini hanya dapat dilihat oleh pengguna yang mengunggah bekas ini."
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 663dfff32d..aaac19c146 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -124,7 +124,12 @@ export interface Locale {
"add": string;
"reaction": string;
"reactions": string;
- "reactionSetting": string;
+ "emojiPicker": string;
+ "pinnedEmojisForReactionSettingDescription": string;
+ "pinnedEmojisSettingDescription": string;
+ "emojiPickerDisplay": string;
+ "overwriteFromPinnedEmojisForReaction": string;
+ "overwriteFromPinnedEmojis": string;
"reactionSettingDescription2": string;
"rememberNoteVisibility": string;
"attachCancel": string;
@@ -198,6 +203,7 @@ export interface Locale {
"perDay": string;
"stopActivityDelivery": string;
"blockThisInstance": string;
+ "silenceThisInstance": string;
"operations": string;
"software": string;
"version": string;
@@ -217,6 +223,8 @@ export interface Locale {
"clearCachedFilesConfirm": string;
"blockedInstances": string;
"blockedInstancesDescription": string;
+ "silencedInstances": string;
+ "silencedInstancesDescription": string;
"muteAndBlock": string;
"mutedUsers": string;
"blockedUsers": string;
@@ -261,6 +269,7 @@ export interface Locale {
"removeAreYouSure": string;
"deleteAreYouSure": string;
"resetAreYouSure": string;
+ "areYouSure": string;
"saved": string;
"messaging": string;
"upload": string;
@@ -311,6 +320,7 @@ export interface Locale {
"createFolder": string;
"renameFolder": string;
"deleteFolder": string;
+ "folder": string;
"addFile": string;
"emptyDrive": string;
"emptyFolder": string;
@@ -437,7 +447,6 @@ export interface Locale {
"notFound": string;
"notFoundDescription": string;
"uploadFolder": string;
- "cacheClear": string;
"markAsReadAllNotifications": string;
"markAsReadAllUnreadNotes": string;
"markAsReadAllTalkMessages": string;
@@ -534,6 +543,7 @@ export interface Locale {
"deleteAll": string;
"showFixedPostForm": string;
"showFixedPostFormInChannel": string;
+ "withRepliesByDefaultForNewlyFollowed": string;
"newNoteRecived": string;
"sounds": string;
"sound": string;
@@ -543,6 +553,8 @@ export interface Locale {
"popout": string;
"volume": string;
"masterVolume": string;
+ "notUseSound": string;
+ "useSoundOnlyWhenActive": string;
"details": string;
"chooseEmoji": string;
"unableToProcess": string;
@@ -563,6 +575,10 @@ export interface Locale {
"script": string;
"disablePagesScript": string;
"updateRemoteUser": string;
+ "unsetUserAvatar": string;
+ "unsetUserAvatarConfirm": string;
+ "unsetUserBanner": string;
+ "unsetUserBannerConfirm": string;
"deleteAllFiles": string;
"deleteAllFilesConfirm": string;
"removeAllFollowing": string;
@@ -634,6 +650,7 @@ export interface Locale {
"smtpSecureInfo": string;
"testEmail": string;
"wordMute": string;
+ "hardWordMute": string;
"regexpError": string;
"regexpErrorDescription": string;
"instanceMute": string;
@@ -867,8 +884,8 @@ export interface Locale {
"classic": string;
"muteThread": string;
"unmuteThread": string;
- "ffVisibility": string;
- "ffVisibilityDescription": string;
+ "followingVisibility": string;
+ "followersVisibility": string;
"continueThread": string;
"deleteAccountConfirm": string;
"incorrectPassword": string;
@@ -978,6 +995,7 @@ export interface Locale {
"unassign": string;
"color": string;
"manageCustomEmojis": string;
+ "manageAvatarDecorations": string;
"youCannotCreateAnymore": string;
"cannotPerformTemporary": string;
"cannotPerformTemporaryDescription": string;
@@ -1018,6 +1036,8 @@ export interface Locale {
"sensitiveWords": string;
"sensitiveWordsDescription": string;
"sensitiveWordsDescription2": string;
+ "hiddenTags": string;
+ "hiddenTagsDescription": string;
"notesSearchNotAvailable": string;
"license": string;
"unfavoriteConfirm": string;
@@ -1030,6 +1050,7 @@ export interface Locale {
"enableChartsForFederatedInstances": string;
"showClipButtonInNoteFooter": string;
"reactionsDisplaySize": string;
+ "limitWidthOfReaction": string;
"noteIdOrUrl": string;
"video": string;
"videos": string;
@@ -1132,6 +1153,10 @@ export interface Locale {
"fileAttachedOnly": string;
"showRepliesToOthersInTimeline": string;
"hideRepliesToOthersInTimeline": string;
+ "showRepliesToOthersInTimelineAll": string;
+ "hideRepliesToOthersInTimelineAll": string;
+ "confirmShowRepliesAll": string;
+ "confirmHideRepliesAll": string;
"externalServices": string;
"impressum": string;
"impressumUrl": string;
@@ -1139,6 +1164,27 @@ export interface Locale {
"privacyPolicy": string;
"privacyPolicyUrl": string;
"tosAndPrivacyPolicy": string;
+ "avatarDecorations": string;
+ "attach": string;
+ "detach": string;
+ "detachAll": string;
+ "angle": string;
+ "flip": string;
+ "showAvatarDecorations": string;
+ "releaseToRefresh": string;
+ "refreshing": string;
+ "pullDownToRefresh": string;
+ "disableStreamingTimeline": string;
+ "useGroupedNotifications": string;
+ "signupPendingError": string;
+ "cwNotationRequired": string;
+ "doReaction": string;
+ "code": string;
+ "reloadRequiredToApplySettings": string;
+ "remainingN": string;
+ "overwriteContentConfirm": string;
+ "seasonalScreenEffect": string;
+ "decorate": string;
"_announcement": {
"forExistingUsers": string;
"forExistingUsersDescription": string;
@@ -1148,6 +1194,10 @@ export interface Locale {
"tooManyActiveAnnouncementDescription": string;
"readConfirmTitle": string;
"readConfirmText": string;
+ "shouldNotBeUsedToPresentPermanentInfo": string;
+ "dialogAnnouncementUxWarn": string;
+ "silence": string;
+ "silenceDescription": string;
};
"_initialAccountSetting": {
"accountCreated": string;
@@ -1161,10 +1211,91 @@ export interface Locale {
"pushNotificationDescription": string;
"initialAccountSettingCompleted": string;
"haveFun": string;
- "ifYouNeedLearnMore": string;
+ "youCanContinueTutorial": string;
+ "startTutorial": string;
"skipAreYouSure": string;
"laterAreYouSure": string;
};
+ "_initialTutorial": {
+ "launchTutorial": string;
+ "title": string;
+ "wellDone": string;
+ "skipAreYouSure": string;
+ "_landing": {
+ "title": string;
+ "description": string;
+ };
+ "_note": {
+ "title": string;
+ "description": string;
+ "reply": string;
+ "renote": string;
+ "reaction": string;
+ "menu": string;
+ };
+ "_reaction": {
+ "title": string;
+ "description": string;
+ "letsTryReacting": string;
+ "reactToContinue": string;
+ "reactNotification": string;
+ "reactDone": string;
+ };
+ "_timeline": {
+ "title": string;
+ "description1": string;
+ "home": string;
+ "local": string;
+ "social": string;
+ "global": string;
+ "description2": string;
+ "description3": string;
+ };
+ "_postNote": {
+ "title": string;
+ "description1": string;
+ "_visibility": {
+ "description": string;
+ "public": string;
+ "home": string;
+ "followers": string;
+ "direct": string;
+ "doNotSendConfidencialOnDirect1": string;
+ "doNotSendConfidencialOnDirect2": string;
+ "localOnly": string;
+ };
+ "_cw": {
+ "title": string;
+ "description": string;
+ "_exampleNote": {
+ "cw": string;
+ "note": string;
+ };
+ "useCases": string;
+ };
+ };
+ "_howToMakeAttachmentsSensitive": {
+ "title": string;
+ "description": string;
+ "tryThisFile": string;
+ "_exampleNote": {
+ "note": string;
+ };
+ "method": string;
+ "sensitiveSucceeded": string;
+ "doItToContinue": string;
+ };
+ "_done": {
+ "title": string;
+ "description": string;
+ };
+ };
+ "_timelineDescription": {
+ "home": string;
+ "local": string;
+ "social": string;
+ "global": string;
+ };
"_serverRules": {
"description": string;
};
@@ -1177,6 +1308,9 @@ export interface Locale {
"manifestJsonOverride": string;
"shortName": string;
"shortNameDescription": string;
+ "fanoutTimelineDescription": string;
+ "fanoutTimelineDbFallback": string;
+ "fanoutTimelineDbFallbackDescription": string;
};
"_accountMigration": {
"moveFrom": string;
@@ -1511,6 +1645,10 @@ export interface Locale {
"title": string;
"description": string;
};
+ "_tutorialCompleted": {
+ "title": string;
+ "description": string;
+ };
};
};
"_role": {
@@ -1523,7 +1661,9 @@ export interface Locale {
"assignTarget": string;
"descriptionOfAssignTarget": string;
"manual": string;
+ "manualRoles": string;
"conditional": string;
+ "conditionalRoles": string;
"condition": string;
"isConditionalRole": string;
"isPublic": string;
@@ -1557,6 +1697,7 @@ export interface Locale {
"inviteLimitCycle": string;
"inviteExpirationTime": string;
"canManageCustomEmojis": string;
+ "canManageAvatarDecorations": string;
"driveCapacity": string;
"alwaysMarkNsfw": string;
"pinMax": string;
@@ -1572,6 +1713,7 @@ export interface Locale {
"canHideAds": string;
"canSearchNotes": string;
"canUseTranslator": string;
+ "avatarDecorationLimit": string;
};
"_condition": {
"isLocal": string;
@@ -1604,6 +1746,7 @@ export interface Locale {
"disposable": string;
"mx": string;
"smtp": string;
+ "banned": string;
};
"_ffVisibility": {
"public": string;
@@ -1628,6 +1771,10 @@ export interface Locale {
"reduceFrequencyOfThisAd": string;
"hide": string;
"timezoneinfo": string;
+ "adsSettings": string;
+ "notesPerOneAd": string;
+ "setZeroToDisable": string;
+ "adsTooClose": string;
};
"_forgotPassword": {
"enterEmail": string;
@@ -1689,6 +1836,7 @@ export interface Locale {
"donate": string;
"morePatrons": string;
"patrons": string;
+ "projectMembers": string;
};
"_displayOfSensitiveMedia": {
"respect": string;
@@ -1717,6 +1865,7 @@ export interface Locale {
"notesCount": string;
"nameAndDescription": string;
"nameOnly": string;
+ "allowRenoteToExternal": string;
};
"_menuDisplay": {
"sideFull": string;
@@ -1793,9 +1942,6 @@ export interface Locale {
"infoFg": string;
"infoWarnBg": string;
"infoWarnFg": string;
- "cwBg": string;
- "cwFg": string;
- "cwHoverBg": string;
"toastBg": string;
"toastFg": string;
"buttonBg": string;
@@ -1817,6 +1963,15 @@ export interface Locale {
"notification": string;
"antenna": string;
"channel": string;
+ "reaction": string;
+ };
+ "_soundSettings": {
+ "driveFile": string;
+ "driveFileWarn": string;
+ "driveFileTypeWarn": string;
+ "driveFileTypeWarnDescription": string;
+ "driveFileDurationWarn": string;
+ "driveFileDurationWarnDescription": string;
};
"_ago": {
"future": string;
@@ -1830,23 +1985,21 @@ export interface Locale {
"yearsAgo": string;
"invalid": string;
};
+ "_timeIn": {
+ "seconds": string;
+ "minutes": string;
+ "hours": string;
+ "days": string;
+ "weeks": string;
+ "months": string;
+ "years": string;
+ };
"_time": {
"second": string;
"minute": string;
"hour": string;
"day": string;
};
- "_timelineTutorial": {
- "title": string;
- "step1_1": string;
- "step1_2": string;
- "step2_1": string;
- "step2_2": string;
- "step3_1": string;
- "step3_2": string;
- "step4_1": string;
- "step4_2": string;
- };
"_2fa": {
"alreadyRegistered": string;
"registerTOTP": string;
@@ -1973,6 +2126,7 @@ export interface Locale {
"chooseList": string;
};
"clicker": string;
+ "birthdayFollowings": string;
};
"_cw": {
"hide": string;
@@ -2041,6 +2195,7 @@ export interface Locale {
"changeAvatar": string;
"changeBanner": string;
"verifiedLinkDescription": string;
+ "avatarDecorationMax": string;
};
"_exportOrImport": {
"allNotes": string;
@@ -2051,6 +2206,7 @@ export interface Locale {
"userLists": string;
"excludeMutingUsers": string;
"excludeInactiveUsers": string;
+ "withReplies": string;
};
"_charts": {
"federation": string;
@@ -2171,12 +2327,16 @@ export interface Locale {
"pollEnded": string;
"newNote": string;
"unreadAntennaNote": string;
+ "roleAssigned": string;
"emptyPushNotificationMessage": string;
"achievementEarned": string;
"testNotification": string;
"checkNotificationBehavior": string;
"sendTestNotification": string;
"notificationWillBeDisplayedLikeThis": string;
+ "reactedBySomeUsers": string;
+ "renotedBySomeUsers": string;
+ "followedBySomeUsers": string;
"_types": {
"all": string;
"note": string;
@@ -2189,6 +2349,7 @@ export interface Locale {
"pollEnded": string;
"receiveFollowRequest": string;
"followRequestAccepted": string;
+ "roleAssigned": string;
"achievementEarned": string;
"app": string;
};
@@ -2290,9 +2451,97 @@ export interface Locale {
"createAd": string;
"deleteAd": string;
"updateAd": string;
+ "createAvatarDecoration": string;
+ "updateAvatarDecoration": string;
+ "deleteAvatarDecoration": string;
+ "unsetUserAvatar": string;
+ "unsetUserBanner": string;
+ };
+ "_fileViewer": {
+ "title": string;
+ "type": string;
+ "size": string;
+ "url": string;
+ "uploadedAt": string;
+ "attachedNotes": string;
+ "thisPageCanBeSeenFromTheAuthor": string;
+ };
+ "_externalResourceInstaller": {
+ "title": string;
+ "checkVendorBeforeInstall": string;
+ "_plugin": {
+ "title": string;
+ "metaTitle": string;
+ };
+ "_theme": {
+ "title": string;
+ "metaTitle": string;
+ };
+ "_meta": {
+ "base": string;
+ };
+ "_vendorInfo": {
+ "title": string;
+ "endpoint": string;
+ "hashVerify": string;
+ };
+ "_errors": {
+ "_invalidParams": {
+ "title": string;
+ "description": string;
+ };
+ "_resourceTypeNotSupported": {
+ "title": string;
+ "description": string;
+ };
+ "_failedToFetch": {
+ "title": string;
+ "fetchErrorDescription": string;
+ "parseErrorDescription": string;
+ };
+ "_hashUnmatched": {
+ "title": string;
+ "description": string;
+ };
+ "_pluginParseFailed": {
+ "title": string;
+ "description": string;
+ };
+ "_pluginInstallFailed": {
+ "title": string;
+ "description": string;
+ };
+ "_themeParseFailed": {
+ "title": string;
+ "description": string;
+ };
+ "_themeInstallFailed": {
+ "title": string;
+ "description": string;
+ };
+ };
+ };
+ "_dataSaver": {
+ "_media": {
+ "title": string;
+ "description": string;
+ };
+ "_avatar": {
+ "title": string;
+ "description": string;
+ };
+ "_urlPreview": {
+ "title": string;
+ "description": string;
+ };
+ "_code": {
+ "title": string;
+ "description": string;
+ };
};
}
declare const locales: {
[lang: string]: Locale;
};
+export function build(): Locale;
export default locales;
diff --git a/locales/index.js b/locales/index.js
index 7801f1275b..650e552337 100644
--- a/locales/index.js
+++ b/locales/index.js
@@ -51,20 +51,37 @@ const primaries = {
// 何故か文字列にバックスペース文字が混入することがあり、YAMLが壊れるので取り除く
const clean = (text) => text.replace(new RegExp(String.fromCodePoint(0x08), 'g'), '');
-const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(new URL(`${c}.yml`, import.meta.url), 'utf-8'))) || {}, a), {});
+export function build() {
+ const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(new URL(`${c}.yml`, import.meta.url), 'utf-8'))) || {}, a), {});
-export default Object.entries(locales)
- .reduce((a, [k ,v]) => (a[k] = (() => {
- const [lang] = k.split('-');
- switch (k) {
- case 'ja-JP': return v;
- case 'ja-KS':
- case 'en-US': return merge(locales['ja-JP'], v);
- default: return merge(
- locales['ja-JP'],
- locales['en-US'],
- locales[`${lang}-${primaries[lang]}`] || {},
- v
- );
+ // 空文字列が入ることがあり、フォールバックが動作しなくなるのでプロパティごと消す
+ const removeEmpty = (obj) => {
+ for (const [k, v] of Object.entries(obj)) {
+ if (v === '') {
+ delete obj[k];
+ } else if (typeof v === 'object') {
+ removeEmpty(v);
+ }
}
- })(), a), {});
+ return obj;
+ };
+ removeEmpty(locales);
+
+ return Object.entries(locales)
+ .reduce((a, [k, v]) => (a[k] = (() => {
+ const [lang] = k.split('-');
+ switch (k) {
+ case 'ja-JP': return v;
+ case 'ja-KS':
+ case 'en-US': return merge(locales['ja-JP'], v);
+ default: return merge(
+ locales['ja-JP'],
+ locales['en-US'],
+ locales[`${lang}-${primaries[lang]}`] ?? {},
+ v
+ );
+ }
+ })(), a), {});
+}
+
+export default build();
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index a28d243566..6ce6cd5604 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -15,7 +15,7 @@ gotIt: "ok!"
cancel: "Annulla"
noThankYou: "No grazie"
enterUsername: "Inserisci un nome utente"
-renotedBy: "Rinotato da {user}"
+renotedBy: "Rinotata da {user}"
noNotes: "Nessuna nota!"
noNotifications: "Nessuna notifica"
instance: "Istanza"
@@ -64,7 +64,7 @@ reply: "Rispondi"
loadMore: "Mostra di più"
showMore: "Espandi"
showLess: "Comprimi"
-youGotNewFollower: "Ti sta seguendo"
+youGotNewFollower: "Adesso ti segue"
receiveFollowRequest: "Hai ricevuto una richiesta di follow"
followRequestAccepted: "Ha accettato la tua richiesta di follow"
mention: "Menzioni"
@@ -102,26 +102,31 @@ defaultNoteVisibility: "Privacy predefinita delle note"
follow: "Segui"
followRequest: "Richiesta di follow"
followRequests: "Richieste di follow"
-unfollow: "Non seguire"
+unfollow: "Interrompi following"
followRequestPending: "Richiesta in approvazione"
enterEmoji: "Inserisci emoji"
renote: "Rinota"
unrenote: "Elimina la Rinota"
-renoted: "Rinotato!"
+renoted: "Rinotata!"
cantRenote: "È impossibile rinotare questa nota."
cantReRenote: "È impossibile rinotare una Rinota."
-quote: "Cita"
+quote: "Citazione"
inChannelRenote: "Rinota nel canale"
inChannelQuote: "Cita nel canale"
-pinnedNote: "Nota fissata"
+pinnedNote: "Nota in primo piano"
pinned: "Fissa sul profilo"
you: "Tu"
-clickToShow: "Clicca per visualizzare"
-sensitive: "Esplicito"
+clickToShow: "Contenuto occultato, cliccare solo se si intende vedere"
+sensitive: "Allegato esplicito"
add: "Aggiungi"
reaction: "Reazioni"
reactions: "Reazioni"
-reactionSetting: "Reazioni visualizzate sul pannello"
+emojiPicker: "Selettore emoji"
+pinnedEmojisForReactionSettingDescription: "Scegli quale sia l'emoji in cima, quando reagisci"
+pinnedEmojisSettingDescription: "Scegli quale sia l'emoji in cima, quando reagisci"
+emojiPickerDisplay: "Visualizza selettore"
+overwriteFromPinnedEmojisForReaction: "Sovrascrivi con le impostazioni reazioni"
+overwriteFromPinnedEmojis: "Sovrascrivi con le impostazioni globali"
reactionSettingDescription2: "Trascina per riorganizzare, clicca per cancellare, usa il pulsante \"+\" per aggiungere."
rememberNoteVisibility: "Ricordare le impostazioni di visibilità delle note"
attachCancel: "Rimuovi allegato"
@@ -162,8 +167,8 @@ cacheRemoteSensitiveFiles: "Copia nella cache locale i file espliciti remoti"
cacheRemoteSensitiveFilesDescription: "Disattivando questa opzione, i file espliciti verranno richiesti direttamente all'istanza remota senza essere salvati nel server locale."
flagAsBot: "Io sono un robot"
flagAsBotDescription: "Attiva questo campo se il profilo esegue principalmente operazioni automatiche. L'attivazione segnala agli altri sviluppatori come comportarsi per evitare catene d’interazione infinite con altri bot. I sistemi interni di Misskey si adegueranno al fine di trattare questo profilo come bot."
-flagAsCat: "Sono un gatto"
-flagAsCatDescription: "La modalità \"sono un gatto\" aggiunge le orecchie al tuo profilo"
+flagAsCat: "MIIaaaoo!!! (Io sono un gatto è un romanzo del 1905, il primo dello scrittore giapponese Natsume Sōseki)"
+flagAsCatDescription: "Miaoo mia miao mi miao?"
flagShowTimelineReplies: "Mostra le risposte alle note sulla timeline."
flagShowTimelineRepliesDescription: "Attivando, la timeline mostra le Note del profilo ed anche le risposte ad altre Note"
autoAcceptFollowed: "Accetta automaticamente le richieste di follow da profili che già segui"
@@ -195,6 +200,7 @@ perHour: "orario"
perDay: "giornaliero"
stopActivityDelivery: "Interrompi la distribuzione di attività"
blockThisInstance: "Blocca questa istanza"
+silenceThisInstance: "Silenzia l'istanza"
operations: "Operazioni"
software: "Software"
version: "Versione"
@@ -214,6 +220,8 @@ clearCachedFiles: "Svuota cache"
clearCachedFilesConfirm: "Vuoi davvero svuotare la cache da tutti i file remoti?"
blockedInstances: "Istanze bloccate"
blockedInstancesDescription: "Elenca le istanze che vuoi bloccare, una per riga. Esse non potranno più interagire con la tua istanza."
+silencedInstances: "Istanze silenziate"
+silencedInstancesDescription: "Elenca i nomi host delle istanze che vuoi silenziare. Tutti i profili nelle istanze silenziate vengono trattati come tali. Possono solo inviare richieste di follow e menzionare soltanto i profili locali che seguono. Le istanze bloccate non sono interessate."
muteAndBlock: "Silenziati / Bloccati"
mutedUsers: "Profili silenziati"
blockedUsers: "Profili bloccati"
@@ -238,7 +246,7 @@ publishing: "Pubblicazione"
notResponding: "Nessuna risposta"
instanceFollowing: "Seguiti dall'istanza"
instanceFollowers: "Follower dell'istanza"
-instanceUsers: "Utenti dell'istanza"
+instanceUsers: "Profili nell'istanza"
changePassword: "Aggiorna Password"
security: "Sicurezza"
retypedNotMatch: "Le password non corrispondono."
@@ -247,7 +255,7 @@ newPassword: "Nuova Password"
newPasswordRetype: "Conferma password"
attachFile: "Allega file"
more: "Di più!"
-featured: "Tendenze"
+featured: "In evidenza"
usernameOrUserId: "Nome utente o ID"
noSuchUser: "Profilo non trovato"
lookup: "Ricerca remota"
@@ -258,6 +266,7 @@ removed: "Eliminato con successo"
removeAreYouSure: "Vuoi davvero eliminare \"{x}\"?"
deleteAreYouSure: "Vuoi davvero eliminare \"{x}\"?"
resetAreYouSure: "Ripristinare?"
+areYouSure: "Confermi?"
saved: "Salvato"
messaging: "Messaggi"
upload: "Carica"
@@ -278,7 +287,7 @@ agreeTo: "Sono d'accordo con {0}"
agree: "Accetto"
agreeBelow: "Accetto quanto riportato sotto"
basicNotesBeforeCreateAccount: "Note importanti"
-termsOfService: "Informativa ai sensi degli artt. 13 e 14 del Regolamento UE 2016/679 per la protezione dei dati personali (GDPR)"
+termsOfService: "Condizioni d'uso del servizio"
start: "Inizia!"
home: "Home"
remoteUserCaution: "Le informazioni potrebbero essere incomplete poiché questo profilo remoto potrebbe non essere completamente federato."
@@ -308,6 +317,7 @@ folderName: "Nome della cartella"
createFolder: "Nuova cartella"
renameFolder: "Rinomina cartella"
deleteFolder: "Elimina cartella"
+folder: "Cartella"
addFile: "Allega"
emptyDrive: "Il Drive è vuoto"
emptyFolder: "La cartella è vuota"
@@ -323,9 +333,9 @@ avatar: "Foto del profilo"
banner: "Intestazione"
displayOfSensitiveMedia: "Visibilità dei media espliciti"
whenServerDisconnected: "Quando la connessione col server è persa"
-disconnectedFromServer: "Il server si è disconnesso"
+disconnectedFromServer: "Connessione persa"
reload: "Ricarica"
-doNothing: "Nessun'azione"
+doNothing: "Ignora"
reloadConfirm: "Vuoi ricaricare?"
watch: "Osserva"
unwatch: "Smetti di Osserva"
@@ -336,7 +346,7 @@ instanceName: "Nome dell'istanza"
instanceDescription: "Descrizione dell'istanza"
maintainerName: "Nome dell'amministratore"
maintainerEmail: "Indirizzo e-mail dell'amministratore"
-tosUrl: "URL dei termini del servizio e della privacy"
+tosUrl: "URL delle condizioni d'uso"
thisYear: "Anno"
thisMonth: "Mese"
today: "Oggi"
@@ -359,12 +369,12 @@ inMb: "in Megabytes"
bannerUrl: "URL dell'immagine d'intestazione"
backgroundImageUrl: "URL dello sfondo"
basicInfo: "Informazioni fondamentali"
-pinnedUsers: "Utenti in evidenza"
-pinnedUsersDescription: "Elenca gli/le utenti che vuoi fissare in cima alla pagina \"Esplora\", un@ per riga."
+pinnedUsers: "Profili in evidenza"
+pinnedUsersDescription: "Elenca i profili delle persone che vuoi fissare nella pagina \"Esplora\"."
pinnedPages: "Pagine in evidenza"
pinnedPagesDescription: "Specifica il percorso delle pagine che vuoi fissare in cima alla pagina dell'istanza. Una pagina per riga."
pinnedClipId: "ID della Clip in evidenza"
-pinnedNotes: "Nota fissata"
+pinnedNotes: "Note in primo piano"
hcaptcha: "hCaptcha"
enableHcaptcha: "Abilita hCaptcha"
hcaptchaSiteKey: "Chiave del sito"
@@ -384,25 +394,25 @@ name: "Nome"
antennaSource: "Fonte dell'antenna"
antennaKeywords: "Parole chiavi da ricevere"
antennaExcludeKeywords: "Parole chiavi da escludere"
-antennaKeywordsDescription: "Separare con uno spazio indica la condizione \"E\". Separare con un'interruzzione riga indica la condizione \"O\"."
+antennaKeywordsDescription: "Sparando con uno spazio indichi la condizione E (and). Separando con un a capo, indichi la condizione O (or)."
notifyAntenna: "Invia notifiche delle nuove note"
withFileAntenna: "Solo note con file in allegato"
enableServiceworker: "Abilita ServiceWorker"
-antennaUsersDescription: "Inserisci solo un nome utente per riga"
+antennaUsersDescription: "Elenca un nome utente per riga"
caseSensitive: "Sensibile alla distinzione tra maiuscole e minuscole"
withReplies: "Includere le risposte"
connectedTo: "Connessione ai seguenti profili:"
notesAndReplies: "Note e risposte"
-withFiles: "Con file in allegato"
+withFiles: "Con allegati"
silence: "Silenzia"
silenceConfirm: "Vuoi davvero silenziare questo profilo?"
unsilence: "Riattiva"
unsilenceConfirm: "Vuoi davvero riattivare questo profilo?"
-popularUsers: "Utenti popolari"
+popularUsers: "Profili popolari"
recentlyUpdatedUsers: "Utenti attivi di recente"
-recentlyRegisteredUsers: "Utenti registrati di recente"
-recentlyDiscoveredUsers: "Utenti scoperti di recente"
-exploreUsersCount: "Ci sono {count} utenti"
+recentlyRegisteredUsers: "Profili iscritti di recente"
+recentlyDiscoveredUsers: "Profili scoperti di recente"
+exploreUsersCount: "Ci sono {count} profili"
exploreFediverse: "Esplora il Fediverso"
popularTags: "Tag di tendenza"
userList: "Liste"
@@ -412,8 +422,8 @@ administrator: "Amministratore"
token: "Token"
2fa: "Autenticazione a due fattori"
setupOf2fa: "Impostare l'autenticazione a due fattori"
-totp: "App di autenticazione"
-totpDescription: "Inserisci un codice OTP tramite un'app di autenticazione"
+totp: "App di autenticazione a due fattori (2FA/MFA)"
+totpDescription: "Puoi autenticarti inserendo un codice OTP tramite la tua App di autenticazione a due fattori (2FA/MFA)"
moderator: "Moderatore"
moderation: "moderazione"
moderationNote: "Promemoria di moderazione"
@@ -434,7 +444,6 @@ share: "Condividi"
notFound: "Non trovato"
notFoundDescription: "Nessuna pagina corrisponde all'URL indicata."
uploadFolder: "Destinazione caricamento predefinita"
-cacheClear: "Svuota cache"
markAsReadAllNotifications: "Segna tutte le notifiche come lette"
markAsReadAllUnreadNotes: "Segna tutte le note come lette"
markAsReadAllTalkMessages: "Segna tutte le chat come lette"
@@ -460,7 +469,7 @@ invitations: "Invita"
invitationCode: "Codice di invito"
checking: "Confermando"
available: "Disponibile"
-unavailable: "Il nome utente è già in uso"
+unavailable: "Non puoi usarlo"
usernameInvalidFormat: "Il nome utente deve avere solo caratteri alfanumerici e trattino basso '_'"
tooShort: "Troppo breve"
tooLong: "Troppo lungo"
@@ -531,6 +540,7 @@ serverLogs: "Log del server"
deleteAll: "Cancella cronologia"
showFixedPostForm: "Visualizzare la finestra di pubblicazione in cima alla timeline"
showFixedPostFormInChannel: "Per i canali, mostra il modulo di pubblicazione in cima alla timeline"
+withRepliesByDefaultForNewlyFollowed: "Quando segui nuovi profili, includi le risposte in TL come impostazione predefinita"
newNoteRecived: "Nuove note da leggere"
sounds: "Impostazioni suoni"
sound: "Suono"
@@ -540,6 +550,8 @@ showInPage: "Visualizza in pagina"
popout: "Finestra pop-out"
volume: "Volume"
masterVolume: "Volume principale"
+notUseSound: "Non emettere suoni"
+useSoundOnlyWhenActive: "Emetti suoni solo quando Misskey è in attività"
details: "Dettagli"
chooseEmoji: "Scegli emoji"
unableToProcess: "Impossibile compiere l'operazione"
@@ -559,13 +571,17 @@ scratchpadDescription: "Lo Scratchpad offre un ambiente per esperimenti di AiScr
output: "Uscita"
script: "Script"
disablePagesScript: "Disabilita AiScript nelle pagine"
-updateRemoteUser: "Aggiornare le informazioni di utente remot@"
+updateRemoteUser: "Aggiorna le informazioni dal profilo remoto"
+unsetUserAvatar: "Rimozione foto profilo"
+unsetUserAvatarConfirm: "Vuoi davvero rimuovere la foto profilo?"
+unsetUserBanner: "Rimuovi intestazione profilo"
+unsetUserBannerConfirm: "Vuoi davvero rimuovere l'intestazione dal profilo?"
deleteAllFiles: "Elimina tutti i file"
deleteAllFilesConfirm: "Vuoi davvero eliminare tutti i file?"
removeAllFollowing: "Annulla tutti i follow"
removeAllFollowingDescription: "Cancella tutti i follows del server {host}. Per favore, esegui se, ad esempio, l'istanza non esiste più."
userSuspended: "L'utente è in sospensione"
-userSilenced: "L'utente è silenziat@."
+userSilenced: "Profilo silente."
yourAccountSuspendedTitle: "Questo profilo è sospeso"
yourAccountSuspendedDescription: "Questo profilo è stato sospeso a causa di una violazione del regolamento. Per informazioni, contattare l'amministrazione. Si prega di non creare un nuovo account."
tokenRevoked: "Il token non è valido"
@@ -586,7 +602,7 @@ invisibleNote: "Nota invisibile"
enableInfiniteScroll: "Abilita scorrimento infinito"
visibility: "Visibilità"
poll: "Sondaggio"
-useCw: "Content Warning"
+useCw: "Contenuto esplicito"
enablePlayer: "Visualizza"
disablePlayer: "Chiudi"
expandTweet: "Espandi tweet"
@@ -631,6 +647,7 @@ smtpSecure: "Usare SSL/TLS implicito per le connessioni SMTP"
smtpSecureInfo: "Disabilitare quando è attivo STARTTLS."
testEmail: "Verifica il funzionamento"
wordMute: "Filtri parole"
+hardWordMute: "Filtro parole forte"
regexpError: "errore regex"
regexpErrorDescription: "Si è verificato un errore nell'espressione regolare alla riga {line} della parola muta {tab}:"
instanceMute: "Silenzia l'istanza"
@@ -649,7 +666,7 @@ notificationSetting: "Impostazioni notifiche"
notificationSettingDesc: "Seleziona il tipo di notifiche da visualizzare."
useGlobalSetting: "Usa impostazioni generali"
useGlobalSettingDesc: "Quando attiva, verranno utilizzate le impostazioni notifiche del profilo. Altrimenti si possono segliere impostazioni personalizzate."
-other: "Avanzate"
+other: "Ulteriori"
regenerateLoginToken: "Genera di nuovo un token di connessione"
regenerateLoginTokenDescription: "Genera un nuovo token di autenticazione. Solitamente questa operazione non è necessaria: quando si genera un nuovo token, tutti i dispositivi vanno disconnessi."
setMultipleBySeparatingWithSpace: "È possibile creare multiple voci separate da spazi."
@@ -737,8 +754,8 @@ reloadToApplySetting: "Le tue preferenze verranno impostate dopo il ricaricament
needReloadToApply: "È necessario riavviare per rendere effettive le modifiche."
showTitlebar: "Visualizza la barra del titolo"
clearCache: "Svuota la cache"
-onlineUsersCount: "{n} utenti online"
-nUsers: "{n} utenti"
+onlineUsersCount: "{n} persone online"
+nUsers: "{n} profili"
nNotes: "{n}Note"
sendErrorReports: "Invia segnalazioni di errori"
sendErrorReportsDescription: "Quando abilitato, se si verifica un problema, informazioni dettagliate sugli errori verranno condivise con Misskey in modo da aiutare a migliorare la qualità del software.\nCiò include informazioni come la versione del sistema operativo, il tipo di navigatore web che usi, la cronologia delle attività, ecc."
@@ -784,7 +801,7 @@ addDescription: "Aggiungi descrizione"
userPagePinTip: "Qui puoi appuntare note, premendo \"Fissa sul profilo\" nel menù delle singole note."
notSpecifiedMentionWarning: "Sono stati menzionati profili non inclusi fra i destinatari"
info: "Informazioni"
-userInfo: "Informazioni utente"
+userInfo: "Informazioni sul profilo"
unknown: "Sconosciuto"
onlineStatus: "Stato di connessione"
hideOnlineStatus: "Modalità invisibile"
@@ -804,13 +821,13 @@ user: "Profilo"
administration: "Gestione"
accounts: "Profilo"
switch: "Cambia"
-noMaintainerInformationWarning: "Le informazioni amministratore non sono impostate."
-noBotProtectionWarning: "Nessuna protezione impostata contro i bot."
+noMaintainerInformationWarning: "Mancano le informazioni sull'amministratore."
+noBotProtectionWarning: "Non è stata impostata alcuna protezione dai Bot"
configure: "Imposta"
postToGallery: "Pubblicare nella galleria"
postToHashtag: "Pubblica a questo hashtag"
gallery: "Galleria"
-recentPosts: "Le più recenti"
+recentPosts: "Pubblicazioni recenti"
popularPosts: "Le più visualizzate"
shareWithNote: "Condividere in nota"
ads: "Banner"
@@ -843,13 +860,13 @@ accountDeletionInProgress: "È in corso l'eliminazione del profilo"
usernameInfo: "Un nome per identificare univocamente il tuo profilo sull'istanza. Puoi utilizzare caratteri alfanumerici maiuscoli, minuscoli e il trattino basso (_). Non potrai cambiare nome utente in seguito."
aiChanMode: "Modalità Ai"
devMode: "Modalità sviluppatori"
-keepCw: "Mantieni il Content Warning"
+keepCw: "Mostra i contenuti espliciti"
pubSub: "Publish/Subscribe del profilo"
lastCommunication: "La comunicazione più recente"
resolved: "Risolto"
unresolved: "Non risolto"
-breakFollow: "Non farti più seguire"
-breakFollowConfirm: "Vuoi davvero smettere di seguire questo profilo?"
+breakFollow: "Interrompi follow"
+breakFollowConfirm: "Vuoi davvero che questo profilo smetta di seguirti?"
itsOn: "Abilitato"
itsOff: "Disabilitato"
on: "Acceso"
@@ -864,8 +881,6 @@ makeReactionsPublicDescription: "La lista delle reazioni che avete fatto è a di
classic: "Classico"
muteThread: "Silenzia conversazione"
unmuteThread: "Riattiva la conversazione"
-ffVisibility: "Visibilità delle connessioni"
-ffVisibilityDescription: "Puoi scegliere a chi mostrare le tue relazioni con altri profili nel fediverso."
continueThread: "Altre conversazioni"
deleteAccountConfirm: "Così verrà eliminato il profilo. Vuoi procedere?"
incorrectPassword: "La password è errata."
@@ -907,7 +922,7 @@ noEmailServerWarning: "Il server di posta non è configurato."
thereIsUnresolvedAbuseReportWarning: "Ci sono report non evasi."
recommended: "Consigliato"
check: "Verifica"
-driveCapOverrideLabel: "Modificare il limite di spazio per questo utente"
+driveCapOverrideLabel: "Modificare la capienza del Drive per questo profilo"
driveCapOverrideCaption: "Se viene specificato meno di 0, viene annullato."
requireAdminForView: "Per visualizzarli, è necessario aver effettuato l'accesso con un profilo amministratore."
isSystemAccount: "Questi profili vengono creati e gestiti automaticamente dal sistema"
@@ -975,6 +990,7 @@ assign: "Assegna"
unassign: "Disassegna"
color: "Colore"
manageCustomEmojis: "Gestisci le emoji personalizzate"
+manageAvatarDecorations: "Gestire le decorazioni di foto del profilo"
youCannotCreateAnymore: "Non puoi creare, hai raggiunto il limite."
cannotPerformTemporary: "Indisponibilità temporanea"
cannotPerformTemporaryDescription: "L'attività non può essere svolta, poiché si è raggiunto il limite di esecuzioni possibili. Per favore, riprova più tardi."
@@ -1015,6 +1031,8 @@ resetPasswordConfirm: "Vuoi davvero ripristinare la password?"
sensitiveWords: "Parole esplicite"
sensitiveWordsDescription: "Imposta automaticamente \"Home\" alla visibilità delle Note che contengono una qualsiasi parola tra queste configurate. Puoi separarle per riga."
sensitiveWordsDescription2: "Gli spazi creano la relazione \"E\" tra parole (questo E quello). Racchiudere una parola nelle slash \"/\" la trasforma in Espressione Regolare."
+hiddenTags: "Hashtag nascosti"
+hiddenTagsDescription: "Impedire la visualizzazione del tag impostato nei trend. Puoi impostare più valori, uno per riga."
notesSearchNotAvailable: "Non è possibile cercare tra le Note."
license: "Licenza"
unfavoriteConfirm: "Vuoi davvero rimuovere la preferenza?"
@@ -1027,6 +1045,7 @@ enableChartsForRemoteUser: "Abilita i grafici per i profili remoti"
enableChartsForFederatedInstances: "Abilita i grafici per le istanze federate"
showClipButtonInNoteFooter: "Aggiungi il bottone Clip tra le azioni delle Note"
reactionsDisplaySize: "Grandezza delle reazioni"
+limitWidthOfReaction: "Limita la larghezza delle reazioni e ridimensionale"
noteIdOrUrl: "ID della Nota o URL"
video: "Video"
videos: "Video"
@@ -1109,7 +1128,7 @@ currentAnnouncements: "Annunci attuali"
pastAnnouncements: "Annunci precedenti"
youHaveUnreadAnnouncements: "Ci sono Annunci non letti"
useSecurityKey: "Per utilizzare la chiave di sicurezza o la passkey, segui le indicazioni del dispositivo"
-replies: "Rispondi"
+replies: "Risposte"
renotes: "Rinota"
loadReplies: "Leggi le risposte"
loadConversation: "Leggi la conversazione"
@@ -1121,14 +1140,45 @@ unnotifyNotes: "Interrompi le notifiche di nuove Note"
authentication: "Autenticazione"
authenticationRequiredToContinue: "Per procedere, è richiesta l'autenticazione"
dateAndTime: "Data e Ora"
-showRenotes: "Leggi le Rinota"
+showRenotes: "Includi le Rinota"
edited: "Modificato"
notificationRecieveConfig: "Preferenze di notifica"
mutualFollow: "Follow reciproco"
-fileAttachedOnly: "Con file in allegato"
+fileAttachedOnly: "Solo con allegati"
showRepliesToOthersInTimeline: "Risposte altrui nella TL"
hideRepliesToOthersInTimeline: "Nascondi Riposte altrui nella TL"
+showRepliesToOthersInTimelineAll: "Mostra le risposte dei tuoi follow nella TL"
+hideRepliesToOthersInTimelineAll: "Nascondi le risposte dei tuoi follow nella TL"
+confirmShowRepliesAll: "Questa è una attività irreversibile. Vuoi davvero includere tutte le risposte dei following in TL?"
+confirmHideRepliesAll: "Questa è una attività irreversibile. Vuoi davvero escludere tutte le risposte dei following in TL?"
externalServices: "Servizi esterni"
+impressum: "Dichiarazione di proprietà"
+impressumUrl: "URL della dichiarazione di proprietà"
+impressumDescription: "La dichiarazione di proprietà, è obbligatoria in alcuni paesi come la Germania (Impressum)."
+privacyPolicy: "Informativa ai sensi del Reg. UE 2016/679 (GDPR)"
+privacyPolicyUrl: "URL della informativa privacy"
+tosAndPrivacyPolicy: "Condizioni d'uso e informativa privacy"
+avatarDecorations: "Decorazioni foto profilo"
+attach: "Applica"
+detach: "Rimuovi"
+detachAll: "Togli tutto"
+angle: "Angolo"
+flip: "Inverti"
+showAvatarDecorations: "Mostra decorazione della foto profilo"
+releaseToRefresh: "Rilascia per aggiornare"
+refreshing: "Aggiornamento..."
+pullDownToRefresh: "Trascina per aggiornare"
+disableStreamingTimeline: "Disabilitare gli aggiornamenti della TL in tempo reale"
+useGroupedNotifications: "Mostra le notifiche raggruppate"
+signupPendingError: "Si è verificato un problema durante la verifica del tuo indirizzo email. Potrebbe essere scaduto il collegamento temporaneo."
+cwNotationRequired: "Devi indicare perché il contenuto è indicato come esplicito."
+doReaction: "Reagisci"
+code: "Codice"
+reloadRequiredToApplySettings: "Per applicare le impostazioni, occorre ricaricare."
+remainingN: "Rimangono: {n}"
+overwriteContentConfirm: "Vuoi davvero sostituire l'attuale contenuto?"
+seasonalScreenEffect: "Schermate in base alla stagione"
+decorate: "Decora"
_announcement:
forExistingUsers: "Solo ai profili attuali"
forExistingUsersDescription: "L'annuncio sarà visibile solo ai profili esistenti in questo momento. Se disabilitato, sarà visibile anche ai profili che verranno creati dopo la pubblicazione di questo annuncio."
@@ -1138,6 +1188,10 @@ _announcement:
tooManyActiveAnnouncementDescription: "L'esperienza delle persone può peggiorare se ci sono troppi annunci attivi. Considera anche l'archiviazione degli annunci conclusi."
readConfirmTitle: "Segnare come già letto?"
readConfirmText: "Hai già letto \"{title}˝?"
+ shouldNotBeUsedToPresentPermanentInfo: "Ti consigliamo di utilizzare gli annunci per pubblicare informazioni tempestive e limitate nel tempo, anziché informazioni importanti a lungo andare nel tempo, poiché potrebbero risultare difficili da ritrovare e peggiorare la fruibilità del servizio, specialmente alle nuove persone iscritte."
+ dialogAnnouncementUxWarn: "Ti consigliamo di usarli con cautela, poiché è molto probabile che avere più di un annuncio in stile \"finestra di dialogo\" peggiori sensibilmente la fruibilità del servizio, specialmente alle nuove persone iscritte."
+ silence: "Silenzia gli annunci"
+ silenceDescription: "Se attivi questa opzione, non riceverai notifiche sugli annunci, evitando di contrassegnarle come già lette."
_initialAccountSetting:
accountCreated: "Il tuo profilo è stato creato!"
letsStartAccountSetup: "Per iniziare, impostiamo il tuo profilo."
@@ -1150,9 +1204,77 @@ _initialAccountSetting:
pushNotificationDescription: "Attivare le notifiche push ti permettera di ricevere informazioni sulla attività di {name} direttamente sul tuo dispositivo."
initialAccountSettingCompleted: "Hai completato la configurazione iniziale!"
haveFun: "Divertiti con {name}!"
- ifYouNeedLearnMore: "Per saperne di più su come usare {name} (Misskey), visita la pagina {link}"
+ youCanContinueTutorial: "Puoi continuare con l'esercitazione su come usare {name} (Misskey), oppure interrompere, iniziando subito a usarlo."
+ startTutorial: "Avvia l'esercitazione"
skipAreYouSure: "Vuoi davvero saltare la configurazione iniziale?"
laterAreYouSure: "Vuoi davvero rimandare la configurazione iniziale?"
+_initialTutorial:
+ launchTutorial: "Guarda il tutorial"
+ title: "Tutorial"
+ wellDone: "Ottimo lavoro!"
+ skipAreYouSure: "Vuoi davvero interrompere il tutorial?"
+ _landing:
+ title: "Eccoci nel tutorial"
+ description: "Qui puoi verificare l'uso delle funzionalità base di Misskey."
+ _note:
+ title: "Cosa sono le Note?"
+ description: "Gli status su Misskey sono chiamati \"Note\". Le Note sono elencate in ordine cronologico nelle timeline e vengono aggiornate in tempo reale."
+ reply: "Puoi rispondere alle Note. Puoi anche rispondere alle risposte e continuare i dialoghi come un conversazioni."
+ renote: "Puoi ri-condividere le Note, facendole rifluire sulla Timeline. Puoi anche aggiungere testo e citare altri profili."
+ reaction: "Puoi aggiungere una reazione. Nella pagina successiva spiegheremo i dettagli."
+ menu: "Puoi svolgere varie attività, come visualizzare i dettagli delle Note o copiare i collegamenti."
+ _reaction:
+ title: "Cosa sono le Reazioni?"
+ description: "Puoi reagire alle Note. Le sensazioni che non si riescono a trasmettere con i \"Mi piace\" si possono esprimere facilmente inviando una reazione."
+ letsTryReacting: "Puoi aggiungere una Reazione cliccando il bottone \"+\" (più) della relativa Nota. Prova ad aggiungerne una a questa Nota di esempio!"
+ reactToContinue: "Aggiungere la Reazione ti consentirà di procedere col tutorial."
+ reactNotification: "Quando qualcuno reagisce alle tue Note, ricevi una notifica in tempo reale."
+ reactDone: "Puoi annullare la tua Reazione premendo il bottone \"ー\" (meno)"
+ _timeline:
+ title: "Come funziona la Timeline"
+ description1: "Misskey fornisce alcune Timeline (sequenze cronologiche di Note). Una di queste potrebbe essere stata disattivata dagli amministratori."
+ home: "Puoi vedere le Note provenienti dai profili che segui (follow)."
+ local: "Puoi vedere tutte le Note pubblicate dai profili di questa istanza."
+ social: "Puoi vedere sia le Note della Timeline Home che quelle della Timeline Locale, insieme!"
+ global: "Puoi vedere le Note da pubblicate da tutte le altre istanze federate con la nostra."
+ description2: "Nella parte superiore dello schermo, puoi scegliere una Timeline o l'altra in qualsiasi momento."
+ description3: "Ci sono anche sequenze temporali di elenchi, sequenze temporali di canali, ecc. Per ulteriori dettagli, consultare il {link}.\nPuoi vedere anche Timeline delle liste di profili (se ne hai create), canali, ecc... Per i dettagli, visita {link}."
+ _postNote:
+ title: "La Nota e le sue impostazioni"
+ description1: "Quando scrivi una Nota su Misskey, hai a disposizione varie opzioni. Il modulo di invio è simile a questo."
+ _visibility:
+ description: "Puoi limitare chi può vedere la tua Nota."
+ public: "Visibile a tutti."
+ home: "Pubblicato solo sulla Timeline Home (personale). Visibile anche da profili remoti follower, visitatori del tuo profilo e tramite i Rinota dei follower."
+ followers: "Visibile solo ai profili tuoi follower (locali o remoti). Nessun altro oltre a te può \"Rinotare\"."
+ direct: "Visibile solo ai profili specificati, i quali riceveranno una notifica. Puoi usarlo come se fossero messaggi diretti."
+ doNotSendConfidencialOnDirect1: "Attenzione, quando si inviano informazioni confidenziali."
+ doNotSendConfidencialOnDirect2: "Poiché le Note non sono crittografate, l'amministratore del server di destinazione potrebbe leggere cosa è stato scritto, quindi se spedisci una Nota diretta a un profilo che risiede su un server non attendibile, evita di scrivere informazioni riservate."
+ localOnly: "Indipendentemente dalla visualizzazione sopra indicata, i profili su altri server non saranno in grado di visualizzare la Nota, se questa impostazione è attivata. Non non verrà comunicata ad altri server."
+ _cw:
+ title: "Nascondere il contenuto esplicito"
+ description: "Verrà visualizzato il testo scritto nel campo \"Annotazione preventiva\" al posto del testo principale della Nota. Premere il bottone \"Continua la lettura\" se si intende davvero leggere il testo."
+ _exampleNote:
+ cw: "Attenzione: contiene zuccheri"
+ note: "Ho appena mangiato una ciambella ricoperta di cioccolato 🍩😋"
+ useCases: "Utilizzalo per chiarire il contenuto della Nota, prima che sia letta. Come richiesto dal regolamento del server o per autoregolamentare spoiler e testi troppo espliciti."
+ _howToMakeAttachmentsSensitive:
+ title: "Come indicare che gli allegati sono espliciti?"
+ description: "Contrassegnare gli allegati come espliciti, va fatto quando è richiesto dal regolamento del server o quando gli allegati non devono essere immediatamente visibili."
+ tryThisFile: "Prova a rendere esplicite le immagini allegate a questo modulo!"
+ _exampleNote:
+ note: "Ho fatto un errore aprendo il coperchio del natto... (fagioli di soia fermentati, particolarmente appiccicosi)"
+ method: "Per indicare che un allegato è esplicito, tocca il file per aprirne il menu e scegliere la voce \"Segna come esplicito\"."
+ sensitiveSucceeded: "Quando alleghi file, assicurati di indicare se è materiale esplicito, in modo appropriato, in base al regolamento del tuo server."
+ doItToContinue: "Impostando l'immagine come esplicita, potrai procedere col tutorial."
+ _done:
+ title: "Il tutorial è finito! 🎉"
+ description: "Queste sono solamente alcune delle funzionalità principali di Misskey. Per ulteriori informazioni, {link}."
+_timelineDescription:
+ home: "Nella Timeline Home, la tua cronologia principale, puoi vedere le Note provenienti dai profili che segui (follow)."
+ local: "La Timeline Locale, è una cronologia di Note pubblicate da tutti i profili iscritti su questo server."
+ social: "La Timeline Sociale, unisce in ordine cronologico l'elenco di Note presenti nella Timeline Home e quella Locale."
+ global: "La Timeline Federata ti consente di vedere le Note pubblicate dai profili di tutti gli altri server federati a questo."
_serverRules:
description: "In Europa è necessario mostrare l'informativa sul trattamento dei dati personali, prima della registrazione al servizio."
_serverSettings:
@@ -1164,6 +1286,9 @@ _serverSettings:
manifestJsonOverride: "Sostituire il file manifest.json"
shortName: "Abbreviazione"
shortNameDescription: "Un'abbreviazione o un nome comune che può essere visualizzato al posto del nome ufficiale lungo del server."
+ fanoutTimelineDescription: "Attivando questa funzionalità migliori notevolmente la capacità delle Timeline di collezionare Note, riducendo il carico sul database. Tuttavia, aumenterà l'impiego di memoria RAM per Redis. Disattiva se il tuo server ha poca RAM o la funzionalità è irregolare."
+ fanoutTimelineDbFallback: "Elaborazione dati alternativa"
+ fanoutTimelineDbFallbackDescription: "Attivando l'elaborazione alternativa, verrà interrogato ulteriormente il database se la timeline non è nella cache. \nDisattivando, si può ridurre ulteriormente il carico del server, evitando l'elaborazione alternativa, ma limitando l'intervallo recuperabile delle timeline."
_accountMigration:
moveFrom: "Migra un altro profilo dentro a questo"
moveFromSub: "Crea un alias verso un altro profilo remoto"
@@ -1421,6 +1546,9 @@ _achievements:
_smashTestNotificationButton:
title: "Prove eccessive"
description: "Hai provato le notifiche consecutivamente in un periodo di tempo molto breve"
+ _tutorialCompleted:
+ title: "Attestato di partecipazione al corso per principianti di Misskey"
+ description: "Ha completato il tutorial"
_role:
new: "Nuovo ruolo"
edit: "Modifica ruolo"
@@ -1431,7 +1559,9 @@ _role:
assignTarget: "Modalità di assegnazione del ruolo"
descriptionOfAssignTarget: "Manuale: per assegnare manualmente questo ruolo ai profili.\nCondizionale: per assegnare o rimuovere automaticamente questo ruolo ai profili, a precise condizioni."
manual: "Manuale"
+ manualRoles: "Ruoli assegnati manualmente"
conditional: "Condizionale"
+ conditionalRoles: "Ruoli condizionati"
condition: "Condizioni"
isConditionalRole: "Questo è un ruolo condizionato"
isPublic: "Ruolo pubblico"
@@ -1464,6 +1594,7 @@ _role:
inviteLimitCycle: "Intervallo di emissione del codice di invito"
inviteExpirationTime: "Scadenza del codice di invito"
canManageCustomEmojis: "Gestire le emoji personalizzate"
+ canManageAvatarDecorations: "Gestisce le decorazioni di immagini del profilo"
driveCapacity: "Capienza del Drive"
alwaysMarkNsfw: "Impostare sempre come esplicito (NSFW)"
pinMax: "Quantità massima di Note in primo piano"
@@ -1479,6 +1610,7 @@ _role:
canHideAds: "Nascondere i banner"
canSearchNotes: "Ricercare nelle Note"
canUseTranslator: "Tradurre le Note"
+ avatarDecorationLimit: "Numero massimo di decorazioni foto profilo installabili"
_condition:
isLocal: "Profilo locale"
isRemote: "Profilo remoto"
@@ -1527,6 +1659,10 @@ _ad:
reduceFrequencyOfThisAd: "Visualizza questa pubblicità meno spesso"
hide: "Nascondi"
timezoneinfo: "Il giorno della settimana è determinato in base al fuso orario del server."
+ adsSettings: "Impostazioni banner"
+ notesPerOneAd: "Quantità di Note tra i banner"
+ setZeroToDisable: "Imposta 0 (zero) per disattivare la distribuzione dei banner durante gli aggiornamenti in tempo reale"
+ adsTooClose: "Attenzione, l'intervallo di pubblicazione dei banner è molto breve, potrebbe infastidire significativamente la fruizione"
_forgotPassword:
enterEmail: "Inserisci l'indirizzo di posta elettronica che hai registrato nel tuo profilo. Il collegamento necessario per ripristinare la password verrà inviato a questo indirizzo."
ifNoEmail: "Se il tuo indirizzo email non risulta registrato, contatta l'amministrazione dell'istanza."
@@ -1538,7 +1674,7 @@ _gallery:
unlike: "Non mi piace più"
_email:
_follow:
- title: "Ha iniziato a seguirti"
+ title: "Adesso ti segue"
_receiveFollowRequest:
title: "Hai ricevuto una richiesta di follow"
_plugin:
@@ -1550,7 +1686,7 @@ _preferencesBackups:
list: "Elenco di impostazioni salvate in precedenza"
saveNew: "Nuovo salvataggio"
loadFile: "Carica da file"
- apply: "Applicabile a questo dispositivo"
+ apply: "Applica a questo dispositivo"
save: "Sovrascrivi il backup"
inputName: "Inserire il nome del backup."
cannotSave: "Impossibile salvare."
@@ -1579,6 +1715,7 @@ _aboutMisskey:
donate: "Sostieni Misskey"
morePatrons: "Apprezziamo sinceramente il supporto di tante altre persone. Grazie mille! 🥰"
patrons: "Sostenitori"
+ projectMembers: "Partecipanti al progetto"
_displayOfSensitiveMedia:
respect: "Nascondere i media espliciti"
ignore: "Non nascondere i media espliciti"
@@ -1596,13 +1733,14 @@ _channel:
edit: "Gerisci canale"
setBanner: "Scegli intestazione"
removeBanner: "Rimuovi intestazione"
- featured: "Tendenze"
+ featured: "Di tendenza"
owned: "I miei canali"
following: "Seguiti"
usersCount: "{n} partecipanti"
notesCount: "{n} note"
nameAndDescription: "Nome e descrizione"
nameOnly: "Solo il nome"
+ allowRenoteToExternal: "Consenti i Rinota e le citazioni all'esterno del canale"
_menuDisplay:
sideFull: "Laterale"
sideIcon: "Laterale (solo icone)"
@@ -1610,7 +1748,7 @@ _menuDisplay:
hide: "Nascondere"
_wordMute:
muteWords: "Parole da filtrare"
- muteWordsDescription: "Separare con uno spazio indica la condizione \"E\". Separare con una interruzione di riga, indica la condizione \"O\""
+ muteWordsDescription: "Sparando con uno spazio indichi la condizione E (and). Separando con un a capo, indichi la condizione O (or)."
muteWordsDescription2: "Se vuoi indicare delle Espressioni Regolari (regexp), metti la condizione all'interno di due slash (/)"
_instanceMute:
instanceMuteDescription: "Disattiva tutte le note, le note di rinvio (condivisione) dell'istanza configurata, comprese le risposte agli utenti dell'istanza."
@@ -1620,7 +1758,7 @@ _instanceMute:
_theme:
explore: "Esplora temi"
install: "Installa un tema"
- manage: "Gerisci temi"
+ manage: "Gestione temi"
code: "Codice tema"
description: "Descrizione"
installed: "{name} è installato"
@@ -1675,9 +1813,6 @@ _theme:
infoFg: "Testo di informazioni"
infoWarnBg: "Sfondo degli avvisi"
infoWarnFg: "Testo di avviso"
- cwBg: "Sfondo del CW"
- cwFg: "Testo del pulsante CW"
- cwHoverBg: "Sfondo del pulsante CW (sorvolato)"
toastBg: "Sfondo di notifica a comparsa"
toastFg: "Testo di notifica a comparsa"
buttonBg: "Sfondo del pulsante"
@@ -1697,6 +1832,14 @@ _sfx:
notification: "Notifiche"
antenna: "Ricezione dell'antenna"
channel: "Notifiche di canale"
+ reaction: "Quando seleziono una reazione"
+_soundSettings:
+ driveFile: "Suoni del Drive"
+ driveFileWarn: "Seleziona file dal dispositivo"
+ driveFileTypeWarn: "Formato file non supportato"
+ driveFileTypeWarnDescription: "Per favore, scegli un file di tipo audio"
+ driveFileDurationWarn: "La durata dell'audio è troppo lunga"
+ driveFileDurationWarnDescription: "Scegliere un audio lungo potrebbe interferire con l'uso di Misskey. Vuoi continuare lo stesso?"
_ago:
future: "Futuro"
justNow: "Adesso"
@@ -1708,31 +1851,29 @@ _ago:
monthsAgo: "{n} mesi fa"
yearsAgo: "{n} anni fa"
invalid: "Niente da visualizzare"
+_timeIn:
+ seconds: "Dopo {n} secondi"
+ minutes: "Dopo {n} minuti"
+ hours: "Dopo {n} ore"
+ days: "Dopo {n} giorni"
+ weeks: "Dopo {n} settimane"
+ months: "Dopo {n} mesi"
+ years: "Dopo {n} anni"
_time:
second: "s"
minute: "min"
hour: "ore"
day: "giorni"
-_timelineTutorial:
- title: "Come usare Misskey"
- step1_1: "Questa è la \"Timeline\". tutte le \"Note\" pubblicate su {name} vengono elencate in ordine cronologico."
- step1_2: "Le Timeline sono diverse, ad esempio, la \"Home\" elenca le Note dei profili che segui. Quella \"Locale\" elenca quelle di tutti i profili attivi su {name}."
- step2_1: "Prova a pubblicare una Nota. Semplicemente premendo il bottone con l'icona di una matita."
- step2_2: "Potresti scrivere la tua presentazione, oppure semplicemente \"Ciao da {name}!\""
- step3_1: "Hai pubblicato qualcosa?"
- step3_2: "In tal caso, dovrebbe comparire subito nella tua \"Home\""
- step4_1: "Puoi reagire con un emoji alle Note."
- step4_2: "To attach a reaction, press the \"+\" mark on a note and choose an emoji you'd like to react with.\nPer reagire con una emoji, premi il bottone \"+\" (più) visibile vicino ad ogni Nota e scegli dall'elenco la emoji che rappresenta la tua reazione."
_2fa:
alreadyRegistered: "La configurazione è stata già completata."
- registerTOTP: "Registra un'app di autenticazione"
- step1: "Innanzitutto, installare sul dispositivo un'applicazione di autenticazione come {a} o {b}."
- step2: "Quindi, scansionare il codice QR visualizzato con l'app."
+ registerTOTP: "Registra una App di autenticazione a due fattori (2FA/MFA)"
+ step1: "Innanzitutto, installa sul dispositivo un'App di autenticazione come {a} o {b}."
+ step2: "Quindi, tramite la App installata, scansiona questo codice QR."
step2Click: "Cliccando sul codice QR, puoi registrarlo con l'app di autenticazione o il portachiavi installato sul tuo dispositivo."
step2Uri: "Inserisci il seguente URL se desideri utilizzare una App per PC"
step3Title: "Inserisci il codice di verifica"
step3: "Inserite il token visualizzato nell'app e il gioco è fatto."
- setupCompleted: "Impostazione completata"
+ setupCompleted: "Impostazione completata! 🎉"
step4: "D'ora in poi, quando si accede, si inserisce il token nello stesso modo."
securityKeyNotSupported: "Il tuo browser non supporta le chiavi di sicurezza."
registerTOTPBeforeKey: "Ti occorre un'app di autenticazione con OTP, prima di registrare la chiave di sicurezza."
@@ -1762,7 +1903,7 @@ _permissions:
"read:favorites": "Visualizza i tuoi preferiti"
"write:favorites": "Gestisci i tuoi preferiti"
"read:following": "Vedi le informazioni di follow"
- "write:following": "Seguire / Non seguire altri profili"
+ "write:following": "Following di altri profili"
"read:messaging": "Visualizzare la chat"
"write:messaging": "Gestire la chat"
"read:mutes": "Vedi i profili silenziati"
@@ -1777,8 +1918,8 @@ _permissions:
"write:pages": "Gestire pagine"
"read:page-likes": "Visualizzare i \"Mi piace\" di pagine"
"write:page-likes": "Gestire i \"Mi piace\" di pagine"
- "read:user-groups": "Vedi gruppi di utenti"
- "write:user-groups": "Gestisci gruppi di utenti"
+ "read:user-groups": "Vedere i gruppi di utenti"
+ "write:user-groups": "Gestire i gruppi di utenti"
"read:channels": "Visualizza canali"
"write:channels": "Gerisci canali"
"read:gallery": "Visualizza la galleria."
@@ -1820,20 +1961,20 @@ _widgets:
notifications: "Notifiche"
timeline: "Timeline"
calendar: "Calendario"
- trends: "Tendenze"
+ trends: "Di tendenza"
clock: "Orologio"
- rss: "Aggregatore rss"
- rssTicker: "Ticker RSS"
+ rss: "Lettura RSS"
+ rssTicker: "Nastro RSS"
activity: "Attività"
photos: "Foto"
digitalClock: "Orologio digitale"
unixClock: "Orologio UNIX"
federation: "Federazione"
- instanceCloud: "Istanza Cloud"
+ instanceCloud: "Nuvola di federazione"
postForm: "Finestra di pubblicazione"
slideshow: "Diapositive"
button: "Pulsante"
- onlineUsers: "Utenti online"
+ onlineUsers: "Persone online"
jobQueue: "Coda di lavoro"
serverMetric: "Statistiche server"
aiscript: "Console AiScript"
@@ -1843,9 +1984,10 @@ _widgets:
_userList:
chooseList: "Seleziona una lista"
clicker: "Cliccaggio"
+ birthdayFollowings: "Chi nacque oggi"
_cw:
hide: "Nascondere"
- show: "Apri..."
+ show: "Continua la lettura..."
chars: "{count} caratteri"
files: "{count} file"
_poll:
@@ -1872,14 +2014,14 @@ _poll:
remainingSeconds: "Rimangono {s} secondi"
_visibility:
public: "Pubblica"
- publicDescription: "Visibile per tutti sul Fediverso"
+ publicDescription: "Visibilità pubblica"
home: "Home"
- homeDescription: "Visibile solo sulla timeline locale"
+ homeDescription: "Visibile solo nella Home"
followers: "Follower"
followersDescription: "Visibile solo ai tuoi follower"
specified: "Nota diretta"
specifiedDescription: "Visibile solo ai profili menzionati"
- disableFederation: "Non federare"
+ disableFederation: "Senza federazione"
disableFederationDescription: "Non spedire attività alle altre istanze remote"
_postForm:
replyPlaceholder: "Rispondi a questa nota..."
@@ -1905,6 +2047,7 @@ _profile:
changeAvatar: "Modifica immagine profilo"
changeBanner: "Cambia intestazione"
verifiedLinkDescription: "Puoi verificare il tuo profilo mostrando una icona. Devi inserire la URL alla pagina che contiene un link al tuo profilo."
+ avatarDecorationMax: "Puoi aggiungere fino a {max} decorazioni."
_exportOrImport:
allNotes: "Tutte le note"
favoritedNotes: "Note preferite"
@@ -1914,6 +2057,7 @@ _exportOrImport:
userLists: "Liste"
excludeMutingUsers: "Escludere gli utenti silenziati"
excludeInactiveUsers: "Escludere i profili inutilizzati"
+ withReplies: "Includere le risposte da profili importati nella Timeline"
_charts:
federation: "Federazione"
apRequest: "Richieste"
@@ -1930,7 +2074,7 @@ _charts:
storageUsageTotal: "Utilizzo totale dell'immagazzinamento"
_instanceCharts:
requests: "Richieste"
- users: "Variazione del numero di utenti"
+ users: "Variazione del numero di profili"
usersTotal: "Totale cumulativo di utenti"
notes: "Variazione del numero di note"
notesTotal: "Totale cumulato di note"
@@ -1991,8 +2135,8 @@ _pages:
font: "Tipo di carattere"
fontSerif: "Serif"
fontSansSerif: "Sans serif"
- eyeCatchingImageSet: "Imposta un'immagine attrattiva"
- eyeCatchingImageRemove: "Elimina l'anteprima immagine"
+ eyeCatchingImageSet: "Imposta un'immagine attraente"
+ eyeCatchingImageRemove: "Elimina immagine attraente"
chooseBlock: "Aggiungi blocco"
selectType: "Seleziona tipo"
contentBlocks: "Contenuto"
@@ -2019,7 +2163,7 @@ _notification:
youGotReply: "{name} ti ha risposto"
youGotQuote: "{name} ha citato la tua Nota e ha detto"
youRenoted: "{name} ha rinotato"
- youWereFollowed: "Ha iniziato a seguirti"
+ youWereFollowed: "Adesso ti segue"
youReceivedFollowRequest: "Hai ricevuto una richiesta di follow"
yourFollowRequestAccepted: "La tua richiesta di follow è stata accettata"
pollEnded: "Risultati del sondaggio."
@@ -2031,6 +2175,9 @@ _notification:
checkNotificationBehavior: "Prova il comportamento della notifica"
sendTestNotification: "Spedisci una notifica di prova"
notificationWillBeDisplayedLikeThis: "La notifica apparirà così"
+ reactedBySomeUsers: "{n} reazioni"
+ renotedBySomeUsers: "{n} Rinota"
+ followedBySomeUsers: "{n} nuovi follower"
_types:
all: "Tutto"
note: "Nuove Note"
@@ -2078,7 +2225,7 @@ _deck:
list: "Liste"
channel: "Canale"
mentions: "Menzioni"
- direct: "Diretta"
+ direct: "Note Dirette"
roleTimeline: "Timeline Ruolo"
_dialog:
charactersExceeded: "Hai superato il limite di {max} caratteri! ({corrente})"
@@ -2134,3 +2281,70 @@ _moderationLogTypes:
createAd: "Banner creato"
deleteAd: "Banner eliminato"
updateAd: "Banner aggiornato"
+ createAvatarDecoration: "Creazione decorazione della foto profilo"
+ updateAvatarDecoration: "Aggiornamento decorazione foto profilo"
+ deleteAvatarDecoration: "Eliminazione decorazione della foto profilo"
+ unsetUserAvatar: "Rimossa foto profilo"
+ unsetUserBanner: "Rimossa intestazione profilo"
+_fileViewer:
+ title: "Dettagli del file"
+ type: "Tipo di file"
+ size: "Dimensioni file"
+ url: "URL"
+ uploadedAt: "Caricato il"
+ attachedNotes: "Note a cui è allegato"
+ thisPageCanBeSeenFromTheAuthor: "Questa pagina può essere vista solo da chi ha caricato il file."
+_externalResourceInstaller:
+ title: "Installa da sito esterno"
+ checkVendorBeforeInstall: "Prima di installare, assicurati che la fonte sia affidabile."
+ _plugin:
+ title: "Vuoi davvero installare questo componente aggiuntivo?"
+ metaTitle: "Informazioni sul componente aggiuntivo"
+ _theme:
+ title: "Vuoi davvero installare questa variazione grafica?"
+ metaTitle: "Informazioni sulla variazione grafica"
+ _meta:
+ base: "Combinazione base di colori"
+ _vendorInfo:
+ title: "Informazioni sulla fonte"
+ endpoint: "Punto di riferimento della fonte"
+ hashVerify: "Codice di verifica della fonte"
+ _errors:
+ _invalidParams:
+ title: "Parametri non validi"
+ description: "Mancano alcuni parametri per il caricamento, per favore, verifica la URL."
+ _resourceTypeNotSupported:
+ title: "Questa risorsa esterna non è supportata"
+ description: "Il tipo di risorsa ottenuta da questo sito esterno non è supportato. Si prega di contattare la fonte di distribuizone."
+ _failedToFetch:
+ title: "Impossibile ottenere i dati"
+ fetchErrorDescription: "Si è verificato un errore di comunicazione con la fonte. Se riprovare di nuovo non aiuta, contattare la fonte di distribuzione."
+ parseErrorDescription: "Si è verificato un errore elaborando i dati ottenuti dalla fonte. Per favore contattare il distributore."
+ _hashUnmatched:
+ title: "Dati non verificabili, diversi da quelli della fonte"
+ description: "Si è verificato un errore durante la verifica di integrità dei dati ottenuti. Per sicurezza, l'installazione è stata interrotta. Contattare la fonte di distribuzione."
+ _pluginParseFailed:
+ title: "Errore AiScript"
+ description: "Sebbene i dati ottenuti siano validi, non è stato possibile interpretarli, perché si è verificato un errore durante l'analisi di AiScript. Si prega di contattare gli autori del componente aggiuntivo. Potresti controllare la console di Javascript per ottenere dettagli aggiuntivi."
+ _pluginInstallFailed:
+ title: "Impossibile installare il componente aggiuntivo"
+ description: "Si è verificato un impedimento durante l'installazione del componente aggiuntivo. Per favore riprova e consulta la console di Javascript per ottenere dettagli aggiuntivi."
+ _themeParseFailed:
+ title: "Impossibile interpretare la variazione grafica"
+ description: "Sebbene i dati siano stati ottenuti, non è stato possibile interpretarli, si è verificato un errore durante l'analisi della variazione grafica. Si prega di contattare gli autori. Potresti anche controllare la console di Javascript per ottenere dettagli aggiuntivi."
+ _themeInstallFailed:
+ title: "Impossibile installare la variazione grafica"
+ description: "Si è verificato un impedimento durante l'installazione della variazione grafica. Per favore riprova e consulta la console di Javascript per ottenere dettagli aggiuntivi."
+_dataSaver:
+ _media:
+ title: "Caricamento dei media"
+ description: "Impedire il caricamento automatico di immagini e video. Devi toccare le immagini o i video nascosti per caricarli."
+ _avatar:
+ title: "Immagine del profilo"
+ description: "Impedire l'animazione per l'immagine del profilo. Le immagini animate possono avere dimensioni file maggiori rispetto a quelle normali, puoi ridurre ulteriormente l'utilizzo dei dati."
+ _urlPreview:
+ title: "Anteprime delle URL"
+ description: "Impedire il caricamento delle anteprime URL."
+ _code:
+ title: "Codice evidenziato"
+ description: "Impedire che il codice sorgente sia automaticamente evidenziato. Evidenziare il codice richiede il caricamento di un file per ogni linguaggio. Puoi evidenziare soltanto il codice che intendi leggere e ridurre il traffico inutilizzato."
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index d2ec7e8fcc..3a956781c9 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -121,7 +121,12 @@ sensitive: "センシティブ"
add: "追加"
reaction: "リアクション"
reactions: "リアクション"
-reactionSetting: "ピッカーに表示するリアクション"
+emojiPicker: "絵文字ピッカー"
+pinnedEmojisForReactionSettingDescription: "リアクション時にピン留め表示する絵文字を設定できます"
+pinnedEmojisSettingDescription: "絵文字入力時にピン留め表示する絵文字を設定できます"
+emojiPickerDisplay: "ピッカーの表示"
+overwriteFromPinnedEmojisForReaction: "リアクション設定から上書きする"
+overwriteFromPinnedEmojis: "全般設定から上書きする"
reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、＋を押して追加します。"
rememberNoteVisibility: "公開範囲を記憶する"
attachCancel: "添付取り消し"
@@ -195,6 +200,7 @@ perHour: "1時間ごと"
perDay: "1日ごと"
stopActivityDelivery: "アクティビティの配送を停止"
blockThisInstance: "このサーバーをブロック"
+silenceThisInstance: "サーバーをサイレンス"
operations: "操作"
software: "ソフトウェア"
version: "バージョン"
@@ -213,7 +219,9 @@ clearQueueConfirmText: "未配達の投稿は配送されなくなります。
clearCachedFiles: "キャッシュをクリア"
clearCachedFilesConfirm: "キャッシュされたリモートファイルをすべて削除しますか？"
blockedInstances: "ブロックしたサーバー"
-blockedInstancesDescription: "ブロックしたいサーバーのホストを改行で区切って設定します。ブロックされたサーバーは、このサーバーとやり取りできなくなります。サブドメインもブロックされます。"
+blockedInstancesDescription: "ブロックしたいサーバーのホストを改行で区切って設定します。ブロックされたサーバーは、このインスタンスとやり取りできなくなります。"
+silencedInstances: "サイレンスしたサーバー"
+silencedInstancesDescription: "サイレンスしたいサーバーのホストを改行で区切って設定します。サイレンスされたサーバーに所属するアカウントはすべて「サイレンス」として扱われ、フォローがすべてリクエストになり、フォロワーでないローカルアカウントにはメンションできなくなります。ブロックしたインスタンスには影響しません。"
muteAndBlock: "ミュートとブロック"
mutedUsers: "ミュートしたユーザー"
blockedUsers: "ブロックしたユーザー"
@@ -258,6 +266,7 @@ removed: "削除しました"
removeAreYouSure: "「{x}」を削除しますか？"
deleteAreYouSure: "「{x}」を削除しますか？"
resetAreYouSure: "リセットしますか？"
+areYouSure: "よろしいですか？"
saved: "保存しました"
messaging: "チャット"
upload: "アップロード"
@@ -308,6 +317,7 @@ folderName: "フォルダー名"
createFolder: "フォルダーを作成"
renameFolder: "フォルダー名を変更"
deleteFolder: "フォルダーを削除"
+folder: "フォルダー"
addFile: "ファイルを追加"
emptyDrive: "ドライブは空です"
emptyFolder: "フォルダーは空です"
@@ -434,7 +444,6 @@ share: "共有"
notFound: "見つかりません"
notFoundDescription: "指定されたURLに該当するページはありませんでした。"
uploadFolder: "既定アップロード先"
-cacheClear: "キャッシュを削除"
markAsReadAllNotifications: "すべての通知を既読にする"
markAsReadAllUnreadNotes: "すべての投稿を既読にする"
markAsReadAllTalkMessages: "すべてのチャットを既読にする"
@@ -531,6 +540,7 @@ serverLogs: "サーバーログ"
deleteAll: "全て削除"
showFixedPostForm: "タイムライン上部に投稿フォームを表示する"
showFixedPostFormInChannel: "タイムライン上部に投稿フォームを表示する(チャンネル)"
+withRepliesByDefaultForNewlyFollowed: "フォローする際、デフォルトで返信をTLに含むようにする"
newNoteRecived: "新しいノートがあります"
sounds: "サウンド"
sound: "サウンド"
@@ -540,6 +550,8 @@ showInPage: "ページで表示"
popout: "ポップアウト"
volume: "音量"
masterVolume: "マスター音量"
+notUseSound: "サウンドを出力しない"
+useSoundOnlyWhenActive: "Misskeyがアクティブな時のみサウンドを出力する"
details: "詳細"
chooseEmoji: "絵文字を選択"
unableToProcess: "操作を完了できません"
@@ -560,6 +572,10 @@ output: "出力"
script: "スクリプト"
disablePagesScript: "Pagesのスクリプトを無効にする"
updateRemoteUser: "リモートユーザー情報の更新"
+unsetUserAvatar: "アイコンを解除"
+unsetUserAvatarConfirm: "アイコンを解除しますか？"
+unsetUserBanner: "バナーを解除"
+unsetUserBannerConfirm: "バナーを解除しますか？"
deleteAllFiles: "すべてのファイルを削除"
deleteAllFilesConfirm: "すべてのファイルを削除しますか？"
removeAllFollowing: "フォローを全解除"
@@ -589,7 +605,7 @@ poll: "アンケート"
useCw: "内容を隠す"
enablePlayer: "プレイヤーを開く"
disablePlayer: "プレイヤーを閉じる"
-expandTweet: "ツイートを展開する"
+expandTweet: "ポストを展開する"
themeEditor: "テーマエディター"
description: "説明"
describeFile: "キャプションを付ける"
@@ -631,6 +647,7 @@ smtpSecure: "SMTP 接続に暗黙的なSSL/TLSを使用する"
smtpSecureInfo: "STARTTLS使用時はオフにします。"
testEmail: "配信テスト"
wordMute: "ワードミュート"
+hardWordMute: "ハードワードミュート"
regexpError: "正規表現エラー"
regexpErrorDescription: "{tab}ワードミュートの{line}行目の正規表現にエラーが発生しました:"
instanceMute: "サーバーミュート"
@@ -794,7 +811,7 @@ active: "アクティブ"
offline: "オフライン"
notRecommended: "非推奨"
botProtection: "Botプロテクション"
-instanceBlocking: "サーバーブロック"
+instanceBlocking: "サーバーブロック・サイレンス"
selectAccount: "アカウントを選択"
switchAccount: "アカウントを切り替え"
enabled: "有効"
@@ -864,8 +881,8 @@ makeReactionsPublicDescription: "あなたがしたリアクション一覧を
classic: "クラシック"
muteThread: "スレッドをミュート"
unmuteThread: "スレッドのミュートを解除"
-ffVisibility: "つながりの公開範囲"
-ffVisibilityDescription: "自分のフォロー/フォロワー情報の公開範囲を設定できます。"
+followingVisibility: "フォローの公開範囲"
+followersVisibility: "フォロワーの公開範囲"
continueThread: "さらにスレッドを見る"
deleteAccountConfirm: "アカウントが削除されます。よろしいですか？"
incorrectPassword: "パスワードが間違っています。"
@@ -975,6 +992,7 @@ assign: "アサイン"
unassign: "アサインを解除"
color: "色"
manageCustomEmojis: "カスタム絵文字の管理"
+manageAvatarDecorations: "アバターデコレーションの管理"
youCannotCreateAnymore: "これ以上作成することはできません。"
cannotPerformTemporary: "一時的に利用できません"
cannotPerformTemporaryDescription: "操作回数が制限を超過するため一時的に利用できません。しばらく時間を置いてから再度お試しください。"
@@ -1015,6 +1033,8 @@ resetPasswordConfirm: "パスワードリセットしますか？"
sensitiveWords: "センシティブワード"
sensitiveWordsDescription: "設定したワードが含まれるノートの公開範囲をホームにします。改行で区切って複数設定できます。"
sensitiveWordsDescription2: "スペースで区切るとAND指定になり、キーワードをスラッシュで囲むと正規表現になります。"
+hiddenTags: "非表示ハッシュタグ"
+hiddenTagsDescription: "設定したタグをトレンドに表示させないようにします。改行で区切って複数設定できます。"
notesSearchNotAvailable: "ノート検索は利用できません。"
license: "ライセンス"
unfavoriteConfirm: "お気に入り解除しますか？"
@@ -1027,6 +1047,7 @@ enableChartsForRemoteUser: "リモートユーザーのチャートを生成"
enableChartsForFederatedInstances: "リモートサーバーのチャートを生成"
showClipButtonInNoteFooter: "ノートのアクションにクリップを追加"
reactionsDisplaySize: "リアクションの表示サイズ"
+limitWidthOfReaction: "リアクションの最大横幅を制限し、縮小して表示する"
noteIdOrUrl: "ノートIDまたはURL"
video: "動画"
videos: "動画"
@@ -1129,6 +1150,10 @@ mutualFollow: "相互フォロー"
fileAttachedOnly: "ファイル付きのみ"
showRepliesToOthersInTimeline: "TLに他の人への返信を含める"
hideRepliesToOthersInTimeline: "TLに他の人への返信を含めない"
+showRepliesToOthersInTimelineAll: "TLに現在フォロー中の人全員の返信を含めるようにする"
+hideRepliesToOthersInTimelineAll: "TLに現在フォロー中の人全員の返信を含めないようにする"
+confirmShowRepliesAll: "この操作は元に戻せません。本当にTLに現在フォロー中の人全員の返信を含めるようにしますか？"
+confirmHideRepliesAll: "この操作は元に戻せません。本当にTLに現在フォロー中の人全員の返信を含めないようにしますか？"
externalServices: "外部サービス"
impressum: "運営者情報"
impressumUrl: "運営者情報URL"
@@ -1136,6 +1161,27 @@ impressumDescription: "ドイツなどの一部の国と地域では表示が義
privacyPolicy: "プライバシーポリシー"
privacyPolicyUrl: "プライバシーポリシーURL"
tosAndPrivacyPolicy: "利用規約・プライバシーポリシー"
+avatarDecorations: "アイコンデコレーション"
+attach: "付ける"
+detach: "外す"
+detachAll: "全て外す"
+angle: "角度"
+flip: "反転"
+showAvatarDecorations: "アイコンのデコレーションを表示"
+releaseToRefresh: "離してリロード"
+refreshing: "リロード中"
+pullDownToRefresh: "引っ張ってリロード"
+disableStreamingTimeline: "タイムラインのリアルタイム更新を無効にする"
+useGroupedNotifications: "通知をグルーピングして表示する"
+signupPendingError: "メールアドレスの確認中に問題が発生しました。リンクの有効期限が切れている可能性があります。"
+cwNotationRequired: "「内容を隠す」がオンの場合は注釈の記述が必要です。"
+doReaction: "リアクションする"
+code: "コード"
+reloadRequiredToApplySettings: "設定の反映にはリロードが必要です。"
+remainingN: "残り: {n}"
+overwriteContentConfirm: "現在の内容に上書きされますがよろしいですか？"
+seasonalScreenEffect: "季節に応じた画面の演出"
+decorate: "デコる"
_announcement:
forExistingUsers: "既存ユーザーのみ"
@@ -1146,10 +1192,14 @@ _announcement:
tooManyActiveAnnouncementDescription: "アクティブなお知らせが多いため、UXが低下する可能性があります。終了したお知らせはアーカイブすることを検討してください。"
readConfirmTitle: "既読にしますか？"
readConfirmText: "「{title}」の内容を読み、既読にします。"
+ shouldNotBeUsedToPresentPermanentInfo: "特に新規ユーザーのUXを損ねる可能性が高いため、ストック情報ではなくフロー情報の掲示にお知らせを使用することを推奨します。"
+ dialogAnnouncementUxWarn: "ダイアログ形式のお知らせが同時に2つ以上ある場合、UXに悪影響を及ぼす可能性が非常に高いため、使用は慎重に行うことを推奨します。"
+ silence: "非通知"
+ silenceDescription: "オンにすると、このお知らせは通知されず、既読にする必要もなくなります。"
_initialAccountSetting:
accountCreated: "アカウントの作成が完了しました！"
- letsStartAccountSetup: "アカウントの初期設定を行いましょう。"
+ letsStartAccountSetup: "さっそくアカウントの初期設定を行いましょう。"
letsFillYourProfile: "まずはあなたのプロフィールを設定しましょう。"
profileSetting: "プロフィール設定"
privacySetting: "プライバシー設定"
@@ -1159,10 +1209,80 @@ _initialAccountSetting:
pushNotificationDescription: "プッシュ通知を有効にすると{name}の通知をお使いのデバイスで受け取ることができます。"
initialAccountSettingCompleted: "初期設定が完了しました！"
haveFun: "{name}をお楽しみください！"
- ifYouNeedLearnMore: "{name}(Misskey)の使い方などを詳しく知るには{link}をご覧ください。"
+ youCanContinueTutorial: "このまま{name}(Misskey)の使い方についてのチュートリアルに進むこともできますが、ここで中断してすぐに使い始めることもできます。"
+ startTutorial: "チュートリアルを開始"
skipAreYouSure: "初期設定をスキップしますか？"
laterAreYouSure: "初期設定をあとでやり直しますか？"
+_initialTutorial:
+ launchTutorial: "チュートリアルを見る"
+ title: "チュートリアル"
+ wellDone: "よくできました"
+ skipAreYouSure: "チュートリアルを終了しますか？"
+ _landing:
+ title: "チュートリアルへようこそ"
+ description: "ここでは、Misskeyの基本的な使い方や機能を確認できます。"
+ _note:
+ title: "ノートって何？"
+ description: "Misskeyでの投稿は「ノート」と呼びます。ノートはタイムラインに時系列で並んでいて、リアルタイムで更新されていきます。"
+ reply: "返信することができます。返信に対しての返信も可能で、スレッドのように会話を続けることもできます。"
+ renote: "そのノートを自分のタイムラインに流して共有することができます。テキストを追加して引用することも可能です。"
+ reaction: "リアクションをつけることができます。詳しくは次のページで解説します。"
+ menu: "ノートの詳細を表示したり、リンクをコピーしたりなどの様々な操作が行えます。"
+ _reaction:
+ title: "リアクションって何？"
+ description: "ノートには「リアクション」をつけることができます。「いいね」では伝わらないニュアンスも、リアクションで簡単・気軽に表現できます。"
+ letsTryReacting: "リアクションは、ノートの「＋」ボタンをクリックするとつけられます。試しにこのサンプルのノートにリアクションをつけてみてください！"
+ reactToContinue: "リアクションをつけると先に進めるようになります。"
+ reactNotification: "あなたのノートが誰かにリアクションされると、リアルタイムで通知を受け取ります。"
+ reactDone: "「ー」ボタンを押すとリアクションを取り消すことができます。"
+ _timeline:
+ title: "タイムラインのしくみ"
+ description1: "Misskeyには、使い方に応じて複数のタイムラインが用意されています（サーバーによってはいずれかが無効になっていることがあります）。"
+ home: "あなたがフォローしているアカウントの投稿を見られます。"
+ local: "このサーバーにいるユーザー全員の投稿を見られます。"
+ social: "ホームタイムラインとローカルタイムラインの投稿が両方表示されます。"
+ global: "接続している他のすべてのサーバーからの投稿を見られます。"
+ description2: "それぞれのタイムラインは、画面上部でいつでも切り替えられます。"
+ description3: "その他にも、リストタイムラインやチャンネルタイムラインなどがあります。詳しくは{link}をご覧ください。"
+ _postNote:
+ title: "ノートの投稿設定"
+ description1: "Misskeyにノートを投稿する際には、様々なオプションの設定が可能です。投稿フォームはこのようになっています。"
+ _visibility:
+ description: "ノートを表示できる相手を制限できます。"
+ public: "すべてのユーザーに公開。"
+ home: "ホームタイムラインのみに公開。フォロワー・プロフィールを見に来た人・リノートから、他のユーザーも見ることができます。"
+ followers: "フォロワーにのみ公開。本人以外がリノートすることはできず、またフォロワー以外は閲覧できません。"
+ direct: "指定したユーザーにのみ公開され、また相手に通知が入ります。ダイレクトメッセージのかわりにお使いいただけます。"
+ doNotSendConfidencialOnDirect1: "機密情報は送信する際は注意してください。"
+ doNotSendConfidencialOnDirect2: "送信先のサーバーの管理者は投稿内容を見ることが可能なので、信頼できないサーバーのユーザーにダイレクト投稿を送信する場合は、機密情報の扱いに注意が必要です。"
+ localOnly: "他のサーバーに投稿を連合しません。上記の公開範囲に関わらず、他のサーバーのユーザーは、この設定がついたノートを直接閲覧することができなくなります。"
+ _cw:
+ title: "内容を隠す（CW）"
+ description: "本文のかわりに「注釈」に書いた内容が表示されます。「もっと見る」を押すと本文が表示されます。"
+ _exampleNote:
+ cw: "飯テロ注意"
+ note: "チョコのかかったドーナツを食べました🍩😋"
+ useCases: "サーバーのガイドラインにより必要とされるノートに指定したり、ネタバレ投稿やセンシティブな文章を自主規制したりするときに使います。"
+ _howToMakeAttachmentsSensitive:
+ title: "添付ファイルをセンシティブにするには？"
+ description: "サーバーのガイドラインにより必要とされる際や、そのまま見れる状態にしておくべきではない添付ファイルには、「センシティブ」設定を付けます。"
+ tryThisFile: "試しに、このフォームに添付された画像をセンシティブにしてみてください！"
+ _exampleNote:
+ note: "納豆のフタ開けるのミスったわね…"
+ method: "添付ファイルをセンシティブにする際は、そのファイルをクリックしてメニューを開き、「センシティブとして設定」をクリックします。"
+ sensitiveSucceeded: "ファイルを添付する際は、サーバーのガイドラインに従ってセンシティブを適切に設定してください。"
+ doItToContinue: "画像をセンシティブに設定すると先に進めるようになります。"
+ _done:
+ title: "チュートリアルは終了です🎉"
+ description: "ここで紹介した機能はほんの一部にすぎません。Misskeyの使い方をより詳しく知るには、{link}をご覧ください。"
+
+_timelineDescription:
+ home: "ホームタイムラインでは、あなたがフォローしているアカウントの投稿を見られます。"
+ local: "ローカルタイムラインでは、このサーバーにいるユーザー全員の投稿を見られます。"
+ social: "ソーシャルタイムラインには、ホームタイムラインとローカルタイムラインの投稿が両方表示されます。"
+ global: "グローバルタイムラインでは、接続している他のすべてのサーバーからの投稿を見られます。"
+
_serverRules:
description: "新規登録前に表示する、サーバーの簡潔なルールを設定します。内容は利用規約の要約とすることを推奨します。"
@@ -1175,6 +1295,9 @@ _serverSettings:
manifestJsonOverride: "manifest.jsonのオーバーライド"
shortName: "略称"
shortNameDescription: "サーバーの正式名称が長い場合に、代わりに表示することのできる略称や通称。"
+ fanoutTimelineDescription: "有効にすると、各種タイムラインを取得する際のパフォーマンスが大幅に向上し、データベースへの負荷を軽減することが可能です。ただし、Redisのメモリ使用量は増加します。サーバーのメモリ容量が少ない場合、または動作が不安定な場合は無効にすることができます。"
+ fanoutTimelineDbFallback: "データベースへのフォールバック"
+ fanoutTimelineDbFallbackDescription: "有効にすると、タイムラインがキャッシュされていない場合にDBへ追加で問い合わせを行うフォールバック処理を行います。無効にすると、フォールバック処理を行わないことでさらにサーバーの負荷を軽減することができますが、タイムラインが取得できる範囲に制限が生じます。"
_accountMigration:
moveFrom: "別のアカウントからこのアカウントに移行"
@@ -1434,6 +1557,9 @@ _achievements:
_smashTestNotificationButton:
title: "テスト過剰"
description: "通知のテストをごく短時間のうちに連続して行った"
+ _tutorialCompleted:
+ title: "Misskey初心者講座 修了証"
+ description: "チュートリアルを完了した"
_role:
new: "ロールの作成"
@@ -1445,7 +1571,9 @@ _role:
assignTarget: "アサイン"
descriptionOfAssignTarget: "マニュアルは誰がこのロールに含まれるかを手動で管理します。\nコンディショナルは条件を設定し、それに合致するユーザーが自動で含まれるようになります。"
manual: "マニュアル"
+ manualRoles: "マニュアルロール"
conditional: "コンディショナル"
+ conditionalRoles: "コンディショナルロール"
condition: "条件"
isConditionalRole: "これはコンディショナルロールです。"
isPublic: "公開ロール"
@@ -1478,6 +1606,7 @@ _role:
inviteLimitCycle: "招待コードの発行間隔"
inviteExpirationTime: "招待コードの有効期限"
canManageCustomEmojis: "カスタム絵文字の管理"
+ canManageAvatarDecorations: "アバターデコレーションの管理"
driveCapacity: "ドライブ容量"
alwaysMarkNsfw: "ファイルにNSFWを常に付与"
pinMax: "ノートのピン留めの最大数"
@@ -1493,6 +1622,7 @@ _role:
canHideAds: "広告の非表示"
canSearchNotes: "ノート検索の利用"
canUseTranslator: "翻訳機能の利用"
+ avatarDecorationLimit: "アイコンデコレーションの最大取付個数"
_condition:
isLocal: "ローカルユーザー"
isRemote: "リモートユーザー"
@@ -1523,6 +1653,7 @@ _emailUnavailable:
disposable: "恒久的に使用可能なアドレスではありません"
mx: "正しいメールサーバーではありません"
smtp: "メールサーバーが応答しません"
+ banned: "このメールアドレスでは登録できません"
_ffVisibility:
public: "公開"
@@ -1532,7 +1663,7 @@ _ffVisibility:
_signup:
almostThere: "ほとんど完了です"
emailAddressInfo: "あなたが使っているメールアドレスを入力してください。メールアドレスが公開されることはありません。"
- emailSent: "入力されたメールアドレス({email})宛に確認のメールが送信されました。メールに記載されたリンクにアクセスすると、アカウントの作成が完了します。"
+ emailSent: "入力されたメールアドレス({email})宛に確認のメールが送信されました。メールに記載されたリンクにアクセスすると、アカウントの作成が完了します。メールに記載されているリンクの有効期限は30分です。"
_accountDelete:
accountDelete: "アカウントの削除"
@@ -1547,6 +1678,10 @@ _ad:
reduceFrequencyOfThisAd: "この広告の表示頻度を下げる"
hide: "表示しない"
timezoneinfo: "曜日はサーバーのタイムゾーンを元に指定されます。"
+ adsSettings: "広告配信設定"
+ notesPerOneAd: "リアルタイム更新中に広告を配信する間隔（ノートの個数）"
+ setZeroToDisable: "0でリアルタイム更新時の広告配信を無効"
+ adsTooClose: "広告の配信間隔が極めて短いため、ユーザー体験が著しく損われる可能性があります。"
_forgotPassword:
enterEmail: "アカウントに登録したメールアドレスを入力してください。そのアドレス宛てに、パスワードリセット用のリンクが送信されます。"
@@ -1599,13 +1734,14 @@ _registry:
_aboutMisskey:
about: "Misskeyはsyuiloによって2014年から開発されている、オープンソースのソフトウェアです。"
- contributors: "主なコントリビューター"
+ contributors: "コントリビューター"
allContributors: "全てのコントリビューター"
source: "ソースコード"
translation: "Misskeyを翻訳"
donate: "Misskeyに寄付"
morePatrons: "他にも多くの方が支援してくれています。ありがとうございます🥰"
patrons: "支援者"
+ projectMembers: "プロジェクトメンバー"
_displayOfSensitiveMedia:
respect: "センシティブ設定されたメディアを隠す"
@@ -1634,6 +1770,7 @@ _channel:
notesCount: "{n}投稿があります"
nameAndDescription: "名前と説明"
nameOnly: "名前のみ"
+ allowRenoteToExternal: "チャンネル外へのリノートと引用リノートを許可する"
_menuDisplay:
sideFull: "横"
@@ -1711,9 +1848,6 @@ _theme:
infoFg: "情報の文字"
infoWarnBg: "警告の背景"
infoWarnFg: "警告の文字"
- cwBg: "CW ボタンの背景"
- cwFg: "CW ボタンの文字"
- cwHoverBg: "CW ボタンの背景 (ホバー)"
toastBg: "通知トーストの背景"
toastFg: "通知トーストの文字"
buttonBg: "ボタンの背景"
@@ -1734,6 +1868,15 @@ _sfx:
notification: "通知"
antenna: "アンテナ受信"
channel: "チャンネル通知"
+ reaction: "リアクション選択時"
+
+_soundSettings:
+ driveFile: "ドライブの音声を使用"
+ driveFileWarn: "ドライブのファイルを選択してください"
+ driveFileTypeWarn: "このファイルは対応していません"
+ driveFileTypeWarnDescription: "音声ファイルを選択してください"
+ driveFileDurationWarn: "音声が長すぎます"
+ driveFileDurationWarnDescription: "長い音声を使用するとMisskeyの使用に支障をきたす可能性があります。それでも続行しますか？"
_ago:
future: "未来"
@@ -1745,7 +1888,16 @@ _ago:
weeksAgo: "{n}週間前"
monthsAgo: "{n}ヶ月前"
yearsAgo: "{n}年前"
- invalid: "ありません"
+ invalid: "日時の解析に失敗"
+
+_timeIn:
+ seconds: "{n}秒後"
+ minutes: "{n}分後"
+ hours: "{n}時間後"
+ days: "{n}日後"
+ weeks: "{n}週間後"
+ months: "{n}ヶ月後"
+ years: "{n}年後"
_time:
second: "秒"
@@ -1753,17 +1905,6 @@ _time:
hour: "時間"
day: "日"
-_timelineTutorial:
- title: "Misskeyの使い方"
- step1_1: "この画面は「タイムライン」です。{name}に投稿された「ノート」が時系列で表示されます。"
- step1_2: "タイムラインにはいくつか種類があり、例えば「ホームタイムライン」にはあなたがフォローしている人のノートが流れ、「ローカルタイムライン」には{name}全体のノートが流れます。"
- step2_1: "試しに、何かノートを投稿してみましょう。画面上にある鉛筆マークのボタンを押すとフォームが開きます。"
- step2_2: "初めてのノートの内容は、あなたの自己紹介や「{name}始めました」などがおすすめです。"
- step3_1: "投稿できましたか？"
- step3_2: "あなたのノートがタイムラインに表示されていれば成功です。"
- step4_1: "ノートには、「リアクション」を付けることができます。"
- step4_2: "リアクションを付けるには、ノートの「+」マークをクリックして、好きな絵文字を選択します。"
-
_2fa:
alreadyRegistered: "既に設定は完了しています。"
registerTOTP: "認証アプリの設定を開始"
@@ -1889,6 +2030,7 @@ _widgets:
_userList:
chooseList: "リストを選択"
clicker: "クリッカー"
+ birthdayFollowings: "今日誕生日のユーザー"
_cw:
hide: "隠す"
@@ -1956,6 +2098,7 @@ _profile:
changeAvatar: "アイコン画像を変更"
changeBanner: "バナー画像を変更"
verifiedLinkDescription: "内容にURLを設定すると、リンク先のWebサイトに自分のプロフィールへのリンクが含まれている場合に所有者確認済みアイコンを表示させることができます。"
+ avatarDecorationMax: "最大{max}つまでデコレーションを付けられます。"
_exportOrImport:
allNotes: "全てのノート"
@@ -1966,6 +2109,7 @@ _exportOrImport:
userLists: "リスト"
excludeMutingUsers: "ミュートしているユーザーを除外"
excludeInactiveUsers: "使われていないアカウントを除外"
+ withReplies: "インポートした人による返信をTLに含むようにする"
_charts:
federation: "連合"
@@ -2085,12 +2229,16 @@ _notification:
pollEnded: "アンケートの結果が出ました"
newNote: "新しい投稿"
unreadAntennaNote: "アンテナ {name}"
+ roleAssigned: "ロールが付与されました"
emptyPushNotificationMessage: "プッシュ通知の更新をしました"
achievementEarned: "実績を獲得"
testNotification: "通知テスト"
checkNotificationBehavior: "通知の表示を確かめる"
sendTestNotification: "テスト通知を送信する"
notificationWillBeDisplayedLikeThis: "通知はこのように表示されます"
+ reactedBySomeUsers: "{n}人がリアクションしました"
+ renotedBySomeUsers: "{n}人がリノートしました"
+ followedBySomeUsers: "{n}人にフォローされました"
_types:
all: "すべて"
@@ -2104,6 +2252,7 @@ _notification:
pollEnded: "アンケートが終了"
receiveFollowRequest: "フォロー申請を受け取った"
followRequestAccepted: "フォローが受理された"
+ roleAssigned: "ロールが付与された"
achievementEarned: "実績の獲得"
app: "連携アプリからの通知"
@@ -2203,3 +2352,73 @@ _moderationLogTypes:
createAd: "広告を作成"
deleteAd: "広告を削除"
updateAd: "広告を更新"
+ createAvatarDecoration: "アイコンデコレーションを作成"
+ updateAvatarDecoration: "アイコンデコレーションを更新"
+ deleteAvatarDecoration: "アイコンデコレーションを削除"
+ unsetUserAvatar: "ユーザーのアイコンを解除"
+ unsetUserBanner: "ユーザーのバナーを解除"
+
+_fileViewer:
+ title: "ファイルの詳細"
+ type: "ファイルタイプ"
+ size: "ファイルサイズ"
+ url: "URL"
+ uploadedAt: "追加日"
+ attachedNotes: "添付されているノート"
+ thisPageCanBeSeenFromTheAuthor: "このページは、このファイルをアップロードしたユーザーしか閲覧できません。"
+
+_externalResourceInstaller:
+ title: "外部サイトからインストール"
+ checkVendorBeforeInstall: "配布元が信頼できるかを確認した上でインストールしてください。"
+ _plugin:
+ title: "このプラグインをインストールしますか？"
+ metaTitle: "プラグイン情報"
+ _theme:
+ title: "このテーマをインストールしますか？"
+ metaTitle: "テーマ情報"
+ _meta:
+ base: "基本のカラースキーム"
+ _vendorInfo:
+ title: "配布元情報"
+ endpoint: "参照したエンドポイント"
+ hashVerify: "ファイル整合性の確認"
+ _errors:
+ _invalidParams:
+ title: "パラメータが不足しています"
+ description: "外部サイトからデータを取得するために必要な情報が不足しています。URLをお確かめください。"
+ _resourceTypeNotSupported:
+ title: "この外部リソースには対応していません"
+ description: "この外部サイトから取得したリソースの種別には対応していません。サイト管理者にお問い合わせください。"
+ _failedToFetch:
+ title: "データの取得に失敗しました"
+ fetchErrorDescription: "外部サイトとの通信に失敗しました。もう一度試しても改善しない場合、サイト管理者にお問い合わせください。"
+ parseErrorDescription: "外部サイトから取得したデータが読み取れませんでした。サイト管理者にお問い合わせください。"
+ _hashUnmatched:
+ title: "正しいデータが取得できませんでした"
+ description: "提供されたデータの整合性の確認に失敗しました。セキュリティ上、インストールは続行できません。サイト管理者にお問い合わせください。"
+ _pluginParseFailed:
+ title: "AiScript エラー"
+ description: "データは取得できたものの、AiScriptの解析時にエラーがあったため読み込めませんでした。プラグインの作者にお問い合わせください。エラーの詳細はJavascriptコンソールをご確認ください。"
+ _pluginInstallFailed:
+ title: "プラグインのインストールに失敗しました"
+ description: "プラグインのインストール中に問題が発生しました。もう一度お試しください。エラーの詳細はJavascriptコンソールをご覧ください。"
+ _themeParseFailed:
+ title: "テーマ解析エラー"
+ description: "データは取得できたものの、テーマファイルの解析時にエラーがあったため読み込めませんでした。テーマの作者にお問い合わせください。エラーの詳細はJavascriptコンソールをご確認ください。"
+ _themeInstallFailed:
+ title: "テーマのインストールに失敗しました"
+ description: "テーマのインストール中に問題が発生しました。もう一度お試しください。エラーの詳細はJavascriptコンソールをご覧ください。"
+
+_dataSaver:
+ _media:
+ title: "メディアの読み込み"
+ description: "画像・動画が自動で読み込まれるのを防止します。隠れている画像・動画はタップすると読み込まれます。"
+ _avatar:
+ title: "アイコン画像"
+ description: "アイコン画像のアニメーションが停止します。アニメーション画像は通常の画像よりファイルサイズが大きいことがあるので、データ通信量をさらに削減できます。"
+ _urlPreview:
+ title: "URLプレビューのサムネイル"
+ description: "URLプレビューのサムネイル画像が読み込まれなくなります。"
+ _code:
+ title: "コードハイライト"
+ description: "MFMなどでコードハイライト記法が使われている場合、タップするまで読み込まれなくなります。コードハイライトではハイライトする言語ごとにその定義ファイルを読み込む必要がありますが、それらが自動で読み込まれなくなるため、通信量の削減が見込めます。"
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index 43d98fdd04..4bd44f56d9 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -15,7 +15,7 @@ gotIt: "ほい"
cancel: "やめとく"
noThankYou: "やめとく"
enterUsername: "ユーザー名を入れてや"
-renotedBy: "{user}がRenoteしたで"
+renotedBy: "{user}がリノートしたで"
noNotes: "ノートはあらへん"
noNotifications: "通知はあらへん"
instance: "サーバー"
@@ -38,18 +38,19 @@ addUser: "ユーザーを追加や"
favorite: "お気に入り"
favorites: "お気に入り"
unfavorite: "やっぱ気に入らん"
-favorited: "お気に入りに入れたで"
+favorited: "お気に入りに入れたで。"
alreadyFavorited: "もうお気に入りに入れとるがな。"
cantFavorite: "アカン、お気に入りに入れれんかったわ。"
pin: "ピン留めしとく"
unpin: "やっぱピン留めせん"
copyContent: "内容をコピー"
copyLink: "リンクをコピー"
+copyLinkRenote: "リノートのリンクをコピーするで？"
delete: "ほかす"
deleteAndEdit: "ほかして直す"
-deleteAndEditConfirm: "このノートをほかしてもっかい直す？このノートへのツッコミ、Renote、返信も全部消えるんやけどそれでもええん？"
+deleteAndEditConfirm: "このノートをほかしてもっかい直す？このノートへのツッコミ、リノート、返信も全部消えるんやけどそれでもええん？"
addToList: "リストに入れたる"
-addToAntenna: "アンテナに追加"
+addToAntenna: "アンテナに入れる"
sendMessage: "メッセージを送る"
copyRSS: "RSSをコピー"
copyUsername: "ユーザー名をコピー"
@@ -58,7 +59,7 @@ copyNoteId: "ノートIDをコピー"
copyFileId: "ファイルIDをコピー"
copyFolderId: "フォルダーIDをコピー"
copyProfileUrl: "プロフィールURLをコピー"
-searchUser: "ユーザーを検索"
+searchUser: "ユーザーを探す"
reply: "返事"
loadMore: "まだまだあるで！"
showMore: "まだまだあるで！"
@@ -67,7 +68,7 @@ youGotNewFollower: "フォローされたで"
receiveFollowRequest: "フォローリクエストされたで"
followRequestAccepted: "フォローが承認されたで"
mention: "メンション"
-mentions: "自分宛て"
+mentions: "あんた宛て"
directNotes: "ダイレクト投稿"
importAndExport: "インポートとエクスポート"
import: "インポート"
@@ -87,7 +88,7 @@ followers: "フォロワー"
followsYou: "フォローされとるで"
createList: "リスト作る"
manageLists: "リストの管理"
-error: "エラー"
+error: "おかしなったで"
somethingHappened: "なんかあかんわ"
retry: "もっぺんやる？"
pageLoadError: "ページが読み込めんかったわ。"
@@ -104,13 +105,13 @@ followRequests: "フォロー申請"
unfollow: "フォローやめる"
followRequestPending: "フォロー許してくれるん待っとる"
enterEmoji: "絵文字を入れてや"
-renote: "Renote"
-unrenote: "Renoteやめる"
-renoted: "Renoteしたで。"
-cantRenote: "この投稿はRenoteできへんらしい。"
-cantReRenote: "Renote自体はRenoteできへんで。"
+renote: "リノート"
+unrenote: "リノートやめる"
+renoted: "リノートしたで。"
+cantRenote: "この投稿はリノートできへんっぽい。"
+cantReRenote: "リノート自体はリノートできへんで。"
quote: "引用"
-inChannelRenote: "チャンネル内Renote"
+inChannelRenote: "チャンネルの中でリノート"
inChannelQuote: "チャンネル内引用"
pinnedNote: "ピン留めされとるノート"
pinned: "ピン留めしとく"
@@ -120,7 +121,12 @@ sensitive: "気いつけて見いや"
add: "増やす"
reaction: "ツッコミ"
reactions: "ツッコミ"
-reactionSetting: "ピッカーに出しとくツッコミ"
+emojiPicker: "絵文字ピッカー"
+pinnedEmojisForReactionSettingDescription: "リアクションしたときにピンで留めてる表示をする絵文字を設定するで"
+pinnedEmojisSettingDescription: "絵文字打ったときにピン留め表示する絵文字設定できるで"
+emojiPickerDisplay: "ピッカーの表示"
+overwriteFromPinnedEmojisForReaction: "リアクション設定から上書きする"
+overwriteFromPinnedEmojis: "全般設定から上書きする"
reactionSettingDescription2: "ドラッグで並び替え、クリックで削除、＋を押して追加やで。"
rememberNoteVisibility: "公開範囲覚えといて"
attachCancel: "のっけるのやめる"
@@ -129,8 +135,8 @@ unmarkAsSensitive: "そこまでアカンことないやろ"
enterFileName: "ファイル名を入れてや"
mute: "ミュート"
unmute: "ミュートやめたる"
-renoteMute: "Renoteは見いひん"
-renoteUnmute: "Renoteもやっぱ見るわ"
+renoteMute: "リノートは見いひん"
+renoteUnmute: "リノートもやっぱ見るわ"
block: "ブロック"
unblock: "ブロックやめたる"
suspend: "凍結"
@@ -140,13 +146,13 @@ unblockConfirm: "ブロックやめたるってほんまか？"
suspendConfirm: "凍結してしもうてええか？"
unsuspendConfirm: "解凍するけどええか？"
selectList: "リストを選ぶ"
-editList: "リスト直すで"
+editList: "リストいじる"
selectChannel: "チャンネルを選ぶ"
selectAntenna: "アンテナを選ぶ"
-editAntenna: "アンテナを編集"
+editAntenna: "アンテナいじる"
selectWidget: "ウィジェットを選ぶ"
editWidgets: "ウィジェットをいじる"
-editWidgetsExit: "編集終ったで"
+editWidgetsExit: "いじるのをやめる"
customEmojis: "カスタム絵文字"
emoji: "絵文字"
emojis: "絵文字"
@@ -155,14 +161,14 @@ emojiUrl: "絵文字画像URL"
addEmoji: "絵文字を追加"
settingGuide: "ええ感じの設定"
cacheRemoteFiles: "リモートのファイルをキャッシュする"
-cacheRemoteFilesDescription: "この設定を切っとったら、リモートファイルをキャッシュせんと直リンクするようになるで。サーバーの容量は節約できるけど、サムネイルを作らんなるから通信量が増えるで。"
+cacheRemoteFilesDescription: "この設定を入れとったら、リモートのファイルを端から端までこのサーバーのキャッシュん中突っ込むようになるで。画像映し出すんがめっちゃ速うなるけど、サーバーの容量をやたらと食うようになるで。リモートの人がどんだけ長くキャッシュを持っとくかはドライブ容量の制限で決めとくで。制限を超えたら古いのから順々に消してって、かわりにリンクになるで。この設定を切ったら、リモートのファイルは最初っからリンクとして扱うことにするけど、画像のサムネ作るのとかみんなのプライバシー守るために、default.ymlのproxyRemoteFilesをtrueにしといたほうがええよ。"
youCanCleanRemoteFilesCache: "ファイル管理にある🗑️ボタンでキャッシュ全部ほかすで。"
-cacheRemoteSensitiveFiles: "リモートのセンシティブなファイルをキャッシュする"
-cacheRemoteSensitiveFilesDescription: "この設定を無効にすると、リモートのセンシティブなファイルはキャッシュせず直リンクするようになるで。"
+cacheRemoteSensitiveFiles: "リモートのきわどいファイルをキャッシュに突っ込む"
+cacheRemoteSensitiveFilesDescription: "この設定を切ると、リモートのきわどいファイルはキャッシュせず直でリンクするようになるで。"
flagAsBot: "Botにするで"
flagAsBotDescription: "もしこのアカウントをプログラム使うて運用するんやったら、このフラグをオンにしてや。オンにすれば、反応がバーッて連鎖せんように開発者が使うたり、Misskeyのシステム上での扱いがBotに合ったもんになるからな。"
-flagAsCat: "Catやで"
-flagAsCatDescription: "ワレ、猫ちゃんならこのフラグをつけてみ？"
+flagAsCat: "猫や。かわええな。"
+flagAsCatDescription: "ネコになりたいんならこれつけとき。"
flagShowTimelineReplies: "タイムラインにノートへの返信を表示するで"
flagShowTimelineRepliesDescription: "オンにしたら、タイムラインにユーザーのノートの他にもそのユーザーの他のノートへの返信を表示するで。"
autoAcceptFollowed: "フォローしとるユーザーからのフォローリクエストを勝手に許可しとく"
@@ -194,6 +200,7 @@ perHour: "1時間ごと"
perDay: "1日ごと"
stopActivityDelivery: "アクティビティの配送をやめる"
blockThisInstance: "このサーバーをブロックすんで"
+silenceThisInstance: "サーバーサイレンスすんで？"
operations: "操作"
software: "ソフトウェア"
version: "バージョン"
@@ -212,10 +219,12 @@ clearQueueConfirmText: "未配達の投稿は配送されんなるで。ふつ
clearCachedFiles: "キャッシュをほかす"
clearCachedFilesConfirm: "キャッシュされとるリモートファイルをみんなほかしてええか？"
blockedInstances: "ブロックしたサーバー"
-blockedInstancesDescription: "ブロックしたいサーバーのホストを改行で区切って設定してな。ブロックされてもうたサーバーとはもう金輪際やり取りできひんくなるで。ついでにそのサブドメインもブロックするで。"
+blockedInstancesDescription: "ブロックしたいサーバーのホストを改行で区切って設定してな。ブロックされてもうたサーバーとはもう金輪際やり取りできひんくなるで。"
+silencedInstances: "サーバーサイレンスされてんねん"
+silencedInstancesDescription: "サイレンスしたいサーバーのホストを改行で区切って設定すんで。サイレンスされたサーバーに所属するアカウントはすべて「サイレンス」として扱われ、フォローがすべてリクエストになり、フォロワーでないローカルアカウントにはメンションできなくなんねん。ブロックしたインスタンスには影響せーへんで。"
muteAndBlock: "ミュートとブロック"
-mutedUsers: "ミュートしたユーザー"
-blockedUsers: "ブロックしたユーザー"
+mutedUsers: "ミュートしとるユーザー"
+blockedUsers: "ブロックしとるユーザー"
noUsers: "ユーザーはおらん"
editProfile: "プロフィールをいじる"
noteDeleteConfirm: "このノートをほかしてええか？"
@@ -242,7 +251,7 @@ changePassword: "パスワードをいじる"
security: "セキュリティ"
retypedNotMatch: "入れたやつ合うてへんわ。"
currentPassword: "今のパスワード"
-newPassword: "次のパスワード"
+newPassword: "今度のパスワード"
newPasswordRetype: "今度のパスワード(もっぺん入れて)"
attachFile: "ファイルのっける"
more: "他のん"
@@ -257,6 +266,7 @@ removed: "ほかしたで！"
removeAreYouSure: "「{x}」はほかしてええか？"
deleteAreYouSure: "「{x}」はほかしてええか？"
resetAreYouSure: "リセットしてええん？"
+areYouSure: "いいん？"
saved: "保存したで！"
messaging: "チャット"
upload: "アップロード"
@@ -307,6 +317,7 @@ folderName: "フォルダー名"
createFolder: "フォルダー作る"
renameFolder: "フォルダー名を変える"
deleteFolder: "フォルダーをほかす"
+folder: "フォルダー"
addFile: "ファイルを追加"
emptyDrive: "ドライブは空っぽや"
emptyFolder: "このフォルダーは空や"
@@ -320,7 +331,7 @@ copyUrl: "URLをコピー"
rename: "名前を変えるで"
avatar: "アイコン"
banner: "バナー"
-displayOfSensitiveMedia: "センシティブなメディアの表示"
+displayOfSensitiveMedia: "きわどいやつの表示"
whenServerDisconnected: "サーバーとの接続が失くなってしもうたとき"
disconnectedFromServer: "サーバーが機嫌悪いねん"
reload: "リロード"
@@ -408,18 +419,20 @@ userList: "リスト"
about: "情報"
aboutMisskey: "Misskeyってなんや？"
administrator: "管理者"
-token: "トークン"
+token: "確認コード"
2fa: "二要素認証"
+setupOf2fa: "二要素認証のセットアップ"
totp: "認証アプリ"
totpDescription: "認証アプリ使うてワンタイムパスワードを入れる"
moderator: "モデレーター"
moderation: "モデレーション"
moderationNote: "モデレーションノート"
addModerationNote: "モデレーションノートを追加するで"
+moderationLogs: "モデログ"
nUsersMentioned: "{n}人が投稿"
securityKeyAndPasskey: "セキュリティキー・パスキー"
securityKey: "セキュリティキー"
-lastUsed: "最後につこうた日"
+lastUsed: "最後に使うた日"
lastUsedAt: "最後に使うたんは: {t}"
unregister: "登録やめる"
passwordLessLogin: "パスワード無くてもログインできるようにする"
@@ -431,7 +444,6 @@ share: "わけわけ"
notFound: "見つからへんね"
notFoundDescription: "言われたURLにはまるページはなかったで。"
uploadFolder: "とりあえずアップロードしたやつ置いとく所"
-cacheClear: "キャッシュをほかす"
markAsReadAllNotifications: "通知はもう全て読んだわっ"
markAsReadAllUnreadNotes: "投稿は全て読んだわっ"
markAsReadAllTalkMessages: "チャットはもうぜんぶ読んだわっ"
@@ -465,7 +477,7 @@ weakPassword: "へぼいパスワード"
normalPassword: "ぼちぼちのパスワード"
strongPassword: "ええ感じのパスワード"
passwordMatched: "よし！一致や！"
-passwordNotMatched: "一致しとらんで？"
+passwordNotMatched: "ちゃうで？"
signinWith: "{x}でログイン"
signinFailed: "ログインできんかったで。もっかいユーザー名とパスワードを確認してみてや。"
or: "それか"
@@ -519,7 +531,7 @@ objectStorageEndpointDesc: "S3のときは空、それ以外は各サービス
objectStorageRegion: "Region"
objectStorageRegionDesc: "'xx-east-1'みたいなregionを指定したってやー。使ってるサービスにregionの概念がないときは、空か'us-east-1'にするんやで。"
objectStorageUseSSL: "SSLを使う"
-objectStorageUseSSLDesc: "API接続にhttpsを使わん場合はオフにするんやで"
+objectStorageUseSSLDesc: "API接続にhttpsを使わんのやったら消しといて"
objectStorageUseProxy: "Proxyを使う"
objectStorageUseProxyDesc: "API接続にproxy使わんのやったら切ってくれへん？"
objectStorageSetPublicRead: "アップロードした時に'public-read'を設定してや"
@@ -528,15 +540,18 @@ serverLogs: "サーバーログ"
deleteAll: "全部ほかす"
showFixedPostForm: "タイムラインの上の方で投稿できるようにやってくれへん？"
showFixedPostFormInChannel: "タイムラインの上の方で投稿できるようにするわ(チャンネル)"
+withRepliesByDefaultForNewlyFollowed: "フォローする時、デフォルトで返信をタイムラインに含むようにしよか"
newNoteRecived: "新しいノートがあるで"
-sounds: "サウンド"
-sound: "サウンド"
+sounds: "音"
+sound: "音"
listen: "聴く"
none: "なし"
showInPage: "ページで表示"
popout: "ポップアウト"
volume: "やかましさ"
masterVolume: "全体のやかましさ"
+notUseSound: "音出さへん"
+useSoundOnlyWhenActive: "Misskeyがアクティブなときだけ音出す"
details: "もっと"
chooseEmoji: "絵文字を選ぶ"
unableToProcess: "なんか奥の方で詰まってもうた"
@@ -557,6 +572,10 @@ output: "出力"
script: "スクリプト"
disablePagesScript: "Pagesのスクリプトを無効にしてや"
updateRemoteUser: "リモートユーザー情報の更新してくれん？"
+unsetUserAvatar: "アイコン戻す"
+unsetUserAvatarConfirm: "アイコンを元に戻すで？"
+unsetUserBanner: "バナー戻す"
+unsetUserBannerConfirm: "バナー元に戻すで？"
deleteAllFiles: "ファイルを全部ほかす"
deleteAllFilesConfirm: "ホンマにファイル全部ほかすんか？消したもんはもう戻ってこんのやで？"
removeAllFollowing: "フォローを全解除"
@@ -568,7 +587,7 @@ yourAccountSuspendedDescription: "あんたのアカウントは、サーバー
tokenRevoked: "トークンが無効やで"
tokenRevokedDescription: "ログイントークンが失効しとるで。もっかいログインしてもろてもええか？"
accountDeleted: "アカウントは削除されとるで"
-accountDeletedDescription: "このアカウントは削除されとるで。"
+accountDeletedDescription: "このアカウントはもう消えとる。"
menu: "メニュー"
divider: "分割線"
addItem: "項目を追加"
@@ -584,9 +603,9 @@ enableInfiniteScroll: "自動でもっと見る"
visibility: "公開範囲"
poll: "アンケート"
useCw: "内容を隠す"
-enablePlayer: "プレイヤーを開く"
-disablePlayer: "プレイヤーを閉じる"
-expandTweet: "ツイートを展開する"
+enablePlayer: "プレイヤー開く"
+disablePlayer: "プレイヤー閉じる"
+expandTweet: "ポスト展開しとく"
themeEditor: "テーマエディター"
description: "説明"
describeFile: "キャプションを付ける"
@@ -599,7 +618,7 @@ preferencesBackups: "設定のバックアップ"
deck: "デッキ"
undeck: "デッキ解除"
useBlurEffectForModal: "モーダルにぼかし効果を使用"
-useFullReactionPicker: "フル機能の突っ込みピッカーを使用"
+useFullReactionPicker: "フルフルのツッコミピッカーを使う"
width: "幅"
height: "高さ"
large: "大"
@@ -628,6 +647,7 @@ smtpSecure: "SMTP 接続に暗黙的なSSL/TLSを使用する"
smtpSecureInfo: "STARTTLS使っとる時はオフにしてや。"
testEmail: "配信テスト"
wordMute: "ワードミュート"
+hardWordMute: "ハードワードミュート"
regexpError: "正規表現エラー"
regexpErrorDescription: "{tab}ワードミュートの{line}行目の正規表現にエラーが出てきたで:"
instanceMute: "サーバーミュート"
@@ -643,7 +663,7 @@ database: "データベース"
channel: "チャンネル"
create: "作成"
notificationSetting: "通知設定"
-notificationSettingDesc: "表示する通知の種類えらんでや。"
+notificationSettingDesc: "出す通知の種類えらんでや。"
useGlobalSetting: "グローバル設定を使ってや"
useGlobalSettingDesc: "オンにすると、アカウントの通知設定が使われるで。オフにすると、別々に設定できるようになるで。"
other: "その他"
@@ -655,6 +675,7 @@ behavior: "動作"
sample: "サンプル"
abuseReports: "通報"
reportAbuse: "通報"
+reportAbuseRenote: "リノート苦情だすで？"
reportAbuseOf: "{name}を通報する"
fillAbuseReportDescription: "細かい通報理由を書いてなー。対象ノートがある時はそのURLも書いといてなー。"
abuseReported: "無事内容が送信されたみたいやで。おおきに〜。"
@@ -679,18 +700,18 @@ clip: "クリップ"
createNew: "新しく作るで"
optional: "任意"
createNewClip: "新しいクリップを作るで"
-unclip: "クリップ解除するで"
-confirmToUnclipAlreadyClippedNote: "このノートはすでにクリップ「{name}」に含まれとるで。ノートをこのクリップから除外しよか？"
+unclip: "クリップやめとく"
+confirmToUnclipAlreadyClippedNote: "このノートはもう「{name}」に含まれとるで。ノート、このクリップから外そか？"
public: "パブリック"
private: "非公開"
-i18nInfo: "Misskeyは有志によっていろんな言語に翻訳されとるで。{link}で翻訳に協力したってやー。"
+i18nInfo: "Misskeyは有志がいろんな言語に訳しとるで。{link}で翻訳に協力したってやー。"
manageAccessTokens: "アクセストークンの管理"
accountInfo: "アカウント情報"
notesCount: "ノートの数やで"
repliesCount: "返信した数やで"
-renotesCount: "Renoteした数やで"
+renotesCount: "リノートした数やで"
repliedCount: "返信された数やで"
-renotedCount: "Renoteされた数やで"
+renotedCount: "リノートされた数やで"
followingCount: "フォロー数やで"
followersCount: "フォロワー数やで"
sentReactionsCount: "ツッコんだ数"
@@ -707,6 +728,7 @@ lockedAccountInfo: "フォローを承認制にしとっても、ノートの公
alwaysMarkSensitive: "デフォルトでメディアを閲覧注意にするで"
loadRawImages: "添付画像のサムネイルをオリジナル画質にするで"
disableShowingAnimatedImages: "アニメーション画像を再生せんとくで"
+highlightSensitiveMedia: "きわどいことをめっっちゃわかりやすくする"
verificationEmailSent: "無事確認のメールを送れたで。メールに書いてあるリンクにアクセスして、設定を完了してなー。"
notSet: "未設定"
emailVerified: "メールアドレスは確認されたで"
@@ -718,7 +740,7 @@ useSystemFont: "システムのデフォルトのフォントを使うで"
clips: "クリップ"
experimentalFeatures: "おためし機能やで"
experimental: "実験的"
-thisIsExperimentalFeature: "これは実験的な機能やで。仕様が変更になったりちゃんと動かなかったりするかもやで。"
+thisIsExperimentalFeature: "これは実験的な機能やから、仕様が変わったりちゃんと動かんかったりするかもしれん。"
developer: "開発者やで"
makeExplorable: "アカウントを見つけやすくするで"
makeExplorableDescription: "オフにすると、「みつける」にアカウントが載らんくなるで。"
@@ -736,7 +758,7 @@ onlineUsersCount: "{n}人が起きとるで"
nUsers: "{n}ユーザー"
nNotes: "{n}ノート"
sendErrorReports: "エラーリポートを送る"
-sendErrorReportsDescription: "オンにしたら、変なことが起きたときにエラーの詳細がMisskeyに送られて、ソフトウェアの品質向上に使えるようになるで。エラー情報には、OSのバージョン、ブラウザの種類、行動履歴なんかが含まれるで。"
+sendErrorReportsDescription: "オンにしたら、なんか変なことが起きたとき、詳しいのが全部Misskeyに送られて、ソフトウェアをもっと良うするで。エラー情報には、OSのバージョン、ブラウザの種類、行動履歴なんかが含まれるな。"
myTheme: "マイテーマ"
backgroundColor: "背景"
accentColor: "アクセント"
@@ -752,8 +774,8 @@ deleteConfirm: "ホンマにほかすで？"
invalidValue: "有効な値じゃないみたいやで。"
registry: "レジストリ"
closeAccount: "アカウントを閉鎖する"
-currentVersion: "現在のバージョン"
-latestVersion: "最新のバージョン"
+currentVersion: "今のやつ"
+latestVersion: "いっちゃん新しいやつ"
youAreRunningUpToDateClient: "今使ってるクライアントが最新やで！"
newVersionOfClientAvailable: "新しいバージョンのクライアントが使えるで。"
usageAmount: "使用量"
@@ -775,9 +797,9 @@ goBack: "戻る"
unlikeConfirm: "いいね解除するんか？"
fullView: "フルビュー"
quitFullView: "フルビュー解除"
-addDescription: "説明を追加するで"
-userPagePinTip: "個々のノートのメニューから「ピン留め」を選んどくと、ここにノートを表示しておけるで。"
-notSpecifiedMentionWarning: "宛先に含まれてへんメンションがあるで"
+addDescription: "説明を入れるで"
+userPagePinTip: "ノートのメニューから「ピン留め」を選んどいたら、ここにノートを置いとけるで。"
+notSpecifiedMentionWarning: "宛先にないメンションがあるで"
info: "情報"
userInfo: "ユーザー情報やで"
unknown: "不明"
@@ -789,7 +811,7 @@ active: "アクティブ"
offline: "オフライン"
notRecommended: "あんま推奨しやんで"
botProtection: "Botプロテクション"
-instanceBlocking: "サーバーブロック"
+instanceBlocking: "サーバーブロック・サイレンス"
selectAccount: "アカウントを選んでなー"
switchAccount: "アカウントを変えるで"
enabled: "有効"
@@ -849,7 +871,7 @@ itsOn: "オンになっとるよ"
itsOff: "オフになってるで"
on: "オン"
off: "オフ"
-emailRequiredForSignup: "アカウント登録にメールアドレスを必須にするで"
+emailRequiredForSignup: "アカウント作るのにメールアドレスを必須にするで"
unread: "未読"
filter: "フィルタ"
controlPanel: "コントロールパネル"
@@ -859,11 +881,9 @@ makeReactionsPublicDescription: "あんたがしたツッコミ一覧を誰で
classic: "クラシック"
muteThread: "スレッドをミュート"
unmuteThread: "スレッドのミュートを解除"
-ffVisibility: "つながりの公開範囲"
-ffVisibilityDescription: "あんたのフォロー/フォロワー情報の公開範囲を設定できるで。"
continueThread: "さらにスレッドを見るで"
deleteAccountConfirm: "アカウントを消すで？ええんか？"
-incorrectPassword: "パスワードがちゃうで。"
+incorrectPassword: "パスワードがちゃうわ。"
voteConfirm: "「{choice}」に投票するんか？"
hide: "隠す"
useDrawerReactionPickerForMobile: "ケータイとかのときドロワーで表示するで"
@@ -891,8 +911,8 @@ oneMonth: "1ヶ月"
reflectMayTakeTime: "反映されるまで時間がかかることがあるで"
failedToFetchAccountInformation: "アカウントの取得に失敗したみたいや…"
rateLimitExceeded: "レート制限が超えたみたいやで"
-cropImage: "画像のクロップ"
-cropImageAsk: "画像をクロップしてもええか？"
+cropImage: "画像切り取り"
+cropImageAsk: "画像を切り取ってもええか？"
cropYes: "切り抜いたる"
cropNo: "切り抜かへん"
file: "ファイル"
@@ -903,18 +923,18 @@ thereIsUnresolvedAbuseReportWarning: "未対応の通報があるみたいやで
recommended: "推奨"
check: "チェック"
driveCapOverrideLabel: "このユーザーのドライブ容量上限を変更するで"
-driveCapOverrideCaption: "0以下を指定すると解除されるで。"
-requireAdminForView: "これを見るには管理者アカウントでログインしとらなあかんで。"
+driveCapOverrideCaption: "0以下にしたら解除されるで。"
+requireAdminForView: "これ見たいんなら管理者じゃないとアカンわ。"
isSystemAccount: "システムが自動で作成・管理しとるアカウントやで。"
-typeToConfirm: "この操作をやるんなら {x} と入力してなー"
+typeToConfirm: "これやるんなら {x} って入力してなー"
deleteAccount: "アカウント削除するで"
document: "ドキュメント"
numberOfPageCache: "ページ、どんだけキャッシュすんの？"
-numberOfPageCacheDescription: "増やすと使いやすくなる、負荷とメモリ使用量が増えてくで。一長一短やな。"
+numberOfPageCacheDescription: "増やすと使いやすくなるけど、負荷とメモリ使用量が増えてくで。一長一短やな。"
logoutConfirm: "ログアウトしまっか？"
lastActiveDate: "最後に使った日時"
statusbar: "ステータスバー"
-pleaseSelect: "選択したってやー"
+pleaseSelect: "選んだってやー"
reverse: "反転"
colored: "色付き"
refreshInterval: "更新間隔"
@@ -923,28 +943,28 @@ type: "タイプ"
speed: "速度"
slow: "遅い"
fast: "速い"
-sensitiveMediaDetection: "センシティブなメディアの検出"
-localOnly: "ローカルのみ"
-remoteOnly: "リモートのみ"
+sensitiveMediaDetection: "きわどいやつの検出"
+localOnly: "ローカルだけ"
+remoteOnly: "リモートだけ"
failedToUpload: "アップロードに失敗してもうたわ…"
-cannotUploadBecauseInappropriate: "不適切な内容を含むかもしれへんって判定されたからアップロードできへんわ。"
-cannotUploadBecauseNoFreeSpace: "ドライブの空き容量が無いからアップロードできへんわ。"
+cannotUploadBecauseInappropriate: "きわどい内容を含むかもしれへんって言われたからアップロードできへんわ。"
+cannotUploadBecauseNoFreeSpace: "ドライブがもうパンパンやからアップロードできへんわ。"
cannotUploadBecauseExceedsFileSizeLimit: "ファイルが思うたよりも大きいさかいアップロードできへんでこれ。"
beta: "ベータ"
-enableAutoSensitive: "自動NSFW判定"
+enableAutoSensitive: "自動できわどいか判断する"
enableAutoSensitiveDescription: "使える時は、機械学習を使って自動でメディアにNSFWフラグを設定するで。この機能をオフにしても、サーバーによっては自動で設定されることがあるで。"
-activeEmailValidationDescription: "ユーザーのメールアドレスのバリデーションを、捨てアドかどうかや実際に通信可能かどうかとかを判定して積極的に行うで。オフにすると単に文字列として正しいかどうかだけチェックするで。"
+activeEmailValidationDescription: "ユーザーのメアドのバリデーションを、捨てアドかどうかとか、ちゃんと通信できるかとかを見るで。切ったら単に文字列として合っとるかどうかだけ見るわ。"
navbar: "ナビゲーションバー"
shuffle: "シャッフルするで"
account: "アカウント"
-move: "移動するで"
+move: "移すで"
pushNotification: "プッシュ通知"
subscribePushNotification: "プッシュ通知をオンにするで"
unsubscribePushNotification: "プッシュ通知を止めるで"
pushNotificationAlreadySubscribed: "プッシュ通知はオンになってるで"
pushNotificationNotSupported: "ブラウザかサーバーがプッシュ通知に対応してないみたいやで。"
sendPushNotificationReadMessage: "通知やメッセージが既読になったらプッシュ通知を消すで"
-sendPushNotificationReadMessageCaption: "「{emptyPushNotificationMessage}」っていう表示が一瞬表示されるようになるで。端末の電池使用量が増える可能性があるで。"
+sendPushNotificationReadMessageCaption: "あんたの端末の電池使う量が増えるかもしれん。"
windowMaximize: "最大化"
windowMinimize: "最小化"
windowRestore: "元に戻す"
@@ -954,29 +974,30 @@ tools: "ツール"
cannotLoad: "読み込めへんで"
numberOfProfileView: "プロフィール表示回数"
like: "ええやん！"
-unlike: "いいねを解除"
+unlike: "いいねやめる"
numberOfLikes: "いいね数"
show: "表示"
neverShow: "今後表示しない"
remindMeLater: "また後で"
didYouLikeMisskey: "Misskey気に入ってくれた？"
-pleaseDonate: "Misskeyは{host}が使用している無料のソフトウェアやで。これからも開発を続けれるように、寄付したってな～。"
+pleaseDonate: "Misskeyは{host}が使うとる無料のソフトウェアやで。これからも開発を続けれるように、寄付したってな～。"
roles: "ロール"
role: "ロール"
noRole: "ロールはありまへん"
normalUser: "一般ユーザー"
undefined: "未定義"
assign: "アサイン"
-unassign: "アサインを解除"
+unassign: "アサインやめる"
color: "色"
manageCustomEmojis: "カスタム絵文字の管理"
+manageAvatarDecorations: "アバターを飾るモンの管理"
youCannotCreateAnymore: "これ以上作れなさそうやわ"
-cannotPerformTemporary: "一時的に利用できへんで"
-cannotPerformTemporaryDescription: "操作回数が制限を超えたから一時的に利用できへんくなったで。ちょっと時間置いてからもう一回やってやー。"
+cannotPerformTemporary: "ちょっといまは使えへんで"
+cannotPerformTemporaryDescription: "操作し過ぎてちょっと今は使えへんくしとるで。ちょっと待ってからもっかいやってや。"
invalidParamError: "パラメータがエラー言うとりますわ"
-invalidParamErrorDescription: "リクエストパラメータに問題があんねん。普通はバグやねんけど、もしかすると入力した文字数が多すぎるとかの可能性もあるから確認してや〜"
+invalidParamErrorDescription: "リクエストパラメータが変やわ。だいたいはバグやねんけど、もしかしたら入れた文字が多すぎるとかかもしれんから確認してや〜"
permissionDeniedError: "操作が拒否されてもうた。"
-permissionDeniedErrorDescription: "自分のアカウントにはこの操作を行う権限があらへんねん"
+permissionDeniedErrorDescription: "このアカウントはこれやったらアカンって。"
preset: "プリセット"
selectFromPresets: "プリセットから選ぶ"
achievements: "実績"
@@ -986,15 +1007,15 @@ thisPostMayBeAnnoying: "この投稿は迷惑かもしらんで。"
thisPostMayBeAnnoyingHome: "ホームに投稿"
thisPostMayBeAnnoyingCancel: "やめとく"
thisPostMayBeAnnoyingIgnore: "このまま投稿"
-collapseRenotes: "見たことあるRenoteは飛ばして表示するで"
+collapseRenotes: "見たことあるリノートは飛ばして表示するで"
internalServerError: "サーバー内部エラー"
-internalServerErrorDescription: "サーバー内部でよう分からんエラーやわ"
-copyErrorInfo: "エラー情報をコピー"
+internalServerErrorDescription: "サーバーでなんか変なこと起こっとるわ。"
+copyErrorInfo: "エラー情報をコピるで"
joinThisServer: "このサーバーに登録するわ"
exploreOtherServers: "他のサーバー見てみる"
letsLookAtTimeline: "タイムライン見てみーや"
disableFederationConfirm: "連合なしにしとくか？"
-disableFederationConfirmWarn: "連合なしにしても投稿は非公開にはならへんで。大体の場合は連合なしにする必要はないで。"
+disableFederationConfirmWarn: "連合なしにしても投稿が非公開になるわけちゃうで。大体の場合は連合なしにする必要はないで。"
disableFederationOk: "連合なしにしとく"
invitationRequiredToRegister: "今このサーバー招待制になってもうてんねん。招待コードを持っとるんやったら登録できるで。"
emailNotSupported: "このサーバーはメール配信がサポートされてへんみたいやわ"
@@ -1003,14 +1024,16 @@ cannotBeChangedLater: "後からは変えられへんで。"
reactionAcceptance: "ツッコミの受け入れ"
likeOnly: "いいねだけ"
likeOnlyForRemote: "リモートからはいいねだけな"
-nonSensitiveOnly: "センシティブじゃないやつだけ"
-nonSensitiveOnlyForLocalLikeOnlyForRemote: "センシティブじゃないやつだけ (リモートはいいねだけ)"
+nonSensitiveOnly: "いつ見ても大丈夫なやつだけ"
+nonSensitiveOnlyForLocalLikeOnlyForRemote: "いつ見ても大丈夫なやつだけ (リモートはいいねだけ)"
rolesAssignedToMe: "自分に割り当てられたロール"
resetPasswordConfirm: "パスワード作り直すんでええな？"
sensitiveWords: "けったいな単語"
sensitiveWordsDescription: "設定した単語が入っとるノートの公開範囲をホームにしたるわ。改行で区切ったら複数設定できるで。"
sensitiveWordsDescription2: "スペースで区切るとAND指定、キーワードをスラッシュで囲んだら正規表現や。"
-notesSearchNotAvailable: "ノート検索は使われへんで。"
+hiddenTags: "見えてへんハッシュタグ"
+hiddenTagsDescription: "設定したタグを最近流行りのとこに見えんようにすんで。複数設定するときは改行で区切ってな。"
+notesSearchNotAvailable: "なんかノート探せへん。"
license: "ライセンス"
unfavoriteConfirm: "ほんまに気に入らんの？"
myClips: "自分のクリップ"
@@ -1021,19 +1044,21 @@ retryAllQueuesConfirmText: "一時的にサーバー重なるかもしれへん
enableChartsForRemoteUser: "リモートユーザーのチャートを作る"
enableChartsForFederatedInstances: "リモートサーバーのチャートを作る"
showClipButtonInNoteFooter: "ノートのアクションにクリップを追加"
+reactionsDisplaySize: "ツッコミの表示のでかさ"
+limitWidthOfReaction: "ツッコミの最大横幅を制限して、ちっさく表示するで"
noteIdOrUrl: "ノートIDかURL"
video: "動画"
videos: "動画"
dataSaver: "データケチケチ"
accountMigration: "アカウントのお引っ越し"
accountMoved: "このユーザーはさらのアカウントに引っ越したで："
-accountMovedShort: "このアカウントは移行されとるで"
+accountMovedShort: "このアカウントは引っ越し済みや"
operationForbidden: "この操作はできまへん"
-forceShowAds: "常に広告を表示しとく"
+forceShowAds: "いっつも広告を映す"
addMemo: "メモを足す"
editMemo: "メモをいらう"
reactionsList: "ツッコミ一覧"
-renotesList: "Renote一覧"
+renotesList: "リノート一覧"
notificationDisplay: "通知見せる"
leftTop: "左上"
rightTop: "右上"
@@ -1045,7 +1070,7 @@ horizontal: "横"
position: "位置"
serverRules: "サーバールール"
pleaseConfirmBelowBeforeSignup: "このサーバーに登録する前に、下に書いてること確認してな。"
-pleaseAgreeAllToContinue: "続けるんやったら、全ての「せやな」にチェック入れてる必要があるで。"
+pleaseAgreeAllToContinue: "続けるんやったら、全部にチェック入れとかなアカンで。"
continue: "続けるで"
preservedUsernames: "予約ユーザー名"
preservedUsernamesDescription: "予約しとくユーザー名を行ごとに挙げるで。ここで指定されたユーザー名はアカウント作るときに使えへんくなるけど、管理者は例外や。あと、もうあるアカウントも例外やな。"
@@ -1071,29 +1096,29 @@ changeReactionConfirm: "ツッコミを別のに変えるか？"
later: "あとで"
goToMisskey: "Misskeyへ"
additionalEmojiDictionary: "絵文字の追加辞書"
-installed: "インストール済み"
+installed: "インストールしとる"
branding: "ブランディング"
enableServerMachineStats: "サーバーのマシン情報見せびらかすで"
enableIdenticonGeneration: "ユーザーごとのIdenticon生成を有効にする"
turnOffToImprovePerformance: "オフにしたらえらい軽うなるで。"
-createInviteCode: "招待コードを作成"
-createWithOptions: "オプションを指定して作成"
-createCount: "作成数"
+createInviteCode: "招待コード作る"
+createWithOptions: "オプション決めて作る"
+createCount: "作った数"
inviteCodeCreated: "招待コード作ったで"
inviteLimitExceeded: "招待コード作りすぎやで。"
-createLimitRemaining: "作成できる招待コード: 残り {limit} 個やで"
-inviteLimitResetCycle: "{time}で最大 {limit} 個の招待コードを作成できるで。"
+createLimitRemaining: "作れる招待コードは残り {limit} 個や"
+inviteLimitResetCycle: "{time}で最大 {limit} 個の招待コードを作れるで。"
expirationDate: "有効期限"
-noExpirationDate: "有効期限を設けへん"
-inviteCodeUsedAt: "招待コードが使用された日時"
-registeredUserUsingInviteCode: "招待コードを使用したユーザー"
+noExpirationDate: "期限なし"
+inviteCodeUsedAt: "招待コードが使われた時"
+registeredUserUsingInviteCode: "招待コードを使うた人"
waitingForMailAuth: "メール認証待ち"
-inviteCodeCreator: "招待コードを作成したユーザー"
-usedAt: "使用日時"
+inviteCodeCreator: "招待コードを作った人"
+usedAt: "使った時"
unused: "つこてへん"
used: "もうつこてる"
expired: "期限切れ"
-doYouAgree: "同意するんか？"
+doYouAgree: "ええんか？"
beSureToReadThisAsItIsImportant: "重要やから絶対読んでや。"
iHaveReadXCarefullyAndAgree: "「{x}」の内容をよう読んで、同意するで。"
dialog: "ダイアログ"
@@ -1104,59 +1129,181 @@ pastAnnouncements: "過去のお知らせやで"
youHaveUnreadAnnouncements: "あんたまだこのお知らせ読んどらんやろ。"
useSecurityKey: "ブラウザまたはデバイスの言う通りに、セキュリティキーまたはパスキーを使ってや。"
replies: "返事"
-renotes: "Renote"
+renotes: "リノート"
loadReplies: "返信を見るで"
loadConversation: "会話を見るで"
-verifiedLink: "このリンク先の所有者であることが確認されたで。"
-authenticationRequiredToContinue: "続けるには認証をやってや。"
+pinnedList: "ピン留めしはったリスト"
+keepScreenOn: "デバイスの画面を常にオンにすんで"
+verifiedLink: "このリンク先の所有者ってわかったわ。"
+notifyNotes: "投稿を通知"
+unnotifyNotes: "投稿の通知やめる"
+authentication: "認証"
+authenticationRequiredToContinue: "続けるんなら認証してや。"
+dateAndTime: "日時"
+showRenotes: "リノート出す"
+edited: "いじったやつ"
+notificationRecieveConfig: "通知もらうかの設定"
+mutualFollow: "お互いフォローしてんで"
+fileAttachedOnly: "ファイルのっけてあるやつだけ"
+showRepliesToOthersInTimeline: "タイムラインに他の人への返信とかも入れるで"
+hideRepliesToOthersInTimeline: "タイムラインに他の人への返信とかは入れへん"
+showRepliesToOthersInTimelineAll: "タイムラインに今フォローしとる人全員の返信入れるで"
+hideRepliesToOthersInTimelineAll: "タイムラインに今フォローしとる人の返信入れへん"
+confirmShowRepliesAll: "これは元に戻せへんから慎重に決めてや。本当にタイムラインに今フォローしとる全員の返信を入れるか？"
+confirmHideRepliesAll: "これは元に戻せへんから慎重に決めてや。本当にタイムラインに今フォローしとる全員の返信を入れへんのか？"
+externalServices: "他のサイトのサービス"
+impressum: "運営者の情報"
+impressumUrl: "運営者の情報URL"
+impressumDescription: "ドイツとかの一部んところではな、表示が義務付けられてんねん(Impressum)。"
+privacyPolicy: "プライバシーポリシー"
+privacyPolicyUrl: "プライバシーポリシーURL"
+tosAndPrivacyPolicy: "利用規約・プライバシーポリシー"
+avatarDecorations: "アイコンデコレーション"
+attach: "のっける"
+detach: "取る"
+detachAll: "全部とる"
+angle: "角度"
+flip: "反転"
+showAvatarDecorations: "アイコンのデコレーション映す"
+releaseToRefresh: "離したらリロード"
+refreshing: "リロードしとる"
+pullDownToRefresh: "引っ張ってリロードするで"
+disableStreamingTimeline: "タイムラインのリアルタイム更新をやめるで"
+useGroupedNotifications: "通知をグループ分けして出すで"
+signupPendingError: "メアド確認してたらなんか変なことなったわ。リンクの期限切れてるかもしれん。"
+cwNotationRequired: "「内容を隠す」んやったら注釈書かなアカンで。"
+doReaction: "ツッコむで"
+code: "コード"
+reloadRequiredToApplySettings: "設定を見るんにはリロードが必要やで。"
+remainingN: "残り:{n}"
+overwriteContentConfirm: "今の内容に上書きされるけどいい？"
+seasonalScreenEffect: "季節にあった画面の動き"
+decorate: "デコる"
_announcement:
forExistingUsers: "もうおるユーザーのみ"
- forExistingUsersDescription: "有効にすると、このお知らせ作成時点でおるユーザーにのみお知らせが表示されます。無効にすると、このお知らせ作成後にアカウントを作成したユーザーにもお知らせが表示されます。"
- needConfirmationToRead: "既読にするのに確認が必要やで"
- needConfirmationToReadDescription: "有効にすると、このお知らせを既読にする際に確認ダイアログが表示されます。また、一括既読操作の対象にもなりません。"
- end: "お知らせを終了"
- tooManyActiveAnnouncementDescription: "アクティブなお知らせが多いため、UXが低下する可能性があります。終了したお知らせはアーカイブすることを検討した方がええよ。"
+ forExistingUsersDescription: "オンにしたらこのお知らせができた時点でおる人らにだけお知らせが行くで。切ったらこの知らせが行ったあとにアカウント作った人にもちゃんとお知らせが行くで。"
+ needConfirmationToRead: "既読にするんやったら確認してや"
+ needConfirmationToReadDescription: "オンにしたら、このお知らせを既読にする時に確認するで。ついでに、一括既読しても既読扱いにならへんで。"
+ end: "お知らせやめる"
+ tooManyActiveAnnouncementDescription: "お知らせが多すぎてUXが落ちそうや。終わったお知らせはアーカイブに突っ込んだほうがええかも。"
readConfirmTitle: "既読にしてええんやな?"
- readConfirmText: "「{title}」の内容を読み、既読にします。"
+ readConfirmText: "「{title}」はもう読んだから既読にするで。"
+ shouldNotBeUsedToPresentPermanentInfo: "新規ユーザーのUXを損ねやすいから、お知らせはストック情報やのうてフロー情報の掲示に使った方がええで。"
+ dialogAnnouncementUxWarn: "ダイアログ形式のお知らせがいっぺんに2コ以上ある場合、UXに良うないことが多いから、使うんは慎重にすんのがおすすめやで。"
+ silence: "通知せんで"
+ silenceDescription: "オンにすると、このお知らせは通知されへんし、既読にする必要もなくなるで。"
_initialAccountSetting:
accountCreated: "アカウント作り終わったで。"
letsStartAccountSetup: "アカウントの初期設定をしよか。"
- letsFillYourProfile: "最初はあんたのプロフィールを設定しよか。"
+ letsFillYourProfile: "最初はあんたのプロフィールを設定するで。"
profileSetting: "プロフィール設定"
privacySetting: "プライバシー設定"
theseSettingsCanEditLater: "この設定はあとから変えれるで。"
youCanEditMoreSettingsInSettingsPageLater: "これ以外にもいろんな設定を「設定」ページからできるで。後で確認してみてな。"
followUsers: "タイムラインを構築するために、気になるユーザーをフォローしてみ。"
pushNotificationDescription: "プッシュ通知を有効にすると{name}の通知をあんたのデバイスで受け取れるで。"
- initialAccountSettingCompleted: "初期設定が終わったで。"
+ initialAccountSettingCompleted: "初期設定終わりや！"
haveFun: "{name}、楽しんでな～"
- ifYouNeedLearnMore: "{name}(Misskey)の使い方とかをよー知りたいんやったら{link}をみてな。"
+ youCanContinueTutorial: "こんまま{name}(Misskey)の使い方のチュートリアルにも行けるけど、ここでやめてすぐに使い始めてもええで。"
+ startTutorial: "チュートリアルはじめる"
skipAreYouSure: "初期設定飛ばすか？"
laterAreYouSure: "初期設定あとでやり直すん？"
+_initialTutorial:
+ launchTutorial: "チュートリアル見るで"
+ title: "チュートリアルやで"
+ wellDone: "やるやん"
+ skipAreYouSure: "チュートリアルやめるか？"
+ _landing:
+ title: "チュートリアルによう来たな"
+ description: "ここでは、Misskeyのカンタンな使い方とか機能を確かめれんで。"
+ _note:
+ title: "ノートってなんや？"
+ description: "Misskeyでの投稿は「ノート」って呼ばれてんで。ノートは順々にタイムラインに載ってて、リアルタイムで新しくなってってんで。"
+ reply: "返信もできるで。返信の返信もできるから、スレッドっぽく会話をそのまま続けれもするで。"
+ renote: "そのノートを自分のタイムラインに流して共有できるで。テキスト入れて引用してもええな。"
+ reaction: "ツッコミをつけることもできるで。細かいことは次のページや。"
+ menu: "ノートの詳細を出したり、リンクをコピーしたり、いろいろできんねん。"
+ _reaction:
+ title: "ツッコミってなんや？"
+ description: "ノートには「ツッコミ」できんねん。「いいね」とか何言っとるかわからんし、簡単に表現できるのはええことやん？"
+ letsTryReacting: "ノートの「＋」ボタンでツッコめるわ。試しに下のノートにツッコんでみ。"
+ reactToContinue: "ツッコんだら進めるようになるで。"
+ reactNotification: "あんたのノートが誰かにツッコまれたら、すぐ通知するで。"
+ reactDone: "「ー」ボタンでツッコミやめれるで。"
+ _timeline:
+ title: "タイムラインのしくみ"
+ description1: "Misskeyには、いろいろタイムラインがあんで（ただ、サーバーによっては無効化されてるところもあるな）。"
+ home: "あんたがフォローしてるアカウントの投稿が見れんねん。"
+ local: "このサーバーの中におる全員の投稿が見れるで。"
+ social: "ホームタイムラインの投稿もローカルタイムラインのも一緒に見れるで。"
+ global: "繋がってる他の全サーバーからの投稿が見れるで。"
+ description2: "それぞれのタイムラインは、いつでも画面上で切り替えられんねん。覚えとき。"
+ description3: "その他にも、リストタイムラインとかチャンネルタイムラインとかがあんねん。詳しいのは{link}を見とき。"
+ _postNote:
+ title: "ノートの投稿設定"
+ description1: "Misskeyにノートを投稿するとき、いろんなオプションが付けれるで。投稿画面はこんな感じや。"
+ _visibility:
+ description: "ノートを見れる相手を制限できるわ。"
+ public: "みんなに見せるで。"
+ home: "ホームタイムラインにだけ見せるで。フォロワーとか、プロフィールを見に来た人、リノートからも見れるから、実質は全員見れるけどな。あんまし広がりにくいってことや。"
+ followers: "フォロワーにだけ見せるで。自分以外はリノートできへんし、フォロワー以外は絶対に見れへん。"
+ direct: "指定した人にだけ公開されて、ついでに通知も送るで。ダイレクトメールの代わりとして使ってな。"
+ doNotSendConfidencialOnDirect1: "機密情報を送るときは十分注意せえよ。"
+ doNotSendConfidencialOnDirect2: "送信先のサーバーの管理者は投稿内容が見れるから、信用できへんサーバーのひとにダイレクト投稿するときには、めっちゃ用心しとくんやで。"
+ localOnly: "他のサーバーに投稿せえへんくなるで。他の公開範囲とか一切無視して、他のサーバーの人らはこの設定がされたノートは絶対に見れへん。"
+ _cw:
+ title: "内容隠し（CW）"
+ description: "本文のかわりに「注釈」に書いた内容だけ見せるで。「続き見して！」を押すと本文も見れんねん。"
+ _exampleNote:
+ cw: "飯テロ注意"
+ note: "チョコドーナツめっちゃ美味かったわ🍩😋"
+ useCases: "サーバーのガイドラインに決められとるノートに使うたり、ネタバレとかきわどい内容を自分で隠したりするとき用やな。"
+ _howToMakeAttachmentsSensitive:
+ title: "のっけたファイルをセンシティブにするんは？"
+ description: "サーバーのガイドラインに書いてあったり、そのままおっぴろげとくのはあんま良うないファイルには「センシティブ」っちゅう設定をつけるんや。"
+ tryThisFile: "試しに、これにのっけてある画像をセンシティブにしてみいや！"
+ _exampleNote:
+ note: "納豆のフタ開けるときにやらかしてもうた…"
+ method: "のっけたファイルをセンシティブにするときは、そのファイルを押してメニュー開けて、「ちょっとこれはアカン」を押すんよ。"
+ sensitiveSucceeded: "ファイルをのっけるときは、サーバーの言うこと聞いてちゃんと設定するんやで。"
+ doItToContinue: "画像をちゃんと設定したら先に進めるで。"
+ _done:
+ title: "チュートリアル終わり！おつかれさん🎉"
+ description: "ここで紹介したのは全部の中のちょび～っとだけや。もっと使い方知りたいんやったら、{link}を見ときや。"
+_timelineDescription:
+ home: "ホームタイムラインは、あんたがフォローしとるアカウントの投稿だけ見れるで。"
+ local: "ローカルタイムラインは、このサーバーにおる全員の投稿を見れるで。"
+ social: "ソーシャルタイムラインは、ホームタイムラインの投稿もローカルタイムラインのも一緒に見れるで。"
+ global: "グローバルタイムラインは、繋がっとる他のサーバーの投稿、全部ひっくるめて見れんで。"
_serverRules:
- description: "新規登録前に見せる、サーバーの簡潔なルールを設定すんで。内容は使うための決め事の要約とすることを推奨するわ。"
+ description: "新規登録前に見せる、サーバーのカンタンなルールを決めるで。内容は使うための決め事の要約がええと思うわ。"
_serverSettings:
iconUrl: "アイコン画像のURL"
appIconDescription: "{host}がアプリとして表示してるんやつをアイコンを指定すんで。"
- appIconUsageExample: "PWAや、スマートフォンのホーム画面にブックマークとして追加された時など"
- appIconStyleRecommendation: "円形もしくは角丸にクロップされる場合があるさかいに、塗り潰された余白のある背景があるものが推奨されるで。"
- appIconResolutionMustBe: "解像度は必ず{resolution}である必要があるで。"
- shortNameDescription: "サーバーの名前が長い時に、代わりに表示することのできるあだ名。"
+ appIconUsageExample: "例えば、PWAとか、スマホのホームにブックマークしたときとか"
+ appIconStyleRecommendation: "円か角丸に切り取られることがあるさかい、塗り潰した余白のある背景があるものがおすすめや。"
+ appIconResolutionMustBe: "解像度は絶対{resolution}じゃないとアカン。"
+ manifestJsonOverride: "manifest.jsonのオーバーライド"
+ shortName: "略称"
+ shortNameDescription: "サーバーの名前が長ったらしい時に、代わりに出すあだ名。"
+ fanoutTimelineDescription: "入れると、おのおのタイムラインを取得するときにめちゃめちゃ動きが良うなって、データベースが軽くなるわ。でも、Redisのメモリ使う量が増えるから注意な。サーバーのメモリが足りんときとか、動きが変なときは切れるで。"
+ fanoutTimelineDbFallback: "データベースにフォールバックする"
+ fanoutTimelineDbFallbackDescription: "有効にしたら、タイムラインがキャッシュん中に入ってないときにDBにもっかい問い合わせるフォールバック処理ってのをやっとくで。切ったらフォールバック処理をやらんからサーバーはもっと軽くなんねんけど、タイムラインの取得範囲がちょっと減るで。"
_accountMigration:
moveFrom: "別のアカウントからこのアカウントに引っ越す"
moveFromSub: "別のアカウントへエイリアスを作る"
- moveFromLabel: "引っ越し元のアカウント："
- moveFromDescription: "別のアカウントからこのアカウントにフォロワーを引き継いで引っ越したかったら、ここでエイリアスを作っとく必要があるで。必ずお引っ越しを実行する前に作っとかなあかんで！引っ越し元のアカウントをこんな風に入力してくれへんか？：@person@instance.com"
+ moveFromLabel: "引っ越しする前のアカウント #{n}"
+ moveFromDescription: "別のアカウントからこのアカウントにフォロワーを引っ越ししたいんなら、ここでエイリアスを作っとかなアカンで。\n引っ越す前のアカウントをこんな感じに入力してや: @username@server.example.com\n入力欄空っぽやったら消しとくで（おすすめはせえへん）。"
moveTo: "このアカウントをさらのアカウントに引っ越すで"
- moveToLabel: "引っ越し先のアカウント："
- moveCannotBeUndone: "アカウントを移行すると、取り消すことはできへんくなります。"
+ moveToLabel: "引っ越し先のアカウント:"
+ moveCannotBeUndone: "アカウント引っ越したらもう戻せへん。"
moveAccountDescription: "おニューのアカウントに移行すんで。\n ・フォロワーがおニューの方を勝手にフォローすんで。\n ・このアカウントからのフォローはまるまる全部解除されんで。\n ・このアカウントでノート作れへんようになるで。\n\nフォロワーの移行は勝手にこっちでやっとくけど、フォローの移行は自分でしてや。移行前にこのアカウントでフォローエクスポートして、移行したあとすぐにおニューのところでインポートしてくれな。\nリストとかミュート、あとブロックもおんなじや。自分で移行してな。\n\n（この説明はこのサーバー、つまりMisskey v13.12.0から後の仕様や。Mastodonとか他のActivityPubソフトやとちょっと挙動が違うこともあんで。）"
- moveAccountHowTo: "アカウントの引っ越しには、まず引っ越し先のアカウントで自分のアカウントに対しエイリアスを作成しなはれや。\nエイリアス作成した後、引っ越し先のアカウントを次のように入力してくれへんか？:@username@server.example.com"
- startMigration: "引っ越しする"
+ moveAccountHowTo: "アカウントの引っ越しには、まず引っ越し先のアカウントで自分のアカウントに対しエイリアスを作ってな。\nエイリアス作ったら、引っ越し先のアカウントをこんな感じに入れてや: @username@server.example.com"
+ startMigration: "引っ越す"
migrationConfirm: "ほんまにこのアカウントを {account} に引っ越すんか？一回引っ越してもうたら取り消されへんし、二度とこのアカウントを元に戻されへんくなるで。\nそれと、引っ越し先のアカウントでエイリアスが作れたかちゃ～んと確認しーや？"
- movedAndCannotBeUndone: "\nアカウントはもう引っ越されてます。\n引っ越しを取り消すことはできまへん。"
+ movedAndCannotBeUndone: "\nアカウントはもう引っ越し済みや。\nこれはもう戻せへん。"
postMigrationNote: "このアカウントからのフォロー解除は移行操作から丸一日経ったら実行されんで。\nこのアカウントのフォロー・フォロワー数はどっちも0や。フォローの解除はされへんから、あんたのフォロワーはこのアカウントのフォロワー向けの投稿をこの後も見れるで。"
- movedTo: "引っ越し先のアカウント："
+ movedTo: "引っ越し先のアカウント:"
_achievements:
earnedAt: "貰った日ぃ"
_types:
@@ -1180,10 +1327,10 @@ _achievements:
title: "箕面の滝からノート"
description: "ノートを5,000回投稿した"
_notes10000:
- title: "スーパーノート"
+ title: "えげつないノート"
description: "ノートを10,000回投稿した"
_notes20000:
- title: "ニードモアノート"
+ title: "もっとノートよこせ！"
description: "ノートを20,000回投稿した"
_notes30000:
title: "ノートノートノート"
@@ -1280,7 +1427,7 @@ _achievements:
title: "はじめてのフォロー"
description: "初めてフォローした"
_following10:
- title: "ついてく、ついてく"
+ title: "すたこらさっさ"
description: "フォローが10人超えた"
_following50:
title: "友達ぎょうさん"
@@ -1333,10 +1480,10 @@ _achievements:
description: "クライアント付けてから１時間経ってもうたで。"
_noteDeletedWithin1min:
title: "＊おおっと＊"
- description: "投稿してから1分以内にその投稿を消した"
+ description: "投稿してから1分以内にその投稿をほかした"
_postedAtLateNight:
title: "夜行性"
- description: "深夜にノートを投稿した"
+ description: "真夜中にノートを投稿した"
flavor: "そろそろ寝よか"
_postedAt0min0sec:
title: "時報"
@@ -1353,7 +1500,7 @@ _achievements:
description: "サーバーのチャートを表示した"
_outputHelloWorldOnScratchpad:
title: "Hello, world!"
- description: "スクラッチパッドで hello worldを出力した"
+ description: "スクラッチパッドで hello world を出力した"
_open3windows:
title: "マド開けすぎ"
description: "ウィンドウを3つ以上開いた状態にした"
@@ -1362,7 +1509,7 @@ _achievements:
description: "ドライブのフォルダを再帰的な入れ子にしようとした"
_reactWithoutRead:
title: "ちゃんと読んだんか？"
- description: "100文字以上のテキストを含むノートに投稿されてから3秒以内にツッコんだ"
+ description: "100文字以上のノートに投稿3秒以内にツッコんだ"
_clickedClickHere:
title: "ここをクリック"
description: "ここをクリックした"
@@ -1371,7 +1518,7 @@ _achievements:
description: "10秒ごとに0.005％の確率で獲得"
_setNameToSyuilo:
title: "神様コンプレックス"
- description: "名前を syuilo に設定した"
+ description: "名前を syuilo にした"
_passedSinceAccountCreated1:
title: "一周年"
description: "アカウント作成から1年経過した"
@@ -1396,6 +1543,12 @@ _achievements:
title: "Brain Diver"
description: "Brain Diverへのリンクを投稿したった"
flavor: "Misskey-Misskey La-Tu-Ma"
+ _smashTestNotificationButton:
+ title: "心配性"
+ description: "通知のテストしすぎやって"
+ _tutorialCompleted:
+ title: "Misskeyひよっこ講座 修了証"
+ description: "チュートリアル全部やった"
_role:
new: "ロールの作成"
edit: "ロールの編集"
@@ -1406,58 +1559,63 @@ _role:
assignTarget: "アサイン"
descriptionOfAssignTarget: "マニュアルは誰がこのロールに含まれてるかを手動で管理するで。\nコンディショナルは条件を設定して、それに合うユーザーが自動で含まれるようになるで。"
manual: "マニュアル"
+ manualRoles: "マニュアルロール"
conditional: "コンディショナル"
+ conditionalRoles: "コンディショナルロール"
condition: "条件"
isConditionalRole: "これはコンディショナルロールやで"
isPublic: "ロールを公開"
- descriptionOfIsPublic: "ロールにアサインされたユーザーを誰でも見ることができるで。そんで、ユーザーのプロフィールでこのロールが表示されるで。"
+ descriptionOfIsPublic: "プロフィールでこのロールが出されるで。"
options: "オプション"
policies: "ポリシー"
baseRole: "ベースロール"
- useBaseValue: "ベースロールの値を使用"
- chooseRoleToAssign: "アサインするロールを選択"
+ useBaseValue: "ベースロールの値使う"
+ chooseRoleToAssign: "アサインするロール選ぶ"
iconUrl: "アイコン画像のURL"
asBadge: "バッジとして見せる"
descriptionOfAsBadge: "オンにすると、ユーザー名の横んとこにロールのアイコンが表示されるで。"
- isExplorable: "ロールタイムラインを公開するで〜"
- descriptionOfIsExplorable: "オンにしたらロールのタイムラインを公開するで〜。でもロールの公開をオフにしたら公開されへんよ。"
+ isExplorable: "ユーザーを見つけやすくしたる"
+ descriptionOfIsExplorable: "オンにしたらロールの面子一覧が「みつける」で公開されるし、ロールのタイムラインが使えるようになるで。"
displayOrder: "表示順"
descriptionOfDisplayOrder: "数がでかいほど、UI上で先に表示されるで。"
- canEditMembersByModerator: "モデレーターのメンバー編集を許可"
- descriptionOfCanEditMembersByModerator: "オンにすると、管理者に加えてモデレーターもこのロールへユーザーをアサイン/アサイン解除できるようになるで。オフにすると管理者のみが行えるで。"
+ canEditMembersByModerator: "モデレーターがメンバーいじるのを許す"
+ descriptionOfCanEditMembersByModerator: "オンにすると、管理者だけやなくてモデレーターもこのロールにユーザーを入れたり抜いたりできるで。オフにすると管理者だけしかやれへんくなるで。"
priority: "優先度"
_priority:
low: "低い"
- middle: "中"
+ middle: "中くらい"
high: "高い"
_options:
- gtlAvailable: "グローバルタイムラインの閲覧"
- ltlAvailable: "ローカルタイムラインの閲覧"
- canPublicNote: "パブリック投稿の許可"
- canInvite: "サーバー招待コードの発行"
- inviteLimit: "招待コードの作成可能数"
- inviteLimitCycle: "招待コードの発行間隔"
- inviteExpirationTime: "招待コードの有効期限"
+ gtlAvailable: "グローバルタイムライン見る"
+ ltlAvailable: "ローカルタイムライン見る"
+ canPublicNote: "パブリック投稿できるか"
+ canInvite: "サーバー招待コード作る"
+ inviteLimit: "招待コード作れる数"
+ inviteLimitCycle: "招待コードの作れる間隔"
+ inviteExpirationTime: "招待コードの期限"
canManageCustomEmojis: "カスタム絵文字の管理"
+ canManageAvatarDecorations: "アバターを飾るモンの管理"
driveCapacity: "ドライブ容量"
alwaysMarkNsfw: "勝手にファイルにNSFWをくっつける"
- pinMax: "ノートのピン留めの最大数"
- antennaMax: "アンテナの作成可能数"
+ pinMax: "ノートピン留めできる数"
+ antennaMax: "アンテナ作れる数"
wordMuteMax: "ワードミュートの最大文字数"
- webhookMax: "Webhockの作成可能数"
- clipMax: "クリップの作成可能数"
- noteEachClipsMax: "クリップ内のノートの最大数"
- userListMax: "ユーザーリストの作成可能数"
+ webhookMax: "Webhook作れる数"
+ clipMax: "クリップ作れる数"
+ noteEachClipsMax: "クリップの中にノート作れる数"
+ userListMax: "ユーザーリスト作れる数"
userEachUserListsMax: "ユーザーリスト内のユーザーの最大数"
rateLimitFactor: "レートリミット"
descriptionOfRateLimitFactor: "ちっちゃいほど制限が緩なって、大きいほど制限されるで。"
- canHideAds: "広告を表示させへん"
- canSearchNotes: "ノート検索を使わすかどうか"
+ canHideAds: "広告映さへん"
+ canSearchNotes: "ノート探せるかどうか"
+ canUseTranslator: "翻訳使えるかどうか"
+ avatarDecorationLimit: "アイコンデコのいっちばんつけれる数"
_condition:
isLocal: "ローカルユーザー"
isRemote: "リモートユーザー"
- createdLessThan: "アカウント作成から～以内"
- createdMoreThan: "アカウント作成から～経過"
+ createdLessThan: "アカウント作ってから～以内"
+ createdMoreThan: "アカウント作ってから～経過"
followersLessThanOrEq: "フォロワー数が～以下"
followersMoreThanOrEq: "フォロワー数が～以上"
followingLessThanOrEq: "フォロー数が～以下"
@@ -1466,41 +1624,45 @@ _role:
notesMoreThanOrEq: "投稿を～以上しとる"
and: "～かつ～"
or: "～または～"
- not: "～ではない"
+ not: "～じゃない"
_sensitiveMediaDetection:
- description: "機械学習を使って自動でセンシティブなメディアを検出して、モデレーションに役立てることができるで。サーバーの負荷が少し増えてまうなあ。"
+ description: "機械学習で自動できわどいメディアを検出して、運営しやすくするで。でもサーバーが少し重くなってまうわ。"
sensitivity: "検出感度やで"
sensitivityDescription: "感度を低くすると、誤検知(偽陽性)が減るで。感度を高くすると、検知漏れ(偽陰性)が減るで。"
- setSensitiveFlagAutomatically: "NSFWフラグを設定するで"
- setSensitiveFlagAutomaticallyDescription: "この設定をオフにしても内部的に判定結果は保持されるで。"
+ setSensitiveFlagAutomatically: "センシティブフラグを設定するで"
+ setSensitiveFlagAutomaticallyDescription: "この設定切っても内部的には判定結果はそのままや。"
analyzeVideos: "動画の解析をオンにするで"
- analyzeVideosDescription: "画像に加えて動画も解析するようにするで。鯖の負荷が少し増えるで。"
+ analyzeVideosDescription: "画像だけじゃなくて動画も解析するようにするで。サーバーがちょっと重くなるで。"
_emailUnavailable:
- used: "もう使われとるで"
+ used: "もう使われとるわ"
format: "形式がおかしいで"
- disposable: "永久に使えるアドレスじゃないみたいやで"
- mx: "正しいメールサーバーじゃない見たいやで"
- smtp: "メールサーバーが応答してないみたいや"
+ disposable: "ずーっと使えるアドレスじゃないみたいや"
+ mx: "正しいメールサーバーじゃないっぽいわ"
+ smtp: "メールサーバーがうんともすんとも言わへん"
_ffVisibility:
public: "公開"
followers: "フォロワーだけに公開"
private: "非公開"
_signup:
- almostThere: "ほぼ完了やで"
+ almostThere: "ほぼ終わったようなもんや"
emailAddressInfo: "あんたが使っとるメアドを入力してなー。入れたメアドが公開されることはないで。"
- emailSent: "さっき入れたメールアドレス({email})宛に確認のメールが送られたで。メールに書かれたリンクにアクセスすれば、アカウントの作成が完了や！"
+ emailSent: "さっき入れたメアド({email})宛に確認メールを送ったで。メールに書かれたリンク押してアカウント作るの終わらしてな。\nメールの認証リンクの期限は30分や。"
_accountDelete:
accountDelete: "アカウントの削除"
- mayTakeTime: "アカウントの削除は負荷がかかる処理やねんて。やから作ったコンテンツの数や上げたファイルの数が多いと削除が終わるまでに時間がかかることがあるんやって。"
- sendEmail: "アカウントの削除が終わるときは、登録してたメールアドレス宛に通知を送るで。"
- requestAccountDelete: "アカウント削除をリクエスト"
+ mayTakeTime: "アカウント消すんはサーバーが重いんやって。やから作ったコンテンツとか上げたファイルの数が多いと消し終わるまでに時間がかかるかもしれへん。"
+ sendEmail: "アカウントの消し終わるときは、登録してたメアドに通知するで。"
+ requestAccountDelete: "アカウント削除頼む"
started: "削除処理が始まったで。"
- inProgress: "削除が進んでるで"
+ inProgress: "今消しよるで"
_ad:
back: "戻る"
- reduceFrequencyOfThisAd: "この広告の表示頻度を下げるで"
+ reduceFrequencyOfThisAd: "この広告ちょっとうざったらしいわ"
hide: "表示せん"
- timezoneinfo: "曜日はサーバーのタイムゾーンを元に指定されるで。"
+ timezoneinfo: "曜日はサーバーのタイムゾーンを元に決めるで。"
+ adsSettings: "広告配信設定"
+ notesPerOneAd: "リアタイ更新中に広告を出す間隔（ノートの個数な）"
+ setZeroToDisable: "0でリアタイ更新時の広告配信を無効にすんで"
+ adsTooClose: "広告を出す間隔がめっちゃ短いから、ユーザー体験がめちゃめちゃ悪くなるかもしれへん。"
_forgotPassword:
enterEmail: "アカウントに登録したメールアドレスをここに入力してや。そのアドレス宛に、パスワードリセット用のリンクが送られるから待っててな～。"
ifNoEmail: "メールアドレスを登録してへんのやったら、管理者まで教えてな～。"
@@ -1519,7 +1681,7 @@ _plugin:
install: "プラグインのインストール"
installWarn: "信頼できへんプラグインはインストールせんとってな"
manage: "プラグインの管理"
- viewSource: "ソースを表示"
+ viewSource: "ソース見る"
_preferencesBackups:
list: "作ったバックアップ"
saveNew: "新しく保存"
@@ -1553,30 +1715,32 @@ _aboutMisskey:
donate: "Misskeyに寄付"
morePatrons: "他にもぎょうさんの人からサポートしてもろてんねん。ほんまおおきに🥰"
patrons: "支援者"
+ projectMembers: ""
_displayOfSensitiveMedia:
respect: "きわどいのは見とうない"
ignore: "きわどいのも見たい"
force: "常にメディアを隠すで"
_instanceTicker:
none: "表示せん"
- remote: "リモートユーザーに表示"
- always: "常に表示"
+ remote: "リモートユーザーに見せる"
+ always: "いつでも見せる"
_serverDisconnectedBehavior:
reload: "自動でリロード"
dialog: "ダイアログで警告"
quiet: "控えめに警告"
_channel:
- create: "チャンネルを作る"
- edit: "チャンネルを編集"
+ create: "チャンネル作る"
+ edit: "チャンネルいじる"
setBanner: "バナーを設定"
removeBanner: "バナーを削除"
featured: "トレンド"
- owned: "管理中"
+ owned: "管理しとる"
following: "フォロー中やで"
- usersCount: "{n}人が参加中やで"
+ usersCount: "{n}人が参加しとる"
notesCount: "{n}こ投稿があるで"
nameAndDescription: "名前と説明"
nameOnly: "名前だけ"
+ allowRenoteToExternal: "チャンネルの外にリノートできるようにする"
_menuDisplay:
sideFull: "横"
sideIcon: "横(アイコン)"
@@ -1602,7 +1766,7 @@ _theme:
builtinThemes: "標準のテーマ"
alreadyInstalled: "そのテーマはもうインストールされとるで？"
invalid: "テーマの形式が間違ってるみたいや"
- make: "テーマを作る"
+ make: "テーマ作る"
base: "ベース"
addConstant: "定数を追加"
constant: "定数"
@@ -1649,9 +1813,6 @@ _theme:
infoFg: "情報の文字"
infoWarnBg: "警告の背景"
infoWarnFg: "警告の文字"
- cwBg: "CW ボタンの背景"
- cwFg: "CW ボタンの文字"
- cwHoverBg: "CW ボタンの背景 (ホバー)"
toastBg: "通知トーストの背景"
toastFg: "通知トーストの文字"
buttonBg: "ボタンの背景"
@@ -1671,6 +1832,14 @@ _sfx:
notification: "通知"
antenna: "アンテナ受信"
channel: "チャンネル通知"
+ reaction: "ツッコミ選んどるとき"
+_soundSettings:
+ driveFile: "ドライブん中の音使う"
+ driveFileWarn: "ドライブん中のファイル選びや"
+ driveFileTypeWarn: "このファイルは対応しとらへん"
+ driveFileTypeWarnDescription: "音声ファイルを選びや"
+ driveFileDurationWarn: "音が長すぎるわ"
+ driveFileDurationWarnDescription: "長い音使うたらMisskey使うのに良うないかもしれへんで。それでもええか？"
_ago:
future: "未来"
justNow: "ついさっき"
@@ -1682,31 +1851,30 @@ _ago:
monthsAgo: "{n}ヶ月前"
yearsAgo: "{n}年前"
invalid: "あらへん"
+_timeIn:
+ seconds: "{n}秒後"
+ minutes: "{n}分後"
+ hours: "{n}時間後"
+ days: "{n}日後"
+ weeks: "{n}週間後"
+ months: "{n}ヶ月後"
+ years: "{n}年後"
_time:
second: "秒"
minute: "分"
hour: "時間"
day: "日"
-_timelineTutorial:
- title: "Misskeyってなんや？"
- step1_1: "これは「タイムライン」や。{name}に投稿された「ノート」が順番に表示されるで。"
- step1_2: "タイムラインには何個か種類があってな、例えば「ホームタイムライン」だったらあんたのフォローしてる人のノート、「ローカルタイムライン」には{name}全部のノートが流れてくるで。"
- step2_1: "試しに、何かノートを投稿してみ。画面の鉛筆マークのボタンでフォームが開くで。"
- step2_2: "最初のノートは、自己紹介とか「{name}始めてみたんや」とかがええと思うで。"
- step3_1: "投稿できた？"
- step3_2: "あんたのノートがタイムラインに出てきたら成功や。"
- step4_1: "ノートには、「ツッコミ」を付けれるで。"
- step4_2: "ツッコむんやったら、ノートの「+」マークを押して、好きな絵文字を選ぶんやで。"
_2fa:
alreadyRegistered: "もう設定終わっとるわ。"
registerTOTP: "認証アプリの設定はじめる"
step1: "ほんなら、{a}や{b}とかの認証アプリを使っとるデバイスにインストールしてな。"
step2: "次に、ここにあるQRコードをアプリでスキャンしてな～。"
- step2Click: "QRコードをクリックすると、今使とる端末に入っとる認証アプリとかキーリングに登録できるで。"
+ step2Click: "QRコード押したら、今使とる端末に入っとる認証アプリとかキーリングに登録できるで。"
+ step2Uri: "デスクトップアプリを使う時は次のURIを入れるで"
step3Title: "確認コードを入れてーや"
- step3: "アプリに表示されているトークンを入力して終わりや。"
- setupCompleted: "設定が完了したで。"
- step4: "これからログインするときも、同じようにトークンを入力するんやで"
+ step3: "アプリに映っとる確認コード（トークン）を入れて終わりや。"
+ setupCompleted: "設定が終わったで。"
+ step4: "これからログインするときも、同じようにコードを入れるんや。"
securityKeyNotSupported: "今使とるブラウザはセキュリティキーに対応してへんのやってさ。"
registerTOTPBeforeKey: "セキュリティキー・パスキーを登録するんやったら、まず認証アプリを設定してーな。"
securityKeyInfo: "FIDO2をサポートするハードウェアセキュリティキーか端末の指紋認証やPINを使ってログインするように設定できるで。"
@@ -1721,6 +1889,7 @@ _2fa:
renewTOTPOk: "もっかい設定する"
renewTOTPCancel: "やめとく"
checkBackupCodesBeforeCloseThisWizard: "このウィザードを閉じる前に、したのバックアップコードを確認しいや。"
+ backupCodes: "バックアップコード"
backupCodesDescription: "認証アプリが使用できんなった場合、以下のバックアップコードを使ってアカウントにアクセスできるで。これらのコードは必ず安全な場所に置いときや。各コードは一回だけ使用できるで。"
backupCodeUsedWarning: "バックアップコードが使用されたで。認証アプリが使えなくなってるん場合、なるべく早く認証アプリを再設定しや。"
backupCodesExhaustedWarning: "バックアップコードが全て使用されたで。認証アプリを利用できん場合、これ以上アカウントにアクセスできなくなるで。認証アプリを再登録しや。"
@@ -1776,6 +1945,7 @@ _antennaSources:
homeTimeline: "フォローしとるユーザーのノート"
users: "選らんだ一人か複数のユーザーのノート"
userList: "選んだリストのユーザーのノート"
+ userBlacklist: "選んだ１人か複数のユーザーのノート"
_weekday:
sunday: "日曜日"
monday: "月曜日"
@@ -1814,6 +1984,7 @@ _widgets:
_userList:
chooseList: "リストを選ぶ"
clicker: "クリッカー"
+ birthdayFollowings: "今日誕生日のツレ"
_cw:
hide: "隠す"
show: "続き見して！"
@@ -1875,6 +2046,8 @@ _profile:
metadataContent: "内容"
changeAvatar: "アバター画像を変更するで"
changeBanner: "バナー画像を変更するで"
+ verifiedLinkDescription: "内容をURLに設定すると、リンク先のwebサイトに自分のプロフのリンクが含まれてる場合に所有者確認済みアイコンを表示させることができるで。"
+ avatarDecorationMax: "最大{max}つまでデコつけれんで"
_exportOrImport:
allNotes: "全てのノート"
favoritedNotes: "お気に入りにしたノート"
@@ -1884,6 +2057,7 @@ _exportOrImport:
userLists: "リスト"
excludeMutingUsers: "ミュートしてるユーザーは入れんとくわ"
excludeInactiveUsers: "使われてなさそうなアカウントは入れんとくわ"
+ withReplies: "インポートした人による返信をTLに含むようにすんで。"
_charts:
federation: "連合"
apRequest: "リクエスト"
@@ -1988,19 +2162,25 @@ _notification:
youGotMention: "{name}からのメンション"
youGotReply: "{name}からのリプライ"
youGotQuote: "{name}による引用"
- youRenoted: "{name}がRenoteしたみたいやで"
+ youRenoted: "{name}がリノートしたみたいやで"
youWereFollowed: "フォローされたで"
youReceivedFollowRequest: "フォロー許可してほしいみたいやな"
yourFollowRequestAccepted: "フォローさせてもろたで"
pollEnded: "アンケートの結果が出たみたいや"
+ newNote: "さらの投稿"
unreadAntennaNote: "アンテナ {name}"
emptyPushNotificationMessage: "プッシュ通知の更新をしといたで"
achievementEarned: "実績を獲得しとるで"
+ testNotification: "通知テスト"
checkNotificationBehavior: "通知の表示を確かめるで"
sendTestNotification: "テスト通知を送信するで"
notificationWillBeDisplayedLikeThis: "通知はこのように表示されるで"
+ reactedBySomeUsers: "{n}人がツッコんだで"
+ renotedBySomeUsers: "{n}人がリノートしたで"
+ followedBySomeUsers: "{n}人にフォローされたで"
_types:
all: "すべて"
+ note: "あんたらの新規投稿"
follow: "フォロー"
mention: "メンション"
reply: "リプライ"
@@ -2035,6 +2215,7 @@ _deck:
widgetsIntroduction: "カラムのメニューから、「ウィジェットの編集」を選んでウィジェットを追加してなー"
useSimpleUiForNonRootPages: "非ルートページは簡易UIで表示"
usedAsMinWidthWhenFlexible: "「幅を自動調整」が有効の場合、これが幅の最小値となるで"
+ flexible: "幅を自動調整"
_columns:
main: "メイン"
widgets: "ウィジェット"
@@ -2066,10 +2247,104 @@ _webhookSettings:
followed: "フォローもらったとき～！"
note: "ノートを投稿したとき～！"
reply: "返信があるとき～！"
- renote: "Renoteされるとき～！"
- reaction: "ツッコミがあるとき～！"
+ renote: "リノートされるとき～！"
+ reaction: "ツッコまれたとき～！"
mention: "メンションがあるとき～！"
_moderationLogTypes:
+ createRole: "ロールを追加すんで"
+ deleteRole: "ロールほかす"
+ updateRole: "ロールの更新すんで"
+ assignRole: "ロールへアサイン"
+ unassignRole: "ロールのアサインほかす"
suspend: "凍結"
+ unsuspend: "凍結解除"
+ addCustomEmoji: "自由な絵文字追加されたで"
+ updateCustomEmoji: "自由な絵文字更新されたで"
+ deleteCustomEmoji: "自由な絵文字消されたで"
+ updateServerSettings: "サーバー設定更新すんねん"
+ updateUserNote: "モデレーションノート更新"
+ deleteDriveFile: "ファイルをほかす"
+ deleteNote: "ノートを削除"
+ createGlobalAnnouncement: "みんなへの通告を作成したで"
+ createUserAnnouncement: "あんたらへの通告を作成したで"
+ updateGlobalAnnouncement: "みんなへの通告更新したったで"
+ updateUserAnnouncement: "あんたらへの通告更新したったで"
+ deleteGlobalAnnouncement: "みんなへの通告消したったで"
+ deleteUserAnnouncement: "あんたらへのお知らせを削除"
resetPassword: "パスワードをリセット"
- createInvitation: "招待コードを作成"
+ suspendRemoteInstance: "リモートサーバーを止めんで"
+ unsuspendRemoteInstance: "リモートサーバーを再開すんで"
+ markSensitiveDriveFile: "ファイルをセンシティブ付与"
+ unmarkSensitiveDriveFile: "ファイルをセンシティブ解除"
+ resolveAbuseReport: "苦情を解決"
+ createInvitation: "招待コード作る"
+ createAd: "広告を作んで"
+ deleteAd: "広告ほかす"
+ updateAd: "広告を更新"
+ createAvatarDecoration: "アイコンデコレーションを作成"
+ updateAvatarDecoration: "アイコンデコレーションを更新"
+ deleteAvatarDecoration: "アイコンデコレーションを削除"
+ unsetUserAvatar: "この子のアイコン元に戻す"
+ unsetUserBanner: "この子のバナー元に戻す"
+_fileViewer:
+ title: "ファイルの詳しい情報"
+ type: "ファイルの種類"
+ size: "ファイルのでかさ"
+ url: "URL"
+ uploadedAt: "追加した日"
+ attachedNotes: "ファイルがついてきてるノート"
+ thisPageCanBeSeenFromTheAuthor: "このページはこのファイルをアップした人しか見れへんねん。"
+_externalResourceInstaller:
+ title: "ほかのサイトからインストール"
+ checkVendorBeforeInstall: "配ってるとこが信頼できるか確認した上でインストールしてな。"
+ _plugin:
+ title: "このプラグイン、インストールする？"
+ metaTitle: "プラグイン情報"
+ _theme:
+ title: "このテーマインストールする？"
+ metaTitle: "テーマ情報"
+ _meta:
+ base: ""
+ _vendorInfo:
+ title: ""
+ endpoint: ""
+ hashVerify: ""
+ _errors:
+ _invalidParams:
+ title: ""
+ description: ""
+ _resourceTypeNotSupported:
+ title: ""
+ description: ""
+ _failedToFetch:
+ title: ""
+ fetchErrorDescription: "他のサイトに繋がらんかったわ。もっかいやってもダメやったら、サイトの管理してる人に言っといて。"
+ parseErrorDescription: "他のサイトから持ってきたデータ、よう分からんかったわ。サイトの管理してる人に言っといて。"
+ _hashUnmatched:
+ title: "ちゃんとしたデータが持ってこれんかったわ"
+ description: "もらったデータがなんかおかしいっぽいわ。ちょっと危ないからインストールはできへん。サイト管理してる人に言っといてな。"
+ _pluginParseFailed:
+ title: "AiScriptエラー起こしてもうたねん"
+ description: "データは取得できたものの、AiScript解析時にエラーがあったから読み込めへんかってん。すまんが、プラグインを作った人に問い合わせてくれへん？ごめんな。エラーの詳細はJavaScriptコンソール読んでな。"
+ _pluginInstallFailed:
+ title: "プラグインのインストール失敗してもた"
+ description: "プラグインのインストール中に問題発生してもた、もう1度試してな。エラーの詳細はJavaScriptのコンソール見てや。"
+ _themeParseFailed:
+ title: "テーマ解析エラー"
+ description: "データは取れたんやが、テーマファイル読み込んどる時にエラーがあったから読み込めへんかったわ。すまんけど、テーマ作った人に言うてくれへん？ごめんな。エラーの詳細はJavaScriptコンソール読んでな。"
+ _themeInstallFailed:
+ title: "テーマインストールに失敗してもた"
+ description: "なんかテーマインストールできんかったわ。もう一回試してな。細かいのはJavaScriptのコンソール見てや。"
+_dataSaver:
+ _media:
+ title: "メディアの読み込み"
+ description: "絵・動画が自動で読まれるのをふせぐわ。隠れてる絵・動画はタップするとひょっこりはんしてくれんで。"
+ _avatar:
+ title: "アイコンの絵"
+ description: "アイコン画像のアニメが止まるで。普通の画像よりもデータ量がでかいから、もっと通信量を節約できるねん。"
+ _urlPreview:
+ title: "URLプレビューのサムネイル画像"
+ description: "URLプレビューのサムネイル画像が読み込まへんなるで。"
+ _code:
+ title: "コードハイライト"
+ description: "MFMとかでコードハイライト記法が使われてるとき、タップするまで読み込まれへんくなるで。コードハイライトではハイライトする言語ごとにその決めてるファイルを読む必要はあんねんな。けどな、それは自動で読み込まれなくなるから、通信量を少なくできることができるねん。"
diff --git a/locales/ko-GS.yml b/locales/ko-GS.yml
new file mode 100644
index 0000000000..9b113ad1b9
--- /dev/null
+++ b/locales/ko-GS.yml
@@ -0,0 +1,584 @@
+---
+_lang_: "한국어(경상)"
+headlineMisskey: "노트로 이언 네트워크"
+introMisskey: "어서 오이소! Misskey넌 오픈소스 분산헹 마이크로 블로그 서비스입니다.\n‘노트’럴 맨걸어서 지검 일나넌 일얼 노누던가 내 이바구럴 남한데 서 보이소.📡\n‘리액션’ 기넝서 남으 노트에 억수로 빠리게 답할 수 잇십니다.👍\n새롭운 세게럴 탐험해 보입시다.🚀"
+poweredByMisskeyDescription: "{name} 서버넌 오픈소스 플랫폼 Misskey으 서버 가운데 하나입니다."
+monthAndDay: "{month}월 {day}일"
+search: "찾기"
+notifications: "알림"
+username: "사용자 이럼"
+password: "비밀번호"
+forgotPassword: "비밀번호럴 잊엇뿟십니꺼?"
+fetchingAsApObject: "연합서 찾아보고 잇어예"
+ok: "예"
+gotIt: "알것어예"
+cancel: "아이예"
+noThankYou: "뎃어예"
+enterUsername: "사용자 이럼 서기"
+renotedBy: "{user}님이 리노트햇어예"
+noNotes: "노트가 없십니다"
+noNotifications: "알림이 없십니다"
+instance: "서버"
+settings: "설정"
+notificationSettings: "알림 설정"
+basicSettings: "기본 설정"
+otherSettings: "다린 설정"
+openInWindow: "창서 옐기"
+profile: "프로필"
+timeline: "타임라인"
+noAccountDescription: "자기소개가 없십니다"
+login: "로그인"
+loggingIn: "로그인하고 잇어예"
+logout: "로그아웃"
+signup: "가입하기"
+uploading: "올리고 잇어예"
+save: "저장하기"
+users: "사용자"
+addUser: "사용자 옇기"
+favorite: "질겨찾기"
+favorites: "질겨찾기"
+unfavorite: "질겨찾기서 어ᇝ애기"
+favorited: "질겨찾기에 담앗십니다."
+alreadyFavorited: "벌시로 질겨찾기에 담기 잇십니다."
+cantFavorite: "질겨찾기에 몬 담았십니다."
+pin: "프로필에 붙이기"
+unpin: "프로필서 띠기"
+copyContent: "내용 복사하기"
+copyLink: "링크 복사하기"
+copyLinkRenote: "리노트 링크 복사"
+delete: "내삐리기"
+deleteAndEdit: "내삐리고 새로 적기"
+deleteAndEditConfirm: "요 노트럴 뭉캐고 새로 적십니꺼? 요 노트서 리액션하고 리노트, 답하기도 말캉 뭉캐집니다."
+addToList: "리스트에 옇기"
+addToAntenna: "안테나에 옇기"
+sendMessage: "메시지 보내기"
+copyRSS: "알에스에스 복사하기"
+copyUsername: "사용자 이럼 복사하기"
+copyUserId: "사용자 아이디 복사하기"
+copyNoteId: "노트 아이디 복사하기"
+copyFileId: "파일 아이디 복사하기"
+copyFolderId: "폴더 아이디 복사하기"
+copyProfileUrl: "프로필 주소 복사하기"
+searchUser: "사용자 찾기"
+reply: "답하기"
+loadMore: "더 볼래예"
+showMore: "더 볼래예"
+showLess: "꺼기"
+youGotNewFollower: "새 팔로워가 잇십니다"
+receiveFollowRequest: "팔로잉 요청이 잇십니다"
+followRequestAccepted: "팔로잉이 받아딜이젓십니다"
+mention: "멘션"
+mentions: "받언 멘션"
+directNotes: "쪽지 서기"
+importAndExport: "가오기하고 내가기"
+import: "가오기"
+export: "내가기"
+files: "파일"
+download: "내리받기"
+driveFileDeleteConfirm: "‘{name}’ 파일얼 뭉캡니꺼? 요 파일얼 서넌 콘텐츠도 뭉캐집니다."
+unfollowConfirm: "{name}님얼 고마 팔로잉합니꺼?"
+exportRequested: "내가기 요청얼 햇십니다. 시간이 쪼매 걸릴 깁니다. 요청이 껕나모 ‘드라이브’에 옇십니다."
+importRequested: "가오기 요청얼 햇십니다. 시간이 쪼매 걸릴 깁니다."
+lists: "리스트"
+noLists: "리스트가 없십니다"
+note: "노트"
+notes: "노트"
+following: "팔로잉"
+followers: "팔로워"
+followsYou: "내럴 팔로잉합니다"
+createList: "리스트 맨걸기"
+manageLists: "리스트 간리하기"
+error: "우짭니꺼"
+somethingHappened: "먼가 일낫십니다"
+retry: "다시 하기"
+pageLoadError: "하멘 부리오기가 아이뎁니다."
+pageLoadErrorDescription: "네트워크나 브라우저 캐시 때문일 깁니다. 캐시럴 뭉캐던가 쪼매 잇다 새로 해 주이소."
+serverIsDead: "서버가 대답얼 아이합니다. 쪼매 잇다 새로 해 주이소."
+youShouldUpgradeClient: "요 하멘얼 볼라먼 새로 곤치던가 새 버전으 클라이언트럴 받아 서 보이소."
+enterListName: "리스트 이럼 서기"
+privacy: "개인 정보"
+makeFollowManuallyApprove: "팔로잉얼 하나석 받아딜이기"
+defaultNoteVisibility: "기본 공개 범위"
+follow: "팔로우"
+followRequest: "팔로우 요청하기"
+followRequests: "팔로우 요청"
+unfollow: "팔로우 무루기"
+followRequestPending: "팔로우 수락 지둘림"
+enterEmoji: "이모지 서기"
+renote: "리노트"
+unrenote: "리노트 무루기"
+renoted: "리노트럴 햇십니다."
+cantRenote: "요 걸언 리노트럴 몬 합니다."
+cantReRenote: "리노트넌 지럴 리노트 몬 합니다."
+quote: "따오기"
+inChannelRenote: "채널 안 리노트"
+inChannelQuote: "채널 안 따오기"
+pinnedNote: "붙인 노트"
+pinned: "프로필에 붙이기"
+you: "나"
+clickToShow: "누질라서 보기"
+sensitive: "수ᇚ힛섭니다"
+add: "옇기"
+reaction: "반엉"
+reactions: "반엉"
+reactionSettingDescription2: "꺼시서 두고, 누질라서 뭉캐고, ‘+’럴 누질라서 옇십니다."
+rememberNoteVisibility: "공개 범위럴 기억하기"
+attachCancel: "붙임 빼기"
+markAsSensitive: "수ᇚ힘 설정"
+unmarkAsSensitive: "수ᇚ힘 무루기"
+enterFileName: "파일 이럼 서기"
+mute: "수ᇚ후기"
+unmute: "수ᇚ훈 거 무루기"
+renoteMute: "리노트 수ᇚ후기"
+renoteUnmute: "리노트 수ᇚ훈 거 무루기"
+block: "차단하기"
+unblock: "차단 무루기"
+suspend: "얼우기"
+unsuspend: "얼우기 풀기"
+blockConfirm: "차단합니꺼?"
+unblockConfirm: "차단얼 무룹니꺼?"
+suspendConfirm: "얼웁니꺼?"
+unsuspendConfirm: "얼운 거 풉니꺼?"
+selectList: "리스트 개리기"
+editList: "리스트 적기"
+selectChannel: "채널 개리기"
+selectAntenna: "안테나 개리기"
+editAntenna: "안테나 적기"
+selectWidget: "위젯 개리기"
+editWidgets: "위젯 적기"
+editWidgetsExit: "고마 적기"
+customEmojis: "사용자 지정 이모지"
+emoji: "이모지"
+emojis: "이모지"
+emojiName: "이모지 이럼"
+emojiUrl: "이모지 주소"
+addEmoji: "이모지 옇기"
+settingGuide: "개않언 설정"
+cacheRemoteFiles: "웬겍 파일 캐시하기"
+cacheRemoteFilesDescription: "요 설정얼 키모 웬겍 파일얼 요 서버으 스토리지에 캐시합니다. 미디어가 사게 비이지먼 서버으 스토리지럴 마이 섭니다. 웬겍 사용자가 얼매나 캐시럴 둘 긴가넌 고 옉할으 드라이브 크기 제한마중 다립니다. 요 제한얼 넘구모 엣날 파일버터 캐시서 뭉캐지서 링크가 뎁니다. 요 설정얼 꺼모 웬겍 파일언 첨버터 링크가 뎁니다. 이미지으 섬네일얼 맨걸던 사용자으 개인 정보럴 징키던 할라먼 default.yml서 proxyRemoteFiles럴 ture로 하입시다."
+youCanCleanRemoteFilesCache: "파일 간리으 🗑️ 모냥얼 누질리모 캐시럴 말캉 뭉캘 수 잇십니다."
+cacheRemoteSensitiveFiles: "웬겍으 수ᇚ힌 파일얼 캐시하기"
+cacheRemoteSensitiveFilesDescription: "요 설정얼 꺼모 웬겍 수ᇚ힌 파일이 캐시하지 아이하고 바리 링크합니다."
+flagAsBot: "자동 게정입니다"
+flagAsBotDescription: "요 게정얼 프로그램서 설라먼 키야 합니다. 키모 다런 개발자가 반엉얼 끋없이 데풀이하지 몬 하게 도아 줄 수 잇고 Misskey으 시스템서 자동 게정이 뎁니다."
+flagAsCat: "애웅애웅애웅애웅!"
+flagAsCatDescription: "애옹?"
+flagShowTimelineReplies: "타임라인서 노트으 답하기 보기"
+flagShowTimelineRepliesDescription: "키모 타임라인서 다런 사용자덜으 답하기도 봅니다."
+autoAcceptFollowed: "팔로잉하넌 사용자으 팔로잉 요청 바리 받아딜이기"
+addAccount: "게정 옇기"
+reloadAccountsList: "게정 리스트으 정보 새로 바꾸기"
+loginFailed: "로그인이 아이뎁니다."
+showOnRemote: "웬겍서 보기"
+general: "일반"
+wallpaper: "벡지"
+setWallpaper: "벡지 설정"
+removeWallpaper: "벡지 뭉캐기"
+searchWith: "찾기: {q}"
+youHaveNoLists: "리스트가 없십니다"
+followConfirm: "{name}님얼 팔로잉합니꺼?"
+proxyAccount: "프락시 게정"
+proxyAccountDescription: "프락시 게정언 턱벨한 조겐서 웬겍 팔로잉얼 하넌 게정입니다. 사용자가 웬겍 사용자럴 리스트에 옇얼 때 리스트에 옇언 사용자럴 누도 팔로잉 아이하모 할동이 서버로 아이 오니께 요 게정이 아인 프락시 게정얼 팔로잉하게 합니다."
+host: "호스트 이럼"
+selectUser: "사용자 개리기"
+recipient: "받넌 사람"
+annotation: "주석"
+federation: "옌합"
+instances: "서버"
+registeredAt: "첫 발겐"
+latestRequestReceivedAt: "막죽에 받언 요청"
+latestStatus: "막죽 상태"
+storageUsage: "스토리지 사용량"
+charts: "차트"
+perHour: "한 시간마중"
+perDay: "하리마중"
+stopActivityDelivery: "할동 고마 보내기"
+blockThisInstance: "요 서버 차단하기"
+silenceThisInstance: "서버 수ᇚ후기"
+operations: "동작"
+software: "소프트웨어"
+version: "버전"
+metadata: "메타데이터"
+withNFiles: "파일 {n}개"
+monitor: "모니터"
+jobQueue: "작업 대기옐"
+cpuAndMemory: "시피유하고 메모리"
+network: "네트워크"
+disk: "디스크"
+instanceInfo: "서버 정보"
+statistics: "통게"
+clearQueue: "대기옐 비우기"
+clearQueueConfirmTitle: "대기옐얼 비웁니꺼?"
+clearQueueConfirmText: "대기옐에 잇넌 걸얼 아이 보냅니다. 흐이 요 동작언 할 필요가 없십니다."
+clearCachedFiles: "캐시 비우기"
+clearCachedFilesConfirm: "캐시한 웬겍 파일얼 말캉 뭉캡니꺼?"
+blockedInstances: "차단한 서버"
+blockedInstancesDescription: "차단할라넌 서버으 호스트럴 줄 바꿈해서로 비이 줍니다. 차단한 서버넌 요 서버하고 교류 몬 합니다."
+silencedInstances: "수ᇚ훈 서버"
+silencedInstancesDescription: "수ᇚ훌라넌 서버으 호스트럴 줄 바꿈해서로 비이 줍니다. 수ᇚ훈 서버으 게정언 말캉 ‘수ᇚ후기’가 데서 팔로잉 요청만 데고 팔로워가 아인 로컬 게정서 멘션얼 몬 합니다. 차단한 서버넌 상간 없십니다."
+muteAndBlock: "수ᇚ훔하고 차단"
+mutedUsers: "수ᇚ훈 사용자"
+blockedUsers: "차단한 사용자"
+noUsers: "사용자가 없십니다"
+editProfile: "프로필 적기"
+noteDeleteConfirm: "요 노트럴 뭉캡니꺼?"
+pinLimitExceeded: "더 몬 붙입니다"
+intro: "Misskey럴 다 깔앗십니다! 간리자 게정얼 맨걸어 보입시다."
+done: "햇어예"
+processing: "처리하고 잇어예"
+preview: "미리보기"
+default: "기본값"
+defaultValueIs: "기본값: {value}"
+noCustomEmojis: "이모지가 없십니다"
+noJobs: "작업이 없십니다"
+federating: "옌합하고 잇어예"
+blocked: "차단햇어예"
+suspended: "고만 보내예"
+all: "말캉"
+subscribing: "구독하고 잇어예"
+publishing: "보내고 잇어예"
+notResponding: "답이 없어예"
+instanceFollowing: "서버으 팔로잉"
+instanceFollowers: "서버으 팔로워"
+instanceUsers: "서버으 사용자"
+changePassword: "비밀번호 바꾸기"
+security: "보안"
+retypedNotMatch: "선 거가 안 맞십니다."
+currentPassword: "지검 비밀번호"
+newPassword: "새 비밀번호"
+newPasswordRetype: "새 비밀번호 다시 서기"
+attachFile: "파일 붙이기"
+more: "더 볼래예!"
+featured: "인기"
+usernameOrUserId: "사용자 이럼이나 사용자 아이디"
+noSuchUser: "사용자럴 몬 찾앗십니다"
+lookup: "찾아보기"
+announcements: "공지 걸"
+imageUrl: "이미지 주소"
+remove: "내삐리기"
+removed: "뭉캣십니다"
+removeAreYouSure: "‘{x}’(얼)럴 뭉캡니꺼?"
+deleteAreYouSure: "‘{x}’(얼)럴 뭉캡니꺼?"
+resetAreYouSure: "아시로 데돌립니꺼?"
+saved: "저장햇십니다"
+messaging: "대화"
+upload: "올리기"
+keepOriginalUploading: "온본 두기"
+keepOriginalUploadingDescription: "이미지럴 올릴 때 온본얼 고대로 둡니다. 꺼모 올릴 때 브라우저서 웹 공개 이미지럴 맨겁니다."
+fromDrive: "드라이브서"
+fromUrl: "주소서"
+uploadFromUrl: "주소 올리기"
+uploadFromUrlDescription: "올리기할라넌 파일으 주소"
+uploadFromUrlRequested: "올리기럴 요청햇십니다"
+uploadFromUrlMayTakeTime: "올리기가 껕날라먼 시간이 쪼매 걸릴 깁니다."
+explore: "살펴보기"
+messageRead: "이럿어예"
+noMoreHistory: "요카마 엣날 기록이 없십니다"
+startMessaging: "대화하기"
+nUsersRead: "{n}멩이 이럿십니다"
+agreeTo: "{0}에 동이하기"
+agree: "동이합니다"
+agreeBelow: "밑으 내용에 동이합니다"
+basicNotesBeforeCreateAccount: "주이할 내용"
+termsOfService: "이용 약간"
+start: "시작하기"
+home: "덜머리"
+remoteUserCaution: "웬겍 사용자넌 정보가 학실하지 아이할 수 잇십니다."
+activity: "할동"
+images: "이미지"
+image: "이미지"
+birthday: "생일"
+yearsOld: "{age}살"
+registeredDate: "맨건 날"
+location: "장소"
+theme: "테마"
+themeForLightMode: "볽엄 모드서 설 테마"
+themeForDarkMode: "어덥엄 모드서 설 테마"
+light: "볽엄"
+dark: "어덥엄"
+lightThemes: "볽언 테마"
+darkThemes: "어덥언 테마"
+syncDeviceDarkMode: "드라이브으 어덥엄 모드하고 같구로 마추기"
+drive: "드라이브"
+fileName: "파일 이럼"
+selectFile: "파일 개리기"
+selectFiles: "파일 개리기"
+selectFolder: "폴더 개리기"
+selectFolders: "폴더 개리기"
+renameFile: "파일 이럼 바꾸기"
+folderName: "폴더 이럼"
+createFolder: "폴더 맨걸기"
+renameFolder: "폴더 이럼 바꾸기"
+deleteFolder: "폴더 뭉캐기"
+folder: "폴더"
+addFile: "파일 옇기"
+emptyDrive: "드라이브가 비잇십니다"
+emptyFolder: "폴더가 비잇십니다"
+unableToDelete: "몬 뭉캡니다"
+inputNewFileName: "새 파일 이럼얼 서 보이소"
+inputNewDescription: "새 설멩얼 서 보이소"
+inputNewFolderName: "새 폴더 이럼얼 서 보이소"
+circularReferenceFolder: "엚길 폴더으 아래 폴더입니다."
+hasChildFilesOrFolders: "요 폴더넌 아이 비잇어니께 몬 뭉캡니다."
+copyUrl: "주소 복사하기"
+rename: "이럼 바꾸기"
+avatar: "아바타"
+banner: "배너"
+displayOfSensitiveMedia: "수ᇚ힌 옝상물 보기"
+whenServerDisconnected: "서버하고 옌겔이 껂기모"
+disconnectedFromServer: "서버하고 옌겔이 껂깃십니다"
+reload: "새로곤침"
+doNothing: "무시하기"
+reloadConfirm: "새로곤침합니꺼?"
+watch: "간심 갖기"
+unwatch: "간심 고마 갖기"
+accept: "받기"
+reject: "아이 받기"
+normal: "일반"
+instanceName: "서버 이럼"
+instanceDescription: "서버 소개"
+maintainerName: "간리자 이럼"
+maintainerEmail: "간리자 전자우펜"
+tosUrl: "이용 약간 주소"
+thisYear: "올개"
+thisMonth: "요달"
+today: "오올"
+dayX: "{day}일"
+monthX: "{month}월"
+yearX: "{year}년"
+pages: "바닥"
+integration: "옌겔"
+connectService: "옌겔하기"
+disconnectService: "껂기"
+enableLocalTimeline: "로컬 타임라인 키기"
+enableGlobalTimeline: "글로벌 타임라인 키기"
+disablingTimelinesInfo: "요 타임라인얼 꺼도 간리자하고 중재자넌 고대로 설 수 잇십니다."
+registration: "맨걸기"
+enableRegistration: "누라도 새로 맨걸 수 잇거로 하기"
+invite: "초대하기"
+driveCapacityPerLocalAccount: "로컬 사용자 하나마중 드라이브 커기"
+driveCapacityPerRemoteAccount: "웬겍 사용자 하나마중 드라이브 커기"
+inMb: "메가바이트 단이"
+bannerUrl: "배너 이미지 주소"
+backgroundImageUrl: "배겡 이미지 주소"
+basicInfo: "기본 정보"
+pinnedUsers: "붙인 사용자"
+pinnedUsersDescription: "‘살펴보기’서 붙일라넌 사용자럴 줄 바꿈해서로 적십니다."
+pinnedPages: "붙인 바닥"
+pinnedPagesDescription: "서버으 대문서 붙일라넌 바닥으 겡로럴 줄 바꿈해서로 적십니다."
+pinnedClipId: "붙일 클립으 아이디"
+pinnedNotes: "붙인 노트"
+hcaptcha: "에이치캡차"
+enableHcaptcha: "에이치캡차 키기"
+hcaptchaSiteKey: "사이트키"
+hcaptchaSecretKey: "시크릿키"
+recaptcha: "리캡차"
+enableRecaptcha: "리캡차 키기"
+recaptchaSiteKey: "사이트키"
+recaptchaSecretKey: "시크릿키"
+turnstile: "턴스타일"
+enableTurnstile: "턴스타일 키기"
+turnstileSiteKey: "사이트키"
+turnstileSecretKey: "시크릿키"
+avoidMultiCaptchaConfirm: "오만 캡차럴 서모 간섭이 잇얼 깁니다. 다린 캡차를 껍니꺼? ‘아이예’럴 누질리모 오만 캡차럴 키 둘 수도 잇십니다."
+antennas: "안테나"
+manageAntennas: "안테나 간리"
+name: "이럼"
+antennaSource: "받얼 소스"
+antennaKeywords: "받얼 검색어"
+antennaExcludeKeywords: "수ᇚ훌 검색어"
+antennaKeywordsDescription: "띠어서기럴 하모 ‘거라고’가 데고 줄 바꿈얼 하모 ‘아이먼’이 뎁니다"
+notifyAntenna: "새 노트럴 알리기"
+withFileAntenna: "파일이 붙언 노트마"
+enableServiceworker: "브라우저서 알림 포시럴 키기"
+antennaUsersDescription: "사용자 이럼얼 줄 바꿈해서로 섭니다"
+caseSensitive: "대소문자럴 구벨하기"
+withReplies: "답하기도 옇기"
+connectedTo: "요 게정하고 옌겔데어 잇십니다"
+notesAndReplies: "걸하고 답걸"
+withFiles: "파일에 붙이기"
+silence: "수ᇚ후기"
+silenceConfirm: "수ᇚ훕니꺼?"
+unsilence: "수ᇚ후기 어ᇝ애기"
+unsilenceConfirm: "수ᇚ후기럴 어ᇝ앱니꺼?"
+popularUsers: "소문난 사용자"
+recentlyUpdatedUsers: "얼마 전에 걸 선 사용자"
+recentlyRegisteredUsers: "얼마 전에 맨건 사용자"
+recentlyDiscoveredUsers: "얼마 전에 찾언 사용자"
+exploreUsersCount: "사용자 {count}멩이 잇십니다."
+exploreFediverse: "옌합우주 탐험하기"
+popularTags: "소문난 태그"
+userList: "리스트"
+about: "정보"
+aboutMisskey: "Misskey넌예"
+administrator: "간리자"
+token: "학인 기호"
+2fa: "두 단게 정멩"
+setupOf2fa: "두 단게 정멩 설정"
+totp: "정멩 앱"
+totpDescription: "정멩 앱서 단헤용 비밀번호 서기"
+moderator: "중재자"
+moderation: "중재"
+moderationNote: "중재 노트"
+addModerationNote: "중재 노트 옇기"
+moderationLogs: "중재 일지"
+nUsersMentioned: "{n}멩이 이바구하고 잇어예"
+securityKeyAndPasskey: "보안키·패스키"
+securityKey: "보안키"
+unregister: "맨걸기 무루기"
+share: "노누기"
+notFound: "몬 찾앗십니다"
+help: "도움말"
+invites: "초대하기"
+retype: "다시 서기"
+noteOf: "{user}님으 노트"
+invitations: "초대하기"
+checking: "학인하고 잇십니다"
+passwordMatched: "맞십니다"
+passwordNotMatched: "안 맞십니다"
+language: "언어"
+remote: "웬겍"
+script: "스크립트"
+manage: "간리"
+emailServer: "전자우펜 서버"
+email: "전자우펜"
+emailAddress: "전자우펜 주소"
+smtpHost: "호스트 이럼"
+smtpPort: "포트"
+smtpUser: "사용자 이럼"
+smtpPass: "비밀번호"
+abuseReports: "신고하기"
+reportAbuse: "신고하기"
+reportAbuseRenote: "리노트 신고하기"
+reportAbuseOf: "{name}님얼 신고하기"
+reporter: "신고한 사람"
+reporteeOrigin: "신고덴 사람"
+reporterOrigin: "신고한 곳"
+forwardReport: "웬겍 서버에 신고 보내기"
+random: "무작이"
+system: "시스템"
+clip: "클립 맨걸기"
+notesCount: "노트 수"
+renotesCount: "리노트한 수"
+renotedCount: "리노트덴 수"
+followingCount: "팔로우 수"
+followersCount: "팔로워 수"
+clips: "클립 맨걸기"
+clearCache: "캐시 비우기"
+unlikeConfirm: "좋네예럴 무룹니꺼?"
+info: "정보"
+user: "사용자"
+administration: "간리"
+on: "킴"
+off: "껌"
+clickToFinishEmailVerification: "[{ok}]럴 누질라서 전자우펜 정멩얼 껕내이소."
+searchByGoogle: "찾기"
+tenMinutes: "십 분"
+oneHour: "한 시간"
+oneDay: "하리"
+oneWeek: "한 주"
+oneMonth: "한 달"
+file: "파일"
+tools: "도구"
+like: "좋네예!"
+unlike: "좋네예 무루기"
+numberOfLikes: "좋네예 수"
+roles: "옉할"
+role: "옉할"
+noRole: "옉할이 없십니다"
+thisPostMayBeAnnoyingCancel: "아이예"
+likeOnly: "좋네예마"
+icon: "아바타"
+replies: "답하기"
+renotes: "리노트"
+_initialAccountSetting:
+ startTutorial: "길라잡이 하기"
+_initialTutorial:
+ launchTutorial: "길라잡이 보기"
+ title: "길라잡이"
+ skipAreYouSure: "길라잡이럴 껕냅니까?"
+ _landing:
+ title: "길라잡이에 어서 오이소"
+ _done:
+ title: "길라잡이가 껕낫십니다!🎉"
+_achievements:
+ _types:
+ _tutorialCompleted:
+ description: "길라잡이럴 껕냇십니다"
+_gallery:
+ liked: "좋네예한 걸"
+ like: "좋네예!"
+ unlike: "좋네예 무루기"
+_email:
+ _follow:
+ title: "새 팔로워가 잇십니다"
+_channel:
+ removeBanner: "배너 뭉캐기"
+_theme:
+ keys:
+ mention: "멘션"
+_sfx:
+ note: "새 노트"
+ notification: "알림"
+_2fa:
+ step3Title: "학인 기호럴 서기"
+ renewTOTPCancel: "뎃어예"
+_widgets:
+ profile: "프로필"
+ instanceInfo: "서버 정보"
+ notifications: "알림"
+ timeline: "타임라인"
+ activity: "할동"
+ federation: "옌합"
+ jobQueue: "작업 대기옐"
+ _userList:
+ chooseList: "리스트 개리기"
+_cw:
+ show: "더 볼래예"
+_visibility:
+ home: "덜머리"
+ followers: "팔로워"
+_profile:
+ name: "이럼"
+ username: "사용자 이럼"
+_exportOrImport:
+ followingList: "팔로잉"
+ muteList: "수ᇚ후기"
+ blockingList: "차단하기"
+ userLists: "리스트"
+_charts:
+ federation: "옌합"
+_timelines:
+ home: "덜머리"
+_play:
+ script: "스크립트"
+_pages:
+ like: "좋네예"
+ unlike: "좋네예 무루기"
+ blocks:
+ image: "이미지"
+ _note:
+ id: "노트 아이디"
+_notification:
+ youWereFollowed: "새 팔로워가 잇십니다"
+ _types:
+ follow: "팔로잉"
+ mention: "멘션"
+ quote: "따오기"
+ reaction: "반엉"
+ _actions:
+ reply: "답하기"
+_deck:
+ _columns:
+ notifications: "알림"
+ tl: "타임라인"
+ antenna: "안테나"
+ list: "리스트"
+ mentions: "받언 멘션"
+_webhookSettings:
+ name: "이럼"
+_moderationLogTypes:
+ suspend: "얼우기"
+ deleteNote: "노트 뭉캐기"
+ deleteUserAnnouncement: "사용자 공지 걸 뭉캐기"
+ resolveAbuseReport: "신고 해겔하기"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 4009b7df5f..6cdcc2c246 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -2,14 +2,14 @@
_lang_: "한국어"
headlineMisskey: "노트로 연결되는 네트워크"
introMisskey: "환영합니다! Misskey는 오픈 소스 분산형 마이크로 블로그 서비스입니다.\n'노트'를 작성해서 지금 일어나고 있는 일을 공유하거나, 당신만의 이야기를 모두에게 발신하세요📡\n'리액션' 기능으로 친구의 노트에 총알같이 반응을 추가할 수도 있습니다👍\n새로운 세계를 탐험해 보세요🚀"
-poweredByMisskeyDescription: "{name}은(는) 오픈소스 플랫폼Misskey를 사용한 서비스(Misskey 인스턴스라고 불립니다) 중 하나입니다."
+poweredByMisskeyDescription: "{name} 서버는 오픈소스 플랫폼 Misskey의 서버 가운데 하나입니다."
monthAndDay: "{month}월 {day}일"
search: "검색"
notifications: "알림"
username: "유저명"
password: "비밀번호"
forgotPassword: "비밀번호 재설정"
-fetchingAsApObject: "연합에 조회 중"
+fetchingAsApObject: "연합에서 찾아보는 중"
ok: "확인"
gotIt: "알겠어요"
cancel: "취소"
@@ -45,7 +45,7 @@ pin: "프로필에 고정"
unpin: "프로필에서 고정 해제"
copyContent: "내용 복사"
copyLink: "링크 복사"
-copyLinkRenote: "Renote 링크 복사"
+copyLinkRenote: "리노트 링크 복사"
delete: "삭제"
deleteAndEdit: "삭제 후 편집"
deleteAndEditConfirm: "이 노트를 삭제한 뒤 다시 편집하시겠습니까? 이 노트에 대한 리액션, 리노트, 답글 또한 모두 삭제됩니다."
@@ -53,8 +53,8 @@ addToList: "리스트에 추가"
addToAntenna: "안테나에 추가"
sendMessage: "메시지 보내기"
copyRSS: "RSS 복사"
-copyUsername: "유저명 복사"
-copyUserId: "유저 ID 복사"
+copyUsername: "사용자 이름 복사"
+copyUserId: "사용자 ID 복사"
copyNoteId: "노트 ID 복사"
copyFileId: "파일 ID 복사"
copyFolderId: "폴더 ID 복사"
@@ -75,7 +75,7 @@ import: "가져오기"
export: "내보내기"
files: "파일"
download: "다운로드"
-driveFileDeleteConfirm: "파일 \"{name}\" 을 삭제하시겠습니까? 이 파일이 첨부된 노트도 함께 삭제됩니다."
+driveFileDeleteConfirm: "‘{name}’ 파일을 삭제하시겠습니까? 이 파일을 사용하는 일부 콘텐츠도 삭제됩니다."
unfollowConfirm: "{name}님을 언팔로우하시겠습니까?"
exportRequested: "내보내기를 요청하였습니다. 이 작업은 시간이 걸릴 수 있습니다. 내보내기가 완료되면 \"드라이브\"에 추가됩니다."
importRequested: "가져오기를 요청하였습니다. 이 작업에는 시간이 걸릴 수 있습니다."
@@ -85,7 +85,7 @@ note: "노트"
notes: "노트"
following: "팔로잉"
followers: "팔로워"
-followsYou: "당신을 팔로우합니다"
+followsYou: "나를 팔로우 합니다"
createList: "리스트 만들기"
manageLists: "리스트 관리"
error: "오류"
@@ -113,15 +113,20 @@ cantReRenote: "리노트를 리노트할 수 없습니다."
quote: "인용"
inChannelRenote: "채널 내 리노트"
inChannelQuote: "채널 내 인용"
-pinnedNote: "고정해놓은 노트"
+pinnedNote: "고정된 노트"
pinned: "프로필에 고정"
-you: "당신"
+you: "나"
clickToShow: "클릭하여 보기"
sensitive: "열람 주의"
add: "추가"
reaction: "리액션"
reactions: "리액션"
-reactionSetting: "선택기에 표시할 리액션"
+emojiPicker: "이모지 선택기"
+pinnedEmojisForReactionSettingDescription: "리액션을 할 때 프로필에 고정하여 표시할 이모지를 설정할 수 있습니다"
+pinnedEmojisSettingDescription: "이모지를 입력할 때 프로필에 고정하여 표시할 이모지를 설정할 수 있습니다"
+emojiPickerDisplay: "선택기 표시"
+overwriteFromPinnedEmojisForReaction: "리액션 설정을 덮어쓰기"
+overwriteFromPinnedEmojis: "일반 설정을 덮어쓰기"
reactionSettingDescription2: "끌어서 순서 변경, 클릭해서 삭제, ＋를 눌러서 추가할 수 있습니다."
rememberNoteVisibility: "공개 범위를 기억하기"
attachCancel: "첨부 취소"
@@ -130,7 +135,7 @@ unmarkAsSensitive: "열람주의 해제"
enterFileName: "파일명을 입력"
mute: "뮤트"
unmute: "뮤트 해제"
-renoteMute: "리노트를 뮤트"
+renoteMute: "리노트 뮤트하기"
renoteUnmute: "리노트 뮤트 해제"
block: "차단"
unblock: "차단 해제"
@@ -162,8 +167,8 @@ cacheRemoteSensitiveFiles: "리모트의 민감한 파일을 캐시"
cacheRemoteSensitiveFilesDescription: "이 설정을 비활성화하면 리모트의 민감한 파일은 캐시하지 않고 리모트에서 직접 가져오도록 합니다."
flagAsBot: "나는 봇입니다"
flagAsBotDescription: "이 계정을 자동화된 수단으로 운용할 경우에 활성화해 주세요. 이 플래그를 활성화하면, 다른 봇이 이를 참고하여 봇 끼리의 무한 연쇄 반응을 회피하거나, 이 계정의 시스템 상에서의 취급이 Bot 운영에 최적화되는 등의 변화가 생깁니다."
-flagAsCat: "나는 고양이다냥"
-flagAsCatDescription: "이 계정이 고양이라면 활성화해 주세요."
+flagAsCat: "미야아아아오오오오오오오오오옹!!!!!!!"
+flagAsCatDescription: "야옹?"
flagShowTimelineReplies: "타임라인에 노트의 답글을 표시하기"
flagShowTimelineRepliesDescription: "이 설정을 활성화하면 타임라인에 다른 유저 간의 답글을 표시합니다."
autoAcceptFollowed: "팔로우 중인 유저로부터의 팔로우 요청을 자동 수락"
@@ -195,6 +200,7 @@ perHour: "1시간마다"
perDay: "1일마다"
stopActivityDelivery: "액티비티 보내지 않기"
blockThisInstance: "이 서버를 차단"
+silenceThisInstance: "서버를 사일런스"
operations: "작업"
software: "소프트웨어"
version: "버전"
@@ -214,6 +220,8 @@ clearCachedFiles: "캐시 비우기"
clearCachedFilesConfirm: "캐시된 리모트 파일을 모두 삭제하시겠습니까?"
blockedInstances: "차단된 서버"
blockedInstancesDescription: "차단하려는 서버의 호스트 이름을 줄바꿈으로 구분하여 설정합니다. 차단된 인스턴스는 이 인스턴스와 통신할 수 없게 됩니다."
+silencedInstances: "사일런스한 서버"
+silencedInstancesDescription: "사일런스하려는 서버의 호스트명을 한 줄에 하나씩 입력합니다. 사일런스된 서버에 소속된 유저는 모두 '사일런스'된 상태로 취급되며, 이 서버로부터의 팔로우가 프로필 설정과 무관하게 승인제로 변경되고, 팔로워가 아닌 로컬 유저에게는 멘션할 수 없게 됩니다. 정지된 서버에는 적용되지 않습니다."
muteAndBlock: "뮤트 및 차단"
mutedUsers: "뮤트한 유저"
blockedUsers: "차단한 유저"
@@ -244,13 +252,13 @@ security: "보안"
retypedNotMatch: "입력이 일치하지 않습니다."
currentPassword: "현재 비밀번호"
newPassword: "새 비밀번호"
-newPasswordRetype: "새 비밀번호 (재입력)"
+newPasswordRetype: "새 비밀번호(재입력)"
attachFile: "파일 첨부"
-more: "더보기"
-featured: "하이라이트"
+more: "더 보기!"
+featured: "유행"
usernameOrUserId: "유저명이나 ID"
noSuchUser: "유저를 찾을 수 없습니다"
-lookup: "조회"
+lookup: "찾아보기"
announcements: "공지사항"
imageUrl: "이미지 URL"
remove: "삭제"
@@ -258,6 +266,7 @@ removed: "삭제하였습니다"
removeAreYouSure: "\"{x}\" 을(를) 삭제하시겠습니까?"
deleteAreYouSure: "\"{x}\" 을(를) 삭제하시겠습니까?"
resetAreYouSure: "초기화 하시겠습니까?"
+areYouSure: "계속 진행하시겠습니까?"
saved: "저장하였습니다"
messaging: "대화"
upload: "업로드"
@@ -304,10 +313,11 @@ selectFiles: "파일 선택"
selectFolder: "폴더 선택"
selectFolders: "폴더 선택"
renameFile: "파일 이름 변경"
-folderName: "폴더명"
+folderName: "폴더 이름"
createFolder: "폴더 만들기"
renameFolder: "폴더 이름 바꾸기"
deleteFolder: "폴더 삭제"
+folder: "폴더"
addFile: "파일 추가"
emptyDrive: "드라이브가 비어 있습니다"
emptyFolder: "폴더가 비어 있습니다"
@@ -327,10 +337,10 @@ disconnectedFromServer: "서버와의 연결이 끊어졌습니다"
reload: "새로고침"
doNothing: "무시하기"
reloadConfirm: "새로고침 하시겠습니까?"
-watch: "지켜보기"
-unwatch: "지켜보기 해제"
-accept: "허가"
-reject: "거부"
+watch: "관심 갖기"
+unwatch: "관심 해제하기"
+accept: "수락하기"
+reject: "거절하기"
normal: "일반"
instanceName: "서버 이름"
instanceDescription: "서버 소개"
@@ -338,7 +348,7 @@ maintainerName: "관리자 이름"
maintainerEmail: "관리자 이메일"
tosUrl: "이용약관 URL"
thisYear: "올해"
-thisMonth: "이번 달"
+thisMonth: "이달"
today: "오늘"
dayX: "{day}일"
monthX: "{month}월"
@@ -364,7 +374,7 @@ pinnedUsersDescription: "\"발견하기\" 페이지 등에 고정하고 싶은
pinnedPages: "고정한 페이지"
pinnedPagesDescription: "서버의 대문에 고정하고 싶은 페이지의 경로를 한 줄에 하나씩 적습니다."
pinnedClipId: "고정할 클립의 ID"
-pinnedNotes: "고정해놓은 노트"
+pinnedNotes: "고정된 노트"
hcaptcha: "hCaptcha"
enableHcaptcha: "hCaptcha 활성화"
hcaptchaSiteKey: "사이트 키"
@@ -382,8 +392,8 @@ antennas: "안테나"
manageAntennas: "안테나 관리"
name: "이름"
antennaSource: "받을 소스"
-antennaKeywords: "받을 키워드"
-antennaExcludeKeywords: "제외할 키워드"
+antennaKeywords: "받을 검색어"
+antennaExcludeKeywords: "제외할 검색어"
antennaKeywordsDescription: "공백으로 구분하는 경우 AND, 줄바꿈으로 구분하는 경우 OR로 지정됩니다"
notifyAntenna: "새로운 노트를 알림"
withFileAntenna: "파일이 첨부된 노트만"
@@ -434,7 +444,6 @@ share: "공유"
notFound: "찾을 수 없습니다"
notFoundDescription: "지정한 URL에 해당하는 페이지가 존재하지 않습니다."
uploadFolder: "기본 업로드 위치"
-cacheClear: "캐시 지우기"
markAsReadAllNotifications: "모든 알림을 읽은 상태로 표시"
markAsReadAllUnreadNotes: "모든 글을 읽은 상태로 표시"
markAsReadAllTalkMessages: "모든 대화를 읽은 상태로 표시"
@@ -476,7 +485,7 @@ language: "언어"
uiLanguage: "UI 표시 언어"
aboutX: "{x}에 대하여"
emojiStyle: "이모지 스타일"
-native: "네이티브"
+native: "기본"
disableDrawer: "드로어 메뉴를 사용하지 않기"
showNoteActionsOnlyHover: "노트 액션 버튼을 마우스를 올렸을 때에만 표시"
noHistory: "기록이 없습니다"
@@ -531,6 +540,7 @@ serverLogs: "서버 로그"
deleteAll: "모두 삭제"
showFixedPostForm: "타임라인 상단에 글 작성란을 표시"
showFixedPostFormInChannel: "채널 타임라인 상단에 글 작성란을 표시"
+withRepliesByDefaultForNewlyFollowed: "팔로우 할 때 기본적으로 답글을 타임라인에 나오게 하기"
newNoteRecived: "새 노트가 있습니다"
sounds: "소리"
sound: "소리"
@@ -540,6 +550,8 @@ showInPage: "페이지로 보기"
popout: "새 창으로 열기"
volume: "음량"
masterVolume: "마스터 볼륨"
+notUseSound: "음소거 하기"
+useSoundOnlyWhenActive: "Misskey가 활성화 되어져 있을 때만 소리 출력하기"
details: "자세히"
chooseEmoji: "이모지 선택"
unableToProcess: "작업을 완료할 수 없습니다"
@@ -560,10 +572,14 @@ output: "출력"
script: "스크립트"
disablePagesScript: "Pages 에서 AiScript 를 사용하지 않음"
updateRemoteUser: "리모트 유저 정보 갱신"
+unsetUserAvatar: "아바타 제거"
+unsetUserAvatarConfirm: "아바타를 제거할까요?"
+unsetUserBanner: "배너 제거"
+unsetUserBannerConfirm: "배너를 제거할까요?"
deleteAllFiles: "모든 파일 삭제"
deleteAllFilesConfirm: "모든 파일을 삭제하시겠습니까?"
removeAllFollowing: "모든 팔로잉 해제"
-removeAllFollowingDescription: "{host}(으)로부터 모든 팔로잉을 해제합니다. 해당 서버가 더 이상 존재하지 않게 된 경우 등에 실행해 주세요."
+removeAllFollowingDescription: "{host} 서버의 모든 팔로잉을 해제합니다. 해당 서버가 더 이상 존재하지 않는 경우 등에 실행해 주세요."
userSuspended: "이 계정은 정지된 상태입니다."
userSilenced: "이 계정은 사일런스된 상태입니다."
yourAccountSuspendedTitle: "계정이 정지되었습니다"
@@ -583,13 +599,13 @@ addedRelays: "추가된 릴레이"
serviceworkerInfo: "푸시 알림을 수행하려면 활성화해야 합니다."
deletedNote: "삭제된 노트"
invisibleNote: "비공개 노트"
-enableInfiniteScroll: "자동으로 좀 더 보기"
+enableInfiniteScroll: "자동으로 더 보기"
visibility: "공개 범위"
poll: "투표"
useCw: "내용 숨기기"
enablePlayer: "플레이어 열기"
disablePlayer: "플레이어 닫기"
-expandTweet: "트윗 확장하기"
+expandTweet: "게시물 확장하기"
themeEditor: "테마 에디터"
description: "설명"
describeFile: "캡션 추가"
@@ -624,13 +640,14 @@ emailAddress: "메일 주소"
smtpConfig: "SMTP 서버 설정"
smtpHost: "호스트"
smtpPort: "포트"
-smtpUser: "유저명"
+smtpUser: "사용자 이름"
smtpPass: "비밀번호"
emptyToDisableSmtpAuth: "SMTP 인증을 사용하지 않으려면 공란으로 비워둡니다."
smtpSecure: "SMTP 연결에 Implicit SSL/TTS 사용"
smtpSecureInfo: "STARTTLS 사용 시에는 해제합니다."
testEmail: "이메일 전송 테스트"
wordMute: "단어 뮤트"
+hardWordMute: "하드 단어 뮤트"
regexpError: "정규 표현식 오류"
regexpErrorDescription: "{tab}단어 뮤트 {line}행의 정규 표현식에 오류가 발생했습니다:"
instanceMute: "서버 뮤트"
@@ -658,7 +675,7 @@ behavior: "동작"
sample: "예시"
abuseReports: "신고"
reportAbuse: "신고"
-reportAbuseRenote: "Renote를 신고"
+reportAbuseRenote: "리노트 신고하기"
reportAbuseOf: "{name}을 신고하기"
fillAbuseReportDescription: "신고하려는 이유를 자세히 알려주세요. 특정 게시물을 신고할 때에는 게시물의 URL도 포함해 주세요."
abuseReported: "신고를 보냈습니다. 신고해 주셔서 감사합니다."
@@ -675,7 +692,7 @@ defaultNavigationBehaviour: "기본 탐색 동작"
editTheseSettingsMayBreakAccount: "이 설정을 변경하면 계정이 손상될 수 있습니다."
instanceTicker: "노트의 서버 정보"
waitingFor: "{x}을(를) 기다리고 있습니다"
-random: "랜덤"
+random: "무작위"
system: "시스템"
switchUi: "UI 전환"
desktop: "데스크탑"
@@ -692,9 +709,9 @@ manageAccessTokens: "액세스 토큰 관리"
accountInfo: "계정 정보"
notesCount: "노트 수"
repliesCount: "답글 수"
-renotesCount: "Renote 수"
+renotesCount: "리노트 수"
repliedCount: "받은 답글 수"
-renotedCount: "받은 Renote 수"
+renotedCount: "받은 리노트 수"
followingCount: "팔로우 수"
followersCount: "팔로워 수"
sentReactionsCount: "보낸 리액션 수"
@@ -711,6 +728,7 @@ lockedAccountInfo: "팔로우를 승인으로 승인받더라도 노트의 공
alwaysMarkSensitive: "미디어를 항상 열람 주의로 설정"
loadRawImages: "첨부한 이미지의 썸네일을 원본화질로 표시"
disableShowingAnimatedImages: "움직이는 이미지를 자동으로 재생하지 않음"
+highlightSensitiveMedia: "미디어가 민감한 내용이라는 것을 알기 쉽게 표시"
verificationEmailSent: "확인 메일을 발송하였습니다. 설정을 완료하려면 메일에 첨부된 링크를 확인해 주세요."
notSet: "설정되지 않음"
emailVerified: "메일 주소가 확인되었습니다."
@@ -799,7 +817,7 @@ switchAccount: "계정 바꾸기"
enabled: "활성화"
disabled: "비활성화"
quickAction: "빠른 동작"
-user: "유저"
+user: "사용자"
administration: "관리"
accounts: "계정"
switch: "전환"
@@ -826,7 +844,7 @@ previewNoteText: "본문 미리보기"
customCss: "CSS 사용자화"
customCssWarn: "이 설정은 기능을 알고 있는 경우에만 사용해야 합니다. 잘못된 값을 입력하면 클라이언트가 정상적으로 작동하지 않을 수 있습니다."
global: "글로벌"
-squareAvatars: "프로필 아이콘을 사각형으로 표시"
+squareAvatars: "프로필 아바타를 사각형으로 표시"
sent: "전송"
received: "수신"
searchResult: "검색 결과"
@@ -861,11 +879,11 @@ manageAccounts: "계정 관리"
makeReactionsPublic: "리액션 목록을 공개하기"
makeReactionsPublicDescription: "나의 리액션을 누구나 볼 수 있게 합니다."
classic: "클래식"
-muteThread: "이 글타래를 뮤트"
+muteThread: "글타래 뮤트"
unmuteThread: "글타래 뮤트 해제"
-ffVisibility: "내 인맥의 공개 범위"
-ffVisibilityDescription: "나의 팔로우와 팔로워 정보에 대한 공개 범위를 설정할 수 있습니다."
-continueThread: "이 글타래 이어서 보기"
+followingVisibility: "팔로우의 공개 범위"
+followersVisibility: "팔로워의 공개 범위"
+continueThread: "글타래 더 보기"
deleteAccountConfirm: "계정이 삭제되고 되돌릴 수 없게 됩니다. 계속하시겠습니까? "
incorrectPassword: "비밀번호가 올바르지 않습니다."
voteConfirm: "\"{choice}\"에 투표하시겠습니까?"
@@ -964,7 +982,7 @@ show: "표시"
neverShow: "다시 보지 않기"
remindMeLater: "나중에 알림"
didYouLikeMisskey: "Misskey가 마음에 드시나요?"
-pleaseDonate: "{host}은(는) 무료 소프트웨어 Misskey를 사용합니다. 후원을 통해 저희의 개발이 이어질 수 있게 도와주세요!"
+pleaseDonate: "Misskey는 {host} 서버의 무료 소프트웨어입니다. 앞으로도 개발을 이어 나가려면 후원이 절실히 필요합니다!"
roles: "역할"
role: "역할"
noRole: "역할이 없습니다"
@@ -974,6 +992,7 @@ assign: "할당"
unassign: "할당 취소"
color: "색"
manageCustomEmojis: "커스텀 이모지 관리"
+manageAvatarDecorations: "아바타 꾸미기 관리"
youCannotCreateAnymore: "더 이상 생성할 수 없습니다."
cannotPerformTemporary: "일시적으로 사용할 수 없음"
cannotPerformTemporaryDescription: "조작 횟수 제한을 초과하여 일시적으로 사용이 불가합니다. 잠시 후 다시 시도해 주세요."
@@ -1008,12 +1027,14 @@ reactionAcceptance: "리액션 수신"
likeOnly: "좋아요만 받기"
likeOnlyForRemote: "리모트에서는 좋아요만 받기"
nonSensitiveOnly: "민감한 이모지를 제외하고 받기"
-nonSensitiveOnlyForLocalLikeOnlyForRemote: "민감한 이모지를 제외하고 받기 (리모트에서는 좋아요만 받기)"
+nonSensitiveOnlyForLocalLikeOnlyForRemote: "민감한 이모지를 제외하고 받기(리모트에서는 좋아요만 받기)"
rolesAssignedToMe: "나에게 할당된 역할"
resetPasswordConfirm: "비밀번호를 재설정하시겠습니까?"
sensitiveWords: "민감한 단어"
sensitiveWordsDescription: "설정한 단어가 포함된 노트의 공개 범위를 '홈'으로 강제합니다. 개행으로 구분하여 여러 개를 지정할 수 있습니다."
sensitiveWordsDescription2: "공백으로 구분하면 AND 지정이 되며, 키워드를 슬래시로 둘러싸면 정규 표현식이 됩니다."
+hiddenTags: "숨긴 해시태그"
+hiddenTagsDescription: "설정한 태그를 트렌드에 표시하지 않도록 합니다. 줄 바꿈으로 하나씩 나눠서 설정할 수 있습니다."
notesSearchNotAvailable: "노트 검색을 이용하실 수 없습니다."
license: "라이선스"
unfavoriteConfirm: "즐겨찾기를 해제하시겠습니까?"
@@ -1026,6 +1047,7 @@ enableChartsForRemoteUser: "리모트 유저의 차트를 생성"
enableChartsForFederatedInstances: "리모트 서버의 차트를 생성"
showClipButtonInNoteFooter: "노트 동작에 클립을 추가"
reactionsDisplaySize: "리액션 표시 크기"
+limitWidthOfReaction: "리액션의 최대 폭을 제한하고 작게 표시하기"
noteIdOrUrl: "노트 ID 및 URL"
video: "동영상"
videos: "동영상"
@@ -1038,7 +1060,7 @@ forceShowAds: "광고를 항상 표시"
addMemo: "메모 추가"
editMemo: "메모 편집"
reactionsList: "리액션 목록"
-renotesList: "Renote 목록"
+renotesList: "리노트 목록"
notificationDisplay: "알림 표시"
leftTop: "왼쪽 상단"
rightTop: "오른쪽 상단"
@@ -1103,7 +1125,7 @@ beSureToReadThisAsItIsImportant: "중요하므로 반드시 읽어주십시오."
iHaveReadXCarefullyAndAgree: "\"{x}\"의 내용을 읽고 동의합니다."
dialog: "다이얼로그"
icon: "아바타"
-forYou: "당신에게"
+forYou: "나에게"
currentAnnouncements: "현재 공지사항"
pastAnnouncements: "과거 공지사항"
youHaveUnreadAnnouncements: "읽지 않은 공지사항이 있습니다."
@@ -1112,16 +1134,53 @@ replies: "답글"
renotes: "리노트"
loadReplies: "답글 보기"
loadConversation: "대화 보기"
-pinnedList: "고정해놓은 리스트"
+pinnedList: "고정된 리스트"
keepScreenOn: "기기 화면을 항상 켜기"
verifiedLink: "이 링크의 소유자임이 확인되었습니다."
notifyNotes: "새 노트 알림 켜기"
unnotifyNotes: "새 노트 알림 끄기"
authentication: "인증"
+authenticationRequiredToContinue: "계속하려면 인증하십시오"
+dateAndTime: "일시"
showRenotes: "리노트 표시"
edited: "수정됨"
notificationRecieveConfig: "알림 설정"
mutualFollow: "맞팔로우"
+fileAttachedOnly: "미디어를 포함한 노트만"
+showRepliesToOthersInTimeline: "타임라인에 다른 사람에게 보내는 답글을 포함"
+hideRepliesToOthersInTimeline: "타임라인에 다른 사람에게 보내는 답글을 포함하지 않음"
+showRepliesToOthersInTimelineAll: "타임라인에 현재 팔로우 중인 사람 전원의 답글을 포함하게 하기"
+hideRepliesToOthersInTimelineAll: "타임라인에 현재 팔로우 중인 사람 전원의 답글이 나오지 않게 하기"
+confirmShowRepliesAll: "이 조작은 되돌릴 수 없습니다. 정말로 타임라인에 현재 팔로우 중인 사람 전원의 답글이 나오지 않게 하시겠습니까?"
+confirmHideRepliesAll: "이 조작은 되돌릴 수 없습니다. 정말로 타임라인에 현재 팔로우 중인 사람 전원의 답글이 나오지 않게 하시겠습니까?"
+externalServices: "외부 서비스"
+impressum: "운영자 정보"
+impressumUrl: "운영자 정보 URL"
+impressumDescription: "독일 등의 일부 나라와 지역에서는 꼭 표시해야 합니다(Impressum)."
+privacyPolicy: "개인정보 보호 정책"
+privacyPolicyUrl: "개인정보 보호 정책 URL"
+tosAndPrivacyPolicy: "약관 및 개인정보 보호 정책"
+avatarDecorations: "아바타 장식"
+attach: "붙이기"
+detach: "빼기"
+detachAll: "모두 빼기"
+angle: "각도"
+flip: "플립"
+showAvatarDecorations: "아바타 장식 표시"
+releaseToRefresh: "놓아서 새로고침"
+refreshing: "새로고침 중"
+pullDownToRefresh: "아래로 내려서 새로고침"
+disableStreamingTimeline: "타임라인의 실시간 갱신을 무효화하기"
+useGroupedNotifications: "알림을 그룹화하고 표시"
+signupPendingError: "메일 주소 확인중에 문제가 발생했습니다. 링크의 유효기간이 지났을 가능성이 있습니다."
+cwNotationRequired: "'내용을 숨기기'를 체크한 경우 주석을 써야 합니다."
+doReaction: "리액션 추가"
+code: "문자열"
+reloadRequiredToApplySettings: "설정을 적용하려면 새로고침을 해야 합니다."
+remainingN: "나머지: {n}"
+overwriteContentConfirm: "현재 내용을 덮어쓰기 합니다. 계속 진행하시겠습니까?"
+seasonalScreenEffect: "철에 맞는 화면으로 꾸미기"
+decorate: "장식하기"
_announcement:
forExistingUsers: "기존 유저에게만 알림"
forExistingUsersDescription: "활성화하면 이 공지사항을 게시한 시점에서 이미 가입한 유저에게만 표시합니다. 비활성화하면 게시 후에 가입한 유저에게도 표시합니다."
@@ -1131,6 +1190,10 @@ _announcement:
tooManyActiveAnnouncementDescription: "공지사항이 너무 많을 경우, 사용자 경험에 영향을 끼칠 가능성이 있습니다. 오래된 공지사항은 아카이브하시는 것을 권장드립니다."
readConfirmTitle: "읽음으로 표시합니까?"
readConfirmText: "\"{title}\"을(를) 읽음으로 표시합니다."
+ shouldNotBeUsedToPresentPermanentInfo: "신규 유저의 이용 경험에 악영향을 끼칠 수 있으므로, 일시적인 알림 수단으로만 사용하고 고정된 정보에는 사용을 지양하는 것을 추천합니다."
+ dialogAnnouncementUxWarn: "다이얼로그 형태의 알림이 동시에 2개 이상 존재하는 경우, 사용자 경험에 악영향을 끼칠 수 있으므로 신중히 결정하십시오."
+ silence: "조용히 알림"
+ silenceDescription: "활성화하면 공지사항에 대한 알림이 가지 않게 되며, 확인 버튼을 누를 필요가 없게 됩니다."
_initialAccountSetting:
accountCreated: "계정 생성이 완료되었습니다!"
letsStartAccountSetup: "계정의 초기 설정을 진행합니다."
@@ -1143,19 +1206,91 @@ _initialAccountSetting:
pushNotificationDescription: "푸시 알림을 활성화하면 {name}의 알림을 나의 기기에서 받아볼 수 있게 됩니다."
initialAccountSettingCompleted: "초기 설정을 모두 마쳤습니다!"
haveFun: "{name}와 함께 즐거운 시간 보내세요!"
- ifYouNeedLearnMore: "{name}(Misskey)의 사용 방법에 대해 자세히 알아보려면 {link}를 참고해 주세요."
+ youCanContinueTutorial: "이대로 {name}(Misskey)의 사용법에 대해 튜토리얼을 진행할 수도 있지만, 여기서 중단하고 바로 시작할 수도 있습니다."
+ startTutorial: "튜토리얼 시작"
skipAreYouSure: "초기 설정을 중단하시겠습니까?"
laterAreYouSure: "초기 설정을 나중에 진행하시겠습니까?"
+_initialTutorial:
+ launchTutorial: "튜토리얼 보기"
+ title: "튜토리얼"
+ wellDone: "잘 하셨습니다"
+ skipAreYouSure: "튜토리얼을 종료하시겠습니까?"
+ _landing:
+ title: "튜토리얼에 오신 걸 환영합니다"
+ description: "여기서는 미스키의 기본적인 사용법이나 기능을 확인할 수 있습니다."
+ _note:
+ title: "'노트'가 무엇인가요?"
+ description: "미스키에서는 게시물을 '노트'라고 합니다. 노트는 타임라인에 시간순으로 정렬되어 있고, 실시간으로 갱신됩니다."
+ reply: "답글을 달 수 있습니다. 답글에 답글을 달 수도 있고 글타래처럼 대화를 이어갈 수도 있습니다."
+ renote: "그 노트를 자기 타임라인에 가져와서 공유하는 것이 가능합니다. 글을 추가해서 인용하는 것도 가능합니다."
+ reaction: "리액션을 다는 것이 가능합니다. 다음 페이지에서 자세한 설명을 볼 수 있습니다."
+ menu: "노트의 상세 정보를 표시하거나, 링크를 복사하는 등의 다양한 조작을 할 수 있습니다."
+ _reaction:
+ title: "'리액션'이 무엇인가요?"
+ description: "노트에 '리액션'을 보낼 수 있습니다. '좋아요'만으로는 충분히 전해지지 않는 감정을, 이모지에 실어서 가볍게 보낼 수 있습니다."
+ letsTryReacting: "리액션은 노트의 '+' 버튼을 클릭하여 붙일 수 있습니다. 지금 표시되는 샘플 노트에 리액션을 달아 보세요!"
+ reactToContinue: "다음으로 진행하려면 리액션을 보내세요."
+ reactNotification: "누군가가 나의 노트에 리액션을 보내면 실시간으로 알림을 받게 됩니다."
+ reactDone: "'-' 버튼을 눌러서 리액션을 취소할 수 있습니다."
+ _timeline:
+ title: "타임라인에 대하여"
+ description1: "Misskey에는 종류에 따라 여러 가지의 타임라인으로 구성되어 있습니다.(서버에 따라서는 일부 타임라인을 사용할 수 없는 경우가 있습니다)"
+ home: "내가 팔로우 중인 계정의 노트를 볼 수 있습니다."
+ local: "이 서버에 있는 모든 유저의 게시물을 볼 수 있습니다."
+ social: "홈 타임라인과 로컬 타임라인의 게시물을 모두 볼 수 있습니다."
+ global: "연결되어 있는 모든 서버의 게시물을 볼 수 있습니다."
+ description2: "각각의 타임라인은 화면 상단에서 언제든지 변경할 수 있습니다."
+ description3: "이 외에도, '리스트 타임라인'이나 '채널 타임라인' 등이 있습니다. 자세한 사항은 {link}에서 확인하실 수 있습니다."
+ _postNote:
+ title: "노트 게시 설정"
+ description1: "Misskey에 노트를 쓸 때에는 다양한 옵션을 설정할 수 있습니다. 노트를 작성하는 화면은 이렇게 생겼습니다."
+ _visibility:
+ description: "노트를 볼 수 있는 사람을 제한할 수 있습니다."
+ public: "모든 유저에게 공개합니다."
+ home: "홈 타임라인에만 공개합니다. 팔로워, 프로필 화면, 리노트를 통해서 다른 유저가 볼 수 있습니다."
+ followers: "팔로워에게만 공개. 자기 자신을 제외하고는 리노트가 불가능하며, 팔로워 외에는 열람할 수 없습니다."
+ direct: "지정한 유저에게만 공개되며, 상대방에게 알림이 갑니다. 다이렉트 메시지(DM) 대용으로써 사용하실 수 있습니다."
+ doNotSendConfidencialOnDirect1: "민감한 정보를 보낼 때에는 주의하십시오."
+ doNotSendConfidencialOnDirect2: "서버 관리자는 기술적으로 게시물 내용을 열람할 수 있습니다. 신뢰할 수 없는 서버의 유저에게 다이렉트 메시지를 보내는 경우, 민감한 정보가 포함되어 있는 지 확인하십시오."
+ localOnly: "다른 서버에 게시물을 보내지 않습니다. 앞서 설정한 공개 범위와 상관 없이, 다른 서버의 유저는 이 게시물을 직접 열람할 수 없게 됩니다."
+ _cw:
+ title: "내용 가리기 (CW)"
+ description: "본문 대신에 '내용에 대한 주석'에 입력한 텍스트가 먼저 표시됩니다. '더 보기' 버튼을 누르면 본문이 표시됩니다."
+ _exampleNote:
+ cw: "배고픈 사람 주의"
+ note: "방금 초코도넛을 먹었어요 🍩😋"
+ useCases: "서버의 가이드라인에 따라 특정 주제를 다룰 때에 사용하거나, 스포일러 및 민감한 화제를 다룰 때에 자율적으로 사용하기도 합니다."
+ _howToMakeAttachmentsSensitive:
+ title: "첨부 파일을 열람주의로 설정하려면?"
+ description: "서버의 가이드라인에 따라 필요한 이미지, 또는 그대로 노출되기에 부적절한 미디어는 '열람 주의'를 설정해 주세요."
+ tryThisFile: "이 작성 창에 첨부된 이미지를 열람 주의로 설정해 보세요!"
+ _exampleNote:
+ note: "낫또 뚜껑 뜯다가 실수했다…"
+ method: "첨부 파일을 열람 주의로 설정하려면, 해당 파일을 클릭하여 메뉴를 열고, '열람주의로 설정'을 클릭합니다."
+ sensitiveSucceeded: "파일을 첨부할 때에는 서버의 가이드라인에 따라 적절히 열람주의를 설정해 주시기 바랍니다."
+ doItToContinue: "이미지를 열람 주의로 설정하면 다음으로 넘어갈 수 있게 됩니다."
+ _done:
+ title: "튜토리얼이 끝났습니다! 🎉"
+ description: "여기에서 소개한 기능은 극히 일부에 지나지 않습니다. Misskey의 사용 방법을 더 자세히 알아보려면 {link}를 확인해 주세요!"
+_timelineDescription:
+ home: "홈 타임라인에서는, 내가 팔로우한 계정의 게시물을 볼 수 있습니다."
+ local: "로컬 타임라인에서는, 이 서버의 모든 유저의 게시물을 볼 수 있습니다."
+ social: "소셜 타임라인에서는, 홈 타임라인과 로컬 타임라인의 게시물을 모두 볼 수 있습니다."
+ global: "글로벌 타임라인에서는, 여기와 연결된 다른 모든 서버의 게시물을 볼 수 있습니다."
_serverRules:
description: "회원 가입 이전에 간단하게 표시할 서버 규칙입니다. 이용 약관의 요약으로 구성하는 것을 추천합니다."
_serverSettings:
iconUrl: "아이콘 URL"
+ appIconDescription: "{host}이 앱으로 표시될 때의 아이콘을 지정합니다."
appIconUsageExample: "예를 들어, PWA나 스마트폰 홈 화면에 북마크로 추가되었을 때 등"
appIconStyleRecommendation: "아이콘이 원형 또는 둥근 사각형으로 잘리는 경우가 있으므로, 가장자리 여백이 충분한 사진을 사용하는 것을 추천합니다."
appIconResolutionMustBe: "해상도는 반드시 {resolution} 이어야 합니다."
manifestJsonOverride: "manifest.json 오버라이드"
shortName: "약칭"
shortNameDescription: "서버의 정식 명칭이 긴 경우에, 대신에 표시할 수 있는 약칭이나 통칭."
+ fanoutTimelineDescription: "활성화하면 각종 타임라인을 가져올 때의 성능을 대폭 향상하며, 데이터베이스의 부하를 줄일 수 있습니다. 단, Redis의 메모리 사용량이 증가합니다. 서버의 메모리 용량이 작거나, 서비스가 불안정해지는 경우 비활성화할 수 있습니다."
+ fanoutTimelineDbFallback: "데이터베이스를 예비로 사용하기"
+ fanoutTimelineDbFallbackDescription: "활성화하면 타임라인의 캐시되어 있지 않은 부분에 대해 DB에 질의하여 정보를 가져옵니다. 비활성화하면 이를 실행하지 않음으로써 서버의 부하를 줄일 수 있지만, 타임라인에서 가져올 수 있는 게시물 범위가 한정됩니다."
_accountMigration:
moveFrom: "다른 계정에서 이 계정으로 이사"
moveFromSub: "다른 계정에 대한 별칭을 생성"
@@ -1175,29 +1310,29 @@ _achievements:
earnedAt: "달성 일시"
_types:
_notes1:
- title: "미스키 시작했는데요"
+ title: "미스키 계정 만들었어요"
description: "첫 노트를 작성했습니다"
- flavor: "Misskey에 오신 것을 환영합니다!"
+ flavor: "Misskey에 어서 오세요!"
_notes10:
- title: "노트 조금"
+ title: "몇 가지 노트"
description: "10개의 노트를 작성했습니다"
_notes100:
- title: "노트 많이"
+ title: "많은 노트"
description: "100개의 노트를 작성했습니다"
_notes500:
- title: "노트로 뒤덮여버렸어"
+ title: "노트 범벅"
description: "500개의 노트를 작성했습니다"
_notes1000:
- title: "노트만 산더미"
+ title: "노트가 산더미"
description: "1,000개의 노트를 작성했습니다"
_notes5000:
- title: "노트가 어디서 솟아?"
+ title: "솟아나는 노트"
description: "5,000개의 노트를 작성했습니다"
_notes10000:
title: "슈퍼 노트"
description: "10,000개의 노트를 작성했습니다"
_notes20000:
- title: "노트 더 없어?"
+ title: "노트가 필요해요"
description: "20,000개의 노트를 작성했습니다"
_notes30000:
title: "노트노트노트"
@@ -1223,27 +1358,27 @@ _achievements:
_notes100000:
title: "ALL YOUR NOTE ARE BELONG TO US"
description: "100,000개의 노트를 작성했습니다"
- flavor: "이만큼 쓸 일도 없겠지만... 다른 할 일이 있진 않으신가요?"
+ flavor: "이렇게나 쓸 게 있어요?"
_login3:
- title: "비기너 I"
- description: "총 3일간 로그인했습니다"
- flavor: "오늘부터 여러분도 미스키스트에요!"
+ title: "초보자 I"
+ description: "총 로그인한 날이 3일"
+ flavor: "오늘부터 여러분도 미스키스트랍니다"
_login7:
- title: "비기너 II"
- description: "총 7일간 로그인했습니다"
+ title: "초보자 II"
+ description: "총 로그인한 날이 7일"
flavor: "슬슬 익숙해지셨나요?"
_login15:
- title: "비기너 III"
- description: "총 15일간 로그인했습니다"
+ title: "초보자 III"
+ description: "총 로그인한 날이 15일"
_login30:
title: "미스키스트 I"
- description: "총 30일간 로그인했습니다"
+ description: "총 로그인한 날이 30일"
_login60:
title: "미스키스트 II"
- description: "총 60일간 로그인했습니다"
+ description: "총 로그인한 날이 60일"
_login100:
title: "미스키스트 III"
- description: "총 100일간 로그인했습니다"
+ description: "총 로그인한 날이 100일"
flavor: "그 유저, 미스키스트이다"
_login200:
title: "단골 I"
@@ -1340,7 +1475,7 @@ _achievements:
title: "보물찾기"
description: "숨겨진 보물을 발견했습니다"
_client30min:
- title: "잠깐 쉬어"
+ title: "잠시 쉬어요"
description: "클라이언트를 시작하고 30분이 경과하였습니다"
_client60min:
title: "No \"Miss\" in Misskey"
@@ -1378,8 +1513,8 @@ _achievements:
title: "읽고 답하긴 하시는 건가요?"
description: "100자가 넘는 노트가 작성되고 3초 안에 반응했습니다"
_clickedClickHere:
- title: "여길 눌러보세요"
- description: "여길을 눌러봤습니다"
+ title: "여기를 누르세요"
+ description: "여기를 눌렀습니다"
_justPlainLucky:
title: "그냥 운이 좋았어"
description: "매 10초마다 0.01%의 확률로 달성됩니다"
@@ -1410,6 +1545,12 @@ _achievements:
title: "Brain Diver"
description: "Brain Diver로의 링크를 첨부했습니다"
flavor: "Misskey-Misskey La-Tu-Ma"
+ _smashTestNotificationButton:
+ title: "테스트 과잉"
+ description: "매우 짧은 시간 안에 알림 테스트를 여러 번 수행했습니다"
+ _tutorialCompleted:
+ title: "Misskey 입문자 과정 수료증"
+ description: "튜토리얼을 완료했습니다"
_role:
new: "새 역할 생성"
edit: "역할 수정"
@@ -1420,7 +1561,9 @@ _role:
assignTarget: "할당 대상"
descriptionOfAssignTarget: "수동을 선택하면 누가 이 역할에 포함되는지를 수동으로 관리할 수 있습니다.\n조건부를 선택하면 조건을 설정해 일치하는 사용자를 자동으로 포함되게 할 수 있습니다."
manual: "수동"
+ manualRoles: "수동 역할"
conditional: "조건부"
+ conditionalRoles: "조건부 역할"
condition: "조건"
isConditionalRole: "조건부 역할입니다."
isPublic: "역할 공개"
@@ -1453,6 +1596,7 @@ _role:
inviteLimitCycle: "초대 발급 간격"
inviteExpirationTime: "초대 만료 기간"
canManageCustomEmojis: "커스텀 이모지 관리"
+ canManageAvatarDecorations: "아바타 꾸미기 관리"
driveCapacity: "드라이브 용량"
alwaysMarkNsfw: "파일을 항상 NSFW로 지정"
pinMax: "고정할 수 있는 노트 수"
@@ -1467,6 +1611,8 @@ _role:
descriptionOfRateLimitFactor: "작을수록 제한이 완화되고, 클수록 제한이 강화됩니다."
canHideAds: "광고 숨기기"
canSearchNotes: "노트 검색 이용 가능 여부"
+ canUseTranslator: "번역 기능의 사용"
+ avatarDecorationLimit: "아바타 장식의 최대 붙임 개수"
_condition:
isLocal: "로컬 사용자"
isRemote: "리모트 사용자"
@@ -1515,6 +1661,10 @@ _ad:
reduceFrequencyOfThisAd: "이 광고의 표시 빈도 낮추기"
hide: "보이지 않음"
timezoneinfo: "요일은 서버의 표준 시간대에 따라 결정됩니다."
+ adsSettings: "광고 표시 설정"
+ notesPerOneAd: "실시간으로 갱신되는 타임라인에서 광고를 노출시키는 간격 (노트 당)"
+ setZeroToDisable: "0으로 지정하면 실시간 타임라인에서의 광고를 비활성화합니다"
+ adsTooClose: "광고의 표시 간격이 매우 작아, 사용자 경험에 부정적인 영향을 미칠 수 있습니다."
_forgotPassword:
enterEmail: "여기에 계정에 등록한 메일 주소를 입력해 주세요. 입력한 메일 주소로 비밀번호 재설정 링크를 발송합니다."
ifNoEmail: "메일 주소를 등록하지 않은 경우, 관리자에 문의해 주십시오."
@@ -1559,7 +1709,7 @@ _registry:
domain: "도메인"
createKey: "키 생성"
_aboutMisskey:
- about: "Misskey는 syuilo에 의해서 2014년부터 개발되어 온 오픈소스 소프트웨어 입니다."
+ about: "Misskey는 syuilo가 2014년부터 개발한 오픈소스 소프트웨어입니다."
contributors: "주요 기여자"
allContributors: "모든 기여자"
source: "소스 코드"
@@ -1567,6 +1717,7 @@ _aboutMisskey:
donate: "Misskey에 기부하기"
morePatrons: "이 외에도 다른 많은 분들이 도움을 주시고 계십니다. 감사합니다🥰"
patrons: "후원자"
+ projectMembers: "프로젝트 구성원"
_displayOfSensitiveMedia:
respect: "민감한 콘텐츠로 표시된 미디어 숨기기"
ignore: "민감한 콘텐츠로 표시된 미디어 보이기"
@@ -1591,6 +1742,7 @@ _channel:
notesCount: "{n}노트"
nameAndDescription: "이름과 설명"
nameOnly: "이름만"
+ allowRenoteToExternal: "채널 외부로의 리노트와 인용 리노트를 허가"
_menuDisplay:
sideFull: "가로"
sideIcon: "가로(아이콘)"
@@ -1663,9 +1815,6 @@ _theme:
infoFg: "정보창 텍스트"
infoWarnBg: "경고창 배경"
infoWarnFg: "경고창 텍스트"
- cwBg: "CW 버튼 배경"
- cwFg: "CW 버튼 텍스트"
- cwHoverBg: "CW 버튼 배경 (호버)"
toastBg: "알림창 배경"
toastFg: "알림창 텍스트"
buttonBg: "버튼 배경"
@@ -1675,7 +1824,7 @@ _theme:
driveFolderBg: "드라이브 폴더 배경"
wallpaperOverlay: "배경화면 오버레이"
badge: "배지"
- messageBg: "채팅 배경"
+ messageBg: "대화 배경"
accentDarken: "강조 색상 (어두움)"
accentLighten: "강조 색상 (밝음)"
fgHighlighted: "강조된 텍스트"
@@ -1685,6 +1834,14 @@ _sfx:
notification: "알림"
antenna: "안테나 수신"
channel: "채널 알림"
+ reaction: "리액션 선택"
+_soundSettings:
+ driveFile: "드라이브에 있는 오디오를 사용"
+ driveFileWarn: "드라이브에 있는 파일을 선택하세요."
+ driveFileTypeWarn: "이 파일은 지원되지 않습니다."
+ driveFileTypeWarnDescription: "오디오 파일을 선택하세요."
+ driveFileDurationWarn: "오디오가 너무 깁니다"
+ driveFileDurationWarnDescription: "긴 오디오로 설정할 경우 미스키 사용에 지장이 갈 수도 있습니다. 그래도 괜찮습니까?"
_ago:
future: "미래"
justNow: "방금 전"
@@ -1696,21 +1853,19 @@ _ago:
monthsAgo: "{n}개월 전"
yearsAgo: "{n}년 전"
invalid: "없음"
+_timeIn:
+ seconds: "{n}초 후"
+ minutes: "{n}분 후"
+ hours: "{n}시간 후"
+ days: "{n}일 후"
+ weeks: "{n}주 후"
+ months: "{n}개월 후"
+ years: "{n}년 후"
_time:
second: "초"
minute: "분"
hour: "시간"
day: "일"
-_timelineTutorial:
- title: "Misskey의 사용 방법"
- step1_1: "이것은 '타임라인'입니다. {name}에 게시된 '노트'가 시간 순서대로 표시됩니다."
- step1_2: "타임라인은 몇 가지 종류로 나뉩니다. 그 중에 '홈 타임라인'은 내가 팔로우한 사람의 노트가 표시되며, '로컬 타임라인'에는 {name} 의 모든 노트가 표시됩니다."
- step2_1: "그럼 시험삼아 노트를 작성해 봅시다. 화면에 있는 연필 버튼을 눌러 보세요."
- step2_2: "첫 노트이니까 자기소개, 혹은 가볍게 \"안녕 {name}\"라고 올려 보는 건 어떨까요?"
- step3_1: "노트 작성을 끝내셨나요?"
- step3_2: "당신의 노트가 타임라인에 표시되어 있다면 성공입니다."
- step4_1: "노트에는 '리액션'을 붙일 수 있습니다."
- step4_2: "리액션을 붙이려면, 노트의 \"+\" 버튼을 클릭하고 원하는 이모지를 선택합니다."
_2fa:
alreadyRegistered: "이미 설정이 완료되었습니다."
registerTOTP: "인증 앱 설정 시작"
@@ -1745,9 +1900,9 @@ _permissions:
"write:account": "계정의 정보를 변경합니다"
"read:blocks": "차단 여부를 확인합니다"
"write:blocks": "차단을 하거나 해제합니다"
- "read:drive": "드라이브를 조회합니다"
+ "read:drive": "드라이브 보기"
"write:drive": "드라이브에 파일을 올리거나, 이름을 변경하거나, 삭제합니다"
- "read:favorites": "즐겨찾기를 조회합니다"
+ "read:favorites": "즐겨찾기 보기"
"write:favorites": "즐겨찾기에 추가하거나 삭제합니다"
"read:following": "팔로우 상태를 봅니다"
"write:following": "팔로우하거나 팔로우를 해제합니다"
@@ -1765,7 +1920,7 @@ _permissions:
"write:pages": "페이지를 수정합니다"
"read:page-likes": "페이지의 좋아요를 확인합니다"
"write:page-likes": "페이지에 좋아요를 추가하거나 취소합니다"
- "read:user-groups": "유저 그룹을 조회합니다"
+ "read:user-groups": "사용자 그룹 보기"
"write:user-groups": "유저 그룹을 만들거나, 초대하거나, 이름을 변경하거나, 양도하거나, 삭제합니다"
"read:channels": "채널을 보기"
"write:channels": "채널을 추가하거나 삭제합니다"
@@ -1790,8 +1945,9 @@ _auth:
_antennaSources:
all: "모든 노트"
homeTimeline: "팔로우중인 유저의 노트"
- users: "지정한 한 명 혹은 여러 명의 유저의 노트"
+ users: "지정한 유저의 노트"
userList: "지정한 리스트에 속한 유저의 노트"
+ userBlacklist: "지정한 유저를 제외한 모든 노트"
_weekday:
sunday: "일요일"
monday: "월요일"
@@ -1830,6 +1986,7 @@ _widgets:
_userList:
chooseList: "리스트 선택"
clicker: "클리커"
+ birthdayFollowings: "오늘이 생일인 사용자"
_cw:
hide: "숨기기"
show: "더 보기"
@@ -1877,7 +2034,7 @@ _postForm:
b: "무슨 일이 일어나고 있나요?"
c: "무엇을 생각하고 있나요?"
d: "말하고 싶은 게 있나요?"
- e: "여기에 적어주세요"
+ e: "여기에 적어 주세요"
f: "작성해주시길 기다리고 있어요..."
_profile:
name: "이름"
@@ -1891,6 +2048,8 @@ _profile:
metadataContent: "내용"
changeAvatar: "아바타 이미지 변경"
changeBanner: "배너 이미지 변경"
+ verifiedLinkDescription: "내용에 자신의 프로필로 향하는 링크가 포함된 페이지의 URL을 삽입하면 소유자 인증 마크가 표시됩니다."
+ avatarDecorationMax: "최대 {max}개까지 장식을 할 수 있습니다."
_exportOrImport:
allNotes: "모든 노트"
favoritedNotes: "즐겨찾기한 노트"
@@ -1900,6 +2059,7 @@ _exportOrImport:
userLists: "리스트"
excludeMutingUsers: "뮤트한 유저 제외하기"
excludeInactiveUsers: "휴면 중인 계정 제외하기"
+ withReplies: "가져오기한 유저에 의한 답글을 타임라인에 포함"
_charts:
federation: "연합"
apRequest: "요청"
@@ -1973,7 +2133,7 @@ _pages:
url: "페이지 URL"
summary: "페이지 요약"
alignCenter: "가운데 정렬"
- hideTitleWhenPinned: "프로필에 고정해놓은 경우 타이틀을 표시하지 않음"
+ hideTitleWhenPinned: "프로필에 고정한 경우 타이틀을 표시하지 않음"
font: "폰트"
fontSerif: "명조체"
fontSansSerif: "고딕체"
@@ -2004,20 +2164,26 @@ _notification:
youGotMention: "{name}님이 멘션함"
youGotReply: "{name}님이 답글함"
youGotQuote: "{name}님이 인용함"
- youRenoted: "{name}님이 Renote"
+ youRenoted: "{name}님이 리노트했습니다"
youWereFollowed: "새로운 팔로워가 있습니다"
youReceivedFollowRequest: "새로운 팔로우 요청이 있습니다"
yourFollowRequestAccepted: "팔로우 요청이 수락되었습니다"
pollEnded: "투표 결과가 발표되었습니다"
+ newNote: "새 게시물"
unreadAntennaNote: "안테나 {name}"
+ roleAssigned: "역할이 부여 되었습니다."
emptyPushNotificationMessage: "푸시 알림이 갱신되었습니다"
achievementEarned: "도전 과제를 달성했습니다"
testNotification: "알림 테스트"
checkNotificationBehavior: "알림 표시를 체크하기"
sendTestNotification: "테스트 알림 보내기"
notificationWillBeDisplayedLikeThis: "알림이 이렇게 표시됩니다"
+ reactedBySomeUsers: "{n}명이 반응했습니다"
+ renotedBySomeUsers: "{n}명이 리노트했습니다"
+ followedBySomeUsers: "{n}명에게 팔로우됨"
_types:
all: "전부"
+ note: "유저의 새 게시물"
follow: "팔로잉"
mention: "멘션"
reply: "답글"
@@ -2027,6 +2193,7 @@ _notification:
pollEnded: "투표가 종료됨"
receiveFollowRequest: "팔로우 요청을 받았을 때"
followRequestAccepted: "팔로우 요청이 승인되었을 때"
+ roleAssigned: "역할이 부여 됨"
achievementEarned: "도전 과제 획득"
app: "연동된 앱을 통한 알림"
_actions:
@@ -2084,10 +2251,104 @@ _webhookSettings:
followed: "누군가 나를 팔로우했을 때"
note: "노트를 게시할 때"
reply: "답글을 받았을 때"
- renote: "누군가 내 글을 Renote했을 때"
+ renote: "누군가 내 글을 리노트했을 때"
reaction: "누군가 내 노트에 리액션했을 때"
mention: "누군가 나를 멘션했을 때"
_moderationLogTypes:
+ createRole: "역할 생성"
+ deleteRole: "역할 삭제"
+ updateRole: "역할 수정"
+ assignRole: "역할 할당"
+ unassignRole: "역할 해제"
suspend: "정지"
+ unsuspend: "정지 해제"
+ addCustomEmoji: "커스텀 이모지 추가"
+ updateCustomEmoji: "커스텀 이모지 수정"
+ deleteCustomEmoji: "커스텀 이모지 삭제"
+ updateServerSettings: "서버 설정 갱신"
+ updateUserNote: "모더레이션 노트 갱신"
+ deleteDriveFile: "파일 삭제"
+ deleteNote: "노트 삭제"
+ createGlobalAnnouncement: "전역 공지사항 생성"
+ createUserAnnouncement: "유저 공지사항 생성"
+ updateGlobalAnnouncement: "전역 공지사항 수정"
+ updateUserAnnouncement: "유저 공지사항 수정"
+ deleteGlobalAnnouncement: "전역 공지사항 삭제"
+ deleteUserAnnouncement: "유저 공지사항 삭제"
resetPassword: "비밀번호 재설정"
+ suspendRemoteInstance: "리모트 서버를 정지"
+ unsuspendRemoteInstance: "리모트 서버의 정지를 해제"
+ markSensitiveDriveFile: "파일에 열람주의를 설정"
+ unmarkSensitiveDriveFile: "파일에 열람주의를 해제"
+ resolveAbuseReport: "신고 해결"
createInvitation: "초대 코드 생성"
+ createAd: "광고 생성"
+ deleteAd: "광고 삭제"
+ updateAd: "광고 수정"
+ createAvatarDecoration: "아바타 장식 만들기"
+ updateAvatarDecoration: "아바타 장식 수정"
+ deleteAvatarDecoration: "아바타 장식 삭제"
+ unsetUserAvatar: "유저 아바타 제거"
+ unsetUserBanner: "유저 배너 제거"
+_fileViewer:
+ title: "파일 상세"
+ type: "파일 유형"
+ size: "파일 크기"
+ url: "URL"
+ uploadedAt: "업로드 날짜"
+ attachedNotes: "첨부된 노트"
+ thisPageCanBeSeenFromTheAuthor: "이 페이지는 파일 소유자만 열람할 수 있습니다"
+_externalResourceInstaller:
+ title: "외부 사이트로부터 설치"
+ checkVendorBeforeInstall: "제공자를 신뢰할 수 있는 경우에만 설치하십시오."
+ _plugin:
+ title: "이 플러그인을 설치하시겠습니까?"
+ metaTitle: "플러그인 정보"
+ _theme:
+ title: "이 테마를 설치하시겠습니까?"
+ metaTitle: "테마 정보"
+ _meta:
+ base: "기본 컬러 스키마"
+ _vendorInfo:
+ title: "제공자 정보"
+ endpoint: "참조한 엔드포인트"
+ hashVerify: "파일 무결성 확인"
+ _errors:
+ _invalidParams:
+ title: "파라미터가 부족합니다"
+ description: "외부 사이트로부터 데이터를 불러오기 위해 필요한 정보가 부족합니다. URL을 다시 한 번 확인하십시오."
+ _resourceTypeNotSupported:
+ title: "해당하는 외부 리소스는 지원되지 않습니다."
+ description: "외부 사이트의 해당 리소스는 지원되지 않습니다. 사이트 관리자에게 문의하십시오."
+ _failedToFetch:
+ title: "데이터를 불러올 수 없습니다"
+ fetchErrorDescription: "외부 사이트와의 통신에 실패하였습니다. 여러 번 시도해도 동일한 오류가 표시되는 경우 사이트 관리자에게 문의하십시오."
+ parseErrorDescription: "외부 사이트에서 불러온 데이터를 읽어들일 수 없습니다. 사이트 관리자에게 문의하십시오."
+ _hashUnmatched:
+ title: "데이터가 올바르지 않습니다."
+ description: "데이터의 무결성 확인에 실패하여, 보안을 위해 설치가 중단되었습니다. 사이트 관리자에게 문의하십시오."
+ _pluginParseFailed:
+ title: "AiScript 오류"
+ description: "데이터를 성공적으로 불러왔으나, AiScript 분석 과정에서 오류가 발생하여 읽어들일 수 없습니다. 플러그인 작성자에게 문의하십시오. 자세한 사항은 브라우저에 내장된 개발자 도구의 Javascript 콘솔에서 확인하실 수 있습니다."
+ _pluginInstallFailed:
+ title: "플러그인 설치에 실패했습니다"
+ description: "플러그인을 설치하는 도중 문제가 발생하였습니다. 다시 한 번 시도하십시오. 자세한 사항은 브라우저에 내장된 개발자 도구의 Javascript 콘솔에서 확인하실 수 있습니다."
+ _themeParseFailed:
+ title: "테마 코드 분석 오류"
+ description: "데이터를 성공적으로 불러왔으나, 테마 코드 분석 과정에서 오류가 발생하여 읽어들일 수 없습니다. 테마 작성자에게 문의하십시오. 자세한 사항은 브라우저에 내장된 개발자 도구의 Javascript 콘솔에서 확인하실 수 있습니다."
+ _themeInstallFailed:
+ title: "테마를 설치하지 못했습니다"
+ description: "테마를 설치하는 도중 문제가 발생하였습니다. 다시 한 번 시도하십시오. 자세한 사항은 브라우저에 내장된 개발자 도구의 Javascript 콘솔에서 확인하실 수 있습니다."
+_dataSaver:
+ _media:
+ title: "미디어 불러오기"
+ description: "사진이나 동영상을 자동으로 불러오지 않습니다. 숨겨 놓은 사진이나 동영상은 누르면 불러옵니다."
+ _avatar:
+ title: "아이콘 이미지"
+ description: "아이콘 이미지의 애니메이션을 멈춥니다. 애니메이션 이미지는 일반 이미지보다 파일 크기가 클 수 있으므로 데이터 사용량을 더 줄일 수 있습니다."
+ _urlPreview:
+ title: "URL 미리보기의 섬네일"
+ description: "URL 미리보기의 섬네일 이미지를 불러오지 않게 됩니다."
+ _code:
+ title: "문자열 강조"
+ description: "MFM 등으로 문자열 강조 기법을 사용할 때 누르기 전에는 불러오지 않습니다. 문자열 강조에서는 강조할 언어마다 그 정의 파일을 불러와야 하지만 이를 자동으로 불러오지 않으므로 데이터 사용량을 줄일 수 있습니다."
diff --git a/locales/lo-LA.yml b/locales/lo-LA.yml
index b22e047cfa..c9e5aea1ed 100644
--- a/locales/lo-LA.yml
+++ b/locales/lo-LA.yml
@@ -320,7 +320,6 @@ administrator: "ຜູ້ບໍລິຫານ"
token: "ໂທເຄັນ"
share: "ແບ່ງປັນ"
notFound: "ບໍ່ພົບ"
-cacheClear: "ລຶບລ້າງແຄສ"
help: "ຊ່ວຍເຫຼືອ"
close: "ປິດ"
invites: "ເຊີນ"
diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index 6f789dff10..98f1693129 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -45,6 +45,7 @@ pin: "Vastmaken aan profielpagina"
unpin: "Losmaken van profielpagina"
copyContent: "Kopiëren inhoud"
copyLink: "Kopiëren link"
+copyLinkRenote: ""
delete: "Verwijderen"
deleteAndEdit: "Verwijderen en bewerken"
deleteAndEditConfirm: "Weet je zeker dat je deze notitie wilt verwijderen en dan bewerken? Je verliest alle reacties, herdelingen en antwoorden erop."
@@ -118,7 +119,6 @@ sensitive: "NSFW"
add: "Toevoegen"
reaction: "Reacties"
reactions: "Reacties"
-reactionSetting: "Reacties die in de reactie-selector worden getoond"
reactionSettingDescription2: "Sleep om opnieuw te ordenen, Klik om te verwijderen, Druk op \"+\" om toe te voegen"
rememberNoteVisibility: "Vergeet niet de notitie zichtbaarheidsinstellingen"
attachCancel: "Verwijder bijlage"
@@ -395,7 +395,6 @@ reduceUiAnimation: "Verminder beweging in de UI"
share: "Delen"
notFound: "Niet gevonden"
uploadFolder: "Standaardmap voor uploaden"
-cacheClear: "Cache verwijderen"
markAsReadAllNotifications: "Markeer alle meldingen als gelezen"
markAsReadAllUnreadNotes: "Markeer alle berichten als gelezen"
markAsReadAllTalkMessages: "Markeer alle berichten als gelezen"
diff --git a/locales/no-NO.yml b/locales/no-NO.yml
index d99c61c1dd..195b1d0717 100644
--- a/locales/no-NO.yml
+++ b/locales/no-NO.yml
@@ -102,7 +102,6 @@ clickToShow: "Klikk for å vise"
add: "Legg til"
reaction: "Reaksjon"
reactions: "Reaksjoner"
-reactionSetting: "Reaksjoner som vises i reaksjonsvelgeren"
reactionSettingDescription2: "Dra for å endre rekkefølgen, klikk for å slette, trykk \"+\" for å legge til."
rememberNoteVisibility: "Husk innstillingene for synlighet av Notes"
attachCancel: "Fjern vedlegg"
@@ -601,9 +600,6 @@ _time:
minute: "Minutter"
hour: "Timer"
day: "Dager"
-_timelineTutorial:
- title: "Hvordan bruke Misskey"
- step2_2: "Hva med å skrive en selvpresentasjon, eller bare \"Hei {name}!\" hvis du ikke har lyst?"
_2fa:
renewTOTPCancel: "Avbryt"
_weekday:
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index 4e5eb147ea..496e9bfc30 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -111,7 +111,6 @@ sensitive: "NSFW"
add: "Dodaj"
reaction: "Reakcja"
reactions: "Reakcja"
-reactionSetting: "Reakcje do pokazania w wyborniku reakcji"
reactionSettingDescription2: "Przeciągnij aby zmienić kolejność, naciśnij aby usunąć, naciśnij „+” aby dodać"
rememberNoteVisibility: "Zapamiętuj ustawienia widoczności wpisu"
attachCancel: "Usuń załącznik"
@@ -407,7 +406,6 @@ share: "Udostępnij"
notFound: "Nie znaleziono"
notFoundDescription: "Nie ma strony odpowiadającej określonemu adresowi URL."
uploadFolder: "Domyślne położenie wysłanych"
-cacheClear: "Wyczyść pamięć podręczną"
markAsReadAllNotifications: "Oznacz wszystkie powiadomienia jako przeczytane"
markAsReadAllUnreadNotes: "Oznacz wszystkie wpisy jako przeczytane"
markAsReadAllTalkMessages: "Oznacz wszystkie wiadomości jako przeczytane"
@@ -808,8 +806,6 @@ makeReactionsPublicDescription: "To spowoduje, że lista wszystkich Twoich dotyc
classic: "Klasyczny"
muteThread: "Wycisz wątek"
unmuteThread: "Wyłącz wyciszenie wątku"
-ffVisibility: "Widoczność obserwowanych/obserwujących"
-ffVisibilityDescription: "Pozwala skonfigurować, kto może zobaczyć, kogo obserwujesz i kto Cię obserwuje."
continueThread: "Pokaż kontynuację wątku"
deleteAccountConfirm: "Spowoduje to nieodwracalne usunięcie Twojego konta. Kontynuować?"
incorrectPassword: "Nieprawidłowe hasło."
@@ -873,6 +869,7 @@ youFollowing: "Śledzeni"
icon: "Awatar"
replies: "Odpowiedz"
renotes: "Udostępnij"
+flip: "Odwróć"
_role:
priority: "Priorytet"
_priority:
@@ -1043,9 +1040,6 @@ _theme:
infoFg: "Tekst informacji"
infoWarnBg: "Tło ostrzeżenia"
infoWarnFg: "Tekst ostrzeżenia"
- cwBg: "Tło CW"
- cwFg: "Tekst CW"
- cwHoverBg: "Tło CW (po najechaniu)"
toastBg: "Tło powiadomień"
toastFg: "Tekst powiadomień"
buttonBg: "Tło przycisku"
diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml
index 23864df1b8..f969d711c0 100644
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -121,7 +121,6 @@ sensitive: "Conteúdo sensível"
add: "Adicionar"
reaction: "Reações"
reactions: "Reações"
-reactionSetting: "Quais reações exibir no seletor de reações"
reactionSettingDescription2: "Arraste para reordenar, clique para excluir, pressione + para adicionar."
rememberNoteVisibility: "Lembrar das configurações de visibilidade de notas"
attachCancel: "Remover anexo"
@@ -431,7 +430,6 @@ share: "Compartilhar"
notFound: "Não encontrado"
notFoundDescription: "Não havia página correspondente ao URL especificado."
uploadFolder: "Destino de upload padrão"
-cacheClear: "Excluir memória transitória"
markAsReadAllNotifications: "Marcar todas as notificações como lidas"
markAsReadAllUnreadNotes: "Marcar todas as postagens como lidas"
markAsReadAllTalkMessages: "Marcar todas as conversas como lidas"
@@ -860,8 +858,6 @@ makeReactionsPublicDescription: "Isto vai deixar o histórico de todas as suas r
classic: "Clássico"
muteThread: "Silenciar esta conversa"
unmuteThread: "Desativar silêncio desta conversa"
-ffVisibility: "Visibilidade de Seguidos/Seguidores"
-ffVisibilityDescription: "Permite configurar quem pode ver quem lhe segue e quem você está seguindo."
continueThread: "Ver mais desta conversa"
deleteAccountConfirm: "Deseja realmente excluir a conta?"
incorrectPassword: "Senha inválida."
@@ -1011,6 +1007,7 @@ icon: "Avatar"
replies: "Responder"
renotes: "Repostar"
keepScreenOn: "Manter a tela do dispositivo sempre ligada"
+flip: "Inversão"
_initialAccountSetting:
followUsers: "Siga usuários que lhe interessam para criar a sua linha do tempo."
_serverSettings:
@@ -1322,8 +1319,6 @@ _sfx:
notification: "Notificações"
_ago:
invalid: "Não há nada aqui"
-_timelineTutorial:
- step1_2: "Existem vários tipos de linhas do tempo, por exemplo, na 'Linha do Tempo Principal', você verá as notas das pessoas que está seguindo, e na 'Linha do Tempo Local', verá todas as notas de {name}."
_2fa:
securityKeyInfo: "Além da autenticação por impressão digital ou PIN, você também pode configurar a autenticação por chaves de segurança de hardware compatível com FIDO2 para proteger ainda mais a sua conta."
removeKeyConfirm: "Deseja excluir {name}?"
diff --git a/locales/ro-RO.yml b/locales/ro-RO.yml
index 77bccb7e6b..10be9539cf 100644
--- a/locales/ro-RO.yml
+++ b/locales/ro-RO.yml
@@ -2,6 +2,7 @@
_lang_: "Română"
headlineMisskey: "O rețea conectată prin note"
introMisskey: "Bine ai venit! Misskey este un serviciu de microblogging open source și decentralizat.\nCreează \"note\" cu care să îți poți împărți gândurile cu oricine din jurul tău. 📡\nCu \"reacții\" îți poți expirma rapid părerea despre notele oricui. 👍\nHai să explorăm o lume nouă! 🚀"
+poweredByMisskeyDescription: "{name} este unul dintre serviciile care se folosește de platforma open source Misskey."
monthAndDay: "{day}/{month}"
search: "Caută"
notifications: "Notificări"
@@ -12,12 +13,14 @@ fetchingAsApObject: "Se aduce din Fediverse..."
ok: "OK"
gotIt: "Am înțeles!"
cancel: "Anulează"
+noThankYou: "Nu, mulțumesc."
enterUsername: "Introdu numele de utilizator"
renotedBy: "Re-notat de {user}"
noNotes: "Nicio notă"
noNotifications: "Nicio notificare"
instance: "Instanță"
settings: "Setări"
+notificationSettings: "Setări notificări"
basicSettings: "Setări generale"
otherSettings: "Alte Setări"
openInWindow: "Deschide într-o fereastră"
@@ -42,12 +45,20 @@ pin: "Fixează pe profil"
unpin: "Anulati fixare"
copyContent: "Copiază conținutul"
copyLink: "Copiază link-ul"
+copyLinkRenote: "Copiază linkul pentru renote"
delete: "Şterge"
deleteAndEdit: "Șterge și editează"
deleteAndEditConfirm: "Ești sigur că vrei să ștergi această notă și să o editezi? Vei pierde reacțiile, re-notele și răspunsurile acesteia."
addToList: "Adaugă în listă"
+addToAntenna: "Adaugă la antenă"
sendMessage: "Trimite un mesaj"
+copyRSS: "Copiază RSS"
copyUsername: "Copiază numele de utilizator"
+copyUserId: "Copiază numele de utilizator"
+copyNoteId: "Copiază ID-ul notiței"
+copyFileId: "Copiază ID-ul fișierului"
+copyFolderId: "Copiază ID-ul folderului"
+copyProfileUrl: "Copiază URL profil"
searchUser: "Caută un utilizator"
reply: "Răspunde"
loadMore: "Incarcă mai mult"
@@ -100,6 +111,8 @@ renoted: "Re-notat."
cantRenote: "Această postare nu poate fi re-notată."
cantReRenote: "O re-notă nu poate fi re-notată."
quote: "Citează"
+inChannelRenote: "Renotează în canal"
+inChannelQuote: "Citează în canal"
pinnedNote: "Notă fixată"
pinned: "Fixat pe profil"
you: "Tu"
@@ -108,7 +121,6 @@ sensitive: "NSFW"
add: "Adaugă"
reaction: "Reacție"
reactions: "Reacție"
-reactionSetting: "Reacții care să apară in selectorul de reacții"
reactionSettingDescription2: "Trage pentru a rearanja, apasă pe \"+\" pentru a adăuga."
rememberNoteVisibility: "Amintește setarea de vizibilitate a notelor"
attachCancel: "Înlătură atașament"
@@ -117,6 +129,8 @@ unmarkAsSensitive: "Demarchează ca NSFW"
enterFileName: "Introduceţi numele fişierului"
mute: "Amuțește"
unmute: "Înlătură amuțirea"
+renoteMute: "Renotări pe modul silențios"
+renoteUnmute: "Scoate renotările de pe modul silențios"
block: "Blochează"
unblock: "Deblochează"
suspend: "Suspendă"
@@ -126,7 +140,10 @@ unblockConfirm: "Ești sigur ca vrei să deblochezi acest cont?"
suspendConfirm: "Ești sigur ca vrei să suspendezi acest cont?"
unsuspendConfirm: "Ești sigur ca vrei să nu mai suspendezi acest cont?"
selectList: "Selectează o listă"
+editList: "Editați lista"
+selectChannel: "Selectaţi canalul"
selectAntenna: "Selectează o antenă"
+editAntenna: "Editează antena"
selectWidget: "Selectați un widget"
editWidgets: "Editează widget-urile"
editWidgetsExit: "Terminat"
@@ -139,6 +156,7 @@ addEmoji: "Adaugă un emoji"
settingGuide: "Setări recomandate"
cacheRemoteFiles: "Ține fișierele externe in cache"
cacheRemoteFilesDescription: "Când această setare este dezactivată, fișierele externe sunt încărcate direct din instanța externă. Dezactivarea va scădea utilizarea spațiului de stocare, dar va crește traficul, deoarece thumbnail-urile nu vor fi generate."
+youCanCleanRemoteFilesCache: "Poți goli cache-ul prin a apăsa pe butonul de 🗑️ din fereastra de gestionare a fișierelor."
flagAsBot: "Marchează acest cont ca bot"
flagAsBotDescription: "Activează această opțiune dacă acest cont este controlat de un program. Daca e activată, aceasta va juca rolul unui indicator pentru dezvoltatori pentru a preveni interacțiunea în lanțuri infinite cu ceilalți boți și ajustează sistemele interne al Misskey pentru a trata acest cont drept un bot."
flagAsCat: "Marchează acest cont ca pisică"
@@ -393,7 +411,6 @@ share: "Distribuie"
notFound: "Nu a fost găsit"
notFoundDescription: "N-a fost găsită nicio pagină cu acest URL."
uploadFolder: "Folder implicit pentru încărcări"
-cacheClear: "Golește cache-ul"
markAsReadAllNotifications: "Marchează toate notificările drept citit"
markAsReadAllUnreadNotes: "Marchează toate notele drept citit"
markAsReadAllTalkMessages: "Marchează toate mesajele drept citit"
@@ -649,6 +666,8 @@ _sfx:
notification: "Notificări"
_ago:
invalid: "Nu e nimic de văzut aici"
+_2fa:
+ renewTOTPCancel: "Nu, mulțumesc."
_widgets:
profile: "Profil"
instanceInfo: "Informații despre instanță"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index ac30e3a98c..b8095d7256 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -59,9 +59,9 @@ copyFileId: "Скопировать ID файла"
copyFolderId: "Скопировать ID папки"
copyProfileUrl: "Скопировать URL профиля "
searchUser: "Поиск людей"
-reply: "Ответить"
+reply: "Ответ"
loadMore: "Показать еще"
-showMore: "Показать еще"
+showMore: "Показать ещё"
showLess: "Закрыть"
youGotNewFollower: "Новый подписчик"
receiveFollowRequest: "Получен запрос на подписку"
@@ -120,7 +120,6 @@ sensitive: "Содержимое не для всех"
add: "Добавить"
reaction: "Реакции"
reactions: "Реакции"
-reactionSetting: "Реакции, отображаемые в палитре"
reactionSettingDescription2: "Расставляйте перетаскиванием, удаляйте нажатием, добавляйте кнопкой «+»."
rememberNoteVisibility: "Запоминать видимость заметок"
attachCancel: "Удалить вложение"
@@ -409,6 +408,7 @@ aboutMisskey: "О Misskey"
administrator: "Администратор"
token: "Токен"
2fa: "2-х факторная аутентификация"
+setupOf2fa: "Настроить двухфакторную аутентификацию"
totp: "Приложение-аутентификатор"
totpDescription: "Описание приложения-аутентификатора"
moderator: "Модератор"
@@ -428,7 +428,6 @@ share: "Поделиться"
notFound: "Не найдено"
notFoundDescription: "Страница по указанной ссылке не найдена"
uploadFolder: "Место загрузки по умолчанию"
-cacheClear: "Очистка кэша"
markAsReadAllNotifications: "Отметить все уведомления как прочитанные"
markAsReadAllUnreadNotes: "Отметить все заметки как прочитанные"
markAsReadAllTalkMessages: "Отметить все реплики как прочитанные"
@@ -642,7 +641,7 @@ create: "Создать"
notificationSetting: "Настройки уведомлений"
notificationSettingDesc: "Выберите тип уведомлений для отображения"
useGlobalSetting: "Использовать глобальные настройки"
-useGlobalSettingDesc: "Если включено, будут использоваться настройки учётной записи. Если включить, этот виджет можно будет настроить индивидуально."
+useGlobalSettingDesc: "Если включено, будут использоваться настройки учётной записи. Если отключить, этот виджет можно будет настроить индивидуально."
other: "Другие"
regenerateLoginToken: "Создать новый токен для входа"
regenerateLoginTokenDescription: "Создаёт новый токен, используемый внутри программы во время входа. Обычно в этом нет необходимости. При создании все устройства будут отключены."
@@ -652,6 +651,7 @@ behavior: "Поведение"
sample: "Пример"
abuseReports: "Жалобы"
reportAbuse: "Жалоба"
+reportAbuseRenote: "Пожаловаться на репост"
reportAbuseOf: "Пожаловаться на пользователя {name}"
fillAbuseReportDescription: "Опишите, пожалуйста, причину жалобы подробнее. Если речь о конкретной заметке, будьте добры приложить ссылку на неё."
abuseReported: "Жалоба отправлена. Большое спасибо за информацию."
@@ -679,7 +679,7 @@ createNewClip: "Новая подборка"
unclip: "Убрать из подборки"
confirmToUnclipAlreadyClippedNote: "Эта заметка уже есть в подборке «{name}». Удалить из этой подборки?"
public: "Общедоступно"
-private: "Показываются только вам"
+private: "Личное"
i18nInfo: "Misskey переводят на разные языки добровольцы со всего света. Ваша помощь тоже пригодится здесь: {link}."
manageAccessTokens: "Управление токенами доступа"
accountInfo: "Сведения об учётной записи"
@@ -856,8 +856,6 @@ makeReactionsPublicDescription: "Список сделанных вами реа
classic: "Классика"
muteThread: "Скрыть цепочку"
unmuteThread: "Отменить сокрытие цепочки"
-ffVisibility: "Видимость подписок и подписчиков"
-ffVisibilityDescription: "Здесь можно настроить, кто будет видеть ваши подписки и подписчиков."
continueThread: "Показать следующие ответы"
deleteAccountConfirm: "Учётная запись будет безвозвратно удалена. Подтверждаете?"
incorrectPassword: "Пароль неверен."
@@ -953,7 +951,7 @@ numberOfProfileView: "Количество профилей для просмо
like: "Нравится!"
unlike: "Отменить «нравится»"
numberOfLikes: "Количество лайков"
-show: "Отображение"
+show: "Показать"
neverShow: "Больше не показывать"
remindMeLater: "Напомнить позже"
didYouLikeMisskey: "Вам нравится Misskey?"
@@ -1060,13 +1058,17 @@ goToMisskey: "К Misskey"
additionalEmojiDictionary: "Дополнительные словари эмодзи"
installed: "Установлено"
branding: "Бренд"
+enableIdenticonGeneration: "Включить генерацию иконки пользователя"
+turnOffToImprovePerformance: "Отключение этого параметра может повысить производительность."
expirationDate: "Дата истечения"
unused: "Неиспользуемый"
expired: "Срок действия приглашения истёк"
doYouAgree: "Согласны?"
icon: "Аватар"
-replies: "Ответить"
+replies: "Ответы"
renotes: "Репост"
+loadReplies: "Показать ответы"
+flip: "Переворот"
_initialAccountSetting:
accountCreated: "Аккаунт успешно создан!"
letsStartAccountSetup: "Давайте настроим вашу учётную запись."
@@ -1074,6 +1076,14 @@ _initialAccountSetting:
privacySetting: "Настройки конфиденциальности"
initialAccountSettingCompleted: "Первоначальная настройка успешно завершена!"
skipAreYouSure: "Пропустить настройку?"
+_initialTutorial:
+ _note:
+ description: "Посты в Misskey называются 'Заметками.' Заметки отсортированы в хронологическом порядке в ленте и обновляются в режиме реального времени."
+_timelineDescription:
+ home: "В персональной ленте располагаются заметки тех, на которых вы подписаны."
+ local: "Местная лента показывает заметки всех пользователей этого сайта."
+ social: "В социальной ленте собирается всё, что есть в персональной и местной лентах."
+ global: "В глобальную ленту попадает вообще всё со связанных инстансов."
_serverSettings:
iconUrl: "Адрес на иконку роли"
_achievements:
@@ -1551,9 +1561,6 @@ _theme:
infoFg: "Текст сообщения"
infoWarnBg: "Фон предупреждения"
infoWarnFg: "Текст предупреждения"
- cwBg: "Фон предупреждения о содержимом"
- cwFg: "Текст предупреждения о содержимом"
- cwHoverBg: "Фон предупреждения о содержимом (под указателем)"
toastBg: "Фон оповещения"
toastFg: "Текст оповещения"
buttonBg: "Фон кнопки"
@@ -1584,21 +1591,19 @@ _ago:
monthsAgo: "{n} мес. назад"
yearsAgo: "{n} г. назад"
invalid: "Ничего нет"
+_timeIn:
+ seconds: "Через {n} с"
+ minutes: "Через {n} мин"
+ hours: "Через {n} ч"
+ days: "Через {n} сут"
+ weeks: "Через {n} нед."
+ months: "Через {n} мес."
+ years: "Через {n} г."
_time:
second: "с"
minute: "мин"
hour: "ч"
day: "сут"
-_timelineTutorial:
- title: "Как пользоваться Misskey"
- step1_1: "Это лицо Misskey, так называемая лента. Ваш инстанс, {name}, покажет тут все опубликованные на нём заметки в хронологическом порядке."
- step1_2: "Здесь есть несколько лент. К примеру «персональная» лента отображает заметки тех, на кого вы подписаны. А «местная» — заметки тех, кого приютил {name}."
- step2_1: "Что ж, теперь самое время опубликовать заметку. Если нажать вверху страницы на изображение карандаша, появится форма для текста."
- step2_2: "Почему бы не написать немного о себе? Ну, или хотя бы «Привет, {name}»?"
- step3_1: "Справились с первой заметкой?"
- step3_2: "Отлично, теперь она должна появиться в вашей ленте."
- step4_1: "А ещё здесь можно делиться своими реакциями на заметки."
- step4_2: "Отмечайте реакции, нажимая на символ «+» под заметкой и выбирая значок по душе."
_2fa:
alreadyRegistered: "Двухфакторная аутентификация уже настроена."
registerTOTP: "Начните настраивать приложение-аутентификатор"
@@ -1709,7 +1714,7 @@ _widgets:
clicker: "Счётчик щелчков"
_cw:
hide: "Спрятать"
- show: "Показать еще"
+ show: "Показать"
chars: "знаков: {count}"
files: "файлов: {count}"
_poll:
@@ -1904,7 +1909,7 @@ _notification:
app: "Уведомления из приложений"
_actions:
followBack: "отвечает взаимной подпиской"
- reply: "Ответить"
+ reply: "Ответ"
renote: "Репост"
_deck:
alwaysShowMainColumn: "Всегда показывать главную колонку"
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index 811f93e711..e8401af1cd 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -113,7 +113,6 @@ sensitive: "NSFW"
add: "Pridať"
reaction: "Reakcie"
reactions: "Reakcie"
-reactionSetting: "Reakcie zobrazené vo výbere reakcií"
reactionSettingDescription2: "Ťahaním preusporiadate, kliknutím odstránite, Stlačením \"+\" pridáte"
rememberNoteVisibility: "Zapamätať nastavenia viditeľnosti poznámky"
attachCancel: "Odstrániť prílohu"
@@ -411,7 +410,6 @@ share: "Zdieľať"
notFound: "Nenájdené"
notFoundDescription: "Nenašla sa žiadna stránka na zadanej URL."
uploadFolder: "Predvolený priečinok pre nahrávanie"
-cacheClear: "Vyčistiť cache"
markAsReadAllNotifications: "Označiť všetky oznámenia ako prečítané"
markAsReadAllUnreadNotes: "Označiť všetky poznámky ako prečítané"
markAsReadAllTalkMessages: "Označiť všetky správy ako prečítané"
@@ -823,8 +821,6 @@ makeReactionsPublicDescription: "Toto spraví všetky vaše minulé reakcie vidi
classic: "Klasika"
muteThread: "Ztíšiť vlákno"
unmuteThread: "Zrušiť stíšenie vlákna"
-ffVisibility: "Viditeľnosť sledujúcich/sledovaných"
-ffVisibilityDescription: "Umožňuje nastaviť kto vidí koho sledujete a kto vás sleduje."
continueThread: "Zobraziť pokračovanie vlákna"
deleteAccountConfirm: "Toto nezvrátiteľne vymaže váš účet. Pokračovať?"
incorrectPassword: "Nesprávne heslo."
@@ -921,6 +917,7 @@ youFollowing: "Sledované"
icon: "Avatar"
replies: "Odpovedať"
renotes: "Preposlať"
+flip: "Preklopiť"
_role:
priority: "Priorita"
_priority:
@@ -1102,9 +1099,6 @@ _theme:
infoFg: "Informačný text"
infoWarnBg: "Pozadie varovania"
infoWarnFg: "Text varovania"
- cwBg: "CW pozadie tlačidla"
- cwFg: "CW text tlačidla"
- cwHoverBg: "CW pozadie tlačidla (pod kurzorom)"
toastBg: "Pozadie upozornenia"
toastFg: "Text upozornenia"
buttonBg: "Pozadie tlačidla"
diff --git a/locales/sv-SE.yml b/locales/sv-SE.yml
index 92678afef8..e5816ba105 100644
--- a/locales/sv-SE.yml
+++ b/locales/sv-SE.yml
@@ -118,7 +118,6 @@ sensitive: "Känsligt innehåll"
add: "Lägg till"
reaction: "Reaktioner"
reactions: "Reaktioner"
-reactionSetting: "Reaktioner som ska visas i reaktionsväljaren"
reactionSettingDescription2: "Dra för att omordna, klicka för att radera, tryck \"+\" för att lägga till."
rememberNoteVisibility: "Komihåg notvisningsinställningar"
attachCancel: "Ta bort bilaga"
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index 6a553dab52..7cb2d68321 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -121,7 +121,6 @@ sensitive: "เนื้อหาที่ละเอียดอ่อน NSFW
add: "เพิ่ม"
reaction: "รีแอคชั่น"
reactions: "รีแอคชั่น"
-reactionSetting: "รีแอคชั่นไปยังแสดงผลในตัวเลือกการรีแอคชั่น"
reactionSettingDescription2: "กดลากเพื่อจัดลำดับใหม่ กดคลิกเพื่อลบ กด \"+\" เพื่อเพิ่ม"
rememberNoteVisibility: "จดจำการตั้งค่าการมองเห็นตัวโน้ต"
attachCancel: "ลบไฟล์ออกที่แนบมา"
@@ -195,6 +194,7 @@ perHour: "ทุกชั่วโมง"
perDay: "ต่อวัน"
stopActivityDelivery: "หยุดส่งกิจกรรม"
blockThisInstance: "บล็อกอินสแตนซ์นี้"
+silenceThisInstance: "ปกปิดอินสแตนซ์นี้"
operations: "ดำเนินการ"
software: "ซอฟต์แวร์"
version: "เวอร์ชั่น"
@@ -214,6 +214,7 @@ clearCachedFiles: "ล้างแคช"
clearCachedFilesConfirm: "นายแน่ใจแล้วหรอว่าต้องการที่จะลบไฟล์ระยะไกลที่แคชไว้ทั้งหมด?"
blockedInstances: "อินสแตนซ์ที่ ถูกบล็อก"
blockedInstancesDescription: "ระบุชื่อโฮสต์ของอินสแตนซ์ที่คุณต้องการบล็อก อินสแตนซ์ที่อยู่ในรายการนั้นจะไม่สามารถพูดคุยกับอินสแตนซ์นี้ได้อีกต่อไป"
+silencedInstances: "ปกปิดอินสแตนซ์นี้แล้ว"
muteAndBlock: "ปิดเสียงและบล็อก"
mutedUsers: "ผู้ใช้ที่ถูกปิดเสียง"
blockedUsers: "ผู้ใช้ที่ถูกบล็อก"
@@ -434,7 +435,6 @@ share: "แชร์"
notFound: "ไม่พบหน้าที่ต้องการ"
notFoundDescription: "ไม่พบหน้าที่สอดคล้องตรงกันกับ URL นี้นะ"
uploadFolder: "โฟลเดอร์เริ่มต้นสำหรับอัพโหลด"
-cacheClear: "ล้างแคช"
markAsReadAllNotifications: "ทำเครื่องหมายการแจ้งเตือนทั้งหมดว่าอ่านแล้ว"
markAsReadAllUnreadNotes: "ทำเครื่องหมายโน้ตทั้งหมดว่าอ่านแล้ว"
markAsReadAllTalkMessages: "ทำเครื่องหมายข้อความทั้งหมดว่าอ่านแล้ว"
@@ -560,6 +560,10 @@ output: "เอาท์พุต"
script: "สคริปต์"
disablePagesScript: "ปิดการใช้งาน AiScript บนเพจ"
updateRemoteUser: "อัปเดตข้อมูลผู้ใช้งานระยะไกล"
+unsetUserAvatar: "เลิกตั้งอวตาร"
+unsetUserAvatarConfirm: "คุณแน่ใจหรือไม่ว่าต้องการเลิกตั้งอวตาร?"
+unsetUserBanner: "เลิกตั้งแบนเนอร์"
+unsetUserBannerConfirm: "คุณแน่ใจหรือไม่ว่าต้องการเลิกตั้งแบนเนอร์เลยมั้ย?"
deleteAllFiles: "ลบไฟล์ทั้งหมด"
deleteAllFilesConfirm: "นายแน่ใจแล้วหรอว่าต้องการที่จะลบไฟล์ทั้งหมด?"
removeAllFollowing: "เลิกติดตามผู้ใช้ที่ติดตามทั้งหมด"
@@ -631,6 +635,7 @@ smtpSecure: "ใช้โดยนัย SSL/TLS สำหรับการเ
smtpSecureInfo: "ปิดสิ่งนี้เมื่อใช้ STARTTLS"
testEmail: "ทดสอบการส่งอีเมล"
wordMute: "ปิดเสียงคำ"
+hardWordMute: "ปิดเสียงคำยาก"
regexpError: "ข้อผิดพลาดของนิพจน์ทั่วไป"
regexpErrorDescription: "เกิดข้อผิดพลาดในนิพจน์ทั่วไปในบรรทัดที่ {line} ของการปิดเสียงคำ {tab} ของคุณ:"
instanceMute: "ปิดเสียง อินสแตนซ์"
@@ -864,8 +869,6 @@ makeReactionsPublicDescription: "การทำเช่นนี้จะท
classic: "คลาสสิค"
muteThread: "ปิดเสียงเธรด"
unmuteThread: "เปิดเสียงเธรด"
-ffVisibility: "การมองเห็นผู้ติดตาม/ผู้ติดตาม"
-ffVisibilityDescription: "ช่วยให้คุณสามารถกำหนดค่าได้ว่าใครสามารถดูได้ว่าคุณติดตามใครและใครติดตามคุณบ้าง"
continueThread: "ดูความต่อเนื่องเธรด"
deleteAccountConfirm: "การดำเนินการนี้จะลบบัญชีของคุณอย่างถาวรเลยนะ แน่ใจหรอดำเนินการ?"
incorrectPassword: "รหัสผ่านไม่ถูกต้อง"
@@ -975,6 +978,7 @@ assign: "กำหนด"
unassign: "ยังไม่มอบหมาย"
color: "สี"
manageCustomEmojis: "จัดการอีโมจิแบบกำหนดเอง"
+manageAvatarDecorations: "จัดการตกแต่งอวตาร"
youCannotCreateAnymore: "คุณถึงขีดจํากัดการสร้างแล้วนะ"
cannotPerformTemporary: "ไม่สามารถใช้การได้ชั่วคราว"
cannotPerformTemporaryDescription: "ไม่สามารถดําเนินการได้ชั่วคราว เนื่องจากเกินขีดจํากัดการดําเนินการ กรุณารอสักครู่แล้วลองใหม่อีกครั้ง"
@@ -1117,20 +1121,44 @@ keepScreenOn: "เปิดหน้าจอไว้"
notifyNotes: "แจ้งเตือนเกี่ยวกับโพสต์ใหม่"
unnotifyNotes: "หยุดการแจ้งเตือนเกี่ยวกับโน้ตใหม่"
authentication: "การตรวจสอบสิทธิ์"
+authenticationRequiredToContinue: "กรุณาตรวจสอบการรับรองความถูกต้องเพื่อดำเนินการต่อ"
dateAndTime: "เวลาประทับ"
showRenotes: "แสดงรีโน้ต"
edited: "แก้ไขแล้ว"
notificationRecieveConfig: "การตั้งค่าการแจ้งเตือน"
mutualFollow: "ติดตามซึ่งกันและกัน"
fileAttachedOnly: "เฉพาะโน้ตที่มีไฟล์เท่านั้น"
+showRepliesToOthersInTimeline: "แสดงการตอบกลับไปยังอื่นๆในไทม์ไลน์"
+hideRepliesToOthersInTimeline: "ซ่อนการตอบกลับไปยังอื่นๆจากไทม์ไลน์"
+externalServices: "บริการภายนอก"
+impressum: "อิมเพรสชั่น"
+impressumUrl: "URL อิมเพรสชั่น"
+privacyPolicy: "นโยบายความเป็นส่วนตัว"
+privacyPolicyUrl: "URL นโยบายความเป็นส่วนตัว"
+tosAndPrivacyPolicy: "เงื่อนไขในการให้บริการและนโยบายความเป็นส่วนตัว"
+avatarDecorations: "การตกแต่งอวตาร"
+attach: "แนบ"
+detach: "นำออก"
+angle: "แองเกิล"
+flip: "ย้อนกลับ"
+showAvatarDecorations: "แสดงตกแต่งอวตาร"
+releaseToRefresh: "ปล่อยเพื่อรีเฟรช"
+refreshing: "กำลังรีเฟรช..."
+pullDownToRefresh: "ดึงลงเพื่อรีเฟรช"
+disableStreamingTimeline: "ปิดใช้งานอัปเดตไทม์ไลน์แบบเรียลไทม์"
+useGroupedNotifications: "แสดงผลการแจ้งเตือนแบบกลุ่มแล้ว"
+signupPendingError: "มีปัญหาในการตรวจสอบที่อยู่อีเมลลิงก์อาจหมดอายุแล้ว"
+doReaction: "เพิ่มรีแอคชั่น"
_announcement:
forExistingUsers: "ผู้ใช้งานที่มีอยู่เท่านั้น"
forExistingUsersDescription: "การประกาศนี้จะแสดงต่อผู้ใช้ที่มีอยู่ ณ จุดที่เผยแพร่นั้นๆถ้าหากเปิดใช้งาน ถ้าหากปิดใช้งานผู้ที่กำลังสมัครใหม่หลังจากโพสต์แล้วนั้นก็จะเห็นเช่นกัน"
+ needConfirmationToRead: "จำเป็นต้องยืนยันเพื่อทำเครื่องหมายบอกว่าอ่านแล้ว"
needConfirmationToReadDescription: "ข้อความแจ้งแยก ถ้าหากต้องการเพื่อยืนยันว่ากำลังทำเครื่องหมายประกาศนี้ว่าอ่านแล้วจะแสดงขึ้นถ้าหากเปิดใช้งาน การประกาศนั้นจะไม่รวมอยู่ในฟังก์ชั่นว่า \"ทำเครื่องหมายทั้งหมดว่าอ่านแล้ว\""
end: "ประกาศเก็บถาวร"
tooManyActiveAnnouncementDescription: "การมีประกาศที่ใช้งานมากเกินไปนั้นอาจจะทำให้ประสบการณ์ของผู้ใช้งานนั้นดูแย่ลง โปรดกรุณาพิจารณาการเก็บประกาศที่ล้าสมัยด้วยนะค่ะ"
readConfirmTitle: "ทำเครื่องหมายบอกว่าอ่านแล้วเลยมั้ย?"
readConfirmText: "การดำเนินการนี้จะทำเครื่องหมายเนื้อหาของ \"{title}\" บอกว่าอ่านแล้วนะ"
+ silence: "ไม่มีการแจ้งเตือน"
_initialAccountSetting:
accountCreated: "คุณได้สร้างบัญชีของคุณสำเร็จเรียบร้อยแล้ว!"
letsStartAccountSetup: "สำหรับผู้เริ่มต้นมาตั้งค่าโปรไฟล์ของคุณกันเถอะ"
@@ -1143,13 +1171,37 @@ _initialAccountSetting:
pushNotificationDescription: "กำลังเปิดใช้งานการแจ้งเตือนแบบพุชจะช่วยให้คุณได้รับการแจ้งเตือนจาก {name} โดยตรงบนอุปกรณ์ของคุณนะ"
initialAccountSettingCompleted: "ตั้งค่าโปรไฟล์เสร็จสมบูรณ์แล้ว!"
haveFun: "ขอให้สนุก {name}!"
- ifYouNeedLearnMore: "ถ้าหากคุณต้องการเรียนรู้เพิ่มเติมเกี่ยวกับวิธีใช้ {ชื่อ} (Misskey) กรุณาไปที่ {link}"
+ startTutorial: "เริ่มการฝึกสอน"
skipAreYouSure: "ต้องการข้ามการตั้งค่าโปรไฟล์จริงๆแบบนั้นหรอ?"
laterAreYouSure: "ต้องการตั้งค่าโปรไฟล์ในภายหลังจริงๆอย่างงั้นหรอ?"
+_initialTutorial:
+ launchTutorial: "เริ่มบทช่วยสอน"
+ title: "บทช่วยสอน"
+ wellDone: "ทำได้ดีมาก!"
+ skipAreYouSure: "ต้องการออกจากบทช่วยสอนใช่ไหม?"
+ _landing:
+ title: "ยินดีต้อนรับสู่บทช่วยสอน"
+ _note:
+ title: "โน้ตคืออะไร?"
+ _reaction:
+ title: "รีแอคชั่นคืออะไร?"
+ _timeline:
+ title: "แนวคิดเรื่องของไทม์ไลน์"
+ _postNote:
+ title: "ตั้งค่ากำลังโพสต์โน้ต"
+ _visibility:
+ description: "คุณสามารถจำกัดผู้ที่สามารถดูโน้ตของคุณได้นะ"
+ public: "โน้ตของคุณนั้นจะปรากฏแก่ผู้ใช้งานทุกคน"
+ _cw:
+ title: "คำเตือนเกี่ยวกับเนื้อหา"
+ _exampleNote:
+ cw: "นี่อาจจะทำให้คุณหิวอย่างแน่นอน!"
_serverRules:
description: "ชุดของกฎที่จะแสดงก่อนการลงทะเบียนเราขอแนะนำให้ตั้งค่าสรุปข้อกำหนดในการให้บริการ"
_serverSettings:
iconUrl: "ไอคอน URL"
+ appIconUsageExample: "E.g. เป็น PWA หรือเมื่อแสดงผลเป็นบุ๊กมาร์กหน้าจอหลักบนโทรศัพท์"
+ appIconResolutionMustBe: "ความละเอียดขั้นต่ำไว้คือ {resolution}."
manifestJsonOverride: "manifest.json โอเวอร์ลาย"
shortName: "ชื่อย่อ"
_accountMigration:
@@ -1452,6 +1504,7 @@ _role:
inviteLimitCycle: "จำกัดการเชิญไว้คูลดาวน์"
inviteExpirationTime: "วันหมดอายุของรหัสการเชิญ"
canManageCustomEmojis: "จัดการอีโมจิแบบกำหนดเอง"
+ canManageAvatarDecorations: "จัดการตกแต่งอวตาร"
driveCapacity: "ความจุของไดรฟ์"
alwaysMarkNsfw: "ทำเครื่องหมายไฟล์ว่าเป็น NSFW เสมอ"
pinMax: "จํานวนสูงสุดของโน้ตที่ปักหมุดไว้"
@@ -1515,6 +1568,8 @@ _ad:
reduceFrequencyOfThisAd: "แสดงโฆษณานี้ให้น้อยลง"
hide: "ไม่ต้องแสดง"
timezoneinfo: "วันในสัปดาห์นี้จะถูกกำหนดจากโซนเวลาของเซิร์ฟเวอร์"
+ adsSettings: "ตั้งค่าการโฆษณา"
+ setZeroToDisable: "ตั้งค่านี้ให้เป็น 0 เพื่อปิดใช้งานโฆษณาอัปเดตแบบเรียลไทม์"
_forgotPassword:
enterEmail: "ป้อนที่อยู่อีเมลที่คุณเคยใช้ในการลงทะเบียนไว้ ลิงก์ที่คุณสามารถรีเซ็ตรหัสผ่านได้นั้นจะถูกส่งไปนะ"
ifNoEmail: "ถ้าหากคุณไม่ได้ใช้อีเมลระหว่างการลงทะเบียน กรุณาติดต่อผู้ดูแลระบบอินสแตนซ์แทนนะ"
@@ -1663,9 +1718,6 @@ _theme:
infoFg: "ข้อความข้อมูล"
infoWarnBg: "คำเตือนพื้นหลัง"
infoWarnFg: "คำเตือนข้อความ"
- cwBg: "ปุ่ม CW พื้นหลัง"
- cwFg: "ปุ่ม CW ข้อความ"
- cwHoverBg: "ปุ่ม CW พื้นหลัง (โฮเวอร์)"
toastBg: "ประวัติการแจ้งเตือน"
toastFg: "ข้อความแจ้งเตือน"
buttonBg: "ปุ่มพื้นหลัง"
@@ -1701,22 +1753,13 @@ _time:
minute: "นาที"
hour: "ชั่วโมง"
day: "วัน"
-_timelineTutorial:
- title: "วิธีใช้งาน Misskey"
- step1_1: "นี่คือ \"ไทม์ไลน์\" \"โน้ต\" ทั้งหมดที่ส่งใน {name} จะแสดงรายการตามลำดับเวลาที่นี่นะ"
- step1_2: "อาจจะมีไทม์ไลน์ที่แตกต่างกันเล็กน้อยยกตัวอย่างเช่น \"ไทม์ไลน์หน้าแรก\" จะมีโน้ตของผู้ใช้ที่คุณติดตามและ \"ไทม์ไลน์ท้องถิ่น\" จะมีโน้ตจากผู้ใช้ทั้งหมดของ {name}"
- step2_1: "มาลองโพสต์โน้ตต่อไปกัน คุณสามารถทำได้โดยการกดปุ่มที่มีไอคอนดินสอ"
- step2_2: "ยังไงไหนลองเขียนแนะนำตัวเองหรือแค่ \"สวัสดี {name}!\" ถ้าคุณไม่รู้สึกเหมือนมัน?"
- step3_1: "เสร็จสิ้นการโพสต์โน้ตย่อแรกของคุณแล้วอย่างงั้นหรอ?"
- step3_2: "ไชโย! ตอนนี้โน้ตย่อแรกของคุณได้ปรากฏบนไทม์ไลน์ของคุณแล้วนะ"
- step4_1: "คุณสามารถเพิ่ม \"การตอบสนอง\" ในโน้ตได้"
- step4_2: "หากต้องการแนบการแสดงความรู้สึก ให้กดเครื่องหมาย \"+\" บนโน้ตแล้วเลือกอิโมจิที่คุณต้องการแสดงความรู้สึกที่ตนเองชอบได้เลย"
_2fa:
alreadyRegistered: "คุณได้ลงทะเบียนอุปกรณ์ยืนยันตัวตนแบบ 2 ชั้นแล้ว"
registerTOTP: "ลงทะเบียนแอพตัวตรวจสอบสิทธิ์"
step1: "ขั้นตอนแรก ติดตั้งแอปยืนยันตัวตน (เช่น {a} หรือ {b}) บนอุปกรณ์ของคุณ"
step2: "จากนั้นสแกนรหัส QR ที่แสดงบนหน้าจอนี้"
step2Click: "การคลิกที่รหัส QR นี้จะช่วยให้คุณนั้นสามารถลงทะเบียน 2FA กับคีย์ความปลอดภัยหรือแอปตรวจสอบความถูกต้องของโทรศัพท์ได้"
+ step2Uri: "ป้อนใส่ URL ดังต่อไปนี้ถ้าหากคุณใช้โปรแกรมเดสก์ท็อป"
step3Title: "ป้อนรหัสยืนยัน"
step3: "ป้อนโทเค็นที่แอปของคุณให้มาเพื่อเสร็จสิ้นการตั้งค่า"
setupCompleted: "ตั้งค่าสำเร็จแล้ว"
@@ -1735,6 +1778,8 @@ _2fa:
renewTOTPOk: "ตั้งค่าคอนฟิกใหม่"
renewTOTPCancel: "ไม่เป็นไร"
backupCodes: "รหัสสำรองข้อมูล"
+ backupCodeUsedWarning: "มีการใช้รหัสสำรองแล้ว โปรดกรุณากำหนดค่าการตรวจสอบสิทธิ์แบบสองปัจจัยโดยเร็วที่สุดถ้าหากคุณยังไม่สามารถใช้งานได้อีก"
+ backupCodesExhaustedWarning: "รหัสสำรองทั้งหมดถูกใช้แล้ว ถ้าหากคุณยังสูญเสียการเข้าถึงแอปการตรวจสอบสิทธิ์แบบสองปัจจัยคุณจะยังไม่สามารถเข้าถึงบัญชีนี้ได้ กรุณากำหนดค่าการรับรองความถูกต้องด้วยการยืนยันสองชั้น"
_permissions:
"read:account": "ดูข้อมูลบัญชีของคุณ"
"write:account": "แก้ไขข้อมูลบัญชีของคุณ"
@@ -1897,6 +1942,7 @@ _exportOrImport:
userLists: "รายการ"
excludeMutingUsers: "ยกเว้นผู้ใช้ที่ปิดเสียง"
excludeInactiveUsers: "ยกเว้นผู้ใช้ที่ไม่ได้ใช้งาน"
+ withReplies: "รวมการตอบกลับจากผู้ใช้ที่นำเข้าไว้ในไทม์ไลน์"
_charts:
federation: "สหพันธ์"
apRequest: "คำขอ"
@@ -2117,3 +2163,23 @@ _moderationLogTypes:
createAd: "สร้างโฆษณาแล้ว"
deleteAd: "ลบโฆษณาออกแล้ว"
updateAd: "อัปเดตโฆษณาแล้ว"
+_fileViewer:
+ title: "รายละเอียดไฟล์"
+ type: "ประเภทไฟล์"
+ size: "ขนาดไฟล์"
+ url: "URL"
+ uploadedAt: "วันที่เข้าร่วม"
+ attachedNotes: "โน้ตที่แนบมาด้วย"
+ thisPageCanBeSeenFromTheAuthor: "หน้าเพจนี้จะสามารถปรากฏได้โดยผู้ใช้ที่อัปโหลดไฟล์นี้เท่านั้น"
+_externalResourceInstaller:
+ _plugin:
+ metaTitle: "ข้อมูลส่วนเสริม"
+ _theme:
+ metaTitle: "ข้อมูลธีม"
+ _vendorInfo:
+ title: "ข้อมูลผู้จัดจำหน่าย"
+ _errors:
+ _pluginParseFailed:
+ title: "ข้อผิดพลาด AiScript"
+ _themeParseFailed:
+ title: "การแยกวิเคราะห์ธีมล้มเหลว"
diff --git a/locales/tr-TR.yml b/locales/tr-TR.yml
index 90bee48a1f..0793592d34 100644
--- a/locales/tr-TR.yml
+++ b/locales/tr-TR.yml
@@ -9,6 +9,7 @@ notifications: "Bildirim"
username: "Kullanıcı Adı"
password: "Şifre"
forgotPassword: "şifremi unuttum"
+fetchingAsApObject: "從聯邦宇宙取得中..."
ok: "TAMAM"
gotIt: "Anladım"
cancel: "İptal"
@@ -44,6 +45,7 @@ pin: "Sabitlenmiş"
unpin: "Sabitlemeyi kaldır"
copyContent: "İçeriği kopyala"
copyLink: "Bağlantıyı Kopyala"
+copyLinkRenote: "Turkish"
delete: "Sil"
deleteAndEdit: "Sil ve yeniden düzenle"
deleteAndEditConfirm: "Bu notu silip yeniden düzenlemek istiyor musunuz? Bu nota ilişkin tüm Tepkiler, Yeniden Notlar ve Yanıtlar da silinecektir."
@@ -119,7 +121,6 @@ sensitive: "Hassas içerik"
add: "Ekle"
reaction: "Tepkiler"
reactions: "Tepkiler"
-reactionSetting: "Palette görünecek tepkiler"
reactionSettingDescription2: "Sıralamak için sürükleyin, silmek için tıklayın, eklemek için \"+\" tuşuna tıklayın."
rememberNoteVisibility: "Görünürlük ayarlarını hatırla"
attachCancel: "Eki sil"
@@ -155,6 +156,7 @@ addEmoji: "Emoji ekle"
settingGuide: "Önerilen ayarlar"
cacheRemoteFiles: "Uzak dosyalar ön belleğe alınsın"
cacheRemoteFilesDescription: "Bu ayar açık olduğunda diğer sitelerin dosyaları doğrudan uzak sunucudan yüklenecektir. Bu ayarı kapatmak depolama kullanımını azaltacak ama küçük resimler oluşturulmadığından trafiği arttıracaktır."
+youCanCleanRemoteFilesCache: ""
cacheRemoteSensitiveFiles: "Hassas uzak dosyalar ön belleğe alınsın"
cacheRemoteSensitiveFilesDescription: "Bu ayar kapalı olduğunda hassas uzak dosyalar ön belleğe alınmadan doğrudan uzak sunucudan yüklenecektir."
flagAsBot: "Bot olarak işaretle"
@@ -192,6 +194,7 @@ perHour: "Saatlik"
perDay: "Günlük"
stopActivityDelivery: "Durum güncellemelerini gönderme"
blockThisInstance: "Bu sunucuyu engelle"
+silenceThisInstance: ""
operations: "İşlemler"
software: "Yazılımlar"
version: "Sürüm"
@@ -211,6 +214,8 @@ clearCachedFiles: "Ön belleği temizle"
clearCachedFilesConfirm: "Ön belleğe alınmış tüm uzak sunucu dosyaları silinsin mi?"
blockedInstances: "Engellenen sunucular"
blockedInstancesDescription: "Engellemek istediğiniz sunucuların alan adlarını satır sonlarıyla ayırarak yazın. Yazılan sunucular bu sunucuyla iletişime geçemeyecek."
+silencedInstances: "Turkısh"
+silencedInstancesDescription: ""
muteAndBlock: "Susturma ve Engelleme"
mutedUsers: "Susturulan kullanıcılar"
blockedUsers: "Engellenen kullanıcılar"
diff --git a/locales/ug-CN.yml b/locales/ug-CN.yml
index 65ef841259..e48f64511c 100644
--- a/locales/ug-CN.yml
+++ b/locales/ug-CN.yml
@@ -1,4 +1,19 @@
---
_lang_: "ياپونچە"
+headlineMisskey: "خاتىرە ئارقىلىق ئۇلانغان تور"
+monthAndDay: "{day}-{month}"
search: "ئىزدەش"
+ok: "ماقۇل"
+noThankYou: "ئۇنى توختىتىڭ"
+profile: "profile"
+login: "كىرىش"
+loggingIn: "كىرىش"
+pin: "pinned"
+delete: "ئۆچۈرۈش"
+pinned: "pinned"
+remove: "ئۆچۈرۈش"
searchByGoogle: "ئىزدەش"
+_2fa:
+ renewTOTPCancel: "ئۇنى توختىتىڭ"
+_widgets:
+ profile: "profile"
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index a0e2a52826..9b609edebb 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -55,6 +55,7 @@ copyRSS: "Скопіювати RSS"
copyUsername: "Скопіювати ім’я користувача"
copyUserId: "Копіювати ID користувача"
copyNoteId: "блокнот ID користувача"
+copyFileId: "Скопіювати ідентифікатор файлу."
searchUser: "Пошук користувачів"
reply: "Відповісти"
loadMore: "Показати більше"
@@ -115,7 +116,6 @@ sensitive: "NSFW"
add: "Додати"
reaction: "Реакції"
reactions: "Реакції"
-reactionSetting: "Налаштування реакцій"
reactionSettingDescription2: "Перемістити щоб змінити порядок, Клацнути мишою щоб видалити, Натиснути \"+\" щоб додати."
rememberNoteVisibility: "Пам’ятати параметри видимісті"
attachCancel: "Видалити вкладення"
@@ -133,6 +133,7 @@ unblockConfirm: "Ви впевнені, що хочете розблокуват
suspendConfirm: "Ви впевнені, що хочете призупинити цей акаунт?"
unsuspendConfirm: "Ви впевнені, що хочете відновити цей акаунт?"
selectList: "Виберіть список"
+editList: "Редагувати список."
selectChannel: "Виберіть канал"
selectAntenna: "Виберіть антену"
selectWidget: "Виберіть віджет"
@@ -408,7 +409,6 @@ share: "Поділитись"
notFound: "Не знайдено"
notFoundDescription: "Сторінка за вказаною адресою не знайдена."
uploadFolder: "Місце для завантаження за замовчуванням"
-cacheClear: "Очистити кеш"
markAsReadAllNotifications: "Позначити всі сповіщення як прочитані"
markAsReadAllUnreadNotes: "Позначити всі нотатки як прочитані"
markAsReadAllTalkMessages: "Позначити всі повідомлення як прочитані"
@@ -449,6 +449,7 @@ or: "або"
language: "Мова"
uiLanguage: "Мова інтерфейсу"
aboutX: "Про {x}"
+native: "місцевий"
disableDrawer: "Не використовувати висувні меню"
noHistory: "Історія порожня"
signinHistory: "Історія входів"
@@ -527,6 +528,8 @@ output: "Вихід"
script: "Скрипт"
disablePagesScript: "Вимкнути AiScript на Сторінках"
updateRemoteUser: "Оновити інформацію про віддаленого користувача"
+unsetUserAvatar: "Деактивувати піктограму."
+unsetUserBanner: "Випустити прапор."
deleteAllFiles: "Видалити всі файли"
deleteAllFilesConfirm: "Ви дійсно хочете видалити всі файли?"
removeAllFollowing: "Скасувати всі підписки"
@@ -814,7 +817,6 @@ makeReactionsPublicDescription: "Це зробить список усіх ва
classic: "Класичний"
muteThread: "Приглушити тред"
unmuteThread: "Скасувати глушіння"
-ffVisibility: "Видимість підписок/підписників"
continueThread: "Показати продовження треду"
deleteAccountConfirm: "Це незворотно видалить ваш акаунт. Продовжити?"
incorrectPassword: "Неправильний пароль."
@@ -907,6 +909,7 @@ youFollowing: "Підписки"
icon: "Аватар"
replies: "Відповісти"
renotes: "Поширити"
+flip: "Перевернути"
_achievements:
earnedAt: "Відкрито"
_types:
@@ -1290,9 +1293,6 @@ _theme:
infoFg: "Текст інформації"
infoWarnBg: "Фон попередження"
infoWarnFg: "Текст попередження"
- cwBg: "Фон чутливого змісту"
- cwFg: "Текст чутливого змісту"
- cwHoverBg: "Фон чутливого змісту (при наведенні)"
toastBg: "Фон повідомлення"
toastFg: "Текст повідомлення"
buttonBg: "Фон кнопки"
diff --git a/locales/uz-UZ.yml b/locales/uz-UZ.yml
index 3a9e6ec5e7..54e20b001d 100644
--- a/locales/uz-UZ.yml
+++ b/locales/uz-UZ.yml
@@ -120,7 +120,6 @@ sensitive: "Sezuvchan"
add: "Qo'shish"
reaction: "Reaktsiyalar"
reactions: "Reaktsiyalar"
-reactionSetting: "Reaksiyalar ro'yxati"
reactionSettingDescription2: "Qayta tartiblash uchun ushlab turib siljiting, oʻchirish uchun bosing, qoʻshish uchun “+” tugmasini bosing."
rememberNoteVisibility: "Qaydning ko'rinish sozlamarini eslab qolish"
attachCancel: "Qo'shimchani olib tashlash"
@@ -428,7 +427,6 @@ share: "Yuborish"
notFound: "Topilmadi"
notFoundDescription: "Ushbu sahifa topilmadi"
uploadFolder: "Jildni yuklash"
-cacheClear: "Keshni tozalash"
markAsReadAllNotifications: "Bildirishnomalarni o'qilgan deb belgilash"
markAsReadAllUnreadNotes: "Barch xabarlarni oq'ilgan deb belgilash"
markAsReadAllTalkMessages: "Barcha suhbatlarni o'qilgan deb belgilang"
@@ -845,6 +843,7 @@ sensitiveWords: "Ta'sirchan so'zlar"
icon: "Avatar"
replies: "Javob berish"
renotes: "Qayta qayd etish"
+flip: "Teskari"
_achievements:
_types:
_viewInstanceChart:
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index 0c32735c31..c2d68d8b27 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -121,7 +121,6 @@ sensitive: "Nhạy cảm"
add: "Thêm"
reaction: "Biểu cảm"
reactions: "Biểu cảm"
-reactionSetting: "Chọn những biểu cảm hiển thị"
reactionSettingDescription2: "Kéo để sắp xếp, nhấn để xóa, nhấn \"+\" để thêm."
rememberNoteVisibility: "Lưu kiểu tút mặc định"
attachCancel: "Gỡ tập tin đính kèm"
@@ -433,7 +432,6 @@ share: "Chia sẻ"
notFound: "Không tìm thấy"
notFoundDescription: "Không tìm thấy trang nào tương ứng với URL này."
uploadFolder: "Thư mục tải lên mặc định"
-cacheClear: "Xóa bộ nhớ đệm"
markAsReadAllNotifications: "Đánh dấu tất cả các thông báo là đã đọc"
markAsReadAllUnreadNotes: "Đánh dấu tất cả các tút là đã đọc"
markAsReadAllTalkMessages: "Đánh dấu tất cả các tin nhắn là đã đọc"
@@ -859,8 +857,6 @@ makeReactionsPublicDescription: "Điều này sẽ hiển thị công khai danh
classic: "Cổ điển"
muteThread: "Không quan tâm nữa"
unmuteThread: "Quan tâm tút này"
-ffVisibility: "Hiển thị Theo dõi/Người theo dõi"
-ffVisibilityDescription: "Quyết định ai có thể xem những người bạn theo dõi và những người theo dõi bạn."
continueThread: "Tiếp tục xem chuỗi tút"
deleteAccountConfirm: "Điều này sẽ khiến tài khoản bị xóa vĩnh viễn. Vẫn tiếp tục?"
incorrectPassword: "Sai mật khẩu."
@@ -1047,6 +1043,7 @@ loadReplies: "Hiển thị các trả lời"
pinnedList: "Các mục đã được ghim"
keepScreenOn: "Giữ màn hình luôn bật"
verifiedLink: "Chúng tôi đã xác nhận bạn là chủ sở hữu của đường dẫn này"
+flip: "Lật"
_announcement:
forExistingUsers: "Chỉ những người dùng đã tồn tại"
forExistingUsersDescription: "Nếu được bật, thông báo này sẽ chỉ hiển thị với những người dùng đã tồn tại vào lúc thông báo được tạo. Nếu tắt đi, những tài khoản mới đăng ký sau khi thông báo được đăng lên cũng sẽ thấy nó."
@@ -1066,7 +1063,6 @@ _initialAccountSetting:
pushNotificationDescription: "Bật thông báo đẩy sẽ cho phép bạn nhận thông báo từ {name} trực tiếp từ thiết bị của bạn."
initialAccountSettingCompleted: "Thiết lập tài khoản thành công!"
haveFun: "Hãy tận hưởng {name} nhé!"
- ifYouNeedLearnMore: "Nếu bạn muốn tìm hiểu thêm về cách sử dụng {name} (Misskey), hãy vào {link}."
skipAreYouSure: "Bạn thực sự muốn bỏ qua mục thiết lập tài khoản?"
laterAreYouSure: "Bạn thực sự muốn thiết lập tài khoản vào lúc khác?"
_serverSettings:
@@ -1467,9 +1463,6 @@ _theme:
infoFg: "Chữ thông tin"
infoWarnBg: "Nền cảnh báo"
infoWarnFg: "Chữ cảnh báo"
- cwBg: "Nền nút nội dung ẩn"
- cwFg: "Chữ nút nội dung ẩn"
- cwHoverBg: "Nền nút nội dung ẩn (Chạm)"
toastBg: "Nền thông báo"
toastFg: "Chữ thông báo"
buttonBg: "Nền nút"
@@ -1505,9 +1498,6 @@ _time:
minute: "phút"
hour: "giờ"
day: "ngày"
-_timelineTutorial:
- step4_1: "Bạn có thể thêm \"Reaction\" vào ghi chú"
- step4_2: "Khi thêm biểu cảm hãy nhấn dấu \"+\""
_2fa:
alreadyRegistered: "Bạn đã đăng ký thiết bị xác minh 2 bước."
registerTOTP: "Đăng ký ứng dụng xác thực"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 5f4db9192b..bfacc03e0a 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -121,7 +121,6 @@ sensitive: "敏感内容"
add: "添加"
reaction: "回应"
reactions: "回应"
-reactionSetting: "在选择器中显示回应"
reactionSettingDescription2: "拖动重新排序，单击删除，点击 + 添加。"
rememberNoteVisibility: "保存上次设置的可见性"
attachCancel: "删除附件"
@@ -195,6 +194,7 @@ perHour: "每小时"
perDay: "每天"
stopActivityDelivery: "停止发送活动"
blockThisInstance: "阻止此服务器向本服务器推流"
+silenceThisInstance: "使服务器静音"
operations: "操作"
software: "软件"
version: "版本"
@@ -214,6 +214,8 @@ clearCachedFiles: "清除缓存"
clearCachedFilesConfirm: "确定要清除缓存文件？"
blockedInstances: "被封锁的服务器"
blockedInstancesDescription: "设定要封锁的服务器，以换行来进行分割。被封锁的服务器将无法与本服务器进行交换通讯。子域名也同样会被封锁。"
+silencedInstances: "沉默的服务器"
+silencedInstancesDescription: "设置要静音的服务器的主机，以换行符分隔。属于静默服务器的所有帐户都将被视为“静默”，所有关注都将成为请求，并且您将无法提及非关注者的本地帐户。被阻止的实例不受影响。"
muteAndBlock: "屏蔽/拉黑"
mutedUsers: "已屏蔽用户"
blockedUsers: "已拉黑的用户"
@@ -308,6 +310,7 @@ folderName: "文件夹名称"
createFolder: "创建文件夹"
renameFolder: "重命名文件夹"
deleteFolder: "删除文件夹"
+folder: "文件夹"
addFile: "添加文件"
emptyDrive: "网盘中无文件"
emptyFolder: "此文件夹中无文件"
@@ -434,7 +437,6 @@ share: "分享"
notFound: "未找到"
notFoundDescription: "没有与指定 URL 对应的页面。"
uploadFolder: "默认上传文件夹"
-cacheClear: "清空缓存"
markAsReadAllNotifications: "将所有通知标为已读"
markAsReadAllUnreadNotes: "将所有帖子标记为已读"
markAsReadAllTalkMessages: "将所有聊天标记为已读"
@@ -864,8 +866,6 @@ makeReactionsPublicDescription: "将您发表过的回应设置成公开可见
classic: "经典"
muteThread: "屏蔽帖子列表"
unmuteThread: "取消屏蔽帖子列表"
-ffVisibility: "关注关系的可见范围"
-ffVisibilityDescription: "您可以设置您的关注/关注者信息的公开范围"
continueThread: "查看更多帖子"
deleteAccountConfirm: "将要删除账户。是否确认？"
incorrectPassword: "密码错误"
@@ -1128,6 +1128,8 @@ mutualFollow: "互相关注"
fileAttachedOnly: "仅限媒体"
showRepliesToOthersInTimeline: "在时间线上显示给其他人的回复"
hideRepliesToOthersInTimeline: "在时间线上隐藏给其他人的回复"
+avatarDecorations: "头像挂件"
+flip: "翻转"
_announcement:
forExistingUsers: "仅限现有用户"
forExistingUsersDescription: "若启用，该公告将仅对创建此公告时存在的用户可见。 如果禁用，则在创建此公告后注册的用户也可以看到该公告。"
@@ -1149,7 +1151,6 @@ _initialAccountSetting:
pushNotificationDescription: "启用推送通知的话，就可以在设备上接收来自 {name} 的通知了。"
initialAccountSettingCompleted: "初始设定已经完成了！"
haveFun: "希望 {name} 在这里玩得开心！"
- ifYouNeedLearnMore: "关于 {name}(Misskey) 的使用方法，详见 {link}。"
skipAreYouSure: "要跳过初始设置吗？"
laterAreYouSure: "要稍后再进行初始设定吗？"
_serverRules:
@@ -1160,7 +1161,7 @@ _serverSettings:
appIconUsageExample: "例如：作为书签添加到 PWA 或手机主屏幕的时候"
appIconStyleRecommendation: "因为有可能会被裁切为圆形或者圆角矩形，建议使用边缘带有留白背景的图标。"
appIconResolutionMustBe: "分辨率必须为 {resolution}。"
- manifestJsonOverride: "覆盖 mainfest.json"
+ manifestJsonOverride: "覆盖 manifest.json"
shortName: "简称"
shortNameDescription: "如果服务器的正式名称很长，可以用简称或者別名来替代。"
_accountMigration:
@@ -1673,9 +1674,6 @@ _theme:
infoFg: "信息文本"
infoWarnBg: "警告背景"
infoWarnFg: "警告文本"
- cwBg: "隐藏内容按钮背景"
- cwFg: "隐藏内容按钮文本"
- cwHoverBg: "隐藏内容按钮背景（悬停）"
toastBg: "Toast 通知背景"
toastFg: "Toast 通知文本"
buttonBg: "按钮背景"
@@ -1706,21 +1704,14 @@ _ago:
monthsAgo: "{n} 月前"
yearsAgo: "{n} 年前"
invalid: "没有"
+_timeIn:
+ seconds: "{n}秒后"
+ days: "{n}天后"
_time:
second: "秒"
minute: "分"
hour: "小时"
day: "日"
-_timelineTutorial:
- title: "Misskey 的使用方法"
- step1_1: "这个画面是「时间线」。{name}的投稿会按照帖子的发布时间顺序来显示。"
- step1_2: "时间线有许多种类，比如在「首页时间线」中展现的是你关注的人的贴文；而在「本地时间线」中展现的是{name}里全部用户的贴文。"
- step2_1: "那么接下来，试着写一些什么东西来发布吧！你可以通过点击屏幕上的铅笔图标来打开投稿页面。"
- step2_2: "第一次发布的帖子内容，建议包含自我介绍，以及「开始使用{name}了」。"
- step3_1: "将想说的话发出去了吗？"
- step3_2: "太棒了！现在你可以在你的时间线中看到刚刚发布的帖子了。"
- step4_1: "试着对帖子使用「回应」吧！"
- step4_2: "在他人的帖子上按下「+」图标，即可选择想要的表情来进行「回应」。"
_2fa:
alreadyRegistered: "此设备已被注册"
registerTOTP: "开始设置认证应用"
@@ -2130,3 +2121,10 @@ _moderationLogTypes:
createAd: "创建了广告"
deleteAd: "删除了广告"
updateAd: "更新了广告"
+_fileViewer:
+ url: "URL"
+ uploadedAt: "添加日期"
+_externalResourceInstaller:
+ _errors:
+ _pluginParseFailed:
+ title: "AiScript 错误"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 5e62cb1b7b..51ba42e66c 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -121,7 +121,12 @@ sensitive: "敏感內容"
add: "新增"
reaction: "反應"
reactions: "反應"
-reactionSetting: "在選擇器中顯示反應"
+emojiPicker: "表情符號選擇器"
+pinnedEmojisForReactionSettingDescription: "選擇反應時可以設定要固定顯示在頂端的表情符號"
+pinnedEmojisSettingDescription: "輸入表情符號時可以設定要固定顯示在頂端的表情符號"
+emojiPickerDisplay: "顯示表情符號選擇器"
+overwriteFromPinnedEmojisForReaction: "從反應複寫設定"
+overwriteFromPinnedEmojis: "從一般複寫設定"
reactionSettingDescription2: "拖動以交換，點擊以刪除，按下「+」以新增。"
rememberNoteVisibility: "記住貼文可見性"
attachCancel: "移除附件"
@@ -161,7 +166,7 @@ youCanCleanRemoteFilesCache: "按檔案管理的🗑️按鈕，可將快取全
cacheRemoteSensitiveFiles: "快取遠端的敏感檔案"
cacheRemoteSensitiveFilesDescription: "若停用這個設定，則不會快取遠端的敏感檔案，而是直接連結。"
flagAsBot: "此使用者是機器人"
-flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整Misskey內部系統將本帳戶識別為機器人"
+flagAsBotDescription: "如果本帳戶是由程式控制，請啟用此選項。啟用後，會作為標示幫助其他開發者防止機器人之間產生無限互動的行為，並會調整 Misskey 內部系統將本帳戶識別為機器人。"
flagAsCat: "此帳戶是一隻貓，喵～～～！！！"
flagAsCatDescription: "如果想將本帳戶標示為一隻貓，請開啟此標示"
flagShowTimelineReplies: "在時間軸上顯示貼文的回覆"
@@ -195,6 +200,7 @@ perHour: "每小時"
perDay: "每日"
stopActivityDelivery: "停止發送活動"
blockThisInstance: "封鎖此伺服器"
+silenceThisInstance: "禁言此伺服器"
operations: "操作"
software: "軟體"
version: "版本"
@@ -214,6 +220,8 @@ clearCachedFiles: "清除快取資料"
clearCachedFilesConfirm: "確定要清除所有遠端暫存資料嗎？"
blockedInstances: "已封鎖的伺服器"
blockedInstancesDescription: "請逐行輸入需要封鎖的伺服器。已封鎖的伺服器將無法與本伺服器進行通訊。"
+silencedInstances: "被禁言的伺服器"
+silencedInstancesDescription: "設定要禁言的伺服器主機名稱，以換行分隔。隸屬於禁言伺服器的所有帳戶都將被視為「禁言帳戶」，只能發出「追隨請求」，而且無法提及未追隨的本地帳戶。這不會影響已封鎖的實例。"
muteAndBlock: "靜音和封鎖"
mutedUsers: "被靜音的使用者"
blockedUsers: "被封鎖的使用者"
@@ -258,6 +266,7 @@ removed: "已刪除"
removeAreYouSure: "確定要刪掉「{x}」嗎？"
deleteAreYouSure: "確定要刪掉「{x}」嗎？"
resetAreYouSure: "確定要重設嗎？"
+areYouSure: "是否確定？"
saved: "已儲存"
messaging: "聊天"
upload: "上傳"
@@ -289,14 +298,14 @@ birthday: "生日"
yearsOld: "{age} 歲"
registeredDate: "註冊日期"
location: "位置"
-theme: "外觀主題"
-themeForLightMode: "在淺色模式下使用的主題"
-themeForDarkMode: "在深色模式下使用的主題"
+theme: "佈景主題"
+themeForLightMode: "在淺色模式下使用的佈景主題"
+themeForDarkMode: "在深色模式下使用的佈景主題"
light: "淺色"
dark: "深色"
-lightThemes: "淺色主題"
-darkThemes: "深色主題"
-syncDeviceDarkMode: "同步至此裝置的深色模式設定"
+lightThemes: "淺色佈景主題"
+darkThemes: "深色佈景主題"
+syncDeviceDarkMode: "與設備的深色模式同步"
drive: "雲端硬碟"
fileName: "檔案名稱"
selectFile: "選擇檔案"
@@ -308,6 +317,7 @@ folderName: "資料夾名稱"
createFolder: "新增資料夾"
renameFolder: "重新命名資料夾"
deleteFolder: "刪除資料夾"
+folder: "資料夾"
addFile: "加入附件"
emptyDrive: "雲端硬碟為空"
emptyFolder: "資料夾為空"
@@ -434,7 +444,6 @@ share: "分享"
notFound: "查無項目"
notFoundDescription: "查無此頁"
uploadFolder: "預設上傳資料夾"
-cacheClear: "清除快取"
markAsReadAllNotifications: "標記所有通知為已讀"
markAsReadAllUnreadNotes: "標記所有貼文為已讀"
markAsReadAllTalkMessages: "標記所有訊息為已讀"
@@ -531,6 +540,7 @@ serverLogs: "伺服器日誌"
deleteAll: "刪除所有記錄"
showFixedPostForm: "於時間軸頁頂顯示「發送貼文」方框"
showFixedPostFormInChannel: "於時間軸頁頂顯示「發送貼文」方框（頻道）"
+withRepliesByDefaultForNewlyFollowed: "在追隨其他人後，預設在時間軸納入回覆的貼文"
newNoteRecived: "發現新貼文"
sounds: "音效"
sound: "音效"
@@ -540,6 +550,8 @@ showInPage: "在頁面中顯示"
popout: "彈出式視窗"
volume: "音量"
masterVolume: "主音量"
+notUseSound: "關閉音效"
+useSoundOnlyWhenActive: "瀏覽器在前景運作時，Misskey 才會發出音效"
details: "詳細資訊"
chooseEmoji: "選擇您的表情符號"
unableToProcess: "操作無法完成"
@@ -560,6 +572,10 @@ output: "輸出"
script: "腳本"
disablePagesScript: "停用頁面的 AiScript 腳本"
updateRemoteUser: "更新遠端使用者資訊"
+unsetUserAvatar: "移除使用者的大頭貼"
+unsetUserAvatarConfirm: "確定要移除使用者的大頭貼嗎？"
+unsetUserBanner: "移除使用者的橫幅圖像"
+unsetUserBannerConfirm: "確定要移除使用者的橫幅圖像嗎？"
deleteAllFiles: "刪除所有檔案"
deleteAllFilesConfirm: "要刪除所有檔案嗎？"
removeAllFollowing: "解除所有追隨"
@@ -580,17 +596,17 @@ relays: "中繼"
addRelay: "新增中繼"
inboxUrl: "收件夾URL"
addedRelays: "已加入的中繼"
-serviceworkerInfo: "您需要啟用推送通知。"
+serviceworkerInfo: "如要使用推播通知，需要啟用此選項並設定金鑰。"
deletedNote: "已刪除的貼文"
invisibleNote: "私密的貼文"
enableInfiniteScroll: "啟用自動滾動頁面模式"
visibility: "可見性"
-poll: "投票"
+poll: "票選活動"
useCw: "隱藏內容"
enablePlayer: "開啟播放器"
disablePlayer: "關閉播放器"
expandTweet: "展開推文"
-themeEditor: "主題編輯器"
+themeEditor: "佈景主題編輯器"
description: "描述"
describeFile: "新增標題"
enterFileDescription: "輸入標題"
@@ -631,6 +647,7 @@ smtpSecure: "在 SMTP 連接中使用隱式 SSL/TLS"
smtpSecureInfo: "使用 STARTTLS 時關閉。"
testEmail: "測試郵件發送"
wordMute: "被靜音的文字"
+hardWordMute: "硬文字靜音"
regexpError: "正規表達式錯誤"
regexpErrorDescription: "{tab} 靜音文字的第 {line} 行的正規表達式有錯誤："
instanceMute: "被靜音的實例"
@@ -727,7 +744,7 @@ thisIsExperimentalFeature: "這是實驗性的功能。可能會有變更規格
developer: "開發者"
makeExplorable: "使自己的帳戶能夠在「探索」頁面中顯示"
makeExplorableDescription: "如果關閉，帳戶將不會被顯示在「探索」頁面中。"
-showGapBetweenNotesInTimeline: "分開顯示時間軸上的貼文。"
+showGapBetweenNotesInTimeline: "分開顯示時間軸上的貼文"
duplicate: "複製"
left: "左"
center: "置中"
@@ -770,7 +787,7 @@ receiveAnnouncementFromInstance: "接收由本實例發出的電郵通知"
emailNotification: "郵件通知"
publish: "發布"
inChannelSearch: "頻道内搜尋"
-useReactionPickerForContextMenu: "點擊右鍵開啟反應工具欄"
+useReactionPickerForContextMenu: "點擊右鍵開啟反應選擇器"
typingUsers: "{users}輸入中"
jumpToSpecifiedDate: "跳轉到特定日期"
showingPastTimeline: "顯示過往的時間軸"
@@ -827,7 +844,7 @@ previewNoteText: "預覽文本"
customCss: "自定義 CSS"
customCssWarn: "這個設定必須由具備相關知識的人員操作，不當的設定可能導致客戶端無法正常使用。"
global: "全域"
-squareAvatars: "頭像以方形顯示"
+squareAvatars: "大頭貼以方形顯示"
sent: "發送"
received: "收取"
searchResult: "搜尋結果"
@@ -864,8 +881,8 @@ makeReactionsPublicDescription: "將您做過的反應設為公開可見。"
classic: "經典"
muteThread: "將貼文串設為靜音"
unmuteThread: "將貼文串的靜音解除"
-ffVisibility: "連繫的可見性"
-ffVisibilityDescription: "您可以設定追隨或追隨者資訊的公開範圍"
+followingVisibility: "追隨中的可見性"
+followersVisibility: "追隨者的可見性"
continueThread: "查看更多貼文"
deleteAccountConfirm: "將要刪除帳戶。是否確定？"
incorrectPassword: "密碼錯誤。"
@@ -878,13 +895,13 @@ overridedDeviceKind: "裝置類型"
smartphone: "智慧型手機"
tablet: "平板"
auto: "自動"
-themeColor: "主題顏色"
+themeColor: "佈景主題顏色"
size: "大小"
numberOfColumn: "列數"
searchByGoogle: "搜尋"
-instanceDefaultLightTheme: "實例預設的淺色主題"
-instanceDefaultDarkTheme: "實例預設的深色主題"
-instanceDefaultThemeDescription: "輸入物件形式的主題代碼"
+instanceDefaultLightTheme: "實例預設的淺色佈景主題"
+instanceDefaultDarkTheme: "實例預設的深色佈景主題"
+instanceDefaultThemeDescription: "輸入物件形式的佈景主題代碼"
mutePeriod: "靜音的期限"
period: "期限"
indefinitely: "無期限"
@@ -975,6 +992,7 @@ assign: "指派"
unassign: "取消指派"
color: "顏色"
manageCustomEmojis: "管理自訂表情符號"
+manageAvatarDecorations: "管理頭像裝飾"
youCannotCreateAnymore: "您無法再建立更多了。"
cannotPerformTemporary: "暫時無法進行"
cannotPerformTemporaryDescription: "由於超過操作次數限制，因此暫時無法進行。請稍後再嘗試。"
@@ -1015,6 +1033,8 @@ resetPasswordConfirm: "重設密碼？"
sensitiveWords: "敏感詞"
sensitiveWordsDescription: "將含有設定詞彙的貼文可見性設為發送至首頁。可以用換行來進行複數的設定。"
sensitiveWordsDescription2: "空格代表「以及」（AND），斜線包圍關鍵字代表使用正規表達式。"
+hiddenTags: "隱藏標籤"
+hiddenTagsDescription: "設定的標籤不會在趨勢中顯示，換行可以設定多個標籤。"
notesSearchNotAvailable: "無法使用搜尋貼文功能。"
license: "授權"
unfavoriteConfirm: "要取消收錄我的最愛嗎？"
@@ -1025,8 +1045,9 @@ retryAllQueuesConfirmTitle: "要現在重試嗎？"
retryAllQueuesConfirmText: "伺服器的負荷可能會暫時增加。"
enableChartsForRemoteUser: "生成遠端使用者的圖表"
enableChartsForFederatedInstances: "生成遠端伺服器的圖表"
-showClipButtonInNoteFooter: "新增摘錄至貼文"
-reactionsDisplaySize: "表情回應的顯示尺寸"
+showClipButtonInNoteFooter: "新增摘錄按鈕至貼文"
+reactionsDisplaySize: "反應的顯示尺寸"
+limitWidthOfReaction: "限制反應的最大寬度，並縮小顯示尺寸。"
noteIdOrUrl: "貼文ID或URL"
video: "影片"
videos: "影片"
@@ -1121,14 +1142,45 @@ unnotifyNotes: "關閉貼文通知"
authentication: "驗證"
authenticationRequiredToContinue: "請於繼續前完成驗證"
dateAndTime: "日期與時間"
-showRenotes: "顯示轉發貼文"
+showRenotes: "顯示其他人的轉發貼文"
edited: "已編輯"
notificationRecieveConfig: "接受通知的設定"
mutualFollow: "互相追隨"
-fileAttachedOnly: "包含附件"
-showRepliesToOthersInTimeline: "在時間軸上顯示給其他人的回覆"
+fileAttachedOnly: "顯示包含附件的貼文"
+showRepliesToOthersInTimeline: "顯示給其他人的回覆"
hideRepliesToOthersInTimeline: "在時間軸上隱藏給其他人的回覆"
+showRepliesToOthersInTimelineAll: "在時間軸包含追隨中所有人的回覆"
+hideRepliesToOthersInTimelineAll: "在時間軸不包含追隨中所有人的回覆"
+confirmShowRepliesAll: "進行此操作後無法復原。您真的希望時間軸「包含」您目前追隨的所有人的回覆嗎？"
+confirmHideRepliesAll: "進行此操作後無法復原。您真的希望時間軸「不包含」您目前追隨的所有人的回覆嗎？"
externalServices: "外部服務"
+impressum: "營運者資訊"
+impressumUrl: "營運者資訊網址"
+impressumDescription: "在德國與部份地區必須要明確顯示營運者資訊。"
+privacyPolicy: "隱私政策"
+privacyPolicyUrl: "隱私政策網址"
+tosAndPrivacyPolicy: "服務條款和隱私政策"
+avatarDecorations: "頭像裝飾"
+attach: "裝上"
+detach: "取下"
+detachAll: "移除所有裝飾"
+angle: "角度"
+flip: "翻轉"
+showAvatarDecorations: "顯示頭像裝飾"
+releaseToRefresh: "放開以更新內容"
+refreshing: "載入更新中"
+pullDownToRefresh: "往下拉來更新內容"
+disableStreamingTimeline: "停用時間軸的即時更新"
+useGroupedNotifications: "分組顯示通知訊息"
+signupPendingError: "驗證您的電子郵件地址時出現問題。連結可能已過期。"
+cwNotationRequired: "如果開啟「隱藏內容」，則需要註解說明。"
+doReaction: "做出反應"
+code: "程式碼"
+reloadRequiredToApplySettings: "需要重新載入頁面設定才能生效。"
+remainingN: "剩餘：{n}"
+overwriteContentConfirm: "確定要覆蓋目前的內容嗎？"
+seasonalScreenEffect: "隨季節變換畫面的呈現"
+decorate: "設置頭像裝飾"
_announcement:
forExistingUsers: "僅限既有的使用者"
forExistingUsersDescription: "啟用代表僅向現存使用者顯示；停用代表張貼後註冊的新使用者也會看到。"
@@ -1138,6 +1190,10 @@ _announcement:
tooManyActiveAnnouncementDescription: "有過多公告可能會影響使用者體驗。請考慮歸檔已結束的公告。"
readConfirmTitle: "標記為已讀嗎？"
readConfirmText: "閱讀「{title}」的內容並標記為已讀。"
+ shouldNotBeUsedToPresentPermanentInfo: "由於可能會破壞使用者體驗，尤其是對於新使用者而言，我們建議使用公告來發布有時效性的資訊而不是固定不變的資訊。"
+ dialogAnnouncementUxWarn: "如果同時有 2 個以上對話方塊形式的公告存在，對於使用者體驗很可能會有不良的影響，因此建議謹慎使用。"
+ silence: "不發送通知"
+ silenceDescription: "啟用此選項後，將不會發送此公告的通知，並且無需將其標記為已讀。"
_initialAccountSetting:
accountCreated: "帳戶已建立完成！"
letsStartAccountSetup: "來進行帳戶的初始設定吧。"
@@ -1150,9 +1206,77 @@ _initialAccountSetting:
pushNotificationDescription: "啟用推送通知，就可以在設備上接收{name}的通知。"
initialAccountSettingCompleted: "初始設定完成了！"
haveFun: "盡情享受{name}吧！"
- ifYouNeedLearnMore: "請瀏覽{link}以更瞭解{name}（Misskey）的使用方法。"
+ youCanContinueTutorial: "您可以繼續學習如何使用{name}(Misskey)，也可以就此打住，立即開始使用。"
+ startTutorial: "開始教學課程"
skipAreYouSure: "要略過初始設定嗎？"
laterAreYouSure: "稍後再重新進行初始設定嗎？"
+_initialTutorial:
+ launchTutorial: "觀看教學課程"
+ title: "新手教學"
+ wellDone: "做得好"
+ skipAreYouSure: "結束教學模式？"
+ _landing:
+ title: "歡迎使用本教學課程"
+ description: "在這裡您可以查看 Misskey 的基本使用方法和功能。"
+ _note:
+ title: "什麼是貼文？"
+ description: "在Misskey上發布的內容稱為「貼文」。貼文在時間軸上按時間順序排列，並即時更新。"
+ reply: "您可以回覆貼文，並像討論串一樣繼續對話。"
+ renote: "您可以將此貼文分享到自己的時間軸。您也可以在引用時添加文字。"
+ reaction: "您可以添加反應。詳細資訊將在下一頁進行說明。"
+ menu: "可執行各種操作，如查看貼文詳細資訊和複製連結。"
+ _reaction:
+ title: "什麼是反應？"
+ description: "您可以在貼文中添加「反應」。您可以使用反應輕鬆隨意地表達「最愛/大心」所無法傳達的細微差別。"
+ letsTryReacting: "可以透過點擊貼文上的「+」按鈕來添加反應。請嘗試在此範例貼文添加反應！"
+ reactToContinue: "添加反應以繼續教學課程。"
+ reactNotification: "當有人對您的貼文做出反應時會即時接收到通知。"
+ reactDone: "按下「-」按鈕可以取消反應。"
+ _timeline:
+ title: "時間軸如何運作"
+ description1: "Misskey根據使用方式提供了多個時間軸（伺服器可能會將部份時間軸停用）。"
+ home: "您可以查看您追隨的使用者的貼文。"
+ local: "您可以看到此伺服器上所有使用者的貼文。"
+ social: "來自首頁時間軸和本地時間軸的貼文都會顯示。"
+ global: "可以看到其他已連接伺服器的貼文。"
+ description2: "您可以隨時在螢幕上方切換對應的時間軸。"
+ description3: "除此之外還有清單時間軸、頻道時間軸等。請參閱{link}以了解更多詳情。"
+ _postNote:
+ title: "貼文的發布設定"
+ description1: "在Misskey上發布貼文時，可以設定各種選項。發布表單如下所示。"
+ _visibility:
+ description: "可以限制誰可以看到您的貼文。"
+ public: "所有人都可以看見。"
+ home: "僅在首頁時間軸上發布。其他使用者只在下列情況可看見該貼文：追隨者、觀看使用者的個人資料頁面，以及貼文被轉發時。"
+ followers: "僅追隨者可見。只有發文者本人可轉發，未追隨發文者的使用者無法看見。"
+ direct: "僅指定的使用者可見，對方也會收到通知。可代替直接訊息使用。"
+ doNotSendConfidencialOnDirect1: "發送機密訊息時請務必注意。"
+ doNotSendConfidencialOnDirect2: "目標伺服器的管理員可以看到發布的內容，因此如果您向不受信任的伺服器上的使用者發送直接訊息，必須小心處理機密訊息。"
+ localOnly: "不將貼文發布到聯邦上的其他伺服器。不論上述發布範圍，使用此設定後，其他伺服器上的使用者將無法直接查看此貼文。"
+ _cw:
+ title: "隱藏內容（CW）"
+ description: "將顯示「註釋」中寫入的內容而不是本文。按一下「顯示內容」以顯示本文。"
+ _exampleNote:
+ cw: "美食恐怖主義注意"
+ note: "我吃了一個巧克力甜甜圈🍩😋"
+ useCases: "伺服器的服務條款可能會規範特定的貼文需要使用隱藏內容，除此之外也會用在隱藏劇情洩漏與敏感內容的貼文。"
+ _howToMakeAttachmentsSensitive:
+ title: "如何標記上傳附件為敏感內容？"
+ description: "如果伺服器服務條款有規範，又或者不希望上傳附件直接被看見，可以設置為「敏感內容」"
+ tryThisFile: "試試看！把附加在發文表單的圖像檔案標記為敏感內容。"
+ _exampleNote:
+ note: "打開納豆的包裝失敗了…"
+ method: "若要使上傳附件標記為敏感內容，請按一下該檔案以開啟選單，然後點擊「標記為敏感內容」。"
+ sensitiveSucceeded: "上傳附件時，請務必根據伺服器的服務條款適當設定敏感內容。"
+ doItToContinue: "把圖像標記為敏感內容以繼續教學課程。"
+ _done:
+ title: "教學課程已結束"
+ description: "這裡介紹的功能只是其中的一小部分。要了解更多有關如何使用Misskey的資訊，請瀏覽{link}。"
+_timelineDescription:
+ home: "在首頁時間軸上，可以看到您追隨的使用者的貼文。"
+ local: "在本地時間軸上，可以看到此伺服器所有使用者的貼文。"
+ social: "在社交時間軸上，可以看到首頁與本地時間軸的貼文。"
+ global: "在公開時間軸上，可以看到其他已連接伺服器的貼文。\n"
_serverRules:
description: "設定在註冊頁面顯示的伺服器簡要規則。建議是服務條款的摘要。"
_serverSettings:
@@ -1164,6 +1288,9 @@ _serverSettings:
manifestJsonOverride: "覆寫 manifest.json"
shortName: "簡稱"
shortNameDescription: "如果伺服器的正式名稱很長，可用簡稱或通稱代替。"
+ fanoutTimelineDescription: "如果啟用的話，檢索各個時間軸的性能會顯著提昇，資料庫的負荷也會減少。不過，Redis 的記憶體使用量會增加。如果伺服器的記憶體容量比較少或者運行不穩定，可以停用。"
+ fanoutTimelineDbFallback: "資料庫的回退"
+ fanoutTimelineDbFallbackDescription: "若啟用，在時間軸沒有快取的情況下將執行回退處理以額外查詢資料庫。若停用，可以透過不執行回退處理來進一步減少伺服器的負荷，但會限制可取得的時間軸範圍。"
_accountMigration:
moveFrom: "從其他帳戶遷移到這個帳戶"
moveFromSub: "為另一個帳戶建立別名"
@@ -1172,7 +1299,7 @@ _accountMigration:
moveTo: "將這個帳戶遷移至新的帳戶"
moveToLabel: "要遷移到的帳戶："
moveCannotBeUndone: "一旦遷移帳戶，就無法取消。"
- moveAccountDescription: "遷移至新帳戶。\n ・此帳戶的追隨者將自動追隨新帳戶；\n ・此帳戶的所有追隨者將被取消追隨；\n ・此帳戶不能再發文。\n\n雖然會自動遷移您追隨者，但必須手動遷移您追隨的帳戶。請在遷移前匯出此帳戶的「追隨中」名單，並在遷移後自行匯入。\n列表名單、靜音名單及封鎖名單也必須如此處理。\n\n（此說明適用於本伺服器，以及運行 Misskey v13.12.0 或更新版本的其他伺服器；如 Mastodon 等使用 ActivityPub 協定的其他軟體或有不同的處理方式。）"
+ moveAccountDescription: "遷移至新帳戶。\n ・此帳戶的追隨者將自動追隨新帳戶；\n ・此帳戶的所有追隨者將被取消追隨；\n ・此帳戶不能再發文。\n\n雖然會自動遷移您的追隨者，但必須手動遷移您追隨的帳戶。請在遷移前匯出此帳戶的「追隨中」名單，並在遷移後自行匯入。\n列表名單、靜音名單及封鎖名單也必須如此處理。\n\n（此說明適用於本伺服器，以及運行 Misskey v13.12.0 或更新版本的其他伺服器；如 Mastodon 等使用 ActivityPub 協定的其他軟體或有不同的處理方式。）"
moveAccountHowTo: "要遷移帳戶，首先要在目標帳戶中為此帳戶建立一個別名。\n 建立別名後，像這樣輸入目標帳戶：@username@server.example.com"
startMigration: "遷移"
migrationConfirm: "確定要將這個帳戶遷移至 {account} 嗎？一旦遷移就無法撤銷，也就無法以原來的狀態使用這個帳戶。\n另外，請確認在要遷移到的帳戶已經建立了一個別名。"
@@ -1421,6 +1548,9 @@ _achievements:
_smashTestNotificationButton:
title: "過度測試"
description: "極短時間內連續測試通知"
+ _tutorialCompleted:
+ title: "Misskey新手講座 結業證書"
+ description: "已完成教學課程"
_role:
new: "建立角色"
edit: "編輯角色"
@@ -1431,7 +1561,9 @@ _role:
assignTarget: "指派目標"
descriptionOfAssignTarget: "手動是以手動管理這個角色包含的人員。\n符合條件是設定條件以自動包含符合條件的使用者。"
manual: "手動"
+ manualRoles: "手動角色"
conditional: "符合條件"
+ conditionalRoles: "有條件的角色"
condition: "條件"
isConditionalRole: "這是條件角色。"
isPublic: "角色為公開"
@@ -1464,6 +1596,7 @@ _role:
inviteLimitCycle: "邀請碼的發放間隔"
inviteExpirationTime: "邀請碼的有效日期"
canManageCustomEmojis: "管理自訂表情符號"
+ canManageAvatarDecorations: "管理頭像裝飾"
driveCapacity: "雲端硬碟容量"
alwaysMarkNsfw: "總是將檔案標記為NSFW"
pinMax: "置頂貼文的最大數量"
@@ -1479,6 +1612,7 @@ _role:
canHideAds: "不顯示廣告"
canSearchNotes: "可否搜尋貼文"
canUseTranslator: "使用翻譯功能"
+ avatarDecorationLimit: "頭像裝飾的最大設置量"
_condition:
isLocal: "本地使用者"
isRemote: "遠端使用者"
@@ -1527,6 +1661,10 @@ _ad:
reduceFrequencyOfThisAd: "降低此廣告的頻率 "
hide: "隱藏"
timezoneinfo: "星期幾是由伺服器的時區指定的。"
+ adsSettings: "廣告投放設定"
+ notesPerOneAd: "即時更新中投放廣告的間隔（貼文數）"
+ setZeroToDisable: "設為 0 則在即時更新時不投放廣告"
+ adsTooClose: "由於廣告投放的間隔極短，可能會嚴重影響使用者體驗。"
_forgotPassword:
enterEmail: "請輸入您的帳戶註冊的電子郵件地址。 密碼重置連結將被發送到該電子郵件地址。"
ifNoEmail: "如果您還沒有註冊您的電子郵件地址，請聯繫管理員。 "
@@ -1579,6 +1717,7 @@ _aboutMisskey:
donate: "贊助 Misskey"
morePatrons: "還有許許多多幫助我們的其他人，非常感謝你們。 🥰"
patrons: "贊助者"
+ projectMembers: "專案成員"
_displayOfSensitiveMedia:
respect: "隱藏敏感檔案"
ignore: "顯示敏感檔案"
@@ -1603,6 +1742,7 @@ _channel:
notesCount: "有 {n} 篇貼文"
nameAndDescription: "名稱與說明"
nameOnly: "僅名稱"
+ allowRenoteToExternal: "允許在頻道外轉發和引用"
_menuDisplay:
sideFull: "橫向"
sideIcon: "橫向（圖示）"
@@ -1613,22 +1753,22 @@ _wordMute:
muteWordsDescription: "空格代表「以及」（AND），換行代表「或者」（OR）。"
muteWordsDescription2: "用斜線包圍關鍵字代表正規表達式。"
_instanceMute:
- instanceMuteDescription: "包括對被靜音實例上的使用者的回覆，被設定的實例上所有貼文及轉發都會被靜音。"
+ instanceMuteDescription: "包括對被靜音伺服器上的使用者的回覆，被設定的伺服器上所有貼文及轉發都會被靜音。"
instanceMuteDescription2: "設定時以換行進行分隔"
title: "將隱藏被設定的實例貼文。"
heading: "將實例靜音"
_theme:
- explore: "取得佈景主題"
+ explore: "探索佈景主題"
install: "安裝佈景主題"
- manage: "佈景主題管理員"
- code: "主題代碼"
+ manage: "管理佈景主題"
+ code: "佈景主題代碼"
description: "描述"
installed: "{name}已安裝"
- installedThemes: "已經安裝的主題"
- builtinThemes: "標準主題"
- alreadyInstalled: "此主題已經安裝"
- invalid: "主題格式錯誤"
- make: "製作主題"
+ installedThemes: "已經安裝的佈景主題"
+ builtinThemes: "標準佈景主題"
+ alreadyInstalled: "已安裝此佈景主題"
+ invalid: "佈景主題格式錯誤"
+ make: "製作佈景主題"
base: "基於"
addConstant: "添加常數"
constant: "常數"
@@ -1645,7 +1785,7 @@ _theme:
darken: "暗度"
lighten: "亮度"
inputConstantName: "請輸入常數名稱"
- importInfo: "您可以在此貼上主題代碼，將其匯入編輯器中"
+ importInfo: "您可以在此貼上佈景主題代碼，將其匯入編輯器中"
deleteConstantConfirm: "確定要刪除常數{const}嗎？"
keys:
accent: "重點色彩"
@@ -1675,9 +1815,6 @@ _theme:
infoFg: "資訊內容"
infoWarnBg: "警告背景"
infoWarnFg: "警告文字"
- cwBg: "隱藏內容按鈕背景"
- cwFg: "隱藏內容按鈕文字"
- cwHoverBg: "隱藏內容按鈕背景（懸浮）"
toastBg: "通知背景"
toastFg: "通知文本"
buttonBg: "按鈕背景"
@@ -1697,6 +1834,14 @@ _sfx:
notification: "通知"
antenna: "天線接收"
channel: "頻道通知"
+ reaction: "選擇反應時"
+_soundSettings:
+ driveFile: "使用雲端硬碟的音效檔案"
+ driveFileWarn: "請選擇雲端硬碟中的檔案"
+ driveFileTypeWarn: "不支援此檔案"
+ driveFileTypeWarnDescription: "請選擇音效檔案"
+ driveFileDurationWarn: "音效太長了"
+ driveFileDurationWarnDescription: "使用長音效檔可能會影響 Misskey 的使用體驗。仍要使用此檔案嗎？"
_ago:
future: "未來"
justNow: "剛剛"
@@ -1708,21 +1853,19 @@ _ago:
monthsAgo: "{n} 個月前"
yearsAgo: "{n} 年前"
invalid: "無"
+_timeIn:
+ seconds: "{n} 秒後"
+ minutes: "{n} 分後"
+ hours: "{n} 小時後"
+ days: "{n} 日後"
+ weeks: "{n} 週後"
+ months: "{n} 個月後"
+ years: "{n} 年後"
_time:
second: "秒"
minute: "分鐘"
hour: "小時"
day: "日"
-_timelineTutorial:
- title: "Misskey 的使用方法"
- step1_1: "這個畫面是「時間軸」。發佈到{name}的「貼文」會按照時間順序顯示。"
- step1_2: "時間軸有多種類型，例如「首頁時間軸」是您追蹤帳戶的貼文、「本地時間軸」是{name}內所有帳戶的貼文。"
- step2_1: "不如現在就嘗試發文吧！按鉛筆圖示的按鈕開啟發文頁面。"
- step2_2: "您可以在第一篇貼文裡寫自我介紹，或是「我來到 {name} 了」之類的話。"
- step3_1: "貼文發出去了嗎？"
- step3_2: "如果您的貼文出現在時間軸上，就代表發文成功。"
- step4_1: "可以對貼文標記「反應」。"
- step4_2: "點擊貼文的「+」圖示，即可選擇表情符號來反應。"
_2fa:
alreadyRegistered: "此裝置已被註冊過了"
registerTOTP: "開始設定驗證應用程式"
@@ -1843,16 +1986,17 @@ _widgets:
_userList:
chooseList: "選擇清單"
clicker: "點擊器"
+ birthdayFollowings: "今天生日的使用者"
_cw:
hide: "隱藏"
- show: "瀏覽更多"
+ show: "顯示內容"
chars: "{count} 個字元"
files: "{count} 個檔案"
_poll:
noOnlyOneChoice: "需要至少兩個選項。"
choiceN: "選項 {n}"
noMore: "沒辦法再添加選項了"
- canMultipleVote: "可以多次投票"
+ canMultipleVote: "允許複選"
expiration: "期限"
infinite: "無期限"
at: "結束時間"
@@ -1861,7 +2005,7 @@ _poll:
deadlineTime: "小時"
duration: "時長"
votesCount: "{n} 票"
- totalVotes: "合共 {n} 票"
+ totalVotes: "一共{n}票"
vote: "投票"
showResult: "顯示結果"
voted: "已投票"
@@ -1905,6 +2049,7 @@ _profile:
changeAvatar: "更換大頭貼"
changeBanner: "變更橫幅圖像"
verifiedLinkDescription: "如果輸入包含您個人資料的網站 URL，欄位旁邊將出現驗證圖示。"
+ avatarDecorationMax: "最多可以設置 {max} 個裝飾。"
_exportOrImport:
allNotes: "所有貼文"
favoritedNotes: "「我的最愛」貼文"
@@ -1914,11 +2059,12 @@ _exportOrImport:
userLists: "清單"
excludeMutingUsers: "排除被靜音的使用者"
excludeInactiveUsers: "排除不活躍帳戶"
+ withReplies: "將被匯入的追隨中清單的貼文回覆包含在時間軸"
_charts:
federation: "聯邦宇宙"
apRequest: "請求"
usersIncDec: "使用者增減"
- usersTotal: "使用者合共"
+ usersTotal: "使用者總數"
activeUsers: "活躍使用者"
notesIncDec: "貼文増減"
localNotesIncDec: "本地貼文増減"
@@ -2025,12 +2171,16 @@ _notification:
pollEnded: "問卷調查已產生結果"
newNote: "新的貼文"
unreadAntennaNote: "天線 {name}"
+ roleAssigned: "已授予角色"
emptyPushNotificationMessage: "推送通知已更新"
achievementEarned: "獲得成就"
testNotification: "通知測試"
checkNotificationBehavior: "確認通知的顯示行為"
sendTestNotification: "發送測試通知"
notificationWillBeDisplayedLikeThis: "通知會以這樣的方式顯示"
+ reactedBySomeUsers: "{n}人做出了反應"
+ renotedBySomeUsers: "{n}人做了轉發"
+ followedBySomeUsers: "被{n}人追隨了"
_types:
all: "全部 "
note: "使用者的最新貼文"
@@ -2043,6 +2193,7 @@ _notification:
pollEnded: "問卷調查結束"
receiveFollowRequest: "已收到追隨請求"
followRequestAccepted: "追隨請求已接受"
+ roleAssigned: "已授予角色"
achievementEarned: "獲得成就"
app: "應用程式通知"
_actions:
@@ -2134,3 +2285,70 @@ _moderationLogTypes:
createAd: "建立廣告"
deleteAd: "刪除廣告"
updateAd: "更新廣告"
+ createAvatarDecoration: "建立頭像裝飾"
+ updateAvatarDecoration: "更新頭像裝飾"
+ deleteAvatarDecoration: "刪除頭像裝飾"
+ unsetUserAvatar: "移除使用者的大頭貼"
+ unsetUserBanner: "移除使用者的橫幅圖像"
+_fileViewer:
+ title: "檔案詳細資訊"
+ type: "檔案類型 "
+ size: "檔案大小"
+ url: "URL"
+ uploadedAt: "加入日期"
+ attachedNotes: "含有附件的貼文"
+ thisPageCanBeSeenFromTheAuthor: "本頁面僅限上傳了這個檔案的使用者可以檢視。"
+_externalResourceInstaller:
+ title: "從外部網站安裝"
+ checkVendorBeforeInstall: "安裝前請確認提供者是可信賴的。"
+ _plugin:
+ title: "要安裝此外掛嘛？"
+ metaTitle: "外掛資訊"
+ _theme:
+ title: "要安裝此佈景主題嗎？"
+ metaTitle: "佈景主題資訊"
+ _meta:
+ base: "基本配色方案"
+ _vendorInfo:
+ title: "提供者資訊"
+ endpoint: "引用端點"
+ hashVerify: "確認檔案的完整性"
+ _errors:
+ _invalidParams:
+ title: "缺少參數"
+ description: "缺少從外部網站取得資料的必要資訊。請檢查 URL 是否正確。"
+ _resourceTypeNotSupported:
+ title: "不支援此外部資源。"
+ description: "不支援從此外部網站取得的資源類型。請聯絡網站管理員。"
+ _failedToFetch:
+ title: "無法取得資料"
+ fetchErrorDescription: "與外部站點的通訊失敗。如果重試後問題仍然存在，請聯絡網站管理員。"
+ parseErrorDescription: "無法讀取從外部站點取得的資料。請聯絡網站管理員。"
+ _hashUnmatched:
+ title: "無法取得正確資料"
+ description: "所提供資料的完整性驗證失敗。出於安全原因，安裝無法繼續。請聯絡網站管理員。"
+ _pluginParseFailed:
+ title: "AiScript 錯誤"
+ description: "已取得資料但解析 AiScript 時發生錯誤，導致無法載入。請聯絡外掛作者。請檢查 Javascript 控制台以取得錯誤詳細資訊。"
+ _pluginInstallFailed:
+ title: "外掛安裝失敗"
+ description: "安裝插件時出現問題。請再試一次。請參閱 Javascript 控制台以取得錯誤詳細資訊。"
+ _themeParseFailed:
+ title: "佈景主題解析錯誤"
+ description: "已取得資料但解析佈景主題時發生錯誤，導致無法載入。請聯絡佈景主題的作者。請檢查 Javascript 控制台以取得錯誤詳細資訊。"
+ _themeInstallFailed:
+ title: "無法安裝佈景主題"
+ description: "安裝佈景主題時出現問題。請再試一次。請參閱 Javascript 控制台以取得錯誤詳細資訊。"
+_dataSaver:
+ _media:
+ title: "載入媒體檔案"
+ description: "防止自動載入圖片和影片。點擊隱藏的圖片/影片即可載入。"
+ _avatar:
+ title: "大頭貼"
+ description: "停止顯示大頭貼的動畫。由於動畫圖片的檔案大小可能比普通圖片大，這可以進一步減少資料流量。"
+ _urlPreview:
+ title: "網址預覽縮圖"
+ description: "將不再自動載入網址預覽縮圖。"
+ _code:
+ title: "程式碼突出顯示"
+ description: "如果使用了 MFM 的程式碼突顯標記，則在點擊之前不會載入。程式碼突顯要求加載每種程式語言的突顯定義檔案，但由於這些檔案不再自動載入，因此有望減少資料流量。"
diff --git a/package.json b/package.json
index d298fbed90..d39b800a18 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
{
"name": "misskey",
- "version": "2023.10.0-beta.7",
+ "version": "2023.12.0",
"codename": "nasubi",
"repository": {
"type": "git",
"url": "https://github.com/misskey-dev/misskey.git"
},
- "packageManager": "pnpm@8.8.0",
+ "packageManager": "pnpm@8.12.1",
"workspaces": [
"packages/frontend",
"packages/backend",
@@ -18,14 +18,16 @@
"build-assets": "node ./scripts/build-assets.mjs",
"build": "pnpm build-pre && pnpm -r build && pnpm build-assets",
"build-storybook": "pnpm --filter frontend build-storybook",
+ "build-misskey-js-with-types": "pnpm --filter backend build && pnpm --filter backend generate-api-json && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && pnpm --filter misskey-js update-autogen-code && pnpm --filter misskey-js build",
"start": "pnpm check:connect && cd packages/backend && 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": "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",
@@ -44,19 +46,20 @@
},
"dependencies": {
"execa": "8.0.1",
- "cssnano": "6.0.1",
+ "cssnano": "6.0.2",
"js-yaml": "4.1.0",
- "postcss": "8.4.31",
- "terser": "5.21.0",
- "typescript": "5.2.2"
+ "postcss": "8.4.32",
+ "terser": "5.26.0",
+ "typescript": "5.3.3"
},
"devDependencies": {
- "@typescript-eslint/eslint-plugin": "6.7.4",
- "@typescript-eslint/parser": "6.7.4",
+ "@typescript-eslint/eslint-plugin": "6.14.0",
+ "@typescript-eslint/parser": "6.14.0",
"cross-env": "7.0.3",
- "cypress": "13.3.0",
- "eslint": "8.50.0",
- "start-server-and-test": "2.0.1"
+ "cypress": "13.6.1",
+ "eslint": "8.56.0",
+ "start-server-and-test": "2.0.3",
+ "ncp": "2.0.0"
},
"optionalDependencies": {
"@tensorflow/tfjs-core": "4.4.0"
diff --git a/packages/backend/.swcrc b/packages/backend/.swcrc
index d9f047b6ac..0504a2d389 100644
--- a/packages/backend/.swcrc
+++ b/packages/backend/.swcrc
@@ -11,7 +11,7 @@
"decoratorMetadata": true
},
"experimental": {
- "keepImportAttributes": true
+ "keepImportAssertions": true
},
"baseUrl": "src",
"paths": {
diff --git a/packages/backend/assets/tabler-badges/bell.png b/packages/backend/assets/tabler-badges/bell.png
new file mode 100644
index 0000000000..ab3b2a110f
Binary files /dev/null and b/packages/backend/assets/tabler-badges/bell.png differ
diff --git a/packages/backend/generate_api_json.js b/packages/backend/generate_api_json.js
new file mode 100644
index 0000000000..5819c60a5f
--- /dev/null
+++ b/packages/backend/generate_api_json.js
@@ -0,0 +1,8 @@
+import { loadConfig } from './built/config.js'
+import { genOpenapiSpec } from './built/server/api/openapi/gen-spec.js'
+import { writeFileSync } from "node:fs";
+
+const config = loadConfig();
+const spec = genOpenapiSpec(config);
+
+writeFileSync('./built/api.json', JSON.stringify(spec), 'utf-8');
\ No newline at end of file
diff --git a/packages/backend/migration/1696743032098-AdsOnStream.js b/packages/backend/migration/1696743032098-AdsOnStream.js
new file mode 100644
index 0000000000..c86ee84883
--- /dev/null
+++ b/packages/backend/migration/1696743032098-AdsOnStream.js
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class AdsOnStream1696743032098 {
+ name = 'AdsOnStream1696743032098'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "meta" ADD "notesPerOneAd" integer NOT NULL DEFAULT '0'`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "notesPerOneAd"`);
+ }
+}
diff --git a/packages/backend/migration/1696807733453-userListUserId.js b/packages/backend/migration/1696807733453-userListUserId.js
new file mode 100644
index 0000000000..ab2ba07fb5
--- /dev/null
+++ b/packages/backend/migration/1696807733453-userListUserId.js
@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class UserListUserId1696807733453 {
+ name = 'UserListUserId1696807733453'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "user_list_membership" ADD "userListUserId" character varying(32) NOT NULL DEFAULT ''`);
+ const memberships = await queryRunner.query(`SELECT "id", "userListId" FROM "user_list_membership"`);
+ for(let i = 0; i < memberships.length; i++) {
+ const userList = await queryRunner.query(`SELECT "userId" FROM "user_list" WHERE "id" = $1`, [memberships[i].userListId]);
+ await queryRunner.query(`UPDATE "user_list_membership" SET "userListUserId" = $1 WHERE "id" = $2`, [userList[0].userId, memberships[i].id]);
+ }
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "user_list_membership" DROP COLUMN "userListUserId"`);
+ }
+}
diff --git a/packages/backend/migration/1696808725134-userListUserId-2.js b/packages/backend/migration/1696808725134-userListUserId-2.js
new file mode 100644
index 0000000000..5bcb5aedc2
--- /dev/null
+++ b/packages/backend/migration/1696808725134-userListUserId-2.js
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class UserListUserId21696808725134 {
+ name = 'UserListUserId21696808725134'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "user_list_membership" ALTER COLUMN "userListUserId" DROP DEFAULT`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "user_list_membership" ALTER COLUMN "userListUserId" SET DEFAULT ''`);
+ }
+}
diff --git a/packages/backend/migration/1697247230117-InstanceSilence.js b/packages/backend/migration/1697247230117-InstanceSilence.js
new file mode 100644
index 0000000000..5fdbca3b27
--- /dev/null
+++ b/packages/backend/migration/1697247230117-InstanceSilence.js
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class InstanceSilence1697247230117 {
+ name = 'InstanceSilence1697247230117'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "meta" ADD "silencedHosts" character varying(1024) array NOT NULL DEFAULT '{}'`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "silencedHosts"`);
+ }
+}
diff --git a/packages/backend/migration/1697420555911-deleteCreatedAt.js b/packages/backend/migration/1697420555911-deleteCreatedAt.js
new file mode 100644
index 0000000000..958d61a348
--- /dev/null
+++ b/packages/backend/migration/1697420555911-deleteCreatedAt.js
@@ -0,0 +1,144 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class DeleteCreatedAt1697420555911 {
+ name = 'DeleteCreatedAt1697420555911'
+
+ async up(queryRunner) {
+ await queryRunner.query(`DROP INDEX "public"."IDX_02878d441ceae15ce060b73daf"`);
+ await queryRunner.query(`DROP INDEX "public"."IDX_c8dfad3b72196dd1d6b5db168a"`);
+ await queryRunner.query(`DROP INDEX "public"."IDX_e11e649824a45d8ed01d597fd9"`);
+ await queryRunner.query(`DROP INDEX "public"."IDX_db2098070b2b5a523c58181f74"`);
+ await queryRunner.query(`DROP INDEX "public"."IDX_048a757923ed8b157e9895da53"`);
+ await queryRunner.query(`DROP INDEX "public"."IDX_1129c2ef687fc272df040bafaa"`);
+ await queryRunner.query(`DROP INDEX "public"."IDX_118ec703e596086fc4515acb39"`);
+ await queryRunner.query(`DROP INDEX "public"."IDX_b9a354f7941c1e779f3b33aea6"`);
+ await queryRunner.query(`DROP INDEX "public"."IDX_71cb7b435b7c0d4843317e7e16"`);
+ await queryRunner.query(`DROP INDEX "public"."IDX_11e71f2511589dcc8a4d3214f9"`);
+ await queryRunner.query(`DROP INDEX "public"."IDX_735a5544f9249d412255f47f95"`);
+ await queryRunner.query(`DROP INDEX "public"."IDX_582f8fab771a9040a12961f3e7"`);
+ await queryRunner.query(`DROP INDEX "public"."IDX_8f1a239bd077c8864a20c62c2c"`);
+ await queryRunner.query(`DROP INDEX "public"."IDX_f86d57fbca33c7a4e6897490cc"`);
+ await queryRunner.query(`DROP INDEX "public"."IDX_d1259a2c2b7bb413ff449e8711"`);
+ await queryRunner.query(`DROP INDEX "public"."IDX_fbb4297c927a9b85e9cefa2eb1"`);
+ await queryRunner.query(`DROP INDEX "public"."IDX_0fb627e1c2f753262a74f0562d"`);
+ await queryRunner.query(`DROP INDEX "public"."IDX_149d2e44785707548c82999b01"`);
+ await queryRunner.query(`ALTER TABLE "drive_folder" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "app" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "access_token" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "ad" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "announcement" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "announcement_read" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "user_list" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "auth_session" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "blocking" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "channel" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "channel_following" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "channel_favorite" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "clip" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "clip_favorite" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "following" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "follow_request" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "gallery_post" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "gallery_like" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "moderation_log" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "muting" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "renote_muting" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "note_favorite" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "note_reaction" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "note_thread_muting" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "page" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "page_like" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "password_reset_request" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "poll_vote" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "promo_read" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "registration_ticket" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "registry_item" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "signin" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "sw_subscription" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "user_list_favorite" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "user_list_membership" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "user_note_pining" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "user_pending" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "webhook" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "role" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "role_assignment" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "flash" DROP COLUMN "createdAt"`);
+ await queryRunner.query(`ALTER TABLE "flash_like" DROP COLUMN "createdAt"`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "flash_like" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "flash" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "role_assignment" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "role" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "webhook" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "user_pending" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "user_note_pining" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "user_list_membership" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "user_list_favorite" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "sw_subscription" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "signin" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "registry_item" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "registration_ticket" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "promo_read" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "poll_vote" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "password_reset_request" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "page_like" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "page" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "note_thread_muting" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "note_reaction" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "note_favorite" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "renote_muting" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "muting" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "moderation_log" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "gallery_like" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "gallery_post" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "follow_request" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "following" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "clip_favorite" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "note" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "clip" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "channel_favorite" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "channel_following" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "channel" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "blocking" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "auth_session" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "antenna" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "user_list" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "announcement_read" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "announcement" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "ad" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "access_token" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "app" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "user" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "drive_file" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`ALTER TABLE "drive_folder" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+ await queryRunner.query(`CREATE INDEX "IDX_149d2e44785707548c82999b01" ON "flash" ("createdAt") `);
+ await queryRunner.query(`CREATE INDEX "IDX_0fb627e1c2f753262a74f0562d" ON "poll_vote" ("createdAt") `);
+ await queryRunner.query(`CREATE INDEX "IDX_fbb4297c927a9b85e9cefa2eb1" ON "page" ("createdAt") `);
+ await queryRunner.query(`CREATE INDEX "IDX_d1259a2c2b7bb413ff449e8711" ON "renote_muting" ("createdAt") `);
+ await queryRunner.query(`CREATE INDEX "IDX_f86d57fbca33c7a4e6897490cc" ON "muting" ("createdAt") `);
+ await queryRunner.query(`CREATE INDEX "IDX_8f1a239bd077c8864a20c62c2c" ON "gallery_post" ("createdAt") `);
+ await queryRunner.query(`CREATE INDEX "IDX_582f8fab771a9040a12961f3e7" ON "following" ("createdAt") `);
+ await queryRunner.query(`CREATE INDEX "IDX_735a5544f9249d412255f47f95" ON "channel_favorite" ("createdAt") `);
+ await queryRunner.query(`CREATE INDEX "IDX_11e71f2511589dcc8a4d3214f9" ON "channel_following" ("createdAt") `);
+ await queryRunner.query(`CREATE INDEX "IDX_71cb7b435b7c0d4843317e7e16" ON "channel" ("createdAt") `);
+ await queryRunner.query(`CREATE INDEX "IDX_b9a354f7941c1e779f3b33aea6" ON "blocking" ("createdAt") `);
+ await queryRunner.query(`CREATE INDEX "IDX_118ec703e596086fc4515acb39" ON "announcement" ("createdAt") `);
+ await queryRunner.query(`CREATE INDEX "IDX_1129c2ef687fc272df040bafaa" ON "ad" ("createdAt") `);
+ await queryRunner.query(`CREATE INDEX "IDX_048a757923ed8b157e9895da53" ON "app" ("createdAt") `);
+ await queryRunner.query(`CREATE INDEX "IDX_db2098070b2b5a523c58181f74" ON "abuse_user_report" ("createdAt") `);
+ await queryRunner.query(`CREATE INDEX "IDX_e11e649824a45d8ed01d597fd9" ON "user" ("createdAt") `);
+ await queryRunner.query(`CREATE INDEX "IDX_c8dfad3b72196dd1d6b5db168a" ON "drive_file" ("createdAt") `);
+ await queryRunner.query(`CREATE INDEX "IDX_02878d441ceae15ce060b73daf" ON "drive_folder" ("createdAt") `);
+ }
+}
diff --git a/packages/backend/migration/1697436246389-antenna-localOnly.js b/packages/backend/migration/1697436246389-antenna-localOnly.js
new file mode 100644
index 0000000000..0228673291
--- /dev/null
+++ b/packages/backend/migration/1697436246389-antenna-localOnly.js
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class AntennaLocalOnly1697436246389 {
+ name = 'AntennaLocalOnly1697436246389'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "antenna" ADD "localOnly" boolean NOT NULL DEFAULT false`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "localOnly"`);
+ }
+}
diff --git a/packages/backend/migration/1697441463087-FollowRequestWithReplies.js b/packages/backend/migration/1697441463087-FollowRequestWithReplies.js
new file mode 100644
index 0000000000..214c6f6680
--- /dev/null
+++ b/packages/backend/migration/1697441463087-FollowRequestWithReplies.js
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+
+export class FollowRequestWithReplies1697441463087 {
+ name = 'FollowRequestWithReplies1697441463087'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "follow_request" ADD "withReplies" boolean NOT NULL DEFAULT false`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "follow_request" DROP COLUMN "withReplies"`);
+ }
+}
diff --git a/packages/backend/migration/1697673894459-note-reactionAndUserPairCache.js b/packages/backend/migration/1697673894459-note-reactionAndUserPairCache.js
new file mode 100644
index 0000000000..fe0ea282d2
--- /dev/null
+++ b/packages/backend/migration/1697673894459-note-reactionAndUserPairCache.js
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+
+export class NoteReactionAndUserPairCache1697673894459 {
+ name = 'NoteReactionAndUserPairCache1697673894459'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "note" ADD "reactionAndUserPairCache" character varying(1024) array NOT NULL DEFAULT '{}'`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "reactionAndUserPairCache"`);
+ }
+}
diff --git a/packages/backend/migration/1697847397844-avatar-decoration.js b/packages/backend/migration/1697847397844-avatar-decoration.js
new file mode 100644
index 0000000000..1f22139746
--- /dev/null
+++ b/packages/backend/migration/1697847397844-avatar-decoration.js
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class AvatarDecoration1697847397844 {
+ name = 'AvatarDecoration1697847397844'
+
+ async up(queryRunner) {
+ await queryRunner.query(`CREATE TABLE "avatar_decoration" ("id" character varying(32) NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE, "url" character varying(1024) NOT NULL, "name" character varying(256) NOT NULL, "description" character varying(2048) NOT NULL, "roleIdsThatCanBeUsedThisDecoration" character varying(128) array NOT NULL DEFAULT '{}', CONSTRAINT "PK_b6de9296f6097078e1dc53f7603" PRIMARY KEY ("id"))`);
+ await queryRunner.query(`ALTER TABLE "user" ADD "avatarDecorations" character varying(512) array NOT NULL DEFAULT '{}'`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarDecorations"`);
+ await queryRunner.query(`DROP TABLE "avatar_decoration"`);
+ }
+}
diff --git a/packages/backend/migration/1697941908548-avatar-decoration2.js b/packages/backend/migration/1697941908548-avatar-decoration2.js
new file mode 100644
index 0000000000..9d15c1c3d0
--- /dev/null
+++ b/packages/backend/migration/1697941908548-avatar-decoration2.js
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class AvatarDecoration21697941908548 {
+ name = 'AvatarDecoration21697941908548'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarDecorations"`);
+ await queryRunner.query(`ALTER TABLE "user" ADD "avatarDecorations" jsonb NOT NULL DEFAULT '[]'`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarDecorations"`);
+ await queryRunner.query(`ALTER TABLE "user" ADD "avatarDecorations" character varying(512) array NOT NULL DEFAULT '{}'`);
+ }
+}
diff --git a/packages/backend/migration/1698041201306-enable-ftt.js b/packages/backend/migration/1698041201306-enable-ftt.js
new file mode 100644
index 0000000000..6769ed53b5
--- /dev/null
+++ b/packages/backend/migration/1698041201306-enable-ftt.js
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class EnableFtt1698041201306 {
+ name = 'EnableFtt1698041201306'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "meta" ADD "enableFanoutTimeline" boolean NOT NULL DEFAULT true`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableFanoutTimeline"`);
+ }
+}
diff --git a/packages/backend/migration/1698840138000-add-allow-renote-to-external.js b/packages/backend/migration/1698840138000-add-allow-renote-to-external.js
new file mode 100644
index 0000000000..0edf298841
--- /dev/null
+++ b/packages/backend/migration/1698840138000-add-allow-renote-to-external.js
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class AddAllowRenoteToExternal1698840138000 {
+ name = 'AddAllowRenoteToExternal1698840138000'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "channel" ADD "allowRenoteToExternal" boolean NOT NULL DEFAULT true`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "channel" DROP COLUMN "allowRenoteToExternal"`);
+ }
+}
diff --git a/packages/backend/migration/1699141698112-announcement-silence.js b/packages/backend/migration/1699141698112-announcement-silence.js
new file mode 100644
index 0000000000..eef9b076fc
--- /dev/null
+++ b/packages/backend/migration/1699141698112-announcement-silence.js
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class AnnouncementSilence1699141698112 {
+ name = 'AnnouncementSilence1699141698112'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "announcement" ADD "silence" boolean NOT NULL DEFAULT false`);
+ await queryRunner.query(`CREATE INDEX "IDX_7b8d9225168e962f94ea517e00" ON "announcement" ("silence") `);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`DROP INDEX "public"."IDX_7b8d9225168e962f94ea517e00"`);
+ await queryRunner.query(`ALTER TABLE "announcement" DROP COLUMN "silence"`);
+ }
+}
diff --git a/packages/backend/migration/1700096812223-enableFanoutTimelineDbFallback.js b/packages/backend/migration/1700096812223-enableFanoutTimelineDbFallback.js
new file mode 100644
index 0000000000..94fa588985
--- /dev/null
+++ b/packages/backend/migration/1700096812223-enableFanoutTimelineDbFallback.js
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class EnableFanoutTimelineDbFallback1700096812223 {
+ name = 'EnableFanoutTimelineDbFallback1700096812223'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "meta" ADD "enableFanoutTimelineDbFallback" boolean NOT NULL DEFAULT true`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableFanoutTimelineDbFallback"`);
+ }
+}
diff --git a/packages/backend/migration/1700303245007-supportVerifyMailApi.js b/packages/backend/migration/1700303245007-supportVerifyMailApi.js
new file mode 100644
index 0000000000..3ac59ec37a
--- /dev/null
+++ b/packages/backend/migration/1700303245007-supportVerifyMailApi.js
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class SupportVerifyMailApi1700303245007 {
+ name = 'SupportVerifyMailApi1700303245007'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "meta" ADD "verifymailAuthKey" character varying(1024)`);
+ await queryRunner.query(`ALTER TABLE "meta" ADD "enableVerifymailApi" boolean NOT NULL DEFAULT false`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableVerifymailApi"`);
+ await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "verifymailAuthKey"`);
+ }
+}
diff --git a/packages/backend/migration/1700383825690-hard-mute.js b/packages/backend/migration/1700383825690-hard-mute.js
new file mode 100644
index 0000000000..afd3247f5c
--- /dev/null
+++ b/packages/backend/migration/1700383825690-hard-mute.js
@@ -0,0 +1,11 @@
+export class HardMute1700383825690 {
+ name = 'HardMute1700383825690'
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "user_profile" ADD "hardMutedWords" jsonb NOT NULL DEFAULT '[]'`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "hardMutedWords"`);
+ }
+}
diff --git a/packages/backend/migration/1700902349231-add-bday-index.js b/packages/backend/migration/1700902349231-add-bday-index.js
new file mode 100644
index 0000000000..251526fc26
--- /dev/null
+++ b/packages/backend/migration/1700902349231-add-bday-index.js
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class AddBdayIndex1700902349231 {
+ name = 'AddBdayIndex1700902349231'
+
+ async up(queryRunner) {
+ await queryRunner.query(`CREATE INDEX "IDX_de22cd2b445eee31ae51cdbe99" ON "user_profile" (SUBSTR("birthday", 6, 5))`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`DROP INDEX "public"."IDX_de22cd2b445eee31ae51cdbe99"`);
+ }
+}
diff --git a/packages/backend/migration/1702718871541-ffVisibility.js b/packages/backend/migration/1702718871541-ffVisibility.js
new file mode 100644
index 0000000000..24b1873134
--- /dev/null
+++ b/packages/backend/migration/1702718871541-ffVisibility.js
@@ -0,0 +1,35 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class ffVisibility1702718871541 {
+ constructor() {
+ this.name = 'ffVisibility1702718871541';
+ }
+ async up(queryRunner) {
+ await queryRunner.query(`CREATE TYPE "public"."user_profile_followingvisibility_enum" AS ENUM('public', 'followers', 'private')`);
+ await queryRunner.query(`CREATE CAST ("public"."user_profile_ffvisibility_enum" AS "public"."user_profile_followingvisibility_enum") WITH INOUT AS ASSIGNMENT`);
+ await queryRunner.query(`CREATE TYPE "public"."user_profile_followersVisibility_enum" AS ENUM('public', 'followers', 'private')`);
+ await queryRunner.query(`CREATE CAST ("public"."user_profile_ffvisibility_enum" AS "public"."user_profile_followersVisibility_enum") WITH INOUT AS ASSIGNMENT`);
+ await queryRunner.query(`ALTER TABLE "user_profile" ADD "followingVisibility" "public"."user_profile_followingvisibility_enum" NOT NULL DEFAULT 'public'`);
+ await queryRunner.query(`ALTER TABLE "user_profile" ADD "followersVisibility" "public"."user_profile_followersVisibility_enum" NOT NULL DEFAULT 'public'`);
+ await queryRunner.query(`UPDATE "user_profile" SET "followingVisibility" = "ffVisibility"`);
+ await queryRunner.query(`UPDATE "user_profile" SET "followersVisibility" = "ffVisibility"`);
+ await queryRunner.query(`DROP CAST ("public"."user_profile_ffvisibility_enum" AS "public"."user_profile_followersVisibility_enum")`);
+ await queryRunner.query(`DROP CAST ("public"."user_profile_ffvisibility_enum" AS "public"."user_profile_followingvisibility_enum")`);
+ await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "ffVisibility"`);
+ await queryRunner.query(`DROP TYPE "public"."user_profile_ffvisibility_enum"`);
+ }
+ async down(queryRunner) {
+ await queryRunner.query(`CREATE TYPE "public"."user_profile_ffvisibility_enum" AS ENUM('public', 'followers', 'private')`);
+ await queryRunner.query(`ALTER TABLE "user_profile" ADD "ffVisibility" "public"."user_profile_ffvisibility_enum" NOT NULL DEFAULT 'public'`);
+ await queryRunner.query(`CREATE CAST ("public"."user_profile_followingvisibility_enum" AS "public"."user_profile_ffvisibility_enum") WITH INOUT AS ASSIGNMENT`);
+ await queryRunner.query(`UPDATE "user_profile" SET ffVisibility = "user_profile"."followingVisibility"`);
+ await queryRunner.query(`DROP CAST ("public"."user_profile_followingvisibility_enum" AS "public"."user_profile_ffvisibility_enum")`);
+ await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "followersVisibility"`);
+ await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "followingVisibility"`);
+ await queryRunner.query(`DROP TYPE "public"."user_profile_followersVisibility_enum"`);
+ await queryRunner.query(`DROP TYPE "public"."user_profile_followingvisibility_enum"`);
+ }
+}
diff --git a/packages/backend/migration/1703209889304-bannedEmailDomains.js b/packages/backend/migration/1703209889304-bannedEmailDomains.js
new file mode 100644
index 0000000000..5dc99c138f
--- /dev/null
+++ b/packages/backend/migration/1703209889304-bannedEmailDomains.js
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class bannedEmailDomains1703209889304 {
+ constructor() {
+ this.name = 'bannedEmailDomains1703209889304';
+ }
+
+ async up(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "meta" ADD "bannedEmailDomains" character varying(1024) array NOT NULL DEFAULT '{}'`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "bannedEmailDomains"`);
+ }
+}
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 2f0cf10374..6848d88e03 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -4,17 +4,20 @@
"private": true,
"type": "module",
"engines": {
- "node": ">=18.16.0"
+ "node": ">=20.10.0"
},
"scripts": {
- "start": "node ./built/index.js",
- "start:test": "NODE_ENV=test node ./built/index.js",
+ "start": "node ./built/boot/entry.js",
+ "start:test": "NODE_ENV=test node ./built/boot/entry.js",
"migrate": "pnpm typeorm migration:run -d ormconfig.js",
+ "revert": "pnpm typeorm migration:revert -d ormconfig.js",
"check:connect": "node ./check_connect.js",
"build": "swc src -d built -D",
"watch:swc": "swc src -d built -D -w",
"build:tsc": "tsc -p tsconfig.json && tsc-alias -p tsconfig.json",
"watch": "node watch.mjs",
+ "restart": "pnpm build && pnpm start",
+ "dev": "nodemon -w src -e ts,js,mjs,cjs,json --exec \"cross-env NODE_ENV=development pnpm run restart\"",
"typecheck": "tsc --noEmit",
"eslint": "eslint --quiet \"src/**/*.ts\"",
"lint": "pnpm typecheck && pnpm eslint",
@@ -22,7 +25,8 @@
"jest-and-coverage": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --coverage --forceExit",
"jest-clear": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --clearCache",
"test": "pnpm jest",
- "test-and-coverage": "pnpm jest-and-coverage"
+ "test-and-coverage": "pnpm jest-and-coverage",
+ "generate-api-json": "node ./generate_api_json.js"
},
"optionalDependencies": {
"@swc/core-android-arm64": "1.3.11",
@@ -58,27 +62,28 @@
"dependencies": {
"@aws-sdk/client-s3": "3.412.0",
"@aws-sdk/lib-storage": "3.412.0",
- "@smithy/node-http-handler": "2.1.5",
- "@bull-board/api": "5.8.4",
- "@bull-board/fastify": "5.8.4",
- "@bull-board/ui": "5.8.4",
- "@discordapp/twemoji": "14.1.2",
- "@fastify/accepts": "4.2.0",
- "@fastify/cookie": "9.1.0",
- "@fastify/cors": "8.4.0",
+ "@bull-board/api": "5.10.2",
+ "@bull-board/fastify": "5.10.2",
+ "@bull-board/ui": "5.10.2",
+ "@discordapp/twemoji": "15.0.2",
+ "@fastify/accepts": "4.3.0",
+ "@fastify/cookie": "9.2.0",
+ "@fastify/cors": "8.4.2",
"@fastify/express": "2.3.0",
- "@fastify/http-proxy": "9.2.1",
+ "@fastify/http-proxy": "9.3.0",
"@fastify/multipart": "8.0.0",
- "@fastify/static": "6.11.2",
+ "@fastify/static": "6.12.0",
"@fastify/view": "8.2.0",
- "@nestjs/common": "10.2.7",
- "@nestjs/core": "10.2.7",
- "@nestjs/testing": "10.2.7",
+ "@nestjs/common": "10.2.10",
+ "@nestjs/core": "10.2.10",
+ "@nestjs/testing": "10.2.10",
"@peertube/http-signature": "1.7.0",
- "@simplewebauthn/server": "8.2.0",
- "@sinonjs/fake-timers": "11.1.0",
- "@swc/cli": "0.1.62",
- "@swc/core": "1.3.92",
+ "@simplewebauthn/server": "8.3.5",
+ "@sinonjs/fake-timers": "11.2.2",
+ "@smithy/node-http-handler": "2.1.10",
+ "@swc/cli": "0.1.63",
+ "@swc/core": "1.3.100",
+ "@twemoji/parser": "15.0.0",
"accepts": "1.3.8",
"ajv": "8.12.0",
"archiver": "6.0.1",
@@ -86,7 +91,7 @@
"bcryptjs": "2.4.3",
"blurhash": "2.0.5",
"body-parser": "1.20.2",
- "bullmq": "4.12.2",
+ "bullmq": "4.15.4",
"cacheable-lookup": "7.0.0",
"cbor": "9.0.1",
"chalk": "5.3.0",
@@ -97,12 +102,13 @@
"content-disposition": "0.5.4",
"date-fns": "2.30.0",
"deep-email-validator": "0.1.21",
- "fastify": "4.23.2",
+ "fastify": "4.24.3",
+ "fastify-raw-body": "4.3.0",
"feed": "4.2.2",
- "file-type": "18.5.0",
+ "file-type": "18.7.0",
"fluent-ffmpeg": "2.1.2",
"form-data": "4.0.0",
- "got": "13.0.0",
+ "got": "14.0.0",
"happy-dom": "10.0.3",
"hpagent": "1.2.0",
"http-link-header": "1.1.1",
@@ -111,116 +117,117 @@
"ipaddr.js": "2.1.0",
"is-svg": "5.0.0",
"js-yaml": "4.1.0",
- "jsdom": "22.1.0",
+ "jsdom": "23.0.1",
"json5": "2.2.3",
- "jsonld": "8.3.1",
- "jsrsasign": "10.8.6",
- "meilisearch": "0.35.0",
- "mfm-js": "0.23.3",
- "microformats-parser": "1.5.2",
+ "jsonld": "8.3.2",
+ "jsrsasign": "10.9.0",
+ "meilisearch": "0.36.0",
+ "mfm-js": "0.24.0",
+ "microformats-parser": "2.0.2",
"mime-types": "2.1.35",
"misskey-js": "workspace:*",
"ms": "3.0.0-canary.1",
- "nanoid": "5.0.1",
+ "nanoid": "5.0.4",
"nested-property": "4.0.0",
"node-fetch": "3.3.2",
- "nodemailer": "6.9.5",
+ "nodemailer": "6.9.7",
"nsfwjs": "2.4.2",
"oauth": "0.10.0",
- "oauth2orize": "1.11.1",
+ "oauth2orize": "1.12.0",
"oauth2orize-pkce": "0.1.2",
"os-utils": "0.0.14",
- "otpauth": "9.1.4",
+ "otpauth": "9.2.1",
"parse5": "7.1.2",
"pg": "8.11.3",
"pkce-challenge": "4.0.1",
"probe-image-size": "7.2.3",
"promise-limit": "2.7.0",
"pug": "3.0.2",
- "punycode": "2.3.0",
+ "punycode": "2.3.1",
"pureimage": "0.3.17",
"qrcode": "1.5.3",
"random-seed": "0.3.0",
"ratelimiter": "3.4.1",
- "re2": "1.20.3",
+ "re2": "1.20.9",
"redis-lock": "0.1.4",
- "reflect-metadata": "0.1.13",
+ "reflect-metadata": "0.1.14",
"rename": "1.0.4",
"rss-parser": "3.13.0",
"rxjs": "7.8.1",
"sanitize-html": "2.11.0",
+ "secure-json-parse": "2.7.0",
"sharp": "0.32.6",
"sharp-read-bmp": "github:misskey-dev/sharp-read-bmp",
"slacc": "0.0.10",
"strict-event-emitter-types": "2.0.0",
"stringz": "2.1.0",
"summaly": "github:misskey-dev/summaly",
- "systeminformation": "5.21.11",
+ "systeminformation": "5.21.20",
"tinycolor2": "1.6.0",
"tmp": "0.2.1",
"tsc-alias": "1.8.8",
"tsconfig-paths": "4.2.0",
- "twemoji-parser": "14.0.0",
"typeorm": "0.3.17",
- "typescript": "5.2.2",
+ "typescript": "5.3.3",
"ulid": "2.3.0",
"vary": "1.1.2",
"web-push": "3.6.6",
- "ws": "8.14.2",
+ "ws": "8.15.1",
"xev": "3.0.2"
},
"devDependencies": {
"@jest/globals": "29.7.0",
- "@simplewebauthn/typescript-types": "8.0.0",
+ "@simplewebauthn/typescript-types": "8.3.4",
"@swc/jest": "0.2.29",
- "@types/accepts": "1.3.5",
- "@types/archiver": "5.3.3",
- "@types/bcryptjs": "2.4.4",
- "@types/body-parser": "1.19.3",
+ "@types/accepts": "1.3.7",
+ "@types/archiver": "6.0.2",
+ "@types/bcryptjs": "2.4.6",
+ "@types/body-parser": "1.19.5",
"@types/cbor": "6.0.0",
- "@types/color-convert": "2.0.1",
- "@types/content-disposition": "0.5.6",
- "@types/fluent-ffmpeg": "2.1.22",
- "@types/http-link-header": "1.0.3",
- "@types/jest": "29.5.5",
- "@types/js-yaml": "4.0.6",
- "@types/jsdom": "21.1.3",
- "@types/jsonld": "1.5.10",
- "@types/jsrsasign": "10.5.9",
- "@types/mime-types": "2.1.2",
- "@types/ms": "0.7.32",
- "@types/node": "20.8.2",
+ "@types/color-convert": "2.0.3",
+ "@types/content-disposition": "0.5.8",
+ "@types/fluent-ffmpeg": "2.1.24",
+ "@types/http-link-header": "1.0.5",
+ "@types/jest": "29.5.11",
+ "@types/js-yaml": "4.0.9",
+ "@types/jsdom": "21.1.6",
+ "@types/jsonld": "1.5.13",
+ "@types/jsrsasign": "10.5.12",
+ "@types/mime-types": "2.1.4",
+ "@types/ms": "0.7.34",
+ "@types/node": "20.10.5",
"@types/node-fetch": "3.0.3",
- "@types/nodemailer": "6.4.11",
- "@types/oauth": "0.9.2",
- "@types/oauth2orize": "1.11.1",
- "@types/oauth2orize-pkce": "0.1.0",
- "@types/pg": "8.10.3",
- "@types/pug": "2.0.7",
- "@types/punycode": "2.1.0",
- "@types/qrcode": "1.5.2",
- "@types/random-seed": "0.3.3",
- "@types/ratelimiter": "3.4.4",
- "@types/rename": "1.0.5",
- "@types/sanitize-html": "2.9.1",
- "@types/semver": "7.5.3",
+ "@types/nodemailer": "6.4.14",
+ "@types/oauth": "0.9.4",
+ "@types/oauth2orize": "1.11.3",
+ "@types/oauth2orize-pkce": "0.1.2",
+ "@types/pg": "8.10.9",
+ "@types/pug": "2.0.10",
+ "@types/punycode": "2.1.3",
+ "@types/qrcode": "1.5.5",
+ "@types/random-seed": "0.3.5",
+ "@types/ratelimiter": "3.4.6",
+ "@types/rename": "1.0.7",
+ "@types/sanitize-html": "2.9.5",
+ "@types/semver": "7.5.6",
"@types/sharp": "0.32.0",
- "@types/simple-oauth2": "5.0.5",
- "@types/sinonjs__fake-timers": "8.1.3",
- "@types/tinycolor2": "1.4.4",
- "@types/tmp": "0.2.4",
- "@types/vary": "1.1.1",
- "@types/web-push": "3.6.1",
- "@types/ws": "8.5.6",
- "@typescript-eslint/eslint-plugin": "6.7.4",
- "@typescript-eslint/parser": "6.7.4",
+ "@types/simple-oauth2": "5.0.7",
+ "@types/sinonjs__fake-timers": "8.1.5",
+ "@types/tinycolor2": "1.4.6",
+ "@types/tmp": "0.2.6",
+ "@types/vary": "1.1.3",
+ "@types/web-push": "3.6.3",
+ "@types/ws": "8.5.10",
+ "@typescript-eslint/eslint-plugin": "6.14.0",
+ "@typescript-eslint/parser": "6.14.0",
"aws-sdk-client-mock": "3.0.0",
"cross-env": "7.0.3",
- "eslint": "8.50.0",
- "eslint-plugin-import": "2.28.1",
+ "eslint": "8.56.0",
+ "eslint-plugin-import": "2.29.1",
"execa": "8.0.1",
"jest": "29.7.0",
"jest-mock": "29.7.0",
+ "nodemon": "3.0.2",
"simple-oauth2": "5.0.0"
}
}
diff --git a/packages/backend/src/boot/common.ts b/packages/backend/src/boot/common.ts
index 4783a2b2da..df10ab1e3d 100644
--- a/packages/backend/src/boot/common.ts
+++ b/packages/backend/src/boot/common.ts
@@ -17,7 +17,6 @@ export async function server() {
const app = await NestFactory.createApplicationContext(MainModule, {
logger: new NestLogger(),
});
- app.enableShutdownHooks();
const serverService = app.get(ServerService);
await serverService.launch();
@@ -35,7 +34,6 @@ export async function jobQueue() {
const jobQueue = await NestFactory.createApplicationContext(QueueProcessorModule, {
logger: new NestLogger(),
});
- jobQueue.enableShutdownHooks();
jobQueue.get(QueueProcessorService).start();
jobQueue.get(ChartManagementService).start();
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index ddb437b062..a3c9b7abea 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -263,7 +263,7 @@ export function loadConfig(): Config {
clientEmbedEntry: clientManifest['src/embed/init.ts'],
clientManifestExists: clientManifestExists,
perChannelMaxNoteCacheCount: config.perChannelMaxNoteCacheCount ?? 1000,
- perUserNotificationsMaxCount: config.perUserNotificationsMaxCount ?? 300,
+ perUserNotificationsMaxCount: config.perUserNotificationsMaxCount ?? 500,
deactivateAntennaThreshold: config.deactivateAntennaThreshold ?? (1000 * 60 * 60 * 24 * 7),
pidFile: config.pidFile,
};
diff --git a/packages/backend/src/core/AccountMoveService.ts b/packages/backend/src/core/AccountMoveService.ts
index ba3413007d..350aa6ba24 100644
--- a/packages/backend/src/core/AccountMoveService.ts
+++ b/packages/backend/src/core/AccountMoveService.ts
@@ -180,13 +180,13 @@ export class AccountMoveService {
{ muteeId: dst.id, expiresAt: IsNull() },
).then(mutings => mutings.map(muting => muting.muterId));
- const newMutings: Map = new Map();
+ const newMutings: Map = new Map();
// 重複しないようにIDを生成
const genId = (): string => {
let id: string;
do {
- id = this.idService.genId();
+ id = this.idService.gen();
} while (newMutings.has(id));
return id;
};
@@ -194,7 +194,6 @@ export class AccountMoveService {
if (existingMutingsMuterUserIds.includes(muting.muterId)) continue; // skip if already muted indefinitely
newMutings.set(genId(), {
...muting,
- createdAt: new Date(),
muteeId: dst.id,
});
}
@@ -228,22 +227,22 @@ export class AccountMoveService {
},
}).then(memberships => memberships.map(membership => membership.userListId));
- const newMemberships: Map = new Map();
+ const newMemberships: Map = new Map();
// 重複しないようにIDを生成
const genId = (): string => {
let id: string;
do {
- id = this.idService.genId();
+ id = this.idService.gen();
} while (newMemberships.has(id));
return id;
};
for (const membership of oldMemberships) {
if (existingUserListIds.includes(membership.userListId)) continue; // skip if dst exists in this user's list
newMemberships.set(genId(), {
- createdAt: new Date(),
userId: dst.id,
userListId: membership.userListId,
+ userListUserId: membership.userListUserId,
});
}
diff --git a/packages/backend/src/core/AchievementService.ts b/packages/backend/src/core/AchievementService.ts
index 1b8718335b..88fc033859 100644
--- a/packages/backend/src/core/AchievementService.ts
+++ b/packages/backend/src/core/AchievementService.ts
@@ -86,6 +86,7 @@ export const ACHIEVEMENT_TYPES = [
'cookieClicked',
'brainDiver',
'smashTestNotificationButton',
+ 'tutorialCompleted',
] as const;
@Injectable()
diff --git a/packages/backend/src/core/AnnouncementService.ts b/packages/backend/src/core/AnnouncementService.ts
index a5330db53f..8c348e595d 100644
--- a/packages/backend/src/core/AnnouncementService.ts
+++ b/packages/backend/src/core/AnnouncementService.ts
@@ -47,13 +47,14 @@ export class AnnouncementService {
const q = this.announcementsRepository.createQueryBuilder('announcement')
.where('announcement.isActive = true')
+ .andWhere('announcement.silence = false')
.andWhere(new Brackets(qb => {
qb.orWhere('announcement.userId = :userId', { userId: user.id });
qb.orWhere('announcement.userId IS NULL');
}))
.andWhere(new Brackets(qb => {
qb.orWhere('announcement.forExistingUsers = false');
- qb.orWhere('announcement.createdAt > :createdAt', { createdAt: user.createdAt });
+ qb.orWhere('announcement.id > :userId', { userId: user.id });
}))
.andWhere(`announcement.id NOT IN (${ readsQuery.getQuery() })`);
@@ -65,8 +66,7 @@ export class AnnouncementService {
@bindThis
public async create(values: Partial, moderator?: MiUser): Promise<{ raw: MiAnnouncement; packed: Packed<'Announcement'> }> {
const announcement = await this.announcementsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
updatedAt: null,
title: values.title,
text: values.text,
@@ -74,6 +74,7 @@ export class AnnouncementService {
icon: values.icon,
display: values.display,
forExistingUsers: values.forExistingUsers,
+ silence: values.silence,
needConfirmationToRead: values.needConfirmationToRead,
userId: values.userId,
}).then(x => this.announcementsRepository.findOneByOrFail(x.identifiers[0]));
@@ -125,6 +126,7 @@ export class AnnouncementService {
display: values.display,
icon: values.icon,
forExistingUsers: values.forExistingUsers,
+ silence: values.silence,
needConfirmationToRead: values.needConfirmationToRead,
isActive: values.isActive,
});
@@ -179,8 +181,7 @@ export class AnnouncementService {
public async read(user: MiUser, announcementId: MiAnnouncement['id']): Promise {
try {
await this.announcementReadsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
announcementId: announcementId,
userId: user.id,
});
@@ -204,7 +205,7 @@ export class AnnouncementService {
const reads = me ? (options?.reads ?? await this.getReads(me.id)) : [];
return announcements.map(announcement => ({
id: announcement.id,
- createdAt: announcement.createdAt.toISOString(),
+ createdAt: this.idService.parse(announcement.id).date.toISOString(),
updatedAt: announcement.updatedAt?.toISOString() ?? null,
text: announcement.text,
title: announcement.title,
@@ -212,6 +213,7 @@ export class AnnouncementService {
icon: announcement.icon,
display: announcement.display,
needConfirmationToRead: announcement.needConfirmationToRead,
+ silence: announcement.silence,
forYou: announcement.userId === me?.id,
isRead: reads.some(read => read.announcementId === announcement.id),
}));
diff --git a/packages/backend/src/core/AntennaService.ts b/packages/backend/src/core/AntennaService.ts
index 95712b35b7..2c27a02559 100644
--- a/packages/backend/src/core/AntennaService.ts
+++ b/packages/backend/src/core/AntennaService.ts
@@ -16,6 +16,7 @@ import type { AntennasRepository, UserListMembershipsRepository } from '@/models
import { UtilityService } from '@/core/UtilityService.js';
import { bindThis } from '@/decorators.js';
import type { GlobalEvents } from '@/core/GlobalEventService.js';
+import { FanoutTimelineService } from '@/core/FanoutTimelineService.js';
import type { OnApplicationShutdown } from '@nestjs/common';
@Injectable()
@@ -38,6 +39,7 @@ export class AntennaService implements OnApplicationShutdown {
private utilityService: UtilityService,
private globalEventService: GlobalEventService,
+ private fanoutTimelineService: FanoutTimelineService,
) {
this.antennasFetched = false;
this.antennas = [];
@@ -55,16 +57,24 @@ export class AntennaService implements OnApplicationShutdown {
case 'antennaCreated':
this.antennas.push({
...body,
- createdAt: new Date(body.createdAt),
lastUsedAt: new Date(body.lastUsedAt),
});
break;
- case 'antennaUpdated':
- this.antennas[this.antennas.findIndex(a => a.id === body.id)] = {
- ...body,
- createdAt: new Date(body.createdAt),
- lastUsedAt: new Date(body.lastUsedAt),
- };
+ case 'antennaUpdated': {
+ const idx = this.antennas.findIndex(a => a.id === body.id);
+ if (idx >= 0) {
+ this.antennas[idx] = {
+ ...body,
+ lastUsedAt: new Date(body.lastUsedAt),
+ };
+ } else {
+ // サーバ起動時にactiveじゃなかった場合、リストに持っていないので追加する必要あり
+ this.antennas.push({
+ ...body,
+ lastUsedAt: new Date(body.lastUsedAt),
+ });
+ }
+ }
break;
case 'antennaDeleted':
this.antennas = this.antennas.filter(a => a.id !== body.id);
@@ -84,12 +94,7 @@ export class AntennaService implements OnApplicationShutdown {
const redisPipeline = this.redisForTimelines.pipeline();
for (const antenna of matchedAntennas) {
- redisPipeline.xadd(
- `antennaTimeline:${antenna.id}`,
- 'MAXLEN', '~', '200',
- '*',
- 'note', note.id);
-
+ this.fanoutTimelineService.push(`antennaTimeline:${antenna.id}`, note.id, 200, redisPipeline);
this.globalEventService.publishAntennaStream(antenna.id, 'note', note);
}
@@ -103,6 +108,8 @@ export class AntennaService implements OnApplicationShutdown {
if (note.visibility === 'specified') return false;
if (note.visibility === 'followers') return false;
+ if (antenna.localOnly && noteUser.host != null) return false;
+
if (!antenna.withReplies && note.replyId != null) return false;
if (antenna.src === 'home') {
diff --git a/packages/backend/src/core/AvatarDecorationService.ts b/packages/backend/src/core/AvatarDecorationService.ts
new file mode 100644
index 0000000000..e97946f9dc
--- /dev/null
+++ b/packages/backend/src/core/AvatarDecorationService.ts
@@ -0,0 +1,129 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
+import * as Redis from 'ioredis';
+import type { AvatarDecorationsRepository, MiAvatarDecoration, MiUser } from '@/models/_.js';
+import { IdService } from '@/core/IdService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { DI } from '@/di-symbols.js';
+import { bindThis } from '@/decorators.js';
+import { MemorySingleCache } from '@/misc/cache.js';
+import type { GlobalEvents } from '@/core/GlobalEventService.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
+
+@Injectable()
+export class AvatarDecorationService implements OnApplicationShutdown {
+ public cache: MemorySingleCache;
+
+ constructor(
+ @Inject(DI.redisForSub)
+ private redisForSub: Redis.Redis,
+
+ @Inject(DI.avatarDecorationsRepository)
+ private avatarDecorationsRepository: AvatarDecorationsRepository,
+
+ private idService: IdService,
+ private moderationLogService: ModerationLogService,
+ private globalEventService: GlobalEventService,
+ ) {
+ this.cache = new MemorySingleCache(1000 * 60 * 30);
+
+ this.redisForSub.on('message', this.onMessage);
+ }
+
+ @bindThis
+ private async onMessage(_: string, data: string): Promise {
+ const obj = JSON.parse(data);
+
+ if (obj.channel === 'internal') {
+ const { type, body } = obj.message as GlobalEvents['internal']['payload'];
+ switch (type) {
+ case 'avatarDecorationCreated':
+ case 'avatarDecorationUpdated':
+ case 'avatarDecorationDeleted': {
+ this.cache.delete();
+ break;
+ }
+ default:
+ break;
+ }
+ }
+ }
+
+ @bindThis
+ public async create(options: Partial, moderator?: MiUser): Promise {
+ const created = await this.avatarDecorationsRepository.insert({
+ id: this.idService.gen(),
+ ...options,
+ }).then(x => this.avatarDecorationsRepository.findOneByOrFail(x.identifiers[0]));
+
+ this.globalEventService.publishInternalEvent('avatarDecorationCreated', created);
+
+ if (moderator) {
+ this.moderationLogService.log(moderator, 'createAvatarDecoration', {
+ avatarDecorationId: created.id,
+ avatarDecoration: created,
+ });
+ }
+
+ return created;
+ }
+
+ @bindThis
+ public async update(id: MiAvatarDecoration['id'], params: Partial, moderator?: MiUser): Promise {
+ const avatarDecoration = await this.avatarDecorationsRepository.findOneByOrFail({ id });
+
+ const date = new Date();
+ await this.avatarDecorationsRepository.update(avatarDecoration.id, {
+ updatedAt: date,
+ ...params,
+ });
+
+ const updated = await this.avatarDecorationsRepository.findOneByOrFail({ id: avatarDecoration.id });
+ this.globalEventService.publishInternalEvent('avatarDecorationUpdated', updated);
+
+ if (moderator) {
+ this.moderationLogService.log(moderator, 'updateAvatarDecoration', {
+ avatarDecorationId: avatarDecoration.id,
+ before: avatarDecoration,
+ after: updated,
+ });
+ }
+ }
+
+ @bindThis
+ public async delete(id: MiAvatarDecoration['id'], moderator?: MiUser): Promise {
+ const avatarDecoration = await this.avatarDecorationsRepository.findOneByOrFail({ id });
+
+ await this.avatarDecorationsRepository.delete({ id: avatarDecoration.id });
+ this.globalEventService.publishInternalEvent('avatarDecorationDeleted', avatarDecoration);
+
+ if (moderator) {
+ this.moderationLogService.log(moderator, 'deleteAvatarDecoration', {
+ avatarDecorationId: avatarDecoration.id,
+ avatarDecoration: avatarDecoration,
+ });
+ }
+ }
+
+ @bindThis
+ public async getAll(noCache = false): Promise {
+ if (noCache) {
+ this.cache.delete();
+ }
+ return this.cache.fetch(() => this.avatarDecorationsRepository.find());
+ }
+
+ @bindThis
+ public dispose(): void {
+ this.redisForSub.off('message', this.onMessage);
+ }
+
+ @bindThis
+ public onApplicationShutdown(signal?: string | undefined): void {
+ this.dispose();
+ }
+}
diff --git a/packages/backend/src/core/CacheService.ts b/packages/backend/src/core/CacheService.ts
index 22c510cc37..e1413342b1 100644
--- a/packages/backend/src/core/CacheService.ts
+++ b/packages/backend/src/core/CacheService.ts
@@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import * as Redis from 'ioredis';
-import type { BlockingsRepository, ChannelFollowingsRepository, FollowingsRepository, MutingsRepository, RenoteMutingsRepository, MiUserProfile, UserProfilesRepository, UsersRepository, MiFollowing } from '@/models/_.js';
+import type { BlockingsRepository, FollowingsRepository, MutingsRepository, RenoteMutingsRepository, MiUserProfile, UserProfilesRepository, UsersRepository, MiFollowing } from '@/models/_.js';
import { MemoryKVCache, RedisKVCache } from '@/misc/cache.js';
import type { MiLocalUser, MiUser } from '@/models/User.js';
import { DI } from '@/di-symbols.js';
@@ -26,7 +26,6 @@ export class CacheService implements OnApplicationShutdown {
public userBlockedCache: RedisKVCache>; // NOTE: 「被」Blockキャッシュ
public renoteMutingsCache: RedisKVCache>;
public userFollowingsCache: RedisKVCache | undefined>>;
- public userFollowingChannelsCache: RedisKVCache>;
constructor(
@Inject(DI.redis)
@@ -53,9 +52,6 @@ export class CacheService implements OnApplicationShutdown {
@Inject(DI.followingsRepository)
private followingsRepository: FollowingsRepository,
- @Inject(DI.channelFollowingsRepository)
- private channelFollowingsRepository: ChannelFollowingsRepository,
-
private userEntityService: UserEntityService,
) {
//this.onMessage = this.onMessage.bind(this);
@@ -150,13 +146,7 @@ export class CacheService implements OnApplicationShutdown {
fromRedisConverter: (value) => JSON.parse(value),
});
- this.userFollowingChannelsCache = new RedisKVCache>(this.redisClient, 'userFollowingChannels', {
- lifetime: 1000 * 60 * 30, // 30m
- memoryCacheLifetime: 1000 * 60, // 1m
- fetcher: (key) => this.channelFollowingsRepository.find({ where: { followerId: key }, select: ['followeeId'] }).then(xs => new Set(xs.map(x => x.followeeId))),
- toRedisConverter: (value) => JSON.stringify(Array.from(value)),
- fromRedisConverter: (value) => new Set(JSON.parse(value)),
- });
+ // NOTE: チャンネルのフォロー状況キャッシュはChannelFollowingServiceで行っている
this.redisForSub.on('message', this.onMessage);
}
@@ -221,7 +211,6 @@ export class CacheService implements OnApplicationShutdown {
this.userBlockedCache.dispose();
this.renoteMutingsCache.dispose();
this.userFollowingsCache.dispose();
- this.userFollowingChannelsCache.dispose();
}
@bindThis
diff --git a/packages/backend/src/core/ChannelFollowingService.ts b/packages/backend/src/core/ChannelFollowingService.ts
new file mode 100644
index 0000000000..75843b9773
--- /dev/null
+++ b/packages/backend/src/core/ChannelFollowingService.ts
@@ -0,0 +1,104 @@
+import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
+import Redis from 'ioredis';
+import { DI } from '@/di-symbols.js';
+import type { ChannelFollowingsRepository } from '@/models/_.js';
+import { MiChannel } from '@/models/_.js';
+import { IdService } from '@/core/IdService.js';
+import { GlobalEvents, GlobalEventService } from '@/core/GlobalEventService.js';
+import { bindThis } from '@/decorators.js';
+import type { MiLocalUser } from '@/models/User.js';
+import { RedisKVCache } from '@/misc/cache.js';
+
+@Injectable()
+export class ChannelFollowingService implements OnModuleInit {
+ public userFollowingChannelsCache: RedisKVCache>;
+
+ constructor(
+ @Inject(DI.redis)
+ private redisClient: Redis.Redis,
+ @Inject(DI.redisForSub)
+ private redisForSub: Redis.Redis,
+ @Inject(DI.channelFollowingsRepository)
+ private channelFollowingsRepository: ChannelFollowingsRepository,
+ private idService: IdService,
+ private globalEventService: GlobalEventService,
+ ) {
+ this.userFollowingChannelsCache = new RedisKVCache>(this.redisClient, 'userFollowingChannels', {
+ lifetime: 1000 * 60 * 30, // 30m
+ memoryCacheLifetime: 1000 * 60, // 1m
+ fetcher: (key) => this.channelFollowingsRepository.find({
+ where: { followerId: key },
+ select: ['followeeId'],
+ }).then(xs => new Set(xs.map(x => x.followeeId))),
+ toRedisConverter: (value) => JSON.stringify(Array.from(value)),
+ fromRedisConverter: (value) => new Set(JSON.parse(value)),
+ });
+
+ this.redisForSub.on('message', this.onMessage);
+ }
+
+ onModuleInit() {
+ }
+
+ @bindThis
+ public async follow(
+ requestUser: MiLocalUser,
+ targetChannel: MiChannel,
+ ): Promise {
+ await this.channelFollowingsRepository.insert({
+ id: this.idService.gen(),
+ followerId: requestUser.id,
+ followeeId: targetChannel.id,
+ });
+
+ this.globalEventService.publishInternalEvent('followChannel', {
+ userId: requestUser.id,
+ channelId: targetChannel.id,
+ });
+ }
+
+ @bindThis
+ public async unfollow(
+ requestUser: MiLocalUser,
+ targetChannel: MiChannel,
+ ): Promise {
+ await this.channelFollowingsRepository.delete({
+ followerId: requestUser.id,
+ followeeId: targetChannel.id,
+ });
+
+ this.globalEventService.publishInternalEvent('unfollowChannel', {
+ userId: requestUser.id,
+ channelId: targetChannel.id,
+ });
+ }
+
+ @bindThis
+ private async onMessage(_: string, data: string): Promise {
+ const obj = JSON.parse(data);
+
+ if (obj.channel === 'internal') {
+ const { type, body } = obj.message as GlobalEvents['internal']['payload'];
+ switch (type) {
+ case 'followChannel': {
+ this.userFollowingChannelsCache.refresh(body.userId);
+ break;
+ }
+ case 'unfollowChannel': {
+ this.userFollowingChannelsCache.delete(body.userId);
+ break;
+ }
+ }
+ }
+ }
+
+ @bindThis
+ public dispose(): void {
+ this.userFollowingChannelsCache.dispose();
+ }
+
+ @bindThis
+ public onApplicationShutdown(signal?: string | undefined): void {
+ this.dispose();
+ }
+}
diff --git a/packages/backend/src/core/ClipService.ts b/packages/backend/src/core/ClipService.ts
index 3d9982e80f..e94f1eb531 100644
--- a/packages/backend/src/core/ClipService.ts
+++ b/packages/backend/src/core/ClipService.ts
@@ -46,8 +46,7 @@ export class ClipService {
}
const clip = await this.clipsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
userId: me.id,
name: name,
isPublic: isPublic,
@@ -109,7 +108,7 @@ export class ClipService {
try {
await this.clipNotesRepository.insert({
- id: this.idService.genId(),
+ id: this.idService.gen(),
noteId: noteId,
clipId: clip.id,
});
diff --git a/packages/backend/src/core/CoreModule.ts b/packages/backend/src/core/CoreModule.ts
index 1984d9e6c2..bc6d24b951 100644
--- a/packages/backend/src/core/CoreModule.ts
+++ b/packages/backend/src/core/CoreModule.ts
@@ -4,6 +4,7 @@
*/
import { Module } from '@nestjs/common';
+import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
import { AccountMoveService } from './AccountMoveService.js';
import { AccountUpdateService } from './AccountUpdateService.js';
import { AiService } from './AiService.js';
@@ -11,6 +12,7 @@ import { AnnouncementService } from './AnnouncementService.js';
import { AntennaService } from './AntennaService.js';
import { AppLockService } from './AppLockService.js';
import { AchievementService } from './AchievementService.js';
+import { AvatarDecorationService } from './AvatarDecorationService.js';
import { CaptchaService } from './CaptchaService.js';
import { CreateSystemUserService } from './CreateSystemUserService.js';
import { CustomEmojiService } from './CustomEmojiService.js';
@@ -61,6 +63,9 @@ import { FileInfoService } from './FileInfoService.js';
import { SearchService } from './SearchService.js';
import { ClipService } from './ClipService.js';
import { FeaturedService } from './FeaturedService.js';
+import { FanoutTimelineService } from './FanoutTimelineService.js';
+import { ChannelFollowingService } from './ChannelFollowingService.js';
+import { RegistryApiService } from './RegistryApiService.js';
import { ChartLoggerService } from './chart/ChartLoggerService.js';
import FederationChart from './chart/charts/federation.js';
import NotesChart from './chart/charts/notes.js';
@@ -139,6 +144,7 @@ const $AnnouncementService: Provider = { provide: 'AnnouncementService', useExis
const $AntennaService: Provider = { provide: 'AntennaService', useExisting: AntennaService };
const $AppLockService: Provider = { provide: 'AppLockService', useExisting: AppLockService };
const $AchievementService: Provider = { provide: 'AchievementService', useExisting: AchievementService };
+const $AvatarDecorationService: Provider = { provide: 'AvatarDecorationService', useExisting: AvatarDecorationService };
const $CaptchaService: Provider = { provide: 'CaptchaService', useExisting: CaptchaService };
const $CreateSystemUserService: Provider = { provide: 'CreateSystemUserService', useExisting: CreateSystemUserService };
const $CustomEmojiService: Provider = { provide: 'CustomEmojiService', useExisting: CustomEmojiService };
@@ -189,6 +195,10 @@ const $FileInfoService: Provider = { provide: 'FileInfoService', useExisting: Fi
const $SearchService: Provider = { provide: 'SearchService', useExisting: SearchService };
const $ClipService: Provider = { provide: 'ClipService', useExisting: ClipService };
const $FeaturedService: Provider = { provide: 'FeaturedService', useExisting: FeaturedService };
+const $FanoutTimelineService: Provider = { provide: 'FanoutTimelineService', useExisting: FanoutTimelineService };
+const $FanoutTimelineEndpointService: Provider = { provide: 'FanoutTimelineEndpointService', useExisting: FanoutTimelineEndpointService };
+const $ChannelFollowingService: Provider = { provide: 'ChannelFollowingService', useExisting: ChannelFollowingService };
+const $RegistryApiService: Provider = { provide: 'RegistryApiService', useExisting: RegistryApiService };
const $ChartLoggerService: Provider = { provide: 'ChartLoggerService', useExisting: ChartLoggerService };
const $FederationChart: Provider = { provide: 'FederationChart', useExisting: FederationChart };
@@ -271,6 +281,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
AntennaService,
AppLockService,
AchievementService,
+ AvatarDecorationService,
CaptchaService,
CreateSystemUserService,
CustomEmojiService,
@@ -321,6 +332,10 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
SearchService,
ClipService,
FeaturedService,
+ FanoutTimelineService,
+ FanoutTimelineEndpointService,
+ ChannelFollowingService,
+ RegistryApiService,
ChartLoggerService,
FederationChart,
NotesChart,
@@ -396,6 +411,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
$AntennaService,
$AppLockService,
$AchievementService,
+ $AvatarDecorationService,
$CaptchaService,
$CreateSystemUserService,
$CustomEmojiService,
@@ -446,6 +462,10 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
$SearchService,
$ClipService,
$FeaturedService,
+ $FanoutTimelineService,
+ $FanoutTimelineEndpointService,
+ $ChannelFollowingService,
+ $RegistryApiService,
$ChartLoggerService,
$FederationChart,
$NotesChart,
@@ -522,6 +542,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
AntennaService,
AppLockService,
AchievementService,
+ AvatarDecorationService,
CaptchaService,
CreateSystemUserService,
CustomEmojiService,
@@ -572,6 +593,10 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
SearchService,
ClipService,
FeaturedService,
+ FanoutTimelineService,
+ FanoutTimelineEndpointService,
+ ChannelFollowingService,
+ RegistryApiService,
FederationChart,
NotesChart,
UsersChart,
@@ -646,6 +671,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
$AntennaService,
$AppLockService,
$AchievementService,
+ $AvatarDecorationService,
$CaptchaService,
$CreateSystemUserService,
$CustomEmojiService,
@@ -696,6 +722,10 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
$SearchService,
$ClipService,
$FeaturedService,
+ $FanoutTimelineService,
+ $FanoutTimelineEndpointService,
+ $ChannelFollowingService,
+ $RegistryApiService,
$FederationChart,
$NotesChart,
$UsersChart,
diff --git a/packages/backend/src/core/CreateSystemUserService.ts b/packages/backend/src/core/CreateSystemUserService.ts
index 3419d0b497..6b475316f0 100644
--- a/packages/backend/src/core/CreateSystemUserService.ts
+++ b/packages/backend/src/core/CreateSystemUserService.ts
@@ -52,8 +52,7 @@ export class CreateSystemUserService {
if (exist) throw new Error('the user is already exists');
account = await transactionalEntityManager.insert(MiUser, {
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
username: username,
usernameLower: username.toLowerCase(),
host: null,
diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts
index 145c224f67..9a8267b466 100644
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@@ -69,7 +69,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
roleIdsThatCanBeUsedThisEmojiAsReaction: MiRole['id'][];
}, moderator?: MiUser): Promise {
const emoji = await this.emojisRepository.insert({
- id: this.idService.genId(),
+ id: this.idService.gen(),
updatedAt: new Date(),
name: data.name,
category: data.category,
@@ -331,7 +331,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
const queryOrNull = async () => (await this.emojisRepository.findOneBy({
name,
- host: host ?? IsNull(),
+ host,
})) ?? null;
const emoji = await this.cache.fetch(`${name} ${host}`, queryOrNull);
diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts
index cecbec9638..484f4fc52e 100644
--- a/packages/backend/src/core/DriveService.ts
+++ b/packages/backend/src/core/DriveService.ts
@@ -564,8 +564,7 @@ export class DriveService {
const folder = await fetchFolder();
let file = new MiDriveFile();
- file.id = this.idService.genId();
- file.createdAt = new Date();
+ file.id = this.idService.gen();
file.userId = user ? user.id : null;
file.userHost = user ? user.host : null;
file.folderId = folder !== null ? folder.id : null;
diff --git a/packages/backend/src/core/EmailService.ts b/packages/backend/src/core/EmailService.ts
index c9da3f77c0..3a61e353f1 100644
--- a/packages/backend/src/core/EmailService.ts
+++ b/packages/backend/src/core/EmailService.ts
@@ -3,16 +3,20 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
+import { URLSearchParams } from 'node:url';
import * as nodemailer from 'nodemailer';
import { Inject, Injectable } from '@nestjs/common';
import { validate as validateEmail } from 'deep-email-validator';
+import { SubOutputFormat } from 'deep-email-validator/dist/output/output.js';
import { MetaService } from '@/core/MetaService.js';
+import { UtilityService } from '@/core/UtilityService.js';
import { DI } from '@/di-symbols.js';
import type { Config } from '@/config.js';
import type Logger from '@/logger.js';
import type { UserProfilesRepository } from '@/models/_.js';
import { LoggerService } from '@/core/LoggerService.js';
import { bindThis } from '@/decorators.js';
+import { HttpRequestService } from '@/core/HttpRequestService.js';
@Injectable()
export class EmailService {
@@ -27,6 +31,8 @@ export class EmailService {
private metaService: MetaService,
private loggerService: LoggerService,
+ private utilityService: UtilityService,
+ private httpRequestService: HttpRequestService,
) {
this.logger = this.loggerService.getLogger('email');
}
@@ -151,7 +157,7 @@ export class EmailService {
@bindThis
public async validateEmailForAccount(emailAddress: string): Promise<{
available: boolean;
- reason: null | 'used' | 'format' | 'disposable' | 'mx' | 'smtp';
+ reason: null | 'used' | 'format' | 'disposable' | 'mx' | 'smtp' | 'banned';
}> {
const meta = await this.metaService.fetch();
@@ -160,21 +166,35 @@ export class EmailService {
email: emailAddress,
});
- const validated = meta.enableActiveEmailValidation ? await validateEmail({
- email: emailAddress,
- validateRegex: true,
- validateMx: true,
- validateTypo: false, // TLDを見ているみたいだけどclubとか弾かれるので
- validateDisposable: true, // 捨てアドかどうかチェック
- validateSMTP: false, // 日本だと25ポートが殆どのプロバイダーで塞がれていてタイムアウトになるので
- }) : { valid: true, reason: null };
+ let validated;
- const available = exist === 0 && validated.valid;
+ if (meta.enableActiveEmailValidation) {
+ if (meta.enableVerifymailApi && meta.verifymailAuthKey != null) {
+ validated = await this.verifyMail(emailAddress, meta.verifymailAuthKey);
+ } else {
+ validated = await validateEmail({
+ email: emailAddress,
+ validateRegex: true,
+ validateMx: true,
+ validateTypo: false, // TLDを見ているみたいだけどclubとか弾かれるので
+ validateDisposable: true, // 捨てアドかどうかチェック
+ validateSMTP: false, // 日本だと25ポートが殆どのプロバイダーで塞がれていてタイムアウトになるので
+ });
+ }
+ } else {
+ validated = { valid: true, reason: null };
+ }
+
+ const emailDomain: string = emailAddress.split('@')[1];
+ const isBanned = this.utilityService.isBlockedHost(meta.bannedEmailDomains, emailDomain);
+
+ const available = exist === 0 && validated.valid && !isBanned;
return {
available,
reason: available ? null :
exist !== 0 ? 'used' :
+ isBanned ? 'banned' :
validated.reason === 'regex' ? 'format' :
validated.reason === 'disposable' ? 'disposable' :
validated.reason === 'mx' ? 'mx' :
@@ -182,4 +202,65 @@ export class EmailService {
null,
};
}
+
+ private async verifyMail(emailAddress: string, verifymailAuthKey: string): Promise<{
+ valid: boolean;
+ reason: 'used' | 'format' | 'disposable' | 'mx' | 'smtp' | null;
+ }> {
+ const endpoint = 'https://verifymail.io/api/' + emailAddress + '?key=' + verifymailAuthKey;
+ const res = await this.httpRequestService.send(endpoint, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ Accept: 'application/json, */*',
+ },
+ });
+
+ const json = (await res.json()) as {
+ block: boolean;
+ catch_all: boolean;
+ deliverable_email: boolean;
+ disposable: boolean;
+ domain: string;
+ email_address: string;
+ email_provider: string;
+ mx: boolean;
+ mx_fallback: boolean;
+ mx_host: string[];
+ mx_ip: string[];
+ mx_priority: { [key: string]: number };
+ privacy: boolean;
+ related_domains: string[];
+ };
+
+ if (json.email_address === undefined) {
+ return {
+ valid: false,
+ reason: 'format',
+ };
+ }
+ if (json.deliverable_email !== undefined && !json.deliverable_email) {
+ return {
+ valid: false,
+ reason: 'smtp',
+ };
+ }
+ if (json.disposable) {
+ return {
+ valid: false,
+ reason: 'disposable',
+ };
+ }
+ if (json.mx !== undefined && !json.mx) {
+ return {
+ valid: false,
+ reason: 'mx',
+ };
+ }
+
+ return {
+ valid: true,
+ reason: null,
+ };
+ }
}
diff --git a/packages/backend/src/core/FanoutTimelineEndpointService.ts b/packages/backend/src/core/FanoutTimelineEndpointService.ts
new file mode 100644
index 0000000000..11027960f1
--- /dev/null
+++ b/packages/backend/src/core/FanoutTimelineEndpointService.ts
@@ -0,0 +1,186 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { DI } from '@/di-symbols.js';
+import { bindThis } from '@/decorators.js';
+import type { MiUser } from '@/models/User.js';
+import type { MiNote } from '@/models/Note.js';
+import { Packed } from '@/misc/json-schema.js';
+import type { NotesRepository } from '@/models/_.js';
+import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
+import { FanoutTimelineName, FanoutTimelineService } from '@/core/FanoutTimelineService.js';
+import { isUserRelated } from '@/misc/is-user-related.js';
+import { isPureRenote } from '@/misc/is-pure-renote.js';
+import { CacheService } from '@/core/CacheService.js';
+import { isReply } from '@/misc/is-reply.js';
+import { isInstanceMuted } from '@/misc/is-instance-muted.js';
+
+type TimelineOptions = {
+ untilId: string | null,
+ sinceId: string | null,
+ limit: number,
+ allowPartial: boolean,
+ me?: { id: MiUser['id'] } | undefined | null,
+ useDbFallback: boolean,
+ redisTimelines: FanoutTimelineName[],
+ noteFilter?: (note: MiNote) => boolean,
+ alwaysIncludeMyNotes?: boolean;
+ ignoreAuthorFromBlock?: boolean;
+ ignoreAuthorFromMute?: boolean;
+ excludeNoFiles?: boolean;
+ excludeReplies?: boolean;
+ excludePureRenotes: boolean;
+ dbFallback: (untilId: string | null, sinceId: string | null, limit: number) => Promise,
+};
+
+@Injectable()
+export class FanoutTimelineEndpointService {
+ constructor(
+ @Inject(DI.notesRepository)
+ private notesRepository: NotesRepository,
+
+ private noteEntityService: NoteEntityService,
+ private cacheService: CacheService,
+ private fanoutTimelineService: FanoutTimelineService,
+ ) {
+ }
+
+ @bindThis
+ async timeline(ps: TimelineOptions): Promise[]> {
+ return await this.noteEntityService.packMany(await this.getMiNotes(ps), ps.me);
+ }
+
+ @bindThis
+ private async getMiNotes(ps: TimelineOptions): Promise {
+ let noteIds: string[];
+ let shouldFallbackToDb = false;
+
+ // 呼び出し元と以下の処理をシンプルにするためにdbFallbackを置き換える
+ if (!ps.useDbFallback) ps.dbFallback = () => Promise.resolve([]);
+
+ const shouldPrepend = ps.sinceId && !ps.untilId;
+ const idCompare: (a: string, b: string) => number = shouldPrepend ? (a, b) => a < b ? -1 : 1 : (a, b) => a > b ? -1 : 1;
+
+ const redisResult = await this.fanoutTimelineService.getMulti(ps.redisTimelines, ps.untilId, ps.sinceId);
+
+ // TODO: いい感じにgetMulti内でソート済だからuniqするときにredisResultが全てソート済なのを利用して再ソートを避けたい
+ const redisResultIds = Array.from(new Set(redisResult.flat(1)));
+
+ redisResultIds.sort(idCompare);
+ noteIds = redisResultIds.slice(0, ps.limit);
+
+ shouldFallbackToDb = shouldFallbackToDb || (noteIds.length === 0);
+
+ if (!shouldFallbackToDb) {
+ let filter = ps.noteFilter ?? (_note => true);
+
+ if (ps.alwaysIncludeMyNotes && ps.me) {
+ const me = ps.me;
+ const parentFilter = filter;
+ filter = (note) => note.userId === me.id || parentFilter(note);
+ }
+
+ if (ps.excludeNoFiles) {
+ const parentFilter = filter;
+ filter = (note) => note.fileIds.length !== 0 && parentFilter(note);
+ }
+
+ if (ps.excludeReplies) {
+ const parentFilter = filter;
+ filter = (note) => !isReply(note, ps.me?.id) && parentFilter(note);
+ }
+
+ if (ps.excludePureRenotes) {
+ const parentFilter = filter;
+ filter = (note) => !isPureRenote(note) && parentFilter(note);
+ }
+
+ if (ps.me) {
+ const me = ps.me;
+ const [
+ userIdsWhoMeMuting,
+ userIdsWhoMeMutingRenotes,
+ userIdsWhoBlockingMe,
+ userMutedInstances,
+ ] = await Promise.all([
+ this.cacheService.userMutingsCache.fetch(ps.me.id),
+ this.cacheService.renoteMutingsCache.fetch(ps.me.id),
+ this.cacheService.userBlockedCache.fetch(ps.me.id),
+ this.cacheService.userProfileCache.fetch(me.id).then(p => new Set(p.mutedInstances)),
+ ]);
+
+ const parentFilter = filter;
+ filter = (note) => {
+ if (isUserRelated(note, userIdsWhoBlockingMe, ps.ignoreAuthorFromBlock)) return false;
+ if (isUserRelated(note, userIdsWhoMeMuting, ps.ignoreAuthorFromMute)) return false;
+ if (isPureRenote(note) && isUserRelated(note, userIdsWhoMeMutingRenotes, ps.ignoreAuthorFromMute)) return false;
+ if (isInstanceMuted(note, userMutedInstances)) return false;
+
+ return parentFilter(note);
+ };
+ }
+
+ const redisTimeline: MiNote[] = [];
+ let readFromRedis = 0;
+ let lastSuccessfulRate = 1; // rateをキャッシュする？
+
+ while ((redisResultIds.length - readFromRedis) !== 0) {
+ const remainingToRead = ps.limit - redisTimeline.length;
+
+ // DBからの取り直しを減らす初回と同じ割合以上で成功すると仮定するが、クエリの長さを考えて三倍まで
+ const countToGet = Math.ceil(remainingToRead * Math.min(1.1 / lastSuccessfulRate, 3));
+ noteIds = redisResultIds.slice(readFromRedis, readFromRedis + countToGet);
+
+ readFromRedis += noteIds.length;
+
+ const gotFromDb = await this.getAndFilterFromDb(noteIds, filter, idCompare);
+ redisTimeline.push(...gotFromDb);
+ lastSuccessfulRate = gotFromDb.length / noteIds.length;
+
+ if (ps.allowPartial ? redisTimeline.length !== 0 : redisTimeline.length >= ps.limit) {
+ // 十分Redisからとれた
+ const result = redisTimeline.slice(0, ps.limit);
+ if (shouldPrepend) result.reverse();
+ return result;
+ }
+ }
+
+ // まだ足りない分はDBにフォールバック
+ const remainingToRead = ps.limit - redisTimeline.length;
+ let dbUntil: string | null;
+ let dbSince: string | null;
+ if (shouldPrepend) {
+ redisTimeline.reverse();
+ dbUntil = ps.untilId;
+ dbSince = noteIds[noteIds.length - 1];
+ } else {
+ dbUntil = noteIds[noteIds.length - 1];
+ dbSince = ps.sinceId;
+ }
+ const gotFromDb = await ps.dbFallback(dbUntil, dbSince, remainingToRead);
+ return shouldPrepend ? [...gotFromDb, ...redisTimeline] : [...redisTimeline, ...gotFromDb];
+ }
+
+ return await ps.dbFallback(ps.untilId, ps.sinceId, ps.limit);
+ }
+
+ private async getAndFilterFromDb(noteIds: string[], noteFilter: (note: MiNote) => boolean, idCompare: (a: string, b: string) => number): Promise {
+ const query = this.notesRepository.createQueryBuilder('note')
+ .where('note.id IN (:...noteIds)', { noteIds: noteIds })
+ .innerJoinAndSelect('note.user', 'user')
+ .leftJoinAndSelect('note.reply', 'reply')
+ .leftJoinAndSelect('note.renote', 'renote')
+ .leftJoinAndSelect('reply.user', 'replyUser')
+ .leftJoinAndSelect('renote.user', 'renoteUser')
+ .leftJoinAndSelect('note.channel', 'channel');
+
+ const notes = (await query.getMany()).filter(noteFilter);
+
+ notes.sort((a, b) => idCompare(a.id, b.id));
+
+ return notes;
+ }
+}
diff --git a/packages/backend/src/core/FanoutTimelineService.ts b/packages/backend/src/core/FanoutTimelineService.ts
new file mode 100644
index 0000000000..9b2678fbcd
--- /dev/null
+++ b/packages/backend/src/core/FanoutTimelineService.ts
@@ -0,0 +1,114 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import * as Redis from 'ioredis';
+import { DI } from '@/di-symbols.js';
+import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
+
+export type FanoutTimelineName =
+ // home timeline
+ | `homeTimeline:${string}`
+ | `homeTimelineWithFiles:${string}` // only notes with files are included
+ // local timeline
+ | `localTimeline` // replies are not included
+ | `localTimelineWithFiles` // only non-reply notes with files are included
+ | `localTimelineWithReplies` // only replies are included
+ | `localTimelineWithReplyTo:${string}` // Only replies to specific local user are included. Parameter is reply user id.
+
+ // antenna
+ | `antennaTimeline:${string}`
+
+ // user timeline
+ | `userTimeline:${string}` // replies are not included
+ | `userTimelineWithFiles:${string}` // only non-reply notes with files are included
+ | `userTimelineWithReplies:${string}` // only replies are included
+ | `userTimelineWithChannel:${string}` // only channel notes are included, replies are included
+
+ // user list timelines
+ | `userListTimeline:${string}`
+ | `userListTimelineWithFiles:${string}` // only notes with files are included
+
+ // channel timelines
+ | `channelTimeline:${string}` // replies are included
+
+ // role timelines
+ | `roleTimeline:${string}` // any notes are included
+
+@Injectable()
+export class FanoutTimelineService {
+ constructor(
+ @Inject(DI.redisForTimelines)
+ private redisForTimelines: Redis.Redis,
+
+ private idService: IdService,
+ ) {
+ }
+
+ @bindThis
+ public push(tl: FanoutTimelineName, id: string, maxlen: number, pipeline: Redis.ChainableCommander) {
+ // リモートから遅れて届いた(もしくは後から追加された)投稿日時が古い投稿が追加されるとページネーション時に問題を引き起こすため、
+ // 3分以内に投稿されたものでない場合、Redisにある最古のIDより新しい場合のみ追加する
+ if (this.idService.parse(id).date.getTime() > Date.now() - 1000 * 60 * 3) {
+ pipeline.lpush('list:' + tl, id);
+ if (Math.random() < 0.1) { // 10%の確率でトリム
+ pipeline.ltrim('list:' + tl, 0, maxlen - 1);
+ }
+ } else {
+ // 末尾のIDを取得
+ this.redisForTimelines.lindex('list:' + tl, -1).then(lastId => {
+ if (lastId == null || (this.idService.parse(id).date.getTime() > this.idService.parse(lastId).date.getTime())) {
+ this.redisForTimelines.lpush('list:' + tl, id);
+ } else {
+ Promise.resolve();
+ }
+ });
+ }
+ }
+
+ @bindThis
+ public get(name: FanoutTimelineName, untilId?: string | null, sinceId?: string | null) {
+ if (untilId && sinceId) {
+ return this.redisForTimelines.lrange('list:' + name, 0, -1)
+ .then(ids => ids.filter(id => id < untilId && id > sinceId).sort((a, b) => a > b ? -1 : 1));
+ } else if (untilId) {
+ return this.redisForTimelines.lrange('list:' + name, 0, -1)
+ .then(ids => ids.filter(id => id < untilId).sort((a, b) => a > b ? -1 : 1));
+ } else if (sinceId) {
+ return this.redisForTimelines.lrange('list:' + name, 0, -1)
+ .then(ids => ids.filter(id => id > sinceId).sort((a, b) => a < b ? -1 : 1));
+ } else {
+ return this.redisForTimelines.lrange('list:' + name, 0, -1)
+ .then(ids => ids.sort((a, b) => a > b ? -1 : 1));
+ }
+ }
+
+ @bindThis
+ public getMulti(name: FanoutTimelineName[], untilId?: string | null, sinceId?: string | null): Promise {
+ const pipeline = this.redisForTimelines.pipeline();
+ for (const n of name) {
+ pipeline.lrange('list:' + n, 0, -1);
+ }
+ return pipeline.exec().then(res => {
+ if (res == null) return [];
+ const tls = res.map(r => r[1] as string[]);
+ return tls.map(ids =>
+ (untilId && sinceId)
+ ? ids.filter(id => id < untilId && id > sinceId).sort((a, b) => a > b ? -1 : 1)
+ : untilId
+ ? ids.filter(id => id < untilId).sort((a, b) => a > b ? -1 : 1)
+ : sinceId
+ ? ids.filter(id => id > sinceId).sort((a, b) => a < b ? -1 : 1)
+ : ids.sort((a, b) => a > b ? -1 : 1),
+ );
+ });
+ }
+
+ @bindThis
+ public purge(name: FanoutTimelineName) {
+ return this.redisForTimelines.del('list:' + name);
+ }
+}
diff --git a/packages/backend/src/core/FeaturedService.ts b/packages/backend/src/core/FeaturedService.ts
index 62b50ed38d..595383c82c 100644
--- a/packages/backend/src/core/FeaturedService.ts
+++ b/packages/backend/src/core/FeaturedService.ts
@@ -5,14 +5,17 @@
import { Inject, Injectable } from '@nestjs/common';
import * as Redis from 'ioredis';
-import type { MiNote, MiUser } from '@/models/_.js';
+import type { MiGalleryPost, MiNote, MiUser } from '@/models/_.js';
import { DI } from '@/di-symbols.js';
import { bindThis } from '@/decorators.js';
const GLOBAL_NOTES_RANKING_WINDOW = 1000 * 60 * 60 * 24 * 3; // 3日ごと
+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; // 1時間ごと
+const featuredEpoc = new Date('2023-01-01T00:00:00Z').getTime();
+
@Injectable()
export class FeaturedService {
constructor(
@@ -23,7 +26,7 @@ export class FeaturedService {
@bindThis
private getCurrentWindow(windowRange: number): number {
- const passed = new Date().getTime() - new Date(new Date().getFullYear(), 0, 1).getTime();
+ const passed = new Date().getTime() - featuredEpoc;
return Math.floor(passed / windowRange);
}
@@ -43,16 +46,16 @@ export class FeaturedService {
}
@bindThis
- private async getRankingOf(name: string, windowRange: number, limit: number): Promise {
+ private async getRankingOf(name: string, windowRange: number, threshold: number): Promise {
const currentWindow = this.getCurrentWindow(windowRange);
const previousWindow = currentWindow - 1;
- const [currentRankingResult, previousRankingResult] = await Promise.all([
- this.redisClient.zrange(
- `${name}:${currentWindow}`, 0, limit, 'REV', 'WITHSCORES'),
- this.redisClient.zrange(
- `${name}:${previousWindow}`, 0, limit, 'REV', 'WITHSCORES'),
- ]);
+ const redisPipeline = this.redisClient.pipeline();
+ redisPipeline.zrange(
+ `${name}:${currentWindow}`, 0, threshold, 'REV', 'WITHSCORES');
+ redisPipeline.zrange(
+ `${name}:${previousWindow}`, 0, threshold, 'REV', 'WITHSCORES');
+ const [currentRankingResult, previousRankingResult] = await redisPipeline.exec().then(result => result ? result.map(r => (r[1] ?? []) as string[]) : [[], []]);
const ranking = new Map();
for (let i = 0; i < currentRankingResult.length; i += 2) {
@@ -74,11 +77,27 @@ export class FeaturedService {
return Array.from(ranking.keys());
}
+ @bindThis
+ private async removeFromRanking(name: string, windowRange: number, element: string): Promise {
+ const currentWindow = this.getCurrentWindow(windowRange);
+ const previousWindow = currentWindow - 1;
+
+ const redisPipeline = this.redisClient.pipeline();
+ redisPipeline.zrem(`${name}:${currentWindow}`, element);
+ redisPipeline.zrem(`${name}:${previousWindow}`, element);
+ await redisPipeline.exec();
+ }
+
@bindThis
public updateGlobalNotesRanking(noteId: MiNote['id'], score = 1): Promise {
return this.updateRankingOf('featuredGlobalNotesRanking', GLOBAL_NOTES_RANKING_WINDOW, noteId, score);
}
+ @bindThis
+ public updateGalleryPostsRanking(galleryPostId: MiGalleryPost['id'], score = 1): Promise {
+ return this.updateRankingOf('featuredGalleryPostsRanking', GALLERY_POSTS_RANKING_WINDOW, galleryPostId, score);
+ }
+
@bindThis
public updateInChannelNotesRanking(channelId: MiNote['channelId'], noteId: MiNote['id'], score = 1): Promise {
return this.updateRankingOf(`featuredInChannelNotesRanking:${channelId}`, GLOBAL_NOTES_RANKING_WINDOW, noteId, score);
@@ -95,22 +114,32 @@ export class FeaturedService {
}
@bindThis
- public getGlobalNotesRanking(limit: number): Promise {
- return this.getRankingOf('featuredGlobalNotesRanking', GLOBAL_NOTES_RANKING_WINDOW, limit);
+ public getGlobalNotesRanking(threshold: number): Promise {
+ return this.getRankingOf('featuredGlobalNotesRanking', GLOBAL_NOTES_RANKING_WINDOW, threshold);
}
@bindThis
- public getInChannelNotesRanking(channelId: MiNote['channelId'], limit: number): Promise {
- return this.getRankingOf(`featuredInChannelNotesRanking:${channelId}`, GLOBAL_NOTES_RANKING_WINDOW, limit);
+ public getGalleryPostsRanking(threshold: number): Promise {
+ return this.getRankingOf('featuredGalleryPostsRanking', GALLERY_POSTS_RANKING_WINDOW, threshold);
}
@bindThis
- public getPerUserNotesRanking(userId: MiUser['id'], limit: number): Promise {
- return this.getRankingOf(`featuredPerUserNotesRanking:${userId}`, PER_USER_NOTES_RANKING_WINDOW, limit);
+ public getInChannelNotesRanking(channelId: MiNote['channelId'], threshold: number): Promise {
+ return this.getRankingOf(`featuredInChannelNotesRanking:${channelId}`, GLOBAL_NOTES_RANKING_WINDOW, threshold);
}
@bindThis
- public getHashtagsRanking(limit: number): Promise {
- return this.getRankingOf('featuredHashtagsRanking', HASHTAG_RANKING_WINDOW, limit);
+ public getPerUserNotesRanking(userId: MiUser['id'], threshold: number): Promise {
+ return this.getRankingOf(`featuredPerUserNotesRanking:${userId}`, PER_USER_NOTES_RANKING_WINDOW, threshold);
+ }
+
+ @bindThis
+ public getHashtagsRanking(threshold: number): Promise {
+ return this.getRankingOf('featuredHashtagsRanking', HASHTAG_RANKING_WINDOW, threshold);
+ }
+
+ @bindThis
+ public removeHashtagsFromRanking(hashtag: string): Promise {
+ return this.removeFromRanking('featuredHashtagsRanking', HASHTAG_RANKING_WINDOW, hashtag);
}
}
diff --git a/packages/backend/src/core/FederatedInstanceService.ts b/packages/backend/src/core/FederatedInstanceService.ts
index 61806583c6..e41f010e48 100644
--- a/packages/backend/src/core/FederatedInstanceService.ts
+++ b/packages/backend/src/core/FederatedInstanceService.ts
@@ -56,7 +56,7 @@ export class FederatedInstanceService implements OnApplicationShutdown {
if (index == null) {
const i = await this.instancesRepository.insert({
- id: this.idService.genId(),
+ id: this.idService.gen(),
host,
firstRetrievedAt: new Date(),
}).then(x => this.instancesRepository.findOneByOrFail(x.identifiers[0]));
diff --git a/packages/backend/src/core/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts
index b74fbbe584..d175f21f2f 100644
--- a/packages/backend/src/core/GlobalEventService.ts
+++ b/packages/backend/src/core/GlobalEventService.ts
@@ -18,7 +18,7 @@ import type { MiSignin } from '@/models/Signin.js';
import type { MiPage } from '@/models/Page.js';
import type { MiWebhook } from '@/models/Webhook.js';
import type { MiMeta } from '@/models/Meta.js';
-import { MiRole, MiRoleAssignment } from '@/models/_.js';
+import { MiAvatarDecoration, MiRole, MiRoleAssignment } from '@/models/_.js';
import type { Packed } from '@/misc/json-schema.js';
import { DI } from '@/di-symbols.js';
import type { Config } from '@/config.js';
@@ -77,7 +77,13 @@ export interface MainEventTypes {
unreadAntenna: MiAntenna;
readAllAnnouncements: undefined;
myTokenRegenerated: undefined;
- signin: MiSignin;
+ signin: {
+ id: MiSignin['id'];
+ createdAt: string;
+ ip: string;
+ headers: Record;
+ success: boolean;
+ };
registryUpdated: {
scope?: string[];
key: string;
@@ -188,6 +194,9 @@ export interface InternalEventTypes {
antennaCreated: MiAntenna;
antennaDeleted: MiAntenna;
antennaUpdated: MiAntenna;
+ avatarDecorationCreated: MiAvatarDecoration;
+ avatarDecorationDeleted: MiAvatarDecoration;
+ avatarDecorationUpdated: MiAvatarDecoration;
metaUpdated: MiMeta;
followChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
unfollowChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
diff --git a/packages/backend/src/core/HashtagService.ts b/packages/backend/src/core/HashtagService.ts
index 1a06767da8..d378999907 100644
--- a/packages/backend/src/core/HashtagService.ts
+++ b/packages/backend/src/core/HashtagService.ts
@@ -45,7 +45,7 @@ export class HashtagService {
await this.updateHashtag(user, tag, true, true);
}
- for (const tag of (user.tags ?? []).filter(x => !tags.includes(x))) {
+ for (const tag of user.tags.filter(x => !tags.includes(x))) {
await this.updateHashtag(user, tag, true, false);
}
}
@@ -120,7 +120,7 @@ export class HashtagService {
} else {
if (isUserAttached) {
this.hashtagsRepository.insert({
- id: this.idService.genId(),
+ id: this.idService.gen(),
name: tag,
mentionedUserIds: [],
mentionedUsersCount: 0,
@@ -137,7 +137,7 @@ export class HashtagService {
} as MiHashtag);
} else {
this.hashtagsRepository.insert({
- id: this.idService.genId(),
+ id: this.idService.gen(),
name: tag,
mentionedUserIds: [user.id],
mentionedUsersCount: 1,
@@ -174,16 +174,15 @@ export class HashtagService {
const redisPipeline = this.redisClient.pipeline();
- // TODO: これらの Set は Bloom Filter を使うようにしても良さそう
-
// チャート用
- redisPipeline.sadd(`hashtagUsers:${hashtag}:${window}`, userId);
+ redisPipeline.pfadd(`hashtagUsers:${hashtag}:${window}`, userId);
redisPipeline.expire(`hashtagUsers:${hashtag}:${window}`,
60 * 60 * 24 * 3, // 3日間
'NX', // "NX -- Set expiry only when the key has no expiry" = 有効期限がないときだけ設定
);
// ユニークカウント用
+ // TODO: Bloom Filter を使うようにしても良さそう
redisPipeline.sadd(`hashtagUsers:${hashtag}`, userId);
redisPipeline.expire(`hashtagUsers:${hashtag}`,
60 * 60, // 1時間
@@ -202,7 +201,7 @@ export class HashtagService {
for (let i = 0; i < range; i++) {
const window = `${now.getUTCFullYear()}${(now.getUTCMonth() + 1).toString().padStart(2, '0')}${now.getUTCDate().toString().padStart(2, '0')}${now.getUTCHours().toString().padStart(2, '0')}${now.getUTCMinutes().toString().padStart(2, '0')}`;
- redisPipeline.scard(`hashtagUsers:${hashtag}:${window}`);
+ redisPipeline.pfcount(`hashtagUsers:${hashtag}:${window}`);
now.setMinutes(now.getMinutes() - (i * 10), 0, 0);
}
@@ -223,7 +222,7 @@ export class HashtagService {
for (let i = 0; i < range; i++) {
const window = `${now.getUTCFullYear()}${(now.getUTCMonth() + 1).toString().padStart(2, '0')}${now.getUTCDate().toString().padStart(2, '0')}${now.getUTCHours().toString().padStart(2, '0')}${now.getUTCMinutes().toString().padStart(2, '0')}`;
for (const hashtag of hashtags) {
- redisPipeline.scard(`hashtagUsers:${hashtag}:${window}`);
+ redisPipeline.pfcount(`hashtagUsers:${hashtag}:${window}`);
}
now.setMinutes(now.getMinutes() - (i * 10), 0, 0);
}
diff --git a/packages/backend/src/core/IdService.ts b/packages/backend/src/core/IdService.ts
index 06c58ad8a1..43e72d2d7b 100644
--- a/packages/backend/src/core/IdService.ts
+++ b/packages/backend/src/core/IdService.ts
@@ -7,11 +7,11 @@ import { Inject, Injectable } from '@nestjs/common';
import { ulid } from 'ulid';
import { DI } from '@/di-symbols.js';
import type { Config } from '@/config.js';
-import { genAid, parseAid } from '@/misc/id/aid.js';
-import { genAidx, parseAidx } from '@/misc/id/aidx.js';
-import { genMeid, parseMeid } from '@/misc/id/meid.js';
-import { genMeidg, parseMeidg } from '@/misc/id/meidg.js';
-import { genObjectId, parseObjectId } from '@/misc/id/object-id.js';
+import { genAid, isSafeAidT, parseAid } from '@/misc/id/aid.js';
+import { genAidx, isSafeAidxT, parseAidx } from '@/misc/id/aidx.js';
+import { genMeid, isSafeMeidT, parseMeid } from '@/misc/id/meid.js';
+import { genMeidg, isSafeMeidgT, parseMeidg } from '@/misc/id/meidg.js';
+import { genObjectId, isSafeObjectIdT, parseObjectId } from '@/misc/id/object-id.js';
import { bindThis } from '@/decorators.js';
import { parseUlid } from '@/misc/id/ulid.js';
@@ -27,16 +27,33 @@ export class IdService {
}
@bindThis
- public genId(date?: Date): string {
- if (!date || (date > new Date())) date = new Date();
+ public isSafeT(t: number): boolean {
+ switch (this.method) {
+ case 'aid': return isSafeAidT(t);
+ case 'aidx': return isSafeAidxT(t);
+ case 'meid': return isSafeMeidT(t);
+ case 'meidg': return isSafeMeidgT(t);
+ case 'ulid': return t > 0;
+ case 'objectid': return isSafeObjectIdT(t);
+ default: throw new Error('unrecognized id generation method');
+ }
+ }
+
+ /**
+ * 時間を元にIDを生成します(省略時は現在日時)
+ * @param time 日時
+ */
+ @bindThis
+ public gen(time?: number): string {
+ const t = (!time || (time > Date.now())) ? Date.now() : time;
switch (this.method) {
- case 'aid': return genAid(date);
- case 'aidx': return genAidx(date);
- case 'meid': return genMeid(date);
- case 'meidg': return genMeidg(date);
- case 'ulid': return ulid(date.getTime());
- case 'objectid': return genObjectId(date);
+ case 'aid': return genAid(t);
+ case 'aidx': return genAidx(t);
+ case 'meid': return genMeid(t);
+ case 'meidg': return genMeidg(t);
+ case 'ulid': return ulid(t);
+ case 'objectid': return genObjectId(t);
default: throw new Error('unrecognized id generation method');
}
}
diff --git a/packages/backend/src/core/MetaService.ts b/packages/backend/src/core/MetaService.ts
index 508544dc07..80e8020961 100644
--- a/packages/backend/src/core/MetaService.ts
+++ b/packages/backend/src/core/MetaService.ts
@@ -11,6 +11,7 @@ import { MiMeta } from '@/models/Meta.js';
import { GlobalEventService } from '@/core/GlobalEventService.js';
import { bindThis } from '@/decorators.js';
import type { GlobalEvents } from '@/core/GlobalEventService.js';
+import { FeaturedService } from '@/core/FeaturedService.js';
import type { OnApplicationShutdown } from '@nestjs/common';
@Injectable()
@@ -25,6 +26,7 @@ export class MetaService implements OnApplicationShutdown {
@Inject(DI.db)
private db: DataSource,
+ private featuredService: FeaturedService,
private globalEventService: GlobalEventService,
) {
//this.onMessage = this.onMessage.bind(this);
@@ -95,6 +97,8 @@ export class MetaService implements OnApplicationShutdown {
@bindThis
public async update(data: Partial): Promise {
+ let before: MiMeta | undefined;
+
const updated = await this.db.transaction(async transactionalEntityManager => {
const metas = await transactionalEntityManager.find(MiMeta, {
order: {
@@ -102,10 +106,10 @@ export class MetaService implements OnApplicationShutdown {
},
});
- const meta = metas[0];
+ before = metas[0];
- if (meta) {
- await transactionalEntityManager.update(MiMeta, meta.id, data);
+ if (before) {
+ await transactionalEntityManager.update(MiMeta, before.id, data);
const metas = await transactionalEntityManager.find(MiMeta, {
order: {
@@ -119,6 +123,21 @@ export class MetaService implements OnApplicationShutdown {
}
});
+ if (data.hiddenTags) {
+ process.nextTick(() => {
+ const hiddenTags = new Set(data.hiddenTags);
+ if (before) {
+ for (const previousHiddenTag of before.hiddenTags) {
+ hiddenTags.delete(previousHiddenTag);
+ }
+ }
+
+ for (const hiddenTag of hiddenTags) {
+ this.featuredService.removeHashtagsFromRanking(hiddenTag);
+ }
+ });
+ }
+
this.globalEventService.publishInternalEvent('metaUpdated', updated);
return updated;
diff --git a/packages/backend/src/core/MfmService.ts b/packages/backend/src/core/MfmService.ts
index b275d1b142..e74c62e1a8 100644
--- a/packages/backend/src/core/MfmService.ts
+++ b/packages/backend/src/core/MfmService.ts
@@ -250,6 +250,12 @@ export class MfmService {
}
}
+ function fnDefault(node: mfm.MfmFn) {
+ const el = doc.createElement('i');
+ appendChildren(node.children, el);
+ return el;
+ }
+
const handlers: { [K in mfm.MfmNode['type']]: (node: mfm.NodeType) => any } = {
bold: (node) => {
const el = doc.createElement('b');
@@ -276,9 +282,69 @@ export class MfmService {
},
fn: (node) => {
- const el = doc.createElement('i');
- appendChildren(node.children, el);
- return el;
+ switch (node.props.name) {
+ case 'unixtime': {
+ const text = node.children[0].type === 'text' ? node.children[0].props.text : '';
+ try {
+ const date = new Date(parseInt(text, 10) * 1000);
+ const el = doc.createElement('time');
+ el.setAttribute('datetime', date.toISOString());
+ el.textContent = date.toISOString();
+ return el;
+ } catch (err) {
+ return fnDefault(node);
+ }
+ }
+
+ case 'ruby': {
+ if (node.children.length === 1) {
+ const child = node.children[0];
+ const text = child.type === 'text' ? child.props.text : '';
+ const rubyEl = doc.createElement('ruby');
+ const rtEl = doc.createElement('rt');
+
+ // ruby未対応のHTMLサニタイザーを通したときにルビが「劉備（りゅうび）」となるようにする
+ const rpStartEl = doc.createElement('rp');
+ rpStartEl.appendChild(doc.createTextNode('('));
+ const rpEndEl = doc.createElement('rp');
+ rpEndEl.appendChild(doc.createTextNode(')'));
+
+ rubyEl.appendChild(doc.createTextNode(text.split(' ')[0]));
+ rtEl.appendChild(doc.createTextNode(text.split(' ')[1]));
+ rubyEl.appendChild(rpStartEl);
+ rubyEl.appendChild(rtEl);
+ rubyEl.appendChild(rpEndEl);
+ return rubyEl;
+ } else {
+ const rt = node.children.at(-1);
+
+ if (!rt) {
+ return fnDefault(node);
+ }
+
+ const text = rt.type === 'text' ? rt.props.text : '';
+ const rubyEl = doc.createElement('ruby');
+ const rtEl = doc.createElement('rt');
+
+ // ruby未対応のHTMLサニタイザーを通したときにルビが「劉備（りゅうび）」となるようにする
+ const rpStartEl = doc.createElement('rp');
+ rpStartEl.appendChild(doc.createTextNode('('));
+ const rpEndEl = doc.createElement('rp');
+ rpEndEl.appendChild(doc.createTextNode(')'));
+
+ appendChildren(node.children.slice(0, node.children.length - 1), rubyEl);
+ rtEl.appendChild(doc.createTextNode(text.trim()));
+ rubyEl.appendChild(rpStartEl);
+ rubyEl.appendChild(rtEl);
+ rubyEl.appendChild(rpEndEl);
+ return rubyEl;
+ }
+ }
+
+ default: {
+ return fnDefault(node);
+ }
+ }
},
blockCode: (node) => {
diff --git a/packages/backend/src/core/ModerationLogService.ts b/packages/backend/src/core/ModerationLogService.ts
index f7f9063d92..8b78d02047 100644
--- a/packages/backend/src/core/ModerationLogService.ts
+++ b/packages/backend/src/core/ModerationLogService.ts
@@ -24,8 +24,7 @@ export class ModerationLogService {
@bindThis
public async log(moderator: { id: MiUser['id'] }, type: T, info?: ModerationLogPayloads[T]) {
await this.moderationLogsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
userId: moderator.id,
type: type,
info: (info as any) ?? {},
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 4a454e79e7..54493612b8 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -54,6 +54,10 @@ import { RoleService } from '@/core/RoleService.js';
import { MetaService } from '@/core/MetaService.js';
import { SearchService } from '@/core/SearchService.js';
import { FeaturedService } from '@/core/FeaturedService.js';
+import { FanoutTimelineService } from '@/core/FanoutTimelineService.js';
+import { UtilityService } from '@/core/UtilityService.js';
+import { UserBlockingService } from '@/core/UserBlockingService.js';
+import { isReply } from '@/misc/is-reply.js';
type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
@@ -97,17 +101,14 @@ class NotificationManager {
}
@bindThis
- public async deliver() {
+ public async notify() {
for (const x of this.queue) {
- // ミュート情報を取得
- const mentioneeMutes = await this.mutingsRepository.findBy({
- muterId: x.target,
- });
-
- const mentioneesMutedUserIds = mentioneeMutes.map(m => m.muteeId);
-
- // 通知される側のユーザーが通知する側のユーザーをミュートしていない限りは通知する
- if (!mentioneesMutedUserIds.includes(this.notifier.id)) {
+ if (x.reason === 'renote') {
+ this.notificationService.createNotification(x.target, 'renote', {
+ noteId: this.note.id,
+ targetNoteId: this.note.renoteId!,
+ }, this.notifier.id);
+ } else {
this.notificationService.createNotification(x.target, x.reason, {
noteId: this.note.id,
}, this.notifier.id);
@@ -194,6 +195,7 @@ export class NoteCreateService implements OnApplicationShutdown {
private idService: IdService,
private globalEventService: GlobalEventService,
private queueService: QueueService,
+ private fanoutTimelineService: FanoutTimelineService,
private noteReadService: NoteReadService,
private notificationService: NotificationService,
private relayService: RelayService,
@@ -212,6 +214,8 @@ export class NoteCreateService implements OnApplicationShutdown {
private perUserNotesChart: PerUserNotesChart,
private activeUsersChart: ActiveUsersChart,
private instanceChart: InstanceChart,
+ private utilityService: UtilityService,
+ private userBlockingService: UserBlockingService,
) { }
@bindThis
@@ -219,8 +223,8 @@ export class NoteCreateService implements OnApplicationShutdown {
id: MiUser['id'];
username: MiUser['username'];
host: MiUser['host'];
- createdAt: MiUser['createdAt'];
isBot: MiUser['isBot'];
+ isCat: MiUser['isCat'];
}, data: Option, silent = false): Promise {
// チャンネル外にリプライしたら対象のスコープに合わせる
// (クライアントサイドでやっても良い処理だと思うけどとりあえずサーバーサイドで)
@@ -245,8 +249,10 @@ export class NoteCreateService implements OnApplicationShutdown {
if (data.channel != null) data.visibleUsers = [];
if (data.channel != null) data.localOnly = true;
+ const meta = await this.metaService.fetch();
+
if (data.visibility === 'public' && data.channel == null) {
- const sensitiveWords = (await this.metaService.fetch()).sensitiveWords;
+ const sensitiveWords = meta.sensitiveWords;
if (this.isSensitive(data, sensitiveWords)) {
data.visibility = 'home';
} else if ((await this.roleService.getUserPolicies(user.id)).canPublicNote === false) {
@@ -254,6 +260,12 @@ export class NoteCreateService implements OnApplicationShutdown {
}
}
+ const inSilencedInstance = this.utilityService.isSilencedHost(meta.silencedHosts, user.host);
+
+ if (data.visibility === 'public' && inSilencedInstance && user.host !== null) {
+ data.visibility = 'home';
+ }
+
if (data.renote) {
switch (data.renote.visibility) {
case 'public':
@@ -280,6 +292,18 @@ export class NoteCreateService implements OnApplicationShutdown {
}
}
+ // Check blocking
+ if (this.isQuote(data)) {
+ if (data.renote.userHost === null) {
+ if (data.renote.userId !== user.id) {
+ const blocked = await this.userBlockingService.checkBlocked(data.renote.userId, user.id);
+ if (blocked) {
+ throw new Error('blocked');
+ }
+ }
+ }
+ }
+
// 返信対象がpublicではないならhomeにする
if (data.reply && data.reply.visibility !== 'public' && data.visibility === 'public') {
data.visibility = 'home';
@@ -310,7 +334,7 @@ export class NoteCreateService implements OnApplicationShutdown {
// Parse MFM if needed
if (!tags || !emojis || !mentionedUsers) {
- const tokens = data.text ? mfm.parse(data.text)! : [];
+ const tokens = (data.text ? mfm.parse(data.text)! : []);
const cwTokens = data.cw ? mfm.parse(data.cw)! : [];
const choiceTokens = data.poll && data.poll.choices
? concat(data.poll.choices.map(choice => mfm.parse(choice)!))
@@ -325,7 +349,7 @@ export class NoteCreateService implements OnApplicationShutdown {
mentionedUsers = data.apMentions ?? await this.extractMentionedUsers(user, combinedTokens);
}
- tags = tags.filter(tag => Array.from(tag ?? '').length <= 128).splice(0, 32);
+ tags = tags.filter(tag => Array.from(tag).length <= 128).splice(0, 32);
if (data.reply && (user.id !== data.reply.userId) && !mentionedUsers.some(u => u.id === data.reply!.userId)) {
mentionedUsers.push(await this.usersRepository.findOneByOrFail({ id: data.reply!.userId }));
@@ -347,14 +371,6 @@ export class NoteCreateService implements OnApplicationShutdown {
const note = await this.insertNote(user, data, tags, emojis, mentionedUsers);
- if (data.channel) {
- this.redisForTimelines.xadd(
- `channelTimeline:${data.channel.id}`,
- 'MAXLEN', '~', this.config.perChannelMaxNoteCacheCount.toString(),
- '*',
- 'note', note.id);
- }
-
setImmediate('post created', { signal: this.#shutdownController.signal }).then(
() => this.postNoteCreated(note, user, data, silent, tags!, mentionedUsers!),
() => { /* aborted, ignore this */ },
@@ -366,8 +382,7 @@ export class NoteCreateService implements OnApplicationShutdown {
@bindThis
private async insertNote(user: { id: MiUser['id']; host: MiUser['host']; }, data: Option, tags: string[], emojis: string[], mentionedUsers: MinimumUser[]) {
const insert = new MiNote({
- id: this.idService.genId(data.createdAt!),
- createdAt: data.createdAt!,
+ id: this.idService.gen(data.createdAt?.getTime()),
fileIds: data.files ? data.files.map(file => file.id) : [],
replyId: data.reply ? data.reply.id : null,
renoteId: data.renote ? data.renote.id : null,
@@ -466,7 +481,6 @@ export class NoteCreateService implements OnApplicationShutdown {
id: MiUser['id'];
username: MiUser['username'];
host: MiUser['host'];
- createdAt: MiUser['createdAt'];
isBot: MiUser['isBot'];
}, data: Option, silent: boolean, tags: string[], mentionedUsers: MinimumUser[]) {
const meta = await this.metaService.fetch();
@@ -494,11 +508,7 @@ export class NoteCreateService implements OnApplicationShutdown {
// Increment notes count (user)
this.incNotesCountOfUser(user);
- if (data.visibility === 'specified') {
- // TODO?
- } else {
- this.pushToTl(note, user);
- }
+ this.pushToTl(note, user);
this.antennaService.addNoteToAntennas(note, user);
@@ -512,11 +522,13 @@ export class NoteCreateService implements OnApplicationShutdown {
followeeId: user.id,
notify: 'normal',
}).then(followings => {
- for (const following of followings) {
- // TODO: ワードミュート考慮
- this.notificationService.createNotification(following.followerId, 'note', {
- noteId: note.id,
- }, user.id);
+ if (note.visibility !== 'specified') {
+ for (const following of followings) {
+ // TODO: ワードミュート考慮
+ this.notificationService.createNotification(following.followerId, 'note', {
+ noteId: note.id,
+ }, user.id);
+ }
}
});
}
@@ -564,7 +576,7 @@ export class NoteCreateService implements OnApplicationShutdown {
}
// Pack the note
- const noteObj = await this.noteEntityService.pack(note);
+ const noteObj = await this.noteEntityService.pack(note, null, { skipHide: true, withReactionAndUserPairCache: true });
this.globalEventService.publishNotesStream(noteObj);
@@ -610,7 +622,7 @@ export class NoteCreateService implements OnApplicationShutdown {
// If it is renote
if (data.renote) {
- const type = data.text ? 'quote' : 'renote';
+ const type = this.isQuote(data) ? 'quote' : 'renote';
// Notify
if (data.renote.userHost === null) {
@@ -630,7 +642,7 @@ export class NoteCreateService implements OnApplicationShutdown {
}
}
- nm.deliver();
+ nm.notify();
//#region AP deliver
if (this.userEntityService.isLocalUser(user)) {
@@ -717,6 +729,12 @@ export class NoteCreateService implements OnApplicationShutdown {
return false;
}
+ @bindThis
+ private isQuote(note: Option): note is Option & { renote: MiNote } {
+ // sync with misc/is-quote.ts
+ return !!note.renote && (!!note.text || !!note.cw || (!!note.files && !!note.files.length) || !!note.poll);
+ }
+
@bindThis
private incRenoteCount(renote: MiNote) {
this.notesRepository.createQueryBuilder().update()
@@ -782,7 +800,7 @@ export class NoteCreateService implements OnApplicationShutdown {
private async renderNoteOrRenoteActivity(data: Option, note: MiNote) {
if (data.localOnly) return null;
- const content = data.renote && data.text == null && data.poll == null && (data.files == null || data.files.length === 0)
+ const content = data.renote && !this.isQuote(data)
? this.apRendererService.renderAnnounce(data.renote.uri ? data.renote.uri : `${this.config.url}/notes/${data.renote.id}`, note)
: this.apRendererService.renderCreate(await this.apRendererService.renderNote(note, false), note);
@@ -827,15 +845,14 @@ export class NoteCreateService implements OnApplicationShutdown {
@bindThis
private async pushToTl(note: MiNote, user: { id: MiUser['id']; host: MiUser['host']; }) {
const meta = await this.metaService.fetch();
+ if (!meta.enableFanoutTimeline) return;
- const redisPipeline = this.redisForTimelines.pipeline();
+ const r = this.redisForTimelines.pipeline();
if (note.channelId) {
- redisPipeline.xadd(
- `userTimelineWithChannel:${user.id}`,
- 'MAXLEN', '~', note.userHost == null ? meta.perLocalUserUserTimelineCacheMax.toString() : meta.perRemoteUserUserTimelineCacheMax.toString(),
- '*',
- 'note', note.id);
+ this.fanoutTimelineService.push(`channelTimeline:${note.channelId}`, note.id, this.config.perChannelMaxNoteCacheCount, r);
+
+ this.fanoutTimelineService.push(`userTimelineWithChannel:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
const channelFollowings = await this.channelFollowingsRepository.find({
where: {
@@ -845,138 +862,97 @@ export class NoteCreateService implements OnApplicationShutdown {
});
for (const channelFollowing of channelFollowings) {
- redisPipeline.xadd(
- `homeTimeline:${channelFollowing.followerId}`,
- 'MAXLEN', '~', meta.perUserHomeTimelineCacheMax.toString(),
- '*',
- 'note', note.id);
-
+ this.fanoutTimelineService.push(`homeTimeline:${channelFollowing.followerId}`, note.id, meta.perUserHomeTimelineCacheMax, r);
if (note.fileIds.length > 0) {
- redisPipeline.xadd(
- `homeTimelineWithFiles:${channelFollowing.followerId}`,
- 'MAXLEN', '~', (meta.perUserHomeTimelineCacheMax / 2).toString(),
- '*',
- 'note', note.id);
+ this.fanoutTimelineService.push(`homeTimelineWithFiles:${channelFollowing.followerId}`, note.id, meta.perUserHomeTimelineCacheMax / 2, r);
}
}
} else {
// TODO: キャッシュ？
- const followings = await this.followingsRepository.find({
- where: {
- followeeId: user.id,
- followerHost: IsNull(),
- isFollowerHibernated: false,
- },
- select: ['followerId', 'withReplies'],
- });
+ // eslint-disable-next-line prefer-const
+ let [followings, userListMemberships] = await Promise.all([
+ this.followingsRepository.find({
+ where: {
+ followeeId: user.id,
+ followerHost: IsNull(),
+ isFollowerHibernated: false,
+ },
+ select: ['followerId', 'withReplies'],
+ }),
+ this.userListMembershipsRepository.find({
+ where: {
+ userId: user.id,
+ },
+ select: ['userListId', 'userListUserId', 'withReplies'],
+ }),
+ ]);
- const userListMemberships = await this.userListMembershipsRepository.find({
- where: {
- userId: user.id,
- },
- select: ['userListId', 'withReplies'],
- });
+ if (note.visibility === 'followers') {
+ // TODO: 重そうだから何とかしたい Set 使う？
+ userListMemberships = userListMemberships.filter(x => x.userListUserId === user.id || followings.some(f => f.followerId === x.userListUserId));
+ }
// TODO: あまりにも数が多いと redisPipeline.exec に失敗する(理由は不明)ため、3万件程度を目安に分割して実行するようにする
for (const following of followings) {
- // 自分自身以外への返信
- if (note.replyId && note.replyUserId !== note.userId) {
+ // 基本的にvisibleUserIdsには自身のidが含まれている前提であること
+ if (note.visibility === 'specified' && !note.visibleUserIds.some(v => v === following.followerId)) continue;
+
+ // 「自分自身への返信 or そのフォロワーへの返信」のどちらでもない場合
+ if (isReply(note, following.followerId)) {
if (!following.withReplies) continue;
}
- redisPipeline.xadd(
- `homeTimeline:${following.followerId}`,
- 'MAXLEN', '~', meta.perUserHomeTimelineCacheMax.toString(),
- '*',
- 'note', note.id);
-
+ this.fanoutTimelineService.push(`homeTimeline:${following.followerId}`, note.id, meta.perUserHomeTimelineCacheMax, r);
if (note.fileIds.length > 0) {
- redisPipeline.xadd(
- `homeTimelineWithFiles:${following.followerId}`,
- 'MAXLEN', '~', (meta.perUserHomeTimelineCacheMax / 2).toString(),
- '*',
- 'note', note.id);
+ this.fanoutTimelineService.push(`homeTimelineWithFiles:${following.followerId}`, note.id, meta.perUserHomeTimelineCacheMax / 2, r);
}
}
- // TODO
- //if (note.visibility === 'followers') {
- // // TODO: 重そうだから何とかしたい Set 使う？
- // userLists = userLists.filter(x => followings.some(f => f.followerId === x.userListUserId));
- //}
-
for (const userListMembership of userListMemberships) {
- // 自分自身以外への返信
- if (note.replyId && note.replyUserId !== note.userId) {
+ // ダイレクトのとき、そのリストが対象外のユーザーの場合
+ if (
+ note.visibility === 'specified' &&
+ !note.visibleUserIds.some(v => v === userListMembership.userListUserId)
+ ) continue;
+
+ // 「自分自身への返信 or そのリストの作成者への返信」のどちらでもない場合
+ if (isReply(note, userListMembership.userListUserId)) {
if (!userListMembership.withReplies) continue;
}
- redisPipeline.xadd(
- `userListTimeline:${userListMembership.userListId}`,
- 'MAXLEN', '~', meta.perUserListTimelineCacheMax.toString(),
- '*',
- 'note', note.id);
-
+ this.fanoutTimelineService.push(`userListTimeline:${userListMembership.userListId}`, note.id, meta.perUserListTimelineCacheMax, r);
if (note.fileIds.length > 0) {
- redisPipeline.xadd(
- `userListTimelineWithFiles:${userListMembership.userListId}`,
- 'MAXLEN', '~', (meta.perUserListTimelineCacheMax / 2).toString(),
- '*',
- 'note', note.id);
+ this.fanoutTimelineService.push(`userListTimelineWithFiles:${userListMembership.userListId}`, note.id, meta.perUserListTimelineCacheMax / 2, r);
}
}
- { // 自分自身のHTL
- redisPipeline.xadd(
- `homeTimeline:${user.id}`,
- 'MAXLEN', '~', meta.perUserHomeTimelineCacheMax.toString(),
- '*',
- 'note', note.id);
-
+ if (note.visibility !== 'specified' || !note.visibleUserIds.some(v => v === user.id)) { // 自分自身のHTL
+ this.fanoutTimelineService.push(`homeTimeline:${user.id}`, note.id, meta.perUserHomeTimelineCacheMax, r);
if (note.fileIds.length > 0) {
- redisPipeline.xadd(
- `homeTimelineWithFiles:${user.id}`,
- 'MAXLEN', '~', (meta.perUserHomeTimelineCacheMax / 2).toString(),
- '*',
- 'note', note.id);
+ this.fanoutTimelineService.push(`homeTimelineWithFiles:${user.id}`, note.id, meta.perUserHomeTimelineCacheMax / 2, r);
}
}
// 自分自身以外への返信
- if (note.replyId && note.replyUserId !== note.userId) {
- redisPipeline.xadd(
- `userTimelineWithReplies:${user.id}`,
- 'MAXLEN', '~', note.userHost == null ? meta.perLocalUserUserTimelineCacheMax.toString() : meta.perRemoteUserUserTimelineCacheMax.toString(),
- '*',
- 'note', note.id);
- } else {
- redisPipeline.xadd(
- `userTimeline:${user.id}`,
- 'MAXLEN', '~', note.userHost == null ? meta.perLocalUserUserTimelineCacheMax.toString() : meta.perRemoteUserUserTimelineCacheMax.toString(),
- '*',
- 'note', note.id);
+ if (isReply(note)) {
+ this.fanoutTimelineService.push(`userTimelineWithReplies:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
+ if (note.visibility === 'public' && note.userHost == null) {
+ this.fanoutTimelineService.push('localTimelineWithReplies', note.id, 300, r);
+ if (note.replyUserHost == null) {
+ this.fanoutTimelineService.push(`localTimelineWithReplyTo:${note.replyUserId}`, note.id, 300 / 10, r);
+ }
+ }
+ } else {
+ this.fanoutTimelineService.push(`userTimeline:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
if (note.fileIds.length > 0) {
- redisPipeline.xadd(
- `userTimelineWithFiles:${user.id}`,
- 'MAXLEN', '~', note.userHost == null ? (meta.perLocalUserUserTimelineCacheMax / 2).toString() : (meta.perRemoteUserUserTimelineCacheMax / 2).toString(),
- '*',
- 'note', note.id);
+ this.fanoutTimelineService.push(`userTimelineWithFiles:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax / 2 : meta.perRemoteUserUserTimelineCacheMax / 2, r);
}
if (note.visibility === 'public' && note.userHost == null) {
- redisPipeline.xadd(
- 'localTimeline',
- 'MAXLEN', '~', '1000',
- '*',
- 'note', note.id);
-
+ this.fanoutTimelineService.push('localTimeline', note.id, 1000, r);
if (note.fileIds.length > 0) {
- redisPipeline.xadd(
- 'localTimelineWithFiles',
- 'MAXLEN', '~', '500',
- '*',
- 'note', note.id);
+ this.fanoutTimelineService.push('localTimelineWithFiles', note.id, 500, r);
}
}
}
@@ -988,7 +964,7 @@ export class NoteCreateService implements OnApplicationShutdown {
}
}
- redisPipeline.exec();
+ r.exec();
}
@bindThis
diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index 9a817ffd76..632daf991a 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -24,6 +24,7 @@ import { bindThis } from '@/decorators.js';
import { MetaService } from '@/core/MetaService.js';
import { SearchService } from '@/core/SearchService.js';
import { ModerationLogService } from '@/core/ModerationLogService.js';
+import { isPureRenote } from '@/misc/is-pure-renote.js';
@Injectable()
export class NoteDeleteService {
@@ -77,8 +78,8 @@ export class NoteDeleteService {
if (this.userEntityService.isLocalUser(user) && !note.localOnly) {
let renote: MiNote | null = null;
- // if deletd note is renote
- if (note.renoteId && note.text == null && !note.hasPoll && (note.fileIds == null || note.fileIds.length === 0)) {
+ // if deleted note is renote
+ if (isPureRenote(note)) {
renote = await this.notesRepository.findOneBy({
id: note.renoteId,
});
diff --git a/packages/backend/src/core/NotePiningService.ts b/packages/backend/src/core/NotePiningService.ts
index 147554ee9a..74e53c5c46 100644
--- a/packages/backend/src/core/NotePiningService.ts
+++ b/packages/backend/src/core/NotePiningService.ts
@@ -71,14 +71,13 @@ export class NotePiningService {
}
await this.userNotePiningsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
userId: user.id,
noteId: note.id,
} as MiUserNotePining);
// Deliver to remote followers
- if (this.userEntityService.isLocalUser(user)) {
+ if (this.userEntityService.isLocalUser(user) && !note.localOnly && ['public', 'home'].includes(note.visibility)) {
this.deliverPinnedChange(user.id, note.id, true);
}
}
@@ -106,7 +105,7 @@ export class NotePiningService {
});
// Deliver to remote followers
- if (this.userEntityService.isLocalUser(user)) {
+ if (this.userEntityService.isLocalUser(user) && !note.localOnly && ['public', 'home'].includes(note.visibility)) {
this.deliverPinnedChange(user.id, noteId, false);
}
}
diff --git a/packages/backend/src/core/NoteReadService.ts b/packages/backend/src/core/NoteReadService.ts
index 422e0192cf..03c1735e04 100644
--- a/packages/backend/src/core/NoteReadService.ts
+++ b/packages/backend/src/core/NoteReadService.ts
@@ -57,7 +57,7 @@ export class NoteReadService implements OnApplicationShutdown {
if (isThreadMuted) return;
const unread = {
- id: this.idService.genId(),
+ id: this.idService.gen(),
noteId: note.id,
userId: userId,
isSpecified: params.isSpecified,
diff --git a/packages/backend/src/core/NotificationService.ts b/packages/backend/src/core/NotificationService.ts
index 32d54d2576..ad7be83e5b 100644
--- a/packages/backend/src/core/NotificationService.ts
+++ b/packages/backend/src/core/NotificationService.ts
@@ -19,6 +19,7 @@ import { IdService } from '@/core/IdService.js';
import { CacheService } from '@/core/CacheService.js';
import type { Config } from '@/config.js';
import { UserListService } from '@/core/UserListService.js';
+import type { FilterUnionByProperty } from '@/types.js';
@Injectable()
export class NotificationService implements OnApplicationShutdown {
@@ -73,10 +74,10 @@ export class NotificationService implements OnApplicationShutdown {
}
@bindThis
- public async createNotification(
+ public async createNotification(
notifieeId: MiUser['id'],
- type: MiNotification['type'],
- data: Omit, 'notifierId'>,
+ type: T,
+ data: Omit, 'type' | 'id' | 'createdAt' | 'notifierId'>,
notifierId?: MiUser['id'] | null,
): Promise {
const profile = await this.cacheService.userProfileCache.fetch(notifieeId);
@@ -125,12 +126,14 @@ export class NotificationService implements OnApplicationShutdown {
}
const notification = {
- id: this.idService.genId(),
+ id: this.idService.gen(),
createdAt: new Date(),
type: type,
- notifierId: notifierId,
+ ...(notifierId ? {
+ notifierId,
+ } : {}),
...data,
- } as MiNotification;
+ } as any as FilterUnionByProperty;
const redisIdPromise = this.redisClient.xadd(
`notificationTimeline:${notifieeId}`,
@@ -144,7 +147,9 @@ export class NotificationService implements OnApplicationShutdown {
this.globalEventService.publishMainStream(notifieeId, 'notification', packed);
// 2秒経っても(今回作成した)通知が既読にならなかったら「未読の通知がありますよ」イベントを発行する
- setTimeout(2000, 'unread notification', { signal: this.#shutdownController.signal }).then(async () => {
+ // テスト通知の場合は即時発行
+ const interval = notification.type === 'test' ? 0 : 2000;
+ setTimeout(interval, 'unread notification', { signal: this.#shutdownController.signal }).then(async () => {
const latestReadNotificationId = await this.redisClient.get(`latestReadNotification:${notifieeId}`);
if (latestReadNotificationId && (latestReadNotificationId >= (await redisIdPromise)!)) return;
diff --git a/packages/backend/src/core/PollService.ts b/packages/backend/src/core/PollService.ts
index 570f2350f1..9e1b5ca78a 100644
--- a/packages/backend/src/core/PollService.ts
+++ b/packages/backend/src/core/PollService.ts
@@ -72,10 +72,8 @@ export class PollService {
throw new Error('already voted');
}
- // Create vote
await this.pollVotesRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
noteId: note.id,
userId: user.id,
choice: choice,
diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index 18bd49286e..f006ed4944 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -9,6 +9,7 @@ import { DI } from '@/di-symbols.js';
import type { MiUser } from '@/models/User.js';
import type { UserProfilesRepository, FollowingsRepository, ChannelFollowingsRepository, BlockingsRepository, NoteThreadMutingsRepository, MutingsRepository, RenoteMutingsRepository } from '@/models/_.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import type { SelectQueryBuilder } from 'typeorm';
@Injectable()
@@ -34,10 +35,12 @@ export class QueryService {
@Inject(DI.renoteMutingsRepository)
private renoteMutingsRepository: RenoteMutingsRepository,
+
+ private idService: IdService,
) {
}
- public makePaginationQuery(q: SelectQueryBuilder, sinceId?: string, untilId?: string, sinceDate?: number, untilDate?: number): SelectQueryBuilder {
+ public makePaginationQuery(q: SelectQueryBuilder, sinceId?: string | null, untilId?: string | null, sinceDate?: number | null, untilDate?: number | null): SelectQueryBuilder {
if (sinceId && untilId) {
q.andWhere(`${q.alias}.id > :sinceId`, { sinceId: sinceId });
q.andWhere(`${q.alias}.id < :untilId`, { untilId: untilId });
@@ -49,15 +52,15 @@ export class QueryService {
q.andWhere(`${q.alias}.id < :untilId`, { untilId: untilId });
q.orderBy(`${q.alias}.id`, 'DESC');
} else if (sinceDate && untilDate) {
- q.andWhere(`${q.alias}.createdAt > :sinceDate`, { sinceDate: new Date(sinceDate) });
- q.andWhere(`${q.alias}.createdAt < :untilDate`, { untilDate: new Date(untilDate) });
- q.orderBy(`${q.alias}.createdAt`, 'DESC');
+ q.andWhere(`${q.alias}.id > :sinceId`, { sinceId: this.idService.gen(sinceDate) });
+ q.andWhere(`${q.alias}.id < :untilId`, { untilId: this.idService.gen(untilDate) });
+ q.orderBy(`${q.alias}.id`, 'DESC');
} else if (sinceDate) {
- q.andWhere(`${q.alias}.createdAt > :sinceDate`, { sinceDate: new Date(sinceDate) });
- q.orderBy(`${q.alias}.createdAt`, 'ASC');
+ q.andWhere(`${q.alias}.id > :sinceId`, { sinceId: this.idService.gen(sinceDate) });
+ q.orderBy(`${q.alias}.id`, 'ASC');
} else if (untilDate) {
- q.andWhere(`${q.alias}.createdAt < :untilDate`, { untilDate: new Date(untilDate) });
- q.orderBy(`${q.alias}.createdAt`, 'DESC');
+ q.andWhere(`${q.alias}.id < :untilId`, { untilId: this.idService.gen(untilDate) });
+ q.orderBy(`${q.alias}.id`, 'DESC');
} else {
q.orderBy(`${q.alias}.id`, 'DESC');
}
@@ -76,13 +79,15 @@ export class QueryService {
// 投稿の引用元の作者にブロックされていない
q
.andWhere(`note.userId NOT IN (${ blockingQuery.getQuery() })`)
- .andWhere(new Brackets(qb => { qb
- .where('note.replyUserId IS NULL')
- .orWhere(`note.replyUserId NOT IN (${ blockingQuery.getQuery() })`);
+ .andWhere(new Brackets(qb => {
+ qb
+ .where('note.replyUserId IS NULL')
+ .orWhere(`note.replyUserId NOT IN (${ blockingQuery.getQuery() })`);
}))
- .andWhere(new Brackets(qb => { qb
- .where('note.renoteUserId IS NULL')
- .orWhere(`note.renoteUserId NOT IN (${ blockingQuery.getQuery() })`);
+ .andWhere(new Brackets(qb => {
+ qb
+ .where('note.renoteUserId IS NULL')
+ .orWhere(`note.renoteUserId NOT IN (${ blockingQuery.getQuery() })`);
}));
q.setParameters(blockingQuery.getParameters());
@@ -112,16 +117,17 @@ export class QueryService {
.where('threadMuted.userId = :userId', { userId: me.id });
q.andWhere(`note.id NOT IN (${ mutedQuery.getQuery() })`);
- q.andWhere(new Brackets(qb => { qb
- .where('note.threadId IS NULL')
- .orWhere(`note.threadId NOT IN (${ mutedQuery.getQuery() })`);
+ q.andWhere(new Brackets(qb => {
+ qb
+ .where('note.threadId IS NULL')
+ .orWhere(`note.threadId NOT IN (${ mutedQuery.getQuery() })`);
}));
q.setParameters(mutedQuery.getParameters());
}
@bindThis
- public generateMutedUserQuery(q: SelectQueryBuilder, me: { id: MiUser['id'] }, exclude?: MiUser): void {
+ public generateMutedUserQuery(q: SelectQueryBuilder, me: { id: MiUser['id'] }, exclude?: { id: MiUser['id'] }): void {
const mutingQuery = this.mutingsRepository.createQueryBuilder('muting')
.select('muting.muteeId')
.where('muting.muterId = :muterId', { muterId: me.id });
@@ -139,26 +145,31 @@ export class QueryService {
// 投稿の引用元の作者をミュートしていない
q
.andWhere(`note.userId NOT IN (${ mutingQuery.getQuery() })`)
- .andWhere(new Brackets(qb => { qb
- .where('note.replyUserId IS NULL')
- .orWhere(`note.replyUserId NOT IN (${ mutingQuery.getQuery() })`);
+ .andWhere(new Brackets(qb => {
+ qb
+ .where('note.replyUserId IS NULL')
+ .orWhere(`note.replyUserId NOT IN (${ mutingQuery.getQuery() })`);
}))
- .andWhere(new Brackets(qb => { qb
- .where('note.renoteUserId IS NULL')
- .orWhere(`note.renoteUserId NOT IN (${ mutingQuery.getQuery() })`);
+ .andWhere(new Brackets(qb => {
+ qb
+ .where('note.renoteUserId IS NULL')
+ .orWhere(`note.renoteUserId NOT IN (${ mutingQuery.getQuery() })`);
}))
// mute instances
- .andWhere(new Brackets(qb => { qb
- .andWhere('note.userHost IS NULL')
- .orWhere(`NOT ((${ mutingInstanceQuery.getQuery() })::jsonb ? note.userHost)`);
+ .andWhere(new Brackets(qb => {
+ qb
+ .andWhere('note.userHost IS NULL')
+ .orWhere(`NOT ((${ mutingInstanceQuery.getQuery() })::jsonb ? note.userHost)`);
}))
- .andWhere(new Brackets(qb => { qb
- .where('note.replyUserHost IS NULL')
- .orWhere(`NOT ((${ mutingInstanceQuery.getQuery() })::jsonb ? note.replyUserHost)`);
+ .andWhere(new Brackets(qb => {
+ qb
+ .where('note.replyUserHost IS NULL')
+ .orWhere(`NOT ((${ mutingInstanceQuery.getQuery() })::jsonb ? note.replyUserHost)`);
}))
- .andWhere(new Brackets(qb => { qb
- .where('note.renoteUserHost IS NULL')
- .orWhere(`NOT ((${ mutingInstanceQuery.getQuery() })::jsonb ? note.renoteUserHost)`);
+ .andWhere(new Brackets(qb => {
+ qb
+ .where('note.renoteUserHost IS NULL')
+ .orWhere(`NOT ((${ mutingInstanceQuery.getQuery() })::jsonb ? note.renoteUserHost)`);
}));
q.setParameters(mutingQuery.getParameters());
@@ -180,36 +191,41 @@ export class QueryService {
public generateVisibilityQuery(q: SelectQueryBuilder, me?: { id: MiUser['id'] } | null): void {
// This code must always be synchronized with the checks in Notes.isVisibleForMe.
if (me == null) {
- q.andWhere(new Brackets(qb => { qb
- .where('note.visibility = \'public\'')
- .orWhere('note.visibility = \'home\'');
+ q.andWhere(new Brackets(qb => {
+ qb
+ .where('note.visibility = \'public\'')
+ .orWhere('note.visibility = \'home\'');
}));
} else {
const followingQuery = this.followingsRepository.createQueryBuilder('following')
.select('following.followeeId')
.where('following.followerId = :meId');
- q.andWhere(new Brackets(qb => { qb
+ q.andWhere(new Brackets(qb => {
+ qb
// 公開投稿である
- .where(new Brackets(qb => { qb
- .where('note.visibility = \'public\'')
- .orWhere('note.visibility = \'home\'');
- }))
+ .where(new Brackets(qb => {
+ qb
+ .where('note.visibility = \'public\'')
+ .orWhere('note.visibility = \'home\'');
+ }))
// または 自分自身
- .orWhere('note.userId = :meId')
+ .orWhere('note.userId = :meId')
// または 自分宛て
- .orWhere(':meId = ANY(note.visibleUserIds)')
- .orWhere(':meId = ANY(note.mentions)')
- .orWhere(new Brackets(qb => { qb
- // または フォロワー宛ての投稿であり、
- .where('note.visibility = \'followers\'')
- .andWhere(new Brackets(qb => { qb
- // 自分がフォロワーである
- .where(`note.userId IN (${ followingQuery.getQuery() })`)
- // または 自分の投稿へのリプライ
- .orWhere('note.replyUserId = :meId');
+ .orWhere(':meId = ANY(note.visibleUserIds)')
+ .orWhere(':meId = ANY(note.mentions)')
+ .orWhere(new Brackets(qb => {
+ qb
+ // または フォロワー宛ての投稿であり、
+ .where('note.visibility = \'followers\'')
+ .andWhere(new Brackets(qb => {
+ qb
+ // 自分がフォロワーである
+ .where(`note.userId IN (${ followingQuery.getQuery() })`)
+ // または 自分の投稿へのリプライ
+ .orWhere('note.replyUserId = :meId');
+ }));
}));
- }));
}));
q.setParameters({ meId: me.id });
diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index d8c7250034..be378a899b 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -237,10 +237,11 @@ export class QueueService {
}
@bindThis
- public createImportFollowingJob(user: ThinUser, fileId: MiDriveFile['id']) {
+ public createImportFollowingJob(user: ThinUser, fileId: MiDriveFile['id'], withReplies?: boolean) {
return this.dbQueue.add('importFollowing', {
user: { id: user.id },
fileId: fileId,
+ withReplies,
}, {
removeOnComplete: true,
removeOnFail: true,
@@ -248,8 +249,8 @@ export class QueueService {
}
@bindThis
- public createImportFollowingToDbJob(user: ThinUser, targets: string[]) {
- const jobs = targets.map(rel => this.generateToDbJobData('importFollowingToDb', { user, target: rel }));
+ public createImportFollowingToDbJob(user: ThinUser, targets: string[], withReplies?: boolean) {
+ const jobs = targets.map(rel => this.generateToDbJobData('importFollowingToDb', { user, target: rel, withReplies }));
return this.dbQueue.addBulk(jobs);
}
@@ -342,7 +343,7 @@ export class QueueService {
}
@bindThis
- public createFollowJob(followings: { from: ThinUser, to: ThinUser, requestId?: string, silent?: boolean }[]) {
+ public createFollowJob(followings: { from: ThinUser, to: ThinUser, requestId?: string, silent?: boolean, withReplies?: boolean }[]) {
const jobs = followings.map(rel => this.generateRelationshipJobData('follow', rel));
return this.relationshipQueue.addBulk(jobs);
}
@@ -384,6 +385,7 @@ export class QueueService {
to: { id: data.to.id },
silent: data.silent,
requestId: data.requestId,
+ withReplies: data.withReplies,
},
opts: {
removeOnComplete: true,
diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts
index e7bbd44926..4233b8d4c3 100644
--- a/packages/backend/src/core/ReactionService.ts
+++ b/packages/backend/src/core/ReactionService.ts
@@ -30,6 +30,7 @@ import { RoleService } from '@/core/RoleService.js';
import { FeaturedService } from '@/core/FeaturedService.js';
const FALLBACK = '❤';
+const PER_NOTE_REACTION_USER_PAIR_CACHE_MAX = 16;
const legacies: Record = {
'like': '👍',
@@ -148,13 +149,12 @@ export class ReactionService {
reaction = FALLBACK;
}
} else {
- reaction = this.normalize(reaction ?? null);
+ reaction = this.normalize(reaction);
}
}
const record: MiNoteReaction = {
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
noteId: note.id,
userId: user.id,
reaction,
@@ -188,6 +188,9 @@ export class ReactionService {
await this.notesRepository.createQueryBuilder().update()
.set({
reactions: () => sql,
+ ...(note.reactionAndUserPairCache.length < PER_NOTE_REACTION_USER_PAIR_CACHE_MAX ? {
+ reactionAndUserPairCache: () => `array_append("reactionAndUserPairCache", '${user.id}/${reaction}')`,
+ } : {}),
})
.where('id = :id', { id: note.id })
.execute();
@@ -294,6 +297,7 @@ export class ReactionService {
await this.notesRepository.createQueryBuilder().update()
.set({
reactions: () => sql,
+ reactionAndUserPairCache: () => `array_remove("reactionAndUserPairCache", '${user.id}/${exist.reaction}')`,
})
.where('id = :id', { id: note.id })
.execute();
diff --git a/packages/backend/src/core/RegistryApiService.ts b/packages/backend/src/core/RegistryApiService.ts
new file mode 100644
index 0000000000..d340c5e480
--- /dev/null
+++ b/packages/backend/src/core/RegistryApiService.ts
@@ -0,0 +1,147 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { DI } from '@/di-symbols.js';
+import type { MiRegistryItem, RegistryItemsRepository } from '@/models/_.js';
+import { IdentifiableError } from '@/misc/identifiable-error.js';
+import type { MiUser } from '@/models/User.js';
+import { IdService } from '@/core/IdService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { bindThis } from '@/decorators.js';
+
+@Injectable()
+export class RegistryApiService {
+ constructor(
+ @Inject(DI.registryItemsRepository)
+ private registryItemsRepository: RegistryItemsRepository,
+
+ private idService: IdService,
+ private globalEventService: GlobalEventService,
+ ) {
+ }
+
+ @bindThis
+ public async set(userId: MiUser['id'], domain: string | null, scope: string[], key: string, value: any) {
+ // TODO: 作成できるキーの数を制限する
+
+ const query = this.registryItemsRepository.createQueryBuilder('item');
+ if (domain) {
+ query.where('item.domain = :domain', { domain: domain });
+ } else {
+ query.where('item.domain IS NULL');
+ }
+ query.andWhere('item.userId = :userId', { userId: userId });
+ query.andWhere('item.key = :key', { key: key });
+ query.andWhere('item.scope = :scope', { scope: scope });
+
+ const existingItem = await query.getOne();
+
+ if (existingItem) {
+ await this.registryItemsRepository.update(existingItem.id, {
+ updatedAt: new Date(),
+ value: value,
+ });
+ } else {
+ await this.registryItemsRepository.insert({
+ id: this.idService.gen(),
+ updatedAt: new Date(),
+ userId: userId,
+ domain: domain,
+ scope: scope,
+ key: key,
+ value: value,
+ });
+ }
+
+ if (domain == null) {
+ // TODO: サードパーティアプリが傍受出来てしまうのでどうにかする
+ this.globalEventService.publishMainStream(userId, 'registryUpdated', {
+ scope: scope,
+ key: key,
+ value: value,
+ });
+ }
+ }
+
+ @bindThis
+ public async getItem(userId: MiUser['id'], domain: string | null, scope: string[], key: string): Promise {
+ const query = this.registryItemsRepository.createQueryBuilder('item')
+ .where(domain == null ? 'item.domain IS NULL' : 'item.domain = :domain', { domain: domain })
+ .andWhere('item.userId = :userId', { userId: userId })
+ .andWhere('item.key = :key', { key: key })
+ .andWhere('item.scope = :scope', { scope: scope });
+
+ const item = await query.getOne();
+
+ return item;
+ }
+
+ @bindThis
+ public async getAllItemsOfScope(userId: MiUser['id'], domain: string | null, scope: string[]): Promise {
+ const query = this.registryItemsRepository.createQueryBuilder('item');
+ query.where(domain == null ? 'item.domain IS NULL' : 'item.domain = :domain', { domain: domain });
+ query.andWhere('item.userId = :userId', { userId: userId });
+ query.andWhere('item.scope = :scope', { scope: scope });
+
+ const items = await query.getMany();
+
+ return items;
+ }
+
+ @bindThis
+ public async getAllKeysOfScope(userId: MiUser['id'], domain: string | null, scope: string[]): Promise {
+ const query = this.registryItemsRepository.createQueryBuilder('item');
+ query.select('item.key');
+ query.where(domain == null ? 'item.domain IS NULL' : 'item.domain = :domain', { domain: domain });
+ query.andWhere('item.userId = :userId', { userId: userId });
+ query.andWhere('item.scope = :scope', { scope: scope });
+
+ const items = await query.getMany();
+
+ return items.map(x => x.key);
+ }
+
+ @bindThis
+ public async getAllScopeAndDomains(userId: MiUser['id']): Promise<{ domain: string | null; scopes: string[][] }[]> {
+ const query = this.registryItemsRepository.createQueryBuilder('item')
+ .select(['item.scope', 'item.domain'])
+ .where('item.userId = :userId', { userId: userId });
+
+ const items = await query.getMany();
+
+ const res = [] as { domain: string | null; scopes: string[][] }[];
+
+ for (const item of items) {
+ const target = res.find(x => x.domain === item.domain);
+ if (target) {
+ if (target.scopes.some(scope => scope.join('.') === item.scope.join('.'))) continue;
+ target.scopes.push(item.scope);
+ } else {
+ res.push({
+ domain: item.domain,
+ scopes: [item.scope],
+ });
+ }
+ }
+
+ return res;
+ }
+
+ @bindThis
+ public async remove(userId: MiUser['id'], domain: string | null, scope: string[], key: string) {
+ const query = this.registryItemsRepository.createQueryBuilder().delete();
+ if (domain) {
+ query.where('domain = :domain', { domain: domain });
+ } else {
+ query.where('domain IS NULL');
+ }
+ query.andWhere('userId = :userId', { userId: userId });
+ query.andWhere('key = :key', { key: key });
+ query.andWhere('scope = :scope', { scope: scope });
+
+ await query.execute();
+ }
+}
diff --git a/packages/backend/src/core/RelayService.ts b/packages/backend/src/core/RelayService.ts
index 7171bf84c5..d40cd080c7 100644
--- a/packages/backend/src/core/RelayService.ts
+++ b/packages/backend/src/core/RelayService.ts
@@ -54,7 +54,7 @@ export class RelayService {
@bindThis
public async addRelay(inbox: string): Promise {
const relay = await this.relaysRepository.insert({
- id: this.idService.genId(),
+ id: this.idService.gen(),
inbox,
status: 'requesting',
}).then(x => this.relaysRepository.findOneByOrFail(x.identifiers[0]));
diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts
index f2bd9de5ee..d354faa7c2 100644
--- a/packages/backend/src/core/RoleService.ts
+++ b/packages/backend/src/core/RoleService.ts
@@ -6,7 +6,14 @@
import { Inject, Injectable } from '@nestjs/common';
import * as Redis from 'ioredis';
import { In } from 'typeorm';
-import type { MiRole, MiRoleAssignment, RoleAssignmentsRepository, RolesRepository, UsersRepository } from '@/models/_.js';
+import { ModuleRef } from '@nestjs/core';
+import type {
+ MiRole,
+ MiRoleAssignment,
+ RoleAssignmentsRepository,
+ RolesRepository,
+ UsersRepository,
+} from '@/models/_.js';
import { MemoryKVCache, MemorySingleCache } from '@/misc/cache.js';
import type { MiUser } from '@/models/User.js';
import { DI } from '@/di-symbols.js';
@@ -16,11 +23,13 @@ import { CacheService } from '@/core/CacheService.js';
import type { RoleCondFormulaValue } from '@/models/Role.js';
import { UserEntityService } from '@/core/entities/UserEntityService.js';
import type { GlobalEvents } from '@/core/GlobalEventService.js';
-import { IdService } from '@/core/IdService.js';
import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { IdService } from '@/core/IdService.js';
import { ModerationLogService } from '@/core/ModerationLogService.js';
import type { Packed } from '@/misc/json-schema.js';
-import type { OnApplicationShutdown } from '@nestjs/common';
+import { FanoutTimelineService } from '@/core/FanoutTimelineService.js';
+import { NotificationService } from '@/core/NotificationService.js';
+import type { OnApplicationShutdown, OnModuleInit } from '@nestjs/common';
export type RolePolicies = {
gtlAvailable: boolean;
@@ -31,6 +40,7 @@ export type RolePolicies = {
inviteLimitCycle: number;
inviteExpirationTime: number;
canManageCustomEmojis: boolean;
+ canManageAvatarDecorations: boolean;
canSearchNotes: boolean;
canUseTranslator: boolean;
canHideAds: boolean;
@@ -45,6 +55,7 @@ export type RolePolicies = {
userListLimit: number;
userEachUserListsLimit: number;
rateLimitFactor: number;
+ avatarDecorationLimit: number;
};
export const DEFAULT_POLICIES: RolePolicies = {
@@ -56,6 +67,7 @@ export const DEFAULT_POLICIES: RolePolicies = {
inviteLimitCycle: 60 * 24 * 7,
inviteExpirationTime: 0,
canManageCustomEmojis: false,
+ canManageAvatarDecorations: false,
canSearchNotes: false,
canUseTranslator: true,
canHideAds: false,
@@ -70,20 +82,27 @@ export const DEFAULT_POLICIES: RolePolicies = {
userListLimit: 10,
userEachUserListsLimit: 50,
rateLimitFactor: 1,
+ avatarDecorationLimit: 1,
};
@Injectable()
-export class RoleService implements OnApplicationShutdown {
+export class RoleService implements OnApplicationShutdown, OnModuleInit {
private rolesCache: MemorySingleCache;
private roleAssignmentByUserIdCache: MemoryKVCache;
+ private notificationService: NotificationService;
public static AlreadyAssignedError = class extends Error {};
public static NotAssignedError = class extends Error {};
constructor(
+ private moduleRef: ModuleRef,
+
@Inject(DI.redis)
private redisClient: Redis.Redis,
+ @Inject(DI.redisForTimelines)
+ private redisForTimelines: Redis.Redis,
+
@Inject(DI.redisForSub)
private redisForSub: Redis.Redis,
@@ -102,6 +121,7 @@ export class RoleService implements OnApplicationShutdown {
private globalEventService: GlobalEventService,
private idService: IdService,
private moderationLogService: ModerationLogService,
+ private fanoutTimelineService: FanoutTimelineService,
) {
//this.onMessage = this.onMessage.bind(this);
@@ -111,6 +131,10 @@ export class RoleService implements OnApplicationShutdown {
this.redisForSub.on('message', this.onMessage);
}
+ async onModuleInit() {
+ this.notificationService = this.moduleRef.get(NotificationService.name);
+ }
+
@bindThis
private async onMessage(_: string, data: string): Promise {
const obj = JSON.parse(data);
@@ -123,7 +147,6 @@ export class RoleService implements OnApplicationShutdown {
if (cached) {
cached.push({
...body,
- createdAt: new Date(body.createdAt),
updatedAt: new Date(body.updatedAt),
lastUsedAt: new Date(body.lastUsedAt),
});
@@ -137,7 +160,6 @@ export class RoleService implements OnApplicationShutdown {
if (i > -1) {
cached[i] = {
...body,
- createdAt: new Date(body.createdAt),
updatedAt: new Date(body.updatedAt),
lastUsedAt: new Date(body.lastUsedAt),
};
@@ -157,7 +179,6 @@ export class RoleService implements OnApplicationShutdown {
if (cached) {
cached.push({
...body,
- createdAt: new Date(body.createdAt),
expiresAt: body.expiresAt ? new Date(body.expiresAt) : null,
});
}
@@ -196,10 +217,10 @@ export class RoleService implements OnApplicationShutdown {
return this.userEntityService.isRemoteUser(user);
}
case 'createdLessThan': {
- return user.createdAt.getTime() > (Date.now() - (value.sec * 1000));
+ return this.idService.parse(user.id).date.getTime() > (Date.now() - (value.sec * 1000));
}
case 'createdMoreThan': {
- return user.createdAt.getTime() < (Date.now() - (value.sec * 1000));
+ return this.idService.parse(user.id).date.getTime() < (Date.now() - (value.sec * 1000));
}
case 'followersLessThanOrEq': {
return user.followersCount <= value.value;
@@ -228,6 +249,12 @@ export class RoleService implements OnApplicationShutdown {
}
}
+ @bindThis
+ public async getRoles() {
+ const roles = await this.rolesCache.fetch(() => this.rolesRepository.findBy({}));
+ return roles;
+ }
+
@bindThis
public async getUserAssigns(userId: MiUser['id']) {
const now = Date.now();
@@ -301,6 +328,7 @@ export class RoleService implements OnApplicationShutdown {
inviteLimitCycle: calc('inviteLimitCycle', vs => Math.max(...vs)),
inviteExpirationTime: calc('inviteExpirationTime', vs => Math.max(...vs)),
canManageCustomEmojis: calc('canManageCustomEmojis', vs => vs.some(v => v === true)),
+ canManageAvatarDecorations: calc('canManageAvatarDecorations', vs => vs.some(v => v === true)),
canSearchNotes: calc('canSearchNotes', vs => vs.some(v => v === true)),
canUseTranslator: calc('canUseTranslator', vs => vs.some(v => v === true)),
canHideAds: calc('canHideAds', vs => vs.some(v => v === true)),
@@ -315,6 +343,7 @@ export class RoleService implements OnApplicationShutdown {
userListLimit: calc('userListLimit', vs => Math.max(...vs)),
userEachUserListsLimit: calc('userEachUserListsLimit', vs => Math.max(...vs)),
rateLimitFactor: calc('rateLimitFactor', vs => Math.max(...vs)),
+ avatarDecorationLimit: calc('avatarDecorationLimit', vs => Math.max(...vs)),
};
}
@@ -380,7 +409,7 @@ export class RoleService implements OnApplicationShutdown {
@bindThis
public async assign(userId: MiUser['id'], roleId: MiRole['id'], expiresAt: Date | null = null, moderator?: MiUser): Promise {
- const now = new Date();
+ const now = Date.now();
const role = await this.rolesRepository.findOneByOrFail({ id: roleId });
@@ -390,7 +419,7 @@ export class RoleService implements OnApplicationShutdown {
});
if (existing) {
- if (existing.expiresAt && (existing.expiresAt.getTime() < now.getTime())) {
+ if (existing.expiresAt && (existing.expiresAt.getTime() < now)) {
await this.roleAssignmentsRepository.delete({
roleId: roleId,
userId: userId,
@@ -401,8 +430,7 @@ export class RoleService implements OnApplicationShutdown {
}
const created = await this.roleAssignmentsRepository.insert({
- id: this.idService.genId(),
- createdAt: now,
+ id: this.idService.gen(now),
expiresAt: expiresAt,
roleId: roleId,
userId: userId,
@@ -414,6 +442,12 @@ export class RoleService implements OnApplicationShutdown {
this.globalEventService.publishInternalEvent('userRoleAssigned', created);
+ if (role.isPublic) {
+ this.notificationService.createNotification(userId, 'roleAssigned', {
+ roleId: roleId,
+ });
+ }
+
if (moderator) {
const user = await this.usersRepository.findOneByOrFail({ id: userId });
this.moderationLogService.log(moderator, 'assignRole', {
@@ -469,15 +503,10 @@ export class RoleService implements OnApplicationShutdown {
public async addNoteToRoleTimeline(note: Packed<'Note'>): Promise {
const roles = await this.getUserRoles(note.userId);
- const redisPipeline = this.redisClient.pipeline();
+ const redisPipeline = this.redisForTimelines.pipeline();
for (const role of roles) {
- redisPipeline.xadd(
- `roleTimeline:${role.id}`,
- 'MAXLEN', '~', '1000',
- '*',
- 'note', note.id);
-
+ this.fanoutTimelineService.push(`roleTimeline:${role.id}`, note.id, 1000, redisPipeline);
this.globalEventService.publishRoleTimelineStream(role.id, 'note', note);
}
@@ -488,8 +517,7 @@ export class RoleService implements OnApplicationShutdown {
public async create(values: Partial, moderator?: MiUser): Promise {
const date = new Date();
const created = await this.rolesRepository.insert({
- id: this.idService.genId(),
- createdAt: date,
+ id: this.idService.gen(date.getTime()),
updatedAt: date,
lastUsedAt: date,
name: values.name,
diff --git a/packages/backend/src/core/SearchService.ts b/packages/backend/src/core/SearchService.ts
index 3ef321dd32..a46d68fd84 100644
--- a/packages/backend/src/core/SearchService.ts
+++ b/packages/backend/src/core/SearchService.ts
@@ -12,6 +12,8 @@ import { MiNote } from '@/models/Note.js';
import { MiUser } from '@/models/_.js';
import type { NotesRepository } from '@/models/_.js';
import { sqlLikeEscape } from '@/misc/sql-like-escape.js';
+import { isUserRelated } from '@/misc/is-user-related.js';
+import { CacheService } from '@/core/CacheService.js';
import { QueryService } from '@/core/QueryService.js';
import { IdService } from '@/core/IdService.js';
import type { Index, MeiliSearch } from 'meilisearch';
@@ -74,6 +76,7 @@ export class SearchService {
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
+ private cacheService: CacheService,
private queryService: QueryService,
private idService: IdService,
) {
@@ -131,7 +134,7 @@ export class SearchService {
await this.meilisearchNoteIndex?.addDocuments([{
id: note.id,
- createdAt: note.createdAt.getTime(),
+ createdAt: this.idService.parse(note.id).date.getTime(),
userId: note.userId,
userHost: note.userHost,
channelId: note.channelId,
@@ -187,8 +190,19 @@ export class SearchService {
limit: pagination.limit,
});
if (res.hits.length === 0) return [];
- const notes = await this.notesRepository.findBy({
+ const [
+ userIdsWhoMeMuting,
+ userIdsWhoBlockingMe,
+ ] = me ? await Promise.all([
+ this.cacheService.userMutingsCache.fetch(me.id),
+ this.cacheService.userBlockedCache.fetch(me.id),
+ ]) : [new Set(), new Set()];
+ const notes = (await this.notesRepository.findBy({
id: In(res.hits.map(x => x.id)),
+ })).filter(note => {
+ if (me && isUserRelated(note, userIdsWhoBlockingMe)) return false;
+ if (me && isUserRelated(note, userIdsWhoMeMuting)) return false;
+ return true;
});
return notes.sort((a, b) => a.id > b.id ? -1 : 1);
} else {
diff --git a/packages/backend/src/core/SignupService.ts b/packages/backend/src/core/SignupService.ts
index dfec0cfcfe..b9e3ded46f 100644
--- a/packages/backend/src/core/SignupService.ts
+++ b/packages/backend/src/core/SignupService.ts
@@ -120,8 +120,7 @@ export class SignupService {
if (exist) throw new Error(' the username is already used');
account = await transactionalEntityManager.save(new MiUser({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
username: username,
usernameLower: username.toLowerCase(),
host: this.utilityService.toPunyNullable(host),
diff --git a/packages/backend/src/core/UserBlockingService.ts b/packages/backend/src/core/UserBlockingService.ts
index 087dfd9214..39b19325c3 100644
--- a/packages/backend/src/core/UserBlockingService.ts
+++ b/packages/backend/src/core/UserBlockingService.ts
@@ -68,8 +68,7 @@ export class UserBlockingService implements OnModuleInit {
]);
const blocking = {
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
blocker,
blockerId: blocker.id,
blockee,
diff --git a/packages/backend/src/core/UserFollowingService.ts b/packages/backend/src/core/UserFollowingService.ts
index beffcc2e9c..d600ffb9d9 100644
--- a/packages/backend/src/core/UserFollowingService.ts
+++ b/packages/backend/src/core/UserFollowingService.ts
@@ -3,7 +3,7 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
-import { Inject, Injectable, OnModuleInit, forwardRef } from '@nestjs/common';
+import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
import { ModuleRef } from '@nestjs/core';
import { IsNull } from 'typeorm';
import type { MiLocalUser, MiPartialLocalUser, MiPartialRemoteUser, MiRemoteUser, MiUser } from '@/models/User.js';
@@ -28,6 +28,8 @@ import { MetaService } from '@/core/MetaService.js';
import { CacheService } from '@/core/CacheService.js';
import type { Config } from '@/config.js';
import { AccountMoveService } from '@/core/AccountMoveService.js';
+import { UtilityService } from '@/core/UtilityService.js';
+import { FanoutTimelineService } from '@/core/FanoutTimelineService.js';
import Logger from '../logger.js';
const logger = new Logger('following/create');
@@ -71,6 +73,7 @@ export class UserFollowingService implements OnModuleInit {
private instancesRepository: InstancesRepository,
private cacheService: CacheService,
+ private utilityService: UtilityService,
private userEntityService: UserEntityService,
private idService: IdService,
private queueService: QueueService,
@@ -81,6 +84,7 @@ export class UserFollowingService implements OnModuleInit {
private webhookService: WebhookService,
private apRendererService: ApRendererService,
private accountMoveService: AccountMoveService,
+ private fanoutTimelineService: FanoutTimelineService,
private perUserFollowingChart: PerUserFollowingChart,
private instanceChart: InstanceChart,
) {
@@ -91,7 +95,15 @@ export class UserFollowingService implements OnModuleInit {
}
@bindThis
- public async follow(_follower: { id: MiUser['id'] }, _followee: { id: MiUser['id'] }, requestId?: string, silent = false): Promise {
+ public async follow(
+ _follower: { id: MiUser['id'] },
+ _followee: { id: MiUser['id'] },
+ { requestId, silent = false, withReplies }: {
+ requestId?: string,
+ silent?: boolean,
+ withReplies?: boolean,
+ } = {},
+ ): Promise {
const [follower, followee] = await Promise.all([
this.usersRepository.findOneByOrFail({ id: _follower.id }),
this.usersRepository.findOneByOrFail({ id: _followee.id }),
@@ -118,15 +130,16 @@ export class UserFollowingService implements OnModuleInit {
}
const followeeProfile = await this.userProfilesRepository.findOneByOrFail({ userId: followee.id });
-
// フォロー対象が鍵アカウントである or
// フォロワーがBotであり、フォロー対象がBotからのフォローに慎重である or
- // フォロワーがローカルユーザーであり、フォロー対象がリモートユーザーである
+ // フォロワーがローカルユーザーであり、フォロー対象がリモートユーザーである or
+ // フォロワーがローカルユーザーであり、フォロー対象がサイレンスされているサーバーである
// 上記のいずれかに当てはまる場合はすぐフォローせずにフォローリクエストを発行しておく
if (
followee.isLocked ||
(followeeProfile.carefulBot && follower.isBot) ||
- (this.userEntityService.isLocalUser(follower) && this.userEntityService.isRemoteUser(followee) && process.env.FORCE_FOLLOW_REMOTE_USER_FOR_TESTING !== 'true')
+ (this.userEntityService.isLocalUser(follower) && this.userEntityService.isRemoteUser(followee) && process.env.FORCE_FOLLOW_REMOTE_USER_FOR_TESTING !== 'true') ||
+ (this.userEntityService.isLocalUser(followee) && this.userEntityService.isRemoteUser(follower) && this.utilityService.isSilencedHost((await this.metaService.fetch()).silencedHosts, follower.host))
) {
let autoAccept = false;
@@ -168,12 +181,12 @@ export class UserFollowingService implements OnModuleInit {
}
if (!autoAccept) {
- await this.createFollowRequest(follower, followee, requestId);
+ await this.createFollowRequest(follower, followee, requestId, withReplies);
return;
}
}
- await this.insertFollowingDoc(followee, follower, silent);
+ await this.insertFollowingDoc(followee, follower, silent, withReplies);
if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
const content = this.apRendererService.addContext(this.apRendererService.renderAccept(this.apRendererService.renderFollow(follower, followee, requestId), followee));
@@ -190,16 +203,17 @@ export class UserFollowingService implements OnModuleInit {
id: MiUser['id']; host: MiUser['host']; uri: MiUser['host']; inbox: MiUser['inbox']; sharedInbox: MiUser['sharedInbox']
},
silent = false,
+ withReplies?: boolean,
): Promise {
if (follower.id === followee.id) return;
let alreadyFollowed = false as boolean;
await this.followingsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
followerId: follower.id,
followeeId: followee.id,
+ withReplies: withReplies,
// 非正規化
followerHost: follower.host,
@@ -276,8 +290,8 @@ export class UserFollowingService implements OnModuleInit {
this.perUserFollowingChart.update(follower, followee, true);
}
- // Publish follow event
if (this.userEntityService.isLocalUser(follower) && !silent) {
+ // Publish follow event
this.userEntityService.pack(followee.id, follower, {
detail: true,
}).then(async packed => {
@@ -343,8 +357,8 @@ export class UserFollowingService implements OnModuleInit {
this.decrementFollowing(following.follower, following.followee);
- // Publish unfollow event
if (!silent && this.userEntityService.isLocalUser(follower)) {
+ // Publish unfollow event
this.userEntityService.pack(followee.id, follower, {
detail: true,
}).then(async packed => {
@@ -452,6 +466,7 @@ export class UserFollowingService implements OnModuleInit {
id: MiUser['id']; host: MiUser['host']; uri: MiUser['host']; inbox: MiUser['inbox']; sharedInbox: MiUser['sharedInbox'];
},
requestId?: string,
+ withReplies?: boolean,
): Promise {
if (follower.id === followee.id) return;
@@ -465,11 +480,11 @@ export class UserFollowingService implements OnModuleInit {
if (blocked) throw new Error('blocked');
const followRequest = await this.followRequestsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
followerId: follower.id,
followeeId: followee.id,
requestId,
+ withReplies,
// 非正規化
followerHost: follower.host,
@@ -490,7 +505,6 @@ export class UserFollowingService implements OnModuleInit {
// 通知を作成
this.notificationService.createNotification(followee.id, 'receiveFollowRequest', {
- followRequestId: followRequest.id,
}, follower.id);
}
@@ -554,7 +568,7 @@ export class UserFollowingService implements OnModuleInit {
throw new IdentifiableError('8884c2dd-5795-4ac9-b27e-6a01d38190f9', 'No follow request.');
}
- await this.insertFollowingDoc(followee, follower);
+ await this.insertFollowingDoc(followee, follower, false, request.withReplies);
if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
const content = this.apRendererService.addContext(this.apRendererService.renderAccept(this.apRendererService.renderFollow(follower, followee as MiPartialLocalUser, request.requestId!), followee));
@@ -694,4 +708,12 @@ export class UserFollowingService implements OnModuleInit {
});
}
}
+
+ @bindThis
+ public getFollowees(userId: MiUser['id']) {
+ return this.followingsRepository.createQueryBuilder('following')
+ .select('following.followeeId')
+ .where('following.followerId = :followerId', { followerId: userId })
+ .getMany();
+ }
}
diff --git a/packages/backend/src/core/UserListService.ts b/packages/backend/src/core/UserListService.ts
index bece1e442e..b6e4e1e884 100644
--- a/packages/backend/src/core/UserListService.ts
+++ b/packages/backend/src/core/UserListService.ts
@@ -3,30 +3,34 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
-import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
+import { Inject, Injectable, OnApplicationShutdown, OnModuleInit } from '@nestjs/common';
import * as Redis from 'ioredis';
+import { ModuleRef } from '@nestjs/core';
import type { UserListMembershipsRepository } from '@/models/_.js';
import type { MiUser } from '@/models/User.js';
import type { MiUserList } from '@/models/UserList.js';
import type { MiUserListMembership } from '@/models/UserListMembership.js';
import { IdService } from '@/core/IdService.js';
+import type { GlobalEvents } from '@/core/GlobalEventService.js';
import { GlobalEventService } from '@/core/GlobalEventService.js';
import { DI } from '@/di-symbols.js';
import { UserEntityService } from '@/core/entities/UserEntityService.js';
import { ProxyAccountService } from '@/core/ProxyAccountService.js';
import { bindThis } from '@/decorators.js';
-import { RoleService } from '@/core/RoleService.js';
import { QueueService } from '@/core/QueueService.js';
import { RedisKVCache } from '@/misc/cache.js';
-import type { GlobalEvents } from '@/core/GlobalEventService.js';
+import { RoleService } from '@/core/RoleService.js';
@Injectable()
-export class UserListService implements OnApplicationShutdown {
+export class UserListService implements OnApplicationShutdown, OnModuleInit {
public static TooManyUsersError = class extends Error {};
public membersCache: RedisKVCache>;
+ private roleService: RoleService;
constructor(
+ private moduleRef: ModuleRef,
+
@Inject(DI.redis)
private redisClient: Redis.Redis,
@@ -38,7 +42,6 @@ export class UserListService implements OnApplicationShutdown {
private userEntityService: UserEntityService,
private idService: IdService,
- private roleService: RoleService,
private globalEventService: GlobalEventService,
private proxyAccountService: ProxyAccountService,
private queueService: QueueService,
@@ -54,6 +57,10 @@ export class UserListService implements OnApplicationShutdown {
this.redisForSub.on('message', this.onMessage);
}
+ async onModuleInit() {
+ this.roleService = this.moduleRef.get(RoleService.name);
+ }
+
@bindThis
private async onMessage(_: string, data: string): Promise {
const obj = JSON.parse(data);
@@ -93,10 +100,10 @@ export class UserListService implements OnApplicationShutdown {
}
await this.userListMembershipsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
userId: target.id,
userListId: list.id,
+ userListUserId: list.userId,
} as MiUserListMembership);
this.globalEventService.publishInternalEvent('userListMemberAdded', { userListId: list.id, memberId: target.id });
diff --git a/packages/backend/src/core/UserMutingService.ts b/packages/backend/src/core/UserMutingService.ts
index 2387c9d648..397e6bdd5d 100644
--- a/packages/backend/src/core/UserMutingService.ts
+++ b/packages/backend/src/core/UserMutingService.ts
@@ -26,8 +26,7 @@ export class UserMutingService {
@bindThis
public async mute(user: MiUser, target: MiUser, expiresAt: Date | null = null): Promise {
await this.mutingsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
expiresAt: expiresAt ?? null,
muterId: user.id,
muteeId: target.id,
diff --git a/packages/backend/src/core/UtilityService.ts b/packages/backend/src/core/UtilityService.ts
index d2d2776bd2..b95e41167b 100644
--- a/packages/backend/src/core/UtilityService.ts
+++ b/packages/backend/src/core/UtilityService.ts
@@ -35,6 +35,12 @@ export class UtilityService {
return blockedHosts.some(x => `.${host.toLowerCase()}`.endsWith(`.${x}`));
}
+ @bindThis
+ public isSilencedHost(silencedHosts: string[] | undefined, host: string | null): boolean {
+ if (!silencedHosts || host == null) return false;
+ return silencedHosts.some(x => `.${host.toLowerCase()}`.endsWith(`.${x}`));
+ }
+
@bindThis
public extractDbHost(uri: string): string {
const url = new URL(uri);
diff --git a/packages/backend/src/core/WebhookService.ts b/packages/backend/src/core/WebhookService.ts
index ff70f7bc0c..930e6ef64a 100644
--- a/packages/backend/src/core/WebhookService.ts
+++ b/packages/backend/src/core/WebhookService.ts
@@ -51,7 +51,6 @@ export class WebhookService implements OnApplicationShutdown {
if (body.active) {
this.webhooks.push({
...body,
- createdAt: new Date(body.createdAt),
latestSentAt: body.latestSentAt ? new Date(body.latestSentAt) : null,
});
}
@@ -62,13 +61,11 @@ export class WebhookService implements OnApplicationShutdown {
if (i > -1) {
this.webhooks[i] = {
...body,
- createdAt: new Date(body.createdAt),
latestSentAt: body.latestSentAt ? new Date(body.latestSentAt) : null,
};
} else {
this.webhooks.push({
...body,
- createdAt: new Date(body.createdAt),
latestSentAt: body.latestSentAt ? new Date(body.latestSentAt) : null,
});
}
diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts
index b921ee7454..baaab67e48 100644
--- a/packages/backend/src/core/activitypub/ApInboxService.ts
+++ b/packages/backend/src/core/activitypub/ApInboxService.ts
@@ -164,7 +164,7 @@ export class ApInboxService {
}
// don't queue because the sender may attempt again when timeout
- await this.userFollowingService.follow(actor, followee, activity.id);
+ await this.userFollowingService.follow(actor, followee, { requestId: activity.id });
return 'ok';
}
@@ -306,9 +306,15 @@ export class ApInboxService {
this.logger.info(`Creating the (Re)Note: ${uri}`);
const activityAudience = await this.apAudienceService.parseAudience(actor, activity.to, activity.cc);
+ const createdAt = activity.published ? new Date(activity.published) : null;
+
+ if (createdAt && createdAt < this.idService.parse(renote.id).date) {
+ this.logger.warn('skip: malformed createdAt');
+ return;
+ }
await this.noteCreateService.create(actor, {
- createdAt: activity.published ? new Date(activity.published) : null,
+ createdAt,
renote,
visibility: activityAudience.visibility,
visibleUsers: activityAudience.visibleUsers,
@@ -514,8 +520,7 @@ export class ApInboxService {
if (users.length < 1) return 'skip';
await this.abuseUserReportsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
targetUserId: users[0].id,
targetUserHost: users[0].host,
reporterId: actor.id,
diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts
index 7a9d2e21d8..1891c341e4 100644
--- a/packages/backend/src/core/activitypub/ApRendererService.ts
+++ b/packages/backend/src/core/activitypub/ApRendererService.ts
@@ -27,6 +27,7 @@ import type { UsersRepository, UserProfilesRepository, NotesRepository, DriveFil
import { bindThis } from '@/decorators.js';
import { CustomEmojiService } from '@/core/CustomEmojiService.js';
import { isNotNull } from '@/misc/is-not-null.js';
+import { IdService } from '@/core/IdService.js';
import { LdSignatureService } from './LdSignatureService.js';
import { ApMfmService } from './ApMfmService.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';
@@ -59,6 +60,7 @@ export class ApRendererService {
private userKeypairService: UserKeypairService,
private apMfmService: ApMfmService,
private mfmService: MfmService,
+ private idService: IdService,
) {
}
@@ -105,7 +107,7 @@ export class ApRendererService {
id: `${this.config.url}/notes/${note.id}/activity`,
actor: this.userEntityService.genLocalUserUri(note.userId),
type: 'Announce',
- published: note.createdAt.toISOString(),
+ published: this.idService.parse(note.id).date.toISOString(),
to,
cc,
object,
@@ -137,7 +139,7 @@ export class ApRendererService {
id: `${this.config.url}/notes/${note.id}/activity`,
actor: this.userEntityService.genLocalUserUri(note.userId),
type: 'Create',
- published: note.createdAt.toISOString(),
+ published: this.idService.parse(note.id).date.toISOString(),
object,
};
@@ -437,7 +439,7 @@ export class ApRendererService {
},
_misskey_quote: quote,
quoteUrl: quote,
- published: note.createdAt.toISOString(),
+ published: this.idService.parse(note.id).date.toISOString(),
to,
cc,
inReplyTo,
@@ -462,7 +464,7 @@ export class ApRendererService {
const attachment = profile.fields.map(field => ({
type: 'PropertyValue',
name: field.name,
- value: /^https?:/.test(field.value)
+ value: (field.value.startsWith('http://') || field.value.startsWith('https://'))
? `${new URL(field.value).href}`
: field.value,
}));
@@ -493,6 +495,7 @@ export class ApRendererService {
preferredUsername: user.username,
name: user.name,
summary: profile.description ? this.mfmService.toHtml(mfm.parse(profile.description)) : null,
+ _misskey_summary: profile.description,
icon: avatar ? this.renderImage(avatar) : null,
image: banner ? this.renderImage(banner) : null,
tag,
@@ -642,6 +645,7 @@ export class ApRendererService {
'_misskey_quote': 'misskey:_misskey_quote',
'_misskey_reaction': 'misskey:_misskey_reaction',
'_misskey_votes': 'misskey:_misskey_votes',
+ '_misskey_summary': 'misskey:_misskey_summary',
'isCat': 'misskey:isCat',
// vcard
vcard: 'http://www.w3.org/2006/vcard/ns#',
diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index 573dff5b91..05d5ca15db 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -92,6 +92,10 @@ export class ApNoteService {
return new Error(`invalid Note: attributedTo has different host. expected: ${expectHost}, actual: ${actualHost}`);
}
+ if (object.published && !this.idService.isSafeT(new Date(object.published).valueOf())) {
+ return new Error('invalid Note: published timestamp is malformed');
+ }
+
return null;
}
@@ -386,7 +390,7 @@ export class ApNoteService {
this.logger.info(`register emoji host=${host}, name=${name}`);
return await this.emojisRepository.insert({
- id: this.idService.genId(),
+ id: this.idService.gen(),
host,
name,
uri: tag.id,
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index ea64883395..bf38d5fd60 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -269,7 +269,7 @@ export class ApPersonService implements OnModuleInit {
const tags = extractApHashtags(person.tag).map(normalizeForSearch).splice(0, 32);
- const isBot = getApType(object) === 'Service';
+ const isBot = getApType(object) === 'Service' || getApType(object) === 'Application';
const bday = person['vcard:bday']?.match(/^\d{4}-\d{2}-\d{2}/);
@@ -295,10 +295,9 @@ export class ApPersonService implements OnModuleInit {
// Start transaction
await this.db.transaction(async transactionalEntityManager => {
user = await transactionalEntityManager.save(new MiUser({
- id: this.idService.genId(),
+ id: this.idService.gen(),
avatarId: null,
bannerId: null,
- createdAt: new Date(),
lastFetchedAt: new Date(),
name: truncate(person.name, nameLength),
isLocked: person.manuallyApprovesFollowers,
@@ -320,9 +319,17 @@ export class ApPersonService implements OnModuleInit {
emojis,
})) as MiRemoteUser;
+ let _description: string | null = null;
+
+ if (person._misskey_summary) {
+ _description = truncate(person._misskey_summary, summaryLength);
+ } else if (person.summary) {
+ _description = this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag);
+ }
+
await transactionalEntityManager.save(new MiUserProfile({
userId: user.id,
- description: person.summary ? this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag) : null,
+ description: _description,
url,
fields,
birthday: bday?.[0] ?? null,
@@ -449,7 +456,7 @@ export class ApPersonService implements OnModuleInit {
emojis: emojiNames,
name: truncate(person.name, nameLength),
tags,
- isBot: getApType(object) === 'Service',
+ isBot: getApType(object) === 'Service' || getApType(object) === 'Application',
isCat: (person as any).isCat === true,
isLocked: person.manuallyApprovesFollowers,
movedToUri: person.movedTo ?? null,
@@ -488,10 +495,18 @@ export class ApPersonService implements OnModuleInit {
});
}
+ let _description: string | null = null;
+
+ if (person._misskey_summary) {
+ _description = truncate(person._misskey_summary, summaryLength);
+ } else if (person.summary) {
+ _description = this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag);
+ }
+
await this.userProfilesRepository.update({ userId: exist.id }, {
url,
fields,
- description: person.summary ? this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag) : null,
+ description: _description,
birthday: bday?.[0] ?? null,
location: person['vcard:Address'] ?? null,
});
@@ -607,8 +622,7 @@ export class ApPersonService implements OnModuleInit {
for (const note of featuredNotes.filter((note): note is MiNote => note != null)) {
td -= 1000;
transactionalEntityManager.insert(MiUserNotePining, {
- id: this.idService.genId(new Date(Date.now() + td)),
- createdAt: new Date(),
+ id: this.idService.gen(Date.now() + td),
userId: user.id,
noteId: note.id,
});
diff --git a/packages/backend/src/core/activitypub/type.ts b/packages/backend/src/core/activitypub/type.ts
index 16ff86e894..d9fcc99066 100644
--- a/packages/backend/src/core/activitypub/type.ts
+++ b/packages/backend/src/core/activitypub/type.ts
@@ -12,6 +12,7 @@ export interface IObject {
id?: string;
name?: string | null;
summary?: string;
+ _misskey_summary?: string;
published?: string;
cc?: ApObject;
to?: ApObject;
diff --git a/packages/backend/src/core/chart/charts/active-users.ts b/packages/backend/src/core/chart/charts/active-users.ts
index 55da1469e5..f0918e059c 100644
--- a/packages/backend/src/core/chart/charts/active-users.ts
+++ b/packages/backend/src/core/chart/charts/active-users.ts
@@ -9,6 +9,7 @@ import { AppLockService } from '@/core/AppLockService.js';
import type { MiUser } from '@/models/User.js';
import { DI } from '@/di-symbols.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import Chart from '../core.js';
import { ChartLoggerService } from '../ChartLoggerService.js';
import { name, schema } from './entities/active-users.js';
@@ -29,6 +30,7 @@ export default class ActiveUsersChart extends Chart { // eslint-d
private appLockService: AppLockService,
private chartLoggerService: ChartLoggerService,
+ private idService: IdService,
) {
super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema);
}
@@ -42,20 +44,21 @@ export default class ActiveUsersChart extends Chart { // eslint-d
}
@bindThis
- public async read(user: { id: MiUser['id'], host: null, createdAt: MiUser['createdAt'] }): Promise {
+ public async read(user: { id: MiUser['id'], host: null }): Promise {
+ const createdAt = this.idService.parse(user.id).date;
await this.commit({
'read': [user.id],
- 'registeredWithinWeek': (Date.now() - user.createdAt.getTime() < week) ? [user.id] : [],
- 'registeredWithinMonth': (Date.now() - user.createdAt.getTime() < month) ? [user.id] : [],
- 'registeredWithinYear': (Date.now() - user.createdAt.getTime() < year) ? [user.id] : [],
- 'registeredOutsideWeek': (Date.now() - user.createdAt.getTime() > week) ? [user.id] : [],
- 'registeredOutsideMonth': (Date.now() - user.createdAt.getTime() > month) ? [user.id] : [],
- 'registeredOutsideYear': (Date.now() - user.createdAt.getTime() > year) ? [user.id] : [],
+ 'registeredWithinWeek': (Date.now() - createdAt.getTime() < week) ? [user.id] : [],
+ 'registeredWithinMonth': (Date.now() - createdAt.getTime() < month) ? [user.id] : [],
+ 'registeredWithinYear': (Date.now() - createdAt.getTime() < year) ? [user.id] : [],
+ 'registeredOutsideWeek': (Date.now() - createdAt.getTime() > week) ? [user.id] : [],
+ 'registeredOutsideMonth': (Date.now() - createdAt.getTime() > month) ? [user.id] : [],
+ 'registeredOutsideYear': (Date.now() - createdAt.getTime() > year) ? [user.id] : [],
});
}
@bindThis
- public async write(user: { id: MiUser['id'], host: null, createdAt: MiUser['createdAt'] }): Promise {
+ public async write(user: { id: MiUser['id'], host: null }): Promise {
await this.commit({
'write': [user.id],
});
diff --git a/packages/backend/src/core/entities/AbuseUserReportEntityService.ts b/packages/backend/src/core/entities/AbuseUserReportEntityService.ts
index 0e65a10d26..97de891ece 100644
--- a/packages/backend/src/core/entities/AbuseUserReportEntityService.ts
+++ b/packages/backend/src/core/entities/AbuseUserReportEntityService.ts
@@ -9,6 +9,7 @@ import type { AbuseUserReportsRepository } from '@/models/_.js';
import { awaitAll } from '@/misc/prelude/await-all.js';
import type { MiAbuseUserReport } from '@/models/AbuseUserReport.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import { UserEntityService } from './UserEntityService.js';
@Injectable()
@@ -18,6 +19,7 @@ export class AbuseUserReportEntityService {
private abuseUserReportsRepository: AbuseUserReportsRepository,
private userEntityService: UserEntityService,
+ private idService: IdService,
) {
}
@@ -29,7 +31,7 @@ export class AbuseUserReportEntityService {
return await awaitAll({
id: report.id,
- createdAt: report.createdAt.toISOString(),
+ createdAt: this.idService.parse(report.id).date.toISOString(),
comment: report.comment,
resolved: report.resolved,
reporterId: report.reporterId,
diff --git a/packages/backend/src/core/entities/AntennaEntityService.ts b/packages/backend/src/core/entities/AntennaEntityService.ts
index ed108f2ce5..265a61e8ad 100644
--- a/packages/backend/src/core/entities/AntennaEntityService.ts
+++ b/packages/backend/src/core/entities/AntennaEntityService.ts
@@ -9,12 +9,15 @@ import type { AntennasRepository } from '@/models/_.js';
import type { Packed } from '@/misc/json-schema.js';
import type { MiAntenna } from '@/models/Antenna.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
@Injectable()
export class AntennaEntityService {
constructor(
@Inject(DI.antennasRepository)
private antennasRepository: AntennasRepository,
+
+ private idService: IdService,
) {
}
@@ -26,7 +29,7 @@ export class AntennaEntityService {
return {
id: antenna.id,
- createdAt: antenna.createdAt.toISOString(),
+ createdAt: this.idService.parse(antenna.id).date.toISOString(),
name: antenna.name,
keywords: antenna.keywords,
excludeKeywords: antenna.excludeKeywords,
@@ -34,6 +37,7 @@ export class AntennaEntityService {
userListId: antenna.userListId,
users: antenna.users,
caseSensitive: antenna.caseSensitive,
+ localOnly: antenna.localOnly,
notify: antenna.notify,
withReplies: antenna.withReplies,
withFile: antenna.withFile,
diff --git a/packages/backend/src/core/entities/BlockingEntityService.ts b/packages/backend/src/core/entities/BlockingEntityService.ts
index 44466e24e8..b4760346b7 100644
--- a/packages/backend/src/core/entities/BlockingEntityService.ts
+++ b/packages/backend/src/core/entities/BlockingEntityService.ts
@@ -11,6 +11,7 @@ import type { Packed } from '@/misc/json-schema.js';
import type { MiBlocking } from '@/models/Blocking.js';
import type { MiUser } from '@/models/User.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import { UserEntityService } from './UserEntityService.js';
@Injectable()
@@ -20,6 +21,7 @@ export class BlockingEntityService {
private blockingsRepository: BlockingsRepository,
private userEntityService: UserEntityService,
+ private idService: IdService,
) {
}
@@ -32,7 +34,7 @@ export class BlockingEntityService {
return await awaitAll({
id: blocking.id,
- createdAt: blocking.createdAt.toISOString(),
+ createdAt: this.idService.parse(blocking.id).date.toISOString(),
blockeeId: blocking.blockeeId,
blockee: this.userEntityService.pack(blocking.blockeeId, me, {
detail: true,
diff --git a/packages/backend/src/core/entities/ChannelEntityService.ts b/packages/backend/src/core/entities/ChannelEntityService.ts
index 094de4d2d5..305946b8a6 100644
--- a/packages/backend/src/core/entities/ChannelEntityService.ts
+++ b/packages/backend/src/core/entities/ChannelEntityService.ts
@@ -5,12 +5,13 @@
import { Inject, Injectable } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
-import type { ChannelFavoritesRepository, ChannelFollowingsRepository, ChannelsRepository, DriveFilesRepository, NoteUnreadsRepository, NotesRepository } from '@/models/_.js';
+import type { ChannelFavoritesRepository, ChannelFollowingsRepository, ChannelsRepository, DriveFilesRepository, NotesRepository } from '@/models/_.js';
import type { Packed } from '@/misc/json-schema.js';
import type { } from '@/models/Blocking.js';
import type { MiUser } from '@/models/User.js';
import type { MiChannel } from '@/models/Channel.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import { DriveFileEntityService } from './DriveFileEntityService.js';
import { NoteEntityService } from './NoteEntityService.js';
import { In } from 'typeorm';
@@ -30,14 +31,12 @@ export class ChannelEntityService {
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
- @Inject(DI.noteUnreadsRepository)
- private noteUnreadsRepository: NoteUnreadsRepository,
-
@Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository,
private noteEntityService: NoteEntityService,
private driveFileEntityService: DriveFileEntityService,
+ private idService: IdService,
) {
}
@@ -52,13 +51,6 @@ export class ChannelEntityService {
const banner = channel.bannerId ? await this.driveFilesRepository.findOneBy({ id: channel.bannerId }) : null;
- const hasUnreadNote = meId ? await this.noteUnreadsRepository.exist({
- where: {
- noteChannelId: channel.id,
- userId: meId,
- },
- }) : undefined;
-
const isFollowing = meId ? await this.channelFollowingsRepository.exist({
where: {
followerId: meId,
@@ -81,7 +73,7 @@ export class ChannelEntityService {
return {
id: channel.id,
- createdAt: channel.createdAt.toISOString(),
+ createdAt: this.idService.parse(channel.id).date.toISOString(),
lastNotedAt: channel.lastNotedAt ? channel.lastNotedAt.toISOString() : null,
name: channel.name,
description: channel.description,
@@ -93,11 +85,12 @@ export class ChannelEntityService {
usersCount: channel.usersCount,
notesCount: channel.notesCount,
isSensitive: channel.isSensitive,
+ allowRenoteToExternal: channel.allowRenoteToExternal,
...(me ? {
isFollowing,
isFavorited,
- hasUnreadNote,
+ hasUnreadNote: false, // 後方互換性のため
} : {}),
...(detailed ? {
diff --git a/packages/backend/src/core/entities/ClipEntityService.ts b/packages/backend/src/core/entities/ClipEntityService.ts
index e141db03f1..96422894fd 100644
--- a/packages/backend/src/core/entities/ClipEntityService.ts
+++ b/packages/backend/src/core/entities/ClipEntityService.ts
@@ -11,6 +11,7 @@ import type { Packed } from '@/misc/json-schema.js';
import type { } from '@/models/Blocking.js';
import type { MiClip } from '@/models/Clip.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import { UserEntityService } from './UserEntityService.js';
@Injectable()
@@ -23,6 +24,7 @@ export class ClipEntityService {
private clipFavoritesRepository: ClipFavoritesRepository,
private userEntityService: UserEntityService,
+ private idService: IdService,
) {
}
@@ -36,7 +38,7 @@ export class ClipEntityService {
return await awaitAll({
id: clip.id,
- createdAt: clip.createdAt.toISOString(),
+ createdAt: this.idService.parse(clip.id).date.toISOString(),
lastClippedAt: clip.lastClippedAt ? clip.lastClippedAt.toISOString() : null,
userId: clip.userId,
user: this.userEntityService.pack(clip.user ?? clip.userId),
diff --git a/packages/backend/src/core/entities/DriveFileEntityService.ts b/packages/backend/src/core/entities/DriveFileEntityService.ts
index 23273b0413..14be000367 100644
--- a/packages/backend/src/core/entities/DriveFileEntityService.ts
+++ b/packages/backend/src/core/entities/DriveFileEntityService.ts
@@ -17,6 +17,7 @@ import { deepClone } from '@/misc/clone.js';
import { bindThis } from '@/decorators.js';
import { isMimeImage } from '@/misc/is-mime-image.js';
import { isNotNull } from '@/misc/is-not-null.js';
+import { IdService } from '@/core/IdService.js';
import { UtilityService } from '../UtilityService.js';
import { VideoProcessingService } from '../VideoProcessingService.js';
import { UserEntityService } from './UserEntityService.js';
@@ -44,6 +45,7 @@ export class DriveFileEntityService {
private utilityService: UtilityService,
private driveFolderEntityService: DriveFolderEntityService,
private videoProcessingService: VideoProcessingService,
+ private idService: IdService,
) {
}
@@ -88,7 +90,7 @@ export class DriveFileEntityService {
if (file.type.startsWith('video')) {
if (file.thumbnailUrl) return file.thumbnailUrl;
- return this.videoProcessingService.getExternalVideoThumbnailUrl(file.webpublicUrl ?? file.url ?? file.uri);
+ return this.videoProcessingService.getExternalVideoThumbnailUrl(file.webpublicUrl ?? file.url);
} else if (file.uri != null && file.userHost != null && this.config.externalMediaProxyEnabled) {
// 動画ではなくリモートかつメディアプロキシ
return this.getProxiedUrl(file.uri, 'static');
@@ -143,7 +145,7 @@ export class DriveFileEntityService {
.select('SUM(file.size)', 'sum')
.getRawOne();
- return parseInt(sum, 10) ?? 0;
+ return parseInt(sum, 10) || 0;
}
@bindThis
@@ -155,7 +157,7 @@ export class DriveFileEntityService {
.select('SUM(file.size)', 'sum')
.getRawOne();
- return parseInt(sum, 10) ?? 0;
+ return parseInt(sum, 10) || 0;
}
@bindThis
@@ -167,7 +169,7 @@ export class DriveFileEntityService {
.select('SUM(file.size)', 'sum')
.getRawOne();
- return parseInt(sum, 10) ?? 0;
+ return parseInt(sum, 10) || 0;
}
@bindThis
@@ -179,7 +181,7 @@ export class DriveFileEntityService {
.select('SUM(file.size)', 'sum')
.getRawOne();
- return parseInt(sum, 10) ?? 0;
+ return parseInt(sum, 10) || 0;
}
@bindThis
@@ -196,7 +198,7 @@ export class DriveFileEntityService {
return await awaitAll>({
id: file.id,
- createdAt: file.createdAt.toISOString(),
+ createdAt: this.idService.parse(file.id).date.toISOString(),
name: file.name,
type: file.type,
md5: file.md5,
@@ -231,7 +233,7 @@ export class DriveFileEntityService {
return await awaitAll>({
id: file.id,
- createdAt: file.createdAt.toISOString(),
+ createdAt: this.idService.parse(file.id).date.toISOString(),
name: file.name,
type: file.type,
md5: file.md5,
diff --git a/packages/backend/src/core/entities/DriveFolderEntityService.ts b/packages/backend/src/core/entities/DriveFolderEntityService.ts
index 55014284bd..8fa78154b9 100644
--- a/packages/backend/src/core/entities/DriveFolderEntityService.ts
+++ b/packages/backend/src/core/entities/DriveFolderEntityService.ts
@@ -11,6 +11,7 @@ import type { Packed } from '@/misc/json-schema.js';
import type { } from '@/models/Blocking.js';
import type { MiDriveFolder } from '@/models/DriveFolder.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
@Injectable()
export class DriveFolderEntityService {
@@ -20,6 +21,8 @@ export class DriveFolderEntityService {
@Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository,
+
+ private idService: IdService,
) {
}
@@ -38,7 +41,7 @@ export class DriveFolderEntityService {
return await awaitAll({
id: folder.id,
- createdAt: folder.createdAt.toISOString(),
+ createdAt: this.idService.parse(folder.id).date.toISOString(),
name: folder.name,
parentId: folder.parentId,
diff --git a/packages/backend/src/core/entities/FlashEntityService.ts b/packages/backend/src/core/entities/FlashEntityService.ts
index 4701cddcba..dc335d9975 100644
--- a/packages/backend/src/core/entities/FlashEntityService.ts
+++ b/packages/backend/src/core/entities/FlashEntityService.ts
@@ -12,6 +12,7 @@ import type { } from '@/models/Blocking.js';
import type { MiUser } from '@/models/User.js';
import type { MiFlash } from '@/models/Flash.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import { UserEntityService } from './UserEntityService.js';
@Injectable()
@@ -24,6 +25,7 @@ export class FlashEntityService {
private flashLikesRepository: FlashLikesRepository,
private userEntityService: UserEntityService,
+ private idService: IdService,
) {
}
@@ -37,7 +39,7 @@ export class FlashEntityService {
return await awaitAll({
id: flash.id,
- createdAt: flash.createdAt.toISOString(),
+ createdAt: this.idService.parse(flash.id).date.toISOString(),
updatedAt: flash.updatedAt.toISOString(),
userId: flash.userId,
user: this.userEntityService.pack(flash.user ?? flash.userId, me), // { detail: true } すると無限ループするので注意
diff --git a/packages/backend/src/core/entities/FollowingEntityService.ts b/packages/backend/src/core/entities/FollowingEntityService.ts
index 9f6eb51e8c..52aa979677 100644
--- a/packages/backend/src/core/entities/FollowingEntityService.ts
+++ b/packages/backend/src/core/entities/FollowingEntityService.ts
@@ -12,6 +12,7 @@ import type { } from '@/models/Blocking.js';
import type { MiUser } from '@/models/User.js';
import type { MiFollowing } from '@/models/Following.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import { UserEntityService } from './UserEntityService.js';
type LocalFollowerFollowing = MiFollowing & {
@@ -45,6 +46,7 @@ export class FollowingEntityService {
private followingsRepository: FollowingsRepository,
private userEntityService: UserEntityService,
+ private idService: IdService,
) {
}
@@ -83,7 +85,7 @@ export class FollowingEntityService {
return await awaitAll({
id: following.id,
- createdAt: following.createdAt.toISOString(),
+ createdAt: this.idService.parse(following.id).date.toISOString(),
followeeId: following.followeeId,
followerId: following.followerId,
followee: opts.populateFollowee ? this.userEntityService.pack(following.followee ?? following.followeeId, me, {
diff --git a/packages/backend/src/core/entities/GalleryPostEntityService.ts b/packages/backend/src/core/entities/GalleryPostEntityService.ts
index bbaf70f0fd..d7b960e0d9 100644
--- a/packages/backend/src/core/entities/GalleryPostEntityService.ts
+++ b/packages/backend/src/core/entities/GalleryPostEntityService.ts
@@ -12,6 +12,7 @@ import type { } from '@/models/Blocking.js';
import type { MiUser } from '@/models/User.js';
import type { MiGalleryPost } from '@/models/GalleryPost.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import { UserEntityService } from './UserEntityService.js';
import { DriveFileEntityService } from './DriveFileEntityService.js';
@@ -26,6 +27,7 @@ export class GalleryPostEntityService {
private userEntityService: UserEntityService,
private driveFileEntityService: DriveFileEntityService,
+ private idService: IdService,
) {
}
@@ -39,7 +41,7 @@ export class GalleryPostEntityService {
return await awaitAll({
id: post.id,
- createdAt: post.createdAt.toISOString(),
+ createdAt: this.idService.parse(post.id).date.toISOString(),
updatedAt: post.updatedAt.toISOString(),
userId: post.userId,
user: this.userEntityService.pack(post.user ?? post.userId, me),
diff --git a/packages/backend/src/core/entities/InstanceEntityService.ts b/packages/backend/src/core/entities/InstanceEntityService.ts
index 0e27e9df7f..7d16a7a80e 100644
--- a/packages/backend/src/core/entities/InstanceEntityService.ts
+++ b/packages/backend/src/core/entities/InstanceEntityService.ts
@@ -5,7 +5,6 @@
import { Injectable } from '@nestjs/common';
import type { Packed } from '@/misc/json-schema.js';
-import type { } from '@/models/Blocking.js';
import type { MiInstance } from '@/models/Instance.js';
import { MetaService } from '@/core/MetaService.js';
import { bindThis } from '@/decorators.js';
@@ -43,10 +42,12 @@ export class InstanceEntityService {
description: instance.description,
maintainerName: instance.maintainerName,
maintainerEmail: instance.maintainerEmail,
+ isSilenced: this.utilityService.isSilencedHost(meta.silencedHosts, instance.host),
iconUrl: instance.iconUrl,
faviconUrl: instance.faviconUrl,
themeColor: instance.themeColor,
infoUpdatedAt: instance.infoUpdatedAt ? instance.infoUpdatedAt.toISOString() : null,
+ latestRequestReceivedAt: instance.latestRequestReceivedAt ? instance.latestRequestReceivedAt.toISOString() : null,
};
}
diff --git a/packages/backend/src/core/entities/InviteCodeEntityService.ts b/packages/backend/src/core/entities/InviteCodeEntityService.ts
index 914eaafe68..0f15fb5ab2 100644
--- a/packages/backend/src/core/entities/InviteCodeEntityService.ts
+++ b/packages/backend/src/core/entities/InviteCodeEntityService.ts
@@ -11,6 +11,7 @@ import type { Packed } from '@/misc/json-schema.js';
import type { MiUser } from '@/models/User.js';
import type { MiRegistrationTicket } from '@/models/RegistrationTicket.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import { UserEntityService } from './UserEntityService.js';
@Injectable()
@@ -20,6 +21,7 @@ export class InviteCodeEntityService {
private registrationTicketsRepository: RegistrationTicketsRepository,
private userEntityService: UserEntityService,
+ private idService: IdService,
) {
}
@@ -39,7 +41,7 @@ export class InviteCodeEntityService {
id: target.id,
code: target.code,
expiresAt: target.expiresAt ? target.expiresAt.toISOString() : null,
- createdAt: target.createdAt.toISOString(),
+ createdAt: this.idService.parse(target.id).date.toISOString(),
createdBy: target.createdBy ? await this.userEntityService.pack(target.createdBy, me) : null,
usedBy: target.usedBy ? await this.userEntityService.pack(target.usedBy, me) : null,
usedAt: target.usedAt ? target.usedAt.toISOString() : null,
diff --git a/packages/backend/src/core/entities/ModerationLogEntityService.ts b/packages/backend/src/core/entities/ModerationLogEntityService.ts
index 83b024d83b..6729ca2671 100644
--- a/packages/backend/src/core/entities/ModerationLogEntityService.ts
+++ b/packages/backend/src/core/entities/ModerationLogEntityService.ts
@@ -10,6 +10,7 @@ import { awaitAll } from '@/misc/prelude/await-all.js';
import type { } from '@/models/Blocking.js';
import type { MiModerationLog } from '@/models/ModerationLog.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import { UserEntityService } from './UserEntityService.js';
@Injectable()
@@ -19,6 +20,7 @@ export class ModerationLogEntityService {
private moderationLogsRepository: ModerationLogsRepository,
private userEntityService: UserEntityService,
+ private idService: IdService,
) {
}
@@ -30,7 +32,7 @@ export class ModerationLogEntityService {
return await awaitAll({
id: log.id,
- createdAt: log.createdAt.toISOString(),
+ createdAt: this.idService.parse(log.id).date.toISOString(),
type: log.type,
info: log.info,
userId: log.userId,
diff --git a/packages/backend/src/core/entities/MutingEntityService.ts b/packages/backend/src/core/entities/MutingEntityService.ts
index e3d5d2e211..9d672169ba 100644
--- a/packages/backend/src/core/entities/MutingEntityService.ts
+++ b/packages/backend/src/core/entities/MutingEntityService.ts
@@ -12,6 +12,7 @@ import type { } from '@/models/Blocking.js';
import type { MiUser } from '@/models/User.js';
import type { MiMuting } from '@/models/Muting.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import { UserEntityService } from './UserEntityService.js';
@Injectable()
@@ -21,6 +22,7 @@ export class MutingEntityService {
private mutingsRepository: MutingsRepository,
private userEntityService: UserEntityService,
+ private idService: IdService,
) {
}
@@ -33,7 +35,7 @@ export class MutingEntityService {
return await awaitAll({
id: muting.id,
- createdAt: muting.createdAt.toISOString(),
+ createdAt: this.idService.parse(muting.id).date.toISOString(),
expiresAt: muting.expiresAt ? muting.expiresAt.toISOString() : null,
muteeId: muting.muteeId,
mutee: this.userEntityService.pack(muting.muteeId, me, {
diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index e45a7992bb..c49dad8e79 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -5,11 +5,9 @@
import { Inject, Injectable } from '@nestjs/common';
import { In } from 'typeorm';
-import * as mfm from 'mfm-js';
import { ModuleRef } from '@nestjs/core';
import { DI } from '@/di-symbols.js';
import type { Packed } from '@/misc/json-schema.js';
-import { nyaize } from '@/misc/nyaize.js';
import { awaitAll } from '@/misc/prelude/await-all.js';
import type { MiUser } from '@/models/User.js';
import type { MiNote } from '@/models/Note.js';
@@ -17,6 +15,8 @@ import type { MiNoteReaction } from '@/models/NoteReaction.js';
import type { UsersRepository, NotesRepository, FollowingsRepository, PollsRepository, PollVotesRepository, NoteReactionsRepository, ChannelsRepository } from '@/models/_.js';
import { bindThis } from '@/decorators.js';
import { isNotNull } from '@/misc/is-not-null.js';
+import { DebounceLoader } from '@/misc/loader.js';
+import { IdService } from '@/core/IdService.js';
import type { OnModuleInit } from '@nestjs/common';
import type { CustomEmojiService } from '../CustomEmojiService.js';
import type { ReactionService } from '../ReactionService.js';
@@ -29,6 +29,8 @@ export class NoteEntityService implements OnModuleInit {
private driveFileEntityService: DriveFileEntityService;
private customEmojiService: CustomEmojiService;
private reactionService: ReactionService;
+ private idService: IdService;
+ private noteLoader = new DebounceLoader(this.findNoteOrFail);
constructor(
private moduleRef: ModuleRef,
@@ -66,11 +68,12 @@ export class NoteEntityService implements OnModuleInit {
this.driveFileEntityService = this.moduleRef.get('DriveFileEntityService');
this.customEmojiService = this.moduleRef.get('CustomEmojiService');
this.reactionService = this.moduleRef.get('ReactionService');
+ this.idService = this.moduleRef.get('IdService');
}
@bindThis
private async hideNote(packedNote: Packed<'Note'>, meId: MiUser['id'] | null) {
- // TODO: isVisibleForMe を使うようにしても良さそう(型違うけど)
+ // TODO: isVisibleForMe を使うようにしても良さそう(型違うけど)
let hide = false;
// visibility が specified かつ自分が指定されていなかったら非表示
@@ -80,7 +83,7 @@ export class NoteEntityService implements OnModuleInit {
} else if (meId === packedNote.userId) {
hide = false;
} else {
- // 指定されているかどうか
+ // 指定されているかどうか
const specified = packedNote.visibleUserIds!.some((id: any) => meId === id);
if (specified) {
@@ -167,21 +170,31 @@ export class NoteEntityService implements OnModuleInit {
}
@bindThis
- private async populateMyReaction(note: MiNote, meId: MiUser['id'], _hint_?: {
- myReactions: Map;
+ public async populateMyReaction(note: { id: MiNote['id']; reactions: MiNote['reactions']; reactionAndUserPairCache?: MiNote['reactionAndUserPairCache']; }, meId: MiUser['id'], _hint_?: {
+ myReactions: Map;
}) {
if (_hint_?.myReactions) {
const reaction = _hint_.myReactions.get(note.id);
if (reaction) {
- return this.reactionService.convertLegacyReaction(reaction.reaction);
- } else if (reaction === null) {
+ return this.reactionService.convertLegacyReaction(reaction);
+ } else {
return undefined;
}
- // 実装上抜けがあるだけかもしれないので、「ヒントに含まれてなかったら(=undefinedなら)return」のようにはしない
}
- // パフォーマンスのためノートが作成されてから1秒以上経っていない場合はリアクションを取得しない
- if (note.createdAt.getTime() + 1000 > Date.now()) {
+ const reactionsCount = Object.values(note.reactions).reduce((a, b) => a + b, 0);
+ if (reactionsCount === 0) return undefined;
+ if (note.reactionAndUserPairCache && reactionsCount <= note.reactionAndUserPairCache.length) {
+ const pair = note.reactionAndUserPairCache.find(p => p.startsWith(meId));
+ if (pair) {
+ return this.reactionService.convertLegacyReaction(pair.split('/')[1]);
+ } else {
+ return undefined;
+ }
+ }
+
+ // パフォーマンスのためノートが作成されてから2秒以上経っていない場合はリアクションを取得しない
+ if (this.idService.parse(note.id).date.getTime() + 2000 > Date.now()) {
return undefined;
}
@@ -273,8 +286,9 @@ export class NoteEntityService implements OnModuleInit {
options?: {
detail?: boolean;
skipHide?: boolean;
+ withReactionAndUserPairCache?: boolean;
_hint_?: {
- myReactions: Map;
+ myReactions: Map;
packedFiles: Map | null>;
};
},
@@ -282,10 +296,11 @@ export class NoteEntityService implements OnModuleInit {
const opts = Object.assign({
detail: true,
skipHide: false,
+ withReactionAndUserPairCache: false,
}, options);
const meId = me ? me.id : null;
- const note = typeof src === 'object' ? src : await this.notesRepository.findOneOrFail({ where: { id: src }, relations: ['user'] });
+ const note = typeof src === 'object' ? src : await this.noteLoader.load(src);
const host = note.userHost;
let text = note.text;
@@ -307,7 +322,7 @@ export class NoteEntityService implements OnModuleInit {
const packed: Packed<'Note'> = await awaitAll({
id: note.id,
- createdAt: note.createdAt.toISOString(),
+ createdAt: this.idService.parse(note.id).date.toISOString(),
userId: note.userId,
user: this.userEntityService.pack(note.user ?? note.userId, me, {
detail: false,
@@ -315,13 +330,14 @@ export class NoteEntityService implements OnModuleInit {
text: text,
cw: note.cw,
visibility: note.visibility,
- localOnly: note.localOnly ?? undefined,
+ localOnly: note.localOnly,
reactionAcceptance: note.reactionAcceptance,
visibleUserIds: note.visibility === 'specified' ? note.visibleUserIds : undefined,
renoteCount: note.renoteCount,
repliesCount: note.repliesCount,
reactions: this.reactionService.convertLegacyReactions(note.reactions),
reactionEmojis: this.customEmojiService.populateEmojis(reactionEmojiNames, host),
+ reactionAndUserPairCache: opts.withReactionAndUserPairCache ? note.reactionAndUserPairCache : undefined,
emojis: host != null ? this.customEmojiService.populateEmojis(note.emojis, host) : undefined,
tags: note.tags.length > 0 ? note.tags : undefined,
fileIds: note.fileIds,
@@ -334,6 +350,7 @@ export class NoteEntityService implements OnModuleInit {
name: channel.name,
color: channel.color,
isSensitive: channel.isSensitive,
+ allowRenoteToExternal: channel.allowRenoteToExternal,
} : undefined,
mentions: note.mentions.length > 0 ? note.mentions : undefined,
uri: note.uri ?? undefined,
@@ -344,41 +361,26 @@ export class NoteEntityService implements OnModuleInit {
reply: note.replyId ? this.pack(note.reply ?? note.replyId, me, {
detail: false,
+ skipHide: opts.skipHide,
+ withReactionAndUserPairCache: opts.withReactionAndUserPairCache,
_hint_: options?._hint_,
}) : undefined,
renote: note.renoteId ? this.pack(note.renote ?? note.renoteId, me, {
detail: true,
+ skipHide: opts.skipHide,
+ withReactionAndUserPairCache: opts.withReactionAndUserPairCache,
_hint_: options?._hint_,
}) : undefined,
poll: note.hasPoll ? this.populatePoll(note, meId) : undefined,
- ...(meId ? {
+ ...(meId && Object.keys(note.reactions).length > 0 ? {
myReaction: this.populateMyReaction(note, meId, options?._hint_),
} : {}),
} : {}),
});
- if (packed.user.isCat && packed.text) {
- const tokens = packed.text ? mfm.parse(packed.text) : [];
- function nyaizeNode(node: mfm.MfmNode) {
- if (node.type === 'quote') return;
- if (node.type === 'text') {
- node.props.text = nyaize(node.props.text);
- }
- if (node.children) {
- for (const child of node.children) {
- nyaizeNode(child);
- }
- }
- }
- for (const node of tokens) {
- nyaizeNode(node);
- }
- packed.text = mfm.toString(tokens);
- }
-
if (!opts.skipHide) {
await this.hideNote(packed, meId);
}
@@ -398,18 +400,48 @@ export class NoteEntityService implements OnModuleInit {
if (notes.length === 0) return [];
const meId = me ? me.id : null;
- const myReactionsMap = new Map();
+ const myReactionsMap = new Map();
if (meId) {
- const renoteIds = notes.filter(n => n.renoteId != null).map(n => n.renoteId!);
- // パフォーマンスのためノートが作成されてから1秒以上経っていない場合はリアクションを取得しない
- const targets = [...notes.filter(n => n.createdAt.getTime() + 1000 < Date.now()).map(n => n.id), ...renoteIds];
- const myReactions = await this.noteReactionsRepository.findBy({
- userId: meId,
- noteId: In(targets),
- });
+ const idsNeedFetchMyReaction = new Set();
- for (const target of targets) {
- myReactionsMap.set(target, myReactions.find(reaction => reaction.noteId === target) ?? null);
+ // パフォーマンスのためノートが作成されてから2秒以上経っていない場合はリアクションを取得しない
+ const oldId = this.idService.gen(Date.now() - 2000);
+
+ for (const note of notes) {
+ if (note.renote && (note.text == null && note.fileIds.length === 0)) { // pure renote
+ const reactionsCount = Object.values(note.renote.reactions).reduce((a, b) => a + b, 0);
+ if (reactionsCount === 0) {
+ myReactionsMap.set(note.renote.id, null);
+ } else if (reactionsCount <= note.renote.reactionAndUserPairCache.length) {
+ const pair = note.renote.reactionAndUserPairCache.find(p => p.startsWith(meId));
+ myReactionsMap.set(note.renote.id, pair ? pair.split('/')[1] : null);
+ } else {
+ idsNeedFetchMyReaction.add(note.renote.id);
+ }
+ } else {
+ if (note.id < oldId) {
+ const reactionsCount = Object.values(note.reactions).reduce((a, b) => a + b, 0);
+ if (reactionsCount === 0) {
+ myReactionsMap.set(note.id, null);
+ } else if (reactionsCount <= note.reactionAndUserPairCache.length) {
+ const pair = note.reactionAndUserPairCache.find(p => p.startsWith(meId));
+ myReactionsMap.set(note.id, pair ? pair.split('/')[1] : null);
+ } else {
+ idsNeedFetchMyReaction.add(note.id);
+ }
+ } else {
+ myReactionsMap.set(note.id, null);
+ }
+ }
+ }
+
+ const myReactions = idsNeedFetchMyReaction.size > 0 ? await this.noteReactionsRepository.findBy({
+ userId: meId,
+ noteId: In(Array.from(idsNeedFetchMyReaction)),
+ }) : [];
+
+ for (const id of idsNeedFetchMyReaction) {
+ myReactionsMap.set(id, myReactions.find(reaction => reaction.noteId === id)?.reaction ?? null);
}
}
@@ -450,4 +482,12 @@ export class NoteEntityService implements OnModuleInit {
}
return emojis.filter(x => x.name != null && x.host != null) as { name: string; host: string; }[];
}
+
+ @bindThis
+ private findNoteOrFail(id: string): Promise {
+ return this.notesRepository.findOneOrFail({
+ where: { id },
+ relations: ['user'],
+ });
+ }
}
diff --git a/packages/backend/src/core/entities/NoteFavoriteEntityService.ts b/packages/backend/src/core/entities/NoteFavoriteEntityService.ts
index 808c8c9f69..1c9aed413f 100644
--- a/packages/backend/src/core/entities/NoteFavoriteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteFavoriteEntityService.ts
@@ -10,6 +10,7 @@ import type { } from '@/models/Blocking.js';
import type { MiUser } from '@/models/User.js';
import type { MiNoteFavorite } from '@/models/NoteFavorite.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import { NoteEntityService } from './NoteEntityService.js';
@Injectable()
@@ -19,6 +20,7 @@ export class NoteFavoriteEntityService {
private noteFavoritesRepository: NoteFavoritesRepository,
private noteEntityService: NoteEntityService,
+ private idService: IdService,
) {
}
@@ -31,7 +33,7 @@ export class NoteFavoriteEntityService {
return {
id: favorite.id,
- createdAt: favorite.createdAt.toISOString(),
+ createdAt: this.idService.parse(favorite.id).date.toISOString(),
noteId: favorite.noteId,
note: await this.noteEntityService.pack(favorite.note ?? favorite.noteId, me),
};
diff --git a/packages/backend/src/core/entities/NoteReactionEntityService.ts b/packages/backend/src/core/entities/NoteReactionEntityService.ts
index 9701f37fdb..f4aba3e543 100644
--- a/packages/backend/src/core/entities/NoteReactionEntityService.ts
+++ b/packages/backend/src/core/entities/NoteReactionEntityService.ts
@@ -8,6 +8,7 @@ import { DI } from '@/di-symbols.js';
import type { NoteReactionsRepository } from '@/models/_.js';
import type { Packed } from '@/misc/json-schema.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import type { OnModuleInit } from '@nestjs/common';
import type { } from '@/models/Blocking.js';
import type { MiUser } from '@/models/User.js';
@@ -22,6 +23,7 @@ export class NoteReactionEntityService implements OnModuleInit {
private userEntityService: UserEntityService;
private noteEntityService: NoteEntityService;
private reactionService: ReactionService;
+ private idService: IdService;
constructor(
private moduleRef: ModuleRef,
@@ -32,6 +34,7 @@ export class NoteReactionEntityService implements OnModuleInit {
//private userEntityService: UserEntityService,
//private noteEntityService: NoteEntityService,
//private reactionService: ReactionService,
+ //private idService: IdService,
) {
}
@@ -39,6 +42,7 @@ export class NoteReactionEntityService implements OnModuleInit {
this.userEntityService = this.moduleRef.get('UserEntityService');
this.noteEntityService = this.moduleRef.get('NoteEntityService');
this.reactionService = this.moduleRef.get('ReactionService');
+ this.idService = this.moduleRef.get('IdService');
}
@bindThis
@@ -57,7 +61,7 @@ export class NoteReactionEntityService implements OnModuleInit {
return {
id: reaction.id,
- createdAt: reaction.createdAt.toISOString(),
+ createdAt: this.idService.parse(reaction.id).date.toISOString(),
user: await this.userEntityService.pack(reaction.user ?? reaction.userId, me),
type: this.reactionService.convertLegacyReaction(reaction.reaction),
...(opts.withNote ? {
diff --git a/packages/backend/src/core/entities/NotificationEntityService.ts b/packages/backend/src/core/entities/NotificationEntityService.ts
index 3ee7c91f3a..704081ed00 100644
--- a/packages/backend/src/core/entities/NotificationEntityService.ts
+++ b/packages/backend/src/core/entities/NotificationEntityService.ts
@@ -7,26 +7,27 @@ import { Inject, Injectable } from '@nestjs/common';
import { ModuleRef } from '@nestjs/core';
import { In } from 'typeorm';
import { DI } from '@/di-symbols.js';
-import type { AccessTokensRepository, FollowRequestsRepository, NotesRepository, MiUser, UsersRepository } from '@/models/_.js';
+import type { FollowRequestsRepository, NotesRepository, MiUser, UsersRepository } from '@/models/_.js';
import { awaitAll } from '@/misc/prelude/await-all.js';
-import type { MiNotification } from '@/models/Notification.js';
+import type { MiGroupedNotification, MiNotification } from '@/models/Notification.js';
import type { MiNote } from '@/models/Note.js';
import type { Packed } from '@/misc/json-schema.js';
import { bindThis } from '@/decorators.js';
import { isNotNull } from '@/misc/is-not-null.js';
-import { notificationTypes } from '@/types.js';
+import { FilterUnionByProperty, notificationTypes } from '@/types.js';
+import { RoleEntityService } from './RoleEntityService.js';
import type { OnModuleInit } from '@nestjs/common';
-import type { CustomEmojiService } from '../CustomEmojiService.js';
import type { UserEntityService } from './UserEntityService.js';
import type { NoteEntityService } from './NoteEntityService.js';
const NOTE_REQUIRED_NOTIFICATION_TYPES = new Set(['note', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollEnded'] as (typeof notificationTypes[number])[]);
+const NOTE_REQUIRED_GROUPED_NOTIFICATION_TYPES = new Set(['note', 'mention', 'reply', 'renote', 'renote:grouped', 'quote', 'reaction', 'reaction:grouped', 'pollEnded']);
@Injectable()
export class NotificationEntityService implements OnModuleInit {
private userEntityService: UserEntityService;
private noteEntityService: NoteEntityService;
- private customEmojiService: CustomEmojiService;
+ private roleEntityService: RoleEntityService;
constructor(
private moduleRef: ModuleRef,
@@ -40,19 +41,15 @@ export class NotificationEntityService implements OnModuleInit {
@Inject(DI.followRequestsRepository)
private followRequestsRepository: FollowRequestsRepository,
- @Inject(DI.accessTokensRepository)
- private accessTokensRepository: AccessTokensRepository,
-
//private userEntityService: UserEntityService,
//private noteEntityService: NoteEntityService,
- //private customEmojiService: CustomEmojiService,
) {
}
onModuleInit() {
this.userEntityService = this.moduleRef.get('UserEntityService');
this.noteEntityService = this.moduleRef.get('NoteEntityService');
- this.customEmojiService = this.moduleRef.get('CustomEmojiService');
+ this.roleEntityService = this.moduleRef.get('RoleEntityService');
}
@bindThis
@@ -69,39 +66,42 @@ export class NotificationEntityService implements OnModuleInit {
},
): Promise> {
const notification = src;
- const token = notification.appAccessTokenId ? await this.accessTokensRepository.findOneByOrFail({ id: notification.appAccessTokenId }) : null;
- const noteIfNeed = NOTE_REQUIRED_NOTIFICATION_TYPES.has(notification.type) && notification.noteId != null ? (
+ const noteIfNeed = NOTE_REQUIRED_NOTIFICATION_TYPES.has(notification.type) && 'noteId' in notification ? (
hint?.packedNotes != null
? hint.packedNotes.get(notification.noteId)
- : this.noteEntityService.pack(notification.noteId!, { id: meId }, {
+ : this.noteEntityService.pack(notification.noteId, { id: meId }, {
detail: true,
})
) : undefined;
- const userIfNeed = notification.notifierId != null ? (
+ const userIfNeed = 'notifierId' in notification ? (
hint?.packedUsers != null
? hint.packedUsers.get(notification.notifierId)
- : this.userEntityService.pack(notification.notifierId!, { id: meId }, {
+ : this.userEntityService.pack(notification.notifierId, { id: meId }, {
detail: false,
})
) : undefined;
+ const role = notification.type === 'roleAssigned' ? await this.roleEntityService.pack(notification.roleId) : undefined;
return await awaitAll({
id: notification.id,
createdAt: new Date(notification.createdAt).toISOString(),
type: notification.type,
- userId: notification.notifierId,
+ userId: 'notifierId' in notification ? notification.notifierId : undefined,
...(userIfNeed != null ? { user: userIfNeed } : {}),
...(noteIfNeed != null ? { note: noteIfNeed } : {}),
...(notification.type === 'reaction' ? {
reaction: notification.reaction,
} : {}),
+ ...(notification.type === 'roleAssigned' ? {
+ role: role,
+ } : {}),
...(notification.type === 'achievementEarned' ? {
achievement: notification.achievement,
} : {}),
...(notification.type === 'app' ? {
body: notification.customBody,
- header: notification.customHeader ?? token?.name,
- icon: notification.customIcon ?? token?.iconUrl,
+ header: notification.customHeader,
+ icon: notification.customIcon,
} : {}),
});
}
@@ -115,7 +115,7 @@ export class NotificationEntityService implements OnModuleInit {
let validNotifications = notifications;
- const noteIds = validNotifications.map(x => x.noteId).filter(isNotNull);
+ const noteIds = validNotifications.map(x => 'noteId' in x ? x.noteId : null).filter(isNotNull);
const notes = noteIds.length > 0 ? await this.notesRepository.find({
where: { id: In(noteIds) },
relations: ['user', 'reply', 'reply.user', 'renote', 'renote.user'],
@@ -125,9 +125,9 @@ export class NotificationEntityService implements OnModuleInit {
});
const packedNotes = new Map(packedNotesArray.map(p => [p.id, p]));
- validNotifications = validNotifications.filter(x => x.noteId == null || packedNotes.has(x.noteId));
+ validNotifications = validNotifications.filter(x => !('noteId' in x) || packedNotes.has(x.noteId));
- const userIds = validNotifications.map(x => x.notifierId).filter(isNotNull);
+ const userIds = validNotifications.map(x => 'notifierId' in x ? x.notifierId : null).filter(isNotNull);
const users = userIds.length > 0 ? await this.usersRepository.find({
where: { id: In(userIds) },
}) : [];
@@ -137,10 +137,10 @@ export class NotificationEntityService implements OnModuleInit {
const packedUsers = new Map(packedUsersArray.map(p => [p.id, p]));
// 既に解決されたフォローリクエストの通知を除外
- const followRequestNotifications = validNotifications.filter(x => x.type === 'receiveFollowRequest');
+ const followRequestNotifications = validNotifications.filter((x): x is FilterUnionByProperty => x.type === 'receiveFollowRequest');
if (followRequestNotifications.length > 0) {
const reqs = await this.followRequestsRepository.find({
- where: { followerId: In(followRequestNotifications.map(x => x.notifierId!)) },
+ where: { followerId: In(followRequestNotifications.map(x => x.notifierId)) },
});
validNotifications = validNotifications.filter(x => (x.type !== 'receiveFollowRequest') || reqs.some(r => r.followerId === x.notifierId));
}
@@ -150,4 +150,148 @@ export class NotificationEntityService implements OnModuleInit {
packedUsers,
})));
}
+
+ @bindThis
+ public async packGrouped(
+ src: MiGroupedNotification,
+ meId: MiUser['id'],
+ // eslint-disable-next-line @typescript-eslint/ban-types
+ options: {
+
+ },
+ hint?: {
+ packedNotes: Map>;
+ packedUsers: Map>;
+ },
+ ): Promise> {
+ const notification = src;
+ const noteIfNeed = NOTE_REQUIRED_GROUPED_NOTIFICATION_TYPES.has(notification.type) && 'noteId' in notification ? (
+ hint?.packedNotes != null
+ ? hint.packedNotes.get(notification.noteId)
+ : this.noteEntityService.pack(notification.noteId, { id: meId }, {
+ detail: true,
+ })
+ ) : undefined;
+ const userIfNeed = 'notifierId' in notification ? (
+ hint?.packedUsers != null
+ ? hint.packedUsers.get(notification.notifierId)
+ : this.userEntityService.pack(notification.notifierId, { id: meId }, {
+ detail: false,
+ })
+ ) : undefined;
+
+ if (notification.type === 'reaction:grouped') {
+ const reactions = await Promise.all(notification.reactions.map(async reaction => {
+ const user = hint?.packedUsers != null
+ ? hint.packedUsers.get(reaction.userId)!
+ : await this.userEntityService.pack(reaction.userId, { id: meId }, {
+ detail: false,
+ });
+ return {
+ user,
+ reaction: reaction.reaction,
+ };
+ }));
+ return await awaitAll({
+ id: notification.id,
+ createdAt: new Date(notification.createdAt).toISOString(),
+ type: notification.type,
+ note: noteIfNeed,
+ reactions,
+ });
+ } else if (notification.type === 'renote:grouped') {
+ const users = await Promise.all(notification.userIds.map(userId => {
+ const packedUser = hint?.packedUsers != null ? hint.packedUsers.get(userId) : null;
+ if (packedUser) {
+ return packedUser;
+ }
+
+ return this.userEntityService.pack(userId, { id: meId }, {
+ detail: false,
+ });
+ }));
+ return await awaitAll({
+ id: notification.id,
+ createdAt: new Date(notification.createdAt).toISOString(),
+ type: notification.type,
+ note: noteIfNeed,
+ users,
+ });
+ }
+
+ const role = notification.type === 'roleAssigned' ? await this.roleEntityService.pack(notification.roleId) : undefined;
+
+ return await awaitAll({
+ id: notification.id,
+ createdAt: new Date(notification.createdAt).toISOString(),
+ type: notification.type,
+ userId: 'notifierId' in notification ? notification.notifierId : undefined,
+ ...(userIfNeed != null ? { user: userIfNeed } : {}),
+ ...(noteIfNeed != null ? { note: noteIfNeed } : {}),
+ ...(notification.type === 'reaction' ? {
+ reaction: notification.reaction,
+ } : {}),
+ ...(notification.type === 'roleAssigned' ? {
+ role: role,
+ } : {}),
+ ...(notification.type === 'achievementEarned' ? {
+ achievement: notification.achievement,
+ } : {}),
+ ...(notification.type === 'app' ? {
+ body: notification.customBody,
+ header: notification.customHeader,
+ icon: notification.customIcon,
+ } : {}),
+ });
+ }
+
+ @bindThis
+ public async packGroupedMany(
+ notifications: MiGroupedNotification[],
+ meId: MiUser['id'],
+ ) {
+ if (notifications.length === 0) return [];
+
+ let validNotifications = notifications;
+
+ const noteIds = validNotifications.map(x => 'noteId' in x ? x.noteId : null).filter(isNotNull);
+ const notes = noteIds.length > 0 ? await this.notesRepository.find({
+ where: { id: In(noteIds) },
+ relations: ['user', 'reply', 'reply.user', 'renote', 'renote.user'],
+ }) : [];
+ const packedNotesArray = await this.noteEntityService.packMany(notes, { id: meId }, {
+ detail: true,
+ });
+ const packedNotes = new Map(packedNotesArray.map(p => [p.id, p]));
+
+ validNotifications = validNotifications.filter(x => !('noteId' in x) || packedNotes.has(x.noteId));
+
+ const userIds = [];
+ for (const notification of validNotifications) {
+ if ('notifierId' in notification) userIds.push(notification.notifierId);
+ if (notification.type === 'reaction:grouped') userIds.push(...notification.reactions.map(x => x.userId));
+ if (notification.type === 'renote:grouped') userIds.push(...notification.userIds);
+ }
+ const users = userIds.length > 0 ? await this.usersRepository.find({
+ where: { id: In(userIds) },
+ }) : [];
+ const packedUsersArray = await this.userEntityService.packMany(users, { id: meId }, {
+ detail: false,
+ });
+ const packedUsers = new Map(packedUsersArray.map(p => [p.id, p]));
+
+ // 既に解決されたフォローリクエストの通知を除外
+ const followRequestNotifications = validNotifications.filter((x): x is FilterUnionByProperty => x.type === 'receiveFollowRequest');
+ if (followRequestNotifications.length > 0) {
+ const reqs = await this.followRequestsRepository.find({
+ where: { followerId: In(followRequestNotifications.map(x => x.notifierId)) },
+ });
+ validNotifications = validNotifications.filter(x => (x.type !== 'receiveFollowRequest') || reqs.some(r => r.followerId === x.notifierId));
+ }
+
+ return await Promise.all(validNotifications.map(x => this.packGrouped(x, meId, {}, {
+ packedNotes,
+ packedUsers,
+ })));
+ }
}
diff --git a/packages/backend/src/core/entities/PageEntityService.ts b/packages/backend/src/core/entities/PageEntityService.ts
index e3a1e19ddd..f39ef949db 100644
--- a/packages/backend/src/core/entities/PageEntityService.ts
+++ b/packages/backend/src/core/entities/PageEntityService.ts
@@ -13,6 +13,7 @@ import type { MiUser } from '@/models/User.js';
import type { MiPage } from '@/models/Page.js';
import type { MiDriveFile } from '@/models/DriveFile.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import { UserEntityService } from './UserEntityService.js';
import { DriveFileEntityService } from './DriveFileEntityService.js';
@@ -30,6 +31,7 @@ export class PageEntityService {
private userEntityService: UserEntityService,
private driveFileEntityService: DriveFileEntityService,
+ private idService: IdService,
) {
}
@@ -85,7 +87,7 @@ export class PageEntityService {
return await awaitAll({
id: page.id,
- createdAt: page.createdAt.toISOString(),
+ createdAt: this.idService.parse(page.id).date.toISOString(),
updatedAt: page.updatedAt.toISOString(),
userId: page.userId,
user: this.userEntityService.pack(page.user ?? page.userId, me), // { detail: true } すると無限ループするので注意
diff --git a/packages/backend/src/core/entities/RenoteMutingEntityService.ts b/packages/backend/src/core/entities/RenoteMutingEntityService.ts
index 7111fab08a..3f9dc9180a 100644
--- a/packages/backend/src/core/entities/RenoteMutingEntityService.ts
+++ b/packages/backend/src/core/entities/RenoteMutingEntityService.ts
@@ -12,6 +12,7 @@ import type { } from '@/models/Blocking.js';
import type { MiUser } from '@/models/User.js';
import type { MiRenoteMuting } from '@/models/RenoteMuting.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import { UserEntityService } from './UserEntityService.js';
@Injectable()
@@ -21,6 +22,7 @@ export class RenoteMutingEntityService {
private renoteMutingsRepository: RenoteMutingsRepository,
private userEntityService: UserEntityService,
+ private idService: IdService,
) {
}
@@ -33,7 +35,7 @@ export class RenoteMutingEntityService {
return await awaitAll({
id: muting.id,
- createdAt: muting.createdAt.toISOString(),
+ createdAt: this.idService.parse(muting.id).date.toISOString(),
muteeId: muting.muteeId,
mutee: this.userEntityService.pack(muting.muteeId, me, {
detail: true,
diff --git a/packages/backend/src/core/entities/RoleEntityService.ts b/packages/backend/src/core/entities/RoleEntityService.ts
index 23e82561d6..5563f9a1ac 100644
--- a/packages/backend/src/core/entities/RoleEntityService.ts
+++ b/packages/backend/src/core/entities/RoleEntityService.ts
@@ -12,6 +12,7 @@ import type { MiUser } from '@/models/User.js';
import type { MiRole } from '@/models/Role.js';
import { bindThis } from '@/decorators.js';
import { DEFAULT_POLICIES } from '@/core/RoleService.js';
+import { IdService } from '@/core/IdService.js';
@Injectable()
export class RoleEntityService {
@@ -21,6 +22,8 @@ export class RoleEntityService {
@Inject(DI.roleAssignmentsRepository)
private roleAssignmentsRepository: RoleAssignmentsRepository,
+
+ private idService: IdService,
) {
}
@@ -33,9 +36,10 @@ export class RoleEntityService {
const assignedCount = await this.roleAssignmentsRepository.createQueryBuilder('assign')
.where('assign.roleId = :roleId', { roleId: role.id })
- .andWhere(new Brackets(qb => { qb
- .where('assign.expiresAt IS NULL')
- .orWhere('assign.expiresAt > :now', { now: new Date() });
+ .andWhere(new Brackets(qb => {
+ qb
+ .where('assign.expiresAt IS NULL')
+ .orWhere('assign.expiresAt > :now', { now: new Date() });
}))
.getCount();
@@ -50,7 +54,7 @@ export class RoleEntityService {
return await awaitAll({
id: role.id,
- createdAt: role.createdAt.toISOString(),
+ createdAt: this.idService.parse(role.id).date.toISOString(),
updatedAt: role.updatedAt.toISOString(),
name: role.name,
description: role.description,
diff --git a/packages/backend/src/core/entities/SigninEntityService.ts b/packages/backend/src/core/entities/SigninEntityService.ts
index 8c88e8560a..6bde3e589a 100644
--- a/packages/backend/src/core/entities/SigninEntityService.ts
+++ b/packages/backend/src/core/entities/SigninEntityService.ts
@@ -7,10 +7,12 @@ import { Injectable } from '@nestjs/common';
import type { } from '@/models/Blocking.js';
import type { MiSignin } from '@/models/Signin.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
@Injectable()
export class SigninEntityService {
constructor(
+ private idService: IdService,
) {
}
@@ -18,7 +20,13 @@ export class SigninEntityService {
public async pack(
src: MiSignin,
) {
- return src;
+ return {
+ id: src.id,
+ createdAt: this.idService.parse(src.id).date.toISOString(),
+ ip: src.ip,
+ headers: src.headers,
+ success: src.success,
+ };
}
}
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index ee67634da5..ef815a388a 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -15,14 +15,17 @@ import { awaitAll } from '@/misc/prelude/await-all.js';
import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD } from '@/const.js';
import type { MiLocalUser, MiPartialLocalUser, MiPartialRemoteUser, MiRemoteUser, MiUser } from '@/models/User.js';
import { birthdaySchema, descriptionSchema, localUsernameSchema, locationSchema, nameSchema, passwordSchema } from '@/models/User.js';
+import { MiNotification } from '@/models/Notification.js';
import type { UsersRepository, UserSecurityKeysRepository, FollowingsRepository, FollowRequestsRepository, BlockingsRepository, MutingsRepository, DriveFilesRepository, NoteUnreadsRepository, UserNotePiningsRepository, UserProfilesRepository, AnnouncementReadsRepository, AnnouncementsRepository, MiUserProfile, RenoteMutingsRepository, UserMemoRepository } from '@/models/_.js';
import { bindThis } from '@/decorators.js';
import { RoleService } from '@/core/RoleService.js';
import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
+import { IdService } from '@/core/IdService.js';
+import type { AnnouncementService } from '@/core/AnnouncementService.js';
+import type { CustomEmojiService } from '@/core/CustomEmojiService.js';
+import { AvatarDecorationService } from '@/core/AvatarDecorationService.js';
import type { OnModuleInit } from '@nestjs/common';
-import type { AnnouncementService } from '../AnnouncementService.js';
-import type { CustomEmojiService } from '../CustomEmojiService.js';
import type { NoteEntityService } from './NoteEntityService.js';
import type { DriveFileEntityService } from './DriveFileEntityService.js';
import type { PageEntityService } from './PageEntityService.js';
@@ -60,6 +63,8 @@ export class UserEntityService implements OnModuleInit {
private announcementService: AnnouncementService;
private roleService: RoleService;
private federatedInstanceService: FederatedInstanceService;
+ private idService: IdService;
+ private avatarDecorationService: AvatarDecorationService;
constructor(
private moduleRef: ModuleRef,
@@ -111,13 +116,6 @@ export class UserEntityService implements OnModuleInit {
@Inject(DI.userMemosRepository)
private userMemosRepository: UserMemoRepository,
-
- //private noteEntityService: NoteEntityService,
- //private driveFileEntityService: DriveFileEntityService,
- //private pageEntityService: PageEntityService,
- //private customEmojiService: CustomEmojiService,
- //private antennaService: AntennaService,
- //private roleService: RoleService,
) {
}
@@ -130,6 +128,8 @@ export class UserEntityService implements OnModuleInit {
this.announcementService = this.moduleRef.get('AnnouncementService');
this.roleService = this.moduleRef.get('RoleService');
this.federatedInstanceService = this.moduleRef.get('FederatedInstanceService');
+ this.idService = this.moduleRef.get('IdService');
+ this.avatarDecorationService = this.moduleRef.get('AvatarDecorationService');
}
//#region Validators
@@ -236,17 +236,34 @@ export class UserEntityService implements OnModuleInit {
}
@bindThis
- public async getHasUnreadNotification(userId: MiUser['id']): Promise {
+ public async getNotificationsInfo(userId: MiUser['id']): Promise<{
+ hasUnread: boolean;
+ unreadCount: number;
+ }> {
+ const response = {
+ hasUnread: false,
+ unreadCount: 0,
+ };
+
const latestReadNotificationId = await this.redisClient.get(`latestReadNotification:${userId}`);
- const latestNotificationIdsRes = await this.redisClient.xrevrange(
- `notificationTimeline:${userId}`,
- '+',
- '-',
- 'COUNT', 1);
- const latestNotificationId = latestNotificationIdsRes[0]?.[0];
+ if (!latestReadNotificationId) {
+ response.unreadCount = await this.redisClient.xlen(`notificationTimeline:${userId}`);
+ } else {
+ const latestNotificationIdsRes = await this.redisClient.xrevrange(
+ `notificationTimeline:${userId}`,
+ '+',
+ latestReadNotificationId,
+ );
- return latestNotificationId != null && (latestReadNotificationId == null || latestReadNotificationId < latestNotificationId);
+ response.unreadCount = (latestNotificationIdsRes.length - 1 >= 0) ? latestNotificationIdsRes.length - 1 : 0;
+ }
+
+ if (response.unreadCount > 0) {
+ response.hasUnread = true;
+ }
+
+ return response;
}
@bindThis
@@ -315,20 +332,24 @@ export class UserEntityService implements OnModuleInit {
const profile = opts.detail ? (opts.userProfile ?? await this.userProfilesRepository.findOneByOrFail({ userId: user.id })) : null;
const followingCount = profile == null ? null :
- (profile.ffVisibility === 'public') || isMe ? user.followingCount :
- (profile.ffVisibility === 'followers') && (relation && relation.isFollowing) ? user.followingCount :
+ (profile.followingVisibility === 'public') || isMe ? user.followingCount :
+ (profile.followingVisibility === 'followers') && (relation && relation.isFollowing) ? user.followingCount :
null;
const followersCount = profile == null ? null :
- (profile.ffVisibility === 'public') || isMe ? user.followersCount :
- (profile.ffVisibility === 'followers') && (relation && relation.isFollowing) ? user.followersCount :
+ (profile.followersVisibility === 'public') || isMe ? user.followersCount :
+ (profile.followersVisibility === 'followers') && (relation && relation.isFollowing) ? user.followersCount :
null;
const isModerator = isMe && opts.detail ? this.roleService.isModerator(user) : null;
const isAdmin = isMe && opts.detail ? this.roleService.isAdministrator(user) : null;
- const unreadAnnouncements = isMe && opts.detail ? await this.announcementService.getUnreadAnnouncements(user) : null;
+ const unreadAnnouncements = isMe && opts.detail ?
+ (await this.announcementService.getUnreadAnnouncements(user)).map((announcement) => ({
+ createdAt: this.idService.parse(announcement.id).date.toISOString(),
+ ...announcement,
+ })) : null;
- const falsy = opts.detail ? false : undefined;
+ const notificationsInfo = isMe && opts.detail ? await this.getNotificationsInfo(user.id) : null;
const packed = {
id: user.id,
@@ -337,8 +358,16 @@ export class UserEntityService implements OnModuleInit {
host: user.host,
avatarUrl: user.avatarUrl ?? this.getIdenticonUrl(user),
avatarBlurhash: user.avatarBlurhash,
- isBot: user.isBot ?? falsy,
- isCat: user.isCat ?? falsy,
+ avatarDecorations: user.avatarDecorations.length > 0 ? this.avatarDecorationService.getAll().then(decorations => user.avatarDecorations.filter(ud => decorations.some(d => d.id === ud.id)).map(ud => ({
+ id: ud.id,
+ angle: ud.angle || undefined,
+ flipH: ud.flipH || undefined,
+ offsetX: ud.offsetX || undefined,
+ offsetY: ud.offsetY || undefined,
+ url: decorations.find(d => d.id === ud.id)!.url,
+ }))) : [],
+ isBot: user.isBot,
+ isCat: user.isCat,
instance: user.host ? this.federatedInstanceService.federatedInstanceCache.fetch(user.host).then(instance => instance ? {
name: instance.name,
softwareName: instance.softwareName,
@@ -364,14 +393,14 @@ export class UserEntityService implements OnModuleInit {
? Promise.all(user.alsoKnownAs.map(uri => this.apPersonService.fetchPerson(uri).then(user => user?.id).catch(() => null)))
.then(xs => xs.length === 0 ? null : xs.filter(x => x != null) as string[])
: null,
- createdAt: user.createdAt.toISOString(),
+ createdAt: this.idService.parse(user.id).date.toISOString(),
updatedAt: user.updatedAt ? user.updatedAt.toISOString() : null,
lastFetchedAt: user.lastFetchedAt ? user.lastFetchedAt.toISOString() : null,
bannerUrl: user.bannerUrl,
bannerBlurhash: user.bannerBlurhash,
isLocked: user.isLocked,
isSilenced: this.roleService.getUserPolicies(user.id).then(r => !r.canPublicNote),
- isSuspended: user.isSuspended ?? falsy,
+ isSuspended: user.isSuspended,
description: profile!.description,
location: profile!.location,
birthday: profile!.birthday,
@@ -388,7 +417,8 @@ export class UserEntityService implements OnModuleInit {
pinnedPageId: profile!.pinnedPageId,
pinnedPage: profile!.pinnedPageId ? this.pageEntityService.pack(profile!.pinnedPageId, me) : null,
publicReactions: profile!.publicReactions,
- ffVisibility: profile!.ffVisibility,
+ followersVisibility: profile!.followersVisibility,
+ followingVisibility: profile!.followingVisibility,
twoFactorEnabled: profile!.twoFactorEnabled,
usePasswordLessLogin: profile!.usePasswordLessLogin,
securityKeys: profile!.twoFactorEnabled
@@ -442,9 +472,11 @@ export class UserEntityService implements OnModuleInit {
unreadAnnouncements,
hasUnreadAntenna: this.getHasUnreadAntenna(user.id),
hasUnreadChannel: false, // 後方互換性のため
- hasUnreadNotification: this.getHasUnreadNotification(user.id),
+ hasUnreadNotification: notificationsInfo?.hasUnread, // 後方互換性のため
hasPendingReceivedFollowRequest: this.getHasPendingReceivedFollowRequest(user.id),
+ unreadNotificationsCount: notificationsInfo?.unreadCount,
mutedWords: profile!.mutedWords,
+ hardMutedWords: profile!.hardMutedWords,
mutedInstances: profile!.mutedInstances,
mutingNotificationTypes: [], // 後方互換性のため
notificationRecieveConfig: profile!.notificationRecieveConfig,
diff --git a/packages/backend/src/core/entities/UserListEntityService.ts b/packages/backend/src/core/entities/UserListEntityService.ts
index 06b6e852b1..31ab7293da 100644
--- a/packages/backend/src/core/entities/UserListEntityService.ts
+++ b/packages/backend/src/core/entities/UserListEntityService.ts
@@ -10,6 +10,7 @@ import type { Packed } from '@/misc/json-schema.js';
import type { } from '@/models/Blocking.js';
import type { MiUserList } from '@/models/UserList.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import { UserEntityService } from './UserEntityService.js';
@Injectable()
@@ -22,6 +23,7 @@ export class UserListEntityService {
private userListMembershipsRepository: UserListMembershipsRepository,
private userEntityService: UserEntityService,
+ private idService: IdService,
) {
}
@@ -37,7 +39,7 @@ export class UserListEntityService {
return {
id: userList.id,
- createdAt: userList.createdAt.toISOString(),
+ createdAt: this.idService.parse(userList.id).date.toISOString(),
name: userList.name,
userIds: users.map(x => x.userId),
isPublic: userList.isPublic,
@@ -50,7 +52,7 @@ export class UserListEntityService {
) {
return Promise.all(memberships.map(async x => ({
id: x.id,
- createdAt: x.createdAt.toISOString(),
+ createdAt: this.idService.parse(x.id).date.toISOString(),
userId: x.userId,
user: await this.userEntityService.pack(x.userId),
withReplies: x.withReplies,
diff --git a/packages/backend/src/daemons/ServerStatsService.ts b/packages/backend/src/daemons/ServerStatsService.ts
index d294628740..c5ef9b2fa3 100644
--- a/packages/backend/src/daemons/ServerStatsService.ts
+++ b/packages/backend/src/daemons/ServerStatsService.ts
@@ -108,6 +108,5 @@ async function net() {
// FS STAT
async function fs() {
- const data = await si.disksIO().catch(() => ({ rIO_sec: 0, wIO_sec: 0 }));
- return data ?? { rIO_sec: 0, wIO_sec: 0 };
+ return await si.disksIO().catch(() => ({ rIO_sec: 0, wIO_sec: 0 }));
}
diff --git a/packages/backend/src/di-symbols.ts b/packages/backend/src/di-symbols.ts
index edcdd21d60..8411cb8229 100644
--- a/packages/backend/src/di-symbols.ts
+++ b/packages/backend/src/di-symbols.ts
@@ -18,6 +18,7 @@ export const DI = {
announcementsRepository: Symbol('announcementsRepository'),
announcementReadsRepository: Symbol('announcementReadsRepository'),
appsRepository: Symbol('appsRepository'),
+ avatarDecorationsRepository: Symbol('avatarDecorationsRepository'),
noteFavoritesRepository: Symbol('noteFavoritesRepository'),
noteThreadMutingsRepository: Symbol('noteThreadMutingsRepository'),
noteReactionsRepository: Symbol('noteReactionsRepository'),
diff --git a/packages/backend/src/misc/emoji-regex.ts b/packages/backend/src/misc/emoji-regex.ts
index 24e4092aeb..37ecde6eb1 100644
--- a/packages/backend/src/misc/emoji-regex.ts
+++ b/packages/backend/src/misc/emoji-regex.ts
@@ -3,7 +3,7 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
-// taken from twemoji-parser/dist/lib/regex.js
-const twemojiRegex = /(?:\ud83d\udc68\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83e\uddd1\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83e\uddd1\ud83c[\udffc-\udfff]|\ud83e\uddd1\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83e\uddd1\ud83c[\udffb\udffd-\udfff]|\ud83e\uddd1\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83e\uddd1\ud83c[\udffb\udffc\udffe\udfff]|\ud83e\uddd1\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83e\uddd1\ud83c[\udffb-\udffd\udfff]|\ud83e\uddd1\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83e\uddd1\ud83c[\udffb-\udffe]|\ud83d\udc68\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffb\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffc-\udfff]|\ud83d\udc68\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffc\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb\udffd-\udfff]|\ud83d\udc68\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffd\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb\udffc\udffe\udfff]|\ud83d\udc68\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffe\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb-\udffd\udfff]|\ud83d\udc68\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udfff\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb-\udffe]|\ud83d\udc69\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffb\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffc-\udfff]|\ud83d\udc69\ud83c\udffb\u200d\ud83e\udd1d\u200d\ud83d\udc69\ud83c[\udffc-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb\udffd-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\ud83e\udd1d\u200d\ud83d\udc69\ud83c[\udffb\udffd-\udfff]|\ud83d\udc69\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffd\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb\udffc\udffe\udfff]|\ud83d\udc69\ud83c\udffd\u200d\ud83e\udd1d\u200d\ud83d\udc69\ud83c[\udffb\udffc\udffe\udfff]|\ud83d\udc69\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffe\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb-\udffd\udfff]|\ud83d\udc69\ud83c\udffe\u200d\ud83e\udd1d\u200d\ud83d\udc69\ud83c[\udffb-\udffd\udfff]|\ud83d\udc69\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udfff\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb-\udffe]|\ud83d\udc69\ud83c\udfff\u200d\ud83e\udd1d\u200d\ud83d\udc69\ud83c[\udffb-\udffe]|\ud83e\uddd1\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83e\uddd1\ud83c[\udffc-\udfff]|\ud83e\uddd1\ud83c\udffb\u200d\ud83e\udd1d\u200d\ud83e\uddd1\ud83c[\udffb-\udfff]|\ud83e\uddd1\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83e\uddd1\ud83c[\udffb\udffd-\udfff]|\ud83e\uddd1\ud83c\udffc\u200d\ud83e\udd1d\u200d\ud83e\uddd1\ud83c[\udffb-\udfff]|\ud83e\uddd1\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83e\uddd1\ud83c[\udffb\udffc\udffe\udfff]|\ud83e\uddd1\ud83c\udffd\u200d\ud83e\udd1d\u200d\ud83e\uddd1\ud83c[\udffb-\udfff]|\ud83e\uddd1\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83e\uddd1\ud83c[\udffb-\udffd\udfff]|\ud83e\uddd1\ud83c\udffe\u200d\ud83e\udd1d\u200d\ud83e\uddd1\ud83c[\udffb-\udfff]|\ud83e\uddd1\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83e\uddd1\ud83c[\udffb-\udffe]|\ud83e\uddd1\ud83c\udfff\u200d\ud83e\udd1d\u200d\ud83e\uddd1\ud83c[\udffb-\udfff]|\ud83d\udc68\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68|\ud83d\udc69\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d[\udc68\udc69]|\ud83e\udef1\ud83c\udffb\u200d\ud83e\udef2\ud83c[\udffc-\udfff]|\ud83e\udef1\ud83c\udffc\u200d\ud83e\udef2\ud83c[\udffb\udffd-\udfff]|\ud83e\udef1\ud83c\udffd\u200d\ud83e\udef2\ud83c[\udffb\udffc\udffe\udfff]|\ud83e\udef1\ud83c\udffe\u200d\ud83e\udef2\ud83c[\udffb-\udffd\udfff]|\ud83e\udef1\ud83c\udfff\u200d\ud83e\udef2\ud83c[\udffb-\udffe]|\ud83d\udc68\u200d\u2764\ufe0f\u200d\ud83d\udc68|\ud83d\udc69\u200d\u2764\ufe0f\u200d\ud83d[\udc68\udc69]|\ud83e\uddd1\u200d\ud83e\udd1d\u200d\ud83e\uddd1|\ud83d\udc6b\ud83c[\udffb-\udfff]|\ud83d\udc6c\ud83c[\udffb-\udfff]|\ud83d\udc6d\ud83c[\udffb-\udfff]|\ud83d\udc8f\ud83c[\udffb-\udfff]|\ud83d\udc91\ud83c[\udffb-\udfff]|\ud83e\udd1d\ud83c[\udffb-\udfff]|\ud83d[\udc6b-\udc6d\udc8f\udc91]|\ud83e\udd1d)|(?:\ud83d[\udc68\udc69]|\ud83e\uddd1)(?:\ud83c[\udffb-\udfff])?\u200d(?:\u2695\ufe0f|\u2696\ufe0f|\u2708\ufe0f|\ud83c[\udf3e\udf73\udf7c\udf84\udf93\udfa4\udfa8\udfeb\udfed]|\ud83d[\udcbb\udcbc\udd27\udd2c\ude80\ude92]|\ud83e[\uddaf-\uddb3\uddbc\uddbd])|(?:\ud83c[\udfcb\udfcc]|\ud83d[\udd74\udd75]|\u26f9)((?:\ud83c[\udffb-\udfff]|\ufe0f)\u200d[\u2640\u2642]\ufe0f)|(?:\ud83c[\udfc3\udfc4\udfca]|\ud83d[\udc6e\udc70\udc71\udc73\udc77\udc81\udc82\udc86\udc87\ude45-\ude47\ude4b\ude4d\ude4e\udea3\udeb4-\udeb6]|\ud83e[\udd26\udd35\udd37-\udd39\udd3d\udd3e\uddb8\uddb9\uddcd-\uddcf\uddd4\uddd6-\udddd])(?:\ud83c[\udffb-\udfff])?\u200d[\u2640\u2642]\ufe0f|(?:\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc68\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d[\udc66\udc67]|\ud83c\udff3\ufe0f\u200d\u26a7\ufe0f|\ud83c\udff3\ufe0f\u200d\ud83c\udf08|\ud83d\ude36\u200d\ud83c\udf2b\ufe0f|\u2764\ufe0f\u200d\ud83d\udd25|\u2764\ufe0f\u200d\ud83e\ude79|\ud83c\udff4\u200d\u2620\ufe0f|\ud83d\udc15\u200d\ud83e\uddba|\ud83d\udc3b\u200d\u2744\ufe0f|\ud83d\udc41\u200d\ud83d\udde8|\ud83d\udc68\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\ud83d[\udc66\udc67]|\ud83d\udc6f\u200d\u2640\ufe0f|\ud83d\udc6f\u200d\u2642\ufe0f|\ud83d\ude2e\u200d\ud83d\udca8|\ud83d\ude35\u200d\ud83d\udcab|\ud83e\udd3c\u200d\u2640\ufe0f|\ud83e\udd3c\u200d\u2642\ufe0f|\ud83e\uddde\u200d\u2640\ufe0f|\ud83e\uddde\u200d\u2642\ufe0f|\ud83e\udddf\u200d\u2640\ufe0f|\ud83e\udddf\u200d\u2642\ufe0f|\ud83d\udc08\u200d\u2b1b)|[#*0-9]\ufe0f?\u20e3|(?:[©®\u2122\u265f]\ufe0f)|(?:\ud83c[\udc04\udd70\udd71\udd7e\udd7f\ude02\ude1a\ude2f\ude37\udf21\udf24-\udf2c\udf36\udf7d\udf96\udf97\udf99-\udf9b\udf9e\udf9f\udfcd\udfce\udfd4-\udfdf\udff3\udff5\udff7]|\ud83d[\udc3f\udc41\udcfd\udd49\udd4a\udd6f\udd70\udd73\udd76-\udd79\udd87\udd8a-\udd8d\udda5\udda8\uddb1\uddb2\uddbc\uddc2-\uddc4\uddd1-\uddd3\udddc-\uddde\udde1\udde3\udde8\uddef\uddf3\uddfa\udecb\udecd-\udecf\udee0-\udee5\udee9\udef0\udef3]|[\u203c\u2049\u2139\u2194-\u2199\u21a9\u21aa\u231a\u231b\u2328\u23cf\u23ed-\u23ef\u23f1\u23f2\u23f8-\u23fa\u24c2\u25aa\u25ab\u25b6\u25c0\u25fb-\u25fe\u2600-\u2604\u260e\u2611\u2614\u2615\u2618\u2620\u2622\u2623\u2626\u262a\u262e\u262f\u2638-\u263a\u2640\u2642\u2648-\u2653\u2660\u2663\u2665\u2666\u2668\u267b\u267f\u2692-\u2697\u2699\u269b\u269c\u26a0\u26a1\u26a7\u26aa\u26ab\u26b0\u26b1\u26bd\u26be\u26c4\u26c5\u26c8\u26cf\u26d1\u26d3\u26d4\u26e9\u26ea\u26f0-\u26f5\u26f8\u26fa\u26fd\u2702\u2708\u2709\u270f\u2712\u2714\u2716\u271d\u2721\u2733\u2734\u2744\u2747\u2757\u2763\u2764\u27a1\u2934\u2935\u2b05-\u2b07\u2b1b\u2b1c\u2b50\u2b55\u3030\u303d\u3297\u3299])(?:\ufe0f|(?!\ufe0e))|(?:(?:\ud83c[\udfcb\udfcc]|\ud83d[\udd74\udd75\udd90]|[\u261d\u26f7\u26f9\u270c\u270d])(?:\ufe0f|(?!\ufe0e))|(?:\ud83c[\udf85\udfc2-\udfc4\udfc7\udfca]|\ud83d[\udc42\udc43\udc46-\udc50\udc66-\udc69\udc6e\udc70-\udc78\udc7c\udc81-\udc83\udc85-\udc87\udcaa\udd7a\udd95\udd96\ude45-\ude47\ude4b-\ude4f\udea3\udeb4-\udeb6\udec0\udecc]|\ud83e[\udd0c\udd0f\udd18-\udd1c\udd1e\udd1f\udd26\udd30-\udd39\udd3d\udd3e\udd77\uddb5\uddb6\uddb8\uddb9\uddbb\uddcd-\uddcf\uddd1-\udddd\udec3-\udec5\udef0-\udef6]|[\u270a\u270b]))(?:\ud83c[\udffb-\udfff])?|(?:\ud83c\udff4\udb40\udc67\udb40\udc62\udb40\udc65\udb40\udc6e\udb40\udc67\udb40\udc7f|\ud83c\udff4\udb40\udc67\udb40\udc62\udb40\udc73\udb40\udc63\udb40\udc74\udb40\udc7f|\ud83c\udff4\udb40\udc67\udb40\udc62\udb40\udc77\udb40\udc6c\udb40\udc73\udb40\udc7f|\ud83c\udde6\ud83c[\udde8-\uddec\uddee\uddf1\uddf2\uddf4\uddf6-\uddfa\uddfc\uddfd\uddff]|\ud83c\udde7\ud83c[\udde6\udde7\udde9-\uddef\uddf1-\uddf4\uddf6-\uddf9\uddfb\uddfc\uddfe\uddff]|\ud83c\udde8\ud83c[\udde6\udde8\udde9\uddeb-\uddee\uddf0-\uddf5\uddf7\uddfa-\uddff]|\ud83c\udde9\ud83c[\uddea\uddec\uddef\uddf0\uddf2\uddf4\uddff]|\ud83c\uddea\ud83c[\udde6\udde8\uddea\uddec\udded\uddf7-\uddfa]|\ud83c\uddeb\ud83c[\uddee-\uddf0\uddf2\uddf4\uddf7]|\ud83c\uddec\ud83c[\udde6\udde7\udde9-\uddee\uddf1-\uddf3\uddf5-\uddfa\uddfc\uddfe]|\ud83c\udded\ud83c[\uddf0\uddf2\uddf3\uddf7\uddf9\uddfa]|\ud83c\uddee\ud83c[\udde8-\uddea\uddf1-\uddf4\uddf6-\uddf9]|\ud83c\uddef\ud83c[\uddea\uddf2\uddf4\uddf5]|\ud83c\uddf0\ud83c[\uddea\uddec-\uddee\uddf2\uddf3\uddf5\uddf7\uddfc\uddfe\uddff]|\ud83c\uddf1\ud83c[\udde6-\udde8\uddee\uddf0\uddf7-\uddfb\uddfe]|\ud83c\uddf2\ud83c[\udde6\udde8-\udded\uddf0-\uddff]|\ud83c\uddf3\ud83c[\udde6\udde8\uddea-\uddec\uddee\uddf1\uddf4\uddf5\uddf7\uddfa\uddff]|\ud83c\uddf4\ud83c\uddf2|\ud83c\uddf5\ud83c[\udde6\uddea-\udded\uddf0-\uddf3\uddf7-\uddf9\uddfc\uddfe]|\ud83c\uddf6\ud83c\udde6|\ud83c\uddf7\ud83c[\uddea\uddf4\uddf8\uddfa\uddfc]|\ud83c\uddf8\ud83c[\udde6-\uddea\uddec-\uddf4\uddf7-\uddf9\uddfb\uddfd-\uddff]|\ud83c\uddf9\ud83c[\udde6\udde8\udde9\uddeb-\udded\uddef-\uddf4\uddf7\uddf9\uddfb\uddfc\uddff]|\ud83c\uddfa\ud83c[\udde6\uddec\uddf2\uddf3\uddf8\uddfe\uddff]|\ud83c\uddfb\ud83c[\udde6\udde8\uddea\uddec\uddee\uddf3\uddfa]|\ud83c\uddfc\ud83c[\uddeb\uddf8]|\ud83c\uddfd\ud83c\uddf0|\ud83c\uddfe\ud83c[\uddea\uddf9]|\ud83c\uddff\ud83c[\udde6\uddf2\uddfc]|\ud83c[\udccf\udd8e\udd91-\udd9a\udde6-\uddff\ude01\ude32-\ude36\ude38-\ude3a\ude50\ude51\udf00-\udf20\udf2d-\udf35\udf37-\udf7c\udf7e-\udf84\udf86-\udf93\udfa0-\udfc1\udfc5\udfc6\udfc8\udfc9\udfcf-\udfd3\udfe0-\udff0\udff4\udff8-\udfff]|\ud83d[\udc00-\udc3e\udc40\udc44\udc45\udc51-\udc65\udc6a\udc6f\udc79-\udc7b\udc7d-\udc80\udc84\udc88-\udc8e\udc90\udc92-\udca9\udcab-\udcfc\udcff-\udd3d\udd4b-\udd4e\udd50-\udd67\udda4\uddfb-\ude44\ude48-\ude4a\ude80-\udea2\udea4-\udeb3\udeb7-\udebf\udec1-\udec5\uded0-\uded2\uded5-\uded7\udedd-\udedf\udeeb\udeec\udef4-\udefc\udfe0-\udfeb\udff0]|\ud83e[\udd0d\udd0e\udd10-\udd17\udd20-\udd25\udd27-\udd2f\udd3a\udd3c\udd3f-\udd45\udd47-\udd76\udd78-\uddb4\uddb7\uddba\uddbc-\uddcc\uddd0\uddde-\uddff\ude70-\ude74\ude78-\ude7c\ude80-\ude86\ude90-\udeac\udeb0-\udeba\udec0-\udec2\uded0-\uded9\udee0-\udee7]|[\u23e9-\u23ec\u23f0\u23f3\u267e\u26ce\u2705\u2728\u274c\u274e\u2753-\u2755\u2795-\u2797\u27b0\u27bf\ue50a])|\ufe0f/g;
+// taken from @twemoji/parser/dist/lib/regex.js
+const twemojiRegex = /(?:\ud83d\udc68\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83e\uddd1\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83e\uddd1\ud83c[\udffc-\udfff]|\ud83e\uddd1\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83e\uddd1\ud83c[\udffb\udffd-\udfff]|\ud83e\uddd1\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83e\uddd1\ud83c[\udffb\udffc\udffe\udfff]|\ud83e\uddd1\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83e\uddd1\ud83c[\udffb-\udffd\udfff]|\ud83e\uddd1\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83e\uddd1\ud83c[\udffb-\udffe]|\ud83d\udc68\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffb\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffc-\udfff]|\ud83d\udc68\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffc\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb\udffd-\udfff]|\ud83d\udc68\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffd\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb\udffc\udffe\udfff]|\ud83d\udc68\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffe\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb-\udffd\udfff]|\ud83d\udc68\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udfff\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb-\udffe]|\ud83d\udc69\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffb\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffc-\udfff]|\ud83d\udc69\ud83c\udffb\u200d\ud83e\udd1d\u200d\ud83d\udc69\ud83c[\udffc-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb\udffd-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\ud83e\udd1d\u200d\ud83d\udc69\ud83c[\udffb\udffd-\udfff]|\ud83d\udc69\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffd\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb\udffc\udffe\udfff]|\ud83d\udc69\ud83c\udffd\u200d\ud83e\udd1d\u200d\ud83d\udc69\ud83c[\udffb\udffc\udffe\udfff]|\ud83d\udc69\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffe\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb-\udffd\udfff]|\ud83d\udc69\ud83c\udffe\u200d\ud83e\udd1d\u200d\ud83d\udc69\ud83c[\udffb-\udffd\udfff]|\ud83d\udc69\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udfff\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb-\udffe]|\ud83d\udc69\ud83c\udfff\u200d\ud83e\udd1d\u200d\ud83d\udc69\ud83c[\udffb-\udffe]|\ud83e\uddd1\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83e\uddd1\ud83c[\udffc-\udfff]|\ud83e\uddd1\ud83c\udffb\u200d\ud83e\udd1d\u200d\ud83e\uddd1\ud83c[\udffb-\udfff]|\ud83e\uddd1\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83e\uddd1\ud83c[\udffb\udffd-\udfff]|\ud83e\uddd1\ud83c\udffc\u200d\ud83e\udd1d\u200d\ud83e\uddd1\ud83c[\udffb-\udfff]|\ud83e\uddd1\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83e\uddd1\ud83c[\udffb\udffc\udffe\udfff]|\ud83e\uddd1\ud83c\udffd\u200d\ud83e\udd1d\u200d\ud83e\uddd1\ud83c[\udffb-\udfff]|\ud83e\uddd1\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83e\uddd1\ud83c[\udffb-\udffd\udfff]|\ud83e\uddd1\ud83c\udffe\u200d\ud83e\udd1d\u200d\ud83e\uddd1\ud83c[\udffb-\udfff]|\ud83e\uddd1\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83e\uddd1\ud83c[\udffb-\udffe]|\ud83e\uddd1\ud83c\udfff\u200d\ud83e\udd1d\u200d\ud83e\uddd1\ud83c[\udffb-\udfff]|\ud83d\udc68\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68|\ud83d\udc69\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d[\udc68\udc69]|\ud83e\udef1\ud83c\udffb\u200d\ud83e\udef2\ud83c[\udffc-\udfff]|\ud83e\udef1\ud83c\udffc\u200d\ud83e\udef2\ud83c[\udffb\udffd-\udfff]|\ud83e\udef1\ud83c\udffd\u200d\ud83e\udef2\ud83c[\udffb\udffc\udffe\udfff]|\ud83e\udef1\ud83c\udffe\u200d\ud83e\udef2\ud83c[\udffb-\udffd\udfff]|\ud83e\udef1\ud83c\udfff\u200d\ud83e\udef2\ud83c[\udffb-\udffe]|\ud83d\udc68\u200d\u2764\ufe0f\u200d\ud83d\udc68|\ud83d\udc69\u200d\u2764\ufe0f\u200d\ud83d[\udc68\udc69]|\ud83e\uddd1\u200d\ud83e\udd1d\u200d\ud83e\uddd1|\ud83d\udc6b\ud83c[\udffb-\udfff]|\ud83d\udc6c\ud83c[\udffb-\udfff]|\ud83d\udc6d\ud83c[\udffb-\udfff]|\ud83d\udc8f\ud83c[\udffb-\udfff]|\ud83d\udc91\ud83c[\udffb-\udfff]|\ud83e\udd1d\ud83c[\udffb-\udfff]|\ud83d[\udc6b-\udc6d\udc8f\udc91]|\ud83e\udd1d)|(?:\ud83d[\udc68\udc69]|\ud83e\uddd1)(?:\ud83c[\udffb-\udfff])?\u200d(?:\u2695\ufe0f|\u2696\ufe0f|\u2708\ufe0f|\ud83c[\udf3e\udf73\udf7c\udf84\udf93\udfa4\udfa8\udfeb\udfed]|\ud83d[\udcbb\udcbc\udd27\udd2c\ude80\ude92]|\ud83e[\uddaf-\uddb3\uddbc\uddbd])|(?:\ud83c[\udfcb\udfcc]|\ud83d[\udd74\udd75]|\u26f9)((?:\ud83c[\udffb-\udfff]|\ufe0f)\u200d[\u2640\u2642]\ufe0f)|(?:\ud83c[\udfc3\udfc4\udfca]|\ud83d[\udc6e\udc70\udc71\udc73\udc77\udc81\udc82\udc86\udc87\ude45-\ude47\ude4b\ude4d\ude4e\udea3\udeb4-\udeb6]|\ud83e[\udd26\udd35\udd37-\udd39\udd3d\udd3e\uddb8\uddb9\uddcd-\uddcf\uddd4\uddd6-\udddd])(?:\ud83c[\udffb-\udfff])?\u200d[\u2640\u2642]\ufe0f|(?:\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc68\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d[\udc66\udc67]|\ud83c\udff3\ufe0f\u200d\u26a7\ufe0f|\ud83c\udff3\ufe0f\u200d\ud83c\udf08|\ud83d\ude36\u200d\ud83c\udf2b\ufe0f|\u2764\ufe0f\u200d\ud83d\udd25|\u2764\ufe0f\u200d\ud83e\ude79|\ud83c\udff4\u200d\u2620\ufe0f|\ud83d\udc15\u200d\ud83e\uddba|\ud83d\udc3b\u200d\u2744\ufe0f|\ud83d\udc41\u200d\ud83d\udde8|\ud83d\udc68\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\ud83d[\udc66\udc67]|\ud83d\udc6f\u200d\u2640\ufe0f|\ud83d\udc6f\u200d\u2642\ufe0f|\ud83d\ude2e\u200d\ud83d\udca8|\ud83d\ude35\u200d\ud83d\udcab|\ud83e\udd3c\u200d\u2640\ufe0f|\ud83e\udd3c\u200d\u2642\ufe0f|\ud83e\uddde\u200d\u2640\ufe0f|\ud83e\uddde\u200d\u2642\ufe0f|\ud83e\udddf\u200d\u2640\ufe0f|\ud83e\udddf\u200d\u2642\ufe0f|\ud83d\udc08\u200d\u2b1b|\ud83d\udc26\u200d\u2b1b)|[#*0-9]\ufe0f?\u20e3|(?:[©®\u2122\u265f]\ufe0f)|(?:\ud83c[\udc04\udd70\udd71\udd7e\udd7f\ude02\ude1a\ude2f\ude37\udf21\udf24-\udf2c\udf36\udf7d\udf96\udf97\udf99-\udf9b\udf9e\udf9f\udfcd\udfce\udfd4-\udfdf\udff3\udff5\udff7]|\ud83d[\udc3f\udc41\udcfd\udd49\udd4a\udd6f\udd70\udd73\udd76-\udd79\udd87\udd8a-\udd8d\udda5\udda8\uddb1\uddb2\uddbc\uddc2-\uddc4\uddd1-\uddd3\udddc-\uddde\udde1\udde3\udde8\uddef\uddf3\uddfa\udecb\udecd-\udecf\udee0-\udee5\udee9\udef0\udef3]|[\u203c\u2049\u2139\u2194-\u2199\u21a9\u21aa\u231a\u231b\u2328\u23cf\u23ed-\u23ef\u23f1\u23f2\u23f8-\u23fa\u24c2\u25aa\u25ab\u25b6\u25c0\u25fb-\u25fe\u2600-\u2604\u260e\u2611\u2614\u2615\u2618\u2620\u2622\u2623\u2626\u262a\u262e\u262f\u2638-\u263a\u2640\u2642\u2648-\u2653\u2660\u2663\u2665\u2666\u2668\u267b\u267f\u2692-\u2697\u2699\u269b\u269c\u26a0\u26a1\u26a7\u26aa\u26ab\u26b0\u26b1\u26bd\u26be\u26c4\u26c5\u26c8\u26cf\u26d1\u26d3\u26d4\u26e9\u26ea\u26f0-\u26f5\u26f8\u26fa\u26fd\u2702\u2708\u2709\u270f\u2712\u2714\u2716\u271d\u2721\u2733\u2734\u2744\u2747\u2757\u2763\u2764\u27a1\u2934\u2935\u2b05-\u2b07\u2b1b\u2b1c\u2b50\u2b55\u3030\u303d\u3297\u3299])(?:\ufe0f|(?!\ufe0e))|(?:(?:\ud83c[\udfcb\udfcc]|\ud83d[\udd74\udd75\udd90]|\ud83e\udef0|[\u261d\u26f7\u26f9\u270c\u270d])(?:\ufe0f|(?!\ufe0e))|(?:\ud83c[\udf85\udfc2-\udfc4\udfc7\udfca]|\ud83d[\udc42\udc43\udc46-\udc50\udc66-\udc69\udc6e\udc70-\udc78\udc7c\udc81-\udc83\udc85-\udc87\udcaa\udd7a\udd95\udd96\ude45-\ude47\ude4b-\ude4f\udea3\udeb4-\udeb6\udec0\udecc]|\ud83e[\udd0c\udd0f\udd18-\udd1c\udd1e\udd1f\udd26\udd30-\udd39\udd3d\udd3e\udd77\uddb5\uddb6\uddb8\uddb9\uddbb\uddcd-\uddcf\uddd1-\udddd\udec3-\udec5\udef1-\udef8]|[\u270a\u270b]))(?:\ud83c[\udffb-\udfff])?|(?:\ud83c\udff4\udb40\udc67\udb40\udc62\udb40\udc65\udb40\udc6e\udb40\udc67\udb40\udc7f|\ud83c\udff4\udb40\udc67\udb40\udc62\udb40\udc73\udb40\udc63\udb40\udc74\udb40\udc7f|\ud83c\udff4\udb40\udc67\udb40\udc62\udb40\udc77\udb40\udc6c\udb40\udc73\udb40\udc7f|\ud83c\udde6\ud83c[\udde8-\uddec\uddee\uddf1\uddf2\uddf4\uddf6-\uddfa\uddfc\uddfd\uddff]|\ud83c\udde7\ud83c[\udde6\udde7\udde9-\uddef\uddf1-\uddf4\uddf6-\uddf9\uddfb\uddfc\uddfe\uddff]|\ud83c\udde8\ud83c[\udde6\udde8\udde9\uddeb-\uddee\uddf0-\uddf5\uddf7\uddfa-\uddff]|\ud83c\udde9\ud83c[\uddea\uddec\uddef\uddf0\uddf2\uddf4\uddff]|\ud83c\uddea\ud83c[\udde6\udde8\uddea\uddec\udded\uddf7-\uddfa]|\ud83c\uddeb\ud83c[\uddee-\uddf0\uddf2\uddf4\uddf7]|\ud83c\uddec\ud83c[\udde6\udde7\udde9-\uddee\uddf1-\uddf3\uddf5-\uddfa\uddfc\uddfe]|\ud83c\udded\ud83c[\uddf0\uddf2\uddf3\uddf7\uddf9\uddfa]|\ud83c\uddee\ud83c[\udde8-\uddea\uddf1-\uddf4\uddf6-\uddf9]|\ud83c\uddef\ud83c[\uddea\uddf2\uddf4\uddf5]|\ud83c\uddf0\ud83c[\uddea\uddec-\uddee\uddf2\uddf3\uddf5\uddf7\uddfc\uddfe\uddff]|\ud83c\uddf1\ud83c[\udde6-\udde8\uddee\uddf0\uddf7-\uddfb\uddfe]|\ud83c\uddf2\ud83c[\udde6\udde8-\udded\uddf0-\uddff]|\ud83c\uddf3\ud83c[\udde6\udde8\uddea-\uddec\uddee\uddf1\uddf4\uddf5\uddf7\uddfa\uddff]|\ud83c\uddf4\ud83c\uddf2|\ud83c\uddf5\ud83c[\udde6\uddea-\udded\uddf0-\uddf3\uddf7-\uddf9\uddfc\uddfe]|\ud83c\uddf6\ud83c\udde6|\ud83c\uddf7\ud83c[\uddea\uddf4\uddf8\uddfa\uddfc]|\ud83c\uddf8\ud83c[\udde6-\uddea\uddec-\uddf4\uddf7-\uddf9\uddfb\uddfd-\uddff]|\ud83c\uddf9\ud83c[\udde6\udde8\udde9\uddeb-\udded\uddef-\uddf4\uddf7\uddf9\uddfb\uddfc\uddff]|\ud83c\uddfa\ud83c[\udde6\uddec\uddf2\uddf3\uddf8\uddfe\uddff]|\ud83c\uddfb\ud83c[\udde6\udde8\uddea\uddec\uddee\uddf3\uddfa]|\ud83c\uddfc\ud83c[\uddeb\uddf8]|\ud83c\uddfd\ud83c\uddf0|\ud83c\uddfe\ud83c[\uddea\uddf9]|\ud83c\uddff\ud83c[\udde6\uddf2\uddfc]|\ud83c[\udccf\udd8e\udd91-\udd9a\udde6-\uddff\ude01\ude32-\ude36\ude38-\ude3a\ude50\ude51\udf00-\udf20\udf2d-\udf35\udf37-\udf7c\udf7e-\udf84\udf86-\udf93\udfa0-\udfc1\udfc5\udfc6\udfc8\udfc9\udfcf-\udfd3\udfe0-\udff0\udff4\udff8-\udfff]|\ud83d[\udc00-\udc3e\udc40\udc44\udc45\udc51-\udc65\udc6a\udc6f\udc79-\udc7b\udc7d-\udc80\udc84\udc88-\udc8e\udc90\udc92-\udca9\udcab-\udcfc\udcff-\udd3d\udd4b-\udd4e\udd50-\udd67\udda4\uddfb-\ude44\ude48-\ude4a\ude80-\udea2\udea4-\udeb3\udeb7-\udebf\udec1-\udec5\uded0-\uded2\uded5-\uded7\udedc-\udedf\udeeb\udeec\udef4-\udefc\udfe0-\udfeb\udff0]|\ud83e[\udd0d\udd0e\udd10-\udd17\udd20-\udd25\udd27-\udd2f\udd3a\udd3c\udd3f-\udd45\udd47-\udd76\udd78-\uddb4\uddb7\uddba\uddbc-\uddcc\uddd0\uddde-\uddff\ude70-\ude7c\ude80-\ude88\ude90-\udebd\udebf-\udec2\udece-\udedb\udee0-\udee8]|[\u23e9-\u23ec\u23f0\u23f3\u267e\u26ce\u2705\u2728\u274c\u274e\u2753-\u2755\u2795-\u2797\u27b0\u27bf\ue50a])|\ufe0f/g;
export const emojiRegex = new RegExp(`(${twemojiRegex.source})`);
diff --git a/packages/backend/src/misc/id/aid.ts b/packages/backend/src/misc/id/aid.ts
index ec8aa849c9..de03f6793f 100644
--- a/packages/backend/src/misc/id/aid.ts
+++ b/packages/backend/src/misc/id/aid.ts
@@ -24,8 +24,7 @@ function getNoise(): string {
return counter.toString(36).padStart(2, '0').slice(-2);
}
-export function genAid(date: Date): string {
- const t = date.getTime();
+export function genAid(t: number): string {
if (isNaN(t)) throw new Error('Failed to create AID: Invalid Date');
counter++;
return getTime(t) + getNoise();
@@ -35,3 +34,7 @@ export function parseAid(id: string): { date: Date; } {
const time = parseInt(id.slice(0, 8), 36) + TIME2000;
return { date: new Date(time) };
}
+
+export function isSafeAidT(t: number): boolean {
+ return t > TIME2000;
+}
diff --git a/packages/backend/src/misc/id/aidx.ts b/packages/backend/src/misc/id/aidx.ts
index 5b031ea4c0..9f457f6f0a 100644
--- a/packages/backend/src/misc/id/aidx.ts
+++ b/packages/backend/src/misc/id/aidx.ts
@@ -31,8 +31,7 @@ function getNoise(): string {
return counter.toString(36).padStart(NOISE_LENGTH, '0').slice(-NOISE_LENGTH);
}
-export function genAidx(date: Date): string {
- const t = date.getTime();
+export function genAidx(t: number): string {
if (isNaN(t)) throw new Error('Failed to create AIDX: Invalid Date');
counter++;
return getTime(t) + nodeId + getNoise();
@@ -42,3 +41,7 @@ export function parseAidx(id: string): { date: Date; } {
const time = parseInt(id.slice(0, TIME_LENGTH), 36) + TIME2000;
return { date: new Date(time) };
}
+
+export function isSafeAidxT(t: number): boolean {
+ return t > TIME2000;
+}
diff --git a/packages/backend/src/misc/id/meid.ts b/packages/backend/src/misc/id/meid.ts
index 82cda37237..7646282edb 100644
--- a/packages/backend/src/misc/id/meid.ts
+++ b/packages/backend/src/misc/id/meid.ts
@@ -29,8 +29,8 @@ function getRandom() {
return str;
}
-export function genMeid(date: Date): string {
- return getTime(date.getTime()) + getRandom();
+export function genMeid(t: number): string {
+ return getTime(t) + getRandom();
}
export function parseMeid(id: string): { date: Date; } {
@@ -38,3 +38,7 @@ export function parseMeid(id: string): { date: Date; } {
date: new Date(parseInt(id.slice(0, 12), 16) - 0x800000000000),
};
}
+
+export function isSafeMeidT(t: number): boolean {
+ return t > 0;
+}
diff --git a/packages/backend/src/misc/id/meidg.ts b/packages/backend/src/misc/id/meidg.ts
index fba7156718..f2a55443ef 100644
--- a/packages/backend/src/misc/id/meidg.ts
+++ b/packages/backend/src/misc/id/meidg.ts
@@ -29,8 +29,8 @@ function getRandom() {
return str;
}
-export function genMeidg(date: Date): string {
- return 'g' + getTime(date.getTime()) + getRandom();
+export function genMeidg(t: number): string {
+ return 'g' + getTime(t) + getRandom();
}
export function parseMeidg(id: string): { date: Date; } {
@@ -38,3 +38,7 @@ export function parseMeidg(id: string): { date: Date; } {
date: new Date(parseInt(id.slice(1, 12), 16)),
};
}
+
+export function isSafeMeidgT(t: number): boolean {
+ return t > 0;
+}
diff --git a/packages/backend/src/misc/id/object-id.ts b/packages/backend/src/misc/id/object-id.ts
index e3b6e8e433..f5c3619fdb 100644
--- a/packages/backend/src/misc/id/object-id.ts
+++ b/packages/backend/src/misc/id/object-id.ts
@@ -29,8 +29,8 @@ function getRandom() {
return str;
}
-export function genObjectId(date: Date): string {
- return getTime(date.getTime()) + getRandom();
+export function genObjectId(t: number): string {
+ return getTime(t) + getRandom();
}
export function parseObjectId(id: string): { date: Date; } {
@@ -38,3 +38,7 @@ export function parseObjectId(id: string): { date: Date; } {
date: new Date(parseInt(id.slice(0, 8), 16) * 1000),
};
}
+
+export function isSafeObjectIdT(t: number): boolean {
+ return t > 0;
+}
diff --git a/packages/backend/src/misc/is-instance-muted.ts b/packages/backend/src/misc/is-instance-muted.ts
index b231058a95..35fe11849d 100644
--- a/packages/backend/src/misc/is-instance-muted.ts
+++ b/packages/backend/src/misc/is-instance-muted.ts
@@ -3,12 +3,13 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
+import { MiNote } from '@/models/Note.js';
import type { Packed } from './json-schema.js';
-export function isInstanceMuted(note: Packed<'Note'>, mutedInstances: Set): boolean {
- if (mutedInstances.has(note.user.host ?? '')) return true;
- if (mutedInstances.has(note.reply?.user.host ?? '')) return true;
- if (mutedInstances.has(note.renote?.user.host ?? '')) return true;
+export function isInstanceMuted(note: Packed<'Note'> | MiNote, mutedInstances: Set): boolean {
+ if (mutedInstances.has(note.user?.host ?? '')) return true;
+ if (mutedInstances.has(note.reply?.user?.host ?? '')) return true;
+ if (mutedInstances.has(note.renote?.user?.host ?? '')) return true;
return false;
}
diff --git a/packages/backend/src/misc/is-pure-renote.ts b/packages/backend/src/misc/is-pure-renote.ts
new file mode 100644
index 0000000000..994d981522
--- /dev/null
+++ b/packages/backend/src/misc/is-pure-renote.ts
@@ -0,0 +1,10 @@
+import type { MiNote } from '@/models/Note.js';
+
+export function isPureRenote(note: MiNote): note is MiNote & { renoteId: NonNullable } {
+ if (!note.renoteId) return false;
+
+ if (note.text) return false; // it's quoted with text
+ if (note.fileIds.length !== 0) return false; // it's quoted with files
+ if (note.hasPoll) return false; // it's quoted with poll
+ return true;
+}
diff --git a/packages/backend/src/misc/is-quote.ts b/packages/backend/src/misc/is-quote.ts
index 059f6a4b5f..db72d1d57a 100644
--- a/packages/backend/src/misc/is-quote.ts
+++ b/packages/backend/src/misc/is-quote.ts
@@ -7,5 +7,6 @@ import type { MiNote } from '@/models/Note.js';
// eslint-disable-next-line import/no-default-export
export default function(note: MiNote): boolean {
+ // sync with NoteCreateService.isQuote
return note.renoteId != null && (note.text != null || note.hasPoll || (note.fileIds != null && note.fileIds.length > 0));
}
diff --git a/packages/backend/src/misc/is-reply.ts b/packages/backend/src/misc/is-reply.ts
new file mode 100644
index 0000000000..964c2aa153
--- /dev/null
+++ b/packages/backend/src/misc/is-reply.ts
@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { MiUser } from '@/models/User.js';
+
+export function isReply(note: any, viewerId?: MiUser['id'] | undefined | null): boolean {
+ return note.replyId && note.replyUserId !== note.userId && note.replyUserId !== viewerId;
+}
diff --git a/packages/backend/src/misc/json-schema.ts b/packages/backend/src/misc/json-schema.ts
index 80c1041c62..176978d35f 100644
--- a/packages/backend/src/misc/json-schema.ts
+++ b/packages/backend/src/misc/json-schema.ts
@@ -36,6 +36,9 @@ import { packedGalleryPostSchema } from '@/models/json-schema/gallery-post.js';
import { packedEmojiDetailedSchema, packedEmojiSimpleSchema } from '@/models/json-schema/emoji.js';
import { packedFlashSchema } from '@/models/json-schema/flash.js';
import { packedAnnouncementSchema } from '@/models/json-schema/announcement.js';
+import { packedSigninSchema } from '@/models/json-schema/signin.js';
+import { packedRoleLiteSchema, packedRoleSchema } from '@/models/json-schema/role.js';
+import { packedAdSchema } from '@/models/json-schema/ad.js';
export const refs = {
UserLite: packedUserLiteSchema,
@@ -47,6 +50,7 @@ export const refs = {
User: packedUserSchema,
UserList: packedUserListSchema,
+ Ad: packedAdSchema,
Announcement: packedAnnouncementSchema,
App: packedAppSchema,
Note: packedNoteSchema,
@@ -71,6 +75,9 @@ export const refs = {
EmojiSimple: packedEmojiSimpleSchema,
EmojiDetailed: packedEmojiDetailedSchema,
Flash: packedFlashSchema,
+ Signin: packedSigninSchema,
+ RoleLite: packedRoleLiteSchema,
+ Role: packedRoleSchema,
};
export type Packed = SchemaType;
diff --git a/packages/backend/src/misc/loader.ts b/packages/backend/src/misc/loader.ts
new file mode 100644
index 0000000000..25f7b54d31
--- /dev/null
+++ b/packages/backend/src/misc/loader.ts
@@ -0,0 +1,52 @@
+export type FetchFunction = (key: K) => Promise;
+
+type ResolveReject = Parameters>[0]>;
+
+type ResolverPair = {
+ resolve: ResolveReject[0];
+ reject: ResolveReject[1];
+};
+
+export class DebounceLoader {
+ private resolverMap = new Map>();
+ private promiseMap = new Map>();
+ private resolvedPromise = Promise.resolve();
+ constructor(private loadFn: FetchFunction) {}
+
+ public load(key: K): Promise {
+ const promise = this.promiseMap.get(key);
+ if (typeof promise !== 'undefined') {
+ return promise;
+ }
+
+ const isFirst = this.promiseMap.size === 0;
+ const newPromise = new Promise((resolve, reject) => {
+ this.resolverMap.set(key, { resolve, reject });
+ });
+ this.promiseMap.set(key, newPromise);
+
+ if (isFirst) {
+ this.enqueueDebouncedLoadJob();
+ }
+
+ return newPromise;
+ }
+
+ private runDebouncedLoad(): void {
+ const resolvers = [...this.resolverMap];
+ this.resolverMap.clear();
+ this.promiseMap.clear();
+
+ for (const [key, { resolve, reject }] of resolvers) {
+ this.loadFn(key).then(resolve, reject);
+ }
+ }
+
+ private enqueueDebouncedLoadJob(): void {
+ this.resolvedPromise.then(() => {
+ process.nextTick(() => {
+ this.runDebouncedLoad();
+ });
+ });
+ }
+}
diff --git a/packages/backend/src/misc/nyaize.ts b/packages/backend/src/misc/nyaize.ts
deleted file mode 100644
index 0ac77e1006..0000000000
--- a/packages/backend/src/misc/nyaize.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export function nyaize(text: string): string {
- return text
- // ja-JP
- .replaceAll('な', 'にゃ').replaceAll('ナ', 'ニャ').replaceAll('ﾅ', 'ﾆｬ')
- // en-US
- .replace(/(?<=n)a/gi, x => x === 'A' ? 'YA' : 'ya')
- .replace(/(?<=morn)ing/gi, x => x === 'ING' ? 'YAN' : 'yan')
- .replace(/(?<=every)one/gi, x => x === 'ONE' ? 'NYAN' : 'nyan')
- // ko-KR
- .replace(/[나-낳]/g, match => String.fromCharCode(
- match.charCodeAt(0)! + '냐'.charCodeAt(0) - '나'.charCodeAt(0),
- ))
- .replace(/(다$)|(다(?=\.))|(다(?= ))|(다(?=!))|(다(?=\?))/gm, '다냥')
- .replace(/(야(?=\?))|(야$)|(야(?= ))/gm, '냥');
-}
diff --git a/packages/backend/src/models/AbuseUserReport.ts b/packages/backend/src/models/AbuseUserReport.ts
index 2551af7cb6..593c44f66b 100644
--- a/packages/backend/src/models/AbuseUserReport.ts
+++ b/packages/backend/src/models/AbuseUserReport.ts
@@ -12,12 +12,6 @@ export class MiAbuseUserReport {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the AbuseUserReport.',
- })
- public createdAt: Date;
-
@Index()
@Column(id())
public targetUserId: MiUser['id'];
diff --git a/packages/backend/src/models/AccessToken.ts b/packages/backend/src/models/AccessToken.ts
index 5a6269a729..452711eb8c 100644
--- a/packages/backend/src/models/AccessToken.ts
+++ b/packages/backend/src/models/AccessToken.ts
@@ -13,11 +13,6 @@ export class MiAccessToken {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the AccessToken.',
- })
- public createdAt: Date;
-
@Column('timestamp with time zone', {
nullable: true,
})
diff --git a/packages/backend/src/models/Ad.ts b/packages/backend/src/models/Ad.ts
index 6dfc9cb30e..b1d7d7d79e 100644
--- a/packages/backend/src/models/Ad.ts
+++ b/packages/backend/src/models/Ad.ts
@@ -11,12 +11,6 @@ export class MiAd {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the Ad.',
- })
- public createdAt: Date;
-
@Index()
@Column('timestamp with time zone', {
comment: 'The expired date of the Ad.',
diff --git a/packages/backend/src/models/Announcement.ts b/packages/backend/src/models/Announcement.ts
index 34b092a8d4..8f8be88fed 100644
--- a/packages/backend/src/models/Announcement.ts
+++ b/packages/backend/src/models/Announcement.ts
@@ -12,12 +12,6 @@ export class MiAnnouncement {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the Announcement.',
- })
- public createdAt: Date;
-
@Column('timestamp with time zone', {
comment: 'The updated date of the Announcement.',
nullable: true,
@@ -72,6 +66,12 @@ export class MiAnnouncement {
})
public forExistingUsers: boolean;
+ @Index()
+ @Column('boolean', {
+ default: false,
+ })
+ public silence: boolean;
+
@Index()
@Column({
...id(),
diff --git a/packages/backend/src/models/AnnouncementRead.ts b/packages/backend/src/models/AnnouncementRead.ts
index 3d6ec5652c..db09e65f50 100644
--- a/packages/backend/src/models/AnnouncementRead.ts
+++ b/packages/backend/src/models/AnnouncementRead.ts
@@ -14,11 +14,6 @@ export class MiAnnouncementRead {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the AnnouncementRead.',
- })
- public createdAt: Date;
-
@Index()
@Column(id())
public userId: MiUser['id'];
diff --git a/packages/backend/src/models/Antenna.ts b/packages/backend/src/models/Antenna.ts
index dc398b6dd2..b74c61b728 100644
--- a/packages/backend/src/models/Antenna.ts
+++ b/packages/backend/src/models/Antenna.ts
@@ -13,11 +13,6 @@ export class MiAntenna {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the Antenna.',
- })
- public createdAt: Date;
-
@Index()
@Column('timestamp with time zone')
public lastUsedAt: Date;
@@ -98,4 +93,9 @@ export class MiAntenna {
default: true,
})
public isActive: boolean;
+
+ @Column('boolean', {
+ default: false,
+ })
+ public localOnly: boolean;
}
diff --git a/packages/backend/src/models/App.ts b/packages/backend/src/models/App.ts
index c599ef8be0..5c56a224a2 100644
--- a/packages/backend/src/models/App.ts
+++ b/packages/backend/src/models/App.ts
@@ -12,12 +12,6 @@ export class MiApp {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the App.',
- })
- public createdAt: Date;
-
@Index()
@Column({
...id(),
diff --git a/packages/backend/src/models/AuthSession.ts b/packages/backend/src/models/AuthSession.ts
index d9de6b6979..81bed21211 100644
--- a/packages/backend/src/models/AuthSession.ts
+++ b/packages/backend/src/models/AuthSession.ts
@@ -13,11 +13,6 @@ export class MiAuthSession {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the AuthSession.',
- })
- public createdAt: Date;
-
@Index()
@Column('varchar', {
length: 128,
diff --git a/packages/backend/src/models/AvatarDecoration.ts b/packages/backend/src/models/AvatarDecoration.ts
new file mode 100644
index 0000000000..08ebbdeac1
--- /dev/null
+++ b/packages/backend/src/models/AvatarDecoration.ts
@@ -0,0 +1,39 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Entity, PrimaryColumn, Index, Column, ManyToOne, JoinColumn } from 'typeorm';
+import { id } from './util/id.js';
+
+@Entity('avatar_decoration')
+export class MiAvatarDecoration {
+ @PrimaryColumn(id())
+ public id: string;
+
+ @Column('timestamp with time zone', {
+ nullable: true,
+ })
+ public updatedAt: Date | null;
+
+ @Column('varchar', {
+ length: 1024,
+ })
+ public url: string;
+
+ @Column('varchar', {
+ length: 256,
+ })
+ public name: string;
+
+ @Column('varchar', {
+ length: 2048,
+ })
+ public description: string;
+
+ // TODO: 定期ジョブで存在しなくなったロールIDを除去するようにする
+ @Column('varchar', {
+ array: true, length: 128, default: '{}',
+ })
+ public roleIdsThatCanBeUsedThisDecoration: string[];
+}
diff --git a/packages/backend/src/models/Blocking.ts b/packages/backend/src/models/Blocking.ts
index 1e3dd3a644..9bf7a63b6e 100644
--- a/packages/backend/src/models/Blocking.ts
+++ b/packages/backend/src/models/Blocking.ts
@@ -13,12 +13,6 @@ export class MiBlocking {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the Blocking.',
- })
- public createdAt: Date;
-
@Index()
@Column({
...id(),
diff --git a/packages/backend/src/models/Channel.ts b/packages/backend/src/models/Channel.ts
index ae3886a657..a7f9e262b1 100644
--- a/packages/backend/src/models/Channel.ts
+++ b/packages/backend/src/models/Channel.ts
@@ -13,12 +13,6 @@ export class MiChannel {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the Channel.',
- })
- public createdAt: Date;
-
@Index()
@Column('timestamp with time zone', {
nullable: true,
@@ -99,4 +93,9 @@ export class MiChannel {
default: false,
})
public isSensitive: boolean;
+
+ @Column('boolean', {
+ default: true,
+ })
+ public allowRenoteToExternal: boolean;
}
diff --git a/packages/backend/src/models/ChannelFavorite.ts b/packages/backend/src/models/ChannelFavorite.ts
index ab74aa5530..fc25ffe260 100644
--- a/packages/backend/src/models/ChannelFavorite.ts
+++ b/packages/backend/src/models/ChannelFavorite.ts
@@ -14,12 +14,6 @@ export class MiChannelFavorite {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the ChannelFavorite.',
- })
- public createdAt: Date;
-
@Index()
@Column({
...id(),
diff --git a/packages/backend/src/models/ChannelFollowing.ts b/packages/backend/src/models/ChannelFollowing.ts
index c62a95332a..4dd391a082 100644
--- a/packages/backend/src/models/ChannelFollowing.ts
+++ b/packages/backend/src/models/ChannelFollowing.ts
@@ -14,12 +14,6 @@ export class MiChannelFollowing {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the ChannelFollowing.',
- })
- public createdAt: Date;
-
@Index()
@Column({
...id(),
diff --git a/packages/backend/src/models/Clip.ts b/packages/backend/src/models/Clip.ts
index c60b2964e0..2483b0925a 100644
--- a/packages/backend/src/models/Clip.ts
+++ b/packages/backend/src/models/Clip.ts
@@ -12,11 +12,6 @@ export class MiClip {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the Clip.',
- })
- public createdAt: Date;
-
@Index()
@Column('timestamp with time zone', {
nullable: true,
diff --git a/packages/backend/src/models/ClipFavorite.ts b/packages/backend/src/models/ClipFavorite.ts
index 054764389b..aa949b3ea8 100644
--- a/packages/backend/src/models/ClipFavorite.ts
+++ b/packages/backend/src/models/ClipFavorite.ts
@@ -14,9 +14,6 @@ export class MiClipFavorite {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone')
- public createdAt: Date;
-
@Index()
@Column(id())
public userId: MiUser['id'];
diff --git a/packages/backend/src/models/DriveFile.ts b/packages/backend/src/models/DriveFile.ts
index c12f0e0f02..24e6be9c90 100644
--- a/packages/backend/src/models/DriveFile.ts
+++ b/packages/backend/src/models/DriveFile.ts
@@ -14,12 +14,6 @@ export class MiDriveFile {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the DriveFile.',
- })
- public createdAt: Date;
-
@Index()
@Column({
...id(),
diff --git a/packages/backend/src/models/DriveFolder.ts b/packages/backend/src/models/DriveFolder.ts
index 3e049136bd..18f6d17709 100644
--- a/packages/backend/src/models/DriveFolder.ts
+++ b/packages/backend/src/models/DriveFolder.ts
@@ -12,12 +12,6 @@ export class MiDriveFolder {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the DriveFolder.',
- })
- public createdAt: Date;
-
@Column('varchar', {
length: 128,
comment: 'The name of the DriveFolder.',
diff --git a/packages/backend/src/models/Flash.ts b/packages/backend/src/models/Flash.ts
index 185063029d..ac880843b0 100644
--- a/packages/backend/src/models/Flash.ts
+++ b/packages/backend/src/models/Flash.ts
@@ -12,12 +12,6 @@ export class MiFlash {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the Flash.',
- })
- public createdAt: Date;
-
@Index()
@Column('timestamp with time zone', {
comment: 'The updated date of the Flash.',
diff --git a/packages/backend/src/models/FlashLike.ts b/packages/backend/src/models/FlashLike.ts
index 7c66010ae6..ad7f4966b4 100644
--- a/packages/backend/src/models/FlashLike.ts
+++ b/packages/backend/src/models/FlashLike.ts
@@ -14,9 +14,6 @@ export class MiFlashLike {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone')
- public createdAt: Date;
-
@Index()
@Column(id())
public userId: MiUser['id'];
diff --git a/packages/backend/src/models/FollowRequest.ts b/packages/backend/src/models/FollowRequest.ts
index 769b9a6cb5..9899694dd6 100644
--- a/packages/backend/src/models/FollowRequest.ts
+++ b/packages/backend/src/models/FollowRequest.ts
@@ -13,11 +13,6 @@ export class MiFollowRequest {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the FollowRequest.',
- })
- public createdAt: Date;
-
@Index()
@Column({
...id(),
@@ -50,6 +45,11 @@ export class MiFollowRequest {
})
public requestId: string | null;
+ @Column('boolean', {
+ default: false,
+ })
+ public withReplies: boolean;
+
//#region Denormalized fields
@Column('varchar', {
length: 128, nullable: true,
diff --git a/packages/backend/src/models/Following.ts b/packages/backend/src/models/Following.ts
index 607538b1e7..e320911a1d 100644
--- a/packages/backend/src/models/Following.ts
+++ b/packages/backend/src/models/Following.ts
@@ -14,12 +14,6 @@ export class MiFollowing {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the Following.',
- })
- public createdAt: Date;
-
@Index()
@Column({
...id(),
diff --git a/packages/backend/src/models/GalleryLike.ts b/packages/backend/src/models/GalleryLike.ts
index b5f71764aa..84d4ce9c3e 100644
--- a/packages/backend/src/models/GalleryLike.ts
+++ b/packages/backend/src/models/GalleryLike.ts
@@ -14,9 +14,6 @@ export class MiGalleryLike {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone')
- public createdAt: Date;
-
@Index()
@Column(id())
public userId: MiUser['id'];
diff --git a/packages/backend/src/models/GalleryPost.ts b/packages/backend/src/models/GalleryPost.ts
index 4c6063f32b..b72220caf9 100644
--- a/packages/backend/src/models/GalleryPost.ts
+++ b/packages/backend/src/models/GalleryPost.ts
@@ -13,12 +13,6 @@ export class MiGalleryPost {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the GalleryPost.',
- })
- public createdAt: Date;
-
@Index()
@Column('timestamp with time zone', {
comment: 'The updated date of the GalleryPost.',
diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts
index 60fdaab54a..84ca762492 100644
--- a/packages/backend/src/models/Meta.ts
+++ b/packages/backend/src/models/Meta.ts
@@ -76,6 +76,11 @@ export class MiMeta {
})
public sensitiveWords: string[];
+ @Column('varchar', {
+ length: 1024, array: true, default: '{}',
+ })
+ public silencedHosts: string[];
+
@Column('varchar', {
length: 1024,
nullable: true,
@@ -441,6 +446,17 @@ export class MiMeta {
})
public enableActiveEmailValidation: boolean;
+ @Column('boolean', {
+ default: false,
+ })
+ public enableVerifymailApi: boolean;
+
+ @Column('varchar', {
+ length: 1024,
+ nullable: true,
+ })
+ public verifymailAuthKey: string | null;
+
@Column('boolean', {
default: true,
})
@@ -479,11 +495,28 @@ export class MiMeta {
})
public manifestJsonOverride: string;
+ @Column('varchar', {
+ length: 1024,
+ array: true,
+ default: '{}',
+ })
+ public bannedEmailDomains: string[];
+
@Column('varchar', {
length: 1024, array: true, default: '{ "admin", "administrator", "root", "system", "maintainer", "host", "mod", "moderator", "owner", "superuser", "staff", "auth", "i", "me", "everyone", "all", "mention", "mentions", "example", "user", "users", "account", "accounts", "official", "help", "helps", "support", "supports", "info", "information", "informations", "announce", "announces", "announcement", "announcements", "notice", "notification", "notifications", "dev", "developer", "developers", "tech", "misskey" }',
})
public preservedUsernames: string[];
+ @Column('boolean', {
+ default: true,
+ })
+ public enableFanoutTimeline: boolean;
+
+ @Column('boolean', {
+ default: true,
+ })
+ public enableFanoutTimelineDbFallback: boolean;
+
@Column('integer', {
default: 300,
})
@@ -503,4 +536,9 @@ export class MiMeta {
default: 300,
})
public perUserListTimelineCacheMax: number;
+
+ @Column('integer', {
+ default: 0,
+ })
+ public notesPerOneAd: number;
}
diff --git a/packages/backend/src/models/ModerationLog.ts b/packages/backend/src/models/ModerationLog.ts
index a12b6ab614..71b33c3e47 100644
--- a/packages/backend/src/models/ModerationLog.ts
+++ b/packages/backend/src/models/ModerationLog.ts
@@ -12,11 +12,6 @@ export class MiModerationLog {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the ModerationLog.',
- })
- public createdAt: Date;
-
@Index()
@Column(id())
public userId: MiUser['id'];
diff --git a/packages/backend/src/models/Muting.ts b/packages/backend/src/models/Muting.ts
index 2f06ca8e5e..a528e1e7d7 100644
--- a/packages/backend/src/models/Muting.ts
+++ b/packages/backend/src/models/Muting.ts
@@ -13,12 +13,6 @@ export class MiMuting {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the Muting.',
- })
- public createdAt: Date;
-
@Index()
@Column('timestamp with time zone', {
nullable: true,
diff --git a/packages/backend/src/models/Note.ts b/packages/backend/src/models/Note.ts
index 3e2adf4d82..a4358b9ba6 100644
--- a/packages/backend/src/models/Note.ts
+++ b/packages/backend/src/models/Note.ts
@@ -18,11 +18,6 @@ export class MiNote {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the Note.',
- })
- public createdAt: Date;
-
@Index()
@Column({
...id(),
@@ -169,6 +164,11 @@ export class MiNote {
})
public mentionedRemoteUsers: string;
+ @Column('varchar', {
+ length: 1024, array: true, default: '{}',
+ })
+ public reactionAndUserPairCache: string[];
+
@Column('varchar', {
length: 128, array: true, default: '{}',
})
diff --git a/packages/backend/src/models/NoteFavorite.ts b/packages/backend/src/models/NoteFavorite.ts
index 1171684bcf..364eaabd98 100644
--- a/packages/backend/src/models/NoteFavorite.ts
+++ b/packages/backend/src/models/NoteFavorite.ts
@@ -14,11 +14,6 @@ export class MiNoteFavorite {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the NoteFavorite.',
- })
- public createdAt: Date;
-
@Index()
@Column(id())
public userId: MiUser['id'];
diff --git a/packages/backend/src/models/NoteReaction.ts b/packages/backend/src/models/NoteReaction.ts
index 43323f8a43..ee3a447464 100644
--- a/packages/backend/src/models/NoteReaction.ts
+++ b/packages/backend/src/models/NoteReaction.ts
@@ -14,11 +14,6 @@ export class MiNoteReaction {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the NoteReaction.',
- })
- public createdAt: Date;
-
@Index()
@Column(id())
public userId: MiUser['id'];
diff --git a/packages/backend/src/models/NoteThreadMuting.ts b/packages/backend/src/models/NoteThreadMuting.ts
index 2d120e4c25..00311aa570 100644
--- a/packages/backend/src/models/NoteThreadMuting.ts
+++ b/packages/backend/src/models/NoteThreadMuting.ts
@@ -13,10 +13,6 @@ export class MiNoteThreadMuting {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- })
- public createdAt: Date;
-
@Index()
@Column({
...id(),
diff --git a/packages/backend/src/models/Notification.ts b/packages/backend/src/models/Notification.ts
index c0a9df2e23..3bc2edaa0d 100644
--- a/packages/backend/src/models/Notification.ts
+++ b/packages/backend/src/models/Notification.ts
@@ -3,37 +3,84 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
-import { notificationTypes } from '@/types.js';
import { MiUser } from './User.js';
import { MiNote } from './Note.js';
-import { MiFollowRequest } from './FollowRequest.js';
import { MiAccessToken } from './AccessToken.js';
+import { MiRole } from './Role.js';
export type MiNotification = {
+ type: 'note';
+ id: string;
+ createdAt: string;
+ notifierId: MiUser['id'];
+ noteId: MiNote['id'];
+} | {
+ type: 'follow';
+ id: string;
+ createdAt: string;
+ notifierId: MiUser['id'];
+} | {
+ type: 'mention';
+ id: string;
+ createdAt: string;
+ notifierId: MiUser['id'];
+ noteId: MiNote['id'];
+} | {
+ type: 'reply';
+ id: string;
+ createdAt: string;
+ notifierId: MiUser['id'];
+ noteId: MiNote['id'];
+} | {
+ type: 'renote';
+ id: string;
+ createdAt: string;
+ notifierId: MiUser['id'];
+ noteId: MiNote['id'];
+ targetNoteId: MiNote['id'];
+} | {
+ type: 'quote';
+ id: string;
+ createdAt: string;
+ notifierId: MiUser['id'];
+ noteId: MiNote['id'];
+} | {
+ type: 'reaction';
+ id: string;
+ createdAt: string;
+ notifierId: MiUser['id'];
+ noteId: MiNote['id'];
+ reaction: string;
+} | {
+ type: 'pollEnded';
+ id: string;
+ createdAt: string;
+ notifierId: MiUser['id'];
+ noteId: MiNote['id'];
+} | {
+ type: 'receiveFollowRequest';
+ id: string;
+ createdAt: string;
+ notifierId: MiUser['id'];
+} | {
+ type: 'followRequestAccepted';
+ id: string;
+ createdAt: string;
+ notifierId: MiUser['id'];
+} | {
+ type: 'roleAssigned';
+ id: string;
+ createdAt: string;
+ roleId: MiRole['id'];
+} | {
+ type: 'achievementEarned';
+ id: string;
+ createdAt: string;
+ achievement: string;
+} | {
+ type: 'app';
id: string;
-
- // RedisのためDateではなくstring
createdAt: string;
-
- /**
- * 通知の送信者(initiator)
- */
- notifierId: MiUser['id'] | null;
-
- /**
- * 通知の種類。
- */
- type: typeof notificationTypes[number];
-
- noteId: MiNote['id'] | null;
-
- followRequestId: MiFollowRequest['id'] | null;
-
- reaction: string | null;
-
- choice: number | null;
-
- achievement: string | null;
/**
* アプリ通知のbody
@@ -56,4 +103,25 @@ export type MiNotification = {
* アプリ通知のアプリ(のトークン)
*/
appAccessTokenId: MiAccessToken['id'] | null;
-}
+} | {
+ type: 'test';
+ id: string;
+ createdAt: string;
+};
+
+export type MiGroupedNotification = MiNotification | {
+ type: 'reaction:grouped';
+ id: string;
+ createdAt: string;
+ noteId: MiNote['id'];
+ reactions: {
+ userId: string;
+ reaction: string;
+ }[];
+} | {
+ type: 'renote:grouped';
+ id: string;
+ createdAt: string;
+ noteId: MiNote['id'];
+ userIds: string[];
+};
diff --git a/packages/backend/src/models/Page.ts b/packages/backend/src/models/Page.ts
index 3cb986f4ee..9cab875499 100644
--- a/packages/backend/src/models/Page.ts
+++ b/packages/backend/src/models/Page.ts
@@ -14,12 +14,6 @@ export class MiPage {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the Page.',
- })
- public createdAt: Date;
-
@Index()
@Column('timestamp with time zone', {
comment: 'The updated date of the Page.',
diff --git a/packages/backend/src/models/PageLike.ts b/packages/backend/src/models/PageLike.ts
index 92adf9bcc2..b845f58b7d 100644
--- a/packages/backend/src/models/PageLike.ts
+++ b/packages/backend/src/models/PageLike.ts
@@ -14,9 +14,6 @@ export class MiPageLike {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone')
- public createdAt: Date;
-
@Index()
@Column(id())
public userId: MiUser['id'];
diff --git a/packages/backend/src/models/PasswordResetRequest.ts b/packages/backend/src/models/PasswordResetRequest.ts
index 79f2e984b8..5be439511f 100644
--- a/packages/backend/src/models/PasswordResetRequest.ts
+++ b/packages/backend/src/models/PasswordResetRequest.ts
@@ -12,9 +12,6 @@ export class MiPasswordResetRequest {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone')
- public createdAt: Date;
-
@Index({ unique: true })
@Column('varchar', {
length: 256,
diff --git a/packages/backend/src/models/PollVote.ts b/packages/backend/src/models/PollVote.ts
index 37cd55fc18..751be8a32b 100644
--- a/packages/backend/src/models/PollVote.ts
+++ b/packages/backend/src/models/PollVote.ts
@@ -14,12 +14,6 @@ export class MiPollVote {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the PollVote.',
- })
- public createdAt: Date;
-
@Index()
@Column(id())
public userId: MiUser['id'];
diff --git a/packages/backend/src/models/PromoRead.ts b/packages/backend/src/models/PromoRead.ts
index 09ebfc8346..d9f3075416 100644
--- a/packages/backend/src/models/PromoRead.ts
+++ b/packages/backend/src/models/PromoRead.ts
@@ -14,11 +14,6 @@ export class MiPromoRead {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the PromoRead.',
- })
- public createdAt: Date;
-
@Index()
@Column(id())
public userId: MiUser['id'];
diff --git a/packages/backend/src/models/RegistrationTicket.ts b/packages/backend/src/models/RegistrationTicket.ts
index d94f465916..730cedffba 100644
--- a/packages/backend/src/models/RegistrationTicket.ts
+++ b/packages/backend/src/models/RegistrationTicket.ts
@@ -23,9 +23,6 @@ export class MiRegistrationTicket {
})
public expiresAt: Date | null;
- @Column('timestamp with time zone')
- public createdAt: Date;
-
@ManyToOne(type => MiUser, {
onDelete: 'CASCADE',
})
diff --git a/packages/backend/src/models/RegistryItem.ts b/packages/backend/src/models/RegistryItem.ts
index fdce57c467..60bdced957 100644
--- a/packages/backend/src/models/RegistryItem.ts
+++ b/packages/backend/src/models/RegistryItem.ts
@@ -13,11 +13,6 @@ export class MiRegistryItem {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the RegistryItem.',
- })
- public createdAt: Date;
-
@Column('timestamp with time zone', {
comment: 'The updated date of the RegistryItem.',
})
diff --git a/packages/backend/src/models/RenoteMuting.ts b/packages/backend/src/models/RenoteMuting.ts
index d2a36249dc..17df43ea31 100644
--- a/packages/backend/src/models/RenoteMuting.ts
+++ b/packages/backend/src/models/RenoteMuting.ts
@@ -13,12 +13,6 @@ export class MiRenoteMuting {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the Muting.',
- })
- public createdAt: Date;
-
@Index()
@Column({
...id(),
diff --git a/packages/backend/src/models/RepositoryModule.ts b/packages/backend/src/models/RepositoryModule.ts
index 9efd6841b1..866fdfe6d4 100644
--- a/packages/backend/src/models/RepositoryModule.ts
+++ b/packages/backend/src/models/RepositoryModule.ts
@@ -5,7 +5,7 @@
import { Module } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
-import { MiAbuseUserReport, MiAccessToken, MiAd, MiAnnouncement, MiAnnouncementRead, MiAntenna, MiApp, MiAuthSession, MiBlocking, MiChannel, MiChannelFavorite, MiChannelFollowing, MiClip, MiClipFavorite, MiClipNote, MiDriveFile, MiDriveFolder, MiEmoji, MiFlash, MiFlashLike, MiFollowRequest, MiFollowing, MiGalleryLike, MiGalleryPost, MiHashtag, MiInstance, MiMeta, MiModerationLog, MiMuting, MiNote, MiNoteFavorite, MiNoteReaction, MiNoteThreadMuting, MiNoteUnread, MiPage, MiPageLike, MiPasswordResetRequest, MiPoll, MiPollVote, MiPromoNote, MiPromoRead, MiRegistrationTicket, MiRegistryItem, MiRelay, MiRenoteMuting, MiRetentionAggregation, MiRole, MiRoleAssignment, MiSignin, MiSwSubscription, MiUsedUsername, MiUser, MiUserIp, MiUserKeypair, MiUserList, MiUserListFavorite, MiUserListMembership, MiUserMemo, MiUserNotePining, MiUserPending, MiUserProfile, MiUserPublickey, MiUserSecurityKey, MiWebhook } from './_.js';
+import { MiAbuseUserReport, MiAccessToken, MiAd, MiAnnouncement, MiAnnouncementRead, MiAntenna, MiApp, MiAuthSession, MiAvatarDecoration, MiBlocking, MiChannel, MiChannelFavorite, MiChannelFollowing, MiClip, MiClipFavorite, MiClipNote, MiDriveFile, MiDriveFolder, MiEmoji, MiFlash, MiFlashLike, MiFollowRequest, MiFollowing, MiGalleryLike, MiGalleryPost, MiHashtag, MiInstance, MiMeta, MiModerationLog, MiMuting, MiNote, MiNoteFavorite, MiNoteReaction, MiNoteThreadMuting, MiNoteUnread, MiPage, MiPageLike, MiPasswordResetRequest, MiPoll, MiPollVote, MiPromoNote, MiPromoRead, MiRegistrationTicket, MiRegistryItem, MiRelay, MiRenoteMuting, MiRetentionAggregation, MiRole, MiRoleAssignment, MiSignin, MiSwSubscription, MiUsedUsername, MiUser, MiUserIp, MiUserKeypair, MiUserList, MiUserListFavorite, MiUserListMembership, MiUserMemo, MiUserNotePining, MiUserPending, MiUserProfile, MiUserPublickey, MiUserSecurityKey, MiWebhook } from './_.js';
import type { DataSource } from 'typeorm';
import type { Provider } from '@nestjs/common';
@@ -39,6 +39,12 @@ const $appsRepository: Provider = {
inject: [DI.db],
};
+const $avatarDecorationsRepository: Provider = {
+ provide: DI.avatarDecorationsRepository,
+ useFactory: (db: DataSource) => db.getRepository(MiAvatarDecoration),
+ inject: [DI.db],
+};
+
const $noteFavoritesRepository: Provider = {
provide: DI.noteFavoritesRepository,
useFactory: (db: DataSource) => db.getRepository(MiNoteFavorite),
@@ -402,6 +408,7 @@ const $userMemosRepository: Provider = {
$announcementsRepository,
$announcementReadsRepository,
$appsRepository,
+ $avatarDecorationsRepository,
$noteFavoritesRepository,
$noteThreadMutingsRepository,
$noteReactionsRepository,
@@ -468,6 +475,7 @@ const $userMemosRepository: Provider = {
$announcementsRepository,
$announcementReadsRepository,
$appsRepository,
+ $avatarDecorationsRepository,
$noteFavoritesRepository,
$noteThreadMutingsRepository,
$noteReactionsRepository,
diff --git a/packages/backend/src/models/Role.ts b/packages/backend/src/models/Role.ts
index df7541db3d..6976956e13 100644
--- a/packages/backend/src/models/Role.ts
+++ b/packages/backend/src/models/Role.ts
@@ -89,11 +89,6 @@ export class MiRole {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the Role.',
- })
- public createdAt: Date;
-
@Column('timestamp with time zone', {
comment: 'The updated date of the Role.',
})
diff --git a/packages/backend/src/models/RoleAssignment.ts b/packages/backend/src/models/RoleAssignment.ts
index 4e5322c60b..30c7e19f2a 100644
--- a/packages/backend/src/models/RoleAssignment.ts
+++ b/packages/backend/src/models/RoleAssignment.ts
@@ -14,11 +14,6 @@ export class MiRoleAssignment {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the RoleAssignment.',
- })
- public createdAt: Date;
-
@Index()
@Column({
...id(),
diff --git a/packages/backend/src/models/Signin.ts b/packages/backend/src/models/Signin.ts
index a8b1a45c53..656b44dfe0 100644
--- a/packages/backend/src/models/Signin.ts
+++ b/packages/backend/src/models/Signin.ts
@@ -12,11 +12,6 @@ export class MiSignin {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the Signin.',
- })
- public createdAt: Date;
-
@Index()
@Column(id())
public userId: MiUser['id'];
diff --git a/packages/backend/src/models/SwSubscription.ts b/packages/backend/src/models/SwSubscription.ts
index be1e4e3687..f685a8ff3e 100644
--- a/packages/backend/src/models/SwSubscription.ts
+++ b/packages/backend/src/models/SwSubscription.ts
@@ -12,9 +12,6 @@ export class MiSwSubscription {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone')
- public createdAt: Date;
-
@Index()
@Column(id())
public userId: MiUser['id'];
diff --git a/packages/backend/src/models/User.ts b/packages/backend/src/models/User.ts
index 4d961c4290..219497a125 100644
--- a/packages/backend/src/models/User.ts
+++ b/packages/backend/src/models/User.ts
@@ -13,12 +13,6 @@ export class MiUser {
@PrimaryColumn(id())
public id: string;
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the User.',
- })
- public createdAt: Date;
-
@Index()
@Column('timestamp with time zone', {
nullable: true,
@@ -144,6 +138,17 @@ export class MiUser {
})
public bannerBlurhash: string | null;
+ @Column('jsonb', {
+ default: [],
+ })
+ public avatarDecorations: {
+ id: string;
+ angle?: number;
+ flipH?: boolean;
+ offsetX?: number;
+ offsetY?: number;
+ }[];
+
@Index()
@Column('varchar', {
length: 128, array: true, default: '{}',
diff --git a/packages/backend/src/models/UserList.ts b/packages/backend/src/models/UserList.ts
index 9af85af97e..7ad15419d7 100644
--- a/packages/backend/src/models/UserList.ts
+++ b/packages/backend/src/models/UserList.ts
@@ -12,11 +12,6 @@ export class MiUserList {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the UserList.',
- })
- public createdAt: Date;
-
@Index()
@Column({
...id(),
diff --git a/packages/backend/src/models/UserListFavorite.ts b/packages/backend/src/models/UserListFavorite.ts
index d0b054b932..a18ed9253a 100644
--- a/packages/backend/src/models/UserListFavorite.ts
+++ b/packages/backend/src/models/UserListFavorite.ts
@@ -14,9 +14,6 @@ export class MiUserListFavorite {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone')
- public createdAt: Date;
-
@Index()
@Column(id())
public userId: MiUser['id'];
diff --git a/packages/backend/src/models/UserListMembership.ts b/packages/backend/src/models/UserListMembership.ts
index f337f19a47..fa8287f17a 100644
--- a/packages/backend/src/models/UserListMembership.ts
+++ b/packages/backend/src/models/UserListMembership.ts
@@ -14,11 +14,6 @@ export class MiUserListMembership {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the UserListMembership.',
- })
- public createdAt: Date;
-
@Index()
@Column({
...id(),
@@ -50,4 +45,11 @@ export class MiUserListMembership {
default: false,
})
public withReplies: boolean;
+
+ //#region Denormalized fields
+ @Column({
+ ...id(),
+ })
+ public userListUserId: MiUser['id'];
+ //#endregion
}
diff --git a/packages/backend/src/models/UserNotePining.ts b/packages/backend/src/models/UserNotePining.ts
index 1d50a5068e..ae5977aa56 100644
--- a/packages/backend/src/models/UserNotePining.ts
+++ b/packages/backend/src/models/UserNotePining.ts
@@ -14,11 +14,6 @@ export class MiUserNotePining {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the UserNotePinings.',
- })
- public createdAt: Date;
-
@Index()
@Column(id())
public userId: MiUser['id'];
diff --git a/packages/backend/src/models/UserPending.ts b/packages/backend/src/models/UserPending.ts
index b15ededa14..8b1f8f617f 100644
--- a/packages/backend/src/models/UserPending.ts
+++ b/packages/backend/src/models/UserPending.ts
@@ -11,9 +11,6 @@ export class MiUserPending {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone')
- public createdAt: Date;
-
@Index({ unique: true })
@Column('varchar', {
length: 128,
diff --git a/packages/backend/src/models/UserProfile.ts b/packages/backend/src/models/UserProfile.ts
index d6d85c5609..328dbeaa1c 100644
--- a/packages/backend/src/models/UserProfile.ts
+++ b/packages/backend/src/models/UserProfile.ts
@@ -4,7 +4,7 @@
*/
import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'typeorm';
-import { obsoleteNotificationTypes, ffVisibility, notificationTypes } from '@/types.js';
+import { obsoleteNotificationTypes, followingVisibilities, followersVisibilities, notificationTypes } from '@/types.js';
import { id } from './util/id.js';
import { MiUser } from './User.js';
import { MiPage } from './Page.js';
@@ -29,6 +29,7 @@ export class MiUserProfile {
})
public location: string | null;
+ @Index()
@Column('char', {
length: 10, nullable: true,
comment: 'The birthday (YYYY-MM-DD) of the User.',
@@ -93,10 +94,16 @@ export class MiUserProfile {
public publicReactions: boolean;
@Column('enum', {
- enum: ffVisibility,
+ enum: followingVisibilities,
default: 'public',
})
- public ffVisibility: typeof ffVisibility[number];
+ public followingVisibility: typeof followingVisibilities[number];
+
+ @Column('enum', {
+ enum: followersVisibilities,
+ default: 'public',
+ })
+ public followersVisibility: typeof followersVisibilities[number];
@Column('varchar', {
length: 128, nullable: true,
@@ -215,7 +222,12 @@ export class MiUserProfile {
@Column('jsonb', {
default: [],
})
- public mutedWords: string[][];
+ public mutedWords: (string[] | string)[];
+
+ @Column('jsonb', {
+ default: [],
+ })
+ public hardMutedWords: (string[] | string)[];
@Column('jsonb', {
default: [],
diff --git a/packages/backend/src/models/Webhook.ts b/packages/backend/src/models/Webhook.ts
index 5b009c18a6..ec4e13cc76 100644
--- a/packages/backend/src/models/Webhook.ts
+++ b/packages/backend/src/models/Webhook.ts
@@ -14,11 +14,6 @@ export class MiWebhook {
@PrimaryColumn(id())
public id: string;
- @Column('timestamp with time zone', {
- comment: 'The created date of the Antenna.',
- })
- public createdAt: Date;
-
@Index()
@Column({
...id(),
diff --git a/packages/backend/src/models/_.ts b/packages/backend/src/models/_.ts
index f974f95ed8..d7c327f164 100644
--- a/packages/backend/src/models/_.ts
+++ b/packages/backend/src/models/_.ts
@@ -10,6 +10,7 @@ import { MiAnnouncement } from '@/models/Announcement.js';
import { MiAnnouncementRead } from '@/models/AnnouncementRead.js';
import { MiAntenna } from '@/models/Antenna.js';
import { MiApp } from '@/models/App.js';
+import { MiAvatarDecoration } from '@/models/AvatarDecoration.js';
import { MiAuthSession } from '@/models/AuthSession.js';
import { MiBlocking } from '@/models/Blocking.js';
import { MiChannelFollowing } from '@/models/ChannelFollowing.js';
@@ -77,6 +78,7 @@ export {
MiAnnouncementRead,
MiAntenna,
MiApp,
+ MiAvatarDecoration,
MiAuthSession,
MiBlocking,
MiChannelFollowing,
@@ -143,6 +145,7 @@ export type AnnouncementsRepository = Repository;
export type AnnouncementReadsRepository = Repository;
export type AntennasRepository = Repository;
export type AppsRepository = Repository;
+export type AvatarDecorationsRepository = Repository;
export type AuthSessionsRepository = Repository;
export type BlockingsRepository = Repository;
export type ChannelFollowingsRepository = Repository;
diff --git a/packages/backend/src/models/json-schema/ad.ts b/packages/backend/src/models/json-schema/ad.ts
new file mode 100644
index 0000000000..649ffcd4dc
--- /dev/null
+++ b/packages/backend/src/models/json-schema/ad.ts
@@ -0,0 +1,64 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export const packedAdSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false,
+ nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ expiresAt: {
+ type: 'string',
+ optional: false,
+ nullable: false,
+ format: 'date-time',
+ },
+ startsAt: {
+ type: 'string',
+ optional: false,
+ nullable: false,
+ format: 'date-time',
+ },
+ place: {
+ type: 'string',
+ optional: false,
+ nullable: false,
+ },
+ priority: {
+ type: 'string',
+ optional: false,
+ nullable: false,
+ },
+ ratio: {
+ type: 'number',
+ optional: false,
+ nullable: false,
+ },
+ url: {
+ type: 'string',
+ optional: false,
+ nullable: false,
+ },
+ imageUrl: {
+ type: 'string',
+ optional: false,
+ nullable: false,
+ },
+ memo: {
+ type: 'string',
+ optional: false,
+ nullable: false,
+ },
+ dayOfWeek: {
+ type: 'integer',
+ optional: false,
+ nullable: false,
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/json-schema/announcement.ts b/packages/backend/src/models/json-schema/announcement.ts
index c7e24c7f29..78a98872b2 100644
--- a/packages/backend/src/models/json-schema/announcement.ts
+++ b/packages/backend/src/models/json-schema/announcement.ts
@@ -42,11 +42,15 @@ export const packedAnnouncementSchema = {
type: 'string',
optional: false, nullable: false,
},
- forYou: {
+ needConfirmationToRead: {
type: 'boolean',
optional: false, nullable: false,
},
- needConfirmationToRead: {
+ silence: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ forYou: {
type: 'boolean',
optional: false, nullable: false,
},
diff --git a/packages/backend/src/models/json-schema/antenna.ts b/packages/backend/src/models/json-schema/antenna.ts
index 7b6475919c..4a9f0ed355 100644
--- a/packages/backend/src/models/json-schema/antenna.ts
+++ b/packages/backend/src/models/json-schema/antenna.ts
@@ -67,6 +67,11 @@ export const packedAntennaSchema = {
optional: false, nullable: false,
default: false,
},
+ localOnly: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ default: false,
+ },
notify: {
type: 'boolean',
optional: false, nullable: false,
diff --git a/packages/backend/src/models/json-schema/channel.ts b/packages/backend/src/models/json-schema/channel.ts
index f1019d1461..5b0fa0f15d 100644
--- a/packages/backend/src/models/json-schema/channel.ts
+++ b/packages/backend/src/models/json-schema/channel.ts
@@ -19,7 +19,7 @@ export const packedChannelSchema = {
},
lastNotedAt: {
type: 'string',
- optional: false, nullable: true,
+ nullable: true, optional: false,
format: 'date-time',
},
name: {
@@ -28,38 +28,18 @@ export const packedChannelSchema = {
},
description: {
type: 'string',
- nullable: true, optional: false,
- },
- bannerUrl: {
- type: 'string',
- format: 'url',
- nullable: true, optional: false,
- },
- isArchived: {
- type: 'boolean',
- optional: false, nullable: false,
- },
- notesCount: {
- type: 'number',
- nullable: false, optional: false,
- },
- usersCount: {
- type: 'number',
- nullable: false, optional: false,
- },
- isFollowing: {
- type: 'boolean',
- optional: true, nullable: false,
- },
- isFavorited: {
- type: 'boolean',
- optional: true, nullable: false,
+ optional: false, nullable: true,
},
userId: {
type: 'string',
nullable: true, optional: false,
format: 'id',
},
+ bannerUrl: {
+ type: 'string',
+ format: 'url',
+ nullable: true, optional: false,
+ },
pinnedNoteIds: {
type: 'array',
nullable: false, optional: false,
@@ -72,9 +52,42 @@ export const packedChannelSchema = {
type: 'string',
optional: false, nullable: false,
},
+ isArchived: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ usersCount: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ notesCount: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
isSensitive: {
type: 'boolean',
optional: false, nullable: false,
},
+ allowRenoteToExternal: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ isFollowing: {
+ type: 'boolean',
+ optional: true, nullable: false,
+ },
+ isFavorited: {
+ type: 'boolean',
+ optional: true, nullable: false,
+ },
+ pinnedNotes: {
+ type: 'array',
+ optional: true, nullable: false,
+ items: {
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'Note',
+ },
+ },
},
} as const;
diff --git a/packages/backend/src/models/json-schema/clip.ts b/packages/backend/src/models/json-schema/clip.ts
index 64f7a2ad9c..1ab96c2b3b 100644
--- a/packages/backend/src/models/json-schema/clip.ts
+++ b/packages/backend/src/models/json-schema/clip.ts
@@ -44,13 +44,13 @@ export const packedClipSchema = {
type: 'boolean',
optional: false, nullable: false,
},
- isFavorited: {
- type: 'boolean',
- optional: true, nullable: false,
- },
favoritedCount: {
type: 'number',
optional: false, nullable: false,
},
+ isFavorited: {
+ type: 'boolean',
+ optional: true, nullable: false,
+ },
},
} as const;
diff --git a/packages/backend/src/models/json-schema/drive-file.ts b/packages/backend/src/models/json-schema/drive-file.ts
index 87f1340812..79f242a711 100644
--- a/packages/backend/src/models/json-schema/drive-file.ts
+++ b/packages/backend/src/models/json-schema/drive-file.ts
@@ -74,7 +74,7 @@ export const packedDriveFileSchema = {
},
url: {
type: 'string',
- optional: false, nullable: true,
+ optional: false, nullable: false,
format: 'url',
},
thumbnailUrl: {
diff --git a/packages/backend/src/models/json-schema/drive-folder.ts b/packages/backend/src/models/json-schema/drive-folder.ts
index 51107d423f..aaad301303 100644
--- a/packages/backend/src/models/json-schema/drive-folder.ts
+++ b/packages/backend/src/models/json-schema/drive-folder.ts
@@ -21,6 +21,12 @@ export const packedDriveFolderSchema = {
type: 'string',
optional: false, nullable: false,
},
+ parentId: {
+ type: 'string',
+ optional: false, nullable: true,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
foldersCount: {
type: 'number',
optional: true, nullable: false,
@@ -29,12 +35,6 @@ export const packedDriveFolderSchema = {
type: 'number',
optional: true, nullable: false,
},
- parentId: {
- type: 'string',
- optional: false, nullable: true,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
parent: {
type: 'object',
optional: true, nullable: true,
diff --git a/packages/backend/src/models/json-schema/federation-instance.ts b/packages/backend/src/models/json-schema/federation-instance.ts
index ac07519f16..3417314272 100644
--- a/packages/backend/src/models/json-schema/federation-instance.ts
+++ b/packages/backend/src/models/json-schema/federation-instance.ts
@@ -79,6 +79,10 @@ export const packedFederationInstanceSchema = {
type: 'string',
optional: false, nullable: true,
},
+ isSilenced: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
iconUrl: {
type: 'string',
optional: false, nullable: true,
@@ -98,5 +102,10 @@ export const packedFederationInstanceSchema = {
optional: false, nullable: true,
format: 'date-time',
},
+ latestRequestReceivedAt: {
+ type: 'string',
+ optional: false, nullable: true,
+ format: 'date-time',
+ },
},
} as const;
diff --git a/packages/backend/src/models/json-schema/flash.ts b/packages/backend/src/models/json-schema/flash.ts
index 9453ba1dce..f08fa7a279 100644
--- a/packages/backend/src/models/json-schema/flash.ts
+++ b/packages/backend/src/models/json-schema/flash.ts
@@ -22,6 +22,16 @@ export const packedFlashSchema = {
optional: false, nullable: false,
format: 'date-time',
},
+ userId: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ user: {
+ type: 'object',
+ ref: 'UserLite',
+ optional: false, nullable: false,
+ },
title: {
type: 'string',
optional: false, nullable: false,
@@ -34,16 +44,6 @@ export const packedFlashSchema = {
type: 'string',
optional: false, nullable: false,
},
- userId: {
- type: 'string',
- optional: false, nullable: false,
- format: 'id',
- },
- user: {
- type: 'object',
- ref: 'UserLite',
- optional: false, nullable: false,
- },
likedCount: {
type: 'number',
optional: false, nullable: true,
diff --git a/packages/backend/src/models/json-schema/following.ts b/packages/backend/src/models/json-schema/following.ts
index 3a24ebb619..e92cff20a1 100644
--- a/packages/backend/src/models/json-schema/following.ts
+++ b/packages/backend/src/models/json-schema/following.ts
@@ -22,16 +22,16 @@ export const packedFollowingSchema = {
optional: false, nullable: false,
format: 'id',
},
- followee: {
- type: 'object',
- optional: true, nullable: false,
- ref: 'UserDetailed',
- },
followerId: {
type: 'string',
optional: false, nullable: false,
format: 'id',
},
+ followee: {
+ type: 'object',
+ optional: true, nullable: false,
+ ref: 'UserDetailed',
+ },
follower: {
type: 'object',
optional: true, nullable: false,
diff --git a/packages/backend/src/models/json-schema/gallery-post.ts b/packages/backend/src/models/json-schema/gallery-post.ts
index cf260c0bf5..df7038950c 100644
--- a/packages/backend/src/models/json-schema/gallery-post.ts
+++ b/packages/backend/src/models/json-schema/gallery-post.ts
@@ -22,14 +22,6 @@ export const packedGalleryPostSchema = {
optional: false, nullable: false,
format: 'date-time',
},
- title: {
- type: 'string',
- optional: false, nullable: false,
- },
- description: {
- type: 'string',
- optional: false, nullable: true,
- },
userId: {
type: 'string',
optional: false, nullable: false,
@@ -40,6 +32,14 @@ export const packedGalleryPostSchema = {
ref: 'UserLite',
optional: false, nullable: false,
},
+ title: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ description: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
fileIds: {
type: 'array',
optional: true, nullable: false,
@@ -70,5 +70,13 @@ export const packedGalleryPostSchema = {
type: 'boolean',
optional: false, nullable: false,
},
+ likedCount: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ isLiked: {
+ type: 'boolean',
+ optional: true, nullable: false,
+ },
},
} as const;
diff --git a/packages/backend/src/models/json-schema/note.ts b/packages/backend/src/models/json-schema/note.ts
index 2caf0d0c3d..aa749943f0 100644
--- a/packages/backend/src/models/json-schema/note.ts
+++ b/packages/backend/src/models/json-schema/note.ts
@@ -127,22 +127,26 @@ export const packedNoteSchema = {
channel: {
type: 'object',
optional: true, nullable: true,
- items: {
- type: 'object',
- optional: false, nullable: false,
- properties: {
- id: {
- type: 'string',
- optional: false, nullable: false,
- },
- name: {
- type: 'string',
- optional: false, nullable: true,
- },
- isSensitive: {
- type: 'boolean',
- optional: true, nullable: false,
- },
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ name: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ color: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ isSensitive: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ allowRenoteToExternal: {
+ type: 'boolean',
+ optional: false, nullable: false,
},
},
},
@@ -174,6 +178,18 @@ export const packedNoteSchema = {
type: 'string',
optional: true, nullable: false,
},
+ reactionAndUserPairCache: {
+ type: 'array',
+ optional: true, nullable: false,
+ items: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ },
+ clippedCount: {
+ type: 'number',
+ optional: true, nullable: false,
+ },
myReaction: {
type: 'object',
diff --git a/packages/backend/src/models/json-schema/notification.ts b/packages/backend/src/models/json-schema/notification.ts
index 2c434913da..c6d6e84317 100644
--- a/packages/backend/src/models/json-schema/notification.ts
+++ b/packages/backend/src/models/json-schema/notification.ts
@@ -12,7 +12,6 @@ export const packedNotificationSchema = {
type: 'string',
optional: false, nullable: false,
format: 'id',
- example: 'xxxxxxxxxx',
},
createdAt: {
type: 'string',
@@ -22,7 +21,7 @@ export const packedNotificationSchema = {
type: {
type: 'string',
optional: false, nullable: false,
- enum: [...notificationTypes],
+ enum: [...notificationTypes, 'reaction:grouped', 'renote:grouped'],
},
user: {
type: 'object',
@@ -43,13 +42,9 @@ export const packedNotificationSchema = {
type: 'string',
optional: true, nullable: true,
},
- choice: {
- type: 'number',
- optional: true, nullable: true,
- },
- invitation: {
- type: 'object',
- optional: true, nullable: true,
+ achievement: {
+ type: 'string',
+ optional: true, nullable: false,
},
body: {
type: 'string',
@@ -63,5 +58,33 @@ export const packedNotificationSchema = {
type: 'string',
optional: true, nullable: true,
},
+ reactions: {
+ type: 'array',
+ optional: true, nullable: true,
+ items: {
+ type: 'object',
+ properties: {
+ user: {
+ type: 'object',
+ ref: 'UserLite',
+ optional: false, nullable: false,
+ },
+ reaction: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ },
+ required: ['user', 'reaction'],
+ },
+ },
+ users: {
+ type: 'array',
+ optional: true, nullable: true,
+ items: {
+ type: 'object',
+ ref: 'UserLite',
+ optional: false, nullable: false,
+ },
+ },
},
} as const;
diff --git a/packages/backend/src/models/json-schema/page.ts b/packages/backend/src/models/json-schema/page.ts
index 3f20a4b802..9baacd6884 100644
--- a/packages/backend/src/models/json-schema/page.ts
+++ b/packages/backend/src/models/json-schema/page.ts
@@ -22,6 +22,32 @@ export const packedPageSchema = {
optional: false, nullable: false,
format: 'date-time',
},
+ userId: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ user: {
+ type: 'object',
+ ref: 'UserLite',
+ optional: false, nullable: false,
+ },
+ content: {
+ type: 'array',
+ optional: false, nullable: false,
+ items: {
+ type: 'object',
+ optional: false, nullable: false,
+ },
+ },
+ variables: {
+ type: 'array',
+ optional: false, nullable: false,
+ items: {
+ type: 'object',
+ optional: false, nullable: false,
+ },
+ },
title: {
type: 'string',
optional: false, nullable: false,
@@ -34,23 +60,47 @@ export const packedPageSchema = {
type: 'string',
optional: false, nullable: true,
},
- content: {
- type: 'array',
+ hideTitleWhenPinned: {
+ type: 'boolean',
optional: false, nullable: false,
},
- variables: {
- type: 'array',
+ alignCenter: {
+ type: 'boolean',
optional: false, nullable: false,
},
- userId: {
+ font: {
type: 'string',
optional: false, nullable: false,
- format: 'id',
},
- user: {
- type: 'object',
- ref: 'UserLite',
+ script: {
+ type: 'string',
optional: false, nullable: false,
},
+ eyeCatchingImageId: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ eyeCatchingImage: {
+ type: 'object',
+ optional: false, nullable: true,
+ ref: 'DriveFile',
+ },
+ attachedFiles: {
+ type: 'array',
+ optional: false, nullable: false,
+ items: {
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'DriveFile',
+ },
+ },
+ likedCount: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ isLiked: {
+ type: 'boolean',
+ optional: true, nullable: false,
+ },
},
} as const;
diff --git a/packages/backend/src/models/json-schema/role.ts b/packages/backend/src/models/json-schema/role.ts
new file mode 100644
index 0000000000..b0c6804bb8
--- /dev/null
+++ b/packages/backend/src/models/json-schema/role.ts
@@ -0,0 +1,158 @@
+const rolePolicyValue = {
+ type: 'object',
+ properties: {
+ value: {
+ oneOf: [
+ {
+ type: 'integer',
+ optional: false, nullable: false,
+ },
+ {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ ],
+ },
+ priority: {
+ type: 'integer',
+ optional: false, nullable: false,
+ },
+ useDefault: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ },
+} as const;
+
+export const packedRoleLiteSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ name: {
+ type: 'string',
+ optional: false, nullable: false,
+ example: 'New Role',
+ },
+ color: {
+ type: 'string',
+ optional: false, nullable: true,
+ example: '#000000',
+ },
+ iconUrl: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ description: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ isModerator: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ example: false,
+ },
+ isAdministrator: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ example: false,
+ },
+ displayOrder: {
+ type: 'integer',
+ optional: false, nullable: false,
+ example: 0,
+ },
+ },
+} as const;
+
+export const packedRoleSchema = {
+ type: 'object',
+ allOf: [
+ {
+ type: 'object',
+ ref: 'RoleLite',
+ },
+ {
+ type: 'object',
+ properties: {
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ updatedAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ target: {
+ type: 'string',
+ optional: false, nullable: false,
+ enum: ['manual', 'conditional'],
+ },
+ condFormula: {
+ type: 'object',
+ optional: false, nullable: false,
+ },
+ isPublic: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ example: false,
+ },
+ isExplorable: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ example: false,
+ },
+ asBadge: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ example: false,
+ },
+ canEditMembersByModerator: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ example: false,
+ },
+ policies: {
+ type: 'object',
+ optional: false, nullable: false,
+ properties: {
+ pinLimit: rolePolicyValue,
+ canInvite: rolePolicyValue,
+ clipLimit: rolePolicyValue,
+ canHideAds: rolePolicyValue,
+ inviteLimit: rolePolicyValue,
+ antennaLimit: rolePolicyValue,
+ gtlAvailable: rolePolicyValue,
+ ltlAvailable: rolePolicyValue,
+ webhookLimit: rolePolicyValue,
+ canPublicNote: rolePolicyValue,
+ userListLimit: rolePolicyValue,
+ wordMuteLimit: rolePolicyValue,
+ alwaysMarkNsfw: rolePolicyValue,
+ canSearchNotes: rolePolicyValue,
+ driveCapacityMb: rolePolicyValue,
+ rateLimitFactor: rolePolicyValue,
+ inviteLimitCycle: rolePolicyValue,
+ noteEachClipsLimit: rolePolicyValue,
+ inviteExpirationTime: rolePolicyValue,
+ canManageCustomEmojis: rolePolicyValue,
+ userEachUserListsLimit: rolePolicyValue,
+ canManageAvatarDecorations: rolePolicyValue,
+ canUseTranslator: rolePolicyValue,
+ avatarDecorationLimit: rolePolicyValue,
+ },
+ },
+ usersCount: {
+ type: 'integer',
+ optional: false, nullable: false,
+ },
+ },
+ },
+ ],
+} as const;
diff --git a/packages/backend/src/models/json-schema/signin.ts b/packages/backend/src/models/json-schema/signin.ts
new file mode 100644
index 0000000000..d27d2490c5
--- /dev/null
+++ b/packages/backend/src/models/json-schema/signin.ts
@@ -0,0 +1,26 @@
+export const packedSigninSchema = {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ ip: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ headers: {
+ type: 'object',
+ optional: false, nullable: false,
+ },
+ success: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ },
+} as const;
diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts
index 57d2d976ff..6a0d43b1ac 100644
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@@ -3,6 +3,18 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
+const notificationRecieveConfig = {
+ type: 'object',
+ nullable: false, optional: true,
+ properties: {
+ type: {
+ type: 'string',
+ nullable: false, optional: false,
+ enum: ['all', 'following', 'follower', 'mutualFollow', 'list', 'never'],
+ },
+ },
+} as const;
+
export const packedUserLiteSchema = {
type: 'object',
properties: {
@@ -37,15 +49,41 @@ export const packedUserLiteSchema = {
type: 'string',
nullable: true, optional: false,
},
- isAdmin: {
- type: 'boolean',
- nullable: false, optional: true,
- default: false,
- },
- isModerator: {
- type: 'boolean',
- nullable: false, optional: true,
- default: false,
+ avatarDecorations: {
+ type: 'array',
+ nullable: false, optional: false,
+ items: {
+ type: 'object',
+ nullable: false, optional: false,
+ properties: {
+ id: {
+ type: 'string',
+ nullable: false, optional: false,
+ format: 'id',
+ },
+ angle: {
+ type: 'number',
+ nullable: false, optional: true,
+ },
+ flipH: {
+ type: 'boolean',
+ nullable: false, optional: true,
+ },
+ url: {
+ type: 'string',
+ format: 'url',
+ nullable: false, optional: false,
+ },
+ offsetX: {
+ type: 'number',
+ nullable: false, optional: true,
+ },
+ offsetY: {
+ type: 'number',
+ nullable: false, optional: true,
+ },
+ },
+ },
},
isBot: {
type: 'boolean',
@@ -55,12 +93,67 @@ export const packedUserLiteSchema = {
type: 'boolean',
nullable: false, optional: true,
},
+ instance: {
+ type: 'object',
+ nullable: false, optional: true,
+ properties: {
+ name: {
+ type: 'string',
+ nullable: true, optional: false,
+ },
+ softwareName: {
+ type: 'string',
+ nullable: true, optional: false,
+ },
+ softwareVersion: {
+ type: 'string',
+ nullable: true, optional: false,
+ },
+ iconUrl: {
+ type: 'string',
+ nullable: true, optional: false,
+ },
+ faviconUrl: {
+ type: 'string',
+ nullable: true, optional: false,
+ },
+ themeColor: {
+ type: 'string',
+ nullable: true, optional: false,
+ },
+ },
+ },
+ emojis: {
+ type: 'object',
+ nullable: false, optional: false,
+ },
onlineStatus: {
type: 'string',
- format: 'url',
- nullable: true, optional: false,
+ nullable: false, optional: false,
enum: ['unknown', 'online', 'active', 'offline'],
},
+ badgeRoles: {
+ type: 'array',
+ nullable: false, optional: true,
+ items: {
+ type: 'object',
+ nullable: false, optional: false,
+ properties: {
+ name: {
+ type: 'string',
+ nullable: false, optional: false,
+ },
+ iconUrl: {
+ type: 'string',
+ nullable: true, optional: false,
+ },
+ displayOrder: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ },
+ },
+ },
},
} as const;
@@ -77,21 +170,18 @@ export const packedUserDetailedNotMeOnlySchema = {
format: 'uri',
nullable: true, optional: false,
},
- movedToUri: {
+ movedTo: {
type: 'string',
format: 'uri',
- nullable: true,
- optional: false,
+ nullable: true, optional: false,
},
alsoKnownAs: {
type: 'array',
- nullable: true,
- optional: false,
+ nullable: true, optional: false,
items: {
type: 'string',
format: 'id',
- nullable: false,
- optional: false,
+ nullable: false, optional: false,
},
},
createdAt: {
@@ -221,6 +311,16 @@ export const packedUserDetailedNotMeOnlySchema = {
type: 'boolean',
nullable: false, optional: false,
},
+ followingVisibility: {
+ type: 'string',
+ nullable: false, optional: false,
+ enum: ['public', 'followers', 'private'],
+ },
+ followersVisibility: {
+ type: 'string',
+ nullable: false, optional: false,
+ enum: ['public', 'followers', 'private'],
+ },
twoFactorEnabled: {
type: 'boolean',
nullable: false, optional: false,
@@ -236,6 +336,23 @@ export const packedUserDetailedNotMeOnlySchema = {
nullable: false, optional: false,
default: false,
},
+ roles: {
+ type: 'array',
+ nullable: false, optional: false,
+ items: {
+ type: 'object',
+ nullable: false, optional: false,
+ ref: 'RoleLite',
+ },
+ },
+ memo: {
+ type: 'string',
+ nullable: true, optional: false,
+ },
+ moderationNote: {
+ type: 'string',
+ nullable: false, optional: true,
+ },
//#region relations
isFollowing: {
type: 'boolean',
@@ -269,13 +386,10 @@ export const packedUserDetailedNotMeOnlySchema = {
type: 'boolean',
nullable: false, optional: true,
},
- memo: {
- type: 'string',
- nullable: false, optional: true,
- },
notify: {
type: 'string',
nullable: false, optional: true,
+ enum: ['normal', 'none'],
},
withReplies: {
type: 'boolean',
@@ -298,29 +412,37 @@ export const packedMeDetailedOnlySchema = {
nullable: true, optional: false,
format: 'id',
},
- injectFeaturedNote: {
+ isModerator: {
type: 'boolean',
nullable: true, optional: false,
},
+ isAdmin: {
+ type: 'boolean',
+ nullable: true, optional: false,
+ },
+ injectFeaturedNote: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
receiveAnnouncementEmail: {
type: 'boolean',
- nullable: true, optional: false,
+ nullable: false, optional: false,
},
alwaysMarkNsfw: {
type: 'boolean',
- nullable: true, optional: false,
+ nullable: false, optional: false,
},
autoSensitive: {
type: 'boolean',
- nullable: true, optional: false,
+ nullable: false, optional: false,
},
carefulBot: {
type: 'boolean',
- nullable: true, optional: false,
+ nullable: false, optional: false,
},
autoAcceptFollowed: {
type: 'boolean',
- nullable: true, optional: false,
+ nullable: false, optional: false,
},
noCrawle: {
type: 'boolean',
@@ -359,10 +481,23 @@ export const packedMeDetailedOnlySchema = {
type: 'boolean',
nullable: false, optional: false,
},
+ unreadAnnouncements: {
+ type: 'array',
+ nullable: false, optional: false,
+ items: {
+ type: 'object',
+ nullable: false, optional: false,
+ ref: 'Announcement',
+ },
+ },
hasUnreadAntenna: {
type: 'boolean',
nullable: false, optional: false,
},
+ hasUnreadChannel: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
hasUnreadNotification: {
type: 'boolean',
nullable: false, optional: false,
@@ -371,6 +506,10 @@ export const packedMeDetailedOnlySchema = {
type: 'boolean',
nullable: false, optional: false,
},
+ unreadNotificationsCount: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
mutedWords: {
type: 'array',
nullable: false, optional: false,
@@ -383,6 +522,18 @@ export const packedMeDetailedOnlySchema = {
},
},
},
+ hardMutedWords: {
+ type: 'array',
+ nullable: false, optional: false,
+ items: {
+ type: 'array',
+ nullable: false, optional: false,
+ items: {
+ type: 'string',
+ nullable: false, optional: false,
+ },
+ },
+ },
mutedInstances: {
type: 'array',
nullable: true, optional: false,
@@ -394,15 +545,150 @@ export const packedMeDetailedOnlySchema = {
notificationRecieveConfig: {
type: 'object',
nullable: false, optional: false,
+ properties: {
+ app: notificationRecieveConfig,
+ quote: notificationRecieveConfig,
+ reply: notificationRecieveConfig,
+ follow: notificationRecieveConfig,
+ renote: notificationRecieveConfig,
+ mention: notificationRecieveConfig,
+ reaction: notificationRecieveConfig,
+ pollEnded: notificationRecieveConfig,
+ receiveFollowRequest: notificationRecieveConfig,
+ },
},
emailNotificationTypes: {
type: 'array',
- nullable: true, optional: false,
+ nullable: false, optional: false,
items: {
type: 'string',
nullable: false, optional: false,
},
},
+ achievements: {
+ type: 'array',
+ nullable: false, optional: false,
+ items: {
+ type: 'object',
+ nullable: false, optional: false,
+ properties: {
+ name: {
+ type: 'string',
+ nullable: false, optional: false,
+ },
+ unlockedAt: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ },
+ },
+ },
+ loggedInDays: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ policies: {
+ type: 'object',
+ nullable: false, optional: false,
+ properties: {
+ gtlAvailable: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ ltlAvailable: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ canPublicNote: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ canInvite: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ inviteLimit: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ inviteLimitCycle: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ inviteExpirationTime: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ canManageCustomEmojis: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ canManageAvatarDecorations: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ canSearchNotes: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ canUseTranslator: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ canHideAds: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ driveCapacityMb: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ alwaysMarkNsfw: {
+ type: 'boolean',
+ nullable: false, optional: false,
+ },
+ pinLimit: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ antennaLimit: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ wordMuteLimit: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ webhookLimit: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ clipLimit: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ noteEachClipsLimit: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ userListLimit: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ userEachUserListsLimit: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ rateLimitFactor: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ avatarDecorationLimit: {
+ type: 'number',
+ nullable: false, optional: false,
+ },
+ },
+ },
//#region secrets
email: {
type: 'string',
@@ -418,6 +704,23 @@ export const packedMeDetailedOnlySchema = {
items: {
type: 'object',
nullable: false, optional: false,
+ properties: {
+ id: {
+ type: 'string',
+ nullable: false, optional: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ name: {
+ type: 'string',
+ nullable: false, optional: false,
+ },
+ lastUsed: {
+ type: 'string',
+ nullable: false, optional: false,
+ format: 'date-time',
+ },
+ },
},
},
//#endregion
@@ -479,5 +782,13 @@ export const packedUserSchema = {
type: 'object',
ref: 'UserDetailed',
},
+ {
+ type: 'object',
+ ref: 'UserDetailedNotMe',
+ },
+ {
+ type: 'object',
+ ref: 'MeDetailed',
+ },
],
} as const;
diff --git a/packages/backend/src/postgres.ts b/packages/backend/src/postgres.ts
index d4c6ad82ce..cd611839a4 100644
--- a/packages/backend/src/postgres.ts
+++ b/packages/backend/src/postgres.ts
@@ -18,6 +18,7 @@ import { MiAnnouncement } from '@/models/Announcement.js';
import { MiAnnouncementRead } from '@/models/AnnouncementRead.js';
import { MiAntenna } from '@/models/Antenna.js';
import { MiApp } from '@/models/App.js';
+import { MiAvatarDecoration } from '@/models/AvatarDecoration.js';
import { MiAuthSession } from '@/models/AuthSession.js';
import { MiBlocking } from '@/models/Blocking.js';
import { MiChannelFollowing } from '@/models/ChannelFollowing.js';
@@ -129,6 +130,7 @@ export const entities = [
MiMeta,
MiInstance,
MiApp,
+ MiAvatarDecoration,
MiAuthSession,
MiAccessToken,
MiUser,
diff --git a/packages/backend/src/queue/QueueProcessorService.ts b/packages/backend/src/queue/QueueProcessorService.ts
index 5201bfed8e..b872dd65f7 100644
--- a/packages/backend/src/queue/QueueProcessorService.ts
+++ b/packages/backend/src/queue/QueueProcessorService.ts
@@ -153,8 +153,8 @@ export class QueueProcessorService implements OnApplicationShutdown {
this.systemQueueWorker
.on('active', (job) => systemLogger.debug(`active id=${job.id}`))
.on('completed', (job, result) => systemLogger.debug(`completed(${result}) id=${job.id}`))
- .on('failed', (job, err) => systemLogger.warn(`failed(${err}) id=${job ? job.id : '-'}`, { job, e: renderError(err) }))
- .on('error', (err: Error) => systemLogger.error(`error ${err}`, { e: renderError(err) }))
+ .on('failed', (job, err) => systemLogger.warn(`failed(${err.stack}) id=${job ? job.id : '-'}`, { job, e: renderError(err) }))
+ .on('error', (err: Error) => systemLogger.error(`error ${err.stack}`, { e: renderError(err) }))
.on('stalled', (jobId) => systemLogger.warn(`stalled id=${jobId}`));
//#endregion
@@ -191,8 +191,8 @@ export class QueueProcessorService implements OnApplicationShutdown {
this.dbQueueWorker
.on('active', (job) => dbLogger.debug(`active id=${job.id}`))
.on('completed', (job, result) => dbLogger.debug(`completed(${result}) id=${job.id}`))
- .on('failed', (job, err) => dbLogger.warn(`failed(${err}) id=${job ? job.id : '-'}`, { job, e: renderError(err) }))
- .on('error', (err: Error) => dbLogger.error(`error ${err}`, { e: renderError(err) }))
+ .on('failed', (job, err) => dbLogger.warn(`failed(${err.stack}) id=${job ? job.id : '-'}`, { job, e: renderError(err) }))
+ .on('error', (err: Error) => dbLogger.error(`error ${err.stack}`, { e: renderError(err) }))
.on('stalled', (jobId) => dbLogger.warn(`stalled id=${jobId}`));
//#endregion
@@ -215,8 +215,8 @@ export class QueueProcessorService implements OnApplicationShutdown {
this.deliverQueueWorker
.on('active', (job) => deliverLogger.debug(`active ${getJobInfo(job, true)} to=${job.data.to}`))
.on('completed', (job, result) => deliverLogger.debug(`completed(${result}) ${getJobInfo(job, true)} to=${job.data.to}`))
- .on('failed', (job, err) => deliverLogger.warn(`failed(${err}) ${getJobInfo(job)} to=${job ? job.data.to : '-'}`))
- .on('error', (err: Error) => deliverLogger.error(`error ${err}`, { e: renderError(err) }))
+ .on('failed', (job, err) => deliverLogger.warn(`failed(${err.stack}) ${getJobInfo(job)} to=${job ? job.data.to : '-'}`))
+ .on('error', (err: Error) => deliverLogger.error(`error ${err.stack}`, { e: renderError(err) }))
.on('stalled', (jobId) => deliverLogger.warn(`stalled id=${jobId}`));
//#endregion
@@ -226,7 +226,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
autorun: false,
concurrency: this.config.inboxJobConcurrency ?? 16,
limiter: {
- max: this.config.inboxJobPerSec ?? 16,
+ max: this.config.inboxJobPerSec ?? 32,
duration: 1000,
},
settings: {
@@ -239,8 +239,8 @@ export class QueueProcessorService implements OnApplicationShutdown {
this.inboxQueueWorker
.on('active', (job) => inboxLogger.debug(`active ${getJobInfo(job, true)}`))
.on('completed', (job, result) => inboxLogger.debug(`completed(${result}) ${getJobInfo(job, true)}`))
- .on('failed', (job, err) => inboxLogger.warn(`failed(${err}) ${getJobInfo(job)} activity=${job ? (job.data.activity ? job.data.activity.id : 'none') : '-'}`, { job, e: renderError(err) }))
- .on('error', (err: Error) => inboxLogger.error(`error ${err}`, { e: renderError(err) }))
+ .on('failed', (job, err) => inboxLogger.warn(`failed(${err.stack}) ${getJobInfo(job)} activity=${job ? (job.data.activity ? job.data.activity.id : 'none') : '-'}`, { job, e: renderError(err) }))
+ .on('error', (err: Error) => inboxLogger.error(`error ${err.stack}`, { e: renderError(err) }))
.on('stalled', (jobId) => inboxLogger.warn(`stalled id=${jobId}`));
//#endregion
@@ -263,8 +263,8 @@ export class QueueProcessorService implements OnApplicationShutdown {
this.webhookDeliverQueueWorker
.on('active', (job) => webhookLogger.debug(`active ${getJobInfo(job, true)} to=${job.data.to}`))
.on('completed', (job, result) => webhookLogger.debug(`completed(${result}) ${getJobInfo(job, true)} to=${job.data.to}`))
- .on('failed', (job, err) => webhookLogger.warn(`failed(${err}) ${getJobInfo(job)} to=${job ? job.data.to : '-'}`))
- .on('error', (err: Error) => webhookLogger.error(`error ${err}`, { e: renderError(err) }))
+ .on('failed', (job, err) => webhookLogger.warn(`failed(${err.stack}) ${getJobInfo(job)} to=${job ? job.data.to : '-'}`))
+ .on('error', (err: Error) => webhookLogger.error(`error ${err.stack}`, { e: renderError(err) }))
.on('stalled', (jobId) => webhookLogger.warn(`stalled id=${jobId}`));
//#endregion
@@ -292,8 +292,8 @@ export class QueueProcessorService implements OnApplicationShutdown {
this.relationshipQueueWorker
.on('active', (job) => relationshipLogger.debug(`active id=${job.id}`))
.on('completed', (job, result) => relationshipLogger.debug(`completed(${result}) id=${job.id}`))
- .on('failed', (job, err) => relationshipLogger.warn(`failed(${err}) id=${job ? job.id : '-'}`, { job, e: renderError(err) }))
- .on('error', (err: Error) => relationshipLogger.error(`error ${err}`, { e: renderError(err) }))
+ .on('failed', (job, err) => relationshipLogger.warn(`failed(${err.stack}) id=${job ? job.id : '-'}`, { job, e: renderError(err) }))
+ .on('error', (err: Error) => relationshipLogger.error(`error ${err.stack}`, { e: renderError(err) }))
.on('stalled', (jobId) => relationshipLogger.warn(`stalled id=${jobId}`));
//#endregion
@@ -315,8 +315,8 @@ export class QueueProcessorService implements OnApplicationShutdown {
this.objectStorageQueueWorker
.on('active', (job) => objectStorageLogger.debug(`active id=${job.id}`))
.on('completed', (job, result) => objectStorageLogger.debug(`completed(${result}) id=${job.id}`))
- .on('failed', (job, err) => objectStorageLogger.warn(`failed(${err}) id=${job ? job.id : '-'}`, { job, e: renderError(err) }))
- .on('error', (err: Error) => objectStorageLogger.error(`error ${err}`, { e: renderError(err) }))
+ .on('failed', (job, err) => objectStorageLogger.warn(`failed(${err.stack}) id=${job ? job.id : '-'}`, { job, e: renderError(err) }))
+ .on('error', (err: Error) => objectStorageLogger.error(`error ${err.stack}`, { e: renderError(err) }))
.on('stalled', (jobId) => objectStorageLogger.warn(`stalled id=${jobId}`));
//#endregion
diff --git a/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts b/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts
index 5aac3f19e8..9f49d85c7f 100644
--- a/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts
+++ b/packages/backend/src/queue/processors/AggregateRetentionProcessorService.ts
@@ -47,13 +47,13 @@ export class AggregateRetentionProcessorService {
// 今日登録したユーザーを全て取得
const targetUsers = await this.usersRepository.findBy({
host: IsNull(),
- createdAt: MoreThan(new Date(Date.now() - (1000 * 60 * 60 * 24))),
+ id: MoreThan(this.idService.gen(Date.now() - (1000 * 60 * 60 * 24))),
});
const targetUserIds = targetUsers.map(u => u.id);
try {
await this.retentionAggregationsRepository.insert({
- id: this.idService.genId(),
+ id: this.idService.gen(),
createdAt: now,
updatedAt: now,
dateKey,
diff --git a/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts b/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts
index a0afbee3ba..d0968d2923 100644
--- a/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts
+++ b/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts
@@ -80,6 +80,7 @@ export class ExportAntennasProcessorService {
return this.utilityService.getFullApAccount(u.username, u.host); // acct
}) : null,
caseSensitive: antenna.caseSensitive,
+ localOnly: antenna.localOnly,
withReplies: antenna.withReplies,
withFile: antenna.withFile,
notify: antenna.notify,
diff --git a/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts b/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts
index 7248c7a649..af2a3434a9 100644
--- a/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts
+++ b/packages/backend/src/queue/processors/ExportFavoritesProcessorService.ts
@@ -15,6 +15,7 @@ import { createTemp } from '@/misc/create-temp.js';
import type { MiPoll } from '@/models/Poll.js';
import type { MiNote } from '@/models/Note.js';
import { bindThis } from '@/decorators.js';
+import { IdService } from '@/core/IdService.js';
import { QueueLoggerService } from '../QueueLoggerService.js';
import type * as Bull from 'bullmq';
import type { DbJobDataWithUser } from '../types.js';
@@ -35,6 +36,7 @@ export class ExportFavoritesProcessorService {
private driveService: DriveService,
private queueLoggerService: QueueLoggerService,
+ private idService: IdService,
) {
this.logger = this.queueLoggerService.logger.createSubLogger('export-favorites');
}
@@ -99,7 +101,7 @@ export class ExportFavoritesProcessorService {
if (favorite.note.hasPoll) {
poll = await this.pollsRepository.findOneByOrFail({ noteId: favorite.note.id });
}
- const content = JSON.stringify(serialize(favorite, poll));
+ const content = JSON.stringify(this.serialize(favorite, poll));
const isFirst = exportedFavoritesCount === 0;
await write(isFirst ? content : ',\n' + content);
exportedFavoritesCount++;
@@ -125,34 +127,34 @@ export class ExportFavoritesProcessorService {
cleanup();
}
}
-}
-function serialize(favorite: MiNoteFavorite & { note: MiNote & { user: MiUser } }, poll: MiPoll | null = null): Record {
- return {
- id: favorite.id,
- createdAt: favorite.createdAt,
- note: {
- id: favorite.note.id,
- text: favorite.note.text,
- createdAt: favorite.note.createdAt,
- fileIds: favorite.note.fileIds,
- replyId: favorite.note.replyId,
- renoteId: favorite.note.renoteId,
- poll: poll,
- cw: favorite.note.cw,
- visibility: favorite.note.visibility,
- visibleUserIds: favorite.note.visibleUserIds,
- localOnly: favorite.note.localOnly,
- reactionAcceptance: favorite.note.reactionAcceptance,
- uri: favorite.note.uri,
- url: favorite.note.url,
- user: {
- id: favorite.note.user.id,
- name: favorite.note.user.name,
- username: favorite.note.user.username,
- host: favorite.note.user.host,
- uri: favorite.note.user.uri,
+ private serialize(favorite: MiNoteFavorite & { note: MiNote & { user: MiUser } }, poll: MiPoll | null = null): Record {
+ return {
+ id: favorite.id,
+ createdAt: this.idService.parse(favorite.id).date.toISOString(),
+ note: {
+ id: favorite.note.id,
+ text: favorite.note.text,
+ createdAt: this.idService.parse(favorite.note.id).date.toISOString(),
+ fileIds: favorite.note.fileIds,
+ replyId: favorite.note.replyId,
+ renoteId: favorite.note.renoteId,
+ poll: poll,
+ cw: favorite.note.cw,
+ visibility: favorite.note.visibility,
+ visibleUserIds: favorite.note.visibleUserIds,
+ localOnly: favorite.note.localOnly,
+ reactionAcceptance: favorite.note.reactionAcceptance,
+ uri: favorite.note.uri,
+ url: favorite.note.url,
+ user: {
+ id: favorite.note.user.id,
+ name: favorite.note.user.name,
+ username: favorite.note.user.username,
+ host: favorite.note.user.host,
+ uri: favorite.note.user.uri,
+ },
},
- },
- };
+ };
+ }
}
diff --git a/packages/backend/src/queue/processors/ExportNotesProcessorService.ts b/packages/backend/src/queue/processors/ExportNotesProcessorService.ts
index e0bc80e190..cd4ccb0b07 100644
--- a/packages/backend/src/queue/processors/ExportNotesProcessorService.ts
+++ b/packages/backend/src/queue/processors/ExportNotesProcessorService.ts
@@ -17,6 +17,7 @@ import type { MiNote } from '@/models/Note.js';
import { bindThis } from '@/decorators.js';
import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
import { Packed } from '@/misc/json-schema.js';
+import { IdService } from '@/core/IdService.js';
import { QueueLoggerService } from '../QueueLoggerService.js';
import type * as Bull from 'bullmq';
import type { DbJobDataWithUser } from '../types.js';
@@ -37,8 +38,8 @@ export class ExportNotesProcessorService {
private driveService: DriveService,
private queueLoggerService: QueueLoggerService,
-
private driveFileEntityService: DriveFileEntityService,
+ private idService: IdService,
) {
this.logger = this.queueLoggerService.logger.createSubLogger('export-notes');
}
@@ -103,7 +104,7 @@ export class ExportNotesProcessorService {
poll = await this.pollsRepository.findOneByOrFail({ noteId: note.id });
}
const files = await this.driveFileEntityService.packManyByIds(note.fileIds);
- const content = JSON.stringify(serialize(note, poll, files));
+ const content = JSON.stringify(this.serialize(note, poll, files));
const isFirst = exportedNotesCount === 0;
await write(isFirst ? content : ',\n' + content);
exportedNotesCount++;
@@ -129,22 +130,22 @@ export class ExportNotesProcessorService {
cleanup();
}
}
-}
-function serialize(note: MiNote, poll: MiPoll | null = null, files: Packed<'DriveFile'>[]): Record {
- return {
- id: note.id,
- text: note.text,
- createdAt: note.createdAt,
- fileIds: note.fileIds,
- files: files,
- replyId: note.replyId,
- renoteId: note.renoteId,
- poll: poll,
- cw: note.cw,
- visibility: note.visibility,
- visibleUserIds: note.visibleUserIds,
- localOnly: note.localOnly,
- reactionAcceptance: note.reactionAcceptance,
- };
+ private serialize(note: MiNote, poll: MiPoll | null = null, files: Packed<'DriveFile'>[]): Record {
+ return {
+ id: note.id,
+ text: note.text,
+ createdAt: this.idService.parse(note.id).date.toISOString(),
+ fileIds: note.fileIds,
+ files: files,
+ replyId: note.replyId,
+ renoteId: note.renoteId,
+ poll: poll,
+ cw: note.cw,
+ visibility: note.visibility,
+ visibleUserIds: note.visibleUserIds,
+ localOnly: note.localOnly,
+ reactionAcceptance: note.reactionAcceptance,
+ };
+ }
}
diff --git a/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts b/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts
index 7c95bccaff..291ea14b67 100644
--- a/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts
+++ b/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts
@@ -43,6 +43,7 @@ const validate = new Ajv().compile({
type: 'string',
} },
caseSensitive: { type: 'boolean' },
+ localOnly: { type: 'boolean' },
withReplies: { type: 'boolean' },
withFile: { type: 'boolean' },
notify: { type: 'boolean' },
@@ -76,8 +77,7 @@ export class ImportAntennasProcessorService {
continue;
}
const result = await this.antennasRepository.insert({
- id: this.idService.genId(),
- createdAt: now,
+ id: this.idService.gen(now.getTime()),
lastUsedAt: now,
userId: job.data.user.id,
name: antenna.name,
@@ -87,6 +87,7 @@ export class ImportAntennasProcessorService {
excludeKeywords: antenna.excludeKeywords,
users: (antenna.src === 'list' && antenna.userListAccts !== null ? antenna.userListAccts : antenna.users).filter(Boolean),
caseSensitive: antenna.caseSensitive,
+ localOnly: antenna.localOnly,
withReplies: antenna.withReplies,
withFile: antenna.withFile,
notify: antenna.notify,
diff --git a/packages/backend/src/queue/processors/ImportFollowingProcessorService.ts b/packages/backend/src/queue/processors/ImportFollowingProcessorService.ts
index 2b5e41a12d..e75499a56f 100644
--- a/packages/backend/src/queue/processors/ImportFollowingProcessorService.ts
+++ b/packages/backend/src/queue/processors/ImportFollowingProcessorService.ts
@@ -56,7 +56,7 @@ export class ImportFollowingProcessorService {
const csv = await this.downloadService.downloadTextFile(file.url);
const targets = csv.trim().split('\n');
- this.queueService.createImportFollowingToDbJob({ id: user.id }, targets);
+ this.queueService.createImportFollowingToDbJob({ id: user.id }, targets, job.data.withReplies);
this.logger.succ('Import jobs created');
}
@@ -93,9 +93,9 @@ export class ImportFollowingProcessorService {
// skip myself
if (target.id === job.data.user.id) return;
- this.logger.info(`Follow ${target.id} ...`);
+ this.logger.info(`Follow ${target.id} ${job.data.withReplies ? 'with replies' : 'without replies'} ...`);
- this.queueService.createFollowJob([{ from: user, to: { id: target.id }, silent: true }]);
+ this.queueService.createFollowJob([{ from: user, to: { id: target.id }, silent: true, withReplies: job.data.withReplies }]);
} catch (e) {
this.logger.warn(`Error: ${e}`);
}
diff --git a/packages/backend/src/queue/processors/ImportUserListsProcessorService.ts b/packages/backend/src/queue/processors/ImportUserListsProcessorService.ts
index 9be36a9d0d..5dd3fbe887 100644
--- a/packages/backend/src/queue/processors/ImportUserListsProcessorService.ts
+++ b/packages/backend/src/queue/processors/ImportUserListsProcessorService.ts
@@ -80,8 +80,7 @@ export class ImportUserListsProcessorService {
if (list == null) {
list = await this.userListsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
userId: user.id,
name: listName,
}).then(x => this.userListsRepository.findOneByOrFail(x.identifiers[0]));
diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts
index 99e823f9fa..89d4ea503e 100644
--- a/packages/backend/src/queue/processors/InboxProcessorService.ts
+++ b/packages/backend/src/queue/processors/InboxProcessorService.ts
@@ -88,7 +88,7 @@ export class InboxProcessorService {
if (err.isClientError) {
throw new Bull.UnrecoverableError(`skip: Ignored deleted actors on both ends ${activity.actor} - ${err.statusCode}`);
}
- throw new Error(`Error in actor ${activity.actor} - ${err.statusCode ?? err}`);
+ throw new Error(`Error in actor ${activity.actor} - ${err.statusCode}`);
}
}
}
diff --git a/packages/backend/src/queue/processors/RelationshipProcessorService.ts b/packages/backend/src/queue/processors/RelationshipProcessorService.ts
index 5b2d2ef313..b2d8e3631f 100644
--- a/packages/backend/src/queue/processors/RelationshipProcessorService.ts
+++ b/packages/backend/src/queue/processors/RelationshipProcessorService.ts
@@ -34,8 +34,12 @@ export class RelationshipProcessorService {
@bindThis
public async processFollow(job: Bull.Job): Promise {
- this.logger.info(`${job.data.from.id} is trying to follow ${job.data.to.id}`);
- await this.userFollowingService.follow(job.data.from, job.data.to, job.data.requestId, job.data.silent);
+ this.logger.info(`${job.data.from.id} is trying to follow ${job.data.to.id} ${job.data.withReplies ? "with replies" : "without replies"}`);
+ await this.userFollowingService.follow(job.data.from, job.data.to, {
+ requestId: job.data.requestId,
+ silent: job.data.silent,
+ withReplies: job.data.withReplies,
+ });
return 'ok';
}
diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts
index c9122f5ca2..9330c01528 100644
--- a/packages/backend/src/queue/types.ts
+++ b/packages/backend/src/queue/types.ts
@@ -32,6 +32,7 @@ export type RelationshipJobData = {
to: ThinUser;
silent?: boolean;
requestId?: string;
+ withReplies?: boolean;
}
export type DbJobData = DbJobMap[T];
@@ -79,6 +80,7 @@ export type DbUserDeleteJobData = {
export type DbUserImportJobData = {
user: ThinUser;
fileId: MiDriveFile['id'];
+ withReplies?: boolean;
};
export type DBAntennaImportJobData = {
@@ -89,6 +91,7 @@ export type DBAntennaImportJobData = {
export type DbUserImportToDbJobData = {
user: ThinUser;
target: string;
+ withReplies?: boolean;
};
export type ObjectStorageJobData = ObjectStorageFileJobData | Record;
diff --git a/packages/backend/src/server/ActivityPubServerService.ts b/packages/backend/src/server/ActivityPubServerService.ts
index 2428fa2792..68e426b5bc 100644
--- a/packages/backend/src/server/ActivityPubServerService.ts
+++ b/packages/backend/src/server/ActivityPubServerService.ts
@@ -3,6 +3,7 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
+import * as crypto from 'node:crypto';
import { IncomingMessage } from 'node:http';
import { Inject, Injectable } from '@nestjs/common';
import fastifyAccepts from '@fastify/accepts';
@@ -10,6 +11,7 @@ import httpSignature from '@peertube/http-signature';
import { Brackets, In, IsNull, LessThan, Not } from 'typeorm';
import accepts from 'accepts';
import vary from 'vary';
+import secureJson from 'secure-json-parse';
import { DI } from '@/di-symbols.js';
import type { FollowingsRepository, NotesRepository, EmojisRepository, NoteReactionsRepository, UserProfilesRepository, UserNotePiningsRepository, UsersRepository, FollowRequestsRepository } from '@/models/_.js';
import * as url from '@/misc/prelude/url.js';
@@ -26,7 +28,8 @@ import { UtilityService } from '@/core/UtilityService.js';
import { UserEntityService } from '@/core/entities/UserEntityService.js';
import { bindThis } from '@/decorators.js';
import { IActivity } from '@/core/activitypub/type.js';
-import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions } from 'fastify';
+import { isPureRenote } from '@/misc/is-pure-renote.js';
+import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions, FastifyBodyParser } from 'fastify';
import type { FindOptionsWhere } from 'typeorm';
const ACTIVITY_JSON = 'application/activity+json; charset=utf-8';
@@ -88,7 +91,7 @@ export class ActivityPubServerService {
*/
@bindThis
private async packActivity(note: MiNote): Promise {
- if (note.renoteId && note.text == null && !note.hasPoll && (note.fileIds == null || note.fileIds.length === 0)) {
+ if (isPureRenote(note)) {
const renote = await this.notesRepository.findOneByOrFail({ id: note.renoteId });
return this.apRendererService.renderAnnounce(renote.uri ? renote.uri : `${this.config.url}/notes/${renote.id}`, note);
}
@@ -107,7 +110,58 @@ export class ActivityPubServerService {
return;
}
- // TODO: request.bodyのバリデーション？
+ if (signature.params.headers.indexOf('host') === -1
+ || request.headers.host !== this.config.host) {
+ // Host not specified or not match.
+ reply.code(401);
+ return;
+ }
+
+ if (signature.params.headers.indexOf('digest') === -1) {
+ // Digest not found.
+ reply.code(401);
+ } else {
+ const digest = request.headers.digest;
+
+ if (typeof digest !== 'string') {
+ // Huh?
+ reply.code(401);
+ return;
+ }
+
+ const re = /^([a-zA-Z0-9\-]+)=(.+)$/;
+ const match = digest.match(re);
+
+ if (match == null) {
+ // Invalid digest
+ reply.code(401);
+ return;
+ }
+
+ const algo = match[1].toUpperCase();
+ const digestValue = match[2];
+
+ if (algo !== 'SHA-256') {
+ // Unsupported digest algorithm
+ reply.code(401);
+ return;
+ }
+
+ if (request.rawBody == null) {
+ // Bad request
+ reply.code(400);
+ return;
+ }
+
+ const hash = crypto.createHash('sha256').update(request.rawBody).digest('base64');
+
+ if (hash !== digestValue) {
+ // Invalid digest
+ reply.code(401);
+ return;
+ }
+ }
+
this.queueService.inbox(request.body as IActivity, signature);
reply.code(202);
@@ -141,11 +195,11 @@ export class ActivityPubServerService {
//#region Check ff visibility
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: user.id });
- if (profile.ffVisibility === 'private') {
+ if (profile.followersVisibility === 'private') {
reply.code(403);
reply.header('Cache-Control', 'public, max-age=30');
return;
- } else if (profile.ffVisibility === 'followers') {
+ } else if (profile.followersVisibility === 'followers') {
reply.code(403);
reply.header('Cache-Control', 'public, max-age=30');
return;
@@ -233,11 +287,11 @@ export class ActivityPubServerService {
//#region Check ff visibility
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: user.id });
- if (profile.ffVisibility === 'private') {
+ if (profile.followingVisibility === 'private') {
reply.code(403);
reply.header('Cache-Control', 'public, max-age=30');
return;
- } else if (profile.ffVisibility === 'followers') {
+ } else if (profile.followingVisibility === 'followers') {
reply.code(403);
reply.header('Cache-Control', 'public, max-age=30');
return;
@@ -316,8 +370,9 @@ export class ActivityPubServerService {
order: { id: 'DESC' },
});
- const pinnedNotes = await Promise.all(pinings.map(pining =>
- this.notesRepository.findOneByOrFail({ id: pining.noteId })));
+ const pinnedNotes = (await Promise.all(pinings.map(pining =>
+ this.notesRepository.findOneByOrFail({ id: pining.noteId }))))
+ .filter(note => !note.localOnly && ['public', 'home'].includes(note.visibility));
const renderedNotes = await Promise.all(pinnedNotes.map(note => this.apRendererService.renderNote(note)));
@@ -379,9 +434,10 @@ export class ActivityPubServerService {
if (page) {
const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), sinceId, untilId)
.andWhere('note.userId = :userId', { userId: user.id })
- .andWhere(new Brackets(qb => { qb
- .where('note.visibility = \'public\'')
- .orWhere('note.visibility = \'home\'');
+ .andWhere(new Brackets(qb => {
+ qb
+ .where('note.visibility = \'public\'')
+ .orWhere('note.visibility = \'home\'');
}))
.andWhere('note.localOnly = FALSE');
@@ -437,8 +493,7 @@ export class ActivityPubServerService {
@bindThis
public createServer(fastify: FastifyInstance, options: FastifyPluginOptions, done: (err?: Error) => void) {
- // addConstraintStrategy の型定義がおかしいため
- (fastify.addConstraintStrategy as any)({
+ fastify.addConstraintStrategy({
name: 'apOrHtml',
storage() {
const store = {} as any;
@@ -458,9 +513,28 @@ export class ActivityPubServerService {
},
});
+ const almostDefaultJsonParser: FastifyBodyParser = function (request, rawBody, done) {
+ if (rawBody.length === 0) {
+ const err = new Error('Body cannot be empty!') as any;
+ err.statusCode = 400;
+ return done(err);
+ }
+
+ try {
+ const json = secureJson.parse(rawBody.toString('utf8'), null, {
+ protoAction: 'ignore',
+ constructorAction: 'ignore',
+ });
+ done(null, json);
+ } catch (err: any) {
+ err.statusCode = 400;
+ return done(err);
+ }
+ };
+
fastify.register(fastifyAccepts);
- fastify.addContentTypeParser('application/activity+json', { parseAs: 'string' }, fastify.getDefaultJsonParser('ignore', 'ignore'));
- fastify.addContentTypeParser('application/ld+json', { parseAs: 'string' }, fastify.getDefaultJsonParser('ignore', 'ignore'));
+ fastify.addContentTypeParser('application/activity+json', { parseAs: 'buffer' }, almostDefaultJsonParser);
+ fastify.addContentTypeParser('application/ld+json', { parseAs: 'buffer' }, almostDefaultJsonParser);
fastify.addHook('onRequest', (request, reply, done) => {
reply.header('Access-Control-Allow-Headers', 'Accept');
@@ -472,8 +546,8 @@ export class ActivityPubServerService {
//#region Routing
// inbox (limit: 64kb)
- fastify.post('/inbox', { bodyLimit: 1024 * 64 }, async (request, reply) => await this.inbox(request, reply));
- fastify.post('/users/:user/inbox', { bodyLimit: 1024 * 64 }, async (request, reply) => await this.inbox(request, reply));
+ fastify.post('/inbox', { config: { rawBody: true }, bodyLimit: 1024 * 64 }, async (request, reply) => await this.inbox(request, reply));
+ fastify.post('/users/:user/inbox', { config: { rawBody: true }, bodyLimit: 1024 * 64 }, async (request, reply) => await this.inbox(request, reply));
// note
fastify.get<{ Params: { note: string; } }>('/notes/:note', { constraints: { apOrHtml: 'ap' } }, async (request, reply) => {
diff --git a/packages/backend/src/server/FileServerService.ts b/packages/backend/src/server/FileServerService.ts
index 11721263d3..0c7fc8cefe 100644
--- a/packages/backend/src/server/FileServerService.ts
+++ b/packages/backend/src/server/FileServerService.ts
@@ -61,6 +61,9 @@ export class FileServerService {
public createServer(fastify: FastifyInstance, options: FastifyPluginOptions, done: (err?: Error) => void) {
fastify.addHook('onRequest', (request, reply, done) => {
reply.header('Content-Security-Policy', 'default-src \'none\'; img-src \'self\'; media-src \'self\'; style-src \'unsafe-inline\'');
+ if (process.env.NODE_ENV === 'development') {
+ reply.header('Access-Control-Allow-Origin', '*');
+ }
done();
});
diff --git a/packages/backend/src/server/NodeinfoServerService.ts b/packages/backend/src/server/NodeinfoServerService.ts
index dd2b7882a2..4d94fcdd54 100644
--- a/packages/backend/src/server/NodeinfoServerService.ts
+++ b/packages/backend/src/server/NodeinfoServerService.ts
@@ -96,6 +96,11 @@ export class NodeinfoServerService {
metadata: {
nodeName: meta.name,
nodeDescription: meta.description,
+ nodeAdmins: [{
+ name: meta.maintainerName,
+ email: meta.maintainerEmail,
+ }],
+ // deprecated
maintainer: {
name: meta.maintainerName,
email: meta.maintainerEmail,
@@ -135,7 +140,11 @@ export class NodeinfoServerService {
.type(
'application/json; profile="http://nodeinfo.diaspora.software/ns/schema/2.1#"',
)
- .header('Cache-Control', 'public, max-age=600');
+ .header('Cache-Control', 'public, max-age=600')
+ .header('Access-Control-Allow-Headers', 'Accept')
+ .header('Access-Control-Allow-Methods', 'GET, OPTIONS')
+ .header('Access-Control-Allow-Origin', '*')
+ .header('Access-Control-Expose-Headers', 'Vary');
return { version: '2.1', ...base };
});
@@ -148,7 +157,11 @@ export class NodeinfoServerService {
.type(
'application/json; profile="http://nodeinfo.diaspora.software/ns/schema/2.0#"',
)
- .header('Cache-Control', 'public, max-age=600');
+ .header('Cache-Control', 'public, max-age=600')
+ .header('Access-Control-Allow-Headers', 'Accept')
+ .header('Access-Control-Allow-Methods', 'GET, OPTIONS')
+ .header('Access-Control-Allow-Origin', '*')
+ .header('Access-Control-Expose-Headers', 'Vary');
return { version: '2.0', ...base };
});
diff --git a/packages/backend/src/server/ServerService.ts b/packages/backend/src/server/ServerService.ts
index 0e4a5ece3e..bb41ab0e42 100644
--- a/packages/backend/src/server/ServerService.ts
+++ b/packages/backend/src/server/ServerService.ts
@@ -9,6 +9,7 @@ import { fileURLToPath } from 'node:url';
import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
import Fastify, { FastifyInstance } from 'fastify';
import fastifyStatic from '@fastify/static';
+import fastifyRawBody from 'fastify-raw-body';
import { IsNull } from 'typeorm';
import { GlobalEventService } from '@/core/GlobalEventService.js';
import type { Config } from '@/config.js';
@@ -73,7 +74,7 @@ export class ServerService implements OnApplicationShutdown {
public async launch(): Promise {
const fastify = Fastify({
trustProxy: true,
- logger: !['production', 'test'].includes(process.env.NODE_ENV ?? ''),
+ logger: false,
});
this.#fastify = fastify;
@@ -86,6 +87,13 @@ export class ServerService implements OnApplicationShutdown {
});
}
+ // Register raw-body parser for ActivityPub HTTP signature validation.
+ await fastify.register(fastifyRawBody, {
+ global: false,
+ encoding: null,
+ runFirst: true,
+ });
+
// Register non-serving static server so that the child services can use reply.sendFile.
// `root` here is just a placeholder and each call must use its own `rootPath`.
fastify.register(fastifyStatic, {
@@ -111,8 +119,8 @@ export class ServerService implements OnApplicationShutdown {
return;
}
- const name = path.split('@')[0].replace('.webp', '');
- const host = path.split('@')[1]?.replace('.webp', '');
+ const name = path.split('@')[0].replace(/\.webp$/i, '');
+ const host = path.split('@')[1]?.replace(/\.webp$/i, '');
const emoji = await this.emojisRepository.findOneBy({
// `@.` is the spec of ReactionService.decodeReaction
@@ -199,10 +207,10 @@ export class ServerService implements OnApplicationShutdown {
includeSecrets: true,
}));
- reply.code(200);
- return 'Verify succeeded!';
+ reply.code(200).send('Verification succeeded! メールアドレスの認証に成功しました。');
+ return;
} else {
- reply.code(404);
+ reply.code(404).send('Verification failed. Please try again. メールアドレスの認証に失敗しました。もう一度お試しください');
return;
}
});
diff --git a/packages/backend/src/server/api/ApiCallService.ts b/packages/backend/src/server/api/ApiCallService.ts
index 085a0fd58a..66f171a5d8 100644
--- a/packages/backend/src/server/api/ApiCallService.ts
+++ b/packages/backend/src/server/api/ApiCallService.ts
@@ -318,8 +318,9 @@ export class ApiCallService implements OnApplicationShutdown {
}
if (ep.meta.requireRolePolicy != null && !user!.isRoot) {
+ const myRoles = await this.roleService.getUserRoles(user!.id);
const policies = await this.roleService.getUserPolicies(user!.id);
- if (!policies[ep.meta.requireRolePolicy]) {
+ if (!policies[ep.meta.requireRolePolicy] && !myRoles.some(r => r.isAdministrator)) {
throw new ApiError({
message: 'You are not assigned to a required role.',
code: 'ROLE_PERMISSION_DENIED',
diff --git a/packages/backend/src/server/api/EndpointsModule.ts b/packages/backend/src/server/api/EndpointsModule.ts
index f834561456..86a64d7121 100644
--- a/packages/backend/src/server/api/EndpointsModule.ts
+++ b/packages/backend/src/server/api/EndpointsModule.ts
@@ -10,6 +10,7 @@ import * as ep___admin_meta from './endpoints/admin/meta.js';
import * as ep___admin_abuseUserReports from './endpoints/admin/abuse-user-reports.js';
import * as ep___admin_accounts_create from './endpoints/admin/accounts/create.js';
import * as ep___admin_accounts_delete from './endpoints/admin/accounts/delete.js';
+import * as ep___admin_accounts_findByEmail from './endpoints/admin/accounts/find-by-email.js';
import * as ep___admin_ad_create from './endpoints/admin/ad/create.js';
import * as ep___admin_ad_delete from './endpoints/admin/ad/delete.js';
import * as ep___admin_ad_list from './endpoints/admin/ad/list.js';
@@ -18,7 +19,13 @@ import * as ep___admin_announcements_create from './endpoints/admin/announcement
import * as ep___admin_announcements_delete from './endpoints/admin/announcements/delete.js';
import * as ep___admin_announcements_list from './endpoints/admin/announcements/list.js';
import * as ep___admin_announcements_update from './endpoints/admin/announcements/update.js';
+import * as ep___admin_avatarDecorations_create from './endpoints/admin/avatar-decorations/create.js';
+import * as ep___admin_avatarDecorations_delete from './endpoints/admin/avatar-decorations/delete.js';
+import * as ep___admin_avatarDecorations_list from './endpoints/admin/avatar-decorations/list.js';
+import * as ep___admin_avatarDecorations_update from './endpoints/admin/avatar-decorations/update.js';
import * as ep___admin_deleteAllFilesOfAUser from './endpoints/admin/delete-all-files-of-a-user.js';
+import * as ep___admin_unsetUserAvatar from './endpoints/admin/unset-user-avatar.js';
+import * as ep___admin_unsetUserBanner from './endpoints/admin/unset-user-banner.js';
import * as ep___admin_drive_cleanRemoteFiles from './endpoints/admin/drive/clean-remote-files.js';
import * as ep___admin_drive_cleanup from './endpoints/admin/drive/cleanup.js';
import * as ep___admin_drive_files from './endpoints/admin/drive/files.js';
@@ -161,6 +168,7 @@ import * as ep___federation_stats from './endpoints/federation/stats.js';
import * as ep___following_create from './endpoints/following/create.js';
import * as ep___following_delete from './endpoints/following/delete.js';
import * as ep___following_update from './endpoints/following/update.js';
+import * as ep___following_update_all from './endpoints/following/update-all.js';
import * as ep___following_invalidate from './endpoints/following/invalidate.js';
import * as ep___following_requests_accept from './endpoints/following/requests/accept.js';
import * as ep___following_requests_cancel from './endpoints/following/requests/cancel.js';
@@ -176,6 +184,7 @@ import * as ep___gallery_posts_show from './endpoints/gallery/posts/show.js';
import * as ep___gallery_posts_unlike from './endpoints/gallery/posts/unlike.js';
import * as ep___gallery_posts_update from './endpoints/gallery/posts/update.js';
import * as ep___getOnlineUsersCount from './endpoints/get-online-users-count.js';
+import * as ep___getAvatarDecorations from './endpoints/get-avatar-decorations.js';
import * as ep___hashtags_list from './endpoints/hashtags/list.js';
import * as ep___hashtags_search from './endpoints/hashtags/search.js';
import * as ep___hashtags_show from './endpoints/hashtags/show.js';
@@ -211,6 +220,7 @@ import * as ep___i_importMuting from './endpoints/i/import-muting.js';
import * as ep___i_importUserLists from './endpoints/i/import-user-lists.js';
import * as ep___i_importAntennas from './endpoints/i/import-antennas.js';
import * as ep___i_notifications from './endpoints/i/notifications.js';
+import * as ep___i_notificationsGrouped from './endpoints/i/notifications-grouped.js';
import * as ep___i_pageLikes from './endpoints/i/page-likes.js';
import * as ep___i_pages from './endpoints/i/pages.js';
import * as ep___i_pin from './endpoints/i/pin.js';
@@ -223,7 +233,7 @@ import * as ep___i_registry_get from './endpoints/i/registry/get.js';
import * as ep___i_registry_keysWithType from './endpoints/i/registry/keys-with-type.js';
import * as ep___i_registry_keys from './endpoints/i/registry/keys.js';
import * as ep___i_registry_remove from './endpoints/i/registry/remove.js';
-import * as ep___i_registry_scopes from './endpoints/i/registry/scopes.js';
+import * as ep___i_registry_scopesWithDomain from './endpoints/i/registry/scopes-with-domain.js';
import * as ep___i_registry_set from './endpoints/i/registry/set.js';
import * as ep___i_revokeToken from './endpoints/i/revoke-token.js';
import * as ep___i_signinHistory from './endpoints/i/signin-history.js';
@@ -351,6 +361,7 @@ import * as ep___users_show from './endpoints/users/show.js';
import * as ep___users_achievements from './endpoints/users/achievements.js';
import * as ep___users_updateMemo from './endpoints/users/update-memo.js';
import * as ep___fetchRss from './endpoints/fetch-rss.js';
+import * as ep___fetchExternalResources from './endpoints/fetch-external-resources.js';
import * as ep___retention from './endpoints/retention.js';
import { GetterService } from './GetterService.js';
import { ApiLoggerService } from './ApiLoggerService.js';
@@ -360,6 +371,7 @@ const $admin_meta: Provider = { provide: 'ep:admin/meta', useClass: ep___admin_m
const $admin_abuseUserReports: Provider = { provide: 'ep:admin/abuse-user-reports', useClass: ep___admin_abuseUserReports.default };
const $admin_accounts_create: Provider = { provide: 'ep:admin/accounts/create', useClass: ep___admin_accounts_create.default };
const $admin_accounts_delete: Provider = { provide: 'ep:admin/accounts/delete', useClass: ep___admin_accounts_delete.default };
+const $admin_accounts_findByEmail: Provider = { provide: 'ep:admin/accounts/find-by-email', useClass: ep___admin_accounts_findByEmail.default };
const $admin_ad_create: Provider = { provide: 'ep:admin/ad/create', useClass: ep___admin_ad_create.default };
const $admin_ad_delete: Provider = { provide: 'ep:admin/ad/delete', useClass: ep___admin_ad_delete.default };
const $admin_ad_list: Provider = { provide: 'ep:admin/ad/list', useClass: ep___admin_ad_list.default };
@@ -368,7 +380,13 @@ const $admin_announcements_create: Provider = { provide: 'ep:admin/announcements
const $admin_announcements_delete: Provider = { provide: 'ep:admin/announcements/delete', useClass: ep___admin_announcements_delete.default };
const $admin_announcements_list: Provider = { provide: 'ep:admin/announcements/list', useClass: ep___admin_announcements_list.default };
const $admin_announcements_update: Provider = { provide: 'ep:admin/announcements/update', useClass: ep___admin_announcements_update.default };
+const $admin_avatarDecorations_create: Provider = { provide: 'ep:admin/avatar-decorations/create', useClass: ep___admin_avatarDecorations_create.default };
+const $admin_avatarDecorations_delete: Provider = { provide: 'ep:admin/avatar-decorations/delete', useClass: ep___admin_avatarDecorations_delete.default };
+const $admin_avatarDecorations_list: Provider = { provide: 'ep:admin/avatar-decorations/list', useClass: ep___admin_avatarDecorations_list.default };
+const $admin_avatarDecorations_update: Provider = { provide: 'ep:admin/avatar-decorations/update', useClass: ep___admin_avatarDecorations_update.default };
const $admin_deleteAllFilesOfAUser: Provider = { provide: 'ep:admin/delete-all-files-of-a-user', useClass: ep___admin_deleteAllFilesOfAUser.default };
+const $admin_unsetUserAvatar: Provider = { provide: 'ep:admin/unset-user-avatar', useClass: ep___admin_unsetUserAvatar.default };
+const $admin_unsetUserBanner: Provider = { provide: 'ep:admin/unset-user-banner', useClass: ep___admin_unsetUserBanner.default };
const $admin_drive_cleanRemoteFiles: Provider = { provide: 'ep:admin/drive/clean-remote-files', useClass: ep___admin_drive_cleanRemoteFiles.default };
const $admin_drive_cleanup: Provider = { provide: 'ep:admin/drive/cleanup', useClass: ep___admin_drive_cleanup.default };
const $admin_drive_files: Provider = { provide: 'ep:admin/drive/files', useClass: ep___admin_drive_files.default };
@@ -511,6 +529,7 @@ const $federation_stats: Provider = { provide: 'ep:federation/stats', useClass:
const $following_create: Provider = { provide: 'ep:following/create', useClass: ep___following_create.default };
const $following_delete: Provider = { provide: 'ep:following/delete', useClass: ep___following_delete.default };
const $following_update: Provider = { provide: 'ep:following/update', useClass: ep___following_update.default };
+const $following_update_all: Provider = { provide: 'ep:following/update-all', useClass: ep___following_update_all.default };
const $following_invalidate: Provider = { provide: 'ep:following/invalidate', useClass: ep___following_invalidate.default };
const $following_requests_accept: Provider = { provide: 'ep:following/requests/accept', useClass: ep___following_requests_accept.default };
const $following_requests_cancel: Provider = { provide: 'ep:following/requests/cancel', useClass: ep___following_requests_cancel.default };
@@ -526,6 +545,7 @@ const $gallery_posts_show: Provider = { provide: 'ep:gallery/posts/show', useCla
const $gallery_posts_unlike: Provider = { provide: 'ep:gallery/posts/unlike', useClass: ep___gallery_posts_unlike.default };
const $gallery_posts_update: Provider = { provide: 'ep:gallery/posts/update', useClass: ep___gallery_posts_update.default };
const $getOnlineUsersCount: Provider = { provide: 'ep:get-online-users-count', useClass: ep___getOnlineUsersCount.default };
+const $getAvatarDecorations: Provider = { provide: 'ep:get-avatar-decorations', useClass: ep___getAvatarDecorations.default };
const $hashtags_list: Provider = { provide: 'ep:hashtags/list', useClass: ep___hashtags_list.default };
const $hashtags_search: Provider = { provide: 'ep:hashtags/search', useClass: ep___hashtags_search.default };
const $hashtags_show: Provider = { provide: 'ep:hashtags/show', useClass: ep___hashtags_show.default };
@@ -561,6 +581,7 @@ const $i_importMuting: Provider = { provide: 'ep:i/import-muting', useClass: ep_
const $i_importUserLists: Provider = { provide: 'ep:i/import-user-lists', useClass: ep___i_importUserLists.default };
const $i_importAntennas: Provider = { provide: 'ep:i/import-antennas', useClass: ep___i_importAntennas.default };
const $i_notifications: Provider = { provide: 'ep:i/notifications', useClass: ep___i_notifications.default };
+const $i_notificationsGrouped: Provider = { provide: 'ep:i/notifications-grouped', useClass: ep___i_notificationsGrouped.default };
const $i_pageLikes: Provider = { provide: 'ep:i/page-likes', useClass: ep___i_pageLikes.default };
const $i_pages: Provider = { provide: 'ep:i/pages', useClass: ep___i_pages.default };
const $i_pin: Provider = { provide: 'ep:i/pin', useClass: ep___i_pin.default };
@@ -573,7 +594,7 @@ const $i_registry_get: Provider = { provide: 'ep:i/registry/get', useClass: ep__
const $i_registry_keysWithType: Provider = { provide: 'ep:i/registry/keys-with-type', useClass: ep___i_registry_keysWithType.default };
const $i_registry_keys: Provider = { provide: 'ep:i/registry/keys', useClass: ep___i_registry_keys.default };
const $i_registry_remove: Provider = { provide: 'ep:i/registry/remove', useClass: ep___i_registry_remove.default };
-const $i_registry_scopes: Provider = { provide: 'ep:i/registry/scopes', useClass: ep___i_registry_scopes.default };
+const $i_registry_scopesWithDomain: Provider = { provide: 'ep:i/registry/scopes-with-domain', useClass: ep___i_registry_scopesWithDomain.default };
const $i_registry_set: Provider = { provide: 'ep:i/registry/set', useClass: ep___i_registry_set.default };
const $i_revokeToken: Provider = { provide: 'ep:i/revoke-token', useClass: ep___i_revokeToken.default };
const $i_signinHistory: Provider = { provide: 'ep:i/signin-history', useClass: ep___i_signinHistory.default };
@@ -701,6 +722,7 @@ const $users_show: Provider = { provide: 'ep:users/show', useClass: ep___users_s
const $users_achievements: Provider = { provide: 'ep:users/achievements', useClass: ep___users_achievements.default };
const $users_updateMemo: Provider = { provide: 'ep:users/update-memo', useClass: ep___users_updateMemo.default };
const $fetchRss: Provider = { provide: 'ep:fetch-rss', useClass: ep___fetchRss.default };
+const $fetchExternalResources: Provider = { provide: 'ep:fetch-external-resources', useClass: ep___fetchExternalResources.default };
const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention.default };
@Module({
@@ -714,6 +736,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$admin_abuseUserReports,
$admin_accounts_create,
$admin_accounts_delete,
+ $admin_accounts_findByEmail,
$admin_ad_create,
$admin_ad_delete,
$admin_ad_list,
@@ -722,7 +745,13 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$admin_announcements_delete,
$admin_announcements_list,
$admin_announcements_update,
+ $admin_avatarDecorations_create,
+ $admin_avatarDecorations_delete,
+ $admin_avatarDecorations_list,
+ $admin_avatarDecorations_update,
$admin_deleteAllFilesOfAUser,
+ $admin_unsetUserAvatar,
+ $admin_unsetUserBanner,
$admin_drive_cleanRemoteFiles,
$admin_drive_cleanup,
$admin_drive_files,
@@ -865,6 +894,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$following_create,
$following_delete,
$following_update,
+ $following_update_all,
$following_invalidate,
$following_requests_accept,
$following_requests_cancel,
@@ -880,6 +910,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$gallery_posts_unlike,
$gallery_posts_update,
$getOnlineUsersCount,
+ $getAvatarDecorations,
$hashtags_list,
$hashtags_search,
$hashtags_show,
@@ -915,6 +946,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$i_importUserLists,
$i_importAntennas,
$i_notifications,
+ $i_notificationsGrouped,
$i_pageLikes,
$i_pages,
$i_pin,
@@ -927,7 +959,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$i_registry_keysWithType,
$i_registry_keys,
$i_registry_remove,
- $i_registry_scopes,
+ $i_registry_scopesWithDomain,
$i_registry_set,
$i_revokeToken,
$i_signinHistory,
@@ -1055,6 +1087,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$users_achievements,
$users_updateMemo,
$fetchRss,
+ $fetchExternalResources,
$retention,
],
exports: [
@@ -1062,6 +1095,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$admin_abuseUserReports,
$admin_accounts_create,
$admin_accounts_delete,
+ $admin_accounts_findByEmail,
$admin_ad_create,
$admin_ad_delete,
$admin_ad_list,
@@ -1070,7 +1104,13 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$admin_announcements_delete,
$admin_announcements_list,
$admin_announcements_update,
+ $admin_avatarDecorations_create,
+ $admin_avatarDecorations_delete,
+ $admin_avatarDecorations_list,
+ $admin_avatarDecorations_update,
$admin_deleteAllFilesOfAUser,
+ $admin_unsetUserAvatar,
+ $admin_unsetUserBanner,
$admin_drive_cleanRemoteFiles,
$admin_drive_cleanup,
$admin_drive_files,
@@ -1213,6 +1253,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$following_create,
$following_delete,
$following_update,
+ $following_update_all,
$following_invalidate,
$following_requests_accept,
$following_requests_cancel,
@@ -1228,6 +1269,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$gallery_posts_unlike,
$gallery_posts_update,
$getOnlineUsersCount,
+ $getAvatarDecorations,
$hashtags_list,
$hashtags_search,
$hashtags_show,
@@ -1263,6 +1305,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$i_importUserLists,
$i_importAntennas,
$i_notifications,
+ $i_notificationsGrouped,
$i_pageLikes,
$i_pages,
$i_pin,
@@ -1275,7 +1318,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$i_registry_keysWithType,
$i_registry_keys,
$i_registry_remove,
- $i_registry_scopes,
+ $i_registry_scopesWithDomain,
$i_registry_set,
$i_revokeToken,
$i_signinHistory,
@@ -1400,6 +1443,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$users_achievements,
$users_updateMemo,
$fetchRss,
+ $fetchExternalResources,
$retention,
],
})
diff --git a/packages/backend/src/server/api/SigninApiService.ts b/packages/backend/src/server/api/SigninApiService.ts
index 150f3f24d4..f3115690fe 100644
--- a/packages/backend/src/server/api/SigninApiService.ts
+++ b/packages/backend/src/server/api/SigninApiService.ts
@@ -128,8 +128,7 @@ export class SigninApiService {
const fail = async (status?: number, failure?: { id: string }) => {
// Append signin history
await this.signinsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
userId: user.id,
ip: request.ip,
headers: request.headers as any,
diff --git a/packages/backend/src/server/api/SigninService.ts b/packages/backend/src/server/api/SigninService.ts
index cebba8c8ee..98e9027006 100644
--- a/packages/backend/src/server/api/SigninService.ts
+++ b/packages/backend/src/server/api/SigninService.ts
@@ -30,8 +30,7 @@ export class SigninService {
setImmediate(async () => {
// Append signin history
const record = await this.signinsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
userId: user.id,
ip: request.ip,
headers: request.headers as any,
diff --git a/packages/backend/src/server/api/SignupApiService.ts b/packages/backend/src/server/api/SignupApiService.ts
index 431df581b5..753984ef52 100644
--- a/packages/backend/src/server/api/SignupApiService.ts
+++ b/packages/backend/src/server/api/SignupApiService.ts
@@ -126,7 +126,7 @@ export class SignupApiService {
code: invitationCode,
});
- if (ticket == null) {
+ if (ticket == null || ticket.usedById != null) {
reply.code(400);
return;
}
@@ -136,7 +136,20 @@ export class SignupApiService {
return;
}
- if (ticket.usedAt) {
+ // メアド認証が有効の場合
+ if (instance.emailRequiredForSignup) {
+ // メアド認証済みならエラー
+ if (ticket.usedBy) {
+ reply.code(400);
+ return;
+ }
+
+ // 認証しておらず、メール送信から30分以内ならエラー
+ if (ticket.usedAt && ticket.usedAt.getTime() + (1000 * 60 * 30) > Date.now()) {
+ reply.code(400);
+ return;
+ }
+ } else if (ticket.usedAt) {
reply.code(400);
return;
}
@@ -164,8 +177,7 @@ export class SignupApiService {
const hash = await bcrypt.hash(password, salt);
const pendingUser = await this.userPendingsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
code,
email: emailAddress!,
username: username,
@@ -225,6 +237,10 @@ export class SignupApiService {
try {
const pendingUser = await this.userPendingsRepository.findOneByOrFail({ code });
+ if (this.idService.parse(pendingUser.id).date.getTime() + (1000 * 60 * 30) < Date.now()) {
+ throw new FastifyReplyError(400, 'EXPIRED');
+ }
+
const { account, secret } = await this.signupService.signup({
username: pendingUser.username,
passwordHash: pendingUser.password,
diff --git a/packages/backend/src/server/api/StreamingApiServerService.ts b/packages/backend/src/server/api/StreamingApiServerService.ts
index badcec1b33..dc3a00617c 100644
--- a/packages/backend/src/server/api/StreamingApiServerService.ts
+++ b/packages/backend/src/server/api/StreamingApiServerService.ts
@@ -15,6 +15,7 @@ import { bindThis } from '@/decorators.js';
import { CacheService } from '@/core/CacheService.js';
import { MiLocalUser } from '@/models/User.js';
import { UserService } from '@/core/UserService.js';
+import { ChannelFollowingService } from '@/core/ChannelFollowingService.js';
import { AuthenticateService, AuthenticationError } from './AuthenticateService.js';
import MainStreamConnection from './stream/Connection.js';
import { ChannelsService } from './stream/ChannelsService.js';
@@ -39,6 +40,7 @@ export class StreamingApiServerService {
private channelsService: ChannelsService,
private notificationService: NotificationService,
private usersService: UserService,
+ private channelFollowingService: ChannelFollowingService,
) {
}
@@ -93,6 +95,7 @@ export class StreamingApiServerService {
this.noteReadService,
this.notificationService,
this.cacheService,
+ this.channelFollowingService,
user, app,
);
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index d12a035afa..e458d720ab 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -10,6 +10,7 @@ import * as ep___admin_meta from './endpoints/admin/meta.js';
import * as ep___admin_abuseUserReports from './endpoints/admin/abuse-user-reports.js';
import * as ep___admin_accounts_create from './endpoints/admin/accounts/create.js';
import * as ep___admin_accounts_delete from './endpoints/admin/accounts/delete.js';
+import * as ep___admin_accounts_findByEmail from './endpoints/admin/accounts/find-by-email.js';
import * as ep___admin_ad_create from './endpoints/admin/ad/create.js';
import * as ep___admin_ad_delete from './endpoints/admin/ad/delete.js';
import * as ep___admin_ad_list from './endpoints/admin/ad/list.js';
@@ -18,7 +19,13 @@ import * as ep___admin_announcements_create from './endpoints/admin/announcement
import * as ep___admin_announcements_delete from './endpoints/admin/announcements/delete.js';
import * as ep___admin_announcements_list from './endpoints/admin/announcements/list.js';
import * as ep___admin_announcements_update from './endpoints/admin/announcements/update.js';
+import * as ep___admin_avatarDecorations_create from './endpoints/admin/avatar-decorations/create.js';
+import * as ep___admin_avatarDecorations_delete from './endpoints/admin/avatar-decorations/delete.js';
+import * as ep___admin_avatarDecorations_list from './endpoints/admin/avatar-decorations/list.js';
+import * as ep___admin_avatarDecorations_update from './endpoints/admin/avatar-decorations/update.js';
import * as ep___admin_deleteAllFilesOfAUser from './endpoints/admin/delete-all-files-of-a-user.js';
+import * as ep___admin_unsetUserAvatar from './endpoints/admin/unset-user-avatar.js';
+import * as ep___admin_unsetUserBanner from './endpoints/admin/unset-user-banner.js';
import * as ep___admin_drive_cleanRemoteFiles from './endpoints/admin/drive/clean-remote-files.js';
import * as ep___admin_drive_cleanup from './endpoints/admin/drive/cleanup.js';
import * as ep___admin_drive_files from './endpoints/admin/drive/files.js';
@@ -161,6 +168,7 @@ import * as ep___federation_stats from './endpoints/federation/stats.js';
import * as ep___following_create from './endpoints/following/create.js';
import * as ep___following_delete from './endpoints/following/delete.js';
import * as ep___following_update from './endpoints/following/update.js';
+import * as ep___following_update_all from './endpoints/following/update-all.js';
import * as ep___following_invalidate from './endpoints/following/invalidate.js';
import * as ep___following_requests_accept from './endpoints/following/requests/accept.js';
import * as ep___following_requests_cancel from './endpoints/following/requests/cancel.js';
@@ -176,6 +184,7 @@ import * as ep___gallery_posts_show from './endpoints/gallery/posts/show.js';
import * as ep___gallery_posts_unlike from './endpoints/gallery/posts/unlike.js';
import * as ep___gallery_posts_update from './endpoints/gallery/posts/update.js';
import * as ep___getOnlineUsersCount from './endpoints/get-online-users-count.js';
+import * as ep___getAvatarDecorations from './endpoints/get-avatar-decorations.js';
import * as ep___hashtags_list from './endpoints/hashtags/list.js';
import * as ep___hashtags_search from './endpoints/hashtags/search.js';
import * as ep___hashtags_show from './endpoints/hashtags/show.js';
@@ -211,6 +220,7 @@ import * as ep___i_importMuting from './endpoints/i/import-muting.js';
import * as ep___i_importUserLists from './endpoints/i/import-user-lists.js';
import * as ep___i_importAntennas from './endpoints/i/import-antennas.js';
import * as ep___i_notifications from './endpoints/i/notifications.js';
+import * as ep___i_notificationsGrouped from './endpoints/i/notifications-grouped.js';
import * as ep___i_pageLikes from './endpoints/i/page-likes.js';
import * as ep___i_pages from './endpoints/i/pages.js';
import * as ep___i_pin from './endpoints/i/pin.js';
@@ -223,7 +233,7 @@ import * as ep___i_registry_get from './endpoints/i/registry/get.js';
import * as ep___i_registry_keysWithType from './endpoints/i/registry/keys-with-type.js';
import * as ep___i_registry_keys from './endpoints/i/registry/keys.js';
import * as ep___i_registry_remove from './endpoints/i/registry/remove.js';
-import * as ep___i_registry_scopes from './endpoints/i/registry/scopes.js';
+import * as ep___i_registry_scopesWithDomain from './endpoints/i/registry/scopes-with-domain.js';
import * as ep___i_registry_set from './endpoints/i/registry/set.js';
import * as ep___i_revokeToken from './endpoints/i/revoke-token.js';
import * as ep___i_signinHistory from './endpoints/i/signin-history.js';
@@ -351,6 +361,7 @@ import * as ep___users_show from './endpoints/users/show.js';
import * as ep___users_achievements from './endpoints/users/achievements.js';
import * as ep___users_updateMemo from './endpoints/users/update-memo.js';
import * as ep___fetchRss from './endpoints/fetch-rss.js';
+import * as ep___fetchExternalResources from './endpoints/fetch-external-resources.js';
import * as ep___retention from './endpoints/retention.js';
const eps = [
@@ -358,6 +369,7 @@ const eps = [
['admin/abuse-user-reports', ep___admin_abuseUserReports],
['admin/accounts/create', ep___admin_accounts_create],
['admin/accounts/delete', ep___admin_accounts_delete],
+ ['admin/accounts/find-by-email', ep___admin_accounts_findByEmail],
['admin/ad/create', ep___admin_ad_create],
['admin/ad/delete', ep___admin_ad_delete],
['admin/ad/list', ep___admin_ad_list],
@@ -366,7 +378,13 @@ const eps = [
['admin/announcements/delete', ep___admin_announcements_delete],
['admin/announcements/list', ep___admin_announcements_list],
['admin/announcements/update', ep___admin_announcements_update],
+ ['admin/avatar-decorations/create', ep___admin_avatarDecorations_create],
+ ['admin/avatar-decorations/delete', ep___admin_avatarDecorations_delete],
+ ['admin/avatar-decorations/list', ep___admin_avatarDecorations_list],
+ ['admin/avatar-decorations/update', ep___admin_avatarDecorations_update],
['admin/delete-all-files-of-a-user', ep___admin_deleteAllFilesOfAUser],
+ ['admin/unset-user-avatar', ep___admin_unsetUserAvatar],
+ ['admin/unset-user-banner', ep___admin_unsetUserBanner],
['admin/drive/clean-remote-files', ep___admin_drive_cleanRemoteFiles],
['admin/drive/cleanup', ep___admin_drive_cleanup],
['admin/drive/files', ep___admin_drive_files],
@@ -509,6 +527,7 @@ const eps = [
['following/create', ep___following_create],
['following/delete', ep___following_delete],
['following/update', ep___following_update],
+ ['following/update-all', ep___following_update_all],
['following/invalidate', ep___following_invalidate],
['following/requests/accept', ep___following_requests_accept],
['following/requests/cancel', ep___following_requests_cancel],
@@ -524,6 +543,7 @@ const eps = [
['gallery/posts/unlike', ep___gallery_posts_unlike],
['gallery/posts/update', ep___gallery_posts_update],
['get-online-users-count', ep___getOnlineUsersCount],
+ ['get-avatar-decorations', ep___getAvatarDecorations],
['hashtags/list', ep___hashtags_list],
['hashtags/search', ep___hashtags_search],
['hashtags/show', ep___hashtags_show],
@@ -559,6 +579,7 @@ const eps = [
['i/import-user-lists', ep___i_importUserLists],
['i/import-antennas', ep___i_importAntennas],
['i/notifications', ep___i_notifications],
+ ['i/notifications-grouped', ep___i_notificationsGrouped],
['i/page-likes', ep___i_pageLikes],
['i/pages', ep___i_pages],
['i/pin', ep___i_pin],
@@ -571,7 +592,7 @@ const eps = [
['i/registry/keys-with-type', ep___i_registry_keysWithType],
['i/registry/keys', ep___i_registry_keys],
['i/registry/remove', ep___i_registry_remove],
- ['i/registry/scopes', ep___i_registry_scopes],
+ ['i/registry/scopes-with-domain', ep___i_registry_scopesWithDomain],
['i/registry/set', ep___i_registry_set],
['i/revoke-token', ep___i_revokeToken],
['i/signin-history', ep___i_signinHistory],
@@ -699,6 +720,7 @@ const eps = [
['users/achievements', ep___users_achievements],
['users/update-memo', ep___users_updateMemo],
['fetch-rss', ep___fetchRss],
+ ['fetch-external-resources', ep___fetchExternalResources],
['retention', ep___retention],
];
diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts b/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts
index be4fc82f0c..484118cd46 100644
--- a/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts
+++ b/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts
@@ -13,6 +13,8 @@ import { AbuseUserReportEntityService } from '@/core/entities/AbuseUserReportEnt
export const meta = {
tags: ['admin'],
+ kind: 'read:admin',
+
requireCredential: true,
requireModerator: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts
index 070e88f6f3..07f24d2995 100644
--- a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts
@@ -15,6 +15,8 @@ import { DI } from '@/di-symbols.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
res: {
type: 'object',
optional: false, nullable: false,
diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
index 60e928ccbe..86f4b0709b 100644
--- a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
@@ -14,6 +14,8 @@ import { UserEntityService } from '@/core/entities/UserEntityService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireAdmin: true,
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/find-by-email.ts b/packages/backend/src/server/api/endpoints/admin/accounts/find-by-email.ts
new file mode 100644
index 0000000000..bc292fd53a
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/admin/accounts/find-by-email.ts
@@ -0,0 +1,68 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import type { UserProfilesRepository } from '@/models/_.js';
+import { DI } from '@/di-symbols.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { ApiError } from '@/server/api/error.js';
+
+export const meta = {
+ tags: ['admin'],
+
+ kind: 'read:admin',
+
+ requireCredential: true,
+ requireAdmin: true,
+
+ errors: {
+ userNotFound: {
+ message: 'No such user who has the email address.',
+ code: 'USER_NOT_FOUND',
+ id: 'cb865949-8af5-4062-a88c-ef55e8786d1d',
+ },
+ },
+ res: {
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'User',
+ },
+} as const;
+
+export const paramDef = {
+ type: 'object',
+ properties: {
+ email: { type: 'string' },
+ },
+ required: ['email'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint { // eslint-disable-line import/no-default-export
+ constructor(
+ @Inject(DI.userProfilesRepository)
+ private userProfilesRepository: UserProfilesRepository,
+
+ private userEntityService: UserEntityService,
+ ) {
+ super(meta, paramDef, async (ps, me) => {
+ const profile = await this.userProfilesRepository.findOne({
+ where: { email: ps.email },
+ relations: ['user'],
+ });
+
+ if (profile == null) {
+ throw new ApiError(meta.errors.userNotFound);
+ }
+
+ const res = await this.userEntityService.pack(profile.user!, null, {
+ detail: true,
+ });
+
+ return res;
+ });
+ }
+}
diff --git a/packages/backend/src/server/api/endpoints/admin/ad/create.ts b/packages/backend/src/server/api/endpoints/admin/ad/create.ts
index e48dffecf4..087ae4befc 100644
--- a/packages/backend/src/server/api/endpoints/admin/ad/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/ad/create.ts
@@ -13,8 +13,16 @@ import { ModerationLogService } from '@/core/ModerationLogService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
+ res: {
+ type: 'object',
+ optional: false,
+ nullable: false,
+ ref: 'Ad',
+ },
} as const;
export const paramDef = {
@@ -44,8 +52,7 @@ export default class extends Endpoint { // eslint-
) {
super(meta, paramDef, async (ps, me) => {
const ad = await this.adsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
expiresAt: new Date(ps.expiresAt),
startsAt: new Date(ps.startsAt),
dayOfWeek: ps.dayOfWeek,
@@ -62,7 +69,18 @@ export default class extends Endpoint { // eslint-
ad: ad,
});
- return ad;
+ return {
+ id: ad.id,
+ expiresAt: ad.expiresAt.toISOString(),
+ startsAt: ad.startsAt.toISOString(),
+ dayOfWeek: ad.dayOfWeek,
+ url: ad.url,
+ imageUrl: ad.imageUrl,
+ priority: ad.priority,
+ ratio: ad.ratio,
+ place: ad.place,
+ memo: ad.memo,
+ };
});
}
}
diff --git a/packages/backend/src/server/api/endpoints/admin/ad/delete.ts b/packages/backend/src/server/api/endpoints/admin/ad/delete.ts
index 8097133a4c..ba655a6aa3 100644
--- a/packages/backend/src/server/api/endpoints/admin/ad/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/ad/delete.ts
@@ -13,6 +13,8 @@ import { ApiError } from '../../../error.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/ad/list.ts b/packages/backend/src/server/api/endpoints/admin/ad/list.ts
index 29eff89523..12528917dc 100644
--- a/packages/backend/src/server/api/endpoints/admin/ad/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/ad/list.ts
@@ -12,8 +12,21 @@ import { DI } from '@/di-symbols.js';
export const meta = {
tags: ['admin'],
+ kind: 'read:admin',
+
requireCredential: true,
requireModerator: true,
+ res: {
+ type: 'array',
+ optional: false,
+ nullable: false,
+ items: {
+ type: 'object',
+ optional: false,
+ nullable: false,
+ ref: 'Ad',
+ },
+ },
} as const;
export const paramDef = {
@@ -22,7 +35,7 @@ export const paramDef = {
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
sinceId: { type: 'string', format: 'misskey:id' },
untilId: { type: 'string', format: 'misskey:id' },
- publishing: { type: 'boolean', default: false },
+ publishing: { type: 'boolean', default: null, nullable: true },
},
required: [],
} as const;
@@ -37,12 +50,25 @@ export default class extends Endpoint { // eslint-
) {
super(meta, paramDef, async (ps, me) => {
const query = this.queryService.makePaginationQuery(this.adsRepository.createQueryBuilder('ad'), ps.sinceId, ps.untilId);
- if (ps.publishing) {
+ if (ps.publishing === true) {
query.andWhere('ad.expiresAt > :now', { now: new Date() }).andWhere('ad.startsAt <= :now', { now: new Date() });
+ } else if (ps.publishing === false) {
+ query.andWhere('ad.expiresAt <= :now', { now: new Date() }).orWhere('ad.startsAt > :now', { now: new Date() });
}
const ads = await query.limit(ps.limit).getMany();
- return ads;
+ return ads.map(ad => ({
+ id: ad.id,
+ expiresAt: ad.expiresAt.toISOString(),
+ startsAt: ad.startsAt.toISOString(),
+ dayOfWeek: ad.dayOfWeek,
+ url: ad.url,
+ imageUrl: ad.imageUrl,
+ memo: ad.memo,
+ place: ad.place,
+ priority: ad.priority,
+ ratio: ad.ratio,
+ }));
});
}
}
diff --git a/packages/backend/src/server/api/endpoints/admin/ad/update.ts b/packages/backend/src/server/api/endpoints/admin/ad/update.ts
index d065f9ec50..b83c163004 100644
--- a/packages/backend/src/server/api/endpoints/admin/ad/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/ad/update.ts
@@ -13,6 +13,8 @@ import { ApiError } from '../../../error.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/create.ts b/packages/backend/src/server/api/endpoints/admin/announcements/create.ts
index 262b36b9a4..fb432336e4 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/create.ts
@@ -10,6 +10,8 @@ import { AnnouncementService } from '@/core/AnnouncementService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
@@ -58,6 +60,7 @@ export const paramDef = {
icon: { type: 'string', enum: ['info', 'warning', 'error', 'success'], default: 'info' },
display: { type: 'string', enum: ['normal', 'banner', 'dialog'], default: 'normal' },
forExistingUsers: { type: 'boolean', default: false },
+ silence: { type: 'boolean', default: false },
needConfirmationToRead: { type: 'boolean', default: false },
userId: { type: 'string', format: 'misskey:id', nullable: true, default: null },
},
@@ -71,7 +74,6 @@ export default class extends Endpoint { // eslint-
) {
super(meta, paramDef, async (ps, me) => {
const { raw, packed } = await this.announcementService.create({
- createdAt: new Date(),
updatedAt: null,
title: ps.title,
text: ps.text,
@@ -79,6 +81,7 @@ export default class extends Endpoint { // eslint-
icon: ps.icon,
display: ps.display,
forExistingUsers: ps.forExistingUsers,
+ silence: ps.silence,
needConfirmationToRead: ps.needConfirmationToRead,
userId: ps.userId,
}, me);
diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts b/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts
index 80ec281253..e84e63c666 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts
@@ -13,6 +13,8 @@ import { ApiError } from '../../../error.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
index c82e702eef..e98ef0b169 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
@@ -9,10 +9,13 @@ import type { MiAnnouncement } from '@/models/Announcement.js';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { QueryService } from '@/core/QueryService.js';
import { DI } from '@/di-symbols.js';
+import { IdService } from '@/core/IdService.js';
export const meta = {
tags: ['admin'],
+ kind: 'read:admin',
+
requireCredential: true,
requireModerator: true,
@@ -81,9 +84,11 @@ export default class extends Endpoint { // eslint-
private announcementReadsRepository: AnnouncementReadsRepository,
private queryService: QueryService,
+ private idService: IdService,
) {
super(meta, paramDef, async (ps, me) => {
const query = this.queryService.makePaginationQuery(this.announcementsRepository.createQueryBuilder('announcement'), ps.sinceId, ps.untilId);
+ query.andWhere('announcement.isActive = true');
if (ps.userId) {
query.andWhere('announcement.userId = :userId', { userId: ps.userId });
} else {
@@ -102,7 +107,7 @@ export default class extends Endpoint { // eslint-
return announcements.map(announcement => ({
id: announcement.id,
- createdAt: announcement.createdAt.toISOString(),
+ createdAt: this.idService.parse(announcement.id).date.toISOString(),
updatedAt: announcement.updatedAt?.toISOString() ?? null,
title: announcement.title,
text: announcement.text,
@@ -111,6 +116,7 @@ export default class extends Endpoint { // eslint-
display: announcement.display,
isActive: announcement.isActive,
forExistingUsers: announcement.forExistingUsers,
+ silence: announcement.silence,
needConfirmationToRead: announcement.needConfirmationToRead,
userId: announcement.userId,
reads: reads.get(announcement)!,
diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts
index d36590c264..e2ec344899 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts
@@ -13,6 +13,8 @@ import { ApiError } from '../../../error.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
@@ -35,6 +37,7 @@ export const paramDef = {
icon: { type: 'string', enum: ['info', 'warning', 'error', 'success'] },
display: { type: 'string', enum: ['normal', 'banner', 'dialog'] },
forExistingUsers: { type: 'boolean' },
+ silence: { type: 'boolean' },
needConfirmationToRead: { type: 'boolean' },
isActive: { type: 'boolean' },
},
@@ -63,6 +66,7 @@ export default class extends Endpoint { // eslint-
display: ps.display,
icon: ps.icon,
forExistingUsers: ps.forExistingUsers,
+ silence: ps.silence,
needConfirmationToRead: ps.needConfirmationToRead,
isActive: ps.isActive,
}, me);
diff --git a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/create.ts b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/create.ts
new file mode 100644
index 0000000000..158435ed21
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/create.ts
@@ -0,0 +1,46 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { AvatarDecorationService } from '@/core/AvatarDecorationService.js';
+
+export const meta = {
+ tags: ['admin'],
+
+ kind: 'write:admin',
+
+ requireCredential: true,
+ requireRolePolicy: 'canManageAvatarDecorations',
+} as const;
+
+export const paramDef = {
+ type: 'object',
+ properties: {
+ name: { type: 'string', minLength: 1 },
+ description: { type: 'string' },
+ url: { type: 'string', minLength: 1 },
+ roleIdsThatCanBeUsedThisDecoration: { type: 'array', items: {
+ type: 'string',
+ } },
+ },
+ required: ['name', 'description', 'url'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint { // eslint-disable-line import/no-default-export
+ constructor(
+ private avatarDecorationService: AvatarDecorationService,
+ ) {
+ super(meta, paramDef, async (ps, me) => {
+ await this.avatarDecorationService.create({
+ name: ps.name,
+ description: ps.description,
+ url: ps.url,
+ roleIdsThatCanBeUsedThisDecoration: ps.roleIdsThatCanBeUsedThisDecoration,
+ }, me);
+ });
+ }
+}
diff --git a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/delete.ts b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/delete.ts
new file mode 100644
index 0000000000..06083cc180
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/delete.ts
@@ -0,0 +1,40 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { DI } from '@/di-symbols.js';
+import { AvatarDecorationService } from '@/core/AvatarDecorationService.js';
+import { ApiError } from '../../../error.js';
+
+export const meta = {
+ tags: ['admin'],
+
+ kind: 'write:admin',
+
+ requireCredential: true,
+ requireRolePolicy: 'canManageAvatarDecorations',
+ errors: {
+ },
+} as const;
+
+export const paramDef = {
+ type: 'object',
+ properties: {
+ id: { type: 'string', format: 'misskey:id' },
+ },
+ required: ['id'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint { // eslint-disable-line import/no-default-export
+ constructor(
+ private avatarDecorationService: AvatarDecorationService,
+ ) {
+ super(meta, paramDef, async (ps, me) => {
+ await this.avatarDecorationService.delete(ps.id, me);
+ });
+ }
+}
diff --git a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/list.ts b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/list.ts
new file mode 100644
index 0000000000..49a8718bce
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/list.ts
@@ -0,0 +1,103 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import type { AnnouncementsRepository, AnnouncementReadsRepository } from '@/models/_.js';
+import type { MiAnnouncement } from '@/models/Announcement.js';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { QueryService } from '@/core/QueryService.js';
+import { DI } from '@/di-symbols.js';
+import { IdService } from '@/core/IdService.js';
+import { AvatarDecorationService } from '@/core/AvatarDecorationService.js';
+
+export const meta = {
+ tags: ['admin'],
+
+ kind: 'read:admin',
+
+ requireCredential: true,
+ requireRolePolicy: 'canManageAvatarDecorations',
+
+ res: {
+ type: 'array',
+ optional: false, nullable: false,
+ items: {
+ type: 'object',
+ optional: false, nullable: false,
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ createdAt: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'date-time',
+ },
+ updatedAt: {
+ type: 'string',
+ optional: false, nullable: true,
+ format: 'date-time',
+ },
+ name: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ description: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ url: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ roleIdsThatCanBeUsedThisDecoration: {
+ type: 'array',
+ optional: false, nullable: false,
+ items: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ },
+ },
+ },
+ },
+} as const;
+
+export const paramDef = {
+ type: 'object',
+ properties: {
+ limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
+ sinceId: { type: 'string', format: 'misskey:id' },
+ untilId: { type: 'string', format: 'misskey:id' },
+ userId: { type: 'string', format: 'misskey:id', nullable: true },
+ },
+ required: [],
+} as const;
+
+@Injectable()
+export default class extends Endpoint { // eslint-disable-line import/no-default-export
+ constructor(
+ private avatarDecorationService: AvatarDecorationService,
+ private idService: IdService,
+ ) {
+ super(meta, paramDef, async (ps, me) => {
+ const avatarDecorations = await this.avatarDecorationService.getAll(true);
+
+ return avatarDecorations.map(avatarDecoration => ({
+ id: avatarDecoration.id,
+ createdAt: this.idService.parse(avatarDecoration.id).date.toISOString(),
+ updatedAt: avatarDecoration.updatedAt?.toISOString() ?? null,
+ name: avatarDecoration.name,
+ description: avatarDecoration.description,
+ url: avatarDecoration.url,
+ roleIdsThatCanBeUsedThisDecoration: avatarDecoration.roleIdsThatCanBeUsedThisDecoration,
+ }));
+ });
+ }
+}
diff --git a/packages/backend/src/server/api/endpoints/admin/avatar-decorations/update.ts b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/update.ts
new file mode 100644
index 0000000000..3d8f3d63de
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/admin/avatar-decorations/update.ts
@@ -0,0 +1,52 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { DI } from '@/di-symbols.js';
+import { AvatarDecorationService } from '@/core/AvatarDecorationService.js';
+import { ApiError } from '../../../error.js';
+
+export const meta = {
+ tags: ['admin'],
+
+ kind: 'write:admin',
+
+ requireCredential: true,
+ requireRolePolicy: 'canManageAvatarDecorations',
+
+ errors: {
+ },
+} as const;
+
+export const paramDef = {
+ type: 'object',
+ properties: {
+ id: { type: 'string', format: 'misskey:id' },
+ name: { type: 'string', minLength: 1 },
+ description: { type: 'string' },
+ url: { type: 'string', minLength: 1 },
+ roleIdsThatCanBeUsedThisDecoration: { type: 'array', items: {
+ type: 'string',
+ } },
+ },
+ required: ['id'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint { // eslint-disable-line import/no-default-export
+ constructor(
+ private avatarDecorationService: AvatarDecorationService,
+ ) {
+ super(meta, paramDef, async (ps, me) => {
+ await this.avatarDecorationService.update(ps.id, {
+ name: ps.name,
+ description: ps.description,
+ url: ps.url,
+ roleIdsThatCanBeUsedThisDecoration: ps.roleIdsThatCanBeUsedThisDecoration,
+ }, me);
+ });
+ }
+}
diff --git a/packages/backend/src/server/api/endpoints/admin/delete-account.ts b/packages/backend/src/server/api/endpoints/admin/delete-account.ts
index 9ef09b172e..adc446d14b 100644
--- a/packages/backend/src/server/api/endpoints/admin/delete-account.ts
+++ b/packages/backend/src/server/api/endpoints/admin/delete-account.ts
@@ -12,6 +12,8 @@ import { DI } from '@/di-symbols.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireAdmin: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts b/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts
index e47ecd81cf..1fdbbfb12e 100644
--- a/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts
@@ -12,6 +12,8 @@ import { DI } from '@/di-symbols.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireAdmin: true,
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/drive/clean-remote-files.ts b/packages/backend/src/server/api/endpoints/admin/drive/clean-remote-files.ts
index 8af44029c5..3f23319a5f 100644
--- a/packages/backend/src/server/api/endpoints/admin/drive/clean-remote-files.ts
+++ b/packages/backend/src/server/api/endpoints/admin/drive/clean-remote-files.ts
@@ -10,6 +10,8 @@ import { QueueService } from '@/core/QueueService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts b/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts
index 75d689966f..fd8fa46a47 100644
--- a/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts
+++ b/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts
@@ -13,6 +13,8 @@ import { DI } from '@/di-symbols.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/drive/files.ts b/packages/backend/src/server/api/endpoints/admin/drive/files.ts
index ac8a70e3da..816bbfbc45 100644
--- a/packages/backend/src/server/api/endpoints/admin/drive/files.ts
+++ b/packages/backend/src/server/api/endpoints/admin/drive/files.ts
@@ -13,6 +13,8 @@ import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.j
export const meta = {
tags: ['admin'],
+ kind: 'read:admin',
+
requireCredential: true,
requireModerator: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts b/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts
index 7fb5342f8d..61cb843558 100644
--- a/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts
+++ b/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts
@@ -8,11 +8,14 @@ import type { DriveFilesRepository, UsersRepository } from '@/models/_.js';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
import { RoleService } from '@/core/RoleService.js';
+import { IdService } from '@/core/IdService.js';
import { ApiError } from '../../../error.js';
export const meta = {
tags: ['admin'],
+ kind: 'read:admin',
+
requireCredential: true,
requireModerator: true,
@@ -163,6 +166,7 @@ export default class extends Endpoint { // eslint-
private usersRepository: UsersRepository,
private roleService: RoleService,
+ private idService: IdService,
) {
super(meta, paramDef, async (ps, me) => {
const file = ps.fileId ? await this.driveFilesRepository.findOneBy({ id: ps.fileId }) : await this.driveFilesRepository.findOne({
@@ -212,7 +216,7 @@ export default class extends Endpoint { // eslint-
type: file.type,
name: file.name,
md5: file.md5,
- createdAt: file.createdAt.toISOString(),
+ createdAt: this.idService.parse(file.id).date.toISOString(),
requestIp: iAmModerator ? file.requestIp : null,
requestHeaders: iAmModerator && !ownerIsModerator ? file.requestHeaders : null,
};
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts
index 66ee4cab3b..5333adb624 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts
@@ -10,6 +10,8 @@ import { CustomEmojiService } from '@/core/CustomEmojiService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireRolePolicy: 'canManageCustomEmojis',
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
index faab8ee608..76ff1c6b94 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
@@ -14,6 +14,8 @@ import { ApiError } from '../../../error.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireRolePolicy: 'canManageCustomEmojis',
@@ -29,6 +31,8 @@ export const meta = {
id: 'f7a3462c-4e6e-4069-8421-b9bd4f4c3975',
},
},
+
+ ref: 'EmojiDetailed',
} as const;
export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
index c5f986ff02..87260faa43 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
@@ -6,17 +6,18 @@
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import type { EmojisRepository } from '@/models/_.js';
-import { IdService } from '@/core/IdService.js';
import type { MiDriveFile } from '@/models/DriveFile.js';
import { DI } from '@/di-symbols.js';
import { DriveService } from '@/core/DriveService.js';
-import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { CustomEmojiService } from '@/core/CustomEmojiService.js';
import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
import { ApiError } from '../../../error.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireRolePolicy: 'canManageCustomEmojis',
@@ -26,6 +27,11 @@ export const meta = {
code: 'NO_SUCH_EMOJI',
id: 'e2785b66-dca3-4087-9cac-b93c541cc425',
},
+ duplicateName: {
+ message: 'Duplicate name.',
+ code: 'DUPLICATE_NAME',
+ id: 'f7a3462c-4e6e-4069-8421-b9bd4f4c3975',
+ },
},
res: {
@@ -56,15 +62,12 @@ export default class extends Endpoint { // eslint-
constructor(
@Inject(DI.emojisRepository)
private emojisRepository: EmojisRepository,
-
private emojiEntityService: EmojiEntityService,
- private idService: IdService,
- private globalEventService: GlobalEventService,
+ private customEmojiService: CustomEmojiService,
private driveService: DriveService,
) {
super(meta, paramDef, async (ps, me) => {
const emoji = await this.emojisRepository.findOneBy({ id: ps.emojiId });
-
if (emoji == null) {
throw new ApiError(meta.errors.noSuchEmoji);
}
@@ -75,28 +78,27 @@ export default class extends Endpoint { // eslint-
// Create file
driveFile = await this.driveService.uploadFromUrl({ url: emoji.originalUrl, user: null, force: true });
} catch (e) {
+ // TODO: need to return Drive Error
throw new ApiError();
}
- const copied = await this.emojisRepository.insert({
- id: this.idService.genId(),
- updatedAt: new Date(),
+ // Duplication Check
+ const isDuplicate = await this.customEmojiService.checkDuplicate(emoji.name);
+ if (isDuplicate) throw new ApiError(meta.errors.duplicateName);
+
+ const addedEmoji = await this.customEmojiService.add({
+ driveFile,
name: emoji.name,
+ category: emoji.category,
+ aliases: emoji.aliases,
host: null,
- aliases: [],
- originalUrl: driveFile.url,
- publicUrl: driveFile.webpublicUrl ?? driveFile.url,
- type: driveFile.webpublicType ?? driveFile.type,
license: emoji.license,
- }).then(x => this.emojisRepository.findOneByOrFail(x.identifiers[0]));
+ isSensitive: emoji.isSensitive,
+ localOnly: emoji.localOnly,
+ roleIdsThatCanBeUsedThisEmojiAsReaction: emoji.roleIdsThatCanBeUsedThisEmojiAsReaction,
+ }, me);
- this.globalEventService.publishBroadcastStream('emojiAdded', {
- emoji: await this.emojiEntityService.packDetailed(copied.id),
- });
-
- return {
- id: copied.id,
- };
+ return this.emojiEntityService.packDetailed(addedEmoji);
});
}
}
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts
index e6c1bf317f..c483794a40 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts
@@ -10,6 +10,8 @@ import { CustomEmojiService } from '@/core/CustomEmojiService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireRolePolicy: 'canManageCustomEmojis',
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
index 58aa0b9950..e15af7717b 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
@@ -10,6 +10,8 @@ import { CustomEmojiService } from '@/core/CustomEmojiService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireRolePolicy: 'canManageCustomEmojis',
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts b/packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts
index 208616c0ac..b75616f3cc 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts
@@ -8,7 +8,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
import { QueueService } from '@/core/QueueService.js';
export const meta = {
- secure: true,
+ kind: 'write:admin',
requireCredential: true,
requireRolePolicy: 'canManageCustomEmojis',
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
index 855ab8cd24..a383e09338 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
@@ -15,6 +15,8 @@ import { sqlLikeEscape } from '@/misc/sql-like-escape.js';
export const meta = {
tags: ['admin'],
+ kind: 'read:admin',
+
requireCredential: true,
requireRolePolicy: 'canManageCustomEmojis',
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
index ab16d86a3d..210b3639c3 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
@@ -15,6 +15,8 @@ import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
export const meta = {
tags: ['admin'],
+ kind: 'read:admin',
+
requireCredential: true,
requireRolePolicy: 'canManageCustomEmojis',
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts
index a5dd6d5e3a..8e92db1daf 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts
@@ -10,6 +10,8 @@ import { CustomEmojiService } from '@/core/CustomEmojiService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireRolePolicy: 'canManageCustomEmojis',
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts
index 515053f57b..5a06b5b32f 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts
@@ -10,6 +10,8 @@ import { CustomEmojiService } from '@/core/CustomEmojiService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireRolePolicy: 'canManageCustomEmojis',
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts
index 8e834ad1dd..b3e9c6df13 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts
@@ -10,6 +10,8 @@ import { CustomEmojiService } from '@/core/CustomEmojiService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireRolePolicy: 'canManageCustomEmojis',
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/set-license-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/set-license-bulk.ts
index 2dc9595a7e..c59d13ad16 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/set-license-bulk.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/set-license-bulk.ts
@@ -10,6 +10,8 @@ import { CustomEmojiService } from '@/core/CustomEmojiService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireRolePolicy: 'canManageCustomEmojis',
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
index 04226d8953..61d857b7b0 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
@@ -13,6 +13,8 @@ import { ApiError } from '../../../error.js';
export const meta = {
tags: ['admin'],
+ kind: 'read:admin',
+
requireCredential: true,
requireRolePolicy: 'canManageCustomEmojis',
diff --git a/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts b/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts
index b63f01bec3..b81297413c 100644
--- a/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts
+++ b/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts
@@ -12,6 +12,8 @@ import { DI } from '@/di-symbols.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts b/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts
index 6dbfe3c4f5..6cc4e3087f 100644
--- a/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts
+++ b/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts
@@ -13,6 +13,8 @@ import { DI } from '@/di-symbols.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts b/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts
index 36ea390e45..18884dfca6 100644
--- a/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts
+++ b/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts
@@ -12,6 +12,8 @@ import { QueueService } from '@/core/QueueService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
index 357bf83e87..4232d42ba5 100644
--- a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
+++ b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
@@ -14,6 +14,8 @@ import { ModerationLogService } from '@/core/ModerationLogService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts b/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts
index 4bd9e7de7f..b81d9857d7 100644
--- a/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts
+++ b/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts
@@ -12,7 +12,19 @@ export const meta = {
requireCredential: true,
requireAdmin: true,
+ kind: 'read:admin',
+
tags: ['admin'],
+ res: {
+ type: 'array',
+ items: {
+ type: 'object',
+ properties: {
+ tablename: { type: 'string' },
+ indexname: { type: 'string' },
+ },
+ },
+ },
} as const;
export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/admin/get-table-stats.ts b/packages/backend/src/server/api/endpoints/admin/get-table-stats.ts
index f953b889a3..c104f653ef 100644
--- a/packages/backend/src/server/api/endpoints/admin/get-table-stats.ts
+++ b/packages/backend/src/server/api/endpoints/admin/get-table-stats.ts
@@ -12,6 +12,8 @@ export const meta = {
requireCredential: true,
requireAdmin: true,
+ kind: 'read:admin',
+
tags: ['admin'],
res: {
diff --git a/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts b/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts
index cf94c998fa..76c32f2a9f 100644
--- a/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts
+++ b/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts
@@ -7,12 +7,34 @@ import { Inject, Injectable } from '@nestjs/common';
import type { UserIpsRepository } from '@/models/_.js';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
+import { IdService } from '@/core/IdService.js';
export const meta = {
tags: ['admin'],
+ kind: 'read:admin',
+
requireCredential: true,
requireModerator: true,
+ res: {
+ type: 'array',
+ optional: false,
+ nullable: false,
+ items: {
+ type: 'object',
+ optional: false,
+ nullable: false,
+ properties: {
+ ip: { type: 'string' },
+ createdAt: {
+ type: 'string',
+ optional: false,
+ nullable: false,
+ format: 'date-time',
+ },
+ },
+ },
+ }
} as const;
export const paramDef = {
@@ -28,11 +50,13 @@ export default class extends Endpoint { // eslint-
constructor(
@Inject(DI.userIpsRepository)
private userIpsRepository: UserIpsRepository,
+
+ private idService: IdService,
) {
super(meta, paramDef, async (ps, me) => {
const ips = await this.userIpsRepository.find({
where: { userId: ps.userId },
- order: { createdAt: 'DESC' },
+ order: { id: 'DESC' },
take: 30,
});
diff --git a/packages/backend/src/server/api/endpoints/admin/invite/create.ts b/packages/backend/src/server/api/endpoints/admin/invite/create.ts
index 2cc5ab6e35..96de772edc 100644
--- a/packages/backend/src/server/api/endpoints/admin/invite/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/invite/create.ts
@@ -16,6 +16,8 @@ import { ApiError } from '../../../error.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
@@ -33,13 +35,7 @@ export const meta = {
items: {
type: 'object',
optional: false, nullable: false,
- properties: {
- code: {
- type: 'string',
- optional: false, nullable: false,
- example: 'GR6S02ERUA5VR',
- },
- },
+ ref: 'InviteCode',
},
},
} as const;
@@ -72,8 +68,7 @@ export default class extends Endpoint { // eslint-
for (let i = 0; i < ps.count; i++) {
ticketsPromises.push(this.registrationTicketsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
expiresAt: ps.expiresAt ? new Date(ps.expiresAt) : null,
code: generateInviteCode(),
}).then(x => this.registrationTicketsRepository.findOneByOrFail(x.identifiers[0])));
diff --git a/packages/backend/src/server/api/endpoints/admin/invite/list.ts b/packages/backend/src/server/api/endpoints/admin/invite/list.ts
index a20a51121a..3b7dc72e11 100644
--- a/packages/backend/src/server/api/endpoints/admin/invite/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/invite/list.ts
@@ -12,6 +12,8 @@ import { DI } from '@/di-symbols.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
@@ -21,6 +23,7 @@ export const meta = {
items: {
type: 'object',
optional: false, nullable: false,
+ ref: 'InviteCode',
},
},
} as const;
@@ -56,8 +59,8 @@ export default class extends Endpoint { // eslint-
}
switch (ps.sort) {
- case '+createdAt': query.orderBy('ticket.createdAt', 'DESC'); break;
- case '-createdAt': query.orderBy('ticket.createdAt', 'ASC'); break;
+ case '+createdAt': query.orderBy('ticket.id', 'DESC'); break;
+ case '-createdAt': query.orderBy('ticket.id', 'ASC'); break;
case '+usedAt': query.orderBy('ticket.usedAt', 'DESC', 'NULLS LAST'); break;
case '-usedAt': query.orderBy('ticket.usedAt', 'ASC', 'NULLS FIRST'); break;
default: query.orderBy('ticket.id', 'DESC'); break;
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index ddca5b4709..6f8494d1d0 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -13,6 +13,8 @@ import { DEFAULT_POLICIES } from '@/core/RoleService.js';
export const meta = {
tags: ['meta'],
+ kind: 'read:admin',
+
requireCredential: true,
requireAdmin: true,
@@ -105,6 +107,16 @@ export const meta = {
type: 'boolean',
optional: false, nullable: false,
},
+ silencedHosts: {
+ type: 'array',
+ optional: true,
+ nullable: false,
+ items: {
+ type: 'string',
+ optional: false,
+ nullable: false,
+ },
+ },
pinnedUsers: {
type: 'array',
optional: false, nullable: false,
@@ -133,6 +145,14 @@ export const meta = {
type: 'string',
},
},
+ bannedEmailDomains: {
+ type: 'array',
+ optional: true, nullable: false,
+ items: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ },
preservedUsernames: {
type: 'array',
optional: false, nullable: false,
@@ -257,6 +277,14 @@ export const meta = {
type: 'boolean',
optional: false, nullable: false,
},
+ enableVerifymailApi: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ verifymailAuthKey: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
enableChartsForRemoteUser: {
type: 'boolean',
optional: false, nullable: false,
@@ -281,6 +309,14 @@ export const meta = {
type: 'object',
optional: false, nullable: false,
},
+ enableFanoutTimeline: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ enableFanoutTimelineDbFallback: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
perLocalUserUserTimelineCacheMax: {
type: 'number',
optional: false, nullable: false,
@@ -297,6 +333,86 @@ export const meta = {
type: 'number',
optional: false, nullable: false,
},
+ notesPerOneAd: {
+ type: 'number',
+ optional: false, nullable: false,
+ },
+ backgroundImageUrl: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ deeplAuthKey: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ deeplIsPro: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ defaultDarkTheme: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ defaultLightTheme: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ description: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ disableRegistration: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ impressumUrl: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ maintainerEmail: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ maintainerName: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ name: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ objectStorageS3ForcePathStyle: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
+ privacyPolicyUrl: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ repositoryUrl: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ summalyProxy: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ themeColor: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ tosUrl: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
+ uri: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ version: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
},
},
} as const;
@@ -363,6 +479,7 @@ export default class extends Endpoint { // eslint-
pinnedUsers: instance.pinnedUsers,
hiddenTags: instance.hiddenTags,
blockedHosts: instance.blockedHosts,
+ silencedHosts: instance.silencedHosts,
sensitiveWords: instance.sensitiveWords,
preservedUsernames: instance.preservedUsernames,
hcaptchaSecretKey: instance.hcaptchaSecretKey,
@@ -398,16 +515,22 @@ export default class extends Endpoint { // eslint-
deeplIsPro: instance.deeplIsPro,
enableIpLogging: instance.enableIpLogging,
enableActiveEmailValidation: instance.enableActiveEmailValidation,
+ enableVerifymailApi: instance.enableVerifymailApi,
+ verifymailAuthKey: instance.verifymailAuthKey,
enableChartsForRemoteUser: instance.enableChartsForRemoteUser,
enableChartsForFederatedInstances: instance.enableChartsForFederatedInstances,
enableServerMachineStats: instance.enableServerMachineStats,
enableIdenticonGeneration: instance.enableIdenticonGeneration,
+ bannedEmailDomains: instance.bannedEmailDomains,
policies: { ...DEFAULT_POLICIES, ...instance.policies },
manifestJsonOverride: instance.manifestJsonOverride,
+ enableFanoutTimeline: instance.enableFanoutTimeline,
+ enableFanoutTimelineDbFallback: instance.enableFanoutTimelineDbFallback,
perLocalUserUserTimelineCacheMax: instance.perLocalUserUserTimelineCacheMax,
perRemoteUserUserTimelineCacheMax: instance.perRemoteUserUserTimelineCacheMax,
perUserHomeTimelineCacheMax: instance.perUserHomeTimelineCacheMax,
perUserListTimelineCacheMax: instance.perUserListTimelineCacheMax,
+ notesPerOneAd: instance.notesPerOneAd,
};
});
}
diff --git a/packages/backend/src/server/api/endpoints/admin/promo/create.ts b/packages/backend/src/server/api/endpoints/admin/promo/create.ts
index 4061e1b5df..e2befec50f 100644
--- a/packages/backend/src/server/api/endpoints/admin/promo/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/promo/create.ts
@@ -13,6 +13,8 @@ import { ApiError } from '../../../error.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/clear.ts b/packages/backend/src/server/api/endpoints/admin/queue/clear.ts
index c9142e9885..1d565e8f24 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/clear.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/clear.ts
@@ -11,6 +11,8 @@ import { QueueService } from '@/core/QueueService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts b/packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts
index 1515ae4c74..30005fc666 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts
@@ -11,6 +11,8 @@ import type { DeliverQueue } from '@/core/QueueModule.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts b/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts
index febe0d07c6..aa8b6edee5 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts
@@ -11,6 +11,8 @@ import type { InboxQueue } from '@/core/QueueModule.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/promote.ts b/packages/backend/src/server/api/endpoints/admin/queue/promote.ts
index 0cba5b4e25..8f46cd6375 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/promote.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/promote.ts
@@ -11,6 +11,8 @@ import { QueueService } from '@/core/QueueService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/stats.ts b/packages/backend/src/server/api/endpoints/admin/queue/stats.ts
index 901195e9a5..1d92e2bf86 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/stats.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/stats.ts
@@ -10,6 +10,8 @@ import type { DbQueue, DeliverQueue, EndedPollNotificationQueue, InboxQueue, Obj
export const meta = {
tags: ['admin'],
+ kind: 'read:admin',
+
requireCredential: true,
requireModerator: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/relays/add.ts b/packages/backend/src/server/api/endpoints/admin/relays/add.ts
index b675db2b89..53b83560cf 100644
--- a/packages/backend/src/server/api/endpoints/admin/relays/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/relays/add.ts
@@ -12,6 +12,8 @@ import { ApiError } from '../../../error.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/relays/list.ts b/packages/backend/src/server/api/endpoints/admin/relays/list.ts
index 0633c57ed5..35c8e05487 100644
--- a/packages/backend/src/server/api/endpoints/admin/relays/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/relays/list.ts
@@ -10,6 +10,8 @@ import { RelayService } from '@/core/RelayService.js';
export const meta = {
tags: ['admin'],
+ kind: 'read:admin',
+
requireCredential: true,
requireModerator: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/relays/remove.ts b/packages/backend/src/server/api/endpoints/admin/relays/remove.ts
index 661b4243c4..fdc53cb708 100644
--- a/packages/backend/src/server/api/endpoints/admin/relays/remove.ts
+++ b/packages/backend/src/server/api/endpoints/admin/relays/remove.ts
@@ -10,6 +10,8 @@ import { RelayService } from '@/core/RelayService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/reset-password.ts b/packages/backend/src/server/api/endpoints/admin/reset-password.ts
index 13e9c30ed8..73bbd1f091 100644
--- a/packages/backend/src/server/api/endpoints/admin/reset-password.ts
+++ b/packages/backend/src/server/api/endpoints/admin/reset-password.ts
@@ -14,6 +14,8 @@ import { ModerationLogService } from '@/core/ModerationLogService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts b/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts
index fb5ac7a335..fb26c82a9d 100644
--- a/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts
+++ b/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts
@@ -15,6 +15,8 @@ import { ModerationLogService } from '@/core/ModerationLogService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/roles/assign.ts b/packages/backend/src/server/api/endpoints/admin/roles/assign.ts
index a0f3edd867..bbd4cfabbe 100644
--- a/packages/backend/src/server/api/endpoints/admin/roles/assign.ts
+++ b/packages/backend/src/server/api/endpoints/admin/roles/assign.ts
@@ -13,6 +13,8 @@ import { RoleService } from '@/core/RoleService.js';
export const meta = {
tags: ['admin', 'role'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/roles/create.ts b/packages/backend/src/server/api/endpoints/admin/roles/create.ts
index 8451b1955f..ac6085d921 100644
--- a/packages/backend/src/server/api/endpoints/admin/roles/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/roles/create.ts
@@ -11,8 +11,16 @@ import { RoleService } from '@/core/RoleService.js';
export const meta = {
tags: ['admin', 'role'],
+ kind: 'write:admin',
+
requireCredential: true,
requireAdmin: true,
+
+ res: {
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'Role',
+ },
} as const;
export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/admin/roles/delete.ts b/packages/backend/src/server/api/endpoints/admin/roles/delete.ts
index 7b989050eb..f60d6754a5 100644
--- a/packages/backend/src/server/api/endpoints/admin/roles/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/roles/delete.ts
@@ -13,6 +13,8 @@ import { RoleService } from '@/core/RoleService.js';
export const meta = {
tags: ['admin', 'role'],
+ kind: 'write:admin',
+
requireCredential: true,
requireAdmin: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/roles/list.ts b/packages/backend/src/server/api/endpoints/admin/roles/list.ts
index 3ed4b324dc..30917ce984 100644
--- a/packages/backend/src/server/api/endpoints/admin/roles/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/roles/list.ts
@@ -12,8 +12,20 @@ import { RoleEntityService } from '@/core/entities/RoleEntityService.js';
export const meta = {
tags: ['admin', 'role'],
+ kind: 'read:admin',
+
requireCredential: true,
requireModerator: true,
+
+ res: {
+ type: 'array',
+ optional: false, nullable: false,
+ items: {
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'Role',
+ },
+ },
} as const;
export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/admin/roles/show.ts b/packages/backend/src/server/api/endpoints/admin/roles/show.ts
index 5f0accab6f..91e32d95be 100644
--- a/packages/backend/src/server/api/endpoints/admin/roles/show.ts
+++ b/packages/backend/src/server/api/endpoints/admin/roles/show.ts
@@ -13,6 +13,8 @@ import { RoleEntityService } from '@/core/entities/RoleEntityService.js';
export const meta = {
tags: ['admin', 'role'],
+ kind: 'read:admin',
+
requireCredential: true,
requireModerator: true,
@@ -23,6 +25,12 @@ export const meta = {
id: '07dc7d34-c0d8-49b7-96c6-db3ce64ee0b3',
},
},
+
+ res: {
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'Role',
+ },
} as const;
export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts b/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts
index 4c27583111..701fea1ed5 100644
--- a/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts
+++ b/packages/backend/src/server/api/endpoints/admin/roles/unassign.ts
@@ -13,6 +13,8 @@ import { RoleService } from '@/core/RoleService.js';
export const meta = {
tags: ['admin', 'role'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/roles/update-default-policies.ts b/packages/backend/src/server/api/endpoints/admin/roles/update-default-policies.ts
index b4e7e29e90..066fc73234 100644
--- a/packages/backend/src/server/api/endpoints/admin/roles/update-default-policies.ts
+++ b/packages/backend/src/server/api/endpoints/admin/roles/update-default-policies.ts
@@ -11,6 +11,8 @@ import { MetaService } from '@/core/MetaService.js';
export const meta = {
tags: ['admin', 'role'],
+ kind: 'write:admin',
+
requireCredential: true,
requireAdmin: true,
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/roles/update.ts b/packages/backend/src/server/api/endpoints/admin/roles/update.ts
index 6031e2363e..6cfcd8ca4a 100644
--- a/packages/backend/src/server/api/endpoints/admin/roles/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/roles/update.ts
@@ -14,6 +14,8 @@ import { RoleService } from '@/core/RoleService.js';
export const meta = {
tags: ['admin', 'role'],
+ kind: 'write:admin',
+
requireCredential: true,
requireAdmin: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/roles/users.ts b/packages/backend/src/server/api/endpoints/admin/roles/users.ts
index b1772be777..6a0f7f9987 100644
--- a/packages/backend/src/server/api/endpoints/admin/roles/users.ts
+++ b/packages/backend/src/server/api/endpoints/admin/roles/users.ts
@@ -10,11 +10,14 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
import { QueryService } from '@/core/QueryService.js';
import { DI } from '@/di-symbols.js';
import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { IdService } from '@/core/IdService.js';
import { ApiError } from '../../../error.js';
export const meta = {
tags: ['admin', 'role', 'users'],
+ kind: 'read:admin',
+
requireCredential: false,
requireAdmin: true,
@@ -25,6 +28,20 @@ export const meta = {
id: '224eff5e-2488-4b18-b3e7-f50d94421648',
},
},
+
+ res: {
+ type: 'array',
+ items: {
+ type: 'object',
+ properties: {
+ id: { type: 'string', format: 'misskey:id' },
+ createdAt: { type: 'string', format: 'date-time' },
+ user: { ref: 'UserDetailed' },
+ expiresAt: { type: 'string', format: 'date-time', nullable: true },
+ },
+ required: ['id', 'createdAt', 'user'],
+ },
+ }
} as const;
export const paramDef = {
@@ -49,6 +66,7 @@ export default class extends Endpoint { // eslint-
private queryService: QueryService,
private userEntityService: UserEntityService,
+ private idService: IdService,
) {
super(meta, paramDef, async (ps, me) => {
const role = await this.rolesRepository.findOneBy({
@@ -61,9 +79,10 @@ export default class extends Endpoint { // eslint-
const query = this.queryService.makePaginationQuery(this.roleAssignmentsRepository.createQueryBuilder('assign'), ps.sinceId, ps.untilId)
.andWhere('assign.roleId = :roleId', { roleId: role.id })
- .andWhere(new Brackets(qb => { qb
- .where('assign.expiresAt IS NULL')
- .orWhere('assign.expiresAt > :now', { now: new Date() });
+ .andWhere(new Brackets(qb => {
+ qb
+ .where('assign.expiresAt IS NULL')
+ .orWhere('assign.expiresAt > :now', { now: new Date() });
}))
.innerJoinAndSelect('assign.user', 'user');
@@ -73,9 +92,9 @@ export default class extends Endpoint { // eslint-
return await Promise.all(assigns.map(async assign => ({
id: assign.id,
- createdAt: assign.createdAt,
+ createdAt: this.idService.parse(assign.id).date.toISOString(),
user: await this.userEntityService.pack(assign.user!, me, { detail: true }),
- expiresAt: assign.expiresAt,
+ expiresAt: assign.expiresAt?.toISOString() ?? null,
})));
});
}
diff --git a/packages/backend/src/server/api/endpoints/admin/send-email.ts b/packages/backend/src/server/api/endpoints/admin/send-email.ts
index b9f2c6a6f1..d22066909e 100644
--- a/packages/backend/src/server/api/endpoints/admin/send-email.ts
+++ b/packages/backend/src/server/api/endpoints/admin/send-email.ts
@@ -10,6 +10,8 @@ import { EmailService } from '@/core/EmailService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/server-info.ts b/packages/backend/src/server/api/endpoints/admin/server-info.ts
index 3169373b0e..d3c3bebff6 100644
--- a/packages/backend/src/server/api/endpoints/admin/server-info.ts
+++ b/packages/backend/src/server/api/endpoints/admin/server-info.ts
@@ -17,6 +17,8 @@ export const meta = {
tags: ['admin', 'meta'],
+ kind: 'read:admin',
+
res: {
type: 'object',
optional: false, nullable: false,
diff --git a/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts b/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts
index f87a5a3574..c82532ed67 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts
@@ -14,7 +14,9 @@ export const meta = {
tags: ['admin'],
requireCredential: true,
- requireModerator: true,
+ requireAdmin: true,
+
+ kind: 'read:admin',
res: {
type: 'array',
diff --git a/packages/backend/src/server/api/endpoints/admin/show-user.ts b/packages/backend/src/server/api/endpoints/admin/show-user.ts
index 0731413d05..f1e7b75a32 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-user.ts
@@ -9,6 +9,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
import { RoleService } from '@/core/RoleService.js';
import { RoleEntityService } from '@/core/entities/RoleEntityService.js';
+import { IdService } from '@/core/IdService.js';
export const meta = {
tags: ['admin'],
@@ -16,6 +17,8 @@ export const meta = {
requireCredential: true,
requireModerator: true,
+ kind: 'read:admin',
+
res: {
type: 'object',
nullable: false, optional: false,
@@ -44,6 +47,7 @@ export default class extends Endpoint { // eslint-
private roleService: RoleService,
private roleEntityService: RoleEntityService,
+ private idService: IdService,
) {
super(meta, paramDef, async (ps, me) => {
const [user, profile] = await Promise.all([
@@ -92,7 +96,7 @@ export default class extends Endpoint { // eslint-
policies: await this.roleService.getUserPolicies(user.id),
roles: await this.roleEntityService.packMany(roles, me),
roleAssigns: roleAssigns.map(a => ({
- createdAt: a.createdAt.toISOString(),
+ createdAt: this.idService.parse(a.id).date.toISOString(),
expiresAt: a.expiresAt ? a.expiresAt.toISOString() : null,
roleId: a.roleId,
})),
diff --git a/packages/backend/src/server/api/endpoints/admin/show-users.ts b/packages/backend/src/server/api/endpoints/admin/show-users.ts
index e89e1a1490..5081383687 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-users.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-users.ts
@@ -17,6 +17,8 @@ export const meta = {
requireCredential: true,
requireModerator: true,
+ kind: 'read:admin',
+
res: {
type: 'array',
nullable: false, optional: false,
@@ -99,8 +101,8 @@ export default class extends Endpoint { // eslint-
switch (ps.sort) {
case '+follower': query.orderBy('user.followersCount', 'DESC'); break;
case '-follower': query.orderBy('user.followersCount', 'ASC'); break;
- case '+createdAt': query.orderBy('user.createdAt', 'DESC'); break;
- case '-createdAt': query.orderBy('user.createdAt', 'ASC'); break;
+ case '+createdAt': query.orderBy('user.id', 'DESC'); break;
+ case '-createdAt': query.orderBy('user.id', 'ASC'); break;
case '+updatedAt': query.orderBy('user.updatedAt', 'DESC', 'NULLS LAST'); break;
case '-updatedAt': query.orderBy('user.updatedAt', 'ASC', 'NULLS FIRST'); break;
case '+lastActiveDate': query.orderBy('user.lastActiveDate', 'DESC', 'NULLS LAST'); break;
diff --git a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
index 9464f4b677..35c3f37481 100644
--- a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
@@ -19,6 +19,8 @@ import { QueueService } from '@/core/QueueService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/unset-user-avatar.ts b/packages/backend/src/server/api/endpoints/admin/unset-user-avatar.ts
new file mode 100644
index 0000000000..2309493937
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/admin/unset-user-avatar.ts
@@ -0,0 +1,62 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import type { UsersRepository } from '@/models/_.js';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { DI } from '@/di-symbols.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
+
+export const meta = {
+ tags: ['admin'],
+
+ kind: 'write:admin',
+
+ requireCredential: true,
+ requireModerator: true,
+} as const;
+
+export const paramDef = {
+ type: 'object',
+ properties: {
+ userId: { type: 'string', format: 'misskey:id' },
+ },
+ required: ['userId'],
+} as const;
+
+// eslint-disable-next-line import/no-default-export
+@Injectable()
+export default class extends Endpoint {
+ constructor(
+ @Inject(DI.usersRepository)
+ private usersRepository: UsersRepository,
+
+ private moderationLogService: ModerationLogService,
+ ) {
+ super(meta, paramDef, async (ps, me) => {
+ const user = await this.usersRepository.findOneBy({ id: ps.userId });
+
+ if (user == null) {
+ throw new Error('user not found');
+ }
+
+ if (user.avatarId == null) return;
+
+ await this.usersRepository.update(user.id, {
+ avatar: null,
+ avatarId: null,
+ avatarUrl: null,
+ avatarBlurhash: null,
+ });
+
+ this.moderationLogService.log(me, 'unsetUserAvatar', {
+ userId: user.id,
+ userUsername: user.username,
+ userHost: user.host,
+ fileId: user.avatarId,
+ });
+ });
+ }
+}
diff --git a/packages/backend/src/server/api/endpoints/admin/unset-user-banner.ts b/packages/backend/src/server/api/endpoints/admin/unset-user-banner.ts
new file mode 100644
index 0000000000..468c634e5b
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/admin/unset-user-banner.ts
@@ -0,0 +1,62 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import type { UsersRepository } from '@/models/_.js';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { DI } from '@/di-symbols.js';
+import { ModerationLogService } from '@/core/ModerationLogService.js';
+
+export const meta = {
+ tags: ['admin'],
+
+ kind: 'write:admin',
+
+ requireCredential: true,
+ requireModerator: true,
+} as const;
+
+export const paramDef = {
+ type: 'object',
+ properties: {
+ userId: { type: 'string', format: 'misskey:id' },
+ },
+ required: ['userId'],
+} as const;
+
+// eslint-disable-next-line import/no-default-export
+@Injectable()
+export default class extends Endpoint {
+ constructor(
+ @Inject(DI.usersRepository)
+ private usersRepository: UsersRepository,
+
+ private moderationLogService: ModerationLogService,
+ ) {
+ super(meta, paramDef, async (ps, me) => {
+ const user = await this.usersRepository.findOneBy({ id: ps.userId });
+
+ if (user == null) {
+ throw new Error('user not found');
+ }
+
+ if (user.bannerId == null) return;
+
+ await this.usersRepository.update(user.id, {
+ banner: null,
+ bannerId: null,
+ bannerUrl: null,
+ bannerBlurhash: null,
+ });
+
+ this.moderationLogService.log(me, 'unsetUserBanner', {
+ userId: user.id,
+ userUsername: user.username,
+ userHost: user.host,
+ fileId: user.bannerId,
+ });
+ });
+ }
+}
diff --git a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts
index 5e523bbc31..8cdd317eae 100644
--- a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts
@@ -13,6 +13,8 @@ import { DI } from '@/di-symbols.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
} as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
index ee7c564e23..5f9de0523e 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -12,6 +12,8 @@ import { MetaService } from '@/core/MetaService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireAdmin: true,
} as const;
@@ -20,18 +22,26 @@ export const paramDef = {
type: 'object',
properties: {
disableRegistration: { type: 'boolean', nullable: true },
- pinnedUsers: { type: 'array', nullable: true, items: {
- type: 'string',
- } },
- hiddenTags: { type: 'array', nullable: true, items: {
- type: 'string',
- } },
- blockedHosts: { type: 'array', nullable: true, items: {
- type: 'string',
- } },
- sensitiveWords: { type: 'array', nullable: true, items: {
- type: 'string',
- } },
+ pinnedUsers: {
+ type: 'array', nullable: true, items: {
+ type: 'string',
+ },
+ },
+ hiddenTags: {
+ type: 'array', nullable: true, items: {
+ type: 'string',
+ },
+ },
+ blockedHosts: {
+ type: 'array', nullable: true, items: {
+ type: 'string',
+ },
+ },
+ sensitiveWords: {
+ type: 'array', nullable: true, items: {
+ type: 'string',
+ },
+ },
themeColor: { type: 'string', nullable: true, pattern: '^#[0-9a-fA-F]{6}$' },
mascotImageUrl: { type: 'string', nullable: true },
bannerUrl: { type: 'string', nullable: true },
@@ -67,9 +77,11 @@ export const paramDef = {
proxyAccountId: { type: 'string', format: 'misskey:id', nullable: true },
maintainerName: { type: 'string', nullable: true },
maintainerEmail: { type: 'string', nullable: true },
- langs: { type: 'array', items: {
- type: 'string',
- } },
+ langs: {
+ type: 'array', items: {
+ type: 'string',
+ },
+ },
summalyProxy: { type: 'string', nullable: true },
deeplAuthKey: { type: 'string', nullable: true },
deeplIsPro: { type: 'boolean' },
@@ -86,8 +98,8 @@ export const paramDef = {
tosUrl: { type: 'string', nullable: true },
repositoryUrl: { type: 'string' },
feedbackUrl: { type: 'string' },
- impressumUrl: { type: 'string' },
- privacyPolicyUrl: { type: 'string' },
+ impressumUrl: { type: 'string', nullable: true },
+ privacyPolicyUrl: { type: 'string', nullable: true },
useObjectStorage: { type: 'boolean' },
objectStorageBaseUrl: { type: 'string', nullable: true },
objectStorageBucket: { type: 'string', nullable: true },
@@ -103,17 +115,30 @@ export const paramDef = {
objectStorageS3ForcePathStyle: { type: 'boolean' },
enableIpLogging: { type: 'boolean' },
enableActiveEmailValidation: { type: 'boolean' },
+ enableVerifymailApi: { type: 'boolean' },
+ verifymailAuthKey: { type: 'string', nullable: true },
enableChartsForRemoteUser: { type: 'boolean' },
enableChartsForFederatedInstances: { type: 'boolean' },
enableServerMachineStats: { type: 'boolean' },
enableIdenticonGeneration: { type: 'boolean' },
serverRules: { type: 'array', items: { type: 'string' } },
+ bannedEmailDomains: { type: 'array', items: { type: 'string' } },
preservedUsernames: { type: 'array', items: { type: 'string' } },
manifestJsonOverride: { type: 'string' },
+ enableFanoutTimeline: { type: 'boolean' },
+ enableFanoutTimelineDbFallback: { type: 'boolean' },
perLocalUserUserTimelineCacheMax: { type: 'integer' },
perRemoteUserUserTimelineCacheMax: { type: 'integer' },
perUserHomeTimelineCacheMax: { type: 'integer' },
perUserListTimelineCacheMax: { type: 'integer' },
+ notesPerOneAd: { type: 'integer' },
+ silencedHosts: {
+ type: 'array',
+ nullable: true,
+ items: {
+ type: 'string',
+ },
+ },
},
required: [],
} as const;
@@ -146,7 +171,14 @@ export default class extends Endpoint { // eslint-
if (Array.isArray(ps.sensitiveWords)) {
set.sensitiveWords = ps.sensitiveWords.filter(Boolean);
}
-
+ if (Array.isArray(ps.silencedHosts)) {
+ let lastValue = '';
+ set.silencedHosts = ps.silencedHosts.sort().filter((h) => {
+ const lv = lastValue;
+ lastValue = h;
+ return h !== '' && h !== lv && !set.blockedHosts?.includes(h);
+ });
+ }
if (ps.themeColor !== undefined) {
set.themeColor = ps.themeColor;
}
@@ -427,6 +459,18 @@ export default class extends Endpoint { // eslint-
set.enableActiveEmailValidation = ps.enableActiveEmailValidation;
}
+ if (ps.enableVerifymailApi !== undefined) {
+ set.enableVerifymailApi = ps.enableVerifymailApi;
+ }
+
+ if (ps.verifymailAuthKey !== undefined) {
+ if (ps.verifymailAuthKey === '') {
+ set.verifymailAuthKey = null;
+ } else {
+ set.verifymailAuthKey = ps.verifymailAuthKey;
+ }
+ }
+
if (ps.enableChartsForRemoteUser !== undefined) {
set.enableChartsForRemoteUser = ps.enableChartsForRemoteUser;
}
@@ -455,6 +499,14 @@ export default class extends Endpoint { // eslint-
set.manifestJsonOverride = ps.manifestJsonOverride;
}
+ if (ps.enableFanoutTimeline !== undefined) {
+ set.enableFanoutTimeline = ps.enableFanoutTimeline;
+ }
+
+ if (ps.enableFanoutTimelineDbFallback !== undefined) {
+ set.enableFanoutTimelineDbFallback = ps.enableFanoutTimelineDbFallback;
+ }
+
if (ps.perLocalUserUserTimelineCacheMax !== undefined) {
set.perLocalUserUserTimelineCacheMax = ps.perLocalUserUserTimelineCacheMax;
}
@@ -471,6 +523,14 @@ export default class extends Endpoint { // eslint-
set.perUserListTimelineCacheMax = ps.perUserListTimelineCacheMax;
}
+ if (ps.notesPerOneAd !== undefined) {
+ set.notesPerOneAd = ps.notesPerOneAd;
+ }
+
+ if (ps.bannedEmailDomains !== undefined) {
+ set.bannedEmailDomains = ps.bannedEmailDomains;
+ }
+
const before = await this.metaService.fetch(true);
await this.metaService.update(set);
diff --git a/packages/backend/src/server/api/endpoints/admin/update-user-note.ts b/packages/backend/src/server/api/endpoints/admin/update-user-note.ts
index bfccc2a2a5..dd0b777373 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-user-note.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-user-note.ts
@@ -12,6 +12,8 @@ import { ModerationLogService } from '@/core/ModerationLogService.js';
export const meta = {
tags: ['admin'],
+ kind: 'write:admin',
+
requireCredential: true,
requireModerator: true,
} as const;
diff --git a/packages/backend/src/server/api/endpoints/antennas/create.ts b/packages/backend/src/server/api/endpoints/antennas/create.ts
index 15fca4904d..b029493d3a 100644
--- a/packages/backend/src/server/api/endpoints/antennas/create.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/create.ts
@@ -63,6 +63,7 @@ export const paramDef = {
type: 'string',
} },
caseSensitive: { type: 'boolean' },
+ localOnly: { type: 'boolean' },
withReplies: { type: 'boolean' },
withFile: { type: 'boolean' },
notify: { type: 'boolean' },
@@ -112,8 +113,7 @@ export default class extends Endpoint { // eslint-
const now = new Date();
const antenna = await this.antennasRepository.insert({
- id: this.idService.genId(),
- createdAt: now,
+ id: this.idService.gen(now.getTime()),
lastUsedAt: now,
userId: me.id,
name: ps.name,
@@ -123,6 +123,7 @@ export default class extends Endpoint { // eslint-
excludeKeywords: ps.excludeKeywords,
users: ps.users,
caseSensitive: ps.caseSensitive,
+ localOnly: ps.localOnly,
withReplies: ps.withReplies,
withFile: ps.withFile,
notify: ps.notify,
diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts
index b563f704a8..0bf2688b4a 100644
--- a/packages/backend/src/server/api/endpoints/antennas/notes.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts
@@ -12,6 +12,8 @@ import { NoteReadService } from '@/core/NoteReadService.js';
import { DI } from '@/di-symbols.js';
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
import { IdService } from '@/core/IdService.js';
+import { FanoutTimelineService } from '@/core/FanoutTimelineService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
import { ApiError } from '../../error.js';
export const meta = {
@@ -69,8 +71,13 @@ export default class extends Endpoint { // eslint-
private noteEntityService: NoteEntityService,
private queryService: QueryService,
private noteReadService: NoteReadService,
+ private fanoutTimelineService: FanoutTimelineService,
+ private globalEventService: GlobalEventService,
) {
super(meta, paramDef, async (ps, me) => {
+ const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
+ const sinceId = ps.sinceId ?? (ps.sinceDate ? this.idService.gen(ps.sinceDate!) : null);
+
const antenna = await this.antennasRepository.findOneBy({
id: ps.antennaId,
userId: me.id,
@@ -80,20 +87,19 @@ export default class extends Endpoint { // eslint-
throw new ApiError(meta.errors.noSuchAntenna);
}
- this.antennasRepository.update(antenna.id, {
- isActive: true,
- lastUsedAt: new Date(),
- });
+ // falseだった場合はアンテナの配信先が増えたことを通知したい
+ const needPublishEvent = !antenna.isActive;
- const limit = ps.limit + (ps.untilId ? 1 : 0) + (ps.sinceId ? 1 : 0); // untilIdに指定したものも含まれるため+1
+ antenna.isActive = true;
+ antenna.lastUsedAt = new Date();
+ this.antennasRepository.update(antenna.id, antenna);
- const noteIds = await this.redisForTimelines.xrevrange(
- `antennaTimeline:${antenna.id}`,
- ps.untilId ? this.idService.parse(ps.untilId).date.getTime() : ps.untilDate ?? '+',
- ps.sinceId ? this.idService.parse(ps.sinceId).date.getTime() : ps.sinceDate ?? '-',
- 'COUNT', limit,
- ).then(res => res.map(x => x[1][1]).filter(x => x !== ps.untilId && x !== ps.sinceId));
+ if (needPublishEvent) {
+ this.globalEventService.publishInternalEvent('antennaUpdated', antenna);
+ }
+ let noteIds = await this.fanoutTimelineService.get(`antennaTimeline:${antenna.id}`, untilId, sinceId);
+ noteIds = noteIds.slice(0, ps.limit);
if (noteIds.length === 0) {
return [];
}
@@ -111,7 +117,11 @@ export default class extends Endpoint { // eslint-
this.queryService.generateBlockedUserQuery(query, me);
const notes = await query.getMany();
- notes.sort((a, b) => a.id > b.id ? -1 : 1);
+ if (sinceId != null && untilId == null) {
+ notes.sort((a, b) => a.id < b.id ? -1 : 1);
+ } else {
+ notes.sort((a, b) => a.id > b.id ? -1 : 1);
+ }
if (notes.length > 0) {
this.noteReadService.read(me.id, notes);
diff --git a/packages/backend/src/server/api/endpoints/antennas/update.ts b/packages/backend/src/server/api/endpoints/antennas/update.ts
index 0e98746881..3457bb6f66 100644
--- a/packages/backend/src/server/api/endpoints/antennas/update.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/update.ts
@@ -62,6 +62,7 @@ export const paramDef = {
type: 'string',
} },
caseSensitive: { type: 'boolean' },
+ localOnly: { type: 'boolean' },
withReplies: { type: 'boolean' },
withFile: { type: 'boolean' },
notify: { type: 'boolean' },
@@ -116,6 +117,7 @@ export default class extends Endpoint { // eslint-
excludeKeywords: ps.excludeKeywords,
users: ps.users,
caseSensitive: ps.caseSensitive,
+ localOnly: ps.localOnly,
withReplies: ps.withReplies,
withFile: ps.withFile,
notify: ps.notify,
diff --git a/packages/backend/src/server/api/endpoints/app/create.ts b/packages/backend/src/server/api/endpoints/app/create.ts
index cb00221506..f89d9823ba 100644
--- a/packages/backend/src/server/api/endpoints/app/create.ts
+++ b/packages/backend/src/server/api/endpoints/app/create.ts
@@ -55,8 +55,7 @@ export default class extends Endpoint { // eslint-
// Create account
const app = await this.appsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
userId: me ? me.id : null,
name: ps.name,
description: ps.description,
diff --git a/packages/backend/src/server/api/endpoints/auth/accept.ts b/packages/backend/src/server/api/endpoints/auth/accept.ts
index 1b1893fd94..e0baeb3565 100644
--- a/packages/backend/src/server/api/endpoints/auth/accept.ts
+++ b/packages/backend/src/server/api/endpoints/auth/accept.ts
@@ -80,8 +80,7 @@ export default class extends Endpoint { // eslint-
const now = new Date();
await this.accessTokensRepository.insert({
- id: this.idService.genId(),
- createdAt: now,
+ id: this.idService.gen(now.getTime()),
lastUsedAt: now,
appId: session.appId,
userId: me.id,
diff --git a/packages/backend/src/server/api/endpoints/auth/session/generate.ts b/packages/backend/src/server/api/endpoints/auth/session/generate.ts
index 8b6a2c213d..6e474c59e0 100644
--- a/packages/backend/src/server/api/endpoints/auth/session/generate.ts
+++ b/packages/backend/src/server/api/endpoints/auth/session/generate.ts
@@ -79,8 +79,7 @@ export default class extends Endpoint { // eslint-
// Create session token document
const doc = await this.authSessionsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
appId: app.id,
token: token,
}).then(x => this.authSessionsRepository.findOneByOrFail(x.identifiers[0]));
diff --git a/packages/backend/src/server/api/endpoints/channels/create.ts b/packages/backend/src/server/api/endpoints/channels/create.ts
index e72120e156..3dd1eddd01 100644
--- a/packages/backend/src/server/api/endpoints/channels/create.ts
+++ b/packages/backend/src/server/api/endpoints/channels/create.ts
@@ -50,6 +50,7 @@ export const paramDef = {
bannerId: { type: 'string', format: 'misskey:id', nullable: true },
color: { type: 'string', minLength: 1, maxLength: 16 },
isSensitive: { type: 'boolean', nullable: true },
+ allowRenoteToExternal: { type: 'boolean', nullable: true },
},
required: ['name'],
} as const;
@@ -80,14 +81,14 @@ export default class extends Endpoint { // eslint-
}
const channel = await this.channelsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
userId: me.id,
name: ps.name,
description: ps.description ?? null,
bannerId: banner ? banner.id : null,
isSensitive: ps.isSensitive ?? false,
...(ps.color !== undefined ? { color: ps.color } : {}),
+ allowRenoteToExternal: ps.allowRenoteToExternal ?? true,
} as MiChannel).then(x => this.channelsRepository.findOneByOrFail(x.identifiers[0]));
return await this.channelEntityService.pack(channel, me);
diff --git a/packages/backend/src/server/api/endpoints/channels/favorite.ts b/packages/backend/src/server/api/endpoints/channels/favorite.ts
index 1f78a86dd4..c175718919 100644
--- a/packages/backend/src/server/api/endpoints/channels/favorite.ts
+++ b/packages/backend/src/server/api/endpoints/channels/favorite.ts
@@ -57,8 +57,7 @@ export default class extends Endpoint { // eslint-
}
await this.channelFavoritesRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
userId: me.id,
channelId: channel.id,
});
diff --git a/packages/backend/src/server/api/endpoints/channels/follow.ts b/packages/backend/src/server/api/endpoints/channels/follow.ts
index 5a43e8be1b..bb5a477eb8 100644
--- a/packages/backend/src/server/api/endpoints/channels/follow.ts
+++ b/packages/backend/src/server/api/endpoints/channels/follow.ts
@@ -5,9 +5,9 @@
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { ChannelFollowingsRepository, ChannelsRepository } from '@/models/_.js';
-import { IdService } from '@/core/IdService.js';
+import type { ChannelsRepository } from '@/models/_.js';
import { DI } from '@/di-symbols.js';
+import { ChannelFollowingService } from '@/core/ChannelFollowingService.js';
import { ApiError } from '../../error.js';
export const meta = {
@@ -41,11 +41,7 @@ export default class extends Endpoint { // eslint-
constructor(
@Inject(DI.channelsRepository)
private channelsRepository: ChannelsRepository,
-
- @Inject(DI.channelFollowingsRepository)
- private channelFollowingsRepository: ChannelFollowingsRepository,
-
- private idService: IdService,
+ private channelFollowingService: ChannelFollowingService,
) {
super(meta, paramDef, async (ps, me) => {
const channel = await this.channelsRepository.findOneBy({
@@ -56,12 +52,7 @@ export default class extends Endpoint { // eslint-
throw new ApiError(meta.errors.noSuchChannel);
}
- await this.channelFollowingsRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
- followerId: me.id,
- followeeId: channel.id,
- });
+ await this.channelFollowingService.follow(me, channel);
});
}
}
diff --git a/packages/backend/src/server/api/endpoints/channels/search.ts b/packages/backend/src/server/api/endpoints/channels/search.ts
index 65df45706b..9c78a94844 100644
--- a/packages/backend/src/server/api/endpoints/channels/search.ts
+++ b/packages/backend/src/server/api/endpoints/channels/search.ts
@@ -55,9 +55,10 @@ export default class extends Endpoint { // eslint-
if (ps.query !== '') {
if (ps.type === 'nameAndDescription') {
- query.andWhere(new Brackets(qb => { qb
- .where('channel.name ILIKE :q', { q: `%${ sqlLikeEscape(ps.query) }%` })
- .orWhere('channel.description ILIKE :q', { q: `%${ sqlLikeEscape(ps.query) }%` });
+ query.andWhere(new Brackets(qb => {
+ qb
+ .where('channel.name ILIKE :q', { q: `%${ sqlLikeEscape(ps.query) }%` })
+ .orWhere('channel.description ILIKE :q', { q: `%${ sqlLikeEscape(ps.query) }%` });
}));
} else {
query.andWhere('channel.name ILIKE :q', { q: `%${ sqlLikeEscape(ps.query) }%` });
diff --git a/packages/backend/src/server/api/endpoints/channels/timeline.ts b/packages/backend/src/server/api/endpoints/channels/timeline.ts
index f0b14d4fd8..006228ceee 100644
--- a/packages/backend/src/server/api/endpoints/channels/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/channels/timeline.ts
@@ -4,14 +4,17 @@
*/
import { Inject, Injectable } from '@nestjs/common';
-import * as Redis from 'ioredis';
import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { ChannelsRepository, MiNote, NotesRepository } from '@/models/_.js';
+import type { ChannelsRepository, NotesRepository } from '@/models/_.js';
import { QueryService } from '@/core/QueryService.js';
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
import ActiveUsersChart from '@/core/chart/charts/active-users.js';
import { DI } from '@/di-symbols.js';
import { IdService } from '@/core/IdService.js';
+import { CacheService } from '@/core/CacheService.js';
+import { MetaService } from '@/core/MetaService.js';
+import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js';
+import { MiLocalUser } from '@/models/User.js';
import { ApiError } from '../../error.js';
export const meta = {
@@ -47,6 +50,7 @@ export const paramDef = {
untilId: { type: 'string', format: 'misskey:id' },
sinceDate: { type: 'integer' },
untilDate: { type: 'integer' },
+ allowPartial: { type: 'boolean', default: false }, // true is recommended but for compatibility false by default
},
required: ['channelId'],
} as const;
@@ -54,9 +58,6 @@ export const paramDef = {
@Injectable()
export default class extends Endpoint { // eslint-disable-line import/no-default-export
constructor(
- @Inject(DI.redisForTimelines)
- private redisForTimelines: Redis.Redis,
-
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
@@ -66,9 +67,17 @@ export default class extends Endpoint { // eslint-
private idService: IdService,
private noteEntityService: NoteEntityService,
private queryService: QueryService,
+ private fanoutTimelineEndpointService: FanoutTimelineEndpointService,
+ private cacheService: CacheService,
private activeUsersChart: ActiveUsersChart,
+ private metaService: MetaService,
) {
super(meta, paramDef, async (ps, me) => {
+ const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
+ const sinceId = ps.sinceId ?? (ps.sinceDate ? this.idService.gen(ps.sinceDate!) : null);
+
+ const serverSettings = await this.metaService.fetch();
+
const channel = await this.channelsRepository.findOneBy({
id: ps.channelId,
});
@@ -77,68 +86,50 @@ export default class extends Endpoint { // eslint-
throw new ApiError(meta.errors.noSuchChannel);
}
- let timeline: MiNote[] = [];
-
- const limit = ps.limit + (ps.untilId ? 1 : 0) + (ps.sinceId ? 1 : 0); // untilIdに指定したものも含まれるため+1
- let noteIdsRes: [string, string[]][] = [];
-
- if (!ps.sinceId && !ps.sinceDate) {
- noteIdsRes = await this.redisForTimelines.xrevrange(
- `channelTimeline:${channel.id}`,
- ps.untilId ? this.idService.parse(ps.untilId).date.getTime() : ps.untilDate ?? '+',
- ps.sinceId ? this.idService.parse(ps.sinceId).date.getTime() : ps.sinceDate ?? '-',
- 'COUNT', limit);
- }
-
- // redis から取得していないとき・取得数が足りないとき
- if (noteIdsRes.length < limit) {
- //#region Construct query
- const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
- .andWhere('note.channelId = :channelId', { channelId: channel.id })
- .innerJoinAndSelect('note.user', 'user')
- .leftJoinAndSelect('note.reply', 'reply')
- .leftJoinAndSelect('note.renote', 'renote')
- .leftJoinAndSelect('reply.user', 'replyUser')
- .leftJoinAndSelect('renote.user', 'renoteUser')
- .leftJoinAndSelect('note.channel', 'channel');
-
- if (me) {
- this.queryService.generateMutedUserQuery(query, me);
- this.queryService.generateBlockedUserQuery(query, me);
- }
- //#endregion
-
- timeline = await query.limit(ps.limit).getMany();
- } else {
- const noteIds = noteIdsRes.map(x => x[1][1]).filter(x => x !== ps.untilId && x !== ps.sinceId);
-
- if (noteIds.length === 0) {
- return [];
- }
-
- //#region Construct query
- const query = this.notesRepository.createQueryBuilder('note')
- .where('note.id IN (:...noteIds)', { noteIds: noteIds })
- .innerJoinAndSelect('note.user', 'user')
- .leftJoinAndSelect('note.reply', 'reply')
- .leftJoinAndSelect('note.renote', 'renote')
- .leftJoinAndSelect('reply.user', 'replyUser')
- .leftJoinAndSelect('renote.user', 'renoteUser')
- .leftJoinAndSelect('note.channel', 'channel');
-
- if (me) {
- this.queryService.generateMutedUserQuery(query, me);
- this.queryService.generateBlockedUserQuery(query, me);
- }
- //#endregion
-
- timeline = await query.getMany();
- timeline.sort((a, b) => a.id > b.id ? -1 : 1);
- }
-
if (me) this.activeUsersChart.read(me);
- return await this.noteEntityService.packMany(timeline, me);
+ if (!serverSettings.enableFanoutTimeline) {
+ return await this.noteEntityService.packMany(await this.getFromDb({ untilId, sinceId, limit: ps.limit, channelId: channel.id }, me), me);
+ }
+
+ return await this.fanoutTimelineEndpointService.timeline({
+ untilId,
+ sinceId,
+ limit: ps.limit,
+ allowPartial: ps.allowPartial,
+ me,
+ useDbFallback: true,
+ redisTimelines: [`channelTimeline:${channel.id}`],
+ excludePureRenotes: false,
+ dbFallback: async (untilId, sinceId, limit) => {
+ return await this.getFromDb({ untilId, sinceId, limit, channelId: channel.id }, me);
+ },
+ });
});
}
+
+ private async getFromDb(ps: {
+ untilId: string | null,
+ sinceId: string | null,
+ limit: number,
+ channelId: string
+ }, me: MiLocalUser | null) {
+ //#region fallback to database
+ const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId)
+ .andWhere('note.channelId = :channelId', { channelId: ps.channelId })
+ .innerJoinAndSelect('note.user', 'user')
+ .leftJoinAndSelect('note.reply', 'reply')
+ .leftJoinAndSelect('note.renote', 'renote')
+ .leftJoinAndSelect('reply.user', 'replyUser')
+ .leftJoinAndSelect('renote.user', 'renoteUser')
+ .leftJoinAndSelect('note.channel', 'channel');
+
+ if (me) {
+ this.queryService.generateMutedUserQuery(query, me);
+ this.queryService.generateBlockedUserQuery(query, me);
+ }
+ //#endregion
+
+ return await query.limit(ps.limit).getMany();
+ }
}
diff --git a/packages/backend/src/server/api/endpoints/channels/unfollow.ts b/packages/backend/src/server/api/endpoints/channels/unfollow.ts
index 46883dd548..c95332c7f8 100644
--- a/packages/backend/src/server/api/endpoints/channels/unfollow.ts
+++ b/packages/backend/src/server/api/endpoints/channels/unfollow.ts
@@ -5,8 +5,9 @@
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { ChannelFollowingsRepository, ChannelsRepository } from '@/models/_.js';
+import type { ChannelsRepository } from '@/models/_.js';
import { DI } from '@/di-symbols.js';
+import { ChannelFollowingService } from '@/core/ChannelFollowingService.js';
import { ApiError } from '../../error.js';
export const meta = {
@@ -40,9 +41,7 @@ export default class extends Endpoint { // eslint-
constructor(
@Inject(DI.channelsRepository)
private channelsRepository: ChannelsRepository,
-
- @Inject(DI.channelFollowingsRepository)
- private channelFollowingsRepository: ChannelFollowingsRepository,
+ private channelFollowingService: ChannelFollowingService,
) {
super(meta, paramDef, async (ps, me) => {
const channel = await this.channelsRepository.findOneBy({
@@ -53,10 +52,7 @@ export default class extends Endpoint { // eslint-
throw new ApiError(meta.errors.noSuchChannel);
}
- await this.channelFollowingsRepository.delete({
- followerId: me.id,
- followeeId: channel.id,
- });
+ await this.channelFollowingService.unfollow(me, channel);
});
}
}
diff --git a/packages/backend/src/server/api/endpoints/channels/update.ts b/packages/backend/src/server/api/endpoints/channels/update.ts
index ab69f62a7b..93d02e4a12 100644
--- a/packages/backend/src/server/api/endpoints/channels/update.ts
+++ b/packages/backend/src/server/api/endpoints/channels/update.ts
@@ -61,6 +61,7 @@ export const paramDef = {
},
color: { type: 'string', minLength: 1, maxLength: 16 },
isSensitive: { type: 'boolean', nullable: true },
+ allowRenoteToExternal: { type: 'boolean', nullable: true },
},
required: ['channelId'],
} as const;
@@ -115,6 +116,7 @@ export default class extends Endpoint { // eslint-
...(typeof ps.isArchived === 'boolean' ? { isArchived: ps.isArchived } : {}),
...(banner ? { bannerId: banner.id } : {}),
...(typeof ps.isSensitive === 'boolean' ? { isSensitive: ps.isSensitive } : {}),
+ ...(typeof ps.allowRenoteToExternal === 'boolean' ? { allowRenoteToExternal: ps.allowRenoteToExternal } : {}),
});
return await this.channelEntityService.pack(channel.id, me);
diff --git a/packages/backend/src/server/api/endpoints/clips/favorite.ts b/packages/backend/src/server/api/endpoints/clips/favorite.ts
index 6cd34f0a54..015b2cfa85 100644
--- a/packages/backend/src/server/api/endpoints/clips/favorite.ts
+++ b/packages/backend/src/server/api/endpoints/clips/favorite.ts
@@ -74,8 +74,7 @@ export default class extends Endpoint { // eslint-
}
await this.clipFavoritesRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
clipId: clip.id,
userId: me.id,
});
diff --git a/packages/backend/src/server/api/endpoints/drive/files.ts b/packages/backend/src/server/api/endpoints/drive/files.ts
index 6f3a62977f..b7e9d12e94 100644
--- a/packages/backend/src/server/api/endpoints/drive/files.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files.ts
@@ -69,8 +69,8 @@ export default class extends Endpoint { // eslint-
}
switch (ps.sort) {
- case '+createdAt': query.orderBy('file.createdAt', 'DESC'); break;
- case '-createdAt': query.orderBy('file.createdAt', 'ASC'); break;
+ case '+createdAt': query.orderBy('file.id', 'DESC'); break;
+ case '-createdAt': query.orderBy('file.id', 'ASC'); break;
case '+name': query.orderBy('file.name', 'DESC'); break;
case '-name': query.orderBy('file.name', 'ASC'); break;
case '+size': query.orderBy('file.size', 'DESC'); break;
diff --git a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts
index 779231a856..14a13b09c9 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts
@@ -6,6 +6,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import type { NotesRepository, DriveFilesRepository } from '@/models/_.js';
+import { QueryService } from '@/core/QueryService.js';
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
import { DI } from '@/di-symbols.js';
import { ApiError } from '../../../error.js';
@@ -41,6 +42,9 @@ export const meta = {
export const paramDef = {
type: 'object',
properties: {
+ sinceId: { type: 'string', format: 'misskey:id' },
+ untilId: { type: 'string', format: 'misskey:id' },
+ limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
fileId: { type: 'string', format: 'misskey:id' },
},
required: ['fileId'],
@@ -56,6 +60,7 @@ export default class extends Endpoint { // eslint-
private notesRepository: NotesRepository,
private noteEntityService: NoteEntityService,
+ private queryService: QueryService,
) {
super(meta, paramDef, async (ps, me) => {
// Fetch file
@@ -68,9 +73,10 @@ export default class extends Endpoint { // eslint-
throw new ApiError(meta.errors.noSuchFile);
}
- const notes = await this.notesRepository.createQueryBuilder('note')
- .where(':file = ANY(note.fileIds)', { file: file.id })
- .getMany();
+ const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId);
+ query.andWhere(':file = ANY(note.fileIds)', { file: file.id });
+
+ const notes = await query.limit(ps.limit).getMany();
return await this.noteEntityService.packMany(notes, me, {
detail: true,
diff --git a/packages/backend/src/server/api/endpoints/drive/folders/create.ts b/packages/backend/src/server/api/endpoints/drive/folders/create.ts
index bc3a9bbe21..d18199f19b 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/create.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/create.ts
@@ -76,8 +76,7 @@ export default class extends Endpoint { // eslint-
// Create folder
const folder = await this.driveFoldersRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
name: ps.name,
parentId: parent !== null ? parent.id : null,
userId: me.id,
diff --git a/packages/backend/src/server/api/endpoints/endpoint.ts b/packages/backend/src/server/api/endpoints/endpoint.ts
index cecaded20a..66ac8f664f 100644
--- a/packages/backend/src/server/api/endpoints/endpoint.ts
+++ b/packages/backend/src/server/api/endpoints/endpoint.ts
@@ -11,6 +11,23 @@ export const meta = {
requireCredential: false,
tags: ['meta'],
+
+ res: {
+ type: 'object',
+ nullable: true,
+ properties: {
+ params: {
+ type: 'array',
+ items: {
+ type: 'object',
+ properties: {
+ name: { type: 'string' },
+ type: { type: 'string' },
+ },
+ },
+ },
+ },
+ },
} as const;
export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts
index be73e5dbb8..e5a90715f5 100644
--- a/packages/backend/src/server/api/endpoints/federation/instances.ts
+++ b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -36,12 +36,32 @@ export const paramDef = {
blocked: { type: 'boolean', nullable: true },
notResponding: { type: 'boolean', nullable: true },
suspended: { type: 'boolean', nullable: true },
+ silenced: { type: 'boolean', nullable: true },
federating: { type: 'boolean', nullable: true },
subscribing: { type: 'boolean', nullable: true },
publishing: { type: 'boolean', nullable: true },
limit: { type: 'integer', minimum: 1, maximum: 100, default: 30 },
offset: { type: 'integer', default: 0 },
- sort: { type: 'string' },
+ sort: {
+ type: 'string',
+ nullable: true,
+ enum: [
+ '+pubSub',
+ '-pubSub',
+ '+notes',
+ '-notes',
+ '+users',
+ '-users',
+ '+following',
+ '-following',
+ '+followers',
+ '-followers',
+ '+firstRetrievedAt',
+ '-firstRetrievedAt',
+ '+latestRequestReceivedAt',
+ '-latestRequestReceivedAt',
+ ],
+ },
},
required: [],
} as const;
@@ -102,6 +122,23 @@ export default class extends Endpoint { // eslint-
}
}
+ if (typeof ps.silenced === 'boolean') {
+ const meta = await this.metaService.fetch(true);
+
+ if (ps.silenced) {
+ if (meta.silencedHosts.length === 0) {
+ return [];
+ }
+ query.andWhere('instance.host IN (:...silences)', {
+ silences: meta.silencedHosts,
+ });
+ } else if (meta.silencedHosts.length > 0) {
+ query.andWhere('instance.host NOT IN (:...silences)', {
+ silences: meta.silencedHosts,
+ });
+ }
+ }
+
if (typeof ps.federating === 'boolean') {
if (ps.federating) {
query.andWhere('((instance.followingCount > 0) OR (instance.followersCount > 0))');
diff --git a/packages/backend/src/server/api/endpoints/federation/show-instance.ts b/packages/backend/src/server/api/endpoints/federation/show-instance.ts
index 71eec11235..781c15e742 100644
--- a/packages/backend/src/server/api/endpoints/federation/show-instance.ts
+++ b/packages/backend/src/server/api/endpoints/federation/show-instance.ts
@@ -16,12 +16,9 @@ export const meta = {
requireCredential: false,
res: {
- oneOf: [{
- type: 'object',
- ref: 'FederationInstance',
- }, {
- type: 'null',
- }],
+ type: 'object',
+ optional: false, nullable: true,
+ ref: 'FederationInstance',
},
} as const;
diff --git a/packages/backend/src/server/api/endpoints/federation/stats.ts b/packages/backend/src/server/api/endpoints/federation/stats.ts
index e3ffea7b7e..6548142d41 100644
--- a/packages/backend/src/server/api/endpoints/federation/stats.ts
+++ b/packages/backend/src/server/api/endpoints/federation/stats.ts
@@ -18,6 +18,92 @@ export const meta = {
allowGet: true,
cacheSec: 60 * 60,
+
+ res: {
+ type: 'object',
+ optional: false,
+ nullable: false,
+ properties: {
+ topSubInstances: {
+ type: 'array',
+ optional: false,
+ nullable: false,
+ items: {
+ properties: {
+ id: { type: 'string' },
+ firstRetrievedAt: { type: 'string' },
+ host: { type: 'string' },
+ usersCount: { type: 'number' },
+ notesCount: { type: 'number' },
+ followingCount: { type: 'number' },
+ followersCount: { type: 'number' },
+ isNotResponding: { type: 'boolean' },
+ isSuspended: { type: 'boolean' },
+ isBlocked: { type: 'boolean' },
+ softwareName: { type: 'string' },
+ softwareVersion: { type: 'string' },
+ openRegistrations: { type: 'boolean' },
+ name: { type: 'string' },
+ description: { type: 'string' },
+ maintainerName: { type: 'string' },
+ maintainerEmail: { type: 'string' },
+ isSilenced: { type: 'boolean' },
+ iconUrl: { type: 'string' },
+ faviconUrl: { type: 'string' },
+ themeColor: { type: 'string' },
+ infoUpdatedAt: {
+ type: 'string',
+ nullable: true,
+ },
+ latestRequestReceivedAt: {
+ type: 'string',
+ nullable: true,
+ },
+ }
+ },
+ },
+ otherFollowersCount: { type: 'number' },
+ topPubInstances: {
+ type: 'array',
+ optional: false,
+ nullable: false,
+ items: {
+ properties: {
+ id: { type: 'string' },
+ firstRetrievedAt: { type: 'string' },
+ host: { type: 'string' },
+ usersCount: { type: 'number' },
+ notesCount: { type: 'number' },
+ followingCount: { type: 'number' },
+ followersCount: { type: 'number' },
+ isNotResponding: { type: 'boolean' },
+ isSuspended: { type: 'boolean' },
+ isBlocked: { type: 'boolean' },
+ softwareName: { type: 'string' },
+ softwareVersion: { type: 'string' },
+ openRegistrations: { type: 'boolean' },
+ name: { type: 'string' },
+ description: { type: 'string' },
+ maintainerName: { type: 'string' },
+ maintainerEmail: { type: 'string' },
+ isSilenced: { type: 'boolean' },
+ iconUrl: { type: 'string' },
+ faviconUrl: { type: 'string' },
+ themeColor: { type: 'string' },
+ infoUpdatedAt: {
+ type: 'string',
+ nullable: true,
+ },
+ latestRequestReceivedAt: {
+ type: 'string',
+ nullable: true,
+ },
+ }
+ },
+ },
+ otherFollowingCount: { type: 'number' },
+ },
+ }
} as const;
export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/fetch-external-resources.ts b/packages/backend/src/server/api/endpoints/fetch-external-resources.ts
new file mode 100644
index 0000000000..6391a2f580
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/fetch-external-resources.ts
@@ -0,0 +1,84 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { createHash } from 'crypto';
+import ms from 'ms';
+import { Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { HttpRequestService } from '@/core/HttpRequestService.js';
+import { ApiError } from '../error.js';
+
+export const meta = {
+ tags: ['meta'],
+
+ requireCredential: true,
+
+ limit: {
+ duration: ms('1hour'),
+ max: 50,
+ },
+
+ errors: {
+ invalidSchema: {
+ message: 'External resource returned invalid schema.',
+ code: 'EXT_RESOURCE_RETURNED_INVALID_SCHEMA',
+ id: 'bb774091-7a15-4a70-9dc5-6ac8cf125856',
+ },
+ hashUnmached: {
+ message: 'Hash did not match.',
+ code: 'EXT_RESOURCE_HASH_DIDNT_MATCH',
+ id: '693ba8ba-b486-40df-a174-72f8279b56a4',
+ },
+ },
+
+ res: {
+ type: 'object',
+ properties: {
+ type: {
+ type: 'string',
+ },
+ data: {
+ type: 'string',
+ },
+ },
+ },
+} as const;
+
+export const paramDef = {
+ type: 'object',
+ properties: {
+ url: { type: 'string' },
+ hash: { type: 'string' },
+ },
+ required: ['url', 'hash'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint { // eslint-disable-line import/no-default-export
+ constructor(
+ private httpRequestService: HttpRequestService,
+ ) {
+ super(meta, paramDef, async (ps) => {
+ const res = await this.httpRequestService.getJson<{
+ type: string;
+ data: string;
+ }>(ps.url);
+
+ if (!res.data || !res.type) {
+ throw new ApiError(meta.errors.invalidSchema);
+ }
+
+ const resHash = createHash('sha512').update(res.data.replace(/\r\n/g, '\n')).digest('hex');
+ if (resHash !== ps.hash) {
+ throw new ApiError(meta.errors.hashUnmached);
+ }
+
+ return {
+ type: res.type,
+ data: res.data,
+ };
+ });
+ }
+}
diff --git a/packages/backend/src/server/api/endpoints/fetch-rss.ts b/packages/backend/src/server/api/endpoints/fetch-rss.ts
index 37859d8330..b2dee83fe9 100644
--- a/packages/backend/src/server/api/endpoints/fetch-rss.ts
+++ b/packages/backend/src/server/api/endpoints/fetch-rss.ts
@@ -16,6 +16,18 @@ export const meta = {
requireCredential: false,
allowGet: true,
cacheSec: 60 * 3,
+
+ res: {
+ type: 'object',
+ properties: {
+ items: {
+ type: 'array',
+ items: {
+ type: 'object',
+ },
+ }
+ }
+ },
} as const;
export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/flash/create.ts b/packages/backend/src/server/api/endpoints/flash/create.ts
index b46660d218..674f323734 100644
--- a/packages/backend/src/server/api/endpoints/flash/create.ts
+++ b/packages/backend/src/server/api/endpoints/flash/create.ts
@@ -27,6 +27,12 @@ export const meta = {
errors: {
},
+
+ res: {
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'Flash',
+ },
} as const;
export const paramDef = {
@@ -53,9 +59,8 @@ export default class extends Endpoint { // eslint-
) {
super(meta, paramDef, async (ps, me) => {
const flash = await this.flashsRepository.insert({
- id: this.idService.genId(),
+ id: this.idService.gen(),
userId: me.id,
- createdAt: new Date(),
updatedAt: new Date(),
title: ps.title,
summary: ps.summary,
diff --git a/packages/backend/src/server/api/endpoints/flash/like.ts b/packages/backend/src/server/api/endpoints/flash/like.ts
index a90e5f653a..1003249c0c 100644
--- a/packages/backend/src/server/api/endpoints/flash/like.ts
+++ b/packages/backend/src/server/api/endpoints/flash/like.ts
@@ -83,8 +83,7 @@ export default class extends Endpoint { // eslint-
// Create like
await this.flashLikesRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
flashId: flash.id,
userId: me.id,
});
diff --git a/packages/backend/src/server/api/endpoints/following/create.ts b/packages/backend/src/server/api/endpoints/following/create.ts
index e0e7fed87a..9037944ef9 100644
--- a/packages/backend/src/server/api/endpoints/following/create.ts
+++ b/packages/backend/src/server/api/endpoints/following/create.ts
@@ -71,6 +71,7 @@ export const paramDef = {
type: 'object',
properties: {
userId: { type: 'string', format: 'misskey:id' },
+ withReplies: { type: 'boolean' }
},
required: ['userId'],
} as const;
@@ -112,7 +113,7 @@ export default class extends Endpoint { // eslint-
}
try {
- await this.userFollowingService.follow(follower, followee);
+ await this.userFollowingService.follow(follower, followee, { withReplies: ps.withReplies });
} catch (e) {
if (e instanceof IdentifiableError) {
if (e.id === '710e8fb0-b8c3-4922-be49-d5d93d8e6a6e') throw new ApiError(meta.errors.blocking);
diff --git a/packages/backend/src/server/api/endpoints/following/update-all.ts b/packages/backend/src/server/api/endpoints/following/update-all.ts
new file mode 100644
index 0000000000..28734cfdbd
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/following/update-all.ts
@@ -0,0 +1,54 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import ms from 'ms';
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import type { FollowingsRepository } from '@/models/_.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { UserFollowingService } from '@/core/UserFollowingService.js';
+import { DI } from '@/di-symbols.js';
+import { GetterService } from '@/server/api/GetterService.js';
+import { ApiError } from '../../error.js';
+
+export const meta = {
+ tags: ['following', 'users'],
+
+ limit: {
+ duration: ms('1hour'),
+ max: 10,
+ },
+
+ requireCredential: true,
+
+ kind: 'write:following',
+} as const;
+
+export const paramDef = {
+ type: 'object',
+ properties: {
+ notify: { type: 'string', enum: ['normal', 'none'] },
+ withReplies: { type: 'boolean' },
+ },
+} as const;
+
+@Injectable()
+export default class extends Endpoint { // eslint-disable-line import/no-default-export
+ constructor(
+ @Inject(DI.followingsRepository)
+ private followingsRepository: FollowingsRepository,
+ ) {
+ super(meta, paramDef, async (ps, me) => {
+ await this.followingsRepository.update({
+ followerId: me.id,
+ }, {
+ notify: ps.notify != null ? (ps.notify === 'none' ? null : ps.notify) : undefined,
+ withReplies: ps.withReplies != null ? ps.withReplies : undefined,
+ });
+
+ return;
+ });
+ }
+}
diff --git a/packages/backend/src/server/api/endpoints/gallery/featured.ts b/packages/backend/src/server/api/endpoints/gallery/featured.ts
index cbab3a83a4..cea4234065 100644
--- a/packages/backend/src/server/api/endpoints/gallery/featured.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/featured.ts
@@ -8,6 +8,7 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
import type { GalleryPostsRepository } from '@/models/_.js';
import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js';
import { DI } from '@/di-symbols.js';
+import { FeaturedService } from '@/core/FeaturedService.js';
export const meta = {
tags: ['gallery'],
@@ -27,25 +28,49 @@ export const meta = {
export const paramDef = {
type: 'object',
- properties: {},
+ properties: {
+ limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
+ untilId: { type: 'string', format: 'misskey:id' },
+ },
required: [],
} as const;
@Injectable()
export default class extends Endpoint { // eslint-disable-line import/no-default-export
+ private galleryPostsRankingCache: string[] = [];
+ private galleryPostsRankingCacheLastFetchedAt = 0;
+
constructor(
@Inject(DI.galleryPostsRepository)
private galleryPostsRepository: GalleryPostsRepository,
private galleryPostEntityService: GalleryPostEntityService,
+ private featuredService: FeaturedService,
) {
super(meta, paramDef, async (ps, me) => {
- const query = this.galleryPostsRepository.createQueryBuilder('post')
- .andWhere('post.createdAt > :date', { date: new Date(Date.now() - (1000 * 60 * 60 * 24 * 3)) })
- .andWhere('post.likedCount > 0')
- .orderBy('post.likedCount', 'DESC');
+ let postIds: string[];
+ if (this.galleryPostsRankingCacheLastFetchedAt !== 0 && (Date.now() - this.galleryPostsRankingCacheLastFetchedAt < 1000 * 60 * 30)) {
+ postIds = this.galleryPostsRankingCache;
+ } else {
+ postIds = await this.featuredService.getGalleryPostsRanking(100);
+ this.galleryPostsRankingCache = postIds;
+ this.galleryPostsRankingCacheLastFetchedAt = Date.now();
+ }
- const posts = await query.limit(10).getMany();
+ postIds.sort((a, b) => a > b ? -1 : 1);
+ if (ps.untilId) {
+ postIds = postIds.filter(id => id < ps.untilId!);
+ }
+ postIds = postIds.slice(0, ps.limit);
+
+ if (postIds.length === 0) {
+ return [];
+ }
+
+ const query = this.galleryPostsRepository.createQueryBuilder('post')
+ .where('post.id IN (:...postIds)', { postIds: postIds });
+
+ const posts = await query.getMany();
return await this.galleryPostEntityService.packMany(posts, me);
});
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
index 94701712de..71e0ad4141 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
@@ -76,8 +76,7 @@ export default class extends Endpoint { // eslint-
}
const post = await this.galleryPostsRepository.insert(new MiGalleryPost({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
updatedAt: new Date(),
title: ps.title,
description: ps.description,
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/like.ts b/packages/backend/src/server/api/endpoints/gallery/posts/like.ts
index c557054066..cc424261b4 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/like.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/like.ts
@@ -6,6 +6,7 @@
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import type { GalleryLikesRepository, GalleryPostsRepository } from '@/models/_.js';
+import { FeaturedService, GALLERY_POSTS_RANKING_WINDOW } from '@/core/FeaturedService.js';
import { IdService } from '@/core/IdService.js';
import { DI } from '@/di-symbols.js';
import { ApiError } from '../../../error.js';
@@ -57,6 +58,7 @@ export default class extends Endpoint { // eslint-
@Inject(DI.galleryLikesRepository)
private galleryLikesRepository: GalleryLikesRepository,
+ private featuredService: FeaturedService,
private idService: IdService,
) {
super(meta, paramDef, async (ps, me) => {
@@ -83,12 +85,16 @@ export default class extends Endpoint { // eslint-
// Create like
await this.galleryLikesRepository.insert({
- id: this.idService.genId(),
- createdAt: new Date(),
+ id: this.idService.gen(),
postId: post.id,
userId: me.id,
});
+ // ランキング更新
+ if (Date.now() - this.idService.parse(post.id).date.getTime() < GALLERY_POSTS_RANKING_WINDOW) {
+ await this.featuredService.updateGalleryPostsRanking(post.id, 1);
+ }
+
this.galleryPostsRepository.increment({ id: post.id }, 'likedCount', 1);
});
}
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts b/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts
index 832b62282f..caa4d45553 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts
@@ -6,6 +6,8 @@
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import type { GalleryPostsRepository, GalleryLikesRepository } from '@/models/_.js';
+import { FeaturedService, GALLERY_POSTS_RANKING_WINDOW } from '@/core/FeaturedService.js';
+import { IdService } from '@/core/IdService.js';
import { DI } from '@/di-symbols.js';
import { ApiError } from '../../../error.js';
@@ -49,6 +51,9 @@ export default class extends Endpoint { // eslint-
@Inject(DI.galleryLikesRepository)
private galleryLikesRepository: GalleryLikesRepository,
+
+ private featuredService: FeaturedService,
+ private idService: IdService,
) {
super(meta, paramDef, async (ps, me) => {
const post = await this.galleryPostsRepository.findOneBy({ id: ps.postId });
@@ -68,6 +73,11 @@ export default class extends Endpoint { // eslint-
// Delete like
await this.galleryLikesRepository.delete(exist.id);
+ // ランキング更新
+ if (Date.now() - this.idService.parse(post.id).date.getTime() < GALLERY_POSTS_RANKING_WINDOW) {
+ await this.featuredService.updateGalleryPostsRanking(post.id, -1);
+ }
+
this.galleryPostsRepository.decrement({ id: post.id }, 'likedCount', 1);
});
}
diff --git a/packages/backend/src/server/api/endpoints/get-avatar-decorations.ts b/packages/backend/src/server/api/endpoints/get-avatar-decorations.ts
new file mode 100644
index 0000000000..dbe1626149
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/get-avatar-decorations.ts
@@ -0,0 +1,82 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { IsNull } from 'typeorm';
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { DI } from '@/di-symbols.js';
+import { AvatarDecorationService } from '@/core/AvatarDecorationService.js';
+import { RoleService } from '@/core/RoleService.js';
+
+export const meta = {
+ tags: ['users'],
+
+ requireCredential: false,
+
+ res: {
+ type: 'array',
+ optional: false, nullable: false,
+ items: {
+ type: 'object',
+ optional: false, nullable: false,
+ properties: {
+ id: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ example: 'xxxxxxxxxx',
+ },
+ name: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ description: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ url: {
+ type: 'string',
+ optional: false, nullable: false,
+ },
+ roleIdsThatCanBeUsedThisDecoration: {
+ type: 'array',
+ optional: false, nullable: false,
+ items: {
+ type: 'string',
+ optional: false, nullable: false,
+ format: 'id',
+ },
+ },
+ },
+ },
+ },
+} as const;
+
+export const paramDef = {
+ type: 'object',
+ properties: {},
+ required: [],
+} as const;
+
+@Injectable()
+export default class extends Endpoint { // eslint-disable-line import/no-default-export
+ constructor(
+ private avatarDecorationService: AvatarDecorationService,
+ private roleService: RoleService,
+ ) {
+ super(meta, paramDef, async (ps, me) => {
+ const decorations = await this.avatarDecorationService.getAll(true);
+ const allRoles = await this.roleService.getRoles();
+
+ return decorations.map(decoration => ({
+ id: decoration.id,
+ name: decoration.name,
+ description: decoration.description,
+ url: decoration.url,
+ roleIdsThatCanBeUsedThisDecoration: decoration.roleIdsThatCanBeUsedThisDecoration.filter(roleId => allRoles.some(role => role.id === roleId)),
+ }));
+ });
+ }
+}
diff --git a/packages/backend/src/server/api/endpoints/get-online-users-count.ts b/packages/backend/src/server/api/endpoints/get-online-users-count.ts
index 8a61168f25..737d637b7e 100644
--- a/packages/backend/src/server/api/endpoints/get-online-users-count.ts
+++ b/packages/backend/src/server/api/endpoints/get-online-users-count.ts
@@ -16,6 +16,16 @@ export const meta = {
requireCredential: false,
allowGet: true,
cacheSec: 60 * 1,
+ res: {
+ type: 'object',
+ optional: false, nullable: false,
+ properties: {
+ count: {
+ type: 'number',
+ nullable: false,
+ },
+ },
+ },
} as const;
export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/hashtags/users.ts b/packages/backend/src/server/api/endpoints/hashtags/users.ts
index 1cef76d3d2..50aea79943 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/users.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/users.ts
@@ -66,8 +66,8 @@ export default class extends Endpoint { // eslint-
switch (ps.sort) {
case '+follower': query.orderBy('user.followersCount', 'DESC'); break;
case '-follower': query.orderBy('user.followersCount', 'ASC'); break;
- case '+createdAt': query.orderBy('user.createdAt', 'DESC'); break;
- case '-createdAt': query.orderBy('user.createdAt', 'ASC'); break;
+ case '+createdAt': query.orderBy('user.id', 'DESC'); break;
+ case '-createdAt': query.orderBy('user.id', 'ASC'); break;
case '+updatedAt': query.orderBy('user.updatedAt', 'DESC'); break;
case '-updatedAt': query.orderBy('user.updatedAt', 'ASC'); break;
}
diff --git a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts
index 6d530aba3b..a7be47fd0f 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts
@@ -32,6 +32,16 @@ export const meta = {
id: '798d6847-b1ed-4f9c-b1f9-163c42655995',
},
},
+
+ res: {
+ type: 'object',
+ nullable: false,
+ optional: false,
+ properties: {
+ id: { type: 'string' },
+ name: { type: 'string' },
+ },
+ },
} as const;
export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts
index c39005f2dd..0fac96d58f 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts
@@ -36,6 +36,140 @@ export const meta = {
id: 'bf32b864-449b-47b8-974e-f9a5468546f1',
},
},
+
+ res: {
+ type: 'object',
+ nullable: false,
+ optional: false,
+ properties: {
+ rp: {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ nullable: true,
+ },
+ },
+ },
+ user: {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ },
+ name: {
+ type: 'string',
+ },
+ displayName: {
+ type: 'string',
+ },
+ },
+ },
+ challenge: {
+ type: 'string',
+ },
+ pubKeyCredParams: {
+ type: 'array',
+ items: {
+ type: 'object',
+ properties: {
+ type: {
+ type: 'string',
+ },
+ alg: {
+ type: 'number',
+ },
+ },
+ },
+ },
+ timeout: {
+ type: 'number',
+ nullable: true,
+ },
+ excludeCredentials: {
+ type: 'array',
+ nullable: true,
+ items: {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ },
+ type: {
+ type: 'string',
+ },
+ transports: {
+ type: 'array',
+ items: {
+ type: 'string',
+ enum: [
+ "ble",
+ "cable",
+ "hybrid",
+ "internal",
+ "nfc",
+ "smart-card",
+ "usb",
+ ],
+ },
+ },
+ },
+ },
+ },
+ authenticatorSelection: {
+ type: 'object',
+ nullable: true,
+ properties: {
+ authenticatorAttachment: {
+ type: 'string',
+ enum: [
+ "cross-platform",
+ "platform",
+ ],
+ },
+ requireResidentKey: {
+ type: 'boolean',
+ },
+ userVerification: {
+ type: 'string',
+ enum: [
+ "discouraged",
+ "preferred",
+ "required",
+ ],
+ },
+ },
+ },
+ attestation: {
+ type: 'string',
+ nullable: true,
+ enum: [
+ "direct",
+ "enterprise",
+ "indirect",
+ "none",
+ ],
+ },
+ extensions: {
+ type: 'object',
+ nullable: true,
+ properties: {
+ appid: {
+ type: 'string',
+ nullable: true,
+ },
+ credProps: {
+ type: 'boolean',
+ nullable: true,
+ },
+ hmacCreateSecret: {
+ type: 'boolean',
+ nullable: true,
+ },
+ },
+ },
+ },
+ },
} as const;
export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register.ts b/packages/backend/src/server/api/endpoints/i/2fa/register.ts
index b358c812ee..cc083cbf7b 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/register.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/register.ts
@@ -26,6 +26,19 @@ export const meta = {
id: '78d6c839-20c9-4c66-b90a-fc0542168b48',
},
},
+
+ res: {
+ type: 'object',
+ nullable: false,
+ optional: false,
+ properties: {
+ qr: { type: 'string' },
+ url: { type: 'string' },
+ secret: { type: 'string' },
+ label: { type: 'string' },
+ issuer: { type: 'string' },
+ },
+ },
} as const;
export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/i/apps.ts b/packages/backend/src/server/api/endpoints/i/apps.ts
index daa3e536a4..ef89f93181 100644
--- a/packages/backend/src/server/api/endpoints/i/apps.ts
+++ b/packages/backend/src/server/api/endpoints/i/apps.ts
@@ -7,11 +7,43 @@ import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import type { AccessTokensRepository } from '@/models/_.js';
import { DI } from '@/di-symbols.js';
+import { IdService } from '@/core/IdService.js';
export const meta = {
requireCredential: true,
secure: true,
+
+ res: {
+ type: 'array',
+ items: {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ format: 'misskey:id',
+ },
+ name: {
+ type: 'string',
+ },
+ createdAt: {
+ type: 'string',
+ format: 'date-time',
+ },
+ lastUsedAt: {
+ type: 'string',
+ format: 'date-time',
+ },
+ permission: {
+ type: 'array',
+ uniqueItems: true,
+ items: {
+ type: 'string'
+ },
+ }
+ },
+ },
+ },
} as const;
export const paramDef = {
@@ -27,6 +59,8 @@ export default class extends Endpoint { // eslint-
constructor(
@Inject(DI.accessTokensRepository)
private accessTokensRepository: AccessTokensRepository,
+
+ private idService: IdService,
) {
super(meta, paramDef, async (ps, me) => {
const query = this.accessTokensRepository.createQueryBuilder('token')
@@ -34,8 +68,8 @@ export default class extends Endpoint { // eslint-
.leftJoinAndSelect('token.app', 'app');
switch (ps.sort) {
- case '+createdAt': query.orderBy('token.createdAt', 'DESC'); break;
- case '-createdAt': query.orderBy('token.createdAt', 'ASC'); break;
+ case '+createdAt': query.orderBy('token.id', 'DESC'); break;
+ case '-createdAt': query.orderBy('token.id', 'ASC'); break;
case '+lastUsedAt': query.orderBy('token.lastUsedAt', 'DESC'); break;
case '-lastUsedAt': query.orderBy('token.lastUsedAt', 'ASC'); break;
default: query.orderBy('token.id', 'ASC'); break;
@@ -46,8 +80,8 @@ export default class extends Endpoint { // eslint-
return await Promise.all(tokens.map(token => ({
id: token.id,
name: token.name ?? token.app?.name,
- createdAt: token.createdAt,
- lastUsedAt: token.lastUsedAt,
+ createdAt: this.idService.parse(token.id).date.toISOString(),
+ lastUsedAt: token.lastUsedAt?.toISOString(),
permission: token.permission,
})));
});
diff --git a/packages/backend/src/server/api/endpoints/i/authorized-apps.ts b/packages/backend/src/server/api/endpoints/i/authorized-apps.ts
index 32061c2aa4..a0ed371fb8 100644
--- a/packages/backend/src/server/api/endpoints/i/authorized-apps.ts
+++ b/packages/backend/src/server/api/endpoints/i/authorized-apps.ts
@@ -14,6 +14,36 @@ export const meta = {
requireCredential: true,
secure: true,
+
+ res: {
+ type: 'array',
+ items: {
+ type: 'object',
+ properties: {
+ id: {
+ type: 'string',
+ format: 'misskey:id',
+ },
+ name: {
+ type: 'string',
+ },
+ callbackUrl: {
+ type: 'string',
+ nullable: true,
+ },
+ permission: {
+ type: 'array',
+ uniqueItems: true,
+ items: {
+ type: 'string'
+ },
+ },
+ isAuthorized: {
+ type: 'boolean',
+ },
+ },
+ },
+ },
} as const;
export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/i/import-following.ts b/packages/backend/src/server/api/endpoints/i/import-following.ts
index 38c9283043..e5fa2ac96a 100644
--- a/packages/backend/src/server/api/endpoints/i/import-following.ts
+++ b/packages/backend/src/server/api/endpoints/i/import-following.ts
@@ -52,6 +52,7 @@ export const paramDef = {
type: 'object',
properties: {
fileId: { type: 'string', format: 'misskey:id' },
+ withReplies: { type: 'boolean' },
},
required: ['fileId'],
} as const;
@@ -79,7 +80,7 @@ export default class extends Endpoint { // eslint-
);
if (checkMoving ? file.size > 32 * 1024 * 1024 : file.size > 64 * 1024) throw new ApiError(meta.errors.tooBigFile);
- this.queueService.createImportFollowingJob(me, file.id);
+ this.queueService.createImportFollowingJob(me, file.id, ps.withReplies);
});
}
}
diff --git a/packages/backend/src/server/api/endpoints/i/move.ts b/packages/backend/src/server/api/endpoints/i/move.ts
index 86b726e054..f3ba720c2b 100644
--- a/packages/backend/src/server/api/endpoints/i/move.ts
+++ b/packages/backend/src/server/api/endpoints/i/move.ts
@@ -64,6 +64,10 @@ export const meta = {
id: 'b234a14e-9ebe-4581-8000-074b3c215962',
},
},
+
+ res: {
+ type: 'object',
+ },
} as const;
export const paramDef = {
diff --git a/packages/backend/src/server/api/endpoints/i/notifications-grouped.ts b/packages/backend/src/server/api/endpoints/i/notifications-grouped.ts
new file mode 100644
index 0000000000..4ea94b07f6
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/i/notifications-grouped.ts
@@ -0,0 +1,178 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Brackets, In } from 'typeorm';
+import * as Redis from 'ioredis';
+import { Inject, Injectable } from '@nestjs/common';
+import type { NotesRepository } from '@/models/_.js';
+import { obsoleteNotificationTypes, notificationTypes, FilterUnionByProperty } from '@/types.js';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { NoteReadService } from '@/core/NoteReadService.js';
+import { NotificationEntityService } from '@/core/entities/NotificationEntityService.js';
+import { NotificationService } from '@/core/NotificationService.js';
+import { DI } from '@/di-symbols.js';
+import { IdService } from '@/core/IdService.js';
+import { MiGroupedNotification, MiNotification } from '@/models/Notification.js';
+
+export const meta = {
+ tags: ['account', 'notifications'],
+
+ requireCredential: true,
+
+ limit: {
+ duration: 30000,
+ max: 30,
+ },
+
+ kind: 'read:notifications',
+
+ res: {
+ type: 'array',
+ optional: false, nullable: false,
+ items: {
+ type: 'object',
+ optional: false, nullable: false,
+ ref: 'Notification',
+ },
+ },
+} as const;
+
+export const paramDef = {
+ type: 'object',
+ properties: {
+ limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
+ sinceId: { type: 'string', format: 'misskey:id' },
+ untilId: { type: 'string', format: 'misskey:id' },
+ markAsRead: { type: 'boolean', default: true },
+ // 後方互換のため、廃止された通知タイプも受け付ける
+ includeTypes: { type: 'array', items: {
+ type: 'string', enum: [...notificationTypes, ...obsoleteNotificationTypes],
+ } },
+ excludeTypes: { type: 'array', items: {
+ type: 'string', enum: [...notificationTypes, ...obsoleteNotificationTypes],
+ } },
+ },
+ required: [],
+} as const;
+
+@Injectable()
+export default class extends Endpoint { // eslint-disable-line import/no-default-export
+ constructor(
+ @Inject(DI.redis)
+ private redisClient: Redis.Redis,
+
+ @Inject(DI.notesRepository)
+ private notesRepository: NotesRepository,
+
+ private idService: IdService,
+ private notificationEntityService: NotificationEntityService,
+ private notificationService: NotificationService,
+ private noteReadService: NoteReadService,
+ ) {
+ super(meta, paramDef, async (ps, me) => {
+ const EXTRA_LIMIT = 100;
+
+ // includeTypes が空の場合はクエリしない
+ if (ps.includeTypes && ps.includeTypes.length === 0) {
+ return [];
+ }
+ // excludeTypes に全指定されている場合はクエリしない
+ if (notificationTypes.every(type => ps.excludeTypes?.includes(type))) {
+ return [];
+ }
+
+ const includeTypes = ps.includeTypes && ps.includeTypes.filter(type => !(obsoleteNotificationTypes).includes(type as any)) as typeof notificationTypes[number][];
+ const excludeTypes = ps.excludeTypes && ps.excludeTypes.filter(type => !(obsoleteNotificationTypes).includes(type as any)) as typeof notificationTypes[number][];
+
+ const limit = (ps.limit + EXTRA_LIMIT) + (ps.untilId ? 1 : 0) + (ps.sinceId ? 1 : 0); // untilIdに指定したものも含まれるため+1
+ const notificationsRes = await this.redisClient.xrevrange(
+ `notificationTimeline:${me.id}`,
+ ps.untilId ? this.idService.parse(ps.untilId).date.getTime() : '+',
+ ps.sinceId ? this.idService.parse(ps.sinceId).date.getTime() : '-',
+ 'COUNT', limit);
+
+ if (notificationsRes.length === 0) {
+ return [];
+ }
+
+ let notifications = notificationsRes.map(x => JSON.parse(x[1][1])).filter(x => x.id !== ps.untilId && x !== ps.sinceId) as MiNotification[];
+
+ if (includeTypes && includeTypes.length > 0) {
+ notifications = notifications.filter(notification => includeTypes.includes(notification.type));
+ } else if (excludeTypes && excludeTypes.length > 0) {
+ notifications = notifications.filter(notification => !excludeTypes.includes(notification.type));
+ }
+
+ if (notifications.length === 0) {
+ return [];
+ }
+
+ // Mark all as read
+ if (ps.markAsRead) {
+ this.notificationService.readAllNotification(me.id);
+ }
+
+ // grouping
+ let groupedNotifications = [notifications[0]] as MiGroupedNotification[];
+ for (let i = 1; i < notifications.length; i++) {
+ const notification = notifications[i];
+ const prev = notifications[i - 1];
+ let prevGroupedNotification = groupedNotifications.at(-1)!;
+
+ if (prev.type === 'reaction' && notification.type === 'reaction' && prev.noteId === notification.noteId) {
+ if (prevGroupedNotification.type !== 'reaction:grouped') {
+ groupedNotifications[groupedNotifications.length - 1] = {
+ type: 'reaction:grouped',
+ id: '',
+ createdAt: prev.createdAt,
+ noteId: prev.noteId!,
+ reactions: [{
+ userId: prev.notifierId!,
+ reaction: prev.reaction!,
+ }],
+ };
+ prevGroupedNotification = groupedNotifications.at(-1)!;
+ }
+ (prevGroupedNotification as FilterUnionByProperty).reactions.push({
+ userId: notification.notifierId!,
+ reaction: notification.reaction!,
+ });
+ prevGroupedNotification.id = notification.id;
+ continue;
+ }
+ if (prev.type === 'renote' && notification.type === 'renote' && prev.targetNoteId === notification.targetNoteId) {
+ if (prevGroupedNotification.type !== 'renote:grouped') {
+ groupedNotifications[groupedNotifications.length - 1] = {
+ type: 'renote:grouped',
+ id: '',
+ createdAt: notification.createdAt,
+ noteId: prev.noteId!,
+ userIds: [prev.notifierId!],
+ };
+ prevGroupedNotification = groupedNotifications.at(-1)!;
+ }
+ (prevGroupedNotification as FilterUnionByProperty).userIds.push(notification.notifierId!);
+ prevGroupedNotification.id = notification.id;
+ continue;
+ }
+
+ groupedNotifications.push(notification);
+ }
+
+ groupedNotifications = groupedNotifications.slice(0, ps.limit);
+
+ const noteIds = groupedNotifications
+ .filter((notification): notification is FilterUnionByProperty => ['mention', 'reply', 'quote'].includes(notification.type))
+ .map(notification => notification.noteId!);
+
+ if (noteIds.length > 0) {
+ const notes = await this.notesRepository.findBy({ id: In(noteIds) });
+ this.noteReadService.read(me.id, notes);
+ }
+
+ return await this.notificationEntityService.packGroupedMany(groupedNotifications, me.id);
+ });
+ }
+}
diff --git a/packages/backend/src/server/api/endpoints/i/notifications.ts b/packages/backend/src/server/api/endpoints/i/notifications.ts
index 91dd72e805..039fd9454c 100644
--- a/packages/backend/src/server/api/endpoints/i/notifications.ts
+++ b/packages/backend/src/server/api/endpoints/i/notifications.ts
@@ -7,7 +7,7 @@ import { Brackets, In } from 'typeorm';
import * as Redis from 'ioredis';
import { Inject, Injectable } from '@nestjs/common';
import type { NotesRepository } from '@/models/_.js';
-import { obsoleteNotificationTypes, notificationTypes } from '@/types.js';
+import { obsoleteNotificationTypes, notificationTypes, FilterUnionByProperty } from '@/types.js';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { NoteReadService } from '@/core/NoteReadService.js';
import { NotificationEntityService } from '@/core/entities/NotificationEntityService.js';
@@ -113,8 +113,8 @@ export default class extends Endpoint { // eslint-
}
const noteIds = notifications
- .filter(notification => ['mention', 'reply', 'quote'].includes(notification.type))
- .map(notification => notification.noteId!);
+ .filter((notification): notification is FilterUnionByProperty => ['mention', 'reply', 'quote'].includes(notification.type))
+ .map(notification => notification.noteId);
if (noteIds.length > 0) {
const notes = await this.notesRepository.findBy({ id: In(noteIds) });
diff --git a/packages/backend/src/server/api/endpoints/i/registry/get-all.ts b/packages/backend/src/server/api/endpoints/i/registry/get-all.ts
index 211e6637dc..bd6e85a074 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/get-all.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/get-all.ts
@@ -5,13 +5,14 @@
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { RegistryItemsRepository } from '@/models/_.js';
-import { DI } from '@/di-symbols.js';
+import { RegistryApiService } from '@/core/RegistryApiService.js';
export const meta = {
requireCredential: true,
- secure: true,
+ res: {
+ type: 'object',
+ },
} as const;
export const paramDef = {
@@ -20,23 +21,18 @@ export const paramDef = {
scope: { type: 'array', default: [], items: {
type: 'string', pattern: /^[a-zA-Z0-9_]+$/.toString().slice(1, -1),
} },
+ domain: { type: 'string', nullable: true },
},
- required: [],
+ required: ['scope'],
} as const;
@Injectable()
export default class extends Endpoint { // eslint-disable-line import/no-default-export
constructor(
- @Inject(DI.registryItemsRepository)
- private registryItemsRepository: RegistryItemsRepository,
+ private registryApiService: RegistryApiService,
) {
- super(meta, paramDef, async (ps, me) => {
- const query = this.registryItemsRepository.createQueryBuilder('item')
- .where('item.domain IS NULL')
- .andWhere('item.userId = :userId', { userId: me.id })
- .andWhere('item.scope = :scope', { scope: ps.scope });
-
- const items = await query.getMany();
+ super(meta, paramDef, async (ps, me, accessToken) => {
+ const items = await this.registryApiService.getAllItemsOfScope(me.id, accessToken != null ? accessToken.id : (ps.domain ?? null), ps.scope);
const res = {} as Record;
diff --git a/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts b/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts
index 9c6f2d6781..2352beb130 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts
@@ -5,15 +5,12 @@
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { RegistryItemsRepository } from '@/models/_.js';
-import { DI } from '@/di-symbols.js';
+import { RegistryApiService } from '@/core/RegistryApiService.js';
import { ApiError } from '../../../error.js';
export const meta = {
requireCredential: true,
- secure: true,
-
errors: {
noSuchKey: {
message: 'No such key.',
@@ -21,6 +18,10 @@ export const meta = {
id: '97a1e8e7-c0f7-47d2-957a-92e61256e01a',
},
},
+
+ res: {
+ type: 'object',
+ }
} as const;
export const paramDef = {
@@ -30,24 +31,18 @@ export const paramDef = {
scope: { type: 'array', default: [], items: {
type: 'string', pattern: /^[a-zA-Z0-9_]+$/.toString().slice(1, -1),
} },
+ domain: { type: 'string', nullable: true },
},
- required: ['key'],
+ required: ['key', 'scope'],
} as const;
@Injectable()
export default class extends Endpoint { // eslint-disable-line import/no-default-export
constructor(
- @Inject(DI.registryItemsRepository)
- private registryItemsRepository: RegistryItemsRepository,
+ private registryApiService: RegistryApiService,
) {
- super(meta, paramDef, async (ps, me) => {
- const query = this.registryItemsRepository.createQueryBuilder('item')
- .where('item.domain IS NULL')
- .andWhere('item.userId = :userId', { userId: me.id })
- .andWhere('item.key = :key', { key: ps.key })
- .andWhere('item.scope = :scope', { scope: ps.scope });
-
- const item = await query.getOne();
+ super(meta, paramDef, async (ps, me, accessToken) => {
+ const item = await this.registryApiService.getItem(me.id, accessToken != null ? accessToken.id : (ps.domain ?? null), ps.scope, ps.key);
if (item == null) {
throw new ApiError(meta.errors.noSuchKey);
diff --git a/packages/backend/src/server/api/endpoints/i/registry/get.ts b/packages/backend/src/server/api/endpoints/i/registry/get.ts
index 729e729b8c..4155a43e0d 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/get.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/get.ts
@@ -5,15 +5,12 @@
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { RegistryItemsRepository } from '@/models/_.js';
-import { DI } from '@/di-symbols.js';
+import { RegistryApiService } from '@/core/RegistryApiService.js';
import { ApiError } from '../../../error.js';
export const meta = {
requireCredential: true,
- secure: true,
-
errors: {
noSuchKey: {
message: 'No such key.',
@@ -21,6 +18,10 @@ export const meta = {
id: 'ac3ed68a-62f0-422b-a7bc-d5e09e8f6a6a',
},
},
+
+ res: {
+ type: 'object',
+ }
} as const;
export const paramDef = {
@@ -30,24 +31,18 @@ export const paramDef = {
scope: { type: 'array', default: [], items: {
type: 'string', pattern: /^[a-zA-Z0-9_]+$/.toString().slice(1, -1),
} },
+ domain: { type: 'string', nullable: true },
},
- required: ['key'],
+ required: ['key', 'scope'],
} as const;
@Injectable()
export default class extends Endpoint { // eslint-disable-line import/no-default-export
constructor(
- @Inject(DI.registryItemsRepository)
- private registryItemsRepository: RegistryItemsRepository,
+ private registryApiService: RegistryApiService,
) {
- super(meta, paramDef, async (ps, me) => {
- const query = this.registryItemsRepository.createQueryBuilder('item')
- .where('item.domain IS NULL')
- .andWhere('item.userId = :userId', { userId: me.id })
- .andWhere('item.key = :key', { key: ps.key })
- .andWhere('item.scope = :scope', { scope: ps.scope });
-
- const item = await query.getOne();
+ super(meta, paramDef, async (ps, me, accessToken) => {
+ const item = await this.registryApiService.getItem(me.id, accessToken != null ? accessToken.id : (ps.domain ?? null), ps.scope, ps.key);
if (item == null) {
throw new ApiError(meta.errors.noSuchKey);
diff --git a/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts b/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts
index ffd2860fde..b411cdd3d9 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts
@@ -5,13 +5,14 @@
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { RegistryItemsRepository } from '@/models/_.js';
-import { DI } from '@/di-symbols.js';
+import { RegistryApiService } from '@/core/RegistryApiService.js';
export const meta = {
requireCredential: true,
- secure: true,
+ res: {
+ type: 'object',
+ },
} as const;
export const paramDef = {
@@ -20,36 +21,31 @@ export const paramDef = {
scope: { type: 'array', default: [], items: {
type: 'string', pattern: /^[a-zA-Z0-9_]+$/.toString().slice(1, -1),
} },
+ domain: { type: 'string', nullable: true },
},
- required: [],
+ required: ['scope'],
} as const;
@Injectable()
export default class extends Endpoint { // eslint-disable-line import/no-default-export
constructor(
- @Inject(DI.registryItemsRepository)
- private registryItemsRepository: RegistryItemsRepository,
+ private registryApiService: RegistryApiService,
) {
- super(meta, paramDef, async (ps, me) => {
- const query = this.registryItemsRepository.createQueryBuilder('item')
- .where('item.domain IS NULL')
- .andWhere('item.userId = :userId', { userId: me.id })
- .andWhere('item.scope = :scope', { scope: ps.scope });
-
- const items = await query.getMany();
+ super(meta, paramDef, async (ps, me, accessToken) => {
+ const items = await this.registryApiService.getAllItemsOfScope(me.id, accessToken != null ? accessToken.id : (ps.domain ?? null), ps.scope);
const res = {} as Record;
for (const item of items) {
const type = typeof item.value;
res[item.key] =
- item.value === null ? 'null' :
- Array.isArray(item.value) ? 'array' :
- type === 'number' ? 'number' :
- type === 'string' ? 'string' :
- type === 'boolean' ? 'boolean' :
- type === 'object' ? 'object' :
- null as never;
+ item.value === null ? 'null' :
+ Array.isArray(item.value) ? 'array' :
+ type === 'number' ? 'number' :
+ type === 'string' ? 'string' :
+ type === 'boolean' ? 'boolean' :
+ type === 'object' ? 'object' :
+ null as never;
}
return res;
diff --git a/packages/backend/src/server/api/endpoints/i/registry/keys.ts b/packages/backend/src/server/api/endpoints/i/registry/keys.ts
index 7239bb66e1..04e120d752 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/keys.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/keys.ts
@@ -5,13 +5,10 @@
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { RegistryItemsRepository } from '@/models/_.js';
-import { DI } from '@/di-symbols.js';
+import { RegistryApiService } from '@/core/RegistryApiService.js';
export const meta = {
requireCredential: true,
-
- secure: true,
} as const;
export const paramDef = {
@@ -20,26 +17,18 @@ export const paramDef = {
scope: { type: 'array', default: [], items: {
type: 'string', pattern: /^[a-zA-Z0-9_]+$/.toString().slice(1, -1),
} },
+ domain: { type: 'string', nullable: true },
},
- required: [],
+ required: ['scope'],
} as const;
@Injectable()
export default class extends Endpoint { // eslint-disable-line import/no-default-export
constructor(
- @Inject(DI.registryItemsRepository)
- private registryItemsRepository: RegistryItemsRepository,
+ private registryApiService: RegistryApiService,
) {
- super(meta, paramDef, async (ps, me) => {
- const query = this.registryItemsRepository.createQueryBuilder('item')
- .select('item.key')
- .where('item.domain IS NULL')
- .andWhere('item.userId = :userId', { userId: me.id })
- .andWhere('item.scope = :scope', { scope: ps.scope });
-
- const items = await query.getMany();
-
- return items.map(x => x.key);
+ super(meta, paramDef, async (ps, me, accessToken) => {
+ return await this.registryApiService.getAllKeysOfScope(me.id, accessToken != null ? accessToken.id : (ps.domain ?? null), ps.scope);
});
}
}
diff --git a/packages/backend/src/server/api/endpoints/i/registry/remove.ts b/packages/backend/src/server/api/endpoints/i/registry/remove.ts
index ae687fefe9..ba8100b547 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/remove.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/remove.ts
@@ -7,13 +7,12 @@ import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
import type { RegistryItemsRepository } from '@/models/_.js';
import { DI } from '@/di-symbols.js';
+import { RegistryApiService } from '@/core/RegistryApiService.js';
import { ApiError } from '../../../error.js';
export const meta = {
requireCredential: true,
- secure: true,
-
errors: {
noSuchKey: {
message: 'No such key.',
@@ -30,30 +29,18 @@ export const paramDef = {
scope: { type: 'array', default: [], items: {
type: 'string', pattern: /^[a-zA-Z0-9_]+$/.toString().slice(1, -1),
} },
+ domain: { type: 'string', nullable: true },
},
- required: ['key'],
+ required: ['key', 'scope'],
} as const;
@Injectable()
export default class extends Endpoint { // eslint-disable-line import/no-default-export
constructor(
- @Inject(DI.registryItemsRepository)
- private registryItemsRepository: RegistryItemsRepository,
+ private registryApiService: RegistryApiService,
) {
- super(meta, paramDef, async (ps, me) => {
- const query = this.registryItemsRepository.createQueryBuilder('item')
- .where('item.domain IS NULL')
- .andWhere('item.userId = :userId', { userId: me.id })
- .andWhere('item.key = :key', { key: ps.key })
- .andWhere('item.scope = :scope', { scope: ps.scope });
-
- const item = await query.getOne();
-
- if (item == null) {
- throw new ApiError(meta.errors.noSuchKey);
- }
-
- await this.registryItemsRepository.remove(item);
+ super(meta, paramDef, async (ps, me, accessToken) => {
+ await this.registryApiService.remove(me.id, accessToken != null ? accessToken.id : (ps.domain ?? null), ps.scope, ps.key);
});
}
}
diff --git a/packages/backend/src/server/api/endpoints/i/registry/scopes-with-domain.ts b/packages/backend/src/server/api/endpoints/i/registry/scopes-with-domain.ts
new file mode 100644
index 0000000000..0aca2a26fe
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/i/registry/scopes-with-domain.ts
@@ -0,0 +1,52 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { RegistryApiService } from '@/core/RegistryApiService.js';
+
+export const meta = {
+ requireCredential: true,
+ secure: true,
+
+ res: {
+ type: 'array',
+ items: {
+ type: 'object',
+ properties: {
+ scopes: {
+ type: 'array',
+ items: {
+ type: 'array',
+ items: {
+ type: 'string',
+ }
+ }
+ },
+ domain: {
+ type: 'string',
+ nullable: true,
+ },
+ },
+ },
+ }
+} as const;
+
+export const paramDef = {
+ type: 'object',
+ properties: {},
+ required: [],
+} as const;
+
+@Injectable()
+export default class extends Endpoint { // eslint-disable-line import/no-default-export
+ constructor(
+ private registryApiService: RegistryApiService,
+ ) {
+ super(meta, paramDef, async (ps, me) => {
+ return await this.registryApiService.getAllScopeAndDomains(me.id);
+ });
+ }
+}
diff --git a/packages/backend/src/server/api/endpoints/i/registry/scopes.ts b/packages/backend/src/server/api/endpoints/i/registry/scopes.ts
deleted file mode 100644
index 7637cdcf73..0000000000
--- a/packages/backend/src/server/api/endpoints/i/registry/scopes.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { RegistryItemsRepository } from '@/models/_.js';
-import { DI } from '@/di-symbols.js';
-
-export const meta = {
- requireCredential: true,
-
- secure: true,
-} as const;
-
-export const paramDef = {
- type: 'object',
- properties: {},
- required: [],
-} as const;
-
-@Injectable()
-export default class extends Endpoint { // eslint-disable-line import/no-default-export
- constructor(
- @Inject(DI.registryItemsRepository)
- private registryItemsRepository: RegistryItemsRepository,
- ) {
- super(meta, paramDef, async (ps, me) => {
- const query = this.registryItemsRepository.createQueryBuilder('item')
- .select('item.scope')
- .where('item.domain IS NULL')
- .andWhere('item.userId = :userId', { userId: me.id });
-
- const items = await query.getMany();
-
- const res = [] as string[][];
-
- for (const item of items) {
- if (res.some(scope => scope.join('.') === item.scope.join('.'))) continue;
- res.push(item.scope);
- }
-
- return res;
- });
- }
-}
diff --git a/packages/backend/src/server/api/endpoints/i/registry/set.ts b/packages/backend/src/server/api/endpoints/i/registry/set.ts
index c074b152df..58bb450bce 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/set.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/set.ts
@@ -5,15 +5,10 @@
import { Inject, Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { RegistryItemsRepository } from '@/models/_.js';
-import { IdService } from '@/core/IdService.js';
-import { GlobalEventService } from '@/core/GlobalEventService.js';
-import { DI } from '@/di-symbols.js';
+import { RegistryApiService } from '@/core/RegistryApiService.js';
export const meta = {
requireCredential: true,
-
- secure: true,
} as const;
export const paramDef = {
@@ -24,52 +19,18 @@ export const paramDef = {
scope: { type: 'array', default: [], items: {
type: 'string', pattern: /^[a-zA-Z0-9_]+$/.toString().slice(1, -1),
} },
+ domain: { type: 'string', nullable: true },
},
- required: ['key', 'value'],
+ required: ['key', 'value', 'scope'],
} as const;
@Injectable()
export default class extends Endpoint