From d4642365730de3f823e861c2568f33c3b1ece499 Mon Sep 17 00:00:00 2001 From: wdvxdr Date: Tue, 28 Sep 2021 15:46:14 +0800 Subject: [PATCH] fix: make linter happy add db into skip-dirs --- .golangci.yml | 4 +++- coolq/bot.go | 20 +++++++++++--------- coolq/cqcode_test.go | 4 ++-- coolq/event.go | 3 ++- modules/config/config.go | 3 ++- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index d4470e1..4950c00 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -78,7 +78,9 @@ run: # concurrency: 4 # explicitly omit this value to fully utilize available resources. deadline: 5m issues-exit-code: 1 - tests: false + skip-dirs: + - db + tests: true # output configuration options output: diff --git a/coolq/bot.go b/coolq/bot.go index 0d2cbff..f87a5cf 100644 --- a/coolq/bot.go +++ b/coolq/bot.go @@ -88,7 +88,7 @@ func NewQQBot(cli *client.QQClient) *CQBot { lconf.Database = "gocq-database" } if lconf.Enable { - multiDB.UseDB(db.UseMongoDB(lconf.Uri, lconf.Database)) + multiDB.UseDB(db.UseMongoDB(lconf.URI, lconf.Database)) } } if err := multiDB.Open(); err != nil { @@ -317,7 +317,8 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen default: if session == nil && groupID != 0 { msg := bot.Client.SendGroupTempMessage(groupID, target, m) - if msg != nil { + if msg != nil { // nolint + // todo(Mrs4s) // id = bot.InsertTempMessage(target, msg) } break @@ -327,7 +328,8 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen log.Errorf("发送临时会话消息失败: %v", err) break } - if msg != nil { + if msg != nil { // nolint + // todo(Mrs4s) // id = bot.InsertTempMessage(target, msg) } } @@ -354,7 +356,7 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 { return ok }) msg := &db.StoredGroupMessage{ - ID: encodeMessageId(m.GroupCode, m.Id), + ID: encodeMessageID(m.GroupCode, m.Id), GlobalID: db.ToGlobalID(m.GroupCode, m.Id), SubType: "normal", Attribute: &db.StoredMessageAttribute{ @@ -377,7 +379,7 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 { reply := replyElem.(*message.ReplyElement) msg.SubType = "quote" msg.QuotedInfo = &db.QuotedInfo{ - PrevID: encodeMessageId(m.GroupCode, reply.ReplySeq), + PrevID: encodeMessageID(m.GroupCode, reply.ReplySeq), PrevGlobalID: db.ToGlobalID(m.GroupCode, reply.ReplySeq), QuotedContent: ToMessageContent(reply.Elements), } @@ -397,7 +399,7 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 { return ok }) msg := &db.StoredPrivateMessage{ - ID: encodeMessageId(m.Sender.Uin, m.Id), + ID: encodeMessageID(m.Sender.Uin, m.Id), GlobalID: db.ToGlobalID(m.Sender.Uin, m.Id), SubType: "normal", Attribute: &db.StoredMessageAttribute{ @@ -420,7 +422,7 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 { reply := replyElem.(*message.ReplyElement) msg.SubType = "quote" msg.QuotedInfo = &db.QuotedInfo{ - PrevID: encodeMessageId(reply.Sender, reply.ReplySeq), + PrevID: encodeMessageID(reply.Sender, reply.ReplySeq), PrevGlobalID: db.ToGlobalID(reply.Sender, reply.ReplySeq), QuotedContent: ToMessageContent(m.Elements), } @@ -594,8 +596,8 @@ func (bot *CQBot) uploadMedia(raw message.IMessageElement, target int64, group b return nil, errors.New("unsupported message element type") } -// encodeMessageId 临时先这样, 暂时用不上 -func encodeMessageId(target int64, seq int32) string { +// encodeMessageID 临时先这样, 暂时用不上 +func encodeMessageID(target int64, seq int32) string { return hex.EncodeToString(binary.NewWriterF(func(w *binary.Writer) { w.WriteUInt64(uint64(target)) w.WriteUInt32(uint32(seq)) diff --git a/coolq/cqcode_test.go b/coolq/cqcode_test.go index 5bde41a..08658aa 100644 --- a/coolq/cqcode_test.go +++ b/coolq/cqcode_test.go @@ -41,7 +41,7 @@ const bText = `123456789[]&987654321[]&987654321[]&987654321[]&987654321[]&98765 func BenchmarkCQCodeEscapeText(b *testing.B) { for i := 0; i < b.N; i++ { ret := bText - ret = CQCodeEscapeText(ret) + CQCodeEscapeText(ret) } } @@ -50,7 +50,7 @@ func BenchmarkCQCodeEscapeTextBefore(b *testing.B) { ret := bText ret = strings.ReplaceAll(ret, "&", "&") ret = strings.ReplaceAll(ret, "[", "[") - ret = strings.ReplaceAll(ret, "]", "]") + strings.ReplaceAll(ret, "]", "]") } } diff --git a/coolq/event.go b/coolq/event.go index 24a7157..d8974df 100644 --- a/coolq/event.go +++ b/coolq/event.go @@ -107,7 +107,8 @@ func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEven cqm := ToStringMessage(m.Elements, 0, true) bot.tempSessionCache.Store(m.Sender.Uin, e.Session) id := m.Id - if bot.db != nil { + if bot.db != nil { // nolint + // todo(Mrs4s) // id = bot.InsertTempMessage(m.Sender.Uin, m) } log.Infof("收到来自群 %v(%v) 内 %v(%v) 的临时会话消息: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm) diff --git a/modules/config/config.go b/modules/config/config.go index b6939cd..72a39b0 100644 --- a/modules/config/config.go +++ b/modules/config/config.go @@ -137,9 +137,10 @@ type LevelDBConfig struct { Enable bool `yaml:"enable"` } +// MongoDBConfig mongodb 相关配置 type MongoDBConfig struct { Enable bool `yaml:"enable"` - Uri string `yaml:"uri"` + URI string `yaml:"uri"` Database string `yaml:"database"` }