IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-17 07:19:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

tidy code

Browse Source
This commit is contained in:
wenxu12345
2021-12-28 14:07:06 +08:00
parent 6b1f4e1686
commit c0db257e9b
7 changed files with 386 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/rpc/friend/firend.go
+2 -2
View File
@@ -140,7 +140,7 @@ func (s *friendServer) AddFriend(ctx context.Context, req *pbFriend.AddFriendReq
}
//Establish a latest relationship in the friend request table
friendRequest := imdb.FriendRequest{ReqMessage: req.ReqMsg}
friendRequest := imdb.FriendRequest{ReqMsg: req.ReqMsg}
utils.CopyStructFields(&friendRequest, req.CommID)
err := imdb.UpdateFriendApplication(&friendRequest)
if err != nil {
@@ -454,7 +454,7 @@ func (s *friendServer) GetSelfApplyList(ctx context.Context, req *pbFriend.GetSe
var selfApplyOtherUserList []*sdkws.FriendRequest
for _, selfApplyOtherUserInfo := range usersInfo {
var userInfo sdkws.FriendRequest // pbFriend.ApplyUserInfo
utils.CopyStructFields(&userInfo, selfApplyOtherUserInfo)
utils.FriendRequestDBCopyOpenIM(&userInfo, selfApplyOtherUserInfo)
selfApplyOtherUserList = append(selfApplyOtherUserList, &userInfo)
}
log.NewInfo(req.CommID.OperationID, "rpc GetSelfApplyList ok", pbFriend.GetSelfApplyListResp{FriendRequestList: selfApplyOtherUserList})
internal/rpc/msg/send_msg.go
+1 -1
View File
@@ -311,7 +311,7 @@ func Notification(n *NotificationMsg, onlineUserOnly bool) {
func setOpUserInfo(operationID, opUserID, groupID string, groupMemberInfo *open_im_sdk.GroupMemberFullInfo) {
if token_verify.IsMangerUserID(opUserID) {
u, err := imdb.FindUserByUID(opUserID)
u, err := imdb.GetUserByUserID(opUserID)
if err != nil {
log.NewError(operationID, "FindUserByUID failed ", err.Error(), opUserID)
return