Commit graph

26439 commits

Author SHA1 Message Date
3d3bfad5d0
fixup! more path sanitization
All checks were successful
Lint / pnpm_install (push) Successful in 1m58s
Publish Docker image / Build (push) Successful in 5m21s
Test (production install and build) / production (22.11.0) (push) Successful in 1m5s
Lint / lint (backend) (push) Successful in 2m14s
Test (backend) / unit (22.11.0) (push) Successful in 9m27s
Lint / lint (frontend) (push) Successful in 2m37s
Lint / lint (frontend-embed) (push) Successful in 2m18s
Lint / lint (frontend-shared) (push) Successful in 2m23s
Lint / lint (misskey-bubble-game) (push) Successful in 2m20s
Test (backend) / e2e (22.11.0) (push) Successful in 12m58s
Lint / lint (misskey-js) (push) Successful in 2m34s
Lint / lint (misskey-reversi) (push) Successful in 2m35s
Lint / lint (sw) (push) Successful in 2m19s
Lint / typecheck (misskey-js) (push) Successful in 1m37s
Lint / typecheck (backend) (push) Successful in 2m29s
Lint / typecheck (sw) (push) Successful in 1m38s
2024-11-19 03:15:48 -06:00
8a26ab9fb5
2024.11.0-yumechinokuni.5
All checks were successful
Test (production install and build) / production (22.11.0) (pull_request) Successful in 1m5s
Test (backend) / unit (22.11.0) (pull_request) Successful in 9m8s
Publish Docker image / Build (push) Successful in 4m37s
Lint / pnpm_install (push) Successful in 1m25s
Test (backend) / e2e (22.11.0) (pull_request) Successful in 11m50s
Test (production install and build) / production (22.11.0) (push) Successful in 1m1s
Lint / lint (backend) (pull_request) Successful in 1m56s
Test (backend) / unit (22.11.0) (push) Successful in 8m17s
Lint / lint (frontend) (pull_request) Successful in 2m13s
Lint / lint (frontend-embed) (pull_request) Successful in 2m30s
Lint / lint (frontend-shared) (pull_request) Successful in 2m19s
Test (backend) / e2e (22.11.0) (push) Successful in 12m12s
Lint / lint (misskey-bubble-game) (pull_request) Successful in 2m39s
Lint / lint (misskey-js) (pull_request) Successful in 2m37s
Lint / lint (misskey-reversi) (pull_request) Successful in 2m25s
Lint / typecheck (backend) (pull_request) Successful in 2m20s
Lint / lint (sw) (pull_request) Successful in 2m37s
Lint / typecheck (misskey-js) (pull_request) Successful in 1m34s
Lint / typecheck (sw) (pull_request) Successful in 1m51s
Lint / lint (backend) (push) Successful in 2m26s
Lint / lint (frontend) (push) Successful in 2m37s
Lint / lint (frontend-embed) (push) Successful in 2m15s
Lint / lint (frontend-shared) (push) Successful in 2m26s
Lint / lint (misskey-bubble-game) (push) Successful in 2m16s
Lint / lint (misskey-js) (push) Successful in 2m22s
Lint / lint (misskey-reversi) (push) Successful in 2m21s
Lint / lint (sw) (push) Successful in 2m22s
Lint / typecheck (backend) (push) Successful in 2m20s
Lint / typecheck (misskey-js) (push) Successful in 1m33s
Lint / typecheck (sw) (push) Successful in 1m34s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-19 01:41:59 -06:00
fe3fd951ed
Merge tag '2024.11.0-alpha.2' into develop
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-19 01:37:57 -06:00
5673f0fff6 Merge pull request 'Sync upstream/develop' (#29) from incoming into develop
Some checks failed
Lint / lint (frontend-embed) (push) Blocked by required conditions
Lint / lint (frontend-shared) (push) Blocked by required conditions
Lint / lint (misskey-bubble-game) (push) Blocked by required conditions
Lint / lint (misskey-js) (push) Blocked by required conditions
Lint / lint (misskey-reversi) (push) Blocked by required conditions
Lint / lint (sw) (push) Blocked by required conditions
Lint / typecheck (backend) (push) Blocked by required conditions
Lint / typecheck (misskey-js) (push) Blocked by required conditions
Lint / typecheck (sw) (push) Blocked by required conditions
Lint / pnpm_install (push) Successful in 2m9s
Publish Docker image / Build (push) Successful in 4m35s
Test (production install and build) / production (22.11.0) (push) Successful in 1m7s
Lint / lint (backend) (push) Successful in 2m15s
Lint / lint (frontend) (push) Has been cancelled
Test (backend) / e2e (22.11.0) (push) Has been cancelled
Test (backend) / unit (22.11.0) (push) Has been cancelled
Reviewed-on: #29
2024-11-19 01:34:05 -06:00
ccf81b9398
filter out duplicate events
All checks were successful
Test (production install and build) / production (22.11.0) (push) Successful in 1m27s
Publish Docker image / Build (push) Successful in 4m45s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-19 01:18:31 -06:00
github-actions[bot]
6c5d3113c6 Bump version to 2024.11.0-alpha.2
All checks were successful
API report (misskey.js) / report (push) Successful in 1m30s
2024-11-19 03:56:50 +00:00
syuilo
968f595606
New Crowdin updates (#14965)
* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Swedish)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Swedish)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Romanian)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Arabic)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Dutch)

* New translations ja-jp.yml (Norwegian)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Slovak)

* New translations ja-jp.yml (Turkish)

* New translations ja-jp.yml (Ukrainian)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Bengali)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Uzbek)

* New translations ja-jp.yml (Lao)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Korean (Gyeongsang))

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Swedish)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Swedish)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Chinese Simplified)
2024-11-19 12:50:04 +09:00
おさむのひと
7b9c884a5d
refactor(backend): SystemWebhookで送信されるペイロードの型を追加 (#14980) 2024-11-19 10:41:39 +09:00
FineArchs
c271534aba
リノートメニューに「リノートの詳細」を追加 (#14985)
* add renote-detail menu

* changelog

* Apply suggestions from code review

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>

* Update CHANGELOG.md

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
2024-11-19 10:34:33 +09:00
饺子w (Yumechi)
e800c0f85a
fix(backend): お知らせ作成時に画像URL入力欄を空欄に変更できないのを修正 (#14990)
* fix(backend): アナウンスメントを作成ときに画像URLを後悔できないのを修正

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

* Update CHANGELOG.md

Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>

---------

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>
2024-11-19 10:29:42 +09:00
かっこかり
81348f1277
fix(frontend): TypeScriptの型チェック対象ファイルを限定して高速化するように (#14994)
* fix frontend tsconfig includes

* fix frontend-embed tsconfig includes

* fix eslint in frontend / frontend-embed

* Update Changelog

---------

Co-authored-by: Hazelnoot <acomputerdog@gmail.com>
2024-11-19 10:22:47 +09:00
1025d5a4c4 Merge remote-tracking branch 'upstream/develop' into incoming
All checks were successful
Lint / pnpm_install (pull_request) Successful in 1m52s
Publish Docker image / Build (pull_request) Successful in 4m19s
Test (production install and build) / production (22.11.0) (pull_request) Successful in 1m1s
Lint / lint (backend) (pull_request) Successful in 2m15s
Test (backend) / unit (22.11.0) (pull_request) Successful in 8m24s
Lint / lint (frontend) (pull_request) Successful in 2m40s
Lint / lint (frontend-embed) (pull_request) Successful in 2m15s
Lint / lint (frontend-shared) (pull_request) Successful in 2m16s
Lint / lint (misskey-bubble-game) (pull_request) Successful in 2m27s
Test (backend) / e2e (22.11.0) (pull_request) Successful in 11m55s
Lint / lint (misskey-js) (pull_request) Successful in 2m39s
Lint / lint (misskey-reversi) (pull_request) Successful in 2m28s
Lint / lint (sw) (pull_request) Successful in 2m26s
Lint / typecheck (misskey-js) (pull_request) Successful in 1m38s
Lint / typecheck (backend) (pull_request) Successful in 2m25s
Lint / typecheck (sw) (pull_request) Successful in 1m40s
2024-11-18 18:44:41 -06:00
f0c0b75285
notifications metrics
All checks were successful
Test (production install and build) / production (22.11.0) (pull_request) Successful in 1m9s
Test (backend) / unit (22.11.0) (pull_request) Successful in 9m20s
Publish Docker image / Build (push) Successful in 4m48s
Lint / pnpm_install (push) Successful in 1m42s
Test (backend) / e2e (22.11.0) (pull_request) Successful in 12m21s
Test (production install and build) / production (22.11.0) (push) Successful in 1m4s
Test (backend) / unit (22.11.0) (push) Successful in 9m3s
Lint / lint (backend) (pull_request) Successful in 2m36s
Lint / lint (frontend) (pull_request) Successful in 2m31s
Lint / lint (frontend-embed) (pull_request) Successful in 2m32s
Test (backend) / e2e (22.11.0) (push) Successful in 12m43s
Lint / lint (frontend-shared) (pull_request) Successful in 2m45s
Lint / lint (misskey-bubble-game) (pull_request) Successful in 2m45s
Lint / lint (misskey-js) (pull_request) Successful in 2m43s
Lint / lint (misskey-reversi) (pull_request) Successful in 2m45s
Lint / lint (sw) (pull_request) Successful in 2m26s
Lint / typecheck (backend) (pull_request) Successful in 2m30s
Lint / typecheck (misskey-js) (pull_request) Successful in 1m58s
Lint / typecheck (sw) (pull_request) Successful in 1m43s
Lint / lint (backend) (push) Successful in 2m44s
Lint / lint (frontend) (push) Successful in 2m36s
Lint / lint (frontend-embed) (push) Successful in 2m24s
Lint / lint (frontend-shared) (push) Successful in 2m45s
Lint / lint (misskey-bubble-game) (push) Successful in 2m34s
Lint / lint (misskey-js) (push) Successful in 2m33s
Lint / lint (misskey-reversi) (push) Successful in 2m30s
Lint / lint (sw) (push) Successful in 2m31s
Lint / typecheck (backend) (push) Successful in 2m25s
Lint / typecheck (misskey-js) (push) Successful in 1m44s
Lint / typecheck (sw) (push) Successful in 1m44s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-18 13:48:45 -06:00
4b6ec86a00
backend: check AP fetch URL
All checks were successful
Test (production install and build) / production (22.11.0) (pull_request) Successful in 1m6s
Test (backend) / unit (22.11.0) (pull_request) Successful in 9m5s
Lint / pnpm_install (push) Successful in 1m28s
Publish Docker image / Build (push) Successful in 4m56s
Test (backend) / e2e (22.11.0) (pull_request) Successful in 12m34s
Test (production install and build) / production (22.11.0) (push) Successful in 1m6s
Lint / lint (backend) (pull_request) Successful in 2m18s
Test (backend) / unit (22.11.0) (push) Successful in 8m20s
Lint / lint (frontend) (pull_request) Successful in 2m26s
Lint / lint (frontend-embed) (pull_request) Successful in 2m26s
Lint / lint (frontend-shared) (pull_request) Successful in 2m32s
Test (backend) / e2e (22.11.0) (push) Successful in 12m9s
Lint / lint (misskey-bubble-game) (pull_request) Successful in 2m46s
Lint / lint (misskey-js) (pull_request) Successful in 2m39s
Lint / lint (misskey-reversi) (pull_request) Successful in 2m30s
Lint / lint (sw) (pull_request) Successful in 2m33s
Lint / typecheck (misskey-js) (pull_request) Successful in 1m42s
Lint / typecheck (backend) (pull_request) Successful in 2m43s
Lint / typecheck (sw) (pull_request) Successful in 1m45s
Lint / lint (backend) (push) Successful in 2m44s
Lint / lint (frontend) (push) Successful in 2m43s
Lint / lint (frontend-embed) (push) Successful in 2m36s
Lint / lint (frontend-shared) (push) Successful in 3m2s
Lint / lint (misskey-bubble-game) (push) Successful in 2m49s
Lint / lint (misskey-js) (push) Successful in 2m48s
Lint / lint (misskey-reversi) (push) Successful in 2m51s
Lint / lint (sw) (push) Successful in 2m50s
Lint / typecheck (backend) (push) Successful in 2m50s
Lint / typecheck (misskey-js) (push) Successful in 2m7s
Lint / typecheck (sw) (push) Successful in 2m22s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-18 12:54:46 -06:00
677a2f0770
update ts model of drive file comment
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-18 11:55:10 -06:00
fly_mc
9899b3cc38 backend: change HASHTAG_RANKING_WINDOW
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-18 11:52:21 -06:00
6fab3e6087
Fix usability issues for queue and inbox error metrics
All checks were successful
Test (production install and build) / production (22.11.0) (pull_request) Successful in 1m7s
Test (backend) / unit (22.11.0) (pull_request) Successful in 8m35s
Test (backend) / e2e (22.11.0) (pull_request) Successful in 12m9s
Lint / lint (backend) (pull_request) Successful in 2m47s
Lint / lint (frontend) (pull_request) Successful in 2m39s
Lint / lint (frontend-embed) (pull_request) Successful in 2m40s
Lint / lint (frontend-shared) (pull_request) Successful in 2m38s
Lint / lint (misskey-bubble-game) (pull_request) Successful in 2m36s
Lint / lint (misskey-js) (pull_request) Successful in 2m37s
Lint / lint (misskey-reversi) (pull_request) Successful in 2m41s
Lint / lint (sw) (pull_request) Successful in 2m43s
Lint / typecheck (backend) (pull_request) Successful in 2m25s
Lint / typecheck (misskey-js) (pull_request) Successful in 1m42s
Lint / typecheck (sw) (pull_request) Successful in 1m34s
Lint / pnpm_install (push) Successful in 2m12s
Publish Docker image / Build (push) Successful in 4m38s
Test (production install and build) / production (22.11.0) (push) Successful in 1m5s
Lint / lint (backend) (push) Successful in 2m19s
Test (backend) / unit (22.11.0) (push) Successful in 9m4s
Lint / lint (frontend) (push) Successful in 2m29s
Lint / lint (frontend-embed) (push) Successful in 2m29s
Lint / lint (frontend-shared) (push) Successful in 2m32s
Lint / lint (misskey-bubble-game) (push) Successful in 2m32s
Test (backend) / e2e (22.11.0) (push) Successful in 12m35s
Lint / lint (misskey-js) (push) Successful in 2m43s
Lint / lint (misskey-reversi) (push) Successful in 2m43s
Lint / lint (sw) (push) Successful in 2m37s
Lint / typecheck (backend) (push) Successful in 2m22s
Lint / typecheck (misskey-js) (push) Successful in 1m43s
Lint / typecheck (sw) (push) Successful in 1m44s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-18 07:12:12 -06:00
31f19bd686
csp: add Bull Dashboard to whitelist
All checks were successful
Test (production install and build) / production (22.11.0) (pull_request) Successful in 1m8s
Test (backend) / unit (22.11.0) (pull_request) Successful in 8m31s
Test (backend) / e2e (22.11.0) (pull_request) Successful in 12m13s
Lint / lint (backend) (pull_request) Successful in 2m34s
Lint / lint (frontend) (pull_request) Successful in 2m27s
Lint / lint (frontend-embed) (pull_request) Successful in 2m26s
Lint / lint (frontend-shared) (pull_request) Successful in 2m33s
Lint / lint (misskey-bubble-game) (pull_request) Successful in 2m34s
Lint / lint (misskey-js) (pull_request) Successful in 2m20s
Lint / lint (misskey-reversi) (pull_request) Successful in 2m33s
Lint / lint (sw) (pull_request) Successful in 2m33s
Lint / typecheck (backend) (pull_request) Successful in 2m26s
Lint / typecheck (misskey-js) (pull_request) Successful in 1m42s
Lint / typecheck (sw) (pull_request) Successful in 1m42s
Lint / pnpm_install (push) Successful in 2m10s
Publish Docker image / Build (push) Successful in 4m41s
Test (production install and build) / production (22.11.0) (push) Successful in 1m6s
Lint / lint (backend) (push) Successful in 2m17s
Test (backend) / unit (22.11.0) (push) Successful in 9m10s
Lint / lint (frontend) (push) Successful in 2m25s
Lint / lint (frontend-embed) (push) Successful in 2m30s
Lint / lint (frontend-shared) (push) Successful in 2m33s
Lint / lint (misskey-bubble-game) (push) Successful in 2m48s
Test (backend) / e2e (22.11.0) (push) Successful in 12m22s
Lint / lint (misskey-js) (push) Successful in 2m44s
Lint / lint (sw) (push) Successful in 2m49s
Lint / lint (misskey-reversi) (push) Successful in 2m51s
Lint / typecheck (backend) (push) Successful in 2m51s
Lint / typecheck (misskey-js) (push) Successful in 1m40s
Lint / typecheck (sw) (push) Successful in 1m52s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-18 03:45:47 -06:00
b78edccd19 Fix permetheus query fingerprinting (#24)
Some checks failed
Publish Docker image / Build (push) Successful in 4m42s
Lint / pnpm_install (push) Successful in 1m27s
Test (production install and build) / production (22.11.0) (push) Successful in 1m6s
Test (backend) / unit (22.11.0) (push) Successful in 8m38s
Test (backend) / e2e (22.11.0) (push) Failing after 11m33s
Lint / lint (backend) (push) Successful in 2m38s
Lint / lint (frontend) (push) Successful in 2m32s
Lint / lint (frontend-embed) (push) Successful in 2m33s
Lint / lint (frontend-shared) (push) Successful in 2m30s
Lint / lint (misskey-bubble-game) (push) Successful in 2m29s
Lint / lint (misskey-js) (push) Successful in 2m28s
Lint / lint (misskey-reversi) (push) Successful in 2m25s
Lint / lint (sw) (push) Successful in 2m27s
Lint / typecheck (backend) (push) Successful in 2m26s
Lint / typecheck (misskey-js) (push) Successful in 1m40s
Lint / typecheck (sw) (push) Successful in 1m44s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

<!-- ℹ お読みください / README
PRありがとうございます! PRを作成する前に、コントリビューションガイドをご確認ください:
Thank you for your PR! Before creating a PR, please check the contribution guide:
https://github.com/misskey-dev/misskey/blob/develop/CONTRIBUTING.md
-->

## What
<!-- このPRで何をしたのか? どう変わるのか? -->
<!-- What did you do with this PR? How will it change things? -->

## Why
<!-- なぜそうするのか? どういう意図なのか? 何が困っているのか? -->
<!-- Why do you do it? What are your intentions? What is the problem? -->

## Additional info (optional)
<!-- テスト観点など -->
<!-- Test perspective, etc -->

## 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

Reviewed-on: #24
Co-authored-by: eternal-flame-AD <yume@yumechi.jp>
Co-committed-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-18 03:29:53 -06:00
b805239b39 Merge pull request 'reduce buckets for incoming ap' (#23) from develop into master
All checks were successful
Publish Docker image / Build (push) Successful in 4m33s
Lint / pnpm_install (push) Successful in 1m28s
Test (production install and build) / production (22.11.0) (push) Successful in 1m6s
Test (backend) / unit (22.11.0) (push) Successful in 8m37s
Test (backend) / e2e (22.11.0) (push) Successful in 11m47s
Lint / lint (backend) (push) Successful in 2m43s
Lint / lint (frontend-embed) (push) Successful in 2m33s
Lint / lint (frontend) (push) Successful in 3m1s
Lint / lint (frontend-shared) (push) Successful in 2m28s
Lint / lint (misskey-bubble-game) (push) Successful in 2m45s
Lint / lint (misskey-js) (push) Successful in 2m45s
Lint / lint (misskey-reversi) (push) Successful in 2m43s
Lint / typecheck (misskey-js) (push) Successful in 1m32s
Lint / typecheck (backend) (push) Successful in 2m42s
Lint / lint (sw) (push) Successful in 3m9s
Lint / typecheck (sw) (push) Successful in 1m35s
Reviewed-on: #23
2024-11-17 21:54:18 -06:00
f9167b8b86
reduce buckets for incoming ap
All checks were successful
Test (production install and build) / production (22.11.0) (push) Successful in 1m3s
Test (backend) / unit (22.11.0) (push) Successful in 8m38s
Publish Docker image / Build (pull_request) Successful in 4m25s
Lint / pnpm_install (pull_request) Successful in 1m36s
Test (backend) / e2e (22.11.0) (push) Successful in 11m20s
Test (production install and build) / production (22.11.0) (pull_request) Successful in 1m2s
Test (backend) / unit (22.11.0) (pull_request) Successful in 8m0s
Test (backend) / e2e (22.11.0) (pull_request) Successful in 11m39s
Lint / lint (backend) (push) Successful in 2m19s
Lint / lint (frontend) (push) Successful in 2m25s
Lint / lint (frontend-shared) (push) Successful in 2m35s
Lint / lint (frontend-embed) (push) Successful in 2m38s
Lint / lint (misskey-bubble-game) (push) Successful in 2m27s
Lint / lint (misskey-js) (push) Successful in 2m43s
Lint / lint (misskey-reversi) (push) Successful in 2m27s
Lint / typecheck (misskey-js) (push) Successful in 1m34s
Lint / lint (sw) (push) Successful in 2m37s
Lint / typecheck (backend) (push) Successful in 2m32s
Lint / typecheck (sw) (push) Successful in 1m48s
Lint / lint (backend) (pull_request) Successful in 3m7s
Lint / lint (frontend) (pull_request) Successful in 2m54s
Lint / lint (frontend-embed) (pull_request) Successful in 2m40s
Lint / lint (frontend-shared) (pull_request) Successful in 2m32s
Lint / lint (misskey-bubble-game) (pull_request) Successful in 2m43s
Lint / lint (misskey-js) (pull_request) Successful in 2m25s
Lint / lint (sw) (pull_request) Successful in 2m49s
Lint / lint (misskey-reversi) (pull_request) Successful in 3m2s
Lint / typecheck (backend) (pull_request) Successful in 2m17s
Lint / typecheck (misskey-js) (pull_request) Successful in 1m39s
Lint / typecheck (sw) (pull_request) Successful in 1m52s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-17 21:53:54 -06:00
おさむのひと
0df6c79172
enhance(frontend): デッキ表示時にサイドバーを展開・折りたたみできるように (#14983)
* enhance(frontend): デッキ表示時にサイドバーを展開・折りたたみできるように

* wip

* wip

* Update navbar.vue

* ✌️

* Update CHANGELOG.md

* 🎨

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-11-18 10:36:51 +09:00
d7080be847 Merge pull request 'prometheus - stage 2 workers' (#22) from develop into master
Some checks failed
Publish Docker image / Build (push) Successful in 4m35s
Lint / pnpm_install (push) Successful in 1m38s
Test (production install and build) / production (22.11.0) (push) Successful in 1m1s
Test (backend) / unit (22.11.0) (push) Successful in 7m45s
Test (backend) / e2e (22.11.0) (push) Successful in 11m38s
Lint / lint (backend) (push) Successful in 2m32s
Lint / lint (frontend-embed) (push) Successful in 2m38s
Lint / lint (frontend) (push) Successful in 2m52s
Lint / lint (misskey-bubble-game) (push) Failing after 1m42s
Lint / lint (frontend-shared) (push) Successful in 2m49s
Lint / lint (misskey-js) (push) Successful in 2m27s
Lint / lint (misskey-reversi) (push) Successful in 2m23s
Lint / lint (sw) (push) Successful in 2m23s
Lint / typecheck (backend) (push) Successful in 2m9s
Lint / typecheck (misskey-js) (push) Successful in 1m32s
Lint / typecheck (sw) (push) Successful in 1m37s
Reviewed-on: #22
2024-11-17 19:07:22 -06:00
935efb5bf2
prometheus - stage 2 workers
Some checks failed
Test (production install and build) / production (22.11.0) (push) Successful in 1m3s
Lint / lint (backend) (push) Successful in 2m21s
Test (backend) / unit (22.11.0) (push) Successful in 8m52s
Lint / lint (frontend) (push) Successful in 2m30s
Lint / lint (frontend-embed) (push) Successful in 2m27s
Lint / lint (misskey-bubble-game) (push) Successful in 2m33s
Lint / lint (frontend-shared) (push) Successful in 2m46s
Test (backend) / e2e (22.11.0) (push) Successful in 11m57s
Lint / lint (misskey-js) (push) Successful in 2m38s
Lint / lint (sw) (push) Successful in 2m47s
Lint / lint (misskey-reversi) (push) Successful in 2m59s
Lint / typecheck (misskey-js) (push) Successful in 1m42s
Lint / typecheck (sw) (push) Successful in 1m54s
Lint / typecheck (backend) (push) Successful in 2m45s
Lint / pnpm_install (pull_request) Successful in 2m11s
Publish Docker image / Build (pull_request) Successful in 4m43s
Test (production install and build) / production (22.11.0) (pull_request) Successful in 1m2s
Test (backend) / unit (22.11.0) (pull_request) Successful in 8m45s
Test (backend) / e2e (22.11.0) (pull_request) Failing after 11m13s
Lint / lint (backend) (pull_request) Successful in 2m6s
Lint / lint (frontend) (pull_request) Successful in 2m19s
Lint / lint (frontend-embed) (pull_request) Successful in 2m14s
Lint / lint (frontend-shared) (pull_request) Successful in 2m27s
Lint / lint (misskey-bubble-game) (pull_request) Successful in 2m36s
Lint / lint (misskey-js) (pull_request) Successful in 2m31s
Lint / lint (misskey-reversi) (pull_request) Successful in 2m50s
Lint / lint (sw) (pull_request) Successful in 2m39s
Lint / typecheck (backend) (pull_request) Successful in 2m42s
Lint / typecheck (misskey-js) (pull_request) Successful in 1m41s
Lint / typecheck (sw) (pull_request) Successful in 1m52s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-17 18:47:56 -06:00
c22160aa90 Merge pull request 'more path sanitization' (#21) from develop into master
Some checks failed
Publish Docker image / Build (push) Successful in 4m42s
Lint / pnpm_install (push) Successful in 1m43s
Test (production install and build) / production (22.11.0) (push) Successful in 1m8s
Test (backend) / unit (22.11.0) (push) Successful in 8m22s
Test (backend) / e2e (22.11.0) (push) Failing after 12m4s
Lint / lint (backend) (push) Successful in 2m37s
Lint / lint (frontend) (push) Successful in 2m34s
Lint / lint (frontend-embed) (push) Successful in 2m33s
Lint / lint (frontend-shared) (push) Successful in 2m40s
Lint / lint (misskey-bubble-game) (push) Successful in 2m29s
Lint / lint (misskey-js) (push) Successful in 2m27s
Lint / lint (misskey-reversi) (push) Successful in 2m41s
Lint / lint (sw) (push) Successful in 2m40s
Lint / typecheck (backend) (push) Successful in 2m23s
Lint / typecheck (misskey-js) (push) Successful in 1m35s
Lint / typecheck (sw) (push) Successful in 1m41s
Reviewed-on: #21
2024-11-17 12:58:51 -06:00
3906efa8d5
more path sanitization
All checks were successful
Test (production install and build) / production (22.11.0) (push) Successful in 1m6s
Test (backend) / unit (22.11.0) (push) Successful in 8m54s
Publish Docker image / Build (pull_request) Successful in 4m37s
Lint / pnpm_install (pull_request) Successful in 1m45s
Test (backend) / e2e (22.11.0) (push) Successful in 11m52s
Test (production install and build) / production (22.11.0) (pull_request) Successful in 1m5s
Test (backend) / unit (22.11.0) (pull_request) Successful in 8m25s
Test (backend) / e2e (22.11.0) (pull_request) Successful in 12m16s
Lint / lint (backend) (push) Successful in 2m19s
Lint / lint (frontend) (push) Successful in 2m26s
Lint / lint (frontend-embed) (push) Successful in 2m27s
Lint / lint (frontend-shared) (push) Successful in 2m19s
Lint / lint (misskey-bubble-game) (push) Successful in 2m28s
Lint / lint (misskey-js) (push) Successful in 2m34s
Lint / lint (misskey-reversi) (push) Successful in 2m32s
Lint / lint (sw) (push) Successful in 2m31s
Lint / typecheck (backend) (push) Successful in 2m29s
Lint / typecheck (misskey-js) (push) Successful in 1m39s
Lint / typecheck (sw) (push) Successful in 1m42s
Lint / lint (backend) (pull_request) Successful in 2m33s
Lint / lint (frontend) (pull_request) Successful in 2m27s
Lint / lint (frontend-embed) (pull_request) Successful in 2m28s
Lint / lint (frontend-shared) (pull_request) Successful in 2m27s
Lint / lint (misskey-bubble-game) (pull_request) Successful in 2m28s
Lint / lint (misskey-js) (pull_request) Successful in 2m30s
Lint / lint (misskey-reversi) (pull_request) Successful in 2m30s
Lint / lint (sw) (pull_request) Successful in 2m31s
Lint / typecheck (backend) (pull_request) Successful in 2m28s
Lint / typecheck (misskey-js) (pull_request) Successful in 1m39s
Lint / typecheck (sw) (pull_request) Successful in 1m44s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-17 12:57:49 -06:00
577a7e5e96 Merge pull request 'prometheus' (#20) from develop into master
Some checks failed
Lint / pnpm_install (push) Successful in 2m5s
Publish Docker image / Build (push) Successful in 4m52s
Test (production install and build) / production (22.11.0) (push) Successful in 1m13s
Lint / lint (backend) (push) Successful in 2m19s
Test (backend) / unit (22.11.0) (push) Successful in 9m25s
Lint / lint (frontend) (push) Successful in 2m27s
Lint / lint (frontend-embed) (push) Successful in 2m25s
Lint / lint (frontend-shared) (push) Successful in 2m23s
Lint / lint (misskey-bubble-game) (push) Successful in 2m36s
Test (backend) / e2e (22.11.0) (push) Failing after 12m25s
Lint / lint (misskey-js) (push) Successful in 2m35s
Lint / lint (misskey-reversi) (push) Successful in 2m37s
Lint / lint (sw) (push) Successful in 2m48s
Lint / typecheck (backend) (push) Has been cancelled
Lint / typecheck (sw) (push) Has been cancelled
Lint / typecheck (misskey-js) (push) Has been cancelled
Reviewed-on: #20
2024-11-17 12:40:23 -06:00
109d8f8008
don't log metrics for postgres in testing
All checks were successful
Test (production install and build) / production (22.11.0) (push) Successful in 1m53s
Lint / pnpm_install (pull_request) Successful in 1m36s
Publish Docker image / Build (push) Successful in 5m12s
Publish Docker image / Build (pull_request) Successful in 4m28s
Test (production install and build) / production (22.11.0) (pull_request) Successful in 1m13s
Lint / lint (backend) (pull_request) Successful in 2m47s
Test (backend) / unit (22.11.0) (pull_request) Successful in 8m38s
Lint / lint (frontend-embed) (pull_request) Successful in 2m25s
Test (backend) / e2e (22.11.0) (pull_request) Successful in 11m35s
Lint / lint (frontend-shared) (pull_request) Successful in 2m28s
Lint / lint (misskey-bubble-game) (pull_request) Successful in 2m37s
Lint / lint (frontend) (pull_request) Successful in 9m50s
Lint / lint (misskey-js) (pull_request) Successful in 2m27s
Lint / lint (sw) (pull_request) Successful in 2m45s
Lint / lint (misskey-reversi) (pull_request) Successful in 2m58s
Lint / typecheck (backend) (pull_request) Successful in 2m42s
Lint / typecheck (misskey-js) (pull_request) Successful in 1m49s
Lint / typecheck (sw) (pull_request) Successful in 1m59s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-17 11:58:15 -06:00
4d44adfaa9
prometheus - stage 1 deployment
Some checks failed
Test (production install and build) / production (22.11.0) (push) Successful in 1m25s
Lint / lint (backend) (push) Successful in 2m7s
Lint / lint (frontend) (push) Successful in 2m11s
Lint / lint (frontend-embed) (push) Successful in 2m9s
Lint / lint (frontend-shared) (push) Successful in 2m19s
Lint / lint (misskey-bubble-game) (push) Successful in 2m21s
Lint / lint (misskey-reversi) (push) Successful in 2m33s
Lint / lint (misskey-js) (push) Successful in 2m44s
Lint / typecheck (misskey-js) (push) Successful in 1m23s
Lint / lint (sw) (push) Successful in 2m21s
Lint / typecheck (backend) (push) Successful in 2m3s
Lint / typecheck (sw) (push) Successful in 1m23s
Lint / pnpm_install (pull_request) Successful in 1m35s
Publish Docker image / Build (pull_request) Successful in 4m59s
Test (production install and build) / production (22.11.0) (pull_request) Successful in 1m32s
Test (backend) / e2e (22.11.0) (push) Failing after 1m56s
Lint / lint (backend) (pull_request) Successful in 2m0s
Lint / lint (frontend) (pull_request) Successful in 2m16s
Lint / lint (frontend-embed) (pull_request) Successful in 2m3s
Lint / lint (frontend-shared) (pull_request) Successful in 2m9s
Lint / lint (misskey-bubble-game) (pull_request) Successful in 2m7s
Test (backend) / unit (22.11.0) (push) Failing after 10m2s
Lint / lint (misskey-js) (pull_request) Successful in 2m13s
Lint / lint (misskey-reversi) (pull_request) Successful in 2m16s
Lint / lint (sw) (pull_request) Successful in 2m26s
Lint / typecheck (misskey-js) (pull_request) Successful in 1m29s
Lint / typecheck (backend) (pull_request) Successful in 2m16s
Lint / typecheck (sw) (pull_request) Successful in 1m40s
Test (backend) / e2e (22.11.0) (pull_request) Failing after 2m5s
Test (backend) / unit (22.11.0) (pull_request) Failing after 7m45s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-17 04:44:39 -06:00
syuilo
eed45c7915
Update SECURITY.md 2024-11-17 17:35:27 +09:00
syuilo
42f9586fc6
Update CONTRIBUTING.md 2024-11-17 17:33:50 +09:00
syuilo
032dfc782d
Update CONTRIBUTING.md 2024-11-17 17:33:12 +09:00
syuilo
00b8d0c072
Update CONTRIBUTING.md 2024-11-17 17:32:28 +09:00
syuilo
9aebf0c168
Update CHANGELOG.md 2024-11-17 14:15:38 +09:00
syuilo
a730045bdd
Update CHANGELOG.md 2024-11-17 12:44:44 +09:00
13e50cd8d9
fix(backend): アナウンスメントを作成ときに画像URLを後悔できないのを修正
All checks were successful
Lint / pnpm_install (push) Successful in 2m0s
Publish Docker image / Build (push) Successful in 4m48s
Test (production install and build) / production (22.11.0) (push) Successful in 1m3s
Lint / lint (backend) (push) Successful in 2m9s
Test (backend) / unit (22.11.0) (push) Successful in 8m6s
Lint / lint (frontend) (push) Successful in 2m19s
Lint / lint (frontend-embed) (push) Successful in 2m12s
Lint / lint (frontend-shared) (push) Successful in 2m15s
Lint / lint (misskey-bubble-game) (push) Successful in 2m14s
Test (backend) / e2e (22.11.0) (push) Successful in 11m38s
Lint / lint (misskey-js) (push) Successful in 2m30s
Lint / lint (misskey-reversi) (push) Successful in 2m20s
Lint / lint (sw) (push) Successful in 2m30s
Lint / typecheck (misskey-js) (push) Successful in 1m37s
Lint / typecheck (backend) (push) Successful in 2m11s
Lint / typecheck (sw) (push) Successful in 1m33s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-16 17:37:26 -06:00
a95e3716ff
2024.11.0-yumechinokuni.4p1
Some checks failed
Test (production install and build) / production (22.11.0) (pull_request) Successful in 1m24s
Lint / lint (backend) (pull_request) Successful in 2m25s
Lint / lint (frontend) (pull_request) Successful in 2m27s
Test (backend) / unit (22.11.0) (pull_request) Successful in 9m22s
Lint / lint (frontend-embed) (pull_request) Successful in 2m26s
Lint / lint (frontend-shared) (pull_request) Successful in 2m22s
Lint / lint (misskey-bubble-game) (pull_request) Successful in 2m30s
Lint / lint (misskey-js) (pull_request) Successful in 2m32s
Test (backend) / e2e (22.11.0) (pull_request) Failing after 13m39s
Lint / lint (misskey-reversi) (pull_request) Successful in 2m36s
Lint / lint (sw) (pull_request) Successful in 2m43s
Lint / typecheck (misskey-js) (pull_request) Successful in 1m50s
Lint / typecheck (backend) (pull_request) Successful in 2m42s
Lint / typecheck (sw) (pull_request) Successful in 1m52s
Lint / pnpm_install (push) Successful in 2m18s
Publish Docker image / Build (push) Successful in 5m5s
Test (production install and build) / production (22.11.0) (push) Successful in 1m10s
Lint / lint (backend) (push) Successful in 2m25s
Test (backend) / unit (22.11.0) (push) Successful in 10m20s
Lint / lint (frontend) (push) Successful in 2m36s
Lint / lint (frontend-embed) (push) Successful in 2m40s
Lint / lint (frontend-shared) (push) Successful in 2m39s
Lint / lint (misskey-bubble-game) (push) Successful in 2m38s
Test (backend) / e2e (22.11.0) (push) Successful in 13m53s
Lint / lint (misskey-js) (push) Successful in 2m57s
Lint / lint (misskey-reversi) (push) Successful in 2m40s
Lint / lint (sw) (push) Successful in 2m42s
Lint / typecheck (backend) (push) Successful in 2m38s
Lint / typecheck (misskey-js) (push) Successful in 1m42s
Lint / typecheck (sw) (push) Successful in 1m41s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-16 06:26:06 -06:00
1862b33aba
pgroonga CW search
All checks were successful
Lint / pnpm_install (push) Successful in 2m23s
Publish Docker image / Build (push) Successful in 5m4s
Lint / lint (backend) (push) Successful in 2m29s
Test (backend) / unit (22.11.0) (push) Successful in 9m49s
Lint / lint (frontend) (push) Successful in 2m35s
Lint / lint (frontend-embed) (push) Successful in 2m24s
Lint / lint (frontend-shared) (push) Successful in 2m40s
Lint / lint (misskey-bubble-game) (push) Successful in 2m29s
Lint / lint (misskey-js) (push) Successful in 2m41s
Test (backend) / e2e (22.11.0) (push) Successful in 13m29s
Lint / lint (misskey-reversi) (push) Successful in 2m51s
Lint / typecheck (backend) (push) Successful in 3m4s
Lint / lint (sw) (push) Successful in 3m10s
Lint / typecheck (misskey-js) (push) Successful in 1m46s
Test (production install and build) / production (22.11.0) (push) Successful in 1m24s
Lint / typecheck (sw) (push) Successful in 1m46s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-16 05:50:57 -06:00
syuilo
9614f74bf8 🎨 2024-11-16 20:24:31 +09:00
CDN
b3c2de2b26
fix(backend): fallback sharedInbox to null in ApPersonService (#14970) 2024-11-16 18:53:28 +09:00
syuilo
cf1b7c7064
add warning for open registration (#14963)
* wip

* wip

* Update ja-JP.yml

* Update index.d.ts

* ✌️
2024-11-16 17:22:34 +09:00
syuilo
2e0f3936a8 Update .gitignore 2024-11-16 15:32:51 +09:00
syuilo
459449864c 🎨 2024-11-16 10:16:11 +09:00
a6b90b14b6
set docker db shm_size
Some checks failed
Test (backend) / unit (22.11.0) (pull_request) Successful in 8m19s
Test (backend) / e2e (22.11.0) (pull_request) Successful in 11m15s
Lint / pnpm_install (pull_request) Successful in 1m14s
Lint / lint (backend) (pull_request) Successful in 2m24s
Lint / lint (frontend) (pull_request) Successful in 2m34s
Lint / lint (frontend-embed) (pull_request) Successful in 2m44s
Lint / lint (frontend-shared) (pull_request) Successful in 3m13s
Lint / lint (misskey-js) (pull_request) Successful in 2m49s
Lint / lint (misskey-bubble-game) (pull_request) Successful in 3m1s
Lint / typecheck (backend) (pull_request) Successful in 2m15s
Lint / lint (sw) (pull_request) Successful in 2m47s
Lint / lint (misskey-reversi) (pull_request) Successful in 2m50s
Lint / typecheck (misskey-js) (pull_request) Successful in 1m29s
Lint / typecheck (sw) (pull_request) Successful in 1m25s
Lint / pnpm_install (push) Successful in 1m57s
Publish Docker image / Build (push) Successful in 5m26s
Test (production install and build) / production (22.11.0) (push) Successful in 1m5s
Lint / lint (backend) (push) Successful in 2m16s
Test (backend) / unit (22.11.0) (push) Successful in 9m11s
Lint / lint (frontend) (push) Successful in 2m29s
Lint / lint (frontend-embed) (push) Successful in 2m27s
Lint / lint (frontend-shared) (push) Successful in 2m28s
Lint / lint (misskey-bubble-game) (push) Successful in 2m27s
Test (backend) / e2e (22.11.0) (push) Failing after 12m38s
Lint / lint (misskey-js) (push) Successful in 2m40s
Lint / lint (sw) (push) Successful in 2m45s
Lint / lint (misskey-reversi) (push) Successful in 2m59s
Lint / typecheck (backend) (push) Successful in 2m46s
Lint / typecheck (misskey-js) (push) Successful in 1m46s
Lint / typecheck (sw) (push) Successful in 1m57s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-15 17:16:33 -06:00
c830e9ba0d
Revert "use execa 8.0.1"
Some checks failed
Test (production install and build) / production (22.11.0) (push) Successful in 1m59s
Lint / pnpm_install (push) Successful in 2m22s
Publish Docker image / Build (push) Successful in 5m29s
Lint / lint (backend) (push) Successful in 3m45s
Lint / lint (frontend-embed) (push) Successful in 3m4s
Lint / lint (misskey-bubble-game) (push) Failing after -4s
Lint / lint (misskey-js) (push) Failing after -4s
Lint / lint (misskey-reversi) (push) Failing after -3s
Lint / lint (sw) (push) Failing after 12m56s
Lint / lint (frontend-shared) (push) Failing after 15m37s
Lint / lint (frontend) (push) Failing after 19m30s
Lint / typecheck (misskey-js) (push) Successful in 2m14s
Lint / typecheck (sw) (push) Successful in 2m27s
Lint / typecheck (backend) (push) Successful in 2m53s
This reverts commit eef0c895bc. Cannot
reproduce original issue in question
2024-11-15 15:23:12 -06:00
d3674705a5 Merge remote-tracking branch 'upstream/develop' into develop 2024-11-15 15:22:22 -06:00
18c5d5cd02
add missing devDependencies
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-15 15:17:34 -06:00
237ac7cffc
cleanup metadata
Some checks failed
Test (production install and build) / production (22.11.0) (push) Successful in 1m40s
Lint / pnpm_install (push) Successful in 2m3s
Lint / lint (backend) (push) Successful in 2m27s
Publish Docker image / Build (push) Successful in 5m6s
Lint / lint (frontend) (push) Successful in 3m1s
Lint / lint (frontend-shared) (push) Successful in 2m46s
Lint / lint (misskey-bubble-game) (push) Successful in 2m58s
Lint / lint (frontend-embed) (push) Successful in 3m33s
Lint / lint (misskey-js) (push) Successful in 2m33s
Lint / lint (sw) (push) Successful in 2m36s
Lint / lint (misskey-reversi) (push) Successful in 2m49s
Lint / typecheck (sw) (push) Successful in 1m53s
Lint / typecheck (misskey-js) (push) Successful in 1m48s
Lint / typecheck (backend) (push) Failing after 18m3s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-15 14:37:13 -06:00
0ac3544a5c
Frontend: Stream再接続ロジックdata raceを修正
Some checks failed
Lint / pnpm_install (push) Successful in 1m38s
Test (production install and build) / production (22.11.0) (push) Successful in 1m46s
Lint / lint (backend) (push) Successful in 2m13s
Lint / lint (frontend) (push) Successful in 2m19s
Publish Docker image / Build (push) Successful in 5m14s
Lint / lint (frontend-embed) (push) Successful in 2m23s
Lint / lint (frontend-shared) (push) Successful in 2m42s
Lint / lint (misskey-bubble-game) (push) Successful in 2m30s
Lint / lint (sw) (push) Failing after 1m21s
Lint / lint (misskey-js) (push) Successful in 2m23s
Lint / typecheck (backend) (push) Failing after 54s
Lint / typecheck (sw) (push) Successful in 2m5s
Lint / typecheck (misskey-js) (push) Failing after 12m52s
Lint / lint (misskey-reversi) (push) Failing after 14m42s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-15 05:38:23 -06:00
syuilo
eef0c895bc use execa 8.0.1
#14966
2024-11-15 19:48:31 +09:00