diff --git a/internal/anime/handler/handler.go b/internal/anime/handler/handler.go index debc670..3f967dc 100644 --- a/internal/anime/handler/handler.go +++ b/internal/anime/handler/handler.go @@ -426,10 +426,10 @@ func (h *AnimeHandler) HandleBrowse(c *gin.Context) { if c.GetHeader("HX-Request") == "true" && page > 1 { c.HTML(http.StatusOK, "browse.gohtml", gin.H{ - "_fragment": "anime_card_scroll", - "Animes": animes, - "NextPage": page + 1, - "HasNextPage": res.HasNextPage, + "_fragment": "anime_card_scroll", + "Animes": animes, + "NextPage": page + 1, + "HasNextPage": res.HasNextPage, "Query": q, "Type": animeType, "Status": status, @@ -459,9 +459,9 @@ func (h *AnimeHandler) HandleBrowse(c *gin.Context) { "Studio": studioID, "StudioName": studioName, "SFW": sfw, - "GenresList": genresList, - "Animes": animes, - "HasNextPage": res.HasNextPage, + "GenresList": genresList, + "Animes": animes, + "HasNextPage": res.HasNextPage, "NextPage": page + 1, "User": user, "WatchlistMap": watchlistMap, @@ -481,8 +481,8 @@ func (h *AnimeHandler) HandleBrowse(c *gin.Context) { "StudioName": studioName, "SFW": sfw, "GenresList": genresList, - "Animes": animes, - "HasNextPage": res.HasNextPage, + "Animes": animes, + "HasNextPage": res.HasNextPage, "NextPage": page + 1, "User": user, "WatchlistMap": watchlistMap, diff --git a/internal/anime/service/service.go b/internal/anime/service/service.go index e529f69..87be24f 100644 --- a/internal/anime/service/service.go +++ b/internal/anime/service/service.go @@ -255,7 +255,7 @@ func (s *animeService) GetAiringSchedule(ctx context.Context, userID string) ([] return fetchErr } mu.Lock() - animes = append(animes, domain.Anime{Anime: anime}) + animes = append(animes, domain.Anime{Anime: anime}) mu.Unlock() return nil }) @@ -362,12 +362,12 @@ func (s *animeService) GetRandomAnime(ctx context.Context) (domain.Anime, error) s.jikan.GetSeasonsUpcoming, } { res, fallbackErr := fallback(ctx, 1) - if fallbackErr != nil || len(res.Animes) == 0 { - continue - } - r := rand.New(rand.NewSource(time.Now().UnixNano())) - return domain.Anime{Anime: res.Animes[r.Intn(len(res.Animes))]}, nil + if fallbackErr != nil || len(res.Animes) == 0 { + continue } + r := rand.New(rand.NewSource(time.Now().UnixNano())) + return domain.Anime{Anime: res.Animes[r.Intn(len(res.Animes))]}, nil + } return domain.Anime{}, err } diff --git a/internal/episodes/module.go b/internal/episodes/module.go index e7a1662..30d1673 100644 --- a/internal/episodes/module.go +++ b/internal/episodes/module.go @@ -19,12 +19,12 @@ func episodeAvailabilityEnabled(cfg config.Config) bool { var Module = fx.Options( fx.Provide( episodeAvailabilityEnabled, - fx.Annotate( - func(queries *db.Queries, jikanClient *jikan.Client, providers []domain.EpisodeAvailabilityProvider, enabled bool, metrics *observability.Metrics) domain.EpisodeService { - return episodeService.NewEpisodeService(queries, jikanClient, providers, enabled, metrics) - }, - ), + fx.Annotate( + func(queries *db.Queries, jikanClient *jikan.Client, providers []domain.EpisodeAvailabilityProvider, enabled bool, metrics *observability.Metrics) domain.EpisodeService { + return episodeService.NewEpisodeService(queries, jikanClient, providers, enabled, metrics) + }, ), + ), fx.Provide(func(p *allanime.AllAnimeProvider) []domain.EpisodeAvailabilityProvider { return []domain.EpisodeAvailabilityProvider{p} }), diff --git a/internal/playback/module.go b/internal/playback/module.go index 6bdea85..a2e728a 100644 --- a/internal/playback/module.go +++ b/internal/playback/module.go @@ -20,11 +20,11 @@ func provideProxyTokenKey(cfg config.Config) service.ProxyTokenKey { var Module = fx.Options( fx.Provide( repository.NewPlaybackRepository, - fx.Annotate( - func(repo domain.PlaybackRepository, providers []domain.Provider, jikan *jikan.Client, episodeSvc domain.EpisodeService, auditSvc domain.AuditService, proxyTokenKey service.ProxyTokenKey) domain.PlaybackService { - return service.NewPlaybackService(repo, providers, jikan, episodeSvc, auditSvc, proxyTokenKey) - }, - ), + fx.Annotate( + func(repo domain.PlaybackRepository, providers []domain.Provider, jikan *jikan.Client, episodeSvc domain.EpisodeService, auditSvc domain.AuditService, proxyTokenKey service.ProxyTokenKey) domain.PlaybackService { + return service.NewPlaybackService(repo, providers, jikan, episodeSvc, auditSvc, proxyTokenKey) + }, + ), func(svc domain.PlaybackService, animeSvc domain.AnimeService) *handler.PlaybackHandler { return handler.NewPlaybackHandler(svc, animeSvc) }, diff --git a/internal/playback/service/service.go b/internal/playback/service/service.go index 9cb3e22..06c9567 100644 --- a/internal/playback/service/service.go +++ b/internal/playback/service/service.go @@ -289,12 +289,12 @@ func (s *playbackService) BuildWatchData(ctx context.Context, animeID int, title Segments: segments, } - return domain.WatchPageData{ - WatchData: watchData, - Anime: domain.Anime{Anime: anime}, - Episodes: canonicalEpisodes.Episodes, - CurrentEpID: episode, - WatchlistStatus: watchlistStatus, + return domain.WatchPageData{ + WatchData: watchData, + Anime: domain.Anime{Anime: anime}, + Episodes: canonicalEpisodes.Episodes, + CurrentEpID: episode, + WatchlistStatus: watchlistStatus, WatchlistIDs: watchlistIDs, Seasons: seasons, }, nil