backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 15:51:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Properly type stored EDUs

Browse source
This commit is contained in:
Lambda 2024-08-26 17:10:43 +00:00
parent 26322d5a95
commit cce83beedb
3 changed files with 29 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/service/sending.rs
View file

@ -28,8 +28,10 @@ use ruma::{
push_rules::PushRulesEvent, receipt::ReceiptType,
AnySyncEphemeralRoomEvent, GlobalAccountDataEventType,
},
push, uint, MilliSecondsSinceUnixEpoch, OwnedServerName, OwnedUserId,
ServerName, UInt, UserId,
push,
serde::Raw,
uint, MilliSecondsSinceUnixEpoch, OwnedServerName, OwnedUserId, ServerName,
UInt, UserId,
};
use tokio::{
select,
@ -81,12 +83,12 @@ impl Destination {
}
}
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
#[derive(Clone, Debug)]
pub(crate) enum SendingEventType {
// pduid
Pdu(PduId),
// pdu json
Edu(Vec<u8>),
Edu(Raw<Edu>),
}
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
@ -444,7 +446,7 @@ impl Service {
pub(crate) fn select_edus(
&self,
server_name: &ServerName,
) -> Result<(Vec<Vec<u8>>, u64)> {
) -> Result<(Vec<Raw<Edu>>, u64)> {
// u64: count of last edu
let since = self.db.get_latest_educount(server_name)?;
let mut events = Vec::new();
@ -532,7 +534,7 @@ impl Service {
};
events.push(
serde_json::to_vec(&federation_event)
Raw::new(&federation_event)
.expect("json can be serialized"),
);
@ -555,9 +557,7 @@ impl Service {
keys: None,
});
events.push(
serde_json::to_vec(&edu).expect("json can be serialized"),
);
events.push(Raw::new(&edu).expect("json can be serialized"));
}
Ok((events, max_edu_count))
@ -622,7 +622,7 @@ impl Service {
pub(crate) fn send_reliable_edu(
&self,
server: &ServerName,
serialized: Vec<u8>,
serialized: Raw<Edu>,
id: u64,
) -> Result<()> {
let destination = Destination::Normal(server.to_owned());
@ -759,7 +759,9 @@ async fn handle_appservice_event(
&events
.iter()
.map(|e| match e {
SendingEventType::Edu(b) => &**b,
SendingEventType::Edu(b) => {
b.json().get().as_bytes()
}
SendingEventType::Pdu(b) => b.as_bytes(),
})
.collect::<Vec<_>>(),
@ -885,9 +887,7 @@ async fn handle_federation_event(
));
}
SendingEventType::Edu(edu) => {
if let Ok(raw) = serde_json::from_slice(edu) {
edu_jsons.push(raw);
}
edu_jsons.push(edu.clone());
}
}
}
@ -906,7 +906,9 @@ async fn handle_federation_event(
&events
.iter()
.map(|e| match e {
SendingEventType::Edu(b) => &**b,
SendingEventType::Edu(b) => {
b.json().get().as_bytes()
}
SendingEventType::Pdu(b) => b.as_bytes(),
})
.collect::<Vec<_>>(),