X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fcontrollers%2Ffeeds.ts;h=6b64ff22720be688d1132b604bab92a71a168ad8;hb=41f8f6207a25b75c69120cabe9b0571ac055f2ec;hp=7dcaf7004f311e29bac7d43d701ff5d6e11161ed;hpb=48dce1c90dff4e90a4bcffefaecf157336cf904b;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/controllers/feeds.ts b/server/controllers/feeds.ts
index 7dcaf7004..6b64ff227 100644
--- a/server/controllers/feeds.ts
+++ b/server/controllers/feeds.ts
@@ -1,21 +1,35 @@
 import * as express from 'express'
-import { CONFIG, FEEDS } from '../initializers/constants'
-import { asyncMiddleware, feedsValidator, setDefaultSort, videosSortValidator } from '../middlewares'
+import { FEEDS, ROUTE_CACHE_LIFETIME, THUMBNAILS_SIZE, WEBSERVER } from '../initializers/constants'
+import {
+  asyncMiddleware,
+  commonVideosFiltersValidator,
+  setDefaultSort,
+  videoCommentsFeedsValidator,
+  videoFeedsValidator,
+  videosSortValidator
+} from '../middlewares'
 import { VideoModel } from '../models/video/video'
 import * as Feed from 'pfeed'
-import { ResultList } from '../../shared/models'
-import { AccountModel } from '../models/account/account'
 import { cacheRoute } from '../middlewares/cache'
-import { VideoSortField } from '../../client/src/app/shared/video/sort-field.type'
+import { VideoCommentModel } from '../models/video/video-comment'
+import { buildNSFWFilter } from '../helpers/express-utils'
+import { CONFIG } from '../initializers/config'
 
 const feedsRouter = express.Router()
 
+feedsRouter.get('/feeds/video-comments.:format',
+  asyncMiddleware(cacheRoute(ROUTE_CACHE_LIFETIME.FEEDS)),
+  asyncMiddleware(videoCommentsFeedsValidator),
+  asyncMiddleware(generateVideoCommentsFeed)
+)
+
 feedsRouter.get('/feeds/videos.:format',
   videosSortValidator,
   setDefaultSort,
-  asyncMiddleware(feedsValidator),
-  asyncMiddleware(cacheRoute),
-  asyncMiddleware(generateFeed)
+  asyncMiddleware(cacheRoute(ROUTE_CACHE_LIFETIME.FEEDS)),
+  commonVideosFiltersValidator,
+  asyncMiddleware(videoFeedsValidator),
+  asyncMiddleware(generateVideoFeed)
 )
 
 // ---------------------------------------------------------------------------
@@ -26,21 +40,74 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function generateFeed (req: express.Request, res: express.Response, next: express.NextFunction) {
-  let feed = initFeed()
+async function generateVideoCommentsFeed (req: express.Request, res: express.Response) {
   const start = 0
 
-  const account: AccountModel = res.locals.account
-  const hideNSFW = CONFIG.INSTANCE.DEFAULT_NSFW_POLICY === 'do_not_list'
+  const video = res.locals.videoAll
+  const videoId: number = video ? video.id : undefined
+
+  const comments = await VideoCommentModel.listForFeed(start, FEEDS.COUNT, videoId)
+
+  const name = video ? video.name : CONFIG.INSTANCE.NAME
+  const description = video ? video.description : CONFIG.INSTANCE.DESCRIPTION
+  const feed = initFeed(name, description)
+
+  // Adding video items to the feed, one at a time
+  comments.forEach(comment => {
+    const link = WEBSERVER.URL + comment.getCommentStaticPath()
+
+    feed.addItem({
+      title: `${comment.Video.name} - ${comment.Account.getDisplayName()}`,
+      id: comment.url,
+      link,
+      content: comment.text,
+      author: [
+        {
+          name: comment.Account.getDisplayName(),
+          link: comment.Account.Actor.url
+        }
+      ],
+      date: comment.createdAt
+    })
+  })
+
+  // Now the feed generation is done, let's send it!
+  return sendFeed(feed, req, res)
+}
+
+async function generateVideoFeed (req: express.Request, res: express.Response) {
+  const start = 0
+
+  const account = res.locals.account
+  const videoChannel = res.locals.videoChannel
+  const nsfw = buildNSFWFilter(res, req.query.nsfw)
+
+  let name: string
+  let description: string
+
+  if (videoChannel) {
+    name = videoChannel.getDisplayName()
+    description = videoChannel.description
+  } else if (account) {
+    name = account.getDisplayName()
+    description = account.description
+  } else {
+    name = CONFIG.INSTANCE.NAME
+    description = CONFIG.INSTANCE.DESCRIPTION
+  }
+
+  const feed = initFeed(name, description)
 
   const resultList = await VideoModel.listForApi({
     start,
     count: FEEDS.COUNT,
     sort: req.query.sort,
-    hideNSFW,
+    includeLocalVideos: true,
+    nsfw,
     filter: req.query.filter,
     withFiles: true,
-    accountId: account ? account.id : null
+    accountId: account ? account.id : null,
+    videoChannelId: videoChannel ? videoChannel.id : null
   })
 
   // Adding video items to the feed, one at a time
@@ -51,11 +118,22 @@ async function generateFeed (req: express.Request, res: express.Response, next:
       url: videoFile.torrentUrl,
       size_in_bytes: videoFile.size
     }))
+    const videos = formattedVideoFiles.map(videoFile => (Object.assign({
+      type: 'video/mp4',
+      medium: 'video',
+      height: videoFile.resolution.label.replace('p', ''),
+      fileSize: videoFile.size,
+      url: videoFile.fileUrl,
+      framerate: videoFile.fps,
+      duration: video.duration
+    }, video.language ? {
+      lang: video.language
+    } : {})))
 
     feed.addItem({
       title: video.name,
       id: video.url,
-      link: video.url,
+      link: WEBSERVER.URL + '/videos/watch/' + video.uuid,
       description: video.getTruncatedDescription(),
       content: video.description,
       author: [
@@ -65,9 +143,32 @@ async function generateFeed (req: express.Request, res: express.Response, next:
         }
       ],
       date: video.publishedAt,
-      language: video.language,
       nsfw: video.nsfw,
-      torrent: torrents
+      torrent: torrents,
+      videos,
+      embed: {
+        url: video.getEmbedStaticPath(),
+        allowFullscreen: true
+      },
+      player: {
+        url: video.getWatchStaticPath()
+      },
+      categories: [video.category ? {
+        value: video.category,
+        label: VideoModel.getCategoryLabel(video.category)
+      } : null].filter(Boolean),
+      community: {
+        statistics: {
+          views: video.views
+        }
+      },
+      thumbnail: [
+        {
+          url: WEBSERVER.URL + video.getMiniatureStaticPath(),
+          height: THUMBNAILS_SIZE.height,
+          width: THUMBNAILS_SIZE.width
+        }
+      ]
     })
   })
 
@@ -75,12 +176,12 @@ async function generateFeed (req: express.Request, res: express.Response, next:
   return sendFeed(feed, req, res)
 }
 
-function initFeed () {
-  const webserverUrl = CONFIG.WEBSERVER.URL
+function initFeed (name: string, description: string) {
+  const webserverUrl = WEBSERVER.URL
 
   return new Feed({
-    title: CONFIG.INSTANCE.NAME,
-    description: CONFIG.INSTANCE.SHORT_DESCRIPTION,
+    title: name,
+    description,
     // updated: TODO: somehowGetLatestUpdate, // optional, default = today
     id: webserverUrl,
     link: webserverUrl,