From d0c0af811e89e0020aa95080c589724885a71a3e Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Sun, 7 Apr 2019 23:21:48 +0300
Subject: Fix syncing preferences from account data

---
 matrix/matrix.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'matrix')

diff --git a/matrix/matrix.go b/matrix/matrix.go
index f19fa24..b9816f2 100644
--- a/matrix/matrix.go
+++ b/matrix/matrix.go
@@ -262,9 +262,15 @@ func (c *Container) Start() {
 }
 
 func (c *Container) HandlePreferences(source EventSource, evt *mautrix.Event) {
+	if source&EventSourceAccountData == 0 {
+		return
+	}
 	orig := c.config.Preferences
-	rt, _ := json.Marshal(&evt.Content)
-	json.Unmarshal(rt, &c.config.Preferences)
+	err := json.Unmarshal(evt.Content.VeryRaw, &c.config.Preferences)
+	if err != nil {
+		debug.Print("Failed to parse updated preferences:", err)
+		return
+	}
 	debug.Print("Updated preferences:", orig, "->", c.config.Preferences)
 	c.ui.HandleNewPreferences()
 }
-- 
cgit v1.2.3-70-g09d2