From 1a1a01a8423a58c2c9f4906364631b160ec593eb Mon Sep 17 00:00:00 2001 From: ᴜɴᴋɴᴡᴏɴ Date: Wed, 19 May 2021 13:38:13 +0800 Subject: ci: use new lint action and add custom config (#6562) --- internal/cron/cron.go | 2 +- internal/db/action.go | 2 +- internal/db/models.go | 2 +- internal/db/ssh_key.go | 2 +- internal/db/webhook.go | 2 +- internal/db/webhook_dingtalk.go | 2 +- internal/db/webhook_discord.go | 2 +- internal/db/webhook_slack.go | 2 +- internal/httplib/httplib.go | 2 +- internal/markup/markup.go | 2 +- internal/markup/sanitizer.go | 2 +- internal/route/admin/admin.go | 2 +- internal/route/admin/notice.go | 2 +- internal/route/admin/orgs.go | 2 +- internal/route/api/v1/repo/branch.go | 4 ++-- internal/route/api/v1/repo/hook.go | 5 +++-- internal/route/repo/branch.go | 4 ++-- internal/route/repo/release.go | 2 +- 18 files changed, 22 insertions(+), 21 deletions(-) (limited to 'internal') diff --git a/internal/cron/cron.go b/internal/cron/cron.go index 9d45cd15..2228b6a4 100644 --- a/internal/cron/cron.go +++ b/internal/cron/cron.go @@ -11,8 +11,8 @@ import ( "github.com/gogs/cron" - "gogs.io/gogs/internal/db" "gogs.io/gogs/internal/conf" + "gogs.io/gogs/internal/db" ) var c = cron.New() diff --git a/internal/db/action.go b/internal/db/action.go index b44af9c7..292e936a 100644 --- a/internal/db/action.go +++ b/internal/db/action.go @@ -11,7 +11,7 @@ import ( "time" "unicode" - "github.com/json-iterator/go" + jsoniter "github.com/json-iterator/go" "github.com/unknwon/com" log "unknwon.dev/clog/v2" "xorm.io/xorm" diff --git a/internal/db/models.go b/internal/db/models.go index f80cad92..3c2b6280 100644 --- a/internal/db/models.go +++ b/internal/db/models.go @@ -227,7 +227,7 @@ func GetStatistic() (stats Statistic) { stats.Counter.HookTask, _ = x.Count(new(HookTask)) stats.Counter.Team, _ = x.Count(new(Team)) stats.Counter.Attachment, _ = x.Count(new(Attachment)) - return + return stats } func Ping() error { diff --git a/internal/db/ssh_key.go b/internal/db/ssh_key.go index 379c5b1d..2f783a9f 100644 --- a/internal/db/ssh_key.go +++ b/internal/db/ssh_key.go @@ -221,7 +221,7 @@ func SSHKeyGenParsePublicKey(key string) (string, int, error) { func SSHNativeParsePublicKey(keyLine string) (string, int, error) { fields := strings.Fields(keyLine) if len(fields) < 2 { - return "", 0, fmt.Errorf("not enough fields in public key line: %s", string(keyLine)) + return "", 0, fmt.Errorf("not enough fields in public key line: %s", keyLine) } raw, err := base64.StdEncoding.DecodeString(fields[1]) diff --git a/internal/db/webhook.go b/internal/db/webhook.go index 61602ef9..457fa6cb 100644 --- a/internal/db/webhook.go +++ b/internal/db/webhook.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "github.com/json-iterator/go" + jsoniter "github.com/json-iterator/go" gouuid "github.com/satori/go.uuid" log "unknwon.dev/clog/v2" "xorm.io/xorm" diff --git a/internal/db/webhook_dingtalk.go b/internal/db/webhook_dingtalk.go index e747ae14..13287f5e 100644 --- a/internal/db/webhook_dingtalk.go +++ b/internal/db/webhook_dingtalk.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/json-iterator/go" + jsoniter "github.com/json-iterator/go" "github.com/gogs/git-module" api "github.com/gogs/go-gogs-client" diff --git a/internal/db/webhook_discord.go b/internal/db/webhook_discord.go index 4725f867..f149b11e 100644 --- a/internal/db/webhook_discord.go +++ b/internal/db/webhook_discord.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/json-iterator/go" + jsoniter "github.com/json-iterator/go" "github.com/gogs/git-module" api "github.com/gogs/go-gogs-client" diff --git a/internal/db/webhook_slack.go b/internal/db/webhook_slack.go index f824e9bc..a42fb8d8 100644 --- a/internal/db/webhook_slack.go +++ b/internal/db/webhook_slack.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/json-iterator/go" + jsoniter "github.com/json-iterator/go" "github.com/gogs/git-module" api "github.com/gogs/go-gogs-client" diff --git a/internal/httplib/httplib.go b/internal/httplib/httplib.go index 1fca7fa7..1062d220 100644 --- a/internal/httplib/httplib.go +++ b/internal/httplib/httplib.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/json-iterator/go" + jsoniter "github.com/json-iterator/go" ) var defaultSetting = Settings{false, "GogsServer", 60 * time.Second, 60 * time.Second, nil, nil, nil, false} diff --git a/internal/markup/markup.go b/internal/markup/markup.go index ad9d7fa1..788708e7 100644 --- a/internal/markup/markup.go +++ b/internal/markup/markup.go @@ -216,7 +216,7 @@ func wrapImgWithLink(urlPrefix string, buf *bytes.Buffer, token html.Token) { buf.WriteString(`">`) if needPrepend { - src = strings.Replace(urlPrefix+string(src), " ", "%20", -1) + src = strings.Replace(urlPrefix+src, " ", "%20", -1) buf.WriteString(`