Add channelName to user-create server-side and models

[github/Chocobozzz/PeerTube.git] / server / controllers / lazy-static.ts

diff --git a/server/controllers/lazy-static.ts b/server/controllers/lazy-static.ts
index 4285fd727f0938fc99defb9d4f4a19deb13fe0b7..1ff99e90c2830f76ce98ab2b40d105dcd96c88f0 100644 (file)
--- a/server/controllers/lazy-static.ts
+++ b/server/controllers/lazy-static.ts
@@ -44,12 +44,19 @@ async function getAvatar (req: express.Request, res: express.Response) {
   }
 
   const avatar = await AvatarModel.loadByName(filename)
+  if (!avatar) return res.sendStatus(404)
+
   if (avatar.onDisk === false) {
     if (!avatar.fileUrl) return res.sendStatus(404)
 
     logger.info('Lazy serve remote avatar image %s.', avatar.fileUrl)
 
-    await pushAvatarProcessInQueue({ filename: avatar.filename, fileUrl: avatar.fileUrl })
+    try {
+      await pushAvatarProcessInQueue({ filename: avatar.filename, fileUrl: avatar.fileUrl })
+    } catch (err) {
+      logger.warn('Cannot process remote avatar %s.', avatar.fileUrl, { err })
+      return res.sendStatus(404)
+    }
 
     avatar.onDisk = true
     avatar.save()