diff --git a/core/store.go b/core/store.go index 59174d0..f1dd8a5 100644 --- a/core/store.go +++ b/core/store.go @@ -80,6 +80,27 @@ func (bucket Bucket) GetInt(key interface{}, vs ...int) int { return value } +func (bucket Bucket) GetBool(key interface{}, vs ...bool) bool { + var value bool + if len(vs) != 0 { + value = vs[0] + } + db.View(func(tx *bolt.Tx) error { + b := tx.Bucket([]byte(bucket)) + if b == nil { + return nil + } + v := string(b.Get([]byte(fmt.Sprint(key)))) + if v == "true" { + value = true + } else if v == "false" { + value = false + } + return nil + }) + return value +} + func (bucket Bucket) Foreach(f func(k, v []byte) error) { db.View(func(tx *bolt.Tx) error { b := tx.Bucket([]byte(bucket)) diff --git a/core/test.go b/core/test.go index 7c34e75..3d79ef2 100644 --- a/core/test.go +++ b/core/test.go @@ -14,10 +14,10 @@ func init() { if v != "" { vv := strings.Split(v, " ") tp, cd, ud := vv[0], Int(vv[1]), Int(vv[2]) - // if tp == "fake" { - // NotifyMasters("自动更新完成。") - // return - // } + if tp == "fake" && sillyGirl.Get("update_notify", "false") == "true" { + NotifyMasters("自动更新完成。") + return + } msg := "重启完成。" for i := 0; i < 10; i++ { if cd == 0 { diff --git a/im/qq/main.go b/im/qq/main.go index 70084da..5ea070f 100644 --- a/im/qq/main.go +++ b/im/qq/main.go @@ -224,12 +224,15 @@ func start() { c.MarkPrivateMessageReaded(m.Sender.Uin, int64(m.Time)) } } - onTempMessage := func(c *client.QQClient, e *client.TempMessageEvent) { + onTempMessage := func(_ *client.QQClient, e *client.TempMessageEvent) { core.Senders <- &Sender{ Message: e.Message, } } OnGroupMessage := func(_ *client.QQClient, m *message.GroupMessage) { + if m.GroupCode != int64(qq.GetInt("groupCode")) { + return + } core.Senders <- &Sender{ Message: m, } @@ -237,7 +240,7 @@ func start() { bot.Client.OnPrivateMessage(onPrivateMessage) bot.Client.OnGroupMessage(OnGroupMessage) bot.Client.OnTempMessage(onTempMessage) - if qq.Get("onself", "true") == "true" { + if qq.GetBool("onself", true) == true { bot.Client.OnSelfPrivateMessage(onPrivateMessage) bot.Client.OnSelfGroupMessage(OnGroupMessage) }