Prefer using our pick function

diff --git a/server/helpers/ffmpeg/ffmpeg-presets.ts b/server/helpers/ffmpeg/ffmpeg-presets.ts
index 99b39f79a166db5f35b0d232647bf5ec0455226d..d1160a4a265e316ce2891c0f57d51af8ec0c40c1 100644 (file)
--- a/server/helpers/ffmpeg/ffmpeg-presets.ts
+++ b/server/helpers/ffmpeg/ffmpeg-presets.ts
@@ -1,6 +1,6 @@
 import { FfmpegCommand } from 'fluent-ffmpeg'
-import { pick } from 'lodash'
 import { logger, loggerTagsFactory } from '@server/helpers/logger'
+import { pick } from '@shared/core-utils'
 import { AvailableEncoders, EncoderOptions } from '@shared/models'
 import { buildStreamSuffix, getScaleFilter, StreamType } from './ffmpeg-commons'
 import { getEncoderBuilderResult } from './ffmpeg-encoders'

diff --git a/server/lib/activitypub/playlists/shared/url-to-object.ts b/server/lib/activitypub/playlists/shared/url-to-object.ts
index f895db587a763874f666f40af12abddf07a0e19c..41bee37521403670eee53714c9a10e647c0f572c 100644 (file)
--- a/server/lib/activitypub/playlists/shared/url-to-object.ts
+++ b/server/lib/activitypub/playlists/shared/url-to-object.ts
@@ -1,5 +1,5 @@
-import { isArray } from 'lodash'
 import { isPlaylistElementObjectValid, isPlaylistObjectValid } from '@server/helpers/custom-validators/activitypub/playlist'
+import { isArray } from '@server/helpers/custom-validators/misc'
 import { logger, loggerTagsFactory } from '@server/helpers/logger'
 import { doJSONRequest } from '@server/helpers/requests'
 import { PlaylistElementObject, PlaylistObject } from '@shared/models'

diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts
index 9e546de7f85d39adf55545afe8510005d7d64ee0..3cdba5c76ec6681545adf432ff10184608bb844d 100644 (file)
--- a/server/lib/emailer.ts
+++ b/server/lib/emailer.ts
@@ -1,7 +1,8 @@
 import { readFileSync } from 'fs-extra'
-import { isArray, merge } from 'lodash'
+import { merge } from 'lodash'
 import { createTransport, Transporter } from 'nodemailer'
 import { join } from 'path'
+import { toArray } from '@server/helpers/custom-validators/misc'
 import { root } from '@shared/core-utils'
 import { EmailPayload } from '@shared/models'
 import { SendEmailDefaultOptions } from '../../shared/models/server/emailer.model'
@@ -158,9 +159,7 @@ class Emailer {
       subjectPrefix: CONFIG.EMAIL.SUBJECT.PREFIX
     })
 
-    const toEmails = isArray(options.to)
-      ? options.to
-      : [ options.to ]
+    const toEmails = toArray(options.to)
 
     for (const to of toEmails) {
       const baseOptions: SendEmailDefaultOptions = {

diff --git a/server/models/video/sql/video/video-model-get-query-builder.ts b/server/models/video/sql/video/video-model-get-query-builder.ts
index 29e59c8be8fc9817fa9b7ef892578f0fc4e984ee..8e90ff6411aa97d8c3114d10450dfc59fb586388 100644 (file)
--- a/server/models/video/sql/video/video-model-get-query-builder.ts
+++ b/server/models/video/sql/video/video-model-get-query-builder.ts
@@ -1,5 +1,5 @@
-import { pick } from 'lodash'
 import { Sequelize, Transaction } from 'sequelize'
+import { pick } from '@shared/core-utils'
 import { AbstractVideoQueryBuilder } from './shared/abstract-video-query-builder'
 import { VideoFileQueryBuilder } from './shared/video-file-query-builder'
 import { VideoModelBuilder } from './shared/video-model-builder'

diff --git a/server/models/video/sql/video/videos-id-list-query-builder.ts b/server/models/video/sql/video/videos-id-list-query-builder.ts
index 8692a436acd342f0ba479c47d4846304d9660252..14f903851068508152f00246c25ade10f27a5acf 100644 (file)
--- a/server/models/video/sql/video/videos-id-list-query-builder.ts
+++ b/server/models/video/sql/video/videos-id-list-query-builder.ts
@@ -1,4 +1,4 @@
-import { Sequelize } from 'sequelize'
+import { Sequelize, Transaction } from 'sequelize'
 import validator from 'validator'
 import { exists } from '@server/helpers/custom-validators/misc'
 import { WEBSERVER } from '@server/initializers/constants'
@@ -73,6 +73,9 @@ export type BuildVideosListQueryOptions = {
 
   group?: string
   having?: string
+
+  transaction?: Transaction
+  logging?: boolean
 }
 
 export class VideosIdListQueryBuilder extends AbstractRunQuery {

diff --git a/server/models/video/sql/video/videos-model-list-query-builder.ts b/server/models/video/sql/video/videos-model-list-query-builder.ts
index 4fe6bc321bbe0c9851d21e07c659be02676c139a..3fdac4ed34e334a4c3363cfd7dd79cb28d086788 100644 (file)
--- a/server/models/video/sql/video/videos-model-list-query-builder.ts
+++ b/server/models/video/sql/video/videos-model-list-query-builder.ts
@@ -1,5 +1,5 @@
-import { pick } from 'lodash'
 import { Sequelize } from 'sequelize'
+import { pick } from '@shared/core-utils'
 import { VideoInclude } from '@shared/models'
 import { AbstractVideoQueryBuilder } from './shared/abstract-video-query-builder'
 import { VideoFileQueryBuilder } from './shared/video-file-query-builder'

diff --git a/shared/server-commands/videos/comments-command.ts b/shared/server-commands/videos/comments-command.ts
index 156cf452f1b7c75f8b76bfe73abffa847a9cf599..154ec0c246608d14065b0a797a3c1341e74be61b 100644 (file)
--- a/shared/server-commands/videos/comments-command.ts
+++ b/shared/server-commands/videos/comments-command.ts
@@ -1,4 +1,4 @@
-import { pick } from 'lodash'
+import { pick } from '@shared/core-utils'
 import { HttpStatusCode, ResultList, VideoComment, VideoCommentThreads, VideoCommentThreadTree } from '@shared/models'
 import { unwrapBody } from '../requests'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'