For online status, account type conversion issues

pull/757/head
pluto 2 years ago
parent 86e09f0d0e
commit 80cb0b4605

@ -17,7 +17,10 @@ package cache
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"github.com/OpenIMSDK/protocol/constant"
"github.com/OpenIMSDK/protocol/user" "github.com/OpenIMSDK/protocol/user"
"github.com/OpenIMSDK/tools/errs"
"hash/crc32"
"strconv" "strconv"
"time" "time"
@ -165,11 +168,9 @@ func (u *UserCacheRedis) getOnlineStatusKey(userID string) string {
func (u *UserCacheRedis) GetUserStatus(ctx context.Context, userIDs []string) ([]*user.OnlineStatus, error) { func (u *UserCacheRedis) GetUserStatus(ctx context.Context, userIDs []string) ([]*user.OnlineStatus, error) {
var res []*user.OnlineStatus var res []*user.OnlineStatus
for _, userID := range userIDs { for _, userID := range userIDs {
UserIDNum, err := strconv.Atoi(userID) //UserIDNum, err := strconv.Atoi(userID)
if err != nil { UserIDNum := crc32.ChecksumIEEE([]byte(userID))
return nil, err var modKey = strconv.Itoa(int(UserIDNum % statusMod))
}
var modKey = strconv.Itoa(UserIDNum % statusMod)
var onlineStatus user.OnlineStatus var onlineStatus user.OnlineStatus
key := olineStatusKey + modKey key := olineStatusKey + modKey
result, err := u.rdb.HGet(ctx, key, userID).Result() result, err := u.rdb.HGet(ctx, key, userID).Result()
@ -178,17 +179,16 @@ func (u *UserCacheRedis) GetUserStatus(ctx context.Context, userIDs []string) ([
// key or field does not exist // key or field does not exist
res = append(res, &user.OnlineStatus{ res = append(res, &user.OnlineStatus{
UserID: userID, UserID: userID,
Status: 0, Status: constant.Offline,
PlatformID: -1,
}) })
continue continue
} else { } else {
return nil, err return nil, errs.Wrap(err)
} }
} }
err = json.Unmarshal([]byte(result), &onlineStatus) err = json.Unmarshal([]byte(result), &onlineStatus)
if err != nil { if err != nil {
return nil, err return nil, errs.Wrap(err)
} }
onlineStatus.UserID = userID onlineStatus.UserID = userID
res = append(res, &onlineStatus) res = append(res, &onlineStatus)
@ -200,23 +200,21 @@ func (u *UserCacheRedis) GetUserStatus(ctx context.Context, userIDs []string) ([
func (u *UserCacheRedis) SetUserStatus(ctx context.Context, list []*user.OnlineStatus) error { func (u *UserCacheRedis) SetUserStatus(ctx context.Context, list []*user.OnlineStatus) error {
for _, status := range list { for _, status := range list {
var isNewKey int64 var isNewKey int64
UserIDNum, err := strconv.Atoi(status.UserID) //UserIDNum, err := strconv.Atoi(status.UserID)
if err != nil { UserIDNum := crc32.ChecksumIEEE([]byte(status.UserID))
return err var modKey = strconv.Itoa(int(UserIDNum % statusMod))
}
var modKey = strconv.Itoa(UserIDNum % statusMod)
key := olineStatusKey + modKey key := olineStatusKey + modKey
jsonData, err := json.Marshal(status) jsonData, err := json.Marshal(status)
if err != nil { if err != nil {
return err return errs.Wrap(err)
} }
isNewKey, err = u.rdb.Exists(ctx, key).Result() isNewKey, err = u.rdb.Exists(ctx, key).Result()
if err != nil { if err != nil {
return err return errs.Wrap(err)
} }
_, err = u.rdb.HSet(ctx, key, status.UserID, string(jsonData)).Result() _, err = u.rdb.HSet(ctx, key, status.UserID, string(jsonData)).Result()
if err != nil { if err != nil {
return err return errs.Wrap(err)
} }
if isNewKey > 0 { if isNewKey > 0 {
u.rdb.Expire(ctx, key, userOlineStatusExpireTime) u.rdb.Expire(ctx, key, userOlineStatusExpireTime)

Loading…
Cancel
Save