Fix s3 mock cleanup

[github/Chocobozzz/PeerTube.git] / server / controllers / bots.ts

diff --git a/server/controllers/bots.ts b/server/controllers/bots.ts
index 541b40e8e200bcbb5d6fbf1deea944a538a6fb60..2b825a73093e7e0b88d21472ca10134b967ac8dd 100644 (file)
--- a/server/controllers/bots.ts
+++ b/server/controllers/bots.ts
@@ -1,20 +1,22 @@
-import * as express from 'express'
-import { asyncMiddleware } from '../middlewares'
+import express from 'express'
+import { truncate } from 'lodash'
+import { ErrorLevel, SitemapStream, streamToPromise } from 'sitemap'
+import { logger } from '@server/helpers/logger'
+import { getServerActor } from '@server/models/application/application'
+import { buildNSFWFilter } from '../helpers/express-utils'
 import { ROUTE_CACHE_LIFETIME, WEBSERVER } from '../initializers/constants'
-import { SitemapStream, streamToPromise } from 'sitemap'
+import { asyncMiddleware } from '../middlewares'
+import { cacheRoute } from '../middlewares/cache/cache'
+import { AccountModel } from '../models/account/account'
 import { VideoModel } from '../models/video/video'
 import { VideoChannelModel } from '../models/video/video-channel'
-import { AccountModel } from '../models/account/account'
-import { cacheRoute } from '../middlewares/cache'
-import { buildNSFWFilter } from '../helpers/express-utils'
-import { truncate } from 'lodash'
 
 const botsRouter = express.Router()
 
 // Special route that add OpenGraph and oEmbed tags
 // Do not use a template engine for a so little thing
 botsRouter.use('/sitemap.xml',
-  asyncMiddleware(cacheRoute()(ROUTE_CACHE_LIFETIME.SITEMAP)),
+  cacheRoute(ROUTE_CACHE_LIFETIME.SITEMAP),
   asyncMiddleware(getSitemap)
 )
 
@@ -33,10 +35,21 @@ async function getSitemap (req: express.Request, res: express.Response) {
   urls = urls.concat(await getSitemapVideoChannelUrls())
   urls = urls.concat(await getSitemapAccountUrls())
 
-  const sitemapStream = new SitemapStream({ hostname: WEBSERVER.URL })
+  const sitemapStream = new SitemapStream({
+    hostname: WEBSERVER.URL,
+    errorHandler: (err: Error, level: ErrorLevel) => {
+      if (level === 'warn') {
+        logger.warn('Warning in sitemap generation.', { err })
+      } else if (level === 'throw') {
+        logger.error('Error in sitemap generation.', { err })
+
+        throw err
+      }
+    }
+  })
 
-  for (const url of urls) {
-    sitemapStream.write({ url })
+  for (const urlObj of urls) {
+    sitemapStream.write(urlObj)
   }
   sitemapStream.end()
 
@@ -63,25 +76,30 @@ async function getSitemapAccountUrls () {
 }
 
 async function getSitemapLocalVideoUrls () {
+  const serverActor = await getServerActor()
+
   const { data } = await VideoModel.listForApi({
     start: 0,
     count: undefined,
     sort: 'createdAt',
-    includeLocalVideos: true,
+    displayOnlyForFollower: {
+      actorId: serverActor.id,
+      orLocalVideos: true
+    },
+    isLocal: true,
     nsfw: buildNSFWFilter(),
-    filter: 'local',
-    withFiles: false,
     countVideos: false
   })
 
   return data.map(v => ({
-    url: WEBSERVER.URL + '/videos/watch/' + v.uuid,
+    url: WEBSERVER.URL + v.getWatchStaticPath(),
     video: [
       {
-        title: v.name,
+        // Sitemap title should be < 100 characters
+        title: truncate(v.name, { length: 100, omission: '...' }),
         // Sitemap description should be < 2000 characters
         description: truncate(v.description || v.name, { length: 2000, omission: '...' }),
-        player_loc: WEBSERVER.URL + '/videos/embed/' + v.uuid,
+        player_loc: WEBSERVER.URL + v.getEmbedStaticPath(),
         thumbnail_loc: WEBSERVER.URL + v.getMiniatureStaticPath()
       }
     ]