1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-10 07:22:27 +03:00
Commit Graph

2775 Commits

Author SHA1 Message Date
Bruno Windels
dffe0b39b6 Merge pull request #697 from matrix-org/dbkr/joined_member_count_wrapper
Add wrapper around getJoinedMemberCount()
2018-08-22 17:44:59 +02:00
Bruno Windels
267d660527 add invite count to room as well 2018-08-22 17:42:30 +02:00
David Baker
4c3046f917 Add wrapper around getJoinedMemberCount()
On Room, because it's super confusing that Room has
getJoinedMembers() but not getJoinedMemberCount()

https://github.com/matrix-org/matrix-react-sdk/pull/2126 had assumed
that this method was on Room
2018-08-22 16:34:06 +01:00
Bruno Windels
52fad6aec2 Merge pull request #694 from matrix-org/hs/fetch-room-event-api
Api to fetch events via /room/.../event/..
2018-08-21 14:39:14 +02:00
Will Hunt
5b830f0b6a Add fetchRoomEvent to base-apis.js 2018-08-21 11:07:48 +01:00
Will Hunt
3d24c8768f Drop fetchRoomEvent from client.js 2018-08-21 11:07:37 +01:00
Bruno Windels
977b8625f8 Merge pull request #693 from matrix-org/dbkr/room_upgrades
Support for room upgrades
2018-08-21 11:22:08 +02:00
Will Hunt
df7dc04a1d Happy linter, happy developer 2018-08-20 14:16:47 +01:00
David Baker
269d3cb086 Merge branch 'master' into develop 2018-08-20 13:49:20 +01:00
David Baker
4d310cd461 v0.10.8 v0.10.8 2018-08-20 13:44:30 +01:00
David Baker
88c5c39fcb Prepare changelog for v0.10.8 2018-08-20 13:44:29 +01:00
Will Hunt
79ca68300c Add callback 2018-08-20 12:47:26 +01:00
Will Hunt
baca20b225 Add support for /rooms/$roomId/event/$eventId 2018-08-20 11:14:45 +01:00
David Baker
0e3cb1977f lint 2018-08-17 15:00:54 +01:00
David Baker
8b1fa72877 Copyright & debadgering 2018-08-17 14:59:34 +01:00
David Baker
e8610a35b4 Support for room upgrades
For https://github.com/vector-im/riot-web/issues/7164
2018-08-17 14:55:12 +01:00
Bruno Windels
77e6442f73 Merge pull request #691 from matrix-org/bwindels/feature_lazyloading
Lazy loading of room members
2018-08-16 18:14:33 +02:00
David Baker
eeddfd4919 v0.10.8-rc.1 v0.10.8-rc.1 2018-08-16 15:17:36 +01:00
David Baker
fa16da86b3 Prepare changelog for v0.10.8-rc.1 2018-08-16 15:17:35 +01:00
Bruno Windels
372a628cab fix log whitespace 2018-08-15 12:01:26 +02:00
Bruno Windels
2f4d8c3530 check with server if it supports member lazy loading 2018-08-15 12:01:26 +02:00
Bruno Windels
482eab0e2a fix tests 2018-08-15 12:01:26 +02:00
Bruno Windels
03c63d9b12 use sync token for /members request, as synapse expects it now 2018-08-15 12:01:26 +02:00
Bruno Windels
07e87915ba fix and add tests 2018-08-15 12:01:26 +02:00
Bruno Windels
91f2bf99c0 fix lint 2018-08-15 12:01:26 +02:00
Bruno Windels
535d59db4d fixup 2018-08-15 12:01:26 +02:00
Bruno Windels
9739c3355a undo postponing tracking device keys on turning on room encryption 2018-08-15 12:01:26 +02:00
Bruno Windels
827db37eef fixup 2018-08-15 12:01:26 +02:00
Bruno Windels
0c6e47a5bc await for LL members in getEncryptionTargetUsers 2018-08-15 12:01:26 +02:00
Bruno Windels
864ea749e5 Move /members fetching to room as getEncryptionTargetMembers needs it 2018-08-15 12:01:26 +02:00
Bruno Windels
5d92ec3b7b prevent deadlock on startup
when loading the encrypted events from storage,
the code would wait for the encryption target users,
which would never come because you would only load them
when viewing the room.

This disabled starting to track the devices in the room
when the inhibitDeviceQuery is set.
2018-08-15 12:01:26 +02:00
Bruno Windels
733a3ed102 Defer encryption targeted users when OOB member loading hasn't started 2018-08-15 12:01:26 +02:00
Bruno Windels
b14be026b7 pass LL flag to room, to know if we should wait for lazy members at all 2018-08-15 12:01:26 +02:00
Bruno Windels
b4afe97289 spelling 2018-08-15 12:01:26 +02:00
Bruno Windels
43a7a607b2 fixup 2018-08-15 12:01:26 +02:00
Bruno Windels
a8bf66d8af Make Room.getEncryptionTargetMembers async, as members might be loading 2018-08-15 12:01:26 +02:00
Bruno Windels
3616a07dbb store /members promise on room while loading members 2018-08-15 12:01:26 +02:00
Bruno Windels
6609dfd410 initial support for lazy loading when calling /context 2018-08-15 12:01:26 +02:00
Bruno Windels
e3913bd397 Fix: missed call site while renaming prependStateEvents 2018-08-15 12:01:26 +02:00
Bruno Windels
8c01ed1469 add comments explaining why we ignore the put promise result 2018-08-15 12:01:26 +02:00
Bruno Windels
7aa0dcc89f PR feedback, rename method 2018-08-15 12:01:26 +02:00
Bruno Windels
5285b22a76 bump version as making startClient async is a breaking change 2018-08-15 12:01:26 +02:00
Bruno Windels
0fa49bc2cd PR feedback 2018-08-15 12:00:38 +02:00
Bruno Windels
01d8730850 cleanup, lint and docs 2018-08-15 12:00:38 +02:00
Bruno Windels
52149ce74a 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-15 12:00:38 +02:00
Bruno Windels
bffc20612d Fix: member avatar was always forward looking
applying itself all the way till the next member event
when back paginating
2018-08-15 12:00:38 +02:00
Bruno Windels
2c0eb19a27 Fix sentinels changing from underneath us!
As RoomMember contains the event in a nested object (events.member),
a shallow copy was not enough to be immutable.

This solution won't copy OOB flags but that's not neccesary
for sentinels.
2018-08-15 12:00:38 +02:00
Bruno Windels
748c4737f6 remove dead code 2018-08-15 12:00:38 +02:00
Bruno Windels
769d5113f7 prepend state from /messages to appropriate timeline/room state (excluding event context for now) 2018-08-15 12:00:38 +02:00
Bruno Windels
157be6da05 centralize creating a /messages request
so we only need to add LL filter once
2018-08-15 12:00:38 +02:00