Merge branch 'feature/fix_notif' into develop

This commit is contained in:
Benoit Marty 2020-02-10 19:16:20 +01:00
commit 01a7ea0bd7

View file

@ -38,7 +38,7 @@ internal object PushRulesMapper {
enabled = pushrule.enabled, enabled = pushrule.enabled,
ruleId = pushrule.ruleId, ruleId = pushrule.ruleId,
conditions = listOf( conditions = listOf(
PushCondition(Condition.Kind.EventMatch.name, "content.body", pushrule.pattern) PushCondition(Condition.Kind.EventMatch.value, "content.body", pushrule.pattern)
) )
) )
} }
@ -59,7 +59,7 @@ internal object PushRulesMapper {
enabled = pushrule.enabled, enabled = pushrule.enabled,
ruleId = pushrule.ruleId, ruleId = pushrule.ruleId,
conditions = listOf( conditions = listOf(
PushCondition(Condition.Kind.EventMatch.name, "room_id", pushrule.ruleId) PushCondition(Condition.Kind.EventMatch.value, "room_id", pushrule.ruleId)
) )
) )
} }
@ -71,7 +71,7 @@ internal object PushRulesMapper {
enabled = pushrule.enabled, enabled = pushrule.enabled,
ruleId = pushrule.ruleId, ruleId = pushrule.ruleId,
conditions = listOf( conditions = listOf(
PushCondition(Condition.Kind.EventMatch.name, "user_id", pushrule.ruleId) PushCondition(Condition.Kind.EventMatch.value, "user_id", pushrule.ruleId)
) )
) )
} }