add default trending page choice, revert comments count for hot strategy

2 files changed, 30 insertions, 3 deletions

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
index 9e4691670..83b1c6a31 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
@@ -269,9 +269,13 @@
               <div class="peertube-select-container">
                 <select id="instanceDefaultClientRoute" formControlName="defaultClientRoute" class="form-control">
                   <option i18n value="/videos/overview">Discover videos</option>
-                  <option i18n value="/videos/trending">Trending videos</option>
-                  <option i18n value="/videos/hot">Hot videos</option>
-                  <option i18n value="/videos/most-liked">Most liked videos</option>
+                  <optgroup i18n-label label="Trending pages">
+                    <option i18n value="/videos/trending">Default trending page</option>
+                    <option i18n value="/videos/hot" *ngIf="isTrendingHotEnabled()">Hot videos</option>
+                    <option i18n value="/videos/hot" *ngIf="!isTrendingHotEnabled()" disabled>Hot videos</option>
+                    <option i18n value="/videos/most-viewed">Most viewed videos</option>
+                    <option i18n value="/videos/most-liked">Most liked videos</option>
+                  </optgroup>
                   <option i18n value="/videos/recently-added">Recently added videos</option>
                   <option i18n value="/videos/local">Local videos</option>
                 </select>
@@ -279,6 +283,19 @@
               <div *ngIf="formErrors.instance.defaultClientRoute" class="form-error">{{ formErrors.instance.defaultClientRoute }}</div>
             </div>
 
+            <div class="form-group" formGroupName="instance">
+              <label i18n for="instanceDefaultTrendingRoute">Default trending page</label>
+              <div class="peertube-select-container">
+                <select id="instanceDefaultTrendingRoute" formControlName="defaultTrendingRoute" class="form-control">
+                  <option i18n value="/videos/hot" *ngIf="isTrendingHotEnabled()">Hot videos</option>
+                  <option i18n value="/videos/hot" *ngIf="!isTrendingHotEnabled()" disabled>Hot videos</option>
+                  <option i18n value="/videos/trending">Most viewed videos</option>
+                  <option i18n value="/videos/most-liked">Most liked videos</option>
+                </select>
+              </div>
+              <div *ngIf="formErrors.instance.defaultTrendingRoute" class="form-error">{{ formErrors.instance.defaultTrendingRoute }}</div>
+            </div>
+
           </div>
         </div>
 
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index 330ab075a..e6fc4582b 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -186,6 +186,12 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A
         languages: null,
 
         defaultClientRoute: null,
+        defaultTrendingRoute: null,
+        pages: {
+          hot: {
+            enabled: null
+          }
+        },
 
         customizations: {
           javascript: null,
@@ -364,6 +370,10 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A
     return this.form.value['followings']['instance']['autoFollowIndex']['enabled'] === true
   }
 
+  isTrendingHotEnabled () {
+    return this.form.value['instance']['pages']['hot']['enabled'] === true
+  }
+
   async formValidated () {
     const value: CustomConfig = this.form.getRawValue()