patch: v0.10.24

[rbdr/mobius] / hotline / server.go

diff --git a/hotline/server.go b/hotline/server.go
index a3508b20d1035aed9b5d3ff51c5ea20e518a4f47..bfc1c1165eee685a77e0891f89e9fede96c4a721 100644 (file)
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -27,8 +27,6 @@ var contextKeyReq = contextKey("req")
 
 type requestCtx struct {
        remoteAddr string
-       login      string
-       name       string
 }
 
 type Server struct {
@@ -105,7 +103,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 +206,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 +220,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),
        }
 
@@ -314,7 +311,7 @@ func (s *Server) keepaliveHandler() {
                                c.Idle = true
 
                                flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(c.Flags)))
-                               flagBitmap.SetBit(flagBitmap, userFlagAway, 1)
+                               flagBitmap.SetBit(flagBitmap, UserFlagAway, 1)
                                binary.BigEndian.PutUint16(c.Flags, uint16(flagBitmap.Int64()))
 
                                c.sendAll(
@@ -740,7 +737,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),