7bcdc2a3b6
Merge branch 'master' into sas-timeout
2020-08-10 14:57:32 +02:00
d5cd608045
base: Remove some unnecessary mutable borrows of the olm machine.
2020-08-10 14:11:55 +02:00
d83fc971ce
Update ruma
2020-08-10 13:58:39 +02:00
d016ce1848
Use identifier macros in tests
2020-08-06 13:03:32 +02:00
ffdb9c4a79
Fix failing wasm test and clippy warnings for wasm
2020-08-04 17:39:25 -04:00
cb8d5ce8fb
Rename CustomOrRawEvent -> CustomEvent and use raw json when failed
...
When deserialization fails we fallback to providing the user with a
serde_json::RawValue, basically the json string. Ruma should handle all
events that conform to a matrix event shape correctly by either
converting them to their type or returning a custom event.
2020-08-04 17:27:57 -04:00
c10120602a
Add test actually testing a correct message edit event
2020-08-04 17:22:54 -04:00
47690bd268
Bump ruma and fix failing unrecognized_event test
...
The test was broken because the JSON being fed into it was bad.
2020-08-04 17:22:54 -04:00
2bf8c99dfe
Merge branch 'master' into sas-verification
2020-08-04 11:23:24 +02:00
33e1601004
matrix_sdk: Fix import error
2020-08-03 20:13:58 -04:00
1787d2ebe6
crypto: Hook up marking the device as verified.
2020-08-03 12:38:43 +02:00
0ac2b84c02
Unify import style across workspace
2020-08-02 08:05:43 -04:00
ed1f12ce37
Run cargo fmt with merge-imports true
2020-08-02 07:46:02 -04:00
3f83941d57
Merge branch 'master' into sas-verification
2020-07-31 16:27:52 +02:00
79e661d1d9
sdk-base: Remove MessageWrapper and do not order messages in queue
2020-07-31 09:16:41 -04:00
dce06d31aa
Merge branch 'master' into sas-verification
2020-07-31 15:14:05 +02:00
3472614649
Merge branch 'remove-possibly-redacted-type-alias' into master
2020-07-31 15:13:23 +02:00
2ce0765206
Remove confusing type alias for AnyPossiblyRedactedSyncMessageEvent.
...
There's already a SyncMessageEvent in Ruma which is something else.
Let's prefer the full, unambiguous type.
2020-07-31 14:36:58 +02:00
e00e94c6c3
Fix input order.
2020-07-31 11:46:52 +02:00
359c5280d7
Expose `sender` in `PossiblyRedactedExt`.
...
Also add a few missing apostrophes.
2020-07-30 14:40:27 +02:00
a07767d417
base: Hide the SAS getting method behind the encryption feature.
2020-07-30 11:50:42 +02:00
117ebeaf4b
crypto: Return requests when you want to accept a verification.
2020-07-29 12:47:36 +02:00
9facd86d81
base: Expose the verification methods in the base client.
2020-07-28 16:44:06 +02:00
7e95d85f17
crypto: Move the cryptostore behind a lock.
2020-07-28 15:03:44 +02:00
6a96368048
Upgrade ruma
2020-07-26 16:58:27 +02:00
d4fe2fe0a2
Remove redundant braces
2020-07-25 02:32:50 +02:00
14db34beee
Use Option::and_then over manual match
2020-07-25 02:32:18 +02:00
bf54b17a2f
Upgrade ruma
2020-07-22 22:31:42 +02:00
e4f94cbfec
Remove FullOrRedacted use ruma::AnyPossiblyRedacted event enum
2020-07-18 08:52:51 -04:00
71f2a042c2
Rename Stub -> Sync for all ruma events
2020-07-18 08:37:43 -04:00
2e8fc3e232
matrix-sdk-base: Integrate redacted events into message queue
...
Redact message events according to spec and ruma types. Remove content
using events redact() method and insert the redacting event into the
event being redacted.
2020-07-17 13:41:55 -04:00
d273786d83
matrix-sdk: Bump our dependencies.
2020-07-17 10:01:22 +02:00
c1ffed4fc9
base: Sanitize the room id for the path of the state store.
...
This closes : #71 .
2020-07-16 14:08:56 +02:00
a2a87b9fff
matrix-sdk: Fix a bunch of clippy warnings.
2020-07-15 15:53:17 +02:00
fa0a22b090
Merge branch 'dkasak-master'
...
High-level summary of changes:
- Rewrite the disambiguation algorithm to simplify it.
- Fixes to state tracking, e.g. use `state_key` instead of `user_id` when
determining which member an event is acting on.
- Changes to `RoomMember`:
* Make `RoomMember` "dumber" and don't let it mutate itself. This came about
primarily because `update_profile` cannot live on `RoomMember` because it
needs some information from `Room`. The other few mutating methods then
looked odd so it seemed best to move them to `Room` so that the room takes
care of updating its members.
* Each `RoomMember` now contains all information to calculate its set of
names:
+ `.name()` (short/ergonomic but potentially ambiguous),
+ `.unique_name()` (unique but may be contain MXID when not necessary),
+ `.disambiguated_name()` (shortest possible while being unique).
- Add some logging using the `tracing` crate.
- Improvements to `EventBuilder`:
* Add a docstring.
* Make it clear itself when building a sync response so the same builder can
be reused for later sync responses.
- A few tests.
2020-07-15 12:52:25 +02:00
bce7fe0217
Equivalence class -> equivalence set.
2020-07-15 11:58:52 +02:00
1fd21ee206
Fix docstrings regarding return value related to disambiguation.
2020-07-15 11:54:30 +02:00
8a4a4140b3
Remove stale comment.
2020-07-15 11:22:47 +02:00
62943f055d
Rewrap docstrings and comments to 80 chars.
2020-07-15 11:21:01 +02:00
ea149ebd8e
Update docstring for disambiguation_updates.
2020-07-15 11:16:13 +02:00
9e48b7172b
cargo fmt
2020-07-14 12:38:55 +02:00
a38efc0f29
room: Fix a clippy warning, use unwrap_or_else for the member counts.
2020-07-14 10:56:06 +02:00
048a2000e7
Merge
2020-07-13 17:10:13 +02:00
740a5af068
Merge branch 'dan/bugfix/implable-StateStore'
2020-07-13 10:19:37 +02:00
8c3855221c
mark state::AllRooms and state::ClientState as public
2020-07-11 19:14:55 -03:00
eea00301ff
Remove immediately-deref'ed double references
2020-07-11 21:20:02 +02:00
85522ac35a
Slightly simplify RoomName::calculate_name
2020-07-11 21:14:32 +02:00
9b5f95672b
Use js_int macros to improve readability
2020-07-11 21:06:21 +02:00
ffc5204109
Fix two pattern matching related warnings
2020-07-11 20:57:01 +02:00
a607d70371
Upgrade mockito in matrix-sdk-base
2020-07-11 20:55:19 +02:00
Damir Jelić
Jonas Platte
Devin Ragotzy
Denis Kasak
Dan Enman