aboutsummaryrefslogtreecommitdiff
path: root/matrix/pushrules
diff options
context:
space:
mode:
Diffstat (limited to 'matrix/pushrules')
-rw-r--r--matrix/pushrules/condition.go2
-rw-r--r--matrix/pushrules/rule.go4
-rw-r--r--matrix/pushrules/rule_array_test.go4
-rw-r--r--matrix/pushrules/rule_test.go43
4 files changed, 26 insertions, 27 deletions
diff --git a/matrix/pushrules/condition.go b/matrix/pushrules/condition.go
index 6607323..08958a3 100644
--- a/matrix/pushrules/condition.go
+++ b/matrix/pushrules/condition.go
@@ -21,8 +21,8 @@ import (
"strconv"
"strings"
- "maunium.net/go/gomuks/lib/glob"
"maunium.net/go/gomatrix"
+ "maunium.net/go/gomuks/lib/glob"
"maunium.net/go/gomuks/matrix/rooms"
)
diff --git a/matrix/pushrules/rule.go b/matrix/pushrules/rule.go
index ddb264e..5ede895 100644
--- a/matrix/pushrules/rule.go
+++ b/matrix/pushrules/rule.go
@@ -17,9 +17,9 @@
package pushrules
import (
- "maunium.net/go/gomuks/lib/glob"
- "maunium.net/go/gomatrix"
"encoding/gob"
+ "maunium.net/go/gomatrix"
+ "maunium.net/go/gomuks/lib/glob"
)
func init() {
diff --git a/matrix/pushrules/rule_array_test.go b/matrix/pushrules/rule_array_test.go
index fdecd9c..9396411 100644
--- a/matrix/pushrules/rule_array_test.go
+++ b/matrix/pushrules/rule_array_test.go
@@ -17,9 +17,9 @@
package pushrules_test
import (
- "testing"
- "maunium.net/go/gomuks/matrix/pushrules"
"github.com/stretchr/testify/assert"
+ "maunium.net/go/gomuks/matrix/pushrules"
+ "testing"
)
func TestPushRuleArray_GetActions_FirstMatchReturns(t *testing.T) {
diff --git a/matrix/pushrules/rule_test.go b/matrix/pushrules/rule_test.go
index 3d3f03c..bedcfca 100644
--- a/matrix/pushrules/rule_test.go
+++ b/matrix/pushrules/rule_test.go
@@ -17,17 +17,17 @@
package pushrules_test
import (
- "testing"
"github.com/stretchr/testify/assert"
"maunium.net/go/gomuks/matrix/pushrules"
+ "testing"
)
func TestPushRule_Match_Conditions(t *testing.T) {
cond1 := newMatchPushCondition("content.msgtype", "m.emote")
cond2 := newMatchPushCondition("content.body", "*pushrules")
rule := &pushrules.PushRule{
- Type: pushrules.OverrideRule,
- Enabled: true,
+ Type: pushrules.OverrideRule,
+ Enabled: true,
Conditions: []*pushrules.PushCondition{cond1, cond2},
}
@@ -42,8 +42,8 @@ func TestPushRule_Match_Conditions_Disabled(t *testing.T) {
cond1 := newMatchPushCondition("content.msgtype", "m.emote")
cond2 := newMatchPushCondition("content.body", "*pushrules")
rule := &pushrules.PushRule{
- Type: pushrules.OverrideRule,
- Enabled: false,
+ Type: pushrules.OverrideRule,
+ Enabled: false,
Conditions: []*pushrules.PushCondition{cond1, cond2},
}
@@ -58,8 +58,8 @@ func TestPushRule_Match_Conditions_FailIfOneFails(t *testing.T) {
cond1 := newMatchPushCondition("content.msgtype", "m.emote")
cond2 := newMatchPushCondition("content.body", "*pushrules")
rule := &pushrules.PushRule{
- Type: pushrules.OverrideRule,
- Enabled: true,
+ Type: pushrules.OverrideRule,
+ Enabled: true,
Conditions: []*pushrules.PushCondition{cond1, cond2},
}
@@ -72,7 +72,7 @@ func TestPushRule_Match_Conditions_FailIfOneFails(t *testing.T) {
func TestPushRule_Match_Content(t *testing.T) {
rule := &pushrules.PushRule{
- Type: pushrules.ContentRule,
+ Type: pushrules.ContentRule,
Enabled: true,
Pattern: "is testing*",
}
@@ -86,7 +86,7 @@ func TestPushRule_Match_Content(t *testing.T) {
func TestPushRule_Match_Content_Fail(t *testing.T) {
rule := &pushrules.PushRule{
- Type: pushrules.ContentRule,
+ Type: pushrules.ContentRule,
Enabled: true,
Pattern: "is testing*",
}
@@ -100,7 +100,7 @@ func TestPushRule_Match_Content_Fail(t *testing.T) {
func TestPushRule_Match_Content_ImplicitGlob(t *testing.T) {
rule := &pushrules.PushRule{
- Type: pushrules.ContentRule,
+ Type: pushrules.ContentRule,
Enabled: true,
Pattern: "testing",
}
@@ -114,7 +114,7 @@ func TestPushRule_Match_Content_ImplicitGlob(t *testing.T) {
func TestPushRule_Match_Content_IllegalGlob(t *testing.T) {
rule := &pushrules.PushRule{
- Type: pushrules.ContentRule,
+ Type: pushrules.ContentRule,
Enabled: true,
Pattern: "this is not a valid glo[b",
}
@@ -128,9 +128,9 @@ func TestPushRule_Match_Content_IllegalGlob(t *testing.T) {
func TestPushRule_Match_Room(t *testing.T) {
rule := &pushrules.PushRule{
- Type: pushrules.RoomRule,
+ Type: pushrules.RoomRule,
Enabled: true,
- RuleID: "!fakeroom:maunium.net",
+ RuleID: "!fakeroom:maunium.net",
}
event := newFakeEvent("m.room.message", map[string]interface{}{})
@@ -139,21 +139,20 @@ func TestPushRule_Match_Room(t *testing.T) {
func TestPushRule_Match_Room_Fail(t *testing.T) {
rule := &pushrules.PushRule{
- Type: pushrules.RoomRule,
+ Type: pushrules.RoomRule,
Enabled: true,
- RuleID: "!otherroom:maunium.net",
+ RuleID: "!otherroom:maunium.net",
}
event := newFakeEvent("m.room.message", map[string]interface{}{})
assert.False(t, rule.Match(blankTestRoom, event))
}
-
func TestPushRule_Match_Sender(t *testing.T) {
rule := &pushrules.PushRule{
- Type: pushrules.SenderRule,
+ Type: pushrules.SenderRule,
Enabled: true,
- RuleID: "@tulir:maunium.net",
+ RuleID: "@tulir:maunium.net",
}
event := newFakeEvent("m.room.message", map[string]interface{}{})
@@ -162,9 +161,9 @@ func TestPushRule_Match_Sender(t *testing.T) {
func TestPushRule_Match_Sender_Fail(t *testing.T) {
rule := &pushrules.PushRule{
- Type: pushrules.RoomRule,
+ Type: pushrules.RoomRule,
Enabled: true,
- RuleID: "@someone:matrix.org",
+ RuleID: "@someone:matrix.org",
}
event := newFakeEvent("m.room.message", map[string]interface{}{})
@@ -173,9 +172,9 @@ func TestPushRule_Match_Sender_Fail(t *testing.T) {
func TestPushRule_Match_UnknownTypeAlwaysFail(t *testing.T) {
rule := &pushrules.PushRule{
- Type: pushrules.PushRuleType("foobar"),
+ Type: pushrules.PushRuleType("foobar"),
Enabled: true,
- RuleID: "@someone:matrix.org",
+ RuleID: "@someone:matrix.org",
}
event := newFakeEvent("m.room.message", map[string]interface{}{})