Rudi Floren
6309506a48
Allow suspicious_else_formatting
...
This is probably unfixable because it is caused by macros
2021-03-04 15:26:34 +01:00
Timo Kösters
bd6507eafb
Merge branch 'valkum-master-patch-25423' into 'master'
...
Make clippy happy (needless-return, etc.)
See merge request famedly/conduit!23
2021-03-04 12:35:12 +00:00
Rudi Floren
231c6032f4
Make clippy happy (needless-return, etc.)
2021-03-04 12:35:12 +00:00
Timo Kösters
3e274d7d2c
Merge branch 'valkum/conduit-update_rocket' into 'master'
...
update dependencies
See merge request famedly/conduit!32
2021-03-04 12:32:22 +00:00
Timo Kösters
105f893cf3
chore: bump other dependencies to make it work
2021-03-04 12:29:08 +01:00
Timo Kösters
437cb5783a
fix: apply the same appservice sending rules to events coming from federation
...
currently this code is duplicated from database/rooms.rs, when we
refactor server_server.rs we should deduplicate it
2021-03-04 11:34:38 +01:00
Rudi Floren
f4039902d8
Bump Rocket to current HEAD
2021-03-03 22:42:10 +01:00
Timo Kösters
f2ec2be821
fix: don't always query aliases of appservices
...
only do so if the alias matches the regex in the registration file
2021-03-03 21:53:32 +01:00
Timo Kösters
1a198e7336
Merge branch 'jaeger' into 'master'
...
feat: opentelemetry/jaeger support
See merge request famedly/conduit!28
2021-03-02 14:14:26 +00:00
Timo Kösters
4155a47db1
feat: opentelemetry/jaeger support
2021-03-02 15:08:54 +01:00
Timo Kösters
f7713fdf2e
fix: sending code got stuck sometimes
2021-03-02 14:58:46 +01:00
Timo Kösters
278751eb23
improvement: use transaction ids for federation requests
2021-03-02 14:36:48 +01:00
Timo Kösters
dd68031b69
improvement: implement /receipt
2021-03-02 14:33:35 +01: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
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
fd3fb3a7ed
Merge remote-tracking branch 'famedly/master' into appservices
2021-02-03 12:54:37 +01:00
Timo Kösters
265fab843a
feature: push rule settings
2021-01-28 20:47: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
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
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
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
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
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
Devin Ragotzy
234b226468
Fix review issues, Remove EventHash's in prev/auth_events in StateEvent
...
The latest state-res crate uses ruma's PduRoomV3 PDU's which don't have
tuples of (EventId, EventHashs) like previous versions did (this was
left from rebasing onto master). The Media DB
now takes an optional content_type like the updated ruma structs.
2020-12-05 17:37:10 +01:00
Devin Ragotzy
acd144e934
Fix get_closest_parent and cleanup federation/send/:txn
2020-12-05 17:37:10 +01:00
Devin Ragotzy
b13049a6fa
Fix federated join miss hashing the join event created
2020-12-05 17:37:09 +01:00
Devin Ragotzy
eca0bbb35a
Fix federated join miss hashing the join event created
2020-12-05 17:37:09 +01:00
Devin Ragotzy
dcd1163806
All outgoing pdus in Sending must be PduStubs
2020-12-05 17:37:08 +01:00
Devin Ragotzy
c9a6ce54cb
Add basic handling of EDUs for /send/txn
2020-12-05 17:37:08 +01:00
Devin Ragotzy
0d69ebdc6c
Reformat imports and fix clippy warnings
2020-12-05 17:37:07 +01:00
