From 14f47720f5c3f7e1f25e3112efaf60b500b43162 Mon Sep 17 00:00:00 2001 From: Zeroquinc Date: Sat, 25 May 2024 17:16:07 +0200 Subject: [PATCH] fix ratings.py merge conflict --- api/radarr/client.py | 1 + api/trakt/models/rating.py | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/api/radarr/client.py b/api/radarr/client.py index 2f0664a..b5b7181 100644 --- a/api/radarr/client.py +++ b/api/radarr/client.py @@ -2,6 +2,7 @@ from utils.custom_logger import logger from src.radarr.functions import process_webhook + class RadarrWebhookHandler: def __init__(self, payload, discord_bot): self.payload = payload diff --git a/api/trakt/models/rating.py b/api/trakt/models/rating.py index 88a44cc..8c47f2f 100644 --- a/api/trakt/models/rating.py +++ b/api/trakt/models/rating.py @@ -1,10 +1,7 @@ from dateutil.parser import parse from dateutil.tz import tzlocal -from api.trakt.models.movie import Movie -from api.trakt.models.show import Show -from api.trakt.models.season import Season -from api.trakt.models.episode import Episode +from api.tmdb.client import TMDb class Rating: def __init__(self, data):