From 7ae34f5bf384c6393f8c066df428bd134b9034b9 Mon Sep 17 00:00:00 2001 From: brookjeynes Date: Wed, 15 Oct 2025 11:34:04 +1000 Subject: [PATCH] feat(handlers/follow): use slogger Change-Id: oknuzwklolrpwpsyynwvsmyvwxotxmxu Signed-off-by: brookjeynes --- internal/server/handlers/follow.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/internal/server/handlers/follow.go b/internal/server/handlers/follow.go index c332ea7..3032e89 100644 --- a/internal/server/handlers/follow.go +++ b/internal/server/handlers/follow.go @@ -1,7 +1,6 @@ package handlers import ( - "log" "net/http" "time" @@ -20,16 +19,18 @@ import ( ) func (h *Handler) HandleFollow(w http.ResponseWriter, r *http.Request) { + l := h.Logger.With("handler", "HandleFollow") + client, err := h.Oauth.AuthorizedClient(r) if err != nil { - log.Println("failed to get authorized client:", err) + l.Error("failed to get authorized client", "err", err) htmx.HxRedirect(w, "/login") return } user, err := bsky.GetUserWithBskyProfile(h.Oauth, r) if err != nil { - log.Println("failed to get logged-in user:", err) + l.Error("failed to get logged-in user", "err", err) htmx.HxRedirect(w, "/login") return } @@ -42,13 +43,13 @@ func (h *Handler) HandleFollow(w http.ResponseWriter, r *http.Request) { subjectIdent, err := h.IdResolver.ResolveIdent(r.Context(), subject) if err != nil { - log.Println("failed to follow, invalid did:", err) + l.Error("failed to follow, invalid did", "err", err) htmx.HxError(w, http.StatusBadRequest, "Failed to follow profile, try again later.") return } if user.Did == subjectIdent.DID.String() { - log.Println("failed to follow, cannot follow yourself") + l.Error("failed to follow, cannot follow yourself") htmx.HxError(w, http.StatusBadRequest, "You cannot follow yourself.") return } @@ -68,7 +69,7 @@ func (h *Handler) HandleFollow(w http.ResponseWriter, r *http.Request) { }}, }) if err != nil { - log.Println("failed to create follow record:", err) + l.Error("failed to create follow record", "err", err) htmx.HxError(w, http.StatusInternalServerError, "Failed to follow profile, try again later.") return } @@ -84,7 +85,7 @@ func (h *Handler) HandleFollow(w http.ResponseWriter, r *http.Request) { Set("is_mutual_follow", followStatus == db.IsMutual), }) if err != nil { - log.Println("failed to enqueue posthog event:", err) + l.Error("failed to enqueue posthog event", "err", err) } } @@ -95,7 +96,7 @@ func (h *Handler) HandleFollow(w http.ResponseWriter, r *http.Request) { case http.MethodDelete: follow, err := db.GetFollow(h.Db, user.Did, subjectIdent.DID.String()) if err != nil { - log.Println("failed to get follow relationship:", err) + l.Error("failed to get follow relationship", "err", err) htmx.HxError(w, http.StatusInternalServerError, "Failed to unfollow profile, try again later.") return } @@ -106,7 +107,7 @@ func (h *Handler) HandleFollow(w http.ResponseWriter, r *http.Request) { Rkey: follow.Rkey, }) if err != nil { - log.Println("failed to delete follow record:", err) + l.Error("failed to delete follow record", "err", err) htmx.HxError(w, http.StatusInternalServerError, "Failed to unfollow profile, try again later.") return } @@ -119,7 +120,7 @@ func (h *Handler) HandleFollow(w http.ResponseWriter, r *http.Request) { Set("subject_did", subjectIdent.DID.String()), }) if err != nil { - log.Println("failed to enqueue posthog event:", err) + l.Error("failed to enqueue posthog event", "err", err) } } -- 2.43.0