imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stabilize support for MSC3952: intentional mentions (#10967)

Browse source 
* enable feature_intentional_mentions with v1.7

* org.matrix.msc3952.mentions -> m.mentions

* update push rules test util

* only support stable version 1.7

* use stable values for msc3952 push rules

* use stable intentional mentions rule sin test models

* unstable feature in settings controller
This commit is contained in:
Kerry 2023-07-12 10:29:54 +12:00 • committed by GitHub
parent 113b6301f8
commit c5befa1ef8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 88 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/models/notificationsettings/pushrules_bug_botnotices.json
View file

@ -345,13 +345,13 @@
"enabled": true
},
{
"rule_id": ".org.matrix.msc3952.is_user_mention",
"rule_id": ".m.rule.is_user_mention",
"default": true,
"enabled": true,
"conditions": [
{
"kind": "event_property_contains",
"key": "content.org\\.matrix\\.msc3952\\.mentions.user_ids",
"key": "content.m\\.mentions.user_ids",
"value": "@jannemk:element.io"
}
],
@ -363,13 +363,13 @@
]
},
{
"rule_id": ".org.matrix.msc3952.is_room_mention",
"rule_id": ".m.rule.is_room_mention",
"default": true,
"enabled": true,
"conditions": [
{
"kind": "event_property_is",
"key": "content.org\\.matrix\\.msc3952\\.mentions.room",
"key": "content.m\\.mentions.room",
"value": true
},
{

8
test/models/notificationsettings/pushrules_bug_keyword_only.json
View file

@ -315,13 +315,13 @@
"enabled": true
},
{
"rule_id": ".org.matrix.msc3952.is_user_mention",
"rule_id": ".m.rule.is_user_mention",
"default": true,
"enabled": false,
"conditions": [
{
"kind": "event_property_contains",
"key": "content.org\\.matrix\\.msc3952\\.mentions.user_ids",
"key": "content.m\\.mentions.user_ids",
"value": "@jannemk:element.io"
}
],
@ -333,13 +333,13 @@
]
},
{
"rule_id": ".org.matrix.msc3952.is_room_mention",
"rule_id": ".m.rule.is_room_mention",
"default": true,
"enabled": true,
"conditions": [
{
"kind": "event_property_is",
"key": "content.org\\.matrix\\.msc3952\\.mentions.room",
"key": "content.m\\.mentions.room",
"value": true
},
{

8
test/models/notificationsettings/pushrules_default.json
View file

@ -259,7 +259,7 @@
"conditions": [
{
"kind": "event_property_contains",
"key": "content.org\\.matrix\\.msc3952\\.mentions.user_ids",
"key": "content.m\\.mentions.user_ids",
"value": "@jannetestuser:beta.matrix.org"
}
],
@ -269,7 +269,7 @@
"set_tweak": "highlight"
}
],
"rule_id": ".org.matrix.msc3952.is_user_mention",
"rule_id": ".m.rule.is_user_mention",
"default": true,
"enabled": true,
"kind": "override"
@ -299,7 +299,7 @@
"conditions": [
{
"kind": "event_property_is",
"key": "content.org\\.matrix\\.msc3952\\.mentions.room",
"key": "content.m\\.mentions.room",
"value": true
},
{
@ -313,7 +313,7 @@
"set_tweak": "highlight"
}
],
"rule_id": ".org.matrix.msc3952.is_room_mention",
"rule_id": ".m.rule.is_room_mention",
"default": true,
"enabled": true,
"kind": "override"

8
test/models/notificationsettings/pushrules_default_new.json
View file

@ -265,7 +265,7 @@
"conditions": [
{
"kind": "event_property_contains",
"key": "content.org\\.matrix\\.msc3952\\.mentions.user_ids",
"key": "content.m\\.mentions.user_ids",
"value": "@jannetestuser:beta.matrix.org"
}
],
@ -275,7 +275,7 @@
"set_tweak": "highlight"
}
],
"rule_id": ".org.matrix.msc3952.is_user_mention",
"rule_id": ".m.rule.is_user_mention",
"default": true,
"enabled": true,
"kind": "override"
@ -305,7 +305,7 @@
"conditions": [
{
"kind": "event_property_is",
"key": "content.org\\.matrix\\.msc3952\\.mentions.room",
"key": "content.m\\.mentions.room",
"value": true
},
{
@ -319,7 +319,7 @@
"set_tweak": "highlight"
}
],
"rule_id": ".org.matrix.msc3952.is_room_mention",
"rule_id": ".m.rule.is_room_mention",
"default": true,
"enabled": true,
"kind": "override"

8
test/models/notificationsettings/pushrules_sample.json
View file

@ -501,13 +501,13 @@
"kind": "override"
},
{
"rule_id": ".org.matrix.msc3952.is_user_mention",
"rule_id": ".m.rule.is_user_mention",
"default": true,
"enabled": true,
"conditions": [
{
"kind": "event_property_contains",
"key": "content.org\\.matrix\\.msc3952\\.mentions.user_ids",
"key": "content.m\\.mentions.user_ids",
"value": "@jannemk:element.io"
}
],
@ -520,13 +520,13 @@
"kind": "override"
},
{
"rule_id": ".org.matrix.msc3952.is_room_mention",
"rule_id": ".m.rule.is_room_mention",
"default": true,
"enabled": true,
"conditions": [
{
"kind": "event_property_is",
"key": "content.org\\.matrix\\.msc3952\\.mentions.room",
"key": "content.m\\.mentions.room",
"value": true
},
{