fix cqcode convert error.

README.md

@@ -27,6 +27,7 @@
 <summary>已实现CQ码</summary>
 
 - [CQ:image]
+- [CQ:record]
 - [CQ:face]
 - [CQ:at]
 - [CQ:share]

coolq/api.go

@@ -121,6 +121,12 @@ func (bot *CQBot) CQSendGroupMessage(groupId int64, i interface{}) MSG {
 		return Failed(100)
 	}
 	elem := bot.ConvertStringMessage(str, true)
+	// fix at display
+	for _, e := range elem {
+		if at, ok := e.(*message.AtElement); ok && at.Target != 0 {
+			at.Display = "@" + bot.Client.FindGroup(groupId).FindMember(at.Target).DisplayName()
+		}
+	}
 	mid := bot.SendGroupMessage(groupId, &message.SendingMessage{Elements: elem})
 	if mid == -1 {
 		return Failed(100)

coolq/bot.go

@@ -99,6 +99,15 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
 			newElem = append(newElem, gm)
 			continue
 		}
+		if i, ok := elem.(*message.VoiceElement); ok {
+			gv, err := bot.Client.UploadGroupPtt(groupId, i.Data, int32(len(i.Data)))
+			if err != nil {
+				log.Warnf("警告: 群 %v 消息语音上传失败: %v", groupId, err)
+				continue
+			}
+			newElem = append(newElem, gv)
+			continue
+		}
 		newElem = append(newElem, elem)
 	}
 	m.Elements = newElem

coolq/cqcode.go

@@ -2,6 +2,7 @@ package coolq
 
 import (
 	"encoding/base64"
+	"encoding/hex"
 	"errors"
 	"fmt"
 	"github.com/Mrs4s/MiraiGo/binary"
@@ -43,6 +44,8 @@ func ToStringMessage(e []message.IMessageElement, code int64, raw ...bool) (r st
 			r += fmt.Sprintf("[CQ:forward,id=%s]", o.ResId)
 		case *message.FaceElement:
 			r += fmt.Sprintf(`[CQ:face,id=%d]`, o.Index)
+		case *message.VoiceElement:
+			r += fmt.Sprintf(`[CQ:record,file=%s]`, o.Name)
 		case *message.ImageElement:
 			if ur {
 				r += fmt.Sprintf(`[CQ:image,file=%s]`, o.Filename)
@@ -95,7 +98,8 @@ func (bot *CQBot) ConvertStringMessage(m string, group bool) (r []message.IMessa
 		}
 		elem, err := bot.ToElement(t, d, group)
 		if err != nil {
-			log.Warnf("转换CQ码到MiraiGo Element时出现错误: %v 将忽略本段CQ码.", err)
+			log.Warnf("转换CQ码到MiraiGo Element时出现错误: %v 将原样发送.", err)
+			r = append(r, message.NewText(code))
 			continue
 		}
 		r = append(r, elem)
@@ -192,33 +196,97 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (message.
 			}
 			return message.NewImage(b), nil
 		}
-		if global.PathExists(path.Join(global.IMAGE_PATH, f)) {
+		rawPath := path.Join(global.IMAGE_PATH, f)
-			b, err := ioutil.ReadFile(path.Join(global.IMAGE_PATH, f))
+		if !global.PathExists(rawPath) && global.PathExists(rawPath+".cqimg") {
+			rawPath += ".cqimg"
+		}
+		if global.PathExists(rawPath) {
+			b, err := ioutil.ReadFile(rawPath)
 			if err != nil {
 				return nil, err
 			}
-			if path.Ext(path.Join(global.IMAGE_PATH, f)) != ".image" {
+			if path.Ext(rawPath) != ".image" && path.Ext(rawPath) != ".cqimg" {
 				return message.NewImage(b), nil
 			}
 			if len(b) < 20 {
 				return nil, errors.New("invalid local file")
 			}
-			r := binary.NewReader(b)
+			var size int32
-			hash := r.ReadBytes(16)
+			var hash []byte
+			if path.Ext(rawPath) == ".cqimg" {
+				for _, line := range strings.Split(global.ReadAllText(rawPath), "\n") {
+					kv := strings.SplitN(line, "=", 2)
+					switch kv[0] {
+					case "md5":
+						hash, _ = hex.DecodeString(strings.ReplaceAll(kv[1], "\r", ""))
+					case "size":
+						t, _ := strconv.Atoi(strings.ReplaceAll(kv[1], "\r", ""))
+						size = int32(t)
+					}
+				}
+			} else {
+				r := binary.NewReader(b)
+				hash = r.ReadBytes(16)
+				size = r.ReadInt32()
+			}
+			if size == 0 {
+				return nil, errors.New("img size is 0")
+			}
+			if len(hash) != 16 {
+				return nil, errors.New("invalid hash")
+			}
 			if group {
-				rsp, err := bot.Client.QueryGroupImage(1, hash, r.ReadInt32())
+				rsp, err := bot.Client.QueryGroupImage(1, hash, size)
 				if err != nil {
 					return nil, err
 				}
 				return rsp, nil
 			}
-			rsp, err := bot.Client.QueryFriendImage(1, hash, r.ReadInt32())
+			rsp, err := bot.Client.QueryFriendImage(1, hash, size)
 			if err != nil {
 				return nil, err
 			}
 			return rsp, nil
 		}
 		return nil, errors.New("invalid image")
+	case "record":
+		if !group {
+			return nil, errors.New("private voice unsupported now")
+		}
+		f := d["file"]
+		var data []byte
+		if strings.HasPrefix(f, "http") || strings.HasPrefix(f, "https") {
+			b, err := global.GetBytes(f)
+			if err != nil {
+				return nil, err
+			}
+			data = b
+		}
+		if strings.HasPrefix(f, "base64") {
+			b, err := base64.StdEncoding.DecodeString(strings.ReplaceAll(f, "base64://", ""))
+			if err != nil {
+				return nil, err
+			}
+			data = b
+		}
+		if strings.HasPrefix(f, "file") {
+			fu, err := url.Parse(f)
+			if err != nil {
+				return nil, err
+			}
+			if strings.HasPrefix(fu.Path, "/") && runtime.GOOS == `windows` {
+				fu.Path = fu.Path[1:]
+			}
+			b, err := ioutil.ReadFile(fu.Path)
+			if err != nil {
+				return nil, err
+			}
+			data = b
+		}
+		if !global.IsAMR(data) {
+			return nil, errors.New("unsupported voice file format (please use AMR file for now)")
+		}
+		return &message.VoiceElement{Data: data}, nil
 	case "face":
 		id, err := strconv.Atoi(d["id"])
 		if err != nil {

global/fs.go

@@ -31,3 +31,10 @@ func Check(err error) {
 		log.Fatalf("遇到错误: %v", err)
 	}
 }
+
+func IsAMR(b []byte) bool {
+	if len(b) <= 6 {
+		return false
+	}
+	return b[0] == 0x23 && b[1] == 0x21 && b[2] == 0x41 && b[3] == 0x4D && b[4] == 0x52 // amr file header
+}

go.mod

@@ -3,7 +3,7 @@ module github.com/Mrs4s/go-cqhttp
 go 1.14
 
 require (
-	github.com/Mrs4s/MiraiGo v0.0.0-20200804064012-e1e00ed0683b
+	github.com/Mrs4s/MiraiGo v0.0.0-20200808044635-cd20d7d43dbb
 	github.com/gin-gonic/gin v1.6.3
 	github.com/gorilla/websocket v1.4.2
 	github.com/guonaihong/gout v0.1.1

go.sum

@@ -1,7 +1,11 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Mrs4s/MiraiGo v0.0.0-20200804064012-e1e00ed0683b h1:HBZgam4cS+6/XFVXVcEv3YINozw2qUjnZIhj6EQXLbU=
+github.com/Mrs4s/MiraiGo v0.0.0-20200807030850-ed30f7ad5934 h1:LoNjIsnyEQFGP9IchIQ65yHRCfNKSru3BAOguRepkCM=
-github.com/Mrs4s/MiraiGo v0.0.0-20200804064012-e1e00ed0683b/go.mod h1:M9wh1hjd0rie3+wm27tjPZkYMbD+MBV76CGqp2G7WSU=
+github.com/Mrs4s/MiraiGo v0.0.0-20200807030850-ed30f7ad5934/go.mod h1:0je03wji/tSw4bUH4QCF2Z4/EjyNWjSJTyy5tliX6EM=
+github.com/Mrs4s/MiraiGo v0.0.0-20200808003732-2a32e623270d h1:K9jHdcO13mLqQB0xm0/ZlY852FoVQJ/WSDwfdmfhDlU=
+github.com/Mrs4s/MiraiGo v0.0.0-20200808003732-2a32e623270d/go.mod h1:0je03wji/tSw4bUH4QCF2Z4/EjyNWjSJTyy5tliX6EM=
+github.com/Mrs4s/MiraiGo v0.0.0-20200808044635-cd20d7d43dbb h1:XLe/UreYJRT65GStA3+irRL1Ao0pHZwBtCmTc+4prwA=
+github.com/Mrs4s/MiraiGo v0.0.0-20200808044635-cd20d7d43dbb/go.mod h1:0je03wji/tSw4bUH4QCF2Z4/EjyNWjSJTyy5tliX6EM=
 github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0=
 github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -34,8 +38,9 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -146,6 +151,7 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=

main.go

@@ -184,7 +184,7 @@ func main() {
 	log.Info("アトリは、高性能ですから!")
 	cli.OnDisconnected(func(bot *client.QQClient, e *client.ClientDisconnectedEvent) {
 		if conf.ReLogin {
-			log.Warnf("Bot已离线，将在 %v 秒后尝试重连.", conf.ReLoginDelay)
+			log.Warnf("Bot已离线 (%v)，将在 %v 秒后尝试重连.", e.Message, conf.ReLoginDelay)
 			time.Sleep(time.Second * time.Duration(conf.ReLoginDelay))
 			rsp, err := cli.Login()
 			if err != nil {