aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-08-14 14:59:53 +0200
committerChocobozzz <me@florianbigard.com>2018-08-14 15:00:01 +0200
commit59c76ffa8f503e962d517c78f033f1beccb1de1a (patch)
treed567991b10cffd59322dd679d5188e7d1ec7ddce /server
parent13b6dc1f3437560c55a5dfc3a94a2b162654e5c9 (diff)
downloadPeerTube-59c76ffa8f503e962d517c78f033f1beccb1de1a.tar.gz
PeerTube-59c76ffa8f503e962d517c78f033f1beccb1de1a.tar.zst
PeerTube-59c76ffa8f503e962d517c78f033f1beccb1de1a.zip
Flat shared module directory
Diffstat (limited to 'server')
-rw-r--r--server/initializers/constants.ts3
-rw-r--r--server/models/video/video-caption.ts2
-rw-r--r--server/tests/api/server/follows.ts2
-rw-r--r--server/tests/api/videos/video-captions.ts2
-rw-r--r--server/tests/utils/videos/video-abuses.ts2
5 files changed, 5 insertions, 6 deletions
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index ff8e64330..bce797159 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -3,12 +3,11 @@ import { dirname, join } from 'path'
3import { JobType, VideoRateType, VideoState } from '../../shared/models' 3import { JobType, VideoRateType, VideoState } from '../../shared/models'
4import { ActivityPubActorType } from '../../shared/models/activitypub' 4import { ActivityPubActorType } from '../../shared/models/activitypub'
5import { FollowState } from '../../shared/models/actors' 5import { FollowState } from '../../shared/models/actors'
6import { VideoPrivacy, VideoAbuseState } from '../../shared/models/videos' 6import { VideoPrivacy, VideoAbuseState, VideoImportState } from '../../shared/models/videos'
7// Do not use barrels, remain constants as independent as possible 7// Do not use barrels, remain constants as independent as possible
8import { buildPath, isTestInstance, root, sanitizeHost, sanitizeUrl } from '../helpers/core-utils' 8import { buildPath, isTestInstance, root, sanitizeHost, sanitizeUrl } from '../helpers/core-utils'
9import { NSFWPolicyType } from '../../shared/models/videos/nsfw-policy.type' 9import { NSFWPolicyType } from '../../shared/models/videos/nsfw-policy.type'
10import { invert } from 'lodash' 10import { invert } from 'lodash'
11import { VideoImportState } from '../../shared/models/videos/video-import-state.enum'
12 11
13// Use a variable to reload the configuration if we need 12// Use a variable to reload the configuration if we need
14let config: IConfig = require('config') 13let config: IConfig = require('config')
diff --git a/server/models/video/video-caption.ts b/server/models/video/video-caption.ts
index 4a25097f8..3593646a2 100644
--- a/server/models/video/video-caption.ts
+++ b/server/models/video/video-caption.ts
@@ -15,7 +15,7 @@ import {
15import { throwIfNotValid } from '../utils' 15import { throwIfNotValid } from '../utils'
16import { VideoModel } from './video' 16import { VideoModel } from './video'
17import { isVideoCaptionLanguageValid } from '../../helpers/custom-validators/video-captions' 17import { isVideoCaptionLanguageValid } from '../../helpers/custom-validators/video-captions'
18import { VideoCaption } from '../../../shared/models/videos/video-caption.model' 18import { VideoCaption } from '../../../shared/models/videos/caption/video-caption.model'
19import { CONFIG, STATIC_PATHS, VIDEO_LANGUAGES } from '../../initializers' 19import { CONFIG, STATIC_PATHS, VIDEO_LANGUAGES } from '../../initializers'
20import { join } from 'path' 20import { join } from 'path'
21import { logger } from '../../helpers/logger' 21import { logger } from '../../helpers/logger'
diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts
index b91cb75c2..1cad8998c 100644
--- a/server/tests/api/server/follows.ts
+++ b/server/tests/api/server/follows.ts
@@ -27,7 +27,7 @@ import {
27import { rateVideo } from '../../utils/videos/videos' 27import { rateVideo } from '../../utils/videos/videos'
28import { waitJobs } from '../../utils/server/jobs' 28import { waitJobs } from '../../utils/server/jobs'
29import { createVideoCaption, listVideoCaptions, testCaptionFile } from '../../utils/videos/video-captions' 29import { createVideoCaption, listVideoCaptions, testCaptionFile } from '../../utils/videos/video-captions'
30import { VideoCaption } from '../../../../shared/models/videos/video-caption.model' 30import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model'
31 31
32const expect = chai.expect 32const expect = chai.expect
33 33
diff --git a/server/tests/api/videos/video-captions.ts b/server/tests/api/videos/video-captions.ts
index ba9ebbdd6..6e441410d 100644
--- a/server/tests/api/videos/video-captions.ts
+++ b/server/tests/api/videos/video-captions.ts
@@ -6,7 +6,7 @@ import { checkVideoFilesWereRemoved, doubleFollow, flushAndRunMultipleServers, r
6import { flushTests, killallServers, ServerInfo, setAccessTokensToServers } from '../../utils/index' 6import { flushTests, killallServers, ServerInfo, setAccessTokensToServers } from '../../utils/index'
7import { waitJobs } from '../../utils/server/jobs' 7import { waitJobs } from '../../utils/server/jobs'
8import { createVideoCaption, deleteVideoCaption, listVideoCaptions, testCaptionFile } from '../../utils/videos/video-captions' 8import { createVideoCaption, deleteVideoCaption, listVideoCaptions, testCaptionFile } from '../../utils/videos/video-captions'
9import { VideoCaption } from '../../../../shared/models/videos/video-caption.model' 9import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model'
10 10
11const expect = chai.expect 11const expect = chai.expect
12 12
diff --git a/server/tests/utils/videos/video-abuses.ts b/server/tests/utils/videos/video-abuses.ts
index 5f138d6b3..14907e6a0 100644
--- a/server/tests/utils/videos/video-abuses.ts
+++ b/server/tests/utils/videos/video-abuses.ts
@@ -1,5 +1,5 @@
1import * as request from 'supertest' 1import * as request from 'supertest'
2import { VideoAbuseUpdate } from '../../../../shared/models/videos/video-abuse-update.model' 2import { VideoAbuseUpdate } from '../../../../shared/models/videos/abuse/video-abuse-update.model'
3import { makeDeleteRequest, makePutBodyRequest } from '..' 3import { makeDeleteRequest, makePutBodyRequest } from '..'
4 4
5function reportVideoAbuse (url: string, token: string, videoId: number | string, reason: string, specialStatus = 200) { 5function reportVideoAbuse (url: string, token: string, videoId: number | string, reason: string, specialStatus = 200) {