mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 11:35:04 +01:00
Code Issues Projects Releases Wiki Activity
5,371 Commits 491 Branches 136 Tags 34 MiB
f8c5878a01
Commit Graph

4240 Commits

Author SHA1 Message Date
Bruno Windels
fef7af3b31 report errors from ErrorBoundary on GroupCall and Member in UI 
UI is still very crude fwiw
 2023-01-19 09:49:10 +01:00
Bruno Windels
1e4180a71f add error boundary to GroupCall 2023-01-19 09:48:59 +01:00
Bruno Windels
7f9edbb742 this can be private 2023-01-19 09:46:19 +01:00
Bruno Windels
b1687d7115 introduce error boundary in call member 2023-01-19 09:46:19 +01:00
Bruno Windels
f0d2c19184 allow an explicit error value again in ErrorBoundary 2023-01-19 09:46:19 +01:00
Bruno Windels
c5ca23f663
Merge pull request #992 from vector-im/bwindels/loguseragent 
add user agent in log export
 2023-01-19 08:44:48 +00:00
Bruno Windels
7f004193d3 add user agent in log export 2023-01-18 08:33:02 +01:00
Bruno Windels
f4b1113321
Merge pull request #922 from vector-im/madlittlemods/mxid-tooltip-display-name 
Add full MXID tooltip to message sender display name
 2023-01-17 09:13:13 +00:00
Bruno Windels
c28b57091c
Merge pull request #961 from Automattic/fix-font-not-chached 
Make sure fonts are cached by service worker
 2023-01-17 09:12:12 +00:00
RMidhunSuresh
1cd6540476
Don't use getter here 2023-01-17 14:32:02 +05:30
RMidhunSuresh
ce5c5779bd
Set mute -> mute 2023-01-17 14:24:20 +05:30
RMidhunSuresh
c064336e35
Create localPreviewMedia in GroupCall.setMedia 2023-01-16 15:28:50 +05:30
RMidhunSuresh
f6c94ecc5a
WIP 2023-01-16 13:41:47 +05:30
Bruno Windels
50f46a21bd finish ErrorBoundary 2023-01-09 10:40:00 +01:00
Bruno Windels
47a8b4d728 WIP 2023-01-09 10:40:00 +01:00
Bruno Windels
a9a72f88e5 finish ErrorBoundary 2023-01-09 10:36:28 +01:00
Bruno Windels
014ae4185f WIP 2023-01-06 17:01:57 +01:00
Bruno Windels
cb0f803276 make this code a bit clearer 2023-01-06 12:05:34 +01:00
Bruno Windels
fcb4f2a62d fix microphone audio being played back through local video preview 2023-01-06 12:05:11 +01:00
Bruno Windels
e26eb30b82 rename m.expires_ts to expires_ts to be compatible with MSC/Element 2023-01-05 15:47:01 +01:00
Bruno Windels
3735e4420a fix TS definition 2023-01-05 11:34:58 +01:00
Bruno Windels
c38ee5239f remove debug logging 2022-12-20 18:53:13 +01:00
Bruno Windels
6ecff485ec make tile comparison commutative again, allow DateTile to do comparison 2022-12-20 18:52:38 +01:00
Paulo Pinto
d1649ea499
Make sure fonts are cached by service worker 2022-12-15 15:22:55 +00:00
Bruno Windels
86e9e0c99e
Merge pull request #923 from vector-im/madlittlemods/dialog-details-optgroup-html-elements 
Add `<dialog>`, `<details>`, and `<optgroup>` HTML elements to use with templating
 2022-12-05 16:23:17 +00:00
Bruno Windels
cbf2d1c8e3
Merge pull request #939 from vector-im/fix-451 
Fix '/' in room-id or mxid breaking navigation
 2022-11-25 16:47:46 +00:00
Bruno Windels
f7132a48d9 implement PR suggestion to do all encoding in fn, so return type is str 2022-11-25 17:45:31 +01:00
Bruno Windels
467a76c223 decode ids separately, as we encode them separately as well 2022-11-25 17:45:06 +01:00
Bruno Windels
b8444a32c0 add missing decode 2022-11-25 17:38:13 +01:00
Bruno Windels
2d0122dda7 apply PR suggestions 2022-11-25 17:38:05 +01:00
Bruno Windels
7bdd23e767 restore active reaction bg color to be transparent version of accent color 2022-11-25 17:21:58 +01:00
Bruno Windels
195142c249 fix lint warnings 2022-11-25 16:56:01 +01:00
Bruno Windels
efa45cade6 remove date from message tiles 2022-11-25 16:48:46 +01:00
Bruno Windels
77fd7e7aca format message time in timeFormatter as well 2022-11-25 16:48:11 +01:00
Bruno Windels
85a06876cd make date header sticky with css 
this has the limitation that it needs to have a fixed with
and an opaque background, but that's better than
not making it sticky for now.
 2022-11-25 16:47:00 +01:00
Bruno Windels
c538f5dbb1 make date header a bit more accessible 2022-11-25 16:31:44 +01:00
Bruno Windels
2136b051a0 cleanup 2022-11-25 16:13:31 +01:00
Bruno Windels
c4e239a401 add timeformatter, shared between all view models 2022-11-25 16:13:22 +01:00
Bruno Windels
9c2c5af291 small UI refinements for date header 2022-11-25 16:12:35 +01:00
Bruno Windels
9b235f7c80 also test next next tile, change this back after testing before 2022-11-25 14:42:54 +01:00
Bruno Windels
b5d5adaa36 add tests 
Co-authored-by: R Midhun Suresh <MidhunSureshR@users.noreply.github.com>
 2022-11-25 14:42:24 +01:00
Bruno Windels
7c6d651b32 remove date headers when removing pending tiles 2022-11-25 12:09:28 +01:00
Bruno Windels
cb0ab589de remove lower bound check as we don't go negative anymore 2022-11-25 11:51:38 +01:00
Bruno Windels
31f53d27c1 emit update from datetile when date might have changed 2022-11-25 11:51:22 +01:00
Bruno Windels
4abf18a5f1 don't look at tiles before the inserted tile, there is no need 
also clarify with comments how the current algorithm works
 2022-11-25 11:26:53 +01:00
Bruno Windels
d889c7deeb bound checks in date header loop and cleanup 
Co-authored-by: R Midhun Suresh <MidhunSureshR@users.noreply.github.com>
 2022-11-25 10:49:26 +01:00
RMidhunSuresh
7bfadf37b4
Decode all segment values that aren't undefined 2022-11-25 11:33:02 +05:30
RMidhunSuresh
80080074fa
Don't encode unknown segment values 2022-11-25 11:20:47 +05:30
RMidhunSuresh
e9053372d6
Encode ids as URI component 2022-11-25 11:13:47 +05:30
Bruno Windels
3f7c1577e0 WIP 2022-11-18 23:26:59 +01:00
Eric Eastwood
35a08e3b05
Update language to "Copy matrix.to permalink" 2022-11-18 12:13:47 -06:00
Eric Eastwood
1aba18ca1d Add <dialog>, <details>, and <optgroup> HTML elements to templating 2022-11-10 21:14:57 -06:00
Eric Eastwood
29aac09641 Add types to function parameters 2022-11-10 21:11:38 -06:00
Eric Eastwood
4125165760 Add full MXID tooltip to message sender display name 
Follow-up to https://github.com/vector-im/hydrogen-web/pull/917
 2022-11-10 20:59:27 -06:00
Eric Eastwood
f0d53fe40f Remove newline 2022-11-10 20:56:27 -06:00
Eric Eastwood
087a4ad7ce Add copy permalink action 2022-11-10 20:53:14 -06:00
Bruno Windels
e4049c962a
Merge pull request #920 from vector-im/bwindels/fetch-sender-keys-without-tracking-room 
Fix keys not being fetched to verify senders when the room isn't tracked yet.
 2022-11-10 17:27:55 +00:00
Bruno Windels
bc96d5add1
Merge pull request #917 from vector-im/madlittlemods/full-mxid-tooltip 
Add full MXID to message avatar/name
 2022-11-10 17:27:41 +00:00
Bruno Windels
430464c829
Merge pull request #916 from vector-im/bwindels/fix-logout-button-on-load-error 
Fix logout not working when there is a session load error
 2022-11-10 17:26:53 +00:00
Bruno Windels
59533a3ba0
Merge pull request #918 from vector-im/madlittlemods/677-rename-urlrouter-usage-to-urlrouter 
Rename `urlRouter` usage to `urlRouter` instead of `urlCreator`
 2022-11-10 17:26:40 +00:00
Bruno Windels
155f4beba8 add devicesForUser to fetch devices for untracked room 
and use it when fetching senders to verify.
 2022-11-10 17:53:11 +01:00
Bruno Windels
3d5a733267 split up _devicesForUserIds to reuse with different outdated criteria 2022-11-10 17:51:40 +01:00
Bruno Windels
c78bed846e create unknown userIdentity when processing /keys/query response 
this can happen when the room isn't tracked yet, which is a use case
we add support for in the next commit to verify senders that we don't
know about yet (e.g. when the room isn't tracked).
 2022-11-10 17:28:18 +01:00
Bruno Windels
31579b4945 when tracking room, check roomId isn't on user we shouldn't share with 2022-11-10 17:26:50 +01:00
Bruno Windels
860f435855 log session afterSyncCompleted with normal log level 2022-11-10 17:26:21 +01:00
Bruno Windels
47d557b38d expand comment how to handle race here 2022-11-10 17:20:59 +01:00
Bruno Windels
32835e26b9 adjust query for finding all state events of a type 
we were looking for state events with state key between \0 and \u10FFFF
but an empty state key is also valid and would come before \0,
so allow empty state keys at the beginning of the range and include them
in the result by opening the lower bound.
 2022-11-10 14:12:22 +01:00
Eric Eastwood
a9fac140ac Rename urlRouter usage to urlRouter 2022-11-08 23:44:22 -06:00
Eric Eastwood
308a215349 Add full MXID to message avatar/sender 2022-11-08 22:15:17 -06:00
Bruno Windels
ec4413550b apply method rename (and catch errors) 2022-11-08 07:59:26 +01:00
Bruno Windels
f18aac017a
Merge pull request #819 from Kaki-In/recalculate_dm 
Deleting leaving Heroes
 2022-11-04 09:29:00 +00:00
Bruno Windels
cc70d44752
Merge pull request #913 from vector-im/bwindels/verify-unfetched-roomkey-senders 
Verify unfetched roomkey senders
 2022-11-04 09:04:41 +00:00
Bruno Windels
6c73c31735 take any decryption result, as it might now have a device to verify with 2022-11-03 17:32:01 +01:00
Bruno Windels
fa21ac021c use binding to update marking a message as (un)verified 2022-11-03 16:38:08 +01:00
Bruno Windels
dd7bbe89ac put detached logs in correct log item 2022-11-03 16:37:53 +01:00
Bruno Windels
dfede83c0b log verifying senders in own item 2022-11-03 16:37:38 +01:00
Bruno Windels
2582600249 await operation, otherwise it keeps running during next sync 2022-11-03 16:37:20 +01:00
Bruno Windels
25c8f1cf04 always return a promise from this method, even if nothing to verify 2022-11-03 16:36:31 +01:00
Bruno Windels
cd5343414a fix lint 2022-10-28 17:16:32 +02:00
Bruno Windels
6123d794da also fetch unknown sender keys after decrypting entries outside of sync 2022-10-28 16:55:36 +02:00
Bruno Windels
dc25f96e73 update observed events as well 2022-10-28 16:55:20 +02:00
Bruno Windels
218d25d973 fix typo 2022-10-28 16:50:01 +02:00
Bruno Windels
d0122d17c0 don't assume timeline is open as have an await since last check 2022-10-28 16:49:33 +02:00
Bruno Windels
6dbcd46d80 cleanup of ctor 2022-10-28 16:31:00 +02:00
Bruno Windels
fcb1546fba fetch keys as part of afterSyncCompleted step 
remove needsAfterSyncCompleted step as well, performance difference
should be neglible
 2022-10-28 16:25:31 +02:00
Bruno Windels
9c13b2b4a4 add method to fetch missing sender keys 2022-10-28 16:09:03 +02:00
Bruno Windels
c544819b42 rename and refactor method to verify locally known senders a bit 
to differentiate with method to come for verifying senders that need to
be fetched still, and also allow reuse of verification logic by said new
method.

Also get rid of roomTracked flag in DecryptionResult as once we fetch
unknown senders (in commit to come), we should now always have a device,
unless the device isn't known on the server,
in which case we should shout.
 2022-10-28 15:35:31 +02:00
Paulo Pinto
ad02c1625f Encode SSO redirect URL as it may contain multiple query parameters 
If the returnURL contains multiple query parameters (e.g. http://localhost:3000?foo=bar&bar=baz), the homeserver would fail to correctly parse the URL, and only the first query parameter would be kept.

This is not an issue with the homeserver since the URL cannot be parsed in an unambiguous way, as the resulting URL would be:

https://example.com/_matrix/client/r0/login/sso/redirect?redirectUrl=http://localhost:3000?foo=bar&bar=baz

It's not possible to know whether the bar parameter is part of the "parent" URL, or part of the redirectUrl parameter.

----

To fix this, we now encode the redirectUrl parameter, which results in:

https://example.com/_matrix/client/r0/login/sso/redirect?redirectUrl=http%3A%2F%2Flocalhost%3A3000%2Fparent.html%3Ffoo%3Dbar%26bar%3Dbaz

This URL is correctly parsed by synapse.
 2022-10-27 15:42:24 +01:00
Robert Long
c0306b45a6 Fix typechecking 2022-10-18 13:43:19 -07:00
Robert Long
e9b8cfbd9e Member should be expired if there's no expires at key 2022-10-18 13:42:01 -07:00
Eric Eastwood
9ad5dd752c
Make no content PL fallback to 0 (#863) 
Make no `content` PL fallback to `0`. A valid PL event will have `content` but when you're just stubbing a PL event with an empty object `{}`, it doesn't need to exist and we can just as easily fallback to `0` PL level.

Split off from https://github.com/vector-im/hydrogen-web/pull/653

Changes necessary for https://github.com/matrix-org/matrix-public-archive/pull/57
 2022-10-17 15:59:24 -05:00
Eric Eastwood
b4f4636555
Clarify that we no-op because if it's already aborted, that's what we wanted to do anyway (#861) 
Split off from https://github.com/vector-im/hydrogen-web/pull/653
 2022-10-17 15:56:34 -05:00
Bruno Windels
2416893718
Merge pull request #867 from ibeckermayer/ibeckermayer/ts-conversion-linkify 
typescriptifying `linkify` and `regex`
 2022-10-17 15:42:15 +00:00
Bruno Windels
2d526bc088 fix sdk build failing on tsc error 2022-10-14 20:13:23 +02:00
Bruno Windels
d37965ef91 return promise from _createSessionAfterAuth 2022-10-14 20:08:26 +02:00
Bruno Windels
4d5f202d94
Merge pull request #889 from vector-im/login_with_access_token 
Add abiity to setup session immediately after registration without using /login
 2022-10-14 08:54:52 +00:00
Bruno Windels
1f8a591cf6 dont need extra log depth 2022-10-14 10:28:42 +02:00
Bruno Windels
f46d2c1bf5 make startWithFinishedRegistration more broadly useful 2022-10-14 10:17:32 +02:00
Bruno Windels
89d031990f
Merge pull request #885 from vector-im/fix-866 
Fix sync error
 2022-10-14 07:53:56 +00:00
Bruno Windels
d9a4a362d9
Merge pull request #862 from vector-im/madlittlemods/remove-unused-button-styles-that-conflict 
Remove unused conflicting generic styles
 2022-10-11 16:36:13 +00:00
RMidhunSuresh
dcba6d1500
Split method 2022-10-11 18:05:54 +05:30
RMidhunSuresh
a448c0218d
Fix missing semicolon 2022-10-11 18:01:54 +05:30
RMidhunSuresh
1f764664c9
Expose homeserver from Registration object 2022-10-11 17:58:33 +05:30
RMidhunSuresh
85a9a019c8
Don't inhibit login 2022-10-11 17:58:07 +05:30
R Midhun Suresh
07823c2cd7
Merge pull request #873 from vector-im/madlittlemods/log-errors-to-console 
Log errors when mounting views to the console for easier reference
 2022-10-11 11:40:35 +05:30
R Midhun Suresh
dc13d1b283
Merge pull request #875 from vector-im/madlittlemods/event-data-attribute-on-announcement-view 
Add `data-event-id` to `AnnouncementView` so it appears for state events in the timeline
 2022-10-11 11:40:21 +05:30
Bruno Windels
5bf6a75546
Merge pull request #874 from vector-im/madlittlemods/add-more-html-tags 
Add `<header>`, `<footer>`, `<style>` HTML tags to template with
 2022-10-10 14:26:03 +00:00
R Midhun Suresh
8ef163353a
Merge pull request #793 from ibeckermayer/ibeckermayer/ts-conversion-observable-map 
Typescript conversion for `src/observable/map`
 2022-10-10 11:31:25 +05:30
Bruno Windels
7d10bec4ac remove comment not relevant anymore 2022-10-07 10:59:13 +02:00
Bruno Windels
4350537004 cleanup 2022-10-07 10:58:12 +02:00
Bruno Windels
7936863934 remove options on dispose in Member 
to ensure callback can't be called anymore, as we don't check
that the member argument is the one currently in GroupCall._members.
 2022-10-07 10:07:46 +02:00
Bruno Windels
400df6a4ff ensure removing expired members from call is always logged 
also return the log item from logger.log so we can ref it
 2022-10-07 10:07:10 +02:00
Bruno Windels
a07be730f9 bring member validity period back to 1h 2022-10-06 16:10:50 +02:00
Bruno Windels
a8ac504efd explain when joinedData is set 2022-10-06 16:10:36 +02:00
Bruno Windels
7ae9c3af0d renew at least 10s before own membership expires 2022-10-06 16:00:38 +02:00
Bruno Windels
c87fd4dfed cleanup 2022-10-06 15:59:45 +02:00
Bruno Windels
2ecfb8f139 unify dispose logic in Member 2022-10-06 15:22:15 +02:00
Bruno Windels
7eb8015ace ensure member.dispose is called when removing member 
so expiration timer is always stopped
 2022-10-06 15:20:05 +02:00
RMidhunSuresh
92ae3a3236
vm may not have created when this is called 2022-10-06 11:41:31 +05:30
Bruno Windels
56ecd39f26 don't assume joinedData is set here 
although not entirely sure why it wouldn't be
 2022-09-30 17:46:57 +02:00
Bruno Windels
1dddabc038 make removing own membership a bit clearer in the logs 2022-09-30 11:21:26 +02:00
Bruno Windels
b694d13348 can be readonly 2022-09-30 11:20:33 +02:00
Bruno Windels
f2564ed5cc also emit updates for expired, connected members that we didn't kick 2022-09-30 11:20:00 +02:00
Bruno Windels
b5f686b10e also allow clean up while still in Joining state, otherwise we get stuck 
in joined state but without joinedData
 2022-09-30 11:17:54 +02:00
Bruno Windels
282cba0ff1 call points for PeerCall.delay rely on AbortError actually being thrown 
+ fix this in one call point where it wasn't the case
 2022-09-30 11:17:07 +02:00
Bruno Windels
167a19a85b untracking from a disposed Disposables is actually not alarming 
it happens under normal conditions when an abortable action is aborted
and you untrack afterwards.
 2022-09-30 11:16:09 +02:00
Bruno Windels
8f8a964b3b allow to actually process the invite in the new peer call 2022-09-30 11:15:48 +02:00
Bruno Windels
05bb360c00 allow to dequeue signalling messages with repeated seq (from other call) 
they will just be ignored by peerCall.getMessageAction() but we don't
want to block dequeuing on these
 2022-09-30 11:12:04 +02:00
Bruno Windels
6f0e781b49 WIP 2022-09-26 19:15:13 +02:00
Bruno Windels
bf71a88799
Merge pull request #880 from vector-im/matthew/turn 
Implement TURN
 2022-09-26 14:19:00 +00:00
Bruno Windels
c660d82d6a make internal method private 2022-09-26 16:00:25 +02:00
Bruno Windels
eccbab1491 cleanup polling and also hangup on all ongoing calls on dispose session 2022-09-26 15:57:20 +02:00
Bruno Windels
24ebf6c559 cleanup 2022-09-26 15:47:48 +02:00
Bruno Windels
ac319bdafd we can assume setConfiguration is available 2022-09-26 15:45:41 +02:00
Bruno Windels
d36b9be24f fix screwing up whitespace 2022-09-26 15:41:30 +02:00
Bruno Windels
05c2da95c4 fix typo 2022-09-26 15:38:04 +02:00
Bruno Windels
e6bf49a6cc remove previous hardcoded turnServers setting 2022-09-26 15:27:41 +02:00
Bruno Windels
f74c4e6425 remove previous approach 2022-09-26 15:26:16 +02:00
Bruno Windels
917ad52302 use observable for turnserver in peercall 
and subscribe if changing config is supported
 2022-09-26 15:25:53 +02:00
Bruno Windels
3a4c38086c fetch turn server settings when joining a call, and pass down 2022-09-26 15:25:24 +02:00
Bruno Windels
035ead0d5b implement polling of voip turnServer settings from HS in separate class 2022-09-26 15:24:41 +02:00
Bruno Windels
f4e633beb4 support onfirstsubscribe callback in ROV 
will use it to start polling for turnServer updates
 2022-09-26 15:24:14 +02:00
Matthew Hodgson
6570ec46f4
setTurnServers doesn't need to be async 2022-09-26 09:02:22 +01:00
Matthew Hodgson
3d7852a469 set array of turnservers 2022-09-26 01:07:24 +01:00
Matthew Hodgson
eab87e5157 fix plurals 2022-09-26 00:52:41 +01:00
Matthew Hodgson
af2098327b first cut at implementing TURN 2022-09-26 00:47:12 +01:00
Matthew Hodgson
31e67142bd typo 2022-09-25 22:11:35 +01:00
Matthew Hodgson
8aa62b2573 don't ignore end-of-ICE candidates 2022-09-25 21:39:38 +01:00
Bruno Windels
7ce5cdfc4a prevent concurrent calls of OlmEncryption.encrypt to OOM olm wasm heap 
This is being triggered by connecting to many call members at once,
while encrypting the signaling messages. This keeps many olm.Session
objects into memory at the same time, which makes olm run out of
wasm heap memory.
 2022-09-22 13:19:56 +02:00
Isaiah Becker-Mayer
c8e6ca9a83 typescriptifying linkify and regex 2022-09-21 21:42:21 -04:00
Bruno Windels
bb2e63b05b don't queue messages for different callIds so last seq doesn't corrupt 
this includes handling invite glares differently
 2022-09-20 17:27:39 +02:00
Bruno Windels
2e9470027b
Update src/platform/web/ui/session/JoinRoomView.ts 2022-09-20 08:50:37 +00:00
Eric Eastwood
90ac16854b Add data-event-id to AnnouncementView so it appears for state events in the timeline 
Follow-up to https://github.com/vector-im/hydrogen-web/pull/690

Split off from https://github.com/vector-im/hydrogen-web/pull/653
 2022-09-16 13:59:50 -05:00
Eric Eastwood
b096ac18ca Add header, footer, style HTML tags to template with 
Split off from https://github.com/vector-im/hydrogen-web/pull/653
 2022-09-16 13:57:21 -05:00
Eric Eastwood
8f414f4cf4 Log errors when mounting views to the console for easier reference 
From the console, I can click the source references in the stack trace
to jump to the spot in the code where things are going wrong.

It also helps with the problem of the error not having enough
space to be read in some components.

Split off from https://github.com/vector-im/hydrogen-web/pull/653
 2022-09-16 13:50:29 -05:00
RMidhunSuresh
67dfbc5e28
Add return type 2022-09-12 23:48:01 +05:30
RMidhunSuresh
1898c4892e
Specify return type 2022-09-12 23:44:51 +05:30
RMidhunSuresh
88091622db
Rename variable 2022-09-12 23:21:55 +05:30
RMidhunSuresh
44eddd0d6b
Call method from menu 2022-09-12 17:24:58 +05:30
RMidhunSuresh
3426240ef4
Style JoinRoom View 2022-09-12 17:23:44 +05:30
RMidhunSuresh
d6ba218c08
Return view from SessionView 2022-09-12 17:22:53 +05:30
RMidhunSuresh
2d4b6b0341
Exctract into function 2022-09-12 17:22:10 +05:30
RMidhunSuresh
f1b86e3532
Add method to show join room view 2022-09-12 17:20:30 +05:30
RMidhunSuresh
84920622e3
Add join vm to session vm 2022-09-12 17:18:57 +05:30
RMidhunSuresh
c27dd97c5e
Add vm/view 2022-09-12 17:08:09 +05:30
RMidhunSuresh
413ba3279f
add "join-room" segment 2022-09-12 14:49:05 +05:30
RMidhunSuresh
cfbd0672c5 Refactor left panel to use menu 2022-09-06 15:42:41 +05:30
Eric Eastwood
23912b2c5a Remove unused conflicting generic styles 
Split off from https://github.com/vector-im/hydrogen-web/pull/653

These styles were conflicting with some in the Matrix public archive
and instead of adjusting in that project, they seem unused here anyway
so we can simplify and remove here.
Conflict with the `.room-header-change-dates-button` styles in
https://github.com/matrix-org/matrix-public-archive/pull/53
 2022-08-30 16:49:23 -05:00
R Midhun Suresh
ca4f6d83f9
Merge pull request #850 from vector-im/fix-798 
Perform forced logout when access token is invalidated
 2022-08-26 16:31:06 +05:30
RMidhunSuresh
bba2d9f0a9 Use t.map 2022-08-26 14:55:01 +05:30
RMidhunSuresh
b440bdcff0 Redirect to login screen 2022-08-26 14:46:15 +05:30
RMidhunSuresh
1f139f17e9 Add explaining comments 2022-08-26 14:43:41 +05:30
Isaiah Becker-Mayer
d025c1111e fixes [Symbol.iterator] typing 2022-08-25 22:56:40 -04:00
R Midhun Suresh
4966b57e12
Merge pull request #834 from vector-im/fix-627 
Gap fill from HS should halt on network disconnection
 2022-08-24 19:43:28 +05:30
R Midhun Suresh
db62427342
Merge pull request #836 from vector-im/fix-779 
Clear keys from local storage when logging out
 2022-08-24 19:43:02 +05:30
R Midhun Suresh
cb761a1cf1
Merge pull request #839 from vector-im/fix-833 
Improve error handling in the UI and logs
 2022-08-24 19:42:42 +05:30
RMidhunSuresh
f718034f2b Track the subscription 2022-08-24 19:40:11 +05:30
RMidhunSuresh
205ecdc52e Show error, progress in view 2022-08-24 19:31:38 +05:30
RMidhunSuresh
7b173fe8eb error prop may not always exist 2022-08-24 16:03:21 +05:30
RMidhunSuresh
5521862498 Use forced segment inside logout 2022-08-24 16:03:00 +05:30
RMidhunSuresh
0f2b7a1ce9 Navigate to UI when sync fails 2022-08-23 21:58:35 +05:30
RMidhunSuresh
216c5da386 Implement forced logout 2022-08-22 21:59:33 +05:30
Isaiah Becker-Mayer
1e6d5ca42f exports types instead of objects 2022-08-21 07:42:06 -04:00
Isaiah Becker-Mayer
ebd8c0751a fixes AsyncMappedList 2022-08-20 17:04:13 -04:00
Isaiah Becker-Mayer
77f21f7a91 fixes import order according to https://medium.com/visual-development/how-to-fix-nasty-circular-dependency-issues-once-and-for-all-in-javascript-typescript-a04c987cf0de 2022-08-20 16:39:39 -04:00
Isaiah Becker-Mayer
92ed503700 Fixes MappedMap type system 2022-08-19 19:02:06 -04:00
RMidhunSuresh
86fec8bf0e Make code more readable 2022-08-19 18:22:37 +05:30
RMidhunSuresh
d6cea6fc5c Extract method to function outside class 2022-08-19 16:36:21 +05:30
RMidhunSuresh
34dd7e4fa5 Remove code 2022-08-19 16:31:48 +05:30
RMidhunSuresh
fdd6eb8fdc Set boolean to true so that gapfill proceeds 2022-08-19 11:55:44 +05:30
RMidhunSuresh
e6f43d6f4f Put logic into VM 2022-08-19 11:55:23 +05:30
RMidhunSuresh
98bd8cd624 Remove unused css 2022-08-17 13:19:11 +05:30
RMidhunSuresh
220144898b Fix errors and simplify code 2022-08-17 13:13:20 +05:30
RMidhunSuresh
5d63069f31 Check status code instead of throwing error 2022-08-16 14:32:18 +05:30
RMidhunSuresh
08f9edaf68 Use Error LogLevel 2022-08-15 22:58:26 +05:30
RMidhunSuresh
6335da0932 Throw error from outside log method 
This will show the error in the UI
 2022-08-15 22:52:02 +05:30
RMidhunSuresh
7590c55404 Log error when loading css file fails 2022-08-15 22:28:40 +05:30
RMidhunSuresh
2e12ce74b7 Show parse errors in the UI as well 2022-08-15 17:23:27 +05:30
RMidhunSuresh
8e2838264f Run binding when isLoading changes 2022-08-15 15:00:31 +05:30
Isaiah Becker-Mayer
c1161e5332 typescript-ifying CompleteSSOLoginViewModel 2022-08-14 11:27:25 -07:00
Isaiah Becker-Mayer
53c4ecb69b typescript-ifying StartSSOLoginViewModel 2022-08-14 11:14:54 -07:00
Isaiah Becker-Mayer
749e038a47 typescript-ifying PasswordLoginViewModel 2022-08-14 11:05:13 -07:00
RMidhunSuresh
4a62cdb8fb Await the promise 2022-08-14 17:52:19 +05:30
RMidhunSuresh
d1c7a792b8 Await in fill method to prevent multiple errors 2022-08-14 17:43:24 +05:30
RMidhunSuresh
27363b3f63 Throw and log errors if manifests cannot be loaded 2022-08-10 22:25:56 +05:30
RMidhunSuresh
ff706e542d Throw ConnectionError instead of swallowing error 2022-08-10 22:23:51 +05:30
RMidhunSuresh
bfd54f2764 Delete localstorage on logout 2022-08-09 23:11:02 +05:30
Isaiah Becker-Mayer
dd01e70b4a src/observable/map/BaseObservableMapDefaults.ts -> src/observable/map/BaseObservableMapTransformers.ts 2022-08-07 21:13:00 -07:00
Isaiah Becker-Mayer
70b68c5b16 found a more clever way to do this which eliminates boilerplate 2022-08-07 21:13:00 -07:00
Isaiah Becker-Mayer
73b83fdab8 Changes config from a function that returns an objectinto a more aptly named BaseObservableMapDefaults class 2022-08-07 21:13:00 -07:00
Isaiah Becker-Mayer
bed66ada88 removes .js to files that are now typescripted 2022-08-07 21:13:00 -07:00
Isaiah Becker-Mayer
0203ece3bd updates ts-eslint and fixes errors in src/observable 2022-08-07 21:13:00 -07:00
Isaiah Becker-Mayer
deab8bdaf0 moves boilerplate to bottom of classes 2022-08-07 21:13:00 -07:00
Isaiah Becker-Mayer
be570cafb0 Adds types for common functions 2022-08-07 21:13:00 -07:00
Isaiah Becker-Mayer
674e7bd1c6 fixing linting errors 2022-08-07 21:13:00 -07:00
Isaiah Becker-Mayer
081cc05fa6 Updates comparator 2022-08-07 21:13:00 -07:00
Isaiah Becker-Mayer
ab6a8ad3aa typescriptifying ApplyMap 2022-08-07 21:13:00 -07:00
Isaiah Becker-Mayer
95c65280ef typescriptifying MappedMap 2022-08-07 21:13:00 -07:00
Isaiah Becker-Mayer
d060d337b6 typescriptifies LogMap 2022-08-07 21:12:59 -07:00
Isaiah Becker-Mayer
edeec896ae typescriptifies SourceSubscriptionHandler 2022-08-07 21:12:59 -07:00
Isaiah Becker-Mayer
63e9b49ebe uncommenting tests 2022-08-07 21:12:59 -07:00
Isaiah Becker-Mayer
3ba2bab59f JoinedMap to typescript 2022-08-07 21:12:59 -07:00
Isaiah Becker-Mayer
f1751a24b0 FilteredMap 2022-08-07 21:12:59 -07:00
Isaiah Becker-Mayer
7645eb8753 moves config into its own file 2022-08-07 21:12:59 -07:00
Isaiah Becker-Mayer
b33db1df36 refactors ObservableMap 2022-08-07 21:12:59 -07:00
RMidhunSuresh
d01a95aae3 UI improvements 2022-08-04 16:37:28 +05:30
RMidhunSuresh
b1fd5f1ad5 Do not fill gap when offline 2022-08-04 16:33:59 +05:30
RMidhunSuresh
236a4ab49b Ignore error 2022-08-01 17:01:36 +05:30
RMidhunSuresh
ba8cdea6b4 Use default import if other not found 2022-08-01 17:01:36 +05:30
RMidhunSuresh
ef9f90bc36 Fix imports breaking on dev 2022-08-01 17:01:36 +05:30
Kaki In
f812519187
Merge branch 'vector-im:master' into recalculate_dm 2022-07-29 16:29:02 +02:00
Bruno Windels
041e628520
Merge pull request #769 from vector-im/implement-derived-theme 
Support for derived themes
 2022-07-29 14:25:05 +00:00
Bruno Windels
4838e19c92
Merge pull request #811 from vector-im/bwindels/sharekeyswithinvitees 
Key sharing based on room history visibility
 2022-07-29 14:23:26 +00:00
Bruno Windels
cb0ac846c7 remove obsolete comment 2022-07-29 16:22:01 +02:00
Bruno Windels
fdefea5b88 Merge branch 'master' into ts-conversion-domain-navigation 2022-07-29 16:18:22 +02:00
Kaki In
808cbd8873
Merge branch 'vector-im:master' into recalculate_dm 2022-07-29 12:41:48 +02:00
Bruno Windels
b6f795505d fix lint 2022-07-29 12:21:16 +02:00
Kaki In
c7698b6071
Merge branch 'vector-im:master' into recalculate_dm 2022-07-29 12:19:48 +02:00
Kaki In
69871ab985
Merge branch 'vector-im:master' into recalculate_dm 2022-07-29 12:08:33 +02:00
Kaki In
09bc77073b
Merge branch 'vector-im:master' into restore_last 2022-07-29 12:06:49 +02:00
Bruno Windels
4a2e14925a
Merge pull request #812 from vector-im/doc-config 
[Documentation] - Add type for config options
 2022-07-29 10:05:27 +00:00
Bruno Windels
224ab2672a
Merge pull request #809 from Kaki-In/implement-join 
Implemented /join
 2022-07-29 10:03:18 +00:00
Bruno Windels
170460f5a9 add link to sygnal webpush docs as well 2022-07-29 12:02:09 +02:00
Bruno Windels
2a5e0302dc
Merge pull request #785 from vector-im/hs/log-when-storage-access-fails 
Log the error when we can't get storage access
 2022-07-29 09:47:58 +00:00
Kaki In
f512bfcfc1 Pretty syntaxed the RoomViewModel 2022-07-29 11:47:47 +02:00
Half-Shot
5b5c852401 Revert "use logging items" 
This reverts commit d937b9b14b.
 2022-07-29 10:44:37 +01:00
Kaki In
58a2d1f34c Restored the common.js indentation 2022-07-29 11:44:23 +02:00
Half-Shot
d937b9b14b use logging items 2022-07-29 10:39:41 +01:00
Bruno Windels
d3e93196e3
Merge pull request #777 from ibeckermayer/ibeckermayer/ts-conversion-loginviewmodel 
TS conversion for `LoginViewModel`
 2022-07-29 09:27:10 +00:00
Bruno Windels
62b3a67e33 write unit tests for correctly reading history visibility when needed 2022-07-28 17:09:41 +02:00
Kaki In
b73e3e9883 Don't add a memeber to the members list if it left the DM 2022-07-28 13:06:47 +02:00
Bruno Windels
319ec37864 fix typos preventing to load the history visibility 2022-07-28 11:44:50 +02:00
Kaki In
f5dacb4e42 Fixed last check 2022-07-28 10:26:59 +02:00
Kaki In
302131c447 Review last checks 2022-07-28 10:14:21 +02:00
Kaki In
fb79326747 Forgot one change 2022-07-28 09:26:08 +02:00
Kaki In
3c64f7d49b Finals checks about https://github.com/vector-im/hydrogen-web/pull/809#pullrequestreview-1053501341 
- joined the processJoinRoom and joinRoom methods;
 - fixed some precisions miss;
 - removed some useless code;
 - change the error message height from absolute (40px) to relative (auto)
 2022-07-28 09:23:30 +02:00
Isaiah Becker-Mayer
a82df95b82 marking private methods as such 2022-07-27 22:09:30 -07:00
Isaiah Becker-Mayer
cadca70946 fixes linter errors and removes some unneeded async/await 2022-07-27 22:09:30 -07:00
Isaiah Becker-Mayer
8b91d8fac8 adds newline 2022-07-27 22:09:30 -07:00
Isaiah Becker-Mayer
a5b9cb6b95 removes unnecessary awaits 2022-07-27 22:09:30 -07:00
Isaiah Becker-Mayer
aeed978789 changes signature of emitChange to require changedProps 2022-07-27 22:09:30 -07:00
Isaiah Becker-Mayer
7b7b19476c updates some signatures to be more verbose, fixes wrong type for attemptLogin 2022-07-27 22:09:30 -07:00
Isaiah Becker-Mayer
ad0bd82bda creating default exports 2022-07-27 22:09:30 -07:00
Isaiah Becker-Mayer
d7657dcc4d first draft of fully typescriptified LoginViewModel.ts 2022-07-27 22:09:30 -07:00
Kaki In
176caf340f Placed the join command outside of the processCommand method 2022-07-27 16:42:44 +02:00
Kaki In
a40bb59dc0 Some fixes : 
- fixed a pretty syntax miss (a !== b);
 - fixed a type error : replaced "msgtype" by "type" when instantied the "messinfo" variable;
 - some indentation fixes
 2022-07-27 16:36:58 +02:00
Kaki In
ab64ce02b2 Separated the _processCommand and the joinRoom command 
- renamed executeJoinCommand as joinRoom;
 - separated the joinRoom process and the parse and result process
 2022-07-27 15:18:32 +02:00
Kaki In
2d3b6fe973 Canceled indentation modification. 2022-07-27 12:40:19 +02:00
Kaki In
550b9db4dc Separated the join instructions into a executeJoinCommand method 2022-07-27 12:21:00 +02:00
Bruno Windels
0df66b5aea track room before listing user ids when sharing key 2022-07-27 12:06:55 +02:00
Bruno Windels
f18520a2fe let loadMembers use own txn in case members haven't been fetched yet 
if they haven't, it will need a network request, meaning that the txn
will get closed, so we can't reuse it afterwards
 2022-07-27 11:39:50 +02:00
Bruno Windels
50b6ee91d7 don't need history visibility here 2022-07-27 11:39:36 +02:00
Kaki In
9b0ab0c8f1 Used "null" instead of "undefined" 
When creating the this._lastSessionHash attribute of History
 2022-07-27 09:19:36 +02:00
Bruno Windels
bfaba63f47 fix ts error 2022-07-26 17:55:21 +02:00
Bruno Windels
544afef902 test adding and removing when tracking multiple rooms 2022-07-26 17:41:26 +02:00
Bruno Windels
dd878bb8d6 also take rejecting invites into account to remove user identity 2022-07-26 16:58:07 +02:00
Bruno Windels
dea3852425 add some tests for sharing keys with invitees 2022-07-26 16:57:28 +02:00
Bruno Windels
4c17612b05 allow passing txn to loadMembers so we can do it as part of sync txn 
to rewrite useridentities upon receiving new history visibility
 2022-07-26 16:53:02 +02:00
Kaki In
f9f49b7640 Fixed an error and improving css 
If the /join command success, an error was thrown, because of a copy-pasted command not well integrated
The button of the error on "theme.css" contains now an unicode cross. The :after/:before cross was disformed when opening the room informations.
 2022-07-26 14:48:03 +02:00
Kaki In
0718f1e77e Fixed the https://github.com/vector-im/hydrogen-web/pull/816#discussion_r929692693 comment 
Added the _lastSessionHash attribute inside the History constructor
 2022-07-26 11:11:16 +02:00
Kaki In
09fd1a5113 Use "args.join" instead of "message.substring" 
into RoomViewModel._processCommands
 2022-07-26 10:37:05 +02:00
Kaki In
adfecf0778 Fix restoring the last url at start 
The last session url is now remembered for being restored at the beginning of the session. Thanks for the help of @bwindels
 2022-07-26 10:02:20 +02:00
Kaki In
1e5179f835 - Application des différents commentaires du Pull Request (#809) 
- Correction des erreurs d'indentations.
 2022-07-25 15:22:06 +02:00
Kaki In
0bf021ea87 The room is now joined after having actualised the rooms list, to avoid the synchronisations waits that can sometimes disable to enter the room (message "You're not into this room" or simply "You're not in this room yet. *Join the room*") 2022-07-25 13:37:03 +02:00
RMidhunSuresh
63bdbee39c Make optional fields optional 2022-07-25 11:33:22 +05:30
RMidhunSuresh
8a976861fb Add type 2022-07-25 11:31:14 +05:30
Bruno Windels
a23df8a545 pass history visibility to device tracker 
and delegate adding and removing members to share keys with to it
 2022-07-22 17:49:59 +02:00
Bruno Windels
17f42f523a add write method for when history visibility changes 
also returning added and removed user ids
 2022-07-22 17:49:26 +02:00
Bruno Windels
f6011f3f34 take history visibility into account in device tracker 
and return added and removed userids to their userIdentity for the given
room, so room encryption can share and discard the keys for them
 2022-07-22 17:48:26 +02:00
Bruno Windels
86c0e9e669 logic for whether a key should be shared by membership and h. visibility 2022-07-22 17:46:53 +02:00
Bruno Windels
f337940202 this migration shouldn't be needed anymore 
and undoes the export of addRoomToIdentity, which is somewhat internal
 2022-07-22 17:46:29 +02:00
Kaki In
b7fd22c7f9 SyntaxError fixed 2022-07-22 17:10:29 +02:00
Kaki In
66a59e6f4d Error of interpretation of the 403 status at the last update. Fixed 2022-07-22 17:09:43 +02:00
Kaki In
e345d0b33e Added the 403 status when joining an unknown room 2022-07-22 17:06:09 +02:00
Kaki In
be8962cec2 Fixed priority operations when checking request status 2022-07-22 16:59:48 +02:00
Kaki In
8b39346409 The error message can now be closed 2022-07-22 16:34:52 +02:00
Kaki In
fb58d9c9ef Corrected some syntax dismiss 2022-07-22 16:08:53 +02:00
Bruno Windels
22831e710c support async callback in iterateResponseStateEvents 2022-07-22 14:15:26 +02:00
Kaki In
faa8cae532 Added the possibility to join a room using /join (also added the global commands uses, and some others commands like /shrug .) 2022-07-21 13:55:23 +02:00
Bruno Windels
c8a8eb10b5 get user ids for sharing a new key when the message is sent 
rather than when the key happens to get sent
 2022-07-20 15:21:33 +02:00
Bruno Windels
d79e5f7806 create key share operations for invitees when history visibility=invited 2022-07-20 15:20:23 +02:00
RMidhunSuresh
1456e308a8 Add type and fix formatting 2022-07-20 15:36:02 +05:30
RMidhunSuresh
313e65e00c Write tests 2022-07-20 12:30:41 +05:30
RMidhunSuresh
8aa96e8031 Update log label 2022-07-19 21:19:22 +05:30
RMidhunSuresh
7ac2c7c7fa Get tests to work 2022-07-19 21:06:55 +05:30
RMidhunSuresh
ecb3a66dfc WIP 2022-07-19 17:56:08 +05:30
RMidhunSuresh
e1ee258630 Change path 2022-07-19 17:56:08 +05:30
RMidhunSuresh
83b5d3b68e Change directory name 2022-07-19 17:56:08 +05:30
RMidhunSuresh
7a1591e0ce Move code 2022-07-19 17:56:08 +05:30
RMidhunSuresh
07db5450b7 Aliases can also be derived 2022-07-19 17:56:08 +05:30
RMidhunSuresh
081de5afa8 .js --> .mjs 2022-07-19 17:56:08 +05:30
RMidhunSuresh
dece42dce3 Do not store all the manifests in memory 2022-07-19 17:56:08 +05:30
RMidhunSuresh
b29287c47e await in loop --> Promise.all() 2022-07-19 17:56:08 +05:30
RMidhunSuresh
9bdf9c500b Add return types 2022-07-19 17:56:08 +05:30
RMidhunSuresh
9e2d355573 Add logging 2022-07-19 17:56:08 +05:30
RMidhunSuresh
ce5db47708 Support using derived theme as default theme 2022-07-19 17:56:08 +05:30
RMidhunSuresh
da0a918c18 This code should only run once 2022-07-19 17:56:08 +05:30
RMidhunSuresh
043cc9f12c Use ThemeManifest type 2022-07-19 17:56:08 +05:30
RMidhunSuresh
80fb953688 Don't fail on erros; expect the code to throw! 2022-07-19 17:56:08 +05:30
RMidhunSuresh
f15e23762a Add more missing keys to type 2022-07-19 17:56:08 +05:30
RMidhunSuresh
f440457875 Use ThemeManifest type where possible 2022-07-19 17:56:08 +05:30
RMidhunSuresh
a8cab98666 Add mroe missing types 2022-07-19 17:56:08 +05:30
RMidhunSuresh
ac7be0c7a1 WIP 2022-07-19 17:56:08 +05:30
RMidhunSuresh
d731eab51c Support fetching text 2022-07-19 17:56:08 +05:30
RMidhunSuresh
161e29b36e Use existing code 2022-07-19 17:56:08 +05:30
RMidhunSuresh
2947f9f6ff Remove console.log 2022-07-19 17:56:08 +05:30
RMidhunSuresh
8c02541b69 WIP - 1 2022-07-19 17:56:08 +05:30
Bruno Windels
3346f68d25 WIP 2022-07-12 11:59:52 +02:00
R Midhun Suresh
c9bca52e82
Merge pull request #760 from vector-im/refactor-rollup-plugin 
Refactor theme builder plugin
 2022-07-11 16:54:18 +05:30
RMidhunSuresh
6718198d9c Continue with other items if this throws 2022-07-11 12:40:24 +05:30
Bruno Windels
e9649ec7c2 different streams never have the same id, even for same devices 2022-07-07 15:47:09 +02:00
Bruno Windels
2f08cd8984 clone localMedia in Member when connection, like we do for setMedia 2022-07-07 15:36:49 +02:00
Bruno Windels
f187a51c97 stop replaced track in PeerCall 2022-07-07 15:36:30 +02:00
RMidhunSuresh
f073f40e31 Fix error 2022-07-07 18:16:33 +05:30
R Midhun Suresh
963324c767
Merge pull request #789 from vector-im/support-pl-room-creation 
Support power_level_content_override option on room creation
 2022-07-07 17:42:19 +05:30
RMidhunSuresh
0bdbb96036 Use same kind 2022-07-07 17:26:43 +05:30
RMidhunSuresh
d292e1f5ad Extract into function 2022-07-07 17:23:23 +05:30
RMidhunSuresh
cd9e00b847 Support power_level_content_override 2022-07-07 17:17:05 +05:30
RMidhunSuresh
3941b7e3f0 Rename method 2022-07-07 16:45:18 +05:30
RMidhunSuresh
efd9f70e92 WIP 2022-07-07 16:39:45 +05:30
Isaiah Becker-Mayer
204948db64 changing filename to ts 2022-07-06 21:06:36 -04:00
Will Hunt
a85d2c96d6
Log the error when we can't get storage access 
This is quite useful when debugging why a session isn't working properly.
 2022-07-06 10:06:00 +01:00
Bruno Windels
206ac6e2dd WIP: prevent stream id from changing when upgrading call 2022-07-05 18:22:36 +02:00
RMidhunSuresh
8ec0bd7295 Check if lightbox url is available 2022-07-05 17:55:51 +05:30
Bruno Windels
5527e2b22c also remove deferred log items from open list when finishing them 
otherwise they end up in the logs twice when exporting
 2022-07-05 11:02:36 +02:00
Bruno Windels
6aab049052 Merge branch 'master' into bwindels/calls 2022-07-04 16:59:17 +02:00
Bruno Windels
ff2129f36a
Merge pull request #773 from vector-im/madlittlemods/consistent-test-selector 
Add a couple consistent selectors to reference in tests
 2022-07-04 14:19:09 +00:00
Bruno Windels
34ce8a8e3c fix lint 2022-07-04 16:15:59 +02:00
R Midhun Suresh
a68f0bba39
Merge pull request #752 from vector-im/theme-document-manifest 
Create a type for theme-manifest
 2022-07-04 17:11:08 +05:30
Eric Eastwood
c59f65e43b Add a couple consistent selectors to reference in tests 
Using `data-testid` because it seems generic out of the list from:

 - https://docs.cypress.io/guides/core-concepts/cypress-app#Uniqueness
 - https://docs.cypress.io/guides/references/best-practices#How-It-Works
 2022-06-29 12:56:20 +02:00