Commit Graph

4391 Commits (c159d550f53555cddeb918d19ce4518216710a80)

Author SHA1 Message Date
Kerry 7aefa34420
use LocationAssetType (#7965)
* use LocationAssetType

Signed-off-by: Kerry Archibald <kerrya@element.io>

* center icon better

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove debug

Signed-off-by: Kerry Archibald <kerrya@element.io>

* retrigger all builds

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-03-03 10:04:38 +00:00
Kerry d304e24a45
Revert "remove code related to encrypted file download button in iframe" (#7957)
* Revert "remove code related to encrypted file download button in iframe (#7940)"

This reverts commit 26216ec527.

* udpate icon import in MFileBody

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-03-02 18:27:36 +01:00
Michael Telatynski 560f8f7ee7
Improve accessibility of the BetaPill (#7949) 2022-03-02 16:31:47 +00:00
Michael Telatynski 71ddd9d78d
Prevent event tiles being shrunk/collapsed by flexbox (#7942) 2022-03-02 14:24:43 +00:00
Kerry b480bffab0
Location share type UI (#7924)
* copyright

Signed-off-by: Kerry Archibald <kerrya@element.io>

* empty line

Signed-off-by: Kerry Archibald <kerrya@element.io>

* functional picker

Signed-off-by: Kerry Archibald <kerrya@element.io>

* most style

Signed-off-by: Kerry Archibald <kerrya@element.io>

* nice style for options

Signed-off-by: Kerry Archibald <kerrya@element.io>

* get ShareType test passing

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add maplibre mock

Signed-off-by: Kerry Archibald <kerrya@element.io>

* lint and test

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add section to themes for location sharing cols

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add svg mock

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use same mock string as imageMock

Signed-off-by: Kerry Archibald <kerrya@element.io>

* newline

Signed-off-by: Kerry Archibald <kerrya@element.io>

* lint

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add live location icon

Signed-off-by: Kerry Archibald <kerrya@element.io>

* rename useEnabledShareTypes

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use solid color for live border

* use ternary

Signed-off-by: Kerry Archibald <kerrya@element.io>

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2022-03-02 13:00:40 +00:00
Kerry 26216ec527
remove code related to encrypted file download button in iframe (#7940)
* remove code related to encrypted file download button in iframe

Signed-off-by: Kerry Archibald <kerrya@element.io>

* i18n

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove getIframeFn in mfilebody filedownloader

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove iframe ref too

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-03-02 11:55:03 +00:00
Kerry e6ea58e84d
Load icons using @svgr (#7928)
* extend svg module

Signed-off-by: Kerry Archibald <kerrya@element.io>

* POC in QuickSettingsButton

Signed-off-by: Kerry Archibald <kerrya@element.io>

* stylelint

Signed-off-by: Kerry Archibald <kerrya@element.io>

* update copyright

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove aria-hidden, quick docs

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-03-02 10:18:45 +01:00
Kerry 3f1951b5b8
Prep for pin drop location sharing (#7919)
* add labs flag feature_location_share_pin_drop

Signed-off-by: Kerry Archibald <kerrya@element.io>

* split LocationButton into two components

Signed-off-by: Kerry Archibald <kerrya@element.io>

* rethemendex

Signed-off-by: Kerry Archibald <kerrya@element.io>

* copyright

Signed-off-by: Kerry Archibald <kerrya@element.io>

* one more (c)

Signed-off-by: Kerry Archibald <kerrya@element.io>

* i18n

Signed-off-by: Kerry Archibald <kerrya@element.io>

* empty line

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use same matrix client import

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-03-01 18:00:07 +01:00
Michael Telatynski 7a32a68a0b
Fix right panel soft crashes due to missing room prop (#7923) 2022-03-01 11:15:23 +00:00
Kerry 36adba101c
fix color of location share caret (#7917)
Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-03-01 08:53:28 +00:00
Suguru Hirahara 7e4b856ec3
Fix padding inside the labels on Settings (#7912) 2022-02-28 15:05:32 +00:00
Robin 464bb727db
Update and expand ways to access pinned messages (#7906)
* Hide pinned messages header button when nothing is pinned

Signed-off-by: Robin Townsend <robin@robin.town>

* Add pinned messages option to room info panel

Signed-off-by: Robin Townsend <robin@robin.town>

* Add pinned messages option to room header menu

Signed-off-by: Robin Townsend <robin@robin.town>

* Make condition more concise

Signed-off-by: Robin Townsend <robin@robin.town>
2022-02-28 14:52:16 +00:00
J. Ryan Stinnett 182aedc3d4
Tweak info message padding in right panel timeline (#7901) 2022-02-28 10:23:01 +00:00
Robin 76ca0362e1
Fix composer format buttons on WebKit (#7898) 2022-02-25 13:20:06 +00:00
Michael Telatynski 8c2dcca48f
Fix edge case around event list summary layout (#7891) 2022-02-24 13:31:03 +00:00
Kerry f4cd71fd47
Check 'useSystemTheme' in quick settings theme switcher (#7809)
* mock Element.scrollIntoView in jest setup

Signed-off-by: Kerry Archibald <kerrya@element.io>

* extract theme switcher from quick settings, add match system option, test

Signed-off-by: Kerry Archibald <kerrya@element.io>

* i18n

Signed-off-by: Kerry Archibald <kerrya@element.io>

* forgotten copyright

Signed-off-by: Kerry Archibald <kerrya@element.io>

* stylelint

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove old class

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-02-24 10:01:06 +01:00
Robin 49bf0abeb5
Fix missing padding on server picker (#7864)
* Fix missing padding on server picker

Signed-off-by: Robin Townsend <robin@robin.town>

* Use spacing variable

Signed-off-by: Robin Townsend <robin@robin.town>
2022-02-23 15:57:34 +00:00
J. Ryan Stinnett d8ac7cf202
Fix thread summary layout for narrow right panel timeline (#7838) 2022-02-23 14:03:46 +00:00
Michael Telatynski 0756e9957e
Fix hidden events in thread view (#7870) 2022-02-22 13:19:29 +00:00
Michael Telatynski 8fccef86d8
Wire up drag-drop file uploads for the thread view (#7860) 2022-02-22 11:14:56 +00:00
Michael Telatynski e644ede09e
Fix edge case around event list summary layout (#7867) 2022-02-22 10:25:44 +00:00
Michael Telatynski 57595bc593
Fix misalignment with Event List Summaries (#7865)
* Fix misalignment with Event List Summaries

* simplify styling
2022-02-22 08:35:58 +00:00
Michael Telatynski e2827b4082
Fix accessibility around the room list treeview and new search beta (#7856) 2022-02-21 15:46:13 +00:00
Michael Telatynski c6b8574dcb
Inhibit tooltip on timeline pill avatars, the whole pill has its own (#7854) 2022-02-21 12:38:11 +00:00
Andy Balaam f1e1b7be86
Support "closed" polls whose votes are not visible until they are ended (#7842) 2022-02-21 10:21:35 +00:00
Michael Telatynski 5f5bb4a4fe
Consolidate TileShape into TimelineRenderingType (#7843) 2022-02-18 15:56:05 +00:00
Kerry 6fccd6b183
add cursor: pointer to actionable poll options (#7826)
* add cursor: pointer to actionable poll options

Signed-off-by: Kerry Archibald <kerrya@element.io>

* eof

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-02-18 11:43:07 +01:00
Michael Telatynski 07d5b4139d
Add way to join room address via new search dialog (#7830) 2022-02-17 15:40:12 +00:00
Germain 2160fd81c2
Fixes React.js console errors (#7829) 2022-02-17 11:46:19 +00:00
Michael Telatynski 4292381202
Fix layout inconsistencies with the room search minimized button (#7824) 2022-02-17 10:33:36 +00:00
Akash Patel 328bbd0e08
set icon-button-color to be configurable (#7725) 2022-02-17 09:40:23 +00:00
Michael Telatynski cd49852c2d
Fix icon size bug in space people context menu (#7822) 2022-02-17 09:20:15 +00:00
Kerry 78524bddce
apply mask-size for svgs with bigger viewbox (#7812)
Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-02-16 09:54:40 +01:00
Michael Telatynski 0a084601c4
Abstract spotlight to allow non-room results too (#7804) 2022-02-15 13:36:32 +00:00
Andy Balaam 84e15fa148
Display '(edited)' next to edited polls (#7789) 2022-02-15 08:52:51 +00:00
Michael Telatynski 76fb2abae1
Consolidate, simplify and improve copied tooltips (#7799) 2022-02-14 23:54:46 +00:00
Michael Telatynski 8d3c2eddd6
Improve styling of edge case devtools state keys (#7794) 2022-02-14 23:37:45 +00:00
Michael Telatynski d06ec845ee
Fix cutout misalignment on some decorated room avatars (#7784) 2022-02-11 12:05:54 +00:00
Michael Telatynski 714136d4f7
Consolidate RedactionGrouper and HiddenEventGrouper into MELS (#7739) 2022-02-09 10:51:12 +00:00
J. Ryan Stinnett 59cdd3edc0
Unify widget header actions with those in right panel (#7734) 2022-02-09 10:47:41 +00:00
Charlie Calendre fdbdde83c2
Fix theme selector dropdown overflow (#7764) 2022-02-09 09:35:06 +00:00
Šimon Brandner f13329213d
Handle highlight notifications in timeline card button (#7762) 2022-02-08 19:03:15 +00:00
Šimon Brandner 479e7e9a25
Add unread notification dot to timeline card button (#7749) 2022-02-08 17:37:03 +00:00
J. Ryan Stinnett bf8438cbb2
Add jump to bottom button for right panel timeline (#7746) 2022-02-08 17:35:03 +00:00
Michael Telatynski ed185240a5
Move new search experience to a Beta (#7718) 2022-02-08 14:02:36 +00:00
Michael Telatynski 5201c9b285
Improve responsiveness of the layout switcher (#7736) 2022-02-08 13:27:09 +00:00
J. Ryan Stinnett 81f2b19d32
Tweak timeline card layout (#7743) 2022-02-08 13:11:18 +00:00
Andy Balaam 76cafb7aa9
Ensure location bodies have a width in bubbles (#7742) 2022-02-08 12:59:08 +00:00
Šimon Brandner c52eaa53ce
Remove weird padding on stickers (#6271) 2022-02-08 08:27:37 +00:00
Michael Telatynski 834d0ec6fe
Fix width issue of the composer overflow menu items (#7731) 2022-02-07 17:49:04 +00:00
Germain 544957bdad
Use typographical quotes in no threads UI (#7713) 2022-02-07 15:13:34 +00:00
Michael Telatynski d72469663d
Add unread badges and avatar decorations to spotlight search (#7696) 2022-02-07 13:50:04 +00:00
Michael Telatynski 5d89230271
Remove IA 1.1 feedback toast (#7720) 2022-02-07 12:46:48 +00:00
Michael Telatynski 78373e86ea
Truncate long server names on login/register screen (#7702)
Co-authored-by: Aaron Raimist <aaron@raim.ist>
2022-02-04 10:20:20 +00:00
Germain df86678798
Update to thread UI (#7714) 2022-02-03 16:24:49 +00:00
Michael Telatynski 75b03ca101
Reuse CopyableText component in all places it can be (#7701) 2022-02-02 12:16:00 +00:00
Andy Balaam afbc843157
Fit location into the width of the container (#7705) 2022-02-02 11:41:33 +00:00
Andy Balaam f5226f9d5b
Simplify Composer buttons (#7678)
* Render a CollapsibleButton's children (needed by UploadButton)

* Make UploadButton ready to live inside an overflow menu

* Always show overflow menu in composer: main buttons are emoji and attach

* Re-order composer buttons as per design

* Re-word composer button captions to be simple nouns

* Don't rotate More options button when clicked

* Move the composer menu and dialogs 16px in from right

* Reduce shadow on composer More menu

* From review: remove else clause

* From review: take input out of button

* Update test snapshots

* Update snapshots
2022-02-02 09:30:53 +00:00
Michael Telatynski c011fb7475
Fix incorrect sizing of DecoratedRoomAvatar in RoomHeader (#7697) 2022-02-02 09:22:27 +00:00
Eric Eastwood 9b0da552e7
Fix vertical spacing in `compact` `<ContextMenu>` (#7684)
Fix https://github.com/vector-im/element-web/issues/20801

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/7339

Relevant styles were first added in https://github.com/matrix-org/matrix-react-sdk/pull/4858
(context behind why the original styles were added)

---

## Cause

Battling CSS specificity between the default and compact styles, https://specificity.keegan.st/

Known good (On `app.element.io` (expected)):
```css
// 0 3 0
.mx_IconizedContextMenu .mx_IconizedContextMenu_optionList .mx_AccessibleButton {
    padding-top: 12px;
    padding-bottom: 12px;
}

// Compact styles override our default rules because they come
// after the other styles (source order) and have the same specificity
// 0 3 0
.mx_IconizedContextMenu.mx_IconizedContextMenu_compact .mx_IconizedContextMenu_optionList > * {
    padding: 8px 16px 8px 11px;
}
```

Bad (On `develop` (broken)):
```css
// Default rules always override because they have higher specificity.
// The `:not()` selector doesn't add any extra specificity but the selectors inside the `:not(...)` do.
// 0 4 0
.mx_IconizedContextMenu .mx_IconizedContextMenu_optionList .mx_AccessibleButton:not(.mx_AccessibleButton_hasKind) {
    padding-top: 12px;
    padding-bottom: 12px;
}

// 0 3 0
.mx_IconizedContextMenu.mx_IconizedContextMenu_compact .mx_IconizedContextMenu_optionList > * {
    padding: 8px 16px 8px 11px;
}
```
2022-02-01 11:23:21 -06:00
Michael Telatynski 18995363d0
Make polls fill column width in bubbles layout (#7661) 2022-02-01 09:27:14 +00:00
UwUnyaa 5d93ca5f2a
Irc full name overlap (#7652) 2022-02-01 09:24:05 +00:00
Ajay Bura 3e1a5f7021
Fix warning image overflow in space hierarchy (#7686) 2022-02-01 10:21:58 +05:30
Michael Telatynski 991257cbc3
Fix accessibility and consistency of MessageComposerButtons (#7679) 2022-01-31 16:05:05 +00:00
Kerry 085ecc7f5f
Chat export parameter customisation (#7647)
* use export settings and hide fields

Signed-off-by: Kerry Archibald <kerrya@element.io>

* fix exporter tests

Signed-off-by: Kerry Archibald <kerrya@element.io>

* test ExportDialog with settings

Signed-off-by: Kerry Archibald <kerrya@element.io>

* tidy debugs, rename setting to Parameters

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use reasonable 100gb limit

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use normal setting instead of UIFeature

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use a customisation

Signed-off-by: Kerry Archibald <kerrya@element.io>

* move validateNumberInRange to utils

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use nullish coalesce

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use 8gb size limit for customisation

Signed-off-by: Kerry Archibald <kerrya@element.io>

* update comments

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-01-31 12:54:14 +01:00
Robin 53aca69594
Fix font size of spaces between big emoji (#7675) 2022-01-31 09:53:04 +00:00
Eric Eastwood 7fa27f5834
Add jump to date functionality to date headers in timeline v2 (#7339)
Fix https://github.com/vector-im/element-web/issues/7677

Utilizes MSC3030: https://github.com/matrix-org/matrix-doc/pull/3030

https://user-images.githubusercontent.com/558581/150060664-79627573-f4fd-497c-b726-dc3485854bd0.png
2022-01-27 16:32:12 -06:00
Michael Telatynski 074fec359b
Fix issue with tile error boundaries collapsing in bubbles layout (#7653) 2022-01-27 13:34:26 +00:00
Michael Telatynski 20819df60b
Fix emojis getting cropped in irc & bubble layouts by anti-zalgo (#7637)
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2022-01-27 09:45:52 +00:00
Michael Telatynski 50f8c61fa8
Fix search results view for layouts other than Group/Modern (#7648) 2022-01-26 20:15:44 +00:00
Michael Telatynski 04f8228741
Tweak room list header menu for when space is active (#7577)
* Remove start chat entry from space-variant room list header + menu

* Add options to the RoomListHeader plus menu

* Tweak behaviour of room list header + menu space variant explore action
2022-01-25 20:21:38 +00:00
Michael Telatynski 51fd4d82fd
Tweak light hover & active color for bubble layout (#7626)
* Tweak light hover & active color for bubble layout

* delint
2022-01-25 14:21:13 +00:00
Michael Telatynski fb49ccce35
Show bubble tile timestamps for bubble layout inside the bubble (#7622) 2022-01-25 13:10:17 +00:00
Michael Telatynski 8ddd677c35
De-labs Metaspaces (#7613) 2022-01-25 12:33:17 +00:00
Kerry 502b805164
Add customisation point for mxid display (#7595)
* add wrapping component for hiding UI

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add Setting

Signed-off-by: Kerry Archibald <kerrya@element.io>

* apply setting to profile settings, user menu, invite dialog, userinfo

Signed-off-by: Kerry Archibald <kerrya@element.io>

* hide mxids in user autocomplete

* remove mxids from title in memeber list and timeline

Signed-off-by: Kerry Archibald <kerrya@element.io>

* hide mxid in ConfirmUserActionDialog

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use name in power level event message when displayMxids is falsy

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add customisation point for mxid display

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use userid customisation

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use customisation in sender profile

Signed-off-by: Kerry Archibald <kerrya@element.io>

* hide profile settings mxid if falsy

Signed-off-by: Kerry Archibald <kerrya@element.io>

* rename and move to components

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove change to UIFeature.ts

Signed-off-by: Kerry Archibald <kerrya@element.io>

* improvements from pr

Signed-off-by: Kerry Archibald <kerrya@element.io>

* lint fix

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-01-25 10:40:02 +01:00
Michael Telatynski 777af0cf10
Bubble layout fixes to media events (#7615) 2022-01-24 19:01:20 +00:00
Michael Telatynski d60b234b75
Don't render a bubble around emotes in bubble layout (#7573) 2022-01-24 13:51:57 +00:00
Robin 6806c2cdca
Enlarge emoji in composer (#7602) 2022-01-24 12:53:05 +00:00
Šimon Brandner b5d11336f7
Add ability to switch between voice & video in calls (#7155) 2022-01-24 12:48:35 +00:00
Michael Telatynski 756b924966
Update colours of message bubbles to match new designs (#7610) 2022-01-24 12:33:55 +00:00
Robin 83b0d123c1
Make pills more natural to navigate around (#7607) 2022-01-24 12:24:11 +00:00
Robin c7449caacc
Fix excessive padding on inline images (#7605) 2022-01-24 12:21:21 +00:00
Robin 5430fa15a4
Prevent pills from being split by formatting actions (#7606) 2022-01-24 12:18:08 +00:00
Šimon Brandner a2f1e856be
Make room ID copyable (#7600) 2022-01-24 11:47:59 +00:00
Šimon Brandner 5f18e4888c
Improve the look of the keyboard settings tab (#7562)
* First cut of new keyboard shortcuts

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove unused code

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* i18n

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Amend shortcuts

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Improve CATEGORIES struct

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Add tests for registerShortcut()

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Simplifie code tiny bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Translate ALTERNATE_KEY_NAME

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Fix `key` usage

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Export components for tests

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Write snapshot tests

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2022-01-24 11:33:27 +00:00
Andy Balaam 9fefce6721
Make the close button of the location share dialog visible in high-contrast theme (#7597) 2022-01-21 15:40:51 +00:00
Robin af8b3c2714
Add tooltips to emoji in messages (#7592) 2022-01-21 10:10:57 +00:00
rkfg 98e1c311c4
Make inline emojis bigger (#5401) 2022-01-20 16:33:41 -07:00
Robin f59ea6d7ad
Show a tile at beginning of visible history (#5887) 2022-01-20 09:51:31 +00:00
Germain 73a58705f6
Fix alignment of unread badge in thread list (#7582) 2022-01-20 08:47:37 +00:00
Germain 8427bf46ef
Fix broken thread list timestamp display (#7549) 2022-01-19 10:41:39 +00:00
Germain 336217f668
Add view in room to action bar in thread list (#7519) 2022-01-19 10:39:33 +00:00
Andy Balaam 2743a75a21
Display general marker on non-self location shares (#7574) 2022-01-19 09:33:49 +00:00
Eric Eastwood a00d359422
Fix left positioned tooltips being wrong and offset by fixed value (#7551)
Previously, the `left` positioning seemed to only work with icons which are all about the same size so the arbitrary offset worked. Now we actually position off to the left of the element and we have equal `margin-left` and `margin-right` to determine the offset.

Spawned from https://github.com/matrix-org/matrix-react-sdk/pull/7339#discussion_r767154349
2022-01-18 21:08:11 -06:00
Michael Telatynski b50060bcfc
Fix MAB overlapping or overflowing in bubbles layout and threads regressions (#7569)
* Fix MAB overlapping or overflowing in bubbles layout

* Fix bubbles in threads timestamps positioning regression
2022-01-19 01:48:07 +00:00
Michael Telatynski aac5964121
Fix wrong icon being used for appearance tab in space preferences dialog (#7570) 2022-01-18 17:56:49 -07:00
Michael Telatynski 67a4d22e79
Update sidebar icon from Compound (#7572) 2022-01-18 15:29:43 +00:00
Michael Telatynski d5412e52ed
Replace home icon with new one (#7571) 2022-01-18 15:29:01 +00:00
Michael Telatynski f217c6fd61
Update bubble layout styling for stickers (#7560) 2022-01-18 10:37:44 +00:00
Michael Telatynski aed09ee2f6
Differentiate between hover and roving focus in spotlight dialog (#7564) 2022-01-18 09:56:04 +00:00