From 00890a0fea507c4a64d143fc4db42632e7b410ee Mon Sep 17 00:00:00 2001 From: jmq <296806834@qq.com> Date: Fri, 1 Sep 2023 20:50:25 +0800 Subject: [PATCH] refactor: rename Rules to userRules;fix go lint errors --- auth/hook.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/auth/hook.go b/auth/hook.go index f05e3b74..5850ada8 100644 --- a/auth/hook.go +++ b/auth/hook.go @@ -3,7 +3,6 @@ package auth import ( "encoding/json" "fmt" - "github.com/filebrowser/filebrowser/v2/rules" "log" "net/http" "os" @@ -12,6 +11,7 @@ import ( "github.com/filebrowser/filebrowser/v2/errors" "github.com/filebrowser/filebrowser/v2/files" + "github.com/filebrowser/filebrowser/v2/rules" "github.com/filebrowser/filebrowser/v2/settings" "github.com/filebrowser/filebrowser/v2/users" ) @@ -310,11 +310,11 @@ func (hf *hookFields) GetRules(k string, dv []rules.Rule) []rules.Rule { if !ok { return dv } - var Rules []rules.Rule - err := json.Unmarshal([]byte(val), &Rules) + var userRules []rules.Rule + err := json.Unmarshal([]byte(val), &userRules) if err != nil { log.Printf("hook: json format in user.perm.rules is incorrect. %s", err) return dv } - return Rules + return userRules }