0.2.55 - Remote config/Request fixes

server/internal/api/requests.go

@@ -169,6 +169,7 @@ func sonarrCoverURL(images []sonarr.Image, kind string) string {
 type requestPayload struct {
 	MediaType string `json:"mediaType"`
 	ForeignID int    `json:"foreignId"`
+	Title     string `json:"title"`
 }
 
 func (s *Server) handleRequest(w http.ResponseWriter, r *http.Request, sess store.Session) {
@@ -185,16 +186,22 @@ func (s *Server) handleRequest(w http.ResponseWriter, r *http.Request, sess stor
 		writeError(w, http.StatusBadRequest, "foreignId is required")
 		return
 	}
+	req.Title = strings.TrimSpace(req.Title)
+	if titleRunes := []rune(req.Title); len(titleRunes) > 240 {
+		req.Title = string(titleRunes[:240])
+	}
 
 	switch req.MediaType {
 	case "movie":
 		if s.radarr == nil {
-			writeError(w, http.StatusServiceUnavailable, "Radarr is not configured")
+			s.logMediaRequest(r.Context(), req, "failed", errors.New("movie requests are not configured"))
+			writeError(w, http.StatusServiceUnavailable, "movie requests are not configured")
 			return
 		}
 		movies, err := s.radarr.Lookup(r.Context(), "tmdb:"+strconv.Itoa(req.ForeignID))
 		if err != nil {
-			s.writeRequestUpstreamError(r.Context(), w, err, "Radarr lookup failed")
+			s.logMediaRequest(r.Context(), req, "failed", err)
+			s.writeRequestUpstreamError(r.Context(), w, err, "movie lookup failed")
 			return
 		}
 		for _, movie := range movies {
@@ -205,26 +212,33 @@ func (s *Server) handleRequest(w http.ResponseWriter, r *http.Request, sess stor
 				// Idempotent under a lost response: OkHttp may replay a repeatable POST after
 				// a connection reset. If the first request already added it, the retry is the
 				// same successful action rather than an error shown to the viewer.
+				req.Title = movie.Title
+				s.logMediaRequest(r.Context(), req, "already added", nil)
 				writeJSON(w, http.StatusOK, map[string]any{"status": "already_added", "title": movie.Title})
 				return
 			}
-			added, err := s.radarr.AddUnmonitored(r.Context(), movie)
+			req.Title = movie.Title
+			added, err := s.radarr.AddRequested(r.Context(), movie)
 			if err != nil {
-				s.writeRequestUpstreamError(r.Context(), w, err, "could not add movie to Radarr")
+				s.logMediaRequest(r.Context(), req, "failed", err)
+				s.writeRequestUpstreamError(r.Context(), w, err, "could not request that movie")
 				return
 			}
-			s.loggerFor(r.Context()).Info("media requested", "user", sess.Username, "type", "movie", "title", added.Title)
+			req.Title = added.Title
+			s.logMediaRequest(r.Context(), req, "successful", nil)
 			writeJSON(w, http.StatusCreated, map[string]any{"status": "requested", "title": added.Title})
 			return
 		}
 	case "series":
 		if s.sonarr == nil {
-			writeError(w, http.StatusServiceUnavailable, "Sonarr is not configured")
+			s.logMediaRequest(r.Context(), req, "failed", errors.New("series requests are not configured"))
+			writeError(w, http.StatusServiceUnavailable, "series requests are not configured")
 			return
 		}
 		series, err := s.sonarr.Lookup(r.Context(), "tvdb:"+strconv.Itoa(req.ForeignID))
 		if err != nil {
-			s.writeRequestUpstreamError(r.Context(), w, err, "Sonarr lookup failed")
+			s.logMediaRequest(r.Context(), req, "failed", err)
+			s.writeRequestUpstreamError(r.Context(), w, err, "series lookup failed")
 			return
 		}
 		for _, show := range series {
@@ -232,25 +246,49 @@ func (s *Server) handleRequest(w http.ResponseWriter, r *http.Request, sess stor
 				continue
 			}
 			if show.ID > 0 {
+				req.Title = show.Title
+				s.logMediaRequest(r.Context(), req, "already added", nil)
 				writeJSON(w, http.StatusOK, map[string]any{"status": "already_added", "title": show.Title})
 				return
 			}
-			added, err := s.sonarr.AddUnmonitored(r.Context(), show)
+			req.Title = show.Title
+			added, err := s.sonarr.AddRequested(r.Context(), show)
 			if err != nil {
-				s.writeRequestUpstreamError(r.Context(), w, err, "could not add series to Sonarr")
+				s.logMediaRequest(r.Context(), req, "failed", err)
+				s.writeRequestUpstreamError(r.Context(), w, err, "could not request that series")
 				return
 			}
-			s.loggerFor(r.Context()).Info("media requested", "user", sess.Username, "type", "series", "title", added.Title)
+			req.Title = added.Title
+			s.logMediaRequest(r.Context(), req, "successful", nil)
 			writeJSON(w, http.StatusCreated, map[string]any{"status": "requested", "title": added.Title})
 			return
 		}
 	default:
+		s.logMediaRequest(r.Context(), req, "failed", errors.New("unsupported media type"))
 		writeError(w, http.StatusBadRequest, `mediaType must be "movie" or "series"`)
 		return
 	}
+	s.logMediaRequest(r.Context(), req, "failed", errors.New("title was not found"))
 	writeError(w, http.StatusNotFound, "title was not found")
 }
 
+func (s *Server) logMediaRequest(
+	ctx context.Context, req requestPayload, outcome string, err error,
+) {
+	fields := []any{
+		"type", req.MediaType,
+		"title", clientLogValue(req.Title),
+		"foreign_id", req.ForeignID,
+		"outcome", outcome,
+	}
+	if err != nil {
+		fields = append(fields, "error", err)
+		s.loggerFor(ctx).Warn("media request failed", fields...)
+		return
+	}
+	s.loggerFor(ctx).Info("media request "+outcome, fields...)
+}
+
 func (s *Server) writeRequestUpstreamError(
 	ctx context.Context, w http.ResponseWriter, err error, message string,
 ) {