diff --git a/internal/features/anime/handler.go b/internal/features/anime/handler.go index f61bd74..d1df67c 100644 --- a/internal/features/anime/handler.go +++ b/internal/features/anime/handler.go @@ -314,51 +314,6 @@ func (h *Handler) HandleAPIDiscoverUpcoming(w http.ResponseWriter, r *http.Reque templates.DiscoverItems(res.Animes, "upcoming", page+1, res.HasNextPage).Render(r.Context(), w) } -func (h *Handler) HandleNotifications(w http.ResponseWriter, r *http.Request) { - userID := userIDFromRequest(r) - - if userID == "" { - http.Redirect(w, r, "/login", http.StatusSeeOther) - return - } - - tab := r.URL.Query().Get("tab") - if tab != "sequels" { - tab = "tracking" - } - - var watching []templates.WatchingAnimeWithDetails - if tab == "tracking" { - var err error - watching, err = h.svc.GetWatchingAnime(r.Context(), userID) - if err != nil { - log.Printf("watching anime error: %v", err) - http.Error(w, "Failed to fetch watching anime", http.StatusInternalServerError) - return - } - } - - templates.Notifications(watching, tab).Render(r.Context(), w) -} - -func (h *Handler) HandleNotificationsUpcoming(w http.ResponseWriter, r *http.Request) { - userID := userIDFromRequest(r) - - if userID == "" { - http.Error(w, "Unauthorized", http.StatusUnauthorized) - return - } - - upcomingSeasons, err := h.svc.GetUpcomingSeasons(r.Context(), userID) - if err != nil { - log.Printf("upcoming seasons error: %v", err) - http.Error(w, "Failed to fetch upcoming seasons", http.StatusInternalServerError) - return - } - - templates.UpcomingSeasonsList(upcomingSeasons).Render(r.Context(), w) -} - func (h *Handler) HandleStudioDetails(w http.ResponseWriter, r *http.Request) { idStr := r.URL.Path[len("/studios/"):] id, err := strconv.Atoi(idStr) diff --git a/internal/features/anime/service.go b/internal/features/anime/service.go index faf6bf6..a1ce4a4 100644 --- a/internal/features/anime/service.go +++ b/internal/features/anime/service.go @@ -6,7 +6,6 @@ import ( "mal/internal/database" "mal/internal/jikan" - "mal/internal/templates" ) type Service struct { @@ -98,52 +97,6 @@ func (s *Service) GetRecommendations(ctx context.Context, animeID int, limit int return s.jikanClient.GetRecommendations(ctx, animeID, limit) } -func (s *Service) GetWatchingAnime(ctx context.Context, userID string) ([]templates.WatchingAnimeWithDetails, error) { - rows, err := s.db.GetWatchingAnime(ctx, userID) - if err != nil { - return nil, fmt.Errorf("failed to get watching anime: %w", err) - } - - var result []templates.WatchingAnimeWithDetails - for _, row := range rows { - anime, err := s.jikanClient.GetAnimeByID(ctx, int(row.AnimeID)) - if err != nil { - if jikan.IsRetryableError(err) { - s.jikanClient.EnqueueAnimeFetchRetry(ctx, int(row.AnimeID), err) - } - // Instead of skipping, we still append it, but without the extra Jikan details - // This prevents anime from vanishing from the watchlist when Jikan rate limits us. - anime = jikan.Anime{} - } - result = append(result, templates.WatchingAnimeWithDetails{ - Entry: row, - Anime: anime, - }) - } - - return result, nil -} - -func (s *Service) GetUpcomingSeasons(ctx context.Context, userID string) ([]database.GetUpcomingSeasonsRow, error) { - rows, err := s.db.GetUpcomingSeasons(ctx, userID) - if err != nil { - return nil, fmt.Errorf("failed to get upcoming seasons: %w", err) - } - - // Deduplicate by related anime ID - // Because of the recursive query, multiple prequels can point to the same upcoming season - seen := make(map[int64]bool) - var deduped []database.GetUpcomingSeasonsRow - for _, row := range rows { - if !seen[row.ID] { - seen[row.ID] = true - deduped = append(deduped, row) - } - } - - return deduped, nil -} - func (s *Service) GetAnimeByProducer(ctx context.Context, producerID int, page int) (jikan.StudioAnimeResult, error) { return s.jikanClient.GetAnimeByProducer(ctx, producerID, page) } diff --git a/internal/features/watchlist/handler.go b/internal/features/watchlist/handler.go index c66e57c..27feec7 100644 --- a/internal/features/watchlist/handler.go +++ b/internal/features/watchlist/handler.go @@ -173,14 +173,7 @@ func (h *Handler) HandleGetWatchlist(w http.ResponseWriter, r *http.Request) { } var filteredEntries []database.GetUserWatchListRow - if statusFilter == "continuing" { - // Show airing anime with watching or plan_to_watch status - for _, entry := range entries { - if entry.Airing.Bool && (entry.Status == "watching" || entry.Status == "plan_to_watch") { - filteredEntries = append(filteredEntries, entry) - } - } - } else if statusFilter != "" && statusFilter != "all" { + if statusFilter != "" && statusFilter != "all" { for _, entry := range entries { if entry.Status == statusFilter { filteredEntries = append(filteredEntries, entry) @@ -197,6 +190,59 @@ func (h *Handler) HandleGetWatchlist(w http.ResponseWriter, r *http.Request) { templates.Watchlist(filteredEntries, layout, statusFilter, sortBy, sortOrder).Render(r.Context(), w) } +func (h *Handler) HandleContinueWatching(w http.ResponseWriter, r *http.Request) { + if !requireMethod(w, r, http.MethodGet) { + return + } + + user := middleware.GetUser(r.Context()) + if user == nil { + http.Redirect(w, r, "/login", http.StatusFound) + return + } + + entries, err := h.svc.db.GetContinueWatchingEntries(r.Context(), user.ID) + if err != nil { + log.Printf("continue watching fetch failed: user_id=%s err=%v", user.ID, err) + http.Error(w, "failed to fetch continue watching", http.StatusInternalServerError) + return + } + + templates.ContinueWatching(entries).Render(r.Context(), w) +} + +func (h *Handler) HandleDeleteContinueWatching(w http.ResponseWriter, r *http.Request) { + if !requireMethod(w, r, http.MethodDelete) { + return + } + + user := middleware.GetUser(r.Context()) + if user == nil { + w.Header().Set("HX-Redirect", "/login") + http.Error(w, "Unauthorized", http.StatusUnauthorized) + return + } + + path := r.URL.Path[len("/api/continue-watching/"):] + animeID, err := strconv.ParseInt(path, 10, 64) + if err != nil || animeID <= 0 { + http.Error(w, "invalid anime ID", http.StatusBadRequest) + return + } + + err = h.svc.db.DeleteContinueWatchingEntry(r.Context(), database.DeleteContinueWatchingEntryParams{ + UserID: user.ID, + AnimeID: animeID, + }) + if err != nil { + log.Printf("continue watching delete failed: user_id=%s anime_id=%d err=%v", user.ID, animeID, err) + http.Error(w, "failed to delete continue watching entry", http.StatusInternalServerError) + return + } + + w.WriteHeader(http.StatusOK) +} + func (h *Handler) HandleExportWatchlist(w http.ResponseWriter, r *http.Request) { if !requireMethod(w, r, http.MethodGet) { return diff --git a/internal/server/routes.go b/internal/server/routes.go index 9fb60d8..ad4dce9 100644 --- a/internal/server/routes.go +++ b/internal/server/routes.go @@ -41,8 +41,10 @@ func NewRouter(cfg Config) http.Handler { mux.HandleFunc("/", animeHandler.HandleCatalog) mux.HandleFunc("/discover", animeHandler.HandleDiscover) - mux.HandleFunc("/notifications", animeHandler.HandleNotifications) - mux.HandleFunc("/notifications/upcoming", animeHandler.HandleNotificationsUpcoming) + mux.HandleFunc("/continue-watching", watchlistHandler.HandleContinueWatching) + mux.HandleFunc("/notifications", func(w http.ResponseWriter, r *http.Request) { + http.Redirect(w, r, "/continue-watching", http.StatusMovedPermanently) + }) mux.HandleFunc("/api/discover/airing", animeHandler.HandleAPIDiscoverAiring) mux.HandleFunc("/api/discover/upcoming", animeHandler.HandleAPIDiscoverUpcoming) mux.HandleFunc("/search", animeHandler.HandleSearch) @@ -77,6 +79,7 @@ func NewRouter(cfg Config) http.Handler { mux.HandleFunc("/api/watchlist/import", watchlistHandler.HandleImportWatchlist) mux.HandleFunc("/api/watchlist", watchlistHandler.HandleUpdateWatchlist) mux.HandleFunc("/api/watchlist/", watchlistHandler.HandleDeleteWatchlist) + mux.HandleFunc("/api/continue-watching/", watchlistHandler.HandleDeleteContinueWatching) mux.HandleFunc("/watchlist", watchlistHandler.HandleGetWatchlist) // Wrap mux with global CSRF origin verification and auth checking, diff --git a/internal/shared/ui/anime_card.templ b/internal/shared/ui/anime_card.templ index 31bcd94..786e930 100644 --- a/internal/shared/ui/anime_card.templ +++ b/internal/shared/ui/anime_card.templ @@ -6,6 +6,7 @@ type AnimeCardProps struct { ID int Title string ImageURL string + Href string // Options to customize the card behavior Class string // override default wrapper class ImgClass string // override default image class @@ -24,7 +25,7 @@ templ AnimeCard(props AnimeCardProps) { { children... } } else { - + @animeCardPoster(props.ImageURL, props.Title, props.ImgClass) if !props.HideTitle { @@ -37,6 +38,14 @@ templ AnimeCard(props AnimeCardProps) { } } +func cardHref(props AnimeCardProps) string { + if props.Href != "" { + return props.Href + } + + return fmt.Sprintf("/anime/%d", props.ID) +} + templ animeCardPoster(imageURL, title, imgClass string) {
if imageURL != "" { diff --git a/internal/templates/continue_watching.templ b/internal/templates/continue_watching.templ new file mode 100644 index 0000000..da177cc --- /dev/null +++ b/internal/templates/continue_watching.templ @@ -0,0 +1,67 @@ +package templates + +import ( + "fmt" + "mal/internal/database" + "mal/internal/shared/ui" +) + +templ ContinueWatching(entries []database.GetContinueWatchingEntriesRow) { + @Layout("mal - continue watching", true) { +
+

Continue watching

+

Pick up where you left off.

+ if len(entries) == 0 { + @ui.EmptyState("Nothing to continue yet") { + Start watching any anime and your progress will show up here. + } + } else { +
+ for _, entry := range entries { +
+ @ui.AnimeCard(ui.AnimeCardProps{ + ID: int(entry.AnimeID), + Title: displayContinueWatchingTitle(entry), + ImageURL: entry.ImageUrl, + Href: continueWatchingURL(entry), + Class: "notification-card min-w-0 flex flex-col bg-transparent text-inherit no-underline", + HideTitle: true, + }) { +
+
{ displayContinueWatchingTitle(entry) }
+
+ if entry.CurrentEpisode.Valid && entry.CurrentEpisode.Int64 > 0 { + Continue ep { fmt.Sprintf("%d", entry.CurrentEpisode.Int64) } + } + if entry.CurrentTimeSeconds > 0 { + { formatProgressTime(entry.CurrentTimeSeconds) } + } +
+
+ } + +
+ } +
+ } +
+ } +} + +func continueWatchingURL(entry database.GetContinueWatchingEntriesRow) string { + episode := 1 + if entry.CurrentEpisode.Valid && entry.CurrentEpisode.Int64 > 0 { + episode = int(entry.CurrentEpisode.Int64) + } + + return fmt.Sprintf("/watch/%d/%d", entry.AnimeID, episode) +} + +func displayContinueWatchingTitle(entry database.GetContinueWatchingEntriesRow) string { + return database.DisplayTitle(entry.TitleEnglish, entry.TitleJapanese, entry.TitleOriginal) +} diff --git a/internal/templates/layout.templ b/internal/templates/layout.templ index af58828..90dd0e0 100644 --- a/internal/templates/layout.templ +++ b/internal/templates/layout.templ @@ -26,9 +26,8 @@ templ Layout(title string, showHeader bool) { @icons.LogoIcon("h-7 w-7")
- Catalog Discover - Notifications + Continue watching Watchlist
diff --git a/internal/templates/notifications.templ b/internal/templates/notifications.templ deleted file mode 100644 index 4e5e251..0000000 --- a/internal/templates/notifications.templ +++ /dev/null @@ -1,184 +0,0 @@ -package templates - -import "mal/internal/jikan" -import "mal/internal/database" -import "mal/internal/shared/ui" -import "fmt" -import "strings" - -type WatchingAnimeWithDetails struct { - Entry database.GetWatchingAnimeRow - Anime jikan.Anime -} - -templ Notifications(watching []WatchingAnimeWithDetails, activeTab string) { - @Layout("mal - notifications", true) { -
-

Notifications

-
- Tracking - Sequels -
- - if activeTab == "sequels" { -
- @ui.LoadingIndicator("Syncing sequel graphs...") -
- } else { -

Shows you're currently watching or planning to watch.

- if len(watching) == 0 { - @ui.EmptyState("No airing anime in your watching list.") { - Add currently airing shows to your watching list to see upcoming episodes here. - } - } else { -
- for _, item := range watching { - @NotificationCard(item) - } -
- } - } -
- } -} - -func splitUpcomingSeasons(items []database.GetUpcomingSeasonsRow) (airing []database.GetUpcomingSeasonsRow, upcoming []database.GetUpcomingSeasonsRow) { - for _, item := range items { - if item.Status.Valid && item.Status.String == "Currently Airing" { - airing = append(airing, item) - } else { - upcoming = append(upcoming, item) - } - } - return -} - -templ UpcomingSeasonsList(upcomingSeasons []database.GetUpcomingSeasonsRow) { - if len(upcomingSeasons) == 0 { - @ui.EmptyState("No upcoming seasons for anime you've watched.") { - As you watch more shows, new seasons will appear here. - } - } else { - @renderSplitSeasons(upcomingSeasons) - } -} - -templ renderSplitSeasons(upcomingSeasons []database.GetUpcomingSeasonsRow) { - if airing, upcoming := splitUpcomingSeasons(upcomingSeasons); true { - if len(airing) > 0 { -
-

Airing now

-

These are the currently airing anime, but you're not tracking any of these.

-
- for _, item := range airing { - @UpcomingSeasonCard(item) - } -
-
- } - - if len(upcoming) > 0 { -
-

Announced & upcoming

-

Newly announced or upcoming seasons related to anime you've watched.

-
- for _, item := range upcoming { - @UpcomingSeasonCard(item) - } -
-
- } - } -} - -templ UpcomingSeasonCard(item database.GetUpcomingSeasonsRow) { - @ui.AnimeCard(ui.AnimeCardProps{ - ID: int(item.ID), - Title: displaySeasonTitle(item), - ImageURL: item.ImageUrl, - Class: "notification-card min-w-0 flex flex-col bg-transparent text-inherit no-underline", - HideTitle: true, - }) { -
-
- { displaySeasonTitle(item) } -
-
- if item.Status.Valid { - { seasonStatusLabel(item.Status.String) } - } - if strings.TrimSpace(item.PrequelTitle) != "" { - { fmt.Sprintf("Sequel to %s", item.PrequelTitle) } - } -
-
- } -} - -func displaySeasonTitle(entry database.GetUpcomingSeasonsRow) string { - return database.DisplayTitle(entry.TitleEnglish, entry.TitleJapanese, entry.TitleOriginal) -} - -templ NotificationCard(item WatchingAnimeWithDetails) { - @ui.AnimeCard(ui.AnimeCardProps{ - ID: int(item.Entry.AnimeID), - Title: displayTitle(item.Entry), - ImageURL: item.Entry.ImageUrl, - Class: "notification-card min-w-0 flex flex-col bg-transparent text-inherit no-underline", - HideTitle: true, - }) { -
-
- { displayTitle(item.Entry) } -
-
- if item.Anime.Broadcast.String != "" { - { item.Anime.Broadcast.String } - Calculating next episode time... - } - if item.Anime.Episodes > 0 { - - if item.Entry.CurrentEpisode.Valid { - { fmt.Sprintf("%d / %d eps", item.Entry.CurrentEpisode.Int64, item.Anime.Episodes) } - } else { - { fmt.Sprintf("0 / %d eps", item.Anime.Episodes) } - } - - } else if item.Entry.CurrentEpisode.Valid && item.Entry.CurrentEpisode.Int64 > 0 { - - { fmt.Sprintf("%d eps watched", item.Entry.CurrentEpisode.Int64) } - - } -
-
- } -} - -func displayTitle(entry database.GetWatchingAnimeRow) string { - return database.DisplayTitle(entry.TitleEnglish, entry.TitleJapanese, entry.TitleOriginal) -} - -func seasonStatusLabel(status string) string { - statusText := strings.TrimSpace(status) - if statusText == "" { - return "" - } - - if statusText == "Currently Airing" { - return "Airing now" - } - - if statusText == "Not yet aired" { - return "Upcoming" - } - - return statusText -} - -func statusTabClass(active bool) string { - base := "shrink-0 whitespace-nowrap bg-(--panel-soft) px-2 py-1 text-xs text-(--text-muted) no-underline hover:bg-(--surface-tab-hover) hover:text-(--text) hover:no-underline" - if active { - return "shrink-0 whitespace-nowrap bg-(--surface-tab-active) px-2 py-1 text-xs text-(--accent) no-underline hover:no-underline" - } - return base -} diff --git a/internal/templates/watchlist.templ b/internal/templates/watchlist.templ index dd3ad2a..408d50a 100644 --- a/internal/templates/watchlist.templ +++ b/internal/templates/watchlist.templ @@ -29,7 +29,6 @@ templ Watchlist(entries []database.GetUserWatchListRow, layout string, currentSt
All Watching - Continuing On hold Plan to watch Dropped @@ -40,8 +39,6 @@ templ Watchlist(entries []database.GetUserWatchListRow, layout string, currentSt @ui.EmptyState("Nothing here yet") { if currentStatus == "all" { Your watchlist is empty. Search for anime to get started. - } else if currentStatus == "continuing" { - No airing anime with watching or plan to watch status. } else { No anime in this category. }