From: Chocobozzz <florian.bigard@gmail.com>
Date: Sat, 4 Mar 2017 08:48:35 +0000 (+0100)
Subject: Server: fix requests endpoints
X-Git-Tag: v0.0.1-alpha~509
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4b4660582b370589f942bf74e2e682e47a9dfa0b;p=oweals%2Fpeertube.git

Server: fix requests endpoints
---

diff --git a/server/initializers/constants.js b/server/initializers/constants.js
index e33229163..2d5bb84cc 100644
--- a/server/initializers/constants.js
+++ b/server/initializers/constants.js
@@ -134,10 +134,9 @@ const REQUESTS_VIDEO_EVENT_LIMIT_PER_POD = 50
 const RETRY_REQUESTS = 5
 
 const REQUEST_ENDPOINTS = {
-  VIDEOS: 'videos',
-  QADU: 'videos/qadu',
-  EVENT: 'videos/events'
+  VIDEOS: 'videos'
 }
+
 const REQUEST_ENDPOINT_ACTIONS = {}
 REQUEST_ENDPOINT_ACTIONS[REQUEST_ENDPOINTS.VIDEOS] = {
   ADD: 'add',
@@ -146,6 +145,9 @@ REQUEST_ENDPOINT_ACTIONS[REQUEST_ENDPOINTS.VIDEOS] = {
   REPORT_ABUSE: 'report-abuse'
 }
 
+const REQUEST_VIDEO_QADU_ENDPOINT = 'videos/qadu'
+const REQUEST_VIDEO_EVENT_ENDPOINT = 'videos/events'
+
 const REQUEST_VIDEO_QADU_TYPES = {
   LIKES: 'likes',
   DISLIKES: 'dislikes',
@@ -227,16 +229,18 @@ module.exports = {
   REMOTE_SCHEME,
   REQUEST_ENDPOINT_ACTIONS,
   REQUEST_ENDPOINTS,
+  REQUEST_VIDEO_EVENT_ENDPOINT,
   REQUEST_VIDEO_EVENT_TYPES,
+  REQUEST_VIDEO_QADU_ENDPOINT,
   REQUEST_VIDEO_QADU_TYPES,
   REQUESTS_IN_PARALLEL,
   REQUESTS_INTERVAL,
   REQUESTS_LIMIT_PER_POD,
   REQUESTS_LIMIT_PODS,
-  REQUESTS_VIDEO_QADU_LIMIT_PER_POD,
-  REQUESTS_VIDEO_QADU_LIMIT_PODS,
   REQUESTS_VIDEO_EVENT_LIMIT_PER_POD,
   REQUESTS_VIDEO_EVENT_LIMIT_PODS,
+  REQUESTS_VIDEO_QADU_LIMIT_PER_POD,
+  REQUESTS_VIDEO_QADU_LIMIT_PODS,
   RETRY_REQUESTS,
   SEARCHABLE_COLUMNS,
   SIGNATURE_ALGORITHM,
diff --git a/server/lib/request-video-event-scheduler.js b/server/lib/request-video-event-scheduler.js
index f178df49e..c7631253a 100644
--- a/server/lib/request-video-event-scheduler.js
+++ b/server/lib/request-video-event-scheduler.js
@@ -45,7 +45,7 @@ module.exports = class RequestVideoEventScheduler extends BaseRequestScheduler {
         if (!requestsToMakeGrouped[toPodId]) {
           requestsToMakeGrouped[toPodId] = {
             toPod: eventToProcess.pod,
-            endpoint: constants.REQUEST_ENDPOINTS.EVENT,
+            endpoint: constants.REQUEST_VIDEO_EVENT_ENDPOINT,
             ids: [], // request ids, to delete them from the DB in the future
             datas: [] // requests data
           }
diff --git a/server/lib/request-video-qadu-scheduler.js b/server/lib/request-video-qadu-scheduler.js
index bfccc5234..ac50cfc11 100644
--- a/server/lib/request-video-qadu-scheduler.js
+++ b/server/lib/request-video-qadu-scheduler.js
@@ -37,7 +37,7 @@ module.exports = class RequestVideoQaduScheduler extends BaseRequestScheduler {
         if (!requestsToMakeGrouped[hashKey]) {
           requestsToMakeGrouped[hashKey] = {
             toPod: pod,
-            endpoint: constants.REQUEST_ENDPOINTS.QADU,
+            endpoint: constants.REQUEST_VIDEO_QADU_ENDPOINT,
             ids: [], // request ids, to delete them from the DB in the future
             datas: [], // requests data
             videos: {}