Commit Graph

494 Commits

Author SHA1 Message Date
Devin Ragotzy
cdeb1236a2 Fix clippy warnings remove unused imports 2021-02-09 15:21:14 -05:00
Devin Ragotzy
63af3d3da0 Step 5 in /send just fetches state from incoming server 2021-02-09 15:20:07 -05:00
Devin Ragotzy
4b9976aa74 Update state-res, use the new Event trait
This also bumps ruma to latest and removes js_int infavor of the ruma
re-export
2021-02-09 15:19:47 -05:00
Devin Ragotzy
4a92a29b56 State resolution outline for /send 2021-02-09 15:18:47 -05:00
Timo Kösters
fb9880fee9 Merge branch 'are-we-synpase-sync' into 'master'
Sync are-we-synapse with dendrite

See merge request famedly/conduit!21
2021-02-07 21:36:05 +00:00
Timo Kösters
098ecb2ca3 Merge branch 'jwt-token-fixed' into 'master'
Add 'm.login.token' authentication

See merge request famedly/conduit!5
2021-02-07 17:11:53 +00:00
Timo Kösters
d49911c5e0
Add 'm.login.token' authentication 2021-02-07 17:38:45 +01:00
Timo Kösters
3588dcd6d0 Merge branch 'deviceid-login' into 'master'
Handle optional device_id field during login

See merge request famedly/conduit!16
2021-02-07 12:28:05 +00:00
Timo Kösters
2d7012cdb1 Merge branch 'appservices' into 'master'
Appservices

Closes #29

See merge request famedly/conduit!11
2021-02-07 12:24:28 +00:00
Timo Kösters
ea1e4625d1
fix: default config options 2021-02-07 13:20:00 +01:00
Timo Kösters
6924dfc8ea
improvement: better appservice compatibility and optimizations 2021-02-06 15:28:30 +01:00
Timo Kösters
7be2a83195 Merge branch 'valkum/complement' into 'master'
Complement Testing: Fix binary name typo

See merge request famedly/conduit!20
2021-02-05 08:52:25 +00:00
Valkum
1d7207b39e Sync are-we-synapse with dendrite 2021-02-05 02:06:14 +01:00
Valkum
a61b1cef5b Fix binary name typo 2021-02-04 23:51:20 +01:00
Timo Kösters
a478ec0443 Merge branch 'cleanup' into 'master'
Update repository link in crate metadata

See merge request famedly/conduit!19
2021-02-03 18:30:11 +00:00
Timo Kösters
fd3fb3a7ed
Merge remote-tracking branch 'famedly/master' into appservices 2021-02-03 12:54:37 +01:00
Jonas Platte
6de5b3c2a0
Update repository link in crate metadata 2021-02-02 18:14:00 +01:00
Timo Kösters
265fab843a
feature: push rule settings 2021-01-28 20:47:19 +01:00
Timo Kösters
87a0019f3a Merge branch 'valkum/complement' into 'master'
Allow the complement test image to use build artifacts

See merge request famedly/conduit!17
2021-01-23 07:43:05 +00:00
Valkum
a1e296374f Allow the complement test image to use build artifacts 2021-01-22 20:11:19 +01:00
Devon Hudson
762255fa8d
Simplify device creation logic during login 2021-01-17 08:39:47 -07:00
Devon Hudson
890187e004
improvement: Handle optional device_id field during login
remove debug logging
2021-01-16 22:19:48 -07:00
Timo Kösters
9424ba0559 Merge branch 'logout-devices' into 'master'
Respect logout_devices param on password change

See merge request famedly/conduit!15
2021-01-16 22:35:08 +00:00
Devon Hudson
ebb38cd330
improvement: respect logout_devices param on password change
Move logout devices comment next to relevant loop

remove unnecessary log
2021-01-16 15:14:50 -07:00
Paul van Tilburg
c263e13000
fix: update binary file name in docs for consistency 2021-01-11 20:28:47 +01:00
Timo Kösters
ad7b3f184b
improvement: send 200 response for turn server info
We didn't implement it, but this will stop clients from retrying the
endpoint every minute
2021-01-11 17:26:47 +01:00
Timo Kösters
d45d033bf1
fix: send presence updates when going offline
remaining bug: conduit sends presence updates every 5 minutes even if
the user is already offline
2021-01-10 17:12:34 +01:00
Timo Kösters
b4818716b8
improvement: better deploy guide 2021-01-01 22:21:05 +01:00
Timo Kösters
d7e56dbfa0
docs: recommend using binaries 2021-01-01 11:27:01 +01:00
Timo Kösters
3bdaf6e79e
improvement: better default config 2021-01-01 11:24:09 +01:00
Timo Kösters
85364a9c27
improvement: change federation_enabled to federation_disabled
This enables federation by default
2021-01-01 10:52:43 +01:00
Timo Kösters
edfd3c1f34
improvement: better config, better logs 2020-12-31 21:07:55 +01:00
Timo Kösters
df16b2ba98
fix: rare state races 2020-12-31 14:52:08 +01:00
Timo Kösters
2cf6fd57b7
improvement: don't send pdus to appservices if it isn't interested
TODO: we need to send pdus if a user of the appservice is in the room
but not the appservice user itself
2020-12-23 19:41:54 +01:00
Timo Kösters
fb9bd34696
improvement: better warnings when server is unreachable 2020-12-23 15:53:41 +01:00
Timo Kösters
c1bc70aeca
Merge branch 'kuboschek/conduit-always-query-srv' into appservices 2020-12-22 20:35:43 +01:00
Leonhard Kuboschek
8dcc1dfe56
improvement: always use port from SRV lookups
Also query SRV records when well-known is not found, fixes #29
2020-12-22 20:34:07 +01:00
Timo Kösters
f12fbca3c5
fix: send state in /sync, element displays wrong membership changes 2020-12-22 20:22:17 +01:00
Timo Kösters
6606e41dde
feat: improved state store 2020-12-20 13:34:11 +01:00
Timo Kösters
6e5b35ea92
feat: implement appservices
this also reverts some stateres changes
2020-12-08 12:59:20 +01:00
Timo Kösters
d62f17a91a
improvement: cache actual destination 2020-12-06 11:05:51 +01:00
Timo Kösters
9d4c7c34a0 Merge branch 'cargo-deb-packaging' into 'master'
Add Debian packaging via cargo-deb

See merge request famedly/conduit!3
2020-12-06 07:31:09 +00:00
Timo Kösters
45086b54b3
improvement: upgrade dependencies, fix timeline reload bug 2020-12-05 21:04:34 +01:00
Devin Ragotzy
164b1633d8
Update ruma to latest, renamed server keys and removed PduStub 2020-12-05 17:44:54 +01:00
Devin Ragotzy
b869aab5d0
Cleanup removing debug printing and logging, append non state events 2020-12-05 17:37:13 +01:00
Devin Ragotzy
c173ce43a5
convert_to_outgoing_federation_event takes CanonicalJsonObj 2020-12-05 17:37:12 +01:00
Devin Ragotzy
27e686f9ff
Convert uses of serde_json::Value to CanonicalJsonObject 2020-12-05 17:37:12 +01:00
Devin Ragotzy
b6d721374f
Have Media db return optional content_type, conversion fixes 2020-12-05 17:37:11 +01:00
Devin Ragotzy
bb24f6ad90
Address some review issues fmt, errors, comments 2020-12-05 17:37:11 +01:00
Devin Ragotzy
86bb93f8cf
Remove outdated TODOs, use StateEvent::from_id_value consistently 2020-12-05 17:37:10 +01:00