aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/shared/instance/instance-features-table.component.html2
-rw-r--r--client/src/app/shared/instance/instance-features-table.component.ts2
-rw-r--r--server/controllers/client.ts2
-rw-r--r--server/controllers/static.ts3
4 files changed, 5 insertions, 4 deletions
diff --git a/client/src/app/shared/instance/instance-features-table.component.html b/client/src/app/shared/instance/instance-features-table.component.html
index 2885f97e3..2987bd00e 100644
--- a/client/src/app/shared/instance/instance-features-table.component.html
+++ b/client/src/app/shared/instance/instance-features-table.component.html
@@ -22,7 +22,7 @@
22 <ng-container *ngIf="initialUserVideoQuota !== -1"> 22 <ng-container *ngIf="initialUserVideoQuota !== -1">
23 {{ initialUserVideoQuota | bytes: 0 }} <ng-container *ngIf="dailyUserVideoQuota !== -1">({{ dailyUserVideoQuota | bytes: 0 }} per day)</ng-container> 23 {{ initialUserVideoQuota | bytes: 0 }} <ng-container *ngIf="dailyUserVideoQuota !== -1">({{ dailyUserVideoQuota | bytes: 0 }} per day)</ng-container>
24 24
25 <my-help helpType="custom" [customHtml]="quotaHelpIndication"></my-help> 25 <my-help tooltipPlacement="auto" helpType="custom" [customHtml]="quotaHelpIndication"></my-help>
26 </ng-container> 26 </ng-container>
27 27
28 <ng-container i18n *ngIf="initialUserVideoQuota === -1"> 28 <ng-container i18n *ngIf="initialUserVideoQuota === -1">
diff --git a/client/src/app/shared/instance/instance-features-table.component.ts b/client/src/app/shared/instance/instance-features-table.component.ts
index 72e7c2730..a53082a93 100644
--- a/client/src/app/shared/instance/instance-features-table.component.ts
+++ b/client/src/app/shared/instance/instance-features-table.component.ts
@@ -22,7 +22,7 @@ export class InstanceFeaturesTableComponent implements OnInit {
22 } 22 }
23 23
24 get dailyUserVideoQuota () { 24 get dailyUserVideoQuota () {
25 return this.serverService.getConfig().user.videoQuotaDaily 25 return Math.min(this.initialUserVideoQuota, this.serverService.getConfig().user.videoQuotaDaily)
26 } 26 }
27 27
28 ngOnInit () { 28 ngOnInit () {
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index 51f610afa..2af00e475 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -1,7 +1,7 @@
1import * as express from 'express' 1import * as express from 'express'
2import { join } from 'path' 2import { join } from 'path'
3import { root } from '../helpers/core-utils' 3import { root } from '../helpers/core-utils'
4import { ACCEPT_HEADERS, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers/constants' 4import { ACCEPT_HEADERS, STATIC_MAX_AGE } from '../initializers/constants'
5import { asyncMiddleware, embedCSP } from '../middlewares' 5import { asyncMiddleware, embedCSP } from '../middlewares'
6import { buildFileLocale, getCompleteLocale, is18nLocale, LOCALE_FILES } from '../../shared/models/i18n/i18n' 6import { buildFileLocale, getCompleteLocale, is18nLocale, LOCALE_FILES } from '../../shared/models/i18n/i18n'
7import { ClientHtml } from '../lib/client-html' 7import { ClientHtml } from '../lib/client-html'
diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index 4296183a0..110d25031 100644
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -1,7 +1,8 @@
1import * as cors from 'cors' 1import * as cors from 'cors'
2import * as express from 'express' 2import * as express from 'express'
3import { 3import {
4 HLS_STREAMING_PLAYLIST_DIRECTORY, PEERTUBE_VERSION, 4 HLS_STREAMING_PLAYLIST_DIRECTORY,
5 PEERTUBE_VERSION,
5 ROUTE_CACHE_LIFETIME, 6 ROUTE_CACHE_LIFETIME,
6 STATIC_DOWNLOAD_PATHS, 7 STATIC_DOWNLOAD_PATHS,
7 STATIC_MAX_AGE, 8 STATIC_MAX_AGE,