studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Simplify Pdu from_id_val constructions.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-08-28 00:21:52 +00:00
parent f58081838e
commit e354be6830
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/matrix/pdu.rs
View File

@@ -88,23 +88,21 @@ pub const MAX_PREV_EVENTS: usize = 20;
pub const MAX_AUTH_EVENTS: usize = 10; pub const MAX_AUTH_EVENTS: usize = 10;
impl Pdu { impl Pdu {
pub fn from_id_val(event_id: &EventId, mut json: CanonicalJsonObject) -> Result<Self> {
let event_id = CanonicalJsonValue::String(event_id.into());
json.insert("event_id".into(), event_id);
serde_json::to_value(json)
.and_then(serde_json::from_value)
.map_err(Into::into)
}
pub fn from_rid_val( pub fn from_rid_val(
room_id: &RoomId, room_id: &RoomId,
event_id: &EventId, event_id: &EventId,
mut json: CanonicalJsonObject, mut json: CanonicalJsonObject,
) -> Result<Self> { ) -> Result<Self> {
let event_id = CanonicalJsonValue::String(event_id.into());
let room_id = CanonicalJsonValue::String(room_id.into()); let room_id = CanonicalJsonValue::String(room_id.into());
json.insert("event_id".into(), event_id);
json.insert("room_id".into(), room_id); json.insert("room_id".into(), room_id);
Self::from_id_val(event_id, json)
}
pub fn from_id_val(event_id: &EventId, mut json: CanonicalJsonObject) -> Result<Self> {
let event_id = CanonicalJsonValue::String(event_id.into());
json.insert("event_id".into(), event_id);
serde_json::to_value(json) serde_json::to_value(json)
.and_then(serde_json::from_value) .and_then(serde_json::from_value)
.map_err(Into::into) .map_err(Into::into)