git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-09-09 19:13:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(fast-joins): Use fast joins only for remote joins

Browse source
This commit is contained in:
nexy7574 2025-07-31 20:16:31 +01:00
commit d7e1d527f6
No known key found for this signature in database
GPG key ID: 0FA334385D0B689F
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/api/client/membership/join.rs
View file

@ -20,7 +20,7 @@ use conduwuit::{
}; };
use futures::{FutureExt, StreamExt}; use futures::{FutureExt, StreamExt};
use ruma::{ use ruma::{
CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, OwnedRoomId, OwnedServerName, CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, OwnedRoomId, OwnedServerName,
OwnedUserId, RoomId, RoomVersionId, UserId, OwnedUserId, RoomId, RoomVersionId, UserId,
api::{ api::{
client::{ client::{
@ -447,11 +447,11 @@ async fn join_room_by_id_helper_remote(
// It has enough fields to be called a proper event now // It has enough fields to be called a proper event now
let mut join_event = join_event_stub; let mut join_event = join_event_stub;
info!("Asking {remote_server} for send_join in room {room_id}"); info!("Asking {remote_server} for send_join in room {room_id} using snazzy fast joins");
let send_join_request = federation::membership::create_join_event::v2::Request { let send_join_request = federation::membership::create_join_event::v2::Request {
room_id: room_id.to_owned(), room_id: room_id.to_owned(),
event_id: event_id.clone(), event_id: event_id.clone(),
omit_members: false, omit_members: true,
pdu: services pdu: services
.sending .sending
.convert_to_outgoing_federation_event(join_event.clone()) .convert_to_outgoing_federation_event(join_event.clone())
@ -688,6 +688,18 @@ async fn join_room_by_id_helper_remote(
.state .state
.set_room_state(room_id, statehash_after_join, &state_lock); .set_room_state(room_id, statehash_after_join, &state_lock);
info!("Fetching the rest of the room state \"in the background\"");
// TODO: Actually do this in the background
// tokio::spawn(fetch_state_in_background(
// services.clone(),
// room_id.to_owned(),
// event_id.clone(),
// servers.to_vec(),
// ));
fetch_state_in_background(services, room_id.to_owned(), event_id, servers.to_vec())
.boxed()
.await?;
info!("Join completed");
Ok(()) Ok(())
} }
@ -990,7 +1002,6 @@ async fn join_room_by_id_helper_local(
// It has enough fields to be called a proper event now // It has enough fields to be called a proper event now
let join_event = join_event_stub; let join_event = join_event_stub;
info!("Performing fancy snazzy new v2 fast join");
let send_join_response = services let send_join_response = services
.sending .sending
.send_synapse_request( .send_synapse_request(
@ -998,7 +1009,7 @@ async fn join_room_by_id_helper_local(
federation::membership::create_join_event::v2::Request { federation::membership::create_join_event::v2::Request {
room_id: room_id.to_owned(), room_id: room_id.to_owned(),
event_id: event_id.clone(), event_id: event_id.clone(),
omit_members: true, omit_members: false,
pdu: services pdu: services
.sending .sending
.convert_to_outgoing_federation_event(join_event.clone()) .convert_to_outgoing_federation_event(join_event.clone())
@ -1026,17 +1037,6 @@ async fn join_room_by_id_helper_local(
.handle_incoming_pdu(&remote_server, room_id, &signed_event_id, signed_value, true) .handle_incoming_pdu(&remote_server, room_id, &signed_event_id, signed_value, true)
.boxed() .boxed()
.await?; .await?;
// TODO: Actually do this in the background
// tokio::spawn(fetch_state_in_background(
// services.clone(),
// room_id.to_owned(),
// event_id.clone(),
// servers.to_vec(),
// ));
info!("Fetching state in background");
fetch_state_in_background(services, room_id.to_owned(), event_id, servers.to_vec())
.boxed()
.await?;
} else { } else {
return Err(error); return Err(error);
} }