From c5d9af5aa4d9fb20316be45ab1b775bcf61bcad5 Mon Sep 17 00:00:00 2001
From: Jeff Halter <868228+jhalter@users.noreply.github.com>
Date: Thu, 12 Aug 2021 19:00:13 -0700
Subject: More cleanup

---
 hotline/transaction_handlers.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'hotline/transaction_handlers.go')

diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go
index 46f96eb..d7a77e2 100644
--- a/hotline/transaction_handlers.go
+++ b/hotline/transaction_handlers.go
@@ -644,7 +644,7 @@ func HandleListUsers(cc *ClientConn, t *Transaction) (res []Transaction, err err
 	var userFields []Field
 	// TODO: make order deterministic
 	for _, acc := range cc.Server.Accounts {
-		userField := acc.Payload()
+		userField := acc.MarshalBinary()
 		userFields = append(userFields, NewField(fieldData, userField))
 	}
 
@@ -1240,7 +1240,10 @@ func HandleDownloadFolder(cc *ClientConn, t *Transaction) (res []Transaction, er
 	cc.Transfers[FolderDownload] = append(cc.Transfers[FolderDownload], fileTransfer)
 
 	var fp FilePath
-	fp.UnmarshalBinary(t.GetField(fieldFilePath).Data)
+	err = fp.UnmarshalBinary(t.GetField(fieldFilePath).Data)
+	if err != nil {
+		return res, err
+	}
 
 	fullFilePath := fmt.Sprintf("%v%v", cc.Server.Config.FileRoot+fp.String(), string(fileTransfer.FileName))
 	transferSize, err := CalcTotalSize(fullFilePath)
-- 
cgit