aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts2
-rw-r--r--client/src/app/+my-account/my-account.module.ts12
-rw-r--r--server/models/server/plugin.ts2
-rw-r--r--server/tests/api/videos/video-blacklist.ts2
4 files changed, 13 insertions, 5 deletions
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
14 templateUrl: './plugin-show-installed.component.html', 14 templateUrl: './plugin-show-installed.component.html',
15 styleUrls: [ './plugin-show-installed.component.scss' ] 15 styleUrls: [ './plugin-show-installed.component.scss' ]
16}) 16})
17export class PluginShowInstalledComponent extends FormReactive implements OnInit, OnDestroy{ 17export class PluginShowInstalledComponent extends FormReactive implements OnInit, OnDestroy {
18 plugin: PeerTubePlugin 18 plugin: PeerTubePlugin
19 registeredSettings: RegisterSettingOptions[] = [] 19 registeredSettings: RegisterSettingOptions[] = []
20 pluginTypeLabel: string 20 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
25import { MyAccountHistoryComponent } from '@app/+my-account/my-account-history/my-account-history.component' 25import { MyAccountHistoryComponent } from '@app/+my-account/my-account-history/my-account-history.component'
26import { MyAccountNotificationsComponent } from '@app/+my-account/my-account-notifications/my-account-notifications.component' 26import { MyAccountNotificationsComponent } from '@app/+my-account/my-account-notifications/my-account-notifications.component'
27import { MyAccountNotificationPreferencesComponent } from '@app/+my-account/my-account-settings/my-account-notification-preferences' 27import { MyAccountNotificationPreferencesComponent } from '@app/+my-account/my-account-settings/my-account-notification-preferences'
28import { MyAccountVideoPlaylistCreateComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-create.component' 28import {
29import { MyAccountVideoPlaylistUpdateComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-update.component' 29 MyAccountVideoPlaylistCreateComponent
30} from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-create.component'
31import {
32 MyAccountVideoPlaylistUpdateComponent
33} from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-update.component'
30import { MyAccountVideoPlaylistsComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlists.component' 34import { MyAccountVideoPlaylistsComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlists.component'
31import { MyAccountVideoPlaylistElementsComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-elements.component' 35import {
36 MyAccountVideoPlaylistElementsComponent
37} from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-elements.component'
32import { DragDropModule } from '@angular/cdk/drag-drop' 38import { DragDropModule } from '@angular/cdk/drag-drop'
33import { MyAccountChangeEmailComponent } from '@app/+my-account/my-account-settings/my-account-change-email' 39import { MyAccountChangeEmailComponent } from '@app/+my-account/my-account-settings/my-account-change-email'
34import { MultiSelectModule } from 'primeng/primeng' 40import { 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<PluginModel> {
154 } 154 }
155 155
156 return PluginModel.findOne(query) 156 return PluginModel.findOne(query)
157 .then((c: any) => { 157 .then((c: any) => {
158 if (!c) return undefined 158 if (!c) return undefined
159 159
160 return c.value 160 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 () {
421 }) 421 })
422 422
423 it('Should auto blacklist a video on URL import', async function () { 423 it('Should auto blacklist a video on URL import', async function () {
424 this.timeout(15000)
425
424 const attributes = { 426 const attributes = {
425 targetUrl: getYoutubeVideoUrl(), 427 targetUrl: getYoutubeVideoUrl(),
426 name: 'URL import', 428 name: 'URL import',