From bc503c2a62dcf9aed6b8d90b68f0f27a7755ac01 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 11 May 2016 21:19:34 +0200 Subject: Update to standard 7. Goodbye snake_case, I used to love you --- server/models/pods.js | 4 ++-- server/models/users.js | 20 ++++++++++---------- server/models/videos.js | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'server/models') diff --git a/server/models/pods.js b/server/models/pods.js index 4e21001f5..04cc2d6fc 100644 --- a/server/models/pods.js +++ b/server/models/pods.js @@ -58,13 +58,13 @@ function incrementScores (ids, value, callback) { } function list (callback) { - PodsDB.find(function (err, pods_list) { + PodsDB.find(function (err, podsList) { if (err) { logger.error('Cannot get the list of the pods.') return callback(err) } - return callback(null, pods_list) + return callback(null, podsList) }) } diff --git a/server/models/users.js b/server/models/users.js index a852bf25b..a1bdece23 100644 --- a/server/models/users.js +++ b/server/models/users.js @@ -45,11 +45,11 @@ const Users = { function createClient (secret, grants, callback) { logger.debug('Creating client.') - const mongo_id = new mongoose.mongo.ObjectID() - return OAuthClientsDB.create({ _id: mongo_id, clientSecret: secret, grants: grants }, function (err) { + const mongoId = new mongoose.mongo.ObjectID() + return OAuthClientsDB.create({ _id: mongoId, clientSecret: secret, grants: grants }, function (err) { if (err) return callback(err) - return callback(null, mongo_id) + return callback(null, mongoId) }) } @@ -73,8 +73,8 @@ function getClient (clientId, clientSecret) { logger.debug('Getting Client (clientId: ' + clientId + ', clientSecret: ' + clientSecret + ').') // TODO req validator - const mongo_id = new mongoose.mongo.ObjectID(clientId) - return OAuthClientsDB.findOne({ _id: mongo_id, clientSecret: clientSecret }) + const mongoId = new mongoose.mongo.ObjectID(clientId) + return OAuthClientsDB.findOne({ _id: mongoId, clientSecret: clientSecret }) } function getClients (callback) { @@ -99,7 +99,7 @@ function getUsers (callback) { function saveToken (token, client, user) { logger.debug('Saving token for client ' + client.id + ' and user ' + user.id + '.') - const token_to_create = { + const tokenToCreate = { accessToken: token.accessToken, accessTokenExpiresOn: token.accessTokenExpiresOn, client: client.id, @@ -108,13 +108,13 @@ function saveToken (token, client, user) { user: user.id } - return OAuthTokensDB.create(token_to_create, function (err, token_created) { + return OAuthTokensDB.create(tokenToCreate, function (err, tokenCreated) { if (err) throw err // node-oauth2-server library uses Promise.try - token_created.client = client - token_created.user = user + tokenCreated.client = client + tokenCreated.user = user - return token_created + return tokenCreated }) } diff --git a/server/models/videos.js b/server/models/videos.js index eedb6eb58..eaea35b7f 100644 --- a/server/models/videos.js +++ b/server/models/videos.js @@ -77,13 +77,13 @@ function get (id, callback) { } function list (callback) { - VideosDB.find(function (err, videos_list) { + VideosDB.find(function (err, videosList) { if (err) { logger.error('Cannot get the list of the videos.') return callback(err) } - return callback(null, videos_list) + return callback(null, videosList) }) } @@ -105,13 +105,13 @@ function listFromRemotes (callback) { function listOwned (callback) { // If namePath is not null this is *our* video - VideosDB.find({ namePath: { $ne: null } }, function (err, videos_list) { + VideosDB.find({ namePath: { $ne: null } }, function (err, videosList) { if (err) { logger.error('Cannot get the list of owned videos.') return callback(err) } - return callback(null, videos_list) + return callback(null, videosList) }) } -- cgit v1.2.3