diff --git a/.golangci.yml b/.golangci.yml index 3dad0af30..dd68ce5a6 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -171,7 +171,7 @@ linters-settings: # exclude_godoc_examples: false funlen: lines: 150 - statements: 50 + statements: 80 gci: # put imports beginning with prefix after 3rd-party packages; # only support one prefix diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go index 4ce686160..0c6b8e26a 100644 --- a/internal/rpc/conversation/conversaion.go +++ b/internal/rpc/conversation/conversaion.go @@ -124,14 +124,8 @@ func (c *conversationServer) SetConversations(ctx context.Context, return nil, err } if groupInfo.Status == constant.GroupStatusDismissed { - return nil, err + return nil, errs.ErrDismissedAlready.Wrap("group dismissed") } - // for _, userID := range req.UserIDs { - // if _, err := c.groupRpcClient.GetGroupMemberCache(ctx, req.Conversation.GroupID, userID); err != nil { - // log.ZError(ctx, "user not in group", err, "userID", userID, "groupID", req.Conversation.GroupID) - // return nil, err - // } - // } } var unequal int var conv tablerelation.ConversationModel @@ -205,8 +199,13 @@ func (c *conversationServer) SetConversations(ctx context.Context, return nil, err } for _, userID := range req.UserIDs { - c.conversationNotificationSender.ConversationSetPrivateNotification(ctx, userID, req.Conversation.UserID, + err := c.conversationNotificationSender.ConversationSetPrivateNotification(ctx, userID, req.Conversation.UserID, req.Conversation.IsPrivateChat.Value, req.Conversation.ConversationID) + if err != nil { + log.ZWarn(ctx, "send conversation set private notification failed", err, + "userID", userID, "conversationID", req.Conversation.ConversationID) + continue + } } } if req.Conversation.BurnDuration != nil {