修复超40人拉入群聊报错的问题 (#406)

757368663 · web-flow · commit 8771ebf7f1fb · 2023-09-25T11:32:20.000+08:00
diff --git a/caller.go b/caller.go
@@ -460,6 +460,7 @@ type CallerAddFriendIntoChatRoomOptions struct {
 	BaseRequest *BaseRequest
 	LoginInfo   *LoginInfo
 	Group       *Group
+	GroupLength int
 	Friends     []*Friend
 }
 
@@ -476,6 +477,7 @@ func (c *Caller) AddFriendIntoChatRoom(ctx context.Context, opt *CallerAddFriend
 		BaseRequest:      opt.BaseRequest,
 		LoginInfo:        opt.LoginInfo,
 		Group:            opt.Group.UserName,
+		GroupLength:      opt.GroupLength,
 		InviteMemberList: inviteMemberList,
 	}
 	resp, err := c.Client.AddMemberIntoChatRoom(ctx, clientAddMemberIntoChatRoomOption)
diff --git a/client.go b/client.go
@@ -824,14 +824,15 @@ func (c *Client) Logout(ctx context.Context, info *LoginInfo) (*http.Response, e
 
 type ClientAddMemberIntoChatRoomOption struct {
 	Group            string
+	GroupLength      int
 	InviteMemberList []string
 	BaseRequest      *BaseRequest
 	LoginInfo        *LoginInfo
 }
 
 // AddMemberIntoChatRoom 添加用户进群聊
 func (c *Client) AddMemberIntoChatRoom(ctx context.Context, opt *ClientAddMemberIntoChatRoomOption) (*http.Response, error) {
-	if len(opt.InviteMemberList) >= 40 {
+	if opt.GroupLength >= 40 {
 		return c.InviteMemberIntoChatRoom(ctx, opt)
 	}
 	return c.addMemberIntoChatRoom(ctx, opt)
diff --git a/user.go b/user.go
@@ -509,6 +509,7 @@ func (s *Self) AddFriendsIntoGroup(group *Group, friends ...*Friend) error {
 		BaseRequest: s.bot.Storage.Request,
 		LoginInfo:   s.bot.Storage.LoginInfo,
 		Group:       group,
+		GroupLength: groupMembers.Count(),
 		Friends:     friends,
 	}
 	return s.bot.Caller.AddFriendIntoChatRoom(s.Bot().Context(), opt)

Original file line number	Diff line number	Diff line change
`@@ -460,6 +460,7 @@ type CallerAddFriendIntoChatRoomOptions struct {`
`460`	`460`	`BaseRequest *BaseRequest`
`461`	`461`	`LoginInfo *LoginInfo`
`462`	`462`	`Group *Group`
	`463`	`+ GroupLength int`
`463`	`464`	`Friends []*Friend`
`464`	`465`	`}`
`465`	`466`
`@@ -476,6 +477,7 @@ func (c Caller) AddFriendIntoChatRoom(ctx context.Context, opt CallerAddFriend`
`476`	`477`	`BaseRequest: opt.BaseRequest,`
`477`	`478`	`LoginInfo: opt.LoginInfo,`
`478`	`479`	`Group: opt.Group.UserName,`
	`480`	`+ GroupLength: opt.GroupLength,`
`479`	`481`	`InviteMemberList: inviteMemberList,`
`480`	`482`	`}`
`481`	`483`	`resp, err := c.Client.AddMemberIntoChatRoom(ctx, clientAddMemberIntoChatRoomOption)`
Original file line number	Diff line number	Diff line change
`@@ -509,6 +509,7 @@ func (s Self) AddFriendsIntoGroup(group Group, friends ...*Friend) error {`
`509`	`509`	`BaseRequest: s.bot.Storage.Request,`
`510`	`510`	`LoginInfo: s.bot.Storage.LoginInfo,`
`511`	`511`	`Group: group,`
	`512`	`+ GroupLength: groupMembers.Count(),`
`512`	`513`	`Friends: friends,`
`513`	`514`	`}`
`514`	`515`	`return s.bot.Caller.AddFriendIntoChatRoom(s.Bot().Context(), opt)`