push

pkg/common/db/cache/redis.go

@@ -308,17 +308,16 @@ func (r *RedisClient) HandleSignalInfo(ctx context.Context, operationID string,
 	if err := proto.Unmarshal(msg.Content, req); err != nil {
 		return false, err
 	}
-	//log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "SignalReq: ", req.String())
-	var inviteeUserIDList []string
+	var inviteeUserIDs []string
 	var isInviteSignal bool
 	switch signalInfo := req.Payload.(type) {
 	case *pbRtc.SignalReq_Invite:
-		inviteeUserIDList = signalInfo.Invite.Invitation.InviteeUserIDList
+		inviteeUserIDs = signalInfo.Invite.Invitation.InviteeUserIDList
 		isInviteSignal = true
 	case *pbRtc.SignalReq_InviteInGroup:
-		inviteeUserIDList = signalInfo.InviteInGroup.Invitation.InviteeUserIDList
+		inviteeUserIDs = signalInfo.InviteInGroup.Invitation.InviteeUserIDList
 		isInviteSignal = true
-		if !utils.IsContain(pushToUserID, inviteeUserIDList) {
+		if !utils.IsContain(pushToUserID, inviteeUserIDs) {
 			return false, nil
 		}
 	case *pbRtc.SignalReq_HungUp, *pbRtc.SignalReq_Cancel, *pbRtc.SignalReq_Reject, *pbRtc.SignalReq_Accept:
@@ -327,7 +326,7 @@ func (r *RedisClient) HandleSignalInfo(ctx context.Context, operationID string,
 		return false, nil
 	}
 	if isInviteSignal {
-		for _, userID := range inviteeUserIDList {
+		for _, userID := range inviteeUserIDs {
 			timeout, err := strconv.Atoi(config.Config.Rtc.SignalTimeout)
 			if err != nil {
 				return false, err

pkg/common/db/controller/group.go

@@ -93,7 +93,7 @@ func (g *GroupController) DismissGroup(ctx context.Context, groupID string) erro
 }
 
 func (g *GroupController) GetGroupIDsByGroupType(ctx context.Context, groupType int) (groupIDs []string, err error) {
-	return g.database.
+	return g.database.GetGroupIDsByGroupType(ctx, groupType)
 }
 
 func (g *GroupController) TakeGroupMember(ctx context.Context, groupID string, userID string) (groupMember *relationTb.GroupMemberModel, err error) {

pkg/common/db/controller/push.go

@@ -0,0 +1,18 @@
+package controller
+
+import (
+	"Open_IM/pkg/common/db/cache"
+	"context"
+)
+
+type PushInterface interface {
+	DelFcmToken(ctx context.Context, userID string, platformID int) error
+}
+
+type PushDataBase struct {
+	cache cache.Cache
+}
+
+func (p *PushDataBase) DelFcmToken(ctx context.Context, userID string, platformID int) error {
+	return p.cache.DelFcmToken(ctx, userID, platformID)
+}

pkg/common/db/localcache/conversation.go

@@ -25,5 +25,5 @@ func NewConversationLocalCache(client discoveryRegistry.SvcDiscoveryRegistry) Co
 
 func (g *ConversationLocalCache) GetRecvMsgNotNotifyUserIDs(ctx context.Context, groupID string) ([]string, error) {
 	g.client.GetConn()
-	return []string{}
+	return []string{}, nil
 }

pkg/common/db/localcache/group.go

@@ -3,7 +3,7 @@ package localcache
 import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
-	discoveryRegistry "Open_IM/pkg/discoveryregistry"
+	"Open_IM/pkg/discoveryregistry"
 	"Open_IM/pkg/proto/group"
 	"context"
 	"sync"
@@ -16,7 +16,7 @@ type GroupLocalCacheInterface interface {
 type GroupLocalCache struct {
 	lock   sync.Mutex
 	cache  map[string]GroupMemberIDsHash
-	client discoveryRegistry.SvcDiscoveryRegistry
+	client discoveryregistry.SvcDiscoveryRegistry
 }
 
 type GroupMemberIDsHash struct {
@@ -24,7 +24,7 @@ type GroupMemberIDsHash struct {
 	userIDs        []string
 }
 
-func NewGroupMemberIDsLocalCache(client discoveryRegistry.SvcDiscoveryRegistry) *GroupLocalCache {
+func NewGroupMemberIDsLocalCache(client discoveryregistry.SvcDiscoveryRegistry) *GroupLocalCache {
 	return &GroupLocalCache{
 		cache:  make(map[string]GroupMemberIDsHash, 0),
 		client: client,
@@ -34,7 +34,7 @@ func NewGroupMemberIDsLocalCache(client discoveryRegistry.SvcDiscoveryRegistry)
 func (g *GroupLocalCache) GetGroupMemberIDs(ctx context.Context, groupID string) ([]string, error) {
 	g.lock.Lock()
 	defer g.lock.Unlock()
-	conn, err := g.client.GetConn(config.Config.RpcRegisterName.OpenImGroupName, nil)
+	conn, err := g.client.GetConn(config.Config.RpcRegisterName.OpenImGroupName)
 	if err != nil {
 		return nil, err
 	}