diff --git a/coolq/cqcode.go b/coolq/cqcode.go
index 75905fe..8554d99 100644
--- a/coolq/cqcode.go
+++ b/coolq/cqcode.go
@@ -383,17 +383,15 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (message.
return nil, errors.New("song not found")
}
name := info.Get("name").Str
+ jumpUrl := "https://y.music.163.com/m/song/" + d["id"]
+ musicUrl := "http://music.163.com/song/media/outer/url?id=" + d["id"]
+ picUrl := info.Get("album.picUrl").Str
artistName := ""
if info.Get("artists.0").Exists() {
artistName = info.Get("artists.0.name").Str
}
- xml := fmt.Sprintf(`- %s%s
`,
- name, d["id"], info.Get("album.picUrl").Str, d["id"], name, artistName)
- return &message.ServiceElement{
- Id: 60,
- Content: xml,
- SubType: "music",
- }, nil
+ json := fmt.Sprintf("{\"app\": \"com.tencent.structmsg\",\"desc\":\"音乐\",\"view\":\"music\",\"prompt\":\"[分享]%s\",\"ver\":\"0.0.0.1\",\"meta\":{ \"music\": { \"desc\": \"%s\", \"jumpUrl\": \"%s\", \"musicUrl\": \"%s\", \"preview\": \"%s\", \"tag\": \"网易云音乐\", \"title\":\"%s\"}}}", name,artistName, jumpUrl, musicUrl, picUrl, name)
+ return message.NewLightApp(json), nil
}
if d["type"] == "custom" {
xml := fmt.Sprintf(`- %s%s
`,
diff --git a/docs/cqhttp.md b/docs/cqhttp.md
index fc97bc2..a91beee 100644
--- a/docs/cqhttp.md
+++ b/docs/cqhttp.md
@@ -222,7 +222,7 @@ Type: `cardimage`
示例cardimage 的cq码:
```test
-[CQ:cardimage,file=https://i.pixiv.cat/img-master/img/2020/03/25/00/00/08/80334602_p0_master1200.jpg]```
+[CQ:cardimage,file=https://i.pixiv.cat/img-master/img/2020/03/25/00/00/08/80334602_p0_master1200.jpg]
```
## API
@@ -236,7 +236,7 @@ Type: `cardimage`
| 字段 | 类型 | 说明 |
| -------- | ------ | ---- |
| group_id | int64 | 群号 |
-| name | string | 新名 |
+| group_name | string | 新名 |
### 获取图片信息
diff --git a/server/http.go b/server/http.go
index 168856b..1bbac8c 100644
--- a/server/http.go
+++ b/server/http.go
@@ -347,7 +347,7 @@ func (s *httpServer) SetWholeBan(c *gin.Context) {
func (s *httpServer) SetGroupName(c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
- c.JSON(200, s.bot.CQSetGroupName(gid, getParam(c, "name")))
+ c.JSON(200, s.bot.CQSetGroupName(gid, getParam(c, "group_name")))
}
func (s *httpServer) SetGroupLeave(c *gin.Context) {
diff --git a/server/websocket.go b/server/websocket.go
index 9c6c9c8..a1f241d 100644
--- a/server/websocket.go
+++ b/server/websocket.go
@@ -477,7 +477,7 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
}())
},
"set_group_name": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
- return bot.CQSetGroupName(p.Get("group_id").Int(), p.Get("name").Str)
+ return bot.CQSetGroupName(p.Get("group_id").Int(), p.Get("group_name").Str)
},
"set_group_leave": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQSetGroupLeave(p.Get("group_id").Int())