matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-10 07:22:27 +03:00
Code Activity
2,775 Commits 238 Branches 516 Tags
dffe0b39b67fd8c91bbcc67060c110d49bba581c
Commit Graph

2775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bruno Windels
031f722540 clarify that we only get joined members for now 2018-08-15 11:59:39 +02:00
Bruno Windels
531ccf1819 actually, comment should be 1 line higher 2018-08-15 11:59:39 +02:00
Bruno Windels
0d2ac42dc4 add comment to clarify corners cut in prototype 2018-08-15 11:59:39 +02:00
Bruno Windels
9ec6ea3bdf 2, not 3 times 2018-08-15 11:59:39 +02:00
Bruno Windels
1ce580bba3 test lazy loaded info is returned and then discarded when setting a state event 2018-08-15 11:59:39 +02:00
Bruno Windels
8ad2a94a90 make sure LL member doesn't override state event 
extra safety check, as this should already not happen because of the check in RoomState
 2018-08-15 11:59:39 +02:00
Bruno Windels
de3f75bc83 Lazy loaded members should never take precendence over members acquired through state events 2018-08-15 11:59:39 +02:00
Bruno Windels
008d85ed32 pick joined property out of response 2018-08-15 11:59:39 +02:00
Bruno Windels
5e30aff418 more consistent naming 2018-08-15 11:59:39 +02:00
Bruno Windels
5de0d39553 move the fact that we're prototyping only with joined members up the stack to client 
only MatrixClient really needs to know that for now we only load joined members, the rest of the code can be generic for other membership types as that is the eventual plan, to also support invites at least.
 2018-08-15 11:59:39 +02:00
Bruno Windels
d95d44dc94 move error handling to caller 2018-08-15 11:59:39 +02:00
Bruno Windels
6061deac37 use method for getting state event, less code 2018-08-15 11:59:39 +02:00
Bruno Windels
ba34a766e7 fix lint 2018-08-15 11:59:39 +02:00
Bruno Windels
1c81a17298 Fix tests 
getSentinelMember now does return a member (with just the userid) when there is no corresponding member yet.
With lazy loading it's perfectly possible the member is not available, and null breaks continuation in the timeline.
 2018-08-15 11:59:39 +02:00
Bruno Windels
2097b31d4f handle failed /joined_members call by logging to console and reverting flag 2018-08-15 11:59:39 +02:00
Bruno Windels
2155dd0552 improve return type comment 2018-08-15 11:59:39 +02:00
Bruno Windels
8733654094 remove left-over test code, oops 2018-08-15 11:59:39 +02:00
Bruno Windels
abd15748ce fix one lint warning too many 2018-08-15 11:59:39 +02:00
Bruno Windels
9a796f1383 fix lint errors 2018-08-15 11:59:39 +02:00
Bruno Windels
88f2f62945 make resetting the live timeline work with lazily loaded members 
In order for the lazy loading logic not to bleed into all corners
of the JS SDK, I moved some of the state copying between timelines
over to the RoomState and EventTimeLine class.
 2018-08-15 11:59:39 +02:00
Bruno Windels
30adefed07 return sentinels with userid if members haven't been loaded yet, 
better than braking timeline continuation
 2018-08-15 11:59:39 +02:00
Bruno Windels
20a1828fa5 make sentinels lazy loading compatible 
dont just rely on member events, but just copy the member
 2018-08-15 11:59:39 +02:00
Bruno Windels
809674ca2b set lazily loaded members on all RoomStates of a room 
for all timelines in all timeline sets
 2018-08-15 11:59:39 +02:00
Bruno Windels
0ca3475878 make method to get mxc avatar url public 
so MemberInfo can use it and take lazy loading into account
 2018-08-15 11:59:39 +02:00
Bruno Windels
32b741e205 use more consistent naming 2018-08-15 11:59:39 +02:00
Bruno Windels
c917c4a468 return correct invite sender in case of a join 2018-08-15 11:59:39 +02:00
Bruno Windels
6c584d2b4c keep is_direct checks inside RoomMember as events.member might not be available 2018-08-15 11:59:39 +02:00
Bruno Windels
759d415d40 preserve member state event if available when lazy loading members 2018-08-15 11:59:39 +02:00
Bruno Windels
45d86fa270 emit individual events for lazily loaded members 
emit individual RoomState.members/newMember events
for each lazily loaded member as batch events are not a thing.
This makes updating the memberlist work
 2018-08-15 11:59:39 +02:00
Bruno Windels
2c5cad71ee prototype support for lazily loading members in matrixclient 2018-08-15 11:59:39 +02:00
Bruno Windels
2b5925b893 Support for updating members in RoomState from lazily loaded members 2018-08-15 11:59:39 +02:00
Bruno Windels
f012ada2c4 add setter on RoomMember to update from lazily loaded member 2018-08-15 11:59:07 +02:00
Bruno Windels
af1b26ae95 Merge pull request #689 from matrix-org/dbkr/show_room_version 
Add getVersion to Room
 2018-08-14 17:54:09 +02:00
David Baker
f72f5b43e1 Add getVersion to Room 
To get the version number of the room as per https://github.com/matrix-org/matrix-doc/issues/1425
 2018-08-14 14:27:08 +01:00
Bruno Windels
c7e1e07262 Merge pull request #680 from matrix-org/dbkr/getsyncstatedata 
Add getSyncStateData()
 2018-08-06 10:51:21 +02:00
Bruno Windels
24a1bec23d Merge pull request #679 from matrix-org/dbkr/chairman_mau_pt_3_sync_error 
Send sync error to listener
 2018-08-03 19:06:17 +02:00
David Baker
89ad104423 Add getSyncStateData() 
To get additional information about the sync state (ie. the error
object).
 2018-08-03 18:00:52 +01:00
David Baker
c2f3324302 Send sync error to listener 
We do this in other places, but not here
 2018-08-03 16:59:10 +01:00
Michael Telatynski
04a969b997 Merge pull request #675 from matrix-org/bwindels/nocrashoninvalidtags 
make sure room.tags is always a valid object to avoid crashes
 2018-08-01 23:03:51 +01:00
Bruno Windels
630dfa9499 make sure room.tags is always a valid object so no crashes happen later on 2018-07-31 15:33:56 +02:00
Bruno Windels
95668950c2 Merge pull request #673 from matrix-org/bwindels/infinite_spinner 
Fix infinite spinner upon joining a room
 2018-07-31 14:57:04 +02:00
Bruno Windels
3012501e4b update docs to clarify state when emitting newMember 2018-07-30 14:19:45 +02:00
David Baker
0e81dfb004 v0.10.7 v0.10.7 2018-07-30 11:40:08 +01:00
David Baker
35b7f358b6 Prepare changelog for v0.10.7 2018-07-30 11:40:08 +01:00
Bruno Windels
e3e48944e0 add test 2018-07-27 11:49:55 +02:00
Bruno Windels
94bbba72f5 add member to members before emitting any events 2018-07-27 11:35:19 +02:00
David Baker
c429ca67b9 v0.10.7-rc.1 v0.10.7-rc.1 2018-07-24 18:15:14 +01:00
David Baker
bce2ba0785 Prepare changelog for v0.10.7-rc.1 2018-07-24 18:15:13 +01:00
Matthew Hodgson
2613690064 Merge pull request #666 from matrix-org/matthew/encrypt-for-invited-users 
encrypt for invited users if history visibility allows.
 2018-07-10 16:14:45 +01:00
David Baker
7283076bc8 Fix Users / Members mixup 2018-07-09 17:16:23 +01:00