[bugfix] Fix setting immediate expires_at value on filter endpoints (#3513)

* [bugfix] Fix setting immediate `expires_at` value on filter endpoints

* update wording

* update wording

* oh my

internal/api/client/accounts/mute.go

@@ -19,9 +19,7 @@ package accounts
 
 import (
 	"errors"
-	"fmt"
 	"net/http"
-	"strconv"
 
 	"github.com/gin-gonic/gin"
 	apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
@@ -140,25 +138,15 @@ func normalizeCreateUpdateMute(form *apimodel.UserMuteCreateUpdateRequest) error
 	// Apply defaults for missing fields.
 	form.Notifications = util.Ptr(util.PtrOrValue(form.Notifications, false))
 
-	// Normalize mute duration if necessary.
-	// If we parsed this as JSON, expires_in
-	// may be either a float64 or a string.
-	if ei := form.DurationI; ei != nil {
-		switch e := ei.(type) {
-		case float64:
-			form.Duration = util.Ptr(int(e))
-
-		case string:
-			duration, err := strconv.Atoi(e)
-			if err != nil {
-				return fmt.Errorf("could not parse duration value %s as integer: %w", e, err)
-			}
-
-			form.Duration = &duration
-
-		default:
-			return fmt.Errorf("could not parse expires_in type %T as integer", ei)
+	// Normalize duration if necessary.
+	if form.DurationI != nil {
+		// If we parsed this as JSON, duration
+		// may be either a float64 or a string.
+		duration, err := apiutil.ParseDuration(form.DurationI, "duration")
+		if err != nil {
+			return err
 		}
+		form.Duration = duration
 	}
 
 	// Interpret zero as indefinite duration.

internal/api/client/filters/v1/validate.go

@@ -19,15 +19,14 @@ package v1
 
 import (
 	"errors"
-	"fmt"
-	"strconv"
 
-	"github.com/superseriousbusiness/gotosocial/internal/api/model"
+	apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
+	apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util"
 	"github.com/superseriousbusiness/gotosocial/internal/util"
 	"github.com/superseriousbusiness/gotosocial/internal/validate"
 )
 
-func validateNormalizeCreateUpdateFilter(form *model.FilterCreateUpdateRequestV1) error {
+func validateNormalizeCreateUpdateFilter(form *apimodel.FilterCreateUpdateRequestV1) error {
 	if err := validate.FilterKeyword(form.Phrase); err != nil {
 		return err
 	}
@@ -48,25 +47,23 @@ func validateNormalizeCreateUpdateFilter(form *model.FilterCreateUpdateRequestV1
 	}
 
 	// Normalize filter expiry if necessary.
-	// If we parsed this as JSON, expires_in
-	// may be either a float64 or a string.
-	if ei := form.ExpiresInI; ei != nil {
-		switch e := ei.(type) {
-		case float64:
-			form.ExpiresIn = util.Ptr(int(e))
-
-		case string:
-			expiresIn, err := strconv.Atoi(e)
-			if err != nil {
-				return fmt.Errorf("could not parse expires_in value %s as integer: %w", e, err)
-			}
-
-			form.ExpiresIn = &expiresIn
-
-		default:
-			return fmt.Errorf("could not parse expires_in type %T as integer", ei)
+	if form.ExpiresInI != nil {
+		// If we parsed this as JSON, expires_in
+		// may be either a float64 or a string.
+		var err error
+		form.ExpiresIn, err = apiutil.ParseDuration(
+			form.ExpiresInI,
+			"expires_in",
+		)
+		if err != nil {
+			return err
 		}
 	}
 
+	// Interpret zero as indefinite duration.
+	if form.ExpiresIn != nil && *form.ExpiresIn == 0 {
+		form.ExpiresIn = nil
+	}
+
 	return nil
 }

internal/api/client/filters/v2/filterpost.go

@@ -18,9 +18,7 @@
 package v2
 
 import (
-	"fmt"
 	"net/http"
-	"strconv"
 
 	"github.com/gin-gonic/gin"
 	apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
@@ -228,26 +226,24 @@ func validateNormalizeCreateFilter(form *apimodel.FilterCreateRequestV2) error {
 	form.FilterAction = util.Ptr(action)
 
 	// Normalize filter expiry if necessary.
-	// If we parsed this as JSON, expires_in
-	// may be either a float64 or a string.
-	if ei := form.ExpiresInI; ei != nil {
-		switch e := ei.(type) {
-		case float64:
-			form.ExpiresIn = util.Ptr(int(e))
-
-		case string:
-			expiresIn, err := strconv.Atoi(e)
-			if err != nil {
-				return fmt.Errorf("could not parse expires_in value %s as integer: %w", e, err)
-			}
-
-			form.ExpiresIn = &expiresIn
-
-		default:
-			return fmt.Errorf("could not parse expires_in type %T as integer", ei)
+	if form.ExpiresInI != nil {
+		// If we parsed this as JSON, expires_in
+		// may be either a float64 or a string.
+		var err error
+		form.ExpiresIn, err = apiutil.ParseDuration(
+			form.ExpiresInI,
+			"expires_in",
+		)
+		if err != nil {
+			return err
 		}
 	}
 
+	// Interpret zero as indefinite duration.
+	if form.ExpiresIn != nil && *form.ExpiresIn == 0 {
+		form.ExpiresIn = nil
+	}
+
 	// Normalize and validate new keywords and statuses.
 	for i, formKeyword := range form.Keywords {
 		if err := validate.FilterKeyword(formKeyword.Keyword); err != nil {

internal/api/client/filters/v2/filterput.go

@@ -19,9 +19,7 @@ package v2
 
 import (
 	"errors"
-	"fmt"
 	"net/http"
-	"strconv"
 
 	"github.com/gin-gonic/gin"
 	apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
@@ -272,26 +270,24 @@ func validateNormalizeUpdateFilter(form *apimodel.FilterUpdateRequestV2) error {
 	}
 
 	// Normalize filter expiry if necessary.
-	// If we parsed this as JSON, expires_in
-	// may be either a float64 or a string.
-	if ei := form.ExpiresInI; ei != nil {
-		switch e := ei.(type) {
-		case float64:
-			form.ExpiresIn = util.Ptr(int(e))
-
-		case string:
-			expiresIn, err := strconv.Atoi(e)
-			if err != nil {
-				return fmt.Errorf("could not parse expires_in value %s as integer: %w", e, err)
-			}
-
-			form.ExpiresIn = &expiresIn
-
-		default:
-			return fmt.Errorf("could not parse expires_in type %T as integer", ei)
+	if form.ExpiresInI != nil {
+		// If we parsed this as JSON, expires_in
+		// may be either a float64 or a string.
+		var err error
+		form.ExpiresIn, err = apiutil.ParseDuration(
+			form.ExpiresInI,
+			"expires_in",
+		)
+		if err != nil {
+			return err
 		}
 	}
 
+	// Interpret zero as indefinite duration.
+	if form.ExpiresIn != nil && *form.ExpiresIn == 0 {
+		form.ExpiresIn = nil
+	}
+
 	// Normalize and validate updates.
 	for i, formKeyword := range form.Keywords {
 		if formKeyword.Keyword != nil {

internal/api/client/statuses/statuscreate.go

@@ -21,7 +21,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"strconv"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
@@ -474,25 +473,19 @@ func validateStatusPoll(form *apimodel.StatusCreateRequest) gtserror.WithCode {
 	}
 
 	// Normalize poll expiry if necessary.
-	// If we parsed this as JSON, expires_in
-	// may be either a float64 or a string.
-	if ei := form.Poll.ExpiresInI; ei != nil {
-		switch e := ei.(type) {
-		case float64:
-			form.Poll.ExpiresIn = int(e)
+	if form.Poll.ExpiresInI != nil {
+		// If we parsed this as JSON, expires_in
+		// may be either a float64 or a string.
+		expiresIn, err := apiutil.ParseDuration(
+			form.Poll.ExpiresInI,
+			"expires_in",
+		)
+		if err != nil {
+			return gtserror.NewErrorBadRequest(err, err.Error())
+		}
 
-		case string:
-			expiresIn, err := strconv.Atoi(e)
-			if err != nil {
-				text := fmt.Sprintf("could not parse expires_in value %s as integer: %v", e, err)
-				return gtserror.NewErrorBadRequest(errors.New(text), text)
-			}
-
-			form.Poll.ExpiresIn = expiresIn
-
-		default:
-			text := fmt.Sprintf("could not parse expires_in type %T as integer", ei)
-			return gtserror.NewErrorBadRequest(errors.New(text), text)
+		if expiresIn != nil {
+			form.Poll.ExpiresIn = *expiresIn
 		}
 	}