diff --git a/api/playback/handler.go b/api/playback/handler.go index e7e11a8..3d3e912 100644 --- a/api/playback/handler.go +++ b/api/playback/handler.go @@ -255,10 +255,10 @@ func (h *Handler) HandleSaveProgress(w http.ResponseWriter, r *http.Request) { if err == nil { seed = &database.UpsertAnimeParams{ ID: int64(anime.MalID), - TitleOriginal: anime.Title, + TitleOriginal: anime.Title, TitleEnglish: sql.NullString{String: anime.TitleEnglish, Valid: anime.TitleEnglish != ""}, - TitleJapanese: sql.NullString{String: anime.TitleJapanese, Valid: anime.TitleJapanese != ""}, - ImageUrl: anime.ImageURL(), + TitleJapanese: sql.NullString{String: anime.TitleJapanese, Valid: anime.TitleJapanese != ""}, + ImageUrl: anime.ImageURL(), Airing: sql.NullBool{Bool: anime.Airing, Valid: true}, DurationSeconds: sql.NullFloat64{Float64: anime.DurationSeconds(), Valid: anime.DurationSeconds() > 0}, } @@ -301,10 +301,10 @@ func (h *Handler) HandleCompleteAnime(w http.ResponseWriter, r *http.Request) { if err == nil { seed = &database.UpsertAnimeParams{ ID: int64(anime.MalID), - TitleOriginal: anime.Title, + TitleOriginal: anime.Title, TitleEnglish: sql.NullString{String: anime.TitleEnglish, Valid: anime.TitleEnglish != ""}, - TitleJapanese: sql.NullString{String: anime.TitleJapanese, Valid: anime.TitleJapanese != ""}, - ImageUrl: anime.ImageURL(), + TitleJapanese: sql.NullString{String: anime.TitleJapanese, Valid: anime.TitleJapanese != ""}, + ImageUrl: anime.ImageURL(), Airing: sql.NullBool{Bool: anime.Airing, Valid: true}, DurationSeconds: sql.NullFloat64{Float64: anime.DurationSeconds(), Valid: anime.DurationSeconds() > 0}, } diff --git a/integrations/jikan/types.go b/integrations/jikan/types.go index 1318ce7..41551f6 100644 --- a/integrations/jikan/types.go +++ b/integrations/jikan/types.go @@ -151,7 +151,7 @@ func (a Anime) DurationSeconds() float64 { minutes = val } } - return float64(hours*60 + minutes) * 60 + return float64(hours*60+minutes) * 60 } func (a Anime) Premiered() string { diff --git a/internal/db/models.go b/internal/db/models.go index aef139a..a974935 100644 --- a/internal/db/models.go +++ b/internal/db/models.go @@ -10,15 +10,15 @@ import ( ) type Anime struct { - ID int64 `json:"id"` - TitleOriginal string `json:"title_original"` - ImageUrl string `json:"image_url"` - CreatedAt time.Time `json:"created_at"` - TitleEnglish sql.NullString `json:"title_english"` - TitleJapanese sql.NullString `json:"title_japanese"` - Airing sql.NullBool `json:"airing"` - Status sql.NullString `json:"status"` - RelationsSyncedAt sql.NullTime `json:"relations_synced_at"` + ID int64 `json:"id"` + TitleOriginal string `json:"title_original"` + ImageUrl string `json:"image_url"` + CreatedAt time.Time `json:"created_at"` + TitleEnglish sql.NullString `json:"title_english"` + TitleJapanese sql.NullString `json:"title_japanese"` + Airing sql.NullBool `json:"airing"` + Status sql.NullString `json:"status"` + RelationsSyncedAt sql.NullTime `json:"relations_synced_at"` DurationSeconds sql.NullFloat64 `json:"duration_seconds"` } @@ -38,14 +38,14 @@ type AnimeRelation struct { } type ContinueWatchingEntry struct { - ID string `json:"id"` - UserID string `json:"user_id"` - AnimeID int64 `json:"anime_id"` - CurrentEpisode sql.NullInt64 `json:"current_episode"` - CurrentTimeSeconds float64 `json:"current_time_seconds"` + ID string `json:"id"` + UserID string `json:"user_id"` + AnimeID int64 `json:"anime_id"` + CurrentEpisode sql.NullInt64 `json:"current_episode"` + CurrentTimeSeconds float64 `json:"current_time_seconds"` DurationSeconds sql.NullFloat64 `json:"duration_seconds"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` } type JikanCache struct { diff --git a/internal/db/queries.sql.go b/internal/db/queries.sql.go index a0f9a02..f62d6ec 100644 --- a/internal/db/queries.sql.go +++ b/internal/db/queries.sql.go @@ -222,18 +222,18 @@ ORDER BY c.updated_at DESC ` type GetContinueWatchingEntriesRow struct { - ID string `json:"id"` - UserID string `json:"user_id"` - AnimeID int64 `json:"anime_id"` - CurrentEpisode sql.NullInt64 `json:"current_episode"` - CurrentTimeSeconds float64 `json:"current_time_seconds"` - DurationSeconds sql.NullFloat64 `json:"duration_seconds"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` - TitleOriginal string `json:"title_original"` - TitleEnglish sql.NullString `json:"title_english"` - TitleJapanese sql.NullString `json:"title_japanese"` - ImageUrl string `json:"image_url"` + ID string `json:"id"` + UserID string `json:"user_id"` + AnimeID int64 `json:"anime_id"` + CurrentEpisode sql.NullInt64 `json:"current_episode"` + CurrentTimeSeconds float64 `json:"current_time_seconds"` + DurationSeconds sql.NullFloat64 `json:"duration_seconds"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` + TitleOriginal string `json:"title_original"` + TitleEnglish sql.NullString `json:"title_english"` + TitleJapanese sql.NullString `json:"title_japanese"` + ImageUrl string `json:"image_url"` AnimeDurationSeconds sql.NullFloat64 `json:"anime_duration_seconds"` } @@ -763,12 +763,12 @@ RETURNING id, title_original, image_url, created_at, title_english, title_japane ` type UpsertAnimeParams struct { - ID int64 `json:"id"` - TitleOriginal string `json:"title_original"` - TitleEnglish sql.NullString `json:"title_english"` - TitleJapanese sql.NullString `json:"title_japanese"` - ImageUrl string `json:"image_url"` - Airing sql.NullBool `json:"airing"` + ID int64 `json:"id"` + TitleOriginal string `json:"title_original"` + TitleEnglish sql.NullString `json:"title_english"` + TitleJapanese sql.NullString `json:"title_japanese"` + ImageUrl string `json:"image_url"` + Airing sql.NullBool `json:"airing"` DurationSeconds sql.NullFloat64 `json:"duration_seconds"` } @@ -828,11 +828,11 @@ RETURNING id, user_id, anime_id, current_episode, current_time_seconds, duration ` type UpsertContinueWatchingEntryParams struct { - ID string `json:"id"` - UserID string `json:"user_id"` - AnimeID int64 `json:"anime_id"` - CurrentEpisode sql.NullInt64 `json:"current_episode"` - CurrentTimeSeconds float64 `json:"current_time_seconds"` + ID string `json:"id"` + UserID string `json:"user_id"` + AnimeID int64 `json:"anime_id"` + CurrentEpisode sql.NullInt64 `json:"current_episode"` + CurrentTimeSeconds float64 `json:"current_time_seconds"` DurationSeconds sql.NullFloat64 `json:"duration_seconds"` }