From 4ec25ae825f8dee44d948b38d8216f9a239ff7b3 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 27 Nov 2020 15:57:38 +0100
Subject: Refactor last PR

---
 client/src/app/+videos/+video-watch/video-watch.component.html |  8 ++------
 client/src/app/+videos/+video-watch/video-watch.component.ts   |  6 ------
 client/src/app/shared/shared-main/video/video.model.ts         | 10 ++++++++++
 .../shared-video-miniature/video-miniature.component.html      |  2 +-
 .../shared/shared-video-miniature/video-miniature.component.ts |  6 ------
 5 files changed, 13 insertions(+), 19 deletions(-)

(limited to 'client')

diff --git a/client/src/app/+videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html
index d74334b13..602214ac5 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.html
+++ b/client/src/app/+videos/+video-watch/video-watch.component.html
@@ -54,9 +54,7 @@
             <div class="video-info-date-views">
               <ng-container i18n>Published <my-date-toggle [date]="video.publishedAt"></my-date-toggle></ng-container>
 
-              <span i18n
-                    title="{{ getExactNumberOfViews() }}"
-                    class="views">
+              <span i18n [title]="video.getExactNumberOfViews()" class="views">
                 • {{ video.views | myNumberFormatter }}
                 <ng-container *ngIf="!video.isLive">views</ng-container>
                 <ng-container *ngIf="video.isLive">viewers</ng-container>
@@ -73,9 +71,7 @@
               <div class="d-none d-md-block video-info-date-views">
                 <ng-container i18n>Published <my-date-toggle [date]="video.publishedAt"></my-date-toggle></ng-container>
 
-                <span i18n
-                      title="{{ getExactNumberOfViews() }}"
-                      class="views">
+                <span i18n [title]="video.getExactNumberOfViews()" class="views">
                   • {{ video.views | myNumberFormatter }}
                   <ng-container *ngIf="!video.isLive">views</ng-container>
                   <ng-container *ngIf="video.isLive">viewers</ng-container>
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts
index bc047489e..66af9709d 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
@@ -219,12 +219,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     return $localize`You need to be <a href="/login">logged in</a> to rate this video.`
   }
 
-  getExactNumberOfViews () {
-    return (this.video.views >= 1000)
-      ? `${this.video.views} ${this.video.isLive ? $localize`viewers` : $localize`views`}`
-      : ''
-  }
-
   showMoreDescription () {
     if (this.completeVideoDescription === undefined) {
       return this.loadCompleteDescription()
diff --git a/client/src/app/shared/shared-main/video/video.model.ts b/client/src/app/shared/shared-main/video/video.model.ts
index 04e7bd717..adb6e884f 100644
--- a/client/src/app/shared/shared-main/video/video.model.ts
+++ b/client/src/app/shared/shared-main/video/video.model.ts
@@ -203,4 +203,14 @@ export class Video implements VideoServerModel {
   canBeDuplicatedBy (user: AuthUser) {
     return user && this.isLocal === false && user.hasRight(UserRight.MANAGE_VIDEOS_REDUNDANCIES)
   }
+
+  getExactNumberOfViews () {
+    if (this.views < 1000) return ''
+
+    if (this.isLive) {
+      return $localize`${this.views} viewers`
+    }
+
+    return $localize`${this.views} views`
+  }
 }
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.html b/client/src/app/shared/shared-video-miniature/video-miniature.component.html
index b323002e3..395a4df97 100644
--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.html
+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.html
@@ -26,7 +26,7 @@
           <span class="video-miniature-created-at-views">
             <my-date-toggle *ngIf="displayOptions.date" [date]="video.publishedAt"></my-date-toggle>
 
-            <span class="views" title="{{ getExactNumberOfViews() }}">
+            <span class="views" [title]="video.getExactNumberOfViews()">
               <ng-container *ngIf="displayOptions.date && displayOptions.views"> • </ng-container>
               <ng-container i18n *ngIf="displayOptions.views">
                 {video.views, plural, =1 {1 view} other {{{ video.views | myNumberFormatter }} views}}
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
index e59255cf8..cc5665ab1 100644
--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts
@@ -190,12 +190,6 @@ export class VideoMiniatureComponent implements OnInit {
     return this.video.videoChannelAvatarUrl
   }
 
-  getExactNumberOfViews () {
-    return (this.video.views >= 1000 && this.displayOptions.views)
-        ? `${this.video.views} ${this.video.isLive ? $localize`viewers` : $localize`views`}`
-        : ''
-  }
-
   loadActions () {
     if (this.displayVideoActions) this.showActions = true
 
-- 
cgit v1.2.3