matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-07 05:22:15 +03:00
Code Activity
2,867 Commits 239 Branches 515 Tags
c91b67d37093cf5ba6abf7dba9f115b4ac4a3a84
Commit Graph

2867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
3e88593a81 Prepare changelog for v0.10.9-rc.1 2018-08-30 14:16:14 +01:00
David Baker
60c01d7869 Revert b0b0291 and a6de395 
To make tests pass again
 2018-08-30 12:03:53 +01:00
David Baker
1cbcc61bd6 Merge pull request #706 from matrix-org/bwindels/fixdmavatar 
Fix DM avatar
 2018-08-30 11:43:07 +01:00
Bruno Windels
7f5a2974ce allow self chats 2018-08-30 12:37:13 +02:00
Bruno Windels
3de3ea38b9 check heroes is present 2018-08-30 11:47:17 +02:00
Bruno Windels
3659e86d57 fix lint, actually get members as well 2018-08-30 11:41:35 +02:00
Bruno Windels
c335a6b3de guess DM user id, used to patch up incorrect m.direct account data 2018-08-30 11:05:31 +02:00
Bruno Windels
267b831bc4 calculate fallback avatar for rooms with <= members but not DM 2018-08-30 11:05:05 +02:00
Bruno Windels
7ee93cb910 make sure our user is not in the summary heroes. 
No reason to think it is right now, but if there is a server bug
we could end up showing your own avatar for a DM again.

Also convenience method as we add up invited + join count often
 2018-08-30 11:04:32 +02:00
Matthew Hodgson
ae95a49618 spell out m.new_devices no longer exist 2018-08-29 20:20:52 +01:00
David Baker
8f98504183 jsdoc 2018-08-29 18:11:53 +01:00
David Baker
1b77ee0ef4 Pass through function to discard megolm session 
To make debugging crypto slightly faster
 2018-08-29 18:06:45 +01:00
Matthew Hodgson
a6de395cde unbreak tests from b0b0291bc7 2018-08-28 18:03:59 +01:00
Bruno Windels
fcd6dd34b2 Merge pull request #699 from matrix-org/bwindels/fixlle2ememberfetch-bis 
Lazy loading: avoid loading members at initial sync for e2e rooms
 2018-08-28 15:36:42 +02:00
Bruno Windels
a6ebfe4215 typo 2018-08-28 15:31:20 +02:00
Bruno Windels
6a9158aa62 Merge pull request #700 from matrix-org/bwindels/fixllmegolmsession 
Improve setRoomEncryption guard against multiple m.room.encryption st…
 2018-08-28 15:30:16 +02:00
Matthew Hodgson
b0b0291bc7 hopefully fix invite_room_state as per https://github.com/vector-im/riot-web/issues/7229 2018-08-28 01:27:20 +01:00
Bruno Windels
85f1da1f10 revert unnecesary changes 2018-08-27 12:09:10 +02:00
Bruno Windels
c47445ca98 no need to just add a space now 2018-08-27 12:01:22 +02:00
Bruno Windels
4e25867548 revert to async event processing 
without LL, we could refresh the device list before all members have been tracked.
as promises, even resolved ones (in case of no LL), always continue async
 2018-08-27 11:56:46 +02:00
Bruno Windels
ad71bb30ac add comment back as we kept flag in the end 2018-08-27 11:51:29 +02:00
Bruno Windels
362bf1895d restore inhibitDeviceQuery param to avoid breaking change 2018-08-27 11:12:00 +02:00
Bruno Windels
7d00c0bd5a make LL/non-LL flow in Crypto more alike by always going through _roomDeviceTrackingState 2018-08-27 10:54:08 +02:00
Bruno Windels
5e5994f166 try and fix tests 2018-08-27 10:54:08 +02:00
Bruno Windels
7247762b60 Also support not lazy-loading members in Crypto 2018-08-27 10:54:08 +02:00
Bruno Windels
21e0c79f7d Revert "Revert "Lazy loading: don't block on setting up room crypto"" 
This reverts commit 5cf2ebea4f.
 2018-08-27 10:54:08 +02:00
Bruno Windels
78b08bfef2 fix var declaration 2018-08-27 10:48:11 +02:00
Bruno Windels
ae7e90dc2f do config comparison first to keep original error message 2018-08-27 10:39:14 +02:00
Bruno Windels
0028bfbfc7 fix lint 2018-08-24 18:42:48 +02:00
Bruno Windels
60c9c403bd Improve setRoomEncryption guard against multiple m.room.encryption state events 
we were only bailing out when receiving a non JSON-identical m.room.encryption event.
When receiving an identical event, the algorithm in _roomEncryptors would be reset,
generating a new megolm session every time this happens (there is a LL synapse bug
where this happens on every sync).

As the _roomList is backed by indexeddb you might already have a config without the algorithm being present though,
so we first check for the room encryptor algorithm being present. If so, always bail out as setRoomEncryption was
already called for the given room.

If no algorithm is present, still check if the config is not being changed.
Also setup the roomlist and room encryption synchronously before awaiting
the indexeddb operation to store the room encryption config in roomlist.
 2018-08-24 18:28:38 +02:00
Bruno Windels
a7199a3d0d Merge pull request #698 from matrix-org/revert-696-bwindels/fixlle2ememberfetch 
Revert "Lazy loading: don't block on setting up room crypto"
 2018-08-23 14:10:13 +02:00
Bruno Windels
5cf2ebea4f Revert "Lazy loading: don't block on setting up room crypto" 2018-08-23 14:05:57 +02:00
David Baker
580e95605e Merge pull request #696 from matrix-org/bwindels/fixlle2ememberfetch 
Lazy loading: don't block on setting up room crypto
 2018-08-23 12:41:33 +01:00
David Baker
8c3d1df3cf Merge pull request #695 from matrix-org/dbkr/hide_replaced_rooms 
Add getVisibleRooms()
 2018-08-23 09:34:39 +01:00
David Baker
7c66f91429 Typo 2018-08-23 09:34:23 +01:00
Bruno Windels
e3d108454c fix test 2018-08-22 23:25:37 +02:00
Bruno Windels
806b40727d fix lint 2018-08-22 23:00:27 +02:00
Bruno Windels
fa702efe8f fix typo 2018-08-22 19:22:50 +02:00
Bruno Windels
344e3e18ab start tracking room devices in background after finishing loading members 2018-08-22 19:13:18 +02:00
Bruno Windels
aea9eaa307 Only start tracking devices in an e2e room when needed 
This way we can put off loading the members
 2018-08-22 18:00:38 +02:00
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
71444b638b don't block on setting up room crypto 
this will load members in case of LL and could take quite some time
The two async actions performed by onCryptoEvent is saving the crypto config
to the roomlist store and fetching the room members to track.
Both are guarded against double calls so not awaiting this should be fine.
 2018-08-22 14:45:36 +02:00
David Baker
962ec7bb53 Add getVisibleRooms() 
To hide rooms that have been replaced

For https://github.com/vector-im/riot-web/issues/7164
 2018-08-22 11:58:44 +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