Skip to content

Commit 53d5669

Browse files
jbblilyjbblily
authored
Merge branch 'misskey-dev:master' into master
2 parents c1a8dec + 5fc8b3b commit 53d5669

File tree

603 files changed

+21676
-8684
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

603 files changed

+21676
-8684
lines changed

‎.config/cypress-devcontainer.yml

+211
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,211 @@
1+
#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
2+
# Misskey configuration
3+
#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
4+
5+
# ┌─────┐
6+
#───┘ URL └─────────────────────────────────────────────────────
7+
8+
# Final accessible URL seen by a user.
9+
url: 'http://misskey.local'
10+
11+
# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
12+
# URL SETTINGS AFTER THAT!
13+
14+
# ┌───────────────────────┐
15+
#───┘ Port and TLS settings └───────────────────────────────────
16+
17+
#
18+
# Misskey requires a reverse proxy to support HTTPS connections.
19+
#
20+
# +----- https://example.tld/ ------------+
21+
# +------+ |+-------------+ +----------------+|
22+
# | User | ---> || Proxy (443) | ---> | Misskey (3000) ||
23+
# +------+ |+-------------+ +----------------+|
24+
# +---------------------------------------+
25+
#
26+
# You need to set up a reverse proxy. (e.g. nginx)
27+
# An encrypted connection with HTTPS is highly recommended
28+
# because tokens may be transferred in GET requests.
29+
30+
# The port that your Misskey server should listen on.
31+
port: 61812
32+
33+
# ┌──────────────────────────┐
34+
#───┘ PostgreSQL configuration └────────────────────────────────
35+
36+
db:
37+
host: db
38+
port: 5432
39+
40+
# Database name
41+
db: misskey
42+
43+
# Auth
44+
user: postgres
45+
pass: postgres
46+
47+
# Whether disable Caching queries
48+
#disableCache: true
49+
50+
# Extra Connection options
51+
#extra:
52+
# ssl: true
53+
54+
dbReplications: false
55+
56+
# You can configure any number of replicas here
57+
#dbSlaves:
58+
# -
59+
# host:
60+
# port:
61+
# db:
62+
# user:
63+
# pass:
64+
# -
65+
# host:
66+
# port:
67+
# db:
68+
# user:
69+
# pass:
70+
71+
# ┌─────────────────────┐
72+
#───┘ Redis configuration └─────────────────────────────────────
73+
74+
redis:
75+
host: redis
76+
port: 6379
77+
#family: 0 # 0=Both, 4=IPv4, 6=IPv6
78+
#pass: example-pass
79+
#prefix: example-prefix
80+
#db: 1
81+
82+
#redisForPubsub:
83+
# host: redis
84+
# port: 6379
85+
# #family: 0 # 0=Both, 4=IPv4, 6=IPv6
86+
# #pass: example-pass
87+
# #prefix: example-prefix
88+
# #db: 1
89+
90+
#redisForJobQueue:
91+
# host: redis
92+
# port: 6379
93+
# #family: 0 # 0=Both, 4=IPv4, 6=IPv6
94+
# #pass: example-pass
95+
# #prefix: example-prefix
96+
# #db: 1
97+
98+
#redisForTimelines:
99+
# host: redis
100+
# port: 6379
101+
# #family: 0 # 0=Both, 4=IPv4, 6=IPv6
102+
# #pass: example-pass
103+
# #prefix: example-prefix
104+
# #db: 1
105+
106+
#redisForReactions:
107+
# host: redis
108+
# port: 6379
109+
# #family: 0 # 0=Both, 4=IPv4, 6=IPv6
110+
# #pass: example-pass
111+
# #prefix: example-prefix
112+
# #db: 1
113+
114+
# ┌───────────────────────────┐
115+
#───┘ MeiliSearch configuration └─────────────────────────────
116+
117+
#meilisearch:
118+
# host: meilisearch
119+
# port: 7700
120+
# apiKey: ''
121+
# ssl: true
122+
# index: ''
123+
124+
# ┌───────────────┐
125+
#───┘ ID generation └───────────────────────────────────────────
126+
127+
# You can select the ID generation method.
128+
# You don't usually need to change this setting, but you can
129+
# change it according to your preferences.
130+
131+
# Available methods:
132+
# aid ... Short, Millisecond accuracy
133+
# aidx ... Millisecond accuracy
134+
# meid ... Similar to ObjectID, Millisecond accuracy
135+
# ulid ... Millisecond accuracy
136+
# objectid ... This is left for backward compatibility
137+
138+
# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
139+
# ID SETTINGS AFTER THAT!
140+
141+
id: 'aidx'
142+
143+
# ┌────────────────┐
144+
#───┘ Error tracking └──────────────────────────────────────────
145+
146+
# Sentry is available for error tracking.
147+
# See the Sentry documentation for more details on options.
148+
149+
#sentryForBackend:
150+
# enableNodeProfiling: true
151+
# options:
152+
# dsn: 'https://[email protected]/0'
153+
154+
#sentryForFrontend:
155+
# options:
156+
# dsn: 'https://[email protected]/0'
157+
158+
# ┌─────────────────────┐
159+
#───┘ Other configuration └─────────────────────────────────────
160+
161+
# Whether disable HSTS
162+
#disableHsts: true
163+
164+
# Number of worker processes
165+
#clusterLimit: 1
166+
167+
# Job concurrency per worker
168+
# deliverJobConcurrency: 128
169+
# inboxJobConcurrency: 16
170+
171+
# Job rate limiter
172+
# deliverJobPerSec: 128
173+
# inboxJobPerSec: 32
174+
175+
# Job attempts
176+
# deliverJobMaxAttempts: 12
177+
# inboxJobMaxAttempts: 8
178+
179+
# IP address family used for outgoing request (ipv4, ipv6 or dual)
180+
#outgoingAddressFamily: ipv4
181+
182+
# Proxy for HTTP/HTTPS
183+
#proxy: http://127.0.0.1:3128
184+
185+
proxyBypassHosts:
186+
- api.deepl.com
187+
- api-free.deepl.com
188+
- www.recaptcha.net
189+
- hcaptcha.com
190+
- challenges.cloudflare.com
191+
192+
# Proxy for SMTP/SMTPS
193+
#proxySmtp: http://127.0.0.1:3128 # use HTTP/1.1 CONNECT
194+
#proxySmtp: socks4://127.0.0.1:1080 # use SOCKS4
195+
#proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5
196+
197+
# Media Proxy
198+
#mediaProxy: https://example.com/proxy
199+
200+
# Proxy remote files (default: true)
201+
proxyRemoteFiles: true
202+
203+
# Sign to ActivityPub GET request (default: true)
204+
signToActivityPubGet: true
205+
206+
allowedPrivateNetworks: [
207+
'127.0.0.1/32'
208+
]
209+
210+
# Upload or download file size limits (bytes)
211+
#maxFileSize: 262144000

‎.config/docker_example.yml

+8
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,14 @@ redis:
106106
# #prefix: example-prefix
107107
# #db: 1
108108

109+
#redisForReactions:
110+
# host: redis
111+
# port: 6379
112+
# #family: 0 # 0=Both, 4=IPv4, 6=IPv6
113+
# #pass: example-pass
114+
# #prefix: example-prefix
115+
# #db: 1
116+
109117
# ┌───────────────────────────┐
110118
#───┘ MeiliSearch configuration └─────────────────────────────
111119

‎.config/example.yml

+10
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,16 @@ redis:
172172
# # You can specify more ioredis options...
173173
# #username: example-username
174174

175+
#redisForReactions:
176+
# host: localhost
177+
# port: 6379
178+
# #family: 0 # 0=Both, 4=IPv4, 6=IPv6
179+
# #pass: example-pass
180+
# #prefix: example-prefix
181+
# #db: 1
182+
# # You can specify more ioredis options...
183+
# #username: example-username
184+
175185
# ┌───────────────────────────┐
176186
#───┘ MeiliSearch configuration └─────────────────────────────
177187

‎.devcontainer/devcontainer.yml

+8
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,14 @@ redis:
103103
# #prefix: example-prefix
104104
# #db: 1
105105

106+
#redisForReactions:
107+
# host: redis
108+
# port: 6379
109+
# #family: 0 # 0=Both, 4=IPv4, 6=IPv6
110+
# #pass: example-pass
111+
# #prefix: example-prefix
112+
# #db: 1
113+
106114
# ┌───────────────────────────┐
107115
#───┘ MeiliSearch configuration └─────────────────────────────
108116

‎.devcontainer/init.sh

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
set -xe
44

55
sudo chown node node_modules
6+
sudo apt-get update
7+
sudo apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 libasound2 libxtst6 xauth xvfb
68
git config --global --add safe.directory /workspace
79
git submodule update --init
810
corepack install
@@ -12,3 +14,4 @@ pnpm install --frozen-lockfile
1214
cp .devcontainer/devcontainer.yml .config/default.yml
1315
pnpm build
1416
pnpm migrate
17+
pnpm exec cypress install

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- run: corepack enable
2222

2323
- name: Setup Node.js
24-
uses: actions/[email protected].3
24+
uses: actions/[email protected].4
2525
with:
2626
node-version-file: '.node-version'
2727
cache: 'pnpm'

‎.github/workflows/changelog-check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Checkout head
1515
uses: actions/[email protected]
1616
- name: Setup Node.js
17-
uses: actions/[email protected].3
17+
uses: actions/[email protected].4
1818
with:
1919
node-version-file: '.node-version'
2020

‎.github/workflows/check-misskey-js-autogen.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
- name: setup node
3030
id: setup-node
31-
uses: actions/[email protected].3
31+
uses: actions/[email protected].4
3232
with:
3333
node-version-file: '.node-version'
3434
cache: pnpm

‎.github/workflows/check-spdx-license-id.yml

+4
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,16 @@ jobs:
4848
"packages/backend/migration"
4949
"packages/backend/src"
5050
"packages/backend/test"
51+
"packages/frontend-shared/@types"
52+
"packages/frontend-shared/js"
5153
"packages/frontend/.storybook"
5254
"packages/frontend/@types"
5355
"packages/frontend/lib"
5456
"packages/frontend/public"
5557
"packages/frontend/src"
5658
"packages/frontend/test"
59+
"packages/frontend-embed/@types"
60+
"packages/frontend-embed/src"
5761
"packages/misskey-bubble-game/src"
5862
"packages/misskey-reversi/src"
5963
"packages/sw/src"

‎.github/workflows/get-api-diff.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Install pnpm
3434
uses: pnpm/action-setup@v4
3535
- name: Use Node.js ${{ matrix.node-version }}
36-
uses: actions/[email protected].3
36+
uses: actions/[email protected].4
3737
with:
3838
node-version: ${{ matrix.node-version }}
3939
cache: 'pnpm'

0 commit comments

Comments
 (0)