Fix lint

diff --git a/client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts b/client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts
index b99281a3741cb1af5824123270860a005052b99a..0fbd651603c902b2e9282d374bb56d5f3168f2d7 100644 (file)
--- a/client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts
+++ b/client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts
@@ -14,7 +14,7 @@ import { BuildFormArgument, FormReactive, FormValidatorService } from '@app/shar
   templateUrl: './plugin-show-installed.component.html',
   styleUrls: [ './plugin-show-installed.component.scss' ]
 })
   templateUrl: './plugin-show-installed.component.html',
   styleUrls: [ './plugin-show-installed.component.scss' ]
 })

-export class PluginShowInstalledComponent extends FormReactive implements OnInit, OnDestroy{
+export class PluginShowInstalledComponent extends FormReactive implements OnInit, OnDestroy {

   plugin: PeerTubePlugin
   registeredSettings: RegisterSettingOptions[] = []
   pluginTypeLabel: string
   plugin: PeerTubePlugin
   registeredSettings: RegisterSettingOptions[] = []
   pluginTypeLabel: string

diff --git a/client/src/app/+my-account/my-account.module.ts b/client/src/app/+my-account/my-account.module.ts
index 5be1b0d052d3b56f25481d43a988088809c5a6e1..01dde5bb6fb85006339c358658f7850db6e06c4b 100644 (file)
--- a/client/src/app/+my-account/my-account.module.ts
+++ b/client/src/app/+my-account/my-account.module.ts
@@ -25,10 +25,16 @@ import { MyAccountServerBlocklistComponent } from '@app/+my-account/my-account-b
 import { MyAccountHistoryComponent } from '@app/+my-account/my-account-history/my-account-history.component'
 import { MyAccountNotificationsComponent } from '@app/+my-account/my-account-notifications/my-account-notifications.component'
 import { MyAccountNotificationPreferencesComponent } from '@app/+my-account/my-account-settings/my-account-notification-preferences'
 import { MyAccountHistoryComponent } from '@app/+my-account/my-account-history/my-account-history.component'
 import { MyAccountNotificationsComponent } from '@app/+my-account/my-account-notifications/my-account-notifications.component'
 import { MyAccountNotificationPreferencesComponent } from '@app/+my-account/my-account-settings/my-account-notification-preferences'

-import { MyAccountVideoPlaylistCreateComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-create.component'
-import { MyAccountVideoPlaylistUpdateComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-update.component'
+import {
+  MyAccountVideoPlaylistCreateComponent
+} from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-create.component'
+import {
+  MyAccountVideoPlaylistUpdateComponent
+} from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-update.component'

 import { MyAccountVideoPlaylistsComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlists.component'
 import { MyAccountVideoPlaylistsComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlists.component'

-import { MyAccountVideoPlaylistElementsComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-elements.component'
+import {
+  MyAccountVideoPlaylistElementsComponent
+} from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-elements.component'

 import { DragDropModule } from '@angular/cdk/drag-drop'
 import { MyAccountChangeEmailComponent } from '@app/+my-account/my-account-settings/my-account-change-email'
 import { MultiSelectModule } from 'primeng/primeng'
 import { DragDropModule } from '@angular/cdk/drag-drop'
 import { MyAccountChangeEmailComponent } from '@app/+my-account/my-account-settings/my-account-change-email'
 import { MultiSelectModule } from 'primeng/primeng'

diff --git a/server/models/server/plugin.ts b/server/models/server/plugin.ts
index ba43713f66d1d61695b6fbcae1614674ecbd8da6..50963ba57a94bcd00c6b0e5aff18da32c0016048 100644 (file)
--- a/server/models/server/plugin.ts
+++ b/server/models/server/plugin.ts
@@ -154,7 +154,7 @@ export class PluginModel extends Model<PluginModel> {
     }
 
     return PluginModel.findOne(query)
     }
 
     return PluginModel.findOne(query)

-      .then((c: any) =>  {
+      .then((c: any) => {

         if (!c) return undefined
 
         return c.value
         if (!c) return undefined
 
         return c.value

diff --git a/server/tests/api/videos/video-blacklist.ts b/server/tests/api/videos/video-blacklist.ts
index 8760a47875d9dd358a2246e8877cb4d1fb671b25..854b2f0cb56ef6f0ce8d923403aaa1de50cfe26c 100644 (file)
--- a/server/tests/api/videos/video-blacklist.ts
+++ b/server/tests/api/videos/video-blacklist.ts
@@ -421,6 +421,8 @@ describe('Test video blacklist', function () {
     })
 
     it('Should auto blacklist a video on URL import', async function () {
     })
 
     it('Should auto blacklist a video on URL import', async function () {

+      this.timeout(15000)
+

       const attributes = {
         targetUrl: getYoutubeVideoUrl(),
         name: 'URL import',
       const attributes = {
         targetUrl: getYoutubeVideoUrl(),
         name: 'URL import',