9aa5e99a0f
Merge pull request 'fix: put reason of redaction in the redacted event' ( #193 ) from redact into master
...
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/193
2020-08-24 10:43:05 +02:00
f0cb17d7a5
Merge branch 'master' into redact
2020-08-24 10:42:00 +02:00
27ffe77823
Use helper instead of route for get_public_rooms_filtered
2020-08-23 16:45:01 -04:00
1848f08292
Use full sorting algorithm on incoming PDU's in membership
2020-08-23 16:43:48 -04:00
3c26166fb5
improvement: device list works better
...
The only situation that isn't working yet is sending `left` events for
users when the sender leaves the room
2020-08-23 16:43:48 -04:00
972babbc79
fix: set limited to true when skipping messages in /sync
2020-08-23 16:43:21 -04:00
672bf4f473
Cargo lock update and a few doc additions
2020-08-23 16:43:21 -04:00
fe795d38ea
Replace route calling routes with helpers
...
This fixes the panic from ruma "index out of bounds"
2020-08-23 16:43:21 -04:00
5ccdd3694b
Add helper function for get_alias route
2020-08-23 16:43:21 -04:00
ea20032404
Helper for join_room_by_id route so routes aren't calling routes
2020-08-23 16:43:21 -04:00
64fb0374b6
Use Vec<u8> instead of string for digest bytes and add roomid_statehash
2020-08-23 16:43:21 -04:00
d73c6aa8ad
Add roomid_statehash tree, clean up review issues
2020-08-23 16:43:21 -04:00
846a0098c1
Split append_pdu -> append_pdu and build_and_append
...
Move all state event appending to append_state_pdu.
2020-08-23 16:43:21 -04:00
cb68bf9e0c
Use ring crate to generate StatHashes when saving stateid/statehash
2020-08-23 16:43:21 -04:00
c4f5a0a631
Keep track of State at event for state resolution
...
feat: first steps towards joining rooms over federation
Add state-res as a dependency of conduit
Add reverse_topological_power_sort before append_pdu
Implement statehashstatid_pduid tree for keeping track of state
Clean up implementation of state_hash as key for tracking state
2020-08-23 16:43:21 -04:00
38663228f5
fix: put reason of redaction in the redacted event
2020-08-23 16:47:27 +02:00
8e55623bde
Merge pull request 'More Federation' ( #181 ) from docs into master
...
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/181
2020-08-23 16:15:01 +02:00
7ba9263cc6
improvement: show most recent PDUs first when searching
2020-08-23 16:14:11 +02:00
366554630a
fix: account registration
2020-08-23 16:14:11 +02:00
804d097a18
fix: wake up /sync for typing events
2020-08-23 16:14:10 +02:00
c092f06068
docs: /sync
2020-08-23 16:14:10 +02:00
df936e8e7e
improvement: guests are more spec-conform
2020-08-23 16:14:10 +02:00
64789537f5
fix: device list when leaving rooms
2020-08-23 16:14:09 +02:00
4323cf5fec
improvement: device list works better
...
The only situation that isn't working yet is sending `left` events for
users when the sender leaves the room
2020-08-23 16:14:09 +02:00
f23fb32e95
fix: set limited to true when skipping messages in /sync
2020-08-23 16:14:09 +02:00
e457e19088
feat: search pdus
2020-08-23 16:14:08 +02:00
27d35f5ab4
docs: fix /register method
2020-08-23 16:14:08 +02:00
69a7cb5142
fix dependency version
2020-08-23 16:14:07 +02:00
3ff17f69ad
fmt
2020-08-23 16:14:07 +02:00
4be68eba76
feat: allow querying conduit's room list over federation
2020-08-23 16:14:07 +02:00
940f533d61
refactor: avoid some allocations when redacting
2020-08-23 16:14:06 +02:00
04eee089e0
feat: first steps towards joining rooms over federation
2020-08-23 16:14:06 +02:00
f40f1d9f75
docs: endpoint documentation
2020-08-23 16:14:06 +02:00
cfda76860b
Merge pull request 'Make default server name more obvious' ( #192 ) from spaetz/conduit:master into master
...
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/192
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-08-18 20:51:15 +02:00
6b7e92ccf5
Make default server name more obvious
...
Too many people fell into the trap and left conduit.rs in the deployment
configuration, wondering why users are all listed as @conduit.rs.
Make the default server name really easy to identify and make it obvious
that this needs to be changed.
2020-08-18 19:18:10 +02:00
6191c3bd00
Merge pull request 'Fix license.' ( #190 ) from q-b/conduit-fork:license into master
...
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/190
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-08-17 14:13:19 +02:00
0fef955b28
Fix license.
2020-08-17 13:59:35 +02:00
2d96323d5f
Merge pull request 'Update ruma' ( #184 ) from jplatte/conduit:up-ruma into master
...
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/184
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-08-13 09:04:22 +02:00
75ea0b3163
Update ruma
2020-08-12 23:42:17 +02:00
4b3d6e736f
Merge pull request 'Alpine based Docker image' ( #152 ) from Weasy666/conduit:master into master
...
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/152
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-08-12 21:42:58 +02:00
2fc99c05e1
docs: add documentation to the repo and improve layout
2020-08-12 21:17:53 +02:00
87ed132ae4
Add README in docker folder and mention docker in Conduit's README
2020-08-11 15:38:24 +02:00
7288010e55
Move additional files into dedicated folder and make build the def...
...
...fault in the compose files.
2020-08-11 15:38:24 +02:00
31c725660f
Add build option to compose file
2020-08-11 15:38:24 +02:00
7456caeefd
Add Element-Web to compose and provide extra compose files for using..
...
..Conduit behind Traefik Reverse Proxy
2020-08-11 15:38:24 +02:00
5f3cb3f926
Minor modifications to compose file and update Dockerfile comments
2020-08-11 15:38:24 +02:00
0338053774
Add ability to switch between local and remote build with build arg a...
...
...nd add env vars to docker-compose
2020-08-11 15:38:24 +02:00
ecb6416244
Image now builds and runs 🎉 Thx to the help of yzhr
2020-08-11 15:38:24 +02:00
a21858758c
Change labels from label-schema to opencontainer.image
2020-08-11 15:38:24 +02:00
624ff08a07
Initial docker files trinity
...
The image builds as is, but running it exits with: standard_init_linux.go:211: exec user process caused "no such file or directory"
2020-08-11 15:38:23 +02:00
Timo Kösters