Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Rename Rust evaluator event_property_contains field value_type to value too #16045

Closed
wants to merge 2 commits into from
Closed

Rename Rust evaluator event_property_contains field value_type to value too #16045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36124f4
fix: rename Rust evaluator event_property_contains' field value_type …
bnjbvr Aug 1, 2023
ae28758
Merge branch 'develop' into fix-rust-value-type
bnjbvr Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust/src/push/base_rules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ pub const BASE_APPEND_OVERRIDE_RULES: &[PushRule] = &[
conditions: Cow::Borrowed(&[Condition::Known(
KnownCondition::ExactEventPropertyContainsType(EventPropertyIsTypeCondition {
key: Cow::Borrowed("content.m\\.mentions.user_ids"),
value_type: Cow::Borrowed(&EventMatchPatternType::UserId),
value: Cow::Borrowed(&EventMatchPatternType::UserId),
}),
)]),
actions: Cow::Borrowed(&[Action::Notify, HIGHLIGHT_ACTION, SOUND_ACTION]),
Expand Down
2 changes: 1 addition & 1 deletion rust/src/push/evaluator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ impl PushRuleEvaluator {
return Ok(false);
};

let pattern = match &*exact_event_match.value_type {
let pattern = match &*exact_event_match.value {
EventMatchPatternType::UserId => user_id,
EventMatchPatternType::UserLocalpart => get_localpart_from_id(user_id)?,
};
Expand Down
2 changes: 1 addition & 1 deletion rust/src/push/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ pub struct EventPropertyIsTypeCondition {
pub key: Cow<'static, str>,
// During serialization, the pattern_type property gets replaced with a
// pattern property of the correct value in synapse.push.clientformat.format_push_rules_for_user.
pub value_type: Cow<'static, EventMatchPatternType>,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't look right, the the code still searches for value_type at https://github.com/matrix-org/synapse/pull/15781/files#diff-50b62bc5724dfc17c692c9467f9a1f92af6ecb2b2afdc41cf96939e794d12f59R68

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not familiar at all with this code, so I might be super wrong. Is this using an internal format that is live-converted to what the spec mandates? If so, then does the rust module use the internal format or the spec format?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it is an internal format, the code I linked to is the serialization code which converts it.

pub value: Cow<'static, EventMatchPatternType>,
}

/// The body of a [`Condition::RelatedEventMatch`]
Expand Down
Loading