Browse Source

Return 404 for deleted albums

Pitu 6 years ago
parent
commit
e56ef97975
2 changed files with 3 additions and 3 deletions
  1. 1 1
      controllers/albumsController.js
  2. 2 2
      routes/album.js

+ 1 - 1
controllers/albumsController.js

@@ -106,7 +106,7 @@ albumsController.get = async (req, res, next) => {
 	const identifier = req.params.identifier;
 	if (identifier === undefined) return res.status(401).json({ success: false, description: 'No identifier provided' });
 
-	const album = await db.table('albums').where('identifier', identifier).first();
+	const album = await db.table('albums').where({ identifier, enabled: 1 }).first();
 	if (!album) return res.json({ success: false, description: 'Album not found' });
 
 	const title = album.name;

+ 2 - 2
routes/album.js

@@ -8,8 +8,8 @@ routes.get('/a/:identifier', async (req, res, next) => {
 	let identifier = req.params.identifier;
 	if (identifier === undefined) return res.status(401).json({ success: false, description: 'No identifier provided' });
 
-	const album = await db.table('albums').where('identifier', identifier).first();
-	if (!album) return res.json({ success: false, description: 'Album not found' });
+	const album = await db.table('albums').where({ identifier, enabled: 1 }).first();
+	if (!album) return res.status(404).sendFile('404.html', { root: './pages/error/' });
 
 	const files = await db.table('files').select('name').where('albumid', album.id).orderBy('id', 'DESC');
 	let thumb = '';