Merge branch 'master' into endpoint/tv-season

This commit is contained in:
DerPenz
2023-05-15 13:13:20 +02:00
17 changed files with 267 additions and 103 deletions

View File

@@ -10,26 +10,20 @@ export interface MediaChanges {
total_results: number;
}
export interface ChangeOptions {
end_date?: string;
start_date?: string;
page?: number;
export interface Changes<T> {
changes: Change<T>[];
}
export interface Changes {
changes: Change[];
}
export interface Change {
export interface Change<T> {
key: string;
items: ChangeItem[];
items: ChangeItem<T>[];
}
export interface ChangeItem {
export interface ChangeItem<T> {
id: string;
action: string;
time: string;
value: Array<number>;
value: T;
iso_639_1: string;
original_value: Array<number>;
original_value: T;
}

View File

@@ -14,6 +14,7 @@ export * from './trending';
export * from './find';
export * from './keywords';
export * from './collections';
export * from './tv-episode';
export * from './tv-seasons';
export type MediaType = 'movie' | 'tv' | 'person';

View File

@@ -155,3 +155,14 @@ export interface UpcomingMovies {
total_results: number;
total_pages: number;
}
export type MovieChangeValue =
| string
| {
person_id: number;
character: string;
order: number;
cast_id: number;
credit_id: string;
}
| unknown;

View File

@@ -10,7 +10,6 @@ import {
MovieLists,
PeopleImages,
PersonTranslations,
PersonChanges,
PersonCombinedCredits,
PersonMovieCredit,
PersonTvShowCredit,
@@ -24,6 +23,12 @@ import {
Translations,
Videos,
WatchProviders,
PersonChangeValue,
MovieChangeValue,
TvShowChangeValue,
TvEpisodeChangeValue,
TvEpisodeCredit,
TvEpisodeTranslations,
} from '.';
export interface LanguageOption {
@@ -38,6 +43,11 @@ export interface PageOption {
page?: number;
}
export interface ChangeOption extends PageOption {
start_date?: Date;
end_date?: Date;
}
export type AppendToResponseMovieKey =
| 'images'
| 'videos'
@@ -82,12 +92,24 @@ export type AppendToResponsePersonKey =
| 'tagged_images'
| 'translations';
export type AppendToResponseTvEpisodeKey =
| 'images'
| 'credits'
| 'external_ids'
| 'videos'
| 'translations';
type AppendToResponseAllKeys =
| AppendToResponseTvKey
| AppendToResponseMovieKey
| AppendToResponseTvEpisodeKey
| AppendToResponsePersonKey;
export type AppendToResponseMediaType = 'movie' | 'tvShow' | 'person';
export type AppendToResponseMediaType =
| 'movie'
| 'tvShow'
| 'person'
| 'tvEpisode';
export type AppendToResponse<
K,
@@ -98,7 +120,11 @@ export type AppendToResponse<
? object
: T extends Array<unknown>
? ('credits' extends T[number]
? { credits: Omit<Credits, 'id'> }
? {
credits: Media extends 'tvEpisode'
? TvEpisodeCredit
: Omit<Credits, 'id'>;
}
: object) &
('videos' extends T[number] ? { videos: Omit<Videos, 'id'> } : object) &
('images' extends T[number]
@@ -120,9 +146,14 @@ export type AppendToResponse<
: object) &
('changes' extends T[number]
? {
changes: Omit<
Media extends 'person' ? PersonChanges : Changes,
'id'
changes: Changes<
Media extends 'person'
? PersonChangeValue
: Media extends 'movie'
? MovieChangeValue
: Media extends 'tvShow'
? TvShowChangeValue
: TvEpisodeChangeValue
>;
}
: object) &
@@ -142,7 +173,16 @@ export type AppendToResponse<
? { external_ids: Omit<ExternalIds, 'id'> }
: object) &
('translations' extends T[number]
? { translations: Omit<Media extends 'person' ? PersonTranslations : Translations, 'id'> }
? {
translations: Omit<
Media extends 'person'
? PersonTranslations
: Media extends 'tvEpisode'
? TvEpisodeTranslations
: Translations,
'id'
>;
}
: object) &
('watch/providers' extends T[number]
? { 'watch/providers': Omit<WatchProviders, 'id'> }

View File

@@ -96,22 +96,13 @@ export interface PersonDetails {
homepage: string;
}
export interface PersonChange {
id: string;
action: string;
time: string;
iso_639_1: string;
iso_3166_1: string;
value: string | { profile: { file_path: string } };
original_value: string | { profile: { file_path: string } };
}
export interface PersonChanges {
changes: {
key: string;
items: PersonChange[];
}[];
}
export type PersonChangeValue =
| string
| {
profile: {
file_path: string;
};
};
export interface PopularPersons {
page: number;

58
src/types/tv-episode.ts Normal file
View File

@@ -0,0 +1,58 @@
import { Credits, Crew } from '.';
export interface EpisodeSelection {
tvShowID: number;
seasonNumber: number;
episodeNumber: number;
}
export interface Episode {
air_date: string;
episode_number: number;
crew: Crew[];
guest_stars: GuestStar[];
id: number;
name: string;
overview: string;
production_code: string;
season_number: number;
still_path: string;
vote_average: number;
vote_count: number;
runtime: number;
show_id: number;
}
export interface GuestStar {
credit_id: string;
order: number;
character: string;
adult: boolean;
gender: number | null;
id: number;
known_for_department: string;
name: string;
original_name: string;
popularity: number;
profile_path: string | null;
}
export interface TvEpisodeCredit extends Credits {
guest_stars: GuestStar[];
}
export interface TvEpisodeTranslations {
id: number;
translations: {
iso_3166_1: string;
iso_639_1: string;
name: string;
english_name: string;
data: {
name: string;
overview: string;
};
};
}
export type TvEpisodeChangeValue = string | unknown;

View File

@@ -1,4 +1,4 @@
import { Episode } from ".";
import { Episode } from '.';
export interface SeasonSelection {
tvShowID: number;
@@ -14,3 +14,10 @@ export interface SeasonDetails {
poster_path: string | null;
season_number: number;
}
export type SeasonChangeValue =
| string
| {
episode_id: number;
episode_number: number;
};

View File

@@ -3,7 +3,7 @@ import {
ProductionCompany,
ProductionCountry,
SpokenLanguage,
Crew,
Episode,
} from './';
export interface CreatedBy {
@@ -93,37 +93,6 @@ export interface TvShowDetails {
vote_count: number;
}
export interface GuestStar {
credit_id: string;
order: number;
character: string;
adult: boolean;
gender: number | null;
id: number;
known_for_department: string;
name: string;
original_name: string;
popularity: number;
profile_path: string | null;
}
export interface Episode {
air_date: string;
episode_number: number;
crew: Crew[];
guest_stars: GuestStar[];
id: number;
name: string;
overview: string;
production_code: string;
season_number: number;
still_path: string;
vote_average: number;
vote_count: number;
show_id: number;
runtime: number;
}
export interface Network {
id: number;
logo_path: string;
@@ -300,3 +269,8 @@ export interface TopRatedTvShows {
total_results: number;
total_pages: number;
}
export interface TvShowChangeValue {
season_id: number;
season_number: number;
}