Clean up various linter warnings

[rbdr/mobius] / hotline / server.go

diff --git a/hotline/server.go b/hotline/server.go
index b4841a7beef26c3ef4ac0d86caa3eb8de43e4243..5245c7bdda3a2c368bad00d9da7ecbbddcb120b8 100644 (file)
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -4,6 +4,7 @@ import (
        "bufio"
        "bytes"
        "context"
        "bufio"
        "bytes"
        "context"

+       "crypto/rand"

        "encoding/binary"
        "errors"
        "fmt"
        "encoding/binary"
        "errors"
        "fmt"


@@ -15,7 +16,6 @@ import (
        "log"
        "log/slog"
        "math/big"
        "log"
        "log/slog"
        "math/big"

-       "math/rand"

        "net"
        "os"
        "path"
        "net"
        "os"
        "path"


@@ -92,12 +92,6 @@ type PrivateChat struct {
 }
 
 func (s *Server) ListenAndServe(ctx context.Context, cancelRoot context.CancelFunc) error {
 }
 
 func (s *Server) ListenAndServe(ctx context.Context, cancelRoot context.CancelFunc) error {

-       s.Logger.Info("Hotline server started",
-               "version", VERSION,
-               "API port", fmt.Sprintf("%s:%v", s.NetInterface, s.Port),
-               "Transfer port", fmt.Sprintf("%s:%v", s.NetInterface, s.Port+1),
-       )
-

        var wg sync.WaitGroup
 
        wg.Add(1)
        var wg sync.WaitGroup
 
        wg.Add(1)


@@ -252,7 +246,7 @@ func NewServer(configDir, netInterface string, netPort int, logger *slog.Logger,
        _ = server.loadBanList(filepath.Join(configDir, "Banlist.yaml"))
 
        if err := server.loadThreadedNews(filepath.Join(configDir, "ThreadedNews.yaml")); err != nil {
        _ = server.loadBanList(filepath.Join(configDir, "Banlist.yaml"))
 
        if err := server.loadThreadedNews(filepath.Join(configDir, "ThreadedNews.yaml")); err != nil {

-               return nil, err
+               return nil, fmt.Errorf("error loading threaded news: %w", err)

        }
 
        if err := server.loadConfig(filepath.Join(configDir, "config.yaml")); err != nil {
        }
 
        if err := server.loadConfig(filepath.Join(configDir, "config.yaml")); err != nil {


@@ -766,7 +760,8 @@ func (s *Server) NewPrivateChat(cc *ClientConn) []byte {
        defer s.PrivateChatsMu.Unlock()
 
        randID := make([]byte, 4)
        defer s.PrivateChatsMu.Unlock()
 
        randID := make([]byte, 4)

-       rand.Read(randID)
+       _, _ = rand.Read(randID)
+

        data := binary.BigEndian.Uint32(randID)
 
        s.PrivateChats[data] = &PrivateChat{
        data := binary.BigEndian.Uint32(randID)
 
        s.PrivateChats[data] = &PrivateChat{