From da97dcda5d0f41b9975d8db8900e3c8ccb471b9e Mon Sep 17 00:00:00 2001 From: zijiren233 Date: Wed, 6 Dec 2023 23:42:16 +0800 Subject: [PATCH] Opt: room ttl --- internal/op/rooms.go | 6 +++--- internal/settings/var.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/op/rooms.go b/internal/op/rooms.go index fe701c3..ee4f8c4 100644 --- a/internal/op/rooms.go +++ b/internal/op/rooms.go @@ -41,7 +41,7 @@ func LoadOrInitRoom(room *model.Room) (*Room, error) { movies: movies{ roomID: room.ID, }, - }, time.Duration(settings.RoomTTL.Get())) + }, time.Duration(settings.RoomTTL.Get())*time.Hour) return i.Value(), nil } @@ -92,7 +92,7 @@ func CompareAndCloseRoom(room *Room) error { func LoadRoomByID(id string) (*Room, error) { r2, loaded := roomCache.Load(id) if loaded { - r2.SetExpiration(time.Now().Add(time.Duration(settings.RoomTTL.Get()))) + r2.SetExpiration(time.Now().Add(time.Duration(settings.RoomTTL.Get()) * time.Hour)) return r2.Value(), nil } return nil, errors.New("room not found") @@ -104,7 +104,7 @@ func LoadOrInitRoomByID(id string) (*Room, error) { } i, loaded := roomCache.Load(id) if loaded { - i.SetExpiration(time.Now().Add(time.Duration(settings.RoomTTL.Get()))) + i.SetExpiration(time.Now().Add(time.Duration(settings.RoomTTL.Get()) * time.Hour)) return i.Value(), nil } room, err := db.GetRoomByID(id) diff --git a/internal/settings/var.go b/internal/settings/var.go index 5907365..1d59dbc 100644 --- a/internal/settings/var.go +++ b/internal/settings/var.go @@ -2,7 +2,6 @@ package settings import ( "errors" - "time" "github.com/synctv-org/synctv/internal/db" "github.com/synctv-org/synctv/internal/model" @@ -12,7 +11,8 @@ var ( DisableCreateRoom = NewBoolSetting("disable_create_room", false, model.SettingGroupRoom) RoomMustNeedPwd = NewBoolSetting("room_must_need_pwd", false, model.SettingGroupRoom) CreateRoomNeedReview = NewBoolSetting("create_room_need_review", false, model.SettingGroupRoom) - RoomTTL = NewInt64Setting("room_ttl", int64(time.Hour*48), model.SettingGroupRoom) + // 48 hours + RoomTTL = NewInt64Setting("room_ttl", 48, model.SettingGroupRoom) ) var (