shkong/go-cqhttp
1
0
Fork 0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-05-05 03:23:49 +08:00
Code Issues Projects Releases Wiki Activity

fix(coolq): invalid convert int to string

Browse Source
This commit is contained in:
wdvxdr 2021-04-28 16:27:42 +08:00
parent 33d20d4698
commit 36e0ec4e41
No known key found for this signature in database
GPG Key ID: 55FF1414A69CEBA6
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
coolq/cqcode.go
View File

@ -147,9 +147,9 @@ func ToArrayMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r []M
"type": "reply", "type": "reply",
"data": map[string]string{ "data": map[string]string{
"id": fmt.Sprint(toGlobalID(id, reply.(*message.ReplyElement).ReplySeq)), "id": fmt.Sprint(toGlobalID(id, reply.(*message.ReplyElement).ReplySeq)),
"seq": string(replyElem.ReplySeq), "seq": strconv.FormatInt(int64(replyElem.ReplySeq), 10),
"qq": strconv.FormatInt(replyElem.Sender, 10), "qq": strconv.FormatInt(replyElem.Sender, 10),
"time": string(replyElem.Time), "time": strconv.FormatInt(int64(replyElem.Time), 10),
"text": CQCodeEscapeValue(CQCodeEscapeText(ToStringMessage(replyElem.Elements, id))), "text": CQCodeEscapeValue(CQCodeEscapeText(ToStringMessage(replyElem.Elements, id))),
}, },
}) })
@ -1196,9 +1196,9 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
return nil, errors.New("invalid local file") return nil, errors.New("invalid local file")
} }
var ( var (
size int32 size int32
hash []byte hash []byte
url string imageURL string
) )
if path.Ext(rawPath) == ".cqimg" { if path.Ext(rawPath) == ".cqimg" {
for _, line := range strings.Split(global.ReadAllText(rawPath), "\n") { for _, line := range strings.Split(global.ReadAllText(rawPath), "\n") {
@ -1216,11 +1216,11 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
hash = r.ReadBytes(16) hash = r.ReadBytes(16)
size = r.ReadInt32() size = r.ReadInt32()
r.ReadString() r.ReadString()
url = r.ReadString() imageURL = r.ReadString()
} }
if size == 0 { if size == 0 {
if url != "" { if imageURL != "" {
return bot.makeImageOrVideoElem(map[string]string{"file": url}, false, group) return bot.makeImageOrVideoElem(map[string]string{"file": imageURL}, false, group)
} }
return nil, errors.New("img size is 0") return nil, errors.New("img size is 0")
} }
@ -1235,8 +1235,8 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
rsp, err = bot.Client.QueryFriendImage(int64(rand.Uint32()), hash, size) rsp, err = bot.Client.QueryFriendImage(int64(rand.Uint32()), hash, size)
ok: ok:
if err != nil { if err != nil {
if url != "" { if imageURL != "" {
return bot.makeImageOrVideoElem(map[string]string{"file": url}, false, group) return bot.makeImageOrVideoElem(map[string]string{"file": imageURL}, false, group)
} }
return nil, err return nil, err
} }