diff --git a/ruma-api-macros/src/api/metadata.rs b/ruma-api-macros/src/api/metadata.rs index acc1435f..f4f778c6 100644 --- a/ruma-api-macros/src/api/metadata.rs +++ b/ruma-api-macros/src/api/metadata.rs @@ -88,10 +88,10 @@ impl Parse for Metadata { FieldValue::Name(n) => set_field(&mut name, n)?, FieldValue::Path(p) => set_field(&mut path, p)?, FieldValue::RateLimited(value, attrs) => { - rate_limited.push(MetadataField { value, attrs }) + rate_limited.push(MetadataField { attrs, value }) } FieldValue::Authentication(value, attrs) => { - authentication.push(MetadataField { value, attrs }) + authentication.push(MetadataField { attrs, value }) } } } diff --git a/ruma-events/src/lib.rs b/ruma-events/src/lib.rs index 31977de3..67fa94df 100644 --- a/ruma-events/src/lib.rs +++ b/ruma-events/src/lib.rs @@ -338,21 +338,21 @@ impl From for RedactedSyncUnsigned { fn from(redacted: RedactedUnsigned) -> Self { match redacted.redacted_because.map(|b| *b) { Some(RedactionEvent { - sender, - event_id, - origin_server_ts, - redacts, - unsigned, content, + redacts, + event_id, + sender, + origin_server_ts, + unsigned, .. }) => Self { redacted_because: Some(Box::new(SyncRedactionEvent { - sender, - event_id, - origin_server_ts, - redacts, - unsigned, content, + redacts, + event_id, + sender, + origin_server_ts, + unsigned, })), }, _ => Self { redacted_because: None }, @@ -376,21 +376,21 @@ impl RedactedSyncUnsigned { pub fn into_full(self, room_id: RoomId) -> RedactedUnsigned { match self.redacted_because.map(|b| *b) { Some(SyncRedactionEvent { - sender, - event_id, - origin_server_ts, - redacts, - unsigned, content, + redacts, + event_id, + sender, + origin_server_ts, + unsigned, }) => RedactedUnsigned { redacted_because: Some(Box::new(RedactionEvent { - room_id, - sender, - event_id, - origin_server_ts, - redacts, - unsigned, content, + redacts, + event_id, + sender, + origin_server_ts, + room_id, + unsigned, })), }, _ => RedactedUnsigned { redacted_because: None },