mirror of
https://github.com/openimsdk/open-im-server.git
synced 2025-04-05 20:11:14 +08:00
* statistics user register * refactor: router change * minio init * UserRegisterCount * push use local conn * refactor: user pb update * remove online push close grpc conn * refactor: user pb update * refactor:pb file * msgs statistics * msgs statistics * revoke userID * refactor: errcode update * active user * active user * active user * refactor: errcode update * feat: conn update token * active user * active user * feat: conn update token * active user * feat: conn update token * feat: conn update token * feat: conn update token * add tx_oss cos * active user * active user * group create * group create * feat: group notification show to conversation * feat: group notification show to conversation * group active * user active * sendNotificationWithName * withname * privateChat * a2r call option * grpc with detail return error * change log error * chain unary interceptor * api nil slice map * fix sync has read * fix: text update * fix: update add model * set conversations update * set privateChat * fix: content update * remove unuse rpc * msgDestruct * cron use rpc mw * set IsMsgDestruct * msg destruct * msgDestruct * s3 minio, cos, oss support * feat: add implement of GetUsersOnlineStatus, #472 (#477) * s3 minio, cos, oss support * s3 route * remove extendMsg code * s3 route * remove unuse code * s3 pb * s3 pb * s3 pb * s3 presigned put * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * Update .gitignore (#482) * s3 debug log * s3 debug log * cron add log and fix cron * add log * cron * s3 config * fix kick user bug * s3 cos * add kick log * s3 cos test * s3 cos test * s3 cos test * kick user log * kickuserlog * s3 cos copy * s3 cos copy * s3 url * s3 url * s3 AccessURL * log * s3 InitiateMultipartUpload add ExpireTime * feat: regenerate pb file * feat: regenerate pb file * Revert "feat: regenerate pb file" This reverts commit 434f22564a89f816cbe944ab61bd9ff3414f0885. * Delete .idea directory * feat: regenerate pb file * fix: remove import C * fix: add msg transfer main file * fix: get user online status fix --------- Co-authored-by: withchao <993506633@qq.com> Co-authored-by: wangchuxiao <wangchuxiao97@outlook.com> Co-authored-by: BanTanger <88583317+BanTanger@users.noreply.github.com> Co-authored-by: withchao <48119764+withchao@users.noreply.github.com> Co-authored-by: Alan <68671759+hanzhixiao@users.noreply.github.com>
85 lines
2.5 KiB
Go
85 lines
2.5 KiB
Go
package msg
|
|
|
|
import (
|
|
"context"
|
|
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
|
|
"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
|
|
"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
|
|
"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
|
|
"time"
|
|
)
|
|
|
|
func (m *msgServer) GetActiveUser(ctx context.Context, req *msg.GetActiveUserReq) (*msg.GetActiveUserResp, error) {
|
|
msgCount, userCount, users, dateCount, err := m.MsgDatabase.RangeUserSendCount(ctx, time.UnixMilli(req.Start), time.UnixMilli(req.End), req.Group, req.Ase, req.Pagination.PageNumber, req.Pagination.ShowNumber)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var pbUsers []*msg.ActiveUser
|
|
if len(users) > 0 {
|
|
userIDs := utils.Slice(users, func(e *unrelation.UserCount) string { return e.UserID })
|
|
userMap, err := m.User.GetUsersInfoMap(ctx, userIDs)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
pbUsers = make([]*msg.ActiveUser, 0, len(users))
|
|
for _, user := range users {
|
|
pbUser := userMap[user.UserID]
|
|
if pbUser == nil {
|
|
pbUser = &sdkws.UserInfo{
|
|
UserID: user.UserID,
|
|
Nickname: user.UserID,
|
|
}
|
|
}
|
|
pbUsers = append(pbUsers, &msg.ActiveUser{
|
|
User: pbUser,
|
|
Count: user.Count,
|
|
})
|
|
}
|
|
}
|
|
return &msg.GetActiveUserResp{
|
|
MsgCount: msgCount,
|
|
UserCount: userCount,
|
|
DateCount: dateCount,
|
|
Users: pbUsers,
|
|
}, nil
|
|
}
|
|
|
|
func (m *msgServer) GetActiveGroup(ctx context.Context, req *msg.GetActiveGroupReq) (*msg.GetActiveGroupResp, error) {
|
|
msgCount, groupCount, groups, dateCount, err := m.MsgDatabase.RangeGroupSendCount(ctx, time.UnixMilli(req.Start), time.UnixMilli(req.End), req.Ase, req.Pagination.PageNumber, req.Pagination.ShowNumber)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var pbGroups []*msg.ActiveGroup
|
|
if len(groups) > 0 {
|
|
groupIDs := utils.Slice(groups, func(e *unrelation.GroupCount) string { return e.GroupID })
|
|
resp, err := m.Group.GetGroupInfos(ctx, groupIDs, false)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
groupMap := make(map[string]*sdkws.GroupInfo, len(groups))
|
|
for i, group := range groups {
|
|
groupMap[group.GroupID] = resp[i]
|
|
}
|
|
pbGroups = make([]*msg.ActiveGroup, 0, len(groups))
|
|
for _, group := range groups {
|
|
pbGroup := groupMap[group.GroupID]
|
|
if pbGroup == nil {
|
|
pbGroup = &sdkws.GroupInfo{
|
|
GroupID: group.GroupID,
|
|
GroupName: group.GroupID,
|
|
}
|
|
}
|
|
pbGroups = append(pbGroups, &msg.ActiveGroup{
|
|
Group: pbGroup,
|
|
Count: group.Count,
|
|
})
|
|
}
|
|
}
|
|
return &msg.GetActiveGroupResp{
|
|
MsgCount: msgCount,
|
|
GroupCount: groupCount,
|
|
DateCount: dateCount,
|
|
Groups: pbGroups,
|
|
}, nil
|
|
}
|