Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / shared-video-miniature / video-filters-header.component.ts

diff --git a/client/src/app/shared/shared-video-miniature/video-filters-header.component.ts b/client/src/app/shared/shared-video-miniature/video-filters-header.component.ts
index 99f133e540e9a251f4b47ba16ef660d123305ff9..7b806248b139269fb3636b39048196e04d435c9f 100644 (file)
--- a/client/src/app/shared/shared-video-miniature/video-filters-header.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-filters-header.component.ts
@@ -5,7 +5,6 @@ import { FormBuilder, FormGroup } from '@angular/forms'
 import { AuthService } from '@app/core'
 import { ServerService } from '@app/core/server/server.service'
 import { UserRight } from '@shared/models'
-import { NSFWPolicyType } from '@shared/models/videos'
 import { PeertubeModalService } from '../shared-main'
 import { VideoFilters } from './video-filters.model'
 
@@ -18,11 +17,8 @@ const logger = debug('peertube:videos:VideoFiltersHeaderComponent')
 })
 export class VideoFiltersHeaderComponent implements OnInit, OnDestroy {
   @Input() filters: VideoFilters
-
   @Input() displayModerationBlock = false
-
-  @Input() defaultSort = '-publishedAt'
-  @Input() nsfwPolicy: NSFWPolicyType
+  @Input() hideScope = false
 
   @Output() filtersChanged = new EventEmitter()
 
@@ -76,15 +72,10 @@ export class VideoFiltersHeaderComponent implements OnInit, OnDestroy {
     return this.auth.getUser().hasRight(UserRight.SEE_ALL_VIDEOS)
   }
 
-  isTrendingSortEnabled (sort: 'most-viewed' | 'hot' | 'best' | 'most-liked') {
+  isTrendingSortEnabled (sort: 'most-viewed' | 'hot' | 'most-liked') {
     const serverConfig = this.serverService.getHTMLConfig()
 
-    const enabled = serverConfig.trending.videos.algorithms.enabled.includes(sort)
-
-    // Best is adapted from the user
-    if (sort === 'best') return enabled && this.auth.isLoggedIn()
-
-    return enabled
+    return serverConfig.trending.videos.algorithms.enabled.includes(sort)
   }
 
   resetFilter (key: string, canRemove: boolean) {