1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-11-16 16:30:49 +01:00
Commit graph

154 commits

Author SHA1 Message Date
Devin Ragotzy
88f3ee489b
Fill event_map with all events that will be needed for resolution 2021-01-14 14:31:47 +01:00
Devin Ragotzy
8a035880f0
Remove StateStore trait from state-res collect events needed 2021-01-14 14:30:24 +01:00
Devin Ragotzy
7c4d74bf9b
Fix clippy warnings remove unused imports 2021-01-14 14:30:24 +01:00
Devin Ragotzy
0ee239c9d7
Step 5 in /send just fetches state from incoming server 2021-01-14 14:30:23 +01:00
Devin Ragotzy
9e83d2b2d5
Update state-res, use the new Event trait
This also bumps ruma to latest and removes js_int infavor of the ruma
re-export
2021-01-14 14:30:19 +01:00
Devin Ragotzy
690c066064
State resolution outline for /send 2021-01-14 14:28:32 +01:00
Timo Kösters
2cf6fd57b7
improvement: don't send pdus to appservices if it isn't interested
TODO: we need to send pdus if a user of the appservice is in the room
but not the appservice user itself
2020-12-23 19:41:54 +01:00
Timo Kösters
6e5b35ea92
feat: implement appservices
this also reverts some stateres changes
2020-12-08 12:59:20 +01:00
Timo Kösters
45086b54b3
improvement: upgrade dependencies, fix timeline reload bug 2020-12-05 21:04:34 +01:00
Devin Ragotzy
164b1633d8
Update ruma to latest, renamed server keys and removed PduStub 2020-12-05 17:44:54 +01:00
Devin Ragotzy
27e686f9ff
Convert uses of serde_json::Value to CanonicalJsonObject 2020-12-05 17:37:12 +01:00
Devin Ragotzy
acd144e934
Fix get_closest_parent and cleanup federation/send/:txn 2020-12-05 17:37:10 +01:00
Devin Ragotzy
db8a0c5d69
Add closest_parent method to Rooms Db insert in order /send pdus 2020-12-05 17:37:07 +01:00
Devin Ragotzy
96dd3b2880
Update ruma to latest, fix unstable origin feature in ruma 2020-12-05 17:37:07 +01:00
Timo Kösters
151ef07fb3
docs: cross compile 2020-10-18 09:04:11 +02:00
Timo Kösters
9d1387954f
Update dependencies, remove dbgs 2020-10-16 14:04:29 +02:00
Timo Kösters
4964e21342
Merge remote-tracking branch 'origin/master' into federation 2020-10-07 12:02:36 +02:00
Timo Kösters
bcd1fe1856
feat: admin room 2020-10-07 11:51:49 +02:00
Timo Kösters
0d6159c2da
improvement: get_missing_events route and cleanup 2020-10-01 20:49:15 +02:00
Timo Kösters
ab332363ce
fix: don't send new requests to servers if we are already waiting 2020-10-01 20:49:14 +02:00
Timo Kösters
e08dfd982b
improvement: look at SRV record when sending requests 2020-09-23 12:04:02 +02:00
Timo Kösters
19207845bc
Fix ruma dependency 2020-09-20 13:49:13 +02:00
Timo Kösters
ea3aaa6b5c
improvement: more efficient /sync with gaps 2020-09-18 10:29:43 +02:00
Timo Kösters
b7ab57897b
fix: sending slowness 2020-09-15 16:14:59 +02:00
Timo Kösters
f7816b11de
feat: send messages over federation 2020-09-15 08:17:06 +02:00
Timo
d1099e9224
Update dependencies 2020-09-14 14:36:49 +02:00
Timo Kösters
4e44fedbcd
fix: room list over federation 2020-09-14 11:43:42 +02:00
Timo Kösters
c5313b3e8f
improvement: try out multiple servers when joining remote rooms 2020-09-14 11:00:31 +02:00
Timo Kösters
1f292c09f2
improvement: better federation joins 2020-09-14 09:29:46 +02:00
Timo Kösters
e6b1f54857
Merge remote-tracking branch 'origin/master' into federation 2020-09-12 22:23:54 +02:00
Timo Kösters
12a8c9badd
fix: join rooms over federation 2020-09-12 21:30:07 +02:00
Timo Kösters
1e8fbd8d50
Update ruma version 2020-09-08 17:32:03 +02:00
Devin Ragotzy
3b40f3d60e Update state-res crate 2020-08-27 20:11:53 -04:00
Devin Ragotzy
f46c2d1eec Fix review issues, move state-res to spec-comp branch 2020-08-27 20:11:53 -04:00
Timo Kösters
3f4cb753ee
improvement: add remaining key backup endpoints 2020-08-27 14:52:20 +02:00
Devin Ragotzy
672bf4f473 Cargo lock update and a few doc additions 2020-08-23 16:43:21 -04:00
Devin Ragotzy
846a0098c1 Split append_pdu -> append_pdu and build_and_append
Move all state event appending to append_state_pdu.
2020-08-23 16:43:21 -04:00
Devin Ragotzy
cb68bf9e0c Use ring crate to generate StatHashes when saving stateid/statehash 2020-08-23 16:43:21 -04:00
Devin Ragotzy
c4f5a0a631 Keep track of State at event for state resolution
feat: first steps towards joining rooms over federation
Add state-res as a dependency of conduit
Add reverse_topological_power_sort before append_pdu
Implement statehashstatid_pduid tree for keeping track of state
Clean up implementation of state_hash as key for tracking state
2020-08-23 16:43:21 -04:00
Timo
f23fb32e95
fix: set limited to true when skipping messages in /sync 2020-08-23 16:14:09 +02:00
timokoesters
e457e19088
feat: search pdus 2020-08-23 16:14:08 +02:00
Timo
69a7cb5142
fix dependency version 2020-08-23 16:14:07 +02:00
Timo
04eee089e0
feat: first steps towards joining rooms over federation 2020-08-23 16:14:06 +02:00
Jonas Platte
75ea0b3163
Update ruma 2020-08-12 23:42:17 +02:00
timokoesters
66bc25fcd3
feat: implement /keys/changes 2020-07-29 18:05:16 +02:00
timokoesters
21eb8d4fe3
fix: problems with pdu serialization 2020-07-29 12:59:40 +02:00
timokoesters
489cbc0a93
refactor: use <_> instead of <_parameter_name> 2020-07-29 12:59:36 +02:00
Devin Ragotzy
42e0102a2a
Conditionally emit rocket::http_verb attr macros if lib/bin 2020-07-27 18:54:43 +02:00
Jonas Platte
09561ccea3
Upgrade ruma 2020-07-26 16:52:43 +02:00
Devin Ragotzy
60381ddcf4 Update to latest ruma/master rev 2020-07-25 14:25:24 -04:00
Devin Ragotzy
61458536ab Merge branch 'master' of https://git.koesters.xyz/timo/conduit into ruma-mono 2020-07-25 13:46:28 -04:00
timokoesters
d8e1248df6
improvement: switch to stable rust 2020-07-22 22:42:01 +02:00
Devin R
33bc666859 Use sync ephemeral events in sync Resposne (remove room_id)
Bump ruma to latest master which also fixes some server name as String
to now being of type Box<ServerName>.
2020-07-21 14:04:39 -04:00
Devin R
59cbf202e4 Cargo.lock updated while rebasing 2020-07-17 16:05:53 -04:00
Devin R
d02685a4fd Update to latest ruma/ruma commit
This will most likely be the API that is released to crates.io so it
should be fairly stable...
2020-07-17 16:04:05 -04:00
Devin R
63e23154f3 Rebase with key backups and cross signing
Moved back to a fork of ruma with timo's key-backup and cross-signing
branch. Ephemeral events in sync responses are EphemeralRoomEventStub
(they also have no room_id like all of sync responses events)
2020-07-17 16:04:05 -04:00
Devin R
7c38e53839 Move to depend on ruma monorepo and ruma-events0.22 2020-07-17 16:03:02 -04:00
Timo Kösters
b9de21949d Update to rocket master (#147)
Merge branch 'master' into rocket

Update to rocket master

Co-authored-by: timokoesters <timo@koesters.xyz>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/147
2020-07-14 18:23:26 +02:00
timokoesters
b83fba5c44
chore: update dependencies 2020-06-26 18:04:08 +02:00
timokoesters
05f1f73e10
improvement: upgrade to sled 0.32
BREAKING CHANGE: old databases are not compatible anymore
2020-06-26 16:26:28 +02:00
timokoesters
a49a572d76
feat: cross-signing 2020-06-26 15:16:15 +02:00
timokoesters
db685e0cf7
fix: update rocket version 2020-06-16 13:53:15 +02:00
timokoesters
13d474f6ee
fix: update ruma version 2020-06-16 12:19:58 +02:00
timokoesters
b4d65ab67d
improvement: optimize /sync response 2020-06-08 11:39:32 +02:00
Jonas Platte
7526fd8602
Switch to the ruma meta-crate 2020-06-05 18:42:45 +02:00
timokoesters
08d19c3e0b
fix: broken dependencies 2020-06-05 09:04:51 +02:00
timokoesters
a8df1acdfd
feat: load replies, forward pagination 2020-06-04 13:58:55 +02:00
timokoesters
b192fddf2f
fix: show device display names 2020-06-04 09:48:32 +02:00
timokoesters
19c9e4b916
fix: room version 6 2020-06-03 22:30:50 +02:00
timokoesters
4e507ef706
feat: room visibility and aliases 2020-05-31 09:46:11 +02:00
timokoesters
18bf67748c
feat: redaction 2020-05-31 08:01:10 +02:00
timokoesters
1014388a9c
fix: one time keys are never removed 2020-05-23 19:17:55 +02:00
timokoesters
d95e8b4880
fix: problem with to-device for all devices 2020-05-21 13:52:54 +02:00
timokoesters
d544d28b6e
feat: image thumbnails 2020-05-19 19:59:52 +02:00
timokoesters
4fb79ebb4c
chore: update dependencies 2020-05-14 13:56:29 +02:00
Rudi Floren
00a9424719
feat: sytests 2020-05-11 14:44:23 +02:00
timokoesters
551308e9a8
Update dependencies and send displayname updates again 2020-05-08 21:13:52 +02:00
timokoesters
8f67c01efd
refactor: split database into multiple files, more error handling, cleaner code 2020-05-03 21:44:48 +02:00
timokoesters
4ca1ada73e
update ruma 2020-05-01 21:45:55 +02:00
timokoesters
b02c568941
feat: notifications, simple permission systems 2020-05-01 20:28:13 +02:00
timokoesters
fd1aea7e36
Update dependencies 2020-04-29 10:27:41 +02:00
timokoesters
120b6f4b95
Bump dependencies and fixes 2020-04-29 10:27:39 +02:00
timokoesters
1af6dd984a
More work on federation 2020-04-29 10:27:38 +02:00
timokoesters
b0d9ccdb2d
Signing, basis for federation 2020-04-29 10:27:38 +02:00
timokoesters
80ddf80f17
work 2020-04-29 10:27:31 +02:00
gnieto
fa9e127a1e Store hashed passwords (#7)
Use if let instead of unwrap

Default to invalid password if could not calculate

Move hash password methdo and return Result

Rename get_password method

Default to empty password when no pwd is received

Store hashed passwords

Store passwords hashed with Argon2 and verify password with that stored
hash.

Co-authored-by: Guillem Nieto <gnieto.talo@gmail.com>
2020-04-14 22:25:44 +02:00
timokoesters
040296c711
Add test support and impl dummy /read_markers 2020-04-10 13:36:57 +02:00
timokoesters
93b1d97166
Update readme and cargo.toml 2020-04-10 10:25:33 +02:00
Jonas Platte
38ab7c843e
Update error type of /register route 2020-04-08 23:25:19 +02:00
Jonas Platte
c60402bf0d
Update ruma-client-api 2020-04-08 23:13:30 +02:00
timokoesters
ddcd423e6f
feat: random tokens, sessions, guest usernames and device ids 2020-04-08 22:04:29 +02:00
timokoesters
10bb96fcf7
feat: room joining, room based /sync responses 2020-04-06 13:52:46 +02:00
timokoesters
884dc2867d
Move to rocket's async branch 2020-04-05 19:54:08 +02:00
timokoesters
8b8381bcc0
New PduEvent struct 2020-04-04 11:53:37 +02:00
timokoesters
f9cfede2a8
fix: deserialize sync event body 2020-04-03 21:17:27 +02:00
timokoesters
fa3226898c
feat: save pdus
PDUs are saved in a pduid -> pdus map. roomid -> pduleaves keeps track
of the leaves of the event graph and eventid -> pduid maps event ids to
pdus.
2020-04-03 17:58:38 +02:00
timokoesters
533260edd8
Add auth 2020-03-29 21:05:20 +02:00
timokoesters
73e04e71d7
Start work on event creation 2020-03-29 13:49:13 +02:00
timokoesters
744e0adfcf
Try to impl auth in ruma_wrapper 2020-03-28 23:08:59 +01:00
timokoesters
34a53ce20a
Better database structure 2020-03-28 18:50:02 +01:00