🎨 改进代码样式

* feat:添加b站推送,写了一半

* feat:添加b站推送（后续看情况,替换掉chromepd）

* fix:修复一直推送直播的bug

* fix:添加缓存路径

* feat:添加推送列表，修复重复发消息的bug

* feat:发现禁用有用,删除多余指令

* fix:修改格式

* fix:sleep无效

* fix:修改直播card

* fix:增加长度

* fix:修改readme

* fix:修lint,并去掉cron

* fix:修lint

* fix:去掉日志

Co-authored-by: Guohuiyuan <haibaraguo@yeahka.com>

README.md

@@ -255,6 +255,13 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] 骂我
     - [x] 大力骂我
     - [x] @bot 他妈|公交车|你妈|操|屎|去死|快死|日|逼|尼玛|艾滋|癌症|有病|戴套|啊对对对|烦你|你爹|屮|tui|cnm
+- **b站推送** `_ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili_push"`
+    - [x] 添加订阅[uid]
+    - [x] 取消订阅[uid]
+    - [x] 取消动态订阅[uid]
+    - [x] 取消直播订阅[uid]
+    - [x] 推送列表
+    - 注: linux下要想动态图片显示正常，需要下载chrome浏览器，并安装字体，具体看https://www.yuque.com/xiangrikuidezhongzi/zerobot/qrwxth
 - **TODO...**
 
 ## 使用方法

go.mod

@@ -3,9 +3,10 @@ module github.com/FloatTech/ZeroBot-Plugin
 go 1.17
 
 require (
-	github.com/FloatTech/AnimeAPI v1.2.3
-	github.com/FloatTech/zbputils v1.2.3-add9
+	github.com/FloatTech/AnimeAPI v1.2.4-beta1
+	github.com/FloatTech/zbputils v1.2.4-beta1
 	github.com/antchfx/htmlquery v1.2.4
+	github.com/chromedp/chromedp v0.7.6
 	github.com/corona10/goimagehash v1.0.3
 	github.com/fogleman/gg v1.3.0
 	github.com/fumiama/cron v1.3.0
@@ -25,16 +26,23 @@ require (
 
 require (
 	github.com/antchfx/xpath v1.2.0 // indirect
+	github.com/chromedp/cdproto v0.0.0-20211126220118-81fa0469ad77 // indirect
+	github.com/chromedp/sysutil v1.0.0 // indirect
 	github.com/disintegration/imaging v1.6.2 // indirect
 	github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/gobwas/httphead v0.1.0 // indirect
+	github.com/gobwas/pool v0.2.1 // indirect
+	github.com/gobwas/ws v1.1.0 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect

go.sum

@@ -1,8 +1,8 @@
-github.com/FloatTech/AnimeAPI v1.2.3 h1:NywV8PxKun6oDcKndsrUKT8l7vHGnf0rm5sRrSZ7qSc=
-github.com/FloatTech/AnimeAPI v1.2.3/go.mod h1:feTdgda0dckTeNl5VCXYlYEgN0wQbrca7TjIlZyph4o=
+github.com/FloatTech/AnimeAPI v1.2.4-beta1 h1:Ff+721UgTSXCRiod83wlUCY0C1nE4wWa7+NCgYjF/Ew=
+github.com/FloatTech/AnimeAPI v1.2.4-beta1/go.mod h1:tQNIP/1fbQzEi3U9v9PsdPOr2OURMx9S8WH+w1oco4I=
 github.com/FloatTech/bot-manager v1.0.0/go.mod h1:8YYRJ16oroGHQGD2En0oVnmcKJkxR9O/jd5BPSfWfOQ=
-github.com/FloatTech/zbputils v1.2.3-add9 h1:lovWc7uvaqSww1TV8/BlGZNf5o2jBUgU4VIlXCusgrI=
-github.com/FloatTech/zbputils v1.2.3-add9/go.mod h1:ZIuQP4tuhn7jiowEy+PALiHmr4zzPQBj4VdjEyd5/Es=
+github.com/FloatTech/zbputils v1.2.4-beta1 h1:WT85o9Y6MAJtmQaMD5h0l1mJ/7qBcjRQdNlCsB5pAPY=
+github.com/FloatTech/zbputils v1.2.4-beta1/go.mod h1:ZIuQP4tuhn7jiowEy+PALiHmr4zzPQBj4VdjEyd5/Es=
 github.com/Mrs4s/MiraiGo v0.0.0-20211120033824-43b23f4e6fcb h1:Rkj28fqIwGx/EgBzRYtpmJRfH6wqVn7cNdc7aJ0QE4M=
 github.com/Mrs4s/MiraiGo v0.0.0-20211120033824-43b23f4e6fcb/go.mod h1:imVKbfKqqeit+C/eaWGb4MKQ3z3gN6pRpBU5RMtp5so=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
@@ -13,6 +13,12 @@ github.com/antchfx/htmlquery v1.2.4/go.mod h1:2xO6iu3EVWs7R2JYqBbp8YzG50gj/ofqs5
 github.com/antchfx/xpath v1.1.6/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk=
 github.com/antchfx/xpath v1.2.0 h1:mbwv7co+x0RwgeGAOHdrKy89GvHaGvxxBtPK0uF9Zr8=
 github.com/antchfx/xpath v1.2.0/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
+github.com/chromedp/cdproto v0.0.0-20211126220118-81fa0469ad77 h1:Et/9YcQRCsaZVT74sy6AHwWy/FcbYqm39jNprlfXF7c=
+github.com/chromedp/cdproto v0.0.0-20211126220118-81fa0469ad77/go.mod h1:At5TxYYdxkbQL0TSefRjhLE3Q0lgvqKKMSFUglJ7i1U=
+github.com/chromedp/chromedp v0.7.6 h1:2juGaktzjwULlsn+DnvIZXFUckEp5xs+GOBroaea+jA=
+github.com/chromedp/chromedp v0.7.6/go.mod h1:ayT4YU/MGAALNfOg9gNrpGSAdnU51PMx+FCeuT1iXzo=
+github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic=
+github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww=
 github.com/corona10/goimagehash v1.0.3 h1:NZM518aKLmoNluluhfHGxT3LGOnrojrxhGn63DR/CZA=
 github.com/corona10/goimagehash v1.0.3/go.mod h1:VkvE0mLn84L4aF8vCb6mafVajEb6QYMHl2ZJLn0mOGI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -51,6 +57,12 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
+github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
+github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
+github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/ws v1.1.0 h1:7RFti/xnNkMJnrK7D1yQ/iCIB5OrrY/54/H930kIbHA=
+github.com/gobwas/ws v1.1.0/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
@@ -78,6 +90,8 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M=
 github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
@@ -90,6 +104,8 @@ github.com/logoove/sqlite v1.13.0 h1:XM7QKK9R3tm8o7bI75R3zmwYBFQ5S3Jqg+XCaqsAMQQ
 github.com/logoove/sqlite v1.13.0/go.mod h1:MRpE/o3qQhT7AgfIdnBue5c63+//xT+KXV0gHeVAUAg=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
@@ -106,6 +122,8 @@ github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/orisano/pixelmatch v0.0.0-20210112091706-4fa4c7ba91d5 h1:1SoBaSPudixRecmlHXb/GxmaD3fLMtHIDN13QujwQuc=
+github.com/orisano/pixelmatch v0.0.0-20210112091706-4fa4c7ba91d5/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -193,6 +211,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -201,6 +220,7 @@ golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220111092808-5a964db01320 h1:0jf+tOCoZ3LyutmCOWpVni1chK4VfFLhRsDK7MhqGRY=
 golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

main.go

@@ -52,7 +52,8 @@ import (
 
 	// b站相关
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili" // 查询b站用户信息
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_diana"    // 嘉心糖发病
+	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili_push" // b站推送（需要安装chrome浏览器）
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_diana" // 嘉心糖发病
 
 	// 二次元图片
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_acgimage"      // 随机图片与AI点评
@@ -79,7 +80,7 @@ import (
 var (
 	contents = []string{
 		"* OneBot + ZeroBot + Golang",
-		"* Version 1.2.3 - 2022-01-07 20:09:30 +0800 CST",
+		"* Version 1.2.4 - 2022-01-14 20:05:43 +0800 CST",
 		"* Copyright © 2020 - 2021 FloatTech. All Rights Reserved.",
 		"* Project: https://github.com/FloatTech/ZeroBot-Plugin",
 	}

plugin_ai_reply/main.go

@@ -1,3 +1,4 @@
+// Package aireply AI 回复
 package aireply
 
 import (

plugin_bilibili_push/bilibili_push.go

@@ -0,0 +1,439 @@
+// Package bilibilipush b站推送
+package bilibilipush
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"strconv"
+	"time"
+
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/txt2img"
+	"github.com/FloatTech/zbputils/web"
+	"github.com/chromedp/chromedp"
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+	"github.com/wdvxdr1123/ZeroBot/utils/helper"
+)
+
+const (
+	ua              = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36"
+	referer         = "https://www.bilibili.com/"
+	infoURL         = "https://api.bilibili.com/x/space/acc/info?mid=%d"
+	userDynamicsURL = "https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/space_history?host_uid=%d&offset_dynamic_id=0&need_top=0"
+	liveListURL     = "https://api.live.bilibili.com/room/v1/Room/get_status_info_by_uids"
+	tURL            = "https://t.bilibili.com/"
+	liveURL         = "https://live.bilibili.com/"
+	prio            = 10
+	serviceName     = "bilibilipush"
+)
+
+var (
+	lastTime = map[int64]int64{}
+	typeMsg  = map[int64]string{
+		0:   "发布了新动态",
+		1:   "转发了一条动态",
+		2:   "发布了新动态",
+		4:   "发布了新动态",
+		8:   "发布了新投稿",
+		16:  "发布了短视频",
+		64:  "发布了新专栏",
+		256: "发布了新音频",
+	}
+	liveStatus  = map[int64]int{}
+	uidErrorMsg = map[int]string{
+		0:    "输入的uid有效",
+		-400: "uid不存在，注意uid不是房间号",
+		-402: "uid不存在，注意uid不是房间号",
+		-412: "操作过于频繁IP暂时被风控，请半小时后再尝试",
+	}
+	upMap = map[int64]string{}
+)
+
+func init() {
+	go bilibiliPushDaily()
+	en := control.Register(serviceName, &control.Options{
+		DisableOnDefault: false,
+		Help: "bilibilipush\n" +
+			"- 添加订阅[uid]\n" +
+			"- 取消订阅[uid]\n" +
+			"- 取消动态订阅[uid]\n" +
+			"- 取消直播订阅[uid]\n" +
+			"- 推送列表",
+	})
+
+	en.OnRegex(`^添加订阅(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).SetPriority(prio).Handle(func(ctx *zero.Ctx) {
+		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
+		var name string
+		var ok bool
+		if name, ok = upMap[buid]; !ok {
+			var status int
+			status, name = checkBuid(buid)
+			if status != 0 {
+				msg, ok := uidErrorMsg[status]
+				if !ok {
+					msg = "未知错误，请私聊反馈给" + zero.BotConfig.NickName[0]
+				}
+				ctx.SendChain(message.Text(msg))
+				return
+			}
+		}
+		gid := ctx.Event.GroupID
+		if gid == 0 {
+			gid = -ctx.Event.UserID
+		}
+		if err := subscribe(buid, gid); err != nil {
+			log.Errorln("[bilibilipush]:", err)
+		} else {
+			ctx.SendChain(message.Text("已添加" + name + "的订阅"))
+		}
+	})
+	en.OnRegex(`^取消订阅(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).SetPriority(prio).Handle(func(ctx *zero.Ctx) {
+		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
+		var name string
+		var ok bool
+		if name, ok = upMap[buid]; !ok {
+			var status int
+			status, name = checkBuid(buid)
+			if status != 0 {
+				msg, ok := uidErrorMsg[status]
+				if !ok {
+					msg = "未知错误，请私聊反馈给" + zero.BotConfig.NickName[0]
+				}
+				ctx.SendChain(message.Text(msg))
+				return
+			}
+		}
+		gid := ctx.Event.GroupID
+		if gid == 0 {
+			gid = -ctx.Event.UserID
+		}
+		if err := unsubscribe(buid, gid); err != nil {
+			log.Errorln("[bilibilipush]:", err)
+		} else {
+			ctx.SendChain(message.Text("已取消" + name + "的订阅"))
+		}
+	})
+	en.OnRegex(`^取消动态订阅(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).SetPriority(prio).Handle(func(ctx *zero.Ctx) {
+		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
+		var name string
+		var ok bool
+		if name, ok = upMap[buid]; !ok {
+			var status int
+			status, name = checkBuid(buid)
+			if status != 0 {
+				msg, ok := uidErrorMsg[status]
+				if !ok {
+					msg = "未知错误，请私聊反馈给" + zero.BotConfig.NickName[0]
+				}
+				ctx.SendChain(message.Text(msg))
+				return
+			}
+		}
+		gid := ctx.Event.GroupID
+		if gid == 0 {
+			gid = -ctx.Event.UserID
+		}
+		if err := unsubscribeDynamic(buid, gid); err != nil {
+			log.Errorln("[bilibilipush]:", err)
+		} else {
+			ctx.SendChain(message.Text("已取消" + name + "的动态订阅"))
+		}
+	})
+	en.OnRegex(`^取消直播订阅(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).SetPriority(prio).Handle(func(ctx *zero.Ctx) {
+		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
+		var name string
+		var ok bool
+		if name, ok = upMap[buid]; !ok {
+			var status int
+			status, name = checkBuid(buid)
+			if status != 0 {
+				msg, ok := uidErrorMsg[status]
+				if !ok {
+					msg = "未知错误，请私聊反馈给" + zero.BotConfig.NickName[0]
+				}
+				ctx.SendChain(message.Text(msg))
+				return
+			}
+		}
+		gid := ctx.Event.GroupID
+		if gid == 0 {
+			gid = -ctx.Event.UserID
+		}
+		if err := unsubscribeLive(buid, gid); err != nil {
+			log.Errorln("[bilibilipush]:", err)
+		} else {
+			ctx.SendChain(message.Text("已取消" + name + "的直播订阅"))
+		}
+	})
+	en.OnFullMatch("推送列表", ctxext.UserOrGrpAdmin).SetBlock(true).SetPriority(prio).Handle(func(ctx *zero.Ctx) {
+		gid := ctx.Event.GroupID
+		if gid == 0 {
+			gid = -ctx.Event.UserID
+		}
+		bpl := bdb.getAllPushByGroup(gid)
+		fmt.Println(bpl)
+		msg := "--------推送列表--------"
+		for _, v := range bpl {
+			if _, ok := upMap[v.BilibiliUID]; !ok {
+				bdb.updateAllUp()
+				fmt.Println(upMap)
+			}
+			msg += fmt.Sprintf("\nuid:%-12d 动态：", v.BilibiliUID)
+			if v.DynamicDisable == 0 {
+				msg += "●"
+			} else {
+				msg += "○"
+			}
+			msg += " 直播："
+			if v.LiveDisable == 0 {
+				msg += "●"
+			} else {
+				msg += "○"
+			}
+			msg += " up主：" + upMap[v.BilibiliUID]
+		}
+		data, err := txt2img.RenderToBase64(msg, txt2img.FontFile, 600, 20)
+		if err != nil {
+			log.Errorln("[bilibilipush]:", err)
+		}
+		if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id == 0 {
+			ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+		}
+	})
+}
+
+func bilibiliPushDaily() {
+	t := time.NewTicker(time.Second * 10)
+	defer t.Stop()
+	for range t.C {
+		log.Println("-----bilibilipush拉取推送信息-----")
+		sendDynamic()
+		sendLive()
+	}
+}
+
+func checkBuid(buid int64) (status int, name string) {
+	data, err := web.ReqWith(fmt.Sprintf(infoURL, buid), "GET", referer, ua)
+	if err != nil {
+		log.Errorln("[bilibilipush]:", err)
+	}
+	status = int(gjson.Get(helper.BytesToString(data), "code").Int())
+	name = gjson.Get(helper.BytesToString(data), "data.name").String()
+	if status == 0 {
+		bdb.insertBilibiliUp(buid, name)
+		upMap[buid] = name
+	}
+	return
+}
+
+// subscribe 订阅
+func subscribe(buid, groupid int64) (err error) {
+	bpMap := map[string]interface{}{
+		"bilibili_uid":    buid,
+		"group_id":        groupid,
+		"live_disable":    0,
+		"dynamic_disable": 0,
+	}
+	err = bdb.insertOrUpdateLiveAndDynamic(bpMap)
+	return
+}
+
+// unsubscribe 取消订阅
+func unsubscribe(buid, groupid int64) (err error) {
+	bpMap := map[string]interface{}{
+		"bilibili_uid":    buid,
+		"group_id":        groupid,
+		"live_disable":    1,
+		"dynamic_disable": 1,
+	}
+	err = bdb.insertOrUpdateLiveAndDynamic(bpMap)
+	return
+}
+
+func unsubscribeDynamic(buid, groupid int64) (err error) {
+	bpMap := map[string]interface{}{
+		"bilibili_uid":    buid,
+		"group_id":        groupid,
+		"dynamic_disable": 1,
+	}
+	err = bdb.insertOrUpdateLiveAndDynamic(bpMap)
+	return
+}
+
+func unsubscribeLive(buid, groupid int64) (err error) {
+	bpMap := map[string]interface{}{
+		"bilibili_uid": buid,
+		"group_id":     groupid,
+		"live_disable": 1,
+	}
+	err = bdb.insertOrUpdateLiveAndDynamic(bpMap)
+	return
+}
+
+func getUserDynamicCard(buid int64) (cardList []gjson.Result) {
+	data, err := web.ReqWith(fmt.Sprintf(userDynamicsURL, buid), "GET", referer, ua)
+	if err != nil {
+		log.Errorln("[bilibilipush]:", err)
+	}
+	cardList = gjson.Get(helper.BytesToString(data), "data.cards").Array()
+	return
+}
+
+func getLiveList(uids ...int64) string {
+	m := make(map[string]interface{})
+	m["uids"] = uids
+	b, _ := json.Marshal(m)
+	client := &http.Client{}
+	// 提交请求
+	request, err := http.NewRequest("POST", liveListURL, bytes.NewBuffer(b))
+	if err != nil {
+		log.Errorln("[bilibilipush]:", err)
+	}
+	request.Header.Add("Referer", referer)
+	request.Header.Add("User-Agent", ua)
+	response, err := client.Do(request)
+	if err != nil {
+		log.Errorln("[bilibilipush]:", err)
+	}
+	defer response.Body.Close()
+	data, err := io.ReadAll(response.Body)
+	if err != nil {
+		log.Errorln("[bilibilipush]:", err)
+	}
+	return helper.BytesToString(data)
+}
+
+func sendDynamic() {
+	uids := bdb.getAllBuidByDynamic()
+	for _, buid := range uids {
+		cardList := getUserDynamicCard(buid)
+		if len(cardList) == 0 {
+			return
+		}
+		t, ok := lastTime[buid]
+		if !ok {
+			lastTime[buid] = cardList[0].Get("desc.timestamp").Int()
+			return
+		}
+		for i := len(cardList) - 1; i >= 0; i-- {
+			ct := cardList[i].Get("desc.timestamp").Int()
+			if ct > t && ct > time.Now().Unix()-600 {
+				lastTime[buid] = ct
+				m, ok := control.Lookup(serviceName)
+				if ok {
+					groupList := bdb.getAllGroupByBuidAndDynamic(buid)
+					cID := cardList[i].Get("desc.dynamic_id").String()
+					cType := cardList[i].Get("desc.type").Int()
+					cName := cardList[i].Get("desc.user_profile.info.uname").String()
+					screenshotFile := cachePath + cID + ".png"
+					initDynamicScreenshot(cID)
+					var msg []message.MessageSegment
+					msg = append(msg, message.Text(cName+typeMsg[cType]))
+					msg = append(msg, message.Image("file:///"+file.BOTPATH+"/"+screenshotFile))
+					msg = append(msg, message.Text(tURL+cID))
+
+					zero.RangeBot(func(id int64, ctx *zero.Ctx) bool {
+						for _, gid := range groupList {
+							if m.IsEnabledIn(gid) {
+								if gid > 0 {
+									ctx.SendGroupMessage(gid, msg)
+								} else if gid < 0 {
+									ctx.SendPrivateMessage(-gid, msg)
+								} else {
+									log.Errorln("[bilibilipush]:gid为0")
+								}
+							}
+						}
+						return true
+					})
+				}
+			}
+		}
+	}
+}
+
+func sendLive() {
+	uids := bdb.getAllBuidByLive()
+	gjson.Get(getLiveList(uids...), "data").ForEach(func(key, value gjson.Result) bool {
+		newStatus := int(value.Get("live_status").Int())
+		if newStatus == 2 {
+			newStatus = 0
+		}
+		if _, ok := liveStatus[key.Int()]; !ok {
+			liveStatus[key.Int()] = newStatus
+			return true
+		}
+		oldStatus := liveStatus[key.Int()]
+		if newStatus != oldStatus && newStatus == 1 {
+			liveStatus[key.Int()] = newStatus
+			m, ok := control.Lookup(serviceName)
+			if ok {
+				groupList := bdb.getAllGroupByBuidAndLive(key.Int())
+				roomID := value.Get("short_id").Int()
+				if roomID == 0 {
+					roomID = value.Get("room_id").Int()
+				}
+				lURL := liveURL + strconv.FormatInt(roomID, 10)
+				lName := value.Get("uname").String()
+				lTitle := value.Get("title").String()
+				lCover := value.Get("cover_from_user").String()
+				if lCover == "" {
+					lCover = value.Get("keyframe").String()
+				}
+				var msg []message.MessageSegment
+				msg = append(msg, message.Text(lName+" 正在直播:\n"))
+				msg = append(msg, message.Text(lTitle))
+				msg = append(msg, message.Image(lCover))
+				msg = append(msg, message.Text(lURL))
+				zero.RangeBot(func(id int64, ctx *zero.Ctx) bool {
+					for _, gid := range groupList {
+						if m.IsEnabledIn(gid) {
+							if gid > 0 {
+								ctx.SendGroupMessage(gid, msg)
+							} else if gid < 0 {
+								ctx.SendPrivateMessage(-gid, msg)
+							} else {
+								log.Errorln("[bilibilipush]:gid为0")
+							}
+						}
+					}
+					return true
+				})
+			}
+		}
+		return true
+	})
+}
+
+func initDynamicScreenshot(dynamicID string) {
+	screenshotFile := cachePath + dynamicID + ".png"
+	if file.IsNotExist(screenshotFile) {
+		var imageBuf []byte
+		dynamicURL := tURL + dynamicID
+		ctx, cancel := chromedp.NewContext(context.Background(), chromedp.WithDebugf(log.Printf))
+		defer cancel()
+
+		if err := chromedp.Run(ctx, chromedp.Tasks{
+			chromedp.Navigate(dynamicURL),
+			chromedp.SetAttributeValue(`div.unlogin-popover-avatar`, "style", "display:none;", chromedp.ByQuery),
+			chromedp.SetAttributeValue(`div.bb-comment`, "style", "display:none;", chromedp.ByQuery),
+			chromedp.Screenshot(`.card`, &imageBuf, chromedp.NodeVisible, chromedp.ByQuery),
+		}); err != nil {
+			log.Errorln("[bilibilipush]:", err)
+		}
+
+		if err := ioutil.WriteFile(screenshotFile, imageBuf, 0644); err != nil {
+			log.Errorln("[bilibilipush]:", err)
+		}
+	}
+}

plugin_bilibili_push/data.go

@@ -0,0 +1,29 @@
+package bilibilipush
+
+import (
+	"os"
+
+	"github.com/FloatTech/zbputils/process"
+	log "github.com/sirupsen/logrus"
+)
+
+const (
+	cachePath = dbpath + "cache/"
+	dbpath    = "data/bilibilipush/"
+	dbfile    = dbpath + "push.db"
+)
+
+// bdb bilibili推送数据库
+var bdb *bilibilipushdb
+
+// 加载数据库
+func init() {
+	go func() {
+		process.SleepAbout1sTo2s()
+		_ = os.MkdirAll(dbpath, 0755)
+		os.RemoveAll(cachePath)
+		_ = os.MkdirAll(cachePath, 0755)
+		bdb = initialize(dbfile)
+		log.Println("[bilibilipush]加载bilibilipush数据库")
+	}()
+}

plugin_bilibili_push/model.go

@@ -0,0 +1,159 @@
+package bilibilipush
+
+import (
+	"encoding/json"
+	"os"
+
+	"github.com/jinzhu/gorm"
+	_ "github.com/logoove/sqlite" // import sql
+)
+
+// bilibilipushdb bili推送数据库
+type bilibilipushdb gorm.DB
+
+type bilibilipush struct {
+	ID             int64 `gorm:"column:id;primary_key" json:"id"`
+	BilibiliUID    int64 `gorm:"column:bilibili_uid;index:idx_buid_gid" json:"bilibili_uid"`
+	GroupID        int64 `gorm:"column:group_id;index:idx_buid_gid" json:"group_id"`
+	LiveDisable    int64 `gorm:"column:live_disable;default:0" json:"live_disable"`
+	DynamicDisable int64 `gorm:"column:dynamic_disable;default:0" json:"dynamic_disable"`
+}
+
+// TableName ...
+func (bilibilipush) TableName() string {
+	return "bilibili_push"
+}
+
+type bilibiliup struct {
+	BilibiliUID int64  `gorm:"column:bilibili_uid;primary_key"`
+	Name        string `gorm:"column:name"`
+}
+
+// TableName ...
+func (bilibiliup) TableName() string {
+	return "bilibili_up"
+}
+
+// initialize 初始化ScoreDB数据库
+func initialize(dbpath string) *bilibilipushdb {
+	var err error
+	if _, err = os.Stat(dbpath); err != nil || os.IsNotExist(err) {
+		// 生成文件
+		f, err := os.Create(dbpath)
+		if err != nil {
+			return nil
+		}
+		defer f.Close()
+	}
+	gdb, err := gorm.Open("sqlite3", dbpath)
+	if err != nil {
+		panic(err)
+	}
+	gdb.AutoMigrate(&bilibilipush{}).AutoMigrate(&bilibiliup{})
+	return (*bilibilipushdb)(gdb)
+}
+
+// open ...
+func open(dbpath string) (*bilibilipushdb, error) {
+	db, err := gorm.Open("sqlite3", dbpath)
+	if err != nil {
+		return nil, err
+	}
+	return (*bilibilipushdb)(db), nil
+}
+
+// close ...
+func (bdb *bilibilipushdb) close() error {
+	db := (*gorm.DB)(bdb)
+	return db.Close()
+}
+
+// insertOrUpdateLiveAndDynamic 插入或更新数据库
+func (bdb *bilibilipushdb) insertOrUpdateLiveAndDynamic(bpMap map[string]interface{}) (err error) {
+	db := (*gorm.DB)(bdb)
+	bp := bilibilipush{}
+	data, _ := json.Marshal(&bpMap)
+	_ = json.Unmarshal(data, &bp)
+	if err = db.Debug().Model(&bilibilipush{}).First(&bp, "bilibili_uid = ? and group_id = ?", bp.BilibiliUID, bp.GroupID).Error; err != nil {
+		if gorm.IsRecordNotFoundError(err) {
+			err = db.Debug().Model(&bilibilipush{}).Create(&bp).Error
+		}
+	} else {
+		err = db.Debug().Model(&bilibilipush{}).Where("bilibili_uid = ? and group_id = ?", bp.BilibiliUID, bp.GroupID).Update(bpMap).Error
+	}
+	return
+}
+
+func (bdb *bilibilipushdb) getAllBuidByLive() (buidList []int64) {
+	db := (*gorm.DB)(bdb)
+	var bpl []bilibilipush
+	db.Debug().Model(&bilibilipush{}).Find(&bpl, "live_disable = 0")
+	temp := make(map[int64]bool)
+	for _, v := range bpl {
+		_, ok := temp[v.BilibiliUID]
+		if !ok {
+			buidList = append(buidList, v.BilibiliUID)
+			temp[v.BilibiliUID] = true
+		}
+	}
+	return
+}
+
+func (bdb *bilibilipushdb) getAllBuidByDynamic() (buidList []int64) {
+	db := (*gorm.DB)(bdb)
+	var bpl []bilibilipush
+	db.Debug().Model(&bilibilipush{}).Find(&bpl, "dynamic_disable = 0")
+	temp := make(map[int64]bool)
+	for _, v := range bpl {
+		_, ok := temp[v.BilibiliUID]
+		if !ok {
+			buidList = append(buidList, v.BilibiliUID)
+			temp[v.BilibiliUID] = true
+		}
+	}
+	return
+}
+
+func (bdb *bilibilipushdb) getAllGroupByBuidAndLive(buid int64) (groupList []int64) {
+	db := (*gorm.DB)(bdb)
+	var bpl []bilibilipush
+	db.Debug().Model(&bilibilipush{}).Find(&bpl, "bilibili_uid = ? and live_disable = 0", buid)
+	for _, v := range bpl {
+		groupList = append(groupList, v.GroupID)
+	}
+	return
+}
+
+func (bdb *bilibilipushdb) getAllGroupByBuidAndDynamic(buid int64) (groupList []int64) {
+	db := (*gorm.DB)(bdb)
+	var bpl []bilibilipush
+	db.Debug().Model(&bilibilipush{}).Find(&bpl, "bilibili_uid = ? and dynamic_disable = 0", buid)
+	for _, v := range bpl {
+		groupList = append(groupList, v.GroupID)
+	}
+	return
+}
+
+func (bdb *bilibilipushdb) getAllPushByGroup(groupID int64) (bpl []bilibilipush) {
+	db := (*gorm.DB)(bdb)
+	db.Debug().Model(&bilibilipush{}).Find(&bpl, "group_id = ? and (live_disable = 0 or dynamic_disable = 0)", groupID)
+	return
+}
+
+func (bdb *bilibilipushdb) insertBilibiliUp(buid int64, name string) {
+	db := (*gorm.DB)(bdb)
+	bu := bilibiliup{
+		BilibiliUID: buid,
+		Name:        name,
+	}
+	db.Debug().Model(&bilibiliup{}).Create(bu)
+}
+
+func (bdb *bilibilipushdb) updateAllUp() {
+	db := (*gorm.DB)(bdb)
+	var bul []bilibiliup
+	db.Debug().Model(&bilibiliup{}).Find(&bul)
+	for _, v := range bul {
+		upMap[v.BilibiliUID] = v.Name
+	}
+}

plugin_danbooru/main.go

@@ -49,7 +49,7 @@ func init() { // 插件主体
 				digest := md5.Sum(helper.StringToBytes(url))
 				f := cachefile + hex.EncodeToString(digest[:])
 				if file.IsNotExist(f) {
-					t.Canvas.SavePNG(f)
+					_ = t.Canvas.SavePNG(f)
 				}
 				ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + f))
 			}

plugin_fortune/fortune.go

@@ -136,12 +136,7 @@ func init() {
 			}
 
 			// 随机获取签文
-			title, text, err := randtext(seed)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
-			}
-
+			title, text := randtext(seed)
 			digest := md5.Sum(helper.StringToBytes(zipfile + strconv.Itoa(index) + title + text))
 			cachefile := cache + hex.EncodeToString(digest[:])
 
@@ -197,10 +192,10 @@ func randimage(path string, seed int64) (im image.Image, index int, err error) {
 // @param file 文件路径
 // @param seed 随机数种子
 // @return 签名 & 签文 & 错误信息
-func randtext(seed int64) (string, string, error) {
+func randtext(seed int64) (string, string) {
 	rand.Seed(seed)
 	r := rand.Intn(len(omikujis))
-	return omikujis[r]["title"], omikujis[r]["content"], nil
+	return omikujis[r]["title"], omikujis[r]["content"]
 }
 
 // @function draw 绘制运势图

plugin_gif/context.go

@@ -1,13 +1,10 @@
-package plugin_gif
+package gif
 
 import (
-	"bufio"
-	"io"
-	"net/http"
 	"os"
 	"strconv"
-	"strings"
 
+	"github.com/FloatTech/zbputils/file"
 	"github.com/sirupsen/logrus"
 )
 
@@ -18,9 +15,8 @@ type context struct {
 
 func dlchan(name string, c *chan *string) {
 	target := datapath + `materials/` + name
-	_, err := os.Stat(target)
-	if err != nil {
-		download(`https://codechina.csdn.net/u011570312/imagematerials/-/raw/main/`+name, target)
+	if file.IsNotExist(target) {
+		_ = file.DownloadTo(`https://codechina.csdn.net/u011570312/imagematerials/-/raw/main/`+name, target, true)
 	} else {
 		logrus.Debugln("[gif] dl", name, "exists")
 	}
@@ -29,18 +25,19 @@ func dlchan(name string, c *chan *string) {
 
 func dlblock(name string) string {
 	target := datapath + `materials/` + name
-	_, err := os.Stat(target)
-	if err != nil {
-		download(`https://codechina.csdn.net/u011570312/imagematerials/-/raw/main/`+name, target)
+	if file.IsNotExist(target) {
+		_ = file.DownloadTo(`https://codechina.csdn.net/u011570312/imagematerials/-/raw/main/`+name, target, true)
+	} else {
+		logrus.Debugln("[gif] dl", name, "exists")
 	}
 	return target
 }
 
-func dlrange(prefix string, suffix string, end int) *[]chan *string {
+func dlrange(prefix string, end int) *[]chan *string {
 	c := make([]chan *string, end)
 	for i := range c {
 		c[i] = make(chan *string)
-		go dlchan(prefix+strconv.Itoa(i)+suffix, &c[i])
+		go dlchan(prefix+"/"+strconv.Itoa(i)+".png", &c[i])
 	}
 	return &c
 }
@@ -49,43 +46,9 @@ func dlrange(prefix string, suffix string, end int) *[]chan *string {
 func newContext(user int64) *context {
 	c := new(context)
 	c.usrdir = datapath + "users/" + strconv.FormatInt(user, 10) + `/`
-	os.MkdirAll(c.usrdir, 0755)
+	_ = os.MkdirAll(c.usrdir, 0755)
 	c.headimgsdir = make([]string, 2)
 	c.headimgsdir[0] = c.usrdir + "0.gif"
 	c.headimgsdir[1] = c.usrdir + "1.gif"
 	return c
 }
-
-// 下载图片
-func download(url, dlpath string) error {
-	// 创建目录
-	var List = strings.Split(dlpath, `/`)
-	err := os.MkdirAll(strings.TrimSuffix(dlpath, List[len(List)-1]), 0755)
-	if err != nil {
-		logrus.Errorln("[gif] mkdir err:", err)
-		return err
-	}
-	res, err := http.Get(url)
-	if err != nil {
-		logrus.Errorln("[gif] http get err:", err)
-		return err
-	}
-	// 获得get请求响应的reader对象
-	reader := bufio.NewReaderSize(res.Body, 32*1024)
-	// 创建文件
-	file, err := os.Create(dlpath)
-	if err != nil {
-		logrus.Errorln("[gif] create file err:", err)
-		return err
-	}
-	// 获得文件的writer对象
-	writer := bufio.NewWriter(file)
-	written, err := io.Copy(writer, reader)
-	if err != nil {
-		logrus.Errorln("[gif] copy err:", err)
-		return err
-	}
-	res.Body.Close()
-	logrus.Debugln("[gif] dl len:", written)
-	return nil
-}

plugin_gif/gif.go

@@ -1,4 +1,4 @@
-package plugin_gif
+package gif
 
 import (
 	"image"
@@ -8,8 +8,8 @@ import (
 
 // 摸
 func (cc *context) mo() string {
-	name := cc.usrdir + `摸.gif`
-	c := dlrange(`mo/`, `.png`, 5)
+	name := cc.usrdir + "摸.gif"
+	c := dlrange("mo", 5)
 	tou := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0).Circle(0).Im
 	mo := []*image.NRGBA{
 		img.LoadFirstFrame(*<-(*c)[0], 0, 0).InsertBottom(tou, 80, 80, 32, 32).Im,
@@ -18,14 +18,14 @@ func (cc *context) mo() string {
 		img.LoadFirstFrame(*<-(*c)[3], 0, 0).InsertBottom(tou, 85, 75, 27, 37).Im,
 		img.LoadFirstFrame(*<-(*c)[4], 0, 0).InsertBottom(tou, 90, 70, 22, 42).Im,
 	}
-	img.SaveGif(img.MergeGif(1, mo), name)
+	_ = img.SaveGif(img.MergeGif(1, mo), name)
 	return "file:///" + name
 }
 
 // 搓
 func (cc *context) cuo() string {
-	name := cc.usrdir + `搓.gif`
-	c := dlrange(`cuo/`, `.png`, 5)
+	name := cc.usrdir + "搓.gif"
+	c := dlrange("cuo", 5)
 	tou := img.LoadFirstFrame(cc.headimgsdir[0], 110, 110).Circle(0).Im
 	m1 := img.Rotate(tou, 72, 0, 0)
 	m2 := img.Rotate(tou, 144, 0, 0)
@@ -38,41 +38,41 @@ func (cc *context) cuo() string {
 		img.LoadFirstFrame(*<-(*c)[3], 0, 0).InsertBottomC(m3.Im, 0, 0, 75, 130).Im,
 		img.LoadFirstFrame(*<-(*c)[4], 0, 0).InsertBottomC(m4.Im, 0, 0, 75, 130).Im,
 	}
-	img.SaveGif(img.MergeGif(5, cuo), name)
+	_ = img.SaveGif(img.MergeGif(5, cuo), name)
 	return "file:///" + name
 }
 
 // 敲
 func (cc *context) qiao() string {
-	name := cc.usrdir + `敲.gif`
-	c := dlrange(`qiao/`, `.png`, 2)
+	name := cc.usrdir + "敲.gif"
+	c := dlrange("qiao", 2)
 	tou := img.LoadFirstFrame(cc.headimgsdir[0], 40, 40).Circle(0).Im
 	qiao := []*image.NRGBA{
 		img.LoadFirstFrame(*<-(*c)[0], 0, 0).InsertUp(tou, 40, 33, 57, 52).Im,
 		img.LoadFirstFrame(*<-(*c)[1], 0, 0).InsertUp(tou, 38, 36, 58, 50).Im,
 	}
-	img.SaveGif(img.MergeGif(1, qiao), name)
+	_ = img.SaveGif(img.MergeGif(1, qiao), name)
 	return "file:///" + name
 }
 
 // 吃
 func (cc *context) chi() string {
-	name := cc.usrdir + `吃.gif`
-	c := dlrange(`chi/`, `.png`, 3)
+	name := cc.usrdir + "吃.gif"
+	c := dlrange("chi", 3)
 	tou := img.LoadFirstFrame(cc.headimgsdir[0], 32, 32).Im
 	chi := []*image.NRGBA{
 		img.LoadFirstFrame(*<-(*c)[0], 0, 0).InsertBottom(tou, 0, 0, 1, 38).Im,
 		img.LoadFirstFrame(*<-(*c)[1], 0, 0).InsertBottom(tou, 0, 0, 1, 38).Im,
 		img.LoadFirstFrame(*<-(*c)[2], 0, 0).InsertBottom(tou, 0, 0, 1, 38).Im,
 	}
-	img.SaveGif(img.MergeGif(1, chi), name)
+	_ = img.SaveGif(img.MergeGif(1, chi), name)
 	return "file:///" + name
 }
 
 // 蹭
 func (cc *context) ceng() string {
-	name := cc.usrdir + `蹭.gif`
-	c := dlrange(`ceng/`, `.png`, 6)
+	name := cc.usrdir + "蹭.gif"
+	c := dlrange("ceng", 6)
 	tou := img.LoadFirstFrame(cc.headimgsdir[0], 100, 100).Circle(0).Im
 	tou2 := img.LoadFirstFrame(cc.headimgsdir[1], 100, 100).Circle(0).Im
 	ceng := []*image.NRGBA{
@@ -83,14 +83,14 @@ func (cc *context) ceng() string {
 		img.LoadFirstFrame(*<-(*c)[4], 0, 0).InsertUp(tou, 75, 77, 56, 110).InsertUp(img.Rotate(tou2, -66, 132, 80).Im, 0, 0, 78, 40).Im,
 		img.LoadFirstFrame(*<-(*c)[5], 0, 0).InsertUp(tou, 75, 77, 62, 102).InsertUp(tou2, 71, 100, 110, 94).Im,
 	}
-	img.SaveGif(img.MergeGif(8, ceng), name)
+	_ = img.SaveGif(img.MergeGif(8, ceng), name)
 	return "file:///" + name
 }
 
 // 啃
 func (cc *context) ken() string {
-	name := cc.usrdir + `啃.gif`
-	c := dlrange(`ken/`, `.png`, 16)
+	name := cc.usrdir + "啃.gif"
+	c := dlrange("ken", 16)
 	tou := img.LoadFirstFrame(cc.headimgsdir[0], 100, 100).Im
 	ken := []*image.NRGBA{
 		img.LoadFirstFrame(*<-(*c)[0], 0, 0).InsertBottom(tou, 90, 90, 105, 150).Im,
@@ -110,40 +110,40 @@ func (cc *context) ken() string {
 		img.LoadFirstFrame(*<-(*c)[14], 0, 0).Im,
 		img.LoadFirstFrame(*<-(*c)[15], 0, 0).Im,
 	}
-	img.SaveGif(img.MergeGif(7, ken), name)
+	_ = img.SaveGif(img.MergeGif(7, ken), name)
 	return "file:///" + name
 }
 
 // 拍
 func (cc *context) pai() string {
-	name := cc.usrdir + `拍.gif`
-	c := dlrange(`pai/`, `.png`, 2)
+	name := cc.usrdir + "拍.gif"
+	c := dlrange("pai", 2)
 	tou := img.LoadFirstFrame(cc.headimgsdir[0], 30, 30).Circle(0).Im
 	pai := []*image.NRGBA{
 		img.LoadFirstFrame(*<-(*c)[0], 0, 0).InsertUp(tou, 0, 0, 1, 47).Im,
 		img.LoadFirstFrame(*<-(*c)[1], 0, 0).InsertUp(tou, 0, 0, 1, 67).Im,
 	}
-	img.SaveGif(img.MergeGif(1, pai), name)
+	_ = img.SaveGif(img.MergeGif(1, pai), name)
 	return "file:///" + name
 }
 
 // 冲
 func (cc *context) chong() string {
-	name := cc.usrdir + `冲.gif`
-	c := dlrange(`xqe/`, `.png`, 2)
+	name := cc.usrdir + "冲.gif"
+	c := dlrange("xqe", 2)
 	tou := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0).Circle(0).Im
 	chong := []*image.NRGBA{
 		img.LoadFirstFrame(*<-(*c)[0], 0, 0).InsertUp(tou, 30, 30, 15, 53).Im,
 		img.LoadFirstFrame(*<-(*c)[1], 0, 0).InsertUp(tou, 30, 30, 40, 53).Im,
 	}
-	img.SaveGif(img.MergeGif(1, chong), name)
+	_ = img.SaveGif(img.MergeGif(1, chong), name)
 	return "file:///" + name
 }
 
 // 丢
 func (cc *context) diu() string {
-	name := cc.usrdir + `丢.gif`
-	c := dlrange(`diu/`, `.png`, 8)
+	name := cc.usrdir + "丢.gif"
+	c := dlrange("diu", 8)
 	tou := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0).Circle(0).Im
 	diu := []*image.NRGBA{
 		img.LoadFirstFrame(*<-(*c)[0], 0, 0).InsertUp(tou, 32, 32, 108, 36).Im,
@@ -155,6 +155,6 @@ func (cc *context) diu() string {
 		img.LoadFirstFrame(*<-(*c)[6], 0, 0).InsertUp(tou, 35, 35, 259, 31).Im,
 		img.LoadFirstFrame(*<-(*c)[7], 0, 0).InsertUp(tou, 175, 175, -50, 220).Im,
 	}
-	img.SaveGif(img.MergeGif(7, diu), name)
+	_ = img.SaveGif(img.MergeGif(7, diu), name)
 	return "file:///" + name
 }

plugin_gif/logo.go

@@ -1,17 +1,19 @@
-package plugin_gif
+package gif
 
 import (
 	"strconv"
 	"strings"
+
+	"github.com/FloatTech/zbputils/file"
 )
 
 func (c *context) prepareLogos(s ...string) {
 	for i, v := range s {
 		_, err := strconv.Atoi(v)
 		if err != nil {
-			download("https://gchat.qpic.cn/gchatpic_new//--"+strings.ToUpper(v)+"/0", c.usrdir+strconv.Itoa(i)+".gif")
+			_ = file.DownloadTo("https://gchat.qpic.cn/gchatpic_new//--"+strings.ToUpper(v)+"/0", c.usrdir+strconv.Itoa(i)+".gif", true)
 		} else {
-			download("http://q4.qlogo.cn/g?b=qq&nk="+v+"&s=640", c.usrdir+strconv.Itoa(i)+".gif")
+			_ = file.DownloadTo("http://q4.qlogo.cn/g?b=qq&nk="+v+"&s=640", c.usrdir+strconv.Itoa(i)+".gif", true)
 		}
 	}
 }

plugin_gif/png.go

@@ -1,4 +1,4 @@
-package plugin_gif
+package gif
 
 import (
 	"image"
@@ -16,7 +16,7 @@ func (cc *context) pa() string {
 	rand := rand.Intn(60) + 1
 	dc := img.LoadFirstFrame(dlblock(`pa/`+strconv.Itoa(rand)+`.png`), 0, 0).
 		InsertBottom(tou, 100, 100, 0, 400).Im
-	img.SavePng(dc, name)
+	_ = img.SavePng(dc, name)
 	return "file:///" + name
 }
 
@@ -29,7 +29,7 @@ func (cc *context) si() string {
 	dc := img.LoadFirstFrame(dlblock(`si/0.png`), 0, 0).
 		InsertBottom(im1.Im, im1.W, im1.H, -3, 370).
 		InsertBottom(im2.Im, im2.W, im2.H, 653, 310).Im
-	img.SavePng(dc, name)
+	_ = img.SavePng(dc, name)
 	return "file:///" + name
 }
 
@@ -39,28 +39,31 @@ func (cc *context) other(value ...string) string {
 	// 加载图片
 	im := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
 	var a *image.NRGBA
-	if value[0] == "上翻" || value[0] == "下翻" {
+
+	switch value[0] {
+	case "上翻", "下翻":
 		a = im.FlipV().Im
-	} else if value[0] == "左翻" || value[0] == "右翻" {
+	case "左翻", "右翻":
 		a = im.FlipH().Im
-	} else if value[0] == "反色" {
+	case "反色":
 		a = im.Invert().Im
-	} else if value[0] == "灰度" {
+	case "灰度":
 		a = im.Grayscale().Im
-	} else if value[0] == "负片" {
+	case "负片":
 		a = im.Invert().Grayscale().Im
-	} else if value[0] == "浮雕" {
+	case "浮雕":
 		a = im.Convolve3x3().Im
-	} else if value[0] == "打码" {
+	case "打码":
 		a = im.Blur(10).Im
-	} else if value[0] == "旋转" {
+	case "旋转":
 		r, _ := strconv.ParseFloat(value[1], 64)
 		a = img.Rotate(im.Im, r, 0, 0).Im
-	} else if value[0] == "变形" {
+	case "变形":
 		w, _ := strconv.Atoi(value[1])
 		h, _ := strconv.Atoi(value[2])
 		a = img.Size(im.Im, w, h).Im
 	}
-	img.SavePng(a, name)
+
+	_ = img.SavePng(a, name)
 	return "file:///" + name
 }

plugin_gif/run.go

@@ -1,5 +1,5 @@
-// Package plugin_gif 制图
-package plugin_gif
+// Package gif 制图
+package gif
 
 import (
 	"math/rand"

plugin_nativesetu/data.go

@@ -10,7 +10,7 @@ import (
 	"github.com/corona10/goimagehash"
 	"github.com/sirupsen/logrus"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-	_ "golang.org/x/image/webp"
+	_ "golang.org/x/image/webp" // import webp decoding
 
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"

plugin_score/model.go

@@ -76,7 +76,7 @@ func (sdb *scoredb) InsertOrUpdateScoreByUID(uid int64, score int) (err error) {
 	if err = db.Debug().Model(&scoretable{}).First(&s, "uid = ? ", uid).Error; err != nil {
 		// error handling...
 		if gorm.IsRecordNotFoundError(err) {
-			db.Debug().Model(&scoretable{}).Create(&s) // newUser not user
+			err = db.Debug().Model(&scoretable{}).Create(&s).Error // newUser not user
 		}
 	} else {
 		err = db.Debug().Model(&scoretable{}).Where("uid = ? ", uid).Update(