暂存

coolq/api.go

@@ -119,7 +119,7 @@ func (bot *CQBot) CQSendGroupMessage(groupId int64, i interface{}, autoEscape bo
 	}
 	if m, ok := i.(gjson.Result); ok {
 		if m.Type == gjson.JSON {
-			elem := bot.ConvertObjectMessage(m, true)
+			elem := bot.ConvertObjectMessage(m, true,groupId)
 			fixAt(elem)
 			mid := bot.SendGroupMessage(groupId, &message.SendingMessage{Elements: elem})
 			if mid == -1 {
@@ -144,7 +144,7 @@ func (bot *CQBot) CQSendGroupMessage(groupId int64, i interface{}, autoEscape bo
 	if autoEscape {
 		elem = append(elem, message.NewText(str))
 	} else {
-		elem = bot.ConvertStringMessage(str, true)
+		elem = bot.ConvertStringMessage(str, true,groupId)
 	}
 	fixAt(elem)
 	mid := bot.SendGroupMessage(groupId, &message.SendingMessage{Elements: elem})
@@ -187,7 +187,7 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG {
 						}
 						return m["time"].(int32)
 					}(),
-					Message: bot.ConvertStringMessage(m["message"].(string), true),
+					Message: bot.ConvertStringMessage(m["message"].(string), true,groupId),
 				})
 				return
 			}
@@ -196,7 +196,7 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupId int64, m gjson.Result) MSG {
 		}
 		uin, _ := strconv.ParseInt(e.Get("data.uin").Str, 10, 64)
 		name := e.Get("data.name").Str
-		content := bot.ConvertObjectMessage(e.Get("data.content"), true)
+		content := bot.ConvertObjectMessage(e.Get("data.content"), true,groupId)
 		if uin != 0 && name != "" && len(content) > 0 {
 			var newElem []message.IMessageElement
 			for _, elem := range content {
@@ -242,7 +242,7 @@ func (bot *CQBot) CQSendPrivateMessage(userId int64, i interface{}, autoEscape b
 	var str string
 	if m, ok := i.(gjson.Result); ok {
 		if m.Type == gjson.JSON {
-			elem := bot.ConvertObjectMessage(m, true)
+			elem := bot.ConvertObjectMessage(m, true,userId)
 			mid := bot.SendPrivateMessage(userId, &message.SendingMessage{Elements: elem})
 			if mid == -1 {
 				return Failed(100)
@@ -265,7 +265,7 @@ func (bot *CQBot) CQSendPrivateMessage(userId int64, i interface{}, autoEscape b
 	if autoEscape {
 		elem = append(elem, message.NewText(str))
 	} else {
-		elem = bot.ConvertStringMessage(str, false)
+		elem = bot.ConvertStringMessage(str, false,userId)
 	}
 	mid := bot.SendPrivateMessage(userId, &message.SendingMessage{Elements: elem})
 	if mid == -1 {

coolq/bot.go

@@ -259,3 +259,4 @@ func (m MSG) ToJson() string {
 	b, _ := json.Marshal(m)
 	return string(b)
 }
+

go.sum

@@ -35,6 +35,7 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=