Commit Graph
100 Commits
Author SHA1 Message Date
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 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
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
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 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
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
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
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
Timo Kösters f56b463278 Merge pull request 'fix: double join over federation' (#225) from join into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/225
2020-10-17 11:29:03 +02:00
Timo Kösters 9109cb492f fix: double join over federation 2020-10-17 11:24:57 +02:00
Timo Kösters a89f7eaf9f Merge pull request 'Add complement support for CI' (#209) from valkum/complement into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/209
2020-10-16 14:34:08 +02:00
Timo Kösters f7c2d23599 Merge branch 'master' into valkum/complement 2020-10-16 14:27:09 +02:00
Timo Kösters 294fae5cdb Merge pull request 'Update dependencies, remove dbgs' (#222) from deps into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/222
2020-10-16 14:12:08 +02:00
Timo Kösters dfcfab5b7e Merge branch 'master' into deps 2020-10-16 14:06:14 +02:00
Timo Kösters 9d1387954f Update dependencies, remove dbgs 2020-10-16 14:04:29 +02:00
Timo Kösters 15fa7fb1cc Merge pull request 'Reduce media ID length from 256 to 32' (#216) from miruka/conduit:reduce-mxc-length into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/216
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-10-16 13:24:52 +02:00
Timo Kösters b6ed018d16 Merge branch 'master' into reduce-mxc-length 2020-10-14 11:48:25 +02:00
Timo Kösters 0e817f6951 Merge pull request 'Federation, Admin room and many fixes' (#221) from federation into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/221
2020-10-13 19:04:42 +02:00
Timo Kösters 304c53c4f5 style: make clippy happier 2020-10-07 12:29:19 +02:00
Timo Kösters 4964e21342 Merge remote-tracking branch 'origin/master' into federation 2020-10-07 12:02:36 +02:00
Timo Kösters 6afc4c9b3e feat: federation disabled by default
It can be enable in the Rocket.toml config or using ROCKET_FEDERATION_ENABLED=true
2020-10-07 11:51:56 +02:00
Timo Kösters c15ae3c126 fix: invalid typing bytes because of 0xff in numbers 2020-10-07 11:51:56 +02:00
Timo Kösters bcd1fe1856 feat: admin room 2020-10-07 11:51:49 +02:00
Timo Kösters 0d6159c2da improvement: get_missing_events route and cleanup 2020-10-01 20:49:15 +02:00
Timo Kösters ab332363ce fix: don't send new requests to servers if we are already waiting 2020-10-01 20:49:14 +02:00
Timo Kösters e08dfd982b improvement: look at SRV record when sending requests 2020-09-23 12:04:02 +02:00
Timo Kösters f0beffb0a9 Merge pull request 'Fix ruma dependency' (#211) from fix into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/211
2020-09-20 18:18:45 +02:00
Timo Kösters 19207845bc Fix ruma dependency 2020-09-20 13:49:13 +02:00
Timo Kösters 267c721616 fix: encryption and sync spam 2020-09-18 10:29:44 +02:00
Timo Kösters 8bcfff2766 fix: no notification counts for fast /syncs 2020-09-18 10:29:43 +02:00
Timo Kösters ea3aaa6b5c improvement: more efficient /sync with gaps 2020-09-18 10:29:43 +02:00
Timo Kösters 506c2a3146 fix: can't find count from event in db 2020-09-17 10:24:18 +02:00
Timo Kösters 4db6d7e430 fix: remove avatar url checks
They are not in the spec and maubot relies on that
2020-09-16 18:10:55 +02:00
Timo Kösters a567cd81d5 improvement: better logs on deserialization errors 2020-09-16 15:08:51 +02:00
Timo Kösters f4078a29eb fix: synapse complains about missing origin 2020-09-16 11:42:33 +02:00
Timo Kösters dd749b8aee fix: server keys and destination resolution when server name contains port 2020-09-16 11:01:04 +02:00
Timo Kösters 005e00e9b1 fix: remove well-known 2020-09-15 17:16:55 +02:00
Timo Kösters 1bf614b0f5 fix: remove transaction_id from pdus over federation 2020-09-15 17:02:20 +02:00
Timo Kösters b7ab57897b fix: sending slowness 2020-09-15 16:14:59 +02:00
Timo Kösters 0b263208e3 fix: don't panic on bad server names 2020-09-15 08:55:02 +02:00
Timo Kösters 71500b14b9 fix: send to all servers and fix media store 2020-09-15 08:17:15 +02:00
Timo Kösters f7816b11de feat: send messages over federation 2020-09-15 08:17:06 +02:00
Timo Kösters 9f05ef926a fix: filter public room dir 2020-09-14 16:23:15 +02:00
Timo d1099e9224 Update dependencies 2020-09-14 14:36:49 +02:00
Timo Kösters aa5e9e607e feat: download media and thumbnails over federation 2020-09-14 14:20:38 +02:00
Timo Kösters 4e44fedbcd fix: room list over federation 2020-09-14 11:43:42 +02:00
Timo Kösters c5313b3e8f improvement: try out multiple servers when joining remote rooms 2020-09-14 11:00:31 +02:00
Timo Kösters 1f292c09f2 improvement: better federation joins 2020-09-14 09:29:46 +02:00
Timo Kösters af53485d70 fix: avoid pdus without event ids 2020-09-12 23:38:52 +02:00
Timo Kösters 1f28434988 feat: hacky transactions 2020-09-12 22:42:05 +02:00
Timo Kösters e6b1f54857 Merge remote-tracking branch 'origin/master' into federation 2020-09-12 22:23:54 +02:00
Timo Kösters 12a8c9badd fix: join rooms over federation 2020-09-12 21:30:07 +02:00
Timo Kösters 1e8fbd8d50 Update ruma version 2020-09-08 17:32:03 +02:00
Timo Kösters b5488f86b5 Merge pull request 'Add room upgrade.' (#182) from q-b/conduit-fork:rooms_upgrade into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/182
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-09-01 13:10:30 +02:00
Timo Kösters 698e44a732 Fix /upgrade account data problems 2020-09-01 13:08:49 +02:00
Timo Kösters 515465f900 fix: make element not show "unknown user" warning
The 404 error for /profile in the spec says "There is no profile
information for this user or this user does not exist.", but Element
assumes every 404 is a user that does not exist.
2020-08-31 13:23:39 +02:00
Timo Kösters aef0c8563c Merge pull request 'improvement: add remaining key backup endpoints' (#201) from keybackup into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/201
2020-08-31 11:24:11 +02:00
Timo Kösters 3f4cb753ee improvement: add remaining key backup endpoints 2020-08-27 14:52:20 +02:00
Timo Kösters d15b8d7c4e Merge pull request 'feat: handle txn ids' (#198) from txnids into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/198
2020-08-25 21:35:24 +02:00
Timo 4954df3cc3 feat: handle txn ids 2020-08-25 21:33:44 +02:00
Timo Kösters 6343eea417 Merge pull request 'Docker add healthcheck and mention Docker Hub image' (#196) from Weasy666/conduit:master into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/196
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-08-25 09:40:08 +02:00
Timo Kösters 0f524955b2 Merge pull request 'fix: send notification count updates when private read receipts change' (#194) from fixrr into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/194
2020-08-24 13:39:39 +02:00
Timo 0c1cc8d82b Fix CI 2020-08-24 11:31:19 +02:00
Timo 33215d6099 fix: send notification count updates when private read receipts change 2020-08-24 10:46:20 +02:00
Timo Kösters 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
Timo Kösters f0cb17d7a5 Merge branch 'master' into redact 2020-08-24 10:42:00 +02:00
Timo 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
Timo 972babbc79 fix: set limited to true when skipping messages in /sync 2020-08-23 16:43:21 -04:00
Timo 38663228f5 fix: put reason of redaction in the redacted event 2020-08-23 16:47:27 +02:00
Timo Kösters 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
Timo 7ba9263cc6 improvement: show most recent PDUs first when searching 2020-08-23 16:14:11 +02:00
Timo 366554630a fix: account registration 2020-08-23 16:14:11 +02:00
Timo 804d097a18 fix: wake up /sync for typing events 2020-08-23 16:14:10 +02:00