Spec compliance: default push rule order is wrong

[t3chguy]

Description

The spec lists the following default underride rules in order https://spec.matrix.org/v1.10/client-server-api/#default-underride-rules

.m.rule.call
.m.rule.encrypted_room_one_to_one
.m.rule.room_one_to_one
...

Synapse has rules 2 and 3 reversed. I did not extensively check if this is the only instance of this misordering.

synapse/rust/src/push/base_rules.rs

Lines 306 to 337 in 59ceabc

	PushRule {
	rule_id: Cow::Borrowed("global/underride/.m.rule.room_one_to_one"),
	priority_class: 1,
	conditions: Cow::Borrowed(&[
	Condition::Known(KnownCondition::EventMatch(EventMatchCondition {
	key: Cow::Borrowed("type"),
	pattern: Cow::Borrowed("m.room.message"),
	})),
	Condition::Known(KnownCondition::RoomMemberCount {
	is: Some(Cow::Borrowed("2")),
	}),
	]),
	actions: Cow::Borrowed(&[Action::Notify, SOUND_ACTION, HIGHLIGHT_FALSE_ACTION]),
	default: true,
	default_enabled: true,
	},
	PushRule {
	rule_id: Cow::Borrowed("global/underride/.m.rule.encrypted_room_one_to_one"),
	priority_class: 1,
	conditions: Cow::Borrowed(&[
	Condition::Known(KnownCondition::EventMatch(EventMatchCondition {
	key: Cow::Borrowed("type"),
	pattern: Cow::Borrowed("m.room.encrypted"),
	})),
	Condition::Known(KnownCondition::RoomMemberCount {
	is: Some(Cow::Borrowed("2")),
	}),
	]),
	actions: Cow::Borrowed(&[Action::Notify, SOUND_ACTION, HIGHLIGHT_FALSE_ACTION]),
	default: true,
	default_enabled: true,
	},

Steps to reproduce

Inspect response from GET /pushrules

Homeserver

element.io

Synapse Version

Unknown

Installation Method

I don't know

Database

Unknown

Workers

I don't know

Platform

Unknown

Configuration

Unknown

Relevant log output

Unknown

Anything else that would be useful to know?

No response