Torsten Flammiger
eecd664c43
Reformat code
2022-01-13 12:26:23 +01:00
Torsten Flammiger
7f2445be6c
On unregister_appservice(service_name), remove the appservice service_name from cache too
2021-12-22 16:48:27 +01:00
Torsten Flammiger
b6c9582cf4
Fix doc style comment according to Rust; VSCode added line breaks
2021-12-22 13:09:56 +01:00
Torsten Flammiger
7857da8a0b
Add ability to remove an appservice
2021-12-20 15:46:36 +01:00
Timo Kösters
9b57c89df6
Merge branch 'more-event-id-arcs' into 'next'
...
Use Arc for EventIds in PDUs
See merge request famedly/conduit!229
2021-12-16 13:06:30 +00:00
Jonas Platte
34d3f74f36
Use Arc for EventIds in PDUs
...
Upgrades Ruma again to make this work.
2021-12-16 13:55:24 +01:00
Timo Kösters
11a21fc136
Merge branch 'up-ruma' into 'next'
...
Upgrade ruma
See merge request famedly/conduit!228
2021-12-15 14:22:30 +00:00
Jonas Platte
0183d003d0
Revert rename of Ruma<_> parameters
2021-12-15 13:58:25 +01:00
Jonas Platte
f712455047
Reduce EventId copying
2021-12-15 13:00:37 +01:00
Jonas Platte
58ea081762
Use int! macro instead of Int::from
2021-12-15 13:00:37 +01:00
Jonas Platte
bffddbd487
Simplify identifier parsing code
2021-12-15 13:00:37 +01:00
Jonas Platte
41fef1da64
Remove unnecessary .to_string() calls
2021-12-15 13:00:37 +01:00
Jonas Platte
892a0525f2
Upgrade Ruma
2021-12-15 13:00:37 +01:00
Jonas Platte
1fc616320a
Use struct init shorthand
2021-12-15 13:00:37 +01:00
Timo Kösters
14a178d783
Merge branch 'update-docker-base-image' into 'next'
...
Update docker images
See merge request famedly/conduit!230
2021-12-15 10:14:20 +00:00
Jonas Zohren
339a26f56c
Update docker images
2021-12-15 10:14:20 +00:00
Timo Kösters
ca724b6340
Merge branch '226-fix-docker-ci-issues' into 'next'
...
Fixes for !225
See merge request famedly/conduit!226
2021-11-25 22:36:44 +00:00
Jonas Zohren
9bfc7b34b6
Fixes for !225
2021-11-25 22:36:44 +00:00
Timo Kösters
afa5d449c6
Merge branch 'better-multiarch-building-the-second-attempt' into 'next'
...
CI: New Multiarch builds and Docker images + cargo clippy/test output now integrated into GitLab
Closes #145
See merge request famedly/conduit!225
2021-11-21 17:34:09 +00:00
Jonas Zohren
2fff720df3
CI: New Multiarch builds and Docker images + cargo clippy/test output now integrated into GitLab
2021-11-21 17:34:08 +00:00
Timo Kösters
da00f611e9
Merge branch 'feature/turn-server-settings' into 'next'
...
Implement turn server settings
Closes #97
See merge request famedly/conduit!208
2021-11-19 16:39:24 +00:00
Moritz Bitsch
9fccbb014a
Implement TURN server authentication with hmac
...
This is a prefered method to allow limited access to the TURN server
2021-11-12 12:43:15 +00:00
Moritz Bitsch
109892b4b7
Implement turn server settings
...
this fills out the infos in /_matrix/client/r0/voip/turnServer with
values specified in the server config
2021-11-12 12:43:15 +00:00
Jonas Platte
24a835647c
Merge branch 'nyaaori/fix-room-creation' into 'next'
...
Make createRoom follow spec for m.room.create, allowing creation of spaces
See merge request famedly/conduit!220
2021-11-09 16:34:51 +00:00
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
