diff --git a/models/asset.go b/models/asset.go index dab9d02..6b7141f 100644 --- a/models/asset.go +++ b/models/asset.go @@ -47,7 +47,7 @@ func DailyAssetsPush() { Name: "pins", Value: ck.PtPin, }} - msg = runTask(&task, true) + msg = runTask(&task) break } } diff --git a/models/bot.go b/models/bot.go index 011fb8b..0d50c4e 100644 --- a/models/bot.go +++ b/models/bot.go @@ -254,77 +254,75 @@ var handleMessage = func(msgs ...interface{}) interface{} { } cks := GetJdCookies() a := s[2] - { - if s := strings.Split(a, "-"); len(s) == 2 { - for i, ck := range cks { - if i+1 >= Int(s[0]) && i+1 <= Int(s[1]) { - switch tp { - case "tg": - tgBotNotify(ck.Query()) - case "qq": - if id == ck.QQ { - SendQQ(int64(id), ck.Query()) - } else { - SendQQ(Config.QQID, ck.Query()) - } - case "qqg": - uid := msgs[3].(int) - if uid == ck.QQ || uid == int(Config.QQID) { - SendQQGroup(int64(id), int64(msgs[3].(int)), ck.Query()) - } - } - } - } - return nil - } - } - { - if x := regexp.MustCompile(`^[\s\d,]+$`).FindString(a); x != "" { - xx := regexp.MustCompile(`(\d+)`).FindAllStringSubmatch(a, -1) - for i, ck := range cks { - for _, x := range xx { - if fmt.Sprint(i+1) == x[1] { - switch tp { - case "tg": - tgBotNotify(ck.Query()) - case "qq": - if id == ck.QQ { - SendQQ(int64(id), ck.Query()) - } else { - SendQQ(Config.QQID, ck.Query()) - } - case "qqg": - uid := msgs[3].(int) - if uid == ck.QQ || uid == int(Config.QQID) { - SendQQGroup(int64(id), int64(msgs[3].(int)), ck.Query()) - } - } - } - } + // { + // if s := strings.Split(a, "-"); len(s) == 2 { + // for i, ck := range cks { + // if i+1 >= Int(s[0]) && i+1 <= Int(s[1]) { + // switch tp { + // case "tg": + // tgBotNotify(ck.Query()) + // case "qq": + // if id == ck.QQ { + // SendQQ(int64(id), ck.Query()) + // } else { + // SendQQ(Config.QQID, ck.Query()) + // } + // case "qqg": + // uid := msgs[3].(int) + // if uid == ck.QQ || uid == int(Config.QQID) { + // SendQQGroup(int64(id), int64(msgs[3].(int)), ck.Query()) + // } + // } + // } + // } + // return nil + // } + // } + // { + // if x := regexp.MustCompile(`^[\s\d,]+$`).FindString(a); x != "" { + // xx := regexp.MustCompile(`(\d+)`).FindAllStringSubmatch(a, -1) + // for i, ck := range cks { + // for _, x := range xx { + // if fmt.Sprint(i+1) == x[1] { + // switch tp { + // case "tg": + // tgBotNotify(ck.Query()) + // case "qq": + // if id == ck.QQ { + // SendQQ(int64(id), ck.Query()) + // } else { + // SendQQ(Config.QQID, ck.Query()) + // } + // case "qqg": + // uid := msgs[3].(int) + // if uid == ck.QQ || uid == int(Config.QQID) { + // SendQQGroup(int64(id), int64(msgs[3].(int)), ck.Query()) + // } + // } + // } + // } - } - return nil - } - } + // } + // return nil + // } + // } { a = strings.Replace(a, " ", "", -1) + pins := "" for _, ck := range cks { if strings.Contains(ck.Note, a) || strings.Contains(ck.Nickname, a) || strings.Contains(ck.PtPin, a) { - switch tp { - case "tg": - tgBotNotify(ck.Query()) - case "qq": - if id == ck.QQ { - SendQQ(int64(id), ck.Query()) - } else { - SendQQ(Config.QQID, ck.Query()) - } - case "qqg": - uid := msgs[3].(int) - if uid == ck.QQ || uid == int(Config.QQID) { - SendQQGroup(int64(id), int64(msgs[3].(int)), ck.Query()) - } - } + pins += ck.PtPin + } + } + for _, task := range Config.Tasks { + if task.Word == "查询" { + task.Envs = []Env{{ + Name: "pins", + Value: pins, + }} + task.Ykq = false + runTask(&task, msgs...) + break } } return nil