diff --git a/coolq/cqcode.go b/coolq/cqcode.go index d97d707..494d17b 100644 --- a/coolq/cqcode.go +++ b/coolq/cqcode.go @@ -244,6 +244,11 @@ func ToArrayMessage(e []message.IMessageElement, source MessageSource) (r []glob "data": map[string]string{"data": o.Content, "resid": strconv.FormatInt(int64(o.Id), 10)}, } } + case *message.AnimatedSticker: + m = global.MSG{ + "type": "sticker", + "data": map[string]string{"id": strconv.FormatInt(int64(o.ID), 10)}, + } default: continue } @@ -361,6 +366,8 @@ func ToStringMessage(e []message.IMessageElement, source MessageSource, isRaw .. } case *message.LightAppElement: write(`[CQ:json,data=%s]`, CQCodeEscapeValue(o.Content)) + case *message.AnimatedSticker: + write(`[CQ:sticker,id=%d]`, o.ID) } } r = sb.String() // 内部已拷贝 @@ -466,6 +473,11 @@ func ToMessageContent(e []message.IMessageElement) (r []global.MSG) { "data": global.MSG{"data": o.Content, "resid": o.Id}, } } + case *message.AnimatedSticker: + m = global.MSG{ + "type": "sticker", + "data": global.MSG{"id": o.ID}, + } default: continue } @@ -922,6 +934,12 @@ func (bot *CQBot) ToElement(t string, d map[string]string, sourceType MessageSou } } return &message.VoiceElement{Data: data}, nil + case "sticker": + id, err := strconv.Atoi(d["id"]) + if err != nil { + return nil, err + } + return &message.AnimatedSticker{ID: int32(id)}, nil case "face": id, err := strconv.Atoi(d["id"]) if err != nil { diff --git a/go.mod b/go.mod index ec37bb9..79f6fba 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f github.com/Microsoft/go-winio v0.5.1 - github.com/Mrs4s/MiraiGo v0.0.0-20211118132817-19e205000410 + github.com/Mrs4s/MiraiGo v0.0.0-20211119150245-3216c69d469d github.com/dustin/go-humanize v1.0.0 github.com/fumiama/go-hide-param v0.1.4 github.com/gabriel-vasile/mimetype v1.4.0 diff --git a/go.sum b/go.sum index e74f4fb..fb92163 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,8 @@ github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/g github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Microsoft/go-winio v0.5.1 h1:aPJp2QD7OOrhO5tQXqQoGSJc+DjDtWTGLOmNyAm6FgY= github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Mrs4s/MiraiGo v0.0.0-20211118132817-19e205000410 h1:a4DRiEqbOPQICQhwis+8sCDwsEev3lmeR8sXQ0oRnMk= -github.com/Mrs4s/MiraiGo v0.0.0-20211118132817-19e205000410/go.mod h1:imVKbfKqqeit+C/eaWGb4MKQ3z3gN6pRpBU5RMtp5so= +github.com/Mrs4s/MiraiGo v0.0.0-20211119150245-3216c69d469d h1:H0XKbw4aZMBxZAb8InemvoDPtOeWrIESwTg4ReVlC5o= +github.com/Mrs4s/MiraiGo v0.0.0-20211119150245-3216c69d469d/go.mod h1:imVKbfKqqeit+C/eaWGb4MKQ3z3gN6pRpBU5RMtp5so= github.com/bits-and-blooms/bitset v1.2.1 h1:M+/hrU9xlMp7t4TyTDQW97d3tRPVuKFC6zBEK16QnXY= github.com/bits-and-blooms/bitset v1.2.1/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=