char
/
conduit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Turn append_pdu args into struct PduBuilder

next
Devin Ragotzy 2020-07-28 09:00:23 -04:00 committed by timokoesters
parent 1c6f211933
commit d948f896c0
No known key found for this signature in database
GPG Key ID: 24DA7517711A2BA4
4 changed files with 322 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

371
src/client_server.rs
View File

@ -477,13 +477,15 @@ pub fn deactivate_route(
}; };
db.rooms.append_pdu( db.rooms.append_pdu(
room_id.clone(), PduBuilder {
sender_id.clone(), room_id: room_id.clone(),
EventType::RoomMember, sender: sender_id.clone(),
serde_json::to_value(event).expect("event is valid, we just created it"), event_type: EventType::RoomMember,
None, content: serde_json::to_value(event).expect("event is valid, we just created it"),
Some(sender_id.to_string()), unsigned: None,
None, state_key: Some(sender_id.to_string()),
redacts: None,
},
&db.globals, &db.globals,
)?; )?;
} }
@ -662,10 +664,11 @@ pub fn set_displayname_route(
for room_id in db.rooms.rooms_joined(&sender_id) { for room_id in db.rooms.rooms_joined(&sender_id) {
let room_id = room_id?; let room_id = room_id?;
db.rooms.append_pdu( db.rooms.append_pdu(
room_id.clone(), PduBuilder {
sender_id.clone(), room_id: room_id.clone(),
EventType::RoomMember, sender: sender_id.clone(),
serde_json::to_value(ruma::events::room::member::MemberEventContent { event_type: EventType::RoomMember,
content: serde_json::to_value(ruma::events::room::member::MemberEventContent {
displayname: body.displayname.clone(), displayname: body.displayname.clone(),
..serde_json::from_value::<Raw<_>>( ..serde_json::from_value::<Raw<_>>(
db.rooms db.rooms
@ -683,9 +686,10 @@ pub fn set_displayname_route(
.map_err(|_| Error::bad_database("Database contains invalid PDU."))? .map_err(|_| Error::bad_database("Database contains invalid PDU."))?
}) })
.expect("event is valid, we just created it"), .expect("event is valid, we just created it"),
None, unsigned: None,
Some(sender_id.to_string()), state_key: Some(sender_id.to_string()),
None, redacts: None,
},
&db.globals, &db.globals,
)?; )?;
@ -758,10 +762,11 @@ pub fn set_avatar_url_route(
for room_id in db.rooms.rooms_joined(&sender_id) { for room_id in db.rooms.rooms_joined(&sender_id) {
let room_id = room_id?; let room_id = room_id?;
db.rooms.append_pdu( db.rooms.append_pdu(
room_id.clone(), PduBuilder {
sender_id.clone(), room_id: room_id.clone(),
EventType::RoomMember, sender: sender_id.clone(),
serde_json::to_value(ruma::events::room::member::MemberEventContent { event_type: EventType::RoomMember,
content: serde_json::to_value(ruma::events::room::member::MemberEventContent {
avatar_url: body.avatar_url.clone(), avatar_url: body.avatar_url.clone(),
..serde_json::from_value::<Raw<_>>( ..serde_json::from_value::<Raw<_>>(
db.rooms db.rooms
@ -779,9 +784,10 @@ pub fn set_avatar_url_route(
.map_err(|_| Error::bad_database("Database contains invalid PDU."))? .map_err(|_| Error::bad_database("Database contains invalid PDU."))?
}) })
.expect("event is valid, we just created it"), .expect("event is valid, we just created it"),
None, unsigned: None,
Some(sender_id.to_string()), state_key: Some(sender_id.to_string()),
None, redacts: None,
},
&db.globals, &db.globals,
)?; )?;
@ -1294,22 +1300,25 @@ pub fn create_room_route(
// 1. The room create event // 1. The room create event
db.rooms.append_pdu( db.rooms.append_pdu(
room_id.clone(), PduBuilder {
sender_id.clone(), room_id: room_id.clone(),
EventType::RoomCreate, sender: sender_id.clone(),
serde_json::to_value(content).expect("event is valid, we just created it"), event_type: EventType::RoomCreate,
None, content: serde_json::to_value(content).expect("event is valid, we just created it"),
Some("".to_owned()), unsigned: None,
None, state_key: Some("".to_owned()),
redacts: None,
},
&db.globals, &db.globals,
)?; )?;
// 2. Let the room creator join // 2. Let the room creator join
db.rooms.append_pdu( db.rooms.append_pdu(
room_id.clone(), PduBuilder {
sender_id.clone(), room_id: room_id.clone(),
EventType::RoomMember, sender: sender_id.clone(),
serde_json::to_value(member::MemberEventContent { event_type: EventType::RoomMember,
content: serde_json::to_value(member::MemberEventContent {
membership: member::MembershipState::Join, membership: member::MembershipState::Join,
displayname: db.users.displayname(&sender_id)?, displayname: db.users.displayname(&sender_id)?,
avatar_url: db.users.avatar_url(&sender_id)?, avatar_url: db.users.avatar_url(&sender_id)?,
@ -1317,9 +1326,10 @@ pub fn create_room_route(
third_party_invite: None, third_party_invite: None,
}) })
.expect("event is valid, we just created it"), .expect("event is valid, we just created it"),
None, unsigned: None,
Some(sender_id.to_string()), state_key: Some(sender_id.to_string()),
None, redacts: None,
},
&db.globals, &db.globals,
)?; )?;
@ -1359,23 +1369,26 @@ pub fn create_room_route(
.expect("event is valid, we just created it") .expect("event is valid, we just created it")
}; };
db.rooms.append_pdu( db.rooms.append_pdu(
room_id.clone(), PduBuilder {
sender_id.clone(), room_id: room_id.clone(),
EventType::RoomPowerLevels, sender: sender_id.clone(),
power_levels_content, event_type: EventType::RoomPowerLevels,
None, content: power_levels_content,
Some("".to_owned()), unsigned: None,
None, state_key: Some("".to_owned()),
redacts: None,
},
&db.globals, &db.globals,
)?; )?;
// 4. Events set by preset // 4. Events set by preset
// 4.1 Join Rules // 4.1 Join Rules
db.rooms.append_pdu( db.rooms.append_pdu(
room_id.clone(), PduBuilder {
sender_id.clone(), room_id: room_id.clone(),
EventType::RoomJoinRules, sender: sender_id.clone(),
match preset { event_type: EventType::RoomJoinRules,
content: match preset {
create_room::RoomPreset::PublicChat => serde_json::to_value( create_room::RoomPreset::PublicChat => serde_json::to_value(
join_rules::JoinRulesEventContent::new(join_rules::JoinRule::Public), join_rules::JoinRulesEventContent::new(join_rules::JoinRule::Public),
) )
@ -1386,45 +1399,52 @@ pub fn create_room_route(
)) ))
.expect("event is valid, we just created it"), .expect("event is valid, we just created it"),
}, },
None, unsigned: None,
Some("".to_owned()), state_key: Some("".to_owned()),
None, redacts: None,
},
&db.globals, &db.globals,
)?; )?;
// 4.2 History Visibility // 4.2 History Visibility
db.rooms.append_pdu( db.rooms.append_pdu(
room_id.clone(), PduBuilder {
sender_id.clone(), room_id: room_id.clone(),
EventType::RoomHistoryVisibility, sender: sender_id.clone(),
serde_json::to_value(history_visibility::HistoryVisibilityEventContent::new( event_type: EventType::RoomHistoryVisibility,
content: serde_json::to_value(history_visibility::HistoryVisibilityEventContent::new(
history_visibility::HistoryVisibility::Shared, history_visibility::HistoryVisibility::Shared,
)) ))
.expect("event is valid, we just created it"), .expect("event is valid, we just created it"),
None, unsigned: None,
Some("".to_owned()), state_key: Some("".to_owned()),
None, redacts: None,
},
&db.globals, &db.globals,
)?; )?;
// 4.3 Guest Access // 4.3 Guest Access
db.rooms.append_pdu( db.rooms.append_pdu(
room_id.clone(), PduBuilder {
sender_id.clone(), room_id: room_id.clone(),
EventType::RoomGuestAccess, sender: sender_id.clone(),
match preset { event_type: EventType::RoomGuestAccess,
create_room::RoomPreset::PublicChat => serde_json::to_value( content: match preset {
guest_access::GuestAccessEventContent::new(guest_access::GuestAccess::Forbidden), create_room::RoomPreset::PublicChat => {
) serde_json::to_value(guest_access::GuestAccessEventContent::new(
.expect("event is valid, we just created it"), guest_access::GuestAccess::Forbidden,
))
.expect("event is valid, we just created it")
}
_ => serde_json::to_value(guest_access::GuestAccessEventContent::new( _ => serde_json::to_value(guest_access::GuestAccessEventContent::new(
guest_access::GuestAccess::CanJoin, guest_access::GuestAccess::CanJoin,
)) ))
.expect("event is valid, we just created it"), .expect("event is valid, we just created it"),
}, },
None, unsigned: None,
Some("".to_owned()), state_key: Some("".to_owned()),
None, redacts: None,
},
&db.globals, &db.globals,
)?; )?;
@ -1441,15 +1461,17 @@ pub fn create_room_route(
} }
db.rooms.append_pdu( db.rooms.append_pdu(
room_id.clone(), PduBuilder {
sender_id.clone(), room_id: room_id.clone(),
event_type.clone(), sender: sender_id.clone(),
serde_json::from_str(content.get()).map_err(|_| { event_type: event_type.clone(),
content: serde_json::from_str(content.get()).map_err(|_| {
Error::BadRequest(ErrorKind::BadJson, "Invalid initial_state content.") Error::BadRequest(ErrorKind::BadJson, "Invalid initial_state content.")
})?, })?,
None, unsigned: None,
state_key.clone(), state_key: state_key.clone(),
None, redacts: None,
},
&db.globals, &db.globals,
)?; )?;
} }
@ -1457,33 +1479,38 @@ pub fn create_room_route(
// 6. Events implied by name and topic // 6. Events implied by name and topic
if let Some(name) = &body.name { if let Some(name) = &body.name {
db.rooms.append_pdu( db.rooms.append_pdu(
room_id.clone(), PduBuilder {
sender_id.clone(), room_id: room_id.clone(),
EventType::RoomName, sender: sender_id.clone(),
serde_json::to_value( event_type: EventType::RoomName,
name::NameEventContent::new(name.clone()) content: serde_json::to_value(
.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Name is invalid."))?, name::NameEventContent::new(name.clone()).map_err(|_| {
Error::BadRequest(ErrorKind::InvalidParam, "Name is invalid.")
})?,
) )
.expect("event is valid, we just created it"), .expect("event is valid, we just created it"),
None, unsigned: None,
Some("".to_owned()), state_key: Some("".to_owned()),
None, redacts: None,
},
&db.globals, &db.globals,
)?; )?;
} }
if let Some(topic) = &body.topic { if let Some(topic) = &body.topic {
db.rooms.append_pdu( db.rooms.append_pdu(
room_id.clone(), PduBuilder {
sender_id.clone(), room_id: room_id.clone(),
EventType::RoomTopic, sender: sender_id.clone(),
serde_json::to_value(topic::TopicEventContent { event_type: EventType::RoomTopic,
content: serde_json::to_value(topic::TopicEventContent {
topic: topic.clone(), topic: topic.clone(),
}) })
.expect("event is valid, we just created it"), .expect("event is valid, we just created it"),
None, unsigned: None,
Some("".to_owned()), state_key: Some("".to_owned()),
None, redacts: None,
},
&db.globals, &db.globals,
)?; )?;
} }
@ -1491,10 +1518,11 @@ pub fn create_room_route(
// 7. Events implied by invite (and TODO: invite_3pid) // 7. Events implied by invite (and TODO: invite_3pid)
for user in &body.invite { for user in &body.invite {
db.rooms.append_pdu( db.rooms.append_pdu(
room_id.clone(), PduBuilder {
sender_id.clone(), room_id: room_id.clone(),
EventType::RoomMember, sender: sender_id.clone(),
serde_json::to_value(member::MemberEventContent { event_type: EventType::RoomMember,
content: serde_json::to_value(member::MemberEventContent {
membership: member::MembershipState::Invite, membership: member::MembershipState::Invite,
displayname: db.users.displayname(&user)?, displayname: db.users.displayname(&user)?,
avatar_url: db.users.avatar_url(&user)?, avatar_url: db.users.avatar_url(&user)?,
@ -1502,9 +1530,10 @@ pub fn create_room_route(
third_party_invite: None, third_party_invite: None,
}) })
.expect("event is valid, we just created it"), .expect("event is valid, we just created it"),
None, unsigned: None,
Some(user.to_string()), state_key: Some(user.to_string()),
None, redacts: None,
},
&db.globals, &db.globals,
)?; )?;
} }
@ -1552,16 +1581,18 @@ pub fn redact_event_route(
let sender_id = body.sender_id.as_ref().expect("user is authenticated"); let sender_id = body.sender_id.as_ref().expect("user is authenticated");
let event_id = db.rooms.append_pdu( let event_id = db.rooms.append_pdu(
body.room_id.clone(), PduBuilder {
sender_id.clone(), room_id: body.room_id.clone(),
EventType::RoomRedaction, sender: sender_id.clone(),
serde_json::to_value(redaction::RedactionEventContent { event_type: EventType::RoomRedaction,
content: serde_json::to_value(redaction::RedactionEventContent {
reason: body.reason.clone(), reason: body.reason.clone(),
}) })
.expect("event is valid, we just created it"), .expect("event is valid, we just created it"),
None, unsigned: None,
None, state_key: None,
Some(body.event_id.clone()), redacts: Some(body.event_id.clone()),
},
&db.globals, &db.globals,
)?; )?;
@ -1647,13 +1678,15 @@ pub fn join_room_by_id_route(
}; };
db.rooms.append_pdu( db.rooms.append_pdu(
body.room_id.clone(), PduBuilder {
sender_id.clone(), room_id: body.room_id.clone(),
EventType::RoomMember, sender: sender_id.clone(),
serde_json::to_value(event).expect("event is valid, we just created it"), event_type: EventType::RoomMember,
None, content: serde_json::to_value(event).expect("event is valid, we just created it"),
Some(sender_id.to_string()), unsigned: None,
None, state_key: Some(sender_id.to_string()),
redacts: None,
},
&db.globals, &db.globals,
)?; )?;
@ -1724,13 +1757,15 @@ pub fn leave_room_route(
event.membership = member::MembershipState::Leave; event.membership = member::MembershipState::Leave;
db.rooms.append_pdu( db.rooms.append_pdu(
body.room_id.clone(), PduBuilder {
sender_id.clone(), room_id: body.room_id.clone(),
EventType::RoomMember, sender: sender_id.clone(),
serde_json::to_value(event).expect("event is valid, we just created it"), event_type: EventType::RoomMember,
None, content: serde_json::to_value(event).expect("event is valid, we just created it"),
Some(sender_id.to_string()), unsigned: None,
None, state_key: Some(sender_id.to_string()),
redacts: None,
},
&db.globals, &db.globals,
)?; )?;
@ -1768,13 +1803,15 @@ pub fn kick_user_route(
// TODO: reason // TODO: reason
db.rooms.append_pdu( db.rooms.append_pdu(
body.room_id.clone(), PduBuilder {
sender_id.clone(), room_id: body.room_id.clone(),
EventType::RoomMember, sender: sender_id.clone(),
serde_json::to_value(event).expect("event is valid, we just created it"), event_type: EventType::RoomMember,
None, content: serde_json::to_value(event).expect("event is valid, we just created it"),
Some(body.user_id.to_string()), unsigned: None,
None, state_key: Some(body.user_id.to_string()),
redacts: None,
},
&db.globals, &db.globals,
)?; )?;
@ -1859,13 +1896,15 @@ pub fn ban_user_route(
)?; )?;
db.rooms.append_pdu( db.rooms.append_pdu(
body.room_id.clone(), PduBuilder {
sender_id.clone(), room_id: body.room_id.clone(),
EventType::RoomMember, sender: sender_id.clone(),
serde_json::to_value(event).expect("event is valid, we just created it"), event_type: EventType::RoomMember,
None, content: serde_json::to_value(event).expect("event is valid, we just created it"),
Some(body.user_id.to_string()), unsigned: None,
None, state_key: Some(body.user_id.to_string()),
redacts: None,
},
&db.globals, &db.globals,
)?; )?;
@ -1902,13 +1941,15 @@ pub fn unban_user_route(
event.membership = ruma::events::room::member::MembershipState::Leave; event.membership = ruma::events::room::member::MembershipState::Leave;
db.rooms.append_pdu( db.rooms.append_pdu(
body.room_id.clone(), PduBuilder {
sender_id.clone(), room_id: body.room_id.clone(),
EventType::RoomMember, sender: sender_id.clone(),
serde_json::to_value(event).expect("event is valid, we just created it"), event_type: EventType::RoomMember,
None, content: serde_json::to_value(event).expect("event is valid, we just created it"),
Some(body.user_id.to_string()), unsigned: None,
None, state_key: Some(body.user_id.to_string()),
redacts: None,
},
&db.globals, &db.globals,
)?; )?;
@ -1942,10 +1983,11 @@ pub fn invite_user_route(
if let invite_user::InvitationRecipient::UserId { user_id } = &body.recipient { if let invite_user::InvitationRecipient::UserId { user_id } = &body.recipient {
db.rooms.append_pdu( db.rooms.append_pdu(
body.room_id.clone(), PduBuilder {
sender_id.clone(), room_id: body.room_id.clone(),
EventType::RoomMember, sender: sender_id.clone(),
serde_json::to_value(member::MemberEventContent { event_type: EventType::RoomMember,
content: serde_json::to_value(member::MemberEventContent {
membership: member::MembershipState::Invite, membership: member::MembershipState::Invite,
displayname: db.users.displayname(&user_id)?, displayname: db.users.displayname(&user_id)?,
avatar_url: db.users.avatar_url(&user_id)?, avatar_url: db.users.avatar_url(&user_id)?,
@ -1953,9 +1995,10 @@ pub fn invite_user_route(
third_party_invite: None, third_party_invite: None,
}) })
.expect("event is valid, we just created it"), .expect("event is valid, we just created it"),
None, unsigned: None,
Some(user_id.to_string()), state_key: Some(user_id.to_string()),
None, redacts: None,
},
&db.globals, &db.globals,
)?; )?;
@ -2327,18 +2370,20 @@ pub fn create_message_event_route(
unsigned.insert("transaction_id".to_owned(), body.txn_id.clone().into()); unsigned.insert("transaction_id".to_owned(), body.txn_id.clone().into());
let event_id = db.rooms.append_pdu( let event_id = db.rooms.append_pdu(
body.room_id.clone(), PduBuilder {
sender_id.clone(), room_id: body.room_id.clone(),
body.event_type.clone(), sender: sender_id.clone(),
serde_json::from_str( event_type: body.event_type.clone(),
content: serde_json::from_str(
body.json_body body.json_body
.ok_or(Error::BadRequest(ErrorKind::BadJson, "Invalid JSON body."))? .ok_or(Error::BadRequest(ErrorKind::BadJson, "Invalid JSON body."))?
.get(), .get(),
) )
.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid JSON body."))?, .map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid JSON body."))?,
Some(unsigned), unsigned: Some(unsigned),
None, state_key: None,
None, redacts: None,
},
&db.globals, &db.globals,
)?; )?;
@ -2395,13 +2440,15 @@ pub fn create_state_event_for_key_route(
} }
let event_id = db.rooms.append_pdu( let event_id = db.rooms.append_pdu(
body.room_id.clone(), PduBuilder {
sender_id.clone(), room_id: body.room_id.clone(),
body.event_type.clone(), sender: sender_id.clone(),
event_type: body.event_type.clone(),
content, content,
None, unsigned: None,
Some(body.state_key.clone()), state_key: Some(body.state_key.clone()),
None, redacts: None,
},
&db.globals, &db.globals,
)?; )?;
@ -2696,7 +2743,7 @@ pub async fn sync_events_route(
// Filter for possible heroes // Filter for possible heroes
.filter_map(|u| u) .filter_map(|u| u)
{ {
if heroes.contains(&hero) || hero == sender_id.to_string() { if heroes.contains(&hero) || hero == sender_id.as_str() {
continue; continue;
} }
@ -2796,7 +2843,7 @@ pub async fn sync_events_route(
notification_count, notification_count,
}, },
timeline: sync_events::Timeline { timeline: sync_events::Timeline {
limited: false || joined_since_last_sync, limited: joined_since_last_sync,
prev_batch, prev_batch,
events: room_events, events: room_events,
}, },
@ -2984,7 +3031,7 @@ pub async fn sync_events_route(
{ {
// Hang a few seconds so requests are not spammed // Hang a few seconds so requests are not spammed
// Stop hanging if new info arrives // Stop hanging if new info arrives
let mut duration = body.timeout.unwrap_or(Duration::default()); let mut duration = body.timeout.unwrap_or_default();
if duration.as_secs() > 30 { if duration.as_secs() > 30 {
duration = Duration::from_secs(30); duration = Duration::from_secs(30);
} }

2
src/database.rs
View File

@ -125,7 +125,7 @@ impl Database {
}) })
} }
pub async fn watch(&self, user_id: &UserId, device_id: &DeviceId) -> () { pub async fn watch(&self, user_id: &UserId, device_id: &DeviceId) {
let mut userid_prefix = user_id.to_string().as_bytes().to_vec(); let mut userid_prefix = user_id.to_string().as_bytes().to_vec();
userid_prefix.push(0xff); userid_prefix.push(0xff);
let mut userdeviceid_prefix = userid_prefix.clone(); let mut userdeviceid_prefix = userid_prefix.clone();

23
src/database/rooms.rs
View File

@ -2,7 +2,7 @@ mod edus;
pub use edus::RoomEdus; pub use edus::RoomEdus;
use crate::{utils, Error, PduEvent, Result}; use crate::{pdu::PduBuilder, utils, Error, PduEvent, Result};
use log::error; use log::error;
use ruma::{ use ruma::{
api::client::error::ErrorKind, api::client::error::ErrorKind,
@ -250,18 +250,21 @@ impl Rooms {
} }
/// Creates a new persisted data unit and adds it to a room. /// Creates a new persisted data unit and adds it to a room.
#[allow(clippy::too_many_arguments, clippy::blocks_in_if_conditions)] #[allow(clippy::blocks_in_if_conditions)]
pub fn append_pdu( pub fn append_pdu(
&self, &self,
room_id: RoomId, pdu_builder: PduBuilder,
sender: UserId,
event_type: EventType,
content: serde_json::Value,
unsigned: Option<serde_json::Map<String, serde_json::Value>>,
state_key: Option<String>,
redacts: Option<EventId>,
globals: &super::globals::Globals, globals: &super::globals::Globals,
) -> Result<EventId> { ) -> Result<EventId> {
let PduBuilder {
room_id,
sender,
event_type,
content,
unsigned,
state_key,
redacts,
} = pdu_builder;
// TODO: Make sure this isn't called twice in parallel // TODO: Make sure this isn't called twice in parallel
let prev_events = self.get_pdu_leaves(&room_id)?; let prev_events = self.get_pdu_leaves(&room_id)?;
@ -623,7 +626,7 @@ impl Rooms {
let mut first_pdu_id = prefix.clone(); let mut first_pdu_id = prefix.clone();
first_pdu_id.extend_from_slice(&(since + 1).to_be_bytes()); first_pdu_id.extend_from_slice(&(since + 1).to_be_bytes());
let mut last_pdu_id = prefix.clone(); let mut last_pdu_id = prefix;
last_pdu_id.extend_from_slice(&u64::MAX.to_be_bytes()); last_pdu_id.extend_from_slice(&u64::MAX.to_be_bytes());
let user_id = user_id.clone(); let user_id = user_id.clone();

12
src/pdu.rs
View File

@ -175,3 +175,15 @@ impl PduEvent {
serde_json::from_value(json).expect("Raw::from_value always works") serde_json::from_value(json).expect("Raw::from_value always works")
} }
} }
/// Build the start of a PDU in order to add it to the `Database`.
#[derive(Debug)]
pub struct PduBuilder {
pub room_id: RoomId,
pub sender: UserId,
pub event_type: EventType,
pub content: serde_json::Value,
pub unsigned: Option<serde_json::Map<String, serde_json::Value>>,
pub state_key: Option<String>,
pub redacts: Option<EventId>,
}