update

core/function.go

@@ -99,6 +99,7 @@ func handleMessage(sender Sender) {
 				rt := function.Handle(sender)
 				if rt != nil {
 					sender.Reply(rt)
+					sender.Finish()
 				}
 				return
 			}

core/im.go

@@ -24,6 +24,7 @@ type Sender interface {
 	Reply(...interface{}) (int, error)
 	Delete() error
 	Disappear(lifetime ...time.Duration)
+	Finish()
 }
 
 type Edit int
@@ -111,3 +112,7 @@ func (sender *Faker) Delete() error {
 func (sender *Faker) Disappear(lifetime ...time.Duration) {
 
 }
+
+func (sender *Faker) Finish() {
+
+}

core/store.go

@@ -28,24 +28,24 @@ func initStore() {
 	}
 }
 
-func (bucket Bucket) Set(key string, value interface{}) {
+func (bucket Bucket) Set(key interface{}, value interface{}) {
 	db.Update(func(tx *bolt.Tx) error {
 		b := tx.Bucket([]byte(bucket))
 		if b == nil {
 			b, _ = tx.CreateBucket([]byte(bucket))
 		}
-		b.Put([]byte(key), []byte(fmt.Sprint(value)))
+		b.Put([]byte(fmt.Sprint(key)), []byte(fmt.Sprint(value)))
 		return nil
 	})
 }
 
-func (bucket Bucket) Get(kv ...string) string {
+func (bucket Bucket) Get(kv ...interface{}) string {
 	var key, value string
 	for i := range kv {
 		if i == 0 {
-			key = kv[0]
+			key = fmt.Sprint(kv[0])
 		} else {
-			value = kv[1]
+			value = fmt.Sprint(kv[1])
 		}
 	}
 	db.View(func(tx *bolt.Tx) error {
@@ -61,7 +61,7 @@ func (bucket Bucket) Get(kv ...string) string {
 	return value
 }
 
-func (bucket Bucket) GetInt(key string, vs ...int) int {
+func (bucket Bucket) GetInt(key interface{}, vs ...int) int {
 	var value int
 	if len(vs) != 0 {
 		value = vs[0]
@@ -71,7 +71,7 @@ func (bucket Bucket) GetInt(key string, vs ...int) int {
 		if b == nil {
 			return nil
 		}
-		v := Int(string(b.Get([]byte(key))))
+		v := Int(string(b.Get([]byte(fmt.Sprint(key)))))
 		if v != 0 {
 			value = v
 		}

im/qq/main.go

@@ -248,7 +248,3 @@ func start() {
 		bot.SendGroupMessage(int64(i), &message.SendingMessage{Elements: []message.IMessageElement{&message.AtElement{Target: int64(j)}, &message.TextElement{Content: s}}})
 	}
 }
-
-func (sender *Sender) Temporary() {
-
-}

im/qq/sender.go

@@ -250,3 +250,7 @@ func (sender *Sender) Disappear(lifetime ...time.Duration) {
 		sender.Duration = &lifetime[0]
 	}
 }
+
+func (sender *Sender) Finish() {
+
+}

im/tg/tg.go

@@ -234,3 +234,7 @@ func (sender *Sender) Disappear(lifetime ...time.Duration) {
 		sender.Duration = &lifetime[0]
 	}
 }
+
+func (sender *Sender) Finish() {
+
+}

im/wxmp/init.go

@@ -2,6 +2,8 @@ package wxgzh
 
 import (
 	"fmt"
+	"strings"
+	"time"
 
 	"github.com/cdle/sillyGirl/core"
 	"github.com/gin-gonic/gin"
@@ -12,6 +14,7 @@ import (
 )
 
 var wxmp = core.NewBucket("wxmp")
+var u2i = core.NewBucket("wxmpu2i")
 
 func init() {
 	core.Server.Any("/wx/", func(c *gin.Context) {
@@ -27,19 +30,124 @@ func init() {
 		officialAccount := wc.GetOfficialAccount(cfg)
 		server := officialAccount.GetServer(c.Request, c.Writer)
 		server.SetMessageHandler(func(msg *message.MixMessage) *message.Reply {
-			//TODO
+			sender := &Sender{}
-			//回复消息：演示回复用户发送的消息
+			sender.Message = msg.Content
-			fmt.Println(msg.Content)
+			sender.Wait = make(chan string)
-			text := message.NewText(msg.Content)
+			sender.uid = u2i.GetInt(msg.FromUserName)
-			return &message.Reply{MsgType: message.MsgTypeText, MsgData: text}
+			if sender.uid == 0 {
+				sender.uid = int(time.Now().UnixNano())
+				u2i.Set(msg.FromUserName, sender.uid)
+			}
+
+			return &message.Reply{MsgType: message.MsgTypeText, MsgData: message.NewText(<-sender.Wait)}
 		})
-		//处理消息接收以及回复
 		err := server.Serve()
 		if err != nil {
-			fmt.Println(err)
 			return
 		}
-		//发送回复的消息
 		server.Send()
 	})
 }
+
+type Sender struct {
+	Message   string
+	matches   [][]string
+	Responses []string
+	Wait      chan string
+	uid       int
+}
+
+func (sender *Sender) GetContent() string {
+	return sender.Message
+}
+
+func (sender *Sender) GetUserID() int {
+	return sender.uid
+}
+
+func (sender *Sender) GetChatID() int {
+	return 0
+}
+
+func (sender *Sender) GetImType() string {
+	return "wxmp"
+}
+
+func (sender *Sender) GetMessageID() int {
+	return 0
+}
+
+func (sender *Sender) GetUsername() string {
+	return ""
+}
+
+func (sender *Sender) IsReply() bool {
+	return false
+}
+
+func (sender *Sender) GetReplySenderUserID() int {
+	return 0
+}
+
+func (sender *Sender) GetRawMessage() interface{} {
+	return sender.Message
+}
+
+func (sender *Sender) SetMatch(ss []string) {
+	sender.matches = [][]string{ss}
+}
+func (sender *Sender) SetAllMatch(ss [][]string) {
+	sender.matches = ss
+}
+
+func (sender *Sender) GetMatch() []string {
+	return sender.matches[0]
+}
+
+func (sender *Sender) GetAllMatch() [][]string {
+	return sender.matches
+}
+
+func (sender *Sender) Get(index ...int) string {
+	i := 0
+	if len(index) != 0 {
+		i = index[0]
+	}
+	if len(sender.matches) == 0 {
+		return ""
+	}
+	if len(sender.matches[0]) < i+1 {
+		return ""
+	}
+	return sender.matches[0][i]
+}
+
+func (sender *Sender) IsAdmin() bool {
+	return strings.Contains(wxmp.Get("masters"), fmt.Sprint(sender.uid))
+}
+
+func (sender *Sender) IsMedia() bool {
+	return false
+}
+
+func (sender *Sender) Reply(msgs ...interface{}) (int, error) {
+	for _, item := range msgs {
+		switch item.(type) {
+		case string:
+			sender.Responses = append(sender.Responses, item.(string))
+		}
+	}
+	return 0, nil
+}
+
+func (sender *Sender) Delete() error {
+	return nil
+}
+
+func (sender *Sender) Disappear(lifetime ...time.Duration) {
+
+}
+
+func (sender *Sender) Finish() {
+	sender.Wait <- strings.Join(sender.Responses, "\n")
+}