8 files changed, 160 insertions, 43 deletions

diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss
index c92d1c39c..0e34150c1 100644
--- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss
+++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss
@@ -1,12 +1,8 @@
 @import 'mixins';
 
 my-global-icon {
-  @include apply-svg-color(#7d7d7d);
-
-  width: 12px;
-  height: 12px;
-  position: relative;
-  top: -1px;
+  width: 24px;
+  height: 24px;
 }
 
 .input-group {
diff --git a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html
index b4f66a75f..45c5fe28f 100644
--- a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html
+++ b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html
@@ -1,9 +1,11 @@
 <h1>
-  <my-global-icon iconName="cross" aria-hidden="true"></my-global-icon>
+  <my-global-icon iconName="message-circle" aria-hidden="true"></my-global-icon>
   <ng-container i18n>Video comments</ng-container>
+
+  <my-feed [syndicationItems]="syndicationItems"></my-feed>
 </h1>
 
-this view does show comments from muted accounts so you can delete them
+<em>This view also shows comments from muted accounts.</em>
 
 <p-table
   [value]="comments" [lazy]="true" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [rowsPerPageOptions]="rowsPerPageOptions"
@@ -29,7 +31,7 @@ this view does show comments from muted accounts so you can delete them
           </div>
           <input
             type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..."
-            (keyup)="onSearch($event)"
+            (keyup)="onInputSearch($event)"
           >
           <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetTableFilter()"></a>
           <span class="sr-only" i18n>Clear filters</span>
@@ -41,9 +43,9 @@ this view does show comments from muted accounts so you can delete them
   <ng-template pTemplate="header">
     <tr>
       <th style="width: 40px"></th>
-      <th style="width: 100px;" i18n>Account</th>
-      <th style="width: 100px;" i18n>Video</th>
-      <th style="width: 100px;" i18n>Comment</th>
+      <th style="width: 300px" i18n>Account</th>
+      <th style="width: 300px" i18n>Video</th>
+      <th i18n>Comment</th>
       <th style="width: 150px;" i18n pSortableColumn="createdAt">Date <p-sortIcon field="createdAt"></p-sortIcon></th>
       <th style="width: 150px;"></th>
     </tr>
@@ -58,14 +60,28 @@ this view does show comments from muted accounts so you can delete them
       </td>
 
       <td>
-        {{ videoComment.by }}
+        <a [href]="videoComment.account.localUrl" i18n-title title="Open account in a new tab" target="_blank" rel="noopener noreferrer">
+          <div class="chip two-lines">
+            <img
+              class="avatar"
+              [src]="videoComment.accountAvatarUrl"
+              alt=""
+            >
+            <div>
+              {{ videoComment.account.displayName }}
+              <span>{{ videoComment.by }}</span>
+            </div>
+          </div>
+        </a>
       </td>
 
-      <td>
-        {{ videoComment.video.name }}
+      <td class="video">
+        <em i18n>Commented video</em>
+
+        <a [href]="videoComment.localUrl" target="_blank" rel="noopener noreferrer">{{ videoComment.video.name }}</a>
       </td>
 
-      <td>
+      <td class="comment-html">
         <div [innerHTML]="videoComment.textHtml"></div>
       </td>
 
diff --git a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss
index c92d1c39c..b3746b0c5 100644
--- a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss
+++ b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss
@@ -1,12 +1,22 @@
 @import 'mixins';
 
-my-global-icon {
-  @include apply-svg-color(#7d7d7d);
+h1 {
+  my-feed {
+    margin-left: 5px;
+    display: inline-block;
+
+    ::ng-deep {
+      my-global-icon {
+        width: 15px !important;
+        top: 0 !important;
+      }
+    }
+  }
+}
 
-  width: 12px;
-  height: 12px;
-  position: relative;
-  top: -1px;
+my-global-icon {
+   width: 24px;
+  height: 24px;
 }
 
 .input-group {
@@ -25,3 +35,32 @@ my-global-icon {
     flex-grow: 1;
   }
 }
+
+.video {
+  display: flex;
+  flex-direction: column;
+
+  em {
+    font-size: 11px;
+  }
+
+  a {
+    @include ellipsis
+  }
+}
+
+.comment-html {
+  ::ng-deep {
+    > div {
+      max-height: 22px;
+    }
+
+    div, p {
+      @include ellipsis;
+    }
+
+    p {
+      margin: 0;
+    }
+  }
+}
diff --git a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts
index fdd5ec76e..d26047125 100644
--- a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts
+++ b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts
@@ -1,16 +1,17 @@
 import { SortMeta } from 'primeng/api'
 import { filter } from 'rxjs/operators'
 import { AfterViewInit, Component, OnInit } from '@angular/core'
-import { DomSanitizer } from '@angular/platform-browser'
 import { ActivatedRoute, Params, Router } from '@angular/router'
-import { ConfirmService, MarkdownService, Notifier, RestPagination, RestTable, ServerService } from '@app/core'
-import { DropdownAction, VideoService } from '@app/shared/shared-main'
+import { AuthService, ConfirmService, MarkdownService, Notifier, RestPagination, RestTable } from '@app/core'
+import { DropdownAction } from '@app/shared/shared-main'
+import { BulkService } from '@app/shared/shared-moderation'
 import { VideoCommentAdmin, VideoCommentService } from '@app/shared/shared-video-comment'
+import { FeedFormat, UserRight } from '@shared/models'
 
 @Component({
   selector: 'my-video-comment-list',
   templateUrl: './video-comment-list.component.html',
-  styleUrls: [ './video-comment-list.component.scss' ]
+  styleUrls: [ '../../../shared/shared-moderation/moderation.scss', './video-comment-list.component.scss' ]
 })
 export class VideoCommentListComponent extends RestTable implements OnInit, AfterViewInit {
   comments: VideoCommentAdmin[]
@@ -20,26 +21,54 @@ export class VideoCommentListComponent extends RestTable implements OnInit, Afte
 
   videoCommentActions: DropdownAction<VideoCommentAdmin>[][] = []
 
+  syndicationItems = [
+    {
+      format: FeedFormat.RSS,
+      label: 'media rss 2.0',
+      url: VideoCommentService.BASE_FEEDS_URL + FeedFormat.RSS.toLowerCase()
+    },
+    {
+      format: FeedFormat.ATOM,
+      label: 'atom 1.0',
+      url: VideoCommentService.BASE_FEEDS_URL + FeedFormat.ATOM.toLowerCase()
+    },
+    {
+      format: FeedFormat.JSON,
+      label: 'json 1.0',
+      url: VideoCommentService.BASE_FEEDS_URL + FeedFormat.JSON.toLowerCase()
+    }
+  ]
+
+  get authUser () {
+    return this.auth.getUser()
+  }
+
   constructor (
+    private auth: AuthService,
     private notifier: Notifier,
-    private serverService: ServerService,
     private confirmService: ConfirmService,
     private videoCommentService: VideoCommentService,
     private markdownRenderer: MarkdownService,
-    private sanitizer: DomSanitizer,
-    private videoService: VideoService,
     private route: ActivatedRoute,
-    private router: Router
+    private router: Router,
+    private bulkService: BulkService
     ) {
     super()
 
     this.videoCommentActions = [
       [
+        {
+          label: $localize`Delete this comment`,
+          handler: comment => this.deleteComment(comment),
+          isDisplayed: () => this.authUser.hasRight(UserRight.REMOVE_ANY_VIDEO_COMMENT)
+        },
 
-        // remove this comment,
-
-        // remove all comments of this account
-
+        {
+          label: $localize`Delete all comments of this account`,
+          description: $localize`Comments are deleted after a few minutes`,
+          handler: comment => this.deleteUserComments(comment),
+          isDisplayed: () => this.authUser.hasRight(UserRight.REMOVE_ANY_VIDEO_COMMENT)
+        }
       ]
     ]
   }
@@ -60,7 +89,7 @@ export class VideoCommentListComponent extends RestTable implements OnInit, Afte
     if (this.search) this.setTableFilter(this.search)
   }
 
-  onSearch (event: Event) {
+  onInputSearch (event: Event) {
     this.onSearch(event)
     this.setQueryParams((event.target as HTMLInputElement).value)
   }
@@ -84,7 +113,7 @@ export class VideoCommentListComponent extends RestTable implements OnInit, Afte
   }
 
   toHtml (text: string) {
-    return this.markdownRenderer.textMarkdownToHTML(text)
+    return this.markdownRenderer.textMarkdownToHTML(text, true, true)
   }
 
   protected loadData () {
@@ -108,4 +137,33 @@ export class VideoCommentListComponent extends RestTable implements OnInit, Afte
         err => this.notifier.error(err.message)
       )
   }
+
+  private deleteComment (comment: VideoCommentAdmin) {
+    this.videoCommentService.deleteVideoComment(comment.video.id, comment.id)
+      .subscribe(
+        () => this.loadData(),
+
+        err => this.notifier.error(err.message)
+      )
+  }
+
+  private async deleteUserComments (comment: VideoCommentAdmin) {
+    const message = $localize`Do you really want to delete all comments of ${comment.by}?`
+    const res = await this.confirmService.confirm(message, $localize`Delete`)
+    if (res === false) return
+
+    const options = {
+      accountName: comment.by,
+      scope: 'instance' as 'instance'
+    }
+
+    this.bulkService.removeCommentsOf(options)
+      .subscribe(
+        () => {
+          this.notifier.success($localize`Comments of ${options.accountName} will be deleted in a few minutes`)
+        },
+
+        err => this.notifier.error(err.message)
+      )
+  }
 }
diff --git a/client/src/app/shared/shared-main/feeds/feed.component.html b/client/src/app/shared/shared-main/feeds/feed.component.html
index 13883fd9b..a00011785 100644
--- a/client/src/app/shared/shared-main/feeds/feed.component.html
+++ b/client/src/app/shared/shared-main/feeds/feed.component.html
@@ -1,4 +1,4 @@
-<div class="video-feed">
+<div class="feed">
   <my-global-icon
     *ngIf="syndicationItems.length !== 0" [ngbPopover]="feedsList" [autoClose]="true" placement="bottom left auto"
     class="icon-syndication" role="button" iconName="syndication"
diff --git a/client/src/app/shared/shared-main/feeds/feed.component.scss b/client/src/app/shared/shared-main/feeds/feed.component.scss
index 34dd0e937..333d59440 100644
--- a/client/src/app/shared/shared-main/feeds/feed.component.scss
+++ b/client/src/app/shared/shared-main/feeds/feed.component.scss
@@ -1,7 +1,7 @@
 @import '_variables';
 @import '_mixins';
 
-.video-feed {
+.feed {
   width: min-content;
 
   a {
diff --git a/client/src/app/shared/shared-video-comment/video-comment.model.ts b/client/src/app/shared/shared-video-comment/video-comment.model.ts
index 1589091e5..eeee397af 100644
--- a/client/src/app/shared/shared-video-comment/video-comment.model.ts
+++ b/client/src/app/shared/shared-video-comment/video-comment.model.ts
@@ -59,12 +59,14 @@ export class VideoCommentAdmin implements VideoCommentAdminServerModel {
   createdAt: Date | string
   updatedAt: Date | string
 
-  account: AccountInterface
+  account: AccountInterface & { localUrl?: string }
+  localUrl: string
 
   video: {
     id: number
     uuid: string
     name: string
+    localUrl: string
   }
 
   by: string
@@ -85,14 +87,19 @@ export class VideoCommentAdmin implements VideoCommentAdminServerModel {
     this.video = {
       id: hash.video.id,
       uuid: hash.video.uuid,
-      name: hash.video.name
+      name: hash.video.name,
+      localUrl: '/videos/watch/' + hash.video.uuid
     }
 
+    this.localUrl = this.video.localUrl + ';threadId=' + this.threadId
+
     this.account = hash.account
 
     if (this.account) {
       this.by = Actor.CREATE_BY_STRING(this.account.name, this.account.host)
       this.accountAvatarUrl = Actor.GET_ACTOR_AVATAR_URL(this.account)
+
+      this.account.localUrl = '/accounts/' + this.by
     }
   }
 }
diff --git a/client/src/app/shared/shared-video-comment/video-comment.service.ts b/client/src/app/shared/shared-video-comment/video-comment.service.ts
index e318e069d..1ab996a76 100644
--- a/client/src/app/shared/shared-video-comment/video-comment.service.ts
+++ b/client/src/app/shared/shared-video-comment/video-comment.service.ts
@@ -19,8 +19,9 @@ import { SortMeta } from 'primeng/api'
 
 @Injectable()
 export class VideoCommentService {
+  static BASE_FEEDS_URL = environment.apiUrl + '/feeds/video-comments.'
+
   private static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos/'
-  private static BASE_FEEDS_URL = environment.apiUrl + '/feeds/video-comments.'
 
   constructor (
     private authHttp: HttpClient,
@@ -56,7 +57,7 @@ export class VideoCommentService {
     search?: string
   }): Observable<ResultList<VideoCommentAdmin>> {
     const { pagination, sort, search } = options
-    const url = VideoCommentService.BASE_VIDEO_URL + '/comments'
+    const url = VideoCommentService.BASE_VIDEO_URL + 'comments'
 
     let params = new HttpParams()
     params = this.restService.addRestGetParams(params, pagination, sort)
@@ -172,7 +173,7 @@ export class VideoCommentService {
 
   private buildParamsFromSearch (search: string, params: HttpParams) {
     const filters = this.restService.parseQueryStringFilter(search, {
-      state: {
+      isLocal: {
         prefix: 'local:',
         isBoolean: true,
         handler: v => {