Timo Kösters
79c910efdf
Merge branch 'clippy_again' into 'master'
...
Fix more clippy errors in master
See merge request famedly/conduit!34
2021-03-04 14:30:28 +00:00
Timo Kösters
bb1064ce04
docs: small readme changes
2021-03-04 15:28:28 +01:00
Rudi Floren
4027cbd01d
Fix various clippy errors
2021-03-04 15:27:25 +01:00
Rudi Floren
6309506a48
Allow suspicious_else_formatting
...
This is probably unfixable because it is caused by macros
2021-03-04 15:26:34 +01:00
Devin Ragotzy
0d55964d24
Run nightly cargo fmt
2021-03-04 08:45:23 -05:00
Devin Ragotzy
d0df8b495c
Merge remote-tracking branch 'upstream/master' into correct-sendtxn
2021-03-04 08:39:16 -05:00
Devin Ragotzy
e239014fa3
Query for the correct server
2021-03-04 08:02:41 -05:00
Timo Kösters
1ce00f90fe
fix: don't accept incoming pdus if we know about them already
2021-03-04 13:37:16 +01:00
Timo Kösters
bd6507eafb
Merge branch 'valkum-master-patch-25423' into 'master'
...
Make clippy happy (needless-return, etc.)
See merge request famedly/conduit!23
2021-03-04 12:35:12 +00:00
Rudi Floren
231c6032f4
Make clippy happy (needless-return, etc.)
2021-03-04 12:35:12 +00:00
Timo Kösters
eaeba35f3c
Merge branch 'valkum/complement' into 'master'
...
Sync paths with CI pipeline due to dockerignore
See merge request famedly/conduit!24
2021-03-04 12:32:55 +00:00
Timo Kösters
3e274d7d2c
Merge branch 'valkum/conduit-update_rocket' into 'master'
...
update dependencies
See merge request famedly/conduit!32
2021-03-04 12:32:22 +00:00
Timo Kösters
105f893cf3
chore: bump other dependencies to make it work
2021-03-04 12:29:08 +01:00
Timo Kösters
a04860b513
Merge branch 'as-fix' into 'master'
...
fix: apply the same appservice sending rules to events coming from federation
See merge request famedly/conduit!31
2021-03-04 11:18:00 +00:00
Timo Kösters
437cb5783a
fix: apply the same appservice sending rules to events coming from federation
...
currently this code is duplicated from database/rooms.rs, when we
refactor server_server.rs we should deduplicate it
2021-03-04 11:34:38 +01:00
Rudi Floren
f4039902d8
Bump Rocket to current HEAD
2021-03-03 22:42:10 +01:00
Timo Kösters
1a940b6e05
Merge branch 'as-fix' into 'master'
...
fix: don't always query aliases of appservices
See merge request famedly/conduit!29
2021-03-03 21:07:18 +00:00
Timo Kösters
f2ec2be821
fix: don't always query aliases of appservices
...
only do so if the alias matches the regex in the registration file
2021-03-03 21:53:32 +01:00
Timo Kösters
1a198e7336
Merge branch 'jaeger' into 'master'
...
feat: opentelemetry/jaeger support
See merge request famedly/conduit!28
2021-03-02 14:14:26 +00:00
Timo Kösters
4155a47db1
feat: opentelemetry/jaeger support
2021-03-02 15:08:54 +01:00
Timo Kösters
066d5b92da
Merge branch 'sending' into 'master'
...
fix: sending code got stuck sometimes
See merge request famedly/conduit!25
2021-03-02 14:04:11 +00:00
Timo Kösters
f7713fdf2e
fix: sending code got stuck sometimes
2021-03-02 14:58:46 +01:00
Timo Kösters
566b8ebabb
Merge branch 'receipt-and-txnid' into 'master'
...
/receipt and transaction ids for federated requests
Closes #11
See merge request famedly/conduit!27
2021-03-02 13:49:14 +00:00
Timo Kösters
278751eb23
improvement: use transaction ids for federation requests
2021-03-02 14:36:48 +01:00
Timo Kösters
dd68031b69
improvement: implement /receipt
2021-03-02 14:33:35 +01:00
Devin Ragotzy
79c9de98cd
Add trusted_servers, filter servers to query keys by trusted_servers
2021-03-01 09:17:53 -05:00
Devin Ragotzy
c9f4ff5cf8
Ask multiple servers for keys when not known or sending server failed
2021-03-01 08:23:28 -05:00
Devin Ragotzy
f3253f2033
Move comments about Rooms trees to doc comments
2021-02-28 18:53:17 -05:00
Devin Ragotzy
0dd8a15c49
Fix leaves not being replaced by correct eventId in membership
...
Update ruma
2021-02-27 16:09:22 -05:00
Timo Kösters
a9239a4d0b
Merge branch 'larodar-master-patch-53953' into 'master'
...
Chore: Add Issue Template
See merge request famedly/conduit!26
2021-02-26 15:00:19 +00:00
Niklas Zender
a601c29c97
Chore: Add Issue Template
2021-02-26 14:55:06 +00:00
Devin Ragotzy
0cc6448dbe
Temp disable rust_2018_idioms for CI
2021-02-23 17:21:01 -05:00
Devin Ragotzy
8f283510aa
Fix unused import clippy warning
2021-02-23 17:21:01 -05:00
Devin Ragotzy
48601142f8
Use auth_cache to avoid db, save state for every event when joining
2021-02-23 17:21:01 -05:00
Devin Ragotzy
74d530ae0e
Address review issues, fix forward extremity calc
...
Keep track of all prev_events since if we know that an event is a
prev_event it is referenced and does not qualify as a forward extremity.
2021-02-23 17:21:01 -05:00
Devin Ragotzy
591769d5f3
Fiter PDU's before main incoming PDU loop
2021-02-23 17:21:01 -05:00
Devin Ragotzy
64374b4679
Use eventId when saving outliers
2021-02-23 17:21:01 -05:00
Devin Ragotzy
e09be2f7ee
Add incoming event to the current room state then resolve
...
All state snapshots that are used in the resolve call are state after
snapshots, they have the event inserted.
2021-02-23 17:21:01 -05:00
Devin Ragotzy
6661de50ab
Fix and integrate outlier tree, build forks after adding event to DB
2021-02-23 17:21:01 -05:00
Devin Ragotzy
6fd3e1d1dd
Append state event that pass resolution to DB, update to tokio 1.1
2021-02-23 17:21:01 -05:00
Devin Ragotzy
e0453e2348
Cleanup dbg prints and error messages
2021-02-23 17:21:01 -05:00
Devin Ragotzy
68f60933e6
Resolved state is set as the current room state on incoming events
2021-02-23 17:21:01 -05:00
Devin Ragotzy
05a4c0b325
Finish forward extremity gathering, use resolved state as new snapshot
2021-02-23 17:21:01 -05:00
Timo Kösters
602edfd849
feature: push rule settings
2021-02-23 17:21:01 -05:00
Devin Ragotzy
88c60605b4
Add ability to update room leaves with multiple eventIds
...
Tokio seems a bit broken with Rocket...
2021-02-23 17:21:01 -05:00
Devin Ragotzy
66af1ff695
Update ruma and rocket to latest git rev and tokio to 1.0
...
Ruma updated the event signing validation code and there was a dep
resolving failure with serde rocket and tokio so I updated rocket latest and
tokio 1.0 to fix.
2021-02-23 17:20:52 -05:00
Valkum
aa7b6b6e09
Sync paths with CI pipeline due to dockerignore#
...
As the docker ignore file includes the target dir, content in this dir
is no accessible to the docker daemon.
We circumvent this by providing the build artifact in a dir called
cached_dir
2021-02-22 19:07:39 +01:00
Timo Kösters
835cf80acd
fix: pushers
2021-02-11 13:17:21 +01:00
Devin Ragotzy
7309b2fba9
WIP gather and update forward extremities
2021-02-09 15:25:30 -05:00
Devin Ragotzy
94da569119
Fixing the incoming events algorithm (review with time)
2021-02-09 15:25:22 -05:00
