Standard JS code conversion + fixes

controllers/ws.js

@@ -1,95 +1,95 @@
-"use strict";
+'use strict'
+
+const _ = require('lodash')
 
 module.exports = (socket) => {
-  
-  if(!socket.request.user.logged_in) {
-    return;
+  if (!socket.request.user.logged_in) {
+    return
   }
 
-  //-----------------------------------------
+  // -----------------------------------------
   // SEARCH
-  //-----------------------------------------
+  // -----------------------------------------
 
   socket.on('search', (data, cb) => {
-    cb = cb || _.noop;
+    cb = cb || _.noop
     entries.search(data.terms).then((results) => {
-      return cb(results) || true;
-    });
-  });
+      return cb(results) || true
+    })
+  })
 
-  //-----------------------------------------
+  // -----------------------------------------
   // UPLOADS
-  //-----------------------------------------
+  // -----------------------------------------
 
   socket.on('uploadsGetFolders', (data, cb) => {
-    cb = cb || _.noop;
+    cb = cb || _.noop
     upl.getUploadsFolders().then((f) => {
-      return cb(f) || true;
-    });
-  });
+      return cb(f) || true
+    })
+  })
 
   socket.on('uploadsCreateFolder', (data, cb) => {
-    cb = cb || _.noop;
+    cb = cb || _.noop
     upl.createUploadsFolder(data.foldername).then((f) => {
-      return cb(f) || true;
-    });
-  });
+      return cb(f) || true
+    })
+  })
 
   socket.on('uploadsGetImages', (data, cb) => {
-    cb = cb || _.noop;
+    cb = cb || _.noop
     upl.getUploadsFiles('image', data.folder).then((f) => {
-      return cb(f) || true;
-    });
-  });
+      return cb(f) || true
+    })
+  })
 
   socket.on('uploadsGetFiles', (data, cb) => {
-    cb = cb || _.noop;
+    cb = cb || _.noop
     upl.getUploadsFiles('binary', data.folder).then((f) => {
-      return cb(f) || true;
-    });
-  });
+      return cb(f) || true
+    })
+  })
 
   socket.on('uploadsDeleteFile', (data, cb) => {
-    cb = cb || _.noop;
+    cb = cb || _.noop
     upl.deleteUploadsFile(data.uid).then((f) => {
-      return cb(f) || true;
-    });
-  });
+      return cb(f) || true
+    })
+  })
 
   socket.on('uploadsFetchFileFromURL', (data, cb) => {
-  	cb = cb || _.noop;
+    cb = cb || _.noop
     upl.downloadFromUrl(data.folder, data.fetchUrl).then((f) => {
-      return cb({ ok: true }) || true;
+      return cb({ ok: true }) || true
     }).catch((err) => {
-    	return cb({
-    		ok: false,
-    		msg: err.message
-    	}) || true;
-    });
-  });
+      return cb({
+        ok: false,
+        msg: err.message
+      }) || true
+    })
+  })
 
   socket.on('uploadsRenameFile', (data, cb) => {
-  	cb = cb || _.noop;
+    cb = cb || _.noop
     upl.moveUploadsFile(data.uid, data.folder, data.filename).then((f) => {
-      return cb({ ok: true }) || true;
+      return cb({ ok: true }) || true
     }).catch((err) => {
-    	return cb({
-    		ok: false,
-    		msg: err.message
-    	}) || true;
-    });
-  });
+      return cb({
+        ok: false,
+        msg: err.message
+      }) || true
+    })
+  })
 
   socket.on('uploadsMoveFile', (data, cb) => {
-    cb = cb || _.noop;
+    cb = cb || _.noop
     upl.moveUploadsFile(data.uid, data.folder).then((f) => {
-      return cb({ ok: true }) || true;
+      return cb({ ok: true }) || true
     }).catch((err) => {
-    	return cb({
-    		ok: false,
-    		msg: err.message
-    	}) || true;
-    });
-  });
-
-};
+      return cb({
+        ok: false,
+        msg: err.message
+      }) || true
+    })
+  })
+}