chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

events: Include all event type segments in Rust type names

Browse Source
This commit is contained in:
Jonas Platte
2021-10-02 21:25:21 +02:00
parent 4e4b71bcdd
commit 04080085f9
71 changed files with 535 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/ruma-state-res/benches/state_res_bench.rs
View File

@@ -24,8 +24,8 @@ use ruma_common::MilliSecondsSinceUnixEpoch;
use ruma_events::{
pdu::{EventHash, Pdu, RoomV3Pdu},
room::{
join_rules::{JoinRule, JoinRulesEventContent},
member::{MemberEventContent, MembershipState},
join_rules::{JoinRule, RoomJoinRulesEventContent},
member::{MembershipState, RoomMemberEventContent},
},
EventType,
};
@@ -264,7 +264,7 @@ impl TestStore<StateEvent> {
alice(),
EventType::RoomJoinRules,
Some(""),
to_raw_json_value(&JoinRulesEventContent::new(JoinRule::Public)).unwrap(),
to_raw_json_value(&RoomJoinRulesEventContent::new(JoinRule::Public)).unwrap(),
&[cre.clone(), alice_mem.event_id().clone()],
&[alice_mem.event_id().clone()],
);
@@ -356,11 +356,11 @@ fn room_id() -> RoomId {
}
fn member_content_ban() -> Box<RawJsonValue> {
to_raw_json_value(&MemberEventContent::new(MembershipState::Ban)).unwrap()
to_raw_json_value(&RoomMemberEventContent::new(MembershipState::Ban)).unwrap()
}
fn member_content_join() -> Box<RawJsonValue> {
to_raw_json_value(&MemberEventContent::new(MembershipState::Join)).unwrap()
to_raw_json_value(&RoomMemberEventContent::new(MembershipState::Join)).unwrap()
}
fn to_pdu_event<S>(
@@ -441,7 +441,7 @@ fn INITIAL_EVENTS() -> HashMap<EventId, Arc<StateEvent>> {
alice(),
EventType::RoomJoinRules,
Some(""),
to_raw_json_value(&JoinRulesEventContent::new(JoinRule::Public)).unwrap(),
to_raw_json_value(&RoomJoinRulesEventContent::new(JoinRule::Public)).unwrap(),
&["CREATE", "IMA", "IPOWER"],
&["IPOWER"],
),

24
crates/ruma-state-res/src/event_auth.rs
View File

@@ -3,11 +3,11 @@ use std::{collections::BTreeSet, convert::TryFrom};
use js_int::{int, Int};
use ruma_events::{
room::{
create::CreateEventContent,
join_rules::{JoinRule, JoinRulesEventContent},
create::RoomCreateEventContent,
join_rules::{JoinRule, RoomJoinRulesEventContent},
member::{MembershipState, ThirdPartyInvite},
power_levels::PowerLevelsEventContent,
third_party_invite::ThirdPartyInviteEventContent,
power_levels::RoomPowerLevelsEventContent,
third_party_invite::RoomThirdPartyInviteEventContent,
},
EventType,
};
@@ -281,7 +281,7 @@ pub fn auth_check<E: Event>(
} else {
// If no power level event found the creator gets 100 everyone else gets 0
room_create_event
.and_then(|create| from_json_str::<CreateEventContent>(create.content().get()).ok())
.and_then(|create| from_json_str::<RoomCreateEventContent>(create.content().get()).ok())
.and_then(|create| (create.creator == *sender).then(|| int!(100)))
.unwrap_or_default()
};
@@ -414,9 +414,9 @@ fn valid_membership_change(
None => MembershipState::Leave,
};
let power_levels: PowerLevelsEventContent = match &power_levels_event {
let power_levels: RoomPowerLevelsEventContent = match &power_levels_event {
Some(ev) => from_json_str(ev.content().get())?,
None => PowerLevelsEventContent::default(),
None => RoomPowerLevelsEventContent::default(),
};
let sender_power = power_levels
@@ -430,7 +430,7 @@ fn valid_membership_change(
let mut join_rules = JoinRule::Invite;
if let Some(jr) = &join_rules_event {
join_rules = from_json_str::<JoinRulesEventContent>(jr.content().get())?.join_rule;
join_rules = from_json_str::<RoomJoinRulesEventContent>(jr.content().get())?.join_rule;
}
if let Some(prev) = prev_event {
@@ -613,10 +613,10 @@ fn check_power_levels(
// If users key in content is not a dictionary with keys that are valid user IDs
// with values that are integers (or a string that is an integer), reject.
let user_content =
from_json_str::<PowerLevelsEventContent>(power_event.content().get()).unwrap();
from_json_str::<RoomPowerLevelsEventContent>(power_event.content().get()).unwrap();
let current_content =
from_json_str::<PowerLevelsEventContent>(current_state.content().get()).unwrap();
from_json_str::<RoomPowerLevelsEventContent>(current_state.content().get()).unwrap();
// Validation of users is done in Ruma, synapse for loops validating user_ids and integers here
info!("validation of power event finished");
@@ -768,7 +768,7 @@ fn get_send_level(
) -> Int {
power_lvl
.and_then(|ple| {
from_json_str::<PowerLevelsEventContent>(ple.content().get())
from_json_str::<RoomPowerLevelsEventContent>(ple.content().get())
.map(|content| {
content.events.get(e_type).copied().unwrap_or_else(|| {
if state_key.is_some() {
@@ -811,7 +811,7 @@ fn verify_third_party_invite(
// If any signature in signed matches any public key in the m.room.third_party_invite event,
// allow
if let Ok(tpid_ev) =
from_json_str::<ThirdPartyInviteEventContent>(current_tpid.content().get())
from_json_str::<RoomThirdPartyInviteEventContent>(current_tpid.content().get())
{
// A list of public keys in the public_keys field
for key in tpid_ev.public_keys.unwrap_or_default() {

8
crates/ruma-state-res/src/lib.rs
View File

@@ -7,7 +7,7 @@ use itertools::Itertools;
use js_int::{int, Int};
use ruma_common::MilliSecondsSinceUnixEpoch;
use ruma_events::{
room::member::{MemberEventContent, MembershipState},
room::member::{MembershipState, RoomMemberEventContent},
EventType,
};
use ruma_identifiers::{EventId, RoomVersionId, UserId};
@@ -601,7 +601,7 @@ fn is_power_event(event: impl Event) -> bool {
event.state_key() == Some("")
}
EventType::RoomMember => {
if let Ok(content) = from_json_str::<MemberEventContent>(event.content().get()) {
if let Ok(content) = from_json_str::<RoomMemberEventContent>(event.content().get()) {
if [MembershipState::Leave, MembershipState::Ban].contains(&content.membership) {
return Some(event.sender().as_str()) != event.state_key();
}
@@ -625,7 +625,7 @@ mod tests {
use rand::seq::SliceRandom;
use ruma_common::MilliSecondsSinceUnixEpoch;
use ruma_events::{
room::join_rules::{JoinRule, JoinRulesEventContent},
room::join_rules::{JoinRule, RoomJoinRulesEventContent},
EventType,
};
use ruma_identifiers::{EventId, RoomVersionId};
@@ -877,7 +877,7 @@ mod tests {
alice(),
EventType::RoomJoinRules,
Some(""),
to_raw_json_value(&JoinRulesEventContent::new(JoinRule::Private)).unwrap(),
to_raw_json_value(&RoomJoinRulesEventContent::new(JoinRule::Private)).unwrap(),
),
to_init_pdu_event(
"ME",

12
crates/ruma-state-res/src/test_utils.rs
View File

@@ -12,8 +12,8 @@ use ruma_common::MilliSecondsSinceUnixEpoch;
use ruma_events::{
pdu::{EventHash, Pdu, RoomV3Pdu},
room::{
join_rules::{JoinRule, JoinRulesEventContent},
member::{MemberEventContent, MembershipState},
join_rules::{JoinRule, RoomJoinRulesEventContent},
member::{MembershipState, RoomMemberEventContent},
},
EventType,
};
@@ -269,7 +269,7 @@ impl TestStore<StateEvent> {
alice(),
EventType::RoomJoinRules,
Some(""),
to_raw_json_value(&JoinRulesEventContent::new(JoinRule::Public)).unwrap(),
to_raw_json_value(&RoomJoinRulesEventContent::new(JoinRule::Public)).unwrap(),
&[cre.clone(), alice_mem.event_id().clone()],
&[alice_mem.event_id().clone()],
);
@@ -365,11 +365,11 @@ pub fn room_id() -> RoomId {
}
pub fn member_content_ban() -> Box<RawJsonValue> {
to_raw_json_value(&MemberEventContent::new(MembershipState::Ban)).unwrap()
to_raw_json_value(&RoomMemberEventContent::new(MembershipState::Ban)).unwrap()
}
pub fn member_content_join() -> Box<RawJsonValue> {
to_raw_json_value(&MemberEventContent::new(MembershipState::Join)).unwrap()
to_raw_json_value(&RoomMemberEventContent::new(MembershipState::Join)).unwrap()
}
pub fn to_init_pdu_event(
@@ -481,7 +481,7 @@ pub fn INITIAL_EVENTS() -> HashMap<EventId, Arc<StateEvent>> {
alice(),
EventType::RoomJoinRules,
Some(""),
to_raw_json_value(&JoinRulesEventContent::new(JoinRule::Public)).unwrap(),
to_raw_json_value(&RoomJoinRulesEventContent::new(JoinRule::Public)).unwrap(),
&["CREATE", "IMA", "IPOWER"],
&["IPOWER"],
),