1 files changed, 11 insertions, 13 deletions
diff --git a/matrix/pushrules/pushrules.go b/matrix/pushrules/pushrules.go
index 876713b..643f2f2 100644
--- a/matrix/pushrules/pushrules.go
+++ b/matrix/pushrules/pushrules.go
@@ -4,16 +4,16 @@ import (
 	"encoding/json"
 	"net/url"
 
-	"maunium.net/go/gomatrix"
+	"maunium.net/go/mautrix"
 )
 
 // GetPushRules returns the push notification rules for the global scope.
-func GetPushRules(client *gomatrix.Client) (*PushRuleset, error) {
+func GetPushRules(client *mautrix.Client) (*PushRuleset, error) {
 	return GetScopedPushRules(client, "global")
 }
 
 // GetScopedPushRules returns the push notification rules for the given scope.
-func GetScopedPushRules(client *gomatrix.Client, scope string) (resp *PushRuleset, err error) {
+func GetScopedPushRules(client *mautrix.Client, scope string) (resp *PushRuleset, err error) {
 	u, _ := url.Parse(client.BuildURL("pushrules", scope))
 	// client.BuildURL returns the URL without a trailing slash, but the pushrules endpoint requires the slash.
 	u.Path += "/"
@@ -21,19 +21,17 @@ func GetScopedPushRules(client *gomatrix.Client, scope string) (resp *PushRulese
 	return
 }
 
-// EventToPushRules converts a m.push_rules event to a PushRuleset by passing the data through JSON.
-func EventToPushRules(event *gomatrix.Event) (*PushRuleset, error) {
-	content, _ := event.Content["global"]
-	raw, err := json.Marshal(content)
-	if err != nil {
-		return nil, err
-	}
+type contentWithRuleset struct {
+	Ruleset *PushRuleset `json:"global"`
+}
 
-	ruleset := &PushRuleset{}
-	err = json.Unmarshal(raw, ruleset)
+// EventToPushRules converts a m.push_rules event to a PushRuleset by passing the data through JSON.
+func EventToPushRules(event *mautrix.Event) (*PushRuleset, error) {
+	content := &contentWithRuleset{}
+	err := json.Unmarshal(event.Content.VeryRaw, content)
 	if err != nil {
 		return nil, err
 	}
 
-	return ruleset, nil
+	return content.Ruleset, nil
 }