fix(job): cannot delete records

Author: fumiama

job/main.go

@@ -194,7 +194,7 @@ func init() {
 	})
 	en.OnRegex(`^取消在"(.*)"触发的指令$`, zero.UserOrGrpAdmin, isfirstregmatchnotnil).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		cron := ctx.State["regex_matched"].([]string)[1]
-		err := rmcmd(ctx.Event.SelfID, ctx.Event.UserID, cron)
+		err := rmcmd(ctx.Event.SelfID, ctx.Event.UserID, cron, zero.AdminPermission(ctx))
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return
@@ -232,7 +232,7 @@ func init() {
 		args := []any{}
 		if ctx.Event.GroupID != 0 {
 			grp := strconv.FormatInt(ctx.Event.GroupID, 36)
-			q = "WHERE cron LIKE 'fm:%' OR cron LIKE 'sm:%' OR cron LIKE ? OR cron LIKE ? "
+			q = "WHERE cron LIKE 'fm:%' OR cron LIKE 'sm:%' OR cron LIKE '?' OR cron LIKE '?' "
 			args = []any{"_m:" + grp + ":%", "_p:" + grp + ":?:%"}
 			lst = append(lst, "在本群的触发指令]\n")
 		} else {
@@ -262,7 +262,7 @@ func init() {
 			return
 		}
 		lst := make([]string, 0, n)
-		err = db.FindFor(ids, c, "WHERE cron = ?", func() error {
+		err = db.FindFor(ids, c, "WHERE cron = '?'", func() error {
 			lst = append(lst, c.Cmd+"\n")
 			return nil
 		}, cron)
@@ -291,7 +291,7 @@ func init() {
 			return
 		}
 		lst := make([]string, 0, n)
-		err = db.FindFor(ids, c, "WHERE cron = ?", func() error {
+		err = db.FindFor(ids, c, "WHERE cron = '?'", func() error {
 			lst = append(lst, c.Cmd+"\n")
 			return nil
 		}, cron)
@@ -441,19 +441,19 @@ func superuserhandler(rsp []byte) (zero.Handler, error) {
 	}, nil
 }
 
-func rmcmd(bot, caller int64, cron string) error {
+func rmcmd(bot, caller int64, cron string, force bool) error {
 	c := &cmd{}
 	mu.Lock()
 	defer mu.Unlock()
 	bots := strconv.FormatInt(bot, 36)
 	e := new(zero.Event)
 	var delids []int64
-	err := db.FindFor(bots, c, "WHERE cron = ? OR cron LIKE ?", func() error {
+	err := db.FindFor(bots, c, "WHERE cron = '?' OR cron LIKE '?'", func() error {
 		err := json.Unmarshal(binary.StringToBytes(c.Cmd), e)
 		if err != nil {
 			return err
 		}
-		if e.UserID != caller {
+		if !force && e.UserID != caller {
 			return nil
 		}
 		eid, ok := entries[c.ID]
@@ -480,7 +480,7 @@ func delcmd(bot int64, cron string) error {
 	defer mu.Unlock()
 	bots := strconv.FormatInt(bot, 36)
 	var delids []int64
-	err := db.FindFor(bots, c, "WHERE cron = ?", func() error {
+	err := db.FindFor(bots, c, "WHERE cron = '?'", func() error {
 		m, ok := matchers[c.ID]
 		if ok {
 			m.Delete()

job/regexqa.go

@@ -87,7 +87,7 @@ func removeRegex(gid, uid int64, bots, pattern string) error {
 	cr += strconv.FormatInt(gid, 36) + ":" + pattern
 	c := &cmd{}
 	var delids []int64
-	_ = db.FindFor(bots, c, "WHERE cron = ?", func() error {
+	_ = db.FindFor(bots, c, "WHERE cron = '?'", func() error {
 		delids = append(delids, c.ID)
 		return nil
 	}, cr)
@@ -107,7 +107,7 @@ func removeInjectRegex(gid, uid int64, bots, pattern string) error {
 	cr += strconv.FormatInt(gid, 36) + ":" + pattern
 	c := &cmd{}
 	var delids []int64
-	_ = db.FindFor(bots, c, "WHERE cron = ?", func() error {
+	_ = db.FindFor(bots, c, "WHERE cron = '?'", func() error {
 		delids = append(delids, c.ID)
 		return nil
 	}, cr)

job/web.go

@@ -355,7 +355,7 @@ func Delete(req *DeleteReq) (err error) {
 			return
 		}
 	}
-	err = db.FindFor(bots, &c, "WHERE id in ?", func() error {
+	err = db.FindFor(bots, &c, "WHERE id in '?'", func() error {
 		switch {
 		case len(c.Cron) >= 3 && (c.Cron[:3] == "fm:" || c.Cron[:3] == "sm:"):
 			m, ok := matchers[c.ID]