dakkar
30bd7768d6
Merge branch 'develop' into future-2024-04-25-post
2024-05-11 13:11:07 +01:00
dakkar
91ef2ceed7
port changes from global timeline to bubble timeline
2024-05-11 12:38:01 +01:00
Sugar
194d8a5527
feat: send edit events to servers that interacted
...
a server replied to, renoted or reacted to a note knows about a note,
and as such it should get notified about it being edited.
this matches similar logic in mastodon.
2024-05-11 09:44:03 +02:00
おさむのひと
f6af6d9679
fix(backend): UserEntityService.getRelationsの取得処理を軽量化 ( #13811 )
...
* fix(backend): UserEntityService.getRelationsの取得処理を軽量化
* rollback
2024-05-10 15:33:25 +09:00
おさむのひと
b298897bde
fix(backend): 不要なUserProfileの取得を修正 ( #13812 )
...
* fix(backend): 不要なuserProfileの取得を修正
* fix: pnpm@9.0.6 to pnpm@9.1.0
* Revert "fix: pnpm@9.0.6 to pnpm@9.1.0"
This reverts commit eaf265ec2cf255cadeaa516d5b668134bc397211.
2024-05-10 15:32:23 +09:00
dakkar
cd5686f9ab
fix spacing
2024-05-09 17:37:22 +01:00
dakkar
f1d96b8ae8
merge: fix: incorrect type for quote property ( !480 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/480
Closes #401
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Tess K <me@thvxl.se>
2024-05-09 09:05:16 +00:00
dakkar
01256af028
merge: Rework cache clearing to be fault tolerant ( !497 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/497
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-05-09 08:01:18 +00:00
dakkar
89f412c696
merge: Send default reactions as Like activities to Iceshrimp.NET instances ( !505 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/505
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-05-09 07:59:46 +00:00
Ember
ed91663672
merge: don't count "system" local accounts in user chart - fixes #451 ( !500 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/500
Closes #451
Approved-by: Ember <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
2024-05-07 20:17:54 +00:00
dakkar
89f4f0e5f4
don't count "system" local accounts in user chart - fixes #451
2024-05-07 20:17:53 +00:00
Ember
58ff225c4e
merge: really edit notes in more cases - fixes #424 ( !504 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/504
Closes #424
Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Ember <acomputerdog@gmail.com>
2024-05-07 20:16:39 +00:00
dakkar
eab690a5e3
really edit notes in more cases - fixes #424
2024-05-07 20:16:38 +00:00
Tess K
5e20de45d7
merge: Compact LD-signed activities against well-known context ( !503 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/503
Approved-by: Marie <marie@kaifa.ch>
Approved-by: Tess K <me@thvxl.se>
2024-05-04 17:19:42 +00:00
syuilo
2b21c19362
update deps ( #13624 )
...
* update deps
* Update package.json
* update deps
* build: pass --strip-leading-paths to restore 0.2.x behavior (#13684 )
* ✌️
* ✌️
* pureimageの代わりに@napi-rs/canvasを使う (#13748 )
* pureimageの代わりに@napi-rs/canvasを使う
* remove writestream
* remove createtemp
* wip
* Update ClientServerService.ts
* update pnpm to 9.x
* update deps
* re: update pnpm to 9.x
* update node
* ✌️
---------
Co-authored-by: anatawa12 <anatawa12@icloud.com>
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
2024-05-04 20:56:14 +09:00
Essem
f843bf6c17
fix: Add unicode flag to custom emoji regexes
2024-05-03 11:48:00 -05:00
dakkar
d0a2708f91
merge: handle non-ASCII emoji names ( !464 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/464
Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Ember <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
2024-05-02 21:06:10 +00:00
ShittyKopper
e333283905
Send default reactions as Like activities to Iceshrimp.NET instances
2024-05-02 02:37:59 +03:00
dakkar
45182c17e2
fix imports
2024-05-01 17:41:33 +01:00
Kisaragi
c530a46e54
enhance(backend): ドライブのファイルがNSFWかどうか個別に連合されるように ( #13756 )
...
* fix(backend): ノートのattachmentにおいて、attach.sensitiveが元から存在する場合はそれを尊重する
* docs: update changelog (per misskey-dev#13756)
* feat(backend,apub): renderDocumentがsensitiveを連合するようにする
per https://github.com/misskey-dev/misskey/issues/13755#issuecomment-2081303014
* chore(backend): 追加したコメントを削除
* docs: changelogをより丁寧にする
* docs: changelogの項目名をPRに合わせる
* docs: tweak
apply suggestion from mei23
2024-05-01 17:13:20 +09:00
Daiki Mizukami
d2a5bb39e3
Merge pull request from GHSA-2vxv-pv3m-3wvj
...
* fix: normalize incoming signed activities
* Tweak style
* Update CHANGELOG.md
* Log compacted activity as well
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-05-01 16:33:58 +09:00
dakkar
6ae01e28aa
Compact LD-signed activities against well-known context
...
This should defend against some spoofing attacks, see also
https://nvd.nist.gov/vuln/detail/CVE-2022-24307 for Mastodon,
febb499fcb
from Iceshrimp and
e790d6be90
for Firefish
Thanks to @tesaguri@fedibird.com for reporting and providing the patch.
2024-04-30 10:16:57 +01:00
zyoshoka
2ff90a80d4
fix(backend): add detailed schema to fetch-rss
endpoint ( #13764 )
2024-04-29 15:36:01 +09:00
MeiMei
c7d7da8fc5
AP Link等は添付ファイル扱いしないようになど ( #13754 )
...
* Linkは添付ファイルではない
* CHANGELOG
2024-04-28 10:53:33 +09:00
anatawa12
fe1172fbb6
fix: ハイフンを含むリモート絵文字が描画されない ( #13715 )
2024-04-27 20:41:55 +09:00
ikasoba
20eb4bc296
Fix(backend): ActivityPubでのHTMLへのシリアライズを修正 ( #13752 )
...
* devモードでもActivityPub系エンドポイントへアクセスできるように
* ActivityPubでのHTMLのシリアライズを修正
* ハードコードしていたurlを`httpUrl`へ修正
* テストの追加
2024-04-27 20:26:55 +09:00
かっこかり
cb5d8bdcdd
fix(backend): ページのOGP URLが違うのを修正 ( #13749 )
...
* fix(backend): ページのOGP URLが違うのを修正
* Update Changelog
* typo
2024-04-27 18:53:28 +09:00
MeiMei
6abb8c4994
Merge pull request from GHSA-m9qf-3pfj-2r86
...
* Add Cache-Control to Bull Board
* CHANGELOG
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-04-27 12:57:00 +09:00
dakkar
ce8d0e45e9
fix backend tests
2024-04-25 11:56:19 +01:00
dakkar
deb2474bdb
sync notes/edit.ts from notes/create.ts
2024-04-25 11:44:24 +01:00
dakkar
7606bce362
sync NoteEditService from NoteCreateService
2024-04-25 11:44:24 +01:00
dakkar
183cf962a0
sync NoteCreateService.create with .import
...
again, git merged on the wrong function
2024-04-25 11:44:24 +01:00
dakkar
76a4ebae8a
re-instate "followed users from muted instances are not muted"
2024-04-25 11:44:24 +01:00
dakkar
4fe8a26081
Merge remote-tracking branch 'misskey/develop' into future-2024-04-25
2024-04-25 11:44:24 +01:00
dakkar
ea6629cebf
Merge branch 'develop' into future-2024-04-10-post
2024-04-25 11:18:30 +01:00
Cocoa Hoto
85339ca751
feat: improve emoji endpoint ( #13742 )
2024-04-25 11:03:34 +09:00
PrivateGER
493775ad7b
reformat expression
2024-04-24 16:05:30 +02:00
dakkar
0f3764ff71
teach ReactionService about non-ASCII emoji names
2024-04-23 14:42:02 +01:00
Latte macchiato
dd3d562a1e
Rework cache clearing to be fault tolerant
2024-04-19 21:58:37 +00:00
anatawa12
f9aed8f2bf
fix: 正規化されていない状態のhashtagが連合されてきたhtmlに含まれているとhashtagが正しくhashtagに復元されない問題を修正 ( #13733 )
2024-04-19 19:42:01 +09:00
おさむのひと
cd7f7271ca
enhance: 新しいコンディショナルロール条件の実装 ( #13732 )
...
* enhance: 新しいコンディショナルロールの実装
* fix: CHANGELOG.md
2024-04-19 15:22:23 +09:00
anatawa12
e423b8ce4b
細かいミュートの処理の修正 ( #13695 )
...
* fix: some replies are removed from global timeline
* refactor: 各チャンネルのミュートとブロックの処理をまとめる
* fix: リノートをミュートでその人のノートのリノートをミュートしていたを修正
* refactor: isPureRenotePackedを他のところでも使う
* docs(changelog): CHANGELOGを更新
* test: withReplies = falseでフォローしてる人によるリプライが流れてくる
* test: ノートミュートしているユーザーの通常ノートのリノートが流れてくる/含まれる
2024-04-17 14:23:41 +09:00
MeiMei
c687b4eaa5
fix(backend): nginx経由で/files/にRangeリクエストされた場合に正しく応答できないのを修正 ( #13712 )
...
* Fix files
* CHANGELOG
2024-04-15 09:28:09 +09:00
MeiMei
b4faa7c4ec
chore: Use integrity for Redoc script ( #13716 )
...
* Use integrity for redoc scripts
* official?
2024-04-15 09:25:11 +09:00
かっこかり
bba3097765
enhance: クリップのノート数を表示するように ( #13686 )
...
* enhance: クリップのノート数を表示できるように
* Update Changelog
2024-04-14 21:30:24 +09:00
zyoshoka
8c5d9a6295
fix(backend): incorrect logic for determining whether Quote or not ( #13700 )
...
* fix(backend): incorrect logic for determining whether Quote or not
* Update CHANGELOG.md
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-04-14 10:23:48 +09:00
かっこかり
7cf0c18f83
fix(backend): FileServerServiceでレンジリクエストの場合に適切なレスポンスコードが返らない問題を修正 ( #13701 )
...
* return 206 for every ranged response - fixes #494
(cherry picked from commit 92eec2178f
)
* detect size of remote files - fixes #494
without this, remote files are assumed to have size 0 (even if we just
downloaded them!) and the range-related code won't run
(cherry picked from commit 960f4fcff7
)
---------
Co-authored-by: dakkar <dakkar@thenautilus.net>
2024-04-14 10:22:03 +09:00
かっこかり
5c7c44c9eb
fix(backend): 登録にメール認証が必須になっている場合、登録されているメールアドレスを削除できないように ( #13703 )
...
* fix(backend): 登録にメール認証が必須になっている場合、登録されているメールアドレスを削除できないように (MisskeyIO#606)
(cherry picked from commit 6b7df2bd10dc28b84f525a621b66fc49bf59cac6)
* Update Changelog
---------
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
2024-04-13 20:38:25 +09:00
dakkar
e0afeff248
merge: hide images/videos in og cards, when under a CW - fixes #487 ( !488 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/488
Closes #487
Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-04-11 20:40:38 +00:00
Marie
cfc8081cec
merge: bump tmp@0.2.3 - fixes #464 ( !475 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/475
Closes #464
Approved-by: Marie <marie@kaifa.ch>
Approved-by: Luna <her@mint.lgbt>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-04-11 18:00:40 +00:00
Marie
011ccd3a9a
merge: bump devel
version ( !486 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/486
Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-04-11 17:21:32 +00:00
dakkar
69697dd9f7
fix backend tests
2024-04-11 14:13:58 +01:00
dakkar
e4d7b2311f
fix merge mistake
2024-04-11 14:03:56 +01:00
dakkar
a3b4ca782a
Merge remote-tracking branch 'misskey/develop' into future-2024-04-10
2024-04-11 13:39:55 +01:00
dakkar
a58f4a6fed
Merge branch 'develop' into future-2024-03-23-post
2024-04-11 13:22:57 +01:00
dakkar
960f4fcff7
detect size of remote files - fixes #494
...
without this, remote files are assumed to have size 0 (even if we just
downloaded them!) and the range-related code won't run
2024-04-09 16:21:30 +01:00
dakkar
92eec2178f
return 206 for every ranged response - fixes #494
2024-04-09 15:42:29 +01:00
dakkar
56dca6dbf5
hide images/videos in og cards, when under a CW - fixes #487
2024-04-07 16:58:13 +01:00
Marie
d6c736f1a5
fix conflicts
2024-04-07 15:42:28 +00:00
dakkar
b6f41a28ed
pull in sfm-js that supports non-ascii in emoji names
2024-04-07 16:37:31 +01:00
Marie
bb7b4a8ea4
merge: fix: send null for empty edited_at in mastodon api ( !487 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/487
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-04-07 15:36:59 +00:00
dakkar
0690b9a429
merge: fix: load libopenmpt on demand ( !469 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/469
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-04-07 14:56:16 +00:00
zyoshoka
959cc8ff37
refactor(general): use Date.now()
instead of creating a new Date
instance ( #13671 )
2024-04-07 21:14:13 +09:00
おさむのひと
efa42a1624
fix(backend): バックエンドのpnpm devによるビルド後にbuild-assetsを行うようにする ( #13659 )
...
* moveto scripts
* add scripts/dev.mjs
2024-04-04 22:25:28 +09:00
Sugar🍬🍭🏳️⚧
e779c1e667
fix: send null for empty edited_at in mastodon api
2024-04-04 10:43:28 +02:00
かっこかり
efafa02f68
enhance(backend): ビデオファイルにビデオトラックがあるかを確認するように ( #13568 )
...
* enhance(backend): ビデオファイルにビデオトラックがあるかを確認するように
(cherry picked from commit 23d38a2d6492a2b24e9b2c031d66c3e8a5d382ef)
* Update Changelog
* Update Changelog
* Revert "Update Changelog"
This reverts commit 93fd996932b87ef550c38b48bd0678060f3ed1af.
* fix(test) ffmpegをインストールするように
* 入れる方間違えた
* fix test
* 拡張子変わらなかったのでそのまま行く
* ログを出力するように
* msg
* remove unused import
* add log
* attempt to fix test error
* Revert "attempt to fix test error"
This reverts commit d9d6524cadd655e6d8e9398b26fdfef332f30f4d.
* Update FileInfoService.ts
* oggも検査の対象にする
2024-03-31 12:43:39 +09:00
dakkar
328546c4cd
Merge branch 'develop' into release/2024-03-30
2024-03-30 11:08:26 +00:00
dakkar
074de82bf7
some validation fixes
2024-03-30 11:05:58 +00:00
おさむのひと
2a851437ff
fix: misskey-js、bubble-game、reversiのビルドをesbuildに統合する ( #13600 )
...
* fix: ビルドが遅いパッケージのビルド速度を改善
* dependenciesの整理
* fix ci
* ビルド開始時に古いファイルを消す
* fix ci
* fix ci
2024-03-30 15:28:19 +09:00
zyoshoka
b35ae97ba7
fix(backend): better notes/translate
error response ( #13631 )
...
* fix(backend): better `notes/translate` error response
* Update CHANGELOG.md
* test(backend): perform administrative operations as `root`
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-03-30 13:51:53 +09:00
Nila
f3500ffda9
fix: report progress out of 100% in CleanRemoteFilesProcessorService ( #13633 )
...
* Report progress out of 100% in CleanRemoteFilesProcessorService
* Add changelog entry
2024-03-30 10:28:47 +09:00
かっこかり
f90be427f5
fix(frontend): 「今日誕生日のフォロー中ユーザー」ウィジェットが正しく動作しない問題を修正 ( #12835 )
...
* (fix) タイムゾーンによっては誕生日のフォロー中ユーザーが正しく読み込まれない
* 文言をわかりやすく
* Update Changelog
* (add) reload button
* Update CHANGELOG.md
* run misskey-js
* fix
* Revert "文言をわかりやすく"
This reverts commit c5ab6419563cc70ec8ba758e800c74d3469131e3.
* Update packages/frontend/src/widgets/WidgetBirthdayFollowings.vue
* Update packages/frontend/src/widgets/WidgetBirthdayFollowings.vue
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-03-25 18:31:30 +09:00
Marie
56b19ab6bb
fix: incorrect type for quote property
2024-03-24 23:41:23 +00:00
dakkar
7374218a33
fix UserEntityService
...
upstream has removed the Drive bits, but we're still using them, to
update avatar / banner / background URLs
2024-03-24 12:14:05 +00:00
dakkar
bc531ac414
Merge remote-tracking branch 'misskey/develop' into future-2024-03-23
2024-03-24 11:53:52 +00:00
dakkar
beb00789df
Merge branch 'develop' into future-2024-03-23
2024-03-24 11:26:36 +00:00
dakkar
4271402e0d
recognise numbers and boolean values
2024-03-24 11:17:55 +00:00
dakkar
0e8cdb30b7
allow setting values not present in the config file
...
replicas and arrays in general, are more complicated :/
2024-03-24 11:12:17 +00:00
zyoshoka
a1bc8fa77b
test(backend): fix streaming test error when replying to followers-only note ( #13618 )
2024-03-24 16:46:52 +09:00
syuilo
3db26f2b94
fix(backend): fix openAPI operationId format
2024-03-23 20:43:29 +09:00
dakkar
435cab01c8
deal with (possible, future) non-alnum config keys
2024-03-21 10:00:16 +00:00
おさむのひと
831c74a25b
fix: URLプレビューの動作改善+動作設定を可能にする ( #13579 )
...
* wip
* support new version
* URLプレビュー無効化時、フロント側も非表示にしてリクエストをしないようにする
* fix lint
* fix lint
* tweak preview request error handles
* fix: CHANGELOG.md
* fix
* fix
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-03-21 18:46:42 +09:00
かっこかり
f4838e50b4
enhance(antenna): Botの投稿を除外できるように ( #13603 )
...
* enhance(antenna): Botの投稿を除外できるように (MisskeyIO#545)
(cherry picked from commit a95ce067c6cf0a93647e358aabc984bdbe99e952)
* Update Changelog
* remove translations
* spdx
---------
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
2024-03-21 07:51:01 +09:00
dakkar
25e6409cc9
allow overriding all string config values via env - fixes #465
...
will need end-user documentation!
2024-03-20 15:38:20 +00:00
dakkar
f4e89f2e6b
bump tmp@0.2.3 - fixes #464
...
see also https://github.com/raszi/node-tmp/issues/295
2024-03-19 17:13:43 +00:00
かっこかり
0226a670dd
fix(backend): ユーザーやノートのOGPでローカルとリモートユーザーの見分けが付かない問題を修正 ( #13586 )
...
* enhance(OGP): ユーザーやノートのOGPでローカルとリモートユーザーの見分けが付かない問題を修正 (MisskeyIO#528)
(cherry picked from commit 0c3de462d99c47297bebc162581bac6f78f21b49)
* Update Changelog
---------
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
2024-03-18 18:34:31 +09:00
かっこかり
a38646bd0f
fix(backend): フォローリクエストを作成する際に既存のものは削除するように ( #13588 )
...
* fix: delete old follow request (if exists) before creating new
(cherry picked from commit ea948ccadc
)
* Update Changelog
* Update Changelog
---------
Co-authored-by: Kaity A <kaity@atikayda.au>
2024-03-18 14:20:28 +09:00
syuilo
282cfae1b2
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
2024-03-17 10:34:15 +09:00
syuilo
7e63ab0f56
refactor(backend): refactor chart engine
2024-03-17 10:34:13 +09:00
zyoshoka
4b1ca9ef61
fix(general): flash/create
でPlayの公開範囲を指定できない問題の修正と編集画面の調整 ( #13574 )
...
* fix(backend): param `visibility` wasn't included in `flash/create`
* fix(frontend): tweak flash editor ui
* Update CHANGELOG.md
2024-03-15 22:02:57 +09:00
dakkar
9478fc0095
Merge remote-tracking branch 'misskey/develop' into future-2024-03-14
2024-03-14 16:28:56 +00:00
zyoshoka
29f6ba6310
chore: add missing SPDX ID and workflow check ( #13570 )
...
* chore: add workflow which checks if SPDX ID exists
* chore: add missing SPDX ID in some files
* chore: change trigger condition
* chore: trigger on push
* lint
2024-03-13 22:37:18 +09:00
おさむのひと
5c1d86b796
refactor(backend): UserEntityService.packMany()の高速化 ( #13550 )
...
* refactor(backend): UserEntityService.packMany()の高速化
* 修正
2024-03-12 14:31:34 +09:00
Alina Sireneva
0085305579
fix: load libopenmpt on demand
2024-03-11 15:32:59 +03:00
yupix
6b676a928d
enhance(backend): antennas/updateの必須項目をantennaIdのみに ( #13542 )
...
* refactor: antennas/updateの必須項目を最小限に
* fix: userListIdがnullにできない
2024-03-10 17:31:39 +09:00
dakkar
43544a6479
longer statement_timeout
for migrations - fixes 450
2024-03-09 15:38:36 +00:00
dakkar
354cb2a675
handle non-ASCII emoji names
...
* use the more inclusive regexp for validating emoji names
* always normalize emoji names, aliases, categories
the latter point is necessary to allow matching, for example, `ä`
against `a`+combining diaeresis
this will also need to bump the version of `sfm-js` once we merge
https://activitypub.software/TransFem-org/sfm-js/-/merge_requests/2
2024-03-09 12:51:51 +00:00
tamaina
1b064d7e30
chore(backend): validateNoteの結果Errorはそのままthrowする
...
理由がわからないため
2024-03-09 04:10:17 +00:00
dakkar
dfff4d2073
Merge remote-tracking branch 'misskey/develop' into future
2024-03-07 16:09:36 +00:00
zyoshoka
412e9f284d
test(backend): enable typecheck by workflow ( #13526 )
2024-03-07 09:51:57 +09:00