4 files changed, 28 insertions, 34 deletions
diff --git a/utils/api/aniskip/aniskip.go b/utils/api/aniskip/aniskip.go
index d7cc343..96220d1 100644
--- a/utils/api/aniskip/aniskip.go
+++ b/utils/api/aniskip/aniskip.go
@@ -39,6 +39,10 @@ var (
 	}
 )
 
+func StopRateLimiters() {
+	rateLimiter.Stop()
+}
+
 func (c *client) getBackOffDuration(attempt int) time.Duration {
 	return time.Duration(float64(c.backoff) * math.Pow(2, float64(attempt-1)))
 }
diff --git a/utils/api/jikan/jikan.go b/utils/api/jikan/jikan.go
index c5bb2c8..991186e 100644
--- a/utils/api/jikan/jikan.go
+++ b/utils/api/jikan/jikan.go
@@ -39,6 +39,10 @@ var (
 	}
 )
 
+func StopRateLimiters() {
+	rateLimiter.Stop()
+}
+
 func (c *client) getBackOffDuration(attempt int) time.Duration {
 	return time.Duration(float64(c.backoff) * math.Pow(2, float64(attempt-1)))
 }
diff --git a/utils/api/tmdb/tmdb.go b/utils/api/tmdb/tmdb.go
index 99f6670..f4c233a 100644
--- a/utils/api/tmdb/tmdb.go
+++ b/utils/api/tmdb/tmdb.go
@@ -312,12 +312,8 @@ func AttachEpisodeDescriptions(anime *entities.Anime) error {
 		return nil
 	}
 
-	title := ""
-	alternativeTitle := ""
-	if anime.Title != nil {
-		title = anime.Title.Romaji
-		alternativeTitle = anime.Title.English
-	}
+	title := anime.Title.Romaji
+	alternativeTitle := anime.Title.English
 
 	tmdbID := 0
 	malID := anime.MALID
@@ -443,12 +439,10 @@ func AttachEpisodeDescriptions(anime *entities.Anime) error {
 			episode.EpisodeNumber = tmdbEpisodes[i].EpisodeNumber
 
 			titleForID := ""
-			if episode.Title != nil {
-				if episode.Title.English != "" {
-					titleForID = episode.Title.English
-				} else if episode.Title.Romaji != "" {
-					titleForID = episode.Title.Romaji
-				}
+			if episode.Title.English != "" {
+				titleForID = episode.Title.English
+			} else if episode.Title.Romaji != "" {
+				titleForID = episode.Title.Romaji
 			}
 			if titleForID == "" && tmdbEpisodes[i].Name != "" {
 				titleForID = tmdbEpisodes[i].Name
@@ -565,14 +559,9 @@ func EnrichEpisodeFromMovie(anime *entities.Anime) error {
 
 	episode := &anime.Episodes[0]
 
-	title := ""
-	alternativeTitle := ""
-	japaneseTitle := ""
-	if anime.Title != nil {
-		title = anime.Title.Romaji
-		alternativeTitle = anime.Title.English
-		japaneseTitle = anime.Title.Japanese
-	}
+	title := anime.Title.Romaji
+	alternativeTitle := anime.Title.English
+	japaneseTitle := anime.Title.Japanese
 
 	tmdbID := 0
 	malID := anime.MALID
@@ -580,10 +569,7 @@ func EnrichEpisodeFromMovie(anime *entities.Anime) error {
 		tmdbID = anime.Mapping.TMDB
 	}
 
-	animeScore := 0.0
-	if anime.Scores != nil {
-		animeScore = anime.Scores.Score
-	}
+	animeScore := anime.Scores.Score
 
 	logger.Debugf("TMDB", "Fetching movie episode data for: %s", title)
 
@@ -622,12 +608,11 @@ func EnrichEpisodeFromMovie(anime *entities.Anime) error {
 		description = noDescription
 	}
 
-	if episode.Title == nil {
-		episode.Title = &entities.Title{}
+	episode.Title = entities.EpisodeTitle{
+		English:  movieDetails.Title,
+		Japanese: japaneseTitle,
+		Romaji:   title,
 	}
-	episode.Title.English = movieDetails.Title
-	episode.Title.Japanese = japaneseTitle
-	episode.Title.Romaji = title
 
 	movieScore := float64(int((animeScore/2.0)*100)) / 100
 
diff --git a/utils/api/tvdb/tvdb.go b/utils/api/tvdb/tvdb.go
index 5d6f78d..ee8f0a9 100644
--- a/utils/api/tvdb/tvdb.go
+++ b/utils/api/tvdb/tvdb.go
@@ -152,11 +152,12 @@ func EnrichEpisodesFromTVDB(anime *entities.Anime, tvdbEpisodes []types.TVDBEpis
 
 		episode := &anime.Episodes[i]
 
-		if episode.Title == nil {
-			episode.Title = &entities.Title{}
-		}
 		if ep.Name != "" {
-			episode.Title.English = ep.Name
+			episode.Title = entities.EpisodeTitle{
+				English:  ep.Name,
+				Japanese: episode.Title.Japanese,
+				Romaji:   episode.Title.Romaji,
+			}
 		}
 
 		if ep.Image != "" {
@@ -181,7 +182,7 @@ func EnrichEpisodesFromTVDB(anime *entities.Anime, tvdbEpisodes []types.TVDBEpis
 		episode.EpisodeLength = float64(ep.Runtime)
 
 		titleForID := ep.Name
-		if titleForID == "" && episode.Title != nil {
+		if titleForID == "" {
 			if episode.Title.English != "" {
 				titleForID = episode.Title.English
 			} else if episode.Title.Romaji != "" {