Clean up various linter warnings

[rbdr/mobius] / hotline / transaction_handlers.go

diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go
index 2d4eabdbf1cc478d5cf23e69fa027af6125e7d2d..0fb250f2cd60e761e62516dab9b93eabdffcafd0 100644 (file)
--- a/hotline/transaction_handlers.go
+++ b/hotline/transaction_handlers.go
@@ -1256,8 +1256,9 @@ func HandleNewNewsFldr(cc *ClientConn, t *Transaction) (res []Transaction, err e
 func HandleGetNewsArtNameList(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
        if !cc.Authorize(accessNewsReadArt) {
                res = append(res, cc.NewErrReply(t, "You are not allowed to read news."))
 func HandleGetNewsArtNameList(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
        if !cc.Authorize(accessNewsReadArt) {
                res = append(res, cc.NewErrReply(t, "You are not allowed to read news."))

-               return res, err
+               return res, nil

        }
        }

+

        pathStrs := ReadNewsPath(t.GetField(FieldNewsPath).Data)
 
        var cat NewsCategoryListData15
        pathStrs := ReadNewsPath(t.GetField(FieldNewsPath).Data)
 
        var cat NewsCategoryListData15


@@ -1272,11 +1273,11 @@ func HandleGetNewsArtNameList(cc *ClientConn, t *Transaction) (res []Transaction
 
        b, err := io.ReadAll(&nald)
        if err != nil {
 
        b, err := io.ReadAll(&nald)
        if err != nil {

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

        }
 
        res = append(res, cc.NewReply(t, NewField(FieldNewsArtListData, b)))
        }
 
        res = append(res, cc.NewReply(t, NewField(FieldNewsArtListData, b)))

-       return res, err
+       return res, nil

 }
 
 // HandleGetNewsArtData requests information about the specific news article.
 }
 
 // HandleGetNewsArtData requests information about the specific news article.


@@ -1763,13 +1764,13 @@ func HandleGetFileNameList(cc *ClientConn, t *Transaction) (res []Transaction, e
                nil,
        )
        if err != nil {
                nil,
        )
        if err != nil {

-               return res, err
+               return res, fmt.Errorf("error reading file path: %w", err)

        }
 
        var fp FilePath
        if t.GetField(FieldFilePath).Data != nil {
                if _, err = fp.Write(t.GetField(FieldFilePath).Data); err != nil {
        }
 
        var fp FilePath
        if t.GetField(FieldFilePath).Data != nil {
                if _, err = fp.Write(t.GetField(FieldFilePath).Data); err != nil {

-                       return res, err
+                       return res, fmt.Errorf("error writing file path: %w", err)

                }
        }
 
                }
        }
 


@@ -1781,7 +1782,7 @@ func HandleGetFileNameList(cc *ClientConn, t *Transaction) (res []Transaction, e
 
        fileNames, err := getFileNameList(fullPath, cc.Server.Config.IgnoreFiles)
        if err != nil {
 
        fileNames, err := getFileNameList(fullPath, cc.Server.Config.IgnoreFiles)
        if err != nil {

-               return res, err
+               return res, fmt.Errorf("getFileNameList: %w", err)

        }
 
        res = append(res, cc.NewReply(t, fileNames...))
        }
 
        res = append(res, cc.NewReply(t, fileNames...))