Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement adding/removing general rule conditions

Browse Source
This commit is contained in:
miruka 2021-02-23 07:36:11 -04:00
parent 64b8ee03e3
commit 5b296ed6be
5 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/gui/Popups/PushRuleSettingsPopup/GeneralRule.qml
View File

@ -7,14 +7,15 @@ import "../../Base"
import "../../Base/Buttons"
HColumnLayout {
id: root
readonly property alias idField: idField
readonly property var matrixConditions: {
const results = []
for (let i = 0; i < conditionRepeater.count; i++) {
for (let i = 0; i < conditionRepeater.count; i++)
results.push(conditionRepeater.itemAt(i).control.matrixObject)
}
return results
}
@ -54,20 +55,39 @@ HColumnLayout {
HMenuItem {
text: qsTr("Room has a certain number of members")
onTriggered: conditionRepeater.model.append({
kind: "room_member_count",
is: "2",
})
}
HMenuItem {
text: qsTr("Message property matches value")
onTriggered: conditionRepeater.model.append({
kind: "event_match",
key: "content.body",
pattern: "",
})
}
HMenuItem {
text: qsTr("Message contains my display name")
onTriggered: conditionRepeater.model.append({
kind: "contains_display_name",
})
}
HMenuItem {
text: qsTr(
"Sender has permission to trigger special notification"
)
onTriggered: conditionRepeater.model.append({
kind: "sender_notification_permission",
key: "room",
})
}
HMenuItem {
text: qsTr("Custom JSON condition")
onTriggered: conditionRepeater.model.append({
condition: ({kind: "example"}),
})
}
}
}
@ -84,7 +104,16 @@ HColumnLayout {
Repeater {
id: conditionRepeater
model: JSON.parse(rule.conditions)
model: ListModel {}
Component.onCompleted: {
// Dummy item to setup all the possible roles for this model
model.append({
kind: "", key: "", pattern: "", condition: {}, is: ""
})
for (const c of JSON.parse(rule.conditions)) model.append(c)
model.remove(0)
}
HRowLayout {
readonly property Item control: loader.item
@ -94,15 +123,15 @@ HColumnLayout {
HLoader {
id: loader
readonly property var condition: modelData
readonly property var condition: model
readonly property string filename:
modelData.kind === "event_match" ?
model.kind === "event_match" ?
"PushEventMatch" :
modelData.kind === "contains_display_name" ?
model.kind === "contains_display_name" ?
"PushContainsDisplayName" :
modelData.kind === "room_member_count" ?
model.kind === "room_member_count" ?
"PushRoomMemberCount" :
modelData.kind === "sender_notification_permission" ?
model.kind === "sender_notification_permission" ?
"PushSenderNotificationPermission" :
"PushUnknownCondition"
@ -116,6 +145,7 @@ HColumnLayout {
iconItem.small: true
Layout.fillHeight: true
Layout.fillWidth: false
onClicked: conditionRepeater.model.remove(model.index)
}
}
}

2
src/gui/Popups/PushRuleSettingsPopup/PushConditions/PushContainsDisplayName.qml
View File

@ -6,7 +6,7 @@ import ".."
import "../../../Base"
CustomLabel {
readonly property var matrixObject: ({kind: "contains_display_name"})
readonly property var matrixObject: ({kind: model.kind})
text: qsTr("Message contains my display name")
}

2
src/gui/Popups/PushRuleSettingsPopup/PushConditions/PushEventMatch.qml
View File

@ -8,7 +8,7 @@ import "../../../Base"
CustomFlow {
readonly property var matrixObject: ({
kind: "event_match",
kind: model.kind,
key: keyCombo.editText,
pattern: patternField.text,
})

2
src/gui/Popups/PushRuleSettingsPopup/PushConditions/PushRoomMemberCount.qml
View File

@ -8,7 +8,7 @@ import "../../../Base"
CustomFlow {
readonly property var matrixObject: ({
kind: "room_member_count",
kind: model.kind,
is: operatorCombo.operators[operatorCombo.currentIndex]
.replace("==", "") + countSpin.value,
})

2
src/gui/Popups/PushRuleSettingsPopup/PushConditions/PushSenderNotificationPermission.qml
View File

@ -8,7 +8,7 @@ import "../../../Base"
CustomFlow {
readonly property var matrixObject: ({
kind: "sender_notification_permission",
kind: model.kind,
key: keyCombo.editText,
})