From 569b89a1178bd25523f7fe5a785816cf9d0dea7e Mon Sep 17 00:00:00 2001 From: Mrs4s Date: Sat, 26 Dec 2020 00:59:43 +0800 Subject: [PATCH] fix onebot protocol. --- server/http.go | 3 +++ server/websocket.go | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/server/http.go b/server/http.go index f036be5..fd9fadb 100644 --- a/server/http.go +++ b/server/http.go @@ -352,6 +352,9 @@ func SetRestart(s *httpServer, c *gin.Context) { func GetForwardMessage(s *httpServer, c *gin.Context) { resId := getParam(c, "message_id") + if resId == "" { + resId = getParam(c, "id") + } c.JSON(200, s.bot.CQGetForwardMessage(resId)) } diff --git a/server/websocket.go b/server/websocket.go index 11f1931..15fc88d 100644 --- a/server/websocket.go +++ b/server/websocket.go @@ -481,7 +481,11 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{ return bot.CQGetImage(p.Get("file").Str) }, "get_forward_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG { - return bot.CQGetForwardMessage(p.Get("message_id").Str) + id := p.Get("message_id").Str + if id == "" { + id = p.Get("id").Str + } + return bot.CQGetForwardMessage(id) }, "get_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG { return bot.CQGetMessage(int32(p.Get("message_id").Int()))