Merge remote-tracking branch 'upsteram/master'

Author: Jiang-Red

config.go

@@ -7,8 +7,9 @@ require (
 	github.com/FloatTech/AnimeAPI v1.5.1-0.20220901132657-2585bbc03bf6
 	github.com/FloatTech/floatbox v0.0.0-20220822040527-f059031fec44
 	github.com/FloatTech/sqlite v0.3.3
+	github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b
 	github.com/FloatTech/zbpctrl v1.4.1-0.20220715042842-93f081cb0133
-	github.com/FloatTech/zbputils v1.5.1-0.20220826103123-0c73a585e38f
+	github.com/FloatTech/zbputils v1.5.1-0.20220906100116-30c0892066d6
 	github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c
 	github.com/antchfx/htmlquery v1.2.5
 	github.com/corona10/goimagehash v1.0.3
@@ -36,7 +37,6 @@ require (
 )
 
 require (
-	github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b // indirect
 	github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc // indirect
 	github.com/antchfx/xpath v1.2.1 // indirect
 	github.com/cheekybits/genny v1.0.0 // indirect

go.mod

@@ -21,8 +21,8 @@ github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJG
 github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs=
 github.com/FloatTech/zbpctrl v1.4.1-0.20220715042842-93f081cb0133 h1:nP9NI4I+vtwAbiU7wCJwjuzCzMZ/yJYg8h3667HGnv0=
 github.com/FloatTech/zbpctrl v1.4.1-0.20220715042842-93f081cb0133/go.mod h1:72BnjyBwQWUC8mqM9dPk5ZrjxXCilQCVp+jfgHATNdw=
-github.com/FloatTech/zbputils v1.5.1-0.20220826103123-0c73a585e38f h1:R13GKhRZfB42nsCEqek/ZlGbKBopQOZFYwBU9qSCfhg=
-github.com/FloatTech/zbputils v1.5.1-0.20220826103123-0c73a585e38f/go.mod h1:ZT91eCYR6y1HbLRTO5EB7o8K7qEPbCsX7vjhYIuMijc=
+github.com/FloatTech/zbputils v1.5.1-0.20220906100116-30c0892066d6 h1:9+PCM0UzbtrpYSzkvy+AeVy6bpprmVd6BUs17Njao04=
+github.com/FloatTech/zbputils v1.5.1-0.20220906100116-30c0892066d6/go.mod h1:ZT91eCYR6y1HbLRTO5EB7o8K7qEPbCsX7vjhYIuMijc=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c h1:cNPOdTNiVwxLpROLjXCgbIPvdkE+BwvxDvgmdYmWx6Q=
 github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c/go.mod h1:KqZzu7slNKROh3TSYEH/IUMG6f4M+1qubZ5e52QypsE=

go.sum

@@ -31,7 +31,8 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/event"    // 事件
 
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/antiabuse" // 违禁词
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/chat"      // 基础词库
+
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/chat" // 基础词库
 
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/sleep_manage" // 统计睡眠时间
 
@@ -180,6 +181,13 @@ import (
 	// -----------------------以上为内置依赖，勿动------------------------ //
 )
 
+type zbpcfg struct {
+	Z zero.Config        `json:"zero"`
+	W []*driver.WSClient `json:"ws"`
+}
+
+var config zbpcfg
+
 func init() {
 	sus := make([]int64, 0, 16)
 	// 解析命令行参数

main.go

@@ -2,69 +2,122 @@
 package antiabuse
 
 import (
-	"fmt"
+	"strconv"
 	"strings"
 	"time"
 
+	"github.com/FloatTech/floatbox/binary"
 	fcext "github.com/FloatTech/floatbox/ctxext"
+	"github.com/FloatTech/ttl"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/img/text"
+	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
+const bandur time.Duration = time.Minute * 10
+
+var (
+	managers *ctrl.Manager[*zero.Ctx] // managers lazy load
+	cache    = ttl.NewCacheOn(bandur, [4]func(int64, struct{}){nil, nil, onDel, nil})
+	db       *antidb
+)
+
+func onDel(uid int64, _ struct{}) {
+	if managers == nil {
+		return
+	}
+	if err := managers.DoUnblock(uid); err != nil {
+		logrus.Errorln("[antiabuse.onDel] unblock:", err)
+	}
+	if err := db.Del("__bantime__", "WHERE id="+strconv.FormatInt(uid, 10)); err != nil {
+		logrus.Errorln("[antiabuse.onDel] db:", err)
+	}
+}
+
 func init() {
 	engine := control.Register("antiabuse", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault:  false,
-		Help:              "违禁词检测",
+		Help:              "违禁词检测\n- /[添加|删除|查看]违禁词",
 		PrivateDataFolder: "anti_abuse",
 	})
+
 	onceRule := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool {
 		managers = ctx.State["manager"].(*ctrl.Control[*zero.Ctx]).Manager
-		db.DBPath = engine.DataFolder() + "anti_abuse.db"
-		err := db.Open(time.Hour * 4)
+		var err error
+		db, err = newantidb(engine.DataFolder() + "anti_abuse.db")
 		if err != nil {
-			ctx.SendChain(message.Text("open db error: ", err))
+			ctx.SendChain(message.Text("ERROR: ", err))
 			return false
 		}
-		err = db.Create("banWord", &banWord{})
-		if err != nil {
-			ctx.SendChain(message.Text("create table error: ", err))
-			return false
+		return true
+	})
+
+	engine.OnMessage(onceRule, zero.OnlyGroup, func(ctx *zero.Ctx) bool {
+		if !ctx.Event.IsToMe {
+			return true
 		}
-		err = recoverWord()
-		if err != nil {
-			ctx.SendChain(message.Text("recover data error: ", err))
+		uid := ctx.Event.UserID
+		gid := ctx.Event.GroupID
+		msg := strings.ReplaceAll(ctx.MessageString(), "\n", "")
+		msg = strings.ReplaceAll(msg, "\r", "")
+		msg = strings.ReplaceAll(msg, "\t", "")
+		msg = strings.ReplaceAll(msg, ";", "")
+		if db.isInAntiList(uid, gid, msg) {
+			if err := ctx.State["manager"].(*ctrl.Control[*zero.Ctx]).Manager.DoBlock(uid); err == nil {
+				t := time.Now().Unix()
+				cache.Set(uid, struct{}{})
+				ctx.SetGroupBan(gid, uid, int64(bandur.Minutes()))
+				ctx.SendChain(message.Text("检测到违禁词, 已封禁/屏蔽", bandur))
+				db.Lock()
+				defer db.Unlock()
+				err := db.Create("__bantime__", nilbt)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR: ", err))
+					return false
+				}
+				err = db.Insert("__bantime__", &banTime{ID: uid, Time: t})
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR: ", err))
+					return false
+				}
+			} else {
+				ctx.SendChain(message.Text("ERROR: block user: ", err))
+			}
 			return false
 		}
 		return true
 	})
-	engine.OnMessage(onceRule, zero.OnlyGroup, banRule)
+
 	engine.OnCommand("添加违禁词", zero.OnlyGroup, zero.AdminPermission, onceRule).Handle(
 		func(ctx *zero.Ctx) {
 			args := ctx.State["args"].(string)
-			if err := insertWord(ctx.Event.GroupID, args); err != nil {
-				ctx.SendChain(message.Text("error:", err))
+			if err := db.insertWord(ctx.Event.GroupID, args); err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
 			} else {
-				ctx.SendChain(message.Text(fmt.Sprintf("添加违禁词 %s 成功", args)))
+				ctx.SendChain(message.Text("成功"))
 			}
 		})
+
 	engine.OnCommand("删除违禁词", zero.OnlyGroup, zero.AdminPermission, onceRule).Handle(
 		func(ctx *zero.Ctx) {
 			args := ctx.State["args"].(string)
-			if err := deleteWord(ctx.Event.GroupID, args); err != nil {
-				ctx.SendChain(message.Text("error:", err))
+			if err := db.deleteWord(ctx.Event.GroupID, args); err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
 			} else {
-				ctx.SendChain(message.Text(fmt.Sprintf("删除违禁词 %s 成功", args)))
+				ctx.SendChain(message.Text("成功"))
 			}
 		})
+
 	engine.OnCommand("查看违禁词", zero.OnlyGroup, onceRule).Handle(
 		func(ctx *zero.Ctx) {
-			if set, ok := wordMap[ctx.Event.GroupID]; !ok {
-				ctx.SendChain(message.Text("本群无违禁词"))
-			} else {
-				ctx.SendChain(message.Text("本群违禁词有:", strings.Join(set.ToSlice(), " |")))
+			b, err := text.RenderToBase64(db.listWords(ctx.Event.GroupID), text.FontFile, 400, 20)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
 			}
+			ctx.SendChain(message.Text("本群违禁词有\n"), message.Image("base64://"+binary.BytesToString(b)))
 		})
-
 }

plugin/antiabuse/anti.go

@@ -0,0 +1,102 @@
+package antiabuse
+
+import (
+	"errors"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	sqlite "github.com/FloatTech/sqlite"
+)
+
+type antidb struct {
+	sync.RWMutex
+	sqlite.Sqlite
+}
+
+type banWord struct {
+	Word string `db:"word"`
+}
+
+type banTime struct {
+	ID   int64 `db:"id"`
+	Time int64 `db:"time"`
+}
+
+var (
+	nilban = &banWord{}
+	nilbt  = &banTime{}
+)
+
+func newantidb(path string) (*antidb, error) {
+	db := &antidb{Sqlite: sqlite.Sqlite{DBPath: path}}
+	err := db.Open(bandur)
+	if err != nil {
+		return nil, err
+	}
+	_ = db.FindFor("__bantime__", nilbt, "", func() error {
+		t := time.Unix(nilbt.Time, 0)
+		ttl := time.Until(t.Add(bandur))
+		if ttl < time.Minute {
+			_ = managers.DoUnblock(nilbt.ID)
+			return nil
+		}
+		cache.Set(nilbt.ID, struct{}{})
+		cache.Touch(nilbt.ID, -time.Since(t))
+		return nil
+	})
+	_ = db.Del("__bantime__", "WHERE time<="+strconv.FormatInt(time.Now().Add(time.Minute-bandur).Unix(), 10))
+	return db, nil
+}
+
+func (db *antidb) isInAntiList(uid, gid int64, msg string) bool {
+	grp := strconv.FormatInt(gid, 36)
+	db.RLock()
+	defer db.RUnlock()
+	return db.CanFind(grp, "WHERE instr('"+msg+"', word)>0")
+}
+
+func (db *antidb) insertWord(gid int64, word string) error {
+	grp := strconv.FormatInt(gid, 36)
+	db.Lock()
+	defer db.Unlock()
+	err := db.Create(grp, nilban)
+	if err != nil {
+		return err
+	}
+	return db.Insert(grp, &banWord{Word: word})
+}
+
+func (db *antidb) deleteWord(gid int64, word string) error {
+	grp := strconv.FormatInt(gid, 36)
+	db.Lock()
+	defer db.Unlock()
+	if n, _ := db.Count(grp); n == 0 {
+		return errors.New("本群还没有违禁词~")
+	}
+	return db.Del(grp, "WHERE word='"+word+"'")
+}
+
+func (db *antidb) listWords(gid int64) string {
+	grp := strconv.FormatInt(gid, 36)
+	word := &banWord{}
+	sb := strings.Builder{}
+	sb.WriteByte('[')
+	i := 0
+	db.RLock()
+	defer db.RUnlock()
+	_ = db.FindFor(grp, word, "", func() error {
+		if i > 0 {
+			sb.WriteString(" | ")
+		}
+		sb.WriteString(word.Word)
+		i++
+		return nil
+	})
+	if sb.Len() <= 4 {
+		return "[]"
+	}
+	sb.WriteByte(']')
+	return sb.String()
+}