TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Nyaaori/rejoin-fix' into 'next'

Browse source 
Rejoin over federation if we are not participating

See merge request famedly/conduit!399
This commit is contained in:
Timo Kösters 2022-10-15 09:56:55 +00:00
commit b1991c8f4f
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/api/client_server/membership.rs
View file

@ -474,8 +474,12 @@ async fn join_room_by_id_helper(
); );
let state_lock = mutex_state.lock().await; let state_lock = mutex_state.lock().await;
// Ask a remote server if we don't have this room // Ask a remote server if we are not participating in this room
if !services().rooms.metadata.exists(room_id)? { if !services()
.rooms
.state_cache
.server_in_room(services().globals.server_name(), room_id)?
{
let mut make_join_response_and_server = Err(Error::BadServerResponse( let mut make_join_response_and_server = Err(Error::BadServerResponse(
"No server available to assist in joining.", "No server available to assist in joining.",
)); ));

3
src/database/key_value/rooms/state_cache.rs
View file

@ -108,8 +108,7 @@ impl service::rooms::state_cache::Data for KeyValueDatabase {
joinedcount += 1; joinedcount += 1;
} }
for invited in self.room_members_invited(room_id).filter_map(|r| r.ok()) { for _invited in self.room_members_invited(room_id).filter_map(|r| r.ok()) {
joined_servers.insert(invited.server_name().to_owned());
invitedcount += 1; invitedcount += 1;
} }