From 003a743e6767b3041c3a8321566c3586d73b399a Mon Sep 17 00:00:00 2001 From: Jeff Halter <868228+jhalter@users.noreply.github.com> Date: Sun, 29 May 2022 09:34:24 -0700 Subject: Refactor and cleanup --- hotline/server.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'hotline/server.go') diff --git a/hotline/server.go b/hotline/server.go index 3a58893..7b409d5 100644 --- a/hotline/server.go +++ b/hotline/server.go @@ -365,7 +365,7 @@ func (s *Server) DeleteUser(login string) error { delete(s.Accounts, login) - return os.Remove(s.ConfigDir + "Users/" + login + ".yaml") + return FS.Remove(s.ConfigDir + "Users/" + login + ".yaml") } func (s *Server) connectedUsers() []Field { @@ -538,9 +538,16 @@ func (s *Server) handleNewConnection(conn net.Conn) error { // assume simplified hotline v1.2.3 login flow that does not require agreement if *c.Version == nil { c.Agreed = true - if _, err := c.notifyNewUserHasJoined(); err != nil { - return err - } + + c.notifyOthers( + *NewTransaction( + tranNotifyChangeUser, nil, + NewField(fieldUserName, c.UserName), + NewField(fieldUserID, *c.ID), + NewField(fieldUserIconID, *c.Icon), + NewField(fieldUserFlags, *c.Flags), + ), + ) } c.Server.Stats.LoginCount += 1 -- cgit