mirror of
https://github.com/Chocobozzz/PeerTube.git
synced 2024-09-11 21:47:09 +03:00
Remove invalid db value checker
fileUrl can use localhost in some specific cases for example
This commit is contained in:
parent
cb88f25ffa
commit
74b62dcb85
@ -10,15 +10,13 @@ import {
|
|||||||
Column,
|
Column,
|
||||||
CreatedAt,
|
CreatedAt,
|
||||||
Default,
|
Default,
|
||||||
ForeignKey,
|
ForeignKey, Table,
|
||||||
Is, Table,
|
|
||||||
UpdatedAt
|
UpdatedAt
|
||||||
} from 'sequelize-typescript'
|
} from 'sequelize-typescript'
|
||||||
import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc.js'
|
|
||||||
import { logger } from '../../helpers/logger.js'
|
import { logger } from '../../helpers/logger.js'
|
||||||
import { CONFIG } from '../../initializers/config.js'
|
import { CONFIG } from '../../initializers/config.js'
|
||||||
import { LAZY_STATIC_PATHS, MIMETYPES, WEBSERVER } from '../../initializers/constants.js'
|
import { LAZY_STATIC_PATHS, MIMETYPES, WEBSERVER } from '../../initializers/constants.js'
|
||||||
import { SequelizeModel, buildSQLAttributes, throwIfNotValid } from '../shared/index.js'
|
import { SequelizeModel, buildSQLAttributes } from '../shared/index.js'
|
||||||
import { ActorModel } from './actor.js'
|
import { ActorModel } from './actor.js'
|
||||||
|
|
||||||
@Table({
|
@Table({
|
||||||
@ -51,7 +49,6 @@ export class ActorImageModel extends SequelizeModel<ActorImageModel> {
|
|||||||
width: number
|
width: number
|
||||||
|
|
||||||
@AllowNull(true)
|
@AllowNull(true)
|
||||||
@Is('ActorImageFileUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'fileUrl', true))
|
|
||||||
@Column
|
@Column
|
||||||
fileUrl: string
|
fileUrl: string
|
||||||
|
|
||||||
|
@ -1,3 +1,18 @@
|
|||||||
|
import {
|
||||||
|
ActivityVideoUrlObject,
|
||||||
|
CacheFileObject,
|
||||||
|
FileRedundancyInformation,
|
||||||
|
StreamingPlaylistRedundancyInformation,
|
||||||
|
VideoPrivacy,
|
||||||
|
VideoRedundanciesTarget,
|
||||||
|
VideoRedundancy,
|
||||||
|
VideoRedundancyStrategy,
|
||||||
|
VideoRedundancyStrategyWithManual
|
||||||
|
} from '@peertube/peertube-models'
|
||||||
|
import { isTestInstance } from '@peertube/peertube-node-utils'
|
||||||
|
import { getVideoFileMimeType } from '@server/lib/video-file.js'
|
||||||
|
import { getServerActor } from '@server/models/application/application.js'
|
||||||
|
import { MActor, MVideoForRedundancyAPI, MVideoRedundancy, MVideoRedundancyAP, MVideoRedundancyVideo } from '@server/types/models/index.js'
|
||||||
import sample from 'lodash-es/sample.js'
|
import sample from 'lodash-es/sample.js'
|
||||||
import { literal, Op, QueryTypes, Transaction, WhereOptions } from 'sequelize'
|
import { literal, Op, QueryTypes, Transaction, WhereOptions } from 'sequelize'
|
||||||
import {
|
import {
|
||||||
@ -12,21 +27,7 @@ import {
|
|||||||
Table,
|
Table,
|
||||||
UpdatedAt
|
UpdatedAt
|
||||||
} from 'sequelize-typescript'
|
} from 'sequelize-typescript'
|
||||||
import {
|
import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc.js'
|
||||||
ActivityVideoUrlObject,
|
|
||||||
CacheFileObject,
|
|
||||||
FileRedundancyInformation,
|
|
||||||
StreamingPlaylistRedundancyInformation,
|
|
||||||
VideoPrivacy,
|
|
||||||
VideoRedundanciesTarget,
|
|
||||||
VideoRedundancy,
|
|
||||||
VideoRedundancyStrategy,
|
|
||||||
VideoRedundancyStrategyWithManual
|
|
||||||
} from '@peertube/peertube-models'
|
|
||||||
import { isTestInstance } from '@peertube/peertube-node-utils'
|
|
||||||
import { getServerActor } from '@server/models/application/application.js'
|
|
||||||
import { MActor, MVideoForRedundancyAPI, MVideoRedundancy, MVideoRedundancyAP, MVideoRedundancyVideo } from '@server/types/models/index.js'
|
|
||||||
import { isActivityPubUrlValid, isUrlValid } from '../../helpers/custom-validators/activitypub/misc.js'
|
|
||||||
import { logger } from '../../helpers/logger.js'
|
import { logger } from '../../helpers/logger.js'
|
||||||
import { CONFIG } from '../../initializers/config.js'
|
import { CONFIG } from '../../initializers/config.js'
|
||||||
import { CONSTRAINTS_FIELDS } from '../../initializers/constants.js'
|
import { CONSTRAINTS_FIELDS } from '../../initializers/constants.js'
|
||||||
@ -38,7 +39,6 @@ import { VideoChannelModel } from '../video/video-channel.js'
|
|||||||
import { VideoFileModel } from '../video/video-file.js'
|
import { VideoFileModel } from '../video/video-file.js'
|
||||||
import { VideoStreamingPlaylistModel } from '../video/video-streaming-playlist.js'
|
import { VideoStreamingPlaylistModel } from '../video/video-streaming-playlist.js'
|
||||||
import { VideoModel } from '../video/video.js'
|
import { VideoModel } from '../video/video.js'
|
||||||
import { getVideoFileMimeType } from '@server/lib/video-file.js'
|
|
||||||
|
|
||||||
export enum ScopeNames {
|
export enum ScopeNames {
|
||||||
WITH_VIDEO = 'WITH_VIDEO'
|
WITH_VIDEO = 'WITH_VIDEO'
|
||||||
@ -102,7 +102,6 @@ export class VideoRedundancyModel extends SequelizeModel<VideoRedundancyModel> {
|
|||||||
expiresOn: Date
|
expiresOn: Date
|
||||||
|
|
||||||
@AllowNull(false)
|
@AllowNull(false)
|
||||||
@Is('VideoRedundancyFileUrl', value => throwIfNotValid(value, isUrlValid, 'fileUrl'))
|
|
||||||
@Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS_REDUNDANCY.URL.max))
|
@Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS_REDUNDANCY.URL.max))
|
||||||
fileUrl: string
|
fileUrl: string
|
||||||
|
|
||||||
|
@ -26,7 +26,6 @@ import {
|
|||||||
Is, Table,
|
Is, Table,
|
||||||
UpdatedAt
|
UpdatedAt
|
||||||
} from 'sequelize-typescript'
|
} from 'sequelize-typescript'
|
||||||
import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc.js'
|
|
||||||
import { isArrayOf } from '../../helpers/custom-validators/misc.js'
|
import { isArrayOf } from '../../helpers/custom-validators/misc.js'
|
||||||
import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos.js'
|
import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos.js'
|
||||||
import {
|
import {
|
||||||
@ -73,7 +72,6 @@ export class VideoStreamingPlaylistModel extends SequelizeModel<VideoStreamingPl
|
|||||||
playlistFilename: string
|
playlistFilename: string
|
||||||
|
|
||||||
@AllowNull(true)
|
@AllowNull(true)
|
||||||
@Is('PlaylistUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'playlist url', true))
|
|
||||||
@Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.URL.max))
|
@Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.URL.max))
|
||||||
playlistUrl: string
|
playlistUrl: string
|
||||||
|
|
||||||
@ -91,7 +89,6 @@ export class VideoStreamingPlaylistModel extends SequelizeModel<VideoStreamingPl
|
|||||||
segmentsSha256Filename: string
|
segmentsSha256Filename: string
|
||||||
|
|
||||||
@AllowNull(true)
|
@AllowNull(true)
|
||||||
@Is('VideoStreamingSegmentsSha256Url', value => throwIfNotValid(value, isActivityPubUrlValid, 'segments sha256 url', true))
|
|
||||||
@Column
|
@Column
|
||||||
segmentsSha256Url: string
|
segmentsSha256Url: string
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user