Feat: add room must no need password setting

synctv-org · Apr 19, 2024 · 0f7e0df · 0f7e0df
1 parent 42d6d92
commit 0f7e0df
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/internal/op/user.go b/internal/op/user.go
@@ -88,6 +88,9 @@ func (u *User) CreateRoom(name, password string, conf ...db.CreateRoomConfig) (*
 		if password == "" && settings.RoomMustNeedPwd.Get() {
 			return nil, errors.New("room must need password")
 		}
+		if password != "" && settings.RoomMustNoNeedPwd.Get() {
+			return nil, errors.New("room must no need password")
+		}
 		if settings.CreateRoomNeedReview.Get() {
 			conf = append(conf, db.WithStatus(model.RoomStatusPending))
 		} else {
@@ -233,8 +236,13 @@ func (u *User) SetRoomPassword(room *Room, password string) error {
 	if !u.HasRoomAdminPermission(room, model.PermissionSetRoomPassword) {
 		return model.ErrNoPermission
 	}
-	if !u.IsAdmin() && password == "" && settings.RoomMustNeedPwd.Get() {
-		return errors.New("room must need password")
+	if !u.IsAdmin() {
+		if password == "" && settings.RoomMustNeedPwd.Get() {
+			return errors.New("room must need password")
+		}
+		if password != "" && settings.RoomMustNoNeedPwd.Get() {
+			return errors.New("room must no need password")
+		}
 	}
 	return room.SetPassword(password)
 }

diff --git a/internal/settings/var.go b/internal/settings/var.go
@@ -9,12 +9,38 @@ import (
 
 var (
 	DisableCreateRoom    = NewBoolSetting("disable_create_room", false, model.SettingGroupRoom)
-	RoomMustNeedPwd      = NewBoolSetting("room_must_need_pwd", false, model.SettingGroupRoom)
+	RoomMustNeedPwd      BoolSetting
+	RoomMustNoNeedPwd    BoolSetting
 	CreateRoomNeedReview = NewBoolSetting("create_room_need_review", false, model.SettingGroupRoom)
 	// 48 hours
 	RoomTTL = NewInt64Setting("room_ttl", 48, model.SettingGroupRoom)
 )
 
+func init() {
+	RoomMustNeedPwd = NewBoolSetting(
+		"room_must_need_pwd",
+		false,
+		model.SettingGroupRoom,
+		WithBeforeSetBool(func(bs BoolSetting, b bool) (bool, error) {
+			if b && RoomMustNoNeedPwd.Get() {
+				return false, errors.New("room_must_need_pwd and room_must_no_need_pwd can't be true at the same time")
+			}
+			return b, nil
+		}),
+	)
+	RoomMustNoNeedPwd = NewBoolSetting(
+		"room_must_no_need_pwd",
+		false,
+		model.SettingGroupRoom,
+		WithBeforeSetBool(func(bs BoolSetting, b bool) (bool, error) {
+			if b && RoomMustNeedPwd.Get() {
+				return false, errors.New("room_must_need_pwd and room_must_no_need_pwd can't be true at the same time")
+			}
+			return b, nil
+		}),
+	)
+}
+
 var (
 	DisableUserSignup = NewBoolSetting("disable_user_signup", false, model.SettingGroupUser)
 	SignupNeedReview  = NewBoolSetting("signup_need_review", false, model.SettingGroupUser)