Continue user mute in ban modal PR

3 files changed, 53 insertions, 13 deletions

diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.html b/client/src/app/+admin/overview/users/user-list/user-list.component.html
index 7eb89fea1..0662e3ac3 100644
--- a/client/src/app/+admin/overview/users/user-list/user-list.component.html
+++ b/client/src/app/+admin/overview/users/user-list/user-list.component.html
@@ -62,10 +62,10 @@
         </div>
       </th>
       <th *ngIf="isSelected('username')" pResizableColumn  pSortableColumn="username">{{ getColumn('username').label }} <p-sortIcon field="username"></p-sortIcon></th>
+      <th *ngIf="isSelected('role')" style="width: 120px;"  pSortableColumn="role">{{ getColumn('role').label }} <p-sortIcon field="role"></p-sortIcon></th>
       <th *ngIf="isSelected('email')">{{ getColumn('email').label }}</th>
       <th *ngIf="isSelected('quota')" style="width: 160px;"  pSortableColumn="videoQuotaUsed">{{ getColumn('quota').label }} <p-sortIcon field="videoQuotaUsed"></p-sortIcon></th>
       <th *ngIf="isSelected('quotaDaily')" style="width: 160px;">{{ getColumn('quotaDaily').label }}</th>
-      <th *ngIf="isSelected('role')" style="width: 120px;"  pSortableColumn="role">{{ getColumn('role').label }} <p-sortIcon field="role"></p-sortIcon></th>
       <th *ngIf="isSelected('pluginAuth')" style="width: 140px;" pResizableColumn >{{ getColumn('pluginAuth').label }}</th>
       <th *ngIf="isSelected('createdAt')" style="width: 150px;"  pSortableColumn="createdAt">{{ getColumn('createdAt').label }} <p-sortIcon field="createdAt"></p-sortIcon></th>
       <th *ngIf="isSelected('lastLoginDate')" style="width: 150px;"  pSortableColumn="lastLoginDate">{{ getColumn('lastLoginDate').label }} <p-sortIcon field="lastLoginDate"></p-sortIcon></th>
@@ -84,8 +84,9 @@
       </td>
 
       <td class="action-cell">
-        <my-user-moderation-dropdown *ngIf="!isInSelectionMode()" [user]="user" container="body"
-          (userChanged)="onUserChanged()" (userDeleted)="onUserChanged()">
+        <my-user-moderation-dropdown
+          *ngIf="!isInSelectionMode()" [user]="user" [account]="user.accountMutedStatus" [displayOptions]="userModerationDisplayOptions"
+          container="body" (userChanged)="onUserChanged()" (userDeleted)="onUserChanged()">
         </my-user-moderation-dropdown>
       </td>
 
@@ -99,6 +100,14 @@
             </div>
           </div>
         </a>
+
+        <div *ngIf="user.accountMutedStatus.mutedByInstance" class="badges-username badge badge-red" i18n>Muted</div>
+        <div *ngIf="user.blocked" class="badges-username badge badge-red" i18n>Banned</div>
+      </td>
+
+      <td *ngIf="isSelected('role')">
+        <span *ngIf="user.blocked" class="badge badge-banned" i18n-title title="The user was banned">{{ user.roleLabel }}</span>
+        <span *ngIf="!user.blocked" class="badge" [ngClass]="getRoleClass(user.role)">{{ user.roleLabel }}</span>
       </td>
 
       <td *ngIf="isSelected('email')" [title]="user.email">
@@ -138,11 +147,6 @@
         </div>
       </td>
 
-      <td *ngIf="isSelected('role')">
-        <span *ngIf="user.blocked" class="badge badge-banned" i18n-title title="The user was banned">{{ user.roleLabel }}</span>
-        <span *ngIf="!user.blocked" class="badge" [ngClass]="getRoleClass(user.role)">{{ user.roleLabel }}</span>
-      </td>
-
       <td *ngIf="isSelected('pluginAuth')">
         <ng-container *ngIf="user.pluginAuth">{{ user.pluginAuth }}</ng-container>
       </td>
diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.scss b/client/src/app/+admin/overview/users/user-list/user-list.component.scss
index 335bd2995..8160703f0 100644
--- a/client/src/app/+admin/overview/users/user-list/user-list.component.scss
+++ b/client/src/app/+admin/overview/users/user-list/user-list.component.scss
@@ -23,6 +23,10 @@ tr.banned > td {
   font-weight: $font-semibold;
 }
 
+.badges-username {
+  margin-left: 15px;
+}
+
 .user-table-primary-text .glyphicon {
   @include margin-left(0.1rem);
 
diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.ts b/client/src/app/+admin/overview/users/user-list/user-list.component.ts
index 9a9d0f5c6..d22e1355e 100644
--- a/client/src/app/+admin/overview/users/user-list/user-list.component.ts
+++ b/client/src/app/+admin/overview/users/user-list/user-list.component.ts
@@ -2,9 +2,10 @@ import { SortMeta } from 'primeng/api'
 import { Component, OnInit, ViewChild } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { AuthService, ConfirmService, Notifier, RestPagination, RestTable, ServerService } from '@app/core'
+import { getAPIHost } from '@app/helpers'
 import { AdvancedInputFilter } from '@app/shared/shared-forms'
-import { DropdownAction } from '@app/shared/shared-main'
-import { UserBanModalComponent } from '@app/shared/shared-moderation'
+import { Actor, DropdownAction } from '@app/shared/shared-main'
+import { AccountMutedStatus, BlocklistService, UserBanModalComponent, UserModerationDisplayType } from '@app/shared/shared-moderation'
 import { UserAdminService } from '@app/shared/shared-users'
 import { User, UserRole } from '@shared/models'
 
@@ -23,7 +24,7 @@ type UserForList = User & {
 export class UserListComponent extends RestTable implements OnInit {
   @ViewChild('userBanModal', { static: true }) userBanModal: UserBanModalComponent
 
-  users: User[] = []
+  users: (User & { accountMutedStatus: AccountMutedStatus })[] = []
 
   totalRecords = 0
   sort: SortMeta = { field: 'createdAt', order: 1 }
@@ -47,6 +48,12 @@ export class UserListComponent extends RestTable implements OnInit {
     }
   ]
 
+  userModerationDisplayOptions: UserModerationDisplayType = {
+    instanceAccount: true,
+    instanceUser: true,
+    myAccount: false
+  }
+
   requiresEmailVerification = false
 
   private _selectedColumns: string[]
@@ -58,6 +65,7 @@ export class UserListComponent extends RestTable implements OnInit {
     private confirmService: ConfirmService,
     private serverService: ServerService,
     private auth: AuthService,
+    private blocklist: BlocklistService,
     private userAdminService: UserAdminService
   ) {
     super()
@@ -115,9 +123,9 @@ export class UserListComponent extends RestTable implements OnInit {
 
     this.columns = [
       { id: 'username', label: $localize`Username` },
+      { id: 'role', label: $localize`Role` },
       { id: 'email', label: $localize`Email` },
       { id: 'quota', label: $localize`Video quota` },
-      { id: 'role', label: $localize`Role` },
       { id: 'createdAt', label: $localize`Created` }
     ]
 
@@ -237,11 +245,35 @@ export class UserListComponent extends RestTable implements OnInit {
       search: this.search
     }).subscribe({
       next: resultList => {
-        this.users = resultList.data
+        this.users = resultList.data.map(u => ({
+          ...u,
+
+          accountMutedStatus: {
+            ...u.account,
+
+            nameWithHost: Actor.CREATE_BY_STRING(u.account.name, u.account.host),
+
+            mutedByInstance: false,
+            mutedByUser: false,
+            mutedServerByInstance: false,
+            mutedServerByUser: false
+          }
+        }))
         this.totalRecords = resultList.total
+
+        this.loadMutedStatus()
       },
 
       error: err => this.notifier.error(err.message)
     })
   }
+
+  private loadMutedStatus () {
+    this.blocklist.getStatus({ accounts: this.users.map(u => u.username + '@' + getAPIHost()) })
+      .subscribe(blockStatus => {
+        for (const user of this.users) {
+          user.accountMutedStatus.mutedByInstance = blockStatus.accounts[user.username + '@' + getAPIHost()].blockedByServer
+        }
+      })
+  }
 }