Merge pull request #16 from AyumuNekozuki/master

version up 2023.10.2
AyumuNekozuki · Oct 29, 2023 · 5f9cd3b · 5f9cd3b
2 parents 36b6341 + 4a5f2a4
commit 5f9cd3b
Show file tree

Hide file tree

Showing 426 changed files with 8,287 additions and 4,291 deletions.
diff --git a/.config/docker_example.yml b/.config/docker_example.yml
@@ -95,6 +95,14 @@ redis:
 #  #prefix: example-prefix
 #  #db: 1
 
+#redisForTimelines:
+#  host: redis
+#  port: 6379
+#  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
+#  #pass: example-pass
+#  #prefix: example-prefix
+#  #db: 1
+
 #   ┌───────────────────────────┐
 #───┘ MeiliSearch configuration └─────────────────────────────
 

diff --git a/.config/example.yml b/.config/example.yml
@@ -105,6 +105,16 @@ redis:
 #  # You can specify more ioredis options...
 #  #username: example-username
 
+#redisForTimelines:
+#  host: localhost
+#  port: 6379
+#  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
+#  #pass: example-pass
+#  #prefix: example-prefix
+#  #db: 1
+#  # You can specify more ioredis options...
+#  #username: example-username
+
 #   ┌───────────────────────────┐
 #───┘ MeiliSearch configuration └─────────────────────────────
 

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

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

diff --git a/.github/workflows/api-misskey-js.yml b/.github/workflows/api-misskey-js.yml
@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
 
       - run: corepack enable
 

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

diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
@@ -13,7 +13,7 @@ jobs:
     if: github.repository == 'misskey-dev/misskey'
     steps:
       - name: Check out the repo
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/[email protected]

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Check out the repo
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/[email protected]

diff --git a/.github/workflows/dockle.yml b/.github/workflows/dockle.yml
@@ -14,7 +14,7 @@ jobs:
     env:
       DOCKER_CONTENT_TRUST: 1
     steps:
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
       - run: |
           curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v0.4.10/dockle_0.4.10_Linux-64bit.deb"
           sudo dpkg -i dockle.deb

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

diff --git a/.github/workflows/pr-preview-deploy.yml b/.github/workflows/pr-preview-deploy.yml
@@ -53,7 +53,7 @@ jobs:
 
     # Check out merge commit
     - name: Fork based /deploy checkout
-      uses: actions/[email protected].0
+      uses: actions/[email protected].1
       with:
         ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
 

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
@@ -29,7 +29,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/[email protected].0
+    - uses: actions/[email protected].1
       with:
         submodules: true
     - name: Install pnpm

diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml
@@ -16,7 +16,7 @@ jobs:
         node-version: [20.5.1]
 
     steps:
-    - uses: actions/[email protected].0
+    - uses: actions/[email protected].1
       with:
         submodules: true
     - name: Install pnpm
@@ -68,7 +68,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/[email protected].0
+    - uses: actions/[email protected].1
       with:
         submodules: true
     # https://github.com/cypress-io/cypress-docker-images/issues/150