Commit graph

1104 commits

Author SHA1 Message Date
Š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
Michael Telatynski
286463606c Spaces fix edge cases around automatic space switching around room navigation 2021-04-29 13:52:48 +01:00
Michael Telatynski
7552801103 Room List respect the prefilter for new rooms 2021-04-29 09:48:23 +01:00
Michael Telatynski
e390c3c732 Inhibit sending RR when context switching to a room 2021-04-29 09:37:21 +01:00
Michael Telatynski
bed52319bc Sort rooms in the add existing to space dialog based on recency 2021-04-28 23:39:24 +01:00
Michael Telatynski
efb9b71900 Make the text filter search all spaces instead of just the selected one 2021-04-28 23:18:42 +01:00
Michael Telatynski
08e0f15006
Merge pull request #5936 from matrix-org/t3chguy/fix/17084
Fix joining room using via servers regression
2021-04-28 17:09:22 +01:00
Michael Telatynski
27731ac25b tidy 2021-04-28 09:07:02 +01:00
Michael Telatynski
5966fade0b Fix joining room using via servers regression 2021-04-28 09:04:02 +01:00
Travis Ralston
c2bcdae8a9 Switch global var to the store for easier debugging 2021-04-27 23:04:49 -06: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
Michael Telatynski
62f8c9aab9
Merge pull request #5924 from matrix-org/t3chguy/fix/17069
Disable spaces context switching for when exploring a space
2021-04-27 09:45:58 +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
25e4feeb38 Add more types in WidgetEchoStore 2021-04-26 15:38:43 +01:00
Travis Ralston
ddb8947c15
Merge pull request #5897 from matrix-org/travis/error-states
Improve message error states
2021-04-26 08:16:26 -06:00
Michael Telatynski
751568cef2 Disable spaces context switching for when exploring a space 2021-04-26 14:55:11 +01:00
J. Ryan Stinnett
b8a915bb76 Tweak private / underscores for fields and methods 2021-04-26 14:02:53 +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
3bb6edbda7 Fix accepting invite edge case where it wouldn't show the newly joined space 2021-04-25 09:24:26 +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
da46e90896 Fix SpaceStore reset behaviour 2021-04-24 11:32:12 +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
J. Ryan Stinnett
3d41b48543 Check for null room in VisibilityProvider
Hopefully fixes https://github.com/vector-im/element-web/issues/16898
2021-04-23 17:27:20 +01:00
J. Ryan Stinnett
2344ddd164 Merge remote-tracking branch 'origin/develop' into jryans/convert-flow-to-ts 2021-04-23 17:19:52 +01:00
J. Ryan Stinnett
d7e6f4b4b5 Add basic types 2021-04-23 17:05:50 +01:00
J. Ryan Stinnett
31a28b1a9e Update extensions for some files with types
This migrates one bucket of files using some amount of Flow typing to mark them
as TypeScript instead. The remaining type errors are fixed in subsequent
commits.
2021-04-23 16:05:30 +01:00
Michael Telatynski
f5ab75cfdd Fix automatic space switching behaviour to prioritise canonical parents 2021-04-23 14:45:34 +01:00
Germain
65d55bd0d9
Merge pull request #5908 from matrix-org/gsouquet-messagepreview-nodom
Remove reliance on DOM API to generated message preview
2021-04-23 14:37:19 +01:00
Michael Telatynski
320ff7b870 Fix invites relating to a space not showing in the space 2021-04-23 13:41:42 +01:00
Michael Telatynski
86a30a2ad5 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17022 2021-04-23 10:05:45 +01:00
Michael Telatynski
1075756929 add more tests 2021-04-23 09:55:30 +01:00
Germain Souquet
2b6551d06a Remove reliance on DOM API to generated message preview 2021-04-22 16:17:53 +01:00
Michael Telatynski
ba9cfa0942
Merge pull request #5902 from matrix-org/t3chguy/fix/17020
Show invites to spaces at the top of the space panel
2021-04-22 14:32:48 +01:00
Michael Telatynski
3fb4b6258a
Merge pull request #5899 from matrix-org/t3chguy/spaces-stability
Improve edge cases with spaces context switching
2021-04-22 14:30:35 +01:00
Michael Telatynski
e219fe082a Tweak context switching edge case for space invites 2021-04-22 12:08:54 +01:00
Michael Telatynski
7efd4a43a5 Show space invites at the top of the space panel 2021-04-22 12:07:58 +01:00
Michael Telatynski
60ef657f64 Properly hide spaces from the room list 2021-04-22 12:07:58 +01:00
Michael Telatynski
28fa1cb44c Reset space contexts as some users may have loops stuck in their local storage 2021-04-22 09:05:02 +01:00
Michael Telatynski
b64b956aa4 when automatically switching space to match room fall back to the home space 2021-04-22 08:39:16 +01:00
Michael Telatynski
ec0612f70d Fix spaces notification dots wrongly including upgraded (hidden) rooms 2021-04-22 08:31:26 +01:00
Michael Telatynski
e1ba04716e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces-stability
 Conflicts:
	src/stores/SpaceStore.tsx
2021-04-22 08:24:19 +01:00
Michael Telatynski
ee80c27b2b Improve edge cases with spaces context switching 2021-04-22 08:22:11 +01:00
Travis Ralston
4be9c51dad Move all the RED_EXCLAMATION badges to a single definition 2021-04-21 16:43:25 -06:00
Michael Telatynski
8373b0e69c
Merge pull request #5893 from matrix-org/t3chguy/fix/16978
Fix spaces filtering sometimes lagging behind or behaving oddly
2021-04-21 09:20:18 +01:00
Michael Telatynski
bae47bbd79
Merge pull request #5894 from matrix-org/t3chguy/fix/17026
Fix issue with spaces context switching looping and breaking
2021-04-21 09:11:26 +01:00
Michael Telatynski
ecd9b8d6de Fix issue with spaces context switching looping and breaking 2021-04-21 09:01:22 +01:00
Michael Telatynski
1507f64f2b Fix spaces filtering sometimes lagging behind or behaving oddly 2021-04-21 08:52:56 +01:00
Šimon Brandner
9b81f5b4a0
Add a comment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 16:11:34 +02:00
Šimon Brandner
3adb2635ba
Revert "Remove unnecessary check"
This reverts commit 08c0f0a67e.

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 15:40:32 +02:00
Michael Telatynski
ace8d59a2a Fix Spaces NPE when a room with no tags gains its first tag 2021-04-20 13:12:28 +01:00
Šimon Brandner
4344ff9097
Update src/stores/SpaceStore.tsx
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-04-20 13:31:50 +02:00
Šimon Brandner
d4ca087c2e
Make getLastViewedRoomsStorageKey() make sense
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 13:24:23 +02:00
Šimon Brandner
1934c4a32f
Add getLastViewedRoomsStorageKey()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 12:39:11 +02:00
Šimon Brandner
f9292c364c
Check if we are joined
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 12:25:56 +02:00
Šimon Brandner
08c0f0a67e
Remove unnecessary check
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 12:22:25 +02:00
Šimon Brandner
a3d0ccf306
Merge branch 'develop' into spaces/context-switching 2021-04-20 12:06:59 +02:00
Michael Telatynski
6127669c53
Merge pull request #5882 from matrix-org/t3chguy/fix/17002
Trigger lazy loading when filtering using spaces
2021-04-19 19:25:15 +01:00
Michael Telatynski
344e4b6c5b Trigger lazy loading when filtering using spaces
so that the filtered DMs are correct
2021-04-19 16:15:24 +01:00
Travis Ralston
f955f33071 Merge branch 'develop' into travis/voice/countdown 2021-04-16 10:00:11 -06:00
David Baker
d39b7175f7 Don't include invisible rooms in notify summary
This could cause rogue title bar natifications if you had invisible rooms
2021-04-16 15:31:01 +01:00
Travis Ralston
0677cf866c Cap recording length, and warn at 10s remaining
See diff for details. Note that this introduces an "Uploading" state which is not currently used.

At the moment, if a user hits the maximum time then their recording will be broken. This is expected to be fixed in a future PR.
2021-04-14 21:15:06 -06:00
Travis Ralston
3cafed478c Run voice recording updates through a dedicated store 2021-04-14 20:11:34 -06:00
Michael Telatynski
bf33775a14 Fix space store wrongly switching to a non-space filter 2021-04-12 11:45:22 +01:00
Travis Ralston
3c25979520
Merge pull request #5824 from robintown/ignore-punctuation
Ignore punctuation when filtering rooms
2021-04-08 20:10:08 -06:00
Travis Ralston
479df8ac5f Clarify docs 2021-04-02 19:35:10 -06:00
Travis Ralston
343ce3b502 Make log spam more quiet 2021-04-01 00:02:05 -06:00
Travis Ralston
746856ed10 Appease the linter 2021-03-31 23:40:25 -06:00
Travis Ralston
70db749430 Restabilize room list ordering with prefiltering on spaces/communities
Fixes https://github.com/vector-im/element-web/issues/16799

This change replaces the "relative priority" system for filters with a kind model. The kind is used to differentiate and optimize when/where a filter condition is applied, resulting in a more stable ordering of the room list. The included documentation describes what this means in detail.

This also introduces a way to inhibit updates being emitted from the Algorithm class given what we're doing to the poor thing will cause it to do a bunch of recalculation. Inhibiting the update and implicitly applying it (as part of our updateFn.mark()/trigger steps) results in much better performance.

This has been tested on my own account with both communities and spaces of varying complexity: it feels faster, though the measurements appear to be within an error tolerance of each other (read: there's no performance impact of this).
2021-03-31 23:36:36 -06:00
Robin Townsend
b13dae1fc6 Ignore punctuation when filtering rooms
Signed-off-by: Robin Townsend <robin@robin.town>
2021-03-31 22:45:53 -04:00
Germain Souquet
3f33060cdd increase default visible tiles for room sublists 2021-03-31 11:15:16 +01:00
J. Ryan Stinnett
3a09c22173
Merge pull request #5812 from matrix-org/jryans/cancel-security-key
Tweak security key error handling
2021-03-29 17:58:11 +01:00
J. Ryan Stinnett
02548cf743 Tweak security key error handling
This reworks error handling of "use security key" so we stop the overall
operation when cancelling access (instead of just the immediate prompt). In
addition, flowing the error to outer catch block also handles resetting state to
re-display the initial verification choices.

Fixes https://github.com/vector-im/element-web/issues/15584
2021-03-26 18:01:03 +00:00
Šimon Brandner
d68afcc4ce
Use else if
Maybe it looks a little nicer, I don't know

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 13:52:41 +01:00
Šimon Brandner
a707524aad
Delete comment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 13:49:01 +01:00
Šimon Brandner
f62e2c0042
Use compound keys
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 13:44:51 +01:00
Šimon Brandner
f64008e239
Check if room is defined
Sometimes it isn't and that leads to errors. We can't use ? here because we also use !

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 13:39:16 +01:00
Michael Telatynski
aff05eff48 Fix suggested room vanishing when you peek it 2021-03-26 11:48:31 +00:00
Šimon Brandner
65ef2b845e
Go to /#/home if there is no saved room
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 08:18:49 +01:00
Šimon Brandner
7e425ce939
Empty object if nothing saved
This isn't nice but I'll rework this soon anyway

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 08:18:49 +01:00
Šimon Brandner
efb8c89433
Don't save if isSpaceRoom()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 08:18:42 +01:00
Šimon Brandner
c26da1bce6
Use this.activeSpace
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 07:58:09 +01:00
Šimon Brandner
e39f7caf59
Don't export as we don't need to
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 07:55:52 +01:00
Šimon Brandner
2dcb60b489
Move persisting of last viewed into SpaceStore
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-26 07:54:27 +01:00
Šimon Brandner
67dcb3a448
If no roomId was saved go to space home
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-25 20:51:21 +01:00
Šimon Brandner
ef3d87f8e8
First implementation of context switching
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-25 20:44:15 +01:00
Michael Telatynski
1b22cc8f6d delint 2021-03-25 17:41:26 +00:00
Michael Telatynski
a2fe964a31 Fix case where room list did not show DM when user joined space after filtering 2021-03-25 17:37:39 +00:00
Michael Telatynski
a61f4c1811 Auto-select space if joined whilst being viewed 2021-03-24 20:01:21 +00:00
Michael Telatynski
56dbd5f628 Remove unused autoJoin prop and move viaServers logic into RVS
this fixes the issue where autoJoining ignored viaServers
2021-03-24 16:45:53 +00:00
Michael Telatynski
d873791369 update comments 2021-03-24 14:01:24 +00:00
Michael Telatynski
796bfd851d Fix left spaces not disappearing from the space panel 2021-03-22 17:47:48 +00:00
Michael Telatynski
128c7db28e
Merge pull request #5777 from matrix-org/t3chguy/spaces4.9
Spaces improve creation journeys
2021-03-22 13:24:10 +00:00
David Baker
8a765cf67a
Merge pull request #5770 from matrix-org/dbkr/jitsi_display_name
Fix username showing instead of display name in Jitsi widgets
2021-03-19 13:41:35 +00:00
Michael Telatynski
2b4c670b89 Fix favourites not showing up in home until a refresh 2021-03-19 13:20:30 +00:00
Michael Telatynski
c6f6d24b32 Iterate space creation and previews 2021-03-19 13:20:30 +00:00
David Baker
4a734ef70b Clear displayname / vatar if they're unset 2021-03-19 11:29:14 +00:00