char/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
446 commits 1 branch 0 tags 2.6 MiB
Commit graph

446 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Devin Ragotzy
db8a0c5d69
Add closest_parent method to Rooms Db insert in order /send pdus 2020-12-05 17:37:07 +01:00
Devin Ragotzy
96dd3b2880
Update ruma to latest, fix unstable origin feature in ruma 2020-12-05 17:37:07 +01:00
Timo Kösters
49f6ab503a Merge branch 'better-logs' into 'master' 
feat: send logs into admin room

See merge request famedly/conduit!6
 2020-12-05 16:36:05 +00:00
Timo Kösters
6e36081573
improvement: more logging 2020-12-05 17:35:00 +01:00
Timo Kösters
9439f2c183
feat: send logs into admin room 
Log entries will automatically be deduplicated, so a message won't be
sent if the same line has already been sent in the last 30 mins
 2020-12-05 17:34:58 +01:00
Timo Kösters
ecea0d4af2 Merge branch 'fix-admin-room' into 'master' 
fix: logging thread crash when admin room does not exist

See merge request famedly/conduit!9
 2020-12-05 16:31:18 +00:00
Timo Kösters
e691e880e0
fix: logging thread crash when admin room does not exist 2020-12-02 16:08:59 +01:00
Timo Kösters
7078443460 Merge branch 'fix_complement' into 'master' 
Fix complement

See merge request famedly/conduit!7
 2020-11-18 20:17:50 +00:00
Timo Kösters
998f9e2109 Merge branch 'sending' into 'master' 
Sending improvements

See merge request famedly/conduit!2
 2020-11-09 19:28:56 +00:00
Rudi Floren
fc08b13db1 Change CA to PKI per naming in Complement 2020-11-09 17:32:04 +01:00
Rudi Floren
e4c5ed96a9 Sync with newest complement changes 2020-11-09 17:21:35 +01:00
Timo Kösters
9f8cffcd22
Admin room improvements 2020-11-09 12:21:57 +01:00
Timo Kösters
16b22bb432
fix: don't allow more than 50 PDUs in a transaction 2020-11-03 21:53:57 +01:00
Rudi Floren
335a33c901 Fix and Improve Complement testing Dockerfile 2020-10-30 02:57:22 +01:00
Timo Kösters
0762196963
fix: don't send new events from left rooms 2020-10-27 20:26:28 +01:00
Timo Kösters
2f5df4aac9
improvement: more reliable federation sending 2020-10-27 20:26:27 +01:00
Timo Kösters
18f33b1ece Merge pull request 'Frequent flushing, configurable cache capacity, welcome message' (#237) from small-improvements into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/237
 2020-10-23 14:41:54 +02:00
Timo Kösters
df82314440
improvement: welcome message 2020-10-23 14:38:12 +02:00
Timo Kösters
6b3934e31d
feat: configurable cache capacity 2020-10-23 14:38:12 +02:00
Timo Kösters
6dbe195695
improvement: flush after every request that manipulates the db 2020-10-23 14:38:07 +02:00
Timo Kösters
b2a1505535 Merge pull request 'improvement: correct thumbnailing algorithm' (#233) from fix-thumbnailing into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/233
 2020-10-19 17:46:22 +02:00
Timo Kösters
6bb8284fc0
improvement: correct thumbnailing algorithm 2020-10-19 17:21:28 +02:00
Timo Kösters
de8bba4b49 Merge pull request 'Fix order of docker command arguments' (#232) from Weasy666/conduit:master into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/232
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-10-19 07:05:18 +02:00
Daniel Wiesenberg
2d6b7750fd Fix order of docker command arguments and change repository link to... 
...github.com repo, to relieve some pressure from git.koesters.xyz.
 2020-10-18 23:06:08 +02:00
Timo Kösters
cde4178f4a Merge pull request 'fix: use device_id when registering' (#231) from fix-deviceid into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/231
 2020-10-18 21:54:37 +02:00
Timo Kösters
f0a21b6165
fix: use device_id when registering 
TIL body.device_id != (*body).device_id, which is pretty bad, so I
renamed body.device_id to body.sender_device
 2020-10-18 21:51:28 +02:00
Timo Kösters
9936027e8f Merge pull request 'Change license to Apache-2.0' (#195) from license into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/195
 2020-10-18 19:37:18 +02:00
Timo Kösters
fccd3fdb88 Merge pull request 'Allow unjoined users to read state of world readable rooms' (#230) from allow-reading-state into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/230
 2020-10-18 16:45:17 +02:00
Timo Kösters
f6f15d9396
Use conduit.rs server in the README shield 2020-10-18 16:44:18 +02:00
Timo Kösters
243126d393
Allow reading state if history_visibility is world readable 
See https://matrix.org/docs/spec/client_server/r0.6.1#id87
 2020-10-18 16:44:18 +02:00
Timo
a2dbc6fe6d
Change license to Apache-2.0 2020-10-18 13:47:52 +02:00
Timo Kösters
9f487dd93a Merge pull request 'Update README.md' (#229) from update-readme into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/229
 2020-10-18 13:35:01 +02:00
Timo Kösters
ce94ad05a7
Update README.md 2020-10-18 13:23:06 +02:00
Timo Kösters
fbbf9f8999 Merge pull request 'docs: cross compile' (#226) from cross-compile into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/226
 2020-10-18 13:03:18 +02:00
Timo Kösters
935546b25b Merge pull request 'fix: random timeline reloads' (#227) from fix-random-timeline-reloads into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/227
 2020-10-18 09:56:28 +02:00
Timo Kösters
151ef07fb3
docs: cross compile 2020-10-18 09:04:11 +02:00
Timo Kösters
12b0efac8b
fix: random timeline reloads 2020-10-18 09:03:40 +02:00