Typo: user func name sign

internal/op/room.go

@@ -314,9 +314,7 @@ func (r *Room) DeleteMoviesByID(ids []string) error {
 }
 
 func (r *Room) ClearMovies() error {
-	if r.current.current.MovieID != "" {
-		return errors.New("cannot clear movies when current movie is not empty")
-	}
+	_ = r.SetCurrentMovie("", false)
 	return r.movies.Clear()
 }
 
@@ -329,6 +327,10 @@ func (r *Room) Current() *Current {
 	return &c
 }
 
+func (r *Room) CurrentMovieID() string {
+	return r.current.current.MovieID
+}
+
 var ErrNoCurrentMovie = errors.New("no current movie")
 
 func (r *Room) CurrentMovie() (*Movie, error) {

internal/op/user.go

@@ -123,7 +123,7 @@ func (u *User) NewMovie(movie *model.BaseMovie) (*model.Movie, error) {
 	}, nil
 }
 
-func (u *User) AddMovieToRoom(room *Room, movie *model.BaseMovie) error {
+func (u *User) AddRoomMovie(room *Room, movie *model.BaseMovie) error {
 	if !u.HasRoomPermission(room, model.PermissionAddMovie) {
 		return model.ErrNoPermission
 	}
@@ -156,7 +156,7 @@ func (u *User) NewMovies(movies []*model.BaseMovie) ([]*model.Movie, error) {
 	return ms, nil
 }
 
-func (u *User) AddMoviesToRoom(room *Room, movies []*model.BaseMovie) error {
+func (u *User) AddRoomMovies(room *Room, movies []*model.BaseMovie) error {
 	if !u.HasRoomPermission(room, model.PermissionAddMovie) {
 		return model.ErrNoPermission
 	}
@@ -248,7 +248,7 @@ func (u *User) SetUsername(username string) error {
 	return nil
 }
 
-func (u *User) UpdateMovie(room *Room, movieID string, movie *model.BaseMovie) error {
+func (u *User) UpdateRoomMovie(room *Room, movieID string, movie *model.BaseMovie) error {
 	m, err := room.GetMovieByID(movieID)
 	if err != nil {
 		return err
@@ -269,7 +269,7 @@ func (u *User) UpdateMovie(room *Room, movieID string, movie *model.BaseMovie) e
 	})
 }
 
-func (u *User) SetRoomSetting(room *Room, setting *model.RoomSettings) error {
+func (u *User) SetRoomSettings(room *Room, setting *model.RoomSettings) error {
 	if !u.HasRoomAdminPermission(room, model.PermissionSetRoomSettings) {
 		return model.ErrNoPermission
 	}
@@ -283,7 +283,7 @@ func (u *User) UpdateRoomSettings(room *Room, settings map[string]interface{}) e
 	return room.UpdateSettings(settings)
 }
 
-func (u *User) DeleteMovieByID(room *Room, movieID string) error {
+func (u *User) DeleteRoomMovieByID(room *Room, movieID string) error {
 	m, err := room.GetMovieByID(movieID)
 	if err != nil {
 		return err
@@ -294,7 +294,7 @@ func (u *User) DeleteMovieByID(room *Room, movieID string) error {
 	return room.DeleteMovieByID(movieID)
 }
 
-func (u *User) DeleteMoviesByID(room *Room, movieIDs []string) error {
+func (u *User) DeleteRoomMoviesByID(room *Room, movieIDs []string) error {
 	for _, id := range movieIDs {
 		m, err := room.GetMovieByID(id)
 		if err != nil {
@@ -316,7 +316,7 @@ func (u *User) DeleteMoviesByID(room *Room, movieIDs []string) error {
 	})
 }
 
-func (u *User) ClearMovies(room *Room) error {
+func (u *User) ClearRoomMovies(room *Room) error {
 	if !u.HasRoomPermission(room, model.PermissionDeleteMovie) {
 		return model.ErrNoPermission
 	}
@@ -333,7 +333,7 @@ func (u *User) ClearMovies(room *Room) error {
 	})
 }
 
-func (u *User) SwapMoviePositions(room *Room, id1, id2 string) error {
+func (u *User) SwapRoomMoviePositions(room *Room, id1, id2 string) error {
 	if !u.HasRoomPermission(room, model.PermissionEditMovie) {
 		return model.ErrNoPermission
 	}
@@ -350,7 +350,7 @@ func (u *User) SwapMoviePositions(room *Room, id1, id2 string) error {
 	})
 }
 
-func (u *User) SetCurrentMovie(room *Room, movieID string, play bool) error {
+func (u *User) SetRoomCurrentMovie(room *Room, movieID string, play bool) error {
 	if !u.HasRoomPermission(room, model.PermissionSetCurrentMovie) {
 		return model.ErrNoPermission
 	}

server/handlers/movie.go

@@ -206,7 +206,7 @@ func PushMovie(ctx *gin.Context) {
 		return
 	}
 
-	err := user.AddMovieToRoom(room, (*dbModel.BaseMovie)(&req))
+	err := user.AddRoomMovie(room, (*dbModel.BaseMovie)(&req))
 	if err != nil {
 		log.Errorf("push movie error: %v", err)
 		if errors.Is(err, dbModel.ErrNoPermission) {
@@ -243,7 +243,7 @@ func PushMovies(ctx *gin.Context) {
 		ms[i] = m
 	}
 
-	err := user.AddMoviesToRoom(room, ms)
+	err := user.AddRoomMovies(room, ms)
 	if err != nil {
 		log.Errorf("push movies error: %v", err)
 		if errors.Is(err, dbModel.ErrNoPermission) {
@@ -338,7 +338,7 @@ func EditMovie(ctx *gin.Context) {
 		return
 	}
 
-	if err := user.UpdateMovie(room, req.Id, (*dbModel.BaseMovie)(&req.PushMovieReq)); err != nil {
+	if err := user.UpdateRoomMovie(room, req.Id, (*dbModel.BaseMovie)(&req.PushMovieReq)); err != nil {
 		log.Errorf("edit movie error: %v", err)
 		if errors.Is(err, dbModel.ErrNoPermission) {
 			ctx.AbortWithStatusJSON(
@@ -368,7 +368,7 @@ func DelMovie(ctx *gin.Context) {
 		return
 	}
 
-	err := user.DeleteMoviesByID(room, req.Ids)
+	err := user.DeleteRoomMoviesByID(room, req.Ids)
 	if err != nil {
 		log.Errorf("del movie error: %v", err)
 		if errors.Is(err, dbModel.ErrNoPermission) {
@@ -391,7 +391,7 @@ func ClearMovies(ctx *gin.Context) {
 	room := ctx.MustGet("room").(*op.RoomEntry).Value()
 	user := ctx.MustGet("user").(*op.UserEntry).Value()
 
-	if err := user.ClearMovies(room); err != nil {
+	if err := user.ClearRoomMovies(room); err != nil {
 		if errors.Is(err, dbModel.ErrNoPermission) {
 			ctx.AbortWithStatusJSON(
 				http.StatusForbidden,
@@ -418,7 +418,7 @@ func SwapMovie(ctx *gin.Context) {
 		return
 	}
 
-	if err := user.SwapMoviePositions(room, req.Id1, req.Id2); err != nil {
+	if err := user.SwapRoomMoviePositions(room, req.Id1, req.Id2); err != nil {
 		ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorResp(err))
 		return
 	}
@@ -438,7 +438,7 @@ func ChangeCurrentMovie(ctx *gin.Context) {
 		return
 	}
 
-	err = user.SetCurrentMovie(room, req.Id, req.Id != "")
+	err = user.SetRoomCurrentMovie(room, req.Id, req.Id != "")
 	if err != nil {
 		log.Errorf("change current movie error: %v", err)
 		if errors.Is(err, dbModel.ErrNoPermission) {