From 8ca56654a176ee8f350d31282c6cac4a59f58499 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 9 Jul 2020 11:58:46 +0200
Subject: Add ability to report comments in front end

---
 .../abuse-list/abuse-details.component.html        | 54 +++++++++++++++-------
 1 file changed, 38 insertions(+), 16 deletions(-)

(limited to 'client/src/app/+admin/moderation/abuse-list/abuse-details.component.html')

diff --git a/client/src/app/+admin/moderation/abuse-list/abuse-details.component.html b/client/src/app/+admin/moderation/abuse-list/abuse-details.component.html
index d031ea8ed..cba9cfb73 100644
--- a/client/src/app/+admin/moderation/abuse-list/abuse-details.component.html
+++ b/client/src/app/+admin/moderation/abuse-list/abuse-details.component.html
@@ -3,10 +3,13 @@
   <div class="col-8">
 
     <!-- report metadata -->
-    <div class="d-flex">
+    <div class="d-flex" *ngIf="abuse.reporterAccount">
       <span class="col-3 moderation-expanded-label" i18n>Reporter</span>
+
       <span class="col-9 moderation-expanded-text">
-        <a [routerLink]="[ '/admin/moderation/abuses/list' ]" [queryParams]="{ 'search': 'reporter:&quot;' + abuse.reporterAccount.displayName + '&quot;' }" class="chip">
+        <a [routerLink]="[ '/admin/moderation/abuses/list' ]" [queryParams]="{ 'search': 'reporter:&quot;' + abuse.reporterAccount.displayName + '&quot;' }"
+          class="chip"
+        >
           <img
             class="avatar"
             [src]="abuse.reporterAccount.avatar?.path"
@@ -17,27 +20,35 @@
             <span class="text-muted">{{ abuse.reporterAccount.nameWithHost }}</span>
           </div>
         </a>
-        <a [routerLink]="[ '/admin/moderation/abuses/list' ]" [queryParams]="{ 'search': 'reporter:&quot;' + abuse.reporterAccount.displayName + '&quot;' }" class="ml-auto text-muted video-details-links" i18n>
+
+        <a [routerLink]="[ '/admin/moderation/abuses/list' ]" [queryParams]="{ 'search': 'reporter:&quot;' + abuse.reporterAccount.displayName + '&quot;' }"
+          class="ml-auto text-muted abuse-details-links" i18n
+        >
           {abuse.countReportsForReporter, plural, =1 {1 report} other {{{ abuse.countReportsForReporter }} reports}}<span class="ml-1 glyphicon glyphicon-flag"></span>
         </a>
       </span>
     </div>
 
-    <div class="d-flex">
+    <div class="d-flex" *ngIf="abuse.flaggedAccount">
       <span class="col-3 moderation-expanded-label" i18n>Reportee</span>
       <span class="col-9 moderation-expanded-text">
-        <a [routerLink]="[ '/admin/moderation/abuses/list' ]" [queryParams]="{ 'search': 'reportee:&quot;' +abuse.video.channel.ownerAccount.displayName + '&quot;' }" class="chip">
+        <a [routerLink]="[ '/admin/moderation/abuses/list' ]" [queryParams]="{ 'search': 'reportee:&quot;' +abuse.flaggedAccount.displayName + '&quot;' }"
+          class="chip"
+        >
           <img
             class="avatar"
-            [src]="abuse.video.channel.ownerAccount?.avatar?.path"
+            [src]="abuse.flaggedAccount?.avatar?.path"
             (error)="switchToDefaultAvatar($event)"
             alt="Avatar"
           >
           <div>
-            <span class="text-muted">{{ abuse.video.channel.ownerAccount ? abuse.video.channel.ownerAccount.nameWithHost : '' }}</span>
+            <span class="text-muted">{{ abuse.flaggedAccount ? abuse.flaggedAccount.nameWithHost : '' }}</span>
           </div>
         </a>
-        <a [routerLink]="[ '/admin/moderation/abuses/list' ]" [queryParams]="{ 'search': 'reportee:&quot;' +abuse.video.channel.ownerAccount.displayName + '&quot;' }" class="ml-auto text-muted video-details-links" i18n>
+
+        <a [routerLink]="[ '/admin/moderation/abuses/list' ]" [queryParams]="{ 'search': 'reportee:&quot;' +abuse.flaggedAccount.displayName + '&quot;' }"
+          class="ml-auto text-muted abuse-details-links" i18n
+        >
           {abuse.countReportsForReportee, plural, =1 {1 report} other {{{ abuse.countReportsForReportee }} reports}}<span class="ml-1 glyphicon glyphicon-flag"></span>
         </a>
       </span>
@@ -45,7 +56,7 @@
 
     <div class="d-flex" *ngIf="abuse.updatedAt">
       <span class="col-3 moderation-expanded-label" i18n>Updated</span>
-      <time class="col-9 moderation-expanded-text video-details-date-updated">{{ abuse.updatedAt | date: 'medium' }}</time>
+      <time class="col-9 moderation-expanded-text abuse-details-date-updated">{{ abuse.updatedAt | date: 'medium' }}</time>
     </div>
 
     <!-- report text -->
@@ -60,34 +71,45 @@
     <div *ngIf="getPredefinedReasons()" class="mt-2 d-flex">
       <span class="col-3"></span>
       <span class="col-9">
-        <a [routerLink]="[ '/admin/moderation/abuses/list' ]" [queryParams]="{ 'search': 'tag:' + reason.id  }" class="chip rectangular bg-secondary text-light" *ngFor="let reason of getPredefinedReasons()">
+        <a *ngFor="let reason of getPredefinedReasons()"  [routerLink]="[ '/admin/moderation/abuses/list' ]"
+          [queryParams]="{ 'search': 'tag:' + reason.id  }" class="chip rectangular bg-secondary text-light"
+        >
           <div>{{ reason.label }}</div>
         </a>
       </span>
     </div>
 
-    <div *ngIf="abuse.startAt" class="mt-2 d-flex">
+    <div *ngIf="abuse.video?.startAt" class="mt-2 d-flex">
       <span class="col-3 moderation-expanded-label" i18n>Reported part</span>
       <span class="col-9">
-        {{ startAt }}<ng-container *ngIf="abuse.endAt"> - {{ endAt }}</ng-container>
+        {{ startAt }}<ng-container *ngIf="abuse.video.endAt"> - {{ endAt }}</ng-container>
       </span>
     </div>
 
     <div class="mt-3 d-flex" *ngIf="abuse.moderationComment">
       <span class="col-3 moderation-expanded-label" i18n>Note</span>
-      <span class="col-9 moderation-expanded-text" [innerHTML]="abuse.moderationCommentHtml"></span>
+      <span class="col-9 moderation-expanded-text d-block" [innerHTML]="abuse.moderationCommentHtml"></span>
     </div>
 
   </div>
 
-  <!-- report right part (video details) -->
+  <!-- report right part (video/comment details) -->
   <div class="col-4">
-    <div class="screenratio">
-      <div *ngIf="abuse.video.deleted || abuse.video.blacklisted">
+    <div *ngIf="abuse.video" class="screenratio">
+      <div>
         <span i18n *ngIf="abuse.video.deleted">The video was deleted</span>
         <span i18n *ngIf="!abuse.video.deleted">The video was blocked</span>
       </div>
+
       <div *ngIf="!abuse.video.deleted && !abuse.video.blacklisted" [innerHTML]="abuse.embedHtml"></div>
     </div>
+
+    <div *ngIf="abuse.comment" class="comment-html">
+      <div>
+        <strong i18n>Comment:</strong>
+      </div>
+
+      <div [innerHTML]="abuse.commentHtml"></div>
+    </div>
   </div>
 </div>
-- 
cgit v1.2.3