Commit Graph
100 Commits
Author SHA1 Message Date
Timo Kösters f4dd051a1d Merge branch 'sd-notify' into 'next'
call sd-notify after init and before exit

See merge request famedly/conduit!426
2022-11-28 15:50:12 +00:00
Timo Kösters 396dac6d82 Merge branch 'fixroomleave' into 'next'
fix: unable to leave room

See merge request famedly/conduit!419
2022-11-21 20:04:27 +00:00
Timo Kösters 9149be31af Merge branch 'logs-cleanup' into 'next'
Clean some noisy logs

See merge request famedly/conduit!423
2022-11-21 20:03:17 +00:00
Timo Kösters 32a4ded4a1 Merge branch 'Nyaaori/reduce-generated-token-length' into 'next'
Reduce length of generated access tokens and session ids

See merge request famedly/conduit!386
2022-11-21 20:02:20 +00:00
Timo Kösters e3dabdf525 Merge branch 'Nyaaori/cleanup' into 'next'
misc. cleanup

See merge request famedly/conduit!420
2022-11-21 19:59:45 +00:00
Timo Kösters 3b3c451c83 fix: unable to leave room 2022-11-21 19:50:48 +01:00
Timo Kösters cf99316082 Merge branch 'dendritefix' into 'next'
Dendrite invite fix

See merge request famedly/conduit!416
2022-11-09 20:27:22 +00:00
Timo Kösters c063700255 fix: invite dendrite users 2022-11-09 21:14:17 +01:00
Timo Kösters 7540227388 chore: bump dependencies 2022-11-09 18:46:10 +01:00
Timo Kösters ccdaaceb33 Merge branch 'ci-revamp-2022-10' into 'next'
Fix CI

See merge request famedly/conduit!414
2022-11-02 16:47:48 +00:00
Timo Kösters e8e0a4dcc5 Merge branch 'Nyaaori/fix-trusted-server-panic' into 'next'
Cleanly handle invalid response from trusted server instead of panicking

See merge request famedly/conduit!411
2022-10-31 11:35:55 +00:00
Timo Kösters 2a52f666dc Merge branch 'fixtyping' into 'next'
Fix typing indicators and unencrypted messages in encrypted rooms

See merge request famedly/conduit!409
2022-10-30 20:25:45 +00:00
Timo Kösters 0cf6545116 fix: not sending enough state on join 2022-10-30 21:23:43 +01:00
Timo Kösters 5d691f405e fix: stuck typing indicators 2022-10-30 21:22:32 +01:00
Timo Kösters c61914c8e1 Merge branch 'fixhead' into 'next'
fix: HEAD requests should continue to produce METHOD_NOT_ALLOWED

See merge request famedly/conduit!402
2022-10-30 19:45:58 +00:00
Timo Kösters 9548c84d32 Merge branch 'fixnotifcount' into 'next'
fix: element android did not reset notification counts

See merge request famedly/conduit!408
2022-10-30 19:43:39 +00:00
Timo Kösters 02dd3d32f2 fix: element android did not reset notification counts 2022-10-30 20:41:32 +01:00
Timo Kösters 7c98ba64aa fix: HEAD requests should produce METHOD_NOT_ALLOWED 2022-10-30 19:53:05 +01:00
Timo Kösters e86fb11512 Merge branch 'nabulator-next-patch-84388' into 'next'
Update nginx configuration to allow for larger uploads.

See merge request famedly/conduit!407
2022-10-28 13:32:02 +00:00
Timo Kösters 20e3c42456 Merge branch 'add-nix-flake' into 'next'
add nix flake

See merge request famedly/conduit!403
2022-10-28 13:31:21 +00:00
Timo Kösters 876fdf480d Merge branch '3pid_403_next' into 'next'
Return 403 to 3pid token routes to signal not implemented

See merge request famedly/conduit!375
2022-10-25 20:47:41 +00:00
Timo Kösters 4af998963b Merge branch 'fix-axum-request-size' into 'next'
fix(main): fix request size limit to max_request_size (axum defaults 2MB)

See merge request famedly/conduit!406
2022-10-25 20:34:33 +00:00
Timo Kösters cb2b5beea8 Merge branch 'fix_persy' into 'next'
fix: update persy implementation after refactor

See merge request famedly/conduit!396
2022-10-15 12:13:36 +00:00
Timo Kösters 2231a69b4c fix: make previous MR compile 2022-10-15 14:07:27 +02:00
Timo Kösters 13052388a7 Merge branch 'conduit-next' into next 2022-10-15 13:55:39 +02:00
Timo Kösters 2627ca5e3d Merge branch 'update-rust' into 'next'
update rust to avoid a cargo problem

See merge request famedly/conduit!395
2022-10-15 11:50:55 +00:00
Timo Kösters ed5b8d6a46 Merge branch 'Nyaaori/fix-whoami-appservices' into 'next'
Fix is_guest value on whoami for appservice users

Closes #310

See merge request famedly/conduit!401
2022-10-15 11:32:49 +00:00
Timo Kösters 3054af41ba Merge branch 'Nyaaori/bump-default-room-version' into 'next'
Bump default room version to V9

See merge request famedly/conduit!400
2022-10-15 11:02:44 +00:00
Timo Kösters b1991c8f4f Merge branch 'Nyaaori/rejoin-fix' into 'next'
Rejoin over federation if we are not participating

See merge request famedly/conduit!399
2022-10-15 09:56:55 +00:00
Timo Kösters 6f7f2820ce Merge branch 'Nyaaori/restricted-join-fix' into 'next'
Fix doing restricted joins into rooms we are not participating in

See merge request famedly/conduit!398
2022-10-15 09:50:25 +00:00
Timo Kösters aca6218c0a Merge branch 'unrecognizedmethods' into 'next'
fix: send unrecognized error on wrong http methods

See merge request famedly/conduit!397
2022-10-15 08:35:39 +00:00
Timo Kösters 3a45628e1d fix: send unrecognized error on wrong http methods 2022-10-15 00:28:43 +02:00
Timo Kösters c948324cf2 Merge branch 'fix-admin-help' into 'next'
fix `@conduit help` not working in the admin room

See merge request famedly/conduit!392
2022-10-13 11:15:49 +00:00
Timo Kösters ce188daccb Merge branch 'conduit-lower-default-log-level' into HEAD 2022-10-13 13:13:03 +02:00
Timo Kösters 175fba5739 Merge branch 'fix-login-token' into 'next'
fix(client/login): username in lowercase for login by token

See merge request famedly/conduit!380
2022-10-13 11:08:04 +00:00
Timo Kösters f46d64e52f Merge branch 'unstability' into 'next'
Mark unstable versions as unstable in /capabilities

See merge request famedly/conduit!394
2022-10-13 09:39:45 +00:00
Timo Kösters 8c6e75a0cd Mark unstable versions as unstable in /capabilities 2022-10-13 10:27:42 +02:00
Timo Kösters c23b4946c5 Merge branch 'fixallthebugs' into 'next'
fix: all the e2ee problems

See merge request famedly/conduit!393
2022-10-13 08:21:12 +00:00
Timo Kösters ac52b234fa fix: all the e2ee problems 2022-10-13 10:15:35 +02:00
Timo Kösters 37eb686b5b Merge branch 'fixfluffy' into 'next'
fix: fluffychat login works again

See merge request famedly/conduit!391
2022-10-12 15:37:50 +00:00
Timo Kösters fdd64fc966 fix: fluffychat login works again 2022-10-12 17:18:01 +02:00
Timo Kösters 4d982d05af Merge branch 'claimfast' into 'next'
improvement: more efficient /claim

See merge request famedly/conduit!389
2022-10-12 09:09:23 +00:00
Timo Kösters 1e725bc548 Merge branch 'fixmakejoin' into 'next'
fix: make join should not send event id

See merge request famedly/conduit!390
2022-10-12 09:08:58 +00:00
Timo Kösters dd8f4681a2 fix: make join should not send event id 2022-10-12 10:57:54 +02:00
Timo Kösters 0290f1f355 improvement: more efficient /claim 2022-10-12 10:43:30 +02:00
Timo Kösters cd835fc7a8 Merge branch 'initialSyncFix' into 'next'
Initial sync fix

See merge request famedly/conduit!388
2022-10-11 21:24:19 +00:00
Timo Kösters 2b70d9604a fix: element gets stuck in /initialSync 2022-10-11 23:07:03 +02:00
Timo Kösters d3968c2fd1 fix: bump ruma again to fix state res problems 2022-10-11 21:51:20 +02:00
Timo Kösters 8105c5cc60 cargo fmt 2022-10-11 18:10:51 +02:00
Timo Kösters d1e5acd7b3 fix: don't panic on missing events in state 2022-10-11 17:59:49 +02:00
Timo Kösters 68227c06c3 fix: state for left rooms 2022-10-11 17:10:56 +02:00
Timo Kösters 31d1801912 fix: workaround for missing avatars on element and rooms becoming historical 2022-10-11 17:10:09 +02:00
Timo Kösters fb6bfa9753 fix: missing field origin error with synapse servers 2022-10-11 15:25:10 +02:00
Timo Kösters c30cc6120b fix: send right errors on make/send join in restricted rooms 2022-10-11 11:53:13 +02:00
Timo Kösters c2a5315e9f Merge branch 'm0dex/fix-signature-upload' into 'next'
fix(client/keys): ignore all but signed keys in signature upload route

See merge request famedly/conduit!378
2022-10-10 14:42:23 +02:00
Timo Kösters a10dae38e2 Merge branch 'v4' into 'next'
Bump version to 0.4

See merge request famedly/conduit!368
2022-10-10 14:38:56 +02:00
Timo Kösters 7cf060ae5b Bump version to 0.4 2022-10-10 14:38:17 +02:00
Timo Kösters de9b0cec50 Merge branch 'lightning_bolt_option' into 'next'
Lightning bolt optional

See merge request famedly/conduit!366
2022-10-10 14:35:56 +02:00
Timo Kösters ca82b2940d fix: sending does not work
We were inserting one too many 0xff bytes
2022-10-10 14:02:05 +02:00
Timo Kösters 229444c932 Use ring-compat feature so out signing keys work again 2022-10-10 14:02:04 +02:00
Timo Kösters 076e9810ba cargo fix 2022-10-10 14:02:04 +02:00
Timo Kösters 6b131202b9 Bump ruma 2022-10-10 14:02:04 +02:00
Timo Kösters 275c6b447d Bump some dependencies 2022-10-10 14:02:04 +02:00
Timo Kösters 1a7893dbbd fix: update state_cache on join over federation 2022-10-10 14:02:03 +02:00
Timo Kösters 5a04559cb4 fix: maintain server list again 2022-10-10 14:02:03 +02:00
Timo Kösters 25c3d89f28 Bump rust version for const fn RwLock::new 2022-10-10 14:02:03 +02:00
Timo Kösters 8b5b7a1f63 fix: panic on launch
Now we start the admin and sending threads at a later time.
2022-10-10 14:02:02 +02:00
Timo Kösters 50b0eb9929 cargo fix 2022-10-10 14:02:02 +02:00
Timo Kösters 7822a385bb cargo fmt 2022-10-10 14:02:02 +02:00
Timo Kösters d5b4754cf4 0 errors left! 2022-10-10 14:02:02 +02:00
Timo Kösters f47a5cd5d5 cargo fix 2022-10-10 14:02:01 +02:00
Timo Kösters a4637e2ba1 cargo fmt 2022-10-10 14:02:01 +02:00
Timo Kösters 33a2b2b772 37 errors left 2022-10-10 14:02:01 +02:00
Timo Kösters 44fe6d1554 127 errors left 2022-10-10 14:02:00 +02:00
Timo Kösters cff52d7ebb messing around with arcs 2022-10-10 14:02:00 +02:00
Timo Kösters face766e0f messing with trait objects 2022-10-10 14:02:00 +02:00
Timo Kösters 8708cd3b63 431 errors left 2022-10-10 14:02:00 +02:00
Timo Kösters bd8b616ca0 Fixed more compile time errors 2022-10-10 13:54:00 +02:00
Timo Kösters 057f8364cc fix: some compile time errors
Only 174 errors left!
2022-10-10 13:25:01 +02:00
Timo Kösters 82e7f57b38 refactor state accessor, state cache, user, uiaa 2022-10-10 13:21:09 +02:00
Timo Kösters f56424bc8d Refactor appservices, pusher, timeline, transactionids, users 2022-10-10 13:00:53 +02:00
Timo Kösters e045abe961 refactor: work on auth chain and state compressor 2022-10-10 11:18:53 +02:00
Timo Kösters b0029c49b9 refactor: work on search 2022-10-10 10:46:39 +02:00
Timo Kösters 03e6e43ecd refactor: split up database/key_value.rs 2022-10-09 18:23:59 +02:00
Timo Kösters 865e35df17 Work on rooms/state, database, alias, directory, edus services, event_handler, lazy_loading, metadata, outlier, and pdu_metadata 2022-08-15 19:03:37 +02:00
Timo Kösters cc80152889 refactor: split up force_state 2022-08-15 17:17:53 +02:00
Timo Kösters dcdbcc0851 refactor: event handling code 2022-08-15 17:12:22 +02:00
Timo Kösters 025b64befc refactor: renames and split room.rs 2022-08-15 16:30:34 +02:00
Timo Kösters 9ee199b0c3 Merge branch 'deactivate-user-command' into 'next'
Deactivate user command

See merge request famedly/conduit!337
2022-06-19 19:38:07 +00:00
Timo Kösters 2ecbcdda42 Merge branch 'upgrades' into 'next'
Upgrade dependencies

See merge request famedly/conduit!363
2022-06-19 15:11:21 +00:00
Timo Kösters 0c8e51e1b7 Upgrade dependencies 2022-06-19 15:40:14 +02:00
Timo Kösters 86b23338dd Merge branch 'password-length-consistency' into 'next'
Length of passwords consistently use the constant

See merge request famedly/conduit!361
2022-06-19 07:35:06 +00:00
Timo Kösters 6ef1e8c4f9 Merge branch 'timo' into 'next'
More async

See merge request famedly/conduit!359
2022-06-18 20:56:26 +00:00
Timo Kösters 0bc03e90a1 improvement: make more things async 2022-06-18 22:55:37 +02:00
Timo Kösters 9b898248c7 feat: more admin commands, better logging 2022-06-18 22:55:34 +02:00
Timo Kösters 566dc0a6a2 Merge branch 'next' into 'next'
Remove outdated rust version info

See merge request famedly/conduit!360
2022-06-18 15:02:31 +00:00
Timo Kösters f8547ecba4 Merge branch 'create-user-command' into 'next'
added a command to the admin bot to create a new user, even with registration disabled

See merge request famedly/conduit!354
2022-06-18 13:08:51 +00:00
Timo Kösters e70cff196b Merge branch 'fix-deb-postinst-config' into 'next'
Remove the address override in deb generated config

See merge request famedly/conduit!344
2022-06-18 11:21:31 +00:00
Timo Kösters 0286a804f4 Merge branch 'filter-users' into 'next'
Hide users from user directory if they are only in private rooms and they don't share a room

Closes #24

See merge request famedly/conduit!325
2022-06-18 11:17:09 +00:00
Timo Kösters 124471199c Merge branch 'registration-without-username' into 'next'
Allow registration without username

Closes #111

See merge request famedly/conduit!340
2022-06-18 11:13:37 +00:00