First typescript iteration

4 files changed, 139 insertions, 129 deletions

diff --git a/server/helpers/custom-validators/remote/index.js b/server/helpers/custom-validators/remote/index.js
deleted file mode 100644
index 1939a95f4..000000000
--- a/server/helpers/custom-validators/remote/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-'use strict'
-
-const remoteVideosValidators = require('./videos')
-
-const validators = {
-  videos: remoteVideosValidators
-}
-
-// ---------------------------------------------------------------------------
-
-module.exports = validators
diff --git a/server/helpers/custom-validators/remote/index.ts b/server/helpers/custom-validators/remote/index.ts
new file mode 100644
index 000000000..d6f9a7e77
--- /dev/null
+++ b/server/helpers/custom-validators/remote/index.ts
@@ -0,0 +1 @@
+export * from './videos';
diff --git a/server/helpers/custom-validators/remote/videos.js b/server/helpers/custom-validators/remote/videos.js
deleted file mode 100644
index 24715b4b3..000000000
--- a/server/helpers/custom-validators/remote/videos.js
+++ /dev/null
@@ -1,118 +0,0 @@
-'use strict'
-
-const has = require('lodash/has')
-const values = require('lodash/values')
-
-const constants = require('../../../initializers/constants')
-const videosValidators = require('../videos')
-const miscValidators = require('../misc')
-
-const ENDPOINT_ACTIONS = constants.REQUEST_ENDPOINT_ACTIONS[constants.REQUEST_ENDPOINTS.VIDEOS]
-
-const remoteVideosValidators = {
-  isEachRemoteRequestVideosValid,
-  isEachRemoteRequestVideosQaduValid,
-  isEachRemoteRequestVideosEventsValid
-}
-
-function isEachRemoteRequestVideosValid (requests) {
-  return miscValidators.isArray(requests) &&
-    requests.every(function (request) {
-      const video = request.data
-
-      if (!video) return false
-
-      return (
-        isRequestTypeAddValid(request.type) &&
-        isCommonVideoAttributesValid(video) &&
-        videosValidators.isVideoAuthorValid(video.author) &&
-        videosValidators.isVideoThumbnailDataValid(video.thumbnailData)
-      ) ||
-      (
-        isRequestTypeUpdateValid(request.type) &&
-        isCommonVideoAttributesValid(video)
-      ) ||
-      (
-        isRequestTypeRemoveValid(request.type) &&
-        videosValidators.isVideoRemoteIdValid(video.remoteId)
-      ) ||
-      (
-        isRequestTypeReportAbuseValid(request.type) &&
-        videosValidators.isVideoRemoteIdValid(request.data.videoRemoteId) &&
-        videosValidators.isVideoAbuseReasonValid(request.data.reportReason) &&
-        videosValidators.isVideoAbuseReporterUsernameValid(request.data.reporterUsername)
-      )
-    })
-}
-
-function isEachRemoteRequestVideosQaduValid (requests) {
-  return miscValidators.isArray(requests) &&
-    requests.every(function (request) {
-      const video = request.data
-
-      if (!video) return false
-
-      return (
-        videosValidators.isVideoRemoteIdValid(video.remoteId) &&
-        (has(video, 'views') === false || videosValidators.isVideoViewsValid) &&
-        (has(video, 'likes') === false || videosValidators.isVideoLikesValid) &&
-        (has(video, 'dislikes') === false || videosValidators.isVideoDislikesValid)
-      )
-    })
-}
-
-function isEachRemoteRequestVideosEventsValid (requests) {
-  return miscValidators.isArray(requests) &&
-    requests.every(function (request) {
-      const eventData = request.data
-
-      if (!eventData) return false
-
-      return (
-        videosValidators.isVideoRemoteIdValid(eventData.remoteId) &&
-        values(constants.REQUEST_VIDEO_EVENT_TYPES).indexOf(eventData.eventType) !== -1 &&
-        videosValidators.isVideoEventCountValid(eventData.count)
-      )
-    })
-}
-
-// ---------------------------------------------------------------------------
-
-module.exports = remoteVideosValidators
-
-// ---------------------------------------------------------------------------
-
-function isCommonVideoAttributesValid (video) {
-  return videosValidators.isVideoDateValid(video.createdAt) &&
-         videosValidators.isVideoDateValid(video.updatedAt) &&
-         videosValidators.isVideoCategoryValid(video.category) &&
-         videosValidators.isVideoLicenceValid(video.licence) &&
-         videosValidators.isVideoLanguageValid(video.language) &&
-         videosValidators.isVideoNSFWValid(video.nsfw) &&
-         videosValidators.isVideoDescriptionValid(video.description) &&
-         videosValidators.isVideoDurationValid(video.duration) &&
-         videosValidators.isVideoInfoHashValid(video.infoHash) &&
-         videosValidators.isVideoNameValid(video.name) &&
-         videosValidators.isVideoTagsValid(video.tags) &&
-         videosValidators.isVideoRemoteIdValid(video.remoteId) &&
-         videosValidators.isVideoExtnameValid(video.extname) &&
-         videosValidators.isVideoViewsValid(video.views) &&
-         videosValidators.isVideoLikesValid(video.likes) &&
-         videosValidators.isVideoDislikesValid(video.dislikes)
-}
-
-function isRequestTypeAddValid (value) {
-  return value === ENDPOINT_ACTIONS.ADD
-}
-
-function isRequestTypeUpdateValid (value) {
-  return value === ENDPOINT_ACTIONS.UPDATE
-}
-
-function isRequestTypeRemoveValid (value) {
-  return value === ENDPOINT_ACTIONS.REMOVE
-}
-
-function isRequestTypeReportAbuseValid (value) {
-  return value === ENDPOINT_ACTIONS.REPORT_ABUSE
-}
diff --git a/server/helpers/custom-validators/remote/videos.ts b/server/helpers/custom-validators/remote/videos.ts
new file mode 100644
index 000000000..4b904d011
--- /dev/null
+++ b/server/helpers/custom-validators/remote/videos.ts
@@ -0,0 +1,138 @@
+import { has, values } from 'lodash'
+
+import {
+  REQUEST_ENDPOINTS,
+  REQUEST_ENDPOINT_ACTIONS,
+  REQUEST_VIDEO_EVENT_TYPES
+} from '../../../initializers'
+import { isArray } from '../misc'
+import {
+  isVideoAuthorValid,
+  isVideoThumbnailDataValid,
+  isVideoRemoteIdValid,
+  isVideoAbuseReasonValid,
+  isVideoAbuseReporterUsernameValid,
+  isVideoViewsValid,
+  isVideoLikesValid,
+  isVideoDislikesValid,
+  isVideoEventCountValid,
+  isVideoDateValid,
+  isVideoCategoryValid,
+  isVideoLicenceValid,
+  isVideoLanguageValid,
+  isVideoNSFWValid,
+  isVideoDescriptionValid,
+  isVideoDurationValid,
+  isVideoInfoHashValid,
+  isVideoNameValid,
+  isVideoTagsValid,
+  isVideoExtnameValid
+} from '../videos'
+
+const ENDPOINT_ACTIONS = REQUEST_ENDPOINT_ACTIONS[REQUEST_ENDPOINTS.VIDEOS]
+
+function isEachRemoteRequestVideosValid (requests) {
+  return isArray(requests) &&
+    requests.every(function (request) {
+      const video = request.data
+
+      if (!video) return false
+
+      return (
+        isRequestTypeAddValid(request.type) &&
+        isCommonVideoAttributesValid(video) &&
+        isVideoAuthorValid(video.author) &&
+        isVideoThumbnailDataValid(video.thumbnailData)
+      ) ||
+      (
+        isRequestTypeUpdateValid(request.type) &&
+        isCommonVideoAttributesValid(video)
+      ) ||
+      (
+        isRequestTypeRemoveValid(request.type) &&
+        isVideoRemoteIdValid(video.remoteId)
+      ) ||
+      (
+        isRequestTypeReportAbuseValid(request.type) &&
+        isVideoRemoteIdValid(request.data.videoRemoteId) &&
+        isVideoAbuseReasonValid(request.data.reportReason) &&
+        isVideoAbuseReporterUsernameValid(request.data.reporterUsername)
+      )
+    })
+}
+
+function isEachRemoteRequestVideosQaduValid (requests) {
+  return isArray(requests) &&
+    requests.every(function (request) {
+      const video = request.data
+
+      if (!video) return false
+
+      return (
+        isVideoRemoteIdValid(video.remoteId) &&
+        (has(video, 'views') === false || isVideoViewsValid) &&
+        (has(video, 'likes') === false || isVideoLikesValid) &&
+        (has(video, 'dislikes') === false || isVideoDislikesValid)
+      )
+    })
+}
+
+function isEachRemoteRequestVideosEventsValid (requests) {
+  return isArray(requests) &&
+    requests.every(function (request) {
+      const eventData = request.data
+
+      if (!eventData) return false
+
+      return (
+        isVideoRemoteIdValid(eventData.remoteId) &&
+        values(REQUEST_VIDEO_EVENT_TYPES).indexOf(eventData.eventType) !== -1 &&
+        isVideoEventCountValid(eventData.count)
+      )
+    })
+}
+
+// ---------------------------------------------------------------------------
+
+export {
+  isEachRemoteRequestVideosValid,
+  isEachRemoteRequestVideosQaduValid,
+  isEachRemoteRequestVideosEventsValid
+}
+
+// ---------------------------------------------------------------------------
+
+function isCommonVideoAttributesValid (video) {
+  return isVideoDateValid(video.createdAt) &&
+         isVideoDateValid(video.updatedAt) &&
+         isVideoCategoryValid(video.category) &&
+         isVideoLicenceValid(video.licence) &&
+         isVideoLanguageValid(video.language) &&
+         isVideoNSFWValid(video.nsfw) &&
+         isVideoDescriptionValid(video.description) &&
+         isVideoDurationValid(video.duration) &&
+         isVideoInfoHashValid(video.infoHash) &&
+         isVideoNameValid(video.name) &&
+         isVideoTagsValid(video.tags) &&
+         isVideoRemoteIdValid(video.remoteId) &&
+         isVideoExtnameValid(video.extname) &&
+         isVideoViewsValid(video.views) &&
+         isVideoLikesValid(video.likes) &&
+         isVideoDislikesValid(video.dislikes)
+}
+
+function isRequestTypeAddValid (value) {
+  return value === ENDPOINT_ACTIONS.ADD
+}
+
+function isRequestTypeUpdateValid (value) {
+  return value === ENDPOINT_ACTIONS.UPDATE
+}
+
+function isRequestTypeRemoveValid (value) {
+  return value === ENDPOINT_ACTIONS.REMOVE
+}
+
+function isRequestTypeReportAbuseValid (value) {
+  return value === ENDPOINT_ACTIONS.REPORT_ABUSE
+}