aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/helpers/custom-validators
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-11-15 11:00:25 +0100
committerChocobozzz <florian.bigard@gmail.com>2017-11-27 19:40:51 +0100
commit608624252466acf9f1d9ee1c1170bd4fe4d18d18 (patch)
tree47eab55bb5421b7fe88e0b2ac743a436fd9561cf /server/helpers/custom-validators
parent51548b31815c6f96f314ae96588a9adca150519d (diff)
downloadPeerTube-608624252466acf9f1d9ee1c1170bd4fe4d18d18.tar.gz
PeerTube-608624252466acf9f1d9ee1c1170bd4fe4d18d18.tar.zst
PeerTube-608624252466acf9f1d9ee1c1170bd4fe4d18d18.zip
Rename Pod -> Server
Diffstat (limited to 'server/helpers/custom-validators')
-rw-r--r--server/helpers/custom-validators/accounts.ts2
-rw-r--r--server/helpers/custom-validators/index.ts4
-rw-r--r--server/helpers/custom-validators/servers.ts (renamed from server/helpers/custom-validators/pods.ts)0
-rw-r--r--server/helpers/custom-validators/videos.ts4
4 files changed, 5 insertions, 5 deletions
diff --git a/server/helpers/custom-validators/accounts.ts b/server/helpers/custom-validators/accounts.ts
index 6d6219a95..088d5fc8f 100644
--- a/server/helpers/custom-validators/accounts.ts
+++ b/server/helpers/custom-validators/accounts.ts
@@ -8,7 +8,7 @@ import { AccountInstance } from '../../models'
8import { logger } from '../logger' 8import { logger } from '../logger'
9 9
10import { isUserUsernameValid } from './users' 10import { isUserUsernameValid } from './users'
11import { isHostValid } from './pods' 11import { isHostValid } from './servers'
12 12
13function isAccountNameValid (value: string) { 13function isAccountNameValid (value: string) {
14 return isUserUsernameValid(value) 14 return isUserUsernameValid(value)
diff --git a/server/helpers/custom-validators/index.ts b/server/helpers/custom-validators/index.ts
index 1c475e301..d3b2f5393 100644
--- a/server/helpers/custom-validators/index.ts
+++ b/server/helpers/custom-validators/index.ts
@@ -1,7 +1,7 @@
1export * from './activitypub' 1export * from './activitypub'
2export * from './misc' 2export * from './misc'
3export * from './pods' 3export * from './servers'
4export * from './pods' 4export * from './servers'
5export * from './users' 5export * from './users'
6export * from './accounts' 6export * from './accounts'
7export * from './video-channels' 7export * from './video-channels'
diff --git a/server/helpers/custom-validators/pods.ts b/server/helpers/custom-validators/servers.ts
index d5021bf38..d5021bf38 100644
--- a/server/helpers/custom-validators/pods.ts
+++ b/server/helpers/custom-validators/servers.ts
diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts
index 715119cf6..d68de6609 100644
--- a/server/helpers/custom-validators/videos.ts
+++ b/server/helpers/custom-validators/videos.ts
@@ -171,9 +171,9 @@ function isVideoFileInfoHashValid (value: string) {
171function checkVideoExists (id: string, res: express.Response, callback: () => void) { 171function checkVideoExists (id: string, res: express.Response, callback: () => void) {
172 let promise: Promise<VideoInstance> 172 let promise: Promise<VideoInstance>
173 if (validator.isInt(id)) { 173 if (validator.isInt(id)) {
174 promise = db.Video.loadAndPopulateAccountAndPodAndTags(+id) 174 promise = db.Video.loadAndPopulateAccountAndServerAndTags(+id)
175 } else { // UUID 175 } else { // UUID
176 promise = db.Video.loadByUUIDAndPopulateAccountAndPodAndTags(id) 176 promise = db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(id)
177 } 177 }
178 178
179 promise.then(video => { 179 promise.then(video => {