Merge commit 'e41619775f0ab57d67d4f49637768417730d68c0' into notes-embed

.config/docker_example.yml

@@ -95,15 +95,15 @@ redis:
 #  #prefix: example-prefix
 #  #db: 1
 
-#   ┌─────────────────────────────┐
-#───┘ Elasticsearch configuration └─────────────────────────────
+#   ┌───────────────────────────┐
+#───┘ MeiliSearch configuration └─────────────────────────────
 
-#elasticsearch:
-#  host: localhost
-#  port: 9200
-#  ssl: false
-#  user:
-#  pass:
+#meilisearch:
+#  host: meilisearch
+#  port: 7700
+#  apiKey: ''
+#  ssl: true
+#  index: ''
 
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────
@@ -114,14 +114,15 @@ redis:
 
 # Available methods:
 # aid ... Short, Millisecond accuracy
+# aidx ... 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'
+id: 'aidx'
 
 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────
@@ -165,8 +166,8 @@ proxyBypassHosts:
 # Media Proxy
 #mediaProxy: https://example.com/proxy
 
-# Proxy remote files (default: false)
-#proxyRemoteFiles: true
+# Proxy remote files (default: true)
+proxyRemoteFiles: true
 
 # Sign to ActivityPub GET request (default: true)
 signToActivityPubGet: true

.config/example.yml

@@ -30,6 +30,10 @@ url: https://example.tld/
 # The port that your Misskey server should listen on.
 port: 3000
 
+# You can also use UNIX domain socket. 
+# socket: /path/to/misskey.sock
+# chmodSocket: '777'
+
 #   ┌──────────────────────────┐
 #───┘ PostgreSQL configuration └────────────────────────────────
 
@@ -78,6 +82,8 @@ redis:
   #pass: example-pass
   #prefix: example-prefix
   #db: 1
+  # You can specify more ioredis options...
+  #username: example-username
 
 #redisForPubsub:
 #  host: localhost
@@ -86,6 +92,8 @@ redis:
 #  #pass: example-pass
 #  #prefix: example-prefix
 #  #db: 1
+#  # You can specify more ioredis options...
+#  #username: example-username
 
 #redisForJobQueue:
 #  host: localhost
@@ -94,16 +102,19 @@ redis:
 #  #pass: example-pass
 #  #prefix: example-prefix
 #  #db: 1
+#  # You can specify more ioredis options...
+#  #username: example-username
 
-#   ┌─────────────────────────────┐
-#───┘ Elasticsearch configuration └─────────────────────────────
+#   ┌───────────────────────────┐
+#───┘ MeiliSearch configuration └─────────────────────────────
 
-#elasticsearch:
+#meilisearch:
 #  host: localhost
-#  port: 9200
-#  ssl: false
-#  user: 
-#  pass: 
+#  port: 7700
+#  apiKey: ''
+#  ssl: true
+#  index: ''
+#  scope: local
 
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────
@@ -114,14 +125,15 @@ redis:
 
 # Available methods:
 # aid ... Short, Millisecond accuracy
+# aidx ... 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'
+id: 'aidx'
 
 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────
@@ -133,16 +145,23 @@ id: 'aid'
 #clusterLimit: 1
 
 # Job concurrency per worker
-# deliverJobConcurrency: 128
-# inboxJobConcurrency: 16
+#deliverJobConcurrency: 128
+#inboxJobConcurrency: 16
+#relashionshipJobConcurrency: 16
+# What's relashionshipJob?:
+#  Follow, unfollow, block and unblock(ings) while following-imports, etc. or account migrations.
 
 # Job rate limiter
-# deliverJobPerSec: 128
-# inboxJobPerSec: 16
+#deliverJobPerSec: 128
+#inboxJobPerSec: 16
+#relashionshipJobPerSec: 64
 
 # Job attempts
-# deliverJobMaxAttempts: 12
-# inboxJobMaxAttempts: 8
+#deliverJobMaxAttempts: 12
+#inboxJobMaxAttempts: 8
+
+# Local address used for outgoing requests
+#outgoingAddress: 127.0.0.1
 
 # IP address family used for outgoing request (ipv4, ipv6 or dual)
 #outgoingAddressFamily: ipv4
@@ -168,9 +187,9 @@ proxyBypassHosts:
 # * Perform image compression (on a different server resource than the main process)
 #mediaProxy: https://example.com/proxy
 
-# Proxy remote files (default: false)
+# Proxy remote files (default: true)
 # Proxy remote files by this instance or mediaProxy to prevent remote files from running in remote domains.
-#proxyRemoteFiles: true
+proxyRemoteFiles: true
 
 # Movie Thumbnail Generation URL
 # There is no reference implementation.

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
 	"features": {
 		"ghcr.io/devcontainers-contrib/features/pnpm:2": {},
 		"ghcr.io/devcontainers/features/node:1": {
-			"version": "18.16.0"
+			"version": "20.5.1"
 		}
 	},
 	"forwardPorts": [3000],

.devcontainer/devcontainer.yml

@@ -95,15 +95,15 @@ redis:
 #  #prefix: example-prefix
 #  #db: 1
 
-#   ┌─────────────────────────────┐
-#───┘ Elasticsearch configuration └─────────────────────────────
+#   ┌───────────────────────────┐
+#───┘ MeiliSearch configuration └─────────────────────────────
 
-#elasticsearch:
-#  host: localhost
-#  port: 9200
-#  ssl: false
-#  user:
-#  pass:
+#meilisearch:
+#  host: meilisearch
+#  port: 7700
+#  apiKey: ''
+#  ssl: true
+#  index: ''
 
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────
@@ -114,14 +114,15 @@ redis:
 
 # Available methods:
 # aid ... Short, Millisecond accuracy
+# aidx ... 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'
+id: 'aidx'
 
 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────
@@ -165,8 +166,8 @@ proxyBypassHosts:
 # Media Proxy
 #mediaProxy: https://example.com/proxy
 
-# Proxy remote files (default: false)
-#proxyRemoteFiles: true
+# Proxy remote files (default: true)
+proxyRemoteFiles: true
 
 # Sign to ActivityPub GET request (default: true)
 signToActivityPubGet: true

.devcontainer/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   app:
-    build: 
+    build:
       context: .
       dockerfile: Dockerfile
 

.dockerignore

@@ -8,7 +8,6 @@ build/
 built/
 db/
 docker-compose.yml
-elasticsearch/
 node_modules/
 packages/*/node_modules
 redis/

.editorconfig

@@ -6,6 +6,10 @@ indent_size = 2
 charset = utf-8
 insert_final_newline = true
 end_of_line = lf
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
 
 [*.{yml,yaml}]
 indent_style = space

.github/ISSUE_TEMPLATE/01_bug-report.md

@@ -37,7 +37,24 @@ Please include errors from the developer console and/or server log files if you
 ## 📌 Environment
 
 <!-- Tell us where on the platform it happens -->
-
-Misskey version:
-Your OS:
-Your browser:
+<!-- DO NOT WRITE "latest". Please provide the specific version. -->
+
+### 💻 Frontend
+* Model and OS of the device(s):
+  <!-- Example: MacBook Pro (14inch, 2021), macOS Ventura 13.4 -->
+* Browser:
+  <!-- Example: Chrome 113.0.5672.126 -->
+* Server URL:
+  <!-- Example: misskey.io -->
+* Misskey:
+  13.x.x
+
+### 🛰 Backend (for server admin)
+<!-- If you are using a managed service, put that after the version. -->
+
+* Installation Method or Hosting Service: <!-- Example: docker compose, k8s/docker, systemd, "Misskey install shell script", development environment -->
+* Misskey: 13.x.x
+* Node: 20.x.x
+* PostgreSQL: 15.x.x
+* Redis: 7.x.x
+* OS and Architecture: <!-- Example: Ubuntu 22.04.2 LTS aarch64 -->

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,4 @@
 contact_links:
-  - name: 👪 Misskey Forum
-    url: https://forum.misskey.io/
-    about: Ask questions and share knowledge
   - name: 💬 Misskey official Discord
     url: https://discord.gg/Wp8gVStHW3
     about: Chat freely about Misskey

.github/dependabot.yml

@@ -9,24 +9,24 @@ updates:
   directory: "/"
   schedule:
     interval: daily
-  open-pull-requests-limit: 0
+  open-pull-requests-limit: 100
+
+# Add only the root, not each workspace item
+# https://github.com/dependabot/dependabot-core/issues/4993#issuecomment-1289133027
 - package-ecosystem: npm
   directory: "/"
   schedule:
     interval: daily
+  # PNPM has an issue with dependabot. See:
+  # https://github.com/dependabot/dependabot-core/issues/7258
+  # https://github.com/pnpm/pnpm/issues/6530
+  # TODO: Restore this when the issue is solved
   open-pull-requests-limit: 0
-- package-ecosystem: npm
-  directory: "/packages/backend"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 0
-- package-ecosystem: npm
-  directory: "/packages/frontend"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 0
-- package-ecosystem: npm
-  directory: "/packages/sw"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 0
+  groups:
+    swc:
+      patterns:
+        - "@swc/*"
+    storybook:
+      patterns:
+        - "storybook*"
+        - "@storybook/*"

.github/labeler.yml

@@ -1,12 +1,21 @@
-'⚙️Server':
+'packages/backend':
 - packages/backend/**/*
 
-'🖥️Client':
+'packages/backend:test':
+- packages/backend/test/**/*
+
+'packages/frontend':
 - packages/frontend/**/*
 
-'🧪Test':
+'packages/frontend:test':
 - cypress/**/*
-- packages/backend/test/**/*
 
-'‼️ wrong locales':
-- any: ['locales/*.yml', '!locales/ja-JP.yml']
+'packages/sw':
+- packages/sw/**/*
+
+'packages/misskey-js':
+- packages/misskey-js/**/*
+
+'packages/misskey-js:test':
+- packages/misskey-js/test/**/*
+- packages/misskey-js/test-d/**/*

.github/misskey/test.yml

@@ -12,4 +12,4 @@ db:
 redis:
   host: 127.0.0.1
   port: 56312
-id: aid
+id: aidx

.github/pull_request_template.md

@@ -19,5 +19,6 @@ https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md
 ## Checklist
 - [ ] Read the [contribution guide](https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md)
 - [ ] Test working in a local environment
+- [ ] (If needed) Add story of storybook
 - [ ] (If needed) Update CHANGELOG.md
 - [ ] (If possible) Add tests