From d6f111320161bc9662de9e9c7ff75d94beb5a371 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 20 Nov 2021 05:35:43 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E6=94=B9=E8=BF=9B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin_vtb_quotation/cron.go | 7 ++++--- plugin_vtb_quotation/firstVtb/firstVtb.go | 13 +++++++------ plugin_vtb_quotation/secondVtb/secondVtb.go | 14 +++++++------- plugin_vtb_quotation/vtb_quotation.go | 20 +++++++++----------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/plugin_vtb_quotation/cron.go b/plugin_vtb_quotation/cron.go index 9514c248..dce664c1 100644 --- a/plugin_vtb_quotation/cron.go +++ b/plugin_vtb_quotation/cron.go @@ -1,12 +1,13 @@ package plugin_vtb_quotation import ( - "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/firstVtb" - "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/model" - "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/secondVtb" "github.com/fumiama/cron" log "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" + + "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/firstVtb" + "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/model" + "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/secondVtb" ) var ( diff --git a/plugin_vtb_quotation/firstVtb/firstVtb.go b/plugin_vtb_quotation/firstVtb/firstVtb.go index 755ad519..686fdc93 100644 --- a/plugin_vtb_quotation/firstVtb/firstVtb.go +++ b/plugin_vtb_quotation/firstVtb/firstVtb.go @@ -1,15 +1,17 @@ package firstVtb import ( - "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/model" - "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/utils" - "github.com/jinzhu/gorm" - log "github.com/sirupsen/logrus" - "github.com/tidwall/gjson" "io/ioutil" "net/http" "strconv" "strings" + + "github.com/jinzhu/gorm" + log "github.com/sirupsen/logrus" + "github.com/tidwall/gjson" + + "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/model" + "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/utils" ) var vtbUrl = "https://vtbkeyboard.moe/api/get_vtb_list" @@ -70,7 +72,6 @@ func DealVtbListStr(vtbListStr string) []string { }) } uidList = append(uidList, fc.FirstCategoryUid) - } log.Println(uidList) diff --git a/plugin_vtb_quotation/secondVtb/secondVtb.go b/plugin_vtb_quotation/secondVtb/secondVtb.go index ab109e24..a783fd23 100644 --- a/plugin_vtb_quotation/secondVtb/secondVtb.go +++ b/plugin_vtb_quotation/secondVtb/secondVtb.go @@ -1,15 +1,17 @@ package secondVtb import ( - "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/model" - "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/utils" - "github.com/jinzhu/gorm" - log "github.com/sirupsen/logrus" - "github.com/tidwall/gjson" "io/ioutil" "net/http" "strconv" "strings" + + "github.com/jinzhu/gorm" + log "github.com/sirupsen/logrus" + "github.com/tidwall/gjson" + + "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/model" + "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/utils" ) func GetVtbStr(uid string) string { @@ -38,7 +40,6 @@ func GetVtbStr(uid string) string { } log.Println(vtbListStr) return vtbListStr - } func DealVtbStr(vtbStr, uid string) { @@ -104,5 +105,4 @@ func DealVtbStr(vtbStr, uid string) { } } } - } diff --git a/plugin_vtb_quotation/vtb_quotation.go b/plugin_vtb_quotation/vtb_quotation.go index 74ef3c4e..107a2954 100644 --- a/plugin_vtb_quotation/vtb_quotation.go +++ b/plugin_vtb_quotation/vtb_quotation.go @@ -2,18 +2,20 @@ package plugin_vtb_quotation import ( "fmt" - "github.com/FloatTech/ZeroBot-Plugin/control" - "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/model" - "github.com/jinzhu/gorm" - _ "github.com/logoove/sqlite" - log "github.com/sirupsen/logrus" - zero "github.com/wdvxdr1123/ZeroBot" - "github.com/wdvxdr1123/ZeroBot/message" "net/url" "regexp" "strconv" "strings" "time" + + "github.com/jinzhu/gorm" + _ "github.com/logoove/sqlite" + log "github.com/sirupsen/logrus" + zero "github.com/wdvxdr1123/ZeroBot" + "github.com/wdvxdr1123/ZeroBot/message" + + "github.com/FloatTech/ZeroBot-Plugin/control" + "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/model" ) var ( @@ -73,7 +75,6 @@ func init() { ctx.SendChain(message.Reply(e.MessageID), message.Text(SecondStepMessage)) step++ } - } } else if step == 2 { secondIndex, err = strconv.Atoi(e.RawMessage) @@ -93,7 +94,6 @@ func init() { ctx.SendChain(message.Reply(e.MessageID), message.Text(ThirdStepMessage)) step++ } - } } else if step == 3 { thirdIndex, err = strconv.Atoi(e.RawMessage) @@ -124,7 +124,6 @@ func init() { cancel() return } - } } case <-time.After(time.Second * 60): @@ -156,6 +155,5 @@ func init() { ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("请欣赏"+fc.FirstCategoryName+"的《"+tc.ThirdCategoryName+"》")) ctx.SendChain(message.Record(recordUrl)) } - }) }