Nyaaori
c4bce1d0c7
Cleanup room.rs; replace unwraps with map_err
2021-11-09 16:12:44 +00:00
Jonas Platte
9b63708685
Merge branch 'nyaaori/fix-join-panic' into 'next'
...
Fix join panic bug
See merge request famedly/conduit!224
2021-11-09 14:46:28 +00:00
Nyaaori
86177faae7
Fix join panic bug
2021-11-07 07:57:15 +00:00
Timo Kösters
2a749c1e99
Merge branch 'nyaaori/implement-report' into 'next'
...
Implement the report feature
Closes #13
See merge request famedly/conduit!218
2021-11-03 14:17:32 +00:00
Timo Kösters
5ae753b2e7
Merge branch 'amorgan-next-patch-81816' into 'next'
...
Add 'Federation publicRoom Name/topic keys are correct' test to sytest whitelist
See merge request famedly/conduit!221
2021-10-27 11:49:55 +00:00
Andrew Morgan
743bdbe961
Add 'Federation publicRoom Name/topic keys are correct' test to sytest whitelist
2021-10-26 13:30:02 +00:00
Nyaaori
d5d25fb064
Preserve all m.room.create entries when performing room upgrades
2021-10-24 22:13:08 +00:00
Nyaaori
8087a26a35
Make createRoom follow spec for m.room.create, allowing creation of spaces
2021-10-24 20:26:51 +00:00
Nyaaori
bbe16f8467
Update Ruma
2021-10-24 00:45:02 +00:00
Nyaaori
50f931a2fd
Cleanup and fix validation in report.rs, lower max report length, better html
2021-10-20 11:12:06 +00:00
Nyaaori
1541b93f45
Make reports look nicer and reduce spam potential, increase max report length to 1000 characters
2021-10-18 05:38:41 +00:00
Nyaaori
ccf501a420
Initial implementation of /report, fixing #13
2021-10-18 04:51:11 +00:00
Timo Kösters
6f70beb78c
Merge branch 'nyaaori/fix-bad-json' into 'next'
...
Nyaaori/fix bad json
Closes #115
See merge request famedly/conduit!216
2021-10-16 06:59:34 +00:00
Timo Kösters
259fc580ca
Merge branch 'nyaaori/otk-sync-fix' into 'next'
...
Remove device_one_time_keys_count from is_empty() sync checks, fixing sync issue as reported by Nekron
Closes #115
See merge request famedly/conduit!215
2021-10-16 06:54:14 +00:00
Nyaaori
55d78b1914
Bump Ruma version to fix M_BAD_JSON on login
2021-10-16 00:45:51 +00:00
Nyaaori
484a044b50
Remove device_one_time_keys_count from is_empty() sync checks, fixing sync issue as reported by Nekron
2021-10-15 23:17:08 +00:00
Nyaaori
2264a5f945
Merge branch 'next' of https://gitlab.com/famedly/conduit into next
2021-10-15 23:14:07 +00:00
Timo Kösters
e88929e154
Merge branch 'nyaaori/fix-otk-reporting' into 'next'
...
Always send device_one_time_keys_count, fixing #178
Closes #169 and #178
See merge request famedly/conduit!213
2021-10-15 13:01:52 +00:00
Nyaaori
d996d1b0e6
Always send device_one_time_keys_count, fixing #178
2021-10-15 12:38:20 +00:00
Timo Kösters
dc8bc4a880
Merge branch 'up-ruma' into 'next'
...
Upgrade Ruma
See merge request famedly/conduit!210
2021-10-15 11:38:12 +00:00
Timo Kösters
87694f4369
Merge branch 'moa31-next-patch-76037' into 'next'
...
Change listen address when running inside a Container to prevent Bad Gateway error
See merge request famedly/conduit!207
2021-10-15 10:51:19 +00:00
Timo Kösters
335027e739
Merge branch 'nyaaori/admin-check' into 'next'
...
Implement admin check and add config option for allowing room creation
See merge request famedly/conduit!211
2021-10-15 10:47:55 +00:00
Timo Kösters
0ccda5f1c7
Merge branch 'nyaaori/allow_encryption' into 'next'
...
Make allow_encryption work again, fixing #115
Closes #115
See merge request famedly/conduit!212
2021-10-15 10:20:05 +00:00
Nyaaori
9082a531c9
Make allow_encryption work again, fixing #115
2021-10-15 09:57:49 +00:00
Jonas Platte
91afa1e0e0
Make Result alias usable with any error type
2021-10-13 12:25:58 +02:00
Jonas Platte
f2ef5677e0
Reduce turbofish usage
...
Should make the code a little bit easier to read.
2021-10-13 12:25:58 +02:00
Jonas Platte
1c4d9af586
Enable more lints and apply their suggestions
2021-10-13 10:24:39 +02:00
Jonas Platte
09895a20c8
Upgrade Ruma
...
Co-authored-by: Timo Kösters <timo@koesters.xyz>
2021-10-13 10:16:45 +02:00
Nyaaori
636db8cfaa
Make allow_encryption work again, fixing #115
2021-09-24 22:44:26 +00:00
Nyaaori
6bc8fb2ae7
Implement admin check and add config option for allowing room creation
2021-09-24 07:16:34 +00:00
Luc-pascal Ceccaldi
5b23d3d06e
Change listen address when running inside a Container to prevent Bad Gateway error
2021-09-23 07:49:52 +00:00
Timo Kösters
47f3263396
Merge branch 'gwmngilfen-next-patch-21674' into 'next'
...
Add two flavours of change for the mautrix-signal patch
See merge request famedly/conduit!197
2021-09-15 20:31:21 +00:00
Greg Sutcliffe
d38f9b5f01
Move Generic instructions for APPSERVICES above notes for specific bridges and tidy up.
2021-09-15 21:16:25 +01:00
Greg Sutcliffe
fa616342b6
Add two flavours of change for the mautrix-signal patch
2021-09-15 21:16:25 +01:00
Timo Kösters
34fa7fee05
Merge branch 'ci-fix-kaniko-i-hope' into 'next'
...
fix(ci): Convince kaniko that it is indeed running in a container by --force-ing it.
See merge request famedly/conduit!205
2021-09-15 07:05:33 +00:00
Jonas Zohren
e8d998cedf
fix(ci): Convince kaniko that it is indeed running in a container by --force-ing it.
2021-09-14 20:44:11 +00:00
Timo Kösters
565fe3a7dd
Merge branch 'faster-sending' into 'next'
...
improvement: batch inserts for inserting pdus
See merge request famedly/conduit!204
2021-09-14 18:35:12 +00:00
Timo Kösters
5c02dc7830
improvement: batch inserts for inserting pdus
2021-09-14 14:33:46 +02:00
Timo Kösters
159e22e450
Merge branch 'ci-fix-aarch64-build' into 'next'
...
fix(ci): Fix aarch64 build
See merge request famedly/conduit!203
2021-09-14 12:09:44 +00:00
Jonas Zohren
ab472e9b7c
fix(ci): Fix aarch64 build
...
gcc-8-aarch64-linux-gnu is not available in debian 11 (which the rust image uses), so update to gcc-10
Signed-off-by: Jonas Zohren <git-pbkyr@jzohren.de>
2021-09-14 12:32:07 +02:00
Timo Kösters
31264e3d1d
Merge branch 'ci-remove-element-web-register-test' into 'next'
...
Remove the "register an account with element" test
See merge request famedly/conduit!202
2021-09-14 09:50:24 +00:00
Jonas Zohren
422bd09e32
Remove the "register an account with element" test
...
Broke due to a timeout and Timo does not like broken tests.
Less testing means less failing tests.
Also, hopefully sytest is less broken now.
2021-09-14 09:44:15 +00:00
Timo Kösters
b64538c6f1
Merge branch 'efficient-sqlite' into 'next'
...
improvement: more efficient sqlite
See merge request famedly/conduit!199
2021-09-14 07:23:02 +00:00
Timo Kösters
178451e9b5
Merge branch 'deduplicate-watchers' into 'next'
...
improvement: deduplicate watchers
See merge request famedly/conduit!201
2021-09-14 07:10:59 +00:00
Timo Kösters
583a966f6e
Merge branch 'less-alloc' into 'next'
...
Reduce allocations in server_server
See merge request famedly/conduit!190
2021-09-14 07:09:55 +00:00
Timo Kösters
cbee7fe111
improvement: deduplicate watchers
2021-09-13 23:20:30 +02:00
Jonas Platte
d68c93b5fa
Clean up (mostly automated with cargo clippy --fix)
2021-09-13 20:58:58 +02:00
Jonas Platte
979ec6b4fa
Upgrade ruma
2021-09-13 20:55:13 +02:00
Jonas Platte
910ad7fed1
Get rid of more unnecessary intermediate collections
2021-09-13 20:55:12 +02:00
Timo Kösters
2c8412fe58
improvement: more efficient sqlite
2021-09-13 20:12:42 +02:00
