Skip to content

Commit 5249a17

Browse files
kakkokari-gtyihkakkokari-gtyih
authored
Merge branch 'develop' into fix-13766
2 parents b2b13ac + 752606f commit 5249a17

File tree

895 files changed

+35992
-13969
lines changed

Some content is hidden

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

895 files changed

+35992
-13969
lines changed

‎.config/cypress-devcontainer.yml

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

+24
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,20 @@
5959
#
6060
# publishTarballInsteadOfProvideRepositoryUrl: true
6161

62+
# ┌────────────────────────┐
63+
#───┘ Initial Setup Password └─────────────────────────────────────────────────────
64+
65+
# Password to initiate setting up admin account.
66+
# It will not be used after the initial setup is complete.
67+
#
68+
# Be sure to change this when you set up Misskey via the Internet.
69+
#
70+
# The provider of the service who sets up Misskey on behalf of the customer should
71+
# set this value to something unique when generating the Misskey config file,
72+
# and provide it to the customer.
73+
#
74+
# setupPassword: example_password_please_change_this_or_you_will_get_hacked
75+
6276
# ┌─────┐
6377
#───┘ URL └─────────────────────────────────────────────────────
6478

@@ -172,6 +186,16 @@ redis:
172186
# # You can specify more ioredis options...
173187
# #username: example-username
174188

189+
#redisForReactions:
190+
# host: localhost
191+
# port: 6379
192+
# #family: 0 # 0=Both, 4=IPv4, 6=IPv6
193+
# #pass: example-pass
194+
# #prefix: example-prefix
195+
# #db: 1
196+
# # You can specify more ioredis options...
197+
# #username: example-username
198+
175199
# ┌───────────────────────────┐
176200
#───┘ MeiliSearch configuration └─────────────────────────────
177201

‎.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"workspaceFolder": "/workspace",
66
"features": {
77
"ghcr.io/devcontainers/features/node:1": {
8-
"version": "20.16.0"
8+
"version": "22.11.0"
99
},
1010
"ghcr.io/devcontainers-contrib/features/corepack:1": {}
1111
},

‎.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/labeler.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
'packages/backend:test':
77
- any:
88
- changed-files:
9-
- any-glob-to-any-file: ['packages/backend/test/**/*']
9+
- any-glob-to-any-file: ['packages/backend/test/**/*', 'packages/backend/test-federation/**/*']
1010

1111
'packages/frontend':
1212
- any:

‎.github/misskey/test.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
url: 'http://misskey.local'
22

3+
setupPassword: example_password_please_change_this_or_you_will_get_hacked
4+
35
# ローカルでテストするときにポートを被らないようにするためデフォルトのものとは変える(以下同じ)
46
port: 61812
57

‎.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

+8-2
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@ jobs:
2121
uses: actions/[email protected]
2222
with:
2323
submodules: true
24+
persist-credentials: false
2425
ref: refs/pull/${{ github.event.pull_request.number }}/merge
2526

2627
- name: setup pnpm
2728
uses: pnpm/action-setup@v4
2829

2930
- name: setup node
3031
id: setup-node
31-
uses: actions/[email protected].3
32+
uses: actions/[email protected].4
3233
with:
3334
node-version-file: '.node-version'
3435
cache: pnpm
@@ -57,7 +58,7 @@ jobs:
5758
name: generated-misskey-js
5859
path: packages/misskey-js/generator/built/autogen
5960

60-
# pull_request_target safety: permissions: read-all, and there are no secrets used in this job
61+
# pull_request_target safety: permissions: read-all, and no user codes are executed
6162
get-actual-misskey-js:
6263
runs-on: ubuntu-latest
6364
permissions:
@@ -68,6 +69,7 @@ jobs:
6869
uses: actions/[email protected]
6970
with:
7071
submodules: true
72+
persist-credentials: false
7173
ref: refs/pull/${{ github.event.pull_request.number }}/merge
7274

7375
- name: Upload From Merged
@@ -131,3 +133,7 @@ jobs:
131133
mode: delete
132134
message: "Thank you!"
133135
create_if_not_exists: false
136+
137+
- name: Make failure if changes are detected
138+
if: steps.check-changes.outputs.changes == 'true'
139+
run: exit 1

0 commit comments

Comments
 (0)