From 02b7762e415cf44acda9c5b44d89d57582e01b92 Mon Sep 17 00:00:00 2001
From: David Florness <david@florness.com>
Date: Sun, 14 Mar 2021 15:33:27 -0400
Subject: [PATCH] Set device name if it's changed

---
 cmd/tallyard/main.go | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/cmd/tallyard/main.go b/cmd/tallyard/main.go
index aa993b1..14ea30e 100644
--- a/cmd/tallyard/main.go
+++ b/cmd/tallyard/main.go
@@ -184,16 +184,6 @@ func debugEventHook(_ mautrix.EventSource, evt *event.Event) {
 }
 
 func setDeviceName(client *mautrix.Client, deviceID id.DeviceID) {
-	resp, err := client.GetDeviceInfo(deviceID)
-	if err != nil {
-		log.Debugf("couldn't get device %s info: %s", deviceID, err)
-		return
-	}
-	if resp.DisplayName != "" {
-		log.Debugf("device %s display name already set to '%s'", deviceID, resp.DisplayName)
-		// device name has already been set
-		return
-	}
 	displayName := fmt.Sprintf("tallyard %s", election.Version)
 	hostname, err := os.Hostname()
 	if err == nil {
@@ -202,6 +192,14 @@ func setDeviceName(client *mautrix.Client, deviceID id.DeviceID) {
 	} else {
 		log.Debugf("couldn't get hostname: %s", err)
 	}
+	resp, err := client.GetDeviceInfo(deviceID)
+	if err != nil {
+		log.Debugf("couldn't get device %s info: %s", deviceID, err)
+	} else if resp.DisplayName == displayName {
+		log.Debugf("device %s display name already set to '%s'", deviceID, displayName)
+		return
+	}
+	log.Debugf("setting display name of device %s to '%s'", deviceID, displayName)
 	err = client.SetDeviceInfo(deviceID, &mautrix.ReqDeviceInfo{
 		DisplayName: displayName,
 	})
-- 
2.38.4