From c43e94dc976630e9fb36c5e592d40927c357ff8b Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 20 Jan 2023 23:14:54 +0900
Subject: [PATCH 001/174] Update docker-compose.yml

---
 compose_example.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/compose_example.yml b/compose_example.yml
index 336bd814a793..dcb4cedaecd0 100644
--- a/compose_example.yml
+++ b/compose_example.yml
@@ -1,6 +1,7 @@
 services:
   web:
-    build: .
+    # build: .
+    image: na2na/misskey-na2na:release
     restart: always
     links:
       - db
@@ -8,7 +9,7 @@ services:
 #     - mcaptcha
 #     - meilisearch
     depends_on:
-      db:
+			db:
         condition: service_healthy
       redis:
         condition: service_healthy
@@ -25,7 +26,7 @@ services:
 
   redis:
     restart: always
-    image: redis:7-alpine
+    image: redis:7.0.7-alpine
     networks:
       - internal_network
     volumes:
@@ -91,7 +92,6 @@ services:
 #      - internal_network
 #    volumes:
 #      - ./meili_data:/meili_data
-
 networks:
   internal_network:
     internal: true

From c0c952d510cf67f93f461f3887ba63874c6cb076 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 20 Jan 2023 23:17:57 +0900
Subject: [PATCH 002/174] Add actions

---
 .../docker-build-push-misskey-na2na.yml       | 46 +++++++++++++++++++
 .github/workflows/enable-automerge.yml        | 29 ++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 .github/workflows/docker-build-push-misskey-na2na.yml
 create mode 100644 .github/workflows/enable-automerge.yml

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
new file mode 100644
index 000000000000..c2e3a9dae7f6
--- /dev/null
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -0,0 +1,46 @@
+name: Publish Docker Image(misskey-na2na)
+
+on:
+  pull_request:
+    branches:
+      - misskey-na2na-deploy
+    types: [closed]
+  workflow_dispatch:
+
+jobs:
+  Build-and-Push-to-Docker-Hub:
+    name: Build and Push to Docker Hub
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: true
+          tags: na2na/misskey-na2na:release
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+      - # Temp fix
+        # https://github.com/docker/build-push-action/issues/252
+        # https://github.com/moby/buildkit/issues/1896
+        name: Move cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
diff --git a/.github/workflows/enable-automerge.yml b/.github/workflows/enable-automerge.yml
new file mode 100644
index 000000000000..afbe6dac6809
--- /dev/null
+++ b/.github/workflows/enable-automerge.yml
@@ -0,0 +1,29 @@
+name: Enable auto merge
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+    branches:
+      - main
+      - develop
+      - misskey-na2na
+      - misskey-na2na-deploy
+      - nmnm
+
+jobs:
+  enable-auto-merge:
+    runs-on: ubuntu-latest
+    # if: github.event.pull_request.user.login == 'renovate[bot]' && contains(github.event.pull_request.labels.*.name, 'dependencies')
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Generate github token
+        id: generate_token
+        uses: ./.github/actions/github-app-token
+        with:
+          app_id: ${{ secrets.ZNAZ_APP_ID }}
+          private_key: ${{ secrets.ZNAZ_PRIVATE_KEY }}
+      - uses: alexwilson/enable-github-automerge-action@main
+        with:
+          github-token: ${{ steps.generate_token.outputs.token }}

From af025e54b5e767e1b2531d7ebe47618745b2f714 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 20 Jan 2023 23:51:25 +0900
Subject: [PATCH 003/174] Update VSCode settings

---
 infra/k8s/web/config.yaml | 158 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 158 insertions(+)
 create mode 100644 infra/k8s/web/config.yaml

diff --git a/infra/k8s/web/config.yaml b/infra/k8s/web/config.yaml
new file mode 100644
index 000000000000..988f7a87c48f
--- /dev/null
+++ b/infra/k8s/web/config.yaml
@@ -0,0 +1,158 @@
+apiVersion: v1
+data:
+  default.yml: |-
+    #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+    # Misskey configuration
+    #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+    #   ┌─────┐
+    #───┘ URL └─────────────────────────────────────────────────────
+
+    # Final accessible URL seen by a user.
+    url: https://mk8stest.na2na.dev/
+
+    # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
+    # URL SETTINGS AFTER THAT!
+
+    #   ┌───────────────────────┐
+    #───┘ Port and TLS settings └───────────────────────────────────
+
+    #
+    # Misskey requires a reverse proxy to support HTTPS connections.
+    #
+    #                 +----- https://example.tld/ ------------+
+    #   +------+      |+-------------+      +----------------+|
+    #   | User | ---> || Proxy (443) | ---> | Misskey (3000) ||
+    #   +------+      |+-------------+      +----------------+|
+    #                 +---------------------------------------+
+    #
+    #   You need to set up a reverse proxy. (e.g. nginx)
+    #   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.
+    port: 3000
+
+    #   ┌──────────────────────────┐
+    #───┘ PostgreSQL configuration └────────────────────────────────
+
+    db:
+      host: postgres-cluster-rw.misskey.svc.cluster.local
+      port: 5432
+
+      # Database name
+      db: misskey
+
+      # Auth
+      user: misskey
+      pass: misskey
+
+      # Whether disable Caching queries
+      #disableCache: true
+
+      # Extra Connection options
+      #extra:
+      #  ssl: true
+
+    #   ┌─────────────────────┐
+    #───┘ Redis configuration └─────────────────────────────────────
+
+    redis:
+      host: redis
+      port: 6379
+      #family: 0  # 0=Both, 4=IPv4, 6=IPv6
+      #pass: example-pass
+      #prefix: example-prefix
+      #db: 1
+
+    #   ┌─────────────────────────────┐
+    #───┘ Elasticsearch configuration └─────────────────────────────
+
+    #elasticsearch:
+    #  host: localhost
+    #  port: 9200
+    #  ssl: false
+    #  user:
+    #  pass:
+
+    #   ┌───────────────┐
+    #───┘ ID generation └───────────────────────────────────────────
+
+    # You can select the ID generation method.
+    # You don't usually need to change this setting, but you can
+    # change it according to your preferences.
+
+    # Available methods:
+    # aid ... Short, Millisecond accuracy
+    # meid ... Similar to ObjectID, Millisecond accuracy
+    # ulid ... Millisecond accuracy
+    # objectid ... This is left for backward compatibility
+
+    # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
+    # ID SETTINGS AFTER THAT!
+
+    id: 'aid'
+
+    #   ┌─────────────────────┐
+    #───┘ Other configuration └─────────────────────────────────────
+
+    # Whether disable HSTS
+    #disableHsts: true
+
+    # Number of worker processes
+    #clusterLimit: 1
+
+    # Job concurrency per worker
+    # deliverJobConcurrency: 128
+    # inboxJobConcurrency: 16
+
+    # Job rate limiter
+    # deliverJobPerSec: 128
+    # inboxJobPerSec: 16
+
+    # Job attempts
+    # deliverJobMaxAttempts: 12
+    # inboxJobMaxAttempts: 8
+
+    # IP address family used for outgoing request (ipv4, ipv6 or dual)
+    #outgoingAddressFamily: ipv4
+
+    # Syslog option
+    #syslog:
+    #  host: localhost
+    #  port: 514
+
+    # Proxy for HTTP/HTTPS
+    #proxy: http://127.0.0.1:3128
+
+    proxyBypassHosts:
+      - api.deepl.com
+      - api-free.deepl.com
+      - www.recaptcha.net
+      - hcaptcha.com
+      - challenges.cloudflare.com
+
+    # Proxy for SMTP/SMTPS
+    #proxySmtp: http://127.0.0.1:3128   # use HTTP/1.1 CONNECT
+    #proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4
+    #proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5
+
+    # Media Proxy
+    #mediaProxy: https://example.com/proxy
+
+    # Proxy remote files (default: false)
+    #proxyRemoteFiles: true
+
+    # Sign to ActivityPub GET request (default: true)
+    signToActivityPubGet: true
+
+    #allowedPrivateNetworks: [
+    #  '127.0.0.1/32'
+    #]
+
+    # Upload or download file size limits (bytes)
+    maxFileSize: 5000000000
+
+kind: ConfigMap
+metadata:
+  name: misskey-default-config

From 3ed8cf051a956cf1c2aa3acb433113dfc0202627 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 20 Jan 2023 23:52:50 +0900
Subject: [PATCH 004/174] =?UTF-8?q?=E6=96=87=E5=AD=97=E3=81=AE=E7=B8=81?=
 =?UTF-8?q?=E5=8F=96=E3=82=8A=E3=82=92=E6=B6=88=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/MkInstanceTicker.vue       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/frontend/src/components/MkInstanceTicker.vue b/packages/frontend/src/components/MkInstanceTicker.vue
index 82c82199b57f..cf4c21d67bcf 100644
--- a/packages/frontend/src/components/MkInstanceTicker.vue
+++ b/packages/frontend/src/components/MkInstanceTicker.vue
@@ -49,19 +49,19 @@ $height: 2ex;
 	border-radius: 4px 0 0 4px;
 	overflow: clip;
 	color: #fff;
-	text-shadow: /* .866 ≈ sin(60deg) */
-		1px 0 1px #000,
-		.866px .5px 1px #000,
-		.5px .866px 1px #000,
-		0 1px 1px #000,
-		-.5px .866px 1px #000,
-		-.866px .5px 1px #000,
-		-1px 0 1px #000,
-		-.866px -.5px 1px #000,
-		-.5px -.866px 1px #000,
-		0 -1px 1px #000,
-		.5px -.866px 1px #000,
-		.866px -.5px 1px #000;
+	// text-shadow: /* .866 ≈ sin(60deg) */
+	// 	1px 0 1px #000,
+	// 	.866px .5px 1px #000,
+	// 	.5px .866px 1px #000,
+	// 	0 1px 1px #000,
+	// 	-.5px .866px 1px #000,
+	// 	-.866px .5px 1px #000,
+	// 	-1px 0 1px #000,
+	// 	-.866px -.5px 1px #000,
+	// 	-.5px -.866px 1px #000,
+	// 	0 -1px 1px #000,
+	// 	.5px -.866px 1px #000,
+	// 	.866px -.5px 1px #000;
 	mask-image: linear-gradient(90deg,
 		rgb(0,0,0),
 		rgb(0,0,0) calc(100% - 16px),

From 24cd366eb7c7d72f980a28a779658439f300b80e Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 20 Jan 2023 23:58:34 +0900
Subject: [PATCH 005/174] Add github token

---
 .github/actions/github-app-token/action.yml | 25 +++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/actions/github-app-token/action.yml

diff --git a/.github/actions/github-app-token/action.yml b/.github/actions/github-app-token/action.yml
new file mode 100644
index 000000000000..306162d9b7c9
--- /dev/null
+++ b/.github/actions/github-app-token/action.yml
@@ -0,0 +1,25 @@
+name: github-app-token
+description: github-app-token
+inputs:
+  app_id:
+    description: app_id
+    required: true
+  private_key:
+    description: private_key
+    required: true
+
+outputs:
+  token:
+    description: token
+    value: ${{ steps.token.outputs.token }}
+
+runs:
+  using: composite
+  steps:
+    - uses: tibdex/github-app-token@v1.7.0
+      with:
+        app_id: ${{ inputs.app_id }}
+        private_key: ${{ inputs.private_key }}
+      env:
+        OPENSSL_CONF: /dev/null
+      id: token

From 561e7e2f6769c96adbf060d8f49a822901a75c5d Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sat, 21 Jan 2023 00:02:02 +0900
Subject: [PATCH 006/174] Update workflows

---
 .github/workflows/docker-develop.yml     | 11 +++++++++--
 .github/workflows/pr-preview-deploy.yml  |  3 +++
 .github/workflows/pr-preview-destroy.yml |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index ac2b1b4d358a..40d5780132db 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -4,10 +4,11 @@ on:
   push:
     branches:
       - develop
+      - misskey-na2na
   workflow_dispatch:
 
 env:
-  REGISTRY_IMAGE: misskey/misskey
+  REGISTRY_IMAGE: na2na/misskey-na2na
 
 jobs:
   # see https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners
@@ -20,7 +21,7 @@ jobs:
         platform:
           - linux/amd64
           - linux/arm64
-    if: github.repository == 'misskey-dev/misskey'
+    if: github.repository == 'na2na-p/misskey'
     steps:
       - name: Prepare
         run: |
@@ -30,6 +31,11 @@ jobs:
         uses: actions/checkout@v4.1.1
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: na2na/misskey-na2na
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -43,6 +49,7 @@ jobs:
           push: true
           platforms: ${{ matrix.platform }}
           provenance: false
+          tags: na2na/misskey-na2na:develop
           labels: develop
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/.github/workflows/pr-preview-deploy.yml b/.github/workflows/pr-preview-deploy.yml
index 964d24c3d7b9..21400b7eb42c 100644
--- a/.github/workflows/pr-preview-deploy.yml
+++ b/.github/workflows/pr-preview-deploy.yml
@@ -1,5 +1,7 @@
 # Run secret-dependent integration tests only after /deploy approval
 on:
+  pull_request:
+    types: [opened, reopened, synchronize]
   repository_dispatch:
     types: [deploy-command]
 
@@ -10,6 +12,7 @@ jobs:
   deploy-preview-environment:
     runs-on: ubuntu-latest
     if:
+      github.event_name == 'repository_dispatch' &&
       github.event.client_payload.slash_command.sha != '' &&
       contains(github.event.client_payload.pull_request.head.sha, github.event.client_payload.slash_command.sha)
     steps:
diff --git a/.github/workflows/pr-preview-destroy.yml b/.github/workflows/pr-preview-destroy.yml
index 8967eb2f94a4..ae1faecbb6ea 100644
--- a/.github/workflows/pr-preview-destroy.yml
+++ b/.github/workflows/pr-preview-destroy.yml
@@ -51,4 +51,4 @@ jobs:
         if: steps.check-conclusion.outputs.result == 'success'
         uses: okteto/destroy-preview@latest
         with:
-          name: pr-${{ github.event.number }}-syuilo
+          name: na2na-p-misskey-pr-${{ github.event.number }}

From e4dc575e70a60ef2418912679df965f58b76ce15 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sat, 21 Jan 2023 00:24:42 +0900
Subject: [PATCH 007/174] Fix fontsize

---
 packages/frontend/src/components/MkInstanceTicker.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkInstanceTicker.vue b/packages/frontend/src/components/MkInstanceTicker.vue
index cf4c21d67bcf..cc76fec1a459 100644
--- a/packages/frontend/src/components/MkInstanceTicker.vue
+++ b/packages/frontend/src/components/MkInstanceTicker.vue
@@ -77,7 +77,7 @@ $height: 2ex;
 .name {
 	margin-left: 4px;
 	line-height: 1;
-	font-size: 0.9em;
+	font-size: 0.85em;
 	font-weight: bold;
 	white-space: nowrap;
 	overflow: visible;

From c61af26491fd74b4d9211efcdf4a52f54ff805de Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Wed, 25 Jan 2023 07:31:00 +0900
Subject: [PATCH 008/174] Add .tool-versions

---
 .tool-versions | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .tool-versions

diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 000000000000..bc5dc274d3fb
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1,2 @@
+nodejs 18.13.0
+pnpm 7.26.0

From a964b94507ca313d3ac7aa20a2cafda1d18f699b Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 27 Jan 2023 16:51:13 +0900
Subject: [PATCH 009/174] Update pnpm version

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index bc5dc274d3fb..7f43344945b5 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.13.0
-pnpm 7.26.0
+pnpm 7.26.1

From 823e944db4a6308222e798241723a7979303a0d1 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 3 Feb 2023 11:28:16 +0900
Subject: [PATCH 010/174] Update tool-versions

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 7f43344945b5..a386cd545157 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.13.0
-pnpm 7.26.1
+pnpm 7.26.3

From 118b6c192ce2d4de8875fce51e44c159bd32011f Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 20 Jan 2023 23:14:54 +0900
Subject: [PATCH 011/174] Update docker-compose.yml

---
 docker-compose.yml | 70 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000000..61756db8a7ea
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,70 @@
+version: "3"
+
+services:
+  web:
+    # build: .
+    image: na2na/misskey-na2na:release
+    restart: always
+    links:
+      - redis
+      # - db
+      # - es
+    depends_on:
+      redis:
+        condition: service_healthy
+    ports:
+      - "3000:3000"
+    networks:
+      - internal_network
+      - external_network
+    volumes:
+      - ./files:/misskey/files
+      - ./.config:/misskey/.config:ro
+
+  redis:
+    restart: always
+    image: redis:7.0.7-alpine
+    networks:
+      - internal_network
+    volumes:
+      - ./redis:/data
+    healthcheck:
+      test: "redis-cli ping"
+      interval: 5s
+      retries: 20
+  # db:
+  #   restart: always
+  #   image: postgres:15-alpine
+  #   networks:
+  #     - internal_network
+  #   env_file:
+  #     - .config/docker.env
+  #   volumes:
+  #     - ./db:/var/lib/postgresql/data
+  #   healthcheck:
+  #     test: "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"
+  #     interval: 5s
+  #     retries: 20
+  # es:
+  #   restart: always
+  #   image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
+  #   environment:
+  #     - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+  #     - "TAKE_FILE_OWNERSHIP=111"
+  #     - discovery.type=single-node
+  #     - cluster.name=docker-cluster
+  #     - bootstrap.memory_lock=true
+  #   ulimits:
+  #     memlock:
+  #       soft: -1
+  #       hard: -1
+  #   networks:
+  #     - internal_network
+  #   env_file:
+  #     - .config/docker.env
+  #   volumes:
+  #     - ./elasticsearch:/usr/share/elasticsearch/data
+networks:
+  internal_network:
+    internal: true
+  external_network:

From 37c07a1d80121172bfd367b193d88838413d4e28 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 3 Feb 2023 10:30:00 +0900
Subject: [PATCH 012/174] Add db container

---
 docker-compose.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 61756db8a7ea..4c8b12002d5f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,19 +32,19 @@ services:
       test: "redis-cli ping"
       interval: 5s
       retries: 20
-  # db:
-  #   restart: always
-  #   image: postgres:15-alpine
-  #   networks:
-  #     - internal_network
-  #   env_file:
-  #     - .config/docker.env
-  #   volumes:
-  #     - ./db:/var/lib/postgresql/data
-  #   healthcheck:
-  #     test: "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"
-  #     interval: 5s
-  #     retries: 20
+  db:
+    restart: always
+    image: postgres:15-alpine
+    networks:
+      - internal_network
+    env_file:
+      - .config/docker.env
+    volumes:
+      - ./db:/var/lib/postgresql/data
+    healthcheck:
+      test: "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"
+      interval: 5s
+      retries: 20
   # es:
   #   restart: always
   #   image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2

From 607e06aae5f9eac8b39586aca8d4325799ef58f4 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 3 Feb 2023 11:40:20 +0900
Subject: [PATCH 013/174] Add cloudflare tunnel

---
 docker-compose.yml            | 19 +++++++++++++++++--
 infra/cloudflare/.env.example |  1 +
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 infra/cloudflare/.env.example

diff --git a/docker-compose.yml b/docker-compose.yml
index 4c8b12002d5f..bcc73961d98b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,11 +7,13 @@ services:
     restart: always
     links:
       - redis
-      # - db
+      - db
       # - es
     depends_on:
       redis:
         condition: service_healthy
+      db:
+        condition: service_healthy
     ports:
       - "3000:3000"
     networks:
@@ -34,7 +36,7 @@ services:
       retries: 20
   db:
     restart: always
-    image: postgres:15-alpine
+    image: postgres:15.1-bullseye
     networks:
       - internal_network
     env_file:
@@ -45,6 +47,19 @@ services:
       test: "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"
       interval: 5s
       retries: 20
+  tunnel:
+    container_name: cloudflared-tunnel
+    image: cloudflare/cloudflared:2023.1.0
+    restart: unless-stopped
+    depends_on:
+      web:
+        condition: service_started
+    command: tunnel --no-autoupdate run
+    networks:
+      - internal_network
+      - external_network
+    env_file:
+      - ./infra/cloudflare/.env
   # es:
   #   restart: always
   #   image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
diff --git a/infra/cloudflare/.env.example b/infra/cloudflare/.env.example
new file mode 100644
index 000000000000..8b5e759b77d4
--- /dev/null
+++ b/infra/cloudflare/.env.example
@@ -0,0 +1 @@
+TUNNEL_TOKEN=TOKEN

From d2f3cd5329c9752b96789e80086c6d8884b2ed71 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 3 Feb 2023 12:12:25 +0900
Subject: [PATCH 014/174] Update

---
 docker-compose.yml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index bcc73961d98b..fc0f12e3fd93 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,8 +14,6 @@ services:
         condition: service_healthy
       db:
         condition: service_healthy
-    ports:
-      - "3000:3000"
     networks:
       - internal_network
       - external_network
@@ -34,6 +32,7 @@ services:
       test: "redis-cli ping"
       interval: 5s
       retries: 20
+
   db:
     restart: always
     image: postgres:15.1-bullseye
@@ -47,6 +46,7 @@ services:
       test: "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"
       interval: 5s
       retries: 20
+
   tunnel:
     container_name: cloudflared-tunnel
     image: cloudflare/cloudflared:2023.1.0
@@ -60,6 +60,20 @@ services:
       - external_network
     env_file:
       - ./infra/cloudflare/.env
+
+  # nginx:
+  #   container_name: nginx
+  #   image: nginx:1.23.3
+  #   restart: unless-stopped
+  #   depends_on:
+  #     web:
+  #       condition: service_started
+  #   networks:
+  #     - internal_network
+  #     - external_network
+  #   volumes:
+  #     - ./infra/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+
   # es:
   #   restart: always
   #   image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2

From 8be2f0b3617121e2f8517d53ba3a0a12fb496d0d Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 3 Feb 2023 22:43:13 +0900
Subject: [PATCH 015/174] Update .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index e33383571553..e3901b25c10c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,5 @@ misskey-assets
 
 # VSCode addon
 .favorites.json
+# nginx
+default.conf

From 3d2f007bfa94ccff06cd3e596990a28c38d94c2d Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 3 Feb 2023 23:21:17 +0900
Subject: [PATCH 016/174] Add nginx container

---
 docker-compose.yml                       | 31 ++++++++------
 infra/nginx/.env.example                 |  2 +
 infra/nginx/Dockerfile                   | 16 ++++++++
 infra/nginx/conf.d/default.conf.template | 52 ++++++++++++++++++++++++
 4 files changed, 88 insertions(+), 13 deletions(-)
 create mode 100644 infra/nginx/.env.example
 create mode 100644 infra/nginx/Dockerfile
 create mode 100644 infra/nginx/conf.d/default.conf.template

diff --git a/docker-compose.yml b/docker-compose.yml
index fc0f12e3fd93..b2953645f435 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -48,9 +48,10 @@ services:
       retries: 20
 
   tunnel:
-    container_name: cloudflared-tunnel
     image: cloudflare/cloudflared:2023.1.0
     restart: unless-stopped
+    links:
+      - nginx
     depends_on:
       web:
         condition: service_started
@@ -61,18 +62,22 @@ services:
     env_file:
       - ./infra/cloudflare/.env
 
-  # nginx:
-  #   container_name: nginx
-  #   image: nginx:1.23.3
-  #   restart: unless-stopped
-  #   depends_on:
-  #     web:
-  #       condition: service_started
-  #   networks:
-  #     - internal_network
-  #     - external_network
-  #   volumes:
-  #     - ./infra/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+  nginx:
+    build: 
+      context: ./infra/nginx
+      dockerfile: ./Dockerfile
+    restart: unless-stopped
+    links:
+      - web
+    depends_on:
+      web:
+        condition: service_started
+    networks:
+      - internal_network
+      - external_network
+    command: /bin/sh -c "envsubst '$$SERVER_NAME $$S3_PROXY_PASS'< /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'"
+    env_file:
+      - ./infra/nginx/.env
 
   # es:
   #   restart: always
diff --git a/infra/nginx/.env.example b/infra/nginx/.env.example
new file mode 100644
index 000000000000..1110713747c1
--- /dev/null
+++ b/infra/nginx/.env.example
@@ -0,0 +1,2 @@
+SERVER_NAME=www.example.com
+S3_PROXY_PASS=https://s3.ap-northeast-1-ntt.wasabisys.com
diff --git a/infra/nginx/Dockerfile b/infra/nginx/Dockerfile
new file mode 100644
index 000000000000..8cc4bb494c4a
--- /dev/null
+++ b/infra/nginx/Dockerfile
@@ -0,0 +1,16 @@
+FROM nginx:1.23.3
+
+RUN apt-get update && \
+  apt-get install -y --no-install-recommends \
+	apt-utils \
+  locales \
+	&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /root/.gnupg /tmp/library-scripts
+
+
+RUN echo "ja_JP.UTF-8 UTF-8" > /etc/locale.gen && \
+  locale-gen ja_JP.UTF-8
+
+ENV LC_ALL ja_JP.UTF-8
+
+# 初期状態の設定ファイル
+ADD ./conf.d/default.conf.template /etc/nginx/conf.d/default.conf.template
diff --git a/infra/nginx/conf.d/default.conf.template b/infra/nginx/conf.d/default.conf.template
new file mode 100644
index 000000000000..7a2bb170dafb
--- /dev/null
+++ b/infra/nginx/conf.d/default.conf.template
@@ -0,0 +1,52 @@
+map $http_upgrade $connection_upgrade {
+  default upgrade;
+  ''      close;
+}
+
+server {
+        listen 80;
+        listen [::]:80;
+        client_max_body_size 1G;
+
+        server_name ${SERVER_NAME};
+
+        location @proxy {
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header Proxy "";
+            proxy_pass_header Server;
+
+            proxy_pass http://web:3000;
+            proxy_buffering off;
+            proxy_redirect off;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection $connection_upgrade;
+
+            add_header Strict-Transport-Security "max-age=31536000";
+
+            tcp_nodelay on;
+          }
+
+        location / {
+                # First attempt to serve request as file, then
+                # as directory, then fall back to displaying a 404.
+                try_files $uri @proxy;
+        }
+
+        location /media {
+                resolver 8.8.8.8 valid=5s;
+                proxy_buffers 10 32k;
+                proxy_buffer_size 32k;
+                proxy_redirect off;
+                proxy_http_version 1.1;
+                proxy_hide_header x-amz-id-2;
+                proxy_hide_header x-amz-request-id;
+                proxy_hide_header Set-Cookie;
+                proxy_ignore_headers Cache-Control Set-Cookie;
+                tcp_nodelay on;
+                proxy_pass ${S3_PROXY_PASS};
+        }
+}

From 7cbb29908f527b656b27e75174164097b458530f Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sat, 4 Feb 2023 00:35:33 +0900
Subject: [PATCH 017/174] Add update command

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 310ea9821473..06ac1c271c62 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,8 @@
 		"test-and-coverage": "pnpm -r test-and-coverage",
 		"clean": "node ./scripts/clean.js",
 		"clean-all": "node ./scripts/clean-all.js",
-		"cleanall": "pnpm clean-all"
+		"cleanall": "pnpm clean-all",
+		"server-update": "git reset --hard origin/deploy/on-premise && docker-compose build && docker-compose down && docker-compose up -d"
 	},
 	"resolutions": {
 		"chokidar": "3.5.3",

From 266351d0f12fa38aec87a0532f73740281f80677 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sat, 4 Feb 2023 00:35:50 +0900
Subject: [PATCH 018/174] Update

---
 docker-compose.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b2953645f435..be407a3670ff 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,8 +2,8 @@ version: "3"
 
 services:
   web:
-    # build: .
-    image: na2na/misskey-na2na:release
+    build: .
+    # image: na2na/misskey-na2na:release
     restart: always
     links:
       - redis
@@ -49,7 +49,7 @@ services:
 
   tunnel:
     image: cloudflare/cloudflared:2023.1.0
-    restart: unless-stopped
+    restart: always
     links:
       - nginx
     depends_on:
@@ -66,7 +66,7 @@ services:
     build: 
       context: ./infra/nginx
       dockerfile: ./Dockerfile
-    restart: unless-stopped
+    restart: always
     links:
       - web
     depends_on:

From 0d01f4a291044777dc08dab719a6733c42549848 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sat, 4 Feb 2023 17:39:40 +0900
Subject: [PATCH 019/174] Update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 06ac1c271c62..7904b3e1e99d 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
 		"clean": "node ./scripts/clean.js",
 		"clean-all": "node ./scripts/clean-all.js",
 		"cleanall": "pnpm clean-all",
-		"server-update": "git reset --hard origin/deploy/on-premise && docker-compose build && docker-compose down && docker-compose up -d"
+		"server-update": "git fetch && git reset --hard origin/deploy/on-premise && git submodule update --init && docker compose build && docker compose down && docker compose up -d"
 	},
 	"resolutions": {
 		"chokidar": "3.5.3",

From f603580c5c03a26a17e34b4e925185b330097346 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sat, 4 Feb 2023 17:51:34 +0900
Subject: [PATCH 020/174] =?UTF-8?q?Change=20Volume=E3=81=AE=E5=8F=96?=
 =?UTF-8?q?=E6=89=B1=E5=A4=89=E3=81=88=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index be407a3670ff..28729b0483c9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
     networks:
       - internal_network
     volumes:
-      - ./redis:/data
+      - redis:/data
     healthcheck:
       test: "redis-cli ping"
       interval: 5s
@@ -41,7 +41,7 @@ services:
     env_file:
       - .config/docker.env
     volumes:
-      - ./db:/var/lib/postgresql/data
+      - postgres:/var/lib/postgresql/data
     healthcheck:
       test: "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"
       interval: 5s
@@ -102,3 +102,7 @@ networks:
   internal_network:
     internal: true
   external_network:
+
+volumes:
+  postgres:
+  redis:

From ed8aeed081d9ad141bb2719fbca133c5c12eabb0 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sat, 4 Feb 2023 20:22:53 +0900
Subject: [PATCH 021/174] =?UTF-8?q?Update=20=E3=83=90=E3=83=83=E3=82=AF?=
 =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E7=94=A8=E5=87=BA=E5=85=A5=E3=82=8A?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 28729b0483c9..6d0edfdc41f5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -42,6 +42,7 @@ services:
       - .config/docker.env
     volumes:
       - postgres:/var/lib/postgresql/data
+      - ./db:/misskey-na2na-db
     healthcheck:
       test: "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"
       interval: 5s

From fdca542f0b32d38f4c235998e5749958d99aa450 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sat, 4 Feb 2023 22:27:33 +0900
Subject: [PATCH 022/174] Update container images

---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 6d0edfdc41f5..3018d0c4dcd0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,7 +23,7 @@ services:
 
   redis:
     restart: always
-    image: redis:7.0.7-alpine
+    image: redis:7.0.8-alpine
     networks:
       - internal_network
     volumes:
@@ -49,7 +49,7 @@ services:
       retries: 20
 
   tunnel:
-    image: cloudflare/cloudflared:2023.1.0
+    image: cloudflare/cloudflared:2023.2.1
     restart: always
     links:
       - nginx

From b1491d07c43136dd8f30ed4215c88093eae91461 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sat, 4 Feb 2023 22:44:20 +0900
Subject: [PATCH 023/174] Rename compose.yml

---
 docker-compose.yml => compose.yml | 2 --
 1 file changed, 2 deletions(-)
 rename docker-compose.yml => compose.yml (99%)

diff --git a/docker-compose.yml b/compose.yml
similarity index 99%
rename from docker-compose.yml
rename to compose.yml
index 3018d0c4dcd0..acb0741f3402 100644
--- a/docker-compose.yml
+++ b/compose.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   web:
     build: .

From 9ab71dd7a51e11d34fb65c1566b774a4befd95f3 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Mon, 9 Jan 2023 18:27:27 +0900
Subject: [PATCH 024/174] Update actions

---
 .github/workflows/approve.yml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/approve.yml

diff --git a/.github/workflows/approve.yml b/.github/workflows/approve.yml
new file mode 100644
index 000000000000..4fc78a8ef5bb
--- /dev/null
+++ b/.github/workflows/approve.yml
@@ -0,0 +1,31 @@
+name: Approve
+
+on:
+  pull_request:
+    types: [labeled]
+
+jobs:
+  approve:
+    runs-on: ubuntu-latest
+    timeout-minutes: 1
+    if: >-
+      ${{
+        github.event.label.name == 'Bypass Approve' &&
+        github.event.pull_request.user.login == 'na2na-p'
+      }}
+    env:
+      NUMBER: ${{ github.event.number }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Generate github token
+        id: generate_token
+        uses: ./.github/actions/github-app-token
+        with:
+          app_id: ${{ secrets.ZNAZ_APP_ID }}
+          private_key: ${{ secrets.ZNAZ_PRIVATE_KEY }}
+      - name: Approve
+        run: gh pr review ${{ env.NUMBER }} --approve
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}

From 6279b2ef87fc434925393baea35954cf0608724a Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sat, 4 Feb 2023 23:39:19 +0900
Subject: [PATCH 025/174] Add renovate

---
 renovate.json5 | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 renovate.json5

diff --git a/renovate.json5 b/renovate.json5
new file mode 100644
index 000000000000..e9159aae27fe
--- /dev/null
+++ b/renovate.json5
@@ -0,0 +1,9 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ],
+	"ignorePaths": [
+    "package.json"
+  ]
+}

From c8c552db7d51fb114ea6208080902b3a91dd395a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 4 Feb 2023 14:40:55 +0000
Subject: [PATCH 026/174] Update Node.js to v18.14.0

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index a386cd545157..0da901c3e4a7 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 18.13.0
+nodejs 18.16.0
 pnpm 7.26.3

From 56a95e51ed9392f873b5015e6ab001944608e3c2 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sun, 5 Feb 2023 00:29:15 +0900
Subject: [PATCH 027/174] Add db backup command

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7904b3e1e99d..5d2d83e01726 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,8 @@
 		"clean": "node ./scripts/clean.js",
 		"clean-all": "node ./scripts/clean-all.js",
 		"cleanall": "pnpm clean-all",
-		"server-update": "git fetch && git reset --hard origin/deploy/on-premise && git submodule update --init && docker compose build && docker compose down && docker compose up -d"
+		"server-update": "git fetch && git reset --hard origin/deploy/on-premise && git submodule update --init && docker compose build && docker compose down && docker compose up -d",
+		"db-backup": "source .config/docker.env && docker compose exec -T db pg_dump -U $POSTGRES_USER -Ft misskey -f /misskey-na2na-db/`date +%y%m%d-%H%M`.tar"
 	},
 	"resolutions": {
 		"chokidar": "3.5.3",

From 41aaf59482a36f9e48e81758118f73a9bb937fdf Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 5 Feb 2023 11:30:21 +0000
Subject: [PATCH 028/174] Update docker/build-push-action action to v4

---
 .github/workflows/docker-build-push-misskey-na2na.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index c2e3a9dae7f6..aec12f8935d9 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -30,7 +30,7 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: .
           push: true

From 284cd8c94017610c5c9c029d4377869fedc23773 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Wed, 15 Feb 2023 21:49:30 +0900
Subject: [PATCH 029/174] Remove tunnel container

---
 compose.yml | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/compose.yml b/compose.yml
index acb0741f3402..fa471dcbb2bc 100644
--- a/compose.yml
+++ b/compose.yml
@@ -46,20 +46,20 @@ services:
       interval: 5s
       retries: 20
 
-  tunnel:
-    image: cloudflare/cloudflared:2023.2.1
-    restart: always
-    links:
-      - nginx
-    depends_on:
-      web:
-        condition: service_started
-    command: tunnel --no-autoupdate run
-    networks:
-      - internal_network
-      - external_network
-    env_file:
-      - ./infra/cloudflare/.env
+  # tunnel:
+  #   image: cloudflare/cloudflared:2023.2.1
+  #   restart: always
+  #   links:
+  #     - nginx
+  #   depends_on:
+  #     web:
+  #       condition: service_started
+  #   command: tunnel --no-autoupdate run
+  #   networks:
+  #     - internal_network
+  #     - external_network
+  #   env_file:
+  #     - ./infra/cloudflare/.env
 
   nginx:
     build: 
@@ -77,6 +77,8 @@ services:
     command: /bin/sh -c "envsubst '$$SERVER_NAME $$S3_PROXY_PASS'< /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'"
     env_file:
       - ./infra/nginx/.env
+    ports:
+      - 10080:80
 
   # es:
   #   restart: always

From 6649765b069ce3d4b43e420c83e6833294dd0d43 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 3 Mar 2023 17:17:34 +0900
Subject: [PATCH 030/174] Fix dockle

---
 .github/workflows/dockle.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/dockle.yml b/.github/workflows/dockle.yml
index c3dba4213d31..fa0177a8d074 100644
--- a/.github/workflows/dockle.yml
+++ b/.github/workflows/dockle.yml
@@ -23,6 +23,7 @@ jobs:
       - run: |
           cp .config/docker_example.env .config/docker.env
           cp ./compose_example.yml ./compose.yml
+          cp ./infra/nginx/.env.example ./infra/nginx/.env
       - run: |
           docker compose up -d web
           docker tag "$(docker compose images web | awk 'OFS=":" {print $4}' | tail -n +2)" misskey-web:latest

From 7b0000ec884d6f56bd626420e10812602ebb16e1 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 3 Mar 2023 17:28:51 +0900
Subject: [PATCH 031/174] Update CI user

---
 .github/workflows/ok-to-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ok-to-test.yml b/.github/workflows/ok-to-test.yml
index 8362c006eba4..ee66b58c81e1 100644
--- a/.github/workflows/ok-to-test.yml
+++ b/.github/workflows/ok-to-test.yml
@@ -19,8 +19,8 @@ jobs:
       id: generate_token
       uses: tibdex/github-app-token@v2
       with:
-        app_id: ${{ secrets.DEPLOYBOT_APP_ID }}
-        private_key: ${{ secrets.DEPLOYBOT_PRIVATE_KEY }}
+          app_id: ${{ secrets.ZNAZ_APP_ID }}
+          private_key: ${{ secrets.ZNAZ_PRIVATE_KEY }}
 
     - name: Slash Command Dispatch
       uses: peter-evans/slash-command-dispatch@v4

From d329cce20a8f998364360a5ada30b63302aba105 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 3 Mar 2023 08:41:09 +0000
Subject: [PATCH 032/174] Update postgres Docker tag

---
 .github/workflows/test-frontend.yml | 13 +++++++++++++
 compose.yml                         |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml
index fcaef529695f..3466b4960749 100644
--- a/.github/workflows/test-frontend.yml
+++ b/.github/workflows/test-frontend.yml
@@ -28,6 +28,19 @@ jobs:
       matrix:
         node-version: [20.16.0]
 
+    services:
+      postgres:
+        image: postgres:15
+        ports:
+          - 54312:5432
+        env:
+          POSTGRES_DB: test-misskey
+          POSTGRES_HOST_AUTH_METHOD: trust
+      redis:
+        image: redis:6
+        ports:
+          - 56312:6379
+
     steps:
     - uses: actions/checkout@v4.1.1
       with:
diff --git a/compose.yml b/compose.yml
index fa471dcbb2bc..9515c7b5c97e 100644
--- a/compose.yml
+++ b/compose.yml
@@ -33,7 +33,7 @@ services:
 
   db:
     restart: always
-    image: postgres:15.1-bullseye
+    image: postgres:15.2-bullseye
     networks:
       - internal_network
     env_file:

From 756ea5ce7ce03e5c1374635c2d679bf20432b60b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 3 Mar 2023 12:42:13 +0000
Subject: [PATCH 033/174] Update redis Docker tag

---
 .github/workflows/test-frontend.yml | 2 +-
 compose.yml                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml
index 3466b4960749..2f658ca15230 100644
--- a/.github/workflows/test-frontend.yml
+++ b/.github/workflows/test-frontend.yml
@@ -37,7 +37,7 @@ jobs:
           POSTGRES_DB: test-misskey
           POSTGRES_HOST_AUTH_METHOD: trust
       redis:
-        image: redis:6
+        image: redis:7
         ports:
           - 56312:6379
 
diff --git a/compose.yml b/compose.yml
index 9515c7b5c97e..e168a2d8bbd8 100644
--- a/compose.yml
+++ b/compose.yml
@@ -21,7 +21,7 @@ services:
 
   redis:
     restart: always
-    image: redis:7.0.8-alpine
+    image: redis:7.0.9-alpine
     networks:
       - internal_network
     volumes:

From f8340dba588db380270f1293a6270b57fa815a79 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 3 Mar 2023 22:49:49 +0900
Subject: [PATCH 034/174] Update pnpm version

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 0da901c3e4a7..28fcd9e19175 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.16.0
-pnpm 7.26.3
+pnpm 7.28.0

From 8b527dac131871b60ab12d006f042905d102c41e Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 3 Mar 2023 23:00:56 +0900
Subject: [PATCH 035/174] =?UTF-8?q?Redis=E3=81=AE=E7=B5=82=E4=BA=86?=
 =?UTF-8?q?=E3=81=8C=E9=81=85=E3=81=84=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose.yml b/compose.yml
index e168a2d8bbd8..eb75269d1088 100644
--- a/compose.yml
+++ b/compose.yml
@@ -22,6 +22,7 @@ services:
   redis:
     restart: always
     image: redis:7.0.9-alpine
+    init: true
     networks:
       - internal_network
     volumes:

From 220f5a05feb5bf62bf904eb6eaeced2b259e60a3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 4 Mar 2023 12:21:53 +0000
Subject: [PATCH 036/174] Update tibdex/github-app-token action to v1.8.0

---
 .github/actions/github-app-token/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/github-app-token/action.yml b/.github/actions/github-app-token/action.yml
index 306162d9b7c9..5cc15091553e 100644
--- a/.github/actions/github-app-token/action.yml
+++ b/.github/actions/github-app-token/action.yml
@@ -16,7 +16,7 @@ outputs:
 runs:
   using: composite
   steps:
-    - uses: tibdex/github-app-token@v1.7.0
+    - uses: tibdex/github-app-token@v1.8.0
       with:
         app_id: ${{ inputs.app_id }}
         private_key: ${{ inputs.private_key }}

From 0bf492a307a5fb2ba0736c107f881169b3fbb273 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 6 Mar 2023 01:56:26 +0000
Subject: [PATCH 037/174] Update dependency pnpm to v7.29.0

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 28fcd9e19175..af173c6ca98e 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.16.0
-pnpm 7.28.0
+pnpm 7.29.0

From b851d6d5a71c9ddb8c65877b22c04cb5a1114c23 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 17 Mar 2023 22:35:43 +0900
Subject: [PATCH 038/174] Update CD

---
 .../docker-build-push-misskey-na2na.yml       | 64 +++++++++++++------
 .github/workflows/docker-develop.yml          |  2 +-
 .github/workflows/docker.yml                  |  2 +-
 3 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index aec12f8935d9..a366ad04d6a9 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -5,42 +5,66 @@ on:
     branches:
       - misskey-na2na-deploy
     types: [closed]
+  push:
+    branches:
+      - misskey-na2na
   workflow_dispatch:
 
+env:
+  DOCKER_TAG_API_URI: https://registry.hub.docker.com/v2/repositories/na2na/misskey-na2na/tags
+
 jobs:
+  Check-image-already-exists:
+    name: Check image already exists
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3.3.0
+      - name: Get current version
+        id: get_version
+        run: |
+          echo "MISSKEY_VERSION=$(cat package.json | jq -r '.version')" >> $GITHUB_ENV
+      - name: Check Docker Hub
+        id: check_docker_hub
+        run: |
+          DOCKER_HUB_TAG=$(curl -s ${{ env.DOCKER_TAG_API_URI }} | jq -r '.results[] | select(.name == "${{ env.MISSKEY_VERSION }}") | .name')
+          echo $DOCKER_HUB_TAG
+          if [ -z "$DOCKER_HUB_TAG" ]; then
+            echo "Tag $DOCKER_HUB_TAG already exists on Docker Hub."
+          else
+            echo "Tag $DOCKER_HUB_TAG does not exist on Docker Hub."
+            echo "tag_exists=false" >> $GITHUB_OUTPUT
+          fi
+
   Build-and-Push-to-Docker-Hub:
     name: Build and Push to Docker Hub
     runs-on: ubuntu-latest
-
+    needs: Check-image-already-exists
+    if: needs.Check-image-already-exists.outputs.tag_exists == 'false'
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.3.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Cache Docker layers
-        uses: actions/cache@v3
+        id: buildx
+        uses: docker/setup-buildx-action@v2.4.1
         with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
+          platforms: linux/amd64,linux/arm64
       - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
+          username: ${{ vars.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
           context: .
           push: true
-          tags: na2na/misskey-na2na:release
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-      - # Temp fix
-        # https://github.com/docker/build-push-action/issues/252
-        # https://github.com/moby/buildkit/issues/1896
-        name: Move cache
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+          platforms: ${{ steps.buildx.outputs.platforms }}
+          provenance: false
+          tags: |
+            na2na/misskey-na2na:release
+            na2na/misskey-na2na:${{ env.MISSKEY_VERSION }}
+          labels: |
+            dev.na2na.misskey-na2na.version=${{ env.MISSKEY_VERSION }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index 40d5780132db..f788046cfefe 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
+          username: ${{ vars.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and push by digest
         id: build
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index db899ba386be..fd0a16e59e92 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -44,7 +44,7 @@ jobs:
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
+          username: ${{ vars.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and Push to Docker Hub
         id: build

From b7c91ff10fff21f1dd8f7d647127d2a12d22572f Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 17 Mar 2023 23:44:55 +0900
Subject: [PATCH 039/174] =?UTF-8?q?=E3=81=9D=E3=81=AE=E5=A0=B4=E3=83=93?=
 =?UTF-8?q?=E3=83=AB=E3=83=89=E3=82=84=E3=82=81=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose.yml b/compose.yml
index eb75269d1088..fc51b3bae9fb 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,7 +1,7 @@
 services:
   web:
-    build: .
-    # image: na2na/misskey-na2na:release
+    # build: .
+    image: na2na/misskey-na2na:release
     restart: always
     links:
       - redis

From 890e5a6f55e549942a7f0f14b0bfcbff34aa0909 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 17 Mar 2023 23:52:41 +0900
Subject: [PATCH 040/174] CD test

---
 .../docker-build-push-misskey-na2na.yml         | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index a366ad04d6a9..1bbe89c7934a 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -17,6 +17,9 @@ jobs:
   Check-image-already-exists:
     name: Check image already exists
     runs-on: ubuntu-latest
+    outputs:
+      tag_exists: ${{ steps.check_docker_hub.outputs.tag_exists }}
+      MISSKEY_VERSION: ${{ env.MISSKEY_VERSION }}
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3.3.0
@@ -27,20 +30,22 @@ jobs:
       - name: Check Docker Hub
         id: check_docker_hub
         run: |
-          DOCKER_HUB_TAG=$(curl -s ${{ env.DOCKER_TAG_API_URI }} | jq -r '.results[] | select(.name == "${{ env.MISSKEY_VERSION }}") | .name')
-          echo $DOCKER_HUB_TAG
-          if [ -z "$DOCKER_HUB_TAG" ]; then
-            echo "Tag $DOCKER_HUB_TAG already exists on Docker Hub."
+          DOCKER_HUB_TAGS=$(curl -s https://registry.hub.docker.com/v2/repositories/na2na/misskey-na2na/tags | jq -r '.results[] | .name')
+          if [ $(echo $DOCKER_HUB_TAGS | grep -c $MISSKEY_VERSION) -eq 1 ]; then
+            echo "Tag $MISSKEY_VERSION already exists on Docker Hub."
           else
-            echo "Tag $DOCKER_HUB_TAG does not exist on Docker Hub."
+            echo "Tag $MISSKEY_VERSION does not exist on Docker Hub."
             echo "tag_exists=false" >> $GITHUB_OUTPUT
+            echo "MISSKEY_VERSION=$MISSKEY_VERSION" >> $GITHUB_ENV
           fi
 
   Build-and-Push-to-Docker-Hub:
     name: Build and Push to Docker Hub
     runs-on: ubuntu-latest
     needs: Check-image-already-exists
-    if: needs.Check-image-already-exists.outputs.tag_exists == 'false'
+    env:
+      MISSKEY_VERSION: ${{ needs.Check-image-already-exists.outputs.MISSKEY_VERSION }}
+    if: ${{ needs.Check-image-already-exists.outputs.tag_exists == 'false' }}
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3.3.0

From ad48bfb80561c0273186891c38f0af246c9ef61f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 15 Mar 2023 13:27:07 +0000
Subject: [PATCH 041/174] Update dependency pnpm to v7.29.3

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index af173c6ca98e..23ef868af19a 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.16.0
-pnpm 7.29.0
+pnpm 7.29.3

From 1072d241edbf8606eec2c1d5dcb31b94406cb496 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sat, 18 Mar 2023 00:53:00 +0900
Subject: [PATCH 042/174] Update docker/setup-buildx-action action to v2.5.0

---
 .github/workflows/docker-build-push-misskey-na2na.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index 1bbe89c7934a..c7e24ee06d4e 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -51,7 +51,7 @@ jobs:
         uses: actions/checkout@v3.3.0
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.4.1
+        uses: docker/setup-buildx-action@v2.5.0
         with:
           platforms: linux/amd64,linux/arm64
       - name: Login to DockerHub

From 7ba09be3ffe9cde55faadd2430489c83cb9d7064 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Thu, 23 Mar 2023 15:13:30 +0900
Subject: [PATCH 043/174] Update update-command

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5d2d83e01726..42380f28429a 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
 		"clean": "node ./scripts/clean.js",
 		"clean-all": "node ./scripts/clean-all.js",
 		"cleanall": "pnpm clean-all",
-		"server-update": "git fetch && git reset --hard origin/deploy/on-premise && git submodule update --init && docker compose build && docker compose down && docker compose up -d",
+		"server-update": "git fetch && git reset --hard origin/deploy/on-premise && git submodule update --init && docker compose build && docker compose pull && docker compose down && docker compose up -d",
 		"db-backup": "source .config/docker.env && docker compose exec -T db pg_dump -U $POSTGRES_USER -Ft misskey -f /misskey-na2na-db/`date +%y%m%d-%H%M`.tar"
 	},
 	"resolutions": {

From 2a85333896426bc545ed7a5b9e3d72a4d404c8f5 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sun, 2 Apr 2023 12:30:50 +0900
Subject: [PATCH 044/174] Update pnpm

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 23ef868af19a..d622518c1397 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.16.0
-pnpm 7.29.3
+pnpm 8.1.0

From afcefc2a65a366b0db8356d66d4fd685765ae8d4 Mon Sep 17 00:00:00 2001
From: "A.Yamamoto" <49822810+na2na-p@users.noreply.github.com>
Date: Sun, 2 Apr 2023 13:08:20 +0900
Subject: [PATCH 045/174] =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E3=83=9C?=
 =?UTF-8?q?=E3=82=BF=E3=83=B3=E3=82=92=E3=83=A2=E3=83=BC=E3=83=80=E3=83=AB?=
 =?UTF-8?q?=E3=83=95=E3=83=83=E3=82=BF=E3=83=BC=E3=81=B8=20(#395)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Move 絵文字ボタンをモーダルフッターへ

* 13.10.3-na2na-v2

* auto-mergeをsquash mergeに
---
 .github/workflows/enable-automerge.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/enable-automerge.yml b/.github/workflows/enable-automerge.yml
index afbe6dac6809..7954ae37abfc 100644
--- a/.github/workflows/enable-automerge.yml
+++ b/.github/workflows/enable-automerge.yml
@@ -27,3 +27,4 @@ jobs:
       - uses: alexwilson/enable-github-automerge-action@main
         with:
           github-token: ${{ steps.generate_token.outputs.token }}
+          merge-method: "SQUASH"

From 311fc9bc1297e073f655cbe1d40987a223e1be90 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 08:08:16 +0000
Subject: [PATCH 046/174] Update dependency pnpm to v8.1.1 (#398)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index d622518c1397..9fcecf2bc35f 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.16.0
-pnpm 8.1.0
+pnpm 8.1.1

From 2c2548070bb471efdd2092dbdc97dc37d6919a70 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 9 Apr 2023 11:27:41 +0000
Subject: [PATCH 047/174] Update actions/checkout action to v3.5.0 (#397)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/docker-build-push-misskey-na2na.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index c7e24ee06d4e..25f74d1badbf 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -22,7 +22,7 @@ jobs:
       MISSKEY_VERSION: ${{ env.MISSKEY_VERSION }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.5.0
       - name: Get current version
         id: get_version
         run: |
@@ -48,7 +48,7 @@ jobs:
     if: ${{ needs.Check-image-already-exists.outputs.tag_exists == 'false' }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.5.0
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v2.5.0

From 32034deba3058d25fac576b6694a2cd1da32fe6a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 23:05:24 +0900
Subject: [PATCH 048/174] Update redis Docker tag to v7.0.10 (#399)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index fc51b3bae9fb..c1fd63aad366 100644
--- a/compose.yml
+++ b/compose.yml
@@ -21,7 +21,7 @@ services:
 
   redis:
     restart: always
-    image: redis:7.0.9-alpine
+    image: redis:7.0.10-alpine
     init: true
     networks:
       - internal_network

From 5ed83755f92b61fa44f23f48aaa133a3abb5f2d3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 23:05:50 +0900
Subject: [PATCH 049/174] Update nginx Docker tag to v1.23.4 (#396)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 infra/nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/nginx/Dockerfile b/infra/nginx/Dockerfile
index 8cc4bb494c4a..b6a422f7132d 100644
--- a/infra/nginx/Dockerfile
+++ b/infra/nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.23.3
+FROM nginx:1.23.4
 
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \

From fd922ba7cdfd6b6d7acfdf15788b2f50bf14d990 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 23:06:13 +0900
Subject: [PATCH 050/174] Update dependency pnpm to v8.2.0 (#401)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index 9fcecf2bc35f..ee459da2262a 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 18.16.0
-pnpm 8.1.1
+nodejs 18.15.0
+pnpm 8.2.0

From 4db7baaa5b0e301f1093e97713c1b9214bf768cd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 12 Apr 2023 14:50:51 +0900
Subject: [PATCH 051/174] Update nginx Docker tag to v1.24.0 (#405)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 infra/nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/nginx/Dockerfile b/infra/nginx/Dockerfile
index b6a422f7132d..b0088baa17aa 100644
--- a/infra/nginx/Dockerfile
+++ b/infra/nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.23.4
+FROM nginx:1.24.0
 
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \

From 740646100518b3d8ec40567dc900f99ae79c890c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 12 Apr 2023 15:37:28 +0900
Subject: [PATCH 052/174] Update actions/github-script action to v6.4.1 (#400)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/storybook.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
index bea93f145612..02e35d30d58c 100644
--- a/.github/workflows/storybook.yml
+++ b/.github/workflows/storybook.yml
@@ -109,6 +109,18 @@ jobs:
             commit_sha: context.sha,
             body: 'Chromatic detects changes. Please [review the changes on Chromatic](https://www.chromatic.com/builds?appId=6428f7d7b962f0b79f97d6e4).'
           })
+    - name: Notify that Chromatic will skip testing
+      uses: actions/github-script@v6.4.1
+      if: github.event_name == 'pull_request' && steps.chromatic_pull_request.outputs.skip == 'true'
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        script: |
+          github.rest.issues.createComment({
+            issue_number: context.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            body: 'Chromatic will skip testing but you may still have to [review the changes on Chromatic](https://www.chromatic.com/pullrequests?appId=6428f7d7b962f0b79f97d6e4).'
+          })
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4
       with:

From 668159b94481ae94191fa0b9bc58dc965a3f03d5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 13 Apr 2023 16:14:40 +0000
Subject: [PATCH 053/174] Update actions/checkout action to v3.5.2 (#406)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/docker-build-push-misskey-na2na.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index 25f74d1badbf..04d92dd24139 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -22,7 +22,7 @@ jobs:
       MISSKEY_VERSION: ${{ env.MISSKEY_VERSION }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
       - name: Get current version
         id: get_version
         run: |
@@ -48,7 +48,7 @@ jobs:
     if: ${{ needs.Check-image-already-exists.outputs.tag_exists == 'false' }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v2.5.0

From ceed55d0f64b784f7ddf472d06b4192e1cbd5d5f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 7 May 2023 20:19:31 +0900
Subject: [PATCH 054/174] Update redis Docker tag to v7.0.11 (#408)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index c1fd63aad366..887953d3c3a9 100644
--- a/compose.yml
+++ b/compose.yml
@@ -21,7 +21,7 @@ services:
 
   redis:
     restart: always
-    image: redis:7.0.10-alpine
+    image: redis:7.0.11-alpine
     init: true
     networks:
       - internal_network

From bf12b825f705f34eb4154bdfdae48eb1c13ff890 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 7 May 2023 20:45:25 +0900
Subject: [PATCH 055/174] Update dependency pnpm to v8.4.0 (#409)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index ee459da2262a..c4753ce35a47 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.15.0
-pnpm 8.2.0
+pnpm 8.4.0

From da79ee235367f51c082c3f91bad89c78b20d4c84 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 7 May 2023 22:20:04 +0900
Subject: [PATCH 056/174] Update Node.js to v18.16.0 (#407)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index c4753ce35a47..de697ce2d024 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 18.15.0
+nodejs 18.16.0
 pnpm 8.4.0

From 0a2c8bf54b4b2e5d56e677044b00d875f26bc42c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 11 May 2023 09:51:12 +0900
Subject: [PATCH 057/174] Update dependency pnpm to v8.5.0 (#411)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index de697ce2d024..8336922736bf 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.16.0
-pnpm 8.4.0
+pnpm 8.5.0

From 6a258f2430c786cf4feb757927897b116ce3d09e Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Thu, 11 May 2023 10:34:24 +0900
Subject: [PATCH 058/174] Add meilisearch settings

---
 .vscode/settings.json | 20 +++++++++++++-------
 compose.yml           | 15 +++++++++++++++
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0ceec23acd8b..e58d26d07df6 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,15 +1,21 @@
 {
 	"search.exclude": {
-		"**/node_modules": true
+			"**/node_modules": true
 	},
 	"typescript.tsdk": "node_modules/typescript/lib",
 	"files.associations": {
-		"*.test.ts": "typescript"
+			"*.test.ts": "typescript"
 	},
 	"jest.jestCommandLine": "pnpm run jest",
-	"jest.runMode": "on-demand",
-	"editor.codeActionsOnSave": {
-		"source.fixAll": "explicit"
-	},
-	"editor.formatOnSave": false
+	"jest.autoRun": "off",
+	"editor.formatOnSave": false,
+	"cSpell.words": [
+		"getmeili",
+		"healthcheck",
+		"isready",
+		"Meili",
+		"meilisearch",
+		"memlock",
+		"ulimits"
+	]
 }
diff --git a/compose.yml b/compose.yml
index 887953d3c3a9..5ff86c8719fb 100644
--- a/compose.yml
+++ b/compose.yml
@@ -6,6 +6,7 @@ services:
     links:
       - redis
       - db
+      # - meilisearch
       # - es
     depends_on:
       redis:
@@ -47,6 +48,19 @@ services:
       interval: 5s
       retries: 20
 
+  # meilisearch:
+  #   restart: always
+  #   image: getmeili/meilisearch:v1.1.1
+  #   environment:
+  #     - MEILI_NO_ANALYTICS=true
+  #     - MEILI_ENV=production
+  #   env_file:
+  #     - .config/meilisearch.env
+  #   networks:
+  #     - internal_network
+  #   volumes:
+  #     - meili_data:/meili_data
+
   # tunnel:
   #   image: cloudflare/cloudflared:2023.2.1
   #   restart: always
@@ -108,3 +122,4 @@ networks:
 volumes:
   postgres:
   redis:
+  # meili_data:

From 82282b46547f82566e86d94ae1ae79892f749fe2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 16 May 2023 09:15:56 +0900
Subject: [PATCH 059/174] Update postgres Docker tag to v15.3 (#412)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index 5ff86c8719fb..a25c4db79b2d 100644
--- a/compose.yml
+++ b/compose.yml
@@ -35,7 +35,7 @@ services:
 
   db:
     restart: always
-    image: postgres:15.2-bullseye
+    image: postgres:15.3-bullseye
     networks:
       - internal_network
     env_file:

From 463797a7d42f3169a9dc43968e5f4b50a3d61270 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 16 May 2023 00:17:03 +0000
Subject: [PATCH 060/174] Update dependency pnpm to v8.5.1

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 8336922736bf..5201cde53769 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.16.0
-pnpm 8.5.0
+pnpm 8.5.1

From 1780668f232095d653789c1c076a2cb1af4f0da5 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Tue, 16 May 2023 14:00:44 +0900
Subject: [PATCH 061/174] =?UTF-8?q?Fix=20=E5=AD=98=E5=9C=A8=E3=81=97?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=E3=81=AE=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index a25c4db79b2d..ad9c759c8ac8 100644
--- a/compose.yml
+++ b/compose.yml
@@ -23,7 +23,6 @@ services:
   redis:
     restart: always
     image: redis:7.0.11-alpine
-    init: true
     networks:
       - internal_network
     volumes:

From acc45e5dfb95f40ad7b96041be6e306743e122ce Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Tue, 16 May 2023 14:05:41 +0900
Subject: [PATCH 062/174] Fix S3_PROXY_PASS

---
 infra/nginx/.env.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/nginx/.env.example b/infra/nginx/.env.example
index 1110713747c1..2a9f349f28c7 100644
--- a/infra/nginx/.env.example
+++ b/infra/nginx/.env.example
@@ -1,2 +1,2 @@
 SERVER_NAME=www.example.com
-S3_PROXY_PASS=https://s3.ap-northeast-1-ntt.wasabisys.com
+S3_PROXY_PASS=https://s3.ap-northeast-1.wasabisys.com

From aa3cd4e6af006a70ab97d3a28160ca2faf63006a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 27 May 2023 23:39:36 +0900
Subject: [PATCH 063/174] Update nginx Docker tag to v1.25.0 (#414)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 infra/nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/nginx/Dockerfile b/infra/nginx/Dockerfile
index b0088baa17aa..a04c2a1e04fa 100644
--- a/infra/nginx/Dockerfile
+++ b/infra/nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.24.0
+FROM nginx:1.25.0
 
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \

From e00a0b65d32618d94cc5b21c14b149c5c99843d6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Jun 2023 14:50:23 +0900
Subject: [PATCH 064/174] Update dependency pnpm to v8.6.1 (#415)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 5201cde53769..bcd8366a43fc 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.16.0
-pnpm 8.5.1
+pnpm 8.6.1

From d1f6c90fdff312543623a5551e0430154c3f4c00 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 11 Jun 2023 03:29:37 +0900
Subject: [PATCH 065/174] Update docker/setup-buildx-action action to v2.6.0
 (#416)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/docker-build-push-misskey-na2na.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index 04d92dd24139..7b7d282512d1 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -51,7 +51,7 @@ jobs:
         uses: actions/checkout@v3.5.2
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.5.0
+        uses: docker/setup-buildx-action@v2.6.0
         with:
           platforms: linux/amd64,linux/arm64
       - name: Login to DockerHub

From b0344d0cb8afabfe9521ac7336803b2861a38dfa Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sun, 11 Jun 2023 03:31:13 +0900
Subject: [PATCH 066/174] Update example

---
 infra/nginx/.env.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/nginx/.env.example b/infra/nginx/.env.example
index 2a9f349f28c7..d0134be11006 100644
--- a/infra/nginx/.env.example
+++ b/infra/nginx/.env.example
@@ -1,2 +1,2 @@
 SERVER_NAME=www.example.com
-S3_PROXY_PASS=https://s3.ap-northeast-1.wasabisys.com
+S3_PROXY_PASS=https://s3.ap-northeast-1.wasabisys.com/bucket-name

From 30acee2fc2cde4a0f7e50d9c5374ce943ce3509b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 12 Jun 2023 15:04:17 +0900
Subject: [PATCH 067/174] Update actions/checkout action to v3.5.3 (#417)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/docker-build-push-misskey-na2na.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index 7b7d282512d1..17019dbe938b 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -22,7 +22,7 @@ jobs:
       MISSKEY_VERSION: ${{ env.MISSKEY_VERSION }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Get current version
         id: get_version
         run: |
@@ -48,7 +48,7 @@ jobs:
     if: ${{ needs.Check-image-already-exists.outputs.tag_exists == 'false' }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.5.3
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v2.6.0

From d9d2555fa68dff3c0fe5a13ab70af8d805d7f7bf Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sat, 22 Jul 2023 15:01:35 +0900
Subject: [PATCH 068/174] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E5=91=A8?=
 =?UTF-8?q?=E3=82=8A=E6=94=B9=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflows/docker-build-push-misskey-na2na.yml   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index 17019dbe938b..f58c3d9ca203 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -54,6 +54,18 @@ jobs:
         uses: docker/setup-buildx-action@v2.6.0
         with:
           platforms: linux/amd64,linux/arm64
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: na2na/misskey
+          tags: |
+            type=edge
+            type=ref,event=pr
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
       - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
@@ -62,6 +74,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
+          builder: ${{ steps.buildx.outputs.name }}
           context: .
           push: true
           platforms: ${{ steps.buildx.outputs.platforms }}

From c163a7993558a2dc239764b9e7ac80f1acd5b18d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 22 Jul 2023 05:59:42 +0000
Subject: [PATCH 069/174] Update nginx Docker tag to v1.25.1

---
 infra/nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/nginx/Dockerfile b/infra/nginx/Dockerfile
index a04c2a1e04fa..29f21aecff83 100644
--- a/infra/nginx/Dockerfile
+++ b/infra/nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.25.0
+FROM nginx:1.25.1
 
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \

From c44cdb63140ab10447927db0a8910bf38ae256c6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 22 Jul 2023 05:59:46 +0000
Subject: [PATCH 070/174] Update redis Docker tag to v7.0.12

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index ad9c759c8ac8..e492948e66d4 100644
--- a/compose.yml
+++ b/compose.yml
@@ -22,7 +22,7 @@ services:
 
   redis:
     restart: always
-    image: redis:7.0.11-alpine
+    image: redis:7.0.12-alpine
     networks:
       - internal_network
     volumes:

From 398e8562e03f8b03ac3ae34c44e576b218991d98 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 22 Jul 2023 06:00:04 +0000
Subject: [PATCH 071/174] Update docker/setup-buildx-action action to v2.9.1

---
 .github/workflows/docker-build-push-misskey-na2na.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index f58c3d9ca203..4cdb54dbc9e5 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -51,7 +51,7 @@ jobs:
         uses: actions/checkout@v3.5.3
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.6.0
+        uses: docker/setup-buildx-action@v2.9.1
         with:
           platforms: linux/amd64,linux/arm64
       - name: Docker meta

From eb6199bd3a14efeef0193e875d9cb7650a5be64f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 22 Jul 2023 05:59:39 +0000
Subject: [PATCH 072/174] Update dependency pnpm to v8.6.9

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index bcd8366a43fc..f27a205c5b5a 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.16.0
-pnpm 8.6.1
+pnpm 8.6.9

From f20042c967830cbfe11ba13ed98927943ace4689 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 24 Jul 2023 01:17:23 +0000
Subject: [PATCH 073/174] Update dependency pnpm to v8.6.10

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index f27a205c5b5a..ae69161df282 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.16.0
-pnpm 8.6.9
+pnpm 8.6.10

From f2054b1146d7ab6e97da660395d1635865cce31d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 22 Jul 2023 07:03:25 +0000
Subject: [PATCH 074/174] Update dependency node to v18.17.0

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index ae69161df282..245d93decc4e 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 18.16.0
+nodejs 18.17.0
 pnpm 8.6.10

From b134d084040a610306551472feed7ea0bd462cc4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 17 Aug 2023 10:52:42 +0900
Subject: [PATCH 075/174] Update nginx Docker tag to v1.25.2 (#431)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 infra/nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/nginx/Dockerfile b/infra/nginx/Dockerfile
index 29f21aecff83..1ce449c046b9 100644
--- a/infra/nginx/Dockerfile
+++ b/infra/nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.25.1
+FROM nginx:1.25.2
 
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \

From 534549ef17579c8505e1b23d4c661b7053b3eec0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 17 Aug 2023 02:06:10 +0000
Subject: [PATCH 076/174] Update dependency node to v18.17.1

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 245d93decc4e..069952ff8d89 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 18.17.0
+nodejs 18.17.1
 pnpm 8.6.10

From ee741d844f4e6596564a4a1a88bf326851633b68 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Thu, 17 Aug 2023 15:31:17 +0900
Subject: [PATCH 077/174] =?UTF-8?q?jemalloc=E3=82=92=E4=BD=BF=E3=81=86?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e247bbcd775f..007ba0db83be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -70,7 +70,6 @@ ARG GID="991"
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \
 	ffmpeg tini curl libjemalloc-dev libjemalloc2 \
-	&& ln -s /usr/lib/$(uname -m)-linux-gnu/libjemalloc.so.2 /usr/local/lib/libjemalloc.so \
 	&& corepack enable \
 	&& groupadd -g "${GID}" misskey \
 	&& useradd -l -u "${UID}" -g "${GID}" -m -d /misskey misskey \
@@ -99,7 +98,7 @@ COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/bui
 COPY --chown=misskey:misskey --from=native-builder /misskey/fluent-emojis /misskey/fluent-emojis
 COPY --chown=misskey:misskey . ./
 
-ENV LD_PRELOAD=/usr/local/lib/libjemalloc.so
+ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2
 ENV NODE_ENV=production
 HEALTHCHECK --interval=5s --retries=20 CMD ["/bin/bash", "/misskey/healthcheck.sh"]
 ENTRYPOINT ["/usr/bin/tini", "--"]

From 16bd3cf8c09137185523489226d3c3e6c5cf4642 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 17 Aug 2023 15:59:35 +0900
Subject: [PATCH 078/174] Update redis Docker tag to v7.2.0 (#432)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index e492948e66d4..712b6debcf88 100644
--- a/compose.yml
+++ b/compose.yml
@@ -22,7 +22,7 @@ services:
 
   redis:
     restart: always
-    image: redis:7.0.12-alpine
+    image: redis:7.2.0-alpine
     networks:
       - internal_network
     volumes:

From 0560bcce5e9f118ad9dcc3b6090578f2d8a9a266 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 17 Aug 2023 16:48:23 +0900
Subject: [PATCH 079/174] Update
 mcr.microsoft.com/devcontainers/javascript-node Docker tag to v1 (#422)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .devcontainer/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index b6ebcf6ad3e8..d14373835d1f 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1 +1 @@
-FROM mcr.microsoft.com/devcontainers/javascript-node:0-18
+FROM mcr.microsoft.com/devcontainers/javascript-node:1-18

From 3dab6886b81636567b6483528a2f41159ac09db9 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Thu, 17 Aug 2023 16:58:00 +0900
Subject: [PATCH 080/174] =?UTF-8?q?Redis=207.2.0=E3=81=ABamd64=E3=81=8C?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=AE=E3=81=A7=E6=88=BB=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/compose.yml b/compose.yml
index 712b6debcf88..012a9c5d1c1c 100644
--- a/compose.yml
+++ b/compose.yml
@@ -22,7 +22,8 @@ services:
 
   redis:
     restart: always
-    image: redis:7.2.0-alpine
+    # HACK 7.2.0-alpineにamd64がない
+    image: redis:7.0.12-alpine
     networks:
       - internal_network
     volumes:
@@ -76,7 +77,7 @@ services:
   #     - ./infra/cloudflare/.env
 
   nginx:
-    build: 
+    build:
       context: ./infra/nginx
       dockerfile: ./Dockerfile
     restart: always

From af68d5f39826a2ea49d7a003e655a72c053efbfd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 17 Aug 2023 07:58:39 +0000
Subject: [PATCH 081/174] Update dependency pnpm to v8.6.12

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 069952ff8d89..0a6253c2b7bb 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.17.1
-pnpm 8.6.10
+pnpm 8.6.12

From fae586735cf1c7062f81ca3ccbb756f289ab275c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 31 Aug 2023 03:43:54 +0000
Subject: [PATCH 082/174] Update dependency pnpm to v8.7.0 (#436)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 0a6253c2b7bb..d46d760461d5 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.17.1
-pnpm 8.6.12
+pnpm 8.7.0

From 50fb72fa392a686184e9772ef810044c64315b81 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 31 Aug 2023 15:39:13 +0900
Subject: [PATCH 083/174] Update docker/setup-buildx-action action to v2.10.0
 (#437)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/docker-build-push-misskey-na2na.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index 4cdb54dbc9e5..975138b742ff 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -51,7 +51,7 @@ jobs:
         uses: actions/checkout@v3.5.3
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.9.1
+        uses: docker/setup-buildx-action@v2.10.0
         with:
           platforms: linux/amd64,linux/arm64
       - name: Docker meta

From a176ccca682f5e77f9c6a0a04bbc30e74b3dbe62 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 12:43:48 +0900
Subject: [PATCH 084/174] Update dependency pnpm to v8.7.4 (#438)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index d46d760461d5..0d2446c7f41a 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.17.1
-pnpm 8.7.0
+pnpm 8.7.4

From 20e78f0b87a78554fc37b38a3f7847f6a271a6db Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Thu, 7 Sep 2023 11:16:33 +0900
Subject: [PATCH 085/174] =?UTF-8?q?=E3=81=8A=E3=81=B2=E3=81=A8=E3=82=8A?=
 =?UTF-8?q?=E6=A7=98=E3=81=AB=E3=83=AA=E3=83=8E=E3=83=BC=E3=83=88=E3=83=AD?=
 =?UTF-8?q?=E3=83=BC=E3=82=AB=E3=83=AB=E9=99=90=E5=AE=9A=E7=B6=99=E6=89=BF?=
 =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=81=AE=E3=81=A7=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/scripts/get-note-menu.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index 2563b0baf308..308290961d2f 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -557,7 +557,6 @@ export function getRenoteMenu(props: {
 				}
 
 				const configuredVisibility = defaultStore.state.rememberNoteVisibility ? defaultStore.state.visibility : defaultStore.state.defaultNoteVisibility;
-				const localOnly = defaultStore.state.rememberNoteVisibility ? defaultStore.state.localOnly : defaultStore.state.defaultNoteLocalOnly;
 
 				let visibility = appearNote.visibility;
 				visibility = smallerVisibility(visibility, configuredVisibility);
@@ -567,7 +566,6 @@ export function getRenoteMenu(props: {
 
 				if (!props.mock) {
 					misskeyApi('notes/create', {
-						localOnly,
 						visibility,
 						renoteId: appearNote.id,
 					}).then(() => {

From fa29c51b4b25da06dc4d8780ec532ce1f0a9175d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 14:42:01 +0900
Subject: [PATCH 086/174] Update dependency pnpm to v8.7.5 (#445)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 0d2446c7f41a..ebf87178d66c 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.17.1
-pnpm 8.7.4
+pnpm 8.7.5

From d0bd38f73850cc2668e92aa597886c46b0dd4d04 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 17:30:55 +0900
Subject: [PATCH 087/174] Update docker/login-action action to v3 (#447)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/docker-build-push-misskey-na2na.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index 975138b742ff..86bbfeacc500 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -67,7 +67,7 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

From 2798a7f3cd19cb0bad747024e98d96784a80e3cc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 14:27:04 +0900
Subject: [PATCH 088/174] Update dependency pnpm to v8.7.6 (#450)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index ebf87178d66c..1e2b264687fe 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 18.17.1
-pnpm 8.7.5
+pnpm 8.7.6

From 6166eb6fbc8f42c65c90e5d9f0618f0eb4979360 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 23:00:16 +0900
Subject: [PATCH 089/174] Update actions/checkout action to v4 (#440)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/approve.yml                         | 2 +-
 .github/workflows/docker-build-push-misskey-na2na.yml | 4 ++--
 .github/workflows/enable-automerge.yml                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/approve.yml b/.github/workflows/approve.yml
index 4fc78a8ef5bb..3e6f369b4164 100644
--- a/.github/workflows/approve.yml
+++ b/.github/workflows/approve.yml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Generate github token
         id: generate_token
         uses: ./.github/actions/github-app-token
diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index 86bbfeacc500..0c68ba76ba3f 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -22,7 +22,7 @@ jobs:
       MISSKEY_VERSION: ${{ env.MISSKEY_VERSION }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.0.0
       - name: Get current version
         id: get_version
         run: |
@@ -48,7 +48,7 @@ jobs:
     if: ${{ needs.Check-image-already-exists.outputs.tag_exists == 'false' }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.0.0
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v2.10.0
diff --git a/.github/workflows/enable-automerge.yml b/.github/workflows/enable-automerge.yml
index 7954ae37abfc..220e49f8c5c0 100644
--- a/.github/workflows/enable-automerge.yml
+++ b/.github/workflows/enable-automerge.yml
@@ -17,7 +17,7 @@ jobs:
     # if: github.event.pull_request.user.login == 'renovate[bot]' && contains(github.event.pull_request.labels.*.name, 'dependencies')
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Generate github token
         id: generate_token
         uses: ./.github/actions/github-app-token

From 0f09ddc42fbf631865ffb4427ed5f421d6d0bf8b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 23:34:05 +0900
Subject: [PATCH 090/174] Update docker/metadata-action action to v5 (#448)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/docker-build-push-misskey-na2na.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index 0c68ba76ba3f..ff442cfc2ccc 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -56,7 +56,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: na2na/misskey
           tags: |

From f809a122cd0ac2d1666be24cf7c40fd6d4429581 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 23:57:30 +0900
Subject: [PATCH 091/174] Update tibdex/github-app-token action to v2 (#444)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/actions/github-app-token/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/github-app-token/action.yml b/.github/actions/github-app-token/action.yml
index 5cc15091553e..3960051d3d65 100644
--- a/.github/actions/github-app-token/action.yml
+++ b/.github/actions/github-app-token/action.yml
@@ -16,7 +16,7 @@ outputs:
 runs:
   using: composite
   steps:
-    - uses: tibdex/github-app-token@v1.8.0
+    - uses: tibdex/github-app-token@v2.0.0
       with:
         app_id: ${{ inputs.app_id }}
         private_key: ${{ inputs.private_key }}

From eef633af8c7800425981c8ceab16a009175d560d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 09:30:07 +0900
Subject: [PATCH 092/174] Update tibdex/github-app-token action to v2.1.0
 (#454)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/actions/github-app-token/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/github-app-token/action.yml b/.github/actions/github-app-token/action.yml
index 3960051d3d65..3f21eb51ec05 100644
--- a/.github/actions/github-app-token/action.yml
+++ b/.github/actions/github-app-token/action.yml
@@ -16,7 +16,7 @@ outputs:
 runs:
   using: composite
   steps:
-    - uses: tibdex/github-app-token@v2.0.0
+    - uses: tibdex/github-app-token@v2.1.0
       with:
         app_id: ${{ inputs.app_id }}
         private_key: ${{ inputs.private_key }}

From d7ffd75ace8378c5e64dc90a942415b9d45dcbfc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 09:46:12 +0900
Subject: [PATCH 093/174] Update docker/build-push-action action to v5 (#446)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/docker-build-push-misskey-na2na.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index ff442cfc2ccc..f99083b538bc 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -72,7 +72,7 @@ jobs:
           username: ${{ vars.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .

From f3ebf876694d90209d9a89b59428c4454db4ea08 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 10:26:05 +0900
Subject: [PATCH 094/174] Update docker/setup-buildx-action action to v3 (#449)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/docker-build-push-misskey-na2na.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index f99083b538bc..5d0ae9cb79e4 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -51,7 +51,7 @@ jobs:
         uses: actions/checkout@v4.0.0
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.10.0
+        uses: docker/setup-buildx-action@v3.0.0
         with:
           platforms: linux/amd64,linux/arm64
       - name: Docker meta

From 63a66ac742a960526414db8ee142e7d4cc05748f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 02:02:31 +0000
Subject: [PATCH 095/174] Update redis Docker tag to v7.2.1 (#433)

* Update redis Docker tag to v7.2.1

* Remove hack annotation

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: na2na-p <na2na@na2na.dev>
Co-authored-by: A.Yamamoto <49822810+na2na-p@users.noreply.github.com>
---
 compose.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/compose.yml b/compose.yml
index 012a9c5d1c1c..cabf04a08a2b 100644
--- a/compose.yml
+++ b/compose.yml
@@ -22,8 +22,7 @@ services:
 
   redis:
     restart: always
-    # HACK 7.2.0-alpineにamd64がない
-    image: redis:7.0.12-alpine
+    image: redis:7.2.1-alpine
     networks:
       - internal_network
     volumes:

From 5ec27f0cbd0d67bcf4301f7073b975119158d535 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 02:15:39 +0000
Subject: [PATCH 096/174] Update dependency node to v20.7.0 (#452)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update dependency node to v20.7.0

* asdfでもv20系を使うように

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: na2na-p <na2na@na2na.dev>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 1e2b264687fe..bead0bb39b5c 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 18.17.1
+nodejs 20.7.0
 pnpm 8.7.6

From d4e68cf2bb2112fe25559f2335d160bc7f4646ad Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 24 Sep 2023 18:42:15 +0900
Subject: [PATCH 097/174] Update actions/checkout action to v4.1.0 (#455)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/docker-build-push-misskey-na2na.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index 5d0ae9cb79e4..8fcbc5ebcd18 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -22,7 +22,7 @@ jobs:
       MISSKEY_VERSION: ${{ env.MISSKEY_VERSION }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4.1.0
       - name: Get current version
         id: get_version
         run: |
@@ -48,7 +48,7 @@ jobs:
     if: ${{ needs.Check-image-already-exists.outputs.tag_exists == 'false' }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4.1.0
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v3.0.0

From b14ed85452b58487518979f62d295bd21bcaeaab Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sun, 24 Sep 2023 21:24:59 +0900
Subject: [PATCH 098/174] =?UTF-8?q?=E8=87=AA=E3=83=AA=E3=82=A2=E3=82=AF?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AB=E3=82=88=E3=82=8B=E6=9E=A0?=
 =?UTF-8?q?=E7=B7=9A=E6=B6=88=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkReactionsViewer.reaction.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index 26223364ab8e..1dd2831e6b70 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -216,7 +216,6 @@ if (!mock) {
 	&.reacted, &.reacted:hover {
 		background: var(--accentedBg);
 		color: var(--accent);
-		box-shadow: 0 0 0 1px var(--accent) inset;
 
 		> .count {
 			color: var(--accent);

From 820a93582404abb063167f245b32227cf8707560 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sun, 24 Sep 2023 21:34:21 +0900
Subject: [PATCH 099/174] =?UTF-8?q?=E3=83=AA=E3=82=A2=E3=82=AF=E3=82=B7?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=AE=E3=82=B5=E3=82=A4=E3=82=BA=E3=81=AE?=
 =?UTF-8?q?=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88=E3=82=92=E5=B0=8F?=
 =?UTF-8?q?=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/store.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 437314074a0c..57f66478b27e 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -360,7 +360,7 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	reactionsDisplaySize: {
 		where: 'device',
-		default: 'medium' as 'small' | 'medium' | 'large',
+		default: 'small' as 'small' | 'medium' | 'large',
 	},
 	limitWidthOfReaction: {
 		where: 'device',

From 921fa94b64bdfb41d86dae3793f4521e90dafd41 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 1 Oct 2023 10:45:59 +0000
Subject: [PATCH 100/174] Update dependency node to v20.8.0 (#459)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index bead0bb39b5c..7a2b824f0d5a 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 20.7.0
+nodejs 20.8.0
 pnpm 8.7.6

From f8e00ce29956d99ace25b3fbaed18dcb7489694c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 3 Oct 2023 12:58:41 +0900
Subject: [PATCH 101/174] Update dependency pnpm to v8.8.0 (#458)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 7a2b824f0d5a..9800619fc5de 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 20.8.0
-pnpm 8.7.6
+pnpm 8.8.0

From 2e478b8d11130ef8072b47f47e5a5166d52e945e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 10 Oct 2023 07:36:00 +0900
Subject: [PATCH 102/174] Update dependency pnpm to v8.9.0 (#460)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 9800619fc5de..0fde29a52cbe 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 20.8.0
-pnpm 8.8.0
+pnpm 8.9.0

From b282eb1521d2f049cc31367895e307fc6022a2f5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 14:47:45 +0900
Subject: [PATCH 103/174] Update dependency pnpm to v8.9.2 (#462)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 0fde29a52cbe..7536b66399bb 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 20.8.0
-pnpm 8.9.0
+pnpm 8.9.2

From 4ba9173612bbca408da357142e18d86d840c0ac7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 08:48:52 +0000
Subject: [PATCH 104/174] Update dependency node to v20.8.1 (#461)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 7536b66399bb..edd1509e7323 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 20.8.0
+nodejs 20.8.1
 pnpm 8.9.2

From 06bdcaadb12d98910683de99c204106582ef89f8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 19 Oct 2023 11:11:16 +0900
Subject: [PATCH 105/174] Update actions/checkout action to v4.1.1 (#464)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/docker-build-push-misskey-na2na.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
index 8fcbc5ebcd18..9f525ad7c329 100644
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ b/.github/workflows/docker-build-push-misskey-na2na.yml
@@ -22,7 +22,7 @@ jobs:
       MISSKEY_VERSION: ${{ env.MISSKEY_VERSION }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Get current version
         id: get_version
         run: |
@@ -48,7 +48,7 @@ jobs:
     if: ${{ needs.Check-image-already-exists.outputs.tag_exists == 'false' }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v3.0.0

From 7dfe2483b8975f90185cb9b2792c632236b08634 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 1 Nov 2023 13:33:29 +0900
Subject: [PATCH 106/174] Update dependency node to v20.9.0 (#472)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index edd1509e7323..23cb73f4df11 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 20.8.1
+nodejs 20.9.0
 pnpm 8.9.2

From 94b8ffe34078a3be7058b12931e5b26a78b0436b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 1 Nov 2023 13:54:04 +0900
Subject: [PATCH 107/174] Update nginx Docker tag to v1.25.3 (#473)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 infra/nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/nginx/Dockerfile b/infra/nginx/Dockerfile
index 1ce449c046b9..843c00f89c33 100644
--- a/infra/nginx/Dockerfile
+++ b/infra/nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.25.2
+FROM nginx:1.25.3
 
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \

From 41f36f4b2963ab1622729621528b2e2cfcab57c1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 1 Nov 2023 14:33:16 +0900
Subject: [PATCH 108/174] Update dependency pnpm to v8.10.0 (#474)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 23cb73f4df11..644d8abcb447 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 20.9.0
-pnpm 8.9.2
+pnpm 8.10.0

From 7b25d20c1e49d866cd4cefcfe698b2a9d3fc5bee Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 08:14:44 +0900
Subject: [PATCH 109/174] Update dependency pnpm to v8.10.2 (#475)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 644d8abcb447..e1c6919cf3de 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 20.9.0
-pnpm 8.10.0
+pnpm 8.10.2

From 57a5465125247aaf25bb9d1ed1aa251f514b303d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 00:33:21 +0000
Subject: [PATCH 110/174] Update dependency pnpm to v8.10.3 (#476)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index e1c6919cf3de..46a73cdccd9a 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 20.9.0
-pnpm 8.10.2
+pnpm 8.10.3

From b69ec2687c37f2ea8c026ee4fb4f2d4cf6309ec4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 00:41:11 +0000
Subject: [PATCH 111/174] Update redis Docker tag to v7.2.3 (#466)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index cabf04a08a2b..867612b12da4 100644
--- a/compose.yml
+++ b/compose.yml
@@ -22,7 +22,7 @@ services:
 
   redis:
     restart: always
-    image: redis:7.2.1-alpine
+    image: redis:7.2.3-alpine
     networks:
       - internal_network
     volumes:

From 6f8623e3d796c88dc47c948fb4571ff38341a92d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 15 Nov 2023 10:02:29 +0900
Subject: [PATCH 112/174] Update actions/github-script action to v7 (#478)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/storybook.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
index 02e35d30d58c..d3d83a16a4d7 100644
--- a/.github/workflows/storybook.yml
+++ b/.github/workflows/storybook.yml
@@ -110,7 +110,7 @@ jobs:
             body: 'Chromatic detects changes. Please [review the changes on Chromatic](https://www.chromatic.com/builds?appId=6428f7d7b962f0b79f97d6e4).'
           })
     - name: Notify that Chromatic will skip testing
-      uses: actions/github-script@v6.4.1
+      uses: actions/github-script@v7.0.0
       if: github.event_name == 'pull_request' && steps.chromatic_pull_request.outputs.skip == 'true'
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}

From a2ecfaba976eea364be531b4a35a9c56b4a51045 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 15 Nov 2023 11:20:27 +0900
Subject: [PATCH 113/174] Update dependency pnpm to v8.10.5 (#477)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 46a73cdccd9a..29a2ad91c901 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 20.9.0
-pnpm 8.10.3
+pnpm 8.10.5

From 8348896862b068d90d5051435275af0021fa518f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 16 Nov 2023 23:00:45 +0900
Subject: [PATCH 114/174] Update docker/dockerfile Docker tag to v1.6 (#480)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 007ba0db83be..85e0d06b398e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# syntax = docker/dockerfile:1.4
+# syntax = docker/dockerfile:1.6
 
 ARG NODE_VERSION=20.16.0-bullseye
 

From 7d1631233cdbc63f2111ab809ab2082d92a4bc99 Mon Sep 17 00:00:00 2001
From: "A.Yamamoto" <49822810+na2na-p@users.noreply.github.com>
Date: Sat, 18 Nov 2023 01:23:21 +0900
Subject: [PATCH 115/174] =?UTF-8?q?docker=20publish=E5=91=A8=E3=82=8A?=
 =?UTF-8?q?=E6=94=B9=E4=BF=AE=20(#481)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ビルド通るかチェック

* push先間違えた

* push周り整頓

* 切り出してみる

* もう少し整頓した

* 切り出し

* 整理

* 汎用性上げる

* デバッグ用消す
---
 .github/workflows/cd-for-misskey-na2na.yml    | 47 ++++++++++
 .../docker-build-push-misskey-na2na.yml       | 88 -------------------
 .github/workflows/docker-develop.yml          |  1 -
 .../image-push-for-misskey-na2na-release.yml  | 53 +++++++++++
 infra/web/image-bake.hcl                      | 10 +++
 5 files changed, 110 insertions(+), 89 deletions(-)
 create mode 100644 .github/workflows/cd-for-misskey-na2na.yml
 delete mode 100644 .github/workflows/docker-build-push-misskey-na2na.yml
 create mode 100644 .github/workflows/image-push-for-misskey-na2na-release.yml
 create mode 100644 infra/web/image-bake.hcl

diff --git a/.github/workflows/cd-for-misskey-na2na.yml b/.github/workflows/cd-for-misskey-na2na.yml
new file mode 100644
index 000000000000..f94924398b85
--- /dev/null
+++ b/.github/workflows/cd-for-misskey-na2na.yml
@@ -0,0 +1,47 @@
+name: CD for Misskey(na2na)
+
+on:
+  push:
+    branches:
+      - misskey-na2na
+  workflow_dispatch:
+
+env:
+  DOCKER_TAG_API_URI: https://registry.hub.docker.com/v2/repositories/na2na/misskey-na2na/tags
+
+jobs:
+  Prepare:
+    name: Prepare
+    runs-on: ubuntu-latest
+    outputs:
+      tag_exists: ${{ steps.check_docker_hub.outputs.tag_exists }}
+      MISSKEY_VERSION: ${{ steps.check_docker_hub.outputs.MISSKEY_VERSION }}
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4.1.1
+      - name: Get current version
+        id: get_version
+        run: |
+          echo "MISSKEY_VERSION=$(cat package.json | jq -r '.version')" >> $GITHUB_ENV
+      - name: Check Docker Hub
+        id: check_docker_hub
+        run: |
+          DOCKER_HUB_TAGS=$(curl -s https://registry.hub.docker.com/v2/repositories/na2na/misskey-na2na/tags | jq -r '.results[] | .name')
+          if [ $(echo $DOCKER_HUB_TAGS | grep -c $MISSKEY_VERSION) -eq 1 ]; then
+            echo "Tag $MISSKEY_VERSION already exists on Docker Hub."
+          else
+            echo "Tag $MISSKEY_VERSION does not exist on Docker Hub."
+            echo "tag_exists=false" >> $GITHUB_OUTPUT
+            echo "MISSKEY_VERSION=$MISSKEY_VERSION" >> $GITHUB_OUTPUT
+          fi
+
+  Build-and-Push-to-Docker-Hub:
+    needs:
+      - Prepare
+    if: ${{ needs.Prepare.outputs.tag_exists == 'false' }}
+    with:
+      MISSKEY_VERSION: ${{ needs.Prepare.outputs.MISSKEY_VERSION }}
+      IMAGE_REPOSITORY: na2na
+      IMAGE_NAME: misskey-na2na
+    uses: ./.github/workflows/image-push-for-misskey-na2na-release.yml
+    secrets: inherit
diff --git a/.github/workflows/docker-build-push-misskey-na2na.yml b/.github/workflows/docker-build-push-misskey-na2na.yml
deleted file mode 100644
index 9f525ad7c329..000000000000
--- a/.github/workflows/docker-build-push-misskey-na2na.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-name: Publish Docker Image(misskey-na2na)
-
-on:
-  pull_request:
-    branches:
-      - misskey-na2na-deploy
-    types: [closed]
-  push:
-    branches:
-      - misskey-na2na
-  workflow_dispatch:
-
-env:
-  DOCKER_TAG_API_URI: https://registry.hub.docker.com/v2/repositories/na2na/misskey-na2na/tags
-
-jobs:
-  Check-image-already-exists:
-    name: Check image already exists
-    runs-on: ubuntu-latest
-    outputs:
-      tag_exists: ${{ steps.check_docker_hub.outputs.tag_exists }}
-      MISSKEY_VERSION: ${{ env.MISSKEY_VERSION }}
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4.1.1
-      - name: Get current version
-        id: get_version
-        run: |
-          echo "MISSKEY_VERSION=$(cat package.json | jq -r '.version')" >> $GITHUB_ENV
-      - name: Check Docker Hub
-        id: check_docker_hub
-        run: |
-          DOCKER_HUB_TAGS=$(curl -s https://registry.hub.docker.com/v2/repositories/na2na/misskey-na2na/tags | jq -r '.results[] | .name')
-          if [ $(echo $DOCKER_HUB_TAGS | grep -c $MISSKEY_VERSION) -eq 1 ]; then
-            echo "Tag $MISSKEY_VERSION already exists on Docker Hub."
-          else
-            echo "Tag $MISSKEY_VERSION does not exist on Docker Hub."
-            echo "tag_exists=false" >> $GITHUB_OUTPUT
-            echo "MISSKEY_VERSION=$MISSKEY_VERSION" >> $GITHUB_ENV
-          fi
-
-  Build-and-Push-to-Docker-Hub:
-    name: Build and Push to Docker Hub
-    runs-on: ubuntu-latest
-    needs: Check-image-already-exists
-    env:
-      MISSKEY_VERSION: ${{ needs.Check-image-already-exists.outputs.MISSKEY_VERSION }}
-    if: ${{ needs.Check-image-already-exists.outputs.tag_exists == 'false' }}
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4.1.1
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3.0.0
-        with:
-          platforms: linux/amd64,linux/arm64
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: na2na/misskey
-          tags: |
-            type=edge
-            type=ref,event=pr
-            type=ref,event=branch
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ vars.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          push: true
-          platforms: ${{ steps.buildx.outputs.platforms }}
-          provenance: false
-          tags: |
-            na2na/misskey-na2na:release
-            na2na/misskey-na2na:${{ env.MISSKEY_VERSION }}
-          labels: |
-            dev.na2na.misskey-na2na.version=${{ env.MISSKEY_VERSION }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index f788046cfefe..c7ac08414a82 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - develop
-      - misskey-na2na
   workflow_dispatch:
 
 env:
diff --git a/.github/workflows/image-push-for-misskey-na2na-release.yml b/.github/workflows/image-push-for-misskey-na2na-release.yml
new file mode 100644
index 000000000000..8687ad22a025
--- /dev/null
+++ b/.github/workflows/image-push-for-misskey-na2na-release.yml
@@ -0,0 +1,53 @@
+name: Publish Docker Image(misskey-na2na)
+
+on:
+  workflow_call:
+    inputs:
+      MISSKEY_VERSION:
+        required: true
+        type: string
+      IMAGE_REPOSITORY:
+        required: true
+        type: string
+      IMAGE_NAME:
+        required: true
+        type: string
+    secrets: {}
+
+jobs:
+  Build-and-Push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Prepare for build
+        id: prepare-for-build
+        run: |
+          echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+      - name: Cache Docker Build Cache
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: docker-build-cache-${{ github.ref }}-${{ github.sha }}
+          restore-keys: |
+            docker-build-cache-${{ github.ref }}
+            docker-build-cache-
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver-opts: network=host
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build Docker Image
+        run: |
+          docker buildx bake \
+              -f 'infra/web/image-bake.hcl' \
+              --builder="${{ steps.buildx.outputs.name }}" \
+              --set='web.tags=${{ inputs.IMAGE_REPOSITORY }}/${{ inputs.IMAGE_NAME }}:${{ inputs.MISSKEY_VERSION }}' \
+              --set='web.tags=${{ inputs.IMAGE_REPOSITORY }}/${{ inputs.IMAGE_NAME }}:${{ steps.prepare-for-build.outputs.sha_short }}' \
+              --set='web.tags=${{ inputs.IMAGE_REPOSITORY }}/${{ inputs.IMAGE_NAME }}:release' \
+              --push
diff --git a/infra/web/image-bake.hcl b/infra/web/image-bake.hcl
new file mode 100644
index 000000000000..bc70197f76d2
--- /dev/null
+++ b/infra/web/image-bake.hcl
@@ -0,0 +1,10 @@
+group "default" {
+    targets = ["web"]
+}
+
+target "web" {
+    dockerfile = "Dockerfile"
+    platforms = ["linux/amd64", "linux/arm64"]
+    cache-to = ["type=local,dest=/tmp/.buildx-cache"]
+    cache-from = ["type=local,src=/tmp/.buildx-cache"]
+}

From fbfff079eefa7759b50d2abc696c061e87dbd895 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sat, 18 Nov 2023 01:34:08 +0900
Subject: [PATCH 116/174] =?UTF-8?q?squash=20merge=E3=82=84=E3=82=81?=
 =?UTF-8?q?=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/enable-automerge.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/enable-automerge.yml b/.github/workflows/enable-automerge.yml
index 220e49f8c5c0..5e383887dc54 100644
--- a/.github/workflows/enable-automerge.yml
+++ b/.github/workflows/enable-automerge.yml
@@ -27,4 +27,3 @@ jobs:
       - uses: alexwilson/enable-github-automerge-action@main
         with:
           github-token: ${{ steps.generate_token.outputs.token }}
-          merge-method: "SQUASH"

From b10a95c4be48df58e5b5692ba039080d52e064dc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 18 Nov 2023 01:09:24 +0000
Subject: [PATCH 117/174] Update actions/github-script action to v7.0.1

---
 .github/workflows/storybook.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
index d3d83a16a4d7..5f28906bc080 100644
--- a/.github/workflows/storybook.yml
+++ b/.github/workflows/storybook.yml
@@ -110,7 +110,7 @@ jobs:
             body: 'Chromatic detects changes. Please [review the changes on Chromatic](https://www.chromatic.com/builds?appId=6428f7d7b962f0b79f97d6e4).'
           })
     - name: Notify that Chromatic will skip testing
-      uses: actions/github-script@v7.0.0
+      uses: actions/github-script@v7.0.1
       if: github.event_name == 'pull_request' && steps.chromatic_pull_request.outputs.skip == 'true'
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}

From 36d2a2833742e6f6d22adcc3300984302b16095b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 Nov 2023 18:58:34 +0000
Subject: [PATCH 118/174] Update dependency pnpm to v8.11.0

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 29a2ad91c901..da835557df2d 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 20.9.0
-pnpm 8.10.5
+pnpm 8.11.0

From b1535e260b886b0081bc56d10df5b01ed12aaf67 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 25 Nov 2023 11:23:35 +0000
Subject: [PATCH 119/174] Update dependency node to v20.10.0

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index da835557df2d..9bf3213a7f4c 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 20.9.0
+nodejs 20.10.0
 pnpm 8.11.0

From eb6665dd7b38f7cfb089badc502442d11151a6b8 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Thu, 30 Nov 2023 14:26:08 +0900
Subject: [PATCH 120/174] =?UTF-8?q?=E3=83=AA=E3=83=90=E3=83=BC=E3=82=B9?=
 =?UTF-8?q?=E3=83=97=E3=83=AD=E3=82=AD=E3=82=B7=E3=82=92Cloudflare=20worke?=
 =?UTF-8?q?rs=E3=81=AB=E7=A7=BB=E8=AD=B2=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infra/nginx/conf.d/default.conf.template | 27 ++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/infra/nginx/conf.d/default.conf.template b/infra/nginx/conf.d/default.conf.template
index 7a2bb170dafb..22db1cac7fe4 100644
--- a/infra/nginx/conf.d/default.conf.template
+++ b/infra/nginx/conf.d/default.conf.template
@@ -36,17 +36,18 @@ server {
                 try_files $uri @proxy;
         }
 
-        location /media {
-                resolver 8.8.8.8 valid=5s;
-                proxy_buffers 10 32k;
-                proxy_buffer_size 32k;
-                proxy_redirect off;
-                proxy_http_version 1.1;
-                proxy_hide_header x-amz-id-2;
-                proxy_hide_header x-amz-request-id;
-                proxy_hide_header Set-Cookie;
-                proxy_ignore_headers Cache-Control Set-Cookie;
-                tcp_nodelay on;
-                proxy_pass ${S3_PROXY_PASS};
-        }
+# NOTE: Cloudflare workersに移譲する
+#        location /media {
+#                resolver 8.8.8.8 valid=5s;
+#                proxy_buffers 10 32k;
+#                proxy_buffer_size 32k;
+#                proxy_redirect off;
+#                proxy_http_version 1.1;
+#                proxy_hide_header x-amz-id-2;
+#                proxy_hide_header x-amz-request-id;
+#                proxy_hide_header Set-Cookie;
+#                proxy_ignore_headers Cache-Control Set-Cookie;
+#                tcp_nodelay on;
+#                proxy_pass ${S3_PROXY_PASS};
+#        }
 }

From 41b0ca4a39cac9ded2acbff49dc7fbd8ae534bff Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Mon, 4 Dec 2023 14:17:33 +0900
Subject: [PATCH 121/174] =?UTF-8?q?CW=E6=B3=A8=E9=87=88=E5=BF=85=E9=A0=88?=
 =?UTF-8?q?=E3=81=AA=E3=81=8F=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkPostForm.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 51ec941c9798..46465c36b658 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -722,13 +722,13 @@ function deleteDraft() {
 }
 
 async function post(ev?: MouseEvent) {
-	if (useCw.value && (cw.value == null || cw.value.trim() === '')) {
-		os.alert({
-			type: 'error',
-			text: i18n.ts.cwNotationRequired,
-		});
-		return;
-	}
+	// if (useCw && (cw == null || cw.trim() === '')) {
+	// 	os.alert({
+	// 		type: 'error',
+	// 		text: i18n.ts.cwNotationRequired,
+	// 	});
+	// 	return;
+	// }
 
 	if (ev) {
 		const el = (ev.currentTarget ?? ev.target) as HTMLElement | null;

From 9ad7c10df2c0339a21f3576e94fdfbde4eaef4d6 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Mon, 4 Dec 2023 15:57:47 +0900
Subject: [PATCH 122/174] =?UTF-8?q?CW=E6=B3=A8=E9=87=88=E5=BF=85=E9=A0=88?=
 =?UTF-8?q?=E3=81=AA=E3=81=8F=E3=81=992?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/server/api/endpoints/notes/create.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts
index beb77ca7ab02..38a190f02c79 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -142,7 +142,7 @@ export const paramDef = {
 		visibleUserIds: { type: 'array', uniqueItems: true, items: {
 			type: 'string', format: 'misskey:id',
 		} },
-		cw: { type: 'string', nullable: true, minLength: 1, maxLength: 100 },
+		cw: { type: 'string', nullable: true, maxLength: 100 },
 		localOnly: { type: 'boolean', default: false },
 		reactionAcceptance: { type: 'string', nullable: true, enum: [null, 'likeOnly', 'likeOnlyForRemote', 'nonSensitiveOnly', 'nonSensitiveOnlyForLocalLikeOnlyForRemote'], default: null },
 		noExtractMentions: { type: 'boolean', default: false },

From 787527aee3aad621a4835fb96e6a96b937a40091 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Wed, 13 Dec 2023 17:37:39 +0900
Subject: [PATCH 123/174] =?UTF-8?q?Renote=E5=85=83=E3=83=8E=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E3=81=B8=E3=81=AE=E8=A9=B3=E7=B4=B0=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts                             |  4 ++++
 locales/ja-JP.yml                              |  1 +
 packages/frontend/src/scripts/get-note-menu.ts | 11 ++++++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 75e1703b4a55..edb2b4527ee6 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -2328,6 +2328,10 @@ export interface Locale extends ILocale {
      * 絵文字を選択
      */
     "chooseEmoji": string;
+		/**
+		 * リノート元詳細
+		 */
+    "renoteFromDetails": string;
     /**
      * 操作を完了できません
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 98e3cbfa417b..b9c96fe0e0e9 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -577,6 +577,7 @@ masterVolume: "マスター音量"
 notUseSound: "サウンドを出力しない"
 useSoundOnlyWhenActive: "Misskeyがアクティブな時のみサウンドを出力する"
 details: "詳細"
+renoteFromDetails: "リノート元詳細"
 chooseEmoji: "絵文字を選択"
 unableToProcess: "操作を完了できません"
 recentUsed: "最近使用"
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index 308290961d2f..fb963898547d 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -265,6 +265,10 @@ export function getNoteMenu(props: {
 		os.pageWindow(`/notes/${appearNote.id}`);
 	}
 
+	function openRenoteSource(): void {
+		os.pageWindow(`/notes/${appearNote.renote?.id}`);
+	}
+
 	async function translate(): Promise<void> {
 		if (props.translation.value != null) return;
 		props.translating.value = true;
@@ -294,7 +298,12 @@ export function getNoteMenu(props: {
 				icon: 'ti ti-info-circle',
 				text: i18n.ts.details,
 				action: openDetail,
-			}, {
+			}, ...(appearNote.renote ? [{
+				icon: 'ti ti-info-circle',
+				text: i18n.ts.renoteFromDetails,
+				action: openRenoteSource,
+			}] : []) ,
+			{
 				icon: 'ti ti-copy',
 				text: i18n.ts.copyContent,
 				action: copyContent,

From 476c5b09516949373aa35bd345a8f5feef6db0cd Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Tue, 26 Dec 2023 22:48:30 +0900
Subject: [PATCH 124/174] =?UTF-8?q?=E7=A9=BA=E6=96=87=E5=AD=97cw=E3=81=AFv?=
 =?UTF-8?q?alid=E6=89=B1=E3=81=84=E3=81=AB=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/server/api/endpoints/notes/create.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/notes/create.test.ts b/packages/backend/src/server/api/endpoints/notes/create.test.ts
index 6097f9c562e7..9b4e40636dec 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.test.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.test.ts
@@ -68,7 +68,7 @@ describe('api:notes/create', () => {
 
 			test('0 characters cw', () => {
 				expect(v({ text: 'Body', cw: '' }))
-					.toBe(INVALID);
+					.toBe(VALID);
 			});
 
 			test('reject only cw', () => {

From 0b470e75bc02f4be6558d08899caada9b8f96290 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Tue, 26 Dec 2023 23:02:47 +0900
Subject: [PATCH 125/174] fix lint

---
 packages/frontend/src/scripts/get-note-menu.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index fb963898547d..16cb41d34300 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -302,7 +302,7 @@ export function getNoteMenu(props: {
 				icon: 'ti ti-info-circle',
 				text: i18n.ts.renoteFromDetails,
 				action: openRenoteSource,
-			}] : []) ,
+			}] : []),
 			{
 				icon: 'ti ti-copy',
 				text: i18n.ts.copyContent,

From 49b0f38bc7c07f24a15dc46ddd8a96fdd6bf7438 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 29 Dec 2023 20:09:25 +0900
Subject: [PATCH 126/174] =?UTF-8?q?redis=E3=82=84postgresql=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infra/k8s/postgres/.gitignore                 |  2 +
 infra/k8s/postgres/forwarding.sh              |  1 +
 infra/k8s/postgres/pg-cluster.yaml            | 64 +++++++++++++++++++
 .../k8s/postgres/pg-user-sercret.example.yaml | 19 ++++++
 .../postgres/postgresql-network-policy.yaml   | 18 ++++++
 infra/k8s/postgres/s3-sercret.example.yaml    |  9 +++
 infra/k8s/redis/redis.yaml                    | 51 +++++++++++++++
 7 files changed, 164 insertions(+)
 create mode 100644 infra/k8s/postgres/.gitignore
 create mode 100755 infra/k8s/postgres/forwarding.sh
 create mode 100644 infra/k8s/postgres/pg-cluster.yaml
 create mode 100644 infra/k8s/postgres/pg-user-sercret.example.yaml
 create mode 100644 infra/k8s/postgres/postgresql-network-policy.yaml
 create mode 100644 infra/k8s/postgres/s3-sercret.example.yaml
 create mode 100644 infra/k8s/redis/redis.yaml

diff --git a/infra/k8s/postgres/.gitignore b/infra/k8s/postgres/.gitignore
new file mode 100644
index 000000000000..b1d9bebf23dc
--- /dev/null
+++ b/infra/k8s/postgres/.gitignore
@@ -0,0 +1,2 @@
+*sercret*
+!*.example*
diff --git a/infra/k8s/postgres/forwarding.sh b/infra/k8s/postgres/forwarding.sh
new file mode 100755
index 000000000000..f077570c0c12
--- /dev/null
+++ b/infra/k8s/postgres/forwarding.sh
@@ -0,0 +1 @@
+kubectl port-forward svc/postgres-cluster-rw 5432:5432 -n misskey
diff --git a/infra/k8s/postgres/pg-cluster.yaml b/infra/k8s/postgres/pg-cluster.yaml
new file mode 100644
index 000000000000..fe3d9078b392
--- /dev/null
+++ b/infra/k8s/postgres/pg-cluster.yaml
@@ -0,0 +1,64 @@
+# postgresql cluster
+apiVersion: postgresql.cnpg.io/v1
+kind: Cluster
+metadata:
+  name: postgres-cluster
+  namespace: misskey
+spec:
+  instances: 3 # HAクラスタのインスタンス数
+  primaryUpdateStrategy: unsupervised
+  imageName: ghcr.io/cloudnative-pg/postgresql:16.1-12
+  superuserSecret:
+    name: superuser-secret
+  storage:
+    size: "30Gi"
+  postgresql:
+    parameters:
+      max_connections: "128"
+      shared_buffers: "2GB"
+      effective_cache_size: "6GB"
+      maintenance_work_mem: "512MB"
+      checkpoint_completion_target: "0.7"
+      wal_buffers: "16MB"
+      default_statistics_target: "100"
+      random_page_cost: "1.1"
+      effective_io_concurrency: "300"
+      work_mem: "8MB"
+      min_wal_size: "1GB"
+      max_wal_size: "4GB"
+      max_worker_processes: "4"
+      max_parallel_workers_per_gather: "2"
+      max_parallel_workers: "4"
+      max_parallel_maintenance_workers: "2"
+  bootstrap:
+    initdb:
+      database: misskey
+      owner: misskey
+      secret:
+        name: pg-user-secret
+
+  backup:
+    barmanObjectStore:
+      destinationPath: "s3://na2na-postgresql-cluster-backup/backup/" # ストレージ内の階層
+      endpointURL: "https://s3.ap-northeast-1-ntt.wasabisys.com/"
+      s3Credentials:
+        accessKeyId:
+          name: s3-secret
+          key: ACCESS_KEY_ID
+        secretAccessKey:
+          name: s3-secret
+          key: ACCESS_SECRET_KEY
+      wal:
+        compression: gzip
+    retentionPolicy: "30d" # 30日で削除
+
+---
+apiVersion: postgresql.cnpg.io/v1
+kind: ScheduledBackup
+metadata:
+  name: backup
+spec:
+  schedule: "0 0 0 * * *"
+  backupOwnerReference: self
+  cluster:
+    name: postgres-cluster
diff --git a/infra/k8s/postgres/pg-user-sercret.example.yaml b/infra/k8s/postgres/pg-user-sercret.example.yaml
new file mode 100644
index 000000000000..c29c205a0364
--- /dev/null
+++ b/infra/k8s/postgres/pg-user-sercret.example.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: pg-user-secret
+  namespace: misskey
+type: Opaque
+data:
+  username: bWlzc2tleQ== # misskey
+  password: bWlzc2tleQ== # misskey
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: superuser-secret
+  namespace: misskey
+type: Opaque
+data:
+  username: cG9zdGdyZXM= # postgres
+  password: cG9zdGdyZXM= # postgres
diff --git a/infra/k8s/postgres/postgresql-network-policy.yaml b/infra/k8s/postgres/postgresql-network-policy.yaml
new file mode 100644
index 000000000000..3080db823612
--- /dev/null
+++ b/infra/k8s/postgres/postgresql-network-policy.yaml
@@ -0,0 +1,18 @@
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: postgresql-network-policy
+  namespace: misskey
+spec:
+  podSelector:
+    matchLabels:
+      app: postgres-cluster # PostgreSQLクラスタのPodに適用されるラベル
+  policyTypes:
+    - Ingress
+  ingress:
+    - from:
+        - ipBlock:
+            cidr: 192.168.3.0/24 # 許可するIP範囲
+      ports:
+        - protocol: TCP
+          port: 5432 # PostgreSQLのデフォルトポート
diff --git a/infra/k8s/postgres/s3-sercret.example.yaml b/infra/k8s/postgres/s3-sercret.example.yaml
new file mode 100644
index 000000000000..68f32a2f4190
--- /dev/null
+++ b/infra/k8s/postgres/s3-sercret.example.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: s3-secret
+  namespace: misskey
+type: Opaque
+data:
+  ACCESS_KEY_ID: "" # ベース64エンコードされたアクセスキー
+  ACCESS_SECRET_KEY: "" # ベース64エンコードされたシークレットキー
diff --git a/infra/k8s/redis/redis.yaml b/infra/k8s/redis/redis.yaml
new file mode 100644
index 000000000000..24e38453d17d
--- /dev/null
+++ b/infra/k8s/redis/redis.yaml
@@ -0,0 +1,51 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis
+  namespace: misskey
+spec:
+  selector:
+    app: redis
+  ports:
+    - name: http
+      port: 6379
+
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: misskey-redis-pvc
+  namespace: misskey
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi
+
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: redis
+  namespace: misskey
+  labels:
+    app: redis
+spec:
+  restartPolicy: Always
+  containers:
+    - name: redis
+      image: redis:7
+      volumeMounts:
+        - mountPath: /data
+          name: redis-volume
+      resources:
+        limits:
+          memory: "100Mi"
+          cpu: "250m"
+      ports:
+        - containerPort: 6379
+  volumes:
+    - name: redis-volume
+      persistentVolumeClaim:
+        claimName: misskey-redis-pvc

From a4175f28b6c016e0df1ab08093eda8fd7665bf72 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 29 Dec 2023 21:59:59 +0900
Subject: [PATCH 127/174] =?UTF-8?q?helm=E3=81=AB=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E3=81=BF=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infra/k8s/web/.gitignore                      |   1 +
 infra/k8s/web/.helmignore                     |  23 +++
 infra/k8s/web/Chart.yaml                      |   6 +
 infra/k8s/web/config.example.yaml             | 158 ++++++++++++++++++
 infra/k8s/web/templates/NOTES.txt             |  18 ++
 infra/k8s/web/templates/_helpers.tpl          |  70 ++++++++
 infra/k8s/web/templates/hpa.yaml              |  17 ++
 infra/k8s/web/templates/ingress.yaml          |  26 +++
 infra/k8s/web/templates/service.yaml          |  15 ++
 infra/k8s/web/templates/statefulset.yaml      |  37 ++++
 .../web/templates/tests/test-connection.yaml  |  15 ++
 infra/k8s/web/values.yaml                     |  35 ++++
 12 files changed, 421 insertions(+)
 create mode 100644 infra/k8s/web/.gitignore
 create mode 100644 infra/k8s/web/.helmignore
 create mode 100644 infra/k8s/web/Chart.yaml
 create mode 100644 infra/k8s/web/config.example.yaml
 create mode 100644 infra/k8s/web/templates/NOTES.txt
 create mode 100644 infra/k8s/web/templates/_helpers.tpl
 create mode 100644 infra/k8s/web/templates/hpa.yaml
 create mode 100644 infra/k8s/web/templates/ingress.yaml
 create mode 100644 infra/k8s/web/templates/service.yaml
 create mode 100644 infra/k8s/web/templates/statefulset.yaml
 create mode 100644 infra/k8s/web/templates/tests/test-connection.yaml
 create mode 100644 infra/k8s/web/values.yaml

diff --git a/infra/k8s/web/.gitignore b/infra/k8s/web/.gitignore
new file mode 100644
index 000000000000..5b6b0720c9ee
--- /dev/null
+++ b/infra/k8s/web/.gitignore
@@ -0,0 +1 @@
+config.yaml
diff --git a/infra/k8s/web/.helmignore b/infra/k8s/web/.helmignore
new file mode 100644
index 000000000000..0e8a0eb36f4c
--- /dev/null
+++ b/infra/k8s/web/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/infra/k8s/web/Chart.yaml b/infra/k8s/web/Chart.yaml
new file mode 100644
index 000000000000..fe11c32e789a
--- /dev/null
+++ b/infra/k8s/web/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: web
+description: A Helm chart for Kubernetes
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
diff --git a/infra/k8s/web/config.example.yaml b/infra/k8s/web/config.example.yaml
new file mode 100644
index 000000000000..96d9d40c537e
--- /dev/null
+++ b/infra/k8s/web/config.example.yaml
@@ -0,0 +1,158 @@
+apiVersion: v1
+data:
+  default.yml: |-
+    #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+    # Misskey configuration
+    #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+    #   ┌─────┐
+    #───┘ URL └─────────────────────────────────────────────────────
+
+    # Final accessible URL seen by a user.
+    url: https://example.na2na.dev/
+
+    # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
+    # URL SETTINGS AFTER THAT!
+
+    #   ┌───────────────────────┐
+    #───┘ Port and TLS settings └───────────────────────────────────
+
+    #
+    # Misskey requires a reverse proxy to support HTTPS connections.
+    #
+    #                 +----- https://example.tld/ ------------+
+    #   +------+      |+-------------+      +----------------+|
+    #   | User | ---> || Proxy (443) | ---> | Misskey (3000) ||
+    #   +------+      |+-------------+      +----------------+|
+    #                 +---------------------------------------+
+    #
+    #   You need to set up a reverse proxy. (e.g. nginx)
+    #   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.
+    port: 3000
+
+    #   ┌──────────────────────────┐
+    #───┘ PostgreSQL configuration └────────────────────────────────
+
+    db:
+      host: postgres-cluster-rw.misskey.svc.cluster.local
+      port: 5432
+
+      # Database name
+      db: misskey
+
+      # Auth
+      user: misskey
+      pass: misskey
+
+      # Whether disable Caching queries
+      #disableCache: true
+
+      # Extra Connection options
+      #extra:
+      #  ssl: true
+
+    #   ┌─────────────────────┐
+    #───┘ Redis configuration └─────────────────────────────────────
+
+    redis:
+      host: redis
+      port: 6379
+      #family: 0  # 0=Both, 4=IPv4, 6=IPv6
+      #pass: example-pass
+      #prefix: example-prefix
+      #db: 1
+
+    #   ┌─────────────────────────────┐
+    #───┘ Elasticsearch configuration └─────────────────────────────
+
+    #elasticsearch:
+    #  host: localhost
+    #  port: 9200
+    #  ssl: false
+    #  user:
+    #  pass:
+
+    #   ┌───────────────┐
+    #───┘ ID generation └───────────────────────────────────────────
+
+    # You can select the ID generation method.
+    # You don't usually need to change this setting, but you can
+    # change it according to your preferences.
+
+    # Available methods:
+    # aid ... Short, Millisecond accuracy
+    # meid ... Similar to ObjectID, Millisecond accuracy
+    # ulid ... Millisecond accuracy
+    # objectid ... This is left for backward compatibility
+
+    # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
+    # ID SETTINGS AFTER THAT!
+
+    id: 'aid'
+
+    #   ┌─────────────────────┐
+    #───┘ Other configuration └─────────────────────────────────────
+
+    # Whether disable HSTS
+    #disableHsts: true
+
+    # Number of worker processes
+    #clusterLimit: 1
+
+    # Job concurrency per worker
+    # deliverJobConcurrency: 128
+    # inboxJobConcurrency: 16
+
+    # Job rate limiter
+    # deliverJobPerSec: 128
+    # inboxJobPerSec: 16
+
+    # Job attempts
+    # deliverJobMaxAttempts: 12
+    # inboxJobMaxAttempts: 8
+
+    # IP address family used for outgoing request (ipv4, ipv6 or dual)
+    #outgoingAddressFamily: ipv4
+
+    # Syslog option
+    #syslog:
+    #  host: localhost
+    #  port: 514
+
+    # Proxy for HTTP/HTTPS
+    #proxy: http://127.0.0.1:3128
+
+    proxyBypassHosts:
+      - api.deepl.com
+      - api-free.deepl.com
+      - www.recaptcha.net
+      - hcaptcha.com
+      - challenges.cloudflare.com
+
+    # Proxy for SMTP/SMTPS
+    #proxySmtp: http://127.0.0.1:3128   # use HTTP/1.1 CONNECT
+    #proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4
+    #proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5
+
+    # Media Proxy
+    #mediaProxy: https://example.com/proxy
+
+    # Proxy remote files (default: false)
+    #proxyRemoteFiles: true
+
+    # Sign to ActivityPub GET request (default: true)
+    signToActivityPubGet: true
+
+    #allowedPrivateNetworks: [
+    #  '127.0.0.1/32'
+    #]
+
+    # Upload or download file size limits (bytes)
+    maxFileSize: 5000000000
+
+kind: ConfigMap
+metadata:
+  name: misskey-default-config
diff --git a/infra/k8s/web/templates/NOTES.txt b/infra/k8s/web/templates/NOTES.txt
new file mode 100644
index 000000000000..cbd3bd2b7b90
--- /dev/null
+++ b/infra/k8s/web/templates/NOTES.txt
@@ -0,0 +1,18 @@
+{{- if .Values.ingress.enabled }}
+
+1. Misskeyがデプロイされました。以下のURLでアクセスできます:
+
+	https://{{ index .Values.ingress.hosts 0 "host" }}/
+
+2. テストを実行してサービスの接続を確認します:
+
+  helm test {{ .Release.Name }}
+
+{{- else }}
+
+Misskeyがデプロイされました。クラスター内から以下のコマンドを使用してアクセスします:
+
+  POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "web.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME {{ .Values.service.port }}:3000
+
+{{- end }}
diff --git a/infra/k8s/web/templates/_helpers.tpl b/infra/k8s/web/templates/_helpers.tpl
new file mode 100644
index 000000000000..6df8264fd3b7
--- /dev/null
+++ b/infra/k8s/web/templates/_helpers.tpl
@@ -0,0 +1,70 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "web.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "web.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- define "web.serviceName" -}}
+{{- if .Values.service.name }}
+{{- .Values.service.name }}
+{{- else }}
+{{- default (include "web.fullname" .) .Values.service.nameSuffix }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "web.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "web.labels" -}}
+helm.sh/chart: {{ include "web.chart" . }}
+{{ include "web.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "web.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "web.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "web.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "web.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/infra/k8s/web/templates/hpa.yaml b/infra/k8s/web/templates/hpa.yaml
new file mode 100644
index 000000000000..c456723ab013
--- /dev/null
+++ b/infra/k8s/web/templates/hpa.yaml
@@ -0,0 +1,17 @@
+{{- if .Values.hpa.enabled -}}
+apiVersion: autoscaling/v1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "web.fullname" . }}
+  labels:
+    {{- include "web.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: StatefulSet
+    name: {{ include "web.fullname" . }}
+  minReplicas: {{ .Values.hpa.minReplicas }}
+  maxReplicas: {{ .Values.hpa.maxReplicas }}
+  targetCPUUtilizationPercentage: {{ .Values.hpa.targetCPUUtilizationPercentage }}
+  # targetMemoryUtilizationPercentage: {{ .Values.hpa.targetMemoryUtilizationPercentage }} # 必要に応じてコメントアウトを解除
+{{- end }}
diff --git a/infra/k8s/web/templates/ingress.yaml b/infra/k8s/web/templates/ingress.yaml
new file mode 100644
index 000000000000..4e30d8705f90
--- /dev/null
+++ b/infra/k8s/web/templates/ingress.yaml
@@ -0,0 +1,26 @@
+{{- if .Values.ingress.enabled -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "web.fullname" . }}
+  labels:
+    {{- include "web.labels" . | nindent 4 }}
+  annotations:
+    {{- toYaml .Values.ingress.annotations | nindent 4 }}
+spec:
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ . }}
+            pathType: Prefix
+            backend:
+              service:
+                name: web-svc
+                port:
+                  number: {{ $.Values.service.port }}
+          {{- end }}
+    {{- end }}
+{{- end }}
diff --git a/infra/k8s/web/templates/service.yaml b/infra/k8s/web/templates/service.yaml
new file mode 100644
index 000000000000..7d6fde7e51e7
--- /dev/null
+++ b/infra/k8s/web/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: web-svc
+  labels:
+    {{- include "web.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: 3000
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "web.selectorLabels" . | nindent 4 }}
diff --git a/infra/k8s/web/templates/statefulset.yaml b/infra/k8s/web/templates/statefulset.yaml
new file mode 100644
index 000000000000..be69f3004ff3
--- /dev/null
+++ b/infra/k8s/web/templates/statefulset.yaml
@@ -0,0 +1,37 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: {{ include "web.fullname" . }}
+  labels:
+    {{- include "web.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "web.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "web.selectorLabels" . | nindent 8 }}
+    spec:
+      containers:
+        - name: web
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - containerPort: 3000
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http
+          volumeMounts:
+            - name: config
+              mountPath: /etc/config
+      volumes:
+        - name: config
+          configMap:
+            name: {{ include "web.fullname" . }}-config
diff --git a/infra/k8s/web/templates/tests/test-connection.yaml b/infra/k8s/web/templates/tests/test-connection.yaml
new file mode 100644
index 000000000000..f36083416f53
--- /dev/null
+++ b/infra/k8s/web/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "web.fullname" . }}-test-connection"
+  labels:
+    {{- include "web.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args: ['{{ include "web.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never
diff --git a/infra/k8s/web/values.yaml b/infra/k8s/web/values.yaml
new file mode 100644
index 000000000000..04d094ee8973
--- /dev/null
+++ b/infra/k8s/web/values.yaml
@@ -0,0 +1,35 @@
+replicaCount: 2
+
+image:
+  repository: na2na/misskey-na2na
+  tag: "2023.11.1-na2na-v4"
+  pullPolicy: Always
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: true
+  annotations:
+    nginx.ingress.kubernetes.io/proxy-body-size: "200m"
+  hosts:
+    - host: example.na2na.dev
+      paths:
+        - /
+
+resources: {}
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+# HPAの設定
+hpa:
+  enabled: true
+  minReplicas: 1
+  maxReplicas: 3
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80 # 必要に応じてコメントアウトを解除

From 290fb0c55ec354296a5f7d73831c05d4f115d623 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Fri, 29 Dec 2023 22:14:32 +0900
Subject: [PATCH 128/174] fix

---
 infra/k8s/web/templates/NOTES.txt        | 18 ----------------
 infra/k8s/web/templates/ingress.yaml     | 26 ------------------------
 infra/k8s/web/templates/service.yaml     | 16 ++++++++-------
 infra/k8s/web/templates/statefulset.yaml | 14 +++++--------
 infra/k8s/web/values.yaml                | 14 +++----------
 5 files changed, 17 insertions(+), 71 deletions(-)
 delete mode 100644 infra/k8s/web/templates/ingress.yaml

diff --git a/infra/k8s/web/templates/NOTES.txt b/infra/k8s/web/templates/NOTES.txt
index cbd3bd2b7b90..e69de29bb2d1 100644
--- a/infra/k8s/web/templates/NOTES.txt
+++ b/infra/k8s/web/templates/NOTES.txt
@@ -1,18 +0,0 @@
-{{- if .Values.ingress.enabled }}
-
-1. Misskeyがデプロイされました。以下のURLでアクセスできます:
-
-	https://{{ index .Values.ingress.hosts 0 "host" }}/
-
-2. テストを実行してサービスの接続を確認します:
-
-  helm test {{ .Release.Name }}
-
-{{- else }}
-
-Misskeyがデプロイされました。クラスター内から以下のコマンドを使用してアクセスします:
-
-  POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "web.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME {{ .Values.service.port }}:3000
-
-{{- end }}
diff --git a/infra/k8s/web/templates/ingress.yaml b/infra/k8s/web/templates/ingress.yaml
deleted file mode 100644
index 4e30d8705f90..000000000000
--- a/infra/k8s/web/templates/ingress.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ include "web.fullname" . }}
-  labels:
-    {{- include "web.labels" . | nindent 4 }}
-  annotations:
-    {{- toYaml .Values.ingress.annotations | nindent 4 }}
-spec:
-  rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ . }}
-            pathType: Prefix
-            backend:
-              service:
-                name: web-svc
-                port:
-                  number: {{ $.Values.service.port }}
-          {{- end }}
-    {{- end }}
-{{- end }}
diff --git a/infra/k8s/web/templates/service.yaml b/infra/k8s/web/templates/service.yaml
index 7d6fde7e51e7..3260ce98f192 100644
--- a/infra/k8s/web/templates/service.yaml
+++ b/infra/k8s/web/templates/service.yaml
@@ -1,15 +1,17 @@
+{{- if eq .Values.service.type "NodePort" }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: web-svc
+  name: {{ include "web.fullname" . }}
   labels:
     {{- include "web.labels" . | nindent 4 }}
 spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: 3000
-      protocol: TCP
-      name: http
+  type: NodePort
   selector:
     {{- include "web.selectorLabels" . | nindent 4 }}
+  ports:
+    - name: http
+      port: {{ .Values.service.port }}
+      targetPort: {{ .Values.service.port }}
+      nodePort: {{ .Values.service.nodePort }}
+{{- end }}
diff --git a/infra/k8s/web/templates/statefulset.yaml b/infra/k8s/web/templates/statefulset.yaml
index be69f3004ff3..2101fa7eed83 100644
--- a/infra/k8s/web/templates/statefulset.yaml
+++ b/infra/k8s/web/templates/statefulset.yaml
@@ -20,18 +20,14 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 3000
-          livenessProbe:
-            httpGet:
-              path: /
-              port: http
           readinessProbe:
             httpGet:
               path: /
-              port: http
+              port: 3000
           volumeMounts:
-            - name: config
-              mountPath: /etc/config
+          - mountPath: /misskey/.config
+            name: misskey-default-conf-file
       volumes:
-        - name: config
+        - name: misskey-default-conf-file
           configMap:
-            name: {{ include "web.fullname" . }}-config
+            name: misskey-default-config
diff --git a/infra/k8s/web/values.yaml b/infra/k8s/web/values.yaml
index 04d094ee8973..6ecafce0f3ce 100644
--- a/infra/k8s/web/values.yaml
+++ b/infra/k8s/web/values.yaml
@@ -6,17 +6,9 @@ image:
   pullPolicy: Always
 
 service:
-  type: ClusterIP
-  port: 80
-
-ingress:
-  enabled: true
-  annotations:
-    nginx.ingress.kubernetes.io/proxy-body-size: "200m"
-  hosts:
-    - host: example.na2na.dev
-      paths:
-        - /
+  type: NodePort
+  port: 3000
+  nodePort: 30000
 
 resources: {}
 

From d1e9deec5031bec0e9baa580da260e9f27744af0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 12 Jan 2024 16:33:30 +0000
Subject: [PATCH 129/174] Update redis Docker tag to v7.2.4

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index 867612b12da4..0b011b18bd53 100644
--- a/compose.yml
+++ b/compose.yml
@@ -22,7 +22,7 @@ services:
 
   redis:
     restart: always
-    image: redis:7.2.3-alpine
+    image: redis:7.2.4-alpine
     networks:
       - internal_network
     volumes:

From cf60e75d86db0b39d8996befbc9bfadd536a7ace Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 12 Jan 2024 16:49:24 +0000
Subject: [PATCH 130/174] Update dependency node to v20.11.0

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 9bf3213a7f4c..7b429a0347aa 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 20.10.0
+nodejs 20.11.0
 pnpm 8.11.0

From 9a78a10f057a3a61f5cd31d271a3b976d9cbbcef Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 12 Jan 2024 17:21:50 +0000
Subject: [PATCH 131/174] Update dependency pnpm to v8.14.1

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 7b429a0347aa..ef9791fbe925 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 20.11.0
-pnpm 8.11.0
+pnpm 8.14.1

From 4d07a6cae90fbf6733432b638d5d61a79decf26a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 17 Jan 2024 17:26:59 +0000
Subject: [PATCH 132/174] Update actions/cache action to v4

---
 .github/workflows/image-push-for-misskey-na2na-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/image-push-for-misskey-na2na-release.yml b/.github/workflows/image-push-for-misskey-na2na-release.yml
index 8687ad22a025..9a632c9f53b3 100644
--- a/.github/workflows/image-push-for-misskey-na2na-release.yml
+++ b/.github/workflows/image-push-for-misskey-na2na-release.yml
@@ -25,7 +25,7 @@ jobs:
         run: |
           echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
       - name: Cache Docker Build Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: docker-build-cache-${{ github.ref }}-${{ github.sha }}

From 23692991ad29bab49b769d1aa2aa31ac03a9d8e3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Feb 2024 23:02:02 +0000
Subject: [PATCH 133/174] Update nginx Docker tag to v1.25.4

---
 infra/nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/nginx/Dockerfile b/infra/nginx/Dockerfile
index 843c00f89c33..667176deed13 100644
--- a/infra/nginx/Dockerfile
+++ b/infra/nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.25.3
+FROM nginx:1.25.4
 
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \

From 76291822e9d64a4f672518dfb45ee05add49f40f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 00:07:18 +0000
Subject: [PATCH 134/174] Update dependency node to v20.11.1

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index ef9791fbe925..42492ae73fe0 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 20.11.0
+nodejs 20.11.1
 pnpm 8.14.1

From 16b3a4e212358a8a6cfae4e66c771be429003d81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Sun, 18 Feb 2024 03:47:17 +0900
Subject: [PATCH 135/174] =?UTF-8?q?spec(backend/NoteCreateService):=20?=
 =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=AB=E3=83=A6=E3=83=BC=E3=82=B6?=
 =?UTF-8?q?=E3=83=BC=E3=81=8C=E3=81=BE=E3=81=A0=E8=AA=B0=E3=82=82=E3=83=95?=
 =?UTF-8?q?=E3=82=A9=E3=83=AD=E3=83=BC=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=83=AA=E3=83=A2=E3=83=BC=E3=83=88=E3=83=A6=E3=83=BC?=
 =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=81=AB=E3=82=88=E3=82=8B=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E3=82=92=E5=BC=95=E3=81=8D=E8=B5=B7=E3=81=93=E3=81=99=E5=8F=AF?=
 =?UTF-8?q?=E8=83=BD=E6=80=A7=E3=81=AE=E3=81=82=E3=82=8B=E6=8A=95=E7=A8=BF?=
 =?UTF-8?q?=E3=82=92=E6=8B=92=E5=90=A6=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=20(MisskeyIO#462)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cherry-picked from 738b4d69701a9d4b232f6a44b340782d096b182b, 1b3adcc2bbc695a0f28f5865a6705e0e59830962, 33cb50761ec12fc0df0e6f99ba97e0d5d4e580fc, a27af00e23a5283e357de1e6bf2a47ebefaa77c2, 5c6236bb0f1fde9140e331c9e1390bb5fccd4f9a

Co-authored-by: Ebise Lutica <7106976+EbiseLutica@users.noreply.github.com>
---
 packages/backend/src/core/NoteCreateService.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 1d8d2483228a..269f743d5cbe 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -366,6 +366,15 @@ export class NoteCreateService implements OnApplicationShutdown {
 
 		// if the host is media-silenced, custom emojis are not allowed
 		if (this.utilityService.isMediaSilencedHost(meta.mediaSilencedHosts, user.host)) emojis = [];
+		const willCauseNotification = mentionedUsers.filter(u => u.host === null).length > 0 || data.reply?.userHost === null || data.renote?.userHost === null;
+
+		if (process.env.MISSKEY_BLOCK_MENTIONS_FROM_UNFAMILIAR_REMOTE_USERS === 'true' && user.host !== null && willCauseNotification) {
+			const userEntity = await this.usersRepository.findOneBy({ id: user.id });
+			if ((userEntity?.followersCount ?? 0) === 0) {
+				this.logger.error('Request rejected because user has no local followers', { user: user.id, note: data });
+				throw new IdentifiableError('e11b3a16-f543-4885-8eb1-66cad131dbfd', 'Notes including mentions, replies, or renotes from remote users are not allowed until user has at least one local follower.');
+			}
+		}
 
 		tags = tags.filter(tag => Array.from(tag).length <= 128).splice(0, 32);
 

From 02f42d7e8ab45c63de5440f071fe2207691d4a00 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sun, 18 Feb 2024 11:51:08 +0900
Subject: [PATCH 136/174] =?UTF-8?q?=E3=83=AD=E3=82=AE=E3=83=B3=E3=82=B0?=
 =?UTF-8?q?=E5=91=A8=E3=82=8A=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/NoteCreateService.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 269f743d5cbe..7e176efa61a5 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -371,8 +371,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		if (process.env.MISSKEY_BLOCK_MENTIONS_FROM_UNFAMILIAR_REMOTE_USERS === 'true' && user.host !== null && willCauseNotification) {
 			const userEntity = await this.usersRepository.findOneBy({ id: user.id });
 			if ((userEntity?.followersCount ?? 0) === 0) {
-				this.logger.error('Request rejected because user has no local followers', { user: user.id, note: data });
-				throw new IdentifiableError('e11b3a16-f543-4885-8eb1-66cad131dbfd', 'Notes including mentions, replies, or renotes from remote users are not allowed until user has at least one local follower.');
+				throw new Error('Temporarily, notes including mentions, replies and renotes to local-user from remote users which is not followed by local-users are not allowed');
 			}
 		}
 

From 876fb9ed0b596179d2800c54866b6ff4e2c62e35 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sun, 18 Feb 2024 11:57:30 +0900
Subject: [PATCH 137/174] =?UTF-8?q?=E5=BC=BE=E3=81=8F=E5=BC=BE=E3=81=8B?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=AE=E6=8C=99=E5=8B=95=E6=B1=BA=E5=AE=9A?=
 =?UTF-8?q?=E3=82=92default.yml=E3=81=AB=E3=82=84=E3=82=89=E3=81=9B?=
 =?UTF-8?q?=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .config/example.yml                            | 4 ++++
 packages/backend/src/config.ts                 | 3 +++
 packages/backend/src/core/NoteCreateService.ts | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.config/example.yml b/.config/example.yml
index b11cbd137328..fe9bb3266d3e 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -297,3 +297,7 @@ signToActivityPubGet: true
 
 # PID File of master process
 #pidFile: /tmp/misskey.pid
+
+# ローカル宛てのメンション、リプライ、引用ノートの発行元が、ローカルユーザーにフォローされていない場合に投稿を拒否するかどうか
+# default: false
+# misskeyBlockMentionsFromUnfamiliarRemoteUsers: false
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index 3e5a1e81cd70..b100b109d6cc 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -96,6 +96,7 @@ type Source = {
 	perUserNotificationsMaxCount?: number;
 	deactivateAntennaThreshold?: number;
 	pidFile: string;
+	misskeyBlockMentionsFromUnfamiliarRemoteUsers?: boolean;
 };
 
 export type Config = {
@@ -175,6 +176,7 @@ export type Config = {
 	perUserNotificationsMaxCount: number;
 	deactivateAntennaThreshold: number;
 	pidFile: string;
+	misskeyBlockMentionsFromUnfamiliarRemoteUsers: boolean;
 };
 
 const _filename = fileURLToPath(import.meta.url);
@@ -276,6 +278,7 @@ export function loadConfig(): Config {
 		perUserNotificationsMaxCount: config.perUserNotificationsMaxCount ?? 500,
 		deactivateAntennaThreshold: config.deactivateAntennaThreshold ?? (1000 * 60 * 60 * 24 * 7),
 		pidFile: config.pidFile,
+		misskeyBlockMentionsFromUnfamiliarRemoteUsers: config.misskeyBlockMentionsFromUnfamiliarRemoteUsers ?? false,
 	};
 }
 
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 7e176efa61a5..85dad0f20c16 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -368,7 +368,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		if (this.utilityService.isMediaSilencedHost(meta.mediaSilencedHosts, user.host)) emojis = [];
 		const willCauseNotification = mentionedUsers.filter(u => u.host === null).length > 0 || data.reply?.userHost === null || data.renote?.userHost === null;
 
-		if (process.env.MISSKEY_BLOCK_MENTIONS_FROM_UNFAMILIAR_REMOTE_USERS === 'true' && user.host !== null && willCauseNotification) {
+		if (this.config.misskeyBlockMentionsFromUnfamiliarRemoteUsers === true && user.host !== null && willCauseNotification) {
 			const userEntity = await this.usersRepository.findOneBy({ id: user.id });
 			if ((userEntity?.followersCount ?? 0) === 0) {
 				throw new Error('Temporarily, notes including mentions, replies and renotes to local-user from remote users which is not followed by local-users are not allowed');

From 2daec7324792e9ff7f8bfbc7104d6e985b6effe3 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Sun, 18 Feb 2024 15:04:12 +0900
Subject: [PATCH 138/174] =?UTF-8?q?docker=5Fexample=E3=81=AB=E3=82=82?=
 =?UTF-8?q?=E5=A2=97=E3=82=84=E3=81=97=E3=81=9Fconfig=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=8A=E3=81=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .config/docker_example.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.config/docker_example.yml b/.config/docker_example.yml
index d347882d1a91..4eb63048fe32 100644
--- a/.config/docker_example.yml
+++ b/.config/docker_example.yml
@@ -211,3 +211,7 @@ signToActivityPubGet: true
 
 # Upload or download file size limits (bytes)
 #maxFileSize: 262144000
+
+# ローカル宛てのメンション、リプライ、引用ノートの発行元が、ローカルユーザーにフォローされていない場合に投稿を拒否するかどうか
+# default: false
+# misskeyBlockMentionsFromUnfamiliarRemoteUsers: false

From 8ee668395f706b27af682100da9d4069bfa29db5 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Wed, 13 Mar 2024 11:15:46 +0900
Subject: [PATCH 139/174] =?UTF-8?q?=E8=AA=B0=E3=82=82db=E4=BD=BF=E3=82=8F?=
 =?UTF-8?q?=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7?=
 =?UTF-8?q?=E6=AD=A2=E3=82=81=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose.yml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/compose.yml b/compose.yml
index 0b011b18bd53..e83569489ade 100644
--- a/compose.yml
+++ b/compose.yml
@@ -5,14 +5,14 @@ services:
     restart: always
     links:
       - redis
-      - db
+      # - db
       # - meilisearch
       # - es
     depends_on:
       redis:
         condition: service_healthy
-      db:
-        condition: service_healthy
+      # db:
+      #   condition: service_healthy
     networks:
       - internal_network
       - external_network
@@ -32,20 +32,20 @@ services:
       interval: 5s
       retries: 20
 
-  db:
-    restart: always
-    image: postgres:15.3-bullseye
-    networks:
-      - internal_network
-    env_file:
-      - .config/docker.env
-    volumes:
-      - postgres:/var/lib/postgresql/data
-      - ./db:/misskey-na2na-db
-    healthcheck:
-      test: "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"
-      interval: 5s
-      retries: 20
+  # db:
+  #   restart: always
+  #   image: postgres:15.3-bullseye
+  #   networks:
+  #     - internal_network
+  #   env_file:
+  #     - .config/docker.env
+  #   volumes:
+  #     - postgres:/var/lib/postgresql/data
+  #     - ./db:/misskey-na2na-db
+  #   healthcheck:
+  #     test: "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"
+  #     interval: 5s
+  #     retries: 20
 
   # meilisearch:
   #   restart: always
@@ -119,6 +119,6 @@ networks:
   external_network:
 
 volumes:
-  postgres:
+  # postgres:
   redis:
   # meili_data:

From 5aef0b4d736c25bbdd413f51fbe8c822e8d9b116 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Mon, 18 Mar 2024 17:54:48 +0900
Subject: [PATCH 140/174] =?UTF-8?q?chart=E5=86=85=E3=81=AB=E6=98=87?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infra/k8s/web/.gitignore                  |  2 +-
 infra/k8s/web/{ => templates}/config.yaml | 15 +++++++++------
 infra/k8s/web/values.yaml                 |  8 ++++++++
 3 files changed, 18 insertions(+), 7 deletions(-)
 rename infra/k8s/web/{ => templates}/config.yaml (94%)

diff --git a/infra/k8s/web/.gitignore b/infra/k8s/web/.gitignore
index 5b6b0720c9ee..733c65dc319e 100644
--- a/infra/k8s/web/.gitignore
+++ b/infra/k8s/web/.gitignore
@@ -1 +1 @@
-config.yaml
+./config.yaml
diff --git a/infra/k8s/web/config.yaml b/infra/k8s/web/templates/config.yaml
similarity index 94%
rename from infra/k8s/web/config.yaml
rename to infra/k8s/web/templates/config.yaml
index 988f7a87c48f..4da7325f31c1 100644
--- a/infra/k8s/web/config.yaml
+++ b/infra/k8s/web/templates/config.yaml
@@ -9,7 +9,7 @@ data:
     #───┘ URL └─────────────────────────────────────────────────────
 
     # Final accessible URL seen by a user.
-    url: https://mk8stest.na2na.dev/
+    url: {{ .Values.service.host }}
 
     # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
     # URL SETTINGS AFTER THAT!
@@ -37,15 +37,15 @@ data:
     #───┘ PostgreSQL configuration └────────────────────────────────
 
     db:
-      host: postgres-cluster-rw.misskey.svc.cluster.local
-      port: 5432
+      host: {{ .Values.database.host }}
+      port: {{ .Values.database.port }}
 
       # Database name
-      db: misskey
+      db: {{ .Values.database.db }}
 
       # Auth
-      user: misskey
-      pass: misskey
+      user: {{ .Values.database.user }}
+      pass: {{ .Values.database.pass }}
 
       # Whether disable Caching queries
       #disableCache: true
@@ -152,6 +152,9 @@ data:
 
     # Upload or download file size limits (bytes)
     maxFileSize: 5000000000
+    # default: false
+    misskeyBlockMentionsFromUnfamiliarRemoteUsers: true
+
 
 kind: ConfigMap
 metadata:
diff --git a/infra/k8s/web/values.yaml b/infra/k8s/web/values.yaml
index 6ecafce0f3ce..ac209bc31fa7 100644
--- a/infra/k8s/web/values.yaml
+++ b/infra/k8s/web/values.yaml
@@ -5,7 +5,15 @@ image:
   tag: "2023.11.1-na2na-v4"
   pullPolicy: Always
 
+database:
+  host: "hoge.local"
+  port: 5432
+  db: "misskey"
+  user: "misskey"
+  pass: "misskey"
+
 service:
+  host: "https://mk8stest.na2na.dev/"
   type: NodePort
   port: 3000
   nodePort: 30000

From e8e1526f5dde14d2f41cdabe612d733872a5d159 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Mon, 18 Mar 2024 18:03:29 +0900
Subject: [PATCH 141/174] =?UTF-8?q?serviceName=E5=85=A5=E3=82=8C=E3=81=A6?=
 =?UTF-8?q?=E3=81=BF=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infra/k8s/web/templates/statefulset.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/infra/k8s/web/templates/statefulset.yaml b/infra/k8s/web/templates/statefulset.yaml
index 2101fa7eed83..fe666cf3b158 100644
--- a/infra/k8s/web/templates/statefulset.yaml
+++ b/infra/k8s/web/templates/statefulset.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
     {{- include "web.labels" . | nindent 4 }}
 spec:
+  serviceName: "web"
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:

From 81d54f8154cc2ea4928ef0346c1fa1c512dcb7f4 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Mon, 18 Mar 2024 23:50:48 +0900
Subject: [PATCH 142/174] =?UTF-8?q?=E3=82=A2=E3=83=BC=E3=82=AD=E3=83=86?=
 =?UTF-8?q?=E3=82=AF=E3=83=81=E3=83=A3=E3=81=AB=E3=82=88=E3=82=89=E3=81=9A?=
 =?UTF-8?q?libjemalloc=E3=82=92=E5=88=A9=E7=94=A8=E3=81=A7=E3=81=8D?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 85e0d06b398e..9772b5174a45 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -98,7 +98,8 @@ COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/bui
 COPY --chown=misskey:misskey --from=native-builder /misskey/fluent-emojis /misskey/fluent-emojis
 COPY --chown=misskey:misskey . ./
 
-ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2
+RUN ln -s /usr/lib/*-linux-gnu/libjemalloc.so.2 /usr/lib/libjemalloc.so.2
+ENV LD_PRELOAD=/usr/lib/libjemalloc.so.2
 ENV NODE_ENV=production
 HEALTHCHECK --interval=5s --retries=20 CMD ["/bin/bash", "/misskey/healthcheck.sh"]
 ENTRYPOINT ["/usr/bin/tini", "--"]

From 849364d20d49c88c181463a82ba8718be8521f50 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Tue, 19 Mar 2024 00:01:41 +0900
Subject: [PATCH 143/174] fix

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9772b5174a45..94d1c4c3ecd4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -70,6 +70,7 @@ ARG GID="991"
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \
 	ffmpeg tini curl libjemalloc-dev libjemalloc2 \
+	&& ln -s /usr/lib/$(uname -m)-linux-gnu/libjemalloc.so.2 /usr/local/lib/libjemalloc.so \
 	&& corepack enable \
 	&& groupadd -g "${GID}" misskey \
 	&& useradd -l -u "${UID}" -g "${GID}" -m -d /misskey misskey \
@@ -98,8 +99,7 @@ COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/bui
 COPY --chown=misskey:misskey --from=native-builder /misskey/fluent-emojis /misskey/fluent-emojis
 COPY --chown=misskey:misskey . ./
 
-RUN ln -s /usr/lib/*-linux-gnu/libjemalloc.so.2 /usr/lib/libjemalloc.so.2
-ENV LD_PRELOAD=/usr/lib/libjemalloc.so.2
+ENV LD_PRELOAD=/usr/local/lib/libjemalloc.so
 ENV NODE_ENV=production
 HEALTHCHECK --interval=5s --retries=20 CMD ["/bin/bash", "/misskey/healthcheck.sh"]
 ENTRYPOINT ["/usr/bin/tini", "--"]

From 76a132c0d0de4be3e45cf9b5328961b558e7b8fc Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Tue, 19 Mar 2024 00:38:34 +0900
Subject: [PATCH 144/174] =?UTF-8?q?ssl=E3=81=BE=E3=82=8F=E3=82=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .config/example.yml                 | 5 +++--
 infra/k8s/web/templates/config.yaml | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.config/example.yml b/.config/example.yml
index fe9bb3266d3e..d465ec6d46f2 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -109,8 +109,9 @@ db:
   #disableCache: true
 
   # Extra Connection options
-  #extra:
-  #  ssl: true
+  # extra:
+  #   ssl:
+  #     rejectUnauthorized: false
 
 dbReplications: false
 
diff --git a/infra/k8s/web/templates/config.yaml b/infra/k8s/web/templates/config.yaml
index 4da7325f31c1..52cf30d0e0da 100644
--- a/infra/k8s/web/templates/config.yaml
+++ b/infra/k8s/web/templates/config.yaml
@@ -51,8 +51,9 @@ data:
       #disableCache: true
 
       # Extra Connection options
-      #extra:
-      #  ssl: true
+      extra:
+        ssl:
+          rejectUnauthorized: false
 
     #   ┌─────────────────────┐
     #───┘ Redis configuration └─────────────────────────────────────

From 909e13e85d8e58179071b32226246244fff01911 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Tue, 19 Mar 2024 00:58:14 +0900
Subject: [PATCH 145/174] =?UTF-8?q?Redis=E3=81=AA=E3=81=8A=E3=81=97?=
 =?UTF-8?q?=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infra/k8s/web/templates/config.yaml | 4 ++--
 infra/k8s/web/values.yaml           | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/infra/k8s/web/templates/config.yaml b/infra/k8s/web/templates/config.yaml
index 52cf30d0e0da..029c24d22b18 100644
--- a/infra/k8s/web/templates/config.yaml
+++ b/infra/k8s/web/templates/config.yaml
@@ -59,8 +59,8 @@ data:
     #───┘ Redis configuration └─────────────────────────────────────
 
     redis:
-      host: redis
-      port: 6379
+      host: {{ .Values.redis.host }}
+      port: {{ .Values.redis.port }}
       #family: 0  # 0=Both, 4=IPv4, 6=IPv6
       #pass: example-pass
       #prefix: example-prefix
diff --git a/infra/k8s/web/values.yaml b/infra/k8s/web/values.yaml
index ac209bc31fa7..178b95a30005 100644
--- a/infra/k8s/web/values.yaml
+++ b/infra/k8s/web/values.yaml
@@ -12,6 +12,10 @@ database:
   user: "misskey"
   pass: "misskey"
 
+redis:
+  host: "localhost"
+  port: 6379
+
 service:
   host: "https://mk8stest.na2na.dev/"
   type: NodePort

From 90a4e841ad4740c8add3d0602d9f02c0859902b5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 17 Apr 2024 19:00:20 +0000
Subject: [PATCH 146/174] chore(deps): update nginx docker tag to v1.25.5

---
 infra/nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/nginx/Dockerfile b/infra/nginx/Dockerfile
index 667176deed13..3a60ff2fae91 100644
--- a/infra/nginx/Dockerfile
+++ b/infra/nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.25.4
+FROM nginx:1.25.5
 
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \

From 812c9a9b333771c80615fe65e3e2b1e54ab8fa67 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Mon, 10 Jun 2024 00:42:21 +0900
Subject: [PATCH 147/174] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=95=E3=83=A9?=
 =?UTF-8?q?=E3=81=93=E3=81=AD=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{statefulset.yaml => deployment.yaml}     | 21 ++++++++++++---
 infra/k8s/web/templates/hpa.yaml              | 26 ++++++++++++++++---
 infra/k8s/web/values.yaml                     | 21 ++++++++++-----
 3 files changed, 53 insertions(+), 15 deletions(-)
 rename infra/k8s/web/templates/{statefulset.yaml => deployment.yaml} (57%)

diff --git a/infra/k8s/web/templates/statefulset.yaml b/infra/k8s/web/templates/deployment.yaml
similarity index 57%
rename from infra/k8s/web/templates/statefulset.yaml
rename to infra/k8s/web/templates/deployment.yaml
index fe666cf3b158..98e7c659962a 100644
--- a/infra/k8s/web/templates/statefulset.yaml
+++ b/infra/k8s/web/templates/deployment.yaml
@@ -1,12 +1,12 @@
 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
   name: {{ include "web.fullname" . }}
   labels:
     {{- include "web.labels" . | nindent 4 }}
 spec:
-  serviceName: "web"
-  replicas: {{ .Values.replicaCount }}
+  strategy:
+    type: Recreate
   selector:
     matchLabels:
       {{- include "web.selectorLabels" . | nindent 6 }}
@@ -23,8 +23,21 @@ spec:
             - containerPort: 3000
           readinessProbe:
             httpGet:
-              path: /
+              path: /healthz
               port: 3000
+          livenessProbe:
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            httpGet:
+              path: /healthz
+              port: 3000
+          resources:
+            requests:
+              cpu: {{ .Values.resources.requests.cpu }}
+              memory: {{ .Values.resources.requests.memory }}
+            limits:
+              cpu: {{ .Values.resources.limits.cpu }}
+              memory: {{ .Values.resources.limits.memory }}
           volumeMounts:
           - mountPath: /misskey/.config
             name: misskey-default-conf-file
diff --git a/infra/k8s/web/templates/hpa.yaml b/infra/k8s/web/templates/hpa.yaml
index c456723ab013..9e40641e8031 100644
--- a/infra/k8s/web/templates/hpa.yaml
+++ b/infra/k8s/web/templates/hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.hpa.enabled -}}
-apiVersion: autoscaling/v1
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "web.fullname" . }}
@@ -8,10 +8,28 @@ metadata:
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
-    kind: StatefulSet
+    kind: Deployment
     name: {{ include "web.fullname" . }}
   minReplicas: {{ .Values.hpa.minReplicas }}
   maxReplicas: {{ .Values.hpa.maxReplicas }}
-  targetCPUUtilizationPercentage: {{ .Values.hpa.targetCPUUtilizationPercentage }}
-  # targetMemoryUtilizationPercentage: {{ .Values.hpa.targetMemoryUtilizationPercentage }} # 必要に応じてコメントアウトを解除
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.hpa.targetCPUUtilizationPercentage }}
+  behavior:
+    scaleUp:
+      policies:
+        - type: Pods
+          value: 2
+          periodSeconds: 60
+      stabilizationWindowSeconds: 300
+    scaleDown:
+      policies:
+        - type: Pods
+          value: 2
+          periodSeconds: 60
+      stabilizationWindowSeconds: 300
 {{- end }}
diff --git a/infra/k8s/web/values.yaml b/infra/k8s/web/values.yaml
index 178b95a30005..aac40205e9f6 100644
--- a/infra/k8s/web/values.yaml
+++ b/infra/k8s/web/values.yaml
@@ -1,5 +1,3 @@
-replicaCount: 2
-
 image:
   repository: na2na/misskey-na2na
   tag: "2023.11.1-na2na-v4"
@@ -22,8 +20,6 @@ service:
   port: 3000
   nodePort: 30000
 
-resources: {}
-
 nodeSelector: {}
 
 tolerations: []
@@ -33,7 +29,18 @@ affinity: {}
 # HPAの設定
 hpa:
   enabled: true
-  minReplicas: 1
-  maxReplicas: 3
+  minReplicas: 2
+  maxReplicas: 5
   targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80 # 必要に応じてコメントアウトを解除
+
+resources:
+  requests:
+    cpu: 200m
+    memory: 1Gi
+  limits:
+    cpu: 1024m
+    memory: 2Gi
+
+livenessProbe:
+  initialDelaySeconds: 60
+  periodSeconds: 10

From 29aea3fc570dc2993a8ca6b05569ea743e80717d Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Mon, 10 Jun 2024 08:26:20 +0900
Subject: [PATCH 148/174] =?UTF-8?q?Pod=E3=83=AA=E3=82=BD=E3=83=BC=E3=82=B9?=
 =?UTF-8?q?=E8=A9=B0=E3=82=81=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infra/k8s/web/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/infra/k8s/web/values.yaml b/infra/k8s/web/values.yaml
index aac40205e9f6..88ae74e83f79 100644
--- a/infra/k8s/web/values.yaml
+++ b/infra/k8s/web/values.yaml
@@ -35,10 +35,10 @@ hpa:
 
 resources:
   requests:
-    cpu: 200m
+    cpu: 100m
     memory: 1Gi
   limits:
-    cpu: 1024m
+    cpu: 512m
     memory: 2Gi
 
 livenessProbe:

From d1862525c576684e7c3902a1482011f4471185d5 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Mon, 10 Jun 2024 11:25:41 +0900
Subject: [PATCH 149/174] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=83=AF?=
 =?UTF-8?q?=E3=83=BC=E3=82=AF=E3=83=95=E3=83=AD=E3=83=BCCO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/on-release-created.yml |  18 +--
 .github/workflows/storybook.yml          | 136 +++++++++++------------
 2 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/.github/workflows/on-release-created.yml b/.github/workflows/on-release-created.yml
index 8dd9ed2513f5..b391840b4366 100644
--- a/.github/workflows/on-release-created.yml
+++ b/.github/workflows/on-release-created.yml
@@ -31,12 +31,12 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
           registry-url: 'https://registry.npmjs.org'
-      - name: Publish package
-        run: |
-          corepack enable
-          pnpm i --frozen-lockfile
-          pnpm build
-          pnpm --filter misskey-js publish --access public --no-git-checks --provenance
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
+      # - name: Publish package
+      #   run: |
+      #     corepack enable
+      #     pnpm i --frozen-lockfile
+      #     pnpm build
+      #     pnpm --filter misskey-js publish --access public --no-git-checks --provenance
+      #   env:
+      #     NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
+      #     NPM_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
index 5f28906bc080..9af0f2c4d901 100644
--- a/.github/workflows/storybook.yml
+++ b/.github/workflows/storybook.yml
@@ -53,74 +53,74 @@ jobs:
       run: pnpm --filter misskey-js build
     - name: Build storybook
       run: pnpm --filter frontend build-storybook
-    - name: Publish to Chromatic
-      if: github.event_name != 'pull_request_target' && github.ref == 'refs/heads/master'
-      run: pnpm --filter frontend chromatic --exit-once-uploaded -d storybook-static
-      env:
-        CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
-    - name: Publish to Chromatic
-      if: github.event_name != 'pull_request_target' && github.ref != 'refs/heads/master'
-      id: chromatic_push
-      run: |
-        DIFF="${{ github.event.before }} HEAD"
-        if [ "$DIFF" = "0000000000000000000000000000000000000000 HEAD" ]; then
-          DIFF="HEAD"
-        fi
-        CHROMATIC_PARAMETER="$(node packages/frontend/.storybook/changes.js $(git diff-tree --no-commit-id --name-only -r $(echo "$DIFF") | xargs))"
-        if [ "$CHROMATIC_PARAMETER" = " --skip" ]; then
-          echo "skip=true" >> $GITHUB_OUTPUT
-        fi
-        if pnpm --filter frontend chromatic -d storybook-static $(echo "$CHROMATIC_PARAMETER"); then
-          echo "success=true" >> $GITHUB_OUTPUT
-        else
-          echo "success=false" >> $GITHUB_OUTPUT
-        fi
-      env:
-        CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
-    - name: Publish to Chromatic
-      if: github.event_name == 'pull_request_target'
-      id: chromatic_pull_request
-      run: |
-        DIFF="${{ steps.rev.outputs.base }} HEAD"
-        if [ "$DIFF" = "0000000000000000000000000000000000000000 HEAD" ]; then
-          DIFF="HEAD"
-        fi
-        CHROMATIC_PARAMETER="$(node packages/frontend/.storybook/changes.js $(git diff-tree --no-commit-id --name-only -r $(echo "$DIFF") | xargs))"
-        if [ "$CHROMATIC_PARAMETER" = " --skip" ]; then
-          echo "skip=true" >> $GITHUB_OUTPUT
-        fi
-        BRANCH="${{ github.event.pull_request.head.user.login }}:$HEAD_REF"
-        if [ "$BRANCH" = "misskey-dev:$HEAD_REF" ]; then
-          BRANCH="$HEAD_REF"
-        fi
-        pnpm --filter frontend chromatic --exit-once-uploaded -d storybook-static --branch-name "$BRANCH" $(echo "$CHROMATIC_PARAMETER")
-      env:
-        HEAD_REF: ${{ github.event.pull_request.head.ref }}
-        CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
-    - name: Notify that Chromatic detects changes
-      uses: actions/github-script@v7.0.1
-      if: github.event_name != 'pull_request_target' && steps.chromatic_push.outputs.success == 'false'
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        script: |
-          github.rest.repos.createCommitComment({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            commit_sha: context.sha,
-            body: 'Chromatic detects changes. Please [review the changes on Chromatic](https://www.chromatic.com/builds?appId=6428f7d7b962f0b79f97d6e4).'
-          })
-    - name: Notify that Chromatic will skip testing
-      uses: actions/github-script@v7.0.1
-      if: github.event_name == 'pull_request' && steps.chromatic_pull_request.outputs.skip == 'true'
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        script: |
-          github.rest.issues.createComment({
-            issue_number: context.issue.number,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            body: 'Chromatic will skip testing but you may still have to [review the changes on Chromatic](https://www.chromatic.com/pullrequests?appId=6428f7d7b962f0b79f97d6e4).'
-          })
+    # - name: Publish to Chromatic
+    #   if: github.event_name != 'pull_request_target' && github.ref == 'refs/heads/master'
+    #   run: pnpm --filter frontend chromatic --exit-once-uploaded -d storybook-static
+    #   env:
+    #     CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
+    # - name: Publish to Chromatic
+    #   if: github.event_name != 'pull_request_target' && github.ref != 'refs/heads/master'
+    #   id: chromatic_push
+    #   run: |
+    #     DIFF="${{ github.event.before }} HEAD"
+    #     if [ "$DIFF" = "0000000000000000000000000000000000000000 HEAD" ]; then
+    #       DIFF="HEAD"
+    #     fi
+    #     CHROMATIC_PARAMETER="$(node packages/frontend/.storybook/changes.js $(git diff-tree --no-commit-id --name-only -r $(echo "$DIFF") | xargs))"
+    #     if [ "$CHROMATIC_PARAMETER" = " --skip" ]; then
+    #       echo "skip=true" >> $GITHUB_OUTPUT
+    #     fi
+    #     if pnpm --filter frontend chromatic -d storybook-static $(echo "$CHROMATIC_PARAMETER"); then
+    #       echo "success=true" >> $GITHUB_OUTPUT
+    #     else
+    #       echo "success=false" >> $GITHUB_OUTPUT
+    #     fi
+    #   env:
+    #     CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
+    # - name: Publish to Chromatic
+    #   if: github.event_name == 'pull_request_target'
+    #   id: chromatic_pull_request
+    #   run: |
+    #     DIFF="${{ steps.rev.outputs.base }} HEAD"
+    #     if [ "$DIFF" = "0000000000000000000000000000000000000000 HEAD" ]; then
+    #       DIFF="HEAD"
+    #     fi
+    #     CHROMATIC_PARAMETER="$(node packages/frontend/.storybook/changes.js $(git diff-tree --no-commit-id --name-only -r $(echo "$DIFF") | xargs))"
+    #     if [ "$CHROMATIC_PARAMETER" = " --skip" ]; then
+    #       echo "skip=true" >> $GITHUB_OUTPUT
+    #     fi
+    #     BRANCH="${{ github.event.pull_request.head.user.login }}:$HEAD_REF"
+    #     if [ "$BRANCH" = "misskey-dev:$HEAD_REF" ]; then
+    #       BRANCH="$HEAD_REF"
+    #     fi
+    #     pnpm --filter frontend chromatic --exit-once-uploaded -d storybook-static --branch-name $BRANCH $(echo "$CHROMATIC_PARAMETER")
+    #   env:
+    #     HEAD_REF: ${{ github.event.pull_request.head.ref }}
+    #     CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
+    # - name: Notify that Chromatic detects changes
+    #   uses: actions/github-script@v7.0.1
+    #   if: github.event_name != 'pull_request_target' && steps.chromatic_push.outputs.success == 'false'
+    #   with:
+    #     github-token: ${{ secrets.GITHUB_TOKEN }}
+    #     script: |
+    #       github.rest.repos.createCommitComment({
+    #         owner: context.repo.owner,
+    #         repo: context.repo.repo,
+    #         commit_sha: context.sha,
+    #         body: 'Chromatic detects changes. Please [review the changes on Chromatic](https://www.chromatic.com/builds?appId=6428f7d7b962f0b79f97d6e4).'
+    #       })
+    # - name: Notify that Chromatic will skip testing
+    #   uses: actions/github-script@v7.0.1
+    #   if: github.event_name == 'pull_request' && steps.chromatic_pull_request.outputs.skip == 'true'
+    #   with:
+    #     github-token: ${{ secrets.GITHUB_TOKEN }}
+    #     script: |
+    #       github.rest.issues.createComment({
+    #         issue_number: context.issue.number,
+    #         owner: context.repo.owner,
+    #         repo: context.repo.repo,
+    #         body: 'Chromatic will skip testing but you may still have to [review the changes on Chromatic](https://www.chromatic.com/pullrequests?appId=6428f7d7b962f0b79f97d6e4).'
+    #       })
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4
       with:

From b681ee33fb6c36fdbf4ace42f4c23c31f4e44f0a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 02:26:25 +0000
Subject: [PATCH 150/174] chore(deps): update dependency node to v20.14.0

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 42492ae73fe0..9d49015aa0a4 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 20.11.1
+nodejs 20.14.0
 pnpm 8.14.1

From dffb566e2ee97329c6c8e4091d2a2e9b98b5314a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 02:30:33 +0000
Subject: [PATCH 151/174] chore(deps): update dependency pnpm to v9

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 9d49015aa0a4..87da6084518d 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 20.14.0
-pnpm 8.14.1
+pnpm 9.2.0

From 9781cab014790c7b542b77eb04b58fea8307a2e6 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Mon, 10 Jun 2024 11:57:19 +0900
Subject: [PATCH 152/174] =?UTF-8?q?Pod=E3=83=AA=E3=82=BD=E3=83=BC=E3=82=B9?=
 =?UTF-8?q?=E8=A9=B0=E3=82=81=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infra/k8s/web/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/infra/k8s/web/values.yaml b/infra/k8s/web/values.yaml
index 88ae74e83f79..cf98f4dd360b 100644
--- a/infra/k8s/web/values.yaml
+++ b/infra/k8s/web/values.yaml
@@ -35,10 +35,10 @@ hpa:
 
 resources:
   requests:
-    cpu: 100m
+    cpu: 64m
     memory: 1Gi
   limits:
-    cpu: 512m
+    cpu: 350m
     memory: 2Gi
 
 livenessProbe:

From a04c275697f9d4ee95689270019763756b03ab07 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 03:04:37 +0000
Subject: [PATCH 153/174] chore(deps): update docker/dockerfile docker tag to
 v1.7

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 94d1c4c3ecd4..6f55654b1856 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# syntax = docker/dockerfile:1.6
+# syntax = docker/dockerfile:1.7
 
 ARG NODE_VERSION=20.16.0-bullseye
 

From 887791e77b94580dca75978b005207f3e28d726f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 05:31:29 +0000
Subject: [PATCH 154/174] chore(deps): update actions/checkout action to v4.1.6

---
 .github/workflows/api-misskey-js.yml           | 2 +-
 .github/workflows/cd-for-misskey-na2na.yml     | 2 +-
 .github/workflows/changelog-check.yml          | 2 +-
 .github/workflows/check-misskey-js-autogen.yml | 4 ++--
 .github/workflows/check-misskey-js-version.yml | 2 +-
 .github/workflows/check-spdx-license-id.yml    | 2 +-
 .github/workflows/check_copyright_year.yml     | 2 +-
 .github/workflows/deploy-test-environment.yml  | 2 +-
 .github/workflows/docker-develop.yml           | 2 +-
 .github/workflows/docker.yml                   | 2 +-
 .github/workflows/dockle.yml                   | 2 +-
 .github/workflows/get-api-diff.yml             | 2 +-
 .github/workflows/lint.yml                     | 6 +++---
 .github/workflows/locale.yml                   | 2 +-
 .github/workflows/on-release-created.yml       | 2 +-
 .github/workflows/pr-preview-deploy.yml        | 2 +-
 .github/workflows/storybook.yml                | 4 ++--
 .github/workflows/test-backend.yml             | 4 ++--
 .github/workflows/test-frontend.yml            | 4 ++--
 .github/workflows/test-misskey-js.yml          | 2 +-
 .github/workflows/test-production.yml          | 2 +-
 .github/workflows/validate-api-json.yml        | 2 +-
 22 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/api-misskey-js.yml b/.github/workflows/api-misskey-js.yml
index e7db18316cb3..acb5776f4d2a 100644
--- a/.github/workflows/api-misskey-js.yml
+++ b/.github/workflows/api-misskey-js.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
 
       - run: corepack enable
 
diff --git a/.github/workflows/cd-for-misskey-na2na.yml b/.github/workflows/cd-for-misskey-na2na.yml
index f94924398b85..37e0f80878c1 100644
--- a/.github/workflows/cd-for-misskey-na2na.yml
+++ b/.github/workflows/cd-for-misskey-na2na.yml
@@ -18,7 +18,7 @@ jobs:
       MISSKEY_VERSION: ${{ steps.check_docker_hub.outputs.MISSKEY_VERSION }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Get current version
         id: get_version
         run: |
diff --git a/.github/workflows/changelog-check.yml b/.github/workflows/changelog-check.yml
index d4e99f966ef0..bbef4a389521 100644
--- a/.github/workflows/changelog-check.yml
+++ b/.github/workflows/changelog-check.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout head
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Setup Node.js
         uses: actions/setup-node@v4.0.3
         with:
diff --git a/.github/workflows/check-misskey-js-autogen.yml b/.github/workflows/check-misskey-js-autogen.yml
index 3a2a2d5f8dd7..465b72a774ca 100644
--- a/.github/workflows/check-misskey-js-autogen.yml
+++ b/.github/workflows/check-misskey-js-autogen.yml
@@ -18,7 +18,7 @@ jobs:
     if: ${{ github.event.pull_request.mergeable == null || github.event.pull_request.mergeable == true }}
     steps:
       - name: checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
         with:
           submodules: true
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
@@ -65,7 +65,7 @@ jobs:
     if: ${{ github.event.pull_request.mergeable == null || github.event.pull_request.mergeable == true }}
     steps:
       - name: checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
         with:
           submodules: true
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
diff --git a/.github/workflows/check-misskey-js-version.yml b/.github/workflows/check-misskey-js-version.yml
index 99c29ac974cf..52e45fb92a40 100644
--- a/.github/workflows/check-misskey-js-version.yml
+++ b/.github/workflows/check-misskey-js-version.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Check version
         run: |
           if [ "$(jq -r '.version' package.json)" != "$(jq -r '.version' packages/misskey-js/package.json)" ]; then
diff --git a/.github/workflows/check-spdx-license-id.yml b/.github/workflows/check-spdx-license-id.yml
index 6cd8bf60d520..6a2626206e45 100644
--- a/.github/workflows/check-spdx-license-id.yml
+++ b/.github/workflows/check-spdx-license-id.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Check
         run: |
           counter=0
diff --git a/.github/workflows/check_copyright_year.yml b/.github/workflows/check_copyright_year.yml
index 03dfcd0a0b21..2b94fb5e0502 100644
--- a/.github/workflows/check_copyright_year.yml
+++ b/.github/workflows/check_copyright_year.yml
@@ -10,7 +10,7 @@ jobs:
   check_copyright_year:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.6
     - 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/deploy-test-environment.yml b/.github/workflows/deploy-test-environment.yml
index 66b15beb91ea..ab54223dca0d 100644
--- a/.github/workflows/deploy-test-environment.yml
+++ b/.github/workflows/deploy-test-environment.yml
@@ -28,7 +28,7 @@ jobs:
       wait_time: ${{ steps.get-wait-time.outputs.wait_time }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
 
       - name: Check allowed users
         id: check-allowed-users
diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index c7ac08414a82..83a49ba03c11 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -27,7 +27,7 @@ jobs:
           platform=${{ matrix.platform }}
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
       - name: Check out the repo
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Docker meta
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index fd0a16e59e92..41c883fa8ec0 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -32,7 +32,7 @@ jobs:
           platform=${{ matrix.platform }}
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
       - name: Check out the repo
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Docker meta
diff --git a/.github/workflows/dockle.yml b/.github/workflows/dockle.yml
index fa0177a8d074..ffb5afff7bd5 100644
--- a/.github/workflows/dockle.yml
+++ b/.github/workflows/dockle.yml
@@ -15,7 +15,7 @@ jobs:
       DOCKER_CONTENT_TRUST: 1
       DOCKLE_VERSION: 0.4.14
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.1.6
       - name: Download and install dockle v${{ env.DOCKLE_VERSION }}
         run: |
           curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v${DOCKLE_VERSION}/dockle_${DOCKLE_VERSION}_Linux-64bit.deb"
diff --git a/.github/workflows/get-api-diff.yml b/.github/workflows/get-api-diff.yml
index 81e8134fb741..9adffc882286 100644
--- a/.github/workflows/get-api-diff.yml
+++ b/.github/workflows/get-api-diff.yml
@@ -26,7 +26,7 @@ jobs:
             ref: refs/pull/${{ github.event.number }}/merge
 
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.6
       with:
         ref: ${{ matrix.ref }}
         submodules: true
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index c21fc951239f..6ad6b50b6be7 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -24,7 +24,7 @@ jobs:
   pnpm_install:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.6
       with:
         fetch-depth: 0
         submodules: true
@@ -50,7 +50,7 @@ jobs:
         - sw
         - misskey-js
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.6
       with:
         fetch-depth: 0
         submodules: true
@@ -80,7 +80,7 @@ jobs:
         - backend
         - misskey-js
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.6
       with:
         fetch-depth: 0
         submodules: true
diff --git a/.github/workflows/locale.yml b/.github/workflows/locale.yml
index 95251bfe31e0..bcea03f9acac 100644
--- a/.github/workflows/locale.yml
+++ b/.github/workflows/locale.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.6
       with:
         fetch-depth: 0
         submodules: true
diff --git a/.github/workflows/on-release-created.yml b/.github/workflows/on-release-created.yml
index b391840b4366..e0b357e32c4b 100644
--- a/.github/workflows/on-release-created.yml
+++ b/.github/workflows/on-release-created.yml
@@ -20,7 +20,7 @@ jobs:
         node-version: [20.16.0]
 
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.1.6
         with:
           submodules: true
       - name: Install pnpm
diff --git a/.github/workflows/pr-preview-deploy.yml b/.github/workflows/pr-preview-deploy.yml
index 21400b7eb42c..1132ec1b3160 100644
--- a/.github/workflows/pr-preview-deploy.yml
+++ b/.github/workflows/pr-preview-deploy.yml
@@ -56,7 +56,7 @@ jobs:
 
     # Check out merge commit
     - name: Fork based /deploy checkout
-      uses: actions/checkout@v4.1.1
+      uses: actions/checkout@v4.1.6
       with:
         ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
 
diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
index 9af0f2c4d901..9aa89703f859 100644
--- a/.github/workflows/storybook.yml
+++ b/.github/workflows/storybook.yml
@@ -21,12 +21,12 @@ jobs:
       NODE_OPTIONS: "--max_old_space_size=7168"
 
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.6
       if: github.event_name != 'pull_request_target'
       with:
         fetch-depth: 0
         submodules: true
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.6
       if: github.event_name == 'pull_request_target'
       with:
         fetch-depth: 0
diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 026550025c95..70615e77185f 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -38,7 +38,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.6
       with:
         submodules: true
     - name: Install pnpm
@@ -87,7 +87,7 @@ jobs:
           - 56312:6379
 
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.1.6
         with:
           submodules: true
       - name: Install pnpm
diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml
index 2f658ca15230..b815596000d2 100644
--- a/.github/workflows/test-frontend.yml
+++ b/.github/workflows/test-frontend.yml
@@ -42,7 +42,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.6
       with:
         submodules: true
     - name: Install pnpm
@@ -91,7 +91,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.6
       with:
         submodules: true
     # https://github.com/cypress-io/cypress-docker-images/issues/150
diff --git a/.github/workflows/test-misskey-js.yml b/.github/workflows/test-misskey-js.yml
index 9ad71919df15..b40b7dea0b38 100644
--- a/.github/workflows/test-misskey-js.yml
+++ b/.github/workflows/test-misskey-js.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
 
       - run: corepack enable
 
diff --git a/.github/workflows/test-production.yml b/.github/workflows/test-production.yml
index 8ad8a6476696..8769a27e6e0a 100644
--- a/.github/workflows/test-production.yml
+++ b/.github/workflows/test-production.yml
@@ -19,7 +19,7 @@ jobs:
         node-version: [20.16.0]
 
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.6
       with:
         submodules: true
     - name: Install pnpm
diff --git a/.github/workflows/validate-api-json.yml b/.github/workflows/validate-api-json.yml
index 06e987f27e4f..71f521503c6d 100644
--- a/.github/workflows/validate-api-json.yml
+++ b/.github/workflows/validate-api-json.yml
@@ -21,7 +21,7 @@ jobs:
         node-version: [20.16.0]
 
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.1.6
       with:
         submodules: true
     - name: Install pnpm

From 387535ef2ddc855995044e8be79f9f1f91d259c4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 05:34:27 +0000
Subject: [PATCH 155/174] chore(deps): update nginx docker tag to v1.27.0

---
 infra/nginx/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/nginx/Dockerfile b/infra/nginx/Dockerfile
index 3a60ff2fae91..9ec13b3f0b5f 100644
--- a/infra/nginx/Dockerfile
+++ b/infra/nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.25.5
+FROM nginx:1.27.0
 
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \

From fc7e6ec78598d34b7302152f870b8ae9783e8303 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 05:39:54 +0000
Subject: [PATCH 156/174] chore(deps): update redis docker tag to v7.2.5

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index e83569489ade..40b72f1ea795 100644
--- a/compose.yml
+++ b/compose.yml
@@ -22,7 +22,7 @@ services:
 
   redis:
     restart: always
-    image: redis:7.2.4-alpine
+    image: redis:7.2.5-alpine
     networks:
       - internal_network
     volumes:

From 22de20c017e4ccd77eaaaec4502a408f95c1dff7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 14:52:12 +0900
Subject: [PATCH 157/174] chore(deps): update postgres docker tag to v16 (#453)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .devcontainer/compose.yml           | 2 +-
 .github/workflows/test-backend.yml  | 4 ++--
 .github/workflows/test-frontend.yml | 4 ++--
 compose.local-db.yml                | 2 +-
 packages/backend/test/compose.yml   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.devcontainer/compose.yml b/.devcontainer/compose.yml
index d02d2a8f4a89..d834dad15686 100644
--- a/.devcontainer/compose.yml
+++ b/.devcontainer/compose.yml
@@ -28,7 +28,7 @@ services:
 
   db:
     restart: unless-stopped
-    image: postgres:15-alpine
+    image: postgres:16-alpine
     networks:
       - internal_network
     environment:
diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 70615e77185f..42ccb58ba4dc 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -26,7 +26,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:15
+        image: postgres:16
         ports:
           - 54312:5432
         env:
@@ -75,7 +75,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:15
+        image: postgres:16
         ports:
           - 54312:5432
         env:
diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml
index b815596000d2..ec247d0a9afd 100644
--- a/.github/workflows/test-frontend.yml
+++ b/.github/workflows/test-frontend.yml
@@ -30,7 +30,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:15
+        image: postgres:16
         ports:
           - 54312:5432
         env:
@@ -79,7 +79,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:15
+        image: postgres:16
         ports:
           - 54312:5432
         env:
diff --git a/compose.local-db.yml b/compose.local-db.yml
index 3835cb23dbad..e8a6d83c322e 100644
--- a/compose.local-db.yml
+++ b/compose.local-db.yml
@@ -15,7 +15,7 @@ services:
 
   db:
     restart: always
-    image: postgres:15-alpine
+    image: postgres:16-alpine
     ports:
       - "5432:5432"
     env_file:
diff --git a/packages/backend/test/compose.yml b/packages/backend/test/compose.yml
index 6593fc33dd6c..523cdf39832d 100644
--- a/packages/backend/test/compose.yml
+++ b/packages/backend/test/compose.yml
@@ -5,7 +5,7 @@ services:
       - "127.0.0.1:56312:6379"
 
   dbtest:
-    image: postgres:15
+    image: postgres:16
     ports:
       - "127.0.0.1:54312:5432"
     environment:

From 6041c70be0a0b1ed548203d0f27beececa9cadec Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 16:51:40 +0000
Subject: [PATCH 158/174] chore(deps): update dependency pnpm to v9.3.0

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 87da6084518d..9e566c8e1e4d 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 20.14.0
-pnpm 9.2.0
+pnpm 9.3.0

From 0e8aaa57bdb6f0512ac1ffd433a9c443f5fe8f16 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Wed, 12 Jun 2024 00:42:38 +0900
Subject: [PATCH 159/174] =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E8=A9=B0=E3=82=81?=
 =?UTF-8?q?=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infra/k8s/web/templates/deployment.yaml |  1 +
 infra/k8s/web/templates/hpa.yaml        | 10 ++++++++--
 infra/k8s/web/values.yaml               | 12 ++++++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/infra/k8s/web/templates/deployment.yaml b/infra/k8s/web/templates/deployment.yaml
index 98e7c659962a..c13c924a8cf4 100644
--- a/infra/k8s/web/templates/deployment.yaml
+++ b/infra/k8s/web/templates/deployment.yaml
@@ -22,6 +22,7 @@ spec:
           ports:
             - containerPort: 3000
           readinessProbe:
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
             httpGet:
               path: /healthz
               port: 3000
diff --git a/infra/k8s/web/templates/hpa.yaml b/infra/k8s/web/templates/hpa.yaml
index 9e40641e8031..7668f514159b 100644
--- a/infra/k8s/web/templates/hpa.yaml
+++ b/infra/k8s/web/templates/hpa.yaml
@@ -19,17 +19,23 @@ spec:
         target:
           type: Utilization
           averageUtilization: {{ .Values.hpa.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.hpa.targetMemoryUtilizationPercentage }}
   behavior:
     scaleUp:
       policies:
         - type: Pods
           value: 2
           periodSeconds: 60
-      stabilizationWindowSeconds: 300
+      stabilizationWindowSeconds: 30
     scaleDown:
       policies:
         - type: Pods
           value: 2
           periodSeconds: 60
-      stabilizationWindowSeconds: 300
+      stabilizationWindowSeconds: 60
 {{- end }}
diff --git a/infra/k8s/web/values.yaml b/infra/k8s/web/values.yaml
index cf98f4dd360b..cf5a8102df18 100644
--- a/infra/k8s/web/values.yaml
+++ b/infra/k8s/web/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: na2na/misskey-na2na
-  tag: "2023.11.1-na2na-v4"
+  tag: "2024.5.0-na2na-v2"
   pullPolicy: Always
 
 database:
@@ -32,15 +32,19 @@ hpa:
   minReplicas: 2
   maxReplicas: 5
   targetCPUUtilizationPercentage: 80
+  targetMemoryUtilizationPercentage: 80
 
 resources:
   requests:
-    cpu: 64m
-    memory: 1Gi
+    cpu: 100m
+    memory: 1500Mi
   limits:
     cpu: 350m
     memory: 2Gi
 
 livenessProbe:
-  initialDelaySeconds: 60
+  initialDelaySeconds: 80
   periodSeconds: 10
+
+readinessProbe:
+  initialDelaySeconds: 80

From 255f4842e12e1f4b19460ec98bb226ac6ebae4cd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 11 Jun 2024 21:45:46 +0000
Subject: [PATCH 160/174] chore(deps): update docker/dockerfile docker tag to
 v1.8

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6f55654b1856..20b197b1c4f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# syntax = docker/dockerfile:1.7
+# syntax = docker/dockerfile:1.8
 
 ARG NODE_VERSION=20.16.0-bullseye
 

From 9169ce8da762cb8df95ffc78d672bf917c83c2cc Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Thu, 27 Jun 2024 18:52:26 +0900
Subject: [PATCH 161/174] =?UTF-8?q?NodePort=E3=82=84=E3=82=81=E3=81=A6Clus?=
 =?UTF-8?q?terIP=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infra/k8s/web/templates/service.yaml | 5 ++---
 infra/k8s/web/values.yaml            | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/infra/k8s/web/templates/service.yaml b/infra/k8s/web/templates/service.yaml
index 3260ce98f192..33d284ac26df 100644
--- a/infra/k8s/web/templates/service.yaml
+++ b/infra/k8s/web/templates/service.yaml
@@ -1,4 +1,4 @@
-{{- if eq .Values.service.type "NodePort" }}
+{{- if eq .Values.service.type "ClusterIP" }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -6,12 +6,11 @@ metadata:
   labels:
     {{- include "web.labels" . | nindent 4 }}
 spec:
-  type: NodePort
+  type: ClusterIP
   selector:
     {{- include "web.selectorLabels" . | nindent 4 }}
   ports:
     - name: http
       port: {{ .Values.service.port }}
       targetPort: {{ .Values.service.port }}
-      nodePort: {{ .Values.service.nodePort }}
 {{- end }}
diff --git a/infra/k8s/web/values.yaml b/infra/k8s/web/values.yaml
index cf5a8102df18..0f89997fcd2d 100644
--- a/infra/k8s/web/values.yaml
+++ b/infra/k8s/web/values.yaml
@@ -16,9 +16,8 @@ redis:
 
 service:
   host: "https://mk8stest.na2na.dev/"
-  type: NodePort
+  type: ClusterIP
   port: 3000
-  nodePort: 30000
 
 nodeSelector: {}
 

From 835bd093ca355ad4ea48acb92c05784fe4082a43 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Thu, 27 Jun 2024 18:57:31 +0900
Subject: [PATCH 162/174] =?UTF-8?q?=E7=99=BA=E7=81=AB=E3=81=95=E3=81=9B?=
 =?UTF-8?q?=E3=81=AA=E3=81=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/dockle.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/dockle.yml b/.github/workflows/dockle.yml
index ffb5afff7bd5..2f1702820cb9 100644
--- a/.github/workflows/dockle.yml
+++ b/.github/workflows/dockle.yml
@@ -2,11 +2,7 @@
 name: Dockle
 
 on:
-  push:
-    branches:
-      - master
-      - develop
-  pull_request:
+  workflow_dispatch
 
 jobs:
   dockle:

From 375eb625019d807f2addc486d127b30a3c91c32f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 09:59:02 +0000
Subject: [PATCH 163/174] chore(deps): update actions/checkout action to v4.1.7

---
 .github/workflows/api-misskey-js.yml           | 2 +-
 .github/workflows/cd-for-misskey-na2na.yml     | 2 +-
 .github/workflows/changelog-check.yml          | 2 +-
 .github/workflows/check-misskey-js-autogen.yml | 4 ++--
 .github/workflows/check-misskey-js-version.yml | 2 +-
 .github/workflows/check-spdx-license-id.yml    | 2 +-
 .github/workflows/check_copyright_year.yml     | 2 +-
 .github/workflows/deploy-test-environment.yml  | 2 +-
 .github/workflows/docker-develop.yml           | 2 +-
 .github/workflows/docker.yml                   | 2 +-
 .github/workflows/dockle.yml                   | 2 +-
 .github/workflows/get-api-diff.yml             | 2 +-
 .github/workflows/lint.yml                     | 6 +++---
 .github/workflows/locale.yml                   | 2 +-
 .github/workflows/on-release-created.yml       | 2 +-
 .github/workflows/pr-preview-deploy.yml        | 2 +-
 .github/workflows/storybook.yml                | 4 ++--
 .github/workflows/test-backend.yml             | 4 ++--
 .github/workflows/test-frontend.yml            | 4 ++--
 .github/workflows/test-misskey-js.yml          | 2 +-
 .github/workflows/test-production.yml          | 2 +-
 .github/workflows/validate-api-json.yml        | 2 +-
 22 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/api-misskey-js.yml b/.github/workflows/api-misskey-js.yml
index acb5776f4d2a..bd9c5d6260db 100644
--- a/.github/workflows/api-misskey-js.yml
+++ b/.github/workflows/api-misskey-js.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
 
       - run: corepack enable
 
diff --git a/.github/workflows/cd-for-misskey-na2na.yml b/.github/workflows/cd-for-misskey-na2na.yml
index 37e0f80878c1..2fffe0f2b789 100644
--- a/.github/workflows/cd-for-misskey-na2na.yml
+++ b/.github/workflows/cd-for-misskey-na2na.yml
@@ -18,7 +18,7 @@ jobs:
       MISSKEY_VERSION: ${{ steps.check_docker_hub.outputs.MISSKEY_VERSION }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Get current version
         id: get_version
         run: |
diff --git a/.github/workflows/changelog-check.yml b/.github/workflows/changelog-check.yml
index bbef4a389521..70a4c9b3742b 100644
--- a/.github/workflows/changelog-check.yml
+++ b/.github/workflows/changelog-check.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout head
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Setup Node.js
         uses: actions/setup-node@v4.0.3
         with:
diff --git a/.github/workflows/check-misskey-js-autogen.yml b/.github/workflows/check-misskey-js-autogen.yml
index 465b72a774ca..33c4c98beee5 100644
--- a/.github/workflows/check-misskey-js-autogen.yml
+++ b/.github/workflows/check-misskey-js-autogen.yml
@@ -18,7 +18,7 @@ jobs:
     if: ${{ github.event.pull_request.mergeable == null || github.event.pull_request.mergeable == true }}
     steps:
       - name: checkout
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
         with:
           submodules: true
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
@@ -65,7 +65,7 @@ jobs:
     if: ${{ github.event.pull_request.mergeable == null || github.event.pull_request.mergeable == true }}
     steps:
       - name: checkout
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
         with:
           submodules: true
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
diff --git a/.github/workflows/check-misskey-js-version.yml b/.github/workflows/check-misskey-js-version.yml
index 52e45fb92a40..dae862a5ba5a 100644
--- a/.github/workflows/check-misskey-js-version.yml
+++ b/.github/workflows/check-misskey-js-version.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Check version
         run: |
           if [ "$(jq -r '.version' package.json)" != "$(jq -r '.version' packages/misskey-js/package.json)" ]; then
diff --git a/.github/workflows/check-spdx-license-id.yml b/.github/workflows/check-spdx-license-id.yml
index 6a2626206e45..0b29bfa5bbb2 100644
--- a/.github/workflows/check-spdx-license-id.yml
+++ b/.github/workflows/check-spdx-license-id.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Check
         run: |
           counter=0
diff --git a/.github/workflows/check_copyright_year.yml b/.github/workflows/check_copyright_year.yml
index 2b94fb5e0502..837bc2d23d01 100644
--- a/.github/workflows/check_copyright_year.yml
+++ b/.github/workflows/check_copyright_year.yml
@@ -10,7 +10,7 @@ jobs:
   check_copyright_year:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.7
     - 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/deploy-test-environment.yml b/.github/workflows/deploy-test-environment.yml
index ab54223dca0d..3ee055d2c9f2 100644
--- a/.github/workflows/deploy-test-environment.yml
+++ b/.github/workflows/deploy-test-environment.yml
@@ -28,7 +28,7 @@ jobs:
       wait_time: ${{ steps.get-wait-time.outputs.wait_time }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
 
       - name: Check allowed users
         id: check-allowed-users
diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index 83a49ba03c11..5f8d9da60a37 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -27,7 +27,7 @@ jobs:
           platform=${{ matrix.platform }}
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
       - name: Check out the repo
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Docker meta
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 41c883fa8ec0..f1474a43b9ea 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -32,7 +32,7 @@ jobs:
           platform=${{ matrix.platform }}
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
       - name: Check out the repo
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Docker meta
diff --git a/.github/workflows/dockle.yml b/.github/workflows/dockle.yml
index 2f1702820cb9..31af4d150ac7 100644
--- a/.github/workflows/dockle.yml
+++ b/.github/workflows/dockle.yml
@@ -11,7 +11,7 @@ jobs:
       DOCKER_CONTENT_TRUST: 1
       DOCKLE_VERSION: 0.4.14
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
       - name: Download and install dockle v${{ env.DOCKLE_VERSION }}
         run: |
           curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v${DOCKLE_VERSION}/dockle_${DOCKLE_VERSION}_Linux-64bit.deb"
diff --git a/.github/workflows/get-api-diff.yml b/.github/workflows/get-api-diff.yml
index 9adffc882286..4de80ea75ef6 100644
--- a/.github/workflows/get-api-diff.yml
+++ b/.github/workflows/get-api-diff.yml
@@ -26,7 +26,7 @@ jobs:
             ref: refs/pull/${{ github.event.number }}/merge
 
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.7
       with:
         ref: ${{ matrix.ref }}
         submodules: true
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 6ad6b50b6be7..4ca2aaa95e5a 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -24,7 +24,7 @@ jobs:
   pnpm_install:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.7
       with:
         fetch-depth: 0
         submodules: true
@@ -50,7 +50,7 @@ jobs:
         - sw
         - misskey-js
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.7
       with:
         fetch-depth: 0
         submodules: true
@@ -80,7 +80,7 @@ jobs:
         - backend
         - misskey-js
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.7
       with:
         fetch-depth: 0
         submodules: true
diff --git a/.github/workflows/locale.yml b/.github/workflows/locale.yml
index bcea03f9acac..c1fc72a39bf6 100644
--- a/.github/workflows/locale.yml
+++ b/.github/workflows/locale.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.7
       with:
         fetch-depth: 0
         submodules: true
diff --git a/.github/workflows/on-release-created.yml b/.github/workflows/on-release-created.yml
index e0b357e32c4b..06af74bfbb90 100644
--- a/.github/workflows/on-release-created.yml
+++ b/.github/workflows/on-release-created.yml
@@ -20,7 +20,7 @@ jobs:
         node-version: [20.16.0]
 
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
         with:
           submodules: true
       - name: Install pnpm
diff --git a/.github/workflows/pr-preview-deploy.yml b/.github/workflows/pr-preview-deploy.yml
index 1132ec1b3160..9ecf462464ed 100644
--- a/.github/workflows/pr-preview-deploy.yml
+++ b/.github/workflows/pr-preview-deploy.yml
@@ -56,7 +56,7 @@ jobs:
 
     # Check out merge commit
     - name: Fork based /deploy checkout
-      uses: actions/checkout@v4.1.6
+      uses: actions/checkout@v4.1.7
       with:
         ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
 
diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
index 9aa89703f859..154718696292 100644
--- a/.github/workflows/storybook.yml
+++ b/.github/workflows/storybook.yml
@@ -21,12 +21,12 @@ jobs:
       NODE_OPTIONS: "--max_old_space_size=7168"
 
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.7
       if: github.event_name != 'pull_request_target'
       with:
         fetch-depth: 0
         submodules: true
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.7
       if: github.event_name == 'pull_request_target'
       with:
         fetch-depth: 0
diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 42ccb58ba4dc..9a086e6cfd13 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -38,7 +38,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.7
       with:
         submodules: true
     - name: Install pnpm
@@ -87,7 +87,7 @@ jobs:
           - 56312:6379
 
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
         with:
           submodules: true
       - name: Install pnpm
diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml
index ec247d0a9afd..c3f3f8372935 100644
--- a/.github/workflows/test-frontend.yml
+++ b/.github/workflows/test-frontend.yml
@@ -42,7 +42,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.7
       with:
         submodules: true
     - name: Install pnpm
@@ -91,7 +91,7 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.7
       with:
         submodules: true
     # https://github.com/cypress-io/cypress-docker-images/issues/150
diff --git a/.github/workflows/test-misskey-js.yml b/.github/workflows/test-misskey-js.yml
index b40b7dea0b38..b970b7efe312 100644
--- a/.github/workflows/test-misskey-js.yml
+++ b/.github/workflows/test-misskey-js.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
 
       - run: corepack enable
 
diff --git a/.github/workflows/test-production.yml b/.github/workflows/test-production.yml
index 8769a27e6e0a..1e17dc6f14fd 100644
--- a/.github/workflows/test-production.yml
+++ b/.github/workflows/test-production.yml
@@ -19,7 +19,7 @@ jobs:
         node-version: [20.16.0]
 
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.7
       with:
         submodules: true
     - name: Install pnpm
diff --git a/.github/workflows/validate-api-json.yml b/.github/workflows/validate-api-json.yml
index 71f521503c6d..8b6a27267f13 100644
--- a/.github/workflows/validate-api-json.yml
+++ b/.github/workflows/validate-api-json.yml
@@ -21,7 +21,7 @@ jobs:
         node-version: [20.16.0]
 
     steps:
-    - uses: actions/checkout@v4.1.6
+    - uses: actions/checkout@v4.1.7
       with:
         submodules: true
     - name: Install pnpm

From 457c60a02135f5c853d28c2a052bbabb929a2f48 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 14:08:35 +0000
Subject: [PATCH 164/174] chore(deps): update dependency node to v20.15.0

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index 9e566c8e1e4d..b06cc172ed9a 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 20.14.0
+nodejs 20.15.0
 pnpm 9.3.0

From 0bfd60e27e4217d257dfefeef62b4f977fa664a8 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Mon, 8 Jul 2024 12:06:10 +0900
Subject: [PATCH 165/174] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E6=8C=87=E5=AE=9A=E3=81=AE=E8=A9=B3=E7=B4=B0=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/docker-develop.yml | 2 +-
 .github/workflows/docker.yml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index 5f8d9da60a37..bf635eee9b47 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -42,7 +42,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and push by digest
         id: build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v6.3.0
         with:
           context: .
           push: true
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index f1474a43b9ea..9817f3d12835 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -48,7 +48,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and Push to Docker Hub
         id: build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v6.3.0
         with:
           context: .
           push: true

From a4b4df7cce47a23b34970366b84632dc61501fcd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 03:08:23 +0000
Subject: [PATCH 166/174] chore(deps): update dependency pnpm to v9.5.0

---
 .tool-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tool-versions b/.tool-versions
index b06cc172ed9a..6bd9363ca051 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 20.15.0
-pnpm 9.3.0
+pnpm 9.5.0

From 2fd71c8389de810b139765ee32082bd9e57a54fd Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Mon, 8 Jul 2024 12:12:34 +0900
Subject: [PATCH 167/174] =?UTF-8?q?Pod=E6=80=A7=E8=83=BD=E3=81=AE=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infra/k8s/web/values.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/infra/k8s/web/values.yaml b/infra/k8s/web/values.yaml
index 0f89997fcd2d..092974464ccc 100644
--- a/infra/k8s/web/values.yaml
+++ b/infra/k8s/web/values.yaml
@@ -30,15 +30,15 @@ hpa:
   enabled: true
   minReplicas: 2
   maxReplicas: 5
-  targetCPUUtilizationPercentage: 80
-  targetMemoryUtilizationPercentage: 80
+  targetCPUUtilizationPercentage: 60
+  targetMemoryUtilizationPercentage: 60
 
 resources:
   requests:
-    cpu: 100m
+    cpu: 200m
     memory: 1500Mi
   limits:
-    cpu: 350m
+    cpu: 450m
     memory: 2Gi
 
 livenessProbe:

From e4b953c193d1042b661e8b011ab3997531a87695 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Mon, 8 Jul 2024 12:12:41 +0900
Subject: [PATCH 168/174] =?UTF-8?q?=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB?=
 =?UTF-8?q?=E3=83=88=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infra/k8s/web/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/k8s/web/values.yaml b/infra/k8s/web/values.yaml
index 092974464ccc..5ff33b25bec9 100644
--- a/infra/k8s/web/values.yaml
+++ b/infra/k8s/web/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: na2na/misskey-na2na
-  tag: "2024.5.0-na2na-v2"
+  tag: "2024.5.0-na2na-v3"
   pullPolicy: Always
 
 database:

From 9e068de34b26da4151cadb12e99ca183fc9a723e Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Tue, 9 Jul 2024 15:48:19 +0900
Subject: [PATCH 169/174] =?UTF-8?q?helm=20values=E3=81=AE=E6=95=B4?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infra/k8s/web/templates/config.yaml     | 18 +++++++-------
 infra/k8s/web/templates/deployment.yaml |  4 ++--
 infra/k8s/web/values.yaml               | 32 +++++++++++++------------
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/infra/k8s/web/templates/config.yaml b/infra/k8s/web/templates/config.yaml
index 029c24d22b18..483d689fb153 100644
--- a/infra/k8s/web/templates/config.yaml
+++ b/infra/k8s/web/templates/config.yaml
@@ -9,7 +9,7 @@ data:
     #───┘ URL └─────────────────────────────────────────────────────
 
     # Final accessible URL seen by a user.
-    url: {{ .Values.service.host }}
+    hostUrl: {{ .Values.misskey-cm.hostUrl }}
 
     # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
     # URL SETTINGS AFTER THAT!
@@ -37,15 +37,15 @@ data:
     #───┘ PostgreSQL configuration └────────────────────────────────
 
     db:
-      host: {{ .Values.database.host }}
-      port: {{ .Values.database.port }}
+      host: {{ .Values.misskey-cm.database.host }}
+      port: {{ .Values.misskey-cm.database.port }}
 
       # Database name
-      db: {{ .Values.database.db }}
+      db: {{ .Values.misskey-cm.database.db }}
 
       # Auth
-      user: {{ .Values.database.user }}
-      pass: {{ .Values.database.pass }}
+      user: {{ .Values.misskey-cm.database.user }}
+      pass: {{ .Values.misskey-cm.database.pass }}
 
       # Whether disable Caching queries
       #disableCache: true
@@ -59,8 +59,8 @@ data:
     #───┘ Redis configuration └─────────────────────────────────────
 
     redis:
-      host: {{ .Values.redis.host }}
-      port: {{ .Values.redis.port }}
+      host: {{ .Values.misskey-cm.redis.host }}
+      port: {{ .Values.misskey-cm.redis.port }}
       #family: 0  # 0=Both, 4=IPv4, 6=IPv6
       #pass: example-pass
       #prefix: example-prefix
@@ -154,7 +154,7 @@ data:
     # Upload or download file size limits (bytes)
     maxFileSize: 5000000000
     # default: false
-    misskeyBlockMentionsFromUnfamiliarRemoteUsers: true
+    misskeyBlockMentionsFromUnfamiliarRemoteUsers: {{ .Values.misskey-cm.misskeyBlockMentionsFromUnfamiliarRemoteUsers }}
 
 
 kind: ConfigMap
diff --git a/infra/k8s/web/templates/deployment.yaml b/infra/k8s/web/templates/deployment.yaml
index c13c924a8cf4..e5e5d59f60a3 100644
--- a/infra/k8s/web/templates/deployment.yaml
+++ b/infra/k8s/web/templates/deployment.yaml
@@ -17,8 +17,8 @@ spec:
     spec:
       containers:
         - name: web
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: "{{ .Values.image.web.repository }}:{{ .Values.image.web.tag }}"
+          imagePullPolicy: {{ .Values.image.web.pullPolicy }}
           ports:
             - containerPort: 3000
           readinessProbe:
diff --git a/infra/k8s/web/values.yaml b/infra/k8s/web/values.yaml
index 5ff33b25bec9..830e53a4f3c0 100644
--- a/infra/k8s/web/values.yaml
+++ b/infra/k8s/web/values.yaml
@@ -1,21 +1,23 @@
 image:
-  repository: na2na/misskey-na2na
-  tag: "2024.5.0-na2na-v3"
-  pullPolicy: Always
-
-database:
-  host: "hoge.local"
-  port: 5432
-  db: "misskey"
-  user: "misskey"
-  pass: "misskey"
-
-redis:
-  host: "localhost"
-  port: 6379
+  web:
+    repository: na2na/misskey-na2na
+    tag: "2024.5.0-na2na-v3"
+    pullPolicy: IfNotPresent
+
+misskey-cm:
+  hostUrl: "https://mk8stest.na2na.dev/"
+  database:
+    host: "hoge.local"
+    port: 5432
+    db: "misskey"
+    user: "misskey"
+    pass: "misskey"
+  redis:
+    host: "localhost"
+    port: 6379
+  misskeyBlockMentionsFromUnfamiliarRemoteUsers: false
 
 service:
-  host: "https://mk8stest.na2na.dev/"
   type: ClusterIP
   port: 3000
 

From d3523c46a73ec45e86f9735023deedb625118250 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Tue, 9 Jul 2024 16:09:15 +0900
Subject: [PATCH 170/174] hotfix

---
 infra/k8s/web/templates/config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/k8s/web/templates/config.yaml b/infra/k8s/web/templates/config.yaml
index 483d689fb153..cdf99efd29b1 100644
--- a/infra/k8s/web/templates/config.yaml
+++ b/infra/k8s/web/templates/config.yaml
@@ -9,7 +9,7 @@ data:
     #───┘ URL └─────────────────────────────────────────────────────
 
     # Final accessible URL seen by a user.
-    hostUrl: {{ .Values.misskey-cm.hostUrl }}
+    hostUrl: "{{ .Values.misskey-cm.hostUrl }}"
 
     # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
     # URL SETTINGS AFTER THAT!

From 33e6be67cd1a589d7dca4e71ef63418e9ca40fc3 Mon Sep 17 00:00:00 2001
From: na2na-p <na2na@na2na.dev>
Date: Tue, 9 Jul 2024 16:11:07 +0900
Subject: [PATCH 171/174] hotfix

---
 infra/k8s/web/templates/config.yaml | 18 +++++++++---------
 infra/k8s/web/values.yaml           |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/infra/k8s/web/templates/config.yaml b/infra/k8s/web/templates/config.yaml
index cdf99efd29b1..556bd22724b2 100644
--- a/infra/k8s/web/templates/config.yaml
+++ b/infra/k8s/web/templates/config.yaml
@@ -9,7 +9,7 @@ data:
     #───┘ URL └─────────────────────────────────────────────────────
 
     # Final accessible URL seen by a user.
-    hostUrl: "{{ .Values.misskey-cm.hostUrl }}"
+    url: "{{ .Values.misskeyCm.hostUrl }}"
 
     # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
     # URL SETTINGS AFTER THAT!
@@ -37,15 +37,15 @@ data:
     #───┘ PostgreSQL configuration └────────────────────────────────
 
     db:
-      host: {{ .Values.misskey-cm.database.host }}
-      port: {{ .Values.misskey-cm.database.port }}
+      host: {{ .Values.misskeyCm.database.host }}
+      port: {{ .Values.misskeyCm.database.port }}
 
       # Database name
-      db: {{ .Values.misskey-cm.database.db }}
+      db: {{ .Values.misskeyCm.database.db }}
 
       # Auth
-      user: {{ .Values.misskey-cm.database.user }}
-      pass: {{ .Values.misskey-cm.database.pass }}
+      user: {{ .Values.misskeyCm.database.user }}
+      pass: {{ .Values.misskeyCm.database.pass }}
 
       # Whether disable Caching queries
       #disableCache: true
@@ -59,8 +59,8 @@ data:
     #───┘ Redis configuration └─────────────────────────────────────
 
     redis:
-      host: {{ .Values.misskey-cm.redis.host }}
-      port: {{ .Values.misskey-cm.redis.port }}
+      host: {{ .Values.misskeyCm.redis.host }}
+      port: {{ .Values.misskeyCm.redis.port }}
       #family: 0  # 0=Both, 4=IPv4, 6=IPv6
       #pass: example-pass
       #prefix: example-prefix
@@ -154,7 +154,7 @@ data:
     # Upload or download file size limits (bytes)
     maxFileSize: 5000000000
     # default: false
-    misskeyBlockMentionsFromUnfamiliarRemoteUsers: {{ .Values.misskey-cm.misskeyBlockMentionsFromUnfamiliarRemoteUsers }}
+    misskeyBlockMentionsFromUnfamiliarRemoteUsers: {{ .Values.misskeyCm.misskeyBlockMentionsFromUnfamiliarRemoteUsers }}
 
 
 kind: ConfigMap
diff --git a/infra/k8s/web/values.yaml b/infra/k8s/web/values.yaml
index 830e53a4f3c0..8cafeb8a9d29 100644
--- a/infra/k8s/web/values.yaml
+++ b/infra/k8s/web/values.yaml
@@ -4,7 +4,7 @@ image:
     tag: "2024.5.0-na2na-v3"
     pullPolicy: IfNotPresent
 
-misskey-cm:
+misskeyCm:
   hostUrl: "https://mk8stest.na2na.dev/"
   database:
     host: "hoge.local"

From 96a2ac1c323ac80694ff6570582d39a222c9dbde Mon Sep 17 00:00:00 2001
From: "A.Yamamoto" <yamamoto-akiyoshi@dmm.com>
Date: Fri, 2 Aug 2024 22:14:43 +0900
Subject: [PATCH 172/174] Bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 42380f28429a..cf4614c553ff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.8.0",
+	"version": "2024.8.0-na2na-v1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 6491892b3a95d983b90440c26f67d2308fcfaf05 Mon Sep 17 00:00:00 2001
From: "A.Yamamoto" <yamamoto-akiyoshi@dmm.com>
Date: Thu, 8 Aug 2024 21:00:11 +0900
Subject: [PATCH 173/174] =?UTF-8?q?release=E3=82=BF=E3=82=B0push=E3=82=84?=
 =?UTF-8?q?=E3=82=81=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/image-push-for-misskey-na2na-release.yml | 1 -
 infra/k8s/web/templates/deployment.yaml                    | 2 +-
 infra/k8s/web/values.yaml                                  | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/image-push-for-misskey-na2na-release.yml b/.github/workflows/image-push-for-misskey-na2na-release.yml
index 9a632c9f53b3..0782c27e411a 100644
--- a/.github/workflows/image-push-for-misskey-na2na-release.yml
+++ b/.github/workflows/image-push-for-misskey-na2na-release.yml
@@ -49,5 +49,4 @@ jobs:
               --builder="${{ steps.buildx.outputs.name }}" \
               --set='web.tags=${{ inputs.IMAGE_REPOSITORY }}/${{ inputs.IMAGE_NAME }}:${{ inputs.MISSKEY_VERSION }}' \
               --set='web.tags=${{ inputs.IMAGE_REPOSITORY }}/${{ inputs.IMAGE_NAME }}:${{ steps.prepare-for-build.outputs.sha_short }}' \
-              --set='web.tags=${{ inputs.IMAGE_REPOSITORY }}/${{ inputs.IMAGE_NAME }}:release' \
               --push
diff --git a/infra/k8s/web/templates/deployment.yaml b/infra/k8s/web/templates/deployment.yaml
index e5e5d59f60a3..d07672961e2e 100644
--- a/infra/k8s/web/templates/deployment.yaml
+++ b/infra/k8s/web/templates/deployment.yaml
@@ -6,7 +6,7 @@ metadata:
     {{- include "web.labels" . | nindent 4 }}
 spec:
   strategy:
-    type: Recreate
+    type: {{ .Values.image.web.strategy }}
   selector:
     matchLabels:
       {{- include "web.selectorLabels" . | nindent 6 }}
diff --git a/infra/k8s/web/values.yaml b/infra/k8s/web/values.yaml
index 8cafeb8a9d29..36bbfb8112c9 100644
--- a/infra/k8s/web/values.yaml
+++ b/infra/k8s/web/values.yaml
@@ -3,6 +3,7 @@ image:
     repository: na2na/misskey-na2na
     tag: "2024.5.0-na2na-v3"
     pullPolicy: IfNotPresent
+    strategy: RollingUpdate
 
 misskeyCm:
   hostUrl: "https://mk8stest.na2na.dev/"

From 8323ded4e1e50d917931caa8f57cc701f00a45b7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 23 Aug 2024 04:52:23 +0000
Subject: [PATCH 174/174] chore(deps): update dependency node to v20.17.0

---
 .node-version  | 2 +-
 .tool-versions | 2 +-
 Dockerfile     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.node-version b/.node-version
index 8ce7030825b5..3516580bbbc0 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-20.16.0
+20.17.0
diff --git a/.tool-versions b/.tool-versions
index 6bd9363ca051..2da31c8ae5f0 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 20.15.0
+nodejs 20.17.0
 pnpm 9.5.0
diff --git a/Dockerfile b/Dockerfile
index 20b197b1c4f4..c90294264665 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.8
 
-ARG NODE_VERSION=20.16.0-bullseye
+ARG NODE_VERSION=20.17.0-bullseye
 
 # build assets & compile TypeScript