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

eatmoreapple · Sep 25, 2023 · 8771ebf · 8771ebf
1 parent 00c5599
commit 8771ebf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
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)