Skip to content

Fix duplicate user key and log missing slug in raw pastes handler #228

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

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

Fix duplicate user key and log missing slug in raw pastes handler #228

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97ddaaf
Update pastes.sh raw logging to match non-raw.
oxume Oct 14, 2026
163b7a1
Don't duplicate user in logs
oxume Oct 14, 2026
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
20 changes: 10 additions & 10 deletions pkg/apps/pastes/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,16 @@ func (web *webRouter) blogHandler(w http.ResponseWriter, r *http.Request) {
username := router.GetUsernameFromRequest(r)
dbpool := web.db
blogger := web.cfg.Logger
logger := blogger.With("user", username)
logger := blogger.With()
cfg := web.cfg

user, err := dbpool.FindUserByName(username)
if err != nil {
logger.Info("user not found")
logger.Info("user not found", "user", username)
http.Error(w, "user not found", http.StatusNotFound)
return
}
logger = shared.LoggerWithUser(blogger, user)
logger = shared.LoggerWithUser(logger, user)

pager, err := dbpool.FindPostsByUser(&db.Pager{Num: 1000, Page: 0}, user.ID, cfg.Space)
if err != nil {
Expand Down Expand Up @@ -137,7 +137,7 @@ func (web *webRouter) blogHandler(w http.ResponseWriter, r *http.Request) {

err = ts.Execute(w, data)
if err != nil {
logger.Error("could not execute tempalte", "err", err)
logger.Error("could not execute template", "err", err)
http.Error(w, err.Error(), http.StatusInternalServerError)
}
}
Expand All @@ -161,12 +161,12 @@ func (web *webRouter) postHandler(w http.ResponseWriter, r *http.Request) {

dbpool := web.db
blogger := web.cfg.Logger
logger := blogger.With("slug", slug, "user", username)
logger := blogger.With("slug", slug)

user, err := dbpool.FindUserByName(username)
if err != nil {
logger.Info("paste not found")
http.Error(w, "paste not found", http.StatusNotFound)
logger.Info("user not found", "user", username)
http.Error(w, "user not found", http.StatusNotFound)
return
}
logger = shared.LoggerWithUser(logger, user)
Expand Down Expand Up @@ -258,15 +258,15 @@ func (web *webRouter) postHandlerRaw(w http.ResponseWriter, r *http.Request) {

dbpool := web.db
blogger := web.cfg.Logger
logger := blogger.With("user", username, "slug", slug)
logger := blogger.With("slug", slug)

user, err := dbpool.FindUserByName(username)
if err != nil {
logger.Info("user not found")
logger.Info("user not found", "user", username)
http.Error(w, "user not found", http.StatusNotFound)
return
}
logger = shared.LoggerWithUser(blogger, user)
logger = shared.LoggerWithUser(logger, user)

post, err := dbpool.FindPostWithSlug(slug, user.ID, cfg.Space)
if err != nil {
Expand Down