Commit graph

11039 commits

Author SHA1 Message Date
Bruno Windels
c8b6ccba25 fallback to room summary for dm detection 2018-08-14 11:43:03 +02:00
Bruno Windels
612077125e
Merge pull request #2113 from matrix-org/bwindels/e2e_enc_ll
Lazy loading: fix end-to-end encryption rooms
2018-08-08 15:32:49 +02:00
Bruno Windels
90fc15ff3e adjust room constructor 2018-08-07 15:33:37 +02:00
Bruno Windels
1f8e3e5d43 await room.getEncryptionTargetMembers in cryptodevices 2018-08-07 14:48:07 +02:00
Bruno Windels
1009bc43ae call method on room now to LL members 2018-08-07 14:47:06 +02:00
Bruno Windels
27ee85f4d9
Merge pull request #2104 from matrix-org/bwindels/backpaginate_ll
Lazy loading: Lazy load members while backpaginating
2018-08-03 14:57:02 +02:00
Bruno Windels
5bb028d474
Merge pull request #2102 from matrix-org/bwindels/selfmembershipchecks
Lazy loading: don't assume we have our own member available
2018-08-03 14:47:01 +02:00
Bruno Windels
f1643f77ac fix lint 2018-08-02 19:57:20 +02:00
Bruno Windels
42fc83d2a8 Move LL filter creation inside MatrixClient
As we need an option to turn lazy loading on (we can't just accept a filter,
as /messages has an incompatible filter), better only pass the option
and create the filter inside startClient
2018-08-02 19:38:41 +02:00
Bruno Windels
e1843601be support directional content in pill member fake 2018-08-02 17:09:18 +02:00
Bruno Windels
4b96e01410 enable newly introduced option 2018-08-02 13:01:57 +02:00
Bruno Windels
802efc7694 given the != join check, isInvite will never be true
Also, put comments in right order
2018-08-02 11:47:24 +02:00
Bruno Windels
b151956f7b Use room method to help with DM detection with fallback to summary heroes/counts. 2018-08-02 11:42:19 +02:00
Bruno Windels
908de56c6d replace getMember(myId).membership with getMyMembership
This works with rooms which haven't had their members
loaded yet.
2018-08-02 11:42:05 +02:00
Bruno Windels
b9bbb7ee16 pass in userId with room in test 2018-08-02 11:40:56 +02:00
Bruno Windels
0dd860242a
Merge pull request #2072 from matrix-org/bwindels/lazy_load_members
Lazy load room members - Part I
2018-07-26 17:19:12 +02:00
Bruno Windels
cfd20c7e85 fix error/tests 2018-07-25 16:10:49 +02:00
Bruno Windels
d87d34030a fix dm detection and conf call code with lazy loading 2018-07-25 16:10:49 +02:00
Bruno Windels
7ea913ccec fall back to synced membership when own membership is not yet available (due to lazy loading) 2018-07-25 16:10:49 +02:00
Bruno Windels
f79e2eae40 might not have loaded members here yet 2018-07-25 16:10:49 +02:00
Bruno Windels
33f5560666 move error message to caller of lazy loading 2018-07-25 16:10:49 +02:00
Bruno Windels
34cb89e86a fix tests 2018-07-25 16:10:49 +02:00
Bruno Windels
201332d96c move comment after rebase 2018-07-25 16:10:49 +02:00
Bruno Windels
af07d73432 hide lazy loading behind feature flag 2018-07-25 16:10:49 +02:00
Bruno Windels
866b4bb067 use isKicked method in preview bar 2018-07-25 16:10:49 +02:00
Bruno Windels
8c9ceca14f take into account lazy loading when enlarging avatar 2018-07-25 16:10:49 +02:00
Bruno Windels
af77f0206a don't assume a member has events associated 2018-07-25 16:10:49 +02:00
Bruno Windels
8529bc55e3 use helper method for knowing whether a user was kicked
mainly for readability, but also to discourage grabbing into the member
because of lazy loading changes
2018-07-25 16:10:49 +02:00
Bruno Windels
e237a02fa5 use more consistent naming 2018-07-25 16:10:49 +02:00
Bruno Windels
54904c9282 use member helper method instead of digging inside member 2018-07-25 16:10:49 +02:00
Bruno Windels
6ff92ede8f this code actually never fires, so remove it
and that's ok because createRoom will already mark a DM as such
on the inviter's side. So here we just handle the invitees side.
2018-07-25 16:10:49 +02:00
Bruno Windels
19387805ac Don't assume RoomMember has a state event in direct chat detection
Instead call the method on the member that takes lazy loading into account
2018-07-25 16:10:49 +02:00
Bruno Windels
de3e143a8f only lazy load the members when viewing a joined room 2018-07-25 16:10:49 +02:00
Bruno Windels
8c985bd049 ask client to lazy load room members when viewing a room 2018-07-25 16:10:49 +02:00
Luke Barnard
a11e1cc2f9 [WIP] Send lazy_load_memberers filter when syncing 2018-07-25 16:10:49 +02:00
David Baker
a00c2b753a
Merge pull request #2085 from matrix-org/t3chguy/emoji_aliases
allow autocompleting Emoji by common aliases, e.g 👍 to 👍
2018-07-25 10:40:59 +01:00
David Baker
0c1722c8ee Update package-lock deps 2018-07-24 22:07:12 +01:00
David Baker
3c377c1816
Merge pull request #2087 from matrix-org/dbkr/jitsi_out_of_labs
Take jitsi conf calling out of labs
2018-07-24 19:22:44 +01:00
David Baker
20ea86417e Appease the linter 2018-07-24 19:14:44 +01:00
David Baker
d8be4508e8 Unused import 2018-07-24 19:13:05 +01:00
David Baker
cfa7d0f11d Take jitsi conf calling out of labs 2018-07-24 19:06:19 +01:00
David Baker
ffabd60972
Merge pull request #2086 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2018-07-24 18:26:42 +01:00
Weblate
86eaf2bd6a Merge remote-tracking branch 'origin/develop' into develop 2018-07-24 16:34:24 +00:00
David Baker
cf6ce0c1e2
Merge pull request #2082 from matrix-org/t3chguy/slate_cont2
Moar Slate Fixes
2018-07-24 17:34:20 +01:00
Weblate
b2fce4809f Merge remote-tracking branch 'origin/develop' into develop 2018-07-24 16:12:54 +00:00
David Baker
c19a5bd2a8
Merge pull request #2084 from matrix-org/dbkr/store_destroy_persistent_widget
Make ActiveWidgetStore clear persistent widgets
2018-07-24 17:12:49 +01:00
Michael Telatynski
07f0713a56
allow autocompleting Emoji by common aliases, e.g 👍 to 👍
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-24 17:06:45 +01:00
David Baker
cdd73e6e1f Check matrix client exists when stopping 2018-07-24 16:55:45 +01:00
David Baker
7044410a13 Move destroyPersistentWidget to store 2018-07-24 16:50:34 +01:00
David Baker
acc767a479 s/start/stop/ 2018-07-24 16:39:30 +01:00