Merge remote-tracking branch 'upstream/develop' into merge-upstream

taiyme · Aug 12, 2024 · 525c0c1 · 525c0c1
2 parents e43f0b4 + 008a66d
commit 525c0c1
Show file tree

Hide file tree

Showing 370 changed files with 9,171 additions and 5,789 deletions.
diff --git a/.config/docker_example.env b/.config/docker_example.env
@@ -1,5 +1,11 @@
+# misskey settings
+# MISSKEY_URL=https://example.tld/
+
 # db settings
 POSTGRES_PASSWORD=example-misskey-pass
+# DATABASE_PASSWORD=${POSTGRES_PASSWORD}
 POSTGRES_USER=example-misskey-user
+# DATABASE_USER=${POSTGRES_USER}
 POSTGRES_DB=misskey
+# DATABASE_DB=${POSTGRES_DB}
 DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}"
diff --git a/.config/docker_example.yml b/.config/docker_example.yml
@@ -6,6 +6,7 @@
 #───┘ URL └─────────────────────────────────────────────────────
 
 # Final accessible URL seen by a user.
+# You can set url from an environment variable instead.
 url: https://example.tld/
 
 # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
@@ -38,9 +39,11 @@ db:
   port: 5432
 
   # Database name
+  # You can set db from an environment variable instead.
   db: misskey
 
   # Auth
+  # You can set user and pass from environment variables instead.
   user: example-misskey-user
   pass: example-misskey-pass
 

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -5,7 +5,7 @@
 	"workspaceFolder": "/workspace",
 	"features": {
 		"ghcr.io/devcontainers/features/node:1": {
-			"version": "20.12.2"
+			"version": "20.16.0"
 		},
 		"ghcr.io/devcontainers-contrib/features/corepack:1": {},
 		"docker-from-docker": {

diff --git a/.github/ISSUE_TEMPLATE/01_bug-report.yml b/.github/ISSUE_TEMPLATE/01_bug-report.yml
@@ -8,7 +8,7 @@ body:
       value: |
         報告ありがとうございます！
         まず、報告の重複を避けるために、発見した問題がすでに報告されているかどうかを検索してください。
-        また、サーバーの所有者/管理者ではない場合は、サーバー固有の問題をここに報告しないでください。 (例: XXX が taiyme.example で機能しません) 一度他のサーバーで試して、それでも特定のサーバーでのみ再現する場合は、まずサーバーの所有者/管理者にお問い合わせください。
+        また、サーバーの所有者/管理者ではない場合は、サーバー固有の問題をここに報告しないでください。 (例: XXX が taiyme.example.com で機能しません) 一度他のサーバーで試して、それでも特定のサーバーでのみ再現する場合は、まずサーバーの所有者/管理者にお問い合わせください。
 
   - type: textarea
     attributes:
@@ -53,8 +53,8 @@ body:
         例:
           - Model and OS of the device(s): MacBook Pro (14inch, 2021), macOS Ventura 13.4
           - Browser: Chrome 113.0.5672.126
-          - Server URL: misskey.io
-          - Misskey: 13.x.x
+          - Server URL: taiyme.example.com
+          - Misskey: 2024.x.x
       value: |
         - Model and OS of the device(s):
         - Browser:
@@ -73,11 +73,11 @@ body:
 
         例:
           - Installation Method or Hosting Service: docker compose, k8s/docker, systemd, "Misskey install shell script", development environment
-          - Misskey: 13.x.x
+          - Misskey: 2024.x.x
           - Node: 20.x.x
           - PostgreSQL: 15.x.x
           - Redis: 7.x.x
-          - OS and Architecture: Ubuntu 22.04.2 LTS aarch64
+          - OS and Architecture: Ubuntu 24.04.2 LTS aarch64
       value: |
         - Installation Method or Hosting Service:
         - Misskey:

diff --git a/.github/workflows/api-misskey-js.yml b/.github/workflows/api-misskey-js.yml
@@ -4,10 +4,11 @@ on:
   push:
     paths:
       - packages/misskey-js/**
+      - .github/workflows/api-misskey-js.yml
   pull_request:
     paths:
       - packages/misskey-js/**
-
+      - .github/workflows/api-misskey-js.yml
 jobs:
   report:
 
@@ -20,7 +21,7 @@ jobs:
       - run: corepack enable
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.3
         with:
           node-version-file: '.node-version'
           cache: 'pnpm'

diff --git a/.github/workflows/check-misskey-js-version.yml b/.github/workflows/check-misskey-js-version.yml
@@ -7,13 +7,14 @@ on:
     paths:
       - packages/misskey-js/package.json
       - package.json
+      - .github/workflows/check-misskey-js-version.yml
   pull_request:
     branches:
       - taiyme
     paths:
       - packages/misskey-js/package.json
       - package.json
-
+      - .github/workflows/check-misskey-js-version.yml
 jobs:
   check-version:
     # ルートの package.json と packages/misskey-js/package.json のバージョンが一致しているかを確認する

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -10,14 +10,15 @@ on:
       - packages/sw/**
       - packages/misskey-js/**
       - packages/shared/eslint.config.js
+      - .github/workflows/lint.yml
   pull_request:
     paths:
       - packages/backend/**
       - packages/frontend/**
       - packages/sw/**
       - packages/misskey-js/**
       - packages/shared/eslint.config.js
-
+      - .github/workflows/lint.yml
 jobs:
   pnpm_install:
     runs-on: ubuntu-latest
@@ -27,7 +28,7 @@ jobs:
         fetch-depth: 0
         submodules: true
     - uses: pnpm/action-setup@v4
-    - uses: actions/setup-node@v4.0.2
+    - uses: actions/setup-node@v4.0.3
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'
@@ -38,6 +39,8 @@ jobs:
     needs: [pnpm_install]
     runs-on: ubuntu-latest
     continue-on-error: true
+    env:
+      eslint-cache-version: v1
     strategy:
       matrix:
         workspace:
@@ -51,13 +54,20 @@ jobs:
         fetch-depth: 0
         submodules: true
     - uses: pnpm/action-setup@v4
-    - uses: actions/setup-node@v4.0.2
+    - uses: actions/setup-node@v4.0.3
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'
     - run: corepack enable
     - run: pnpm i --frozen-lockfile
-    - run: pnpm --filter ${{ matrix.workspace }} run eslint
+    - name: Restore eslint cache
+      uses: actions/cache@v4.0.2
+      with:
+        path: node_modules/.cache/eslint
+        key: eslint-${{ env.eslint-cache-version }}-${{ hashFiles('/pnpm-lock.yaml') }}-${{ github.ref_name }}-${{ github.sha }}
+        restore-keys: |
+          eslint-${{ env.eslint-cache-version }}-${{ hashFiles('/pnpm-lock.yaml') }}-
+    - run: pnpm --filter ${{ matrix.workspace }} run eslint --cache --cache-location node_modules/.cache/eslint --cache-strategy content
 
   typecheck:
     needs: [pnpm_install]
@@ -74,7 +84,7 @@ jobs:
         fetch-depth: 0
         submodules: true
     - uses: pnpm/action-setup@v4
-    - uses: actions/setup-node@v4.0.2
+    - uses: actions/setup-node@v4.0.3
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'

diff --git a/.github/workflows/locale.yml b/.github/workflows/locale.yml
@@ -4,10 +4,11 @@ on:
   push:
     paths:
       - locales/**
+      - .github/workflows/locale.yml
   pull_request:
     paths:
       - locales/**
-
+      - .github/workflows/locale.yml
 jobs:
   locale_verify:
     runs-on: ubuntu-latest
@@ -18,7 +19,7 @@ jobs:
         fetch-depth: 0
         submodules: true
     - uses: pnpm/action-setup@v4
-    - uses: actions/setup-node@v4.0.2
+    - uses: actions/setup-node@v4.0.3
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
@@ -8,20 +8,21 @@ on:
       - packages/backend/**
       # for permissions
       - packages/misskey-js/**
+      - .github/workflows/test-backend.yml
   pull_request:
     paths:
       - packages/backend/**
       # for permissions
       - packages/misskey-js/**
-
+      - .github/workflows/test-backend.yml
 jobs:
   unit:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
         node-version:
-          - 20.12.2
+          - 20.16.0
 
     services:
       postgres:
@@ -45,7 +46,7 @@ jobs:
     - name: Install FFmpeg
       uses: FedericoCarboni/setup-ffmpeg@v3
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.0.2
+      uses: actions/setup-node@v4.0.3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'
@@ -71,7 +72,7 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 20.12.2
+          - 20.16.0
 
     services:
       postgres:
@@ -93,7 +94,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'

diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml
@@ -10,23 +10,23 @@ on:
       - packages/misskey-js/**
       # for e2e
       - packages/backend/**
-
+      - .github/workflows/test-frontend.yml
   pull_request:
     paths:
       - packages/frontend/**
       # for permissions
       - packages/misskey-js/**
       # for e2e
       - packages/backend/**
-
+      - .github/workflows/test-frontend.yml
 jobs:
   vitest:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
         node-version:
-          - 20.12.2
+          - 20.16.0
 
     steps:
     - uses: actions/checkout@v4.1.1
@@ -35,7 +35,7 @@ jobs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.0.2
+      uses: actions/setup-node@v4.0.3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'
@@ -62,7 +62,7 @@ jobs:
       fail-fast: false
       matrix:
         node-version:
-          - 20.12.2
+          - 20.16.0
         browser: [chrome]
 
     services:
@@ -91,7 +91,7 @@ jobs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.0.2
+      uses: actions/setup-node@v4.0.3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

diff --git a/.github/workflows/test-misskey-js.yml b/.github/workflows/test-misskey-js.yml
@@ -9,12 +9,13 @@ on:
       - taiyme
     paths:
       - packages/misskey-js/**
+      - .github/workflows/test-misskey-js.yml
   pull_request:
     branches:
       - taiyme
     paths:
       - packages/misskey-js/**
-
+      - .github/workflows/test-misskey-js.yml
 jobs:
   test:
 
@@ -23,7 +24,7 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 20.12.2
+          - 20.16.0
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -33,7 +34,7 @@ jobs:
       - run: corepack enable
 
       - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.3
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'

diff --git a/.github/workflows/test-production.yml b/.github/workflows/test-production.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 20.12.2
+          - 20.16.0
 
     steps:
     - uses: actions/checkout@v4.1.1
@@ -25,7 +25,7 @@ jobs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.0.2
+      uses: actions/setup-node@v4.0.3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

diff --git a/.gitignore b/.gitignore
@@ -65,6 +65,7 @@ ormconfig.json
 temp
 /packages/frontend/src/**/*.stories.ts
 tsdoc-metadata.json
+misskey-assets
 
 # blender backups
 *.blend1

diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "misskey-assets"]
-	path = misskey-assets
-	url = https://github.com/misskey-dev/assets.git
 [submodule "fluent-emojis"]
 	path = fluent-emojis
 	url = https://github.com/misskey-dev/emojis.git
diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-20.12.2
+20.16.0