Merge main into sweep/imctl-module

internal/rpc/friend/friend.go

@@ -45,6 +45,7 @@ type friendServer struct {
 	blackDatabase         controller.BlackDatabase
 	userRpcClient         *rpcclient.UserRpcClient
 	notificationSender    *notification.FriendNotificationSender
+	conversationRpcClient rpcclient.ConversationRpcClient
 	RegisterCenter        registry.SvcDiscoveryRegistry
 }
 
@@ -82,6 +83,7 @@ func Start(client registry.SvcDiscoveryRegistry, server *grpc.Server) error {
 		userRpcClient:         &userRpcClient,
 		notificationSender:    notificationSender,
 		RegisterCenter:        client,
+		conversationRpcClient: rpcclient.NewConversationRpcClient(client),
 	})
 	return nil
 }
@@ -131,17 +133,22 @@ func (s *friendServer) ImportFriends(
 	if _, err := s.userRpcClient.GetUsersInfo(ctx, append([]string{req.OwnerUserID}, req.FriendUserIDs...)); err != nil {
 		return nil, err
 	}
-
 	if utils.Contain(req.OwnerUserID, req.FriendUserIDs...) {
 		return nil, errs.ErrCanNotAddYourself.Wrap()
 	}
 	if utils.Duplicate(req.FriendUserIDs) {
 		return nil, errs.ErrArgs.Wrap("friend userID repeated")
 	}
-
 	if err := s.friendDatabase.BecomeFriends(ctx, req.OwnerUserID, req.FriendUserIDs, constant.BecomeFriendByImport); err != nil {
 		return nil, err
 	}
+	for _, userID := range req.FriendUserIDs {
+		s.notificationSender.FriendApplicationAgreedNotification(ctx, &pbfriend.RespondFriendApplyReq{
+			FromUserID:   req.OwnerUserID,
+			ToUserID:     userID,
+			HandleResult: constant.FriendResponseAgree,
+		})
+	}
 	return &pbfriend.ImportFriendResp{}, nil
 }
 

pkg/common/kafka/consumer_group.go

@@ -17,9 +17,10 @@ package kafka
 import (
 	"context"
 
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/tools/log"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+
 	"github.com/Shopify/sarama"
 )
 

pkg/common/kafka/util.go

@@ -1,9 +1,10 @@
 package kafka
 
 import (
+	"github.com/Shopify/sarama"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/tls"
-	"github.com/Shopify/sarama"
 )
 
 // SetupTLSConfig set up the TLS config from config file.

pkg/common/tls/tls.go

@@ -10,7 +10,6 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 )
 
-
 func decryptPEM(data []byte, passphrase []byte) ([]byte, error) {
 	if len(passphrase) == 0 {
 		return data, nil

pkg/rpcclient/notification/group.go

@@ -18,6 +18,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
+
 	"github.com/OpenIMSDK/protocol/constant"
 	pbgroup "github.com/OpenIMSDK/protocol/group"
 	"github.com/OpenIMSDK/protocol/sdkws"
@@ -235,6 +237,14 @@ func (g *GroupNotificationSender) fillOpUser(ctx context.Context, opUser **sdkws
 	}
 	userID := mcontext.GetOpUserID(ctx)
 	if groupID != "" {
+		if authverify.IsManagerUserID(userID) {
+			*opUser = &sdkws.GroupMemberFullInfo{
+				GroupID:        groupID,
+				UserID:         userID,
+				RoleLevel:      constant.GroupAdmin,
+				AppMangerLevel: constant.AppAdmin,
+			}
+		} else {
 			member, err := g.db.TakeGroupMember(ctx, groupID, userID)
 			if err == nil {
 				*opUser = g.groupMemberDB2PB(member, 0)
@@ -242,6 +252,7 @@ func (g *GroupNotificationSender) fillOpUser(ctx context.Context, opUser **sdkws
 				return err
 			}
 		}
+	}
 	user, err := g.getUser(ctx, userID)
 	if err != nil {
 		return err