diff --git a/plugin_diana/data/text.go b/plugin_diana/data/text.go index 0a1f2428..d32189f0 100644 --- a/plugin_diana/data/text.go +++ b/plugin_diana/data/text.go @@ -21,8 +21,8 @@ const ( var db = sql.Sqlite{DBPath: dbfile} -type Text struct { - Id int64 `db:"id"` +type text struct { + ID int64 `db:"id"` Data string `db:"data"` } @@ -35,7 +35,7 @@ func init() { } err = LoadText() if err == nil { - err = db.Create("text", &Text{}) + err = db.Create("text", &text{}) if err != nil { panic(err) } @@ -57,12 +57,12 @@ func LoadText() error { func AddText(txt string) error { s := md5.Sum(helper.StringToBytes(txt)) i := binary.LittleEndian.Uint64(s[:8]) - return db.Insert("text", &Text{Id: int64(i), Data: txt}) + return db.Insert("text", &text{ID: int64(i), Data: txt}) } // RandText 随机小作文 func RandText() string { - var t Text + var t text err := db.Pick("text", &t) if err != nil { return err.Error() @@ -72,7 +72,7 @@ func RandText() string { // HentaiText 发大病 func HentaiText() string { - var t Text + var t text err := db.Find("text", &t, "where id = -3802576048116006195") if err != nil { return err.Error() diff --git a/plugin_novel/qianbi.go b/plugin_novel/qianbi.go index 79ca3698..2d7438f4 100644 --- a/plugin_novel/qianbi.go +++ b/plugin_novel/qianbi.go @@ -54,14 +54,15 @@ func init() { ctx.SendChain(message.Text("少女祈祷中......")) login(username, password) searchKey := ctx.State["regex_matched"].([]string)[1] - searchHtml := search(searchKey) + searchHTML := search(searchKey) var m message.Message - doc, err := htmlquery.Parse(strings.NewReader(searchHtml)) + doc, err := htmlquery.Parse(strings.NewReader(searchHTML)) if err != nil { log.Errorln("[novel]", err) } htmlTitle := htmlquery.InnerText(htmlquery.FindOne(doc, "/html/head/title")) - if htmlTitle == websiteTitle { + switch htmlTitle { + case websiteTitle: list, err := htmlquery.QueryAll(doc, "//dl[@id='nr']") if err != nil { log.Errorln("[novel]", err) @@ -97,16 +98,16 @@ func init() { } } else { text := htmlquery.InnerText(htmlquery.FindOne(doc, "//div[@id='tipss']")) - text = strings.Replace(text, " ", "", -1) - text = strings.Replace(text, "本站", websiteURL, -1) + text = strings.ReplaceAll(text, " ", "") + text = strings.ReplaceAll(text, "本站", websiteURL) ctx.SendChain(message.Text(text)) } - } else if htmlTitle == errorTitle { + case errorTitle: ctx.SendChain(message.Text(errorTitle)) text := htmlquery.InnerText(htmlquery.FindOne(doc, "//div[@style='text-align: center;padding:10px']")) - text = strings.Replace(text, " ", "", -1) + text = strings.ReplaceAll(text, " ", "") ctx.SendChain(message.Text(text)) - } else { + default: bookName := htmlquery.SelectAttr(htmlquery.FindOne(doc, "//meta[@property='og:novel:book_name']"), "content") category := htmlquery.SelectAttr(htmlquery.FindOne(doc, "//meta[@property='og:novel:category']"), "content") author := htmlquery.SelectAttr(htmlquery.FindOne(doc, "//meta[@property='og:novel:author']"), "content") @@ -153,7 +154,7 @@ func login(username, password string) { defer loginResp.Body.Close() } -func search(searchKey string) (searchHtml string) { +func search(searchKey string) (searchHTML string) { searchKeyData, err := ub.UTF82GBK(helper.StringToBytes(searchKey)) if err != nil { log.Errorln("[novel]", err) @@ -181,6 +182,6 @@ func search(searchKey string) (searchHtml string) { if err != nil { log.Errorln("[novel]", err) } - searchHtml = helper.BytesToString(searchData) - return searchHtml + searchHTML = helper.BytesToString(searchData) + return searchHTML } diff --git a/plugin_shindan/shindan.go b/plugin_shindan/shindan.go index bbff45f3..62caf5ea 100644 --- a/plugin_shindan/shindan.go +++ b/plugin_shindan/shindan.go @@ -1,10 +1,3 @@ -/* - * @Author: Kanri - * @Date: 2021-10-15 21:23:14 - * @LastEditors: Kanri - * @LastEditTime: 2021-10-15 21:42:51 - * @Description: - */ // Package shindan 基于 https://shindanmaker.com 的测定小功能 package shindan diff --git a/plugin_tracemoe/moe.go b/plugin_tracemoe/moe.go index 2b08b36a..993a0917 100644 --- a/plugin_tracemoe/moe.go +++ b/plugin_tracemoe/moe.go @@ -1,3 +1,4 @@ +// Package tracemoe 搜番 package tracemoe import ( diff --git a/plugin_vtb_quotation/model/model.go b/plugin_vtb_quotation/model/model.go index ee179c37..cb9e6e85 100644 --- a/plugin_vtb_quotation/model/model.go +++ b/plugin_vtb_quotation/model/model.go @@ -96,12 +96,18 @@ func (vdb *VtbDB) GetAllFirstCategoryMessage() string { rows, err := db.Model(&FirstCategory{}).Rows() if err != nil { logrus.Errorln("[vtb/model]数据库读取错误", err) + return "" } if rows == nil { return "" } + defer rows.Close() for rows.Next() { - db.ScanRows(rows, &fc) + err = db.ScanRows(rows, &fc) + if err != nil { + logrus.Errorln("[vtb/model]数据库读取错误", err) + return "" + } // logrus.Println(fc) firstStepMessage = firstStepMessage + strconv.FormatInt(fc.FirstCategoryIndex, 10) + ". " + fc.FirstCategoryName + "\n" } diff --git a/utils/binary/encode.go b/utils/binary/encode.go index 125c13a2..a53de0d7 100644 --- a/utils/binary/encode.go +++ b/utils/binary/encode.go @@ -1,3 +1,4 @@ +// Package binary 数据处理 package binary import (