Merge branch 'openimsdk:main' into main

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/gorilla/websocket v1.5.1
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/openimsdk/protocol v0.0.72-alpha.18
+	github.com/openimsdk/protocol v0.0.72-alpha.21
 	github.com/openimsdk/tools v0.0.50-alpha.12
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0

go.sum

@@ -322,8 +322,8 @@ github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
 github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/openimsdk/gomake v0.0.14-alpha.5 h1:VY9c5x515lTfmdhhPjMvR3BBRrRquAUCFsz7t7vbv7Y=
 github.com/openimsdk/gomake v0.0.14-alpha.5/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
-github.com/openimsdk/protocol v0.0.72-alpha.18 h1:EytTtgZuXMG1cgTlJryqXXSO1J3t3wrLIn3Os2PRBEE=
-github.com/openimsdk/protocol v0.0.72-alpha.18/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
+github.com/openimsdk/protocol v0.0.72-alpha.21 h1:MRSFDHVRsFymglbv2FSGPtiKo4RXZDTBwQTWNWiUf/U=
+github.com/openimsdk/protocol v0.0.72-alpha.21/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
 github.com/openimsdk/tools v0.0.50-alpha.12 h1:rV3BxgqN+F79vZvdoQ+97Eob8ScsRVEM8D+Wrcl23uo=
 github.com/openimsdk/tools v0.0.50-alpha.12/go.mod h1:h1cYmfyaVtgFbKmb1Cfsl8XwUOMTt8ubVUQrdGtsUh4=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=

internal/rpc/group/callback.go

@@ -363,26 +363,26 @@ func (s *groupServer) webhookBeforeSetGroupInfoEX(ctx context.Context, before *c
 	return webhook.WithCondition(ctx, before, func(ctx context.Context) error {
 		cbReq := &callbackstruct.CallbackBeforeSetGroupInfoEXReq{
 			CallbackCommand: callbackstruct.CallbackBeforeSetGroupInfoCommand,
-			GroupID:         req.GroupInfoForSetEX.GroupID,
-			GroupName:       req.GroupInfoForSetEX.GroupName,
-			Notification:    req.GroupInfoForSetEX.Notification,
-			Introduction:    req.GroupInfoForSetEX.Introduction,
-			FaceURL:         req.GroupInfoForSetEX.FaceURL,
+			GroupID:         req.GroupInfoForSet.GroupID,
+			GroupName:       req.GroupInfoForSet.GroupName,
+			Notification:    req.GroupInfoForSet.Notification,
+			Introduction:    req.GroupInfoForSet.Introduction,
+			FaceURL:         req.GroupInfoForSet.FaceURL,
 		}
 
-		if req.GroupInfoForSetEX.Ex != nil {
-			cbReq.Ex = req.GroupInfoForSetEX.Ex
+		if req.GroupInfoForSet.Ex != nil {
+			cbReq.Ex = req.GroupInfoForSet.Ex
 		}
 		log.ZDebug(ctx, "debug CallbackBeforeSetGroupInfoEX", "ex", cbReq.Ex)
 
-		if req.GroupInfoForSetEX.NeedVerification != nil {
-			cbReq.NeedVerification = req.GroupInfoForSetEX.NeedVerification
+		if req.GroupInfoForSet.NeedVerification != nil {
+			cbReq.NeedVerification = req.GroupInfoForSet.NeedVerification
 		}
-		if req.GroupInfoForSetEX.LookMemberInfo != nil {
-			cbReq.LookMemberInfo = req.GroupInfoForSetEX.LookMemberInfo
+		if req.GroupInfoForSet.LookMemberInfo != nil {
+			cbReq.LookMemberInfo = req.GroupInfoForSet.LookMemberInfo
 		}
-		if req.GroupInfoForSetEX.ApplyMemberFriend != nil {
-			cbReq.ApplyMemberFriend = req.GroupInfoForSetEX.ApplyMemberFriend
+		if req.GroupInfoForSet.ApplyMemberFriend != nil {
+			cbReq.ApplyMemberFriend = req.GroupInfoForSet.ApplyMemberFriend
 		}
 
 		resp := &callbackstruct.CallbackBeforeSetGroupInfoEXResp{}
@@ -391,14 +391,14 @@ func (s *groupServer) webhookBeforeSetGroupInfoEX(ctx context.Context, before *c
 			return err
 		}
 
-		datautil.NotNilReplace(&req.GroupInfoForSetEX.GroupID, &resp.GroupID)
-		datautil.NotNilReplace(&req.GroupInfoForSetEX.GroupName, &resp.GroupName)
-		datautil.NotNilReplace(&req.GroupInfoForSetEX.FaceURL, &resp.FaceURL)
-		datautil.NotNilReplace(&req.GroupInfoForSetEX.Introduction, &resp.Introduction)
-		datautil.NotNilReplace(&req.GroupInfoForSetEX.Ex, &resp.Ex)
-		datautil.NotNilReplace(&req.GroupInfoForSetEX.NeedVerification, &resp.NeedVerification)
-		datautil.NotNilReplace(&req.GroupInfoForSetEX.LookMemberInfo, &resp.LookMemberInfo)
-		datautil.NotNilReplace(&req.GroupInfoForSetEX.ApplyMemberFriend, &resp.ApplyMemberFriend)
+		datautil.NotNilReplace(&req.GroupInfoForSet.GroupID, &resp.GroupID)
+		datautil.NotNilReplace(&req.GroupInfoForSet.GroupName, &resp.GroupName)
+		datautil.NotNilReplace(&req.GroupInfoForSet.FaceURL, &resp.FaceURL)
+		datautil.NotNilReplace(&req.GroupInfoForSet.Introduction, &resp.Introduction)
+		datautil.NotNilReplace(&req.GroupInfoForSet.Ex, &resp.Ex)
+		datautil.NotNilReplace(&req.GroupInfoForSet.NeedVerification, &resp.NeedVerification)
+		datautil.NotNilReplace(&req.GroupInfoForSet.LookMemberInfo, &resp.LookMemberInfo)
+		datautil.NotNilReplace(&req.GroupInfoForSet.ApplyMemberFriend, &resp.ApplyMemberFriend)
 
 		return nil
 	})
@@ -407,24 +407,24 @@ func (s *groupServer) webhookBeforeSetGroupInfoEX(ctx context.Context, before *c
 func (s *groupServer) webhookAfterSetGroupInfoEX(ctx context.Context, after *config.AfterConfig, req *group.SetGroupInfoEXReq) {
 	cbReq := &callbackstruct.CallbackAfterSetGroupInfoEXReq{
 		CallbackCommand: callbackstruct.CallbackAfterSetGroupInfoCommand,
-		GroupID:         req.GroupInfoForSetEX.GroupID,
-		GroupName:       req.GroupInfoForSetEX.GroupName,
-		Notification:    req.GroupInfoForSetEX.Notification,
-		Introduction:    req.GroupInfoForSetEX.Introduction,
-		FaceURL:         req.GroupInfoForSetEX.FaceURL,
+		GroupID:         req.GroupInfoForSet.GroupID,
+		GroupName:       req.GroupInfoForSet.GroupName,
+		Notification:    req.GroupInfoForSet.Notification,
+		Introduction:    req.GroupInfoForSet.Introduction,
+		FaceURL:         req.GroupInfoForSet.FaceURL,
 	}
 
-	if req.GroupInfoForSetEX.Ex != nil {
-		cbReq.Ex = req.GroupInfoForSetEX.Ex
+	if req.GroupInfoForSet.Ex != nil {
+		cbReq.Ex = req.GroupInfoForSet.Ex
 	}
-	if req.GroupInfoForSetEX.NeedVerification != nil {
-		cbReq.NeedVerification = req.GroupInfoForSetEX.NeedVerification
+	if req.GroupInfoForSet.NeedVerification != nil {
+		cbReq.NeedVerification = req.GroupInfoForSet.NeedVerification
 	}
-	if req.GroupInfoForSetEX.LookMemberInfo != nil {
-		cbReq.LookMemberInfo = req.GroupInfoForSetEX.LookMemberInfo
+	if req.GroupInfoForSet.LookMemberInfo != nil {
+		cbReq.LookMemberInfo = req.GroupInfoForSet.LookMemberInfo
 	}
-	if req.GroupInfoForSetEX.ApplyMemberFriend != nil {
-		cbReq.ApplyMemberFriend = req.GroupInfoForSetEX.ApplyMemberFriend
+	if req.GroupInfoForSet.ApplyMemberFriend != nil {
+		cbReq.ApplyMemberFriend = req.GroupInfoForSet.ApplyMemberFriend
 	}
 
 	s.webhookClient.AsyncPost(ctx, cbReq.GetCallbackCommand(), cbReq, &callbackstruct.CallbackAfterSetGroupInfoEXResp{}, after)

internal/rpc/group/group.go

@@ -1064,7 +1064,7 @@ func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupI
 	if !authverify.IsAppManagerUid(ctx, g.config.Share.IMAdminUserID) {
 		var err error
 
-		opMember, err = g.db.TakeGroupMember(ctx, req.GroupInfoForSetEX.GroupID, mcontext.GetOpUserID(ctx))
+		opMember, err = g.db.TakeGroupMember(ctx, req.GroupInfoForSet.GroupID, mcontext.GetOpUserID(ctx))
 		if err != nil {
 			return nil, err
 		}
@@ -1082,7 +1082,7 @@ func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupI
 		return nil, err
 	}
 
-	group, err := g.db.TakeGroup(ctx, req.GroupInfoForSetEX.GroupID)
+	group, err := g.db.TakeGroup(ctx, req.GroupInfoForSet.GroupID)
 	if err != nil {
 		return nil, err
 	}
@@ -1104,7 +1104,7 @@ func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupI
 		return nil, err
 	}
 
-	updatedData := UpdateGroupInfoEXMap(ctx, req.GroupInfoForSetEX)
+	updatedData := UpdateGroupInfoEXMap(ctx, req.GroupInfoForSet)
 	if len(updatedData) == 0 {
 		return &pbgroup.SetGroupInfoEXResp{}, nil
 	}
@@ -1113,7 +1113,7 @@ func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupI
 		return nil, err
 	}
 
-	group, err = g.db.TakeGroup(ctx, req.GroupInfoForSetEX.GroupID)
+	group, err = g.db.TakeGroup(ctx, req.GroupInfoForSet.GroupID)
 	if err != nil {
 		return nil, err
 	}
@@ -1129,18 +1129,18 @@ func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupI
 	}
 
 	num := len(updatedData)
-	if req.GroupInfoForSetEX.Notification != nil {
+	if req.GroupInfoForSet.Notification != nil {
 		num--
 
-		if req.GroupInfoForSetEX.Notification.Value != "" {
+		if req.GroupInfoForSet.Notification.Value != "" {
 			func() {
 				conversation := &pbconversation.ConversationReq{
-					ConversationID:   msgprocessor.GetConversationIDBySessionType(constant.ReadGroupChatType, req.GroupInfoForSetEX.GroupID),
+					ConversationID:   msgprocessor.GetConversationIDBySessionType(constant.ReadGroupChatType, req.GroupInfoForSet.GroupID),
 					ConversationType: constant.ReadGroupChatType,
-					GroupID:          req.GroupInfoForSetEX.GroupID,
+					GroupID:          req.GroupInfoForSet.GroupID,
 				}
 
-				resp, err := g.GetGroupMemberUserIDs(ctx, &pbgroup.GetGroupMemberUserIDsReq{GroupID: req.GroupInfoForSetEX.GroupID})
+				resp, err := g.GetGroupMemberUserIDs(ctx, &pbgroup.GetGroupMemberUserIDsReq{GroupID: req.GroupInfoForSet.GroupID})
 				if err != nil {
 					log.ZWarn(ctx, "GetGroupMemberIDs is failed.", err)
 					return
@@ -1157,7 +1157,7 @@ func (g *groupServer) SetGroupInfoEX(ctx context.Context, req *pbgroup.SetGroupI
 		}
 	}
 
-	if req.GroupInfoForSetEX.GroupName != "" {
+	if req.GroupInfoForSet.GroupName != "" {
 		num--
 		g.notification.GroupInfoSetNameNotification(ctx, &sdkws.GroupInfoSetNameTips{Group: tips.Group, OpUser: tips.OpUser})
 	}

internal/rpc/msg/sync_msg.go

@@ -16,6 +16,7 @@ package msg
 
 import (
 	"context"
+
 	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
 	"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
 	"github.com/openimsdk/open-im-server/v3/pkg/util/conversationutil"
@@ -144,7 +145,8 @@ func (m *msgServer) GetMaxSeq(ctx context.Context, req *sdkws.GetMaxSeqReq) (*sd
 }
 
 func (m *msgServer) SearchMessage(ctx context.Context, req *msg.SearchMessageReq) (resp *msg.SearchMessageResp, err error) {
-	var chatLogs []*sdkws.MsgData
+	// var chatLogs []*sdkws.MsgData
+	var chatLogs []*msg.SearchedMsgData
 	var total int64
 	resp = &msg.SearchMessageResp{}
 	if total, chatLogs, err = m.MsgDatabase.SearchMessage(ctx, req); err != nil {
@@ -159,17 +161,19 @@ func (m *msgServer) SearchMessage(ctx context.Context, req *msg.SearchMessageReq
 		recvMap  = make(map[string]string)
 		groupMap = make(map[string]*sdkws.GroupInfo)
 	)
+
 	for _, chatLog := range chatLogs {
-		if chatLog.SenderNickname == "" {
-			sendIDs = append(sendIDs, chatLog.SendID)
+		if chatLog.MsgData.SenderNickname == "" {
+			sendIDs = append(sendIDs, chatLog.MsgData.SendID)
 		}
-		switch chatLog.SessionType {
+		switch chatLog.MsgData.SessionType {
 		case constant.SingleChatType, constant.NotificationChatType:
-			recvIDs = append(recvIDs, chatLog.RecvID)
+			recvIDs = append(recvIDs, chatLog.MsgData.RecvID)
 		case constant.WriteGroupChatType, constant.ReadGroupChatType:
-			groupIDs = append(groupIDs, chatLog.GroupID)
+			groupIDs = append(groupIDs, chatLog.MsgData.GroupID)
 		}
 	}
+
 	// Retrieve sender and receiver information
 	if len(sendIDs) != 0 {
 		sendInfos, err := m.UserLocalCache.GetUsersInfo(ctx, sendIDs)
@@ -180,6 +184,7 @@ func (m *msgServer) SearchMessage(ctx context.Context, req *msg.SearchMessageReq
 			sendMap[sendInfo.UserID] = sendInfo.Nickname
 		}
 	}
+
 	if len(recvIDs) != 0 {
 		recvInfos, err := m.UserLocalCache.GetUsersInfo(ctx, recvIDs)
 		if err != nil {
@@ -205,28 +210,31 @@ func (m *msgServer) SearchMessage(ctx context.Context, req *msg.SearchMessageReq
 			}
 		}
 	}
+
 	// Construct response with updated information
 	for _, chatLog := range chatLogs {
 		pbchatLog := &msg.ChatLog{}
-		datautil.CopyStructFields(pbchatLog, chatLog)
-		pbchatLog.SendTime = chatLog.SendTime
-		pbchatLog.CreateTime = chatLog.CreateTime
-		if chatLog.SenderNickname == "" {
-			pbchatLog.SenderNickname = sendMap[chatLog.SendID]
+		datautil.CopyStructFields(pbchatLog, chatLog.MsgData)
+		pbchatLog.SendTime = chatLog.MsgData.SendTime
+		pbchatLog.CreateTime = chatLog.MsgData.CreateTime
+		if chatLog.MsgData.SenderNickname == "" {
+			pbchatLog.SenderNickname = sendMap[chatLog.MsgData.SendID]
 		}
-		switch chatLog.SessionType {
+		switch chatLog.MsgData.SessionType {
 		case constant.SingleChatType, constant.NotificationChatType:
-			pbchatLog.RecvNickname = recvMap[chatLog.RecvID]
-		case constant.WriteGroupChatType, constant.ReadGroupChatType:
-			groupInfo := groupMap[chatLog.GroupID]
+			pbchatLog.RecvNickname = recvMap[chatLog.MsgData.RecvID]
+		case constant.ReadGroupChatType:
+			groupInfo := groupMap[chatLog.MsgData.GroupID]
 			pbchatLog.SenderFaceURL = groupInfo.FaceURL
 			pbchatLog.GroupMemberCount = groupInfo.MemberCount // Reflects actual member count
 			pbchatLog.RecvID = groupInfo.GroupID
 			pbchatLog.GroupName = groupInfo.GroupName
 			pbchatLog.GroupOwner = groupInfo.OwnerUserID
 			pbchatLog.GroupType = groupInfo.GroupType
 		}
-		resp.ChatLogs = append(resp.ChatLogs, pbchatLog)
+		searchChatLog := &msg.SearchChatLog{ChatLog: pbchatLog, IsRevoked: chatLog.IsRevoked}
+
+		resp.ChatLogs = append(resp.ChatLogs, searchChatLog)
 	}
 	resp.ChatLogsNum = int32(total)
 	return resp, nil

internal/rpc/third/log.go

@@ -17,9 +17,10 @@ package third
 import (
 	"context"
 	"crypto/rand"
-	relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
 	"time"
 
+	relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
+
 	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/servererrs"
 	"github.com/openimsdk/protocol/constant"

pkg/callbackstruct/constant.go

@@ -18,7 +18,7 @@ const (
 	CallbackBeforeInviteJoinGroupCommand    = "callbackBeforeInviteJoinGroupCommand"
 	CallbackAfterJoinGroupCommand           = "callbackAfterJoinGroupCommand"
 	CallbackAfterSetGroupInfoCommand        = "callbackAfterSetGroupInfoCommand"
-	CallbackAfterSetGroupInfoEXCommand      = "callbackAfterSetGroupInfoCommandEX"
+	CallbackAfterSetGroupInfoEXCommand      = "callbackAfterSetGroupInfoEXCommand"
 	CallbackBeforeSetGroupInfoCommand       = "callbackBeforeSetGroupInfoCommand"
 	CallbackBeforeSetGroupInfoEXCommand     = "callbackBeforeSetGroupInfoEXCommand"
 	CallbackAfterRevokeMsgCommand           = "callbackBeforeAfterMsgCommand"

pkg/common/storage/controller/msg.go

@@ -78,7 +78,7 @@ type CommonMsgDatabase interface {
 	//GetConversationMinMaxSeqInMongoAndCache(ctx context.Context, conversationID string) (minSeqMongo, maxSeqMongo, minSeqCache, maxSeqCache int64, err error)
 	SetSendMsgStatus(ctx context.Context, id string, status int32) error
 	GetSendMsgStatus(ctx context.Context, id string) (int32, error)
-	SearchMessage(ctx context.Context, req *pbmsg.SearchMessageReq) (total int64, msgData []*sdkws.MsgData, err error)
+	SearchMessage(ctx context.Context, req *pbmsg.SearchMessageReq) (total int64, msgData []*pbmsg.SearchedMsgData, err error)
 	FindOneByDocIDs(ctx context.Context, docIDs []string, seqs map[string]int64) (map[string]*sdkws.MsgData, error)
 
 	// to mq
@@ -747,8 +747,8 @@ func (db *commonMsgDatabase) RangeGroupSendCount(
 	return db.msgDocDatabase.RangeGroupSendCount(ctx, start, end, ase, pageNumber, showNumber)
 }
 
-func (db *commonMsgDatabase) SearchMessage(ctx context.Context, req *pbmsg.SearchMessageReq) (total int64, msgData []*sdkws.MsgData, err error) {
-	var totalMsgs []*sdkws.MsgData
+func (db *commonMsgDatabase) SearchMessage(ctx context.Context, req *pbmsg.SearchMessageReq) (total int64, msgData []*pbmsg.SearchedMsgData, err error) {
+	var totalMsgs []*pbmsg.SearchedMsgData
 	total, msgs, err := db.msgDocDatabase.SearchMessage(ctx, req)
 	if err != nil {
 		return 0, nil, err
@@ -757,7 +757,13 @@ func (db *commonMsgDatabase) SearchMessage(ctx context.Context, req *pbmsg.Searc
 		if msg.IsRead {
 			msg.Msg.IsRead = true
 		}
-		totalMsgs = append(totalMsgs, convert.MsgDB2Pb(msg.Msg))
+		searchedMsgData := &pbmsg.SearchedMsgData{MsgData: convert.MsgDB2Pb(msg.Msg)}
+
+		if msg.Revoke != nil {
+			searchedMsgData.IsRevoked = true
+		}
+
+		totalMsgs = append(totalMsgs, searchedMsgData)
 	}
 	return total, totalMsgs, nil
 }

pkg/common/storage/controller/user.go

@@ -16,12 +16,13 @@ package controller
 
 import (
 	"context"
+	"time"
+
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/database"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
 	"github.com/openimsdk/tools/db/pagination"
 	"github.com/openimsdk/tools/db/tx"
 	"github.com/openimsdk/tools/utils/datautil"
-	"time"
 
 	"github.com/openimsdk/protocol/user"
 	"github.com/openimsdk/tools/errs"
@@ -111,10 +112,14 @@ func (u *userDatabase) InitOnce(ctx context.Context, users []*model.User) error
 // FindWithError Get the information of the specified user and return an error if the userID is not found.
 func (u *userDatabase) FindWithError(ctx context.Context, userIDs []string) (users []*model.User, err error) {
 	userIDs = datautil.Distinct(userIDs)
+
+	// TODO: Add logic to identify which user IDs are distinct and which user IDs were not found.
+
 	users, err = u.cache.GetUsersInfo(ctx, userIDs)
 	if err != nil {
 		return
 	}
+
 	if len(users) != len(userIDs) {
 		err = errs.ErrRecordNotFound.WrapMsg("userID not found")
 	}

pkg/localcache/lru/lru_lazy.go

@@ -94,11 +94,11 @@ func (x *LayLRU[K, V]) GetBatch(keys []K, fetch func(keys []K) (map[K]V, error))
 		once sync.Once
 	)
 
-	x.lock.Lock()
 	res := make(map[K]V)
 	queries := make([]K, 0)
 	setVs := make(map[K]*layLruItem[V])
 	for _, key := range keys {
+		x.lock.Lock()
 		v, ok := x.core.Get(key)
 		x.lock.Unlock()
 		if ok {