From d1052e81716762e853cca3c8f00e5db74890a98d Mon Sep 17 00:00:00 2001
From: David Florness <david@florness.com>
Date: Sun, 13 Mar 2022 13:48:12 -0400
Subject: [PATCH] Actually use custom syncer and fix inheritance from
 DefaultSyncer

I forgot to actually use the new tallyard syncer in 1e94d712 (making that commit
essentially a no-op).

Also, we want to make sure we correctly initialize the custom syncer with
NewDefaultSyncer, which sets important values like ParseEventContent.

Fixes: 1e94d712
---
 cmd/tallyard/main.go   |  3 ++-
 cmd/tallyard/syncer.go | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/cmd/tallyard/main.go b/cmd/tallyard/main.go
index 8e14a4b..3eb58f4 100644
--- a/cmd/tallyard/main.go
+++ b/cmd/tallyard/main.go
@@ -52,6 +52,8 @@ func main() {
 	}
 
 	client, err := mautrix.NewClient(authInfo.Homeserver, authInfo.UserID, authInfo.AccessToken)
+	syncer := NewTallyardSyncer()
+	client.Syncer = syncer
 	client.Logger = TallyardLogger{}
 	if err != nil {
 		log.Panic(err)
@@ -67,7 +69,6 @@ func main() {
 	client.Store = matrix.NewTallyardStore(electionsMap)
 	defer electionsMap.Save()
 
-	syncer := client.Syncer.(*mautrix.DefaultSyncer)
 	syncer.OnEvent(debugEventHook)
 	syncer.OnEvent(client.Store.(*matrix.TallyardStore).UpdateState)
 	electionsMap.SetupEventHooks(client, syncer)
diff --git a/cmd/tallyard/syncer.go b/cmd/tallyard/syncer.go
index 58e016a..eba3352 100644
--- a/cmd/tallyard/syncer.go
+++ b/cmd/tallyard/syncer.go
@@ -5,6 +5,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	"maunium.net/go/mautrix"
+	"maunium.net/go/mautrix/event"
 )
 
 type TallyardSyncer struct {
@@ -16,3 +17,18 @@ func (s *TallyardSyncer) OnFailedSync(res *mautrix.RespSync, err error) (time.Du
 	log.Warnf("encountered sync error; retrying in %s: %s", sleepDuration, err)
 	return sleepDuration, nil
 }
+
+func NewTallyardSyncer() *TallyardSyncer {
+	t := &TallyardSyncer{
+		mautrix.NewDefaultSyncer(),
+	}
+	t.ParseErrorHandler = func(evt *event.Event, err error) bool {
+		if evt == nil {
+			log.Debugf("a parse error occurred for nil event: %s", err)
+		} else {
+			log.Debugf("a parse error occurred for event %s: %s", evt.ID, err)
+		}
+		return false
+	}
+	return t
+}
-- 
2.38.4