Add room_version argument and reorg convert_outgoing_federation_event.
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
@@ -90,8 +90,8 @@ async fn remote_invite(
|
||||
room_version: room_version_id.clone(),
|
||||
event: self
|
||||
.services
|
||||
.sending
|
||||
.convert_to_outgoing_federation_event(pdu_json.clone())
|
||||
.federation
|
||||
.format_pdu_into(pdu_json.clone(), Some(&room_version_id))
|
||||
.await,
|
||||
invite_room_state: invite_room_state
|
||||
.into_iter()
|
||||
|
||||
@@ -253,8 +253,8 @@ pub async fn join_remote(
|
||||
omit_members: false,
|
||||
pdu: self
|
||||
.services
|
||||
.sending
|
||||
.convert_to_outgoing_federation_event(join_event.clone())
|
||||
.federation
|
||||
.format_pdu_into(join_event.clone(), Some(&room_version_id))
|
||||
.await,
|
||||
};
|
||||
|
||||
@@ -742,8 +742,8 @@ pub async fn join_local(
|
||||
omit_members: false,
|
||||
pdu: self
|
||||
.services
|
||||
.sending
|
||||
.convert_to_outgoing_federation_event(join_event.clone())
|
||||
.federation
|
||||
.format_pdu_into(join_event.clone(), Some(&room_version_id))
|
||||
.await,
|
||||
},
|
||||
)
|
||||
|
||||
@@ -329,8 +329,8 @@ pub async fn remote_leave(&self, user_id: &UserId, room_id: &RoomId) -> Result {
|
||||
event_id,
|
||||
pdu: self
|
||||
.services
|
||||
.sending
|
||||
.convert_to_outgoing_federation_event(leave_event.clone())
|
||||
.federation
|
||||
.format_pdu_into(leave_event.clone(), Some(&room_version_id))
|
||||
.await,
|
||||
},
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user