Skip to content

Commit 492bd37

Browse files
authored
release: v2024.10.1-kakurega.1.39.2 (#160)
2 parents d527274 + f15c8cc commit 492bd37

File tree

433 files changed

+6609
-1965
lines changed

Some content is hidden

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

433 files changed

+6609
-1965
lines changed

.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/workflows/test-federation.yml

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Test (federation)
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- develop
8+
paths:
9+
- packages/backend/**
10+
- packages/misskey-js/**
11+
- .github/workflows/test-federation.yml
12+
pull_request:
13+
paths:
14+
- packages/backend/**
15+
- packages/misskey-js/**
16+
- .github/workflows/test-federation.yml
17+
18+
jobs:
19+
test:
20+
runs-on: ubuntu-latest
21+
strategy:
22+
matrix:
23+
node-version: [20.16.0]
24+
steps:
25+
- uses: actions/checkout@v4
26+
with:
27+
submodules: true
28+
- name: Install pnpm
29+
uses: pnpm/action-setup@v4
30+
- name: Install FFmpeg
31+
uses: FedericoCarboni/setup-ffmpeg@v3
32+
- name: Use Node.js ${{ matrix.node-version }}
33+
uses: actions/[email protected]
34+
with:
35+
node-version: ${{ matrix.node-version }}
36+
cache: 'pnpm'
37+
- name: Build Misskey
38+
run: |
39+
corepack enable && corepack prepare
40+
pnpm i --frozen-lockfile
41+
pnpm build
42+
- name: Setup
43+
run: |
44+
cd packages/backend/test-federation
45+
bash ./setup.sh
46+
sudo chmod 644 ./certificates/*.test.key
47+
- name: Start servers
48+
# https://github.com/docker/compose/issues/1294#issuecomment-374847206
49+
run: |
50+
cd packages/backend/test-federation
51+
docker compose up -d --scale tester=0
52+
- name: Test
53+
run: |
54+
cd packages/backend/test-federation
55+
docker compose run --no-deps tester
56+
- name: Stop servers
57+
run: |
58+
cd packages/backend/test-federation
59+
docker compose down

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ coverage
3737
!/.config/docker_example.env
3838
!/.config/cypress-devcontainer.yml
3939
docker-compose.yml
40-
compose.yml
40+
./compose.yml
4141
.devcontainer/compose.yml
4242
!/.devcontainer/compose.yml
4343

CHANGELOG.md

+23
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
## 2024.10.1
2+
3+
### Note
4+
- スパム対策として、モデレータ権限を持つユーザのアクティビティが7日以上確認できない場合は自動的に招待制へと切り替え(コントロールパネル -> モデレーション -> "誰でも新規登録できるようにする"をオフに変更)るようになりました。 ( #13437 )
5+
- 切り替わった際はモデレーターへお知らせとして通知されます。登録をオープンな状態で継続したい場合は、コントロールパネルから再度設定を行ってください。
6+
7+
### General
8+
- Feat: ユーザーの名前に禁止ワードを設定できるように
9+
10+
### Client
11+
- Enhance: タイムライン表示時のパフォーマンスを向上
12+
- Enhance: アーカイブした個人宛のお知らせを表示・編集できるように
13+
- Enhance: l10nの更新
14+
- Fix: メールアドレス不要でCaptchaが有効な場合にアカウント登録完了後自動でのログインに失敗する問題を修正
15+
16+
### Server
17+
- Feat: モデレータ権限を持つユーザが全員7日間活動しなかった場合は自動的に招待制へと切り替えるように ( #13437 )
18+
- Enhance: 個人宛のお知らせは「わかった」を押すと自動的にアーカイブされるように
19+
- Fix: `admin/emoji/update`エンドポイントのidのみ指定した時不正なエラーが発生するバグを修正
20+
- Fix: RBT有効時、リノートのリアクションが反映されない問題を修正
21+
- Fix: キューのエラーログを簡略化するように
22+
(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/649)
23+
124
## 2024.10.0
225

326
### Note

CONTRIBUTING.md

+33-19
Original file line numberDiff line numberDiff line change
@@ -181,31 +181,45 @@ MK_DEV_PREFER=backend pnpm dev
181181
- HMR may not work in some environments such as Windows.
182182

183183
## Testing
184-
- Test codes are located in [`/packages/backend/test`](/packages/backend/test).
185-
186-
### Run test
187-
Create a config file.
184+
You can run non-backend tests by executing following commands:
185+
```sh
186+
pnpm --filter frontend test
187+
pnpm --filter misskey-js test
188188
```
189+
190+
Backend tests require manual preparation of servers. See the next section for more on this.
191+
192+
### Backend
193+
There are three types of test codes for the backend:
194+
- Unit tests: [`/packages/backend/test/unit`](/packages/backend/test/unit)
195+
- Single-server E2E tests: [`/packages/backend/test/e2e`](/packages/backend/test/e2e)
196+
- Multiple-server E2E tests: [`/packages/backend/test-federation`](/packages/backend/test-federation)
197+
198+
#### Running Unit Tests or Single-server E2E Tests
199+
1. Create a config file:
200+
```sh
189201
cp .github/misskey/test.yml .config/
190202
```
191-
Prepare DB/Redis for testing.
192-
```
193-
docker compose -f packages/backend/test/compose.yml up
194-
```
195-
Alternatively, prepare an empty (data can be erased) DB and edit `.config/test.yml`.
196203

197-
Run all test.
198-
```
199-
pnpm test
204+
2. Start DB and Redis servers for testing:
205+
```sh
206+
docker compose -f packages/backend/test/compose.yml up
200207
```
208+
Instead, you can prepare an empty (data can be erased) DB and edit `.config/test.yml` appropriately.
201209

202-
#### Run specify test
210+
3. Run all tests:
211+
```sh
212+
pnpm --filter backend test # unit tests
213+
pnpm --filter backend test:e2e # single-server E2E tests
203214
```
204-
pnpm jest -- foo.ts
215+
If you want to run a specific test, run as a following command:
216+
```sh
217+
pnpm --filter backend test -- packages/backend/test/unit/activitypub.ts
218+
pnpm --filter backend test:e2e -- packages/backend/test/e2e/nodeinfo.ts
205219
```
206220

207-
### e2e tests
208-
TODO
221+
#### Running Multiple-server E2E Tests
222+
See [`/packages/backend/test-federation/README.md`](/packages/backend/test-federation/README.md).
209223

210224
## Environment Variable
211225

@@ -578,18 +592,18 @@ ESMではディレクトリインポートは廃止されているのと、デ
578592
### Lighten CSS vars
579593
580594
``` css
581-
color: hsl(from var(--accent) h s calc(l + 10));
595+
color: hsl(from var(--MI_THEME-accent) h s calc(l + 10));
582596
```
583597
584598
### Darken CSS vars
585599
586600
``` css
587-
color: hsl(from var(--accent) h s calc(l - 10));
601+
color: hsl(from var(--MI_THEME-accent) h s calc(l - 10));
588602
```
589603
590604
### Add alpha to CSS vars
591605
592606
``` css
593-
color: color(from var(--accent) srgb r g b / 0.5);
607+
color: color(from var(--MI_THEME-accent) srgb r g b / 0.5);
594608
```
595609

idea/MkDisableSection.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ defineProps<{
3434
width: 100%;
3535
height: 100%;
3636
cursor: not-allowed;
37-
--color: color(from var(--error) srgb r g b / 0.25);
37+
--color: color(from var(--MI_THEME-error) srgb r g b / 0.25);
3838
background-size: auto auto;
3939
background-image: repeating-linear-gradient(135deg, transparent, transparent 10px, var(--color) 4px, var(--color) 14px);
4040
}

locales/ar-SA.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,6 @@ _theme:
12521252
buttonBg: "خلفية الأزرار"
12531253
buttonHoverBg: "خلفية الأزرار (عند التمرير فوقها)"
12541254
inputBorder: "حواف حقل الإدخال"
1255-
listItemHoverBg: "خلفية عناصر القائمة (عند التمرير فوقها)"
12561255
driveFolderBg: "خلفية مجلد قرص التخزين"
12571256
messageBg: "خلفية المحادثة"
12581257
_sfx:

locales/bn-BD.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,6 @@ _theme:
10171017
buttonBg: "বাটনের পটভূমি"
10181018
buttonHoverBg: "বাটনের পটভূমি (হভার)"
10191019
inputBorder: "ইনপুট ফিল্ডের বর্ডার"
1020-
listItemHoverBg: "লিস্ট আইটেমের পটভূমি (হোভার)"
10211020
driveFolderBg: "ড্রাইভ ফোল্ডারের পটভূমি"
10221021
wallpaperOverlay: "ওয়ালপেপার ওভারলে"
10231022
badge: "ব্যাজ"

locales/ca-ES.yml

+13-1
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,7 @@ totpDescription: "Escriu una contrasenya d'un sol us fent servir l'aplicació d'
453453
moderator: "Moderador/a"
454454
moderation: "Moderació"
455455
moderationNote: "Nota de moderació "
456+
moderationNoteDescription: "Pots escriure notes que es compartiran entre els moderadors."
456457
addModerationNote: "Afegir una nota de moderació "
457458
moderationLogs: "Registre de moderació "
458459
nUsersMentioned: "{n} usuaris mencionats"
@@ -1284,6 +1285,15 @@ unknownWebAuthnKey: "Passkey desconeguda"
12841285
passkeyVerificationFailed: "La verificació a fallat"
12851286
passkeyVerificationSucceededButPasswordlessLoginDisabled: "La verificació de la passkey a estat correcta, però s'ha deshabilitat l'inici de sessió sense contrasenya."
12861287
messageToFollower: "Missatge als meus seguidors"
1288+
target: "Assumpte "
1289+
testCaptchaWarning: "És una característica dissenyada per a la prova de CAPTCHA. <strong>No l'utilitzes en l'entorn real.</strong>"
1290+
_abuseUserReport:
1291+
forward: "Reenviar "
1292+
forwardDescription: "Reenvia l'informe a una altra instància com un compte del sistema anònima."
1293+
resolve: "Solució "
1294+
accept: "Acceptar "
1295+
reject: "Rebutjar"
1296+
resolveTutorial: "Si l'informe és legítim selecciona \"Acceptar\" per resoldre'l positivament. Però si l'informe no és legítim selecciona \"Rebutjar\" per resoldre'l negativament."
12871297
_delivery:
12881298
status: "Estat d'entrega "
12891299
stop: "Suspés"
@@ -1421,6 +1431,7 @@ _serverSettings:
14211431
reactionsBufferingDescription: "Quan s'activa aquesta opció millora bastant el rendiment en recuperar les línies de temps reduint la càrrega de la base. Com a contrapunt, augmentarà l'ús de memòria de Redís. Desactiva aquesta opció en cas de tenir un servidor amb poca memòria o si tens problemes d'inestabilitat."
14221432
inquiryUrl: "URL de consulta "
14231433
inquiryUrlDescription: "Escriu adreça URL per al formulari de consulta per al mantenidor del servidor o una pàgina web amb el contacte d'informació."
1434+
thisSettingWillAutomaticallyOffWhenModeratorsInactive: "Si no es detecta activitat per part del moderador durant un període de temps, aquesta opció es desactiva automàticament per evitar el correu brossa."
14241435
_accountMigration:
14251436
moveFrom: "Migrar un altre compte a aquest"
14261437
moveFromSub: "Crear un àlies per un altre compte"
@@ -1974,7 +1985,6 @@ _theme:
19741985
buttonBg: "Fons botó "
19751986
buttonHoverBg: "Fons botó (en passar-hi per sobre)"
19761987
inputBorder: "Contorn del cap d'introducció "
1977-
listItemHoverBg: "Fons dels elements d'una llista"
19781988
driveFolderBg: "Fons de la carpeta Disc"
19791989
wallpaperOverlay: "Superposició del fons de pantalla "
19801990
badge: "Insígnia "
@@ -2520,6 +2530,8 @@ _moderationLogTypes:
25202530
markSensitiveDriveFile: "Fitxer marcat com a sensible"
25212531
unmarkSensitiveDriveFile: "S'ha tret la marca de sensible del fitxer"
25222532
resolveAbuseReport: "Informe resolt"
2533+
forwardAbuseReport: "Informe reenviat"
2534+
updateAbuseReportNote: "Nota de moderació d'un informe actualitzat"
25232535
createInvitation: "Crear codi d'invitació "
25242536
createAd: "Anunci creat"
25252537
deleteAd: "Anunci esborrat"

locales/cs-CZ.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1629,7 +1629,6 @@ _theme:
16291629
buttonBg: "Pozadí tlačítka"
16301630
buttonHoverBg: "Pozadí tlačítka (Hover)"
16311631
inputBorder: "Ohraničení vstupního pole"
1632-
listItemHoverBg: "Pozadí položky seznamu (Hover)"
16331632
driveFolderBg: "Pozadí složky disku"
16341633
wallpaperOverlay: "Překrytí tapety"
16351634
badge: "Odznak"

locales/de-DE.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1784,7 +1784,6 @@ _theme:
17841784
buttonBg: "Hintergrund von Schaltflächen"
17851785
buttonHoverBg: "Hintergrund von Schaltflächen (Mouseover)"
17861786
inputBorder: "Rahmen von Eingabefeldern"
1787-
listItemHoverBg: "Hintergrund von Listeneinträgen (Mouseover)"
17881787
driveFolderBg: "Hintergrund von Drive-Ordnern"
17891788
wallpaperOverlay: "Hintergrundbild-Overlay"
17901789
badge: "Wappen"

locales/en-US.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1988,7 +1988,6 @@ _theme:
19881988
buttonBg: "Button background"
19891989
buttonHoverBg: "Button background (Hover)"
19901990
inputBorder: "Input field border"
1991-
listItemHoverBg: "List item background (Hover)"
19921991
driveFolderBg: "Drive folder background"
19931992
wallpaperOverlay: "Wallpaper overlay"
19941993
badge: "Badge"

locales/es-ES.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1915,7 +1915,6 @@ _theme:
19151915
buttonBg: "Fondo de botón"
19161916
buttonHoverBg: "Fondo de botón (hover)"
19171917
inputBorder: "Borde de los campos de entrada"
1918-
listItemHoverBg: "Fondo de elemento de listas (hover)"
19191918
driveFolderBg: "Fondo de capeta del drive"
19201919
wallpaperOverlay: "Transparencia del fondo de pantalla"
19211920
badge: "Medalla"

locales/fr-FR.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1701,7 +1701,6 @@ _theme:
17011701
buttonBg: "Arrière-plan du bouton"
17021702
buttonHoverBg: "Arrière-plan du bouton (survolé)"
17031703
inputBorder: "Cadre de la zone de texte"
1704-
listItemHoverBg: "Arrière-plan d'item de liste (survolé)"
17051704
driveFolderBg: "Arrière-plan du dossier de disque"
17061705
wallpaperOverlay: "Superposition de fond d'écran"
17071706
badge: "Badge"

locales/id-ID.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1924,7 +1924,6 @@ _theme:
19241924
buttonBg: "Latar belakang tombol"
19251925
buttonHoverBg: "Latar belakang tombol (Mengambang)"
19261926
inputBorder: "Batas bidang masukan"
1927-
listItemHoverBg: "Latar belakang daftar item (Mengambang)"
19281927
driveFolderBg: "Latar belakang folder drive"
19291928
wallpaperOverlay: "Lapisan wallpaper"
19301929
badge: "Lencana"

locales/index.d.ts

+36-4
Original file line numberDiff line numberDiff line change
@@ -4530,6 +4530,10 @@ export interface Locale extends ILocale {
45304530
* リモートサーバーのチャートを生成
45314531
*/
45324532
"enableChartsForFederatedInstances": string;
4533+
/**
4534+
* リモートサーバーの情報を取得
4535+
*/
4536+
"enableStatsForFederatedInstances": string;
45334537
/**
45344538
* ノートのアクションにクリップを追加
45354539
*/
@@ -5598,6 +5602,26 @@ export interface Locale extends ILocale {
55985602
* 対象
55995603
*/
56005604
"target": string;
5605+
/**
5606+
* CAPTCHAのテストを目的とした機能です。<strong>本番環境で使用しないでください。</strong>
5607+
*/
5608+
"testCaptchaWarning": string;
5609+
/**
5610+
* 禁止ワード(ユーザーの名前)
5611+
*/
5612+
"prohibitedWordsForNameOfUser": string;
5613+
/**
5614+
* このリストに含まれる文字列がユーザーの名前に含まれる場合、ユーザーの名前の変更を拒否します。モデレーター権限を持つユーザーはこの制限の影響を受けません。
5615+
*/
5616+
"prohibitedWordsForNameOfUserDescription": string;
5617+
/**
5618+
* 変更しようとした名前に禁止された文字列が含まれています
5619+
*/
5620+
"yourNameContainsProhibitedWords": string;
5621+
/**
5622+
* 名前に禁止されている文字列が含まれています。この名前を使用したい場合は、サーバー管理者にお問い合わせください。
5623+
*/
5624+
"yourNameContainsProhibitedWordsDescription": string;
56015625
"_abuseUserReport": {
56025626
/**
56035627
* 転送
@@ -6128,6 +6152,10 @@ export interface Locale extends ILocale {
61286152
* サーバー運営者へのお問い合わせフォームのURLや、運営者の連絡先等が記載されたWebページのURLを指定します。
61296153
*/
61306154
"inquiryUrlDescription": string;
6155+
/**
6156+
* 一定期間モデレーターのアクティビティが検出されなかった場合、スパム防止のためこの設定は自動でオフになります。
6157+
*/
6158+
"thisSettingWillAutomaticallyOffWhenModeratorsInactive": string;
61316159
};
61326160
"_accountMigration": {
61336161
/**
@@ -8273,10 +8301,6 @@ export interface Locale extends ILocale {
82738301
* 入力ボックスの縁取り
82748302
*/
82758303
"inputBorder": string;
8276-
/**
8277-
* リスト項目の背景 (ホバー)
8278-
*/
8279-
"listItemHoverBg": string;
82808304
/**
82818305
* ドライブフォルダーの背景
82828306
*/
@@ -10205,6 +10229,14 @@ export interface Locale extends ILocale {
1020510229
* ユーザーが作成されたとき
1020610230
*/
1020710231
"userCreated": string;
10232+
/**
10233+
* モデレーターが一定期間非アクティブになったとき
10234+
*/
10235+
"inactiveModeratorsWarning": string;
10236+
/**
10237+
* モデレーターが一定期間非アクティブだったため、システムにより招待制へと変更されたとき
10238+
*/
10239+
"inactiveModeratorsInvitationOnlyChanged": string;
1020810240
};
1020910241
/**
1021010242
* Webhookを削除しますか?

0 commit comments

Comments
 (0)