factorize account/server blocklists for users and instance (#2875)

13 files changed, 19 insertions, 238 deletions

diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts
index eb073f709..eccec8a49 100644
--- a/client/src/app/+admin/admin.module.ts
+++ b/client/src/app/+admin/admin.module.ts
@@ -27,7 +27,6 @@ import { SelectButtonModule } from 'primeng/selectbutton'
 import { PluginApiService } from '@app/+admin/plugins/shared/plugin-api.service'
 import { VideoRedundancyInformationComponent } from '@app/+admin/follows/video-redundancies-list/video-redundancy-information.component'
 import { ChartModule } from 'primeng/chart'
-import { BatchDomainsModalComponent } from './config/shared/batch-domains-modal.component'
 import { VideoAbuseDetailsComponent } from './moderation/video-abuse-list/video-abuse-details.component'
 
 @NgModule({
@@ -76,9 +75,7 @@ import { VideoAbuseDetailsComponent } from './moderation/video-abuse-list/video-
     DebugComponent,
 
     ConfigComponent,
-    EditCustomConfigComponent,
-
-    BatchDomainsModalComponent
+    EditCustomConfigComponent
   ],
 
   exports: [
diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.html b/client/src/app/+admin/follows/followers-list/followers-list.component.html
index 298871fce..48b5681f4 100644
--- a/client/src/app/+admin/follows/followers-list/followers-list.component.html
+++ b/client/src/app/+admin/follows/followers-list/followers-list.component.html
@@ -56,7 +56,7 @@
   <ng-template pTemplate="emptymessage">
     <tr>
       <td colspan="6">
-        <div class="empty-table-message">
+        <div class="no-results">
           <ng-container *ngIf="search" i18n>No follower found matching current filters.</ng-container>
           <ng-container *ngIf="!search" i18n>Your instance doesn't have any follower.</ng-container>
         </div>
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.html b/client/src/app/+admin/follows/following-list/following-list.component.html
index ed521d650..a8fbf65d4 100644
--- a/client/src/app/+admin/follows/following-list/following-list.component.html
+++ b/client/src/app/+admin/follows/following-list/following-list.component.html
@@ -58,7 +58,7 @@
   <ng-template pTemplate="emptymessage">
     <tr>
       <td colspan="6">
-        <div class="empty-table-message">
+        <div class="no-results">
           <ng-container *ngIf="search" i18n>No host found matching current filters.</ng-container>
           <ng-container *ngIf="!search" i18n>Your instance is not following anyone.</ng-container>
         </div>
diff --git a/client/src/app/+admin/follows/follows.component.scss b/client/src/app/+admin/follows/follows.component.scss
index 32394f698..0cffcb555 100644
--- a/client/src/app/+admin/follows/follows.component.scss
+++ b/client/src/app/+admin/follows/follows.component.scss
@@ -4,7 +4,3 @@
   flex-grow: 0;
   margin-right: 30px;
 }
-
-.empty-table-message {
-  @include empty-state;
-}
diff --git a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html
index c08154bcd..44586cb67 100644
--- a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html
+++ b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html
@@ -73,7 +73,7 @@
   <ng-template pTemplate="emptymessage">
     <tr>
       <td colspan="6">
-        <div class="empty-table-message">
+        <div class="no-results">
           <ng-container *ngIf="isDisplayingRemoteVideos()" i18n>Your instance doesn't mirror any video.</ng-container>
           <ng-container *ngIf="!isDisplayingRemoteVideos()" i18n>Your instance has no mirrored videos.</ng-container>
         </div>
diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html
index b7d40be60..486785f35 100644
--- a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html
+++ b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html
@@ -54,7 +54,7 @@
   <ng-template pTemplate="emptymessage">
     <tr>
       <td colspan="6">
-        <div class="empty-table-message">
+        <div class="no-results">
           <ng-container *ngIf="search" i18n>No account found matching current filters.</ng-container>
           <ng-container *ngIf="!search" i18n>No account found.</ng-container>
         </div>
diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts
index 73a9ae75d..90a176194 100644
--- a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts
+++ b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts
@@ -1,70 +1,15 @@
-import { Component, OnInit } from '@angular/core'
-import { Notifier } from '@app/core'
-import { I18n } from '@ngx-translate/i18n-polyfill'
-import { RestPagination, RestTable } from '@app/shared'
-import { SortMeta } from 'primeng/api'
-import { AccountBlock, BlocklistService } from '@app/shared/blocklist'
-import { Actor } from '@app/shared/actor/actor.model'
+import { Component } from '@angular/core'
+import { GenericAccountBlocklistComponent, BlocklistComponentType } from '@app/shared/blocklist'
 
 @Component({
   selector: 'my-instance-account-blocklist',
-  styleUrls: [ '../moderation.component.scss', './instance-account-blocklist.component.scss' ],
-  templateUrl: './instance-account-blocklist.component.html'
+  styleUrls: [ '../moderation.component.scss', '../../../shared/blocklist/account-blocklist.component.scss' ],
+  templateUrl: '../../../shared/blocklist/account-blocklist.component.html'
 })
-export class InstanceAccountBlocklistComponent extends RestTable implements OnInit {
-  blockedAccounts: AccountBlock[] = []
-  totalRecords = 0
-  sort: SortMeta = { field: 'createdAt', order: -1 }
-  pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
-
-  constructor (
-    private notifier: Notifier,
-    private blocklistService: BlocklistService,
-    private i18n: I18n
-  ) {
-    super()
-  }
-
-  ngOnInit () {
-    this.initialize()
-  }
+export class InstanceAccountBlocklistComponent extends GenericAccountBlocklistComponent {
+  mode = BlocklistComponentType.Instance
 
   getIdentifier () {
     return 'InstanceAccountBlocklistComponent'
   }
-
-  switchToDefaultAvatar ($event: Event) {
-    ($event.target as HTMLImageElement).src = Actor.GET_DEFAULT_AVATAR_URL()
-  }
-
-  unblockAccount (accountBlock: AccountBlock) {
-    const blockedAccount = accountBlock.blockedAccount
-
-    this.blocklistService.unblockAccountByInstance(blockedAccount)
-        .subscribe(
-          () => {
-            this.notifier.success(
-              this.i18n('Account {{nameWithHost}} unmuted by your instance.', { nameWithHost: blockedAccount.nameWithHost })
-            )
-
-            this.loadData()
-          }
-        )
-  }
-
-  protected loadData () {
-    return this.blocklistService.getInstanceAccountBlocklist({
-      pagination: this.pagination,
-      sort: this.sort,
-      search: this.search
-    })
-      .subscribe(
-        resultList => {
-          this.blockedAccounts = resultList.data
-          this.totalRecords = resultList.total
-        },
-
-        err => this.notifier.error(err.message)
-      )
-  }
 }
diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html
deleted file mode 100644
index 7a77b8842..000000000
--- a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<p-table
-  [value]="blockedServers" [lazy]="true" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [rowsPerPageOptions]="rowsPerPageOptions"
-  [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" (onPage)="onPage($event)"
-  [showCurrentPageReport]="true" i18n-currentPageReportTemplate
-  currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} muted instances"
->
-  <ng-template pTemplate="caption">
-    <div class="caption">
-      <div class="ml-auto has-feedback has-clear">
-        <input
-          type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..."
-          (keyup)="onSearch($event)"
-        >
-        <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetSearch()"></a>
-        <span class="sr-only" i18n>Clear filters</span>
-      </div>
-      <a class="ml-2 block-button" (click)="addServersToBlock()" (key.enter)="addServersToBlock()">
-        <my-global-icon iconName="add" aria-hidden="true"></my-global-icon>
-        <ng-container i18n>Mute domain</ng-container>
-      </a>
-    </div>
-  </ng-template>
-
-  <ng-template pTemplate="header">
-    <tr>
-      <th style="width: 100%;" i18n>Instance</th>
-      <th style="width: 150px;" i18n pSortableColumn="createdAt">Muted at <p-sortIcon field="createdAt"></p-sortIcon></th>
-      <th style="width: 150px;"></th> <!-- column for action buttons -->
-    </tr>
-  </ng-template>
-
-  <ng-template pTemplate="body" let-serverBlock>
-    <tr>
-      <td>
-        <a [href]="'https://' + serverBlock.blockedServer.host" i18n-title title="Open instance in a new tab" target="_blank" rel="noopener noreferrer">
-          {{ serverBlock.blockedServer.host }}
-          <span class="glyphicon glyphicon-new-window"></span>
-        </a>
-      </td>
-      <td>{{ serverBlock.createdAt | date: 'short' }}</td>
-      <td class="action-cell">
-        <button class="unblock-button" (click)="unblockServer(serverBlock)" i18n>Unmute</button>
-      </td>
-    </tr>
-  </ng-template>
-
-  <ng-template pTemplate="emptymessage">
-    <tr>
-      <td colspan="6">
-        <div class="empty-table-message">
-          <ng-container *ngIf="search" i18n>No server found matching current filters.</ng-container>
-          <ng-container *ngIf="!search" i18n>No server found.</ng-container>
-        </div>
-      </td>
-    </tr>
-  </ng-template>
-</p-table>
-
-<my-batch-domains-modal #batchDomainsModal i18n-action action="Mute domains" (domains)="onDomainsToBlock($event)"></my-batch-domains-modal>
diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.scss b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.scss
deleted file mode 100644
index c1f66116b..000000000
--- a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-@import '_variables';
-@import '_mixins';
-
-a {
-  @include disable-default-a-behaviour;
-  display: inline-block;
-
-  &, &:hover {
-    color: pvar(--mainForegroundColor);
-  }
-
-  span {
-    font-size: 80%;
-    color: pvar(--inputPlaceholderColor);
-  }
-}
-
-.unblock-button {
-  @include peertube-button;
-  @include grey-button;
-}
-
-.block-button {
-  @include create-button;
-}
diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts
index 559c9c0b0..9d4ec174a 100644
--- a/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts
+++ b/client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts
@@ -1,84 +1,15 @@
-import { Component, OnInit, ViewChild } from '@angular/core'
-import { Notifier } from '@app/core'
-import { I18n } from '@ngx-translate/i18n-polyfill'
-import { RestPagination, RestTable } from '@app/shared'
-import { SortMeta } from 'primeng/api'
-import { BlocklistService } from '@app/shared/blocklist'
-import { ServerBlock } from '../../../../../../shared'
-import { BatchDomainsModalComponent } from '@app/+admin/config/shared/batch-domains-modal.component'
+import { Component } from '@angular/core'
+import { GenericServerBlocklistComponent, BlocklistComponentType } from '@app/shared/blocklist'
 
 @Component({
   selector: 'my-instance-server-blocklist',
-  styleUrls: [ '../moderation.component.scss', './instance-server-blocklist.component.scss' ],
-  templateUrl: './instance-server-blocklist.component.html'
+  styleUrls: [ '../../../shared/blocklist/server-blocklist.component.scss' ],
+  templateUrl: '../../../shared/blocklist/server-blocklist.component.html'
 })
-export class InstanceServerBlocklistComponent extends RestTable implements OnInit {
-  @ViewChild('batchDomainsModal') batchDomainsModal: BatchDomainsModalComponent
-
-  blockedServers: ServerBlock[] = []
-  totalRecords = 0
-  sort: SortMeta = { field: 'createdAt', order: -1 }
-  pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
-
-  constructor (
-    private notifier: Notifier,
-    private blocklistService: BlocklistService,
-    private i18n: I18n
-  ) {
-    super()
-  }
-
-  ngOnInit () {
-    this.initialize()
-  }
+export class InstanceServerBlocklistComponent extends GenericServerBlocklistComponent {
+  mode = BlocklistComponentType.Instance
 
   getIdentifier () {
     return 'InstanceServerBlocklistComponent'
   }
-
-  unblockServer (serverBlock: ServerBlock) {
-    const host = serverBlock.blockedServer.host
-
-    this.blocklistService.unblockServerByInstance(host)
-      .subscribe(
-        () => {
-          this.notifier.success(this.i18n('Instance {{host}} unmuted by your instance.', { host }))
-
-          this.loadData()
-        }
-      )
-  }
-
-  addServersToBlock () {
-    this.batchDomainsModal.openModal()
-  }
-
-  onDomainsToBlock (domains: string[]) {
-    domains.forEach(domain => {
-      this.blocklistService.blockServerByInstance(domain)
-        .subscribe(
-          () => {
-            this.notifier.success(this.i18n('Instance {{domain}} muted by your instance.', { domain }))
-
-            this.loadData()
-          }
-        )
-    })
-  }
-
-  protected loadData () {
-    return this.blocklistService.getInstanceServerBlocklist({
-      pagination: this.pagination,
-      sort: this.sort,
-      search: this.search
-    })
-      .subscribe(
-        resultList => {
-          this.blockedServers = resultList.data
-          this.totalRecords = resultList.total
-        },
-
-        err => this.notifier.error(err.message)
-      )
-  }
 }
diff --git a/client/src/app/+admin/moderation/moderation.component.scss b/client/src/app/+admin/moderation/moderation.component.scss
index 404eb0504..ba68cf6f6 100644
--- a/client/src/app/+admin/moderation/moderation.component.scss
+++ b/client/src/app/+admin/moderation/moderation.component.scss
@@ -16,10 +16,6 @@
   }
 }
 
-.empty-table-message {
-  @include empty-state;
-}
-
 .moderation-expanded {
   font-size: 90%;
 
diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
index a2ed51559..64641b28a 100644
--- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
+++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
@@ -137,7 +137,7 @@
   <ng-template pTemplate="emptymessage">
     <tr>
       <td colspan="6">
-        <div class="empty-table-message">
+        <div class="no-results">
           <ng-container *ngIf="search" i18n>No video abuses found matching current filters.</ng-container>
           <ng-container *ngIf="!search" i18n>No video abuses found.</ng-container>
         </div>
diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html
index a01a2566d..ec20e46f1 100644
--- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html
+++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html
@@ -102,7 +102,7 @@
   <ng-template pTemplate="emptymessage">
     <tr>
       <td colspan="6">
-        <div class="empty-table-message">
+        <div class="no-results">
           <ng-container *ngIf="search" i18n>No blocked video found matching current filters.</ng-container>
           <ng-container *ngIf="!search" i18n>No blocked video found.</ng-container>
         </div>