Clean up

app.js

@@ -18,12 +18,12 @@ var group = require('./controllers/group');
 var discussion = require('./controllers/discussion');
 var issue = require('./controllers/issue');
 var scriptStorage = require('./controllers/scriptStorage');
-var statusCodePage = require('./libs/templateHelpers').statusCodePage;
-
-var modelParser = require('./libs/modelParser');
 
+var statusCodePage = require('./libs/templateHelpers').statusCodePage;
 var modifySessions = require('./libs/modifySessions');
+
 var settings = require('./models/settings.json');
+
 var connectStr = process.env.CONNECT_STRING || settings.connect;
 var sessionSecret = process.env.SESSION_SECRET || settings.secret;
 var db = mongoose.connection;
@@ -61,8 +61,7 @@ app.configure(function(){
         'max-age=8640000; includeSubDomains');
 
       if (req.headers['x-forwarded-proto'] !== 'https') {
-        return res.redirect(301, 'https://' + req.headers.host
-          + encodeURI(req.url));
+        return res.redirect(301, 'https://' + req.headers.host + encodeURI(req.url));
       }
 
       next();
@@ -153,7 +152,6 @@ app_route('/user/add/lib/new').get(script.lib(user.editScript)).post(script.lib(
 app_route('/user/add/scripts/upload').post(user.uploadScript);
 app_route('/user/add/lib/upload').post(script.lib(user.uploadScript));
 
-
 // Script routes
 app_route('/scripts/:username/:namespace?/:scriptname').get(script.view);
 app_route('/script/:username/:namespace?/:scriptname/edit').get(script.edit).post(script.edit);
@@ -201,9 +199,8 @@ app_route('/mod/removed').get(moderation.removedItemListPage);
 app_route('/mod/removed/:id').get(moderation.removedItemPage);
 app.get('/flag/users/:username/:unflag?', user.flag);
 app.get('/flag/scripts/:username/:namespace?/:scriptname/:unflag?', script.flag);
-app.get('/flag/libs/:username/:scriptname/:unflag?', script.lib(script.flag)); //
-app.get(listRegex('\/flagged(?:\/([^\/]+?))?', 'user|script'),
-  moderation.flagged); //
+app.get('/flag/libs/:username/:scriptname/:unflag?', script.lib(script.flag));
+app.get(listRegex('\/flagged(?:\/([^\/]+?))?', 'user|script'), moderation.flagged);
 app.get(listRegex('\/graveyard(?:\/([^\/]+?))?', ''), moderation.graveyard);
 app.get(/^\/remove\/(.+?)\/(.+)$/, remove.rm);
 
@@ -243,4 +240,3 @@ app.use(function (req, res, next) {
     statusMessage: 'This is not the page you\'re are looking for.',
   });
 });
-

controllers/_template.js

@@ -16,7 +16,6 @@ var modelQuery = require('../libs/modelQuery');
 // Generate a bootstrap3 pagination widget.
 var getDefaultPagination = require('../libs/templateHelpers').getDefaultPagination;
 
-
 //--- Views
 exports.example = function(req, res, next) {
   var authedUser = req.session.user;
@@ -38,7 +37,6 @@ exports.example = function (req, res, next) {
   options.pageMetaKeywords = pageMetaKeywords.join(', ');
 
   //--- Tasks
-  // ...
 
   //---
   function preRender() { };
@@ -81,7 +79,6 @@ exports.example = function (req, res, next) {
     scriptListQuery.sort('-rating -installs -updated');
   });
 
-
   // Pagination
   var pagination = getDefaultPagination(req);
   pagination.applyToQuery(scriptListQuery);

controllers/admin.js

@@ -34,7 +34,11 @@ function getOAuthStrategies(stored) {
     strategy = strategies[type];
     if (strategy.oauth) {
       oAuthStrats.push(stored[type] ||
-        nil({ 'strat' : type, 'id' : '', 'key' : ''}));
+        nil({
+          'strat': type,
+          'id': '',
+          'key': ''
+        }));
     }
   }
 
@@ -56,14 +60,20 @@ exports.userAdmin = function (req, res, next) {
     users.forEach(function(user) {
       var roles = [];
       userRoles.forEach(function(role, index) {
-        roles.push({ 'val' : index, 'display' : role,
-          'selected' : index === user.role });
+        roles.push({
+          'val': index,
+          'display': role,
+          'selected': index === user.role
+        });
       });
       roles = roles.splice(thisUser.role + 1);
       roles.reverse();
 
-      options.users.push({ 'id' : user._id, 'name' : user.name,
-        'roles' : roles });
+      options.users.push({
+        'id': user._id,
+        'name': user.name,
+        'roles': roles
+      });
     });
 
     res.render('userAdmin', options);
@@ -83,20 +93,22 @@ exports.adminUserView = function (req, res, next) {
     function(err, user) {
       if (err || !user) { return next(); }
 
-      res.render('userAdmin', { user: {
-        info: JSON.stringify(user.toObject(), null, ' ') } });
+      res.render('userAdmin', {
+        user: {
+          info: JSON.stringify(user.toObject(), null, ' ')
+        }
+      });
     });
 };
 
-
 var jsonModelMap = {
   'User': User,
   'Script': Script,
   'Group': Group,
   'Discussion': Discussion,
   'Comment': Comment,
   'Vote': Vote,
-  'Flag': Flag,
+  'Flag': Flag
 };
 // View everything about a particular user
 // This is mostly for debugging in production
@@ -117,7 +129,6 @@ exports.adminJsonView = function (req, res, next) {
   if (!options.isAdmin)
     return res.send(403, { status: 403, message: 'Not an admin.' });
 
-
   var model = jsonModelMap[modelname];
   if (!model)
     return res.send(400, { status: 400, message: 'Invalid model.' });
@@ -324,7 +335,6 @@ exports.apiAdminUpdate = function (req, res, next) {
           });
         }
 
-
         return strategy.save(function(err, strategy) {
           loadPassport(strategy);
           cb();

controllers/auth.js

@@ -109,7 +109,6 @@ exports.callback = function (req, res, next) {
   // Get the passport strategy instance so we can alter the _verfiy method
   strategyInstance = strategyInstances[strategy];
 
-
   // Hijak the private verify method so we can fuck shit up freely
   // We use this library for things it was never intended to do
   if (openIdStrategies[strategy]) {
@@ -125,8 +124,7 @@ exports.callback = function (req, res, next) {
   }
 
   // This callback will happen after the verify routine
-  var authenticate = passport.authenticate(strategy,
-    function (err, user, info) {
+  var authenticate = passport.authenticate(strategy, function(err, user, info) {
     if (err) { return next(err); }
     if (!user) {
       return res.redirect(doneUrl + (doneUrl === '/' ? 'register' : '')

controllers/discussion.js

@@ -15,7 +15,7 @@ var categories = [
     slug: 'announcements',
     name: 'Announcements',
     description: 'UserScripts News (OpenUserJS, GreaseMonkey, etc)',
-    roleReqToPostTopic: 3, // Moderator
+    roleReqToPostTopic: 3 // Moderator
   },
   {
     slug: 'garage',

controllers/group.js

@@ -119,7 +119,8 @@ exports.addScriptToGroups = function (script, groupNames, callback) {
             group.rating = getRating(scripts);
             group.updated = new Date();
             group.save(function() { });
-        });
+          }
+        );
       });
     });
   });

controllers/index.js

@@ -15,7 +15,6 @@ var modelQuery = require('../libs/modelQuery');
 var execQueryTask = require('../libs/tasks').execQueryTask;
 var removeSession = require('../libs/modifySessions').remove;
 
-
 // The home page has scripts and groups in a sidebar
 exports.home = function(req, res) {
   var authedUser = req.session.user;
@@ -175,7 +174,8 @@ function getSearchResults (req, res, prefixSearch, fullSearch, opts, callback) {
         'search': search,
         'scriptsList': scriptsList
       });
-  });
+    }
+  );
 };
 
 // Script search results

controllers/issue.js

@@ -12,7 +12,6 @@ var discussionLib = require('./discussion');
 var execQueryTask = require('../libs/tasks').execQueryTask;
 var countTask = require('../libs/tasks').countTask;
 
-
 // List script issues
 exports.list = function(req, res, next) {
   var authedUser = req.session.user;
@@ -261,7 +260,6 @@ exports.open = function (req, res, next) {
     } else {
       // New Issue Page
 
-
       //--- Tasks
       // ...
 
@@ -323,6 +321,7 @@ exports.changeStatus = function (req, res, next) {
     + (type === 'libs' ? '.js' : '.user.js')) }, function (err, script) {
 
       if (err || !script) { return next(); }
+    if (err || !script) { return next(); }
 
     discussionLib.findDiscussion(category, topic, function(issue) {
       if (!issue) { return next(); }

controllers/moderation.js

@@ -15,8 +15,10 @@ exports.flagged = function (req, res, next) {
   var user = req.session.user;
   var type = req.route.params.shift() || 'users';
   var baseUrl = '/flagged' + (type ? '/' + type : '');
-  var options = { title: 'Flagged Content', moderation: true,
-    username: user ? user.name : '' };
+  var options = {
+    title: 'Flagged Content', moderation: true,
+    username: user ? user.name : ''
+  };
 
   options[type + 'Type'] = true;
 
@@ -126,7 +128,7 @@ exports.removedItemPage = function (req, res, next) {
     if (err || !removedItemData) { return next(); }
 
     res.json(removedItemData);
-  })
+  });
 };
 
 exports.removedItemListPage = function(req, res, next) {

controllers/script.js

@@ -53,15 +53,13 @@ var getScriptPageTasks = function(options) {
   var script = options.script;
   var authedUser = options.authedUser;
 
-
   //--- Tasks
 
   // Show the number of open issues
   var scriptOpenIssueCountQuery = Discussion.find({ category: scriptStorage
       .caseInsensitive(script.issuesCategorySlug), open: {$ne: false} });
   tasks.push(countTask(scriptOpenIssueCountQuery, options, 'issueCount'));
 
-
   // Show collaborators of the script
   if (script.meta.author && script.meta.collaborator) {
     options.hasCollab = true;
@@ -308,7 +306,6 @@ exports.view = function (req, res, next) {
     //--- Tasks
     tasks = tasks.concat(getScriptPageTasks(options));
 
-
     //---
     function preRender() {
       var pageMetaKeywords = ['userscript', 'greasemonkey'];
@@ -504,8 +501,10 @@ exports.vote = function (req, res, next) {
           }
 
           voteModel.save(saveScript);
-      });
-  });
+        }
+      );
+    }
+  );
 };
 
 // Script flagging
@@ -523,5 +522,6 @@ exports.flag = function (req, res, next) {
       fn(Script, script, req.session.user, function(flagged) {
         res.redirect((isLib ? '/libs/' : '/scripts/') + encodeURI(installName));
       });
-  });
+    }
+  );
 };

controllers/scriptStorage.js

@@ -15,10 +15,14 @@ if (process.env.NODE_ENV === 'production') {
   // You need to install (and ruby too): https://github.com/jubos/fake-s3
   // Then run the fakes3.sh script or: fakes3 -r fakeS3 -p 10001
   var DEV_AWS_URL = process.env.DEV_AWS_URL || 'localhost:10001';
-  AWS.config.update({ accessKeyId: 'fakeId', secretAccessKey: 'fakeKey',
+  AWS.config.update({
+    accessKeyId: 'fakeId',
+    secretAccessKey: 'fakeKey',
     httpOptions: {
-    proxy: DEV_AWS_URL, agent: require('http').globalAgent
-  }});
+      proxy: DEV_AWS_URL,
+      agent: require('http').globalAgent
+    }
+  });
 }
 
 /*Script.find({ installName: /^[^\/]+\/[^\/]+\/[^\/]+$/ },function (err, scripts){
@@ -275,7 +279,6 @@ exports.storeScript = function (user, meta, buf, callback, update) {
   // Prevent a removed script from being reuploaded
   findDeadorAlive(Script, { installName: caseInsensitive(installName) }, true,
     function(alive, script, removed) {
-
       if (removed || (!script && (update || collaborators))) {
         return callback(null);
       } else if (!script) {
@@ -352,7 +355,7 @@ exports.webhook = function (req, res) {
   var repos = {};
   var repo = null;
 
-  res.end(); // close connection
+  res.end(); // Close connection
 
   // Test for know GH webhook ips: https://api.github.com/meta
   if (!req.body.payload ||