magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

All outgoing pdus in Sending must be PduStubs

Browse source
This commit is contained in:
Devin Ragotzy 2020-11-03 21:20:35 +01:00 • committed by Timo Kösters
parent c9a6ce54cb
commit dcd1163806
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
2 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/database/sending.rs
View file

@ -73,7 +73,7 @@ impl Sending {
loop {
select! {
Some(server) = futures.next() => {
debug!("response: {:?}", &server);
debug!("sending response: {:?}", &server);
match server {
Ok((server, _response)) => {
let mut prefix = server.as_bytes().to_vec();
@ -184,17 +184,29 @@ impl Sending {
let pdu_jsons = pdu_ids
.iter()
.map(|pdu_id| {
Ok::<_, (Box<ServerName>, Error)>(PduEvent::convert_to_outgoing_federation_event(
rooms
.get_pdu_json_from_id(pdu_id)
.map_err(|e| (server.clone(), e))?
.ok_or_else(|| {
(
server.clone(),
Error::bad_database("Event in servernamepduids not found in db."),
)
})?,
))
Ok::<_, (Box<ServerName>, Error)>(
// TODO: this was a PduStub
// In order for sending to work these actually do have to be
// PduStub but, since they are Raw<..> we can fake it.
serde_json::from_str(
PduEvent::convert_to_outgoing_federation_event(
rooms
.get_pdu_json_from_id(pdu_id)
.map_err(|e| (server.clone(), e))?
.ok_or_else(|| {
(
server.clone(),
Error::bad_database(
"Event in servernamepduids not found in db.",
),
)
})?,
)
.json()
.get(),
)
.expect("Raw<..> is always valid"),
)
})
.filter_map(|r| r.ok())
.collect::<Vec<_>>();