Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Collapsed favorites #276

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Collapsed favorites #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5ab3976
backend endpoints
supreme2580 Dec 18, 2024
851cced
worlds
supreme2580 Dec 18, 2024
42fab9d
stencils
supreme2580 Dec 18, 2024
e73507d
worlds and stencils
supreme2580 Dec 18, 2024
f8f2503
stencils
supreme2580 Dec 18, 2024
6dbc5dc
Merge branch 'auto-favorite' into collapsed-favorites
supreme2580 Dec 18, 2024
52b6539
stencils
supreme2580 Dec 18, 2024
12aff02
stencils bug
supreme2580 Dec 18, 2024
05abfbf
stencils
supreme2580 Dec 18, 2024
9e6f4a8
stencils and worlds backend
supreme2580 Dec 18, 2024
825e80c
stencils and worlds frontend logged in or not
supreme2580 Dec 18, 2024
2d06602
merge conflict resolution
supreme2580 Dec 18, 2024
6224d02
Merge branch 'keep-starknet-strange:main' into collapsed-favorites
supreme2580 Jan 2, 2025
5db86de
Merge branch 'keep-starknet-strange:main' into collapsed-favorites
supreme2580 Jan 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
168 changes: 127 additions & 41 deletions backend/routes/stencils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ package routes

import (
"bytes"
"context"
"encoding/json"
"fmt"
"image"
"image/color"
"image/png"
"io"
"log"
"net/http"
"os"
"os/exec"
Expand Down Expand Up @@ -106,20 +108,27 @@ func getStencils(w http.ResponseWriter, r *http.Request) {
query := `
SELECT
stencils.*,
COALESCE(favortie_count, 0) AS favorites,
COALESCE((SELECT true FROM stencilfavorites WHERE user_address = $1 AND stencilfavorites.stencil_id = stencils.stencil_id AND stencilfavorites.world_id = $2), false) as favorited
COALESCE(favorite_count, 0) AS favorites,
COALESCE(
(SELECT true FROM stencilfavorites
WHERE user_address = $1
AND stencilfavorites.stencil_id = stencils.stencil_id
AND stencilfavorites.world_id = stencils.world_id),
false
) as favorited
FROM
stencils
LEFT JOIN (
SELECT
stencil_id,
world_id,
COUNT(*) AS favorites
world_id,
COUNT(*) AS favorite_count
FROM
stencilfavorites
GROUP BY
(world_id, stencil_id)
) stencilfavorites ON stencils.world_id = stencilfavorites.world_id AND stencils.stencil_id = stencilfavorites.stencil_id
stencil_id, world_id
) sf ON stencils.stencil_id = sf.stencil_id AND stencils.world_id = sf.world_id
WHERE stencils.world_id = $2
ORDER BY stencils.stencil_id DESC
LIMIT $3 OFFSET $4`
stencils, err := core.PostgresQueryJson[StencilData](query, address, worldIdInt, pageLength, offset)
Expand Down Expand Up @@ -259,20 +268,12 @@ func getHotStencils(w http.ResponseWriter, r *http.Request) {
}

func getTopStencils(w http.ResponseWriter, r *http.Request) {
worldId := r.URL.Query().Get("worldId")
if worldId == "" {
routeutils.WriteErrorJson(w, http.StatusBadRequest, "Missing worldId")
return
}
worldIdInt, err := strconv.Atoi(worldId)
if err != nil {
routeutils.WriteErrorJson(w, http.StatusBadRequest, "Invalid worldId")
return
}
address := r.URL.Query().Get("address")
if address == "" {
address = "0"
}
worldId := r.URL.Query().Get("worldId")

pageLength, err := strconv.Atoi(r.URL.Query().Get("pageLength"))
if err != nil || pageLength <= 0 {
pageLength = 25
Expand All @@ -286,29 +287,64 @@ func getTopStencils(w http.ResponseWriter, r *http.Request) {
}
offset := (page - 1) * pageLength

query := `
SELECT
stencils.*,
COALESCE(stencilfavorites.favorite_count, 0) AS favorites,
COALESCE((SELECT true FROM stencilfavorites WHERE user_address = $1 AND stencilfavorites.stencil_id = stencils.stencil_id AND stencilfavorites.world_id = $2), false) as favorited
FROM
stencils
LEFT JOIN (
SELECT
stencil_id,
world_id,
COUNT(*) AS favorite_count
FROM
stencilfavorites
GROUP BY
(world_id, stencil_id)
) stencilfavorites ON stencils.world_id = stencilfavorites.world_id AND stencils.stencil_id = stencilfavorites.stencil_id
ORDER BY
favorites DESC
LIMIT $3 OFFSET $4`
stencils, err := core.PostgresQueryJson[StencilData](query, address, worldIdInt, pageLength, offset)
if err != nil {
routeutils.WriteErrorJson(w, http.StatusInternalServerError, "Failed to retrieve Worlds")
var query string
var stencils []byte
var queryErr error

if worldId != "" {
// Query for specific worldId
query = `
SELECT
stencils.*,
COALESCE(stencilfavorites.favorite_count, 0) AS favorites,
COALESCE((SELECT true FROM stencilfavorites WHERE user_address = $1 AND stencilfavorites.stencil_id = stencils.stencil_id AND stencilfavorites.world_id = $2), false) as favorited
FROM
stencils
LEFT JOIN (
SELECT
stencil_id,
world_id,
COUNT(*) AS favorite_count
FROM
stencilfavorites
GROUP BY
(world_id, stencil_id)
) stencilfavorites ON stencils.world_id = stencilfavorites.world_id AND stencils.stencil_id = stencilfavorites.stencil_id
WHERE stencils.world_id = $2
ORDER BY
favorites DESC
LIMIT $3 OFFSET $4`
stencils, queryErr = core.PostgresQueryJson[StencilData](query, address, worldId, pageLength, offset)
} else {
// Query for all worlds
query = `
SELECT
stencils.*,
COALESCE(stencilfavorites.favorite_count, 0) AS favorites,
CASE
WHEN $1 = '0' THEN false
ELSE COALESCE((SELECT true FROM stencilfavorites WHERE user_address = $1 AND stencilfavorites.stencil_id = stencils.stencil_id AND stencilfavorites.world_id = stencils.world_id), false)
END as favorited
FROM
stencils
LEFT JOIN (
SELECT
stencil_id,
world_id,
COUNT(*) AS favorite_count
FROM
stencilfavorites
GROUP BY
(world_id, stencil_id)
) stencilfavorites ON stencils.world_id = stencilfavorites.world_id AND stencils.stencil_id = stencilfavorites.stencil_id
ORDER BY
favorites DESC
LIMIT $2 OFFSET $3`
stencils, queryErr = core.PostgresQueryJson[StencilData](query, address, pageLength, offset)
}

if queryErr != nil {
routeutils.WriteErrorJson(w, http.StatusInternalServerError, "Failed to retrieve Stencils")
return
}
routeutils.WriteDataJson(w, string(stencils))
Expand Down Expand Up @@ -592,16 +628,28 @@ func addStencilDevnet(w http.ResponseWriter, r *http.Request) {
return
}

// Add the stencil
shellCmd := core.ArtPeaceBackend.BackendConfig.Scripts.AddStencilDevnet
contract := os.Getenv("CANVAS_FACTORY_CONTRACT_ADDRESS")
cmd := exec.Command(shellCmd, contract, "add_stencil", strconv.Itoa(worldId), hash, strconv.Itoa(width), strconv.Itoa(height), strconv.Itoa(position))
_, err = cmd.Output()
output, err := cmd.CombinedOutput()
if err != nil {
log.Printf("Add stencil command failed: %v\nOutput: %s\nCommand: %v", err, string(output), cmd.String())
routeutils.WriteErrorJson(w, http.StatusInternalServerError, "Failed to add stencil to devnet")
return
}

routeutils.WriteResultJson(w, "Stencil added to devnet")
// Favorite the newly created stencil
shellCmd = core.ArtPeaceBackend.BackendConfig.Scripts.FavoriteStencilDevnet
cmd = exec.Command(shellCmd, contract, "favorite_stencil", strconv.Itoa(worldId), strconv.Itoa(position))
output, err = cmd.CombinedOutput()
if err != nil {
log.Printf("Favorite stencil command failed: %v\nOutput: %s\nCommand: %v", err, string(output), cmd.String())
routeutils.WriteErrorJson(w, http.StatusInternalServerError, "Failed to favorite newly created stencil")
return
}

routeutils.WriteResultJson(w, "Stencil added and favorited")
}

func removeStencilDevnet(w http.ResponseWriter, r *http.Request) {
Expand Down Expand Up @@ -664,6 +712,12 @@ func favoriteStencilDevnet(w http.ResponseWriter, r *http.Request) {
return
}

userAddress := (*jsonBody)["userAddress"]
if userAddress == "" {
routeutils.WriteErrorJson(w, http.StatusBadRequest, "Missing user address")
return
}

shellCmd := core.ArtPeaceBackend.BackendConfig.Scripts.FavoriteStencilDevnet
contract := os.Getenv("CANVAS_FACTORY_CONTRACT_ADDRESS")
cmd := exec.Command(shellCmd, contract, "favorite_stencil", strconv.Itoa(worldId), strconv.Itoa(stencilId))
Expand All @@ -673,6 +727,19 @@ func favoriteStencilDevnet(w http.ResponseWriter, r *http.Request) {
return
}

// Add to stencilfavorites table
_, err = core.ArtPeaceBackend.Databases.Postgres.Exec(
context.Background(),
"INSERT INTO stencilfavorites (stencil_id, world_id, user_address) VALUES ($1, $2, $3)",
stencilId,
worldId,
userAddress,
)
if err != nil {
routeutils.WriteErrorJson(w, http.StatusInternalServerError, "Failed to insert favorite")
return
}

routeutils.WriteResultJson(w, "Stencil favorited in devnet")
}

Expand Down Expand Up @@ -700,6 +767,12 @@ func unfavoriteStencilDevnet(w http.ResponseWriter, r *http.Request) {
return
}

userAddress := (*jsonBody)["userAddress"]
if userAddress == "" {
routeutils.WriteErrorJson(w, http.StatusBadRequest, "Missing user address")
return
}

shellCmd := core.ArtPeaceBackend.BackendConfig.Scripts.UnfavoriteStencilDevnet
contract := os.Getenv("CANVAS_FACTORY_CONTRACT_ADDRESS")
cmd := exec.Command(shellCmd, contract, "unfavorite_stencil", strconv.Itoa(worldId), strconv.Itoa(stencilId))
Expand All @@ -709,6 +782,19 @@ func unfavoriteStencilDevnet(w http.ResponseWriter, r *http.Request) {
return
}

// Remove from stencilfavorites table
_, err = core.ArtPeaceBackend.Databases.Postgres.Exec(
context.Background(),
"DELETE FROM stencilfavorites WHERE stencil_id = $1 AND world_id = $2 AND user_address = $3",
stencilId,
worldId,
userAddress,
)
if err != nil {
routeutils.WriteErrorJson(w, http.StatusInternalServerError, "Failed to remove favorite")
return
}

routeutils.WriteResultJson(w, "Stencil unfavorited in devnet")
}

Expand Down
Loading
Loading