From 95604a77f1d5698c8d62259f374dec277fe715e9 Mon Sep 17 00:00:00 2001 From: brookjeynes Date: Wed, 15 Oct 2025 12:00:44 +1000 Subject: [PATCH] feat(handlers/reaction): use slogger Change-Id: rykvnnktrsrwmxnmyykykxkxozqxzwsk Signed-off-by: brookjeynes --- internal/server/handlers/reaction.go | 34 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/internal/server/handlers/reaction.go b/internal/server/handlers/reaction.go index 2d4013f..b3c4513 100644 --- a/internal/server/handlers/reaction.go +++ b/internal/server/handlers/reaction.go @@ -1,7 +1,6 @@ package handlers import ( - "log" "net/http" "slices" "strconv" @@ -21,16 +20,18 @@ import ( ) func (h *Handler) HandleReaction(w http.ResponseWriter, r *http.Request) { + l := h.Logger.With("handler", "HandleReaction") + 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 } @@ -53,7 +54,7 @@ func (h *Handler) HandleReaction(w http.ResponseWriter, r *http.Request) { } if user.Did == session.Did { - log.Println("failed to react to study session, cannot react to your own study session") + l.Error("failed to react to study session, cannot react to your own study session") htmx.HxError(w, http.StatusBadRequest, "You cannot react to your own study sessions.") return } @@ -73,14 +74,14 @@ func (h *Handler) HandleReaction(w http.ResponseWriter, r *http.Request) { reaction, err := db.ReactionFromString(db.ReactionType(reactionId).String()) if err != nil { - log.Printf("failed to get reaction types: %v", err) + l.Error("failed to get reaction types", "err", err) htmx.HxError(w, http.StatusInternalServerError, "Failed to get global study session feed, try again later.") return } reactionEvents, err := db.GetReactionsForSession(h.Db, subjectDid, subjectRkey) if err != nil { - log.Println("failed to get reactions for study session from db:", err) + l.Error("failed to get reactions for study session from db", "err", err) htmx.HxError(w, http.StatusInternalServerError, "Failed to get global study session feed, try again later.") return } @@ -89,12 +90,12 @@ func (h *Handler) HandleReaction(w http.ResponseWriter, r *http.Request) { case http.MethodPost: reactionEvent, err := db.GetReactionEvent(h.Db, user.Did, session, reaction.ID) if err != nil { - log.Println("failed to get reaction event from db:", err) + l.Error("failed to get reaction event from db", "err", err) htmx.HxError(w, http.StatusInternalServerError, "Failed to add reaction, try again later.") return } if reactionEvent != nil { - log.Println("failed to add reaction, user already reacted") + l.Error("failed to add reaction, user already reacted") htmx.HxError(w, http.StatusBadRequest, "You cannot react multiple times with the same reaction.") return } @@ -113,7 +114,7 @@ func (h *Handler) HandleReaction(w http.ResponseWriter, r *http.Request) { }}, }) if err != nil { - log.Println("failed to create reaction record:", err) + l.Error("failed to create reaction record", "err", err) htmx.HxError(w, http.StatusInternalServerError, "Failed to add reaction, try again later.") return } @@ -128,7 +129,7 @@ func (h *Handler) HandleReaction(w http.ResponseWriter, r *http.Request) { Set("session_rkey", subjectRkey), }) if err != nil { - log.Println("failed to enqueue posthog event:", err) + l.Error("failed to enqueue posthog event", "err", err) } } @@ -153,7 +154,7 @@ func (h *Handler) HandleReaction(w http.ResponseWriter, r *http.Request) { case http.MethodDelete: reactionEvent, err := db.GetReactionEvent(h.Db, user.Did, session, reaction.ID) if err != nil { - log.Println("failed to get reaction event from db:", err) + l.Error("failed to get reaction event from db", "err", err) htmx.HxError(w, http.StatusInternalServerError, "Failed to remove reaction, try again later.") return } @@ -164,7 +165,7 @@ func (h *Handler) HandleReaction(w http.ResponseWriter, r *http.Request) { Rkey: reactionEvent.Rkey, }) if err != nil { - log.Println("failed to delete reaction record:", err) + l.Error("failed to delete reaction record", "err", err) htmx.HxError(w, http.StatusInternalServerError, "Failed to remove reaction, try again later.") return } @@ -179,7 +180,7 @@ func (h *Handler) HandleReaction(w http.ResponseWriter, r *http.Request) { Set("session_rkey", subjectRkey), }) if err != nil { - log.Println("failed to enqueue posthog event:", err) + l.Error("failed to enqueue posthog event", "err", err) } } @@ -188,10 +189,9 @@ func (h *Handler) HandleReaction(w http.ResponseWriter, r *http.Request) { }) partials.NewReactions(partials.NewReactionsProps{ - User: user, - SessionRkey: subjectRkey, - SessionDid: subjectDid, - // Reactions: reactions, + User: user, + SessionRkey: subjectRkey, + SessionDid: subjectDid, ReactionEvents: reactionEvents, }).Render(r.Context(), w) } -- 2.43.0