From 9cf66aeafbcbb9237fedc2efc97cc2856eb60f7f Mon Sep 17 00:00:00 2001 From: Jeff Halter <868228+jhalter@users.noreply.github.com> Date: Sun, 9 Jun 2024 13:56:29 -0700 Subject: Convert more bespoke methods to io.Reader/io.Writer interfaces --- hotline/client.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'hotline/client.go') diff --git a/hotline/client.go b/hotline/client.go index e056438..3969e26 100644 --- a/hotline/client.go +++ b/hotline/client.go @@ -405,11 +405,12 @@ func handleClientGetUserNameList(ctx context.Context, c *Client, t *Transaction) // fields, but shxd sneaks in FieldChatSubject (115) so it's important to filter explicitly for the expected // field type. Probably a good idea to do everywhere. if bytes.Equal(field.ID, []byte{0x01, 0x2c}) { - u, err := ReadUser(field.Data) - if err != nil { - return res, err + var user User + if _, err := user.Write(field.Data); err != nil { + return res, fmt.Errorf("unable to read user data: %w", err) } - users = append(users, *u) + + users = append(users, user) } } c.UserList = users -- cgit