Compare commits
3 Commits
6005422cea
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2dc143faf7 | ||
|
|
206f586a11 | ||
|
|
e4874f5792 |
@@ -4,6 +4,8 @@ export type AvailableCacheIds =
|
|||||||
| 'tmdb'
|
| 'tmdb'
|
||||||
| 'radarr'
|
| 'radarr'
|
||||||
| 'sonarr'
|
| 'sonarr'
|
||||||
|
| 'lidarr'
|
||||||
|
| 'readarr'
|
||||||
| 'rt'
|
| 'rt'
|
||||||
| 'imdb'
|
| 'imdb'
|
||||||
| 'github'
|
| 'github'
|
||||||
@@ -50,6 +52,8 @@ class CacheManager {
|
|||||||
}),
|
}),
|
||||||
radarr: new Cache('radarr', 'Radarr API'),
|
radarr: new Cache('radarr', 'Radarr API'),
|
||||||
sonarr: new Cache('sonarr', 'Sonarr API'),
|
sonarr: new Cache('sonarr', 'Sonarr API'),
|
||||||
|
lidarr: new Cache('lidarr', 'Lidarr API'),
|
||||||
|
readarr: new Cache('readarr', 'Readarr API'),
|
||||||
rt: new Cache('rt', 'Rotten Tomatoes API', {
|
rt: new Cache('rt', 'Rotten Tomatoes API', {
|
||||||
stdTtl: 43200,
|
stdTtl: 43200,
|
||||||
checkPeriod: 60 * 30,
|
checkPeriod: 60 * 30,
|
||||||
|
|||||||
@@ -703,7 +703,7 @@ discoverRoutes.get('/trending', async (req, res, next) => {
|
|||||||
const tmdb = createTmdbWithRegionLanguage(req.user);
|
const tmdb = createTmdbWithRegionLanguage(req.user);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const mediaType = (req.query.mediaType as 'all' | 'movie' | 'tv') ?? 'all';
|
const mediaType = (req.query.mediaType as 'all' | 'movie' | 'tv' | 'music' | 'book') ?? 'all';
|
||||||
const timeWindow =
|
const timeWindow =
|
||||||
(req.query.timeWindow as 'day' | 'week') === 'week' ? 'week' : 'day';
|
(req.query.timeWindow as 'day' | 'week') === 'week' ? 'week' : 'day';
|
||||||
const language = (req.query.language as string) ?? req.locale;
|
const language = (req.query.language as string) ?? req.locale;
|
||||||
@@ -737,7 +737,9 @@ discoverRoutes.get('/trending', async (req, res, next) => {
|
|||||||
}),
|
}),
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
const { data, mapper, type } = await trendingFetchers[mediaType]();
|
// Music/book don't have TMDB trending - fall back to 'all'
|
||||||
|
const fetcherKey = (mediaType === 'music' || mediaType === 'book') ? 'all' : mediaType;
|
||||||
|
const { data, mapper, type } = await trendingFetchers[fetcherKey]();
|
||||||
|
|
||||||
const media = await Media.getRelatedMedia(
|
const media = await Media.getRelatedMedia(
|
||||||
req.user,
|
req.user,
|
||||||
|
|||||||
@@ -244,6 +244,14 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
|
|||||||
?.profiles?.find((profile) => profile.id === r.profileId)?.name,
|
?.profiles?.find((profile) => profile.id === r.profileId)?.name,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
case MediaType.MUSIC:
|
||||||
|
case MediaType.BOOK:
|
||||||
|
default: {
|
||||||
|
return {
|
||||||
|
...r,
|
||||||
|
profileName: undefined,
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -273,6 +281,14 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
|
|||||||
),
|
),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
case MediaType.MUSIC:
|
||||||
|
case MediaType.BOOK:
|
||||||
|
default: {
|
||||||
|
return {
|
||||||
|
...r,
|
||||||
|
canRemove: true,
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ const messages = defineMessages('components.Discover', {
|
|||||||
timeWindowWeek: 'Weekly',
|
timeWindowWeek: 'Weekly',
|
||||||
});
|
});
|
||||||
|
|
||||||
type MediaType = 'all' | 'movie' | 'tv';
|
type MediaType = 'all' | 'movie' | 'tv' | 'music' | 'book';
|
||||||
|
|
||||||
type TimeWindow = 'day' | 'week';
|
type TimeWindow = 'day' | 'week';
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import useSettings from '@app/hooks/useSettings';
|
|||||||
import { MediaType } from '@server/constants/media';
|
import { MediaType } from '@server/constants/media';
|
||||||
import { MediaServerType } from '@server/constants/server';
|
import { MediaServerType } from '@server/constants/server';
|
||||||
|
|
||||||
type ExternalLinkType = 'movie' | 'tv' | 'person';
|
type ExternalLinkType = 'movie' | 'tv' | 'person' | 'music' | 'book';
|
||||||
|
|
||||||
interface ExternalLinkBlockProps {
|
interface ExternalLinkBlockProps {
|
||||||
mediaType: ExternalLinkType;
|
mediaType: ExternalLinkType;
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ const messages = defineMessages('components.IssueModal', {
|
|||||||
interface IssueOption {
|
interface IssueOption {
|
||||||
name: MessageDescriptor;
|
name: MessageDescriptor;
|
||||||
issueType: IssueType;
|
issueType: IssueType;
|
||||||
mediaType?: 'movie' | 'tv';
|
mediaType?: 'movie' | 'tv' | 'music' | 'book';
|
||||||
}
|
}
|
||||||
|
|
||||||
export const issueOptions: IssueOption[] = [
|
export const issueOptions: IssueOption[] = [
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ const messages = defineMessages('components.PersonDetails', {
|
|||||||
ascharacter: 'as {character}',
|
ascharacter: 'as {character}',
|
||||||
});
|
});
|
||||||
|
|
||||||
type MediaType = 'all' | 'movie' | 'tv';
|
type MediaType = 'all' | 'movie' | 'tv' | 'music' | 'book';
|
||||||
|
|
||||||
const PersonDetails = () => {
|
const PersonDetails = () => {
|
||||||
const intl = useIntl();
|
const intl = useIntl();
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ interface StatusBadgeProps {
|
|||||||
plexUrl?: string;
|
plexUrl?: string;
|
||||||
serviceUrl?: string;
|
serviceUrl?: string;
|
||||||
tmdbId?: number;
|
tmdbId?: number;
|
||||||
mediaType?: 'movie' | 'tv';
|
mediaType?: 'movie' | 'tv' | 'music' | 'book';
|
||||||
title?: string | string[];
|
title?: string | string[];
|
||||||
statusLabelOverride?: string;
|
statusLabelOverride?: string;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user