diff options
Diffstat (limited to 'hotline/server.go')
| -rw-r--r-- | hotline/server.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hotline/server.go b/hotline/server.go index 30121a6..4e2bde2 100644 --- a/hotline/server.go +++ b/hotline/server.go @@ -169,7 +169,7 @@ func (s *Server) Serve(ctx context.Context, cancelRoot context.CancelFunc, ln ne } const ( - agreementFile = "Agreement.txt" + agreementFile = "Agreement.txt" ) // NewServer constructs a new Server from a config dir @@ -377,7 +377,7 @@ func (s *Server) connectedUsers() []Field { defer s.mux.Unlock() var connectedUsers []Field - for _, c := range s.Clients { + for _, c := range sortedClients(s.Clients) { user := User{ ID: *c.ID, Icon: *c.Icon, @@ -993,7 +993,6 @@ func transferFile(conn net.Conn, dst string) error { } } - // sortedClients is a utility function that takes a map of *ClientConn and returns a sorted slice of the values. // The purpose of this is to ensure that the ordering of client connections is deterministic so that test assertions work. func sortedClients(unsortedClients map[uint16]*ClientConn) (clients []*ClientConn) { |