X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/d005ef04cfaa26943e6dd33807d741577ffb232a..548d4bb93fe32d24b3fbc491a01e5c6127be9289:/hotline/server.go

diff --git a/hotline/server.go b/hotline/server.go
index f4a2ad4..4b36cf6 100644
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -11,7 +11,6 @@ import (
 	"gopkg.in/yaml.v3"
 	"io"
 	"io/fs"
-	"io/ioutil"
 	"math/big"
 	"math/rand"
 	"net"
@@ -210,7 +209,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),
@@ -224,7 +223,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),
 	}
 
@@ -339,7 +338,7 @@ func (s *Server) writeBanList() error {
 	if err != nil {
 		return err
 	}
-	err = ioutil.WriteFile(
+	err = os.WriteFile(
 		filepath.Join(s.ConfigDir, "Banlist.yaml"),
 		out,
 		0666,
@@ -1210,7 +1209,7 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
 						return err
 					}
 
-					if err := receiveFile(rwc, file, ioutil.Discard, ioutil.Discard, fileTransfer.bytesSentCounter); err != nil {
+					if err := receiveFile(rwc, file, io.Discard, io.Discard, fileTransfer.bytesSentCounter); err != nil {
 						s.Logger.Error(err)
 					}