From 676c4f821e710ffeeccc881e611e295edbe332c9 Mon Sep 17 00:00:00 2001 From: zijiren233 Date: Sun, 13 Oct 2024 10:17:27 +0800 Subject: [PATCH] feat: room hot list need reged client --- internal/op/room.go | 10 +++++----- server/handlers/room.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/op/room.go b/internal/op/room.go index 4e5f76bc..7c31ca37 100644 --- a/internal/op/room.go +++ b/internal/op/room.go @@ -36,26 +36,26 @@ func (r *Room) lazyInitHub() *Hub { return h } -func (r *Room) hubIsNotInited() bool { +func (r *Room) HubIsNotInited() bool { return r.hub.Load() == nil } func (r *Room) ViewerCount() int64 { - if r.hubIsNotInited() { + if r.HubIsNotInited() { return 0 } return r.lazyInitHub().ClientNum() } func (r *Room) KickUser(userID string) error { - if r.hubIsNotInited() { + if r.HubIsNotInited() { return nil } return r.lazyInitHub().KickUser(userID) } func (r *Room) Broadcast(data Message, conf ...BroadcastConf) error { - if r.hubIsNotInited() { + if r.HubIsNotInited() { return nil } return r.lazyInitHub().Broadcast(data, conf...) @@ -66,7 +66,7 @@ func (r *Room) SendToUser(user *User, data Message) error { } func (r *Room) SendToUserWithId(userID string, data Message) error { - if r.hubIsNotInited() { + if r.HubIsNotInited() { return nil } return r.lazyInitHub().SendToUser(userID, data) diff --git a/server/handlers/room.go b/server/handlers/room.go index 13fabbf3..a3930bf2 100644 --- a/server/handlers/room.go +++ b/server/handlers/room.go @@ -125,7 +125,7 @@ var roomHotCache = refreshcache0.NewRefreshCache[[]*model.RoomListResp](func(con rooms := make([]*model.RoomListResp, 0) op.RangeRoomCache(func(key string, value *synccache.Entry[*op.Room]) bool { v := value.Value() - if !v.Settings.Hidden && v.IsActive() { + if !v.Settings.Hidden && v.IsActive() && !v.HubIsNotInited() { rooms = append(rooms, &model.RoomListResp{ RoomId: v.ID, RoomName: v.Name,