X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/7152b7e59b6e30d3025cf5c6386eb2e54b95c139..c8bfd6061f5079f6c6c0155a2de1e8cd32d8a39a:/hotline/server.go diff --git a/hotline/server.go b/hotline/server.go index a3508b2..500087a 100644 --- a/hotline/server.go +++ b/hotline/server.go @@ -105,7 +105,6 @@ func (s *Server) ListenAndServe(ctx context.Context, cancelRoot context.CancelFu ln, err := net.Listen("tcp", fmt.Sprintf("%s:%v", "", s.Port+1)) if err != nil { s.Logger.Fatal(err) - } s.Logger.Fatal(s.ServeFileTransfers(ctx, ln)) @@ -209,7 +208,7 @@ const ( ) // NewServer constructs a new Server from a config dir -func NewServer(configDir string, netPort int, logger *zap.SugaredLogger, FS FileStore) (*Server, error) { +func NewServer(configDir string, netPort int, logger *zap.SugaredLogger, fs FileStore) (*Server, error) { server := Server{ Port: netPort, Accounts: make(map[string]*Account), @@ -223,7 +222,7 @@ func NewServer(configDir string, netPort int, logger *zap.SugaredLogger, FS File outbox: make(chan Transaction), Stats: &Stats{Since: time.Now()}, ThreadedNews: &ThreadedNews{}, - FS: FS, + FS: fs, banList: make(map[string]*time.Time), } @@ -740,7 +739,7 @@ func (s *Server) NewPrivateChat(cc *ClientConn) []byte { randID := make([]byte, 4) rand.Read(randID) - data := binary.BigEndian.Uint32(randID[:]) + data := binary.BigEndian.Uint32(randID) s.PrivateChats[data] = &PrivateChat{ ClientConn: make(map[uint16]*ClientConn),