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

Merge pull request #74 from Shigma/api-type-check

Browse Source 
sendXXX api type check
This commit is contained in:
Mrs4s 2020-08-11 11:20:17 +08:00 committed by GitHub
commit cdbf903361
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
server/http.go
View File

@ -235,8 +235,8 @@ func (s *httpServer) SendMessage(c *gin.Context) {
func (s *httpServer) SendPrivateMessage(c *gin.Context) { func (s *httpServer) SendPrivateMessage(c *gin.Context) {
uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64) uid, _ := strconv.ParseInt(getParam(c, "user_id"), 10, 64)
msg := getParam(c, "message") msg, t := getParamWithType(c, "message")
if gjson.Valid(msg) { if t == gjson.JSON {
c.JSON(200, s.bot.CQSendPrivateMessage(uid, gjson.Parse(msg))) c.JSON(200, s.bot.CQSendPrivateMessage(uid, gjson.Parse(msg)))
return return
} }
@ -245,8 +245,8 @@ func (s *httpServer) SendPrivateMessage(c *gin.Context) {
func (s *httpServer) SendGroupMessage(c *gin.Context) { func (s *httpServer) SendGroupMessage(c *gin.Context) {
gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64) gid, _ := strconv.ParseInt(getParam(c, "group_id"), 10, 64)
msg := getParam(c, "message") msg, t := getParamWithType(c, "message")
if gjson.Valid(msg) { if t == gjson.JSON {
c.JSON(200, s.bot.CQSendGroupMessage(gid, gjson.Parse(msg))) c.JSON(200, s.bot.CQSendGroupMessage(gid, gjson.Parse(msg)))
return return
} }
@ -372,14 +372,19 @@ func getParamOrDefault(c *gin.Context, k, def string) string {
} }
func getParam(c *gin.Context, k string) string { func getParam(c *gin.Context, k string) string {
p, _ := getParamWithType(c, k)
return p
}
func getParamWithType(c *gin.Context, k string) (string, gjson.Type) {
if q := c.Query(k); q != "" { if q := c.Query(k); q != "" {
return q return q, gjson.Null
} }
if c.Request.Method == "POST" { if c.Request.Method == "POST" {
if h := c.Request.Header.Get("Content-Type"); h != "" { if h := c.Request.Header.Get("Content-Type"); h != "" {
if h == "application/x-www-form-urlencoded" { if h == "application/x-www-form-urlencoded" {
if p, ok := c.GetPostForm(k); ok { if p, ok := c.GetPostForm(k); ok {
return p return p, gjson.Null
} }
} }
if h == "application/json" { if h == "application/json" {
@ -388,20 +393,20 @@ func getParam(c *gin.Context, k string) string {
if res.Exists() { if res.Exists() {
switch res.Type { switch res.Type {
case gjson.JSON: case gjson.JSON:
return res.Raw return res.Raw, gjson.JSON
case gjson.String: case gjson.String:
return res.Str return res.Str, gjson.String
case gjson.Number: case gjson.Number:
return strconv.FormatInt(res.Int(), 10) // 似乎没有需要接受 float 类型的api return strconv.FormatInt(res.Int(), 10), gjson.Number // 似乎没有需要接受 float 类型的api
case gjson.True: case gjson.True:
return "true" return "true", gjson.True
case gjson.False: case gjson.False:
return "false" return "false", gjson.False
} }
} }
} }
} }
} }
} }
return "" return "", gjson.Null
} }