d0d5bc412b
Add more gitignore
2021-03-13 20:33:16 +01:00
f79053484b
Add .gitlab-ci.yml
2021-03-13 20:18:56 +01:00
6da40225bb
improvement: make state res actually work
2021-03-13 16:30:12 +01:00
e785ff6f56
Merge branch 'sled-no-metrics' into 'master'
...
fix: avoid illegal instruction crash
See merge request famedly/conduit!38
2021-03-12 17:29:47 +00:00
7bc58461cd
fix: avoid illegal instruction crash
...
see https://github.com/spacejam/sled/issues/1232
2021-03-12 16:22:35 +01:00
6538d91567
Merge branch 'readme' into 'master'
...
docs: add icon and license to readme
See merge request famedly/conduit!37
2021-03-04 20:37:50 +00:00
96431069a9
docs: add icon and license to readme
2021-03-04 21:37:24 +01:00
3436e844c2
Merge branch 'valkum-master-patch-62987' into 'master'
...
Fix Complement CI paths
See merge request famedly/conduit!36
2021-03-04 17:51:52 +00:00
156296ac05
Fix Complement CI paths
...
The final container tried to COPY from the default cargo target dir, but we only checked if cached_target is present.
We copy from cached_target to target when cached_target is present now in the builder
2021-03-04 17:22:23 +00:00
643109309b
Merge branch 'incoming-pdu' into 'master'
...
fix: don't accept incoming pdus if we know about them already
Closes #70
See merge request famedly/conduit!33
2021-03-04 14:38:07 +00:00
03440f4b15
Merge branch 'readme' into 'master'
...
docs: small readme changes
See merge request famedly/conduit!35
2021-03-04 14:35:12 +00:00
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
bb1064ce04
docs: small readme changes
2021-03-04 15:28:28 +01:00
4027cbd01d
Fix various clippy errors
2021-03-04 15:27:25 +01:00
6309506a48
Allow suspicious_else_formatting
...
This is probably unfixable because it is caused by macros
2021-03-04 15:26:34 +01:00
0d55964d24
Run nightly cargo fmt
2021-03-04 08:45:23 -05:00
d0df8b495c
Merge remote-tracking branch 'upstream/master' into correct-sendtxn
2021-03-04 08:39:16 -05:00
e239014fa3
Query for the correct server
2021-03-04 08:02:41 -05:00
1ce00f90fe
fix: don't accept incoming pdus if we know about them already
2021-03-04 13:37:16 +01:00
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
231c6032f4
Make clippy happy (needless-return, etc.)
2021-03-04 12:35:12 +00:00
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
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
105f893cf3
chore: bump other dependencies to make it work
2021-03-04 12:29:08 +01:00
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
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
f4039902d8
Bump Rocket to current HEAD
2021-03-03 22:42:10 +01:00
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
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
1a198e7336
Merge branch 'jaeger' into 'master'
...
feat: opentelemetry/jaeger support
See merge request famedly/conduit!28
2021-03-02 14:14:26 +00:00
4155a47db1
feat: opentelemetry/jaeger support
2021-03-02 15:08:54 +01:00
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
f7713fdf2e
fix: sending code got stuck sometimes
2021-03-02 14:58:46 +01:00
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
278751eb23
improvement: use transaction ids for federation requests
2021-03-02 14:36:48 +01:00
dd68031b69
improvement: implement /receipt
2021-03-02 14:33:35 +01:00
79c9de98cd
Add trusted_servers, filter servers to query keys by trusted_servers
2021-03-01 09:17:53 -05:00
c9f4ff5cf8
Ask multiple servers for keys when not known or sending server failed
2021-03-01 08:23:28 -05:00
f3253f2033
Move comments about Rooms trees to doc comments
2021-02-28 18:53:17 -05:00
0dd8a15c49
Fix leaves not being replaced by correct eventId in membership
...
Update ruma
2021-02-27 16:09:22 -05:00
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
a601c29c97
Chore: Add Issue Template
2021-02-26 14:55:06 +00:00
0cc6448dbe
Temp disable rust_2018_idioms for CI
2021-02-23 17:21:01 -05:00
8f283510aa
Fix unused import clippy warning
2021-02-23 17:21:01 -05:00
48601142f8
Use auth_cache to avoid db, save state for every event when joining
2021-02-23 17:21:01 -05:00
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
591769d5f3
Fiter PDU's before main incoming PDU loop
2021-02-23 17:21:01 -05:00
64374b4679
Use eventId when saving outliers
2021-02-23 17:21:01 -05:00
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
6661de50ab
Fix and integrate outlier tree, build forks after adding event to DB
2021-02-23 17:21:01 -05:00
Jonathan de Jong
Jonathan de Jong
Timo Kösters
Rudi Floren
Rudi Floren
Devin Ragotzy
Niklas Zender