mirror of
https://github.com/sct/overseerr.git
synced 2025-12-28 16:56:19 +01:00
* perf: remove eager load of Blacklist entity from Media entity Try to resolve some performance issues by removing the eager loading of Blacklist items from the Media entity * fix: fix ManageSlideOver for blacklist * perf(blacklist): request data only when modal is shown For admin users, the button to blacklist a media (used on every media card) was displaying a Modal, that was requesting data BEFORE the modal was displayed. This resulted in dozens of additional requests everytime media cards were displayed. * perf(blacklist): remove useless ratelimit
172 lines
4.6 KiB
TypeScript
172 lines
4.6 KiB
TypeScript
import { MediaType } from '@server/constants/media';
|
|
import { getRepository } from '@server/datasource';
|
|
import { Blacklist } from '@server/entity/Blacklist';
|
|
import Media from '@server/entity/Media';
|
|
import type { BlacklistResultsResponse } from '@server/interfaces/api/blacklistInterfaces';
|
|
import { Permission } from '@server/lib/permissions';
|
|
import logger from '@server/logger';
|
|
import { isAuthenticated } from '@server/middleware/auth';
|
|
import { Router } from 'express';
|
|
import { EntityNotFoundError, QueryFailedError } from 'typeorm';
|
|
import { z } from 'zod';
|
|
|
|
const blacklistRoutes = Router();
|
|
|
|
export const blacklistAdd = z.object({
|
|
tmdbId: z.coerce.number(),
|
|
mediaType: z.nativeEnum(MediaType),
|
|
title: z.coerce.string().optional(),
|
|
user: z.coerce.number(),
|
|
});
|
|
|
|
blacklistRoutes.get(
|
|
'/',
|
|
isAuthenticated([Permission.MANAGE_BLACKLIST, Permission.VIEW_BLACKLIST], {
|
|
type: 'or',
|
|
}),
|
|
async (req, res, next) => {
|
|
const pageSize = req.query.take ? Number(req.query.take) : 25;
|
|
const skip = req.query.skip ? Number(req.query.skip) : 0;
|
|
const search = (req.query.search as string) ?? '';
|
|
|
|
try {
|
|
let query = getRepository(Blacklist)
|
|
.createQueryBuilder('blacklist')
|
|
.leftJoinAndSelect('blacklist.user', 'user');
|
|
|
|
if (search.length > 0) {
|
|
query = query.where('blacklist.title like :title', {
|
|
title: `%${search}%`,
|
|
});
|
|
}
|
|
|
|
const [blacklistedItems, itemsCount] = await query
|
|
.orderBy('blacklist.createdAt', 'DESC')
|
|
.take(pageSize)
|
|
.skip(skip)
|
|
.getManyAndCount();
|
|
|
|
return res.status(200).json({
|
|
pageInfo: {
|
|
pages: Math.ceil(itemsCount / pageSize),
|
|
pageSize,
|
|
results: itemsCount,
|
|
page: Math.ceil(skip / pageSize) + 1,
|
|
},
|
|
results: blacklistedItems,
|
|
} as BlacklistResultsResponse);
|
|
} catch (error) {
|
|
logger.error('Something went wrong while retrieving blacklisted items', {
|
|
label: 'Blacklist',
|
|
errorMessage: error.message,
|
|
});
|
|
return next({
|
|
status: 500,
|
|
message: 'Unable to retrieve blacklisted items.',
|
|
});
|
|
}
|
|
}
|
|
);
|
|
|
|
blacklistRoutes.get(
|
|
'/:id',
|
|
isAuthenticated([Permission.MANAGE_BLACKLIST], {
|
|
type: 'or',
|
|
}),
|
|
async (req, res, next) => {
|
|
try {
|
|
const blacklisteRepository = getRepository(Blacklist);
|
|
|
|
const blacklistItem = await blacklisteRepository.findOneOrFail({
|
|
where: { tmdbId: Number(req.params.id) },
|
|
});
|
|
|
|
return res.status(200).send(blacklistItem);
|
|
} catch (e) {
|
|
if (e instanceof EntityNotFoundError) {
|
|
return next({
|
|
status: 401,
|
|
message: e.message,
|
|
});
|
|
}
|
|
return next({ status: 500, message: e.message });
|
|
}
|
|
}
|
|
);
|
|
|
|
blacklistRoutes.post(
|
|
'/',
|
|
isAuthenticated([Permission.MANAGE_BLACKLIST], {
|
|
type: 'or',
|
|
}),
|
|
async (req, res, next) => {
|
|
try {
|
|
const values = blacklistAdd.parse(req.body);
|
|
|
|
await Blacklist.addToBlacklist({
|
|
blacklistRequest: values,
|
|
});
|
|
|
|
return res.status(201).send();
|
|
} catch (error) {
|
|
if (!(error instanceof Error)) {
|
|
return;
|
|
}
|
|
|
|
if (error instanceof QueryFailedError) {
|
|
switch (error.driverError.errno) {
|
|
case 19:
|
|
return next({ status: 412, message: 'Item already blacklisted' });
|
|
default:
|
|
logger.warn('Something wrong with data blacklist', {
|
|
tmdbId: req.body.tmdbId,
|
|
mediaType: req.body.mediaType,
|
|
label: 'Blacklist',
|
|
});
|
|
return next({ status: 409, message: 'Something wrong' });
|
|
}
|
|
}
|
|
|
|
return next({ status: 500, message: error.message });
|
|
}
|
|
}
|
|
);
|
|
|
|
blacklistRoutes.delete(
|
|
'/:id',
|
|
isAuthenticated([Permission.MANAGE_BLACKLIST], {
|
|
type: 'or',
|
|
}),
|
|
async (req, res, next) => {
|
|
try {
|
|
const blacklisteRepository = getRepository(Blacklist);
|
|
|
|
const blacklistItem = await blacklisteRepository.findOneOrFail({
|
|
where: { tmdbId: Number(req.params.id) },
|
|
});
|
|
|
|
await blacklisteRepository.remove(blacklistItem);
|
|
|
|
const mediaRepository = getRepository(Media);
|
|
|
|
const mediaItem = await mediaRepository.findOneOrFail({
|
|
where: { tmdbId: Number(req.params.id) },
|
|
});
|
|
|
|
await mediaRepository.remove(mediaItem);
|
|
|
|
return res.status(204).send();
|
|
} catch (e) {
|
|
if (e instanceof EntityNotFoundError) {
|
|
return next({
|
|
status: 401,
|
|
message: e.message,
|
|
});
|
|
}
|
|
return next({ status: 500, message: e.message });
|
|
}
|
|
}
|
|
);
|
|
|
|
export default blacklistRoutes;
|