1 files changed, 8 insertions(+), 10 deletions(-)

M 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,
 	})