Merge pull request #10 from TeamNijimiss/merge-upstream

.config/docker_example.yml

@@ -72,31 +72,31 @@ dbReplications: false
 #───┘ Redis configuration └─────────────────────────────────────
 
 redis:
-  host: keydb
+  host: dragonfly
   port: 6379
   #family: 0  # 0=Both, 4=IPv4, 6=IPv6
   #pass: example-pass
   #prefix: example-prefix
   #db: 1
 
 #redisForPubsub:
-#  host: keydb
+#  host: dragonfly
 #  port: 6379
 #  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
 #  #pass: example-pass
 #  #prefix: example-prefix
 #  #db: 1
 
 #redisForJobQueue:
-#  host: keydb
+#  host: dragonfly
 #  port: 6379
 #  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
 #  #pass: example-pass
 #  #prefix: example-prefix
 #  #db: 1
 
 #redisForTimelines:
-#  host: keydb
+#  host: dragonfly
 #  port: 6379
 #  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
 #  #pass: example-pass

.devcontainer/devcontainer.yml

@@ -72,31 +72,31 @@ dbReplications: false
 #───┘ Redis configuration └─────────────────────────────────────
 
 redis:
-  host: keydb
+  host: dragonfly
   port: 6379
   #family: 0  # 0=Both, 4=IPv4, 6=IPv6
   #pass: example-pass
   #prefix: example-prefix
   #db: 1
 
 #redisForPubsub:
-#  host: keydb
+#  host: dragonfly
 #  port: 6379
 #  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
 #  #pass: example-pass
 #  #prefix: example-prefix
 #  #db: 1
 
 #redisForJobQueue:
-#  host: keydb
+#  host: dragonfly
 #  port: 6379
 #  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
 #  #pass: example-pass
 #  #prefix: example-prefix
 #  #db: 1
 
 #redisForTimelines:
-#  host: keydb
+#  host: dragonfly
 #  port: 6379
 #  #family: 0  # 0=Both, 4=IPv4, 6=IPv6
 #  #pass: example-pass

.devcontainer/docker-compose.yml

@@ -15,17 +15,25 @@ services:
       - internal_network
       - external_network
 
-  keydb:
+  dragonfly:
     restart: unless-stopped
-    image: eqalpha/keydb:latest
+    image: docker.dragonflydb.io/dragonflydb/dragonfly
+    ulimits:
+      memlock: -1
+    environment:
+      DFLY_snapshot_cron: '* * * * *'
+      DFLY_version_check: false
+      DFLY_tcp_backlog: 2048
+      DFLY_default_lua_flags: allow-undeclared-keys
+      DFLY_pipeline_squash: 0
+      DFLY_multi_exec_squash: false
+      DFLY_conn_io_threads: 4
+      DFLY_epoll_file_threads: 4
+      DFLY_proactor_threads: 4
     networks:
       - internal_network
     volumes:
-      - keydb-data:/data
-    healthcheck:
-      test: "keydb-cli ping"
-      interval: 5s
-      retries: 20
+      - dragonfly-data:/data
 
   db:
     restart: unless-stopped
@@ -45,7 +53,7 @@ services:
 
 volumes:
   postgres-data:
-  keydb-data:
+  dragonfly-data:
 
 networks:
   internal_network:

.dockerignore

@@ -11,7 +11,6 @@ docker-compose.yml
 node_modules/
 packages/*/node_modules
 redis/
-keydb/
 files/
 fluent-emojis/
 .pnp.*

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

@@ -20,7 +20,7 @@ jobs:
       - run: corepack enable
 
       - name: Setup Node.js
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           node-version-file: '.node-version'
           cache: 'pnpm'

.github/workflows/lint.yml

@@ -31,7 +31,7 @@ jobs:
     - uses: pnpm/action-setup@v4
       with:
         run_install: false
-    - uses: actions/[email protected].3
+    - uses: actions/[email protected].4
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'
@@ -57,7 +57,7 @@ jobs:
     - uses: pnpm/action-setup@v4
       with:
         run_install: false
-    - uses: actions/[email protected].3
+    - uses: actions/[email protected].4
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'
@@ -82,7 +82,7 @@ jobs:
     - uses: pnpm/action-setup@v4
       with:
         run_install: false
-    - uses: actions/[email protected].3
+    - uses: actions/[email protected].4
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'

.github/workflows/test-backend.yml

@@ -32,8 +32,18 @@ jobs:
         env:
           POSTGRES_DB: test-misskey
           POSTGRES_HOST_AUTH_METHOD: trust
-      keydb:
-        image: eqalpha/keydb:latest
+      dragonfly:
+        image: docker.dragonflydb.io/dragonflydb/dragonfly
+        options: --ulimit "memlock=-1"
+        env:
+          DFLY_version_check: false
+          DFLY_tcp_backlog: 2048
+          DFLY_default_lua_flags: allow-undeclared-keys
+          DFLY_pipeline_squash: 0
+          DFLY_multi_exec_squash: false
+          DFLY_conn_io_threads: 4
+          DFLY_epoll_file_threads: 4
+          DFLY_proactor_threads: 4
         ports:
           - 56312:6379
 
@@ -49,7 +59,7 @@ jobs:
     - name: Install FFmpeg
       uses: FedericoCarboni/setup-ffmpeg@v3
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/[email protected].3
+      uses: actions/[email protected].4
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'
@@ -84,8 +94,18 @@ jobs:
         env:
           POSTGRES_DB: test-misskey
           POSTGRES_HOST_AUTH_METHOD: trust
-      keydb:
-        image: eqalpha/keydb:latest
+      dragonfly:
+        image: docker.dragonflydb.io/dragonflydb/dragonfly
+        options: --ulimit "memlock=-1"
+        env:
+          DFLY_version_check: false
+          DFLY_tcp_backlog: 2048
+          DFLY_default_lua_flags: allow-undeclared-keys
+          DFLY_pipeline_squash: 0
+          DFLY_multi_exec_squash: false
+          DFLY_conn_io_threads: 4
+          DFLY_epoll_file_threads: 4
+          DFLY_proactor_threads: 4
         ports:
           - 56312:6379
 
@@ -99,7 +119,7 @@ jobs:
         with:
           run_install: false
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'

.github/workflows/test-frontend.yml

@@ -39,7 +39,7 @@ jobs:
       with:
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/[email protected].3
+      uses: actions/[email protected].4
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

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

@@ -32,7 +32,7 @@ jobs:
       - run: corepack enable
 
       - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'

.github/workflows/test-production.yml

@@ -29,7 +29,7 @@ jobs:
       with:
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/[email protected].3
+      uses: actions/[email protected].4
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

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

@@ -30,7 +30,7 @@ jobs:
       with:
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/[email protected].3
+      uses: actions/[email protected].4
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

.gitignore

@@ -53,7 +53,6 @@ run.bat
 api-docs.json
 *.log
 /redis
-/keydb
 *.code-workspace
 .DS_Store
 /files

chart/templates/Deployment.yml

@@ -37,8 +37,25 @@ spec:
               value: "misskey"
           ports:
             - containerPort: 5432
-        - name: keydb
-          image: eqalpha/keydb:latest
+        - name: dragonfly
+          image: docker.dragonflydb.io/dragonflydb/dragonfly
+          env:
+            - name: DFLY_version_check
+              value: false
+            - name: DFLY_tcp_backlog
+              value: 2048
+            - name: DFLY_default_lua_flags
+              value: allow-undeclared-keys
+            - name: DFLY_pipeline_squash
+              value: 0
+            - name: DFLY_multi_exec_squash
+              value: false
+            - name: DFLY_conn_io_threads
+              value: 4
+            - name: DFLY_epoll_file_threads
+              value: 4
+            - name: DFLY_proactor_threads
+              value: 4
           ports:
             - containerPort: 6379
       volumes:

docker-compose.local-db.yml

@@ -3,17 +3,25 @@ version: "3"
 # このconfigは、 dockerでMisskey本体を起動せず、 redisとpostgresql などだけを起動します
 
 services:
-  keydb:
+  dragonfly:
     restart: always
-    image: eqalpha/keydb:latest
+    image: docker.dragonflydb.io/dragonflydb/dragonfly
+    ulimits:
+      memlock: -1
+    environment:
+      DFLY_snapshot_cron: '* * * * *'
+      DFLY_version_check: false
+      DFLY_tcp_backlog: 2048
+      DFLY_default_lua_flags: allow-undeclared-keys
+      DFLY_pipeline_squash: 0
+      DFLY_multi_exec_squash: false
+      DFLY_conn_io_threads: 4
+      DFLY_epoll_file_threads: 4
+      DFLY_proactor_threads: 4
     ports:
       - "6379:6379"
     volumes:
-      - ./keydb:/data
-    healthcheck:
-      test: "keydb-cli ping"
-      interval: 5s
-      retries: 20
+      - ./redis:/data
 
   db:
     restart: always

docker-compose_example.yml

@@ -6,13 +6,13 @@ services:
     restart: always
     links:
       - db
-      - keydb
+      - dragonfly
 #     - mcaptcha
 #     - meilisearch
     depends_on:
       db:
         condition: service_healthy
-      keydb:
+      dragonfly:
         condition: service_healthy
     ports:
       - "3000:3000"
@@ -23,17 +23,25 @@ services:
       - ./files:/misskey/files
       - ./.config:/misskey/.config:ro
 
-  keydb:
+  dragonfly:
     restart: always
-    image: eqalpha/keydb:latest
+    image: docker.dragonflydb.io/dragonflydb/dragonfly
+    ulimits:
+      memlock: -1
+    environment:
+      DFLY_snapshot_cron: '* * * * *'
+      DFLY_version_check: false
+      DFLY_tcp_backlog: 2048
+      DFLY_default_lua_flags: allow-undeclared-keys
+      DFLY_pipeline_squash: 0
+      DFLY_multi_exec_squash: false
+      DFLY_conn_io_threads: 4
+      DFLY_epoll_file_threads: 4
+      DFLY_proactor_threads: 4
     networks:
       - internal_network
     volumes:
-      - ./keydb:/data
-    healthcheck:
-      test: "keydb-cli ping"
-      interval: 5s
-      retries: 20
+      - ./redis:/data
 
   db:
     restart: always

locales/en-US.yml

@@ -442,6 +442,10 @@ moderation: "Moderation"
 moderationNote: "Moderation note"
 addModerationNote: "Add moderation note"
 moderationLogs: "Moderation logs"
+userAccountMoveLogs: "Account migration logs"
+userAccountMoveLogsTitle: "{from} migrated the account to {to}"
+movedToId: "ID of the account migrated to"
+moveFromId: "ID of the account migrated from"
 nUsersMentioned: "Mentioned by {n} users"
 securityKeyAndPasskey: "Security- and passkeys"
 securityKey: "Security key"
@@ -1088,6 +1092,7 @@ audioFiles: "Audio"
 dataSaver: "Data Saver"
 accountMigration: "Account Migration"
 accountMoved: "This user has moved to a new account:"
+accountMovedFrom: "This user has been migrated from the following account:"
 accountMovedShort: "This account has been migrated."
 operationForbidden: "Operation forbidden"
 forceShowAds: "Always show ads"