Client: add users list/friends list titles

[github/Chocobozzz/PeerTube.git] / server.js

diff --git a/server.js b/server.js
index 4c8e8cfd39d03b18614e57fb56a1c1d143582871..d38c5830f3f0ac565fbfdbe4b5554c98dc7c2bad 100644 (file)
--- a/server.js
+++ b/server.js
@@ -13,6 +13,14 @@ const WebSocketServer = require('ws').Server
 // Create our main app
 const app = express()
 
+// ----------- Database -----------
+const config = require('config')
+const constants = require('./server/initializers/constants')
+const database = require('./server/initializers/database')
+const logger = require('./server/helpers/logger')
+
+database.connect()
+
 // ----------- Checker -----------
 const checker = require('./server/initializers/checker')
 
@@ -22,24 +30,18 @@ if (miss.length !== 0) {
 }
 
 // ----------- PeerTube modules -----------
-const config = require('config')
-const constants = require('./server/initializers/constants')
-const customValidators = require('./server/helpers/customValidators')
-const database = require('./server/initializers/database')
+const customValidators = require('./server/helpers/custom-validators')
 const installer = require('./server/initializers/installer')
-const logger = require('./server/helpers/logger')
-const poolRequests = require('./server/lib/requestsScheduler')
+const mongoose = require('mongoose')
 const routes = require('./server/controllers')
 const utils = require('./server/helpers/utils')
-const videos = require('./server/lib/videos')
 const webtorrent = require('./server/lib/webtorrent')
+const Request = mongoose.model('Request')
+const Video = mongoose.model('Video')
 
 // Get configurations
 const port = config.get('listen.port')
 
-// ----------- Database -----------
-database.connect()
-
 // ----------- Command line -----------
 
 // ----------- App -----------
@@ -51,7 +53,7 @@ app.use(bodyParser.json())
 app.use(bodyParser.urlencoded({ extended: false }))
 // Validate some params for the API
 app.use(expressValidator({
-  customValidators: customValidators
+  customValidators: Object.assign({}, customValidators.misc, customValidators.users, customValidators.videos)
 }))
 
 // ----------- Views, routes and static files -----------
@@ -136,9 +138,11 @@ installer.installApplication(function (err) {
     // ----------- Make the server listening -----------
     server.listen(port, function () {
       // Activate the pool requests
-      poolRequests.activate()
+      Request.activate()
+
+      Video.seedAllExisting(function (err) {
+        if (err) throw err
 
-      videos.seedAllExisting(function () {
         logger.info('Seeded all the videos')
         logger.info('Server listening on port %d', port)
         app.emit('ready')