oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-09-05 18:41:00 +00:00
Code Wiki Activity

fix: don't lookup create event when converting stripped state

Browse source 
by making the caller pass the room version rules, fixing stripped state conversion for invites over federation
This commit is contained in:
Matthias Ahouansou 2025-08-15 23:57:11 +02:00
parent 54916a25bf
commit 03dfa72b8f
3 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/utils/mod.rs
View file

@ -22,7 +22,7 @@ use std::{
time::{SystemTime, UNIX_EPOCH},
};
use crate::{service::pdu::gen_event_id_canonical_json, services, Result};
use crate::{service::pdu::gen_event_id_canonical_json, Result};
pub fn millis_since_unix_epoch() -> u64 {
SystemTime::now()
@ -202,20 +202,14 @@ impl fmt::Display for HtmlEscape<'_> {
/// Converts `RawStrippedState` (federation format) into `Raw<StrippedState>` (client format)
pub fn convert_stripped_state(
stripped_state: Vec<RawStrippedState>,
room_id: &RoomId,
rules: &RoomVersionRules,
) -> Result<Vec<Raw<StrippedState>>> {
stripped_state
.into_iter()
.map(|stripped_state| match stripped_state {
RawStrippedState::Stripped(state) => Ok(state.cast()),
RawStrippedState::Pdu(state) => {
let rules = services()
.rooms
.state
.get_room_version(room_id)?
.rules()
.expect("Supported room version must have rules.");
let (event_id, mut event) = gen_event_id_canonical_json(&state, &rules)?;
let (event_id, mut event) = gen_event_id_canonical_json(&state, rules)?;
event.retain(|k, _| {
matches!(