From 23f1dd59c5baa96bf63f491b40bb9ce6ba05a27b Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 25 Jan 2015 15:26:37 -0600 Subject: [PATCH] Converted shared to common for controllers --- src/controllers/auth.js | 2 +- src/controllers/challenges.js | 2 +- src/controllers/groups.js | 2 +- src/controllers/hall.js | 2 +- src/controllers/members.js | 2 +- src/controllers/user.js | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/controllers/auth.js b/src/controllers/auth.js index 3a00eda7f0..6586ce37ad 100644 --- a/src/controllers/auth.js +++ b/src/controllers/auth.js @@ -1,7 +1,7 @@ var _ = require('lodash'); var validator = require('validator'); var passport = require('passport'); -var shared = require('habitrpg-shared'); +var shared = require('../../common'); var async = require('async'); var utils = require('../utils'); var nconf = require('nconf'); diff --git a/src/controllers/challenges.js b/src/controllers/challenges.js index 71e1d82d33..ea5aa11e96 100644 --- a/src/controllers/challenges.js +++ b/src/controllers/challenges.js @@ -3,7 +3,7 @@ var _ = require('lodash'); var nconf = require('nconf'); var async = require('async'); -var shared = require('habitrpg-shared'); +var shared = require('../../common'); var User = require('./../models/user').model; var Group = require('./../models/group').model; var Challenge = require('./../models/challenge').model; diff --git a/src/controllers/groups.js b/src/controllers/groups.js index 22268838ef..e3f4d1d170 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -8,7 +8,7 @@ var _ = require('lodash'); var nconf = require('nconf'); var async = require('async'); var utils = require('./../utils'); -var shared = require('habitrpg-shared'); +var shared = require('../../common'); var User = require('./../models/user').model; var Group = require('./../models/group').model; var Challenge = require('./../models/challenge').model; diff --git a/src/controllers/hall.js b/src/controllers/hall.js index cd8eba7744..6389b72e9a 100644 --- a/src/controllers/hall.js +++ b/src/controllers/hall.js @@ -1,7 +1,7 @@ var _ = require('lodash'); var nconf = require('nconf'); var async = require('async'); -var shared = require('habitrpg-shared'); +var shared = require('../../common'); var User = require('./../models/user').model; var Group = require('./../models/group').model; var api = module.exports; diff --git a/src/controllers/members.js b/src/controllers/members.js index 73db176865..bc695dbb05 100644 --- a/src/controllers/members.js +++ b/src/controllers/members.js @@ -4,7 +4,7 @@ var partyFields = require('./groups').partyFields var api = module.exports; var async = require('async'); var _ = require('lodash'); -var shared = require('habitrpg-shared'); +var shared = require('../../common'); var fetchMember = function(uuid, restrict){ return function(cb){ diff --git a/src/controllers/user.js b/src/controllers/user.js index 43cc9ff8a2..fdd8b7444e 100644 --- a/src/controllers/user.js +++ b/src/controllers/user.js @@ -5,7 +5,7 @@ var ipn = require('paypal-ipn'); var _ = require('lodash'); var nconf = require('nconf'); var async = require('async'); -var shared = require('habitrpg-shared'); +var shared = require('../../common'); var User = require('./../models/user').model; var utils = require('./../utils'); var ga = utils.ga; @@ -477,7 +477,7 @@ api.sessionPartyInvite = function(req,res,next){ } /** - * All other user.ops which can easily be mapped to habitrpg-shared/index.coffee, not requiring custom API-wrapping + * All other user.ops which can easily be mapped to ../../common/scripts/index.coffee, not requiring custom API-wrapping */ _.each(shared.wrap({}).ops, function(op,k){ if (!api[k]) {