aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html2
-rw-r--r--client/src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts4
-rw-r--r--client/src/app/+admin/moderation/moderation.component.html4
-rw-r--r--client/src/app/+admin/moderation/moderation.component.ts4
-rw-r--r--client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html2
-rw-r--r--client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts4
-rw-r--r--client/src/app/+my-account/my-account-routing.module.ts4
7 files changed, 12 insertions, 12 deletions
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
index 859c0f916..f634ba834 100644
--- 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
@@ -1,5 +1,5 @@
1<p-table 1<p-table
2 [value]="blockedAccounts" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" 2 [value]="blockedServers" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage"
3 [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" 3 [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)"
4> 4>
5 5
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 9459117a3..130009dc7 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
@@ -12,7 +12,7 @@ import { ServerBlock } from '../../../../../../shared'
12 templateUrl: './instance-server-blocklist.component.html' 12 templateUrl: './instance-server-blocklist.component.html'
13}) 13})
14export class InstanceServerBlocklistComponent extends RestTable implements OnInit { 14export class InstanceServerBlocklistComponent extends RestTable implements OnInit {
15 blockedAccounts: ServerBlock[] = [] 15 blockedServers: ServerBlock[] = []
16 totalRecords = 0 16 totalRecords = 0
17 rowsPerPage = 10 17 rowsPerPage = 10
18 sort: SortMeta = { field: 'createdAt', order: -1 } 18 sort: SortMeta = { field: 'createdAt', order: -1 }
@@ -50,7 +50,7 @@ export class InstanceServerBlocklistComponent extends RestTable implements OnIni
50 return this.blocklistService.getInstanceServerBlocklist(this.pagination, this.sort) 50 return this.blocklistService.getInstanceServerBlocklist(this.pagination, this.sort)
51 .subscribe( 51 .subscribe(
52 resultList => { 52 resultList => {
53 this.blockedAccounts = resultList.data 53 this.blockedServers = resultList.data
54 this.totalRecords = resultList.total 54 this.totalRecords = resultList.total
55 }, 55 },
56 56
diff --git a/client/src/app/+admin/moderation/moderation.component.html b/client/src/app/+admin/moderation/moderation.component.html
index 8ec7278ef..01457936c 100644
--- a/client/src/app/+admin/moderation/moderation.component.html
+++ b/client/src/app/+admin/moderation/moderation.component.html
@@ -6,9 +6,9 @@
6 6
7 <a *ngIf="hasVideoBlacklistRight()" i18n routerLink="video-blacklist/list" routerLinkActive="active">Blacklisted videos</a> 7 <a *ngIf="hasVideoBlacklistRight()" i18n routerLink="video-blacklist/list" routerLinkActive="active">Blacklisted videos</a>
8 8
9 <a *ngIf="hasAccountsBlacklistRight()" i18n routerLink="blocklist/accounts" routerLinkActive="active">Muted accounts</a> 9 <a *ngIf="hasAccountsBlocklistRight()" i18n routerLink="blocklist/accounts" routerLinkActive="active">Muted accounts</a>
10 10
11 <a *ngIf="hasServersBlacklistRight()" i18n routerLink="blocklist/servers" routerLinkActive="active">Muted servers</a> 11 <a *ngIf="hasServersBlocklistRight()" i18n routerLink="blocklist/servers" routerLinkActive="active">Muted servers</a>
12 </div> 12 </div>
13</div> 13</div>
14 14
diff --git a/client/src/app/+admin/moderation/moderation.component.ts b/client/src/app/+admin/moderation/moderation.component.ts
index 7f85f920e..2b2618933 100644
--- a/client/src/app/+admin/moderation/moderation.component.ts
+++ b/client/src/app/+admin/moderation/moderation.component.ts
@@ -17,11 +17,11 @@ export class ModerationComponent {
17 return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) 17 return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_BLACKLIST)
18 } 18 }
19 19
20 hasAccountsBlacklistRight () { 20 hasAccountsBlocklistRight () {
21 return this.auth.getUser().hasRight(UserRight.MANAGE_ACCOUNTS_BLOCKLIST) 21 return this.auth.getUser().hasRight(UserRight.MANAGE_ACCOUNTS_BLOCKLIST)
22 } 22 }
23 23
24 hasServersBlacklistRight () { 24 hasServersBlocklistRight () {
25 return this.auth.getUser().hasRight(UserRight.MANAGE_SERVERS_BLOCKLIST) 25 return this.auth.getUser().hasRight(UserRight.MANAGE_SERVERS_BLOCKLIST)
26 } 26 }
27} 27}
diff --git a/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html b/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html
index 680334740..329cfb08f 100644
--- a/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html
+++ b/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html
@@ -3,7 +3,7 @@
3</div> 3</div>
4 4
5<p-table 5<p-table
6 [value]="blockedAccounts" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" 6 [value]="blockedServers" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage"
7 [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" 7 [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)"
8> 8>
9 9
diff --git a/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts b/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts
index b994c2c99..b411d6926 100644
--- a/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts
+++ b/client/src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts
@@ -12,7 +12,7 @@ import { BlocklistService } from '@app/shared/blocklist'
12 templateUrl: './my-account-server-blocklist.component.html' 12 templateUrl: './my-account-server-blocklist.component.html'
13}) 13})
14export class MyAccountServerBlocklistComponent extends RestTable implements OnInit { 14export class MyAccountServerBlocklistComponent extends RestTable implements OnInit {
15 blockedAccounts: ServerBlock[] = [] 15 blockedServers: ServerBlock[] = []
16 totalRecords = 0 16 totalRecords = 0
17 rowsPerPage = 10 17 rowsPerPage = 10
18 sort: SortMeta = { field: 'createdAt', order: -1 } 18 sort: SortMeta = { field: 'createdAt', order: -1 }
@@ -50,7 +50,7 @@ export class MyAccountServerBlocklistComponent extends RestTable implements OnIn
50 return this.blocklistService.getUserServerBlocklist(this.pagination, this.sort) 50 return this.blocklistService.getUserServerBlocklist(this.pagination, this.sort)
51 .subscribe( 51 .subscribe(
52 resultList => { 52 resultList => {
53 this.blockedAccounts = resultList.data 53 this.blockedServers = resultList.data
54 this.totalRecords = resultList.total 54 this.totalRecords = resultList.total
55 }, 55 },
56 56
diff --git a/client/src/app/+my-account/my-account-routing.module.ts b/client/src/app/+my-account/my-account-routing.module.ts
index 49f9c94a7..601e517b4 100644
--- a/client/src/app/+my-account/my-account-routing.module.ts
+++ b/client/src/app/+my-account/my-account-routing.module.ts
@@ -102,7 +102,7 @@ const myAccountRoutes: Routes = [
102 component: MyAccountBlocklistComponent, 102 component: MyAccountBlocklistComponent,
103 data: { 103 data: {
104 meta: { 104 meta: {
105 title: 'Accounts blocklist' 105 title: 'Muted accounts'
106 } 106 }
107 } 107 }
108 }, 108 },
@@ -111,7 +111,7 @@ const myAccountRoutes: Routes = [
111 component: MyAccountServerBlocklistComponent, 111 component: MyAccountServerBlocklistComponent,
112 data: { 112 data: {
113 meta: { 113 meta: {
114 title: 'Instances blocklist' 114 title: 'Muted instances'
115 } 115 }
116 } 116 }
117 } 117 }