Use more generic sync process in headless mode

headless/headless.go

@@ -1,7 +1,6 @@
 package headless
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -69,24 +68,10 @@ func Init(conf Config, updates chan fmt.Stringer) error {
 	updates <- configuredDisplayMode{}
 
 	// sync
-	updates <- beginningSync{}
+	updates <- creatingSyncer{}
-	resp, err := gmx.Matrix().Client().FullSyncRequest(mautrix.ReqSync{
-		Timeout:        30000,
-		Since:          "",
-		FilterID:       "",
-		FullState:      true,
-		SetPresence:    gmx.Matrix().Client().SyncPresence,
-		Context:        context.Background(),
-		StreamResponse: true,
-	})
-	if err != nil {
-		return err
-	}
-	updates <- fetchedSyncData{}
-
 	gmx.Matrix().(*matrix.Container).InitSyncer()
-	updates <- processingSync{}
+	updates <- synchronizing{}
-	err = gmx.Matrix().(*matrix.Container).ProcessSyncResponse(resp, "")
+	err = gmx.Matrix().Client().Sync()
 	if err != nil {
 		return err
 	}

headless/msg.go

@@ -32,22 +32,16 @@ func (msg configuredDisplayMode) String() string {
 	return "Configured display mode…"
 }
 
-type beginningSync struct{}
+type creatingSyncer struct{}
 
-func (msg beginningSync) String() string {
+func (msg creatingSyncer) String() string {
-	return "Beginning the sync process…"
+	return "Initializing sync utilities…"
 }
 
-type fetchedSyncData struct{}
+type synchronizing struct{}
 
-func (msg fetchedSyncData) String() string {
+func (msg synchronizing) String() string {
-	return "Fetched sync data…"
+	return "Synchronizing…"
-}
-
-type processingSync struct{}
-
-func (msg processingSync) String() string {
-	return "Processing sync response…"
 }
 
 type syncFinished struct{}

matrix/matrix.go

@@ -439,6 +439,11 @@ func (c *Container) InitSyncer() {
 		runtime.GC()
 		dbg.FreeOSMemory()
 	}
+	if c.headless {
+		c.syncer.FirstDoneCallback = func() {
+			c.Stop()
+		}
+	}
 
 	c.client.Syncer = c.syncer
 }