forks
/
peertube
1
0
Fork 0
Code Releases Activity

Client: avoid "quit friends" to appear during the pending request

This commit is contained in:
Chocobozzz 2016-10-21 12:28:32 +02:00
parent c731ee4efd
commit dc00913261
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/admin/friends/friend-list/friend-list.component.html
View File

@ -20,7 +20,7 @@
</tbody> </tbody>
</table> </table>
<a *ngIf="friends?.length !== 0" class="add-user btn btn-danger pull-left" (click)="quitFriends()"> <a *ngIf="friends && friends.length !== 0" class="add-user btn btn-danger pull-left" (click)="quitFriends()">
Quit friends Quit friends
</a> </a>

8
server.js
View File

@ -68,22 +68,22 @@ const apiRoute = '/api/' + constants.API_VERSION
app.use(apiRoute, routes.api) app.use(apiRoute, routes.api)
// Static files // Static files
app.use('/client', express.static(path.join(__dirname, '/client/dist'), { maxAge: 0 })) app.use('/client', express.static(path.join(__dirname, '/client/dist'), { maxAge: constants.STATIC_MAX_AGE }))
// 404 for static files not found // 404 for static files not found
app.use('/client/*', function (req, res, next) { app.use('/client/*', function (req, res, next) {
res.sendStatus(404) res.sendStatus(404)
}) })
const torrentsPhysicalPath = path.join(__dirname, config.get('storage.torrents')) const torrentsPhysicalPath = path.join(__dirname, config.get('storage.torrents'))
app.use(constants.STATIC_PATHS.TORRENTS, cors(), express.static(torrentsPhysicalPath, { maxAge: '7d' })) app.use(constants.STATIC_PATHS.TORRENTS, cors(), express.static(torrentsPhysicalPath, { maxAge: constants.STATIC_MAX_AGE }))
// Videos path for webseeding // Videos path for webseeding
const videosPhysicalPath = path.join(__dirname, config.get('storage.videos')) const videosPhysicalPath = path.join(__dirname, config.get('storage.videos'))
app.use(constants.STATIC_PATHS.WEBSEED, cors(), express.static(videosPhysicalPath, { maxAge: '7d' })) app.use(constants.STATIC_PATHS.WEBSEED, cors(), express.static(videosPhysicalPath, { maxAge: constants.STATIC_MAX_AGE }))
// Thumbnails path for express // Thumbnails path for express
const thumbnailsPhysicalPath = path.join(__dirname, config.get('storage.thumbnails')) const thumbnailsPhysicalPath = path.join(__dirname, config.get('storage.thumbnails'))
app.use(constants.STATIC_PATHS.THUMBNAILS, express.static(thumbnailsPhysicalPath, { maxAge: '7d' })) app.use(constants.STATIC_PATHS.THUMBNAILS, express.static(thumbnailsPhysicalPath, { maxAge: constants.STATIC_MAX_AGE }))
// Client application // Client application
app.use('/*', function (req, res, next) { app.use('/*', function (req, res, next) {

5
server/initializers/constants.js
View File

@ -128,6 +128,9 @@ const STATIC_PATHS = {
WEBSEED: '/static/webseed/' WEBSEED: '/static/webseed/'
} }
// Cache control
let STATIC_MAX_AGE = '30d'
// Videos thumbnail size // Videos thumbnail size
const THUMBNAILS_SIZE = '200x110' const THUMBNAILS_SIZE = '200x110'
@ -143,6 +146,7 @@ if (isTestInstance() === true) {
CONSTRAINTS_FIELDS.VIDEOS.DURATION.max = 14 CONSTRAINTS_FIELDS.VIDEOS.DURATION.max = 14
FRIEND_SCORE.BASE = 20 FRIEND_SCORE.BASE = 20
REQUESTS_INTERVAL = 10000 REQUESTS_INTERVAL = 10000
STATIC_MAX_AGE = 0
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@ -164,6 +168,7 @@ module.exports = {
RETRY_REQUESTS, RETRY_REQUESTS,
SEARCHABLE_COLUMNS, SEARCHABLE_COLUMNS,
SORTABLE_COLUMNS, SORTABLE_COLUMNS,
STATIC_MAX_AGE,
STATIC_PATHS, STATIC_PATHS,
THUMBNAILS_SIZE, THUMBNAILS_SIZE,
USER_ROLES USER_ROLES