Travis Ralston
beef07bdef
Merge branch 'develop' into err
2021-05-10 20:08:19 -06:00
Travis Ralston
379d19e2e0
Lint
2021-05-10 19:56:30 -06:00
Robin Townsend
c39d9649ba
Merge branch 'develop' into improved-forwarding-ui
2021-05-10 13:38:02 -04:00
Robin Townsend
503301aa89
Make rooms in ForwardDialog clickable
...
…so that you can jump to a room easily once you've forwarded a message
there.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 13:00:06 -04:00
Robin Townsend
5c10e1e574
Fix lints
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 01:16:37 -04:00
Robin Townsend
eb779cd3d8
Test that forward buttons are disabled for rooms without permission
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 01:10:41 -04:00
Robin Townsend
35cf0e1c7e
Find components by name rather than class in ForwardDialog test
...
It makes things shorter and more readable!
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 01:10:39 -04:00
Robin Townsend
eb07f1fb86
Test that ForwardDialog can render replies
...
Previously ForwardDialog was not giving its EventTile message preview
the information it needed to render a ReplyThread. This was a bit tricky
to fix since we were pulling a fake event out of thin air, so this
ensures it doesn't regress.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 00:54:00 -04:00
Robin Townsend
74925b2c6d
Test ForwardDialog
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-08 21:11:06 -04:00
Ayush PS
2ad0032f72
Added regression tests for Natural headers
2021-05-09 01:10:54 +05:30
Travis Ralston
b007ea81b2
Rescale and smooth playback waveform to better match expectation
2021-05-07 21:06:07 -06:00
Ayush PS
32edbc155f
Merge remote-tracking branch 'origin/develop' into err
2021-05-07 19:16:00 +05:30
Michael Telatynski
90fa738734
Fix that one final pesky test
2021-05-07 11:22:10 +01:00
Michael Telatynski
f0e61e6286
short circuit automatic switch to related space behaviour and fix tests
2021-05-07 11:08:18 +01:00
Michael Telatynski
9d9dce7a91
update orphan room behaviour test to expect new home space behaviour
2021-05-07 10:48:55 +01:00
Ayush PS
d1f23fb994
Partially added the tests [WIP]
2021-05-07 11:45:52 +05:30
dependabot[bot]
137189932e
Bump lodash from 4.17.19 to 4.17.21 in /test/end-to-end-tests
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.19 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-07 01:13:47 +00:00
J. Ryan Stinnett
683aec1066
Merge pull request #5833 from SimonBrandner/feed
...
Support for multiple streams (not MSC3077)
2021-05-06 11:20:09 +01:00
Michael Telatynski
ed8b05b730
Merge pull request #5951 from SimonBrandner/fix/room-pill-history
...
Fix saving room pill part to history
2021-05-04 12:32:04 +01:00
Šimon Brandner
1fe2085309
Fix deserialize test
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-01 12:28:18 +02:00
Šimon Brandner
5913203dc6
Merge branch 'develop' into fix-indent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 20:08:14 +02:00
Šimon Brandner
232b87a3b4
Improve formatting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 19:57:02 +02:00
Travis Ralston
8d8525cdeb
Merge pull request #5935 from matrix-org/travis/voice/control-bar
...
Voice messages: Composer controls
2021-04-28 09:38:28 -06:00
Šimon Brandner
9aaf321e4e
Remove dis call which doesn't seem to be necessary
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 13:39:09 +02:00
Šimon Brandner
b6324a816f
Use CallHandler correctly
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 13:33:15 +02:00
Šimon Brandner
40748d3c94
Make CallHandler emit CallChangeRoom
...
Let's hope I changed the tests correctly
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 11:49:07 +02:00
David Baker
c95c1aeffd
Merge pull request #5886 from matrix-org/dbkr/asserted_identity
...
Support MSC3086 asserted identity
2021-04-28 09:47:40 +01:00
Travis Ralston
32e3ce3dea
Handle basic state machine of recordings
2021-04-27 15:02:15 -06:00
David Baker
be7d4d020b
Put asserted identity option under a 'voip' section
2021-04-27 19:33:53 +01:00
David Baker
705505fe85
make copyright not lie
2021-04-27 18:56:36 +01:00
Šimon Brandner
46bfbbadf9
Enable indent rule and fix indent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 17:23:27 +02:00
J. Ryan Stinnett
dd8abb0206
Merge pull request #5912 from matrix-org/jryans/convert-flow-to-ts
...
Convert some Flow-typed files to TypeScript
2021-04-27 13:44:47 +01:00
Michael Telatynski
f18a24025a
Merge branch 'develop' into t3chguy/fix/17022
2021-04-27 11:16:02 +01:00
J. Ryan Stinnett
cddcedcce2
Merge remote-tracking branch 'origin/develop' into jryans/convert-flow-to-ts
2021-04-26 15:57:28 +01:00
J. Ryan Stinnett
ba4e58513d
Fix ScalarAuthClient test
2021-04-26 15:41:19 +01:00
Michael Telatynski
203425c8de
Test and fix space store wrongly treating room invites as space invites
2021-04-26 08:37:45 +01:00
Michael Telatynski
47c12a7d23
Add tests for rooms moving around the SpaceStore
2021-04-25 09:24:00 +01:00
Michael Telatynski
98851f8e64
Text space switching behaviour and fix invalid space edge case
2021-04-24 11:32:55 +01:00
Michael Telatynski
f85d3643ee
Test and fix subspace invite receipt behaviour
2021-04-24 11:31:52 +01:00
Travis Ralston
82119ad595
Merge branch 'develop' into travis/error-states
2021-04-23 15:53:37 -06:00
Michael Telatynski
dd2a1d063a
Write tests for spaces context switching behavious
2021-04-23 16:14:55 +01:00
Michael Telatynski
4446022327
Add automatic space switching tests
2021-04-23 14:45:22 +01:00
David Baker
dc3d05bc88
Test for asserted identity
...
This is out first CallHandler test(!) Switches react-sdk to use
createCall on the client object so we can stub this out in the test.
Add a bunch more stubs to the test client.
There's more stuff in this test that has scope to be used more
widely, like waiting for a certain dispatch and mocking out rooms
with particular sets of users in them: we could consider moving these
out to test utils if we wanted.
2021-04-23 14:39:39 +01:00
Michael Telatynski
c35678c64a
Add yet more tests
2021-04-23 13:40:16 +01:00
Michael Telatynski
a3ca48b4da
Write more space store tests
2021-04-23 12:19:38 +01:00
Michael Telatynski
a12cefee8e
Tweak some tests
2021-04-23 12:19:08 +01:00
Michael Telatynski
a38419defb
extend space tests some more
2021-04-23 11:20:26 +01:00
Michael Telatynski
1075756929
add more tests
2021-04-23 09:55:30 +01:00
Travis Ralston
2c459c4828
Move utility tests to the right place
2021-04-22 20:37:19 -06:00
Travis Ralston
374f51452e
Add set utility tests
2021-04-22 20:37:19 -06:00
Travis Ralston
27af3291ed
Add number utility tests
2021-04-22 20:37:19 -06:00
Travis Ralston
6124a8319b
Add iterable utility tests
...
Unsurprisingly, it's a copy/paste of the array tests
2021-04-22 20:37:19 -06:00
Travis Ralston
0d4218ee35
Add enum utility tests
2021-04-22 20:37:19 -06:00
Travis Ralston
21cae1502a
Add map utility tests
2021-04-22 20:37:19 -06:00
Travis Ralston
772ff4e257
Add object utility tests
2021-04-22 20:37:19 -06:00
Travis Ralston
a3e846685d
Add array utility tests (and support upsampling in resample)
...
See contained diff.
The upsampling is important for Voice Messages, but is being done here because it's easier to add all the tests at once.
This also introduces a new Object utility - that will be tested on its own commit.
2021-04-22 20:08:45 -06:00
Michael Telatynski
fba7465ad4
Initial SpaceStore tests work
2021-04-22 14:45:13 +01:00
Šimon Brandner
55365e632b
Use the correct selector in E2EE tests
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-22 07:52:39 +02:00
Travis Ralston
a53696ff5e
Fix tests
2021-04-21 16:53:29 -06:00
Germain
68fb9a78c4
Merge pull request #5874 from matrix-org/gsouquet-room-events
2021-04-21 09:09:01 +01:00
Germain Souquet
de5ca92e4e
add e2e session.delay explainer
2021-04-19 18:01:19 +01:00
Germain Souquet
db646d5987
Fix end to end tests for DM creation
2021-04-19 15:07:11 +01:00
Travis Ralston
22233a8745
Add a concept of a singleflight to avoid repeated calls to stop/ending
...
This makes it easier to keep track of which pieces the client will have already dispatched or been executed, reducing the amount of class members needed.
Critically, this makes it so the 'stop' button (which is currently a send button) actually works even after the automatic stop has happened.
UI is still pending for stopping recording early. This is not covered by this change.
2021-04-14 21:59:50 -06:00
Travis Ralston
b0af163002
Merge pull request #5825 from matrix-org/travis/spaces/room-list
...
Restabilize room list ordering with prefiltering on spaces/communities
2021-04-06 05:47:21 -06:00
Travis Ralston
a0049f956d
Patch over legacy Groups test
2021-03-31 23:51:17 -06:00
Germain Souquet
c81847689a
Remove query matcher shouldMatchPrefix support
2021-03-31 18:21:02 +01:00
J. Ryan Stinnett
33e8edb3d5
Merge pull request #5720 from czeidler/key-bindings
...
Decouple key bindings from event handling
2021-03-26 15:14:38 +00:00
J. Ryan Stinnett
ce19d07850
Merge pull request #5805 from matrix-org/travis/ts/access-ss-dialog
...
Convert AccessSecretStorageDialog to TypeScript
2021-03-26 12:37:24 +00:00
J. Ryan Stinnett
cf4ed1bcdf
Fix tests
2021-03-26 11:56:58 +00:00
Travis Ralston
5d9b36afc1
Fix tests
2021-03-25 23:47:41 -06:00
Clemens Zeidler
2a21d45ac0
Merge branch 'develop' into key-bindings
2021-03-12 16:44:12 +13:00
Travis Ralston
6ab235f10c
Fix tests for new call path
...
We have to mock `fetch` for the caching of the download icon, and then mock out all the function calls used by components to feed a Media object.
2021-03-11 09:42:55 -07:00
Travis Ralston
533c9fed64
Appease the linter
2021-03-10 12:32:18 -07:00
Travis Ralston
375ffafda6
Fix tests failing to load skin
...
We should find a better way to do this, but this works well enough.
2021-03-09 10:13:16 -07:00
Travis Ralston
591ccabab9
Remove a bunch of useless 'use strict' definitions
2021-03-08 20:26:08 -07:00
J. Ryan Stinnett
b12cf7912a
Merge pull request #5624 from SimonBrandner/show-room-name
...
Display room name in pills instead of address
2021-03-08 16:27:43 +00:00
Clemens Zeidler
06181221a1
Add copyright headers
2021-03-07 19:05:36 +13:00
Clemens Zeidler
4a6f931782
Merge branch 'develop' into key-bindings
2021-03-04 21:10:35 +13:00
Travis Ralston
0dd4d45c49
Disable velocity mock option
...
This appears to have been removed in the beta
2021-02-26 22:36:42 -07:00
Michael Telatynski
f45510ed25
Fix test assuming too much about the underlying calls
2021-02-19 13:08:30 +00:00
Michael Telatynski
3c52446205
Remove redundant PhasedRollOut
2021-02-19 00:01:07 +00:00
Clemens Zeidler
4a138f3b84
Only support a single key in the KeyCombo
...
Keep it simple...
2021-02-15 19:21:08 +13:00
David Baker
196507a730
VoIP virtual rooms, mk II
...
Does a thirdparty protocol lookup to the homeserver to get the
corresponding native/virtual user for a matrix ID. Stores the
mappings in room account data. Involves some slightly nasty workarounds
for that fact that room account data has no local echo.
2021-02-12 20:55:54 +00:00
Šimon Brandner
a075568e89
Fixed tests
...
In the previous commits I have removed the native title/tooltip so it needs to be removed from the tests as well
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 11:34:09 +01:00
Clemens Zeidler
c7f9defd12
Add simple implementation of a KeyBindingsManager + match tests
2021-02-12 22:04:33 +13:00
J. Ryan Stinnett
474c029db5
Fix permalink via parsing for rooms
...
This adjusts the app local link parsing path to better handle `via`s in query
params. Previously this path only expected them when an event ID was also
present, but it's also valid to have `via`s without event IDs as well.
Fixes https://github.com/vector-im/element-web/issues/16345
2021-02-03 15:18:19 +00:00
Michael Telatynski
5a49cbf51a
Merge pull request #5600 from weeman1337/fix-e2et-run-out
...
Fix app-url hint in the e2e-test run script output
2021-02-01 12:47:12 +00:00
J. Ryan Stinnett
89b835dd20
Merge pull request #5575 from matrix-org/jryans/no-event-pills
...
Remove pills from event permalinks with text
2021-02-01 10:53:22 +00:00
Michael Weimann
0660371461
fix typo in end-to-end-test run script output
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-01-31 09:53:15 +01:00
J. Ryan Stinnett
0cb266eda2
lolex renamed to @sinonjs/fake-timers
2021-01-27 12:31:37 +00:00
J. Ryan Stinnett
fa3ace8473
Rework message pilling to ignore event permalinks
...
This removes pills from event permalinks since they hide the text associated
with the link, which can cause nonsensical messages since words have been
removed. In addition, this moves away from fragile regexs to more
straightforward code to parse links and adds a test for this case.
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5188
Fixes https://github.com/vector-im/element-web/issues/15159
2021-01-27 11:46:20 +00:00
David Baker
f703383ab6
Merge pull request #5560 from matrix-org/dbkr/voip_user_mapper
...
Add VoIP user mapper
2021-01-22 14:12:08 +00:00
David Baker
ba45b47240
Oops, the tests won't work if we don't export the functions
2021-01-21 22:42:12 +00:00
David Baker
0a90c982c7
Add VoIP user mapper
...
The accompanying element-web PR with the config documentation should
explain what this is & why. Internally, this breaks the assumption
that call.roomId is the room that the call appears in for the user.
call.roomId may now be a 'virtual' room while the react SDK actually
displays it in a different room. React SDK always stores the calls
under the user-facing rooms, and provides a function to get the
user-facing room for a given call.
2021-01-21 19:20:35 +00:00
J. Ryan Stinnett
e49a931588
Merge pull request #5533 from aaronraimist/security-key
...
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase
2021-01-21 17:46:02 +00:00
J. Ryan Stinnett
97a551c04a
Fix test
2021-01-14 17:39:58 +00:00
David Baker
6371a4abd1
Fix tests
...
Remove stray file extensions in includes and update shared instance
name.
2021-01-13 16:02:35 +00:00
Aaron Raimist
4f96d5dee5
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-01-04 19:17:17 -06:00
Michael Telatynski
2142a65a9b
delint
2020-12-16 10:46:39 +00:00
Michael Telatynski
4c2b6f410b
fix tests
2020-12-16 10:41:56 +00:00
J. Ryan Stinnett
70f24baaf1
Merge pull request #5425 from macekj/emoji_quick_shortcut
...
Add keyboard shortcut for emoji reactions
2020-12-14 13:12:49 +00:00
Simon Merrick
b365d3b27e
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into new/room-alias-in-permalink
2020-12-07 10:30:50 +13:00
macekj
0c85cb587d
Merge branch 'develop' into emoji_quick_shortcut
2020-12-04 11:05:50 -05:00
J. Ryan Stinnett
1fda735222
Rebrand various CI scripts and modules
...
This replaces Riot with Element in various CI scripts, modules, parameters, etc.
This _should_ be the last major rebranding pass (hopefully).
Fixes https://github.com/vector-im/element-web/issues/14894
2020-12-03 13:56:27 +00:00
Simon Merrick
6670c727a4
Add getCanonicalAlias to mock
2020-12-02 13:28:35 +13:00
Michael Telatynski
eb25c39318
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials
...
Conflicts:
src/i18n/strings/en_EN.json
2020-12-01 16:33:29 +00:00
Michael Telatynski
3bdedd73f7
fix another test
2020-11-25 11:38:43 +00:00
Michael Telatynski
c4084196d1
delint
2020-11-25 10:39:44 +00:00
Michael Telatynski
1b1c482f9c
Iterate tests
2020-11-25 10:22:16 +00:00
macekj
ba8d02a808
add quick shortcut emoji feature and tests
...
Signed-off-by: macekj <macekj@umich.edu>
2020-11-17 17:36:58 -05:00
Aleks Kissinger
5f3af7863a
Merge branch 'develop' into katex
2020-11-10 18:19:20 +00:00
Michael Telatynski
4997676f5d
fix last remaining broken test
2020-11-05 16:57:51 +00:00
Michael Telatynski
ae2d9941ff
fix more tests
2020-11-05 16:54:25 +00:00
Michael Telatynski
54e41b5f32
fix tests
2020-11-05 16:27:41 +00:00
Michael Telatynski
6029f2a03b
update e2e tests for invite ux tweaks
2020-11-03 15:16:52 +00:00
David Baker
db0d74d0d4
Remove a couple more files from eslintignore
...
Just var/const & spaces
2020-10-30 18:33:33 +00:00
Aleks Kissinger
3f9f1d03c8
stubbed isGuest for unit tests
2020-10-29 13:22:09 +00:00
Michael Telatynski
b7a1e698df
fix tests which use a private method
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-14 10:47:46 +01:00
Michael Telatynski
b2d04deb83
fix tests for the new sessionStorage key
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-08 10:04:01 +01:00
Michael Telatynski
a8d88e01fb
Write Enzyme tests for SendMessageComposer state/history persistence behaviour
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 00:10:40 +01:00
Michael Telatynski
965debf442
extend mockClient in testutils
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 00:09:48 +01:00
Michael Telatynski
ffa7ceb70e
Trim range when formatting so that it excludes leading/trailing spaces
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 14:15:20 +01:00
Michael Telatynski
fe67ebf1fd
Merge pull request #5209 from matrix-org/t3chguy/fix/12591
...
Retry loading i18n language if it fails
2020-09-24 17:03:25 +01:00
J. Ryan Stinnett
b5000b236f
Fix lint error
2020-09-16 17:12:51 +01:00
J. Ryan Stinnett
a18d0271c3
Adjust tests for Secure Backup toast
2020-09-16 16:51:10 +01:00
J. Ryan Stinnett
46f37fb969
Create cross-signing keys during authentication
...
With this change, Element now creates cross-signing keys during auth flows for
password login. For other auth flows like token / SSO, it will not happen until
a cross-signing / secret storage dialog flow as before.
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
7bd5e3fa31
Move security-related dialogs to a common directory
2020-09-16 15:03:06 +01:00
Michael Telatynski
608249745a
Attempt to fix tests some more
2020-09-15 13:19:47 +01:00
Michael Telatynski
39a59dbefa
fix CI some more
2020-09-09 12:59:41 +01:00
Michael Telatynski
d9e17e89b5
fix CI
2020-09-09 12:55:16 +01:00
Michael Telatynski
b635598bc3
Attempt to fix tests and fix RoomSummaryCard having wrong member count
2020-09-09 12:28:12 +01:00
Michael Telatynski
8dcb2d4719
attempt to fix CI tests
2020-09-09 12:06:16 +01:00
Michael Telatynski
bb98587143
fix e2e tests. Change the default Room Tab to RoomSummary
2020-09-09 11:42:41 +01:00
Michael Telatynski
fb0b784369
test CI
2020-09-09 10:56:14 +01:00
Michael Telatynski
c8bc80a3b1
test with delay
2020-09-09 10:07:43 +01:00
Michael Telatynski
644ff56ace
Fix e2e tests
2020-09-09 09:38:13 +01:00
Michael Telatynski
c120458b81
fix test stub
2020-08-29 13:02:45 +01:00
Michael Telatynski
72498df28f
Remove create-react-class
2020-08-29 12:14:16 +01:00
Travis Ralston
c815a370e7
Remove some unused components
...
We no longer have tinting support, so remove it. We still need the `Tinter` to exist though as it's used in quite a few places (though does nothing). Similarly, we have to keep the `roomColor` setting due to it being used in a few places - another PR can take away the tinter support properly.
The room tile context menu and top left menu are artifacts of the old room list.
The end to end tests weren't failing before as the code path is unused, however it seems worthwhile to keep it as we will eventually need it.
2020-08-20 20:47:02 -06:00
Travis Ralston
4f851542ac
Implement force state for features like in the proposal
2020-08-17 13:51:41 -06:00
Michael Telatynski
62c1798bec
try to fix the e2e tests
2020-08-13 16:55:48 +01:00
Jorik Schellekens
0060acbb33
Merge pull request #5056 from matrix-org/joriks/style-fighting
...
Quick win session 24/07/2020
2020-08-12 15:21:06 +01:00
J. Ryan Stinnett
2e76e19f37
Remove rebrand toast from tests
2020-08-12 14:58:55 +01:00
J. Ryan Stinnett
ce226ab534
Replace Riot with Element in docs and comments
...
This only covers the simple cases of references to issues and repos. More
complex areas, such as deployment scripts, will be handled separately.
Part of https://github.com/vector-im/element-web/issues/14864
2020-08-03 18:33:36 +01:00
Jorik Schellekens
749aaf0b54
Fix tests
2020-07-28 14:59:03 +01:00
Michael Telatynski
c578026474
Merge branches 'develop' and 't3chguy/fix/13641' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/13641
...
Conflicts:
src/editor/parts.ts
2020-07-24 08:18:20 +01:00
Michael Telatynski
93b0287e11
s/semi-colon/colon/
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-24 00:04:50 +01:00
Michael Telatynski
38e93469d3
Fix broken test
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-23 09:01:44 +01:00
Michael Telatynski
8018a20680
create acceptance tests
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-21 17:40:34 +01:00
Travis Ralston
2dfd636a9e
Appease the linter
2020-07-17 16:28:49 -06:00