Shortened regex

Author: keitharm

models/User.js

@@ -16,7 +16,7 @@ module.exports = {
       '2.0', '3.0', '3.5', '4.0', '4.5', '5.0', '5.5', '5.75', '6.0',
       '7.0', '8.0', '9.0', '9.5', '10.0', '11.0', '12.0'];
     return new Promise((resolve, reject) => {
-      if (data.username.match(/^[a-zA-Z0-9]{1,20}$/)) {
+      if (data.username.match(/^[A-z0-9]{1,20}$/)) {
         if (data.password === '') {
           reject({flash: 'Please provide a password!', redirect: '/register'});
 

routes/ajax.js

@@ -25,7 +25,7 @@ router.get('/snippetLookup/:ref?/:version?', (req, res, next) => {
   let version = req.params.version;
 
   Version.getVersion(ref, version).then(ver => {
-    if (ver === null) {
+    if (ver === null || ver.published === 0) {
       return res.redirect(baseURL + '/');
     }
 

routes/edit.js

@@ -79,7 +79,7 @@ router.post('/api/:ref', (req, res, next) => {
     } else {
       let name = req.body.rename;
       if (name === undefined || name === "") name = doc.name;
-      if (name.match(/^[a-zA-Z0-9 _\-\.+\[\]\{\}\(\)]{1,32}$/) === null) {
+      if (name.match(/^[A-z0-9 _\-\.+\[\]\{\}\(\)]{1,32}$/) === null) {
         req.flash('warning', 'Only 32 chars max please! Accepted chars: a-Z0-9 _-.+[]{}()');
         res.redirect(baseURL + '/edit/api/' + req.params.ref);
       } else {
@@ -132,7 +132,7 @@ router.post('/list/:ref', (req, res, next) => {
       } else {
         let name = req.body.rename;
         if (name === undefined || name === "") name = doc.name;
-        if (name.match(/^[a-zA-Z0-9 _\-\.+\[\]\{\}\(\)]{1,32}$/) === null) {
+        if (name.match(/^[A-z0-9 _\-\.+\[\]\{\}\(\)]{1,32}$/) === null) {
           req.flash('warning', 'Only 32 chars max please! Accepted chars: a-Z0-9 _-.+[]{}()');
           res.redirect(baseURL + '/view/api/' + req.params.ref);
         } else if (req.file === undefined) {
@@ -222,7 +222,7 @@ router.post('/snippet/:ref?/:version?', (req, res, next) => {
   }
 
   let tags = _.uniq(req.body.tags.split(',').map(tag => tag.trim()).filter(tag => tag !== ""));
-  let rejects = tags.filter(tag => tag.match(/^([a-zA-Z0-9 _\-\.+\[\]\{\}\(\)]{1,32})$/g) === null);
+  let rejects = tags.filter(tag => tag.match(/^([A-z0-9 _\-\.+\[\]\{\}\(\)]{1,32})$/g) === null);
 
   Snippet.getCond({ref}).then(doc => {
     if (doc.owner !== req.session.user.id) {
@@ -238,7 +238,7 @@ router.post('/snippet/:ref?/:version?', (req, res, next) => {
       req.flash('warning', 'Names can\'t be changed for Published Snippets');
       res.redirect(`${baseURL}/edit/snippet/${ref}${versionFmt}`);
 
-    } else if (name.match(/^[a-zA-Z0-9 _\-\.+\[\]\{\}\(\)]{1,32}$/) === null) {
+    } else if (name.match(/^[A-z0-9 _\-\.+\[\]\{\}\(\)]{1,32}$/) === null) {
       req.flash('warning', 'Only 32 chars max please! Accepted chars: a-Z0-9 _-.+[]{}()');
       res.redirect(`${baseURL}/edit/snippet/${ref}${versionFmt}`);
 

routes/new.js

@@ -69,7 +69,7 @@ router.post('/api', (req, res, next) => {
     req.flash('warning', 'Please provide a name for your API');
     res.redirect(baseURL + '/new/api');
 
-  } else if (!req.body.name.match(/^[a-zA-Z0-9 _\-\.+\[\]\{\}\(\)]{1,32}$/)) {
+  } else if (!req.body.name.match(/^[A-z0-9 _\-\.+\[\]\{\}\(\)]{1,32}$/)) {
     req.flash('warning', 'Only 32 chars max please! Accepted chars: a-Z0-9 _-.+[]{}()');
     res.redirect(baseURL + '/new/api');
 
@@ -121,7 +121,7 @@ router.post('/list', (req, res, next) => {
       }
       res.redirect(baseURL + '/new/list');
 
-    } else if (!req.body.name.match(/^[a-zA-Z0-9 _\-\.+\[\]\{\}\(\)]{1,32}$/)) {
+    } else if (!req.body.name.match(/^[A-z0-9 _\-\.+\[\]\{\}\(\)]{1,32}$/)) {
       req.flash('warning', 'Only 32 chars max please! Accepted chars: a-Z0-9 _-.+[]{}()');
       res.redirect(baseURL + '/new/list');
 
@@ -158,14 +158,14 @@ router.post('/snippet', (req, res, next) => {
   }
 
   let tags = _.uniq(req.body.tags.split(',').map(tag => tag.trim()).filter(tag => tag !== ""));
-  let rejects = tags.filter(tag => tag.match(/^([a-zA-Z0-9 _\-\.+\[\]\{\}\(\)]{1,32})$/g) === null);
+  let rejects = tags.filter(tag => tag.match(/^([A-z0-9 _\-\.+\[\]\{\}\(\)]{1,32})$/g) === null);
 
   if (req.body.name === '') {
     req.flash('warning', 'Please provide a name for your Snippet');
     res.redirect(baseURL + '/new/snippet');
 
   // Make sure snippet name meets requirements
-  } else if (!req.body.name.match(/^[a-zA-Z0-9 _\-\.+\[\]\{\}\(\)]{1,32}$/)) {
+  } else if (!req.body.name.match(/^[A-z0-9 _\-\.+\[\]\{\}\(\)]{1,32}$/)) {
     req.flash('warning', 'Only 32 chars max please! Accepted chars: a-Z0-9 _-.+[]{}()');
     res.redirect(baseURL + '/new/snippet');
 

src/js/general.js

@@ -92,7 +92,7 @@ function snippetDeletePrompt(ref, name) {
 }
 
 function updateDates() {
-    $('.date').each((index, date) => {
-      $(date).html(moment(new Date($(date).data('date'))/*, "MMDDYYHHmmss"*/).fromNow());
-    });
-  }
+  $('.date').each((index, date) => {
+    $(date).html(moment(new Date($(date).data('date'))/*, "MMDDYYHHmmss"*/).fromNow());
+  });
+}