Change Favorites to Favourites

Waifu-im · Mar 6, 2023 · 45f6eb9 · 45f6eb9
1 parent d61e164
commit 45f6eb9
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 17 deletions.
diff --git a/api/routes/fav/fav.go b/api/routes/fav/fav.go
@@ -45,12 +45,17 @@ func (r Route) Insert(c echo.Context) error {
 				return c.JSON(http.StatusBadRequest, api.JSONError{Detail: "The image you provided does not exist."})
 			}
 			if pqe.Code == "23505" {
-				return c.JSON(http.StatusBadRequest, api.JSONError{Detail: "The image you provided is already in the user favourites, consider using /fav/toggle instead."})
+				return c.JSON(http.StatusBadRequest, api.JSONError{Detail: "The image you provided is already in the user favorites, consider using /fav/toggle instead."})
 			}
 		}
 		return err
 	}
-	return c.NoContent(http.StatusNoContent)
+	return c.JSON(
+		200,
+		struct {
+			State string `json:"state"`
+		}{"INSERTED"},
+	)
 }
 
 func (r Route) Delete(c echo.Context) error {
@@ -71,11 +76,16 @@ func (r Route) Delete(c echo.Context) error {
 	}
 	if err := r.Database.DeleteImageFromFav(userId, image.Id); err != nil {
 		if err == sql.ErrNoRows {
-			return c.JSON(http.StatusBadRequest, api.JSONError{Detail: "The image you provided do not exist or it is not in the user favourites."})
+			return c.JSON(http.StatusBadRequest, api.JSONError{Detail: "The image you provided do not exist or it is not in the user favorites."})
 		}
 		return err
 	}
-	return c.NoContent(http.StatusNoContent)
+	return c.JSON(
+		200,
+		struct {
+			State string `json:"state"`
+		}{"DELETED"},
+	)
 }
 
 func (r Route) Toggle(c echo.Context) error {

diff --git a/api/routes/fav/router.go b/api/routes/fav/router.go
@@ -14,21 +14,21 @@ func AddRouter(globals api.Globals, app *echo.Echo) error {
 		route.Insert,
 		middleware.JWTWithConfig(globals.JWTConfig),
 		middlewares.TokenVerification(globals),
-		middlewares.PermissionsVerification(globals, []string{"manage_favourites"}, middlewares.SkipOrSetUser(true)),
+		middlewares.PermissionsVerification(globals, []string{"manage_favorites"}, middlewares.SkipOrSetUser(true)),
 	)
 	app.DELETE(
 		"/fav/delete",
 		route.Delete,
 		middleware.JWTWithConfig(globals.JWTConfig),
 		middlewares.TokenVerification(globals),
-		middlewares.PermissionsVerification(globals, []string{"manage_favourites"}, middlewares.SkipOrSetUser(true)),
+		middlewares.PermissionsVerification(globals, []string{"manage_favorites"}, middlewares.SkipOrSetUser(true)),
 	)
 	app.POST(
 		"/fav/toggle",
 		route.Toggle,
 		middleware.JWTWithConfig(globals.JWTConfig),
 		middlewares.TokenVerification(globals),
-		middlewares.PermissionsVerification(globals, []string{"manage_favourites"}, middlewares.SkipOrSetUser(true)),
+		middlewares.PermissionsVerification(globals, []string{"manage_favorites"}, middlewares.SkipOrSetUser(true)),
 	)
 	return nil
 }
diff --git a/api/routes/image/binding.go b/api/routes/image/binding.go
@@ -16,7 +16,7 @@ func getThreeState() []string {
 }
 
 func getOrderBy(includeLikedAt bool) []string {
-	arr := []string{database.Favourites, database.UploadedAt, database.Random}
+	arr := []string{database.Favorites, database.UploadedAt, database.Random}
 	if includeLikedAt {
 		arr = append(arr, database.LikedAt)
 	}

diff --git a/api/routes/image/router.go b/api/routes/image/router.go
@@ -24,7 +24,7 @@ func AddRouter(globals api.Globals, app *echo.Echo) error {
 		route.RouteSelector(true),
 		middleware.JWTWithConfig(globals.JWTConfig),
 		middlewares.TokenVerification(globals),
-		middlewares.PermissionsVerification(globals, []string{"view_favourites"}, middlewares.UIntParamsSkipper("user_id", "target_user_id", true)),
+		middlewares.PermissionsVerification(globals, []string{"view_favorites"}, middlewares.UIntParamsSkipper("user_id", "target_user_id", true)),
 	)
 	return nil
 }
diff --git a/database/constants.go b/database/constants.go
@@ -10,7 +10,7 @@ const (
 )
 
 const (
-	Favourites = "FAVOURITES"
+	Favorites  = "FAVORITES"
 	UploadedAt = "UPLOADED_AT"
 	LikedAt    = "LIKED_AT"
 	Random     = "RANDOM"

diff --git a/database/queries.go b/database/queries.go
@@ -27,7 +27,7 @@ func (database Database) FetchImages(
 	userId uint,
 ) (ImageRows, error) {
 	var parameters []any
-	query := "SELECT DISTINCT Q.signature,Q.extension,Q.image_id,Q.favourites,Q.dominant_color,Q.source,Q.uploaded_at,Q.is_nsfw,Q.width,Q.height,"
+	query := "SELECT DISTINCT Q.signature,Q.extension,Q.image_id,Q.favorites,Q.dominant_color,Q.source,Q.uploaded_at,Q.is_nsfw,Q.width,Q.height,"
 	if userId != 0 {
 		query += "Q.liked_at,"
 	}
@@ -38,7 +38,7 @@ func (database Database) FetchImages(
 	if userId != 0 {
 		query += "FavImages.liked_at,"
 	}
-	query += "(SELECT COUNT(image_id) from FavImages WHERE image_id=Images.image_id) as favourites " +
+	query += "(SELECT COUNT(image_id) from FavImages WHERE image_id=Images.image_id) as favorites " +
 		"FROM Images JOIN LinkedTags ON Images.image_id=LinkedTags.image_id JOIN Tags ON Tags.id=LinkedTags.tag_id "
 	if userId != 0 {
 		query += fmt.Sprintf("JOIN FavImages ON FavImages.image_id=Images.image_id AND FavImages.user_id=$%v ", len(parameters)+1)
@@ -92,7 +92,7 @@ func (database Database) FetchImages(
 				&imageRow.Signature,
 				&imageRow.Extension,
 				&imageRow.ImageId,
-				&imageRow.Favourites,
+				&imageRow.Favorites,
 				&imageRow.DominantColor,
 				&imageRow.Source,
 				&imageRow.UploadedAt,
@@ -109,7 +109,7 @@ func (database Database) FetchImages(
 				&imageRow.Signature,
 				&imageRow.Extension,
 				&imageRow.ImageId,
-				&imageRow.Favourites,
+				&imageRow.Favorites,
 				&imageRow.DominantColor,
 				&imageRow.Source,
 				&imageRow.UploadedAt,

diff --git a/database/types.go b/database/types.go
@@ -13,7 +13,7 @@ type ImageRow struct {
 	Signature     string  `field:"signature" json:"signature"`
 	Extension     string  `field:"extension" json:"extension"`
 	ImageId       uint    `field:"image_id" json:"image_id"`
-	Favourites    uint    `field:"favourites" json:"favourites"`
+	Favorites     uint    `field:"favorites" json:"favorites"`
 	DominantColor string  `field:"dominant_color" json:"dominant_color"`
 	Source        *string `field:"source" json:"source"`
 	UploadedAt    string  `field:"uploaded_at" json:"uploaded_at"`
@@ -46,7 +46,7 @@ type Image struct {
 	Signature     string  `json:"signature"`
 	Extension     string  `json:"extension"`
 	ImageId       uint    `json:"image_id"`
-	Favourites    uint    `json:"favourites"`
+	Favorites     uint    `json:"favorites"`
 	DominantColor string  `json:"dominant_color"`
 	Source        *string `json:"source"`
 	UploadedAt    string  `json:"uploaded_at"`
@@ -68,7 +68,7 @@ func (ir ImageRows) GetImage(ImageId uint) Image {
 					im.Signature,
 					im.Extension,
 					im.ImageId,
-					im.Favourites,
+					im.Favorites,
 					im.DominantColor,
 					im.Source,
 					im.UploadedAt,