Fix lint

diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts
index 7b3691332b1712430214eb1f65420d1ce4d0f24e..c0ac3224218df09879d9016bf7e2bdbb995744a1 100644 (file)
--- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts
+++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, OnInit, AfterViewInit } from '@angular/core'
 import { SortMeta } from 'primeng/api'
 import { Notifier, ServerService } from '@app/core'
 import { ConfirmService } from '../../../core'
@@ -17,7 +17,7 @@ import { VideoService } from '@app/shared/video/video.service'
   templateUrl: './video-block-list.component.html',
   styleUrls: [ '../moderation.component.scss', './video-block-list.component.scss' ]
 })
-export class VideoBlockListComponent extends RestTable implements OnInit {
+export class VideoBlockListComponent extends RestTable implements OnInit, AfterViewInit {
   blocklist: (VideoBlacklist & { reasonHtml?: string })[] = []
   totalRecords = 0
   sort: SortMeta = { field: 'createdAt', order: -1 }
@@ -55,7 +55,7 @@ export class VideoBlockListComponent extends RestTable implements OnInit {
                 this.notifier.success(this.i18n('Video {{name}} switched to manual block.', { name: videoBlock.video.name }))
                 this.loadData()
               },
-        
+
               err => this.notifier.error(err.message)
             )
           }
@@ -64,7 +64,7 @@ export class VideoBlockListComponent extends RestTable implements OnInit {
       [
         {
           label: this.i18n('Actions for the video'),
-          isHeader: true,
+          isHeader: true
         },
         {
           label: this.i18n('Unblock video'),
@@ -177,7 +177,7 @@ export class VideoBlockListComponent extends RestTable implements OnInit {
     this.videoBlocklistService.listBlocks({
       pagination: this.pagination,
       sort: this.sort,
-      search: this.search,
+      search: this.search
     })
       .subscribe(
         async resultList => {

diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts
index b686af4e4eb4f79310edfc591f33c23af7a0d0b4..1ae1adb2d86cf33bec5de45a0b5fd54548cfd0e4 100644 (file)
--- a/server/tests/api/server/follows.ts
+++ b/server/tests/api/server/follows.ts
@@ -326,7 +326,7 @@ describe('Test follows', function () {
     let video4: Video
 
     before(async function () {
-      this.timeout(20000)
+      this.timeout(50000)
 
       const video4Attributes = {
         name: 'server3-4',