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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Mrs4s 2020-09-25 11:19:12 +08:00
commit fffe64651a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coolq/api.go
View File

@ -125,6 +125,7 @@ func (bot *CQBot) CQSendGroupMessage(groupId int64, i interface{}, autoEscape bo
if mid == -1 { if mid == -1 {
return Failed(100) return Failed(100)
} }
log.Infof("发送群 %v(%v) 的消息: %v (%v)", groupId, groupId, m.String(), mid)
return OK(MSG{"message_id": mid}) return OK(MSG{"message_id": mid})
} }
str = func() string { str = func() string {
@ -151,6 +152,7 @@ func (bot *CQBot) CQSendGroupMessage(groupId int64, i interface{}, autoEscape bo
if mid == -1 { if mid == -1 {
return Failed(100) return Failed(100)
} }
log.Infof("发送群 %v(%v) 的消息: %v (%v)", groupId, groupId, str, mid)
return OK(MSG{"message_id": mid}) return OK(MSG{"message_id": mid})
} }
@ -247,6 +249,7 @@ func (bot *CQBot) CQSendPrivateMessage(userId int64, i interface{}, autoEscape b
if mid == -1 { if mid == -1 {
return Failed(100) return Failed(100)
} }
log.Infof("发送好友 %v(%v) 的消息: %v (%v)", userId, userId, m.String(), mid)
return OK(MSG{"message_id": mid}) return OK(MSG{"message_id": mid})
} }
str = func() string { str = func() string {
@ -271,6 +274,7 @@ func (bot *CQBot) CQSendPrivateMessage(userId int64, i interface{}, autoEscape b
if mid == -1 { if mid == -1 {
return Failed(100) return Failed(100)
} }
log.Infof("发送好友 %v(%v) 的消息: %v (%v)", userId, userId, str, mid)
return OK(MSG{"message_id": mid}) return OK(MSG{"message_id": mid})
} }

4
coolq/cqcode.go
View File

@ -58,8 +58,6 @@ func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []M
"type": "text", "type": "text",
"data": map[string]string{"text": o.Content}, "data": map[string]string{"text": o.Content},
} }
case *message.ReplyElement:
continue
case *message.LightAppElement: case *message.LightAppElement:
//m = MSG{ //m = MSG{
// "type": "text", // "type": "text",
@ -144,6 +142,8 @@ func ToArrayMessage(e []message.IMessageElement, code int64, raw ...bool) (r []M
"data": map[string]string{"data": o.Content, "resid": fmt.Sprintf("%d", o.Id)}, "data": map[string]string{"data": o.Content, "resid": fmt.Sprintf("%d", o.Id)},
} }
} }
default:
continue
} }
r = append(r, m) r = append(r, m)
} }