From 3da68f0a781ebd893521e2e6fa200280c92ae815 Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Tue, 26 Jan 2021 01:53:13 +0100
Subject: add default trending page choice, revert comments count for hot
 strategy

---
 .../src/app/+videos/video-list/trending/index.ts   |  2 +-
 .../trending/video-most-viewed.component.ts        | 99 ++++++++++++++++++++++
 .../trending/video-trending-header.component.html  |  2 +-
 .../trending/video-trending-header.component.ts    | 29 +++++--
 .../trending/video-trending.component.ts           | 99 ----------------------
 client/src/app/+videos/videos-routing.module.ts    | 22 +++--
 client/src/app/+videos/videos.module.ts            |  4 +-
 7 files changed, 140 insertions(+), 117 deletions(-)
 create mode 100644 client/src/app/+videos/video-list/trending/video-most-viewed.component.ts
 delete mode 100644 client/src/app/+videos/video-list/trending/video-trending.component.ts

(limited to 'client/src/app/+videos')

diff --git a/client/src/app/+videos/video-list/trending/index.ts b/client/src/app/+videos/video-list/trending/index.ts
index 8bae205a5..93f4b1df6 100644
--- a/client/src/app/+videos/video-list/trending/index.ts
+++ b/client/src/app/+videos/video-list/trending/index.ts
@@ -1,4 +1,4 @@
 export * from './video-trending-header.component'
-export * from './video-trending.component'
 export * from './video-hot.component'
+export * from './video-most-viewed.component'
 export * from './video-most-liked.component'
diff --git a/client/src/app/+videos/video-list/trending/video-most-viewed.component.ts b/client/src/app/+videos/video-list/trending/video-most-viewed.component.ts
new file mode 100644
index 000000000..98ced42d6
--- /dev/null
+++ b/client/src/app/+videos/video-list/trending/video-most-viewed.component.ts
@@ -0,0 +1,99 @@
+import { Component, ComponentFactoryResolver, Injector, OnDestroy, OnInit } from '@angular/core'
+import { ActivatedRoute, Router } from '@angular/router'
+import { AuthService, LocalStorageService, Notifier, ScreenService, ServerService, UserService } from '@app/core'
+import { HooksService } from '@app/core/plugins/hooks.service'
+import { immutableAssign } from '@app/helpers'
+import { VideoService } from '@app/shared/shared-main'
+import { AbstractVideoList } from '@app/shared/shared-video-miniature'
+import { VideoSortField } from '@shared/models'
+import { VideoTrendingHeaderComponent } from './video-trending-header.component'
+
+@Component({
+  selector: 'my-videos-most-viewed',
+  styleUrls: [ '../../../shared/shared-video-miniature/abstract-video-list.scss' ],
+  templateUrl: '../../../shared/shared-video-miniature/abstract-video-list.html'
+})
+export class VideoMostViewedComponent extends AbstractVideoList implements OnInit, OnDestroy {
+  HeaderComponent = VideoTrendingHeaderComponent
+  titlePage: string
+  defaultSort: VideoSortField = '-trending'
+
+  useUserVideoPreferences = true
+
+  constructor (
+    protected router: Router,
+    protected serverService: ServerService,
+    protected route: ActivatedRoute,
+    protected notifier: Notifier,
+    protected authService: AuthService,
+    protected userService: UserService,
+    protected screenService: ScreenService,
+    protected storageService: LocalStorageService,
+    protected cfr: ComponentFactoryResolver,
+    private videoService: VideoService,
+    private hooks: HooksService
+  ) {
+    super()
+
+    this.headerComponentInjector = this.getInjector()
+  }
+
+  ngOnInit () {
+    super.ngOnInit()
+
+    this.generateSyndicationList()
+
+    this.serverService.getConfig().subscribe(
+      config => {
+        const trendingDays = config.trending.videos.intervalDays
+
+        if (trendingDays === 1) {
+          this.titleTooltip = $localize`Trending videos are those totalizing the greatest number of views during the last 24 hours`
+        } else {
+          this.titleTooltip = $localize`Trending videos are those totalizing the greatest number of views during the last ${trendingDays} days`
+        }
+
+        this.headerComponentInjector = this.getInjector()
+        this.setHeader()
+      })
+  }
+
+  ngOnDestroy () {
+    super.ngOnDestroy()
+  }
+
+  getVideosObservable (page: number) {
+    const newPagination = immutableAssign(this.pagination, { currentPage: page })
+    const params = {
+      videoPagination: newPagination,
+      sort: this.sort,
+      categoryOneOf: this.categoryOneOf,
+      languageOneOf: this.languageOneOf,
+      nsfwPolicy: this.nsfwPolicy,
+      skipCount: true
+    }
+
+    return this.hooks.wrapObsFun(
+      this.videoService.getVideos.bind(this.videoService),
+      params,
+      'common',
+      'filter:api.trending-videos.videos.list.params',
+      'filter:api.trending-videos.videos.list.result'
+    )
+  }
+
+  generateSyndicationList () {
+    this.syndicationItems = this.videoService.getVideoFeedUrls(this.sort, undefined, this.categoryOneOf)
+  }
+
+  getInjector () {
+    return Injector.create({
+      providers: [{
+        provide: 'data',
+        useValue: {
+          model: this.defaultSort
+        }
+      }]
+    })
+  }
+}
diff --git a/client/src/app/+videos/video-list/trending/video-trending-header.component.html b/client/src/app/+videos/video-list/trending/video-trending-header.component.html
index 6319ee6d3..a025bf1a2 100644
--- a/client/src/app/+videos/video-list/trending/video-trending-header.component.html
+++ b/client/src/app/+videos/video-list/trending/video-trending-header.component.html
@@ -1,5 +1,5 @@
 <div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" [(ngModel)]="data.model" (ngModelChange)="setSort()">
-  <label *ngFor="let button of buttons" ngbButtonLabel class="btn-light" placement="bottom" [ngbTooltip]="button.tooltip" container="body">
+  <label *ngFor="let button of visibleButtons" ngbButtonLabel class="btn-light" placement="bottom" [ngbTooltip]="button.tooltip" container="body">
     <my-global-icon [iconName]="button.iconName"></my-global-icon>
     <input ngbButton type="radio" [value]="button.value"> {{ button.label }}
   </label>
diff --git a/client/src/app/+videos/video-list/trending/video-trending-header.component.ts b/client/src/app/+videos/video-list/trending/video-trending-header.component.ts
index 125f14e33..e49b61c68 100644
--- a/client/src/app/+videos/video-list/trending/video-trending-header.component.ts
+++ b/client/src/app/+videos/video-list/trending/video-trending-header.component.ts
@@ -1,8 +1,9 @@
-import { Component, Inject } from '@angular/core'
+import { Component, Inject, OnInit } from '@angular/core'
 import { Router } from '@angular/router'
 import { VideoListHeaderComponent } from '@app/shared/shared-video-miniature'
 import { GlobalIconName } from '@app/shared/shared-icons'
 import { VideoSortField } from '@shared/models'
+import { ServerService } from '@app/core/server/server.service'
 
 interface VideoTrendingHeaderItem {
   label: string
@@ -10,6 +11,7 @@ interface VideoTrendingHeaderItem {
   value: VideoSortField
   path: string
   tooltip?: string
+  hidden?: boolean
 }
 
 @Component({
@@ -18,12 +20,13 @@ interface VideoTrendingHeaderItem {
   styleUrls: [ './video-trending-header.component.scss' ],
   templateUrl: './video-trending-header.component.html'
 })
-export class VideoTrendingHeaderComponent extends VideoListHeaderComponent {
+export class VideoTrendingHeaderComponent extends VideoListHeaderComponent implements OnInit {
   buttons: VideoTrendingHeaderItem[]
 
   constructor (
     @Inject('data') public data: any,
-    private router: Router
+    private router: Router,
+    private serverService: ServerService
   ) {
     super(data)
 
@@ -34,16 +37,17 @@ export class VideoTrendingHeaderComponent extends VideoListHeaderComponent {
         value: '-hot',
         path: 'hot',
         tooltip: $localize`Videos totalizing the most interactions for recent videos`,
+        hidden: true
       },
       {
         label: $localize`:Main variant of Trending videos based on number of recent views:Views`,
         iconName: 'trending',
         value: '-trending',
-        path: 'trending',
+        path: 'most-viewed',
         tooltip: $localize`Videos totalizing the most views during the last 24 hours`,
       },
       {
-        label: $localize`:a variant of Trending videos based on the number of likes:Likes`,
+        label: $localize`:A variant of Trending videos based on the number of likes:Likes`,
         iconName: 'like',
         value: '-likes',
         path: 'most-liked',
@@ -52,6 +56,21 @@ export class VideoTrendingHeaderComponent extends VideoListHeaderComponent {
     ]
   }
 
+  ngOnInit () {
+    this.serverService.getConfig()
+        .subscribe(config => {
+          // don't filter if auto-blacklist is not enabled as this will be the only list
+          if (config.instance.pages.hot.enabled) {
+            const index = this.buttons.findIndex(b => b.path === 'hot')
+            this.buttons[index].hidden = false
+          }
+        })
+  }
+
+  get visibleButtons () {
+    return this.buttons.filter(b => !b.hidden)
+  }
+
   setSort () {
     const path = this.buttons.find(b => b.value === this.data.model).path
     this.router.navigate([ `/videos/${path}` ])
diff --git a/client/src/app/+videos/video-list/trending/video-trending.component.ts b/client/src/app/+videos/video-list/trending/video-trending.component.ts
deleted file mode 100644
index e77231586..000000000
--- a/client/src/app/+videos/video-list/trending/video-trending.component.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { Component, ComponentFactoryResolver, Injector, OnDestroy, OnInit } from '@angular/core'
-import { ActivatedRoute, Router } from '@angular/router'
-import { AuthService, LocalStorageService, Notifier, ScreenService, ServerService, UserService } from '@app/core'
-import { HooksService } from '@app/core/plugins/hooks.service'
-import { immutableAssign } from '@app/helpers'
-import { VideoService } from '@app/shared/shared-main'
-import { AbstractVideoList } from '@app/shared/shared-video-miniature'
-import { VideoSortField } from '@shared/models'
-import { VideoTrendingHeaderComponent } from './video-trending-header.component'
-
-@Component({
-  selector: 'my-videos-trending',
-  styleUrls: [ '../../../shared/shared-video-miniature/abstract-video-list.scss' ],
-  templateUrl: '../../../shared/shared-video-miniature/abstract-video-list.html'
-})
-export class VideoTrendingComponent extends AbstractVideoList implements OnInit, OnDestroy {
-  HeaderComponent = VideoTrendingHeaderComponent
-  titlePage: string
-  defaultSort: VideoSortField = '-trending'
-
-  useUserVideoPreferences = true
-
-  constructor (
-    protected router: Router,
-    protected serverService: ServerService,
-    protected route: ActivatedRoute,
-    protected notifier: Notifier,
-    protected authService: AuthService,
-    protected userService: UserService,
-    protected screenService: ScreenService,
-    protected storageService: LocalStorageService,
-    protected cfr: ComponentFactoryResolver,
-    private videoService: VideoService,
-    private hooks: HooksService
-  ) {
-    super()
-
-    this.headerComponentInjector = this.getInjector()
-  }
-
-  ngOnInit () {
-    super.ngOnInit()
-
-    this.generateSyndicationList()
-
-    this.serverService.getConfig().subscribe(
-      config => {
-        const trendingDays = config.trending.videos.intervalDays
-
-        if (trendingDays === 1) {
-          this.titleTooltip = $localize`Trending videos are those totalizing the greatest number of views during the last 24 hours`
-        } else {
-          this.titleTooltip = $localize`Trending videos are those totalizing the greatest number of views during the last ${trendingDays} days`
-        }
-
-        this.headerComponentInjector = this.getInjector()
-        this.setHeader()
-      })
-  }
-
-  ngOnDestroy () {
-    super.ngOnDestroy()
-  }
-
-  getVideosObservable (page: number) {
-    const newPagination = immutableAssign(this.pagination, { currentPage: page })
-    const params = {
-      videoPagination: newPagination,
-      sort: this.sort,
-      categoryOneOf: this.categoryOneOf,
-      languageOneOf: this.languageOneOf,
-      nsfwPolicy: this.nsfwPolicy,
-      skipCount: true
-    }
-
-    return this.hooks.wrapObsFun(
-      this.videoService.getVideos.bind(this.videoService),
-      params,
-      'common',
-      'filter:api.trending-videos.videos.list.params',
-      'filter:api.trending-videos.videos.list.result'
-    )
-  }
-
-  generateSyndicationList () {
-    this.syndicationItems = this.videoService.getVideoFeedUrls(this.sort, undefined, this.categoryOneOf)
-  }
-
-  getInjector () {
-    return Injector.create({
-      providers: [{
-        provide: 'data',
-        useValue: {
-          model: this.defaultSort
-        }
-      }]
-    })
-  }
-}
diff --git a/client/src/app/+videos/videos-routing.module.ts b/client/src/app/+videos/videos-routing.module.ts
index b6850b436..973935af8 100644
--- a/client/src/app/+videos/videos-routing.module.ts
+++ b/client/src/app/+videos/videos-routing.module.ts
@@ -1,11 +1,11 @@
 import { NgModule } from '@angular/core'
 import { RouterModule, Routes } from '@angular/router'
-import { LoginGuard } from '@app/core'
+import { LoginGuard, TrendingGuard } from '@app/core'
 import { MetaGuard } from '@ngx-meta/core'
 import { VideoOverviewComponent } from './video-list/overview/video-overview.component'
 import { VideoHotComponent } from './video-list/trending/video-hot.component'
 import { VideoMostLikedComponent } from './video-list/trending/video-most-liked.component'
-import { VideoTrendingComponent } from './video-list/trending/video-trending.component'
+import { VideoMostViewedComponent } from './video-list/trending/video-most-viewed.component'
 import { VideoLocalComponent } from './video-list/video-local.component'
 import { VideoRecentlyAddedComponent } from './video-list/video-recently-added.component'
 import { VideoUserSubscriptionsComponent } from './video-list/video-user-subscriptions.component'
@@ -28,27 +28,31 @@ const videosRoutes: Routes = [
       },
       {
         path: 'trending',
-        component: VideoTrendingComponent,
+        canActivate: [ TrendingGuard ]
+      },
+      {
+        path: 'hot',
+        component: VideoHotComponent,
         data: {
           meta: {
-            title: $localize`Trending videos`
+            title: $localize`Hot videos`
           },
           reuse: {
             enabled: true,
-            key: 'trending-videos-list'
+            key: 'hot-videos-list'
           }
         }
       },
       {
-        path: 'hot',
-        component: VideoHotComponent,
+        path: 'most-viewed',
+        component: VideoMostViewedComponent,
         data: {
           meta: {
-            title: $localize`Hot videos`
+            title: $localize`Most viewed videos`
           },
           reuse: {
             enabled: true,
-            key: 'hot-videos-list'
+            key: 'most-viewed-videos-list'
           }
         }
       },
diff --git a/client/src/app/+videos/videos.module.ts b/client/src/app/+videos/videos.module.ts
index 4c88a0397..ae9c680eb 100644
--- a/client/src/app/+videos/videos.module.ts
+++ b/client/src/app/+videos/videos.module.ts
@@ -9,7 +9,7 @@ import { OverviewService } from './video-list'
 import { VideoOverviewComponent } from './video-list/overview/video-overview.component'
 import { VideoTrendingHeaderComponent } from './video-list/trending/video-trending-header.component'
 import { VideoHotComponent } from './video-list/trending/video-hot.component'
-import { VideoTrendingComponent } from './video-list/trending/video-trending.component'
+import { VideoMostViewedComponent } from './video-list/trending/video-most-viewed.component'
 import { VideoMostLikedComponent } from './video-list/trending/video-most-liked.component'
 import { VideoLocalComponent } from './video-list/video-local.component'
 import { VideoRecentlyAddedComponent } from './video-list/video-recently-added.component'
@@ -32,7 +32,7 @@ import { VideosComponent } from './videos.component'
     VideosComponent,
 
     VideoTrendingHeaderComponent,
-    VideoTrendingComponent,
+    VideoMostViewedComponent,
     VideoHotComponent,
     VideoMostLikedComponent,
     VideoRecentlyAddedComponent,
-- 
cgit v1.2.3