兼容单独拉取 message 时候返回数据多一层 message id 的情况

--issue=25

Author: vissong

examples/apitest/main_test.go

@@ -23,7 +23,7 @@ var api openapi.OpenAPI
 
 var (
 	testGuildID   = "3326534247441079828" // replace your guild id
-	testChannelID = "1513270"             // replace your channel id
+	testChannelID = "1595028"             // replace your channel id
 	testMessageID = `08e092eeb983afef9e0110f9bb5d1a1231343431313532313836373838333234303420801e
 28003091c4bb02380c400c48d8a7928d06`  // replace your channel id
 	testRolesID            = `10054557`                             // replace your roles id

examples/apitest/message_test.go

@@ -1,6 +1,7 @@
 package apitest
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/tencent-connect/botgo/dto"
@@ -80,6 +81,9 @@ func TestMessage(t *testing.T) {
 				}
 				t.Log(message.ID, message.Author.Username, message.Timestamp)
 			}
+
+			message, err := api.Message(ctx, testChannelID, index[0])
+			fmt.Println(message)
 		},
 	)
 }
@@ -100,13 +104,15 @@ func TestRetractMessage(t *testing.T) {
 func TestMessageReference(t *testing.T) {
 	t.Run(
 		"引用消息", func(t *testing.T) {
-			message, err := api.PostMessage(ctx, testChannelID, &dto.MessageToCreate{
-				Content: "文本引用消息",
-				MessageReference: &dto.MessageReference{
-					MessageID:             testMessageID,
-					IgnoreGetMessageError: false,
+			message, err := api.PostMessage(
+				ctx, testChannelID, &dto.MessageToCreate{
+					Content: "文本引用消息",
+					MessageReference: &dto.MessageReference{
+						MessageID:             testMessageID,
+						IgnoreGetMessageError: false,
+					},
 				},
-			})
+			)
 			if err != nil {
 				t.Error(err)
 			}
@@ -118,33 +124,35 @@ func TestMessageReference(t *testing.T) {
 func TestMarkdownMessage(t *testing.T) {
 	t.Run(
 		"markdown 消息", func(t *testing.T) {
-			message, err := api.PostMessage(ctx, testChannelID, &dto.MessageToCreate{
-				Markdown: &dto.Markdown{
-					TemplateID: testMarkdownTemplateID,
-					Params: []*dto.MarkdownParams{
-						{
-							Key:    "title",
-							Values: []string{"标题"},
-						},
-						{
-							Key:    "slice",
-							Values: []string{"1", "频道名称<#1146349>", "3"},
-						},
-						{
-							Key:    "image",
-							Values: []string{"https://pub.idqqimg.com/pc/misc/files/20191015/32ed5b691a1138ac452a59e42f3f83b5.png"},
-						},
-						{
-							Key:    "link",
-							Values: []string{"[🔗我的收藏夹](qq.com)"},
-						},
-						{
-							Key:    "desc",
-							Values: []string{"简介"},
+			message, err := api.PostMessage(
+				ctx, testChannelID, &dto.MessageToCreate{
+					Markdown: &dto.Markdown{
+						TemplateID: testMarkdownTemplateID,
+						Params: []*dto.MarkdownParams{
+							{
+								Key:    "title",
+								Values: []string{"标题"},
+							},
+							{
+								Key:    "slice",
+								Values: []string{"1", "频道名称<#1146349>", "3"},
+							},
+							{
+								Key:    "image",
+								Values: []string{"https://pub.idqqimg.com/pc/misc/files/20191015/32ed5b691a1138ac452a59e42f3f83b5.png"},
+							},
+							{
+								Key:    "link",
+								Values: []string{"[🔗我的收藏夹](qq.com)"},
+							},
+							{
+								Key:    "desc",
+								Values: []string{"简介"},
+							},
 						},
 					},
 				},
-			})
+			)
 			if err != nil {
 				t.Error(err)
 			}
@@ -156,9 +164,11 @@ func TestMarkdownMessage(t *testing.T) {
 func TestContentMessage(t *testing.T) {
 	t.Run(
 		"content 消息", func(t *testing.T) {
-			message, err := api.PostMessage(ctx, testChannelID, &dto.MessageToCreate{
-				Content: "文本消息",
-			})
+			message, err := api.PostMessage(
+				ctx, testChannelID, &dto.MessageToCreate{
+					Content: "文本消息",
+				},
+			)
 			if err != nil {
 				t.Error(err)
 			}
@@ -170,24 +180,26 @@ func TestContentMessage(t *testing.T) {
 func TestPatchMessage(t *testing.T) {
 	t.Run(
 		"修改消息", func(t *testing.T) {
-			message, err := api.PatchMessage(ctx, testChannelID, testMessageID, &dto.MessageToCreate{
-				Keyboard: &dto.Keyboard{
-					ID: "62",
-				},
-				Markdown: &dto.Markdown{
-					TemplateID: 65,
-					Params: []*dto.MarkdownParams{
-						{
-							Key:    "title",
-							Values: []string{"标题"},
-						},
-						{
-							Key:    "content",
-							Values: []string{"内容"},
+			message, err := api.PatchMessage(
+				ctx, testChannelID, testMessageID, &dto.MessageToCreate{
+					Keyboard: &dto.Keyboard{
+						ID: "62",
+					},
+					Markdown: &dto.Markdown{
+						TemplateID: 65,
+						Params: []*dto.MarkdownParams{
+							{
+								Key:    "title",
+								Values: []string{"标题"},
+							},
+							{
+								Key:    "content",
+								Values: []string{"内容"},
+							},
 						},
 					},
 				},
-			})
+			)
 			if err != nil {
 				t.Error(err)
 			}

examples/apitest/role_test.go

@@ -74,7 +74,6 @@ func Test_role(t *testing.T) {
 
 func Test_roleWithMember(t *testing.T) {
 	var roleID dto.RoleID
-	var err error
 
 	t.Run(
 		"添加人到身份组", func(t *testing.T) {

openapi/v1/message.go

@@ -7,6 +7,7 @@ import (
 	"github.com/tencent-connect/botgo/dto"
 	"github.com/tencent-connect/botgo/errs"
 	"github.com/tencent-connect/botgo/openapi"
+	"github.com/tidwall/gjson"
 )
 
 // Message 拉取单条消息
@@ -20,7 +21,15 @@ func (o *openAPI) Message(ctx context.Context, channelID string, messageID strin
 		return nil, err
 	}
 
-	return resp.Result().(*dto.Message), nil
+	// 兼容处理
+	result := resp.Result().(*dto.Message)
+	if result.ID == "" {
+		body := gjson.Get(resp.String(), "message")
+		if err := json.Unmarshal([]byte(body.String()), result); err != nil {
+			return nil, err
+		}
+	}
+	return result, nil
 }
 
 // Messages 拉取消息列表