Commit graph

884 commits

Author SHA1 Message Date
phesch
666e1d30a3 Implement From<AnyInitialStateEvent> on PduBuilder
The conversion between the two is now direct and thus shouldn't lose the state_keys.
2021-07-21 10:55:23 +02:00
Timo Kösters
7d14a46607 Merge branch 'improvements' into 'master'
Update ruma

See merge request famedly/conduit!127
2021-07-20 16:59:49 +00:00
Timo Kösters
68cc743f2a
fix: use get_auth_chain method more often 2021-07-20 18:45:21 +02:00
Timo Kösters
56e5d5e3d2
fix: add warning for strange bug 2021-07-20 18:38:17 +02:00
Timo Kösters
f0ac7ed933
chore: update ruma again 2021-07-20 15:25:17 +02:00
Timo Kösters
0f8ecdc625
fix: state res fixes 2021-07-20 15:25:17 +02:00
Timo Kösters
cfaa900e83
improvement: auth chain cache 2021-07-20 15:25:16 +02:00
Timo Kösters
f5273f7eb1
improvement: upgrade ruma and implement blurhashes 2021-07-20 15:25:16 +02:00
Timo Kösters
0fcefa4125
fix: ruma 2021-07-20 15:25:16 +02:00
Timo Kösters
d07762f596 Merge branch 'connection-cushion' into 'master'
Spillover connection cushion

See merge request famedly/conduit!133
2021-07-20 10:39:04 +00:00
Jonathan de Jong
d253f9236a change fraction type 2021-07-20 11:01:35 +02:00
Jonathan de Jong
ec44f3d568 change to f64 2021-07-20 10:47:36 +02:00
Jonathan de Jong
e7a51c07d0 log change feedback 2021-07-19 17:17:10 +02:00
Jonathan de Jong
79bf7fc597 some logging shuffling 2021-07-19 16:46:59 +02:00
Jonathan de Jong
7e579f8d34 change to fraction-based approach 2021-07-19 16:25:41 +02:00
Jonathan de Jong
0f2dc9a239 add stuff and bits 2021-07-19 15:56:20 +02:00
Timo Kösters
59d538206f Merge branch 'fix-shutdown-period' into 'master'
Fix shutdown period

See merge request famedly/conduit!131
2021-07-19 13:11:25 +00:00
Jonathan de Jong
faa283d35b review feedback 2021-07-19 13:44:53 +02:00
Timo Kösters
86160597ea Merge branch 'ci-package-upload-hotfix' into 'master'
CI: Fix package upload

See merge request famedly/conduit!132
2021-07-19 11:20:00 +00:00
Jonas Zohren
d6b37480e7 CI: Fix package upload 2021-07-19 10:00:44 +00:00
Jonathan de Jong
3ce75d1f02 apply fix 2021-07-19 11:55:39 +02:00
Timo Kösters
a50abeedad Merge branch 'ci-rough-sytest-integration' into 'master'
CI: Add sytest

See merge request famedly/conduit!130
2021-07-19 08:47:32 +00:00
Jonas Zohren
130b9841da CI: Add sytest 2021-07-19 08:47:31 +00:00
Timo Kösters
ffa10a68b9 Merge branch 'more-detailed-issue-templates' into 'master'
Docs: More (detailed) templates for Issues and MRs

See merge request famedly/conduit!129
2021-07-19 08:28:10 +00:00
Timo Kösters
124b5484b5 Merge branch 'test-registering-with-element-web' into 'master'
CI: Test registration with element web

See merge request famedly/conduit!128
2021-07-19 08:23:05 +00:00
Jonas Zohren
2babff1e41 CI: Test registration with element web 2021-07-19 08:23:04 +00:00
Jonas Zohren
cdd01262d2 Shorten more templates 2021-07-18 20:43:21 +00:00
Jonas Zohren
092221ca3f Reduce amount of text in Bug Report template 2021-07-18 20:30:57 +00:00
Jonas Zohren
5d8ad4fd72 Add some more details to the MR template 2021-07-17 12:22:11 +02:00
Jonas Zohren
7054f74783 Add issue template for GitHub which redirects to Gitlab 2021-07-17 12:21:41 +02:00
Jonas Zohren
82a4ec9cbd Add more detailed issue templates
Shamelessly stolen from
https://github.com/HedgeDoc/client

Originally written by
https://github.com/ErikMichelson and
https://github.com/DerMolly
2021-07-17 12:00:38 +02:00
Timo Kösters
f924ebf8a6 Merge branch 'fix-windows-signal' into 'master'
fix signal compiling on windows

See merge request famedly/conduit!126
2021-07-15 16:29:47 +00:00
Jonathan de Jong
b1993421c2 fix signal compiling on windows 2021-07-15 18:09:10 +02:00
Timo Kösters
8e2d6f7e43 Merge branch 'sled-fix' into 'master'
Sled fixes

See merge request famedly/conduit!125
2021-07-15 15:38:40 +00:00
Jonathan de Jong
d76e95e8fc use existing db cache size 2021-07-15 13:47:21 +02:00
Jonathan de Jong
661101c9ae add sled cache_capacity back 2021-07-15 13:29:08 +02:00
Timo Kösters
f7ecf83ac3 Merge branch 'stuff' into 'master'
fix: stuck/duplicate messages, e2ee and sync timeouts

See merge request famedly/conduit!123
2021-07-15 08:18:56 +00:00
Timo Kösters
9a4789efdc Merge branch 'ci-format-check-before-cargo-test' into 'master'
CI: Check format before running test

See merge request famedly/conduit!124
2021-07-14 20:53:10 +00:00
Jonas Zohren
eaa4c77641 CI: Check format before running test
Testing needs compilation and is slow. Format checking is quick.
As format checking fails more often than tests,
switching them should result in faster failure and feedback
2021-07-14 20:33:19 +00:00
Timo Kösters
9268b33c3f Merge branch 'shutdown-sync' into 'master'
Make shutdown short-circuit sync helpers

See merge request famedly/conduit!122
2021-07-14 13:49:00 +00:00
Timo Kösters
9de32ae12f
fix toolchain 2021-07-14 15:46:30 +02:00
Jonathan de Jong
952fb75795 add shutdown handler to kick sync 2021-07-14 14:50:07 +02:00
Timo Kösters
e12b1ff863
improvement: locks 2021-07-14 13:21:25 +02:00
Timo Kösters
e15e6d4405
improvement: efficient /sync, mutex for federation transactions 2021-07-14 13:20:39 +02:00
Timo Kösters
1c25492a7e
fix: stuck messages
Conduit did not send the event in /sync because of a race condition.
There is a brief moment in time where Conduit accepted the event, but
did not store it yet. So when the client /syncs it updates the since
token without sending the event. I hope I fixed it by significantly
shortening the race-condition period.
2021-07-14 13:19:24 +02:00
Timo Kösters
8c44312485
fix: e2ee verification 2021-07-14 13:10:56 +02:00
Timo Kösters
ac0027756e
improvement: more efficient state res 2021-07-14 13:10:49 +02:00
Timo Kösters
f3e806096b Merge branch 'clippy-fix' into 'master'
Fix clippy lint

See merge request famedly/conduit!121
2021-07-14 10:57:44 +00:00
Jonathan de Jong
e1b89c1248 apply lint suggestions and version bump 2021-07-14 12:31:38 +02:00
Timo Kösters
be6b6c3cf0 Merge branch 'rocket-update' into 'master'
Update rocket to rc1 and lock file

See merge request famedly/conduit!120
2021-07-14 09:48:17 +00:00