Commit Graph

62574 Commits (195337d8656b89a8b8a66c8f7d1b9923ffc1f5f8)

Author SHA1 Message Date
Michael Telatynski 02e0aca98d
Deduplicate icons using Compound (#28239)
* Deduplicate icons using Compound

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshots

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update e2e tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-21 10:36:31 +00:00
Michael Telatynski c278d2f31e
Stabilise audio-player reply button clicking in playwright (#28243)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-21 10:36:21 +00:00
Florian Duros 061c8217b3
- Remove deprecated `MatrixClient.keyBackupKeyFromPassword` call. (#28233)
- The `keyBackupKeyFromPassword` call is bound to the `keyCallback` props in `RestoreKeyBackupDialog` which is not used in `CreateSecretStorageDialog`
- Remove code bound to `keyCallback` props
2024-10-21 09:59:07 +00:00
Michael Telatynski 3294c6b5c5
Close right panel chat when minimising maximised voip widget (#28241)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-21 09:06:18 +00:00
David Langley 249c0fd1df
Fix RTE mentions autocomplete test (#28244)
LeftArrow  -> ArrowLeft
2024-10-18 17:13:20 +00:00
Michael Telatynski 26430a3a6a
Replace legacy Tooltips with Compound tooltips (#28231)
* Ditch legacy Tooltips in favour of Compound

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Remove dead code

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Extract markdown CodeBlock into React component

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Upgrade compound

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-18 14:57:39 +00:00
Florian Duros fad457362d
Replace `MatrixClient.isRoomEncrypted` by `MatrixClient.CryptoApi.isEncryptionEnabledInRoom` in `ContentMessages.ts` (#28238) 2024-10-18 14:44:56 +00:00
Michael Telatynski 4e93233a3d
Merge pull request #28236 from element-hq/t3chguy/sonar-happy 2024-10-18 15:55:15 +01:00
Michael Telatynski 51c308f2ec
Update RoomInvite.tsx 2024-10-18 15:38:49 +01:00
David Langley d638d5d5fa
Remove openDesk variant (#28237)
* Remove opendesk variant

This method of shipping the openDesk variant is no longer required. A separate pipeline now publishes to https://gitlab.opencode.de/bmi/opendesk/components/supplier/Element/images/container_registry/1216.

* Remove additional vanilla switch
2024-10-18 14:36:28 +00:00
Michael Telatynski 4d9b40c49a
Update src/RoomInvite.tsx
Co-authored-by: Florian Duros <florianduros@element.io>
2024-10-18 15:17:58 +01:00
Michael Telatynski 90e8c13c0f
Deduplicate icons using Compound Design Tokens (#28219)
* Deduplicate icons using Compound Design Tokens

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-18 13:51:54 +00:00
Michael Telatynski e5a436a00a
Merge pull request #28007 from element-hq/renovate/major-typescript-eslint-monorepo 2024-10-18 14:55:51 +01:00
Michael Telatynski 9d68f2c4cc
Update tests
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-18 14:34:02 +01:00
Michael Telatynski 837e27ed42
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-18 14:34:02 +01:00
Michael Telatynski 6c6bf811a6
Migrate to stylistic
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-18 14:34:01 +01:00
renovate[bot] d8052e6a73
Update typescript-eslint monorepo to v8 2024-10-18 14:34:01 +01:00
renovate[bot] 8c305f8891
Update all non-major dependencies (#28136)
* Absorb the matrix-react-sdk repository (#28192)

Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
Co-authored-by: github-merge-queue <github-merge-queue@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Florian Duros <florian.duros@ormaz.fr>
Co-authored-by: Kim Brose <kim.brose@nordeck.net>
Co-authored-by: Florian Duros <florianduros@element.io>
Co-authored-by: R Midhun Suresh <hi@midhun.dev>
Co-authored-by: dbkr <986903+dbkr@users.noreply.github.com>
Co-authored-by: ElementRobot <releases@riot.im>
Co-authored-by: dbkr <dbkr@users.noreply.github.com>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Co-authored-by: David Langley <davidl@element.io>
Co-authored-by: Michael Weimann <michaelw@matrix.org>
Co-authored-by: Timshel <Timshel@users.noreply.github.com>
Co-authored-by: Sahil Silare <32628578+sahil9001@users.noreply.github.com>
Co-authored-by: Will Hunt <will@half-shot.uk>
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
Co-authored-by: Andrew Ferrazzutti <andrewf@element.io>
Co-authored-by: Robin <robin@robin.town>
Co-authored-by: Tulir Asokan <tulir@maunium.net>

* Update dependency @sentry/browser to v8.33.0 [SECURITY] (#28194)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update babel monorepo (#28196)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @types/react to v17.0.83 (#28138)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @matrix-org/spec to v1.12.0 (#28200)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @formatjs/intl-segmenter to v11.5.9 (#28197)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Remove references to `MatrixClient.crypto` (#28204)

* Remove `VerificationExplorer`

* Remove `remakeolm` slash command

* Remove call to `crypto.cancelAndResendAllOutgoingKeyRequests`

* Remove crypto mock in `LoginWithQR-test.tsx`

* Remove `StopGadWidgetDriver.sendToDevice`

* Remove remaining mock

* Update dependency typescript to v5.6.3 (#28198)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency eslint-plugin-unicorn to v56 (#28202)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency stylelint to v16.10.0 (#28201)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update browserslist (#28199)

* Update browserslist

* Update tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>

* Update all non-major dependencies

* Pin posthog-js

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshots for re-resizable

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Pin re-resizable

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshot and improve playwright workflow to account for symlinked matrix-js-sdk

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Revert snapshot

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update package.json

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Fix screenshot flakiness

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
Co-authored-by: github-merge-queue <github-merge-queue@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Florian Duros <florian.duros@ormaz.fr>
Co-authored-by: Kim Brose <kim.brose@nordeck.net>
Co-authored-by: Florian Duros <florianduros@element.io>
Co-authored-by: R Midhun Suresh <hi@midhun.dev>
Co-authored-by: dbkr <986903+dbkr@users.noreply.github.com>
Co-authored-by: ElementRobot <releases@riot.im>
Co-authored-by: dbkr <dbkr@users.noreply.github.com>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Co-authored-by: David Langley <davidl@element.io>
Co-authored-by: Michael Weimann <michaelw@matrix.org>
Co-authored-by: Timshel <Timshel@users.noreply.github.com>
Co-authored-by: Sahil Silare <32628578+sahil9001@users.noreply.github.com>
Co-authored-by: Will Hunt <will@half-shot.uk>
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
Co-authored-by: Andrew Ferrazzutti <andrewf@element.io>
Co-authored-by: Robin <robin@robin.town>
Co-authored-by: Tulir Asokan <tulir@maunium.net>
2024-10-18 13:30:58 +00:00
David Langley 59cd5180af
Add reactions to html export (#28210)
* Absorb the matrix-react-sdk repository (#28192)

Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
Co-authored-by: github-merge-queue <github-merge-queue@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Florian Duros <florian.duros@ormaz.fr>
Co-authored-by: Kim Brose <kim.brose@nordeck.net>
Co-authored-by: Florian Duros <florianduros@element.io>
Co-authored-by: R Midhun Suresh <hi@midhun.dev>
Co-authored-by: dbkr <986903+dbkr@users.noreply.github.com>
Co-authored-by: ElementRobot <releases@riot.im>
Co-authored-by: dbkr <dbkr@users.noreply.github.com>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Co-authored-by: David Langley <davidl@element.io>
Co-authored-by: Michael Weimann <michaelw@matrix.org>
Co-authored-by: Timshel <Timshel@users.noreply.github.com>
Co-authored-by: Sahil Silare <32628578+sahil9001@users.noreply.github.com>
Co-authored-by: Will Hunt <will@half-shot.uk>
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
Co-authored-by: Andrew Ferrazzutti <andrewf@element.io>
Co-authored-by: Robin <robin@robin.town>
Co-authored-by: Tulir Asokan <tulir@maunium.net>

* Update dependency @sentry/browser to v8.33.0 [SECURITY] (#28194)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update babel monorepo (#28196)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @types/react to v17.0.83 (#28138)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @matrix-org/spec to v1.12.0 (#28200)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @formatjs/intl-segmenter to v11.5.9 (#28197)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Remove references to `MatrixClient.crypto` (#28204)

* Remove `VerificationExplorer`

* Remove `remakeolm` slash command

* Remove call to `crypto.cancelAndResendAllOutgoingKeyRequests`

* Remove crypto mock in `LoginWithQR-test.tsx`

* Remove `StopGadWidgetDriver.sendToDevice`

* Remove remaining mock

* Update dependency typescript to v5.6.3 (#28198)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency eslint-plugin-unicorn to v56 (#28202)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency stylelint to v16.10.0 (#28201)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update browserslist (#28199)

* Update browserslist

* Update tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>

* Add reactions to html export and add test

* Add reaction to snapshot test

* Update snapshot output

* Remove logging

* Add reaction to html export screenshot test.

* lint

* Update reference screenshot.

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
Co-authored-by: github-merge-queue <github-merge-queue@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Florian Duros <florian.duros@ormaz.fr>
Co-authored-by: Kim Brose <kim.brose@nordeck.net>
Co-authored-by: Florian Duros <florianduros@element.io>
Co-authored-by: R Midhun Suresh <hi@midhun.dev>
Co-authored-by: dbkr <986903+dbkr@users.noreply.github.com>
Co-authored-by: ElementRobot <releases@riot.im>
Co-authored-by: dbkr <dbkr@users.noreply.github.com>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Co-authored-by: Michael Weimann <michaelw@matrix.org>
Co-authored-by: Timshel <Timshel@users.noreply.github.com>
Co-authored-by: Sahil Silare <32628578+sahil9001@users.noreply.github.com>
Co-authored-by: Will Hunt <will@half-shot.uk>
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
Co-authored-by: Andrew Ferrazzutti <andrewf@element.io>
Co-authored-by: Robin <robin@robin.town>
Co-authored-by: Tulir Asokan <tulir@maunium.net>
2024-10-18 12:56:08 +00:00
Michael Telatynski e09e15bb52
Fix test
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-18 13:38:25 +01:00
Michael Telatynski 0105f566c9
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-18 13:28:44 +01:00
Michael Telatynski 44b23d2191
Make Sonar happier
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-18 12:56:57 +01:00
Michael Telatynski 06d1239608
Fix develop changelog parsing (#28232)
* Fix develop changelog parsing and DRY it

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* duh

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Improve coverage

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Typeguards!

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Discard changes to test/unit-tests/components/views/dialogs/__snapshots__/ChangelogDialog-test.tsx.snap

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-18 11:20:52 +00:00
ElementRobot 6771bd6de2
[create-pull-request] automated change (#28234)
Co-authored-by: t3chguy <t3chguy@users.noreply.github.com>
2024-10-18 10:24:02 +00:00
Florian Duros 1bb482f6f7
Replace `Matrix.getKeyBackupEnabled` by `MatrixClient.CryptoApi.getActiveSessionBackupVersion` (#28225)
* Migrating deprecated sync `MatrixClient.getKeyBackupEnabled` to async `MatrixClient.CryptoApi.getActiveSessionBackupVersion` in `NewRecoveryMethodDialog`.
Rewrite `NewRecoveryMethodDialog` into a functional component to make it easier to handle the new async method.

* Migrating deprecated sync `MatrixClient.getKeyBackupEnabled` to async `MatrixClient.CryptoApi.getActiveSessionBackupVersion` in `MatrixChat`.
2024-10-18 09:45:45 +00:00
Florian Duros 85d2bf3a04
Second batch: remove deprecated calls on `MatrixClient` (#28227)
* Replace `MatrixClient.forceDiscardSession` call by `MatrixClient.CryptoApi.forceDiscardSession`

* Remove `MatrixClient.scheduleAllGroupSessionsForBackup` mock
2024-10-18 07:51:53 +00:00
ElementRobot e79916454f
[create-pull-request] automated change (#28230)
Co-authored-by: t3chguy <2403652+t3chguy@users.noreply.github.com>
2024-10-18 06:20:52 +00:00
David Baker 8f35353758
Deflake keyboard navigation test (#28224)
Fixes https://github.com/element-hq/element-web/issues/28139
2024-10-17 16:08:26 +00:00
David Baker cb383efb42
Port the flaky add/remove 3pid test to playwright (#28226)
Fixes https://github.com/element-hq/element-web/issues/28160
2024-10-17 15:45:56 +00:00
Michael Telatynski a9bea774f9
Fix Ctrl+F shortcut not working with minimised room summary card (#28223)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-17 15:02:38 +00:00
David Baker 1fc0122523
Deflake unskippable verification (#28222)
Discovering what is the correct way of asserting that an element is *not*
on screen with Playwright, which apparently is nontrivial.
2024-10-17 14:44:53 +00:00
Michael Telatynski 0c19991e3c
Fix network dropdown missing checkbox & aria-checked (#28220)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-17 12:40:04 +00:00
Michael Telatynski 2cff2b5a86
Pin GHA runner versions (#28215)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-17 10:10:32 +00:00
renovate[bot] eedeb2cdaf
Update dependency @types/node to v18.19.56 (#28137)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-17 08:31:51 +00:00
Michael Telatynski f4a254a303
Merge pull request #28213 from element-hq/t3chguy/repo-merge 2024-10-17 09:13:18 +01:00
ElementRobot d4a780ebb9
[create-pull-request] automated change (#28212)
Co-authored-by: t3chguy <2403652+t3chguy@users.noreply.github.com>
2024-10-17 08:50:45 +01:00
renovate[bot] 9a6dac00fc
Update browserslist (#28199)
* Update browserslist

* Update tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-17 08:50:45 +01:00
renovate[bot] fa419a0ae1
Update dependency stylelint to v16.10.0 (#28201)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-17 08:50:44 +01:00
renovate[bot] e27779343c
Update dependency eslint-plugin-unicorn to v56 (#28202)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-17 08:50:44 +01:00
renovate[bot] d25f203a5c
Update dependency typescript to v5.6.3 (#28198)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-17 08:50:44 +01:00
Florian Duros 7236953d07
Remove references to `MatrixClient.crypto` (#28204)
* Remove `VerificationExplorer`

* Remove `remakeolm` slash command

* Remove call to `crypto.cancelAndResendAllOutgoingKeyRequests`

* Remove crypto mock in `LoginWithQR-test.tsx`

* Remove `StopGadWidgetDriver.sendToDevice`

* Remove remaining mock
2024-10-17 08:50:44 +01:00
renovate[bot] ea5cba3649
Update dependency @formatjs/intl-segmenter to v11.5.9 (#28197)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-17 08:50:44 +01:00
renovate[bot] 40355980c8
Update dependency @matrix-org/spec to v1.12.0 (#28200)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-17 08:50:44 +01:00
renovate[bot] 1ea31f4e96
Update dependency @types/react to v17.0.83 (#28138)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-17 08:50:43 +01:00
renovate[bot] 71d0b391b2
Update babel monorepo (#28196)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-17 08:50:43 +01:00
renovate[bot] 82f96dc3a1
Update dependency @sentry/browser to v8.33.0 [SECURITY] (#28194)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-17 08:50:40 +01:00
Michael Telatynski 75b0a8329a
Merge branch 'develop' of https://github.com/vector-im/element-web into t3chguy/repo-merge 2024-10-16 13:12:03 +01:00
Florian Duros b483fdda35
Use new `CryptoEvent` import (#128)
* Use new `CryptoEvent` import

* Remove remaining old `CryptoEvent` import

* Replace `import` by `import type`
2024-10-16 12:56:10 +01:00
Michael Telatynski 8ae64fe09b
Move NETLIFY_SITE_ID to vars
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-10-16 11:24:37 +01:00
Florian Duros 2b99496025
Merge pull request #28173 from element-hq/florianduros/remove-feature-dehydration
Remove feature_dehydration
2024-10-16 10:01:16 +00:00