X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/0da28a1fe47ffc60e40aeca9dddd7ab37e52a999..926c7f5505456a0900e9c49f6c08efebe9a53505:/hotline/transaction_handlers.go

diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go
index 7f29d73..650aae0 100644
--- a/hotline/transaction_handlers.go
+++ b/hotline/transaction_handlers.go
@@ -698,8 +698,13 @@ func HandleListUsers(cc *ClientConn, t *Transaction) (res []Transaction, err err
 
 	var userFields []Field
 	for _, acc := range cc.Server.Accounts {
-		userField := acc.MarshalBinary()
-		userFields = append(userFields, NewField(fieldData, userField))
+		b := make([]byte, 0, 100)
+		n, err := acc.Read(b)
+		if err != nil {
+			return res, err
+		}
+
+		userFields = append(userFields, NewField(fieldData, b[:n]))
 	}
 
 	res = append(res, cc.NewReply(t, userFields...))
@@ -1782,7 +1787,10 @@ func HandleLeaveChat(cc *ClientConn, t *Transaction) (res []Transaction, err err
 	chatID := t.GetField(fieldChatID).Data
 	chatInt := binary.BigEndian.Uint32(chatID)
 
-	privChat := cc.Server.PrivateChats[chatInt]
+	privChat, ok := cc.Server.PrivateChats[chatInt]
+	if !ok {
+		return res, nil
+	}
 
 	delete(privChat.ClientConn, cc.uint16ID())