Merge pull request 'Replace notes(userId) index with (userId, id)' (#28) from sugar/forkey:replace-notes-user-id-index-with-user-id-id into main

Reviewed-on: woem.men/forkey#28
Reviewed-by: leah <leah@noreply.woem.men>

.config/docker_example.env

@@ -1,5 +1,5 @@
 # db settings
-POSTGRES_PASSWORD=example-misskey-pass
-POSTGRES_USER=example-misskey-user
-POSTGRES_DB=misskey
+POSTGRES_PASSWORD=example-forkey-pass
+POSTGRES_USER=example-forkey-user
+POSTGRES_DB=forkey
 DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}"

.config/docker_example.yml

@@ -1,5 +1,5 @@
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-# Misskey configuration
+# Forkey configuration
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 #   ┌─────┐
@@ -15,11 +15,11 @@ url: https://example.tld/
 #───┘ Port and TLS settings └───────────────────────────────────
 
 #
-# Misskey requires a reverse proxy to support HTTPS connections.
+# Forkey requires a reverse proxy to support HTTPS connections.
 #
 #                 +----- https://example.tld/ ------------+
 #   +------+      |+-------------+      +----------------+|
-#   | User | ---> || Proxy (443) | ---> | Misskey (3000) ||
+#   | User | ---> || Proxy (443) | ---> | Forkey (3000) ||
 #   +------+      |+-------------+      +----------------+|
 #                 +---------------------------------------+
 #
@@ -27,7 +27,7 @@ url: https://example.tld/
 #   An encrypted connection with HTTPS is highly recommended
 #   because tokens may be transferred in GET requests.
 
-# The port that your Misskey server should listen on.
+# The port that your Forkey server should listen on.
 port: 3000
 
 #   ┌──────────────────────────┐
@@ -38,11 +38,11 @@ db:
   port: 5432
 
   # Database name
-  db: misskey
+  db: forkey
 
   # Auth
-  user: example-misskey-user
-  pass: example-misskey-pass
+  user: example-forkey-user
+  pass: example-forkey-pass
 
   # Whether disable Caching queries
   #disableCache: true

.config/example.yml

@@ -1,5 +1,5 @@
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-# Misskey configuration
+# Forkey configuration
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 #   ┌─────┐
@@ -15,11 +15,11 @@ url: https://example.tld/
 #───┘ Port and TLS settings └───────────────────────────────────
 
 #
-# Misskey requires a reverse proxy to support HTTPS connections.
+# Forkey requires a reverse proxy to support HTTPS connections.
 #
 #                 +----- https://example.tld/ ------------+
 #   +------+      |+-------------+      +----------------+|
-#   | User | ---> || Proxy (443) | ---> | Misskey (3000) ||
+#   | User | ---> || Proxy (443) | ---> | Forkey (3000) ||
 #   +------+      |+-------------+      +----------------+|
 #                 +---------------------------------------+
 #
@@ -27,7 +27,7 @@ url: https://example.tld/
 #   An encrypted connection with HTTPS is highly recommended
 #   because tokens may be transferred in GET requests.
 
-# The port that your Misskey server should listen on.
+# The port that your Forkey server should listen on.
 port: 3000
 
 # You can also use UNIX domain socket.
@@ -42,11 +42,11 @@ db:
   port: 5432
 
   # Database name
-  db: misskey
+  db: forkey
 
   # Auth
-  user: example-misskey-user
-  pass: example-misskey-pass
+  user: example-forkey-user
+  pass: example-forkey-pass
 
   # Whether disable Caching queries
   #disableCache: true
@@ -206,7 +206,7 @@ proxyRemoteFiles: true
 
 # Movie Thumbnail Generation URL
 # There is no reference implementation.
-# For example, Misskey will point to the following URL:
+# For example, Forkey will point to the following URL:
 #   https://example.com/thumbnail.webp?thumbnail=1&url=https%3A%2F%2Fstorage.example.com%2Fpath%2Fto%2Fvideo.mp4
 #videoThumbnailGenerator: https://example.com
 

.dockerignore

@@ -1,7 +1,7 @@
 **/.git
 
 .autogen
-.github
+.forgejo
 .travis
 .vscode
 .config

.forgejo/misskey/test-forgejo.yml

@@ -0,0 +1,16 @@
+# Workaround for Forgejo not supporting port redirection
+
+url: 'http://misskey.local'
+
+port: 61812
+
+db:
+  host: postgres
+  port: 5432
+  db: test-misskey
+  user: postgres
+  pass: ''
+redis:
+  host: dragonfly
+  port: 6379
+id: aidx

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

@@ -17,11 +17,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
           submodules: true
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v4.0.0
         with:
           run_install: false
 

.forgejo/workflows/check-misskey-js-version.yml

@@ -3,9 +3,7 @@ name: Check Misskey JS version
 on:
   push:
     branches:
-      - beta
-      - io
-      - host
+      - main
     paths:
       - packages/misskey-js/package.json
       - package.json
@@ -23,7 +21,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
           submodules: true
       - name: Check version
         run: |

.forgejo/workflows/lint.yml

@@ -3,9 +3,7 @@ name: Lint
 on:
   push:
     branches:
-      - beta
-      - io
-      - host
+      - main
     paths:
       - packages/backend/**
       - packages/frontend/**
@@ -26,9 +24,8 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       with:
-        fetch-depth: 0
         submodules: true
-    - uses: pnpm/action-setup@v4
+    - uses: pnpm/action-setup@v4.0.0
       with:
         run_install: false
     - uses: actions/setup-node@v4.1.0
@@ -51,9 +48,8 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       with:
-        fetch-depth: 0
         submodules: true
-    - uses: pnpm/action-setup@v4
+    - uses: pnpm/action-setup@v4.0.0
       with:
         run_install: false
     - uses: actions/setup-node@v4.1.0
@@ -75,9 +71,8 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       with:
-        fetch-depth: 0
         submodules: true
-    - uses: pnpm/action-setup@v4
+    - uses: pnpm/action-setup@v4.0.0
       with:
         run_install: false
     - uses: actions/setup-node@v4.1.0

.forgejo/workflows/test-backend.yml

@@ -3,9 +3,7 @@ name: Test (backend)
 on:
   push:
     branches:
-      - beta
-      - io
-      - host
+      - main
     paths:
       - packages/backend/**
       # for permissions
@@ -27,8 +25,6 @@ jobs:
     services:
       postgres:
         image: postgres:15
-        ports:
-          - 54312:5432
         env:
           POSTGRES_DB: test-misskey
           POSTGRES_HOST_AUTH_METHOD: trust
@@ -44,20 +40,17 @@ jobs:
           DFLY_conn_io_threads: 4
           DFLY_epoll_file_threads: 4
           DFLY_proactor_threads: 4
-        ports:
-          - 56312:6379
 
     steps:
     - uses: actions/checkout@v4
       with:
-        fetch-depth: 0
         submodules: true
     - name: Install pnpm
-      uses: pnpm/action-setup@v4
+      uses: pnpm/action-setup@v4.0.0
       with:
         run_install: false
     - name: Install FFmpeg
-      uses: FedericoCarboni/setup-ffmpeg@v3
+      uses: https://github.com/FedericoCarboni/setup-ffmpeg@v3
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v4.1.0
       with:
@@ -67,16 +60,11 @@ jobs:
     - name: Check pnpm-lock.yaml
       run: git diff --exit-code pnpm-lock.yaml
     - name: Copy Configure
-      run: cp .github/misskey/test.yml .config
+      run: cp .forgejo/misskey/test-forgejo.yml .config/test.yml
     - name: Build
       run: pnpm build
     - name: Test
-      run: pnpm --filter backend test-and-coverage
-    - name: Upload to Codecov
-      uses: codecov/codecov-action@v5
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        files: ./packages/backend/coverage/coverage-final.json
+      run: pnpm --filter backend test
 
   e2e:
     runs-on: ubuntu-latest
@@ -88,8 +76,6 @@ jobs:
     services:
       postgres:
         image: postgres:15
-        ports:
-          - 54312:5432
         env:
           POSTGRES_DB: test-misskey
           POSTGRES_HOST_AUTH_METHOD: trust
@@ -105,16 +91,13 @@ jobs:
           DFLY_conn_io_threads: 4
           DFLY_epoll_file_threads: 4
           DFLY_proactor_threads: 4
-        ports:
-          - 56312:6379
 
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 0
           submodules: true
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v4.0.0
         with:
           run_install: false
       - name: Use Node.js ${{ matrix.node-version }}
@@ -126,13 +109,8 @@ jobs:
       - name: Check pnpm-lock.yaml
         run: git diff --exit-code pnpm-lock.yaml
       - name: Copy Configure
-        run: cp .github/misskey/test.yml .config
+        run: cp .forgejo/misskey/test-forgejo.yml .config/test.yml
       - name: Build
         run: pnpm build
       - name: Test
-        run: pnpm --filter backend test-and-coverage:e2e
-      - name: Upload to Codecov
-        uses: codecov/codecov-action@v5
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: ./packages/backend/coverage/coverage-final.json
+        run: pnpm --filter backend test:e2e

.forgejo/workflows/test-frontend.yml

@@ -32,10 +32,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       with:
-        fetch-depth: 0
         submodules: true
     - name: Install pnpm
-      uses: pnpm/action-setup@v4
+      uses: pnpm/action-setup@v4.0.0
       with:
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
@@ -47,13 +46,8 @@ jobs:
     - name: Check pnpm-lock.yaml
       run: git diff --exit-code pnpm-lock.yaml
     - name: Copy Configure
-      run: cp .github/misskey/test.yml .config
+      run: cp .forgejo/misskey/test-forgejo.yml .config/test.yml
     - name: Build
       run: pnpm build
     - name: Test
-      run: pnpm --filter frontend test-and-coverage
-    - name: Upload Coverage
-      uses: codecov/codecov-action@v5
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        files: ./packages/frontend/coverage/coverage-final.json
+      run: pnpm --filter frontend test

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

@@ -6,9 +6,7 @@ name: Test (misskey.js)
 on:
   push:
     branches:
-      - beta
-      - io
-      - host
+      - main
     paths:
       - packages/misskey-js/**
   pull_request:
@@ -29,11 +27,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
           submodules: true
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v4.0.0
         with:
           run_install: false
 
@@ -56,9 +53,3 @@ jobs:
         run: pnpm --filter misskey-js test
         env:
           CI: true
-
-      - name: Upload Coverage
-        uses: codecov/codecov-action@v5
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: ./packages/misskey-js/coverage/coverage-final.json

.forgejo/workflows/test-production.yml

@@ -3,9 +3,7 @@ name: Test (production install and build)
 on:
   push:
     branches:
-      - beta
-      - io
-      - host
+      - main
   pull_request:
 
 env:
@@ -22,10 +20,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       with:
-        fetch-depth: 0
         submodules: true
     - name: Install pnpm
-      uses: pnpm/action-setup@v4
+      uses: pnpm/action-setup@v4.0.0
       with:
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
@@ -37,6 +34,6 @@ jobs:
     - name: Check pnpm-lock.yaml
       run: git diff --exit-code pnpm-lock.yaml
     - name: Copy Configure
-      run: cp .github/misskey/test.yml .config/default.yml
+      run: cp .forgejo/misskey/test-forgejo.yml .config/default.yml
     - name: Build
       run: pnpm build

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

@@ -3,9 +3,7 @@ name: Test (backend)
 on:
   push:
     branches:
-      - beta
-      - io
-      - host
+      - main
     paths:
       - packages/backend/**
   pull_request:
@@ -23,10 +21,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       with:
-        fetch-depth: 0
         submodules: true
     - name: Install pnpm
-      uses: pnpm/action-setup@v4
+      uses: pnpm/action-setup@v4.0.0
       with:
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}

.github/workflows/docker-beta.yml

@@ -1,52 +0,0 @@
-name: Publish Docker image (beta)
-
-on:
-  push:
-    branches:
-      - beta
-  workflow_dispatch:
-
-jobs:
-  push_to_registry:
-    name: Push Docker image to GitHub Container Registry
-    runs-on: ubuntu-22.04
-    if: github.repository == 'MisskeyIO/misskey'
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          submodules: true
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          platforms: linux/amd64
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ghcr.io/misskeyio/misskey
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Prepare image tags
-        run: |
-          echo "FORMATTED_BRANCH_NAME=$(echo ${{ github.ref_name }} | sed -e 's/\//-/g' )" >> $GITHUB_ENV
-      - name: Build and Push to GitHub Container Registry
-        uses: docker/build-push-action@v6
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          push: true
-          platforms: ${{ steps.buildx.outputs.platforms }}
-          provenance: false
-          labels: ${{ env.FORMATTED_BRANCH_NAME }}
-          cache-from: type=registry,ref=ghcr.io/misskeyio/misskey:io-buildcache
-          cache-to: type=registry,ref=ghcr.io/misskeyio/misskey:io-buildcache,mode=max
-          tags: |
-            ghcr.io/misskeyio/misskey:beta
-            ghcr.io/misskeyio/misskey:${{ env.FORMATTED_BRANCH_NAME }}

.github/workflows/docker-host.yml

@@ -1,54 +0,0 @@
-name: Publish Docker image (host)
-
-on:
-  push:
-    branches:
-      - host
-    tags:
-      - '**-host.*'
-  workflow_dispatch:
-
-jobs:
-  push_to_registry:
-    name: Push Docker image to GitHub Container Registry
-    runs-on: ubuntu-22.04
-    if: github.repository == 'MisskeyIO/misskey'
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          submodules: true
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          platforms: linux/amd64
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ghcr.io/misskeyio/misskey
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Prepare image tags
-        run: |
-          echo "FORMATTED_BRANCH_NAME=$(echo ${{ github.ref_name }} | sed -e 's/\//-/g' )" >> $GITHUB_ENV
-      - name: Build and Push to GitHub Container Registry
-        uses: docker/build-push-action@v6
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          push: true
-          platforms: ${{ steps.buildx.outputs.platforms }}
-          provenance: false
-          labels: ${{ env.FORMATTED_BRANCH_NAME }}
-          cache-from: type=registry,ref=ghcr.io/misskeyio/misskey:host-buildcache
-          cache-to: type=registry,ref=ghcr.io/misskeyio/misskey:host-buildcache,mode=max
-          tags: |
-            ghcr.io/misskeyio/misskey:host
-            ghcr.io/misskeyio/misskey:${{ env.FORMATTED_BRANCH_NAME }}

.github/workflows/docker-io.yml

@@ -1,54 +0,0 @@
-name: Publish Docker image (io)
-
-on:
-  push:
-    branches:
-      - io
-    tags:
-      - '**-io.*'
-  workflow_dispatch:
-
-jobs:
-  push_to_registry:
-    name: Push Docker image to GitHub Container Registry
-    runs-on: ubuntu-22.04
-    if: github.repository == 'MisskeyIO/misskey'
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          submodules: true
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          platforms: linux/amd64
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ghcr.io/misskeyio/misskey
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Prepare image tags
-        run: |
-          echo "FORMATTED_BRANCH_NAME=$(echo ${{ github.ref_name }} | sed -e 's/\//-/g' )" >> $GITHUB_ENV
-      - name: Build and Push to GitHub Container Registry
-        uses: docker/build-push-action@v6
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          push: true
-          platforms: ${{ steps.buildx.outputs.platforms }}
-          provenance: false
-          labels: ${{ env.FORMATTED_BRANCH_NAME }}
-          cache-from: type=registry,ref=ghcr.io/misskeyio/misskey:io-buildcache
-          cache-to: type=registry,ref=ghcr.io/misskeyio/misskey:io-buildcache,mode=max
-          tags: |
-            ghcr.io/misskeyio/misskey:latest
-            ghcr.io/misskeyio/misskey:${{ env.FORMATTED_BRANCH_NAME }}

.github/workflows/dockle.yml

@@ -1,38 +0,0 @@
-name: Dockle
-
-on:
-  push:
-    branches:
-      - beta
-      - io
-      - host
-  pull_request:
-
-jobs:
-  dockle:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          submodules: true
-      - name: Build an image from Dockerfile
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: false
-          provenance: false
-          cache-from: type=registry,ref=ghcr.io/misskeyio/misskey:io-buildcache
-          tags: |
-            misskey:scan
-      - name: Run dockle
-        uses: docker://goodwithtech/dockle:v0.4.14
-        env:
-          DOCKLE_OUTPUT_FORMAT: list
-          DOCKLE_EXIT_CODE: 1
-          DOCKLE_EXIT_LEVEL: WARN
-          DOCKLE_IGNORES: CIS-DI-0005,CIS-DI-0010
-          DOCKLE_DEBUG: true
-        with:
-          args: 'misskey:scan'

.github/workflows/labeler.yml

@@ -1,16 +0,0 @@
-name: "Pull Request Labeler"
-on:
-  pull_request_target:
-    branches-ignore:
-      - 'l10n_develop'
-
-jobs:
-  triage:
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/labeler@v5
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"

CONTRIBUTING.md

@@ -1,5 +1,5 @@
 # Contribution guide
-We're glad you're interested in contributing Misskey! In this document you will find the information you need to contribute to the project.
+We're glad you're interested in contributing Forkey! In this document you will find the information you need to contribute to the project.
 
 > **Note**
 > This project uses Japanese as its major language, **but you do not need to translate and write the Issues/PRs in Japanese.**
@@ -161,7 +161,7 @@ pnpm dev
 ### Run test
 Create a config file.
 ```
-cp .github/misskey/test.yml .config/
+cp .forgejo/misskey/test.yml .config/
 ```
 Prepare DB/Redis for testing.
 ```
@@ -188,8 +188,8 @@ TODO
 - `MISSKEY_WEBFINGER_USE_HTTP`: If it's set true, WebFinger requests will be http instead of https, useful for testing federation between servers in localhost. NEVER USE IN PRODUCTION.
 
 ## Continuous integration
-Misskey uses GitHub Actions for executing automated tests.
-Configuration files are located in [`/.github/workflows`](/.github/workflows).
+Misskey uses Forgejo Actions for executing automated tests.
+Configuration files are located in [`/.forgejo/workflows`](/.forgejo/workflows).
 
 ## Vue
 Misskey uses Vue(v3) as its front-end framework.

Dockerfile

@@ -14,7 +14,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 	&& apt-get install -yqq --no-install-recommends \
 	build-essential
 
-WORKDIR /misskey
+WORKDIR /forkey
 
 COPY --link pnpm-lock.yaml ./
 RUN npm install -g pnpm
@@ -45,7 +45,7 @@ RUN apt-get update \
 	&& apt-get install -yqq --no-install-recommends \
 	build-essential
 
-WORKDIR /misskey
+WORKDIR /forkey
 
 COPY --link pnpm-lock.yaml ./
 RUN npm install -g pnpm
@@ -71,8 +71,8 @@ RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \
 	curl ffmpeg libjemalloc-dev libjemalloc2 tini \
 	&& ln -s /usr/lib/$(uname -m)-linux-gnu/libjemalloc.so.2 /usr/local/lib/libjemalloc.so \
-	&& groupadd -g "${GID}" misskey \
-	&& useradd -l -u "${UID}" -g "${GID}" -m -d /misskey misskey \
+	&& groupadd -g "${GID}" forkey \
+	&& useradd -l -u "${UID}" -g "${GID}" -m -d /forkey forkey \
 	&& 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 \
@@ -80,27 +80,27 @@ RUN apt-get update \
 
 WORKDIR /misskey
 
-COPY --chown=misskey:misskey pnpm-lock.yaml ./
+COPY --chown=forkey:forkey pnpm-lock.yaml ./
 RUN npm install -g pnpm
 
-COPY --chown=misskey:misskey --from=target-builder /misskey/node_modules ./node_modules
-COPY --chown=misskey:misskey --from=target-builder /misskey/packages/backend/node_modules ./packages/backend/node_modules
-COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-js/node_modules ./packages/misskey-js/node_modules
-COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-reversi/node_modules ./packages/misskey-reversi/node_modules
-COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-bubble-game/node_modules ./packages/misskey-bubble-game/node_modules
-COPY --chown=misskey:misskey --from=native-builder /misskey/built ./built
-COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-js/built ./packages/misskey-js/built
-COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-reversi/built ./packages/misskey-reversi/built
-COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-bubble-game/built ./packages/misskey-bubble-game/built
-COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/built ./packages/backend/built
-COPY --chown=misskey:misskey --from=native-builder /misskey/fluent-emojis /misskey/fluent-emojis
-COPY --chown=misskey:misskey . ./
+COPY --chown=forkey:forkey --from=target-builder /forkey/node_modules ./node_modules
+COPY --chown=forkey:forkey --from=target-builder /forkey/packages/backend/node_modules ./packages/backend/node_modules
+COPY --chown=forkey:forkey --from=target-builder /forkey/packages/misskey-js/node_modules ./packages/misskey-js/node_modules
+COPY --chown=forkey:forkey --from=target-builder /forkey/packages/misskey-reversi/node_modules ./packages/misskey-reversi/node_modules
+COPY --chown=forkey:forkey --from=target-builder /forkey/packages/misskey-bubble-game/node_modules ./packages/misskey-bubble-game/node_modules
+COPY --chown=forkey:forkey --from=native-builder /forkey/built ./built
+COPY --chown=forkey:forkey --from=native-builder /forkey/packages/misskey-js/built ./packages/misskey-js/built
+COPY --chown=forkey:forkey --from=native-builder /forkey/packages/misskey-reversi/built ./packages/misskey-reversi/built
+COPY --chown=forkey:forkey --from=native-builder /forkey/packages/misskey-bubble-game/built ./packages/misskey-bubble-game/built
+COPY --chown=forkey:forkey --from=native-builder /forkey/packages/backend/built ./packages/backend/built
+COPY --chown=forkey:forkey --from=native-builder /forkey/fluent-emojis /forkey/fluent-emojis
+COPY --chown=forkey:forkey . ./
 
-USER misskey
+USER forkey
 ENV LD_PRELOAD=/usr/local/lib/libjemalloc.so
 ENV MALLOC_CONF=background_thread:true,metadata_thp:auto,dirty_decay_ms:30000,muzzy_decay_ms:30000
 ENV TF_CPP_MIN_LOG_LEVEL=2
 ENV NODE_ENV=production
-HEALTHCHECK --interval=5s --retries=20 CMD ["/bin/bash", "/misskey/healthcheck.sh"]
+HEALTHCHECK --interval=5s --retries=20 CMD ["/bin/bash", "/forkey/healthcheck.sh"]
 ENTRYPOINT ["/usr/bin/tini", "--"]
 CMD ["pnpm", "run", "migrateandstart:docker"]

README.md

@@ -1,9 +1,9 @@
 <div align="center">
 <a href="https://misskey-hub.net">
-	<img src="./assets/title_float.svg" alt="Misskey logo" style="border-radius:50%" width="300"/>
+	<img src="./assets/title_float.svg" alt="Forkey logo" style="border-radius:50%" width="300"/>
 </a>
 
-**🌎 **Misskey** is an open source, federated social media platform that's free forever! 🚀**
+**🌎 **Forkey** is an open source, federated social media platform that's free forever! 🚀**
 
 [Learn more](https://misskey-hub.net/)
 

chart/templates/Deployment.yml

@@ -30,11 +30,11 @@ spec:
           image: postgres:15-alpine
           env:
             - name: POSTGRES_USER
-              value: "example-misskey-user"
+              value: "example-forkey-user"
             - name: POSTGRES_PASSWORD
-              value: "example-misskey-pass"
+              value: "example-forkey-pass"
             - name: POSTGRES_DB
-              value: "misskey"
+              value: "forkey"
           ports:
             - containerPort: 5432
         - name: dragonfly

docker-compose_example.yml

@@ -20,8 +20,8 @@ services:
       - internal_network
       - external_network
     volumes:
-      - ./files:/misskey/files
-      - ./.config:/misskey/.config:ro
+      - ./files:/forkey/files
+      - ./.config:/forkey/.config:ro
 
   dragonfly:
     restart: always

healthcheck.sh

@@ -3,5 +3,5 @@
 # SPDX-FileCopyrightText: syuilo and misskey-project
 # SPDX-License-Identifier: AGPL-3.0-only
 
-PORT=$(grep '^port:' /misskey/.config/default.yml | awk 'NR==1{print $2; exit}')
+PORT=$(grep '^port:' /forkey/.config/default.yml | awk 'NR==1{print $2; exit}')
 curl -s -S -o /dev/null "http://localhost:${PORT}"

locales/ca-ES.yml

@@ -1458,7 +1458,7 @@ _achievements:
     _login1000:
       title: "Mestre de les Notes III"
       description: "Vas iniciar sessió fa mil dies"
-      flavor: "Gràcies per fer servir MissKey!"
+      flavor: "Gràcies per fer servir Forkey!"
     _noteClipped1:
       title: "He de retallar-te!"
       description: "Retalla la teva primera nota"
@@ -1518,9 +1518,9 @@ _achievements:
       title: "M'agraden els èxits "
       description: "Mira la teva llista d'assoliments durant més de 3 minuts"
     _iLoveMisskey:
-      title: "Estimo Misskey"
-      description: "Publica \"I ❤ #Misskey\""
-      flavor: "L'equip de desenvolupament de Misskey agraeix el vostre suport!"
+      title: "Estimo Forkey"
+      description: "Publica \"I ❤ #Forkey\""
+      flavor: "L'equip de desenvolupament de Forkey agraeix el vostre suport!"
     _foundTreasure:
       title: "A la Recerca del Tresor"
       description: "Has trobat el tresor amagat"
@@ -1599,7 +1599,7 @@ _achievements:
       title: "Sobrecàrrega de proves"
       description: "Envia moltes notificacions de prova en un període de temps molt curt"
     _tutorialCompleted:
-      title: "Diploma del Curs Elemental de Misskey"
+      title: "Diploma del Curs Elemental de Forkey"
       description: "Has completat el tutorial"
     _bubbleGameExplodingHead:
       title: "🤯"

locales/cs-CZ.yml

@@ -1235,7 +1235,7 @@ _achievements:
     _login1000:
       title: "Mistr poznámek III"
       description: "Přihlaste se celkově za 1000 dní"
-      flavor: "Děkujeme, že používáte Misskey!"
+      flavor: "Děkujeme, že používáte Forkey!"
     _noteClipped1:
       title: "Musím... připnout..."
       description: "Připněte si první poznámku"
@@ -1295,9 +1295,9 @@ _achievements:
       title: "Máš rád úspěchy"
       description: "Koukejte na váš seznam úspěchů alespoň po dobu 3 minut"
     _iLoveMisskey:
-      title: "Miluju Misskey"
-      description: "Zveřejněte \" I ❤ #Misskey\""
-      flavor: "Vývojový tým Misskey si velmi váží vaší podpory!"
+      title: "Miluju Forkey"
+      description: "Zveřejněte \" I ❤ #Forkey\""
+      flavor: "Vývojový tým Forkey si velmi váží vaší podpory!"
     _foundTreasure:
       title: "Hon za pokladem"
       description: "Našli jste schovaný poklad!"

locales/de-DE.yml

@@ -166,7 +166,7 @@ youCanCleanRemoteFilesCache: "Klicke auf den 🗑️-Knopf der Dateiverwaltungsa
 cacheRemoteSensitiveFiles: "Sensitive Dateien von fremden Instanzen im Cache speichern"
 cacheRemoteSensitiveFilesDescription: "Ist diese Einstellung deaktiviert, so werden sensitive Dateien fremder Instanzen direkt von dort ohne Zwischenspeicherung geladen."
 flagAsBot: "Als Bot markieren"
-flagAsBotDescription: "Aktiviere diese Option, falls dieses Benutzerkonto durch ein Programm gesteuert wird. Falls aktiviert, agiert es als Flag für andere Entwickler zur Verhinderung von endlosen Kettenreaktionen mit anderen Bots und lässt Misskeys interne Systeme dieses Benutzerkonto als Bot behandeln."
+flagAsBotDescription: "Aktiviere diese Option, falls dieses Benutzerkonto durch ein Programm gesteuert wird. Falls aktiviert, agiert es als Flag für andere Entwickler zur Verhinderung von endlosen Kettenreaktionen mit anderen Bots und lässt forkeys interne Systeme dieses Benutzerkonto als Bot behandeln."
 flagAsCat: "Als Katze markieren"
 flagAsCatDescription: "Aktiviere diese Option, um dieses Benutzerkonto als Katze zu markieren."
 flagShowTimelineReplies: "Antworten in der Chronik anzeigen"
@@ -1374,7 +1374,7 @@ _achievements:
     _login1000:
       title: "Meister der Notizen Ⅲ"
       description: "An 1000 Tagen eingeloggt"
-      flavor: "Danke, dass du Misskey nutzt!"
+      flavor: "Danke, dass du Forkey nutzt!"
     _noteClipped1:
       title: "Muss... clippen..."
       description: "Die erste Notiz geclippt"
@@ -1434,9 +1434,9 @@ _achievements:
       title: "Fan von Errungenschaften"
       description: "Schau dir die Liste deiner Errungenschaften für mindestens 3 Minuten an"
     _iLoveMisskey:
-      title: "I Love Misskey"
-      description: "Sende \"I ❤ #Misskey\""
-      flavor: "Danke, dass du Misskey verwendest! - vom Entwicklerteam"
+      title: "I Love Forkey"
+      description: "Sende \"I ❤ #Forkey\""
+      flavor: "Danke, dass du Forkey verwendest! - vom Entwicklerteam"
     _foundTreasure:
       title: "Schatzsuche"
       description: "Du hast einen verborgenen Schatz gefunden"

locales/en-US.yml

@@ -175,6 +175,8 @@ flagAsBot: "Mark this account as a bot"
 flagAsBotDescription: "Enable this option if this account is controlled by a program. If enabled, it will act as a flag for other developers to prevent endless interaction chains with other bots and adjust Misskey's internal systems to treat this account as a bot."
 flagAsCat: "Mark this account as a cat"
 flagAsCatDescription: "Enable this option to mark this account as a cat."
+flagSpeakAsCat: "Speak as a cat"
+flagSpeakAsCatDescription: "Your posts will get nyanified when in cat mode. If this isn't working, then please check that you dont have 'Disable cat speak' on under General/Note Display"
 flagShowTimelineReplies: "Show replies in timeline"
 flagShowTimelineRepliesDescription: "Shows replies of users to notes of other users in the timeline if turned on."
 autoAcceptFollowed: "Automatically approve follow requests from users you're following"
@@ -437,6 +439,7 @@ popularTags: "Popular tags"
 userList: "Lists"
 about: "About"
 aboutMisskey: "About Misskey"
+aboutForkey: "About Forkey"
 administrator: "Administrator"
 token: "Token"
 2fa: "Two-factor authentication"
@@ -761,6 +764,7 @@ noCrawleDescription: "Ask search engines to not index your profile page, notes,
 lockedAccountInfo: "Unless you set your note visiblity to \"Followers only\", your notes will be visible to anyone, even if you require followers to be manually approved."
 alwaysMarkSensitive: "Mark as sensitive by default"
 loadRawImages: "Load original images instead of showing thumbnails"
+disableCatSpeak: "Disable cat speak"
 disableShowingAnimatedImages: "Don't play animated images"
 highlightSensitiveMedia: "Highlight sensitive media"
 verificationEmailSent: "A verification email has been sent. Please follow the included link to complete verification."
@@ -1332,6 +1336,14 @@ consentAll: "Allow All Items"
 consentSelected: "Allow Selected Items"
 emailAddressLogin: "Login with email address"
 usernameLogin: "Login with username"
+autoloadDrafts: "Automatically load drafts when opening the posting form"
+drafts: "Drafts"
+unsent: "Unsent"
+schedule: "Schedule"
+scheduled: "Scheduled"
+unschedule: "Unschedule"
+setScheduledTime: "Set scheduled time"
+willBePostedAt: "Note will be posted at {x}"
 
 _bubbleGame:
   howToPlay: "How to play"
@@ -1372,8 +1384,8 @@ _abuseReportCategory:
   otherBreach_description: "Other actions that violate the terms but do not fall under specific categories"
   violationRights: "Rights Infringement or Impersonation (Reported by Rights Holder)"
   violationRights_description: "Posts infringing the rights (such as copyright or trademark) of the rights holder or impersonation"
-  violationRightsOther: "Rights Infringement or Impersonation (Reported by Third Party)"
-  violationRightsOther_description: "Posts infringing the rights (such as copyright or trademark) of others or impersonation\nIf reported by a third party, cases outside the scope of non-complaint offenses as defined by law may not be addressed"
+  violationRightsOther: "Rights Infringement (Reported by Third Party)"
+  violationRightsOther_description: "Posts infringing the rights (such as copyright or trademark) of others\nIf reported by a third party, cases outside the scope of non-complaint offenses as defined by law may not be addressed"
   notLike: "Dislike This Person"
   notLike_description: "Users or posts that you find unpleasant for personal reasons"
   other: "Other"
@@ -1510,9 +1522,9 @@ _achievements:
   earnedAt: "Unlocked at"
   _types:
     _notes1:
-      title: "just setting up my msky"
+      title: "just setting up my forkey"
       description: "Post your first note"
-      flavor: "Have a good time with Misskey!"
+      flavor: "Have a good time with Forkey!"
     _notes10:
       title: "Some notes"
       description: "Post 10 notes"
@@ -1608,7 +1620,7 @@ _achievements:
     _login1000:
       title: "Master of Notes III"
       description: "Log in for a total of 1,000 days"
-      flavor: "Thank you for using Misskey!"
+      flavor: "Thank you for using Forkey!"
     _noteClipped1:
       title: "Must... clip..."
       description: "Clip your first note"
@@ -1668,9 +1680,9 @@ _achievements:
       title: "Likes Achievements"
       description: "Look at your list of achievements for at least 3 minutes"
     _iLoveMisskey:
-      title: "I Love Misskey"
-      description: "Post \"I ❤ #Misskey\""
-      flavor: "Misskey's development team greatly appreciates your support!"
+      title: "I Love Forkey"
+      description: "Post \"I ❤ #Forkey\""
+      flavor: "Forkey's development team greatly appreciates your support!"
     _foundTreasure:
       title: "Treasure Hunt"
       description: "You've found the hidden treasure"
@@ -1749,7 +1761,7 @@ _achievements:
       title: "Test overflow"
       description: "Trigger the notification test repeatedly within an extremely short time"
     _tutorialCompleted:
-      title: "Misskey Elementary Course Diploma"
+      title: "Forkey Elementary Course Diploma"
       description: "Tutorial completed"
     _bubbleGameExplodingHead:
       title: "🤯"
@@ -1800,6 +1812,9 @@ _role:
     gtlAvailable: "Can view the global timeline"
     ltlAvailable: "Can view the local timeline"
     canPublicNote: "Can send public notes"
+    canScheduleNote: "Can schedule notes"
+    scheduleNoteLimit: "Maximum number of scheduled notes"
+    scheduleNoteMaxDays: "Maximum number of days that note can be scheduled"
     canInitiateConversation: "Can mention, reply or quote"
     canCreateContent: "Can create contents"
     canUpdateContent: "Can edit contents"
@@ -1947,13 +1962,17 @@ _aboutMisskey:
   contributors: "Main contributors"
   allContributors: "All contributors"
   source: "Source code"
-  original: "Original"
+  original: "Misskey Original"
   thisIsModifiedVersion: "{name} uses a modified version of the original Misskey."
   translation: "Translate Misskey"
   donate: "Donate to Misskey"
   morePatrons: "We also appreciate the support of many other helpers not listed here. Thank you! 🥰"
   patrons: "Patrons"
-  projectMembers: "Project members"
+  projectMembers: "Misskey Project members"
+_aboutForkey:
+  about: "Forkey is open-source software based on Misskey which has been in development by syuilo since 2014."
+  original: "Forkey Original"
+  projectMembers: "Forkey Project Members"
 _displayOfSensitiveMedia:
   respect: "Hide media marked as sensitive"
   ignore: "Display media marked as sensitive"
@@ -2224,6 +2243,7 @@ _permissions:
   "read:clip-favorite": "View favorited clips"
   "read:federation": "Get federation data"
   "write:report-abuse": "Report violation"
+  "write:push-notification": "Receive push notifications"
 _auth:
   shareAccessTitle: "Granting application permissions"
   shareAccess: "Would you like to authorize \"{name}\" to access this account?"
@@ -2332,6 +2352,8 @@ _postForm:
     d: "What do you want to say?"
     e: "Start writing..."
     f: "Waiting for you to write..."
+  policyScheduleNoteMaxDaysExceeded: "The maximum number of days you can schedule notes for with your current support plan is {max}.\nYou can upgrade your plan [here](https://go.misskey.io/donate)."
+  tosAndGuidelinesInfo: "Before posting, please read the [Terms of Service]({tosUrl}) and [NSFW Guidelines](https://go.misskey.io/media-guideline)."
 _profile:
   name: "Name"
   username: "Username"
@@ -2356,7 +2378,7 @@ _profile:
   sectionName: "Section name"
   sectionNameNoneDescription: "Do not display the section name"
   sectionNameNone: "Section without name"
-  policyDisplayLimitExceeded: "The number of items displayed exceeds the current support plan's limit ({max}). This item will not be displayed. You can upgrade your plan [here](https://go.misskey.io/donate)."
+  policyDisplayLimitExceeded: "The number of items displayed exceeds the current support plan's limit ({max}). This item will not be displayed.\nYou can upgrade your plan [here](https://go.misskey.io/donate)."
 _exportOrImport:
   allNotes: "All notes"
   favoritedNotes: "Favorite notes"
@@ -2489,6 +2511,9 @@ _notification:
   roleAssigned: "Role given"
   emptyPushNotificationMessage: "Push notifications have been updated"
   achievementEarned: "Achievement unlocked"
+  noteScheduled: "Note has been scheduled"
+  scheduledNotePosted: "Scheduled note has been posted"
+  scheduledNoteError: "Scheduled note has problem with posting"
   testNotification: "Test notification"
   checkNotificationBehavior: "Check notification appearance"
   sendTestNotification: "Send test notification"
@@ -2512,6 +2537,9 @@ _notification:
     followRequestAccepted: "Accepted follow requests"
     roleAssigned: "Role given"
     achievementEarned: "Achievement unlocked"
+    noteScheduled: "Note scheduled"
+    scheduledNotePosted: "Scheduled note posted"
+    scheduledNoteError: "Problem with scheduled note"
     app: "Notifications from linked apps"
   _actions:
     followBack: "followed you back"

locales/es-ES.yml

@@ -1476,7 +1476,7 @@ _achievements:
     _login1000:
       title: "Maestro III"
       description: "Días desde el inicio de sesión: 1000"
-      flavor: "¡Gracias por usar Misskey!"
+      flavor: "¡Gracias por usar Forkey!"
     _noteClipped1:
       title: "No puedo evitar clipearte..."
       description: "Hacer un clip por primera vez"
@@ -1536,9 +1536,9 @@ _achievements:
       title: "¡Te gustan los logros!"
       description: "Mirando tus logros por 3 minutos"
     _iLoveMisskey:
-      title: "¡AMO Misskey!"
-      description: "\"I ❤ #Misskey\" Publicado"
-      flavor: "El equipo de desarrollo de Misskey, en verdad, ¡aprecia tu apoyo!"
+      title: "¡AMO Forkey!"
+      description: "\"I ❤ #Forkey\" Publicado"
+      flavor: "El equipo de desarrollo de Forkey, en verdad, ¡aprecia tu apoyo!"
     _foundTreasure:
       title: "Búsqueda del tesoro"
       description: "Encontraste un tesoro"
@@ -1617,7 +1617,7 @@ _achievements:
       title: "Sobrecarga de pruebas"
       description: "Envía muchas notificaciones de prueba en un corto espacio de tiempo"
     _tutorialCompleted:
-      title: "Diploma del Curso Básico de Misskey"
+      title: "Diploma del Curso Básico de Forkey"
       description: "Tutorial completado"
     _bubbleGameExplodingHead:
       title: "🤯"

locales/fr-FR.yml

@@ -1393,7 +1393,7 @@ _achievements:
     _login900:
       description: "Se connecter pour un total de 900 jours"
     _login1000:
-      flavor: "Merci d'utiliser Misskey !"
+      flavor: "Merci d'utiliser Forkey !"
     _profileFilled:
       title: "Bien préparé"
       description: "Configuration de votre profil"
@@ -1429,9 +1429,9 @@ _achievements:
       title: "Influenceur·euse"
       description: "Obtenir plus de 1000 abonné·e·s"
     _iLoveMisskey:
-      title: "J’adore Misskey"
-      description: "Publication « J’❤ #Misskey »"
-      flavor: "L'équipe de développement de Misskey apprécie vraiment votre aide !"
+      title: "J’adore Forkey"
+      description: "Publication « J’❤ #Forkey »"
+      flavor: "L'équipe de développement de Forkey apprécie vraiment votre aide !"
     _foundTreasure:
       title: "Chasse au trésor"
       description: "Vous avez trouvé le trésor caché"
@@ -1472,7 +1472,7 @@ _achievements:
       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"
+      title: "Diplôme de la course élémentaire de Forkey"
       description: "Terminer le tutoriel"
 _role:
   new: "Nouveau rôle"

locales/id-ID.yml

@@ -1478,7 +1478,7 @@ _achievements:
     _login1000:
       title: "Sepuh Catatan III"
       description: "Login selama 1000 hari"
-      flavor: "Terima kasih telah menggunakan Misskey!"
+      flavor: "Terima kasih telah menggunakan Forkey!"
     _noteClipped1:
       title: "Harus... Ngeklip..."
       description: "Klip catatan pertamamu"
@@ -1538,9 +1538,9 @@ _achievements:
       title: "Suka Pencapaian"
       description: "Lugat daftar pencapaianmu setidaknya 3 menit"
     _iLoveMisskey:
-      title: "I Love Misskey"
-      description: "Catat \"I ❤ #Misskey\""
-      flavor: "Tim pengembang misskey sangat mengapresiasi dukungan kamu!"
+      title: "I Love Forkey"
+      description: "Catat \"I ❤ #Forkey\""
+      flavor: "Tim pengembang forkey sangat mengapresiasi dukungan kamu!"
     _foundTreasure:
       title: "Berburu Harta Karun"
       description: "Kamu telah menemukan harta karun tersembunyi"
@@ -1619,7 +1619,7 @@ _achievements:
       title: "Tes overflow"
       description: "Picu tes notifikasi secara berulang dalam waktu yang sangat pendek"
     _tutorialCompleted:
-      title: "Ijazah Sekolah Dasar Misskey"
+      title: "Ijazah Sekolah Dasar Forkey"
       description: "Tutorial selesai"
     _bubbleGameExplodingHead:
       title: "🤯"

locales/index.d.ts

@@ -724,6 +724,14 @@ export interface Locale extends ILocale {
      * にゃにゃにゃ？？
      */
     "flagAsCatDescription": string;
+    /**
+     * 猫語で話す
+     */
+    "flagSpeakAsCat": string;
+    /**
+     * 有効にすると、あなたの投稿の 「な」を「にゃ」にします。
+     */
+    "flagSpeakAsCatDescription": string;
     /**
      * タイムラインにノートへの返信を表示する
      */
@@ -1772,6 +1780,10 @@ export interface Locale extends ILocale {
      * Misskeyについて
      */
     "aboutMisskey": string;
+    /**
+     * Forkeyについて
+     */
+    "aboutForkey": string;
     /**
      * 管理者
      */
@@ -3060,6 +3072,10 @@ export interface Locale extends ILocale {
      * 添付画像のサムネイルをオリジナル画質にする
      */
     "loadRawImages": string;
+    /**
+     * 猫の話し方を無効にする
+     */
+    "disableCatSpeak": string;
     /**
      * アニメーション画像を再生しない
      */
@@ -5382,6 +5398,38 @@ export interface Locale extends ILocale {
      * ユーザー名でログイン
      */
     "usernameLogin": string;
+    /**
+     * 投稿フォームを開いたときに下書きを自動で読み込む
+     */
+    "autoloadDrafts": string;
+    /**
+     * 下書き
+     */
+    "drafts": string;
+    /**
+     * 未送信
+     */
+    "unsent": string;
+    /**
+     * 予約
+     */
+    "schedule": string;
+    /**
+     * 予約済み
+     */
+    "scheduled": string;
+    /**
+     * 予約を解除
+     */
+    "unschedule": string;
+    /**
+     * 予約日時を設定
+     */
+    "setScheduledTime": string;
+    /**
+     * {x}に投稿されます
+     */
+    "willBePostedAt": ParameterizedString<"x">;
     "_bubbleGame": {
         /**
          * 遊び方
@@ -5510,11 +5558,11 @@ export interface Locale extends ILocale {
          */
         "violationRights_description": string;
         /**
-         * 権利侵害やなりすまし（第三者による通報）
+         * 権利侵害（第三者による通報）
          */
         "violationRightsOther": string;
         /**
-         * 他人の著作権、商標権、またはその他の権利を侵害する投稿及びなりすまし行為
+         * 他人の著作権、商標権、またはその他の権利を侵害する行為
          * 第三者による通報の場合、法律で定められた非親告罪の範囲外のケースには対応できないことがあります
          */
         "violationRightsOther_description": string;
@@ -6033,7 +6081,7 @@ export interface Locale extends ILocale {
         "_types": {
             "_notes1": {
                 /**
-                 * just setting up my msky
+                 * just setting up my forkey
                  */
                 "title": string;
                 /**
@@ -6041,7 +6089,7 @@ export interface Locale extends ILocale {
                  */
                 "description": string;
                 /**
-                 * 良いMisskeyライフを！
+                 * 良いForkeyライフを！
                  */
                 "flavor": string;
             };
@@ -6365,7 +6413,7 @@ export interface Locale extends ILocale {
                  */
                 "description": string;
                 /**
-                 * Misskeyを使ってくれてありがとう！
+                 * Forkeyを使ってくれてありがとう！
                  */
                 "flavor": string;
             };
@@ -6565,15 +6613,15 @@ export interface Locale extends ILocale {
             };
             "_iLoveMisskey": {
                 /**
-                 * I Love Misskey
+                 * I Love Forkey
                  */
                 "title": string;
                 /**
-                 * "I ❤ #Misskey"を投稿した
+                 * "I ❤ #Forkey"を投稿した
                  */
                 "description": string;
                 /**
-                 * Misskeyを使ってくださりありがとうございます！ by 開発チーム
+                 * Forkeyを使ってくださりありがとうございます！ by 開発チーム
                  */
                 "flavor": string;
             };
@@ -6839,7 +6887,7 @@ export interface Locale extends ILocale {
             };
             "_tutorialCompleted": {
                 /**
-                 * Misskey初心者講座 修了証
+                 * Forkey初心者講座 修了証
                  */
                 "title": string;
                 /**
@@ -7035,6 +7083,18 @@ export interface Locale extends ILocale {
              * パブリック投稿の許可
              */
             "canPublicNote": string;
+            /**
+             * 予約投稿の許可
+             */
+            "canScheduleNote": string;
+            /**
+             * 予約投稿の最大数
+             */
+            "scheduleNoteLimit": string;
+            /**
+             * 予約投稿の最大日数
+             */
+            "scheduleNoteMaxDays": string;
             /**
              * メンション、リプライ、引用の許可
              */
@@ -7593,7 +7653,7 @@ export interface Locale extends ILocale {
          */
         "source": string;
         /**
-         * オリジナル
+         * Misskeyオリジナル
          */
         "original": string;
         /**
@@ -7617,7 +7677,21 @@ export interface Locale extends ILocale {
          */
         "patrons": string;
         /**
-         * プロジェクトメンバー
+         * Misskeyプロジェクトメンバー
+         */
+        "projectMembers": string;
+    };
+    "_aboutForkey": {
+        /**
+         * Forkey は、2014 年から syuilo によって開発されている Misskey をベースにしたオープンソース ソフトウェアです。
+         */
+        "about": string;
+        /**
+         * Forkeyに寄付
+         */
+        "original": string;
+        /**
+         * Forkeyプロジェクトメンバー
          */
         "projectMembers": string;
     };
@@ -9092,9 +9166,14 @@ export interface Locale extends ILocale {
             "f": string;
         };
         /**
-         * [NSFWガイドライン]({nsfwGuideUrl})を必ずお読みになってからご利用ください。
+         * 現在の支援プランで予約できる日数の上限は{max}日です。
+         * [ここ](https://go.misskey.io/donate)からプランをアップグレードできます。
          */
-        "guidelineInfo": ParameterizedString<"nsfwGuideUrl">;
+        "policyScheduleNoteMaxDaysExceeded": ParameterizedString<"max">;
+        /**
+         * 投稿する前に、[利用規約]({tosUrl})と[NSFWガイドライン](https://go.misskey.io/media-guideline)を必ずお読みください。
+         */
+        "tosAndGuidelinesInfo": ParameterizedString<"tosUrl">;
     };
     "_profile": {
         /**
@@ -9190,7 +9269,8 @@ export interface Locale extends ILocale {
          */
         "sectionNameNone": string;
         /**
-         * 現在の支援プランの表示上限({max}個)を超えているため、この項目は表示されません。[ここ](https://go.misskey.io/donate)からプランをアップグレードできます。
+         * 現在の支援プランの表示上限({max}個)を超えているため、この項目は表示されません。
+         * [ここ](https://go.misskey.io/donate)からプランをアップグレードできます。
          */
         "policyDisplayLimitExceeded": ParameterizedString<"max">;
     };
@@ -9701,6 +9781,18 @@ export interface Locale extends ILocale {
          * 実績を獲得
          */
         "achievementEarned": string;
+        /**
+         * ノートが予約されました
+         */
+        "noteScheduled": string;
+        /**
+         * 予約済みのノートが投稿されました
+         */
+        "scheduledNotePosted": string;
+        /**
+         * 予約済みのノートを投稿できませんでした
+         */
+        "scheduledNoteError": string;
         /**
          * 通知テスト
          */
@@ -9790,6 +9882,18 @@ export interface Locale extends ILocale {
              * 実績の獲得
              */
             "achievementEarned": string;
+            /**
+             * ノートが予約された
+             */
+            "noteScheduled": string;
+            /**
+             * 予約済みのノートが投稿された
+             */
+            "scheduledNotePosted": string;
+            /**
+             * 予約済みのノートが投稿できなかった
+             */
+            "scheduledNoteError": string;
             /**
              * 連携アプリからの通知
              */

locales/index.js

@@ -72,7 +72,7 @@ export function build() {
 		.reduce((a, [k, v]) => (a[k] = (() => {
 			const [lang] = k.split('-');
 			switch (k) {
-				case 'ja-JP': return v;
+				case 'ja-JP': return merge(locales['en-US'], v);
 				case 'ja-KS':
 				case 'en-US': return merge(locales['ja-JP'], v);
 				default: return merge(

locales/it-IT.yml

@@ -1476,7 +1476,7 @@ _achievements:
     _login1000:
       title: "Maestro di Note III livello"
       description: "Hai totalizzato 1000 accessi!"
-      flavor: "Grazie per aver usato Misskey!"
+      flavor: "Grazie per aver usato Forkey!"
     _noteClipped1:
       title: "Devo clippare!"
       description: "Hai raccolto la tua prima Nota in una Clip"
@@ -1536,9 +1536,9 @@ _achievements:
       title: "Mi piacciono i risultati"
       description: "Guarda la tua collezione di obiettivi per almeno 3 minuti"
     _iLoveMisskey:
-      title: "I LOVE Misskey"
-      description: "Pubblica «I ♥ #Misskey»"
-      flavor: "Grazie per aver utilizzato Misskey! Dal team di sviluppo"
+      title: "I LOVE Forkey"
+      description: "Pubblica «I ♥ #Forkey»"
+      flavor: "Grazie per aver utilizzato Forkey! Dal team di sviluppo"
     _foundTreasure:
       title: "Caccia al tesoro"
       description: "Hai trovato un tesoro nascosto"
@@ -1617,7 +1617,7 @@ _achievements:
       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"
+      title: "Attestato di partecipazione al corso per principianti di Forkey"
       description: "Ha completato il tutorial"
     _bubbleGameExplodingHead:
       title: "🤯"

locales/ja-JP.yml

@@ -177,6 +177,8 @@ flagAsBot: "Botとして設定"
 flagAsBotDescription: "このアカウントがプログラムによって運用される場合は、このフラグをオンにします。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Misskeyのシステム上での扱いがBotに合ったものになります。"
 flagAsCat: "にゃああああああああああああああ！！！！！！！！！！！！"
 flagAsCatDescription: "にゃにゃにゃ？？"
+flagSpeakAsCat: "猫語で話す"
+flagSpeakAsCatDescription: "有効にすると、あなたの投稿の 「な」を「にゃ」にします。"
 flagShowTimelineReplies: "タイムラインにノートへの返信を表示する"
 flagShowTimelineRepliesDescription: "オンにすると、タイムラインにユーザーのノート以外にもそのユーザーの他のノートへの返信を表示します。"
 autoAcceptFollowed: "フォロー中ユーザーからのフォロリクを自動承認"
@@ -439,6 +441,7 @@ popularTags: "人気のタグ"
 userList: "リスト"
 about: "情報"
 aboutMisskey: "Misskeyについて"
+aboutForkey: "Forkeyについて"
 administrator: "管理者"
 token: "確認コード"
 2fa: "二要素認証"
@@ -761,6 +764,7 @@ noCrawleDescription: "外部の検索エンジンにあなたのユーザーペ
 lockedAccountInfo: "フォローを承認制にしても、ノートの公開範囲を「フォロワー」にしない限り、誰でもあなたのノートを見ることができます。"
 alwaysMarkSensitive: "デフォルトでメディアをセンシティブ設定にする"
 loadRawImages: "添付画像のサムネイルをオリジナル画質にする"
+disableCatSpeak: "猫の話し方を無効にする"
 disableShowingAnimatedImages: "アニメーション画像を再生しない"
 highlightSensitiveMedia: "メディアがセンシティブであることを分かりやすく表示"
 verificationEmailSent: "確認のメールを送信しました。メールに記載されたリンクにアクセスして、設定を完了してください。"
@@ -1339,6 +1343,14 @@ consentAll: "全て許可"
 consentSelected: "選択した項目のみ許可"
 emailAddressLogin: "メールアドレスでログイン"
 usernameLogin: "ユーザー名でログイン"
+autoloadDrafts: "投稿フォームを開いたときに下書きを自動で読み込む"
+drafts: "下書き"
+unsent: "未送信"
+schedule: "予約"
+scheduled: "予約済み"
+unschedule: "予約を解除"
+setScheduledTime: "予約日時を設定"
+willBePostedAt: "{x}に投稿されます"
 
 _bubbleGame:
   howToPlay: "遊び方"
@@ -1375,8 +1387,8 @@ _abuseReportCategory:
   otherBreach_description: "明確に分類されないその他の規約違反行為"
   violationRights: "権利侵害やなりすまし（侵害を受けた権利者本人によるご申告）"
   violationRights_description: "権利者本人の著作権、商標権、またはその他の権利を侵害する投稿及びなりすまし行為"
-  violationRightsOther: "権利侵害やなりすまし（第三者による通報）"
-  violationRightsOther_description: "他人の著作権、商標権、またはその他の権利を侵害する投稿及びなりすまし行為\n第三者による通報の場合、法律で定められた非親告罪の範囲外のケースには対応できないことがあります"
+  violationRightsOther: "権利侵害（第三者による通報）"
+  violationRightsOther_description: "他人の著作権、商標権、またはその他の権利を侵害する行為\n第三者による通報の場合、法律で定められた非親告罪の範囲外のケースには対応できないことがあります"
   notLike: "この人が気に入らない"
   notLike_description: "個人的な理由で不快と感じるユーザーや投稿"
   other: "その他"
@@ -1521,9 +1533,9 @@ _achievements:
   earnedAt: "獲得日時"
   _types:
     _notes1:
-      title: "just setting up my msky"
+      title: "just setting up my forkey"
       description: "初めてノートを投稿した"
-      flavor: "良いMisskeyライフを！"
+      flavor: "良いForkeyライフを！"
     _notes10:
       title: "いくつかのノート"
       description: "ノートを10回投稿した"
@@ -1619,7 +1631,7 @@ _achievements:
     _login1000:
       title: "ノートマスターⅢ"
       description: "通算ログイン日数が1,000日"
-      flavor: "Misskeyを使ってくれてありがとう！"
+      flavor: "Forkeyを使ってくれてありがとう！"
     _noteClipped1:
       title: "クリップせずにはいられないな"
       description: "初めてノートをクリップした"
@@ -1679,9 +1691,9 @@ _achievements:
       title: "実績好き"
       description: "実績一覧を3分以上眺め続けた"
     _iLoveMisskey:
-      title: "I Love Misskey"
-      description: "\"I ❤ #Misskey\"を投稿した"
-      flavor: "Misskeyを使ってくださりありがとうございます！ by 開発チーム"
+      title: "I Love Forkey"
+      description: "\"I ❤ #Forkey\"を投稿した"
+      flavor: "Forkeyを使ってくださりありがとうございます！ by 開発チーム"
     _foundTreasure:
       title: "宝探し"
       description: "隠されたお宝を発見した"
@@ -1760,7 +1772,7 @@ _achievements:
       title: "テスト過剰"
       description: "通知のテストをごく短時間のうちに連続して行った"
     _tutorialCompleted:
-      title: "Misskey初心者講座 修了証"
+      title: "Forkey初心者講座 修了証"
       description: "チュートリアルを完了した"
     _bubbleGameExplodingHead:
       title: "🤯"
@@ -1812,6 +1824,9 @@ _role:
     gtlAvailable: "グローバルタイムラインの閲覧"
     ltlAvailable: "ローカルタイムラインの閲覧"
     canPublicNote: "パブリック投稿の許可"
+    canScheduleNote: "予約投稿の許可"
+    scheduleNoteLimit: "予約投稿の最大数"
+    scheduleNoteMaxDays: "予約投稿の最大日数"
     canInitiateConversation: "メンション、リプライ、引用の許可"
     canCreateContent: "コンテンツの作成"
     canUpdateContent: "コンテンツの編集"
@@ -1972,13 +1987,19 @@ _aboutMisskey:
   contributors: "コントリビューター"
   allContributors: "全てのコントリビューター"
   source: "ソースコード"
-  original: "オリジナル"
+  original: "Misskeyオリジナル"
   thisIsModifiedVersion: "{name}はオリジナルのMisskeyを改変したバージョンを使用しています。"
   translation: "Misskeyを翻訳"
   donate: "Misskeyに寄付"
   morePatrons: "他にも多くの方が支援してくれています。ありがとうございます🥰"
   patrons: "支援者"
-  projectMembers: "プロジェクトメンバー"
+  projectMembers: "Misskeyプロジェクトメンバー"
+
+_aboutForkey:
+  about: "Forkey は、2014 年から syuilo によって開発されている Misskey をベースにしたオープンソース ソフトウェアです。"
+  original: "Forkeyに寄付"
+  projectMembers: "Forkeyプロジェクトメンバー"
+
 
 _displayOfSensitiveMedia:
   respect: "センシティブ設定されたメディアを隠す"
@@ -2383,7 +2404,8 @@ _postForm:
     d: "言いたいことは？"
     e: "ここに書いてください"
     f: "あなたが書くのを待っています..."
-  guidelineInfo: "[NSFWガイドライン]({nsfwGuideUrl})を必ずお読みになってからご利用ください。"
+  policyScheduleNoteMaxDaysExceeded: "現在の支援プランで予約できる日数の上限は{max}日です。\n[ここ](https://go.misskey.io/donate)からプランをアップグレードできます。"
+  tosAndGuidelinesInfo: "投稿する前に、[利用規約]({tosUrl})と[NSFWガイドライン](https://go.misskey.io/media-guideline)を必ずお読みください。"
 
 _profile:
   name: "名前"
@@ -2409,7 +2431,7 @@ _profile:
   sectionName: "セクション名"
   sectionNameNoneDescription: "セクション名を表示しないようにする"
   sectionNameNone: "名前が表示されないセクション"
-  policyDisplayLimitExceeded: "現在の支援プランの表示上限({max}個)を超えているため、この項目は表示されません。[ここ](https://go.misskey.io/donate)からプランをアップグレードできます。"
+  policyDisplayLimitExceeded: "現在の支援プランの表示上限({max}個)を超えているため、この項目は表示されません。\n[ここ](https://go.misskey.io/donate)からプランをアップグレードできます。"
 
 _exportOrImport:
   allNotes: "全てのノート"
@@ -2551,6 +2573,9 @@ _notification:
   roleAssigned: "ロールが付与されました"
   emptyPushNotificationMessage: "プッシュ通知の更新をしました"
   achievementEarned: "実績を獲得"
+  noteScheduled: "ノートが予約されました"
+  scheduledNotePosted: "予約済みのノートが投稿されました"
+  scheduledNoteError: "予約済みのノートを投稿できませんでした"
   testNotification: "通知テスト"
   checkNotificationBehavior: "通知の表示を確かめる"
   sendTestNotification: "テスト通知を送信する"
@@ -2575,6 +2600,9 @@ _notification:
     followRequestAccepted: "フォローが受理された"
     roleAssigned: "ロールが付与された"
     achievementEarned: "実績の獲得"
+    noteScheduled: "ノートが予約された"
+    scheduledNotePosted: "予約済みのノートが投稿された"
+    scheduledNoteError: "予約済みのノートが投稿できなかった"
     app: "連携アプリからの通知"
 
   _actions:

locales/ja-KS.yml

@@ -1478,7 +1478,7 @@ _achievements:
     _login1000:
       title: "ノートマイスターⅢ"
       description: "通算1,000日ログインした"
-      flavor: "Misskeyようさん使てもろておおきにな！"
+      flavor: "Forkeyようさん使てもろておおきにな！"
     _noteClipped1:
       title: "アカンどれもクリップしたいわ"
       description: "初めてノートをクリップした"
@@ -1538,9 +1538,9 @@ _achievements:
       title: "実績好き"
       description: "実績一覧を3分以上眺め続けた"
     _iLoveMisskey:
-      title: "Misskey好きやねん"
-      description: "\"I ❤ #Misskey\"を投稿した"
-      flavor: "Misskeyを使ってくれておおきにな～　by 開発チーム"
+      title: "Forkey好きやねん"
+      description: "\"I ❤ #Forkey\"を投稿した"
+      flavor: "Forkeyを使ってくれておおきにな～　by 開発チーム"
     _foundTreasure:
       title: "なんでも鑑定団"
       description: "隠されたお宝を発見した"
@@ -1619,7 +1619,7 @@ _achievements:
       title: "心配性"
       description: "通知のテストしすぎやって"
     _tutorialCompleted:
-      title: "Misskeyひよっこ講座 修了証"
+      title: "Forkeyひよっこ講座 修了証"
       description: "チュートリアル全部やった"
     _bubbleGameExplodingHead:
       title: "🤯"

locales/ko-GS.yml

@@ -700,7 +700,7 @@ _achievements:
     _myNoteFavorited1:
       description: "다런 사람이 내 노트럴 질겨찾기에 담앗십니다"
     _iLoveMisskey:
-      description: "“I ❤ #Misskey”럴 섰어예"
+      description: "“I ❤ #Forkey”럴 섰어예"
     _postedAt0min0sec:
       description: "0분 0초에 노트를 섰어예"
     _tutorialCompleted:

locales/ko-KR.yml

@@ -1314,6 +1314,14 @@ consentAll: "모두 허용"
 consentSelected: "선택한 항목만 허용"
 emailAddressLogin: "이메일 주소로 로그인"
 usernameLogin: "사용자명으로 로그인"
+autoloadDrafts: "글 작성 시 자동으로 임시 저장된 글 불러오기"
+drafts: "임시 저장"
+unsent: "미전송"
+schedule: "예약"
+scheduled: "예약됨"
+unschedule: "예약 취소"
+setScheduledTime: "예약 시간 설정"
+willBePostedAt: "{x}에 게시됩니다"
 
 _bubbleGame:
   howToPlay: "설명"
@@ -1354,8 +1362,8 @@ _abuseReportCategory:
   otherBreach_description: "명확하게 분류되지 않는 기타 규약 위반 행위"
   violationRights: "권리 침해 또는 사칭 (권리자 본인에 의한 신고)"
   violationRights_description: "권리자 본인의 저작권, 상표권 또는 기타 권리를 침해하는 게시물 및 사칭 행위"
-  violationRightsOther: "권리 침해 또는 사칭 (제3자에 의한 신고)"
-  violationRightsOther_description: "타인의 저작권, 상표권 또는 기타 권리를 침해하는 게시물 및 사칭 행위\n제3자에 의한 신고의 경우, 법으로 정해진 비친고죄 범위 외의 사례에는 대응할 수 없습니다"
+  violationRightsOther: "권리 침해 (제3자에 의한 신고)"
+  violationRightsOther_description: "타인의 저작권, 상표권 또는 기타 권리를 침해하는 행위\n제3자에 의한 신고의 경우, 법으로 정해진 비친고죄 범위 외의 사례에는 대응할 수 없습니다"
   notLike: "이 사람이 마음에 들지 않음"
   notLike_description: "개인적인 이유로 불쾌감을 느끼는 사용자나 게시물"
   other: "기타"
@@ -1590,7 +1598,7 @@ _achievements:
     _login1000:
       title: "노트 마스터 III"
       description: "총 1,000일간 로그인했습니다"
-      flavor: "Misskey를 사용해 주셔서 감사합니다!"
+      flavor: "Forkey를 사용해 주셔서 감사합니다!"
     _noteClipped1:
       title: "클립할 수밖에 없었어"
       description: "처음으로 노트를 클립했습니다"
@@ -1650,9 +1658,9 @@ _achievements:
       title: "저 도전과제 좋아해요"
       description: "도전 과제 목록을 3분 이상 쳐다봤습니다"
     _iLoveMisskey:
-      title: "I Love Misskey"
-      description: "\"I ❤ #Misskey\"를 포스트했습니다"
-      flavor: "Misskey를 이용해 주셔서 감사합니다! ― 개발 팀"
+      title: "I Love Forkey"
+      description: "\"I ❤ #Forkey\"를 포스트했습니다"
+      flavor: "Forkey를 이용해 주셔서 감사합니다! ― 개발 팀"
     _foundTreasure:
       title: "보물찾기"
       description: "숨겨진 보물을 발견했습니다"
@@ -1731,7 +1739,7 @@ _achievements:
       title: "테스트 과잉"
       description: "매우 짧은 시간 안에 알림 테스트를 여러 번 수행했습니다"
     _tutorialCompleted:
-      title: "Misskey 입문자 과정 수료증"
+      title: "Forkey 입문자 과정 수료증"
       description: "튜토리얼을 완료했습니다"
     _bubbleGameExplodingHead:
       title: "🤯"
@@ -1782,6 +1790,9 @@ _role:
     gtlAvailable: "글로벌 타임라인 보이기"
     ltlAvailable: "로컬 타임라인 보이기"
     canPublicNote: "공개 노트 허용"
+    canScheduleNote: "노트 예약 허용"
+    scheduleNoteLimit: "노트 예약 한도"
+    scheduleNoteMaxDays: "노트 예약 최대 일수"
     mentionMax: "노트에 넣을 수 있는 멘션 수"
     canCreateContent: "컨텐츠 생성 허용"
     canUpdateContent: "컨텐츠 수정 허용"
@@ -2301,6 +2312,8 @@ _postForm:
     d: "말하고 싶은 게 있나요?"
     e: "여기에 적어 주세요"
     f: "글 쓰기를 기다려요…"
+  policyScheduleNoteMaxDaysExceeded: "현재 지원 플랜의 예약 가능한 최대 일수는 {max}일입니다.\n[여기](https://go.misskey.io/donate)에서 플랜을 업그레이드할 수 있습니다."
+  tosAndGuidelinesInfo: "노트를 게시하기 전에 [이용약관]({tosUrl})과 [NSFW 가이드라인](https://go.misskey.io/media-guideline)을 반드시 읽어 주세요."
 _profile:
   name: "이름"
   username: "사용자 이름"
@@ -2325,7 +2338,7 @@ _profile:
   sectionName: "섹션 이름"
   sectionNameNoneDescription: "섹션 이름이 표시되지 않도록 합니다"
   sectionNameNone: "이름이 표시되지 않는 섹션"
-  policyDisplayLimitExceeded: "현재 지원 플랜의 표시 제한({max}개)을 초과하였기 때문에 이 항목은 표시되지 않습니다. [여기](https://go.misskey.io/donate)에서 플랜을 업그레이드할 수 있습니다."
+  policyDisplayLimitExceeded: "현재 지원 플랜의 표시 제한({max}개)을 초과하였기 때문에 이 항목은 표시되지 않습니다.\n[여기](https://go.misskey.io/donate)에서 플랜을 업그레이드할 수 있습니다."
 _exportOrImport:
   allNotes: "모든 노트"
   favoritedNotes: "즐겨찾기한 노트"
@@ -2454,9 +2467,12 @@ _notification:
   pollEnded: "투표 결과가 발표되었습니다"
   newNote: "새 게시물"
   unreadAntennaNote: "안테나 {name}"
-  roleAssigned: "역할이 부여 되었습니다."
+  roleAssigned: "역할이 부여 되었습니다"
   emptyPushNotificationMessage: "푸시 알림이 갱신되었습니다"
   achievementEarned: "도전 과제를 달성했습니다"
+  noteScheduled: "노트가 예약되었습니다"
+  scheduledNotePosted: "예약된 노트가 게시되었습니다"
+  scheduledNoteError: "예약된 노트를 게시하지 못했습니다"
   testNotification: "알림 테스트"
   checkNotificationBehavior: "알림 표시를 체크하기"
   sendTestNotification: "테스트 알림 보내기"
@@ -2480,6 +2496,9 @@ _notification:
     followRequestAccepted: "팔로우 요청이 승인되었을 때"
     roleAssigned: "역할이 부여 됨"
     achievementEarned: "도전 과제 획득"
+    noteScheduled: "노트가 예약됨"
+    scheduledNotePosted: "예약된 노트가 게시됨"
+    scheduledNoteError: "예약된 노트를 게시하지 못함"
     app: "연동된 앱을 통한 알림"
   _actions:
     followBack: "팔로우"

locales/no-NO.yml

@@ -127,7 +127,7 @@ emojis: "Emojier"
 addEmoji: "Legg til emoji"
 settingGuide: "Anbefalte innstillinger"
 flagAsBot: "Merk denne kontoen som en bot"
-flagAsBotDescription: "Aktiver dette alternativet hvis denne kontoen styres av et program. Hvis det er aktivert, vil det fungere som et flagg for andre utviklere for å forhindre endeløse interaksjonskjeder med andre roboter og justere Misskeys interne systemer til å behandle denne kontoen som en bot."
+flagAsBotDescription: "Aktiver dette alternativet hvis denne kontoen styres av et program. Hvis det er aktivert, vil det fungere som et flagg for andre utviklere for å forhindre endeløse interaksjonskjeder med andre roboter og justere forkeys interne systemer til å behandle denne kontoen som en bot."
 flagAsCat: "Merk denne kontoen som en katt"
 flagAsCatDescription: "Aktiver dette alternativet for å merke denne kontoen som en katt."
 flagShowTimelineReplies: "Vis svar i tidslinje"

locales/pt-PT.yml

@@ -1125,7 +1125,7 @@ _achievements:
     _login1000:
       title: "Mestre das notas III"
       description: "Fez login por um total de 1000 dias"
-      flavor: "Obrigado por utilizar o Misskey!"
+      flavor: "Obrigado por utilizar o Forkey!"
     _noteClipped1:
       title: "Não posso deixar de adicionar ao clipe"
       description: "Adicionou a um clipe a sua primeira nota"

locales/ru-RU.yml

@@ -1219,7 +1219,7 @@ _achievements:
     _login1000:
       title: "Повелитель заметок Ⅲ"
       description: "1000 дней на сайте"
-      flavor: "Спасибо, что пользуетесь Misskey!"
+      flavor: "Спасибо, что пользуетесь Forkey!"
     _noteClipped1:
       title: "Нельзя не сохранить"
       description: "Первая заметка в подборке"
@@ -1279,9 +1279,9 @@ _achievements:
       title: "Любовь к успехам"
       description: "Более 3 минут любования достижениями"
     _iLoveMisskey:
-      title: "Я люблю Misskey"
-      description: "Написана заметка «I ❤ #Misskey»"
-      flavor: "Спасибо за поддержку Misskey! Ваша команда разработчиков"
+      title: "Я люблю Forkey"
+      description: "Написана заметка «I ❤ #Forkey»"
+      flavor: "Спасибо за поддержку Forkey! Ваша команда разработчиков"
     _foundTreasure:
       title: "Охота за сокровищами"
       description: "Найдено спрятанное сокровище"

locales/sv-SE.yml

@@ -152,7 +152,7 @@ settingGuide: "Rekommenderade inställningar"
 cacheRemoteFiles: "Spara externa filer till cachen"
 cacheRemoteFilesDescription: "När denna inställning är avstängd kommer externa filer laddas direkt från den externa instansen. Genom att stänga av detta kommer lagringsutrymme minska i användning men kommer öka datatrafiken eftersom miniatyrer inte kommer genereras."
 flagAsBot: "Markera konto som bot"
-flagAsBotDescription: "Aktivera det här alternativet om kontot är kontrollerat av ett program. Om aktiverat kommer den fungera som en flagga för andra utvecklare för att hindra ändlösa kedjor med andra bottar. Det kommer också få Misskeys interna system att hantera kontot som en bot."
+flagAsBotDescription: "Aktivera det här alternativet om kontot är kontrollerat av ett program. Om aktiverat kommer den fungera som en flagga för andra utvecklare för att hindra ändlösa kedjor med andra bottar. Det kommer också få forkeys interna system att hantera kontot som en bot."
 flagAsCat: "Markera konto som katt"
 flagAsCatDescription: "Aktivera denna inställning för att markera kontot som en katt."
 flagShowTimelineReplies: "Visa svar i tidslinje"

locales/th-TH.yml

@@ -1380,9 +1380,9 @@ _achievements:
   earnedAt: "ได้รับเมื่อ"
   _types:
     _notes1:
-      title: "just setting up my msky"
+      title: "just setting up my forkey"
       description: "โพสต์โน้ตแรกของคุณ"
-      flavor: "ขอให้มีช่วงเวลาที่ดีกับ Misskey นะคะ!"
+      flavor: "ขอให้มีช่วงเวลาที่ดีกับ Forkey นะคะ!"
     _notes10:
       title: "โน้ตไม่กี่ชิ้น"
       description: "โพสต์ 10 โน้ต"
@@ -1478,7 +1478,7 @@ _achievements:
     _login1000:
       title: "ปรมาจารย์ด้านโน้ต III"
       description: "เข้าสู่ระบบเป็นเวลารวม 1,000 วัน"
-      flavor: "ขอบคุณที่ใช้ Misskey นะ !"
+      flavor: "ขอบคุณที่ใช้ Forkey นะ !"
     _noteClipped1:
       title: "อดไม่ได้ที่จะต้องคลิปมันเอาไว้"
       description: "คลิปโน้ตตัวแรกของคุณ"
@@ -1538,9 +1538,9 @@ _achievements:
       title: "ชอบบรรลุความสําเร็จ"
       description: "มองดูรายการความสำเร็จของคุณเป็นเวลาอย่างน้อย 3 นาที"
     _iLoveMisskey:
-      title: "ฉันรัก Misskey"
-      description: "โพสต์ “I ❤ #Misskey”"
-      flavor: "ขอบคุณพระคุณเป็นอย่างสูงที่ท่านใช้ Misskey นะคะ ! by ทีมผู้พัฒนา"
+      title: "ฉันรัก Forkey"
+      description: "โพสต์ “I ❤ #Forkey”"
+      flavor: "ขอบคุณพระคุณเป็นอย่างสูงที่ท่านใช้ Forkey นะคะ ! by ทีมผู้พัฒนา"
     _foundTreasure:
       title: "ล่าสมบัติ"
       description: "คุณพบสมบัติที่ซ่อนอยู่"
@@ -1619,7 +1619,7 @@ _achievements:
       title: "ทดสอบโอเวอร์โฟลว์"
       description: "ทดสอบการแจ้งเตือนทริกเกอร์ซ้ำๆ ภายในระยะเวลาอันสั้นๆ"
     _tutorialCompleted:
-      title: "ใบรับรองการสำเร็จหลักสูตร Misskey มือใหม่"
+      title: "ใบรับรองการสำเร็จหลักสูตร Forkey มือใหม่"
       description: "เสร็จสิ้นการสอนแล้ว"
     _bubbleGameExplodingHead:
       title: "🤯"

locales/uk-UA.yml

@@ -1017,7 +1017,7 @@ _achievements:
     _login1000:
       title: "Майстер нотаток III"
       description: "1000 днів користування загально"
-      flavor: "Дякуємо, що користуєтеся Misskey!"
+      flavor: "Дякуємо, що користуєтеся Forkey!"
     _noteClipped1:
       title: "Не можна не зберегти"
       description: "Перша нотатка у добірці"
@@ -1072,9 +1072,9 @@ _achievements:
       title: "Шанувальник досягнень"
       description: "Переглядати список досягнень принаймні 3 хвилини"
     _iLoveMisskey:
-      title: "I Love Misskey"
-      description: "Відправлено \"I ❤ #Misskey\""
-      flavor: "Дякуємо вам, що користуєтесь Misskey!  – команда розробників"
+      title: "I Love Forkey"
+      description: "Відправлено \"I ❤ #Forkey\""
+      flavor: "Дякуємо вам, що користуєтесь Forkey!  – команда розробників"
     _foundTreasure:
       title: "Пошуки скарбів"
       description: "Ви знайшли прихований скарб"

locales/vi-VN.yml

@@ -1157,9 +1157,9 @@ _achievements:
   earnedAt: "Ngày thu nhận"
   _types:
     _notes1:
-      title: "just setting up my msky"
+      title: "just setting up my forkey"
       description: "Lần đầu tiên đăng bài"
-      flavor: "Chúc bạn trên Miskey vui vẻ nha!!"
+      flavor: "Chúc bạn trên Forkey vui vẻ nha!!"
     _notes10:
       title: "Một số bài viết"
       description: "Đăng bài 10 lần"
@@ -1225,7 +1225,7 @@ _achievements:
       title: "Khách hàng thường xuyên cấp III"
       description: "Tổng số ngày đăng nhập đạt 400 ngày"
     _login1000:
-      flavor: "Cảm ơn bạn đã sử dụng Misskey!"
+      flavor: "Cảm ơn bạn đã sử dụng Forkey!"
     _noteFavorited1:
       title: "Nhà thiên văn học"
     _myNoteFavorited1:
@@ -1280,9 +1280,9 @@ _achievements:
       title: "Yêu Thành tích"
       description: "Ngắm danh sách thành tích đến tận hơn 3 phút"
     _iLoveMisskey:
-      title: "Tôi Yêu Misskey"
-      description: "Đăng lời nói \"I ❤ #Misskey\""
-      flavor: "Xin chân thành cảm ơn bạn đã sử dụng Misskey!!  by Đội ngũ phát triển"
+      title: "Tôi Yêu Forkey"
+      description: "Đăng lời nói \"I ❤ #Forkey\""
+      flavor: "Xin chân thành cảm ơn bạn đã sử dụng Forkey!!  by Đội ngũ phát triển"
     _foundTreasure:
       title: "Tìm kiếm kho báu"
       description: "Tìm thấy được những kho báu cất giấu"

locales/zh-CN.yml

@@ -1499,7 +1499,7 @@ _achievements:
     _login1000:
       title: "帖子大师 Ⅲ"
       description: "累计登录 1000 天"
-      flavor: "感谢您使用 Misskey！"
+      flavor: "感谢您使用 Forkey！"
     _noteClipped1:
       title: "忍不住要收藏到便签"
       description: "第一次将贴文贴进便签"
@@ -1559,9 +1559,9 @@ _achievements:
       title: "成就爱好者"
       description: "盯着成就看三分钟"
     _iLoveMisskey:
-      title: "I Love Misskey"
-      description: "发布 \"I ❤ #Misskey\" 帖子"
-      flavor: "感谢您使用 Misskey ！ by 开发团队"
+      title: "I Love Forkey"
+      description: "发布 \"I ❤ #Forkey\" 帖子"
+      flavor: "感谢您使用 Forkey ！ by 开发团队"
     _foundTreasure:
       title: "寻宝"
       description: "发现了隐藏的宝藏"
@@ -1640,7 +1640,7 @@ _achievements:
       title: "过度测试"
       description: "短时间内连续测试通知"
     _tutorialCompleted:
-      title: "Misskey 初学者课程 结业证书"
+      title: "Forkey 初学者课程 结业证书"
       description: "完成了教学"
     _bubbleGameExplodingHead:
       title: "🤯"

locales/zh-TW.yml

@@ -1478,7 +1478,7 @@ _achievements:
     _login1000:
       title: "貼文大師ⅠⅠⅠ"
       description: "總登入天數為一千天"
-      flavor: "感謝您使用 Misskey！"
+      flavor: "感謝您使用 Forkey！"
     _noteClipped1:
       title: "忍不住要收進摘錄裡"
       description: "第一次將貼文收進摘錄"
@@ -1540,7 +1540,7 @@ _achievements:
     _iLoveMisskey:
       title: "I Love Misskey"
       description: "發佈「I ❤ #Misskey」"
-      flavor: "感謝您使用 Misskey！by 開發團隊"
+      flavor: "感謝您使用 Forkey！by 開發團隊"
     _foundTreasure:
       title: "尋寶"
       description: "發現了隱藏的寶藏"
@@ -1619,7 +1619,7 @@ _achievements:
       title: "過度測試"
       description: "極短時間內連續測試通知"
     _tutorialCompleted:
-      title: "Misskey新手講座 結業證書"
+      title: "Forkey新手講座 結業證書"
       description: "已完成教學課程"
     _bubbleGameExplodingHead:
       title: "🤯"

package.json

@@ -1,12 +1,12 @@
 {
-	"name": "misskey",
-	"version": "2024.5.0-io.5e",
+	"name": "forkey",
+	"version": "2024.5.0-io.7c",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/MisskeyIO/misskey.git"
+		"url": "https://git.woem.men/woem.men/forkey.git"
 	},
-	"packageManager": "pnpm@9.15.0",
+	"packageManager": "pnpm@9.15.4",
 	"workspaces": [
 		"packages/frontend",
 		"packages/backend",
@@ -56,26 +56,26 @@
 		"jpeg-js": "0.4.4",
 		"lodash": "4.17.21",
 		"sharp": "0.33.5",
-		"tough-cookie": "5.0.0",
-		"web-streams-polyfill": "4.0.0"
+		"tough-cookie": "5.1.0",
+		"web-streams-polyfill": "4.1.0"
 	},
 	"dependencies": {
 		"cssnano": "7.0.6",
 		"execa": "9.5.2",
 		"js-yaml": "4.1.0",
-		"postcss": "8.4.49",
+		"postcss": "8.5.1",
 		"terser": "5.37.0",
-		"typescript": "5.7.2"
+		"typescript": "5.7.3"
 	},
 	"devDependencies": {
-		"@types/node": "22.10.2",
+		"@types/node": "22.10.7",
 		"@typescript-eslint/eslint-plugin": "7.10.0",
 		"@typescript-eslint/parser": "7.10.0",
 		"cross-env": "7.0.3",
 		"cypress": "13.17.0",
 		"eslint": "8.57.1",
 		"ncp": "2.0.0",
-		"start-server-and-test": "2.0.9"
+		"start-server-and-test": "2.0.10"
 	},
 	"optionalDependencies": {
 		"@tensorflow/tfjs-core": "4.22.0"

packages/backend/assets/redoc.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title>Misskey API</title>
+		<title>Forkey API</title>
 		<!-- needed for adaptive design -->
 		<meta charset="utf-8"/>
 		<meta name="viewport" content="width=device-width, initial-scale=1">

packages/backend/migration/1696386694000-speakAsCat.js

@@ -0,0 +1,12 @@
+export class SpeakAsCat1696386694000 {
+	name = "SpeakAsCat1696386694000";
+
+	async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user" ADD "speakAsCat" boolean NOT NULL DEFAULT true`);
+		await queryRunner.query(`COMMENT ON COLUMN "user"."speakAsCat" IS 'Whether to speak as a cat if chosen.'`);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "speakAsCat"`);
+	}
+}

packages/backend/migration/1730505338000-friendlyCaptcha.js

@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: marie and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class friendlyCaptcha1730505338000 {
+	name = 'friendlyCaptcha1730505338000';
+
+	async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "meta" ADD "enableFC" boolean NOT NULL DEFAULT false`, undefined);
+		await queryRunner.query(`ALTER TABLE "meta" ADD "fcSiteKey" character varying(1024)`, undefined);
+		await queryRunner.query(`ALTER TABLE "meta" ADD "fcSecretKey" character varying(1024)`, undefined);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "fcSecretKey"`, undefined);
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "fcSiteKey"`, undefined);
+		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableFC"`, undefined);
+	}
+}

packages/backend/migration/1736599563231-MastodonApp.js

@@ -0,0 +1,18 @@
+export class MastodonOauth1736599563231 {
+    name = 'MastodonOauth1736599563231'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "app" ADD "website" character varying(128)`);
+        await queryRunner.query(`COMMENT ON COLUMN "app"."website" IS 'Application website.'`);
+        await queryRunner.query(`ALTER TABLE "app" ADD "mastodonScopes" character varying(64) array`);
+        await queryRunner.query(`COMMENT ON COLUMN "app"."mastodonScopes" IS 'Mastodon app scopes, only set for apps created with Mastodon API.'`);
+        await queryRunner.query(`ALTER TABLE "app" ADD "redirectUris" character varying(512) array DEFAULT '{}' NOT NULL`);
+        await queryRunner.query(`COMMENT ON COLUMN "app"."redirectUris" IS 'Redirect URIs.'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "app" DROP COLUMN "website"`);
+        await queryRunner.query(`ALTER TABLE "app" DROP COLUMN "mastodonScopes"`);
+        await queryRunner.query(`ALTER TABLE "app" DROP COLUMN "redirectUris"`);
+    }
+}

packages/backend/migration/1736888704471-NoteUserIdIdIndex.js

@@ -0,0 +1,11 @@
+export class NoteUserIdIdIndex1736888704471 {
+	name = 'NoteUserIdIdIndex1736888704471'
+
+	async up(queryRunner) {
+		await queryRunner.query(`CREATE INDEX "IDX_note_userId_id" ON "note" ("userId", "id") `);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "public"."IDX_note_userId_id"`);
+	}
+}

packages/backend/migration/1736923279563-ScheduledNote.js

@@ -0,0 +1,21 @@
+export class ScheduledNote1736923279563 {
+    name = 'ScheduledNote1736923279563'
+
+    async up(queryRunner) {
+        await queryRunner.query(`CREATE TABLE "note_scheduled" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "scheduledAt" TIMESTAMP WITH TIME ZONE, "reason" character varying(256), "userId" character varying(32) NOT NULL, "draft" jsonb NOT NULL, CONSTRAINT "PK_14ca8fa67f70dc68ebab8900f4b" PRIMARY KEY ("id")); COMMENT ON COLUMN "note_scheduled"."createdAt" IS 'The created date of the Note.'; COMMENT ON COLUMN "note_scheduled"."scheduledAt" IS 'The scheduled date of the Note.'; COMMENT ON COLUMN "note_scheduled"."userId" IS 'The ID of author.'`);
+        await queryRunner.query(`CREATE INDEX "IDX_7ddf8710a9faee81081592ec35" ON "note_scheduled" ("createdAt") `);
+        await queryRunner.query(`CREATE INDEX "IDX_bbe52891059217fc31e73e84e2" ON "note_scheduled" ("scheduledAt") `);
+        await queryRunner.query(`CREATE INDEX "IDX_b148b24837cc7a2707ae1f0975" ON "note_scheduled" ("userId") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_dfeab22d6bbc4799193997553a" ON "note_scheduled" ("userId", "scheduledAt") `);
+        await queryRunner.query(`ALTER TABLE "note_scheduled" ADD CONSTRAINT "FK_b148b24837cc7a2707ae1f0975a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "note_scheduled" DROP CONSTRAINT "FK_b148b24837cc7a2707ae1f0975a"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_dfeab22d6bbc4799193997553a"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_b148b24837cc7a2707ae1f0975"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_bbe52891059217fc31e73e84e2"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_7ddf8710a9faee81081592ec35"`);
+        await queryRunner.query(`DROP TABLE "note_scheduled"`);
+    }
+}

packages/backend/package.json

@@ -33,16 +33,16 @@
 		"generate-api-json": "pnpm build && node ./scripts/generate_api_json.js"
 	},
 	"optionalDependencies": {
-		"@swc/core-darwin-arm64": "1.10.3",
-		"@swc/core-darwin-x64": "1.10.3",
-		"@swc/core-linux-arm-gnueabihf": "1.10.3",
-		"@swc/core-linux-arm64-gnu": "1.10.3",
-		"@swc/core-linux-arm64-musl": "1.10.3",
-		"@swc/core-linux-x64-gnu": "1.10.3",
-		"@swc/core-linux-x64-musl": "1.10.3",
-		"@swc/core-win32-arm64-msvc": "1.10.3",
-		"@swc/core-win32-ia32-msvc": "1.10.3",
-		"@swc/core-win32-x64-msvc": "1.10.3",
+		"@swc/core-darwin-arm64": "1.10.7",
+		"@swc/core-darwin-x64": "1.10.7",
+		"@swc/core-linux-arm-gnueabihf": "1.10.7",
+		"@swc/core-linux-arm64-gnu": "1.10.7",
+		"@swc/core-linux-arm64-musl": "1.10.7",
+		"@swc/core-linux-x64-gnu": "1.10.7",
+		"@swc/core-linux-x64-musl": "1.10.7",
+		"@swc/core-win32-arm64-msvc": "1.10.7",
+		"@swc/core-win32-ia32-msvc": "1.10.7",
+		"@swc/core-win32-x64-msvc": "1.10.7",
 		"@tensorflow/tfjs": "4.22.0",
 		"@tensorflow/tfjs-node": "4.22.0",
 		"bufferutil": "4.0.9",
@@ -63,22 +63,22 @@
 	},
 	"dependencies": {
 		"@authenio/samlify-node-xmllint": "2.0.0",
-		"@aws-sdk/client-s3": "3.717.0",
-		"@aws-sdk/lib-storage": "3.717.0",
-		"@bull-board/api": "6.5.4",
-		"@bull-board/fastify": "6.5.4",
-		"@bull-board/ui": "6.5.4",
+		"@aws-sdk/client-s3": "3.729.0",
+		"@aws-sdk/lib-storage": "3.729.0",
+		"@bull-board/api": "6.6.2",
+		"@bull-board/fastify": "6.6.2",
+		"@bull-board/ui": "6.6.2",
 		"@discordapp/twemoji": "15.1.0",
 		"@elastic/elasticsearch": "8.17.0",
 		"@fastify/accepts": "5.0.2",
-		"@fastify/cookie": "11.0.1",
-		"@fastify/cors": "10.0.1",
-		"@fastify/express": "4.0.1",
-		"@fastify/formbody": "8.0.1",
-		"@fastify/http-proxy": "11.0.0",
-		"@fastify/multipart": "9.0.1",
-		"@fastify/static": "8.0.3",
-		"@fastify/view": "10.0.1",
+		"@fastify/cookie": "11.0.2",
+		"@fastify/cors": "10.0.2",
+		"@fastify/express": "4.0.2",
+		"@fastify/formbody": "8.0.2",
+		"@fastify/http-proxy": "11.0.1",
+		"@fastify/multipart": "9.0.2",
+		"@fastify/static": "8.0.4",
+		"@fastify/view": "10.0.2",
 		"@misskey-dev/sharp-read-bmp": "1.2.0",
 		"@misskey-dev/summaly": "github:MisskeyIO/summaly#5.1.3",
 		"@napi-rs/canvas": "0.1.65",
@@ -86,11 +86,11 @@
 		"@nestjs/core": "10.4.15",
 		"@nestjs/testing": "10.4.15",
 		"@peertube/http-signature": "1.7.0",
-		"@simplewebauthn/server": "13.0.0",
+		"@simplewebauthn/server": "13.1.0",
 		"@sinonjs/fake-timers": "11.3.1",
-		"@smithy/node-http-handler": "3.3.3",
-		"@swc/cli": "0.5.2",
-		"@swc/core": "1.10.3",
+		"@smithy/node-http-handler": "4.0.2",
+		"@swc/cli": "0.6.0",
+		"@swc/core": "1.10.7",
 		"@twemoji/parser": "15.1.1",
 		"accepts": "1.3.8",
 		"ajv": "8.17.1",
@@ -99,7 +99,7 @@
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
 		"body-parser": "1.20.3",
-		"bullmq": "5.34.5",
+		"bullmq": "5.34.10",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "10.0.3",
 		"chalk": "5.4.1",
@@ -110,11 +110,11 @@
 		"content-disposition": "0.5.4",
 		"date-fns": "4.1.0",
 		"deep-email-validator": "0.1.21",
-		"fastify": "5.2.0",
-		"fastify-http-errors-enhanced": "6.0.0",
+		"fastify": "5.2.1",
+		"fastify-http-errors-enhanced": "6.0.1",
 		"fastify-raw-body": "5.0.0",
 		"feed": "4.2.2",
-		"file-type": "19.6.0",
+		"file-type": "20.0.0",
 		"fluent-ffmpeg": "2.1.3",
 		"form-data": "4.0.1",
 		"got": "14.4.5",
@@ -127,11 +127,11 @@
 		"is-svg": "5.1.0",
 		"jose": "5.9.6",
 		"js-yaml": "4.1.0",
-		"jsdom": "25.0.1",
+		"jsdom": "26.0.0",
 		"json5": "2.2.3",
 		"jsonld": "8.3.3",
 		"jsrsasign": "11.1.0",
-		"meilisearch": "0.47.0",
+		"meilisearch": "0.48.0",
 		"mfm-js": "0.24.0",
 		"microformats-parser": "2.0.2",
 		"mime-types": "2.1.35",
@@ -163,25 +163,24 @@
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
 		"re2": "1.21.4",
-		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.2.2",
 		"rename": "1.0.4",
 		"rss-parser": "3.13.0",
 		"rxjs": "7.8.1",
 		"samlify": "2.8.11",
 		"sanitize-html": "2.14.0",
-		"secure-json-parse": "3.0.1",
+		"secure-json-parse": "3.0.2",
 		"sharp": "0.33.5",
 		"slacc": "0.0.10",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
-		"systeminformation": "5.23.23",
+		"systeminformation": "5.25.11",
 		"tinycolor2": "1.6.0",
 		"tmp": "0.2.3",
 		"tsc-alias": "1.8.10",
 		"tsconfig-paths": "4.2.0",
 		"typeorm": "0.3.20",
-		"typescript": "5.7.2",
+		"typescript": "5.7.3",
 		"ulid": "2.3.0",
 		"vary": "1.1.2",
 		"web-push": "3.6.7",
@@ -210,7 +209,7 @@
 		"@types/jsrsasign": "10.5.15",
 		"@types/mime-types": "2.1.4",
 		"@types/ms": "0.7.34",
-		"@types/node": "22.10.2",
+		"@types/node": "22.10.7",
 		"@types/node-forge": "1.3.11",
 		"@types/nodemailer": "6.4.17",
 		"@types/oauth": "0.9.6",

packages/backend/src/@types/redis-lock.d.ts

@@ -1,13 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-declare module 'redis-lock' {
-	import type Redis from 'ioredis';
-
-	type Lock = (lockName: string, timeout?: number, taskToPerform?: () => Promise<void>) => void;
-	function redisLock(client: Redis.Redis, retryDelay: number): Lock;
-
-	export = redisLock;
-}

packages/backend/src/boot/entry.ts

@@ -19,7 +19,7 @@ import { workerMain } from './worker.js';
 
 import 'reflect-metadata';
 
-process.title = `Misskey (${cluster.isPrimary ? 'master' : 'worker'})`;
+process.title = `Forkey (${cluster.isPrimary ? 'master' : 'worker'})`;
 
 Error.stackTraceLimit = Infinity;
 EventEmitter.defaultMaxListeners = 128;

packages/backend/src/boot/master.ts

@@ -28,24 +28,25 @@ const themeColor = chalk.hex('#86b300');
 
 function greet() {
 	if (!envOption.quiet && !envOption.logJson) {
-		//#region Misskey logo
+		//#region Forkey logo
 		const v = `v${meta.version}`;
-		console.log(themeColor('  _____ _         _           '));
-		console.log(themeColor(' |     |_|___ ___| |_ ___ _ _ '));
-		console.log(themeColor(' | | | | |_ -|_ -| \'_| -_| | |'));
-		console.log(themeColor(' |_|_|_|_|___|___|_,_|___|_  |'));
-		console.log(' ' + chalk.gray(v) + themeColor('                        |___|\n'.substring(v.length)));
+		console.log(themeColor('███████╗░█████╗░██████╗░██╗░░██╗███████╗██╗░░░██╗'));
+		console.log(themeColor('██╔════╝██╔══██╗██╔══██╗██║░██╔╝██╔════╝╚██╗░██╔╝'));
+		console.log(themeColor('█████╗░░██║░░██║██████╔╝█████═╝░█████╗░░░╚████╔╝░'));
+		console.log(themeColor('██╔══╝░░██║░░██║██╔══██╗██╔═██╗░██╔══╝░░░░╚██╔╝░░'));
+		console.log(themeColor('██║░░░░░╚█████╔╝██║░░██║██║░╚██╗███████╗░░░██║░░░'));
+		console.log(' ' + chalk.gray(v) + themeColor('╚═╝░░░░░░╚════╝░╚═╝░░╚═╝╚═╝░░╚═╝╚══════╝░░░╚═╝░░░\n'.substring(v.length)));
 		//#endregion
 
-		console.log(' Misskey is an open-source decentralized microblogging platform.');
-		console.log(chalk.rgb(255, 136, 0)(' If you like Misskey, please donate to support development. https://www.patreon.com/syuilo'));
+		console.log(' Forkey is an open-source decentralized microblogging platform.');
+		// console.log(chalk.rgb(255, 136, 0)(' If you like Forkey, please donate to support development. https://www.patreon.com/syuilo'));
 
 		console.log('');
 		console.log(chalkTemplate`--- ${os.hostname()} {gray (PID: ${process.pid.toString()})} ---`);
 	}
 
-	bootLogger.info('Welcome to Misskey!');
-	bootLogger.info(`Misskey v${meta.version}`, { version: meta.version, hostname: os.hostname(), pid: process.pid }, true);
+	bootLogger.info('Welcome to Forkey!');
+	bootLogger.info(`Forkey v${meta.version}`, { version: meta.version, hostname: os.hostname(), pid: process.pid }, true);
 }
 
 /**
@@ -68,7 +69,7 @@ export async function masterMain() {
 		process.exit(1);
 	}
 
-	bootLogger.succ('Misskey initialized');
+	bootLogger.succ('Forkey initialized');
 
 	if (envOption.disableClustering) {
 		if (envOption.onlyServer) {

packages/backend/src/core/AppLockService.ts

@@ -1,44 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { promisify } from 'node:util';
-import { Inject, Injectable } from '@nestjs/common';
-import redisLock from 'redis-lock';
-import * as Redis from 'ioredis';
-import { DI } from '@/di-symbols.js';
-import { bindThis } from '@/decorators.js';
-
-/**
- * Retry delay (ms) for lock acquisition
- */
-const retryDelay = 100;
-
-@Injectable()
-export class AppLockService {
-	private lock: (key: string, timeout?: number, _?: (() => Promise<void>) | undefined) => Promise<() => void>;
-
-	constructor(
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-	) {
-		this.lock = promisify(redisLock(this.redisClient, retryDelay));
-	}
-
-	/**
-	 * Get AP Object lock
-	 * @param uri AP object ID
-	 * @param timeout Lock timeout (ms), The timeout releases previous lock.
-	 * @returns Unlock function
-	 */
-	@bindThis
-	public getApLock(uri: string, timeout = 30 * 1000): Promise<() => void> {
-		return this.lock(`ap-object:${uri}`, timeout);
-	}
-
-	@bindThis
-	public getChartInsertLock(lockKey: string, timeout = 30 * 1000): Promise<() => void> {
-		return this.lock(`chart-insert:${lockKey}`, timeout);
-	}
-}

packages/backend/src/core/CaptchaService.ts

@@ -10,6 +10,7 @@ import { bindThis } from '@/decorators.js';
 type CaptchaResponse = {
 	success: boolean;
 	'error-codes'?: string[];
+	'errors'?: string[];
 };
 
 @Injectable()
@@ -73,6 +74,35 @@ export class CaptchaService {
 		}
 	}
 
+	@bindThis
+	public async verifyFriendlyCaptcha(secret: string, response: string | null | undefined): Promise<void> {
+		if (response == null) {
+			throw new Error('frc-failed: no response provided');
+		}
+
+		const result = await this.httpRequestService.send('https://api.friendlycaptcha.com/api/v1/siteverify', {
+			method: 'POST',
+			body: JSON.stringify({
+				secret: secret,
+				solution: response,
+			}),
+			headers: {
+				'Content-Type': 'application/json',
+			},
+		});
+
+		if (result.status !== 200) {
+			throw new Error('frc-failed: frc didn\'t return 200 OK');
+		}
+
+		const resp = await result.json() as CaptchaResponse;
+
+		if (resp.success !== true) {
+			const errorCodes = resp['error-codes'] ? resp['errors']?.join(', ') : '';
+			throw new Error(`frc-failed: ${errorCodes}`);
+		}
+	}
+
 	// https://codeberg.org/Gusted/mCaptcha/src/branch/main/mcaptcha.go
 	@bindThis
 	public async verifyMcaptcha(secret: string, siteKey: string, instanceHost: string, response: string | null | undefined): Promise<void> {

packages/backend/src/core/CoreModule.ts

@@ -10,7 +10,6 @@ import { AccountUpdateService } from './AccountUpdateService.js';
 import { AiService } from './AiService.js';
 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';
@@ -105,6 +104,7 @@ import { UserAccountMoveLogEntityService } from './entities/UserAccountMoveLogEn
 import { MutingEntityService } from './entities/MutingEntityService.js';
 import { RenoteMutingEntityService } from './entities/RenoteMutingEntityService.js';
 import { NoteEntityService } from './entities/NoteEntityService.js';
+import { ScheduledNoteEntityService } from './entities/ScheduledNoteEntityService.js';
 import { NoteFavoriteEntityService } from './entities/NoteFavoriteEntityService.js';
 import { NoteReactionEntityService } from './entities/NoteReactionEntityService.js';
 import { NotificationEntityService } from './entities/NotificationEntityService.js';
@@ -150,7 +150,6 @@ const $AccountUpdateService: Provider = { provide: 'AccountUpdateService', useEx
 const $AiService: Provider = { provide: 'AiService', useExisting: AiService };
 const $AnnouncementService: Provider = { provide: 'AnnouncementService', useExisting: AnnouncementService };
 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 };
@@ -248,6 +247,7 @@ const $UserAccountMoveLogEntityService: Provider = { provide: 'UserAccountMoveLo
 const $MutingEntityService: Provider = { provide: 'MutingEntityService', useExisting: MutingEntityService };
 const $RenoteMutingEntityService: Provider = { provide: 'RenoteMutingEntityService', useExisting: RenoteMutingEntityService };
 const $NoteEntityService: Provider = { provide: 'NoteEntityService', useExisting: NoteEntityService };
+const $ScheduledNoteEntityService: Provider = { provide: 'ScheduledNoteEntityService', useExisting: ScheduledNoteEntityService };
 const $NoteFavoriteEntityService: Provider = { provide: 'NoteFavoriteEntityService', useExisting: NoteFavoriteEntityService };
 const $NoteReactionEntityService: Provider = { provide: 'NoteReactionEntityService', useExisting: NoteReactionEntityService };
 const $NotificationEntityService: Provider = { provide: 'NotificationEntityService', useExisting: NotificationEntityService };
@@ -293,7 +293,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		AiService,
 		AnnouncementService,
 		AntennaService,
-		AppLockService,
 		AchievementService,
 		AvatarDecorationService,
 		CaptchaService,
@@ -389,6 +388,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		MutingEntityService,
 		RenoteMutingEntityService,
 		NoteEntityService,
+		ScheduledNoteEntityService,
 		NoteFavoriteEntityService,
 		NoteReactionEntityService,
 		NotificationEntityService,
@@ -433,7 +433,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$AiService,
 		$AnnouncementService,
 		$AntennaService,
-		$AppLockService,
 		$AchievementService,
 		$AvatarDecorationService,
 		$CaptchaService,
@@ -529,6 +528,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$MutingEntityService,
 		$RenoteMutingEntityService,
 		$NoteEntityService,
+		$ScheduledNoteEntityService,
 		$NoteFavoriteEntityService,
 		$NoteReactionEntityService,
 		$NotificationEntityService,
@@ -571,7 +571,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		AiService,
 		AnnouncementService,
 		AntennaService,
-		AppLockService,
 		AchievementService,
 		AvatarDecorationService,
 		CaptchaService,
@@ -666,6 +665,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		MutingEntityService,
 		RenoteMutingEntityService,
 		NoteEntityService,
+		ScheduledNoteEntityService,
 		NoteFavoriteEntityService,
 		NoteReactionEntityService,
 		NotificationEntityService,
@@ -710,7 +710,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$AiService,
 		$AnnouncementService,
 		$AntennaService,
-		$AppLockService,
 		$AchievementService,
 		$AvatarDecorationService,
 		$CaptchaService,
@@ -805,6 +804,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$MutingEntityService,
 		$RenoteMutingEntityService,
 		$NoteEntityService,
+		$ScheduledNoteEntityService,
 		$NoteFavoriteEntityService,
 		$NoteReactionEntityService,
 		$NotificationEntityService,

packages/backend/src/core/FileInfoService.ts

@@ -9,7 +9,7 @@ import { join } from 'node:path';
 import * as stream from 'node:stream/promises';
 import { Injectable } from '@nestjs/common';
 import { FSWatcher } from 'chokidar';
-import * as fileType from 'file-type';
+import { fileTypeFromFile } from 'file-type';
 import FFmpeg from 'fluent-ffmpeg';
 import isSvg from 'is-svg';
 import probeImageSize from 'probe-image-size';
@@ -309,7 +309,7 @@ export class FileInfoService {
 	}
 
 	@bindThis
-	public fixMime(mime: string | fileType.MimeType): string {
+	public fixMime(mime: string): string {
 		// see https://github.com/misskey-dev/misskey/pull/10686
 		if (mime === 'audio/x-flac') {
 			return 'audio/flac';
@@ -363,7 +363,7 @@ export class FileInfoService {
 			return TYPE_OCTET_STREAM;
 		}
 
-		const type = await fileType.fileTypeFromFile(path);
+		const type = await fileTypeFromFile(path);
 
 		if (type) {
 		// XMLはSVGかもしれない

packages/backend/src/core/NoteCreateService.ts

@@ -13,16 +13,28 @@ import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mf
 import { extractHashtags } from '@/misc/extract-hashtags.js';
 import type { IMentionedRemoteUsers } from '@/models/Note.js';
 import { MiNote } from '@/models/Note.js';
-import type { ChannelFollowingsRepository, ChannelsRepository, FollowingsRepository, InstancesRepository, MiFollowing, NotesRepository, NoteThreadMutingsRepository, UserListMembershipsRepository, UserProfilesRepository, UsersRepository } from '@/models/_.js';
+import { MiScheduledNote } from '@/models/ScheduledNote.js';
+import type {
+	ChannelFollowingsRepository,
+	ChannelsRepository,
+	FollowingsRepository,
+	InstancesRepository,
+	MiFollowing,
+	NotesRepository,
+	NoteThreadMutingsRepository,
+	ScheduledNotesRepository,
+	UserListMembershipsRepository,
+	UserProfilesRepository,
+	UsersRepository
+} from '@/models/_.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
-import type { MiApp } from '@/models/App.js';
 import { concat } from '@/misc/prelude/array.js';
 import { IdService } from '@/core/IdService.js';
 import type { MiUser, MiLocalUser, MiRemoteUser } from '@/models/User.js';
 import type { IPoll } from '@/models/Poll.js';
 import { MiPoll } from '@/models/Poll.js';
+import type { NoteCreateOption, MinimumUser } from '@/types.js';
 import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js';
-import type { MiChannel } from '@/models/Channel.js';
 import { normalizeForSearch } from '@/misc/normalize-for-search.js';
 import { RelayService } from '@/core/RelayService.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
@@ -118,35 +130,6 @@ class NotificationManager {
 	}
 }
 
-type MinimumUser = {
-	id: MiUser['id'];
-	host: MiUser['host'];
-	username: MiUser['username'];
-	uri: MiUser['uri'];
-};
-
-type Option = {
-	createdAt?: Date | null;
-	name?: string | null;
-	text?: string | null;
-	reply?: MiNote | null;
-	renote?: MiNote | null;
-	files?: MiDriveFile[] | null;
-	poll?: IPoll | null;
-	localOnly?: boolean | null;
-	reactionAcceptance?: MiNote['reactionAcceptance'];
-	cw?: string | null;
-	visibility?: string;
-	visibleUsers?: MinimumUser[] | null;
-	channel?: MiChannel | null;
-	apMentions?: MinimumUser[] | null;
-	apHashtags?: string[] | null;
-	apEmojis?: string[] | null;
-	uri?: string | null;
-	url?: string | null;
-	app?: MiApp | null;
-};
-
 @Injectable()
 export class NoteCreateService implements OnApplicationShutdown {
 	private logger: Logger;
@@ -169,6 +152,9 @@ export class NoteCreateService implements OnApplicationShutdown {
 		@Inject(DI.notesRepository)
 		private notesRepository: NotesRepository,
 
+		@Inject(DI.scheduledNotesRepository)
+		private scheduledNotesRepository: ScheduledNotesRepository,
+
 		@Inject(DI.instancesRepository)
 		private instancesRepository: InstancesRepository,
 
@@ -229,7 +215,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		host: MiUser['host'];
 		isBot: MiUser['isBot'];
 		isCat: MiUser['isCat'];
-	}, data: Option, silent = false): Promise<MiNote> {
+	}, data: NoteCreateOption, silent = false): Promise<MiNote | MiScheduledNote> {
 		// チャンネル外にリプライしたら対象のスコープに合わせる
 		// (クライアントサイドでやっても良い処理だと思うけどとりあえずサーバーサイドで)
 		if (data.reply && data.channel && data.reply.channelId !== data.channel.id) {
@@ -425,6 +411,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			throw new IdentifiableError('9f466dab-c856-48cd-9e65-ff90ff750580', `Notes including mentions are limited to ${policies.mentionLimit} users.`);
 		}
 
+		if (!data.scheduledAt) {
 			const note = await this.insertNote(user, data, tags, emojis, mentionedUsers);
 
 			setImmediate('post created', { signal: this.#shutdownController.signal }).then(
@@ -433,10 +420,30 @@ export class NoteCreateService implements OnApplicationShutdown {
 			);
 
 			return note;
+		} else {
+			if (!policies.canScheduleNote) {
+				throw new IdentifiableError('7cc42034-f7ab-4f7c-87b4-e00854479080', 'User has no permission to schedule notes.');
+			}
+
+			if ((data.scheduledAt.getTime() - Date.now()) / 86_400_000 > policies.scheduleNoteMaxDays) {
+				throw new IdentifiableError('506006cf-3092-4ae1-8145-b025001c591f', `User can schedule notes up to ${policies.scheduleNoteMaxDays} days in the future.`);
+			}
+
+			const scheduledCount = await this.scheduledNotesRepository.countBy({ userId: user.id });
+			if (scheduledCount >= policies.scheduleNoteLimit) {
+				throw new IdentifiableError('7fc78d25-d947-45c1-9547-02257b98cab3', `User can schedule up to ${policies.scheduleNoteLimit} notes.`);
+			}
+
+			const draft = await this.insertScheduledNote(user, data);
+
+			await this.queueService.createScheduledNoteJob(draft.id, draft.scheduledAt!);
+
+			return draft;
+		}
 	}
 
 	@bindThis
-	private async insertNote(user: { id: MiUser['id']; host: MiUser['host']; }, data: Option, tags: string[], emojis: string[], mentionedUsers: MinimumUser[]) {
+	private async insertNote(user: { id: MiUser['id']; host: MiUser['host']; }, data: NoteCreateOption, tags: string[], emojis: string[], mentionedUsers: MinimumUser[]) {
 		const insert = new MiNote({
 			id: this.idService.gen(data.createdAt?.getTime()),
 			createdAt: data.createdAt!,
@@ -534,13 +541,40 @@ export class NoteCreateService implements OnApplicationShutdown {
 		}
 	}
 
+	@bindThis
+	private async insertScheduledNote(user: { id: MiUser['id']; host: MiUser['host']; }, data: NoteCreateOption) {
+		const insert = new MiScheduledNote({
+			id: this.idService.gen(data.createdAt?.getTime()),
+			createdAt: data.createdAt!,
+			scheduledAt: data.scheduledAt!,
+			userId: user.id,
+			draft: data,
+		});
+
+		// 予約投稿を作成
+		try {
+			await this.scheduledNotesRepository.insert(insert);
+
+			return insert;
+		} catch (e) {
+			// duplicate key error
+			if (isDuplicateKeyValueError(e)) {
+				throw new IdentifiableError('5ea8e4f5-9d64-4e6c-92b8-9e2b5a4756bc', 'There is already a scheduled note with the same time.');
+			}
+
+			this.logger.error(`Failed to create scheduled note: ${e}`, { error: e });
+
+			throw e;
+		}
+	}
+
 	@bindThis
 	private async postNoteCreated(note: MiNote, user: {
 		id: MiUser['id'];
 		username: MiUser['username'];
 		host: MiUser['host'];
 		isBot: MiUser['isBot'];
-	}, data: Option, silent: boolean, tags: string[], mentionedUsers: MinimumUser[]) {
+	}, data: NoteCreateOption, silent: boolean, tags: string[], mentionedUsers: MinimumUser[]) {
 		const meta = await this.metaService.fetch();
 
 		this.notesChart.update(note, true);
@@ -792,12 +826,12 @@ export class NoteCreateService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	private isRenote(note: Option): note is Option & { renote: MiNote } {
+	private isRenote(note: NoteCreateOption): note is NoteCreateOption & { renote: MiNote } {
 		return note.renote != null;
 	}
 
 	@bindThis
-	private isQuote(note: Option): note is Option & { renote: MiNote } & (
+	private isQuote(note: NoteCreateOption): note is NoteCreateOption & { renote: MiNote } & (
 		{ text: string } | { cw: string } | { reply: MiNote } | { poll: IPoll } | { files: MiDriveFile[] }
 		) {
 		// NOTE: SYNC WITH misc/is-renote.ts
@@ -873,7 +907,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	private async renderNoteOrRenoteActivity(data: Option, note: MiNote) {
+	private async renderNoteOrRenoteActivity(data: NoteCreateOption, note: MiNote) {
 		if (data.localOnly) return null;
 
 		const content = this.isRenote(data) && !this.isQuote(data)

packages/backend/src/core/QueueService.ts

@@ -7,6 +7,7 @@ import { randomUUID } from 'node:crypto';
 import { Inject, Injectable } from '@nestjs/common';
 import type { IActivity } from '@/core/activitypub/type.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
+import type { MiScheduledNote } from '@/models/ScheduledNote.js';
 import type { MiAbuseUserReport } from '@/models/AbuseUserReport.js';
 import type { MiWebhook, webhookEventTypes } from '@/models/Webhook.js';
 import type { Config } from '@/config.js';
@@ -34,6 +35,11 @@ export class QueueService {
 		@Inject('queue:objectStorage') public objectStorageQueue: ObjectStorageQueue,
 		@Inject('queue:webhookDeliver') public webhookDeliverQueue: WebhookDeliverQueue,
 	) {
+		this.ensureRepeatJobs();
+	}
+
+	@bindThis
+	private ensureRepeatJobs() {
 		this.systemQueue.add('tickCharts', {
 		}, {
 			repeat: { pattern: '55 * * * *' },
@@ -69,6 +75,12 @@ export class QueueService {
 			repeat: { pattern: '*/5 * * * *' },
 			removeOnComplete: true,
 		});
+
+		this.systemQueue.add('checkMissingScheduledNote', {
+		}, {
+			repeat: { pattern: '*/5 * * * *' },
+			removeOnComplete: true,
+		});
 	}
 
 	@bindThis
@@ -376,7 +388,22 @@ export class QueueService {
 
 	@bindThis
 	public createReportAbuseJob(report: MiAbuseUserReport) {
-		return this.dbQueue.add('reportAbuse', report);
+		return this.dbQueue.add('reportAbuse', report, {
+			removeOnComplete: true,
+			removeOnFail: true,
+		});
+	}
+
+	@bindThis
+	public createScheduledNoteJob(draftId: MiScheduledNote['id'], scheduledAt: Date) {
+		return this.systemQueue.add('scheduledNote', {
+			draftId,
+		}, {
+			jobId: `scheduledNote:${draftId}`,
+			delay: Math.max(scheduledAt.getTime() - Date.now(), 0) + Math.floor(Math.random() * 500 + 250),
+			removeOnComplete: true,
+			removeOnFail: true,
+		});
 	}
 
 	@bindThis

packages/backend/src/core/RoleService.ts

@@ -36,6 +36,9 @@ export type RolePolicies = {
 	gtlAvailable: boolean;
 	ltlAvailable: boolean;
 	canPublicNote: boolean;
+	canScheduleNote: boolean;
+	scheduleNoteLimit: number;
+	scheduleNoteMaxDays: number;
 	canInitiateConversation: boolean;
 	canCreateContent: boolean;
 	canUpdateContent: boolean;
@@ -77,6 +80,9 @@ export const DEFAULT_POLICIES: RolePolicies = {
 	gtlAvailable: true,
 	ltlAvailable: true,
 	canPublicNote: true,
+	canScheduleNote: true,
+	scheduleNoteLimit: 10,
+	scheduleNoteMaxDays: 365,
 	canInitiateConversation: true,
 	canCreateContent: true,
 	canUpdateContent: true,
@@ -389,6 +395,9 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 			gtlAvailable: calc('gtlAvailable', vs => vs.some(v => v === true)),
 			ltlAvailable: calc('ltlAvailable', vs => vs.some(v => v === true)),
 			canPublicNote: calc('canPublicNote', vs => vs.some(v => v === true)),
+			canScheduleNote: calc('canScheduleNote', vs => vs.some(v => v === true)),
+			scheduleNoteLimit: calc('scheduleNoteLimit', vs => Math.max(...vs)),
+			scheduleNoteMaxDays: calc('scheduleNoteMaxDays', vs => Math.max(...vs)),
 			canInitiateConversation: calc('canInitiateConversation', vs => vs.some(v => v === true)),
 			canCreateContent: calc('canCreateContent', vs => vs.some(v => v === true)),
 			canUpdateContent: calc('canUpdateContent', vs => vs.some(v => v === true)),

packages/backend/src/core/S3Service.ts

@@ -46,6 +46,8 @@ export class S3Service {
 			tls: meta.objectStorageUseSSL,
 			forcePathStyle: meta.objectStorageEndpoint ? meta.objectStorageS3ForcePathStyle : false, // AWS with endPoint omitted
 			requestHandler: new NodeHttpHandler(handlerOption),
+			requestChecksumCalculation: 'WHEN_REQUIRED',
+			responseChecksumValidation: 'WHEN_REQUIRED',
 		});
 	}
 

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

@@ -5,6 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { In } from 'typeorm';
+import * as Redis from 'ioredis';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { UserFollowingService } from '@/core/UserFollowingService.js';
@@ -14,8 +15,8 @@ import { NotePiningService } from '@/core/NotePiningService.js';
 import { UserBlockingService } from '@/core/UserBlockingService.js';
 import { NoteDeleteService } from '@/core/NoteDeleteService.js';
 import { NoteCreateService } from '@/core/NoteCreateService.js';
+import { acquireApObjectLock } from '@/misc/distributed-lock.js';
 import { concat, toArray, toSingle, unique } from '@/misc/prelude/array.js';
-import { AppLockService } from '@/core/AppLockService.js';
 import type Logger from '@/logger.js';
 import { MetaService } from '@/core/MetaService.js';
 import { IdService } from '@/core/IdService.js';
@@ -49,6 +50,9 @@ export class ApInboxService {
 		@Inject(DI.config)
 		private config: Config,
 
+		@Inject(DI.redisForTimelines)
+		private redisForTimelines: Redis.Redis,
+
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
@@ -77,7 +81,6 @@ export class ApInboxService {
 		private userBlockingService: UserBlockingService,
 		private noteCreateService: NoteCreateService,
 		private noteDeleteService: NoteDeleteService,
-		private appLockService: AppLockService,
 		private apResolverService: ApResolverService,
 		private apDbResolverService: ApDbResolverService,
 		private apLoggerService: ApLoggerService,
@@ -312,7 +315,7 @@ export class ApInboxService {
 		const meta = await this.metaService.fetch();
 		if (this.utilityService.isItemListedIn(this.utilityService.extractHost(uri), meta.blockedHosts)) return 'skip: blocked host';
 
-		const unlock = await this.appLockService.getApLock(uri);
+		const unlock = await acquireApObjectLock(this.redisForTimelines, uri);
 
 		try {
 			// 既に同じURIを持つものが登録されていないかチェック
@@ -440,7 +443,7 @@ export class ApInboxService {
 			}
 		}
 
-		const unlock = await this.appLockService.getApLock(uri);
+		const unlock = await acquireApObjectLock(this.redisForTimelines, uri);
 
 		try {
 			const exist = await this.apNoteService.fetchNote(note);
@@ -543,7 +546,7 @@ export class ApInboxService {
 	private async deleteNote(actor: MiRemoteUser, uri: string): Promise<string> {
 		this.logger.info(`Deleting the Note: ${uri}`);
 
-		const unlock = await this.appLockService.getApLock(uri);
+		const unlock = await acquireApObjectLock(this.redisForTimelines, uri);
 
 		try {
 			const note = await this.apDbResolverService.getNoteFromApId(uri);
@@ -813,7 +816,7 @@ export class ApInboxService {
 			return 'ok: Question updated';
 		} else if (additionalCc && isPost(object)) {
 			const uri = getApId(object);
-			const unlock = await this.appLockService.getApLock(uri);
+			const unlock = await acquireApObjectLock(this.redisForTimelines, uri);
 
 			try {
 				const exist = await this.apNoteService.fetchNote(object);

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

@@ -518,6 +518,7 @@ export class ApRendererService {
 			discoverable: user.isExplorable,
 			publicKey: this.renderKey(user, keypair, '#main-key'),
 			isCat: user.isCat,
+			speakAsCat: user.speakAsCat,
 			attachment: attachment.length ? attachment : undefined,
 		};
 

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

@@ -553,6 +553,9 @@ export const CONTEXTS: (string | Context)[] = [
 		'_misskey_votes': 'misskey:_misskey_votes',
 		'_misskey_summary': 'misskey:_misskey_summary',
 		'isCat': 'misskey:isCat',
+		// Firefish
+		firefish: "https://joinfirefish.org/ns#",
+		speakAsCat: "firefish:speakAsCat",
 		// vcard
 		vcard: 'http://www.w3.org/2006/vcard/ns#',
 	} satisfies Context,

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

@@ -5,15 +5,16 @@
 
 import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { In } from 'typeorm';
+import * as Redis from 'ioredis';
 import { DI } from '@/di-symbols.js';
 import type { UsersRepository, PollsRepository, EmojisRepository } from '@/models/_.js';
 import type { Config } from '@/config.js';
 import type { MiRemoteUser } from '@/models/User.js';
 import type { MiNote } from '@/models/Note.js';
+import { acquireApObjectLock } from '@/misc/distributed-lock.js';
 import { toArray, toSingle, unique } from '@/misc/prelude/array.js';
 import type { MiEmoji } from '@/models/Emoji.js';
 import { MetaService } from '@/core/MetaService.js';
-import { AppLockService } from '@/core/AppLockService.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
 import { NoteCreateService } from '@/core/NoteCreateService.js';
 import type Logger from '@/logger.js';
@@ -47,6 +48,9 @@ export class ApNoteService {
 		@Inject(DI.config)
 		private config: Config,
 
+		@Inject(DI.redisForTimelines)
+		private redisForTimelines: Redis.Redis,
+
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
@@ -70,7 +74,6 @@ export class ApNoteService {
 		private apImageService: ApImageService,
 		private apQuestionService: ApQuestionService,
 		private metaService: MetaService,
-		private appLockService: AppLockService,
 		private pollService: PollService,
 		private noteCreateService: NoteCreateService,
 		private apDbResolverService: ApDbResolverService,
@@ -349,7 +352,7 @@ export class ApNoteService {
 				poll,
 				uri: note.id,
 				url: url,
-			}, silent);
+			}, silent) as MiNote;
 		} catch (err: any) {
 			if (err.name !== 'duplicated') {
 				throw err;
@@ -379,7 +382,7 @@ export class ApNoteService {
 			throw new StatusError('blocked host', 451);
 		}
 
-		const unlock = await this.appLockService.getApLock(uri);
+		const unlock = await acquireApObjectLock(this.redisForTimelines, uri);
 
 		try {
 			//#region このサーバーに既に登録されていたらそれを返す

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

@@ -389,6 +389,7 @@ export class ApPersonService implements OnModuleInit {
 					tags,
 					isBot,
 					isCat: (person as any).isCat === true,
+					speakAsCat: (person as any).speakAsCat != null ? (person as any).speakAsCat === true : (person as any).isCat === true,
 					emojis,
 				})) as MiRemoteUser;
 
@@ -562,12 +563,13 @@ export class ApPersonService implements OnModuleInit {
 			tags,
 			isBot: getApType(object) === 'Service' || getApType(object) === 'Application',
 			isCat: (person as any).isCat === true,
+			speakAsCat: (person as any).speakAsCat != null ? (person as any).speakAsCat === true : (person as any).isCat === true,
 			isLocked: person.manuallyApprovesFollowers,
 			movedToUri: person.movedTo ?? null,
 			alsoKnownAs: person.alsoKnownAs ?? null,
 			isExplorable: person.discoverable,
 			...((policy.canUpdateAvatar || policy.canUpdateBanner) ? await this.resolveAvatarAndBanner(exist, policy.canUpdateAvatar ? person.icon : exist.avatarUrl, policy.canUpdateBanner ? person.image : exist.bannerUrl).catch(() => ({})) : {}),
-		} as Partial<MiRemoteUser> & Pick<MiRemoteUser, 'isBot' | 'isCat' | 'isLocked' | 'movedToUri' | 'alsoKnownAs' | 'isExplorable'>;
+		} as Partial<MiRemoteUser> & Pick<MiRemoteUser, 'isBot' | 'isCat' | 'speakAsCat' | 'isLocked' | 'movedToUri' | 'alsoKnownAs' | 'isExplorable'>;
 
 		const moving = ((): boolean => {
 			// 移行先がない→ある

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

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

packages/backend/src/core/chart/charts/active-users.ts

@@ -5,11 +5,12 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import { AppLockService } from '@/core/AppLockService.js';
+import * as Redis from 'ioredis';
 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 { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/active-users.js';
@@ -28,11 +29,13 @@ export default class ActiveUsersChart extends Chart<typeof schema> { // eslint-d
 		@Inject(DI.db)
 		private db: DataSource,
 
-		private appLockService: AppLockService,
+		@Inject(DI.redisForTimelines)
+		private redisForTimelines: Redis.Redis,
+
 		private chartLoggerService: ChartLoggerService,
 		private idService: IdService,
 	) {
-		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema);
+		super(db, (k) => acquireChartInsertLock(redisForTimelines, k), chartLoggerService.logger, name, schema);
 	}
 
 	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/ap-request.ts

@@ -5,9 +5,10 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import { AppLockService } from '@/core/AppLockService.js';
+import * as Redis from 'ioredis';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
+import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/ap-request.js';
@@ -22,10 +23,12 @@ export default class ApRequestChart extends Chart<typeof schema> { // eslint-dis
 		@Inject(DI.db)
 		private db: DataSource,
 
-		private appLockService: AppLockService,
+		@Inject(DI.redisForTimelines)
+		private redisForTimelines: Redis.Redis,
+
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema);
+		super(db, (k) => acquireChartInsertLock(redisForTimelines, k), chartLoggerService.logger, name, schema);
 	}
 
 	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/drive.ts

@@ -5,10 +5,11 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
+import * as Redis from 'ioredis';
 import type { MiDriveFile } from '@/models/DriveFile.js';
-import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
+import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/drive.js';
@@ -23,10 +24,12 @@ export default class DriveChart extends Chart<typeof schema> { // eslint-disable
 		@Inject(DI.db)
 		private db: DataSource,
 
-		private appLockService: AppLockService,
+		@Inject(DI.redisForTimelines)
+		private redisForTimelines: Redis.Redis,
+
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema);
+		super(db, (k) => acquireChartInsertLock(redisForTimelines, k), chartLoggerService.logger, name, schema);
 	}
 
 	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/federation.ts

@@ -5,11 +5,12 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
+import * as Redis from 'ioredis';
 import type { FollowingsRepository, InstancesRepository } from '@/models/_.js';
-import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import { MetaService } from '@/core/MetaService.js';
 import { bindThis } from '@/decorators.js';
+import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/federation.js';
@@ -24,6 +25,9 @@ export default class FederationChart extends Chart<typeof schema> { // eslint-di
 		@Inject(DI.db)
 		private db: DataSource,
 
+		@Inject(DI.redisForTimelines)
+		private redisForTimelines: Redis.Redis,
+
 		@Inject(DI.followingsRepository)
 		private followingsRepository: FollowingsRepository,
 
@@ -31,10 +35,9 @@ export default class FederationChart extends Chart<typeof schema> { // eslint-di
 		private instancesRepository: InstancesRepository,
 
 		private metaService: MetaService,
-		private appLockService: AppLockService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema);
+		super(db, (k) => acquireChartInsertLock(redisForTimelines, k), chartLoggerService.logger, name, schema);
 	}
 
 	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/instance.ts

@@ -5,13 +5,14 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
+import * as Redis from 'ioredis';
 import type { DriveFilesRepository, FollowingsRepository, UsersRepository, NotesRepository } from '@/models/_.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
 import type { MiNote } from '@/models/Note.js';
-import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
+import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/instance.js';
@@ -26,6 +27,9 @@ export default class InstanceChart extends Chart<typeof schema> { // eslint-disa
 		@Inject(DI.db)
 		private db: DataSource,
 
+		@Inject(DI.redisForTimelines)
+		private redisForTimelines: Redis.Redis,
+
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
@@ -39,10 +43,9 @@ export default class InstanceChart extends Chart<typeof schema> { // eslint-disa
 		private followingsRepository: FollowingsRepository,
 
 		private utilityService: UtilityService,
-		private appLockService: AppLockService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema, true);
+		super(db, (k) => acquireChartInsertLock(redisForTimelines, k), chartLoggerService.logger, name, schema, true);
 	}
 
 	protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/notes.ts

@@ -5,11 +5,12 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { Not, IsNull, DataSource } from 'typeorm';
+import * as Redis from 'ioredis';
 import type { NotesRepository } from '@/models/_.js';
 import type { MiNote } from '@/models/Note.js';
-import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
+import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/notes.js';
@@ -24,13 +25,15 @@ export default class NotesChart extends Chart<typeof schema> { // eslint-disable
 		@Inject(DI.db)
 		private db: DataSource,
 
+		@Inject(DI.redisForTimelines)
+		private redisForTimelines: Redis.Redis,
+
 		@Inject(DI.notesRepository)
 		private notesRepository: NotesRepository,
 
-		private appLockService: AppLockService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema);
+		super(db, (k) => acquireChartInsertLock(redisForTimelines, k), chartLoggerService.logger, name, schema);
 	}
 
 	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/per-user-drive.ts

@@ -5,12 +5,13 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
+import * as Redis from 'ioredis';
 import type { DriveFilesRepository } from '@/models/_.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
-import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
 import { bindThis } from '@/decorators.js';
+import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/per-user-drive.js';
@@ -25,14 +26,16 @@ export default class PerUserDriveChart extends Chart<typeof schema> { // eslint-
 		@Inject(DI.db)
 		private db: DataSource,
 
+		@Inject(DI.redisForTimelines)
+		private redisForTimelines: Redis.Redis,
+
 		@Inject(DI.driveFilesRepository)
 		private driveFilesRepository: DriveFilesRepository,
 
-		private appLockService: AppLockService,
 		private driveFileEntityService: DriveFileEntityService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema, true);
+		super(db, (k) => acquireChartInsertLock(redisForTimelines, k), chartLoggerService.logger, name, schema, true);
 	}
 
 	protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/per-user-following.ts

@@ -5,12 +5,13 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { Not, IsNull, DataSource } from 'typeorm';
+import * as Redis from 'ioredis';
 import type { MiUser } from '@/models/User.js';
-import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import type { FollowingsRepository } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
+import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/per-user-following.js';
@@ -25,14 +26,16 @@ export default class PerUserFollowingChart extends Chart<typeof schema> { // esl
 		@Inject(DI.db)
 		private db: DataSource,
 
+		@Inject(DI.redisForTimelines)
+		private redisForTimelines: Redis.Redis,
+
 		@Inject(DI.followingsRepository)
 		private followingsRepository: FollowingsRepository,
 
-		private appLockService: AppLockService,
 		private userEntityService: UserEntityService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema, true);
+		super(db, (k) => acquireChartInsertLock(redisForTimelines, k), chartLoggerService.logger, name, schema, true);
 	}
 
 	protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/per-user-notes.ts

@@ -5,12 +5,13 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
+import * as Redis from 'ioredis';
 import type { MiUser } from '@/models/User.js';
 import type { MiNote } from '@/models/Note.js';
-import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import type { NotesRepository } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
+import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/per-user-notes.js';
@@ -25,13 +26,15 @@ export default class PerUserNotesChart extends Chart<typeof schema> { // eslint-
 		@Inject(DI.db)
 		private db: DataSource,
 
+		@Inject(DI.redisForTimelines)
+		private redisForTimelines: Redis.Redis,
+
 		@Inject(DI.notesRepository)
 		private notesRepository: NotesRepository,
 
-		private appLockService: AppLockService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema, true);
+		super(db, (k) => acquireChartInsertLock(redisForTimelines, k), chartLoggerService.logger, name, schema, true);
 	}
 
 	protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/per-user-pv.ts

@@ -5,11 +5,12 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
+import * as Redis from 'ioredis';
 import type { MiUser } from '@/models/User.js';
-import { AppLockService } from '@/core/AppLockService.js';
 import { addTime, dateUTC, subtractTime } from '@/misc/prelude/time.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
+import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/per-user-pv.js';
@@ -24,10 +25,12 @@ export default class PerUserPvChart extends Chart<typeof schema> { // eslint-dis
 		@Inject(DI.db)
 		private db: DataSource,
 
-		private appLockService: AppLockService,
+		@Inject(DI.redisForTimelines)
+		private redisForTimelines: Redis.Redis,
+
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema, true);
+		super(db, (k) => acquireChartInsertLock(redisForTimelines, k), chartLoggerService.logger, name, schema, true);
 	}
 
 	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/per-user-reactions.ts

@@ -5,12 +5,13 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
+import * as Redis from 'ioredis';
 import type { MiUser } from '@/models/User.js';
 import type { MiNote } from '@/models/Note.js';
-import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
+import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/per-user-reactions.js';
@@ -25,11 +26,13 @@ export default class PerUserReactionsChart extends Chart<typeof schema> { // esl
 		@Inject(DI.db)
 		private db: DataSource,
 
-		private appLockService: AppLockService,
+		@Inject(DI.redisForTimelines)
+		private redisForTimelines: Redis.Redis,
+
 		private userEntityService: UserEntityService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema, true);
+		super(db, (k) => acquireChartInsertLock(redisForTimelines, k), chartLoggerService.logger, name, schema, true);
 	}
 
 	protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/test-grouped.ts

@@ -5,10 +5,11 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import { AppLockService } from '@/core/AppLockService.js';
+import * as Redis from 'ioredis';
 import { DI } from '@/di-symbols.js';
 import Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
+import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { name, schema } from './entities/test-grouped.js';
 import type { KVs } from '../core.js';
@@ -24,10 +25,12 @@ export default class TestGroupedChart extends Chart<typeof schema> { // eslint-d
 		@Inject(DI.db)
 		private db: DataSource,
 
-		private appLockService: AppLockService,
+		@Inject(DI.redisForTimelines)
+		private redisForTimelines: Redis.Redis,
+
 		logger: Logger,
 	) {
-		super(db, (k) => appLockService.getChartInsertLock(k), logger, name, schema, true);
+		super(db, (k) => acquireChartInsertLock(redisForTimelines, k), logger, name, schema, true);
 	}
 
 	protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/test-intersection.ts

@@ -5,10 +5,11 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import { AppLockService } from '@/core/AppLockService.js';
+import * as Redis from 'ioredis';
 import { DI } from '@/di-symbols.js';
 import Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
+import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { name, schema } from './entities/test-intersection.js';
 import type { KVs } from '../core.js';
@@ -22,10 +23,12 @@ export default class TestIntersectionChart extends Chart<typeof schema> { // esl
 		@Inject(DI.db)
 		private db: DataSource,
 
-		private appLockService: AppLockService,
+		@Inject(DI.redisForTimelines)
+		private redisForTimelines: Redis.Redis,
+
 		logger: Logger,
 	) {
-		super(db, (k) => appLockService.getChartInsertLock(k), logger, name, schema);
+		super(db, (k) => acquireChartInsertLock(redisForTimelines, k), logger, name, schema);
 	}
 
 	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {