aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared/utils
diff options
context:
space:
mode:
Diffstat (limited to 'shared/utils')
-rw-r--r--shared/utils/requests/check-api-params.ts2
-rw-r--r--shared/utils/search/videos.ts2
-rw-r--r--shared/utils/server/config.ts2
-rw-r--r--shared/utils/server/jobs.ts3
-rw-r--r--shared/utils/server/stats.ts2
-rw-r--r--shared/utils/users/accounts.ts2
-rw-r--r--shared/utils/users/blocklist.ts2
-rw-r--r--shared/utils/users/user-subscriptions.ts2
-rw-r--r--shared/utils/users/users.ts2
-rw-r--r--shared/utils/videos/video-abuses.ts2
-rw-r--r--shared/utils/videos/video-captions.ts4
-rw-r--r--shared/utils/videos/video-channels.ts2
-rw-r--r--shared/utils/videos/video-comments.ts2
-rw-r--r--shared/utils/videos/video-imports.ts3
-rw-r--r--shared/utils/videos/videos.ts5
15 files changed, 20 insertions, 17 deletions
diff --git a/shared/utils/requests/check-api-params.ts b/shared/utils/requests/check-api-params.ts
index edb47e0e9..a2a549682 100644
--- a/shared/utils/requests/check-api-params.ts
+++ b/shared/utils/requests/check-api-params.ts
@@ -1,5 +1,5 @@
1import { makeGetRequest } from './requests' 1import { makeGetRequest } from './requests'
2import { immutableAssign } from '..' 2import { immutableAssign } from '../miscs/miscs'
3 3
4function checkBadStartPagination (url: string, path: string, token?: string, query = {}) { 4function checkBadStartPagination (url: string, path: string, token?: string, query = {}) {
5 return makeGetRequest({ 5 return makeGetRequest({
diff --git a/shared/utils/search/videos.ts b/shared/utils/search/videos.ts
index 115b3ff9a..ba4627017 100644
--- a/shared/utils/search/videos.ts
+++ b/shared/utils/search/videos.ts
@@ -2,7 +2,7 @@
2 2
3import * as request from 'supertest' 3import * as request from 'supertest'
4import { VideosSearchQuery } from '../../models/search' 4import { VideosSearchQuery } from '../../models/search'
5import { immutableAssign } from '..' 5import { immutableAssign } from '../miscs/miscs'
6 6
7function searchVideo (url: string, search: string) { 7function searchVideo (url: string, search: string) {
8 const path = '/api/v1/search/videos' 8 const path = '/api/v1/search/videos'
diff --git a/shared/utils/server/config.ts b/shared/utils/server/config.ts
index 15a94432b..5b888b061 100644
--- a/shared/utils/server/config.ts
+++ b/shared/utils/server/config.ts
@@ -1,4 +1,4 @@
1import { makeDeleteRequest, makeGetRequest, makePutBodyRequest } from '../' 1import { makeDeleteRequest, makeGetRequest, makePutBodyRequest } from '../requests/requests'
2import { CustomConfig } from '../../models/server/custom-config.model' 2import { CustomConfig } from '../../models/server/custom-config.model'
3 3
4function getConfig (url: string) { 4function getConfig (url: string) {
diff --git a/shared/utils/server/jobs.ts b/shared/utils/server/jobs.ts
index 3eec1d7d7..7c7e89824 100644
--- a/shared/utils/server/jobs.ts
+++ b/shared/utils/server/jobs.ts
@@ -1,6 +1,7 @@
1import * as request from 'supertest' 1import * as request from 'supertest'
2import { Job, JobState } from '../../models' 2import { Job, JobState } from '../../models'
3import { ServerInfo, wait } from '../index' 3import { wait } from '../miscs/miscs'
4import { ServerInfo } from './servers'
4 5
5function getJobsList (url: string, accessToken: string, state: JobState) { 6function getJobsList (url: string, accessToken: string, state: JobState) {
6 const path = '/api/v1/jobs/' + state 7 const path = '/api/v1/jobs/' + state
diff --git a/shared/utils/server/stats.ts b/shared/utils/server/stats.ts
index 01989d952..6f079ad18 100644
--- a/shared/utils/server/stats.ts
+++ b/shared/utils/server/stats.ts
@@ -1,4 +1,4 @@
1import { makeGetRequest } from '../' 1import { makeGetRequest } from '../requests/requests'
2 2
3function getStats (url: string, useCache = false) { 3function getStats (url: string, useCache = false) {
4 const path = '/api/v1/server/stats' 4 const path = '/api/v1/server/stats'
diff --git a/shared/utils/users/accounts.ts b/shared/utils/users/accounts.ts
index 5601f2a77..388eb6973 100644
--- a/shared/utils/users/accounts.ts
+++ b/shared/utils/users/accounts.ts
@@ -4,7 +4,7 @@ import { expect } from 'chai'
4import { existsSync, readdir } from 'fs-extra' 4import { existsSync, readdir } from 'fs-extra'
5import { join } from 'path' 5import { join } from 'path'
6import { Account } from '../../models/actors' 6import { Account } from '../../models/actors'
7import { root } from '../index' 7import { root } from '../miscs/miscs'
8import { makeGetRequest } from '../requests/requests' 8import { makeGetRequest } from '../requests/requests'
9 9
10function getAccountsList (url: string, sort = '-createdAt', statusCodeExpected = 200) { 10function getAccountsList (url: string, sort = '-createdAt', statusCodeExpected = 200) {
diff --git a/shared/utils/users/blocklist.ts b/shared/utils/users/blocklist.ts
index 35b537571..0ead5e5f6 100644
--- a/shared/utils/users/blocklist.ts
+++ b/shared/utils/users/blocklist.ts
@@ -1,6 +1,6 @@
1/* tslint:disable:no-unused-expression */ 1/* tslint:disable:no-unused-expression */
2 2
3import { makeDeleteRequest, makePostBodyRequest } from '../index' 3import { makeDeleteRequest, makePostBodyRequest } from '../requests/requests'
4import { makeGetRequest } from '../requests/requests' 4import { makeGetRequest } from '../requests/requests'
5 5
6function getAccountBlocklistByAccount ( 6function getAccountBlocklistByAccount (
diff --git a/shared/utils/users/user-subscriptions.ts b/shared/utils/users/user-subscriptions.ts
index b0e7da7cc..7148fbfca 100644
--- a/shared/utils/users/user-subscriptions.ts
+++ b/shared/utils/users/user-subscriptions.ts
@@ -1,4 +1,4 @@
1import { makeDeleteRequest, makeGetRequest, makePostBodyRequest } from '../' 1import { makeDeleteRequest, makeGetRequest, makePostBodyRequest } from '../requests/requests'
2 2
3function addUserSubscription (url: string, token: string, targetUri: string, statusCodeExpected = 204) { 3function addUserSubscription (url: string, token: string, targetUri: string, statusCodeExpected = 204) {
4 const path = '/api/v1/users/me/subscriptions' 4 const path = '/api/v1/users/me/subscriptions'
diff --git a/shared/utils/users/users.ts b/shared/utils/users/users.ts
index 1b385aaf7..d5d62a507 100644
--- a/shared/utils/users/users.ts
+++ b/shared/utils/users/users.ts
@@ -1,5 +1,5 @@
1import * as request from 'supertest' 1import * as request from 'supertest'
2import { makePostBodyRequest, makePutBodyRequest, updateAvatarRequest } from '../' 2import { makePostBodyRequest, makePutBodyRequest, updateAvatarRequest } from '../requests/requests'
3 3
4import { UserRole } from '../../index' 4import { UserRole } from '../../index'
5import { NSFWPolicyType } from '../../models/videos/nsfw-policy.type' 5import { NSFWPolicyType } from '../../models/videos/nsfw-policy.type'
diff --git a/shared/utils/videos/video-abuses.ts b/shared/utils/videos/video-abuses.ts
index 8be891a9b..7f011ec0f 100644
--- a/shared/utils/videos/video-abuses.ts
+++ b/shared/utils/videos/video-abuses.ts
@@ -1,6 +1,6 @@
1import * as request from 'supertest' 1import * as request from 'supertest'
2import { VideoAbuseUpdate } from '../../models/videos/abuse/video-abuse-update.model' 2import { VideoAbuseUpdate } from '../../models/videos/abuse/video-abuse-update.model'
3import { makeDeleteRequest, makePutBodyRequest } from '..' 3import { makeDeleteRequest, makePutBodyRequest } from '../requests/requests'
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) {
6 const path = '/api/v1/videos/' + videoId + '/abuse' 6 const path = '/api/v1/videos/' + videoId + '/abuse'
diff --git a/shared/utils/videos/video-captions.ts b/shared/utils/videos/video-captions.ts
index 41e52be07..8d67f617b 100644
--- a/shared/utils/videos/video-captions.ts
+++ b/shared/utils/videos/video-captions.ts
@@ -1,7 +1,7 @@
1import { makeDeleteRequest, makeGetRequest } from '../' 1import { makeDeleteRequest, makeGetRequest, makeUploadRequest } from '../requests/requests'
2import { buildAbsoluteFixturePath, makeUploadRequest } from '../index'
3import * as request from 'supertest' 2import * as request from 'supertest'
4import * as chai from 'chai' 3import * as chai from 'chai'
4import { buildAbsoluteFixturePath } from '../miscs/miscs'
5 5
6const expect = chai.expect 6const expect = chai.expect
7 7
diff --git a/shared/utils/videos/video-channels.ts b/shared/utils/videos/video-channels.ts
index 3d37f0e4c..3935c261e 100644
--- a/shared/utils/videos/video-channels.ts
+++ b/shared/utils/videos/video-channels.ts
@@ -1,6 +1,6 @@
1import * as request from 'supertest' 1import * as request from 'supertest'
2import { VideoChannelCreate, VideoChannelUpdate } from '../../models/videos' 2import { VideoChannelCreate, VideoChannelUpdate } from '../../models/videos'
3import { updateAvatarRequest } from '../index' 3import { updateAvatarRequest } from '../requests/requests'
4 4
5function getVideoChannelsList (url: string, start: number, count: number, sort?: string) { 5function getVideoChannelsList (url: string, start: number, count: number, sort?: string) {
6 const path = '/api/v1/video-channels' 6 const path = '/api/v1/video-channels'
diff --git a/shared/utils/videos/video-comments.ts b/shared/utils/videos/video-comments.ts
index 7d4cae364..0ebf69ced 100644
--- a/shared/utils/videos/video-comments.ts
+++ b/shared/utils/videos/video-comments.ts
@@ -1,5 +1,5 @@
1import * as request from 'supertest' 1import * as request from 'supertest'
2import { makeDeleteRequest } from '../' 2import { makeDeleteRequest } from '../requests/requests'
3 3
4function getVideoCommentThreads (url: string, videoId: number | string, start: number, count: number, sort?: string, token?: string) { 4function getVideoCommentThreads (url: string, videoId: number | string, start: number, count: number, sort?: string, token?: string) {
5 const path = '/api/v1/videos/' + videoId + '/comment-threads' 5 const path = '/api/v1/videos/' + videoId + '/comment-threads'
diff --git a/shared/utils/videos/video-imports.ts b/shared/utils/videos/video-imports.ts
index bf5062cd1..3fa49b432 100644
--- a/shared/utils/videos/video-imports.ts
+++ b/shared/utils/videos/video-imports.ts
@@ -1,5 +1,6 @@
1
1import { VideoImportCreate } from '../../models/videos' 2import { VideoImportCreate } from '../../models/videos'
2import { makeGetRequest, makeUploadRequest } from '..' 3import { makeGetRequest, makeUploadRequest } from '../requests/requests'
3 4
4function getYoutubeVideoUrl () { 5function getYoutubeVideoUrl () {
5 return 'https://youtu.be/msX3jv1XdvM' 6 return 'https://youtu.be/msX3jv1XdvM'
diff --git a/shared/utils/videos/videos.ts b/shared/utils/videos/videos.ts
index b3206e566..1ab3e7c4b 100644
--- a/shared/utils/videos/videos.ts
+++ b/shared/utils/videos/videos.ts
@@ -16,9 +16,10 @@ import {
16 ServerInfo, 16 ServerInfo,
17 testImage 17 testImage
18} from '../' 18} from '../'
19
19import { VideoDetails, VideoPrivacy } from '../../models/videos' 20import { VideoDetails, VideoPrivacy } from '../../models/videos'
20import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../server/initializers' 21import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../server/initializers/constants'
21import { dateIsValid, webtorrentAdd } from '../index' 22import { dateIsValid, webtorrentAdd } from '../miscs/miscs'
22 23
23type VideoAttributes = { 24type VideoAttributes = {
24 name?: string 25 name?: string