From: Chocobozzz Date: Tue, 16 Jul 2019 15:38:20 +0000 (+0200) Subject: Fix lint X-Git-Tag: v1.4.0-rc.1~106 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=sidebyside;h=109d893ff5353c3061af3062cf9443bcba39aafc;p=github%2FChocobozzz%2FPeerTube.git 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 b99281a37..0fbd65160 100644 --- 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' ] }) -export class PluginShowInstalledComponent extends FormReactive implements OnInit, OnDestroy{ +export class PluginShowInstalledComponent extends FormReactive implements OnInit, OnDestroy { 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 5be1b0d05..01dde5bb6 100644 --- 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 { 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 { 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' diff --git a/server/models/server/plugin.ts b/server/models/server/plugin.ts index ba43713f6..50963ba57 100644 --- a/server/models/server/plugin.ts +++ b/server/models/server/plugin.ts @@ -154,7 +154,7 @@ export class PluginModel extends Model { } return PluginModel.findOne(query) - .then((c: any) => { + .then((c: any) => { 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 8760a4787..854b2f0cb 100644 --- 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 () { + this.timeout(15000) + const attributes = { targetUrl: getYoutubeVideoUrl(), name: 'URL import',