mirror of
				https://github.com/openimsdk/open-im-server.git
				synced 2025-10-31 08:29:33 +08:00 
			
		
		
		
	* fix: to start im or chat, ZooKeeper must be started first. * fix: msg gateway start output err info Signed-off-by: Gordon <1432970085@qq.com> * fix: msg gateway start output err info Signed-off-by: Gordon <1432970085@qq.com> * chore: package path changes Signed-off-by: withchao <993506633@qq.com> * fix: go mod update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * chore: package path changes Signed-off-by: withchao <993506633@qq.com> * chore: package path changes Signed-off-by: withchao <993506633@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: token update Signed-off-by: Gordon <1432970085@qq.com> * fix: get all userID Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: msggateway add online status call Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * refactor: log change Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * refactor: log change Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * chore: network mode change Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * feat: add api of get server time Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * feat: remove go work sum Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix: pull message add isRead field Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: check msg-transfer script Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: script update Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: start don't kill old process Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix: check component Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: pull message set isRead only message come from single. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix: multiple gateway kick user each other. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: add ex field to update group info. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change * cicd: robot automated Change * refactor: change project module name. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * refactor: change project module name. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * refactor: change project module name. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * cicd: robot automated Change --------- Signed-off-by: Gordon <1432970085@qq.com> Signed-off-by: withchao <993506633@qq.com> Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: withchao <993506633@qq.com> Co-authored-by: Xinwei Xiong <3293172751NSS@gmail.com> Co-authored-by: FGadvancer <FGadvancer@users.noreply.github.com>
		
			
				
	
	
		
			121 lines
		
	
	
		
			4.1 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			121 lines
		
	
	
		
			4.1 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright © 2023 OpenIM. All rights reserved.
 | |
| //
 | |
| // Licensed under the Apache License, Version 2.0 (the "License");
 | |
| // you may not use this file except in compliance with the License.
 | |
| // You may obtain a copy of the License at
 | |
| //
 | |
| //     http://www.apache.org/licenses/LICENSE-2.0
 | |
| //
 | |
| // Unless required by applicable law or agreed to in writing, software
 | |
| // distributed under the License is distributed on an "AS IS" BASIS,
 | |
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | |
| // See the License for the specific language governing permissions and
 | |
| // limitations under the License.
 | |
| 
 | |
| package convert
 | |
| 
 | |
| import (
 | |
| 	"context"
 | |
| 
 | |
| 	"github.com/OpenIMSDK/protocol/sdkws"
 | |
| 	"github.com/OpenIMSDK/tools/utils"
 | |
| 
 | |
| 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 | |
| )
 | |
| 
 | |
| func FriendPb2DB(friend *sdkws.FriendInfo) *relation.FriendModel {
 | |
| 	dbFriend := &relation.FriendModel{}
 | |
| 	utils.CopyStructFields(dbFriend, friend)
 | |
| 	dbFriend.FriendUserID = friend.FriendUser.UserID
 | |
| 	dbFriend.CreateTime = utils.UnixSecondToTime(friend.CreateTime)
 | |
| 	return dbFriend
 | |
| }
 | |
| 
 | |
| func FriendDB2Pb(
 | |
| 	ctx context.Context,
 | |
| 	friendDB *relation.FriendModel,
 | |
| 	getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
 | |
| ) (*sdkws.FriendInfo, error) {
 | |
| 	pbfriend := &sdkws.FriendInfo{FriendUser: &sdkws.UserInfo{}}
 | |
| 	utils.CopyStructFields(pbfriend, friendDB)
 | |
| 	users, err := getUsers(ctx, []string{friendDB.FriendUserID})
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 	pbfriend.FriendUser.UserID = users[friendDB.FriendUserID].UserID
 | |
| 	pbfriend.FriendUser.Nickname = users[friendDB.FriendUserID].Nickname
 | |
| 	pbfriend.FriendUser.FaceURL = users[friendDB.FriendUserID].FaceURL
 | |
| 	pbfriend.FriendUser.Ex = users[friendDB.FriendUserID].Ex
 | |
| 	pbfriend.CreateTime = friendDB.CreateTime.Unix()
 | |
| 	return pbfriend, nil
 | |
| }
 | |
| 
 | |
| func FriendsDB2Pb(
 | |
| 	ctx context.Context,
 | |
| 	friendsDB []*relation.FriendModel,
 | |
| 	getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
 | |
| ) (friendsPb []*sdkws.FriendInfo, err error) {
 | |
| 	if len(friendsDB) == 0 {
 | |
| 		return nil, nil
 | |
| 	}
 | |
| 	var userID []string
 | |
| 	for _, friendDB := range friendsDB {
 | |
| 		userID = append(userID, friendDB.FriendUserID)
 | |
| 	}
 | |
| 	users, err := getUsers(ctx, userID)
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 	for _, friend := range friendsDB {
 | |
| 		friendPb := &sdkws.FriendInfo{FriendUser: &sdkws.UserInfo{}}
 | |
| 		utils.CopyStructFields(friendPb, friend)
 | |
| 		friendPb.FriendUser.UserID = users[friend.FriendUserID].UserID
 | |
| 		friendPb.FriendUser.Nickname = users[friend.FriendUserID].Nickname
 | |
| 		friendPb.FriendUser.FaceURL = users[friend.FriendUserID].FaceURL
 | |
| 		friendPb.FriendUser.Ex = users[friend.FriendUserID].Ex
 | |
| 		friendPb.CreateTime = friend.CreateTime.Unix()
 | |
| 		friendsPb = append(friendsPb, friendPb)
 | |
| 	}
 | |
| 	return friendsPb, nil
 | |
| }
 | |
| 
 | |
| func FriendRequestDB2Pb(
 | |
| 	ctx context.Context,
 | |
| 	friendRequests []*relation.FriendRequestModel,
 | |
| 	getUsers func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error),
 | |
| ) ([]*sdkws.FriendRequest, error) {
 | |
| 	if len(friendRequests) == 0 {
 | |
| 		return nil, nil
 | |
| 	}
 | |
| 	userIDMap := make(map[string]struct{})
 | |
| 	for _, friendRequest := range friendRequests {
 | |
| 		userIDMap[friendRequest.ToUserID] = struct{}{}
 | |
| 		userIDMap[friendRequest.FromUserID] = struct{}{}
 | |
| 	}
 | |
| 	users, err := getUsers(ctx, utils.Keys(userIDMap))
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 	res := make([]*sdkws.FriendRequest, 0, len(friendRequests))
 | |
| 	for _, friendRequest := range friendRequests {
 | |
| 		toUser := users[friendRequest.ToUserID]
 | |
| 		fromUser := users[friendRequest.FromUserID]
 | |
| 		res = append(res, &sdkws.FriendRequest{
 | |
| 			FromUserID:    friendRequest.FromUserID,
 | |
| 			FromNickname:  fromUser.Nickname,
 | |
| 			FromFaceURL:   fromUser.FaceURL,
 | |
| 			ToUserID:      friendRequest.ToUserID,
 | |
| 			ToNickname:    toUser.Nickname,
 | |
| 			ToFaceURL:     toUser.FaceURL,
 | |
| 			HandleResult:  friendRequest.HandleResult,
 | |
| 			ReqMsg:        friendRequest.ReqMsg,
 | |
| 			CreateTime:    friendRequest.CreateTime.UnixMilli(),
 | |
| 			HandlerUserID: friendRequest.HandlerUserID,
 | |
| 			HandleMsg:     friendRequest.HandleMsg,
 | |
| 			HandleTime:    friendRequest.HandleTime.UnixMilli(),
 | |
| 			Ex:            friendRequest.Ex,
 | |
| 		})
 | |
| 	}
 | |
| 	return res, nil
 | |
| }
 |