From a24a9cd6dd3d35ecc9378a492dbc376a2b82a38e Mon Sep 17 00:00:00 2001 From: Kevin Midboe Date: Sat, 20 Aug 2022 17:37:45 +0200 Subject: [PATCH] Resolved merge conflicts --- src/plex/plexRepository.js | 1 - src/tautulli/tautulli.js | 14 -------------- src/tmdb/tmdb.js | 38 -------------------------------------- 3 files changed, 53 deletions(-) diff --git a/src/plex/plexRepository.js b/src/plex/plexRepository.js index 3bdc6e5..4018ce2 100644 --- a/src/plex/plexRepository.js +++ b/src/plex/plexRepository.js @@ -1,4 +1,3 @@ -const rp = require("request-promise"); const convertPlexToSeasoned = require("./convertPlexToSeasoned"); const convertPlexToStream = require("./convertPlexToStream"); diff --git a/src/tautulli/tautulli.js b/src/tautulli/tautulli.js index a40fee2..90b7b29 100644 --- a/src/tautulli/tautulli.js +++ b/src/tautulli/tautulli.js @@ -12,20 +12,6 @@ function logTautulliError(error) { throw new TautulliUnexpectedError(error); } -class TautulliUnexpectedError extends Error { - constructor(errorMessage) { - const message = "Unexpected error fetching from tautulli."; - super(message); - - this.statusCode = 500; - this.errorMessage = errorMessage; - } -} - -function logTautulliError(error) { - throw new TautulliUnexpectedError(error); -} - class Tautulli { constructor(apiKey, ip, port) { this.apiKey = apiKey; diff --git a/src/tmdb/tmdb.js b/src/tmdb/tmdb.js index df1bb49..054d1e8 100644 --- a/src/tmdb/tmdb.js +++ b/src/tmdb/tmdb.js @@ -37,44 +37,6 @@ class TMDBNotReachableError extends Error { } } -const tmdbErrorResponse = (error, type = null) => { - if (error.status === 404) { - const message = error.response.body.status_message; - - throw new TMDBNotFoundError(`${message.slice(0, -1)} in tmdb.`); - } else if (error.status === 401) { - throw new TMDBUnauthorizedError(error?.response?.body?.status_message); - } else if (error?.code === "ENOTFOUND") { - throw new TMDBNotReachableError(); - } -} - -class TMDBUnauthorizedError extends Error { - constructor(message = "TMDB returned access denied, requires api token.") { - super(message); - - this.statusCode = 401; - } -} - -class TMDBUnexpectedError extends Error { - constructor(type, errorMessage) { - const message = `An unexpected error occured while fetching ${type} from tmdb`; - super(message); - - this.errorMessage = errorMessage; - this.statusCode = 500; - } -} - -class TMDBNotReachableError extends Error { - constructor( - message = "TMDB api not reachable, check your internet connection" - ) { - super(message); - } -} - const tmdbErrorResponse = (error, type = null) => { if (error?.status === 404) { const message = error?.response?.body?.status_message;