removed unused parameter parsing

This commit is contained in:
DerPenz
2023-04-14 16:01:35 +02:00
parent 1200064194
commit 562864a70f
9 changed files with 35 additions and 79 deletions

View File

@@ -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<Changes> {
const params = parseOptions(options);
return await this.api.get<Changes>(`/movie/changes?${params}`);
return await this.api.get<Changes>(`/movie/changes`, options);
}
async tvShows(options?: ChangeOptions): Promise<Changes> {
const params = parseOptions(options);
return await this.api.get<Changes>(`/tv/changes?${params}`);
return await this.api.get<Changes>(`/tv/changes`, options);
}
async person(options?: ChangeOptions): Promise<Changes> {
const params = parseOptions(options);
return await this.api.get<Changes>(`/person/changes${params}`);
return await this.api.get<Changes>(`/person/change`, options);
}
}

View File

@@ -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<DetailedCollection> {
const params = parseOptions(options);
return await this.api.get<DetailedCollection>(`${BASE_COLLECTION}/${id}?${params}`);
return await this.api.get<DetailedCollection>(`${BASE_COLLECTION}/${id}`, options);
}
async images(id: number, options? : LanguageOption): Promise<ImageCollection> {
const params = parseOptions(options);
return await this.api.get<ImageCollection>(`${BASE_COLLECTION}/${id}/images?${params}`);
return await this.api.get<ImageCollection>(`${BASE_COLLECTION}/${id}/images`, options);
}
async translations(id: number, options? : LanguageOption): Promise<Translations> {
const params = parseOptions(options);
return await this.api.get<Translations>(`${BASE_COLLECTION}/${id}/translations?${params}`);
return await this.api.get<Translations>(`${BASE_COLLECTION}/${id}/translations`, options);
}
}

View File

@@ -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<MovieDiscoverResult> {
const params = parseOptions(options);
return await this.api.get<MovieDiscoverResult>(`${BASE_DISCOVER}/movie?${params}`);
return await this.api.get<MovieDiscoverResult>(`${BASE_DISCOVER}/movie`, options);
}
async tvShow(options?: TvShowQueryOptions): Promise<TvShowDiscoverResult> {
const params = parseOptions(options);
return await this.api.get<TvShowDiscoverResult>(`${BASE_DISCOVER}/tv?${params}`);
return await this.api.get<TvShowDiscoverResult>(`${BASE_DISCOVER}/tv`, options);
}
}

View File

@@ -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<FindResult> {
const params = parseOptions(options);
return await this.api.get<FindResult>(`/find/${externalId}?${params}`);
return await this.api.get<FindResult>(`/find/${externalId}`, options);
}
}

View File

@@ -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<BelongingMovies> {
const params = parseOptions(options);
return await this.api.get<BelongingMovies>(`${BASE_Keyword}/${keywordId}/movies?${params}`);
return await this.api.get<BelongingMovies>(`${BASE_Keyword}/${keywordId}/movies`, options);
}
}

View File

@@ -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<MovieChanges>{
const params = parseOptions(options);
return await this.api.get<MovieChanges>(`${BASE_MOVIE}/${id}/changes?${params}`);
return await this.api.get<MovieChanges>(`${BASE_MOVIE}/${id}/changes`, options);
}
async credits(id: number): Promise<Credits>{
@@ -63,13 +61,11 @@ export class MoviesEndpoint extends BaseEndpoint{
}
async lists(id: number, options?: LanguageOption | PageOption): Promise<MovieLists>{
const params = parseOptions(options);
return await this.api.get<MovieLists>(`${BASE_MOVIE}/${id}/lists?${params}`);
return await this.api.get<MovieLists>(`${BASE_MOVIE}/${id}/lists`, options);
}
async recommendations(id: number, options?: PageOption): Promise<Recommendations>{
const params = parseOptions(options);
return await this.api.get<Recommendations>(`${BASE_MOVIE}/${id}/recommendations?${params}`);
return await this.api.get<Recommendations>(`${BASE_MOVIE}/${id}/recommendations`, options);
}
async releaseDates(id: number): Promise<ReleaseDates>{
@@ -77,13 +73,11 @@ export class MoviesEndpoint extends BaseEndpoint{
}
async reviews(id: number, options?: PageOption): Promise<Reviews>{
const params = parseOptions(options);
return await this.api.get<Reviews>(`${BASE_MOVIE}/${id}/reviews?${params}`);
return await this.api.get<Reviews>(`${BASE_MOVIE}/${id}/reviews`, options);
}
async similar(id: number, options?: PageOption): Promise<SimilarMovies>{
const params = parseOptions(options);
return await this.api.get<SimilarMovies>(`${BASE_MOVIE}/${id}/similar?${params}`);
return await this.api.get<SimilarMovies>(`${BASE_MOVIE}/${id}/similar`, options);
}
async translations(id: number): Promise<Translations>{
@@ -107,23 +101,19 @@ export class MoviesEndpoint extends BaseEndpoint{
}
async nowPlaying(options?: PageOption & LanguageOption & RegionOption): Promise<MoviesPlayingNow>{
const params = parseOptions(options);
return await this.api.get<MoviesPlayingNow>(`${BASE_MOVIE}/now_playing?${params}`);
return await this.api.get<MoviesPlayingNow>(`${BASE_MOVIE}/now_playing`, options);
}
async popular(options?: PageOption): Promise<PopularMovies>{
const params = parseOptions(options);
return await this.api.get<PopularMovies>(`${BASE_MOVIE}/popular?${params}`);
return await this.api.get<PopularMovies>(`${BASE_MOVIE}/popular`, options);
}
async topRated(options?: PageOption & LanguageOption & RegionOption): Promise<TopRatedMovies>{
const params = parseOptions(options);
return await this.api.get<TopRatedMovies>(`${BASE_MOVIE}/top_rated?${params}`);
return await this.api.get<TopRatedMovies>(`${BASE_MOVIE}/top_rated`, options);
}
async upcoming(options?: PageOption & LanguageOption & RegionOption): Promise<UpcomingMovies>{
const params = parseOptions(options);
return await this.api.get<UpcomingMovies>(`${BASE_MOVIE}/upcoming?${params}`);
return await this.api.get<UpcomingMovies>(`${BASE_MOVIE}/upcoming`, options);
}
}

View File

@@ -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<PersonChanges> {
const params = parseOptions(options);
return await this.api.get<PersonChanges>(`${BASE_PERSON}/${id}/changes?${params}`);
return await this.api.get<PersonChanges>(`${BASE_PERSON}/${id}/changes`, options);
}
async movieCredits(id: number): Promise<PersonMovieCredit> {
@@ -52,8 +50,7 @@ export class PeopleEndpoint extends BaseEndpoint {
}
async taggedImages(id: number, options?: PageOption): Promise<TaggedImages>{
const params = parseOptions(options);
return await this.api.get<TaggedImages>(`${BASE_PERSON}/${id}/tagged_images?${params}`);
return await this.api.get<TaggedImages>(`${BASE_PERSON}/${id}/tagged_images`, options);
}
async translation(id: number) : Promise<PeopleTranslations>{
@@ -65,7 +62,6 @@ export class PeopleEndpoint extends BaseEndpoint {
}
async popular(options?: PageOption): Promise<PopularPersons>{
const params = parseOptions(options);
return await this.api.get<PopularPersons>(`${BASE_PERSON}/popular?${params}`);
return await this.api.get<PopularPersons>(`${BASE_PERSON}/popular`, options);
}
}

View File

@@ -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<Search<Company>>{
const params = parseOptions(options);
return await this.api.get<Search<Company>>(`${BASE_SEARCH}/company?${params}`);
return await this.api.get<Search<Company>>(`${BASE_SEARCH}/company`, options);
}
async collections(options: SearchOptions): Promise<Search<Collection>>{
const params = parseOptions(options);
return await this.api.get<Search<Collection>>(`${BASE_SEARCH}/collection?${params}`);
return await this.api.get<Search<Collection>>(`${BASE_SEARCH}/collection`, options);
}
async keywords(options: SearchOptions): Promise<Search<{ id: string, name: string }>>{
const params = parseOptions(options);
return await this.api.get<Search<{ id: string, name: string }>>(`${BASE_SEARCH}/keyword?${params}`);
return await this.api.get<Search<{ id: string, name: string }>>(`${BASE_SEARCH}/keyword`, options);
}
async movies(options: MovieSearchOptions): Promise<Search<Movie>>{
const params = parseOptions(options);
return await this.api.get<Search<Movie>>(`${BASE_SEARCH}/movie?${params}`);
return await this.api.get<Search<Movie>>(`${BASE_SEARCH}/movie`, options);
}
async people(options: PeopleSearchOptions): Promise<Search<Person>>{
const params = parseOptions(options);
return await this.api.get<Search<Person>>(`${BASE_SEARCH}/person?${params}`);
return await this.api.get<Search<Person>>(`${BASE_SEARCH}/person`, options);
}
// TODO: Multi search
async tvShows(options: TvSearchOptions): Promise<Search<TV>>{
const params = parseOptions(options);
return await this.api.get<Search<TV>>(`${BASE_SEARCH}/tv?${params}`);
return await this.api.get<Search<TV>>(`${BASE_SEARCH}/tv`, options);
}
}

View File

@@ -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<TvShowChanges>{
const params = parseOptions(options);
return await this.api.get<TvShowChanges>(`${BASE_TV}/${id}/changes?${params}`);
return await this.api.get<TvShowChanges>(`${BASE_TV}/${id}/changes`, options);
}
async contentRatings(id: number): Promise<ContentRatings>{
@@ -78,13 +76,11 @@ export class TvShowsEndpoint extends BaseEndpoint{
}
async recommendations(id: number, options?: PageOption): Promise<Recommendations>{
const params = parseOptions(options);
return await this.api.get<Recommendations>(`${BASE_TV}/${id}/recommendations?${params}`);
return await this.api.get<Recommendations>(`${BASE_TV}/${id}/recommendations`, options);
}
async reviews(id: number, options?: PageOption): Promise<Reviews>{
const params = parseOptions(options);
return await this.api.get<Reviews>(`${BASE_TV}/${id}/reviews?${params}`);
return await this.api.get<Reviews>(`${BASE_TV}/${id}/reviews`, options);
}
async screenedTheatrically(id: number): Promise<ScreenedTheatrically>{
@@ -92,8 +88,7 @@ export class TvShowsEndpoint extends BaseEndpoint{
}
async similar(id: number, options?: PageOption): Promise<SimilarTvShows>{
const params = parseOptions(options);
return await this.api.get<SimilarTvShows>(`${BASE_TV}/${id}/similar?${params}`);
return await this.api.get<SimilarTvShows>(`${BASE_TV}/${id}/similar`, options);
}
async translations(id: number): Promise<Translations>{
@@ -121,17 +116,14 @@ export class TvShowsEndpoint extends BaseEndpoint{
}
async airingToday(options?: PageOption & LanguageOption & RegionOption): Promise<TvShowsAiringToday>{
const params = parseOptions(options);
return await this.api.get<TvShowsAiringToday>(`${BASE_TV}/airing_today?${params}`);
return await this.api.get<TvShowsAiringToday>(`${BASE_TV}/airing_today`, options);
}
async popular(options?: PageOption & LanguageOption & RegionOption): Promise<PopularTvShows>{
const params = parseOptions(options);
return await this.api.get<PopularTvShows>(`${BASE_TV}/popular?${params}`);
return await this.api.get<PopularTvShows>(`${BASE_TV}/popular`, options);
}
async topRated(options?: PageOption & LanguageOption & RegionOption): Promise<TopRatedTvShows>{
const params = parseOptions(options);
return await this.api.get<TopRatedTvShows>(`${BASE_TV}/top_rated?${params}`);
return await this.api.get<TopRatedTvShows>(`${BASE_TV}/top_rated`, options);
}
}