From 83002a823465fe03a8d82833cb2e073a383405a8 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 22 May 2023 17:04:39 +0200 Subject: Update server dependencies --- server/helpers/custom-validators/videos.ts | 4 ++-- server/helpers/image-utils.ts | 3 ++- server/helpers/webtorrent.ts | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'server/helpers') diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts index 9e8177f77..5f75ec27c 100644 --- a/server/helpers/custom-validators/videos.ts +++ b/server/helpers/custom-validators/videos.ts @@ -1,5 +1,5 @@ import { UploadFilesForCheck } from 'express' -import magnetUtil from 'magnet-uri' +import { decode as magnetUriDecode } from 'magnet-uri' import validator from 'validator' import { VideoFilter, VideoInclude, VideoPrivacy, VideoRateType } from '@shared/models' import { @@ -137,7 +137,7 @@ function isVideoFileSizeValid (value: string) { function isVideoMagnetUriValid (value: string) { if (!exists(value)) return false - const parsed = magnetUtil.decode(value) + const parsed = magnetUriDecode(value) return parsed && isVideoFileInfoHashValid(parsed.infoHash) } diff --git a/server/helpers/image-utils.ts b/server/helpers/image-utils.ts index 05b258d8a..f86f7216d 100644 --- a/server/helpers/image-utils.ts +++ b/server/helpers/image-utils.ts @@ -1,6 +1,7 @@ import { copy, readFile, remove, rename } from 'fs-extra' import Jimp, { read as jimpRead } from 'jimp' import { join } from 'path' +import { ColorActionName } from '@jimp/plugin-color' import { getLowercaseExtension } from '@shared/core-utils' import { buildUUID } from '@shared/extra-utils' import { convertWebPToJPG, generateThumbnailFromVideo, processGIF } from './ffmpeg' @@ -131,7 +132,7 @@ async function autoResize (options: { if (sourceIsPortrait && !destIsPortraitOrSquare) { const baseImage = sourceImage.cloneQuiet().cover(newSize.width, newSize.height) - .color([ { apply: 'shade', params: [ 50 ] } ]) + .color([ { apply: ColorActionName.SHADE, params: [ 50 ] } ]) const topImage = sourceImage.cloneQuiet().contain(newSize.width, newSize.height) diff --git a/server/helpers/webtorrent.ts b/server/helpers/webtorrent.ts index e690e3890..f33a7bccd 100644 --- a/server/helpers/webtorrent.ts +++ b/server/helpers/webtorrent.ts @@ -1,7 +1,7 @@ import { decode, encode } from 'bencode' import createTorrent from 'create-torrent' import { createWriteStream, ensureDir, pathExists, readFile, remove, writeFile } from 'fs-extra' -import magnetUtil from 'magnet-uri' +import { encode as magnetUriEncode } from 'magnet-uri' import parseTorrent from 'parse-torrent' import { dirname, join } from 'path' import { pipeline } from 'stream' @@ -185,7 +185,7 @@ function generateMagnetUri ( name: video.name } - return magnetUtil.encode(magnetHash) + return magnetUriEncode(magnetHash) } // --------------------------------------------------------------------------- -- cgit v1.2.3