From 562864a70fc48c4846f5044cb6595fee1b47079b Mon Sep 17 00:00:00 2001 From: DerPenz Date: Fri, 14 Apr 2023 16:01:35 +0200 Subject: [PATCH] removed unused parameter parsing --- src/endpoints/changes.ts | 10 +++------- src/endpoints/collections.ts | 10 +++------- src/endpoints/discover.ts | 7 ++----- src/endpoints/find.ts | 4 +--- src/endpoints/keywords.ts | 4 +--- src/endpoints/movies.ts | 28 +++++++++------------------- src/endpoints/people.ts | 10 +++------- src/endpoints/search.ts | 19 ++++++------------- src/endpoints/tv-shows.ts | 22 +++++++--------------- 9 files changed, 35 insertions(+), 79 deletions(-) diff --git a/src/endpoints/changes.ts b/src/endpoints/changes.ts index ea4818e..c6ab875 100644 --- a/src/endpoints/changes.ts +++ b/src/endpoints/changes.ts @@ -1,6 +1,5 @@ import { BaseEndpoint } from './base'; import { ChangeOptions, Changes } from '../types/changes'; -import { parseOptions } from '../utils'; export class ChangeEndpoint extends BaseEndpoint { @@ -9,17 +8,14 @@ export class ChangeEndpoint extends BaseEndpoint { } async movies(options?: ChangeOptions): Promise { - const params = parseOptions(options); - return await this.api.get(`/movie/changes?${params}`); + return await this.api.get(`/movie/changes`, options); } async tvShows(options?: ChangeOptions): Promise { - const params = parseOptions(options); - return await this.api.get(`/tv/changes?${params}`); + return await this.api.get(`/tv/changes`, options); } async person(options?: ChangeOptions): Promise { - const params = parseOptions(options); - return await this.api.get(`/person/changes${params}`); + return await this.api.get(`/person/change`, options); } } diff --git a/src/endpoints/collections.ts b/src/endpoints/collections.ts index 0f1237d..757e813 100644 --- a/src/endpoints/collections.ts +++ b/src/endpoints/collections.ts @@ -1,5 +1,4 @@ import { DetailedCollection, ImageCollection, LanguageOption, Translations } from '../types'; -import { parseOptions } from '../utils'; import { BaseEndpoint } from './base'; const BASE_COLLECTION = '/collection'; @@ -10,17 +9,14 @@ export class CollectionsEndpoint extends BaseEndpoint { } async details(id: number, options? : LanguageOption): Promise { - const params = parseOptions(options); - return await this.api.get(`${BASE_COLLECTION}/${id}?${params}`); + return await this.api.get(`${BASE_COLLECTION}/${id}`, options); } async images(id: number, options? : LanguageOption): Promise { - const params = parseOptions(options); - return await this.api.get(`${BASE_COLLECTION}/${id}/images?${params}`); + return await this.api.get(`${BASE_COLLECTION}/${id}/images`, options); } async translations(id: number, options? : LanguageOption): Promise { - const params = parseOptions(options); - return await this.api.get(`${BASE_COLLECTION}/${id}/translations?${params}`); + return await this.api.get(`${BASE_COLLECTION}/${id}/translations`, options); } } \ No newline at end of file diff --git a/src/endpoints/discover.ts b/src/endpoints/discover.ts index c6005c6..5dfef52 100644 --- a/src/endpoints/discover.ts +++ b/src/endpoints/discover.ts @@ -1,5 +1,4 @@ import { MovieDiscoverResult, SortOption, TvShowDiscoverResult } from '../types'; -import { parseOptions } from '../utils'; import { BaseEndpoint } from './base'; const BASE_DISCOVER = '/discover'; @@ -66,12 +65,10 @@ export class DiscoverEndpoint extends BaseEndpoint { } async movie(options?: MovieQueryOptions): Promise { - const params = parseOptions(options); - return await this.api.get(`${BASE_DISCOVER}/movie?${params}`); + return await this.api.get(`${BASE_DISCOVER}/movie`, options); } async tvShow(options?: TvShowQueryOptions): Promise { - const params = parseOptions(options); - return await this.api.get(`${BASE_DISCOVER}/tv?${params}`); + return await this.api.get(`${BASE_DISCOVER}/tv`, options); } } diff --git a/src/endpoints/find.ts b/src/endpoints/find.ts index fcae9ec..aa3c914 100644 --- a/src/endpoints/find.ts +++ b/src/endpoints/find.ts @@ -1,6 +1,5 @@ import { BaseEndpoint } from './base'; import { ExternalIdOptions, FindResult } from '../types'; -import { parseOptions } from '../utils'; export class FindEndpoint extends BaseEndpoint { constructor(accessToken: string) { @@ -8,7 +7,6 @@ export class FindEndpoint extends BaseEndpoint { } async byId(externalId: string, options: ExternalIdOptions): Promise { - const params = parseOptions(options); - return await this.api.get(`/find/${externalId}?${params}`); + return await this.api.get(`/find/${externalId}`, options); } } diff --git a/src/endpoints/keywords.ts b/src/endpoints/keywords.ts index 0637a28..336c789 100644 --- a/src/endpoints/keywords.ts +++ b/src/endpoints/keywords.ts @@ -1,6 +1,5 @@ import { BaseEndpoint } from './base'; import { BelongingMovies, Keyword, KeywordsOptions } from '../types'; -import { parseOptions } from '../utils'; const BASE_Keyword = '/keyword'; @@ -14,7 +13,6 @@ export class KeywordsEndpoint extends BaseEndpoint { } async belongingMovies(keywordId : number, options?: KeywordsOptions): Promise { - const params = parseOptions(options); - return await this.api.get(`${BASE_Keyword}/${keywordId}/movies?${params}`); + return await this.api.get(`${BASE_Keyword}/${keywordId}/movies`, options); } } diff --git a/src/endpoints/movies.ts b/src/endpoints/movies.ts index afb92b3..68eb06a 100644 --- a/src/endpoints/movies.ts +++ b/src/endpoints/movies.ts @@ -24,7 +24,6 @@ import { Videos, WatchProviders, } from '../types'; -import { parseOptions } from '../utils'; const BASE_MOVIE = '/movie'; @@ -42,8 +41,7 @@ export class MoviesEndpoint extends BaseEndpoint{ } async changes(id: number, options?: ChangeOptions): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_MOVIE}/${id}/changes?${params}`); + return await this.api.get(`${BASE_MOVIE}/${id}/changes`, options); } async credits(id: number): Promise{ @@ -63,13 +61,11 @@ export class MoviesEndpoint extends BaseEndpoint{ } async lists(id: number, options?: LanguageOption | PageOption): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_MOVIE}/${id}/lists?${params}`); + return await this.api.get(`${BASE_MOVIE}/${id}/lists`, options); } async recommendations(id: number, options?: PageOption): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_MOVIE}/${id}/recommendations?${params}`); + return await this.api.get(`${BASE_MOVIE}/${id}/recommendations`, options); } async releaseDates(id: number): Promise{ @@ -77,13 +73,11 @@ export class MoviesEndpoint extends BaseEndpoint{ } async reviews(id: number, options?: PageOption): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_MOVIE}/${id}/reviews?${params}`); + return await this.api.get(`${BASE_MOVIE}/${id}/reviews`, options); } async similar(id: number, options?: PageOption): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_MOVIE}/${id}/similar?${params}`); + return await this.api.get(`${BASE_MOVIE}/${id}/similar`, options); } async translations(id: number): Promise{ @@ -107,23 +101,19 @@ export class MoviesEndpoint extends BaseEndpoint{ } async nowPlaying(options?: PageOption & LanguageOption & RegionOption): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_MOVIE}/now_playing?${params}`); + return await this.api.get(`${BASE_MOVIE}/now_playing`, options); } async popular(options?: PageOption): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_MOVIE}/popular?${params}`); + return await this.api.get(`${BASE_MOVIE}/popular`, options); } async topRated(options?: PageOption & LanguageOption & RegionOption): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_MOVIE}/top_rated?${params}`); + return await this.api.get(`${BASE_MOVIE}/top_rated`, options); } async upcoming(options?: PageOption & LanguageOption & RegionOption): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_MOVIE}/upcoming?${params}`); + return await this.api.get(`${BASE_MOVIE}/upcoming`, options); } } diff --git a/src/endpoints/people.ts b/src/endpoints/people.ts index 0c42e32..cade34d 100644 --- a/src/endpoints/people.ts +++ b/src/endpoints/people.ts @@ -12,7 +12,6 @@ import { PopularPersons, TaggedImages, } from '../types'; -import { parseOptions } from '../utils'; import { BaseEndpoint } from './base'; const BASE_PERSON = '/person'; @@ -27,8 +26,7 @@ export class PeopleEndpoint extends BaseEndpoint { } async changes(id: number, options? : ChangeOptions): Promise { - const params = parseOptions(options); - return await this.api.get(`${BASE_PERSON}/${id}/changes?${params}`); + return await this.api.get(`${BASE_PERSON}/${id}/changes`, options); } async movieCredits(id: number): Promise { @@ -52,8 +50,7 @@ export class PeopleEndpoint extends BaseEndpoint { } async taggedImages(id: number, options?: PageOption): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_PERSON}/${id}/tagged_images?${params}`); + return await this.api.get(`${BASE_PERSON}/${id}/tagged_images`, options); } async translation(id: number) : Promise{ @@ -65,7 +62,6 @@ export class PeopleEndpoint extends BaseEndpoint { } async popular(options?: PageOption): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_PERSON}/popular?${params}`); + return await this.api.get(`${BASE_PERSON}/popular`, options); } } diff --git a/src/endpoints/search.ts b/src/endpoints/search.ts index 7a8ab78..0a9ac50 100644 --- a/src/endpoints/search.ts +++ b/src/endpoints/search.ts @@ -1,7 +1,6 @@ import { BaseEndpoint } from './base'; import { Search } from '../types/search'; import { Collection, Company, Movie, Person, TV } from '../types'; -import { parseOptions } from '../utils'; const BASE_SEARCH = '/search'; @@ -31,34 +30,28 @@ export class SearchEndpoint extends BaseEndpoint { } async companies(options: SearchOptions): Promise>{ - const params = parseOptions(options); - return await this.api.get>(`${BASE_SEARCH}/company?${params}`); + return await this.api.get>(`${BASE_SEARCH}/company`, options); } async collections(options: SearchOptions): Promise>{ - const params = parseOptions(options); - return await this.api.get>(`${BASE_SEARCH}/collection?${params}`); + return await this.api.get>(`${BASE_SEARCH}/collection`, options); } async keywords(options: SearchOptions): Promise>{ - const params = parseOptions(options); - return await this.api.get>(`${BASE_SEARCH}/keyword?${params}`); + return await this.api.get>(`${BASE_SEARCH}/keyword`, options); } async movies(options: MovieSearchOptions): Promise>{ - const params = parseOptions(options); - return await this.api.get>(`${BASE_SEARCH}/movie?${params}`); + return await this.api.get>(`${BASE_SEARCH}/movie`, options); } async people(options: PeopleSearchOptions): Promise>{ - const params = parseOptions(options); - return await this.api.get>(`${BASE_SEARCH}/person?${params}`); + return await this.api.get>(`${BASE_SEARCH}/person`, options); } // TODO: Multi search async tvShows(options: TvSearchOptions): Promise>{ - const params = parseOptions(options); - return await this.api.get>(`${BASE_SEARCH}/tv?${params}`); + return await this.api.get>(`${BASE_SEARCH}/tv`, options); } } diff --git a/src/endpoints/tv-shows.ts b/src/endpoints/tv-shows.ts index 8b1fb2f..8c4a383 100644 --- a/src/endpoints/tv-shows.ts +++ b/src/endpoints/tv-shows.ts @@ -27,7 +27,6 @@ import { Videos, WatchProviders, } from '../types'; -import { parseOptions } from '../utils'; const BASE_TV = '/tv'; @@ -45,8 +44,7 @@ export class TvShowsEndpoint extends BaseEndpoint{ } async changes(id: number, options?: ChangeOptions): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_TV}/${id}/changes?${params}`); + return await this.api.get(`${BASE_TV}/${id}/changes`, options); } async contentRatings(id: number): Promise{ @@ -78,13 +76,11 @@ export class TvShowsEndpoint extends BaseEndpoint{ } async recommendations(id: number, options?: PageOption): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_TV}/${id}/recommendations?${params}`); + return await this.api.get(`${BASE_TV}/${id}/recommendations`, options); } async reviews(id: number, options?: PageOption): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_TV}/${id}/reviews?${params}`); + return await this.api.get(`${BASE_TV}/${id}/reviews`, options); } async screenedTheatrically(id: number): Promise{ @@ -92,8 +88,7 @@ export class TvShowsEndpoint extends BaseEndpoint{ } async similar(id: number, options?: PageOption): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_TV}/${id}/similar?${params}`); + return await this.api.get(`${BASE_TV}/${id}/similar`, options); } async translations(id: number): Promise{ @@ -121,17 +116,14 @@ export class TvShowsEndpoint extends BaseEndpoint{ } async airingToday(options?: PageOption & LanguageOption & RegionOption): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_TV}/airing_today?${params}`); + return await this.api.get(`${BASE_TV}/airing_today`, options); } async popular(options?: PageOption & LanguageOption & RegionOption): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_TV}/popular?${params}`); + return await this.api.get(`${BASE_TV}/popular`, options); } async topRated(options?: PageOption & LanguageOption & RegionOption): Promise{ - const params = parseOptions(options); - return await this.api.get(`${BASE_TV}/top_rated?${params}`); + return await this.api.get(`${BASE_TV}/top_rated`, options); } }