msb-public
/
Open-IM-Server
mirror of https://github.com/OpenIMSDK/Open-IM-Server
2
0
Code Issues Projects Releases Wiki Activity

fix: fix the conflect

Browse Source
pull/1987/head
luhaoling 2 years ago
parent 62134aa6fc bcc6a95633
commit ddac6fe7c7
11 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File

5
internal/push/consumer_init.go
Unescape View File

@ -20,8 +20,9 @@ import (
)
type Consumer struct {
pushCh ConsumerHandler
successCount uint64
pushCh ConsumerHandler
// successCount is unused
// successCount uint64
}
func NewConsumer(config *config.GlobalConfig, pusher *Pusher) (*Consumer, error) {

2
internal/rpc/friend/black.go
Unescape View File

@ -28,7 +28,7 @@ import (
)
func (s *friendServer) GetPaginationBlacks(ctx context.Context, req *pbfriend.GetPaginationBlacksReq) (resp *pbfriend.GetPaginationBlacksResp, err error) {
if err := s.userRpcClient.Access(ctx, req.UserID); err != nil {
if accessErr := s.userRpcClient.Access(ctx, req.UserID); accessErr != nil {
return nil, err
}
total, blacks, err := s.blackDatabase.FindOwnerBlacks(ctx, req.UserID, req.Pagination)

16
internal/rpc/friend/friend.go
Unescape View File

@ -118,7 +118,7 @@ func Start(config *config.GlobalConfig, client registry.SvcDiscoveryRegistry, se
// ok.
func (s *friendServer) ApplyToAddFriend(ctx context.Context, req *pbfriend.ApplyToAddFriendReq) (resp *pbfriend.ApplyToAddFriendResp, err error) {
resp = &pbfriend.ApplyToAddFriendResp{}
if err = authverify.CheckAccessV3(ctx, req.FromUserID, s.config); err != nil {
if accessErr := authverify.CheckAccessV3(ctx, req.FromUserID, s.config); accessErr != nil {
return nil, err
}
if req.ToUserID == req.FromUserID {
@ -127,7 +127,7 @@ func (s *friendServer) ApplyToAddFriend(ctx context.Context, req *pbfriend.Apply
if err = CallbackBeforeAddFriend(ctx, s.config, req); err != nil && err != errs.ErrCallbackContinue {
return nil, err
}
if _, err := s.userRpcClient.GetUsersInfoMap(ctx, []string{req.ToUserID, req.FromUserID}); err != nil {
if _, getUserInfoErr := s.userRpcClient.GetUsersInfoMap(ctx, []string{req.ToUserID, req.FromUserID}); getUserInfoErr != nil {
return nil, err
}
in1, in2, err := s.friendDatabase.CheckIn(ctx, req.FromUserID, req.ToUserID)
@ -222,7 +222,7 @@ func (s *friendServer) RespondFriendApply(ctx context.Context, req *pbfriend.Res
func (s *friendServer) DeleteFriend(ctx context.Context, req *pbfriend.DeleteFriendReq) (resp *pbfriend.DeleteFriendResp, err error) {
defer log.ZInfo(ctx, utils.GetFuncName()+" Return")
resp = &pbfriend.DeleteFriendResp{}
if err := s.userRpcClient.Access(ctx, req.OwnerUserID); err != nil {
if accessErr := s.userRpcClient.Access(ctx, req.OwnerUserID); accessErr != nil {
return nil, err
}
_, err = s.friendDatabase.FindFriendsWithError(ctx, req.OwnerUserID, []string{req.FriendUserID})
@ -247,7 +247,7 @@ func (s *friendServer) SetFriendRemark(ctx context.Context, req *pbfriend.SetFri
return nil, err
}
resp = &pbfriend.SetFriendRemarkResp{}
if err := s.userRpcClient.Access(ctx, req.OwnerUserID); err != nil {
if accessErr := s.userRpcClient.Access(ctx, req.OwnerUserID); accessErr != nil {
return nil, err
}
_, err = s.friendDatabase.FindFriendsWithError(ctx, req.OwnerUserID, []string{req.FriendUserID})
@ -298,7 +298,7 @@ func (s *friendServer) GetDesignatedFriendsApply(ctx context.Context,
// ok 获取接收到的好友申请（即别人主动申请的）.
func (s *friendServer) GetPaginationFriendsApplyTo(ctx context.Context, req *pbfriend.GetPaginationFriendsApplyToReq) (resp *pbfriend.GetPaginationFriendsApplyToResp, err error) {
defer log.ZInfo(ctx, utils.GetFuncName()+" Return")
if err := s.userRpcClient.Access(ctx, req.UserID); err != nil {
if accessErr := s.userRpcClient.Access(ctx, req.UserID); accessErr != nil {
return nil, err
}
total, friendRequests, err := s.friendDatabase.PageFriendRequestToMe(ctx, req.UserID, req.Pagination)
@ -318,7 +318,7 @@ func (s *friendServer) GetPaginationFriendsApplyTo(ctx context.Context, req *pbf
func (s *friendServer) GetPaginationFriendsApplyFrom(ctx context.Context, req *pbfriend.GetPaginationFriendsApplyFromReq) (resp *pbfriend.GetPaginationFriendsApplyFromResp, err error) {
defer log.ZInfo(ctx, utils.GetFuncName()+" Return")
resp = &pbfriend.GetPaginationFriendsApplyFromResp{}
if err := s.userRpcClient.Access(ctx, req.UserID); err != nil {
if accessErr := s.userRpcClient.Access(ctx, req.UserID); accessErr != nil {
return nil, err
}
total, friendRequests, err := s.friendDatabase.PageFriendRequestFromMe(ctx, req.UserID, req.Pagination)
@ -346,7 +346,7 @@ func (s *friendServer) IsFriend(ctx context.Context, req *pbfriend.IsFriendReq)
func (s *friendServer) GetPaginationFriends(ctx context.Context, req *pbfriend.GetPaginationFriendsReq) (resp *pbfriend.GetPaginationFriendsResp, err error) {
defer log.ZInfo(ctx, utils.GetFuncName()+" Return")
if err := s.userRpcClient.Access(ctx, req.UserID); err != nil {
if accessErr := s.userRpcClient.Access(ctx, req.UserID); accessErr != nil {
return nil, err
}
total, friends, err := s.friendDatabase.PageOwnerFriends(ctx, req.UserID, req.Pagination)
@ -364,7 +364,7 @@ func (s *friendServer) GetPaginationFriends(ctx context.Context, req *pbfriend.G
func (s *friendServer) GetFriendIDs(ctx context.Context, req *pbfriend.GetFriendIDsReq) (resp *pbfriend.GetFriendIDsResp, err error) {
defer log.ZInfo(ctx, utils.GetFuncName()+" Return")
if err := s.userRpcClient.Access(ctx, req.UserID); err != nil {
if accessErr := s.userRpcClient.Access(ctx, req.UserID); accessErr != nil {
return nil, err
}
resp = &pbfriend.GetFriendIDsResp{}

28
internal/rpc/group/group.go
Unescape View File

@ -540,7 +540,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbgroup.KickGrou
if err != nil {
return nil, err
}
if err := s.PopulateGroupMember(ctx, members...); err != nil {
if populateErr := s.PopulateGroupMember(ctx, members...); populateErr != nil {
return nil, err
}
memberMap := make(map[string]*relationtb.GroupMemberModel)
@ -766,12 +766,12 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbgroup
return nil, errs.ErrGroupRequestHandled.Wrap("group request already processed")
}
var inGroup bool
if _, err := s.db.TakeGroupMember(ctx, req.GroupID, req.FromUserID); err == nil {
if _, takeErr := s.db.TakeGroupMember(ctx, req.GroupID, req.FromUserID); takeErr == nil {
inGroup = true // 已经在群里了
} else if !s.IsNotFound(err) {
return nil, err
}
if _, err := s.User.GetPublicUserInfo(ctx, req.FromUserID); err != nil {
if _, getInfoErr := s.User.GetPublicUserInfo(ctx, req.FromUserID); getInfoErr != nil {
return nil, err
}
var member *relationtb.GroupMemberModel
@ -858,14 +858,14 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbgroup.JoinGroupReq)
JoinTime: time.Now(),
MuteEndTime: time.UnixMilli(0),
}
if err = CallbackBeforeMemberJoinGroup(ctx, s.config, groupMember, group.Ex); err != nil {
if callbackErr := CallbackBeforeMemberJoinGroup(ctx, s.config, groupMember, group.Ex); callbackErr != nil {
return nil, err
}
if err = s.db.CreateGroup(ctx, nil, []*relationtb.GroupMemberModel{groupMember}); err != nil {
if createErr := s.db.CreateGroup(ctx, nil, []*relationtb.GroupMemberModel{groupMember}); createErr != nil {
return nil, err
}
if err = s.conversationRpcClient.GroupChatFirstCreateConversation(ctx, req.GroupID, []string{req.InviterUserID}); err != nil {
if createErr := s.conversationRpcClient.GroupChatFirstCreateConversation(ctx, req.GroupID, []string{req.InviterUserID}); createErr != nil {
return nil, err
}
s.Notification.MemberEnterNotification(ctx, req.GroupID, req.InviterUserID)
@ -906,7 +906,7 @@ func (s *groupServer) QuitGroup(ctx context.Context, req *pbgroup.QuitGroupReq)
if member.RoleLevel == constant.GroupOwner {
return nil, errs.ErrNoPermission.Wrap("group owner can't quit")
}
if err := s.PopulateGroupMember(ctx, member); err != nil {
if populateErr := s.PopulateGroupMember(ctx, member); populateErr != nil {
return nil, err
}
err = s.db.DeleteGroupMember(ctx, req.GroupID, []string{req.UserID})
@ -968,14 +968,14 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbgroup.SetGroupInf
if err != nil {
return nil, err
}
if err := s.PopulateGroupMember(ctx, owner); err != nil {
if populateErr := s.PopulateGroupMember(ctx, owner); populateErr != nil {
return nil, err
}
update := UpdateGroupInfoMap(ctx, req.GroupInfoForSet)
if len(update) == 0 {
return resp, nil
}
if err := s.db.UpdateGroup(ctx, group.GroupID, update); err != nil {
if updateErr := s.db.UpdateGroup(ctx, group.GroupID, update); updateErr != nil {
return nil, err
}
group, err = s.db.TakeGroup(ctx, req.GroupInfoForSet.GroupID)
@ -1169,7 +1169,7 @@ func (s *groupServer) GetUserReqApplicationList(ctx context.Context, req *pbgrou
if err != nil {
return nil, err
}
if err := s.PopulateGroupMember(ctx, owners...); err != nil {
if populateErr := s.PopulateGroupMember(ctx, owners...); populateErr != nil {
return nil, err
}
ownerMap := utils.SliceToMap(owners, func(e *relationtb.GroupMemberModel) string {
@ -1201,17 +1201,17 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbgroup.DismissGrou
return nil, errs.ErrNoPermission.Wrap("not group owner")
}
}
if err := s.PopulateGroupMember(ctx, owner); err != nil {
if populateErr := s.PopulateGroupMember(ctx, owner); populateErr != nil {
return nil, err
}
group, err := s.db.TakeGroup(ctx, req.GroupID)
if err != nil {
return nil, err
}
if req.DeleteMember == false && group.Status == constant.GroupStatusDismissed {
if !req.DeleteMember && group.Status == constant.GroupStatusDismissed {
return nil, errs.ErrDismissedAlready.Wrap("group status is dismissed")
}
if err := s.db.DismissGroup(ctx, req.GroupID, req.DeleteMember); err != nil {
if dismissErr := s.db.DismissGroup(ctx, req.GroupID, req.DeleteMember); dismissErr != nil {
return nil, err
}
if !req.DeleteMember {
@ -1567,7 +1567,7 @@ func (s *groupServer) GetGroupUsersReqApplicationList(ctx context.Context, req *
if err != nil {
return nil, err
}
if err := s.PopulateGroupMember(ctx, owners...); err != nil {
if populateErr := s.PopulateGroupMember(ctx, owners...); populateErr != nil {
return nil, err
}
ownerMap := utils.SliceToMap(owners, func(e *relationtb.GroupMemberModel) string {

2
internal/rpc/msg/as_read.go
Unescape View File

@ -82,7 +82,7 @@ func (m *msgServer) SetConversationHasReadSeq(
if req.HasReadSeq > maxSeq {
return nil, errs.ErrArgs.Wrap("hasReadSeq must not be bigger than maxSeq")
}
if err := m.MsgDatabase.SetHasReadSeq(ctx, req.UserID, req.ConversationID, req.HasReadSeq); err != nil {
if setErr := m.MsgDatabase.SetHasReadSeq(ctx, req.UserID, req.ConversationID, req.HasReadSeq); setErr != nil {
return nil, err
}
if err = m.sendMarkAsReadNotification(ctx, req.ConversationID, constant.SingleChatType, req.UserID,

4
internal/rpc/msg/revoke.go
Unescape View File

@ -67,7 +67,7 @@ func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg.
if !authverify.IsAppManagerUid(ctx, m.config) {
switch msgs[0].SessionType {
case constant.SingleChatType:
if err = authverify.CheckAccessV3(ctx, msgs[0].SendID, m.config); err != nil {
if accessErr := authverify.CheckAccessV3(ctx, msgs[0].SendID, m.config); accessErr != nil {
return nil, err
}
role = user.AppMangerLevel
@ -132,7 +132,7 @@ func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg.
} else {
recvID = msgs[0].RecvID
}
if err = m.notificationSender.NotificationWithSesstionType(ctx, req.UserID, recvID, constant.MsgRevokeNotification, msgs[0].SessionType, &tips); err != nil {
if notificationErr := m.notificationSender.NotificationWithSesstionType(ctx, req.UserID, recvID, constant.MsgRevokeNotification, msgs[0].SessionType, &tips); notificationErr != nil {
return nil, err
}
if err = CallbackAfterRevokeMsg(ctx, m.config, req); err != nil {

8
internal/rpc/msg/send.go
Unescape View File

@ -66,7 +66,7 @@ func (m *msgServer) sendMsgSuperGroupChat(
return nil, err
}
if err = callbackMsgModify(ctx, m.config, req); err != nil {
if modifyErr := callbackMsgModify(ctx, m.config, req); modifyErr != nil {
return nil, err
}
err = m.MsgDatabase.MsgToMQ(ctx, utils.GenConversationUniqueKeyForGroup(req.MsgData.GroupID), req.MsgData)
@ -144,7 +144,7 @@ func (m *msgServer) sendMsgNotification(
}
func (m *msgServer) sendMsgSingleChat(ctx context.Context, req *pbmsg.SendMsgReq) (resp *pbmsg.SendMsgResp, err error) {
if err = m.messageVerification(ctx, req); err != nil {
if verificationErr := m.messageVerification(ctx, req); verificationErr != nil {
return nil, err
}
isSend := true
@ -169,10 +169,10 @@ func (m *msgServer) sendMsgSingleChat(ctx context.Context, req *pbmsg.SendMsgReq
return nil, err
}
if err = callbackMsgModify(ctx, m.config, req); err != nil {
if modifyErr := callbackMsgModify(ctx, m.config, req); modifyErr != nil {
return nil, err
}
if err = m.MsgDatabase.MsgToMQ(ctx, utils.GenConversationUniqueKeyForSingle(req.MsgData.SendID, req.MsgData.RecvID), req.MsgData); err != nil {
if mqErr := m.MsgDatabase.MsgToMQ(ctx, utils.GenConversationUniqueKeyForSingle(req.MsgData.SendID, req.MsgData.RecvID), req.MsgData); mqErr != nil {
prommetrics.SingleChatMsgProcessFailedCounter.Inc()
return nil, err
}

2
internal/rpc/msg/server.go
Unescape View File

@ -72,7 +72,7 @@ func Start(config *config.GlobalConfig, client discoveryregistry.SvcDiscoveryReg
if err != nil {
return err
}
if err := mongo.CreateMsgIndex(); err != nil {
if indexErr := mongo.CreateMsgIndex(); indexErr != nil {
return err
}
cacheModel := cache.NewMsgCacheModel(rdb, config)

8
internal/rpc/third/s3.go
Unescape View File

@ -57,13 +57,11 @@ func (t *thirdServer) PartSize(ctx context.Context, req *third.PartSizeReq) (*th
}
func (t *thirdServer) InitiateMultipartUpload(ctx context.Context, req *third.InitiateMultipartUploadReq) (*third.InitiateMultipartUploadResp, error) {
defer log.ZDebug(ctx, "return")
if err := checkUploadName(ctx, req.Name, t.config); err != nil {
return nil, err
}
expireTime := time.Now().Add(t.defaultExpire)
result, err := t.s3dataBase.InitiateMultipartUpload(ctx, req.Hash, req.Size, t.defaultExpire, int(req.MaxParts))
log.ZDebug(ctx, "33333333333333333333333", err)
if err != nil {
if haErr, ok := errs.Unwrap(err).(*cont.HashAlreadyExistsError); ok {
obj := &relation.ObjectModel{
@ -76,7 +74,7 @@ func (t *thirdServer) InitiateMultipartUpload(ctx context.Context, req *third.In
Group: req.Cause,
CreateTime: time.Now(),
}
if err := t.s3dataBase.SetObject(ctx, obj); err != nil {
if setObjectErr := t.s3dataBase.SetObject(ctx, obj); setObjectErr != nil {
return nil, err
}
return &third.InitiateMultipartUploadResp{
@ -258,10 +256,10 @@ func (t *thirdServer) CompleteFormData(ctx context.Context, req *third.CompleteF
return nil, errs.ErrArgs.Wrap("invalid id " + err.Error())
}
var mate FormDataMate
if err = json.Unmarshal(data, &mate); err != nil {
if unmarshalErr := json.Unmarshal(data, &mate); unmarshalErr != nil {
return nil, errs.ErrArgs.Wrap("invalid id " + err.Error())
}
if err = checkUploadName(ctx, mate.Name, t.config); err != nil {
if uploadErr := checkUploadName(ctx, mate.Name, t.config); uploadErr != nil {
return nil, err
}
info, err := t.s3dataBase.StatObject(ctx, mate.Key)

2
internal/rpc/third/third.go
Unescape View File

@ -59,7 +59,7 @@ func Start(config *config.GlobalConfig, client discoveryregistry.SvcDiscoveryReg
if apiURL == "" {
return fmt.Errorf("api url is empty")
}
if _, err = url.Parse(config.Object.ApiURL); err != nil {
if _, parseErr := url.Parse(config.Object.ApiURL); parseErr != nil {
return err
}
if apiURL[len(apiURL)-1] != '/' {

4
internal/rpc/user/user.go
Unescape View File

@ -125,11 +125,11 @@ func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbuser.UpdateUserI
if err != nil {
return nil, err
}
if err = CallbackBeforeUpdateUserInfo(ctx, s.config, req); err != nil {
if callbackErr := CallbackBeforeUpdateUserInfo(ctx, s.config, req); callbackErr != nil {
return nil, err
}
data := convert.UserPb2DBMap(req.UserInfo)
if err = s.UpdateByMap(ctx, req.UserInfo.UserID, data); err != nil {
if updateErr := s.UpdateByMap(ctx, req.UserInfo.UserID, data); updateErr != nil {
return nil, err
}
_ = s.friendNotificationSender.UserInfoUpdatedNotification(ctx, req.UserInfo.UserID)

Write Preview
Loading…
Cancel
Save