nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Simplify identifier parsing code

Browse source
This commit is contained in:
Jonas Platte 2021-11-27 00:30:28 +01:00
parent 41fef1da64
commit bffddbd487
No known key found for this signature in database
GPG key ID: CC154DE0E30B7C67
15 changed files with 147 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/client_server/sync.rs
View file

@ -10,7 +10,7 @@ use ruma::{
};
use std::{
collections::{hash_map::Entry, BTreeMap, HashMap, HashSet},
convert::{TryFrom, TryInto},
convert::TryInto,
sync::Arc,
time::Duration,
};
@ -298,10 +298,9 @@ async fn sync_helper(
})?;
if let Some(state_key) = &pdu.state_key {
let user_id =
Box::<UserId>::try_from(state_key.clone()).map_err(|_| {
Error::bad_database("Invalid UserId in member PDU.")
})?;
let user_id = UserId::parse(state_key.clone()).map_err(|_| {
Error::bad_database("Invalid UserId in member PDU.")
})?;
// The membership was and still is invite or join
if matches!(
@ -427,7 +426,7 @@ async fn sync_helper(
}
if let Some(state_key) = &state_event.state_key {
let user_id = Box::<UserId>::try_from(state_key.clone())
let user_id = UserId::parse(state_key.clone())
.map_err(|_| Error::bad_database("Invalid UserId in member PDU."))?;
if user_id == sender_user {