✨ 更新 zb 到 v1.4.1

README.md

@@ -122,6 +122,8 @@ zerobot -h -t token -u url [-d|w] [-g] qq1 qq2 qq3 ...
 - **搜图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_saucenao"`
     - [x] 以图搜图|搜索图片|以图识图[图片]
     - [x] 搜图[P站图片ID]
+- **搜番** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_tracemoe"`
+    - [x] 搜番|搜索番剧[图片]
 - **随机图片与AI点评** `github.com/FloatTech/ZeroBot-Plugin/plugin_acgimage`
     - [x] 随机图片(评级大于6的图将私发)
     - [x] 直接随机(无r18检测，务必小心，仅管理可用)

control/web/gui.go

@@ -1,4 +1,4 @@
-package web
+package webctrl
 
 import (
 	"encoding/json"
@@ -36,8 +36,8 @@ var (
 type logWriter struct {
 }
 
-// initGui 初始化gui
-func initGui() {
+// InitGui 初始化gui
+func InitGui() {
 	// 将日志重定向到前端hook
 	writer := io.MultiWriter(l, os.Stderr)
 	log.SetOutput(writer)

control/web/init.go

@@ -1,11 +0,0 @@
-// Package web 网页管理后端
-package web
-
-import "flag"
-
-func init() {
-	// 解析命令行参数，输入 `-g` 即可启用 gui
-	if *flag.Bool("g", false, "Enable web gui.") {
-		initGui()
-	}
-}

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/fogleman/gg v1.3.0
 	github.com/fumiama/cron v1.3.0
 	github.com/fumiama/go-base16384 v1.2.1
+	github.com/fumiama/gotracemoe v0.0.3
 	github.com/gin-gonic/gin v1.7.4
 	github.com/golang/protobuf v1.5.2
 	github.com/gorilla/websocket v1.4.2
@@ -17,6 +18,6 @@ require (
 	github.com/sirupsen/logrus v1.8.1
 	github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
 	github.com/tidwall/gjson v1.11.0
-	github.com/wdvxdr1123/ZeroBot v1.4.0
+	github.com/wdvxdr1123/ZeroBot v1.4.1
 	modernc.org/sqlite v1.13.3
 )

go.sum

@@ -31,6 +31,8 @@ github.com/fumiama/cron v1.3.0 h1:ZWlwuexF+HQHl3cYytEE5HNwD99q+3vNZF1GrEiXCFo=
 github.com/fumiama/cron v1.3.0/go.mod h1:bz5Izvgi/xEUI8tlBN8BI2jr9Moo8N4or0KV8xXuPDY=
 github.com/fumiama/go-base16384 v1.2.1 h1:6OGprW8g/95m2ocmryHi8mipZ7bx9StFMZDKEqLvMiA=
 github.com/fumiama/go-base16384 v1.2.1/go.mod h1:1HTC0QFL7BjS0DuO5Qm+fBYKQkHqmAapLbRpCxrhPXQ=
+github.com/fumiama/gotracemoe v0.0.3 h1:iI5EbE9A3UUbfukG6+/soYPjp1S31eCNYf4tw7s6/Jc=
+github.com/fumiama/gotracemoe v0.0.3/go.mod h1:tyqahdUzHf0bQIAVY/GYmDWvYYe5ik1ZbhnGYh+zl40=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.7.4 h1:QmUZXrvJ9qZ3GfWvQ+2wnW/1ePrTEJqPKMYEU3lD/DM=
@@ -93,8 +95,6 @@ github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6O
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
 github.com/shirou/gopsutil v3.21.8+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shirou/gopsutil v3.21.9+incompatible h1:LTLpUnfX81MkHeCtSrwNKZwuW5Id6kCa7/P43NdcNn4=
-github.com/shirou/gopsutil v3.21.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil v3.21.10+incompatible h1:AL2kpVykjkqeN+MFe1WcwSBVUjGjvdU8/ubvCuXAjrU=
 github.com/shirou/gopsutil v3.21.10+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
@@ -114,8 +114,6 @@ github.com/tdf1939/ZeroBot-Plugin-Gif v0.0.0-20210828060956-389b1dc33652/go.mod
 github.com/tdf1939/img v0.0.0-20210827153520-90cb4e9580a3/go.mod h1:FgTEOcosTWrkOr7++gbtPSj1rX5loRWrf/AL+hm3Cnw=
 github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
 github.com/tidwall/gjson v1.9.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
-github.com/tidwall/gjson v1.10.2 h1:APbLGOM0rrEkd8WBw9C24nllro4ajFuJu0Sc9hRz8Bo=
-github.com/tidwall/gjson v1.10.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/gjson v1.11.0 h1:C16pk7tQNiH6VlCrtIXL1w8GaOsi1X3W8KDkE1BuYd4=
 github.com/tidwall/gjson v1.11.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
@@ -135,10 +133,11 @@ github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLY
 github.com/wdvxdr1123/ZeroBot v1.2.2/go.mod h1:83nHtG8V5TAxPwH/LCDxLpZk4khIgs29dkr5TBWf7fc=
 github.com/wdvxdr1123/ZeroBot v1.2.3/go.mod h1:83nHtG8V5TAxPwH/LCDxLpZk4khIgs29dkr5TBWf7fc=
 github.com/wdvxdr1123/ZeroBot v1.2.4/go.mod h1:83nHtG8V5TAxPwH/LCDxLpZk4khIgs29dkr5TBWf7fc=
-github.com/wdvxdr1123/ZeroBot v1.3.2 h1:EFZNb3awNbwxRtmDkWv3PH6Z9rUV6ZLFa3hBmRMRRCA=
 github.com/wdvxdr1123/ZeroBot v1.3.2/go.mod h1:i2DIqQjtjE+3gvVi9r9sc+QpNaUuyTXx/HNXXayIpwI=
 github.com/wdvxdr1123/ZeroBot v1.4.0 h1:7ea6wIlaFtVPOgR77N3w2lWlV6zIxB37CnOzEjBd9Tc=
 github.com/wdvxdr1123/ZeroBot v1.4.0/go.mod h1:i2DIqQjtjE+3gvVi9r9sc+QpNaUuyTXx/HNXXayIpwI=
+github.com/wdvxdr1123/ZeroBot v1.4.1 h1:fk/8RH2D1gB3YeC1eI/SZi/kG31Rh7Z8lAiDc60VZFM=
+github.com/wdvxdr1123/ZeroBot v1.4.1/go.mod h1:7t9m4vDZPwWAmzKlhP6IvUoisOIiqNdm/3AJgiY3+ew=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

main.go

@@ -10,7 +10,7 @@ import (
 	// 下列插件可与 wdvxdr1123/ZeroBot v1.1.2 以上配合单独使用
 
 	// 插件控制
-	// _ "github.com/FloatTech/ZeroBot-Plugin/control/web" // web 后端控制
+	// webctrl "github.com/FloatTech/ZeroBot-Plugin/control/web" // web 后端控制
 
 	// 词库类
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_atri"      // ATRI词库
@@ -48,6 +48,7 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_lolicon"      // lolicon 随机图片
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_saucenao"     // 以图搜图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_setutime"     // 来份涩图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_tracemoe"     // 搜番
 
 	// 以下为内置依赖，勿动
 	"github.com/sirupsen/logrus"
@@ -73,10 +74,14 @@ func init() {
 	d := flag.Bool("d", false, "Enable debug level log and higher.")
 	w := flag.Bool("w", false, "Enable warning level log and higher.")
 	h := flag.Bool("h", false, "Display this help.")
+	// 解析命令行参数，输入 `-g` 即可启用 gui
+	// g := flag.Bool("g", false, "Enable web gui.")
+
 	// 直接写死 AccessToken 时，请更改下面第二个参数
 	token = flag.String("t", "", "Set AccessToken of WSClient.")
 	// 直接写死 URL 时，请更改下面第二个参数
 	url = flag.String("u", "ws://127.0.0.1:6700", "Set Url of WSClient.")
+
 	flag.Parse()
 	if *h {
 		printBanner()
@@ -91,6 +96,10 @@ func init() {
 			logrus.SetLevel(logrus.WarnLevel)
 		}
 	}
+	// 解析命令行参数，输入 `-g` 即可启用 gui
+	// if *g {
+	// 	webctrl.InitGui()
+	// }
 }
 
 func printBanner() {

plugin_fortune/fortune.go

@@ -83,7 +83,7 @@ func init() {
 				dlmu.Lock()
 				if file.IsNotExist(mikuji) {
 					ctx.SendChain(message.Text("正在下载签文文件，请稍后..."))
-					err := file.DownloadTo(site+"运势签文.json", mikuji)
+					err := file.DownloadTo(site+"运势签文.json", mikuji, false)
 					if err != nil {
 						ctx.SendChain(message.Text("ERROR: ", err))
 						return
@@ -98,7 +98,7 @@ func init() {
 				dlmu.Lock()
 				if file.IsNotExist(ttf) {
 					ctx.SendChain(message.Text("正在下载字体文件，请稍后..."))
-					err := file.DownloadTo(site+"sakura.ttf", ttf)
+					err := file.DownloadTo(site+"sakura.ttf", ttf, false)
 					if err != nil {
 						ctx.SendChain(message.Text("ERROR: ", err))
 						return
@@ -126,7 +126,7 @@ func init() {
 					ctx.SendChain(message.Text("正在下载背景图片，请稍后..."))
 					zipfile := kind + ".zip"
 					zipcache := base + zipfile
-					err := file.DownloadTo(site+zipfile, zipcache)
+					err := file.DownloadTo(site+zipfile, zipcache, false)
 					if err != nil {
 						ctx.SendChain(message.Text("ERROR: ", err))
 						return

plugin_lolicon/lolicon.go

@@ -4,6 +4,7 @@ package lolicon
 import (
 	"io/ioutil"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/tidwall/gjson"
@@ -49,7 +50,7 @@ func init() {
 						continue
 					}
 					url := json.Get("data.0.urls.original").Str
-					ctx.SendGroupMessage(0, message.Image(url))
+					ctx.SendGroupMessage(0, message.Image(strings.ReplaceAll(url, "i.pixiv.cat", "i.pixiv.re")))
 					queue <- url
 				}
 			}()

plugin_qingyunke/qingyunke.go

@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"math/rand"
 	"net/http"
+	"net/url"
 	"regexp"
 	"strconv"
 	"strings"
@@ -98,13 +99,13 @@ type dataQYK struct {
 
 // 青云客取消息
 func getMessage(msg string) (string, error) {
-	url := "http://api.qingyunke.com/api.php"
+	qykUrl := "http://api.qingyunke.com/api.php"
 	key := "free"
 	appid := "0"
-	url = fmt.Sprintf(url+"?key=%s&appid=%s&msg=%s", key, appid, msg)
+	qykUrl = fmt.Sprintf(qykUrl+"?key=%s&appid=%s&msg=%s", key, appid, url.QueryEscape(msg))
 
 	client := &http.Client{}
-	req, err := http.NewRequest("GET", url, nil)
+	req, err := http.NewRequest("GET", qykUrl, nil)
 	if err != nil {
 		return "", err
 	}

plugin_tracemoe/moe.go

@@ -0,0 +1,55 @@
+package tracemoe
+
+import (
+	"fmt"
+
+	"github.com/FloatTech/AnimeAPI/picture"
+	trmoe "github.com/fumiama/gotracemoe"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/ZeroBot-Plugin/control"
+)
+
+var (
+	moe = trmoe.NewMoe("")
+)
+
+func init() { // 插件主体
+	engine := control.Register("tracemoe", &control.Options{
+		DisableOnDefault: false,
+		Help:             "tracemoe\n- 搜番|搜索番剧[图片]",
+	})
+	// 以图搜图
+	engine.OnKeywordGroup([]string{"搜番", "搜索番剧"}, picture.CmdMatch, picture.MustGiven).SetBlock(true).ThirdPriority().
+		Handle(func(ctx *zero.Ctx) {
+			// 开始搜索图片
+			ctx.SendChain(message.Text("少女祈祷中......"))
+			for _, pic := range ctx.State["image_url"].([]string) {
+				fmt.Println(pic)
+				if result, err := moe.Search(pic, true, true); err != nil {
+					ctx.SendChain(message.Text("ERROR: ", err))
+				} else if len(result.Result) > 0 {
+					r := result.Result[0]
+					hint := "我有把握是这个！"
+					if r.Similarity < 0.8 {
+						hint = "大概是这个？"
+					}
+					mf := int(r.From / 60)
+					mt := int(r.To / 60)
+					sf := r.From - float32(mf*60)
+					st := r.To - float32(mt*60)
+					ctx.SendChain(
+						message.Text(hint),
+						message.Image(r.Image),
+						message.Text(
+							"\n",
+							"番剧名：", r.Anilist.Title.Native, "\n",
+							"话数：", r.Episode, "\n",
+							"时间：", mf, ":", sf, "-", mt, ":", st,
+						),
+					)
+				}
+			}
+		})
+}

plugin_translation/tl.go

@@ -1,3 +1,4 @@
+// Package translation 翻译
 package translation
 
 import (
@@ -18,7 +19,7 @@ import (
 
 var (
 	prio   = 100
-	bucket = rate.NewManager(time.Minute, 20) //  接口回复
+	bucket = rate.NewManager(time.Minute, 20) // 接口回复
 )
 
 func tl(d string) ([]byte, error) {

utils/file/dl.go

@@ -2,14 +2,28 @@
 package file
 
 import (
+	"crypto/tls"
 	"io"
 	"net/http"
 	"os"
 )
 
+var (
+	tr = &http.Transport{
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+	}
+	nochkcrtcli = &http.Client{Transport: tr}
+)
+
 // DownloadTo 下载到路径
-func DownloadTo(url, file string) error {
-	resp, err := http.Get(url)
+func DownloadTo(url, file string, chkcrt bool) error {
+	var resp *http.Response
+	var err error
+	if chkcrt {
+		resp, err = http.Get(url)
+	} else {
+		resp, err = nochkcrtcli.Get(url)
+	}
 	if err == nil {
 		var f *os.File
 		f, err = os.Create(file)

utils/web/http.go

@@ -7,11 +7,11 @@ import (
 
 func ReqWith(url string, method string, referer string, ua string) (data []byte, err error) {
 	client := &http.Client{}
-	//提交请求
+	// 提交请求
 	var reqest *http.Request
 	reqest, err = http.NewRequest(method, url, nil)
 	if err == nil {
-		//增加header选项
+		// 增加header选项
 		reqest.Header.Add("Referer", referer)
 		reqest.Header.Add("User-Agent", ua)
 		var response *http.Response