aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2018-06-29 14:40:39 +0200
committerChocobozzz <me@florianbigard.com>2018-06-29 14:58:57 +0200
commitb81eb8fdc6fabbe517d5731c26da773206ebba62 (patch)
tree29eb7f0eed0123599291d58126ffa7fe5413e073
parent52d9f792b3fee5acce80f948295b59e3ad2073eb (diff)
downloadPeerTube-b81eb8fdc6fabbe517d5731c26da773206ebba62.tar.gz
PeerTube-b81eb8fdc6fabbe517d5731c26da773206ebba62.tar.zst
PeerTube-b81eb8fdc6fabbe517d5731c26da773206ebba62.zip
(feed) adding thumbnail support for RSS feed
-rw-r--r--package.json2
-rw-r--r--server/controllers/feeds.ts10
-rw-r--r--yarn.lock6
3 files changed, 13 insertions, 5 deletions
diff --git a/package.json b/package.json
index 254281df5..cbe269e7d 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
108 "parse-torrent": "^6.0.0", 108 "parse-torrent": "^6.0.0",
109 "password-generator": "^2.0.2", 109 "password-generator": "^2.0.2",
110 "pem": "^1.12.3", 110 "pem": "^1.12.3",
111 "pfeed": "^1.1.5", 111 "pfeed": "^1.1.6",
112 "pg": "^7.4.1", 112 "pg": "^7.4.1",
113 "pg-hstore": "^2.3.2", 113 "pg-hstore": "^2.3.2",
114 "redis": "^2.8.0", 114 "redis": "^2.8.0",
diff --git a/server/controllers/feeds.ts b/server/controllers/feeds.ts
index ce57e5c11..1773fc71e 100644
--- a/server/controllers/feeds.ts
+++ b/server/controllers/feeds.ts
@@ -1,5 +1,6 @@
1import * as express from 'express' 1import * as express from 'express'
2import { CONFIG, FEEDS, ROUTE_CACHE_LIFETIME } from '../initializers/constants' 2import { CONFIG, FEEDS, ROUTE_CACHE_LIFETIME } from '../initializers/constants'
3import { THUMBNAILS_SIZE } from '../initializers'
3import { asyncMiddleware, setDefaultSort, videoCommentsFeedsValidator, videoFeedsValidator, videosSortValidator } from '../middlewares' 4import { asyncMiddleware, setDefaultSort, videoCommentsFeedsValidator, videoFeedsValidator, videosSortValidator } from '../middlewares'
4import { VideoModel } from '../models/video/video' 5import { VideoModel } from '../models/video/video'
5import * as Feed from 'pfeed' 6import * as Feed from 'pfeed'
@@ -125,7 +126,14 @@ async function generateVideoFeed (req: express.Request, res: express.Response, n
125 date: video.publishedAt, 126 date: video.publishedAt,
126 language: video.language, 127 language: video.language,
127 nsfw: video.nsfw, 128 nsfw: video.nsfw,
128 torrent: torrents 129 torrent: torrents,
130 thumbnail: [
131 {
132 url: CONFIG.WEBSERVER.URL + video.getThumbnailPath(),
133 height: THUMBNAILS_SIZE.height,
134 width: THUMBNAILS_SIZE.width
135 }
136 ]
129 }) 137 })
130 }) 138 })
131 139
diff --git a/yarn.lock b/yarn.lock
index 8c79ab282..a341e56eb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5426,9 +5426,9 @@ performance-now@^2.1.0:
5426 version "2.1.0" 5426 version "2.1.0"
5427 resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" 5427 resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
5428 5428
5429pfeed@^1.1.5: 5429pfeed@^1.1.6:
5430 version "1.1.5" 5430 version "1.1.6"
5431 resolved "https://registry.yarnpkg.com/pfeed/-/pfeed-1.1.5.tgz#6d0ab54209c60b45de03a15efaab7be867a3f71a" 5431 resolved "https://registry.yarnpkg.com/pfeed/-/pfeed-1.1.6.tgz#0de2a1c40b116fa236227237fa264c7956c185e8"
5432 dependencies: 5432 dependencies:
5433 xml "^1.0.1" 5433 xml "^1.0.1"
5434 5434