Commit Graph

19 Commits

Author SHA1 Message Date
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
Nyaaori
e9697f13d6 Handle initiating restricted joins over federation
Allows Conduit users to join restricted rooms if we are not currently participating
2022-10-15 10:46:50 +02:00
Nyaaori
3b0aa23fdf Rejoin room over federation if we are not participating in it; do not include invited users in participating servers calculation 2022-10-15 10:38:30 +02:00
Nyaaori
f430b87459 cargo clippy 2022-10-10 14:09:11 +02:00
Timo Kösters
6b131202b9 Bump ruma 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
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
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