Northern_Lights/ZeroBot-Plugin
1
0
Fork 0
mirror of https://github.com/FloatTech/ZeroBot-Plugin.git synced 2025-12-19 05:30:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(niuniu): 一些小问题 (#1043)

Browse Source
This commit is contained in:
宇~ 2024-10-22 00:15:55 +08:00 committed by GitHub
parent 814fa0ce33
commit eb065e1984
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugin/niuniu/main.go
View File

@ -289,10 +289,10 @@ func init() {
dajiaoLimiter.Delete(fmt.Sprintf("%d_%d", gid, uid)) dajiaoLimiter.Delete(fmt.Sprintf("%d_%d", gid, uid))
return return
} }
messages, err := niuniu.processNiuNiuAction(t, fiancee[1]) messages, err := niuniu.processNiuNiuAction(t, fiancee[1])
if err != nil { if err != nil {
ctx.SendChain(message.Text(err)) ctx.SendChain(message.Text(err))
dajiaoLimiter.Delete(fmt.Sprintf("%d_%d", gid, uid))
return return
} }
if err = db.insertNiuNiu(&niuniu, gid); err != nil { if err = db.insertNiuNiu(&niuniu, gid); err != nil {
@ -375,6 +375,7 @@ func init() {
fencingResult, err := myniuniu.processJJuAction(&adduserniuniu, t, fiancee[1]) fencingResult, err := myniuniu.processJJuAction(&adduserniuniu, t, fiancee[1])
if err != nil { if err != nil {
ctx.SendChain(message.Text(err)) ctx.SendChain(message.Text(err))
jjLimiter.Delete(t)
return return
} }

8
plugin/niuniu/model.go
View File

@ -142,8 +142,8 @@ func (u *userInfo) processNiuNiuAction(t string, props string) (string, error) {
load, ok := prop.Load(t) load, ok := prop.Load(t)
info = *u info = *u
if props != "" { if props != "" {
if !contains(t, dajiaoProp) { if contains(t, dajiaoProp) {
return "", errors.New("道具不能混着用哦") return "", errors.New("道具不存在")
} }
if err = u.createUserInfoByProps(props); err != nil { if err = u.createUserInfoByProps(props); err != nil {
return "", err return "", err
@ -221,8 +221,8 @@ func (u *userInfo) processJJuAction(adduserniuniu *userInfo, t string, props str
v, ok := prop.Load(t) v, ok := prop.Load(t)
info = *u info = *u
if props != "" { if props != "" {
if !contains(t, jjProp) { if contains(t, jjProp) {
return "", errors.New("道具不能混着用哦") return "", errors.New("道具不存在")
} }
if err = u.createUserInfoByProps(props); err != nil { if err = u.createUserInfoByProps(props); err != nil {
return "", err return "", err